diff --git a/asm/rom.s b/asm/rom.s index d9a85bf..99c47c4 100644 --- a/asm/rom.s +++ b/asm/rom.s @@ -225,21 +225,21 @@ AgbMain: @ 0x080003A4 adds r0, r3, #0 strh r0, [r1] bl InitKeys - bl sub_08000684 + bl InitIntrHandlers bl m4aSoundInit - bl sub_08000594 + bl EnableVCountIntrAtLine150 bl sub_0800E194 - bl sub_0802EE80 - bl sub_08076570 + bl RtcInit + bl CheckForFlashMemory bl UpdateLinkAndCallCallbacks - bl sub_080A269C + bl InitMapMusic bl ClearDma3Requests bl ResetBgs - bl sub_080061A4 + bl SetDefaultFontsPointer ldr r0, _08000474 movs r1, #0xe0 lsls r1, r1, #9 - bl sub_08000BAC + bl InitHeap ldr r0, _08000478 movs r4, #0 strb r4, [r0] @@ -248,7 +248,7 @@ AgbMain: @ 0x080003A4 cmp r0, #1 beq _08000414 movs r0, #0 - bl sub_08000540 + bl SetMainCallback2 _08000414: ldr r2, _08000480 strb r4, [r2] @@ -262,7 +262,7 @@ _08000414: mov r8, r0 adds r6, r2, #0 _0800042A: - bl sub_080005E4 + bl ReadKeys ldr r0, _08000478 ldrb r0, [r0] cmp r0, #0 @@ -278,7 +278,7 @@ _0800042A: bne _08000454 bl rfu_REQ_stopMode bl rfu_waitREQComplete - bl sub_080008F4 + bl DoSoftReset _08000454: bl sub_08086F98 cmp r0, #1 @@ -316,7 +316,7 @@ _0800048C: strb r2, [r5] _080004B2: bl PlayTimeCounter_Update - bl sub_080A26B0 + bl MapMusicMain bl WaitForVBlank b _0800042A .align 2, 0 @@ -326,7 +326,7 @@ _080004C0: .4byte gUnknown_3002354 thumb_func_start sub_080004C4 sub_080004C4: @ 0x080004C4 push {lr} - bl sub_0800AEE0 + bl HandleLinkConnection lsls r0, r0, #0x18 cmp r0, #0 bne _080004D4 @@ -347,7 +347,7 @@ UpdateLinkAndCallCallbacks: @ 0x080004D8 str r0, [r2, #0x24] str r0, [r2] ldr r0, _08000508 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0800050C ldr r0, _08000510 str r0, [r1] @@ -359,7 +359,7 @@ UpdateLinkAndCallCallbacks: @ 0x080004D8 .align 2, 0 _08000500: .4byte gUnknown_3002360 _08000504: .4byte gUnknown_203CC28 -_08000508: .4byte sub_0816CC90 +_08000508: .4byte CB2_InitCopyrightScreenAfterBootup _0800050C: .4byte gUnknown_3005AF0 _08000510: .4byte gUnknown_20246F8 _08000514: .4byte gUnknown_3005AF4 @@ -387,8 +387,8 @@ _08000534: _0800053C: .4byte gUnknown_3002360 thumb_func_end InitMainCallbacks - thumb_func_start sub_08000540 -sub_08000540: @ 0x08000540 + thumb_func_start SetMainCallback2 +SetMainCallback2: @ 0x08000540 ldr r1, _08000550 str r0, [r1, #4] movs r0, #0x87 @@ -399,25 +399,25 @@ sub_08000540: @ 0x08000540 bx lr .align 2, 0 _08000550: .4byte gUnknown_3002360 - thumb_func_end sub_08000540 + thumb_func_end SetMainCallback2 - thumb_func_start sub_08000554 -sub_08000554: @ 0x08000554 + thumb_func_start StartTimer1 +StartTimer1: @ 0x08000554 ldr r1, _0800055C movs r0, #0x80 strh r0, [r1] bx lr .align 2, 0 _0800055C: .4byte 0x04000106 - thumb_func_end sub_08000554 + thumb_func_end StartTimer1 - thumb_func_start sub_08000560 -sub_08000560: @ 0x08000560 + thumb_func_start SeedRngAndSetTrainerId +SeedRngAndSetTrainerId: @ 0x08000560 push {r4, lr} ldr r0, _0800057C ldrh r4, [r0] adds r0, r4, #0 - bl sub_0806F07C + bl SeedRng ldr r1, _08000580 movs r0, #0 strh r0, [r1] @@ -430,7 +430,7 @@ sub_08000560: @ 0x08000560 _0800057C: .4byte 0x04000104 _08000580: .4byte 0x04000106 _08000584: .4byte gUnknown_2020000 - thumb_func_end sub_08000560 + thumb_func_end SeedRngAndSetTrainerId thumb_func_start sub_08000588 sub_08000588: @ 0x08000588 @@ -441,8 +441,8 @@ sub_08000588: @ 0x08000588 _08000590: .4byte gUnknown_2020000 thumb_func_end sub_08000588 - thumb_func_start sub_08000594 -sub_08000594: @ 0x08000594 + thumb_func_start EnableVCountIntrAtLine150 +EnableVCountIntrAtLine150: @ 0x08000594 push {lr} movs r0, #4 bl GetGpuReg @@ -460,7 +460,7 @@ sub_08000594: @ 0x08000594 bl EnableInterrupts pop {r0} bx r0 - thumb_func_end sub_08000594 + thumb_func_end EnableVCountIntrAtLine150 thumb_func_start InitKeys InitKeys: @ 0x080005BC @@ -484,8 +484,8 @@ _080005DC: .4byte gUnknown_3002350 _080005E0: .4byte gUnknown_3002360 thumb_func_end InitKeys - thumb_func_start sub_080005E4 -sub_080005E4: @ 0x080005E4 + thumb_func_start ReadKeys +ReadKeys: @ 0x080005E4 push {lr} ldr r0, _08000620 ldrh r1, [r0] @@ -566,10 +566,10 @@ _08000676: .align 2, 0 _0800067C: .4byte gUnknown_3002350 _08000680: .4byte gUnknown_3005AF0 - thumb_func_end sub_080005E4 + thumb_func_end ReadKeys - thumb_func_start sub_08000684 -sub_08000684: @ 0x08000684 + thumb_func_start InitIntrHandlers +InitIntrHandlers: @ 0x08000684 push {r4, r5, lr} ldr r5, _080006D0 ldr r4, _080006D4 @@ -591,11 +591,11 @@ _08000690: ldr r0, _080006E8 str r4, [r0] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_0800072C + bl SetSerialCallback ldr r1, _080006EC movs r0, #1 strh r0, [r1] @@ -613,37 +613,37 @@ _080006E0: .4byte 0x040000D4 _080006E4: .4byte 0x84000200 _080006E8: .4byte gUnknown_3007FFC _080006EC: .4byte 0x04000208 - thumb_func_end sub_08000684 + thumb_func_end InitIntrHandlers - thumb_func_start sub_080006F0 -sub_080006F0: @ 0x080006F0 + thumb_func_start SetVBlankCallback +SetVBlankCallback: @ 0x080006F0 ldr r1, _080006F8 str r0, [r1, #0xc] bx lr .align 2, 0 _080006F8: .4byte gUnknown_3002360 - thumb_func_end sub_080006F0 + thumb_func_end SetVBlankCallback - thumb_func_start sub_080006FC -sub_080006FC: @ 0x080006FC + thumb_func_start SetHBlankCallback +SetHBlankCallback: @ 0x080006FC ldr r1, _08000704 str r0, [r1, #0x10] bx lr .align 2, 0 _08000704: .4byte gUnknown_3002360 - thumb_func_end sub_080006FC + thumb_func_end SetHBlankCallback - thumb_func_start sub_08000708 -sub_08000708: @ 0x08000708 + thumb_func_start SetVCountCallback +SetVCountCallback: @ 0x08000708 ldr r1, _08000710 str r0, [r1, #0x14] bx lr .align 2, 0 _08000710: .4byte gUnknown_3002360 - thumb_func_end sub_08000708 + thumb_func_end SetVCountCallback - thumb_func_start sub_08000714 -sub_08000714: @ 0x08000714 + thumb_func_start RestoreSerialTimer3IntrHandlers +RestoreSerialTimer3IntrHandlers: @ 0x08000714 ldr r0, _08000720 ldr r1, _08000724 str r1, [r0, #4] @@ -652,21 +652,21 @@ sub_08000714: @ 0x08000714 bx lr .align 2, 0 _08000720: .4byte gUnknown_30027B0 -_08000724: .4byte sub_08000878 -_08000728: .4byte sub_0800B4E4 - thumb_func_end sub_08000714 +_08000724: .4byte SerialIntr +_08000728: .4byte Timer3Intr + thumb_func_end RestoreSerialTimer3IntrHandlers - thumb_func_start sub_0800072C -sub_0800072C: @ 0x0800072C + thumb_func_start SetSerialCallback +SetSerialCallback: @ 0x0800072C ldr r1, _08000734 str r0, [r1, #0x18] bx lr .align 2, 0 _08000734: .4byte gUnknown_3002360 - thumb_func_end sub_0800072C + thumb_func_end SetSerialCallback - thumb_func_start sub_08000738 -sub_08000738: @ 0x08000738 + thumb_func_start VBlankIntr +VBlankIntr: @ 0x08000738 push {r4, lr} ldr r0, _08000748 ldrb r0, [r0] @@ -681,7 +681,7 @@ _0800074C: ldrb r0, [r0] cmp r0, #0 bne _08000758 - bl sub_0800B474 + bl LinkVSync _08000758: ldr r0, _080007E0 ldr r1, [r0, #0x20] @@ -756,7 +756,7 @@ _080007F0: .4byte 0x00000439 _080007F4: .4byte gUnknown_2022C90 _080007F8: .4byte 0x013F0102 _080007FC: .4byte gUnknown_3007FF8 - thumb_func_end sub_08000738 + thumb_func_end VBlankIntr thumb_func_start sub_08000800 sub_08000800: @ 0x08000800 @@ -770,8 +770,8 @@ sub_08000800: @ 0x08000800 _08000810: .4byte gUnknown_30027CC thumb_func_end sub_08000800 - thumb_func_start sub_08000814 -sub_08000814: @ 0x08000814 + thumb_func_start HBlankIntr +HBlankIntr: @ 0x08000814 push {r4, lr} ldr r4, _0800083C ldr r0, [r4, #0x10] @@ -794,10 +794,10 @@ _08000822: .align 2, 0 _0800083C: .4byte gUnknown_3002360 _08000840: .4byte gUnknown_3007FF8 - thumb_func_end sub_08000814 + thumb_func_end HBlankIntr - thumb_func_start sub_08000844 -sub_08000844: @ 0x08000844 + thumb_func_start VCountIntr +VCountIntr: @ 0x08000844 push {r4, lr} ldr r4, _08000870 ldr r0, [r4, #0x14] @@ -821,10 +821,10 @@ _08000852: .align 2, 0 _08000870: .4byte gUnknown_3002360 _08000874: .4byte gUnknown_3007FF8 - thumb_func_end sub_08000844 + thumb_func_end VCountIntr - thumb_func_start sub_08000878 -sub_08000878: @ 0x08000878 + thumb_func_start SerialIntr +SerialIntr: @ 0x08000878 push {r4, lr} ldr r4, _080008A0 ldr r0, [r4, #0x18] @@ -847,7 +847,7 @@ _08000886: .align 2, 0 _080008A0: .4byte gUnknown_3002360 _080008A4: .4byte gUnknown_3007FF8 - thumb_func_end sub_08000878 + thumb_func_end SerialIntr thumb_func_start sub_080008A8 sub_080008A8: @ 0x080008A8 @@ -903,14 +903,14 @@ sub_080008E8: @ 0x080008E8 _080008F0: .4byte gUnknown_203CC28 thumb_func_end sub_080008E8 - thumb_func_start sub_080008F4 -sub_080008F4: @ 0x080008F4 + thumb_func_start DoSoftReset +DoSoftReset: @ 0x080008F4 push {r4, lr} ldr r1, _08000950 movs r0, #0 strh r0, [r1] bl m4aSoundVSyncOff - bl sub_080B9710 + bl ScanlineEffect_Stop ldr r1, _08000954 ldrh r2, [r1, #0xa] ldr r3, _08000958 @@ -953,10 +953,10 @@ _08000954: .4byte 0x040000BC _08000958: .4byte 0x0000C5FF _0800095C: .4byte 0x00007FFF _08000960: .4byte 0x040000D4 - thumb_func_end sub_080008F4 + thumb_func_end DoSoftReset - thumb_func_start sub_08000964 -sub_08000964: @ 0x08000964 + thumb_func_start GetRivalSonDaughterString +GetRivalSonDaughterString: @ 0x08000964 push {lr} sub sp, #4 mov r1, sp @@ -972,7 +972,7 @@ sub_08000964: @ 0x08000964 .align 2, 0 _08000980: .4byte gUnknown_30070D0 _08000984: .4byte 0x01000034 - thumb_func_end sub_08000964 + thumb_func_end GetRivalSonDaughterString thumb_func_start PutMemBlockHeader PutMemBlockHeader: @ 0x08000988 @@ -1004,8 +1004,8 @@ sub_080009A4: @ 0x080009A4 .align 2, 0 thumb_func_end sub_080009A4 - thumb_func_start sub_080009B8 -sub_080009B8: @ 0x080009B8 + thumb_func_start AllocInternal +AllocInternal: @ 0x080009B8 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r4, #0 @@ -1071,7 +1071,7 @@ _08000A24: .align 2, 0 _08000A2C: .4byte gUnknown_829BDF4 _08000A30: .4byte gUnknown_829BE08 - thumb_func_end sub_080009B8 + thumb_func_end AllocInternal thumb_func_start sub_08000A34 sub_08000A34: @ 0x08000A34 @@ -1186,12 +1186,12 @@ _08000B0C: .4byte gUnknown_829BE54 _08000B10: .4byte gUnknown_829BE80 thumb_func_end sub_08000A34 - thumb_func_start sub_08000B14 -sub_08000B14: @ 0x08000B14 + thumb_func_start AllocZeroedInternal +AllocZeroedInternal: @ 0x08000B14 push {r4, r5, lr} sub sp, #4 adds r4, r1, #0 - bl sub_080009B8 + bl AllocInternal adds r5, r0, #0 cmp r5, #0 beq _08000B48 @@ -1220,7 +1220,7 @@ _08000B48: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08000B14 + thumb_func_end AllocZeroedInternal thumb_func_start CheckMemBlockInternal CheckMemBlockInternal: @ 0x08000B54 @@ -1274,8 +1274,8 @@ _08000BA6: bx r1 thumb_func_end CheckMemBlockInternal - thumb_func_start sub_08000BAC -sub_08000BAC: @ 0x08000BAC + thumb_func_start InitHeap +InitHeap: @ 0x08000BAC push {lr} ldr r2, _08000BC0 str r0, [r2] @@ -1287,7 +1287,7 @@ sub_08000BAC: @ 0x08000BAC .align 2, 0 _08000BC0: .4byte gUnknown_3000004 _08000BC4: .4byte gUnknown_3000008 - thumb_func_end sub_08000BAC + thumb_func_end InitHeap thumb_func_start sub_08000BC8 sub_08000BC8: @ 0x08000BC8 @@ -1295,28 +1295,28 @@ sub_08000BC8: @ 0x08000BC8 adds r1, r0, #0 ldr r0, _08000BD8 ldr r0, [r0] - bl sub_080009B8 + bl AllocInternal pop {r1} bx r1 .align 2, 0 _08000BD8: .4byte gUnknown_3000004 thumb_func_end sub_08000BC8 - thumb_func_start sub_08000BDC -sub_08000BDC: @ 0x08000BDC + thumb_func_start AllocZeroed +AllocZeroed: @ 0x08000BDC push {lr} adds r1, r0, #0 ldr r0, _08000BEC ldr r0, [r0] - bl sub_08000B14 + bl AllocZeroedInternal pop {r1} bx r1 .align 2, 0 _08000BEC: .4byte gUnknown_3000004 - thumb_func_end sub_08000BDC + thumb_func_end AllocZeroed - thumb_func_start sub_08000BF0 -sub_08000BF0: @ 0x08000BF0 + thumb_func_start Free +Free: @ 0x08000BF0 push {lr} adds r1, r0, #0 ldr r0, _08000C00 @@ -1326,10 +1326,10 @@ sub_08000BF0: @ 0x08000BF0 bx r0 .align 2, 0 _08000C00: .4byte gUnknown_3000004 - thumb_func_end sub_08000BF0 + thumb_func_end Free - thumb_func_start sub_08000C04 -sub_08000C04: @ 0x08000C04 + thumb_func_start CheckMemBlock +CheckMemBlock: @ 0x08000C04 push {lr} adds r1, r0, #0 ldr r0, _08000C14 @@ -1339,7 +1339,7 @@ sub_08000C04: @ 0x08000C04 bx r1 .align 2, 0 _08000C14: .4byte gUnknown_3000004 - thumb_func_end sub_08000C04 + thumb_func_end CheckMemBlock thumb_func_start CheckHeap CheckHeap: @ 0x08000C18 @@ -2160,8 +2160,8 @@ _080011F8: _080011FC: .4byte 0x04000006 thumb_func_end GetGpuReg - thumb_func_start sub_08001200 -sub_08001200: @ 0x08001200 + thumb_func_start SetGpuRegBits +SetGpuRegBits: @ 0x08001200 push {lr} adds r2, r1, #0 lsls r0, r0, #0x18 @@ -2177,10 +2177,10 @@ sub_08001200: @ 0x08001200 bx r0 .align 2, 0 _0800121C: .4byte gUnknown_3000818 - thumb_func_end sub_08001200 + thumb_func_end SetGpuRegBits - thumb_func_start sub_08001220 -sub_08001220: @ 0x08001220 + thumb_func_start ClearGpuRegBits +ClearGpuRegBits: @ 0x08001220 push {lr} adds r2, r1, #0 lsls r0, r0, #0x18 @@ -2196,7 +2196,7 @@ sub_08001220: @ 0x08001220 bx r0 .align 2, 0 _0800123C: .4byte gUnknown_3000818 - thumb_func_end sub_08001220 + thumb_func_end ClearGpuRegBits thumb_func_start SyncRegIE SyncRegIE: @ 0x08001240 @@ -2240,7 +2240,7 @@ EnableInterrupts: @ 0x08001274 strb r0, [r1] bl SyncRegIE ldrh r0, [r4] - bl sub_080012CC + bl UpdateRegDispstatIntrBits pop {r4} pop {r0} bx r0 @@ -2263,7 +2263,7 @@ DisableInterrupts: @ 0x080012A0 strb r0, [r1] bl SyncRegIE ldrh r0, [r4] - bl sub_080012CC + bl UpdateRegDispstatIntrBits pop {r4} pop {r0} bx r0 @@ -2272,8 +2272,8 @@ _080012C4: .4byte gUnknown_30008DA _080012C8: .4byte gUnknown_30008D9 thumb_func_end DisableInterrupts - thumb_func_start sub_080012CC -sub_080012CC: @ 0x080012CC + thumb_func_start UpdateRegDispstatIntrBits +UpdateRegDispstatIntrBits: @ 0x080012CC push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 @@ -2304,7 +2304,7 @@ _08001302: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080012CC + thumb_func_end UpdateRegDispstatIntrBits thumb_func_start ResetBgs ResetBgs: @ 0x08001308 @@ -2313,15 +2313,15 @@ ResetBgs: @ 0x08001308 ldr r1, _0800131C movs r0, #0 strh r0, [r1, #0x10] - bl sub_080016D4 + bl SetTextModeAndHideBgs pop {r0} bx r0 .align 2, 0 _0800131C: .4byte gUnknown_30008E0 thumb_func_end ResetBgs - thumb_func_start sub_08001320 -sub_08001320: @ 0x08001320 + thumb_func_start SetBgModeInternal +SetBgModeInternal: @ 0x08001320 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _08001334 @@ -2334,10 +2334,10 @@ sub_08001320: @ 0x08001320 .align 2, 0 _08001334: .4byte gUnknown_30008E0 _08001338: .4byte 0x0000FFF8 - thumb_func_end sub_08001320 + thumb_func_end SetBgModeInternal - thumb_func_start sub_0800133C -sub_0800133C: @ 0x0800133C + thumb_func_start GetBgMode +GetBgMode: @ 0x0800133C ldr r0, _08001348 ldrb r1, [r0, #0x10] movs r0, #7 @@ -2345,7 +2345,7 @@ sub_0800133C: @ 0x0800133C bx lr .align 2, 0 _08001348: .4byte gUnknown_30008E0 - thumb_func_end sub_0800133C + thumb_func_end GetBgMode thumb_func_start ResetBgControlStructs ResetBgControlStructs: @ 0x0800134C @@ -2553,8 +2553,8 @@ _080014B0: _080014C0: .4byte gUnknown_30008E0 thumb_func_end SetBgControlAttributes - thumb_func_start sub_080014C4 -sub_080014C4: @ 0x080014C4 + thumb_func_start GetBgControlAttribute +GetBgControlAttribute: @ 0x080014C4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -2645,10 +2645,10 @@ _08001572: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080014C4 + thumb_func_end GetBgControlAttribute - thumb_func_start sub_08001578 -sub_08001578: @ 0x08001578 + thumb_func_start LoadBgVram +LoadBgVram: @ 0x08001578 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -2721,10 +2721,10 @@ _080015F6: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08001578 + thumb_func_end LoadBgVram - thumb_func_start sub_08001600 -sub_08001600: @ 0x08001600 + thumb_func_start ShowBgInternal +ShowBgInternal: @ 0x08001600 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -2785,7 +2785,7 @@ _0800166E: .align 2, 0 _08001674: .4byte gUnknown_30008E0 _08001678: .4byte 0x00000F07 - thumb_func_end sub_08001600 + thumb_func_end ShowBgInternal thumb_func_start HideBgInternal HideBgInternal: @ 0x0800167C @@ -2816,8 +2816,8 @@ _080016A8: .4byte gUnknown_30008E0 _080016AC: .4byte 0x00000F07 thumb_func_end HideBgInternal - thumb_func_start sub_080016B0 -sub_080016B0: @ 0x080016B0 + thumb_func_start SyncBgVisibilityAndMode +SyncBgVisibilityAndMode: @ 0x080016B0 push {lr} movs r0, #0 bl GetGpuReg @@ -2833,10 +2833,10 @@ sub_080016B0: @ 0x080016B0 .align 2, 0 _080016CC: .4byte 0x0000F0F8 _080016D0: .4byte gUnknown_30008E0 - thumb_func_end sub_080016B0 + thumb_func_end SyncBgVisibilityAndMode - thumb_func_start sub_080016D4 -sub_080016D4: @ 0x080016D4 + thumb_func_start SetTextModeAndHideBgs +SetTextModeAndHideBgs: @ 0x080016D4 push {lr} movs r0, #0 bl GetGpuReg @@ -2848,10 +2848,10 @@ sub_080016D4: @ 0x080016D4 bx r0 .align 2, 0 _080016EC: .4byte 0x0000F0F8 - thumb_func_end sub_080016D4 + thumb_func_end SetTextModeAndHideBgs - thumb_func_start sub_080016F0 -sub_080016F0: @ 0x080016F0 + thumb_func_start SetBgAffineInternal +SetBgAffineInternal: @ 0x080016F0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -2947,7 +2947,7 @@ _080017AE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080016F0 + thumb_func_end SetBgAffineInternal thumb_func_start sub_080017BC sub_080017BC: @ 0x080017BC @@ -3008,7 +3008,7 @@ InitBgsFromTemplates: @ 0x08001800 lsrs r0, r0, #0x18 lsls r2, r2, #0x18 lsrs r4, r2, #0x18 - bl sub_08001320 + bl SetBgModeInternal bl ResetBgControlStructs cmp r4, #0 beq _080018AC @@ -3165,16 +3165,16 @@ _08001944: .4byte 0xFFFFFC00 _08001948: .4byte 0x00003FFF thumb_func_end InitBgFromTemplate - thumb_func_start sub_0800194C -sub_0800194C: @ 0x0800194C + thumb_func_start SetBgMode +SetBgMode: @ 0x0800194C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08001320 + bl SetBgModeInternal pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0800194C + thumb_func_end SetBgMode thumb_func_start LoadBgTiles LoadBgTiles: @ 0x0800195C @@ -3192,7 +3192,7 @@ LoadBgTiles: @ 0x0800195C lsrs r4, r3, #0x10 adds r0, r5, #0 movs r1, #5 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 bne _08001998 @@ -3224,7 +3224,7 @@ _080019A8: adds r1, r7, #0 mov r2, r8 adds r3, r4, #0 - bl sub_08001578 + bl LoadBgVram lsls r2, r0, #0x18 lsrs r1, r2, #0x18 adds r7, r1, #0 @@ -3283,7 +3283,7 @@ LoadBgTilemap: @ 0x08001A14 lsrs r3, r3, #0x10 movs r4, #2 str r4, [sp] - bl sub_08001578 + bl LoadBgVram lsls r2, r0, #0x18 lsrs r3, r2, #0x18 cmp r3, #0xff @@ -3314,8 +3314,8 @@ _08001A56: _08001A60: .4byte 0x0000FFFF thumb_func_end LoadBgTilemap - thumb_func_start sub_08001A64 -sub_08001A64: @ 0x08001A64 + thumb_func_start Unused_LoadBgPalette +Unused_LoadBgPalette: @ 0x08001A64 push {r4, r5, r6, r7, lr} adds r7, r1, #0 lsls r0, r0, #0x18 @@ -3384,10 +3384,10 @@ _08001AE0: bx r1 .align 2, 0 _08001AE8: .4byte gUnknown_3000938 - thumb_func_end sub_08001A64 + thumb_func_end Unused_LoadBgPalette - thumb_func_start sub_08001AEC -sub_08001AEC: @ 0x08001AEC + thumb_func_start IsDma3ManagerBusyWithBgCopy +IsDma3ManagerBusyWithBgCopy: @ 0x08001AEC push {r4, r5, r6, r7, lr} movs r5, #0 movs r7, #1 @@ -3437,34 +3437,34 @@ _08001B42: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08001AEC + thumb_func_end IsDma3ManagerBusyWithBgCopy - thumb_func_start sub_08001B48 -sub_08001B48: @ 0x08001B48 + thumb_func_start ShowBg +ShowBg: @ 0x08001B48 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08001600 - bl sub_080016B0 + bl ShowBgInternal + bl SyncBgVisibilityAndMode pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08001B48 + thumb_func_end ShowBg - thumb_func_start sub_08001B5C -sub_08001B5C: @ 0x08001B5C + thumb_func_start HideBg +HideBg: @ 0x08001B5C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl HideBgInternal - bl sub_080016B0 + bl SyncBgVisibilityAndMode pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08001B5C + thumb_func_end HideBg - thumb_func_start sub_08001B70 -sub_08001B70: @ 0x08001B70 + thumb_func_start SetBgAttribute +SetBgAttribute: @ 0x08001B70 push {r4, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -3565,10 +3565,10 @@ _08001C2A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08001B70 + thumb_func_end SetBgAttribute - thumb_func_start sub_08001C34 -sub_08001C34: @ 0x08001C34 + thumb_func_start GetBgAttribute +GetBgAttribute: @ 0x08001C34 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -3598,37 +3598,37 @@ _08001C54: @ jump table _08001C7C: adds r0, r4, #0 movs r1, #2 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001C86: adds r0, r4, #0 movs r1, #3 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001C90: adds r0, r4, #0 movs r1, #4 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001C9A: adds r0, r4, #0 movs r1, #5 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001CA4: adds r0, r4, #0 movs r1, #6 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001CAE: adds r0, r4, #0 movs r1, #7 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001CB8: adds r0, r4, #0 movs r1, #8 - bl sub_080014C4 + bl GetBgControlAttribute b _08001CF6 _08001CC2: adds r0, r4, #0 @@ -3642,14 +3642,14 @@ _08001CC2: _08001CD4: adds r0, r4, #0 movs r1, #0 - bl sub_080028C8 + bl GetBgMetricTextMode lsls r0, r0, #0x1b lsrs r0, r0, #0x10 b _08001D12 _08001CE2: adds r0, r4, #0 movs r1, #0 - bl sub_08002938 + bl GetBgMetricAffineMode lsls r0, r0, #0x18 lsrs r0, r0, #0x10 b _08001D12 @@ -3678,10 +3678,10 @@ _08001D12: bx r1 .align 2, 0 _08001D18: .4byte 0x0000FFFF - thumb_func_end sub_08001C34 + thumb_func_end GetBgAttribute - thumb_func_start sub_08001D1C -sub_08001D1C: @ 0x08001D1C + thumb_func_start ChangeBgX +ChangeBgX: @ 0x08001D1C push {r4, r5, r6, lr} adds r6, r1, #0 lsls r0, r0, #0x18 @@ -3694,7 +3694,7 @@ sub_08001D1C: @ 0x08001D1C bne _08001D40 adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 bne _08001D46 @@ -3740,7 +3740,7 @@ _08001D84: str r1, [r0] adds r5, r2, #0 _08001D88: - bl sub_0800133C + bl GetBgMode lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, #1 @@ -3840,10 +3840,10 @@ _08001E4C: bx r1 .align 2, 0 _08001E54: .4byte gUnknown_30008F8 - thumb_func_end sub_08001D1C + thumb_func_end ChangeBgX - thumb_func_start sub_08001E58 -sub_08001E58: @ 0x08001E58 + thumb_func_start GetBgX +GetBgX: @ 0x08001E58 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -3853,7 +3853,7 @@ sub_08001E58: @ 0x08001E58 bne _08001E88 adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 beq _08001E88 @@ -3873,10 +3873,10 @@ _08001E8C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08001E58 + thumb_func_end GetBgX - thumb_func_start sub_08001E94 -sub_08001E94: @ 0x08001E94 + thumb_func_start ChangeBgY +ChangeBgY: @ 0x08001E94 push {r4, r5, r6, lr} adds r6, r1, #0 lsls r0, r0, #0x18 @@ -3889,7 +3889,7 @@ sub_08001E94: @ 0x08001E94 bne _08001EB8 adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 bne _08001EBE @@ -3935,7 +3935,7 @@ _08001EFC: str r1, [r0] adds r5, r2, #0 _08001F00: - bl sub_0800133C + bl GetBgMode lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, #1 @@ -4035,10 +4035,10 @@ _08001FC4: bx r1 .align 2, 0 _08001FCC: .4byte gUnknown_30008F8 - thumb_func_end sub_08001E94 + thumb_func_end ChangeBgY - thumb_func_start sub_08001FD0 -sub_08001FD0: @ 0x08001FD0 + thumb_func_start GetBgY +GetBgY: @ 0x08001FD0 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -4048,7 +4048,7 @@ sub_08001FD0: @ 0x08001FD0 bne _08002000 adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 beq _08002000 @@ -4068,10 +4068,10 @@ _08002004: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08001FD0 + thumb_func_end GetBgY - thumb_func_start sub_0800200C -sub_0800200C: @ 0x0800200C + thumb_func_start SetBgAffine +SetBgAffine: @ 0x0800200C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -4096,17 +4096,17 @@ sub_0800200C: @ 0x0800200C asrs r6, r6, #0x10 str r6, [sp, #8] str r7, [sp, #0xc] - bl sub_080016F0 + bl SetBgAffineInternal add sp, #0x10 pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0800200C + thumb_func_end SetBgAffine - thumb_func_start sub_0800204C -sub_0800204C: @ 0x0800204C + thumb_func_start Unused_AdjustBgMosaic +Unused_AdjustBgMosaic: @ 0x0800204C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -4224,10 +4224,10 @@ _08002102: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0800204C + thumb_func_end Unused_AdjustBgMosaic - thumb_func_start sub_0800212C -sub_0800212C: @ 0x0800212C + thumb_func_start SetBgTilemapBuffer +SetBgTilemapBuffer: @ 0x0800212C push {r4, r5, lr} adds r5, r1, #0 lsls r0, r0, #0x18 @@ -4238,7 +4238,7 @@ sub_0800212C: @ 0x0800212C bne _08002156 adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 beq _08002156 @@ -4253,10 +4253,10 @@ _08002156: bx r0 .align 2, 0 _0800215C: .4byte gUnknown_30008F8 - thumb_func_end sub_0800212C + thumb_func_end SetBgTilemapBuffer - thumb_func_start sub_08002160 -sub_08002160: @ 0x08002160 + thumb_func_start UnsetBgTilemapBuffer +UnsetBgTilemapBuffer: @ 0x08002160 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -4267,7 +4267,7 @@ sub_08002160: @ 0x08002160 bne _0800218A adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 beq _0800218A @@ -4282,10 +4282,10 @@ _0800218A: bx r0 .align 2, 0 _08002190: .4byte gUnknown_30008F8 - thumb_func_end sub_08002160 + thumb_func_end UnsetBgTilemapBuffer - thumb_func_start sub_08002194 -sub_08002194: @ 0x08002194 + thumb_func_start GetBgTilemapBuffer +GetBgTilemapBuffer: @ 0x08002194 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -4295,7 +4295,7 @@ sub_08002194: @ 0x08002194 bne _080021C4 adds r0, r4, #0 movs r1, #1 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 cmp r0, #0 beq _080021C4 @@ -4313,10 +4313,10 @@ _080021C6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08002194 + thumb_func_end GetBgTilemapBuffer - thumb_func_start sub_080021CC -sub_080021CC: @ 0x080021CC + thumb_func_start CopyToBgTilemapBuffer +CopyToBgTilemapBuffer: @ 0x080021CC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -4376,10 +4376,10 @@ _08002234: bx r0 .align 2, 0 _08002244: .4byte gUnknown_30008F8 - thumb_func_end sub_080021CC + thumb_func_end CopyToBgTilemapBuffer - thumb_func_start sub_08002248 -sub_08002248: @ 0x08002248 + thumb_func_start CopyBgTilemapBufferToVram +CopyBgTilemapBufferToVram: @ 0x08002248 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -4403,13 +4403,13 @@ sub_08002248: @ 0x08002248 _08002276: adds r0, r4, #0 movs r1, #0 - bl sub_080028C8 + bl GetBgMetricTextMode lsls r0, r0, #0x1b b _0800228C _08002282: adds r0, r4, #0 movs r1, #0 - bl sub_08002938 + bl GetBgMetricAffineMode lsls r0, r0, #0x18 _0800228C: lsrs r2, r0, #0x10 @@ -4423,7 +4423,7 @@ _0800228E: str r0, [sp] adds r0, r4, #0 movs r3, #0 - bl sub_08001578 + bl LoadBgVram _080022A4: add sp, #4 pop {r4} @@ -4431,7 +4431,7 @@ _080022A4: bx r0 .align 2, 0 _080022AC: .4byte gUnknown_30008F8 - thumb_func_end sub_08002248 + thumb_func_end CopyBgTilemapBufferToVram thumb_func_start CopyToBgTilemapBufferRect CopyToBgTilemapBufferRect: @ 0x080022B0 @@ -4517,7 +4517,7 @@ _0800234C: mov r4, r8 adds r0, r5, #0 movs r1, #1 - bl sub_08002938 + bl GetBgMetricAffineMode lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp] @@ -4601,15 +4601,15 @@ CopyToBgTilemapBufferRect_ChangePalette: @ 0x080023B4 str r2, [sp, #0x1c] str r2, [sp, #0x20] movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect add sp, #0x24 pop {r4, r5, r6} pop {r0} bx r0 thumb_func_end CopyToBgTilemapBufferRect_ChangePalette - thumb_func_start sub_080023F8 -sub_080023F8: @ 0x080023F8 + thumb_func_start CopyRectToBgTilemapBufferRect +CopyRectToBgTilemapBufferRect: @ 0x080023F8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -4677,19 +4677,19 @@ _0800246E: _0800247A: ldr r0, [sp, #4] movs r1, #4 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x30] ldr r0, [sp, #4] movs r1, #1 - bl sub_080028C8 + bl GetBgMetricTextMode lsls r0, r0, #0x15 lsrs r0, r0, #0x10 str r0, [sp, #0x28] ldr r0, [sp, #4] movs r1, #2 - bl sub_080028C8 + bl GetBgMetricTextMode lsls r0, r0, #0x15 lsrs r0, r0, #0x10 str r0, [sp, #0x2c] @@ -4790,7 +4790,7 @@ _08002550: adds r6, r1, r0 ldr r0, [sp, #4] movs r1, #1 - bl sub_08002938 + bl GetBgMetricAffineMode lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 @@ -4855,7 +4855,7 @@ _080025CA: bx r0 .align 2, 0 _080025DC: .4byte gUnknown_30008FC - thumb_func_end sub_080023F8 + thumb_func_end CopyRectToBgTilemapBufferRect thumb_func_start FillBgTilemapBufferRect_Palette0 FillBgTilemapBufferRect_Palette0: @ 0x080025E0 @@ -4940,7 +4940,7 @@ _08002678: .4byte gUnknown_30008FC _0800267C: adds r0, r6, #0 movs r1, #1 - bl sub_08002938 + bl GetBgMetricAffineMode lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp] @@ -5019,15 +5019,15 @@ FillBgTilemapBufferRect: @ 0x080026E0 str r6, [sp, #8] movs r4, #0 str r4, [sp, #0xc] - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 thumb_func_end FillBgTilemapBufferRect - thumb_func_start sub_0800271C -sub_0800271C: @ 0x0800271C + thumb_func_start WriteSequenceToBgTilemapBuffer +WriteSequenceToBgTilemapBuffer: @ 0x0800271C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -5075,19 +5075,19 @@ _0800276A: _08002776: mov r0, sb movs r1, #4 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x1c] mov r0, sb movs r1, #1 - bl sub_080028C8 + bl GetBgMetricTextMode lsls r0, r0, #0x15 lsrs r0, r0, #0x10 str r0, [sp, #0x14] mov r0, sb movs r1, #2 - bl sub_080028C8 + bl GetBgMetricTextMode lsls r0, r0, #0x15 lsrs r0, r0, #0x10 str r0, [sp, #0x18] @@ -5169,7 +5169,7 @@ _08002834: .4byte 0x000003FF _08002838: mov r0, sb movs r1, #1 - bl sub_08002938 + bl GetBgMetricAffineMode lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x20] @@ -5241,10 +5241,10 @@ _080028B0: .align 2, 0 _080028C0: .4byte gUnknown_30008FC _080028C4: .4byte 0x000003FF - thumb_func_end sub_0800271C + thumb_func_end WriteSequenceToBgTilemapBuffer - thumb_func_start sub_080028C8 -sub_080028C8: @ 0x080028C8 + thumb_func_start GetBgMetricTextMode +GetBgMetricTextMode: @ 0x080028C8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -5252,7 +5252,7 @@ sub_080028C8: @ 0x080028C8 lsrs r4, r1, #0x18 adds r5, r4, #0 movs r1, #4 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, #1 @@ -5311,17 +5311,17 @@ _08002930: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080028C8 + thumb_func_end GetBgMetricTextMode - thumb_func_start sub_08002938 -sub_08002938: @ 0x08002938 + thumb_func_start GetBgMetricAffineMode +GetBgMetricAffineMode: @ 0x08002938 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r1, #0x18 lsrs r4, r1, #0x18 movs r1, #4 - bl sub_080014C4 + bl GetBgControlAttribute lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r0, r1, #0 @@ -5366,7 +5366,7 @@ _0800298A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08002938 + thumb_func_end GetBgMetricAffineMode thumb_func_start GetTileMapIndexFromCoords GetTileMapIndexFromCoords: @ 0x08002990 @@ -5461,7 +5461,7 @@ sub_08002A24: @ 0x08002A24 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_0800133C + bl GetBgMode lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, #2 @@ -5841,8 +5841,8 @@ _08002CCA: .align 2, 0 thumb_func_end BlitBitmapRect4Bit - thumb_func_start sub_08002CDC -sub_08002CDC: @ 0x08002CDC + thumb_func_start FillBitmapRect4Bit +FillBitmapRect4Bit: @ 0x08002CDC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -5945,7 +5945,7 @@ _08002D88: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08002CDC + thumb_func_end FillBitmapRect4Bit thumb_func_start BlitBitmapRect4BitTo8Bit BlitBitmapRect4BitTo8Bit: @ 0x08002D98 @@ -6362,8 +6362,8 @@ sub_0800308C: @ 0x0800308C .align 2, 0 thumb_func_end sub_0800308C - thumb_func_start sub_08003090 -sub_08003090: @ 0x08003090 + thumb_func_start InitWindows +InitWindows: @ 0x08003090 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -6378,7 +6378,7 @@ _080030A4: mov r1, r8 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080030B4 ldr r0, _08003128 @@ -6460,18 +6460,18 @@ _08003138: bne _0800319A adds r0, r7, #0 movs r1, #8 - bl sub_08001C34 + bl GetBgAttribute lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _08003174 cmp r5, r0 beq _0800319A adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 cmp r4, #0 bne _08003178 - bl sub_080034D4 + bl FreeAllWindowBuffers b _08003120 .align 2, 0 _08003170: .4byte gUnknown_3003010 @@ -6494,14 +6494,14 @@ _0800318C: str r4, [r0] adds r0, r7, #0 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer _0800319A: ldrb r1, [r6, #3] ldrb r0, [r6, #4] muls r0, r1, r0 lsls r0, r0, #0x15 lsrs r0, r0, #0x10 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 cmp r4, #0 bne _080031DC @@ -6518,7 +6518,7 @@ _0800319A: cmp r1, r0 beq _08003120 adds r0, r1, #0 - bl sub_08000BF0 + bl Free str r4, [r5] b _08003120 .align 2, 0 @@ -6583,10 +6583,10 @@ _08003234: _08003244: .4byte gUnknown_2020004 _08003248: .4byte gUnknown_3002FF4 _0800324C: .4byte gUnknown_3003000 - thumb_func_end sub_08003090 + thumb_func_end InitWindows - thumb_func_start sub_08003250 -sub_08003250: @ 0x08003250 + thumb_func_start AddWindow +AddWindow: @ 0x08003250 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -6648,14 +6648,14 @@ _080032B2: bne _08003302 adds r0, r7, #0 movs r1, #8 - bl sub_08001C34 + bl GetBgAttribute lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _0800334C cmp r5, r0 beq _08003302 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 cmp r4, #0 beq _0800333A @@ -6676,7 +6676,7 @@ _080032F4: str r4, [r0] adds r0, r7, #0 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer _08003302: mov r2, r8 ldrb r1, [r2, #3] @@ -6684,7 +6684,7 @@ _08003302: muls r0, r1, r0 lsls r0, r0, #0x15 lsrs r0, r0, #0x10 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 cmp r4, #0 bne _08003354 @@ -6701,7 +6701,7 @@ _08003302: cmp r1, r0 beq _0800333A adds r0, r1, #0 - bl sub_08000BF0 + bl Free str r4, [r5] _0800333A: movs r0, #0xff @@ -6755,10 +6755,10 @@ _08003390: .align 2, 0 _080033A0: .4byte gUnknown_2020004 _080033A4: .4byte gUnknown_3002FF4 - thumb_func_end sub_08003250 + thumb_func_end AddWindow - thumb_func_start sub_080033A8 -sub_080033A8: @ 0x080033A8 + thumb_func_start AddWindowWithoutTileMap +AddWindowWithoutTileMap: @ 0x080033A8 push {r4, r5, r6, lr} adds r5, r0, #0 movs r4, #0 @@ -6838,10 +6838,10 @@ _08003434: .align 2, 0 _0800343C: .4byte gUnknown_2020004 _08003440: .4byte gUnknown_3002FF4 - thumb_func_end sub_080033A8 + thumb_func_end AddWindowWithoutTileMap - thumb_func_start sub_08003444 -sub_08003444: @ 0x08003444 + thumb_func_start RemoveWindow +RemoveWindow: @ 0x08003444 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -6883,7 +6883,7 @@ _08003470: cmp r1, r0 beq _0800349E adds r0, r1, #0 - bl sub_08000BF0 + bl Free str r5, [r4] _0800349E: ldr r1, _080034C0 @@ -6895,7 +6895,7 @@ _0800349E: ldr r0, [r4] cmp r0, #0 beq _080034B8 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080034B8: @@ -6908,10 +6908,10 @@ _080034C4: .4byte gUnknown_3002FF4 _080034C8: .4byte gUnknown_829BEB0 _080034CC: .4byte gUnknown_3003010 _080034D0: .4byte sub_0800308C - thumb_func_end sub_08003444 + thumb_func_end RemoveWindow - thumb_func_start sub_080034D4 -sub_080034D4: @ 0x080034D4 + thumb_func_start FreeAllWindowBuffers +FreeAllWindowBuffers: @ 0x080034D4 push {r4, r5, r6, lr} ldr r4, _0800351C movs r5, #3 @@ -6923,7 +6923,7 @@ _080034DA: cmp r1, r0 beq _080034F0 adds r0, r1, #0 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080034F0: @@ -6940,7 +6940,7 @@ _08003502: ldr r0, [r4] cmp r0, #0 beq _0800350E - bl sub_08000BF0 + bl Free str r6, [r4] _0800350E: adds r4, #0xc @@ -6954,10 +6954,10 @@ _0800350E: _0800351C: .4byte gUnknown_3003010 _08003520: .4byte sub_0800308C _08003524: .4byte gUnknown_2020004 - thumb_func_end sub_080034D4 + thumb_func_end FreeAllWindowBuffers - thumb_func_start sub_08003528 -sub_08003528: @ 0x08003528 + thumb_func_start CopyWindowToVram +CopyWindowToVram: @ 0x08003528 push {r4, r5, r6, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -6995,7 +6995,7 @@ _08003564: _0800356A: mov r0, sp ldrb r0, [r0] - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0800359E _08003574: mov r0, sp @@ -7016,17 +7016,17 @@ _08003586: bl LoadBgTiles mov r0, sp ldrb r0, [r0] - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0800359E: add sp, #0xc pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08003528 + thumb_func_end CopyWindowToVram - thumb_func_start sub_080035A8 -sub_080035A8: @ 0x080035A8 + thumb_func_start CopyWindowRectToVram +CopyWindowRectToVram: @ 0x080035A8 push {r4, r5, r6, r7, lr} sub sp, #0xc adds r6, r0, #0 @@ -7078,7 +7078,7 @@ _08003600: _08003606: mov r0, sp ldrb r0, [r0] - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08003652 _08003610: mov r0, sp @@ -7111,17 +7111,17 @@ _0800362E: bl LoadBgTiles mov r0, sp ldrb r0, [r0] - bl sub_08002248 + bl CopyBgTilemapBufferToVram _08003652: add sp, #0xc pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080035A8 + thumb_func_end CopyWindowRectToVram - thumb_func_start sub_0800365C -sub_0800365C: @ 0x0800365C + thumb_func_start PutWindowTilemap +PutWindowTilemap: @ 0x0800365C push {r4, lr} sub sp, #0x1c lsls r0, r0, #0x18 @@ -7137,7 +7137,7 @@ sub_0800365C: @ 0x0800365C add r0, sp, #0x10 ldrb r0, [r0] movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute adds r1, r0, #0 add r0, sp, #0x10 ldrh r0, [r0, #6] @@ -7161,17 +7161,17 @@ sub_0800365C: @ 0x0800365C str r4, [sp, #8] movs r4, #1 str r4, [sp, #0xc] - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer add sp, #0x1c pop {r4} pop {r0} bx r0 .align 2, 0 _080036B8: .4byte gUnknown_2020004 - thumb_func_end sub_0800365C + thumb_func_end PutWindowTilemap - thumb_func_start sub_080036BC -sub_080036BC: @ 0x080036BC + thumb_func_start PutWindowRectTilemapOverridePalette +PutWindowRectTilemapOverridePalette: @ 0x080036BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -7208,7 +7208,7 @@ sub_080036BC: @ 0x080036BC add r0, sp, #0x10 ldrb r0, [r0] movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute add r2, sp, #0x10 adds r1, r2, #0 ldrb r1, [r1, #3] @@ -7244,7 +7244,7 @@ _0800372A: str r1, [sp, #8] str r7, [sp, #0xc] adds r1, r6, #0 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer ldrb r0, [r4, #3] adds r0, r6, r0 lsls r0, r0, #0x10 @@ -7263,10 +7263,10 @@ _0800375E: bx r0 .align 2, 0 _08003770: .4byte gUnknown_2020004 - thumb_func_end sub_080036BC + thumb_func_end PutWindowRectTilemapOverridePalette - thumb_func_start sub_08003774 -sub_08003774: @ 0x08003774 + thumb_func_start ClearWindowTilemap +ClearWindowTilemap: @ 0x08003774 push {r4, lr} sub sp, #0x18 lsls r0, r0, #0x18 @@ -7304,10 +7304,10 @@ sub_08003774: @ 0x08003774 .align 2, 0 _080037BC: .4byte gUnknown_2020004 _080037C0: .4byte gUnknown_3003000 - thumb_func_end sub_08003774 + thumb_func_end ClearWindowTilemap - thumb_func_start sub_080037C4 -sub_080037C4: @ 0x080037C4 + thumb_func_start PutWindowRectTilemap +PutWindowRectTilemap: @ 0x080037C4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -7340,7 +7340,7 @@ sub_080037C4: @ 0x080037C4 add r0, sp, #0x10 ldrb r0, [r0] movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute add r2, sp, #0x10 adds r1, r2, #0 ldrb r1, [r1, #3] @@ -7376,7 +7376,7 @@ _0800382A: str r1, [sp, #8] str r7, [sp, #0xc] adds r1, r6, #0 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer ldrb r0, [r4, #3] adds r0, r6, r0 lsls r0, r0, #0x10 @@ -7395,7 +7395,7 @@ _0800385E: bx r0 .align 2, 0 _08003870: .4byte gUnknown_2020004 - thumb_func_end sub_080037C4 + thumb_func_end PutWindowRectTilemap thumb_func_start BlitBitmapToWindow BlitBitmapToWindow: @ 0x08003874 @@ -7421,15 +7421,15 @@ BlitBitmapToWindow: @ 0x08003874 str r5, [sp, #0x14] movs r2, #0 movs r3, #0 - bl sub_080038AC + bl BlitBitmapRectToWindow add sp, #0x18 pop {r4, r5} pop {r0} bx r0 thumb_func_end BlitBitmapToWindow - thumb_func_start sub_080038AC -sub_080038AC: @ 0x080038AC + thumb_func_start BlitBitmapRectToWindow +BlitBitmapRectToWindow: @ 0x080038AC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -7522,10 +7522,10 @@ sub_080038AC: @ 0x080038AC _08003960: .4byte 0xFFFF0000 _08003964: .4byte 0x0000FFFF _08003968: .4byte gUnknown_2020004 - thumb_func_end sub_080038AC + thumb_func_end BlitBitmapRectToWindow - thumb_func_start sub_0800396C -sub_0800396C: @ 0x0800396C + thumb_func_start BlitBitmapRectToWindowWithColorKey +BlitBitmapRectToWindowWithColorKey: @ 0x0800396C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -7622,7 +7622,7 @@ sub_0800396C: @ 0x0800396C _08003A28: .4byte 0x0000FFFF _08003A2C: .4byte gUnknown_2020004 _08003A30: .4byte 0xFFFF0000 - thumb_func_end sub_0800396C + thumb_func_end BlitBitmapRectToWindowWithColorKey thumb_func_start sub_08003A34 sub_08003A34: @ 0x08003A34 @@ -7680,7 +7680,7 @@ sub_08003A34: @ 0x08003A34 add r0, sp, #8 adds r1, r2, #0 mov r2, sb - bl sub_08002CDC + bl FillBitmapRect4Bit add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -7694,8 +7694,8 @@ _08003AB8: .4byte 0xFFFF0000 _08003ABC: .4byte 0x0000FFFF thumb_func_end sub_08003A34 - thumb_func_start sub_08003AC0 -sub_08003AC0: @ 0x08003AC0 + thumb_func_start CopyToWindowPixelBuffer +CopyToWindowPixelBuffer: @ 0x08003AC0 push {r4, r5, r6, lr} adds r6, r1, #0 lsls r0, r0, #0x18 @@ -7738,10 +7738,10 @@ _08003B0C: bx r0 .align 2, 0 _08003B14: .4byte gUnknown_2020004 - thumb_func_end sub_08003AC0 + thumb_func_end CopyToWindowPixelBuffer - thumb_func_start sub_08003B18 -sub_08003B18: @ 0x08003B18 + thumb_func_start FillWindowPixelBuffer +FillWindowPixelBuffer: @ 0x08003B18 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -7778,7 +7778,7 @@ sub_08003B18: @ 0x08003B18 bx r0 .align 2, 0 _08003B60: .4byte gUnknown_2020004 - thumb_func_end sub_08003B18 + thumb_func_end FillWindowPixelBuffer thumb_func_start ScrollWindow ScrollWindow: @ 0x08003B64 @@ -8307,8 +8307,8 @@ _08003F16: .align 2, 0 thumb_func_end ScrollWindow - thumb_func_start sub_08003F28 -sub_08003F28: @ 0x08003F28 + thumb_func_start CallWindowFunction +CallWindowFunction: @ 0x08003F28 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -8347,10 +8347,10 @@ sub_08003F28: @ 0x08003F28 bx r0 .align 2, 0 _08003F74: .4byte gUnknown_2020004 - thumb_func_end sub_08003F28 + thumb_func_end CallWindowFunction - thumb_func_start sub_08003F78 -sub_08003F78: @ 0x08003F78 + thumb_func_start SetWindowAttribute +SetWindowAttribute: @ 0x08003F78 push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -8433,10 +8433,10 @@ _08004014: bx r1 .align 2, 0 _08004018: .4byte gUnknown_2020004 - thumb_func_end sub_08003F78 + thumb_func_end SetWindowAttribute - thumb_func_start sub_0800401C -sub_0800401C: @ 0x0800401C + thumb_func_start GetWindowAttribute +GetWindowAttribute: @ 0x0800401C push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -8547,7 +8547,7 @@ _080040FA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800401C + thumb_func_end GetWindowAttribute thumb_func_start sub_08004100 sub_08004100: @ 0x08004100 @@ -8583,8 +8583,8 @@ sub_0800412C: @ 0x0800412C .align 2, 0 thumb_func_end sub_0800412C - thumb_func_start sub_08004130 -sub_08004130: @ 0x08004130 + thumb_func_start AddWindow8Bit +AddWindow8Bit: @ 0x08004130 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -8625,7 +8625,7 @@ _0800415E: bne _080041BA adds r0, r7, #0 movs r1, #8 - bl sub_08001C34 + bl GetBgAttribute lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _08004200 @@ -8654,7 +8654,7 @@ _080041AC: str r4, [r0] adds r0, r7, #0 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer _080041BA: mov r2, sb ldrb r1, [r2, #3] @@ -8679,7 +8679,7 @@ _080041BA: cmp r1, r0 beq _080041F2 adds r0, r1, #0 - bl sub_08000BF0 + bl Free str r4, [r5] _080041F2: movs r0, #0xff @@ -8715,7 +8715,7 @@ _08004226: bx r1 .align 2, 0 _08004234: .4byte gUnknown_2020004 - thumb_func_end sub_08004130 + thumb_func_end AddWindow8Bit thumb_func_start FillWindowPixelBuffer8Bit FillWindowPixelBuffer8Bit: @ 0x08004238 @@ -8927,8 +8927,8 @@ _080043C8: .4byte gUnknown_2020004 _080043CC: .4byte 0xFFFF0000 thumb_func_end BlitBitmapRectToWindow4BitTo8Bit - thumb_func_start sub_080043D0 -sub_080043D0: @ 0x080043D0 + thumb_func_start CopyWindowToVram8Bit +CopyWindowToVram8Bit: @ 0x080043D0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -8965,7 +8965,7 @@ _08004410: b _08004440 _08004416: ldrb r0, [r3] - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08004440 _0800441E: ldrb r0, [r3] @@ -8982,13 +8982,13 @@ _0800442C: bl LoadBgTiles ldr r0, [r6] ldrb r0, [r0] - bl sub_08002248 + bl CopyBgTilemapBufferToVram _08004440: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080043D0 + thumb_func_end CopyWindowToVram8Bit thumb_func_start sub_08004448 sub_08004448: @ 0x08004448 @@ -9122,7 +9122,7 @@ AddTextPrinterParameterized: @ 0x0800449C mov r0, sp mov r1, r8 adds r2, r7, #0 - bl sub_08004548 + bl AddTextPrinter lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #0x10 @@ -9135,8 +9135,8 @@ AddTextPrinterParameterized: @ 0x0800449C _08004544: .4byte gUnknown_3003020 thumb_func_end AddTextPrinterParameterized - thumb_func_start sub_08004548 -sub_08004548: @ 0x08004548 + thumb_func_start AddTextPrinter +AddTextPrinter: @ 0x08004548 push {r4, r5, r6, r7, lr} adds r6, r0, #0 mov ip, r2 @@ -9223,7 +9223,7 @@ _080045EE: cmp r4, r7 bhi _080045FC ldr r0, _08004624 - bl sub_080046B8 + bl RenderFont cmp r0, #1 bne _080045E8 _080045FC: @@ -9232,7 +9232,7 @@ _080045FC: ldr r0, _08004624 ldrb r0, [r0, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _0800460A: ldr r0, _08004628 ldrb r1, [r6, #4] @@ -9253,7 +9253,7 @@ _0800461E: _08004624: .4byte gUnknown_202018C _08004628: .4byte gUnknown_20201AC _0800462C: .4byte gUnknown_3003024 - thumb_func_end sub_08004548 + thumb_func_end AddTextPrinter thumb_func_start sub_08004630 sub_08004630: @ 0x08004630 @@ -9271,7 +9271,7 @@ _0800463E: cmp r0, #0 beq _08004698 adds r0, r5, #0 - bl sub_080046B8 + bl RenderFont lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #1 @@ -9291,7 +9291,7 @@ _08004668: _0800466E: ldrb r0, [r5, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _08004676: ldr r1, _08004690 adds r0, r1, #0 @@ -9333,8 +9333,8 @@ sub_080046A8: @ 0x080046A8 _080046B4: .4byte gUnknown_20201AC thumb_func_end sub_080046A8 - thumb_func_start sub_080046B8 -sub_080046B8: @ 0x080046B8 + thumb_func_start RenderFont +RenderFont: @ 0x080046B8 push {r4, lr} adds r4, r0, #0 _080046BC: @@ -9357,7 +9357,7 @@ _080046BC: bx r1 .align 2, 0 _080046E0: .4byte gUnknown_3003020 - thumb_func_end sub_080046B8 + thumb_func_end RenderFont thumb_func_start sub_080046E4 sub_080046E4: @ 0x080046E4 @@ -9472,8 +9472,8 @@ _080047B0: .4byte gUnknown_30009EC _080047B4: .4byte gUnknown_30009EE thumb_func_end SaveTextColors - thumb_func_start sub_080047B8 -sub_080047B8: @ 0x080047B8 + thumb_func_start RestoreTextColors +RestoreTextColors: @ 0x080047B8 push {lr} ldrb r0, [r0] ldrb r1, [r1] @@ -9481,7 +9481,7 @@ sub_080047B8: @ 0x080047B8 bl sub_080046E4 pop {r0} bx r0 - thumb_func_end sub_080047B8 + thumb_func_end RestoreTextColors thumb_func_start sub_080047C8 sub_080047C8: @ 0x080047C8 @@ -10375,8 +10375,8 @@ _08004E48: .4byte gUnknown_2020004 _08004E4C: .4byte gUnknown_3003090 thumb_func_end sub_08004850 - thumb_func_start sub_08004E50 -sub_08004E50: @ 0x08004E50 + thumb_func_start EReader_IsReceivedDataValid +EReader_IsReceivedDataValid: @ 0x08004E50 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -11065,10 +11065,10 @@ _0800533C: _0800534C: .4byte gUnknown_3003050 _08005350: .4byte gUnknown_3003070 _08005354: .4byte gUnknown_3003090 - thumb_func_end sub_08004E50 + thumb_func_end EReader_IsReceivedDataValid - thumb_func_start sub_08005358 -sub_08005358: @ 0x08005358 + thumb_func_start Font0Func +Font0Func: @ 0x08005358 push {lr} adds r2, r0, #0 adds r3, r2, #0 @@ -11089,16 +11089,16 @@ sub_08005358: @ 0x08005358 strb r0, [r3, #1] _0800537C: adds r0, r2, #0 - bl sub_08005760 + bl RenderText lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08005358 + thumb_func_end Font0Func - thumb_func_start sub_0800538C -sub_0800538C: @ 0x0800538C + thumb_func_start Font1Func +Font1Func: @ 0x0800538C push {lr} adds r2, r0, #0 adds r3, r2, #0 @@ -11121,16 +11121,16 @@ sub_0800538C: @ 0x0800538C strb r0, [r3, #1] _080053B4: adds r0, r2, #0 - bl sub_08005760 + bl RenderText lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800538C + thumb_func_end Font1Func - thumb_func_start sub_080053C4 -sub_080053C4: @ 0x080053C4 + thumb_func_start Font2Func +Font2Func: @ 0x080053C4 push {lr} adds r2, r0, #0 adds r3, r2, #0 @@ -11153,16 +11153,16 @@ sub_080053C4: @ 0x080053C4 strb r0, [r3, #1] _080053EC: adds r0, r2, #0 - bl sub_08005760 + bl RenderText lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080053C4 + thumb_func_end Font2Func - thumb_func_start sub_080053FC -sub_080053FC: @ 0x080053FC + thumb_func_start Font3Func +Font3Func: @ 0x080053FC push {lr} adds r2, r0, #0 adds r3, r2, #0 @@ -11185,16 +11185,16 @@ sub_080053FC: @ 0x080053FC strb r0, [r3, #1] _08005424: adds r0, r2, #0 - bl sub_08005760 + bl RenderText lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080053FC + thumb_func_end Font3Func - thumb_func_start sub_08005434 -sub_08005434: @ 0x08005434 + thumb_func_start Font4Func +Font4Func: @ 0x08005434 push {lr} adds r2, r0, #0 adds r3, r2, #0 @@ -11217,16 +11217,16 @@ sub_08005434: @ 0x08005434 strb r0, [r3, #1] _0800545C: adds r0, r2, #0 - bl sub_08005760 + bl RenderText lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08005434 + thumb_func_end Font4Func - thumb_func_start sub_0800546C -sub_0800546C: @ 0x0800546C + thumb_func_start Font5Func +Font5Func: @ 0x0800546C push {lr} adds r2, r0, #0 adds r3, r2, #0 @@ -11249,16 +11249,16 @@ sub_0800546C: @ 0x0800546C strb r0, [r3, #1] _08005494: adds r0, r2, #0 - bl sub_08005760 + bl RenderText lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800546C + thumb_func_end Font5Func - thumb_func_start sub_080054A4 -sub_080054A4: @ 0x080054A4 + thumb_func_start TextPrinterInitDownArrowCounters +TextPrinterInitDownArrowCounters: @ 0x080054A4 push {lr} adds r2, r0, #0 adds r2, #0x14 @@ -11285,10 +11285,10 @@ _080054C0: _080054D0: pop {r0} bx r0 - thumb_func_end sub_080054A4 + thumb_func_end TextPrinterInitDownArrowCounters - thumb_func_start sub_080054D4 -sub_080054D4: @ 0x080054D4 + thumb_func_start TextPrinterDrawDownArrow +TextPrinterDrawDownArrow: @ 0x080054D4 push {r4, r5, r6, r7, lr} sub sp, #0x18 adds r5, r0, #0 @@ -11364,10 +11364,10 @@ _08005542: str r2, [sp, #0x14] adds r1, r7, #0 movs r2, #0 - bl sub_080038AC + bl BlitBitmapRectToWindow ldrb r0, [r5, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r6, #1] movs r1, #0x20 rsbs r1, r1, #0 @@ -11396,10 +11396,10 @@ _0800559A: .align 2, 0 _080055A4: .4byte gUnknown_829C078 _080055A8: .4byte gUnknown_829C638 - thumb_func_end sub_080054D4 + thumb_func_end TextPrinterDrawDownArrow - thumb_func_start sub_080055AC -sub_080055AC: @ 0x080055AC + thumb_func_start TextPrinterClearDownArrow +TextPrinterClearDownArrow: @ 0x080055AC push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -11418,13 +11418,13 @@ sub_080055AC: @ 0x080055AC bl sub_08003A34 ldrb r0, [r5, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #8 pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080055AC + thumb_func_end TextPrinterClearDownArrow thumb_func_start TextPrinterWaitAutoMode TextPrinterWaitAutoMode: @ 0x080055E0 @@ -11446,8 +11446,8 @@ _080055F6: .align 2, 0 thumb_func_end TextPrinterWaitAutoMode - thumb_func_start sub_080055FC -sub_080055FC: @ 0x080055FC + thumb_func_start TextPrinterWaitWithDownArrow +TextPrinterWaitWithDownArrow: @ 0x080055FC push {r4, lr} adds r2, r0, #0 movs r4, #0 @@ -11466,7 +11466,7 @@ sub_080055FC: @ 0x080055FC _0800561C: .4byte gUnknown_30030B4 _08005620: adds r0, r2, #0 - bl sub_080054D4 + bl TextPrinterDrawDownArrow ldr r0, _08005644 ldrh r1, [r0, #0x2e] movs r0, #3 @@ -11483,10 +11483,10 @@ _0800563A: bx r1 .align 2, 0 _08005644: .4byte gUnknown_3002360 - thumb_func_end sub_080055FC + thumb_func_end TextPrinterWaitWithDownArrow - thumb_func_start sub_08005648 -sub_08005648: @ 0x08005648 + thumb_func_start TextPrinterWait +TextPrinterWait: @ 0x08005648 push {r4, lr} adds r2, r0, #0 movs r4, #0 @@ -11520,10 +11520,10 @@ _08005680: bx r1 .align 2, 0 _08005688: .4byte gUnknown_3002360 - thumb_func_end sub_08005648 + thumb_func_end TextPrinterWait - thumb_func_start sub_0800568C -sub_0800568C: @ 0x0800568C + thumb_func_start DrawDownArrow +DrawDownArrow: @ 0x0800568C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -11607,10 +11607,10 @@ _08005702: adds r0, r5, #0 adds r1, r6, #0 movs r2, #0 - bl sub_080038AC + bl BlitBitmapRectToWindow adds r0, r5, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram mov r1, sb strb r4, [r1] mov r5, sl @@ -11629,10 +11629,10 @@ _08005746: .align 2, 0 _08005758: .4byte gUnknown_829C078 _0800575C: .4byte gUnknown_829C638 - thumb_func_end sub_0800568C + thumb_func_end DrawDownArrow - thumb_func_start sub_08005760 -sub_08005760: @ 0x08005760 + thumb_func_start RenderText +RenderText: @ 0x08005760 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r6, #0 @@ -11956,7 +11956,7 @@ _080059FC: adds r1, #1 str r1, [r6] adds r0, r3, #0 - bl sub_080A3040 + bl PlayBGM b _080059B2 _08005A16: ldr r0, [r6] @@ -11995,7 +11995,7 @@ _08005A4C: lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r6, #6] strb r0, [r6, #8] ldrb r0, [r6, #7] @@ -12027,7 +12027,7 @@ _08005A8C: _08005A8E: strb r0, [r6, #0x1c] adds r0, r6, #0 - bl sub_080054A4 + bl TextPrinterInitDownArrowCounters _08005A96: movs r0, #3 b _08005C42 @@ -12050,7 +12050,7 @@ _08005AAC: adds r1, r3, #0 ldrb r2, [r6, #8] ldrb r3, [r6, #9] - bl sub_08006124 + bl DrawKeypadIcon ldr r1, _08005AD0 adds r1, #0x80 strb r0, [r1] @@ -12083,7 +12083,7 @@ _08005AEC: @ jump table .4byte _08005B2C @ case 5 _08005B04: adds r0, r3, #0 - bl sub_080062B4 + bl DecompressGlyphFont9 b _08005B32 _08005B0C: adds r0, r3, #0 @@ -12091,7 +12091,7 @@ _08005B0C: b _08005B32 _08005B14: adds r0, r3, #0 - bl sub_08006354 + bl ether_effect_related b _08005B32 _08005B1C: adds r0, r3, #0 @@ -12122,7 +12122,7 @@ _08005B46: _08005B4C: .4byte gUnknown_3003030 _08005B50: adds r0, r6, #0 - bl sub_08005648 + bl TextPrinterWait lsls r0, r0, #0x10 cmp r0, #0 beq _08005A96 @@ -12131,7 +12131,7 @@ _08005B50: b _08005A96 _08005B62: adds r0, r6, #0 - bl sub_080055FC + bl TextPrinterWaitWithDownArrow lsls r0, r0, #0x10 cmp r0, #0 beq _08005A96 @@ -12141,7 +12141,7 @@ _08005B62: lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r6, #6] movs r1, #0 strb r0, [r6, #8] @@ -12151,14 +12151,14 @@ _08005B62: b _08005A96 _08005B8C: adds r0, r6, #0 - bl sub_080055FC + bl TextPrinterWaitWithDownArrow lsls r0, r0, #0x10 cmp r0, #0 bne _08005B9A b _08005A96 _08005B9A: adds r0, r6, #0 - bl sub_080055AC + bl TextPrinterClearDownArrow ldrb r1, [r6, #5] ldr r0, _08005BC0 ldr r2, [r0] @@ -12216,13 +12216,13 @@ _08005C0C: strb r0, [r6, #0x1f] ldrb r0, [r6, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _08005A96 _08005C18: strb r0, [r6, #0x1c] b _08005A96 _08005C1C: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -12248,10 +12248,10 @@ _08005C42: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08005760 + thumb_func_end RenderText - thumb_func_start sub_08005C48 -sub_08005C48: @ 0x08005C48 + thumb_func_start GetStringWidthFixedWidthFont +GetStringWidthFixedWidthFont: @ 0x08005C48 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -12375,7 +12375,7 @@ _08005D58: ble _08005D4C adds r0, r7, #0 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute add r0, r8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -12387,10 +12387,10 @@ _08005D58: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08005C48 + thumb_func_end GetStringWidthFixedWidthFont - thumb_func_start sub_08005D7C -sub_08005D7C: @ 0x08005D7C + thumb_func_start GetFontWidthFunc +GetFontWidthFunc: @ 0x08005D7C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -12418,7 +12418,7 @@ _08005DA4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08005D7C + thumb_func_end GetFontWidthFunc thumb_func_start sub_08005DAC sub_08005DAC: @ 0x08005DAC @@ -12433,7 +12433,7 @@ sub_08005DAC: @ 0x08005DAC adds r7, r0, #0 lsls r2, r2, #0x10 lsrs r5, r2, #0x10 - bl sub_08005D7C + bl GetFontWidthFunc adds r6, r0, #0 cmp r6, #0 bne _08005DD0 @@ -12450,7 +12450,7 @@ _08005DD0: bne _08005DEC adds r0, r7, #0 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r7, r0, #0x18 b _08005DEE @@ -12587,7 +12587,7 @@ _08005F0E: _08005F12: adds r4, #1 ldrb r0, [r4] - bl sub_08005D7C + bl GetFontWidthFunc adds r6, r0, #0 cmp r6, #0 bne _08005F22 @@ -12601,7 +12601,7 @@ _08005F22: bne _08005F58 ldrb r0, [r4] movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r7, r0, #0x18 b _08005F58 @@ -12647,8 +12647,8 @@ _08005F6C: .align 2, 0 thumb_func_end sub_08005DAC - thumb_func_start sub_08005F7C -sub_08005F7C: @ 0x08005F7C + thumb_func_start RenderTextFont9 +RenderTextFont9: @ 0x08005F7C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -12823,7 +12823,7 @@ _080060FA: adds r1, #1 mov r2, sp adds r2, #2 - bl sub_080047B8 + bl RestoreTextColors movs r0, #1 add sp, #0x10 pop {r3, r4, r5} @@ -12836,10 +12836,10 @@ _080060FA: .align 2, 0 _0800611C: .4byte gUnknown_3003030 _08006120: .4byte 0x04000008 - thumb_func_end sub_08005F7C + thumb_func_end RenderTextFont9 - thumb_func_start sub_08006124 -sub_08006124: @ 0x08006124 + thumb_func_start DrawKeypadIcon +DrawKeypadIcon: @ 0x08006124 push {r4, r5, lr} sub sp, #0x18 lsls r0, r0, #0x18 @@ -12868,7 +12868,7 @@ sub_08006124: @ 0x08006124 adds r1, r5, #0 movs r2, #0 movs r3, #0 - bl sub_080038AC + bl BlitBitmapRectToWindow adds r0, r4, #0 add sp, #0x18 pop {r4, r5} @@ -12877,10 +12877,10 @@ sub_08006124: @ 0x08006124 .align 2, 0 _0800616C: .4byte gUnknown_829C670 _08006170: .4byte gUnknown_829C6A4 - thumb_func_end sub_08006124 + thumb_func_end DrawKeypadIcon - thumb_func_start sub_08006174 -sub_08006174: @ 0x08006174 + thumb_func_start GetKeypadIconTileOffset +GetKeypadIconTileOffset: @ 0x08006174 lsls r0, r0, #0x18 ldr r1, _08006180 lsrs r0, r0, #0x16 @@ -12889,10 +12889,10 @@ sub_08006174: @ 0x08006174 bx lr .align 2, 0 _08006180: .4byte gUnknown_829C670 - thumb_func_end sub_08006174 + thumb_func_end GetKeypadIconTileOffset - thumb_func_start sub_08006184 -sub_08006184: @ 0x08006184 + thumb_func_start GetKeypadIconWidth +GetKeypadIconWidth: @ 0x08006184 lsls r0, r0, #0x18 ldr r1, _08006190 lsrs r0, r0, #0x16 @@ -12901,10 +12901,10 @@ sub_08006184: @ 0x08006184 bx lr .align 2, 0 _08006190: .4byte gUnknown_829C670 - thumb_func_end sub_08006184 + thumb_func_end GetKeypadIconWidth - thumb_func_start sub_08006194 -sub_08006194: @ 0x08006194 + thumb_func_start GetKeypadIconHeight +GetKeypadIconHeight: @ 0x08006194 lsls r0, r0, #0x18 ldr r1, _080061A0 lsrs r0, r0, #0x16 @@ -12913,10 +12913,10 @@ sub_08006194: @ 0x08006194 bx lr .align 2, 0 _080061A0: .4byte gUnknown_829C670 - thumb_func_end sub_08006194 + thumb_func_end GetKeypadIconHeight - thumb_func_start sub_080061A4 -sub_080061A4: @ 0x080061A4 + thumb_func_start SetDefaultFontsPointer +SetDefaultFontsPointer: @ 0x080061A4 push {lr} ldr r0, _080061B0 bl sub_08004474 @@ -12924,10 +12924,10 @@ sub_080061A4: @ 0x080061A4 bx r0 .align 2, 0 _080061B0: .4byte gUnknown_829CEA4 - thumb_func_end sub_080061A4 + thumb_func_end SetDefaultFontsPointer - thumb_func_start sub_080061B4 -sub_080061B4: @ 0x080061B4 + thumb_func_start GetFontAttribute +GetFontAttribute: @ 0x080061B4 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -13039,7 +13039,7 @@ _08006292: bx r1 .align 2, 0 _08006298: .4byte gUnknown_829CEA4 - thumb_func_end sub_080061B4 + thumb_func_end GetFontAttribute thumb_func_start sub_0800629C sub_0800629C: @ 0x0800629C @@ -13056,8 +13056,8 @@ sub_0800629C: @ 0x0800629C _080062B0: .4byte gUnknown_829CF04 thumb_func_end sub_0800629C - thumb_func_start sub_080062B4 -sub_080062B4: @ 0x080062B4 + thumb_func_start DecompressGlyphFont9 +DecompressGlyphFont9: @ 0x080062B4 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x14 @@ -13093,7 +13093,7 @@ sub_080062B4: @ 0x080062B4 .align 2, 0 _080062F8: .4byte gUnknown_829CF14 _080062FC: .4byte gUnknown_3003030 - thumb_func_end sub_080062B4 + thumb_func_end DecompressGlyphFont9 thumb_func_start sub_08006300 sub_08006300: @ 0x08006300 @@ -13146,8 +13146,8 @@ sub_08006350: @ 0x08006350 bx lr thumb_func_end sub_08006350 - thumb_func_start sub_08006354 -sub_08006354: @ 0x08006354 + thumb_func_start ether_effect_related +ether_effect_related: @ 0x08006354 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -13226,7 +13226,7 @@ _080063E6: _080063EC: .4byte gUnknown_82A4F14 _080063F0: .4byte gUnknown_3003030 _080063F4: .4byte gUnknown_82ACF14 - thumb_func_end sub_08006354 + thumb_func_end ether_effect_related thumb_func_start sub_080063F8 sub_080063F8: @ 0x080063F8 @@ -13595,7 +13595,7 @@ ResetSpriteData: @ 0x0800668C movs r4, #0 strh r4, [r0] movs r0, #0 - bl sub_08006FB4 + bl AllocSpriteTiles ldr r0, _080066D0 strh r4, [r0] ldr r0, _080066D4 @@ -13610,8 +13610,8 @@ _080066D0: .4byte gUnknown_2021B38 _080066D4: .4byte gUnknown_2021B3A thumb_func_end ResetSpriteData - thumb_func_start sub_080066D8 -sub_080066D8: @ 0x080066D8 + thumb_func_start AnimateSprites +AnimateSprites: @ 0x080066D8 push {r4, r5, r6, r7, lr} movs r6, #0 movs r7, #1 @@ -13637,7 +13637,7 @@ _080066DE: cmp r0, #0 beq _0800670E adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite _0800670E: adds r0, r6, #1 lsls r0, r0, #0x18 @@ -13649,14 +13649,14 @@ _0800670E: bx r0 .align 2, 0 _08006720: .4byte gUnknown_20205AC - thumb_func_end sub_080066D8 + thumb_func_end AnimateSprites thumb_func_start BuildOamBuffer BuildOamBuffer: @ 0x08006724 push {r4, r5, lr} - bl sub_08006770 + bl UpdateOamCoords bl BuildSpritePriorities - bl sub_08006874 + bl SortSprites ldr r5, _08006764 ldr r0, _08006768 adds r5, r5, r0 @@ -13686,8 +13686,8 @@ _08006768: .4byte 0x00000439 _0800676C: .4byte gUnknown_20217B0 thumb_func_end BuildOamBuffer - thumb_func_start sub_08006770 -sub_08006770: @ 0x08006770 + thumb_func_start UpdateOamCoords +UpdateOamCoords: @ 0x08006770 push {r4, r5, r6, r7, lr} movs r4, #0 ldr r7, _080067DC @@ -13785,7 +13785,7 @@ _08006822: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08006770 + thumb_func_end UpdateOamCoords thumb_func_start BuildSpritePriorities BuildSpritePriorities: @ 0x08006834 @@ -13822,8 +13822,8 @@ _0800686C: .4byte gUnknown_20205AC _08006870: .4byte gUnknown_20216F0 thumb_func_end BuildSpritePriorities - thumb_func_start sub_08006874 -sub_08006874: @ 0x08006874 + thumb_func_start SortSprites +SortSprites: @ 0x08006874 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -14060,7 +14060,7 @@ _08006A1C: .align 2, 0 _08006A2C: .4byte gUnknown_20205AC _08006A30: .4byte gUnknown_20216F0 - thumb_func_end sub_08006874 + thumb_func_end SortSprites thumb_func_start CopyMatricesToOamBuffer CopyMatricesToOamBuffer: @ 0x08006A34 @@ -14129,7 +14129,7 @@ _08006A8A: bne _08006AB6 adds r0, r2, #0 mov r1, sp - bl sub_08008598 + bl AddSpriteToOamBuffer lsls r0, r0, #0x18 cmp r0, #0 bne _08006AF0 @@ -14177,8 +14177,8 @@ _08006B04: .4byte gUnknown_3002398 _08006B08: .4byte gUnknown_82BF2F8 thumb_func_end AddSpritesToOamBuffer - thumb_func_start sub_08006B0C -sub_08006B0C: @ 0x08006B0C + thumb_func_start CreateSprite +CreateSprite: @ 0x08006B0C push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -14204,7 +14204,7 @@ _08006B20: adds r1, r7, #0 asrs r2, r5, #0x10 asrs r3, r6, #0x10 - bl sub_08006C14 + bl CreateSpriteAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08006B58 @@ -14222,10 +14222,10 @@ _08006B58: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08006B0C + thumb_func_end CreateSprite - thumb_func_start sub_08006B60 -sub_08006B60: @ 0x08006B60 + thumb_func_start CreateSpriteAtEnd +CreateSpriteAtEnd: @ 0x08006B60 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -14259,7 +14259,7 @@ _08006B7E: adds r1, r7, #0 asrs r2, r4, #0x10 asrs r3, r5, #0x10 - bl sub_08006C14 + bl CreateSpriteAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08006BBE @@ -14281,17 +14281,17 @@ _08006BBE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08006B60 + thumb_func_end CreateSpriteAtEnd - thumb_func_start sub_08006BCC -sub_08006BCC: @ 0x08006BCC + thumb_func_start CreateInvisibleSprite +CreateInvisibleSprite: @ 0x08006BCC push {r4, r5, r6, lr} adds r6, r0, #0 ldr r0, _08006C04 movs r1, #0 movs r2, #0 movs r3, #0x1f - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 @@ -14320,10 +14320,10 @@ _08006C0E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08006BCC + thumb_func_end CreateInvisibleSprite - thumb_func_start sub_08006C14 -sub_08006C14: @ 0x08006C14 + thumb_func_start CreateSpriteAt +CreateSpriteAt: @ 0x08006C14 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -14348,7 +14348,7 @@ sub_08006C14: @ 0x08006C14 ldr r1, _08006CD8 adds r7, r0, r1 adds r0, r7, #0 - bl sub_08006F5C + bl ResetSprite adds r2, r7, #0 adds r2, #0x3e ldrb r0, [r2] @@ -14407,7 +14407,7 @@ sub_08006C14: @ 0x08006C14 lsrs r0, r0, #5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08006FB4 + bl AllocSpriteTiles lsls r0, r0, #0x10 lsrs r2, r0, #0x10 asrs r0, r0, #0x10 @@ -14415,7 +14415,7 @@ sub_08006C14: @ 0x08006C14 cmp r0, r1 bne _08006CE0 adds r0, r7, #0 - bl sub_08006F5C + bl ResetSprite movs r0, #0x40 b _08006D58 .align 2, 0 @@ -14472,7 +14472,7 @@ _08006D38: beq _08006D56 mov r1, r8 ldrh r0, [r1, #2] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #4 ldrb r2, [r7, #5] movs r1, #0xf @@ -14491,10 +14491,10 @@ _08006D58: bx r1 .align 2, 0 _08006D68: .4byte 0x0000FFFF - thumb_func_end sub_08006C14 + thumb_func_end CreateSpriteAt - thumb_func_start sub_08006D6C -sub_08006D6C: @ 0x08006D6C + thumb_func_start CreateSpriteAndAnimate +CreateSpriteAndAnimate: @ 0x08006D6C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -14530,7 +14530,7 @@ _08006D8C: asrs r2, r3, #0x10 mov r5, r8 asrs r3, r5, #0x10 - bl sub_08006C14 + bl CreateSpriteAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r5, r0, #0 @@ -14546,7 +14546,7 @@ _08006D8C: cmp r0, #0 beq _08006DD8 adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite _08006DD8: adds r0, r5, #0 b _08006DF0 @@ -14570,7 +14570,7 @@ _08006DF0: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08006D6C + thumb_func_end CreateSpriteAndAnimate thumb_func_start DestroySprite DestroySprite: @ 0x08006E00 @@ -14620,7 +14620,7 @@ _08006E3A: blo _08006E3A _08006E56: adds r0, r5, #0 - bl sub_08006F5C + bl ResetSprite _08006E5C: pop {r4, r5, r6, r7} pop {r0} @@ -14661,8 +14661,8 @@ _08006E98: .4byte gUnknown_3002398 _08006E9C: .4byte gUnknown_82BF2F8 thumb_func_end ResetOamRange - thumb_func_start sub_08006EA0 -sub_08006EA0: @ 0x08006EA0 + thumb_func_start LoadOam +LoadOam: @ 0x08006EA0 push {lr} ldr r2, _08006EC4 ldr r1, _08006EC8 @@ -14685,7 +14685,7 @@ _08006EC0: _08006EC4: .4byte gUnknown_3002360 _08006EC8: .4byte 0x00000439 _08006ECC: .4byte 0x04000100 - thumb_func_end sub_08006EA0 + thumb_func_end LoadOam thumb_func_start ClearSpriteCopyRequests ClearSpriteCopyRequests: @ 0x08006ED0 @@ -14768,8 +14768,8 @@ SetOamMatrix: @ 0x08006F3C _08006F58: .4byte gUnknown_2021B3C thumb_func_end SetOamMatrix - thumb_func_start sub_08006F5C -sub_08006F5C: @ 0x08006F5C + thumb_func_start ResetSprite +ResetSprite: @ 0x08006F5C push {lr} ldr r1, _08006F6C movs r2, #0x44 @@ -14778,7 +14778,7 @@ sub_08006F5C: @ 0x08006F5C bx r0 .align 2, 0 _08006F6C: .4byte gUnknown_82BF2B4 - thumb_func_end sub_08006F5C + thumb_func_end ResetSprite thumb_func_start CalcCenterToCornerVec CalcCenterToCornerVec: @ 0x08006F70 @@ -14818,8 +14818,8 @@ _08006F9E: _08006FB0: .4byte gUnknown_82BF299 thumb_func_end CalcCenterToCornerVec - thumb_func_start sub_08006FB4 -sub_08006FB4: @ 0x08006FB4 + thumb_func_start AllocSpriteTiles +AllocSpriteTiles: @ 0x08006FB4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -14971,10 +14971,10 @@ _080070BC: .align 2, 0 _080070C8: .4byte gUnknown_2021AB6 _080070CC: .4byte gUnknown_2021AB8 - thumb_func_end sub_08006FB4 + thumb_func_end AllocSpriteTiles - thumb_func_start sub_080070D0 -sub_080070D0: @ 0x080070D0 + thumb_func_start SpriteTileAllocBitmapOp +SpriteTileAllocBitmapOp: @ 0x080070D0 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -15033,7 +15033,7 @@ _08007134: bx r1 .align 2, 0 _0800713C: .4byte gUnknown_2021AB8 - thumb_func_end sub_080070D0 + thumb_func_end SpriteTileAllocBitmapOp thumb_func_start sub_08007140 sub_08007140: @ 0x08007140 @@ -15041,8 +15041,8 @@ sub_08007140: @ 0x08007140 .align 2, 0 thumb_func_end sub_08007140 - thumb_func_start sub_08007144 -sub_08007144: @ 0x08007144 + thumb_func_start ProcessSpriteCopyRequests +ProcessSpriteCopyRequests: @ 0x08007144 push {r4, r5, r6, r7, lr} ldr r0, _08007194 ldrb r0, [r0] @@ -15088,7 +15088,7 @@ _0800718C: _08007194: .4byte gUnknown_20217B0 _08007198: .4byte gUnknown_20217B1 _0800719C: .4byte gUnknown_20217B4 - thumb_func_end sub_08007144 + thumb_func_end ProcessSpriteCopyRequests thumb_func_start RequestSpriteFrameImageCopy RequestSpriteFrameImageCopy: @ 0x080071A0 @@ -15241,7 +15241,7 @@ _080072A8: lsls r0, r0, #2 ldr r5, _080072D8 adds r0, r0, r5 - bl sub_08006F5C + bl ResetSprite ldr r0, _080072DC adds r0, r4, r0 strb r4, [r0] @@ -15254,7 +15254,7 @@ _080072A8: adds r0, r0, r4 lsls r0, r0, #2 adds r0, r0, r5 - bl sub_08006F5C + bl ResetSprite pop {r4, r5} pop {r0} bx r0 @@ -15280,8 +15280,8 @@ _080072F2: _080072F8: .4byte 0x0000FFFF thumb_func_end FreeSpriteTiles - thumb_func_start sub_080072FC -sub_080072FC: @ 0x080072FC + thumb_func_start FreeSpritePalette +FreeSpritePalette: @ 0x080072FC push {lr} ldr r0, [r0, #0x14] ldrh r0, [r0, #2] @@ -15289,7 +15289,7 @@ sub_080072FC: @ 0x080072FC pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080072FC + thumb_func_end FreeSpritePalette thumb_func_start FreeSpriteOamMatrix FreeSpriteOamMatrix: @ 0x0800730C @@ -15323,7 +15323,7 @@ DestroySpriteAndFreeResources: @ 0x08007338 adds r4, r0, #0 bl FreeSpriteTiles adds r0, r4, #0 - bl sub_080072FC + bl FreeSpritePalette adds r0, r4, #0 bl FreeSpriteOamMatrix adds r0, r4, #0 @@ -15333,8 +15333,8 @@ DestroySpriteAndFreeResources: @ 0x08007338 bx r0 thumb_func_end DestroySpriteAndFreeResources - thumb_func_start sub_08007358 -sub_08007358: @ 0x08007358 + thumb_func_start AnimateSprite +AnimateSprite: @ 0x08007358 push {r4, r5, lr} adds r4, r0, #0 ldr r2, _08007394 @@ -15368,7 +15368,7 @@ _0800738E: _08007394: .4byte gUnknown_82BF32C _08007398: .4byte gUnknown_2021C3C _0800739C: .4byte gUnknown_82BF334 - thumb_func_end sub_08007358 + thumb_func_end AnimateSprite thumb_func_start BeginAnim BeginAnim: @ 0x080073A0 @@ -15494,8 +15494,8 @@ _08007484: bx r0 thumb_func_end BeginAnim - thumb_func_start sub_08007490 -sub_08007490: @ 0x08007490 + thumb_func_start ContinueAnim +ContinueAnim: @ 0x08007490 push {r4, lr} adds r4, r0, #0 adds r0, #0x2c @@ -15576,7 +15576,7 @@ _08007526: bx r0 .align 2, 0 _0800752C: .4byte gUnknown_82BF33C - thumb_func_end sub_08007490 + thumb_func_end ContinueAnim thumb_func_start AnimCmd_frame AnimCmd_frame: @ 0x08007530 @@ -15833,7 +15833,7 @@ BeginAnimLoop: @ 0x080076DC adds r0, r4, #0 bl JumpToTopOfAnimLoop adds r0, r4, #0 - bl sub_08007490 + bl ContinueAnim pop {r4} pop {r0} bx r0 @@ -15851,7 +15851,7 @@ ContinueAnimLoop: @ 0x08007714 adds r0, r4, #0 bl JumpToTopOfAnimLoop adds r0, r4, #0 - bl sub_08007490 + bl ContinueAnim pop {r4} pop {r0} bx r0 @@ -15983,7 +15983,7 @@ BeginAffineAnim: @ 0x080077A8 movs r0, #0x3c ldrsh r2, [r6, r0] adds r0, r6, #0 - bl sub_08007B6C + bl obj_update_pos2 _0800782A: add sp, #8 pop {r4, r5, r6, r7} @@ -15994,8 +15994,8 @@ _08007834: .4byte 0x00007FFF _08007838: .4byte gUnknown_3000B70 thumb_func_end BeginAffineAnim - thumb_func_start sub_0800783C -sub_0800783C: @ 0x0800783C + thumb_func_start ContinueAffineAnim +ContinueAffineAnim: @ 0x0800783C push {r4, r5, lr} adds r4, r0, #0 ldrb r0, [r4, #1] @@ -16075,7 +16075,7 @@ _080078C2: movs r0, #0x3c ldrsh r2, [r4, r0] adds r0, r4, #0 - bl sub_08007B6C + bl obj_update_pos2 _080078DE: pop {r4, r5} pop {r0} @@ -16084,7 +16084,7 @@ _080078DE: _080078E4: .4byte 0x00007FFC _080078E8: .4byte 0xFFFF8003 _080078EC: .4byte gUnknown_82BF34C - thumb_func_end sub_0800783C + thumb_func_end ContinueAffineAnim thumb_func_start AffineAnimDelay AffineAnimDelay: @ 0x080078F0 @@ -16105,7 +16105,7 @@ AffineAnimDelay: @ 0x080078F0 bl GetAffineAnimFrame adds r0, r4, #0 mov r1, sp - bl sub_08007D64 + bl ApplyAffineAnimFrameRelativeAndUpdateMatrix _0800791A: add sp, #8 pop {r4, r5} @@ -16167,7 +16167,7 @@ BeginAffineAnimLoop: @ 0x08007958 adds r1, r4, #0 bl JumpToTopOfAffineAnimLoop adds r0, r4, #0 - bl sub_0800783C + bl ContinueAffineAnim pop {r4} pop {r0} bx r0 @@ -16192,7 +16192,7 @@ ContinueAffineAnimLoop: @ 0x08007994 adds r1, r4, #0 bl JumpToTopOfAffineAnimLoop adds r0, r4, #0 - bl sub_0800783C + bl ContinueAffineAnim pop {r4} pop {r0} bx r0 @@ -16324,7 +16324,7 @@ AffineAnimCmd_end: @ 0x08007A7C subs r2, #1 strb r2, [r1, #1] mov r1, sp - bl sub_08007D64 + bl ApplyAffineAnimFrameRelativeAndUpdateMatrix add sp, #8 pop {r0} bx r0 @@ -16440,8 +16440,8 @@ _08007B56: .align 2, 0 thumb_func_end sub_08007B40 - thumb_func_start sub_08007B6C -sub_08007B6C: @ 0x08007B6C + thumb_func_start obj_update_pos2 +obj_update_pos2: @ 0x08007B6C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -16516,7 +16516,7 @@ _08007BF2: .align 2, 0 _08007C00: .4byte gUnknown_82BF35C _08007C04: .4byte gUnknown_2021B3C - thumb_func_end sub_08007B6C + thumb_func_end obj_update_pos2 thumb_func_start SetSpriteOamFlipBits SetSpriteOamFlipBits: @ 0x08007C08 @@ -16721,8 +16721,8 @@ _08007D58: _08007D60: .4byte gUnknown_3000B70 thumb_func_end DecrementAffineAnimDelayCounter - thumb_func_start sub_08007D64 -sub_08007D64: @ 0x08007D64 + thumb_func_start ApplyAffineAnimFrameRelativeAndUpdateMatrix +ApplyAffineAnimFrameRelativeAndUpdateMatrix: @ 0x08007D64 push {r4, r5, r6, lr} sub sp, #0x10 adds r5, r0, #0 @@ -16791,7 +16791,7 @@ _08007DEC: .4byte gUnknown_3000B70 _08007DF0: .4byte 0xFFFFFF00 _08007DF4: .4byte 0xFFFF0000 _08007DF8: .4byte 0x0000FFFF - thumb_func_end sub_08007D64 + thumb_func_end ApplyAffineAnimFrameRelativeAndUpdateMatrix thumb_func_start sub_08007DFC sub_08007DFC: @ 0x08007DFC @@ -16883,7 +16883,7 @@ ApplyAffineAnimFrame: @ 0x08007E80 strb r0, [r2, #5] adds r0, r4, #0 adds r1, r2, #0 - bl sub_08007D64 + bl ApplyAffineAnimFrameRelativeAndUpdateMatrix b _08007EB6 _08007EA6: adds r0, r4, #0 @@ -16891,7 +16891,7 @@ _08007EA6: bl ApplyAffineAnimFrameAbsolute adds r0, r4, #0 mov r1, sp - bl sub_08007D64 + bl ApplyAffineAnimFrameRelativeAndUpdateMatrix _08007EB6: add sp, #8 pop {r4} @@ -16972,7 +16972,7 @@ SeekSpriteAnim: @ 0x08007EF4 ands r0, r1 strb r0, [r4] adds r0, r3, #0 - bl sub_08007490 + bl ContinueAnim ldrb r2, [r4] movs r0, #0x3f ands r0, r2 @@ -17298,8 +17298,8 @@ _08008188: .align 2, 0 thumb_func_end InitSpriteAffineAnim - thumb_func_start sub_08008190 -sub_08008190: @ 0x08008190 + thumb_func_start SetOamMatrixRotationScaling +SetOamMatrixRotationScaling: @ 0x08008190 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -17359,15 +17359,15 @@ sub_08008190: @ 0x08008190 .align 2, 0 _08008208: .4byte 0xFFFF0000 _0800820C: .4byte 0x0000FFFF - thumb_func_end sub_08008190 + thumb_func_end SetOamMatrixRotationScaling - thumb_func_start sub_08008210 -sub_08008210: @ 0x08008210 + thumb_func_start LoadSpriteSheet +LoadSpriteSheet: @ 0x08008210 push {r4, r5, r6, lr} adds r5, r0, #0 ldrh r0, [r5, #4] lsrs r0, r0, #5 - bl sub_08006FB4 + bl AllocSpriteTiles lsls r4, r0, #0x10 asrs r6, r4, #0x10 cmp r6, #0 @@ -17395,7 +17395,7 @@ _0800824E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08008210 + thumb_func_end LoadSpriteSheet thumb_func_start LoadSpriteSheets LoadSpriteSheets: @ 0x08008254 @@ -17408,7 +17408,7 @@ LoadSpriteSheets: @ 0x08008254 _08008260: lsls r0, r4, #3 adds r0, r5, r0 - bl sub_08008210 + bl LoadSpriteSheet adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -17689,7 +17689,7 @@ LoadSpritePalette: @ 0x0800845C push {r4, r5, lr} adds r5, r0, #0 ldrh r0, [r5, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xff @@ -17698,7 +17698,7 @@ LoadSpritePalette: @ 0x0800845C b _080084A2 _08008472: ldr r0, _08008498 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xff @@ -17710,7 +17710,7 @@ _08008472: strh r1, [r0] ldr r0, [r5] lsls r1, r4, #4 - bl sub_080084D4 + bl DoLoadSpritePalette adds r0, r4, #0 b _080084A2 .align 2, 0 @@ -17752,8 +17752,8 @@ _080084CE: bx r0 thumb_func_end LoadSpritePalettes - thumb_func_start sub_080084D4 -sub_080084D4: @ 0x080084D4 + thumb_func_start DoLoadSpritePalette +DoLoadSpritePalette: @ 0x080084D4 push {lr} lsls r1, r1, #0x10 movs r2, #0x80 @@ -17761,11 +17761,11 @@ sub_080084D4: @ 0x080084D4 adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080084D4 + thumb_func_end DoLoadSpritePalette thumb_func_start AllocSpritePalette AllocSpritePalette: @ 0x080084EC @@ -17773,7 +17773,7 @@ AllocSpritePalette: @ 0x080084EC lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r0, _0800850C - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -17795,8 +17795,8 @@ _08008516: bx r1 thumb_func_end AllocSpritePalette - thumb_func_start sub_0800851C -sub_0800851C: @ 0x0800851C + thumb_func_start IndexOfSpritePaletteTag +IndexOfSpritePaletteTag: @ 0x0800851C push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -17827,7 +17827,7 @@ _0800854E: _08008550: pop {r1} bx r1 - thumb_func_end sub_0800851C + thumb_func_end IndexOfSpritePaletteTag thumb_func_start sub_08008554 sub_08008554: @ 0x08008554 @@ -17846,7 +17846,7 @@ FreeSpritePaletteByTag: @ 0x08008564 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0xff @@ -17864,18 +17864,18 @@ _08008584: .4byte gUnknown_3000CF0 _08008588: .4byte 0x0000FFFF thumb_func_end FreeSpritePaletteByTag - thumb_func_start sub_0800858C -sub_0800858C: @ 0x0800858C + thumb_func_start SetSubspriteTables +SetSubspriteTables: @ 0x0800858C str r1, [r0, #0x18] adds r0, #0x42 movs r1, #0x40 strb r1, [r0] bx lr .align 2, 0 - thumb_func_end sub_0800858C + thumb_func_end SetSubspriteTables - thumb_func_start sub_08008598 -sub_08008598: @ 0x08008598 + thumb_func_start AddSpriteToOamBuffer +AddSpriteToOamBuffer: @ 0x08008598 push {r4, lr} adds r4, r0, #0 adds r3, r1, #0 @@ -17923,7 +17923,7 @@ _080085E4: adds r1, r1, r0 adds r0, r4, #0 adds r2, r3, #0 - bl sub_08008604 + bl AddSubspritesToOamBuffer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _080085F8: @@ -17932,10 +17932,10 @@ _080085F8: bx r1 .align 2, 0 _08008600: .4byte gUnknown_3002398 - thumb_func_end sub_08008598 + thumb_func_end AddSpriteToOamBuffer - thumb_func_start sub_08008604 -sub_08008604: @ 0x08008604 + thumb_func_start AddSubspritesToOamBuffer +AddSubspritesToOamBuffer: @ 0x08008604 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -18215,10 +18215,10 @@ _08008818: .4byte 0x000001FF _0800881C: .4byte 0xFFFFFE00 _08008820: .4byte 0x000003FF _08008824: .4byte 0xFFFFFC00 - thumb_func_end sub_08008604 + thumb_func_end AddSubspritesToOamBuffer - thumb_func_start sub_08008828 -sub_08008828: @ 0x08008828 + thumb_func_start StringCopy10 +StringCopy10: @ 0x08008828 push {r4, r5, lr} adds r4, r0, #0 movs r5, #5 @@ -18248,10 +18248,10 @@ _08008854: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08008828 + thumb_func_end StringCopy10 - thumb_func_start sub_0800885C -sub_0800885C: @ 0x0800885C + thumb_func_start StringGetEnd10 +StringGetEnd10: @ 0x0800885C push {r4, lr} adds r3, r0, #0 movs r4, #5 @@ -18277,10 +18277,10 @@ _08008880: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800885C + thumb_func_end StringGetEnd10 - thumb_func_start sub_08008888 -sub_08008888: @ 0x08008888 + thumb_func_start StringCopy7 +StringCopy7: @ 0x08008888 push {r4, r5, lr} adds r4, r0, #0 movs r5, #5 @@ -18308,7 +18308,7 @@ _080088B0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08008888 + thumb_func_end StringCopy7 thumb_func_start StringCopy StringCopy: @ 0x080088B8 @@ -18793,8 +18793,8 @@ _08008BB8: .align 2, 0 thumb_func_end sub_08008B18 - thumb_func_start sub_08008BCC -sub_08008BCC: @ 0x08008BCC + thumb_func_start StringExpandPlaceholders +StringExpandPlaceholders: @ 0x08008BCC push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -18822,10 +18822,10 @@ _08008BEC: @ jump table _08008C04: ldrb r0, [r5] adds r5, #1 - bl sub_08008DC4 + bl GetExpandedPlaceholder adds r1, r0, #0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r4, r0, #0 b _08008BD2 _08008C18: @@ -18894,10 +18894,10 @@ _08008CAC: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08008BCC + thumb_func_end StringExpandPlaceholders - thumb_func_start sub_08008CB8 -sub_08008CB8: @ 0x08008CB8 + thumb_func_start StringBraille +StringBraille: @ 0x08008CB8 push {r4, r5, r6, lr} sub sp, #0xc adds r5, r0, #0 @@ -18946,7 +18946,7 @@ _08008D0A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08008CB8 + thumb_func_end StringBraille thumb_func_start sub_08008D18 sub_08008D18: @ 0x08008D18 @@ -19089,8 +19089,8 @@ sub_08008DBC: @ 0x08008DBC _08008DC0: .4byte gUnknown_85C8C54 thumb_func_end sub_08008DBC - thumb_func_start sub_08008DC4 -sub_08008DC4: @ 0x08008DC4 + thumb_func_start GetExpandedPlaceholder +GetExpandedPlaceholder: @ 0x08008DC4 push {lr} cmp r0, #0xd bhi _08008DDC @@ -19109,7 +19109,7 @@ _08008DDE: bx r1 .align 2, 0 _08008DE4: .4byte gUnknown_85C8C24 - thumb_func_end sub_08008DC4 + thumb_func_end GetExpandedPlaceholder thumb_func_start StringFill StringFill: @ 0x08008DE8 @@ -19189,8 +19189,8 @@ _08008E58: _08008E64: .4byte 0x0000FFFF thumb_func_end StringCopyPadded - thumb_func_start sub_08008E68 -sub_08008E68: @ 0x08008E68 + thumb_func_start StringFillWithTerminator +StringFillWithTerminator: @ 0x08008E68 push {lr} lsls r2, r1, #0x10 lsrs r2, r2, #0x10 @@ -19198,7 +19198,7 @@ sub_08008E68: @ 0x08008E68 bl StringFill pop {r1} bx r1 - thumb_func_end sub_08008E68 + thumb_func_end StringFillWithTerminator thumb_func_start StringCopyN_Multibyte StringCopyN_Multibyte: @ 0x08008E78 @@ -19361,8 +19361,8 @@ _08008F62: bx r1 thumb_func_end sub_08008F38 - thumb_func_start sub_08008F68 -sub_08008F68: @ 0x08008F68 + thumb_func_start LoadHeldItemIcons +LoadHeldItemIcons: @ 0x08008F68 push {lr} bl sub_0800AF5C bl sub_0800E1C4 @@ -19371,8 +19371,8 @@ sub_08008F68: @ 0x08008F68 cmp r0, r1 beq _08008F90 bl sub_0800AF78 - bl sub_08009384 - bl sub_08000714 + bl CloseLink + bl RestoreSerialTimer3IntrHandlers movs r0, #0 b _08008F9A .align 2, 0 @@ -19385,21 +19385,21 @@ _08008F9A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08008F68 + thumb_func_end LoadHeldItemIcons - thumb_func_start sub_08008FA0 -sub_08008FA0: @ 0x08008FA0 + thumb_func_start Task_DestroySelf +Task_DestroySelf: @ 0x08008FA0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08008FA0 + thumb_func_end Task_DestroySelf - thumb_func_start sub_08008FB0 -sub_08008FB0: @ 0x08008FB0 + thumb_func_start InitLinkTestBG +InitLinkTestBG: @ 0x08008FB0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -19419,7 +19419,7 @@ sub_08008FB0: @ 0x08008FB0 ldr r0, _0800900C lsls r1, r5, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r3, _08009010 ldr r0, _08009014 str r0, [r3] @@ -19503,7 +19503,7 @@ _0800905C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08008FB0 + thumb_func_end InitLinkTestBG thumb_func_start sub_08009088 sub_08009088: @ 0x08009088 @@ -19527,7 +19527,7 @@ sub_08009088: @ 0x08009088 mov r2, r8 lsls r1, r2, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r2, _080090F8 ldr r0, _080090FC str r0, [r2] @@ -19567,24 +19567,24 @@ _08009104: .4byte gUnknown_30031D0 _08009108: .4byte gUnknown_82BFF20 thumb_func_end sub_08009088 - thumb_func_start sub_0800910C -sub_0800910C: @ 0x0800910C + thumb_func_start LinkTestScreen +LinkTestScreen: @ 0x0800910C push {r4, lr} sub sp, #4 bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks ldr r0, _080091A0 - bl sub_080006F0 - bl sub_08009EA4 + bl SetVBlankCallback + bl ResetBlockSend ldr r1, _080091A4 ldr r2, _080091A8 adds r0, r2, #0 strh r0, [r1] - bl sub_080092D0 + bl OpenLink ldr r0, _080091AC ldrh r0, [r0, #0x24] - bl sub_0806F07C + bl SeedRng movs r4, #0 _0800913C: bl Random @@ -19602,26 +19602,26 @@ _0800913C: movs r1, #2 movs r2, #4 movs r3, #0 - bl sub_08008FB0 + bl InitLinkTestBG movs r1, #0xaa lsls r1, r1, #5 movs r0, #0 bl SetGpuReg ldr r0, _080091B4 movs r1, #0 - bl sub_080A8878 - bl sub_080A89D4 - bl sub_080066D8 + bl CreateTask + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _080091B8 str r4, [r0] - bl sub_080091D4 + bl InitLocalLinkPlayer ldr r0, _080091BC movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _080091C0 - bl sub_08000540 + bl SetMainCallback2 add sp, #4 pop {r4} pop {r0} @@ -19632,14 +19632,14 @@ _080091A4: .4byte gUnknown_202267E _080091A8: .4byte 0x00001111 _080091AC: .4byte gUnknown_3002360 _080091B0: .4byte gUnknown_3005AF0 -_080091B4: .4byte sub_08008FA0 +_080091B4: .4byte Task_DestroySelf _080091B8: .4byte gUnknown_3000D60 _080091BC: .4byte sub_0800A414 -_080091C0: .4byte sub_08009558 - thumb_func_end sub_0800910C +_080091C0: .4byte CB2_LinkTest + thumb_func_end LinkTestScreen - thumb_func_start sub_080091C4 -sub_080091C4: @ 0x080091C4 + thumb_func_start SetLocalLinkPlayerId +SetLocalLinkPlayerId: @ 0x080091C4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080091D0 @@ -19647,10 +19647,10 @@ sub_080091C4: @ 0x080091C4 bx lr .align 2, 0 _080091D0: .4byte gUnknown_2022684 - thumb_func_end sub_080091C4 + thumb_func_end SetLocalLinkPlayerId - thumb_func_start sub_080091D4 -sub_080091D4: @ 0x080091D4 + thumb_func_start InitLocalLinkPlayer +InitLocalLinkPlayer: @ 0x080091D4 push {r4, r5, lr} ldr r5, _08009240 ldr r4, _08009244 @@ -19688,7 +19688,7 @@ sub_080091D4: @ 0x080091D4 movs r0, #0x80 lsls r0, r0, #8 strh r0, [r5, #2] - bl sub_0809CD04 + bl IsNationalPokedexEnabled strb r0, [r5, #0x10] ldr r0, _08009254 bl FlagGet @@ -19710,21 +19710,21 @@ _08009248: .4byte gUnknown_202267E _0800924C: .4byte gUnknown_829BDA5 _08009250: .4byte gUnknown_829BDA4 _08009254: .4byte 0x0000087F - thumb_func_end sub_080091D4 + thumb_func_end InitLocalLinkPlayer thumb_func_start sub_08009258 sub_08009258: @ 0x08009258 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08009258 - thumb_func_start sub_0800926C -sub_0800926C: @ 0x0800926C + thumb_func_start InitLink +InitLink: @ 0x0800926C push {lr} ldr r3, _0800928C ldr r1, _08009290 @@ -19738,17 +19738,17 @@ _08009278: bge _08009278 movs r0, #1 strb r0, [r3] - bl sub_0800B050 + bl EnableSerial pop {r0} bx r0 .align 2, 0 _0800928C: .4byte gUnknown_202267C _08009290: .4byte gUnknown_30031B0 _08009294: .4byte 0x0000EFFF - thumb_func_end sub_0800926C + thumb_func_end InitLink - thumb_func_start sub_08009298 -sub_08009298: @ 0x08009298 + thumb_func_start Task_TriggerHandshake +Task_TriggerHandshake: @ 0x08009298 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -19768,24 +19768,24 @@ sub_08009298: @ 0x08009298 movs r0, #1 strb r0, [r1] adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _080092C2: pop {r0} bx r0 .align 2, 0 _080092C8: .4byte gUnknown_3005B60 _080092CC: .4byte gUnknown_30031E4 - thumb_func_end sub_08009298 + thumb_func_end Task_TriggerHandshake - thumb_func_start sub_080092D0 -sub_080092D0: @ 0x080092D0 + thumb_func_start OpenLink +OpenLink: @ 0x080092D0 push {r4, r5, r6, lr} ldr r0, _08009318 ldrb r4, [r0] cmp r4, #0 bne _08009344 - bl sub_0800B0E4 - bl sub_0800926C + bl ResetSerial + bl InitLink ldr r1, _0800931C ldr r0, _08009320 str r0, [r1] @@ -19795,8 +19795,8 @@ sub_080092D0: @ 0x080092D0 strb r4, [r0] ldr r0, _0800932C strb r4, [r0] - bl sub_0800A178 - bl sub_08009EA4 + bl ResetBlockReceivedFlags + bl ResetBlockSend ldr r0, _08009330 str r4, [r0] ldr r0, _08009334 @@ -19807,12 +19807,12 @@ sub_080092D0: @ 0x080092D0 strh r4, [r0] ldr r0, _08009340 movs r1, #2 - bl sub_080A8878 + bl CreateTask b _08009348 .align 2, 0 _08009318: .4byte gUnknown_300319C _0800931C: .4byte gUnknown_30031E0 -_08009320: .4byte sub_0800A3E8 +_08009320: .4byte LinkCB_RequestPlayerDataExchange _08009324: .4byte gUnknown_30027E8 _08009328: .4byte gUnknown_300310C _0800932C: .4byte gUnknown_3003198 @@ -19820,7 +19820,7 @@ _08009330: .4byte gUnknown_3000D54 _08009334: .4byte gUnknown_3003188 _08009338: .4byte gUnknown_3003184 _0800933C: .4byte gUnknown_3003194 -_08009340: .4byte sub_08009298 +_08009340: .4byte Task_TriggerHandshake _08009344: bl sub_0800E1C4 _08009348: @@ -19851,10 +19851,10 @@ _08009374: .4byte gUnknown_30031C4 _08009378: .4byte gUnknown_3003118 _0800937C: .4byte gUnknown_3003190 _08009380: .4byte gUnknown_300318C - thumb_func_end sub_080092D0 + thumb_func_end OpenLink - thumb_func_start sub_08009384 -sub_08009384: @ 0x08009384 + thumb_func_start CloseLink +CloseLink: @ 0x08009384 push {r4, lr} ldr r0, _080093A8 movs r4, #0 @@ -19867,7 +19867,7 @@ sub_08009384: @ 0x08009384 _08009398: ldr r0, _080093B0 strb r4, [r0] - bl sub_0800AFF8 + bl DisableSerial pop {r4} pop {r0} bx r0 @@ -19875,10 +19875,10 @@ _08009398: _080093A8: .4byte gUnknown_30031C4 _080093AC: .4byte gUnknown_300319C _080093B0: .4byte gUnknown_202267C - thumb_func_end sub_08009384 + thumb_func_end CloseLink - thumb_func_start sub_080093B4 -sub_080093B4: @ 0x080093B4 + thumb_func_start TestBlockTransfer +TestBlockTransfer: @ 0x080093B4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -19925,7 +19925,7 @@ _08009404: lsrs r5, r0, #0x18 cmp r5, #3 bls _080093DC - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r7, r0, #0x18 cmp r7, #0xf @@ -19956,7 +19956,7 @@ _08009424: movs r6, #0 strh r0, [r4] adds r0, r5, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag ldrh r0, [r4] cmp r0, r8 beq _08009460 @@ -19987,10 +19987,10 @@ _0800948C: .4byte gUnknown_202207C _08009490: .4byte gUnknown_30031E8 _08009494: .4byte gUnknown_2022074 _08009498: .4byte gUnknown_2022075 - thumb_func_end sub_080093B4 + thumb_func_end TestBlockTransfer - thumb_func_start sub_0800949C -sub_0800949C: @ 0x0800949C + thumb_func_start LinkTestProcessKeyInput +LinkTestProcessKeyInput: @ 0x0800949C push {r4, r5, lr} sub sp, #4 ldr r4, _0800953C @@ -20011,7 +20011,7 @@ _080094B2: beq _080094C6 ldr r0, _08009544 ldr r1, _08009548 - bl sub_08009EB8 + bl InitBlockSend _080094C6: ldrh r1, [r4, #0x2e] movs r0, #0x80 @@ -20025,7 +20025,7 @@ _080094C6: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _080094E2: ldrh r1, [r4, #0x2e] movs r0, #8 @@ -20042,7 +20042,7 @@ _080094F2: cmp r0, #0 beq _08009504 movs r0, #1 - bl sub_08153274 + bl TrySavingData _08009504: ldrh r1, [r4, #0x2e] movs r0, #4 @@ -20066,7 +20066,7 @@ _08009512: orrs r1, r0 _0800952C: adds r0, r2, #0 - bl sub_0800A558 + bl SetLinkDebugValues _08009532: add sp, #4 pop {r4, r5} @@ -20080,26 +20080,26 @@ _08009548: .4byte 0x00002004 _0800954C: .4byte gUnknown_2022074 _08009550: .4byte gUnknown_30027E8 _08009554: .4byte gUnknown_30031E0 - thumb_func_end sub_0800949C + thumb_func_end LinkTestProcessKeyInput - thumb_func_start sub_08009558 -sub_08009558: @ 0x08009558 + thumb_func_start CB2_LinkTest +CB2_LinkTest: @ 0x08009558 push {lr} - bl sub_0800949C + bl LinkTestProcessKeyInput movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_080093B4 - bl sub_080A89D4 - bl sub_080066D8 + bl TestBlockTransfer + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 - thumb_func_end sub_08009558 + thumb_func_end CB2_LinkTest - thumb_func_start sub_0800957C -sub_0800957C: @ 0x0800957C + thumb_func_start LinkMain2 +LinkMain2: @ 0x0800957C push {r4, r5, lr} adds r4, r0, #0 ldr r0, _0800958C @@ -20136,14 +20136,14 @@ _08009598: ldr r0, [r0] lsls r0, r0, #0x1a lsrs r0, r0, #0x1e - bl sub_0800963C + bl EmeraldBattleTowerRecordToRuby ldr r0, _080095F0 ldr r0, [r0] cmp r0, #0 beq _080095D0 bl _call_via_r0 _080095D0: - bl sub_0800A990 + bl CheckErrorStatus _080095D4: ldr r0, _080095E8 ldrh r0, [r0] @@ -20157,10 +20157,10 @@ _080095E4: .4byte gUnknown_30031B0 _080095E8: .4byte gUnknown_3003180 _080095EC: .4byte 0x04000128 _080095F0: .4byte gUnknown_30031E0 - thumb_func_end sub_0800957C + thumb_func_end LinkMain2 - thumb_func_start sub_080095F4 -sub_080095F4: @ 0x080095F4 + thumb_func_start HandleReceiveRemoteLinkPlayer +HandleReceiveRemoteLinkPlayer: @ 0x080095F4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -20179,7 +20179,7 @@ _0800960C: adds r5, r5, r0 adds r4, #1 _08009614: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -20198,10 +20198,10 @@ _08009630: bx r0 .align 2, 0 _08009638: .4byte gUnknown_30031C4 - thumb_func_end sub_080095F4 + thumb_func_end HandleReceiveRemoteLinkPlayer - thumb_func_start sub_0800963C -sub_0800963C: @ 0x0800963C + thumb_func_start EmeraldBattleTowerRecordToRuby +EmeraldBattleTowerRecordToRuby: @ 0x0800963C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -20302,7 +20302,7 @@ _080096F8: _080096FC: .4byte 0x0000CAFE _08009700: .4byte 0x0000CCCC _08009704: - bl sub_080091D4 + bl InitLocalLinkPlayer ldr r1, _08009748 adds r1, #0x10 ldr r0, _0800974C @@ -20331,7 +20331,7 @@ _08009704: strb r1, [r0, #2] ldr r0, _08009748 movs r1, #0x3c - bl sub_08009EB8 + bl InitBlockSend b _08009906 .align 2, 0 _08009748: .4byte gUnknown_30030D0 @@ -20493,7 +20493,7 @@ _08009866: beq _080098A4 _08009882: ldr r0, _080098A0 - bl sub_08000540 + bl SetMainCallback2 b _08009906 .align 2, 0 _0800988C: .4byte gUnknown_202207C @@ -20501,16 +20501,16 @@ _08009890: .4byte gUnknown_3003130 _08009894: .4byte gUnknown_3003118 _08009898: .4byte gUnknown_20226A0 _0800989C: .4byte gUnknown_82BFF24 -_080098A0: .4byte sub_0800AA0C +_080098A0: .4byte CB2_LinkError _080098A4: lsls r0, r6, #0x18 lsrs r0, r0, #0x18 - bl sub_080095F4 + bl HandleReceiveRemoteLinkPlayer b _08009906 _080098AE: lsls r0, r6, #0x18 lsrs r0, r0, #0x18 - bl sub_0800A14C + bl SetBlockReceivedFlag b _08009906 _080098B8: ldr r0, _080098BC @@ -20542,7 +20542,7 @@ _080098D6: adds r2, r2, r3 ldrh r2, [r2] movs r0, #0 - bl sub_0800A070 + bl SendBlock b _08009906 .align 2, 0 _080098F4: .4byte gUnknown_82BFEF8 @@ -20571,10 +20571,10 @@ _08009912: bx r0 .align 2, 0 _08009924: .4byte gUnknown_3003130 - thumb_func_end sub_0800963C + thumb_func_end EmeraldBattleTowerRecordToRuby - thumb_func_start sub_08009928 -sub_08009928: @ 0x08009928 + thumb_func_start BuildSendCmd +BuildSendCmd: @ 0x08009928 push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -20768,7 +20768,7 @@ _08009A9E: _08009AA4: .4byte gUnknown_3005B08 _08009AA8: .4byte gUnknown_3002354 _08009AAC: .4byte gUnknown_30031B0 - thumb_func_end sub_08009928 + thumb_func_end BuildSendCmd thumb_func_start sub_08009AB0 sub_08009AB0: @ 0x08009AB0 @@ -20790,8 +20790,8 @@ _08009ACC: .4byte gUnknown_30031E0 _08009AD0: .4byte sub_08009B08 thumb_func_end sub_08009AB0 - thumb_func_start sub_08009AD4 -sub_08009AD4: @ 0x08009AD4 + thumb_func_start IsSendingKeysToLink +IsSendingKeysToLink: @ 0x08009AD4 push {lr} ldr r0, _08009AE4 ldrb r0, [r0] @@ -20818,7 +20818,7 @@ _08009B02: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08009AD4 + thumb_func_end IsSendingKeysToLink thumb_func_start sub_08009B08 sub_08009B08: @ 0x08009B08 @@ -20828,7 +20828,7 @@ sub_08009B08: @ 0x08009B08 cmp r0, #1 bne _08009B18 ldr r0, _08009B20 - bl sub_08009928 + bl BuildSendCmd _08009B18: pop {r0} bx r0 @@ -20879,8 +20879,8 @@ _08009B5C: _08009B60: .4byte gUnknown_30031E0 thumb_func_end sub_08009B44 - thumb_func_start sub_08009B64 -sub_08009B64: @ 0x08009B64 + thumb_func_start GetLinkPlayerCount +GetLinkPlayerCount: @ 0x08009B64 push {lr} ldr r0, _08009B7C ldrb r0, [r0] @@ -20902,14 +20902,14 @@ _08009B84: _08009B8C: pop {r1} bx r1 - thumb_func_end sub_08009B64 + thumb_func_end GetLinkPlayerCount thumb_func_start sub_08009B90 sub_08009B90: @ 0x08009B90 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r5, r1, #0 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r2, #0 @@ -20963,7 +20963,7 @@ _08009BEA: adds r4, #0x1c adds r5, #1 _08009BEE: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -20979,7 +20979,7 @@ _08009BFC: thumb_func_start sub_08009C04 sub_08009C04: @ 0x08009C04 push {lr} - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -20999,8 +20999,8 @@ _08009C24: bx r1 thumb_func_end sub_08009C04 - thumb_func_start sub_08009C28 -sub_08009C28: @ 0x08009C28 + thumb_func_start Link_AnyPartnersPlayingRubyOrSapphire +Link_AnyPartnersPlayingRubyOrSapphire: @ 0x08009C28 push {lr} movs r0, #2 movs r1, #1 @@ -21014,7 +21014,7 @@ _08009C3A: _08009C3C: pop {r1} bx r1 - thumb_func_end sub_08009C28 + thumb_func_end Link_AnyPartnersPlayingRubyOrSapphire thumb_func_start sub_08009C40 sub_08009C40: @ 0x08009C40 @@ -21045,24 +21045,24 @@ _08009C6A: .align 2, 0 thumb_func_end sub_08009C40 - thumb_func_start sub_08009C70 -sub_08009C70: @ 0x08009C70 + thumb_func_start OpenLinkTimed +OpenLinkTimed: @ 0x08009C70 push {lr} ldr r0, _08009C84 movs r1, #0 str r1, [r0] ldr r0, _08009C88 strh r1, [r0] - bl sub_080092D0 + bl OpenLink pop {r0} bx r0 .align 2, 0 _08009C84: .4byte gUnknown_3000D5C _08009C88: .4byte gUnknown_2022680 - thumb_func_end sub_08009C70 + thumb_func_end OpenLinkTimed - thumb_func_start sub_08009C8C -sub_08009C8C: @ 0x08009C8C + thumb_func_start GetLinkPlayerDataExchangeStatusTimed +GetLinkPlayerDataExchangeStatusTimed: @ 0x08009C8C push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r6, r1, #0 @@ -21073,7 +21073,7 @@ sub_08009C8C: @ 0x08009C8C beq _08009C9E b _08009DD8 _08009C9E: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -21089,13 +21089,13 @@ _08009CAE: _08009CB8: .4byte gUnknown_30031C4 _08009CBC: .4byte gUnknown_3000D5C _08009CC0: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 cmp r0, #0 bne _08009CD2 ldr r0, _08009CDC strb r4, [r0] - bl sub_08009384 + bl CloseLink _08009CD2: movs r6, #0 ldr r4, _08009CE0 @@ -21117,12 +21117,12 @@ _08009CF4: adds r5, #0x1c adds r6, #1 _08009CF8: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 blt _08009CE4 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r7, r0 @@ -21178,7 +21178,7 @@ _08009D70: movs r0, #3 str r0, [r6] ldr r4, _08009DC8 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -21187,7 +21187,7 @@ _08009D70: adds r4, #0x14 adds r1, r1, r4 ldr r5, [r1] - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -21244,10 +21244,10 @@ _08009DF2: .align 2, 0 _08009DF8: .4byte gUnknown_2022680 _08009DFC: .4byte gUnknown_3000D5C - thumb_func_end sub_08009C8C + thumb_func_end GetLinkPlayerDataExchangeStatusTimed - thumb_func_start sub_08009E00 -sub_08009E00: @ 0x08009E00 + thumb_func_start IsLinkPlayerDataExchangeComplete +IsLinkPlayerDataExchangeComplete: @ 0x08009E00 push {r4, r5, r6, lr} movs r6, #0 movs r4, #0 @@ -21274,12 +21274,12 @@ _08009E2A: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _08009E30: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 blo _08009E10 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -21302,7 +21302,7 @@ _08009E5C: bx r1 .align 2, 0 _08009E64: .4byte gUnknown_3000D5C - thumb_func_end sub_08009E00 + thumb_func_end IsLinkPlayerDataExchangeComplete thumb_func_start GetLinkPlayerTrainerId GetLinkPlayerTrainerId: @ 0x08009E68 @@ -21320,8 +21320,8 @@ GetLinkPlayerTrainerId: @ 0x08009E68 _08009E7C: .4byte gUnknown_20226A0 thumb_func_end GetLinkPlayerTrainerId - thumb_func_start sub_08009E80 -sub_08009E80: @ 0x08009E80 + thumb_func_start ResetLinkPlayers +ResetLinkPlayers: @ 0x08009E80 push {r4, r5, lr} ldr r5, _08009EA0 movs r4, #4 @@ -21339,10 +21339,10 @@ _08009E86: bx r0 .align 2, 0 _08009EA0: .4byte gUnknown_20226A0 - thumb_func_end sub_08009E80 + thumb_func_end ResetLinkPlayers - thumb_func_start sub_08009EA4 -sub_08009EA4: @ 0x08009EA4 + thumb_func_start ResetBlockSend +ResetBlockSend: @ 0x08009EA4 ldr r1, _08009EB4 movs r0, #0 strb r0, [r1, #8] @@ -21352,10 +21352,10 @@ sub_08009EA4: @ 0x08009EA4 bx lr .align 2, 0 _08009EB4: .4byte gUnknown_3000D10 - thumb_func_end sub_08009EA4 + thumb_func_end ResetBlockSend - thumb_func_start sub_08009EB8 -sub_08009EB8: @ 0x08009EB8 + thumb_func_start InitBlockSend +InitBlockSend: @ 0x08009EB8 push {r4, r5, r6, r7, lr} adds r7, r0, #0 adds r6, r1, #0 @@ -21368,7 +21368,7 @@ sub_08009EB8: @ 0x08009EB8 .align 2, 0 _08009ECC: .4byte gUnknown_3000D10 _08009ED0: - bl sub_0800A02C + bl GetMultiplayerId strb r0, [r4, #9] movs r0, #1 strb r0, [r4, #8] @@ -21391,7 +21391,7 @@ _08009EF8: str r5, [r4, #4] _08009EFA: ldr r0, _08009F18 - bl sub_08009928 + bl BuildSendCmd ldr r1, _08009F1C ldr r0, _08009F20 str r0, [r1] @@ -21409,7 +21409,7 @@ _08009F18: .4byte 0x0000BBBB _08009F1C: .4byte gUnknown_30031E0 _08009F20: .4byte LinkCB_BlockSendBegin _08009F24: .4byte gUnknown_3000D50 - thumb_func_end sub_08009EB8 + thumb_func_end InitBlockSend thumb_func_start LinkCB_BlockSendBegin LinkCB_BlockSendBegin: @ 0x08009F28 @@ -21496,9 +21496,9 @@ _08009FB8: .4byte gUnknown_30031E0 thumb_func_start sub_08009FBC sub_08009FBC: @ 0x08009FBC push {lr} - bl sub_0800A02C + bl GetMultiplayerId ldr r0, _08009FD4 - bl sub_08009928 + bl BuildSendCmd ldr r1, _08009FD8 ldr r0, [r1] adds r0, #1 @@ -21550,15 +21550,15 @@ _0800A018: .4byte gUnknown_2022078 sub_0800A01C: @ 0x0800A01C push {lr} ldr r0, _0800A028 - bl sub_08009928 + bl BuildSendCmd pop {r0} bx r0 .align 2, 0 _0800A028: .4byte 0x0000AAAA thumb_func_end sub_0800A01C - thumb_func_start sub_0800A02C -sub_0800A02C: @ 0x0800A02C + thumb_func_start GetMultiplayerId +GetMultiplayerId: @ 0x0800A02C push {lr} ldr r0, _0800A040 ldrb r0, [r0] @@ -21573,18 +21573,18 @@ sub_0800A02C: @ 0x0800A02C _0800A040: .4byte gUnknown_300319C _0800A044: .4byte 0x04000128 _0800A048: - bl sub_0800FFD0 + bl rfu_get_multiplayer_id lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0800A050: pop {r1} bx r1 - thumb_func_end sub_0800A02C + thumb_func_end GetMultiplayerId thumb_func_start bitmask_all_link_players_but_self bitmask_all_link_players_but_self: @ 0x0800A054 push {lr} - bl sub_0800A02C + bl GetMultiplayerId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -21598,8 +21598,8 @@ bitmask_all_link_players_but_self: @ 0x0800A054 bx r1 thumb_func_end bitmask_all_link_players_but_self - thumb_func_start sub_0800A070 -sub_0800A070: @ 0x0800A070 + thumb_func_start SendBlock +SendBlock: @ 0x0800A070 push {lr} adds r3, r1, #0 lsls r2, r2, #0x10 @@ -21609,7 +21609,7 @@ sub_0800A070: @ 0x0800A070 cmp r0, #1 beq _0800A08C adds r0, r3, #0 - bl sub_08009EB8 + bl InitBlockSend b _0800A092 .align 2, 0 _0800A088: .4byte gUnknown_300319C @@ -21622,7 +21622,7 @@ _0800A092: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800A070 + thumb_func_end SendBlock thumb_func_start sub_0800A09C sub_0800A09C: @ 0x0800A09C @@ -21654,7 +21654,7 @@ _0800A0CC: ldr r0, _0800A0DC strb r2, [r0] ldr r0, _0800A0E0 - bl sub_08009928 + bl BuildSendCmd movs r0, #1 _0800A0D8: pop {r1} @@ -21664,8 +21664,8 @@ _0800A0DC: .4byte gUnknown_30031F0 _0800A0E0: .4byte 0x0000CCCC thumb_func_end sub_0800A09C - thumb_func_start sub_0800A0E4 -sub_0800A0E4: @ 0x0800A0E4 + thumb_func_start IsLinkTaskFinished +IsLinkTaskFinished: @ 0x0800A0E4 push {lr} ldr r0, _0800A0F8 ldrb r0, [r0] @@ -21691,10 +21691,10 @@ _0800A10A: bx r1 .align 2, 0 _0800A110: .4byte gUnknown_30031E0 - thumb_func_end sub_0800A0E4 + thumb_func_end IsLinkTaskFinished - thumb_func_start sub_0800A114 -sub_0800A114: @ 0x0800A114 + thumb_func_start GetBlockReceivedStatus +GetBlockReceivedStatus: @ 0x0800A114 push {lr} ldr r0, _0800A138 ldrb r0, [r0] @@ -21722,10 +21722,10 @@ _0800A144: lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_0800A114 + thumb_func_end GetBlockReceivedStatus - thumb_func_start sub_0800A14C -sub_0800A14C: @ 0x0800A14C + thumb_func_start SetBlockReceivedFlag +SetBlockReceivedFlag: @ 0x0800A14C push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -21748,10 +21748,10 @@ _0800A170: bx r0 .align 2, 0 _0800A174: .4byte gUnknown_300311C - thumb_func_end sub_0800A14C + thumb_func_end SetBlockReceivedFlag - thumb_func_start sub_0800A178 -sub_0800A178: @ 0x0800A178 + thumb_func_start ResetBlockReceivedFlags +ResetBlockReceivedFlags: @ 0x0800A178 push {r4, lr} ldr r0, _0800A194 ldrb r0, [r0] @@ -21783,10 +21783,10 @@ _0800A1A6: bx r0 .align 2, 0 _0800A1AC: .4byte gUnknown_300311C - thumb_func_end sub_0800A178 + thumb_func_end ResetBlockReceivedFlags - thumb_func_start sub_0800A1B0 -sub_0800A1B0: @ 0x0800A1B0 + thumb_func_start ResetBlockReceivedFlag +ResetBlockReceivedFlag: @ 0x0800A1B0 push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -21812,7 +21812,7 @@ _0800A1DA: bx r0 .align 2, 0 _0800A1E0: .4byte gUnknown_300311C - thumb_func_end sub_0800A1B0 + thumb_func_end ResetBlockReceivedFlag thumb_func_start CheckShouldAdvanceLinkState CheckShouldAdvanceLinkState: @ 0x0800A1E4 @@ -21980,8 +21980,8 @@ _0800A2F8: bx r0 thumb_func_end LinkTest_prnthex - thumb_func_start sub_0800A300 -sub_0800A300: @ 0x0800A300 + thumb_func_start LinkTest_prntint +LinkTest_prntint: @ 0x0800A300 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -22064,7 +22064,7 @@ _0800A38E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0800A300 + thumb_func_end LinkTest_prntint thumb_func_start LinkTest_prntstr LinkTest_prntstr: @ 0x0800A3A0 @@ -22109,8 +22109,8 @@ _0800A3E0: .align 2, 0 thumb_func_end LinkTest_prntstr - thumb_func_start sub_0800A3E8 -sub_0800A3E8: @ 0x0800A3E8 + thumb_func_start LinkCB_RequestPlayerDataExchange +LinkCB_RequestPlayerDataExchange: @ 0x0800A3E8 push {lr} ldr r0, _0800A408 ldr r0, [r0] @@ -22119,7 +22119,7 @@ sub_0800A3E8: @ 0x0800A3E8 cmp r0, #0 beq _0800A3FC ldr r0, _0800A40C - bl sub_08009928 + bl BuildSendCmd _0800A3FC: ldr r1, _0800A410 movs r0, #0 @@ -22130,7 +22130,7 @@ _0800A3FC: _0800A408: .4byte gUnknown_3003180 _0800A40C: .4byte 0x00002222 _0800A410: .4byte gUnknown_30031E0 - thumb_func_end sub_0800A3E8 + thumb_func_end LinkCB_RequestPlayerDataExchange thumb_func_start sub_0800A414 sub_0800A414: @ 0x0800A414 @@ -22169,7 +22169,7 @@ sub_0800A414: @ 0x0800A414 movs r2, #0xa movs r3, #2 bl LinkTest_prnthex - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0xf @@ -22188,7 +22188,7 @@ sub_0800A414: @ 0x0800A414 movs r2, #2 movs r3, #2 bl LinkTest_prnthex - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0xf @@ -22207,7 +22207,7 @@ sub_0800A414: @ 0x0800A414 movs r2, #0xd movs r3, #8 bl LinkTest_prnthex - bl sub_0800ADC4 + bl GetSioMultiSI lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x19 @@ -22221,7 +22221,7 @@ sub_0800A414: @ 0x0800A414 movs r2, #6 movs r3, #1 bl LinkTest_prnthex - bl sub_0800ADFC + bl IsLinkConnectionEstablished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x19 @@ -22268,8 +22268,8 @@ _0800A550: .4byte gUnknown_3003110 _0800A554: .4byte gUnknown_30031E8 thumb_func_end sub_0800A414 - thumb_func_start sub_0800A558 -sub_0800A558: @ 0x0800A558 + thumb_func_start SetLinkDebugValues +SetLinkDebugValues: @ 0x0800A558 ldr r2, _0800A564 str r0, [r2] ldr r0, _0800A568 @@ -22278,7 +22278,7 @@ sub_0800A558: @ 0x0800A558 .align 2, 0 _0800A564: .4byte gUnknown_30030CC _0800A568: .4byte gUnknown_3003110 - thumb_func_end sub_0800A558 + thumb_func_end SetLinkDebugValues thumb_func_start sub_0800A56C sub_0800A56C: @ 0x0800A56C @@ -22324,7 +22324,7 @@ _0800A5A6: lsrs r4, r0, #0x18 adds r5, #1 _0800A5B2: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -22341,7 +22341,7 @@ sub_0800A5C8: @ 0x0800A5C8 push {r4, r5, r6, r7, lr} ldr r1, _0800A5FC strb r0, [r1] - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _0800A600 strb r0, [r1] ldr r4, _0800A604 @@ -22441,7 +22441,7 @@ _0800A678: ldrb r0, [r0] cmp r3, r0 bne _0800A6A8 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sb @@ -22528,9 +22528,9 @@ _0800A71E: ldr r1, _0800A754 movs r0, #1 strb r0, [r1] - bl sub_08009384 + bl CloseLink ldr r0, _0800A758 - bl sub_08000540 + bl SetMainCallback2 _0800A72E: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -22550,7 +22550,7 @@ _0800A748: .4byte gUnknown_30031A0 _0800A74C: .4byte gUnknown_202272C _0800A750: .4byte gUnknown_20226A0 _0800A754: .4byte gUnknown_300310C -_0800A758: .4byte sub_0800AA0C +_0800A758: .4byte CB2_LinkError thumb_func_end sub_0800A6DC thumb_func_start sub_0800A75C @@ -22566,8 +22566,8 @@ _0800A768: .4byte gUnknown_30031A0 _0800A76C: .4byte gUnknown_30031C0 thumb_func_end sub_0800A75C - thumb_func_start sub_0800A770 -sub_0800A770: @ 0x0800A770 + thumb_func_start GetLinkPlayerCount_2 +GetLinkPlayerCount_2: @ 0x0800A770 ldr r0, _0800A77C ldr r0, [r0] movs r1, #0x1c @@ -22576,10 +22576,10 @@ sub_0800A770: @ 0x0800A770 bx lr .align 2, 0 _0800A77C: .4byte gUnknown_3003180 - thumb_func_end sub_0800A770 + thumb_func_end GetLinkPlayerCount_2 - thumb_func_start sub_0800A780 -sub_0800A780: @ 0x0800A780 + thumb_func_start IsLinkMaster +IsLinkMaster: @ 0x0800A780 push {lr} ldr r0, _0800A798 ldrb r0, [r0] @@ -22595,13 +22595,13 @@ sub_0800A780: @ 0x0800A780 _0800A798: .4byte gUnknown_300319C _0800A79C: .4byte gUnknown_3003180 _0800A7A0: - bl sub_0801159C + bl Rfu_IsMaster lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0800A7A8: pop {r1} bx r1 - thumb_func_end sub_0800A780 + thumb_func_end IsLinkMaster thumb_func_start sub_0800A7AC sub_0800A7AC: @ 0x0800A7AC @@ -22621,7 +22621,7 @@ sub_0800A7B8: @ 0x0800A7B8 ldrb r0, [r0] cmp r0, #1 bne _0800A7D0 - bl sub_0800FD94 + bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800A7E4 .align 2, 0 _0800A7CC: .4byte gUnknown_300319C @@ -22653,7 +22653,7 @@ sub_0800A7F8: @ 0x0800A7F8 ldrb r0, [r0] cmp r0, #1 bne _0800A80C - bl sub_0800FD94 + bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800A834 .align 2, 0 _0800A808: .4byte gUnknown_300319C @@ -22694,7 +22694,7 @@ sub_0800A844: @ 0x0800A844 cmp r0, #0 bne _0800A85A ldr r0, _0800A864 - bl sub_08009928 + bl BuildSendCmd ldr r1, _0800A868 ldr r0, _0800A86C str r0, [r1] @@ -22711,7 +22711,7 @@ _0800A86C: .4byte sub_0800A870 thumb_func_start sub_0800A870 sub_0800A870: @ 0x0800A870 push {r4, lr} - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r3, #0 @@ -22741,7 +22741,7 @@ _0800A894: ldr r0, _0800A8C8 movs r4, #1 strb r4, [r0] - bl sub_08009384 + bl CloseLink ldr r1, _0800A8CC movs r0, #0 str r0, [r1] @@ -22798,7 +22798,7 @@ sub_0800A90C: @ 0x0800A90C cmp r0, #0 bne _0800A922 ldr r0, _0800A92C - bl sub_08009928 + bl BuildSendCmd ldr r1, _0800A930 ldr r0, _0800A934 str r0, [r1] @@ -22815,7 +22815,7 @@ _0800A934: .4byte sub_0800A938 thumb_func_start sub_0800A938 sub_0800A938: @ 0x0800A938 push {r4, lr} - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r1, #0 @@ -22861,8 +22861,8 @@ _0800A988: .4byte gUnknown_300318C _0800A98C: .4byte gUnknown_30031E0 thumb_func_end sub_0800A938 - thumb_func_start sub_0800A990 -sub_0800A990: @ 0x0800A990 + thumb_func_start CheckErrorStatus +CheckErrorStatus: @ 0x0800A990 push {lr} ldr r0, _0800A9D4 ldrb r0, [r0] @@ -22888,12 +22888,12 @@ sub_0800A990: @ 0x0800A990 ldrb r0, [r0] strb r0, [r1, #5] ldr r0, _0800A9EC - bl sub_08000540 + bl SetMainCallback2 _0800A9C6: ldr r1, _0800A9F0 movs r0, #1 strb r0, [r1] - bl sub_08009384 + bl CloseLink _0800A9D0: pop {r0} bx r0 @@ -22904,9 +22904,9 @@ _0800A9DC: .4byte gUnknown_3003198 _0800A9E0: .4byte gUnknown_20227B8 _0800A9E4: .4byte gUnknown_30041D0 _0800A9E8: .4byte gUnknown_3003200 -_0800A9EC: .4byte sub_0800AA0C +_0800A9EC: .4byte CB2_LinkError _0800A9F0: .4byte gUnknown_300310C - thumb_func_end sub_0800A990 + thumb_func_end CheckErrorStatus thumb_func_start sub_0800A9F4 sub_0800A9F4: @ 0x0800A9F4 @@ -22923,8 +22923,8 @@ sub_0800A9F4: @ 0x0800A9F4 _0800AA08: .4byte gUnknown_20227B8 thumb_func_end sub_0800A9F4 - thumb_func_start sub_0800AA0C -sub_0800AA0C: @ 0x0800AA0C + thumb_func_start CB2_LinkError +CB2_LinkError: @ 0x0800AA0C push {r4, lr} movs r0, #0 movs r1, #0 @@ -22938,16 +22938,16 @@ sub_0800AA0C: @ 0x0800AA0C ldr r0, _0800AB2C movs r1, #0xe0 lsls r1, r1, #9 - bl sub_08000BAC + bl InitHeap bl ResetSpriteData bl FreeAllSpritePalettes bl ResetPaletteFadeControl movs r0, #0 movs r1, #0 movs r2, #2 - bl sub_080A1238 - bl sub_080A8818 - bl sub_080B9710 + bl FillPalette + bl ResetTasks + bl ScanlineEffect_Stop ldr r1, _0800AB30 ldrb r0, [r1] cmp r0, #0 @@ -22962,7 +22962,7 @@ _0800AA64: bl sub_0800E0C8 _0800AA68: ldr r0, _0800AB38 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _0800AB3C @@ -22976,9 +22976,9 @@ _0800AA68: adds r1, r0, #0 str r1, [r4] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _0800AB44 - bl sub_08003090 + bl InitWindows lsls r0, r0, #0x10 cmp r0, #0 beq _0800AB18 @@ -23005,27 +23005,27 @@ _0800AA68: movs r1, #0xe0 lsls r1, r1, #8 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits ldr r0, _0800AB48 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0800AB4C movs r0, #0 strb r0, [r1] ldr r0, _0800AB50 movs r1, #0 - bl sub_080A8878 - bl sub_080A27F8 + bl CreateTask + bl StopMapMusic ldr r1, _0800AB54 movs r0, #0 str r0, [r1] - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0800AB58 - bl sub_08000540 + bl SetMainCallback2 _0800AB18: pop {r4} pop {r0} @@ -23043,10 +23043,10 @@ _0800AB40: .4byte gUnknown_20227C4 _0800AB44: .4byte gUnknown_82BFF54 _0800AB48: .4byte gUnknown_85D7B04 _0800AB4C: .4byte gUnknown_30027A0 -_0800AB50: .4byte sub_08008FA0 +_0800AB50: .4byte Task_DestroySelf _0800AB54: .4byte gUnknown_3002360 -_0800AB58: .4byte sub_0800AC7C - thumb_func_end sub_0800AA0C +_0800AB58: .4byte CB2_PrintErrorMessage + thumb_func_end CB2_LinkError thumb_func_start sub_0800AB5C sub_0800AB5C: @ 0x0800AB5C @@ -23063,24 +23063,24 @@ sub_0800AB5C: @ 0x0800AB5C movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _0800AC00 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0800AC04 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _0800AC08 str r4, [sp] str r5, [sp, #4] @@ -23090,7 +23090,7 @@ sub_0800AB5C: @ 0x0800AB5C movs r1, #3 movs r2, #0x18 movs r3, #5 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r4, [sp] str r5, [sp, #4] ldr r0, _0800AC10 @@ -23099,17 +23099,17 @@ sub_0800AB5C: @ 0x0800AB5C movs r1, #3 movs r2, #3 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #0 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -23124,8 +23124,8 @@ _0800AC0C: .4byte gUnknown_82BFE50 _0800AC10: .4byte gUnknown_82BFE62 thumb_func_end sub_0800AB5C - thumb_func_start sub_0800AC14 -sub_0800AC14: @ 0x0800AC14 + thumb_func_start BtlController_EmitCmd42 +BtlController_EmitCmd42: @ 0x0800AC14 push {lr} sub sp, #0xc ldr r1, _0800AC70 @@ -23135,10 +23135,10 @@ sub_0800AC14: @ 0x0800AC14 bl LoadBgTiles movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0800AC74 str r0, [sp] movs r0, #0 @@ -23149,17 +23149,17 @@ sub_0800AC14: @ 0x0800AC14 movs r1, #3 movs r2, #3 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #0 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -23167,10 +23167,10 @@ sub_0800AC14: @ 0x0800AC14 _0800AC70: .4byte gUnknown_82BFEB8 _0800AC74: .4byte gUnknown_82BFF74 _0800AC78: .4byte gUnknown_82BFE00 - thumb_func_end sub_0800AC14 + thumb_func_end BtlController_EmitCmd42 - thumb_func_start sub_0800AC7C -sub_0800AC7C: @ 0x0800AC7C + thumb_func_start CB2_PrintErrorMessage +CB2_PrintErrorMessage: @ 0x0800AC7C push {r4, lr} sub sp, #0xc ldr r0, _0800AC9C @@ -23211,17 +23211,17 @@ _0800ACB4: .align 2, 0 _0800ACC4: .4byte gUnknown_20227B8 _0800ACC8: - bl sub_0800AC14 + bl BtlController_EmitCmd42 b _0800AD3C _0800ACCE: movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r0, _0800ACE4 ldrb r0, [r0, #6] cmp r0, #0 beq _0800AD3C movs r0, #1 - bl sub_08001B48 + bl ShowBg b _0800AD3C .align 2, 0 _0800ACE4: .4byte gUnknown_20227B8 @@ -23244,7 +23244,7 @@ _0800ACF0: movs r1, #3 movs r2, #0x18 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0800AD3C .align 2, 0 _0800AD14: .4byte gUnknown_300319C @@ -23263,7 +23263,7 @@ _0800AD20: movs r1, #3 movs r2, #0x18 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0800AD3C: ldr r0, _0800AD78 movs r2, #0x87 @@ -23305,7 +23305,7 @@ _0800AD84: beq _0800AD9E bl rfu_REQ_stopMode bl rfu_waitREQComplete - bl sub_080008F4 + bl DoSoftReset _0800AD9E: ldr r0, _0800ADC0 movs r2, #0x87 @@ -23328,10 +23328,10 @@ _0800ADB8: bx r0 .align 2, 0 _0800ADC0: .4byte gUnknown_3002360 - thumb_func_end sub_0800AC7C + thumb_func_end CB2_PrintErrorMessage - thumb_func_start sub_0800ADC4 -sub_0800ADC4: @ 0x0800ADC4 + thumb_func_start GetSioMultiSI +GetSioMultiSI: @ 0x0800ADC4 ldr r0, _0800ADD0 ldrh r0, [r0] lsrs r0, r0, #2 @@ -23340,7 +23340,7 @@ sub_0800ADC4: @ 0x0800ADC4 bx lr .align 2, 0 _0800ADD0: .4byte 0x04000128 - thumb_func_end sub_0800ADC4 + thumb_func_end GetSioMultiSI thumb_func_start IsSioMultiMaster IsSioMultiMaster: @ 0x0800ADD4 @@ -23366,8 +23366,8 @@ _0800ADF0: _0800ADF8: .4byte 0x04000128 thumb_func_end IsSioMultiMaster - thumb_func_start sub_0800ADFC -sub_0800ADFC: @ 0x0800ADFC + thumb_func_start IsLinkConnectionEstablished +IsLinkConnectionEstablished: @ 0x0800ADFC ldr r0, _0800AE08 ldr r0, [r0] lsrs r0, r0, #6 @@ -23376,7 +23376,7 @@ sub_0800ADFC: @ 0x0800ADFC bx lr .align 2, 0 _0800AE08: .4byte gUnknown_3003180 - thumb_func_end sub_0800ADFC + thumb_func_end IsLinkConnectionEstablished thumb_func_start sub_0800AE0C sub_0800AE0C: @ 0x0800AE0C @@ -23399,7 +23399,7 @@ _0800AE20: .4byte gUnknown_300310C thumb_func_start sub_0800AE24 sub_0800AE24: @ 0x0800AE24 push {r4, r5, r6, lr} - bl sub_080091D4 + bl InitLocalLinkPlayer ldr r1, _0800AE70 adds r2, r1, #0 adds r2, #0x10 @@ -23475,7 +23475,7 @@ sub_0800AE80: @ 0x0800AE80 beq _0800AEC8 _0800AEC2: ldr r0, _0800AEDC - bl sub_08000540 + bl SetMainCallback2 _0800AEC8: pop {r4, r5} pop {r0} @@ -23484,11 +23484,11 @@ _0800AEC8: _0800AED0: .4byte gUnknown_202207C _0800AED4: .4byte gUnknown_20226A0 _0800AED8: .4byte gUnknown_82BFF24 -_0800AEDC: .4byte sub_0800AA0C +_0800AEDC: .4byte CB2_LinkError thumb_func_end sub_0800AE80 - thumb_func_start sub_0800AEE0 -sub_0800AEE0: @ 0x0800AEE0 + thumb_func_start HandleLinkConnection +HandleLinkConnection: @ 0x0800AEE0 push {r4, r5, lr} ldr r0, _0800AF18 ldrb r0, [r0] @@ -23497,11 +23497,11 @@ sub_0800AEE0: @ 0x0800AEE0 ldr r0, _0800AF1C ldr r1, _0800AF20 ldr r2, _0800AF24 - bl sub_0800B0F4 + bl LinkMain1 ldr r4, _0800AF28 str r0, [r4] ldr r0, _0800AF2C - bl sub_0800957C + bl LinkMain2 ldr r0, [r4] movs r1, #0x80 lsls r1, r1, #1 @@ -23531,7 +23531,7 @@ _0800AF30: bne _0800AF54 cmp r4, #1 beq _0800AF12 - bl sub_0800EB78 + bl IsRfuRecvQueueEmpty cmp r0, #0 bne _0800AF12 cmp r5, #0 @@ -23542,7 +23542,7 @@ _0800AF56: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0800AEE0 + thumb_func_end HandleLinkConnection thumb_func_start sub_0800AF5C sub_0800AF5C: @ 0x0800AF5C @@ -23596,8 +23596,8 @@ _0800AFA8: .4byte gUnknown_30031C4 _0800AFAC: .4byte gUnknown_300319C thumb_func_end sub_0800AF94 - thumb_func_start sub_0800AFB0 -sub_0800AFB0: @ 0x0800AFB0 + thumb_func_start GetLinkRecvQueueLength +GetLinkRecvQueueLength: @ 0x0800AFB0 push {lr} ldr r0, _0800AFC4 ldrb r0, [r0] @@ -23617,12 +23617,12 @@ _0800AFD0: _0800AFD4: pop {r1} bx r1 - thumb_func_end sub_0800AFB0 + thumb_func_end GetLinkRecvQueueLength thumb_func_start sub_0800AFD8 sub_0800AFD8: @ 0x0800AFD8 push {lr} - bl sub_0800AFB0 + bl GetLinkRecvQueueLength cmp r0, #2 bhi _0800AFE6 movs r0, #0 @@ -23643,8 +23643,8 @@ sub_0800AFEC: @ 0x0800AFEC _0800AFF4: .4byte gUnknown_300319C thumb_func_end sub_0800AFEC - thumb_func_start sub_0800AFF8 -sub_0800AFF8: @ 0x0800AFF8 + thumb_func_start DisableSerial +DisableSerial: @ 0x0800AFF8 push {lr} sub sp, #4 movs r0, #0xc0 @@ -23682,10 +23682,10 @@ _0800B040: .4byte 0x0400012A _0800B044: .4byte 0x04000120 _0800B048: .4byte gUnknown_3003210 _0800B04C: .4byte 0x050003F0 - thumb_func_end sub_0800AFF8 + thumb_func_end DisableSerial - thumb_func_start sub_0800B050 -sub_0800B050: @ 0x0800B050 + thumb_func_start EnableSerial +EnableSerial: @ 0x0800B050 push {r4, r5, lr} sub sp, #4 movs r0, #0xc0 @@ -23745,20 +23745,20 @@ _0800B0D4: .4byte gUnknown_3000D72 _0800B0D8: .4byte gUnknown_3000D73 _0800B0DC: .4byte gUnknown_3003200 _0800B0E0: .4byte gUnknown_30041D0 - thumb_func_end sub_0800B050 + thumb_func_end EnableSerial - thumb_func_start sub_0800B0E4 -sub_0800B0E4: @ 0x0800B0E4 + thumb_func_start ResetSerial +ResetSerial: @ 0x0800B0E4 push {lr} - bl sub_0800B050 - bl sub_0800AFF8 + bl EnableSerial + bl DisableSerial pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0800B0E4 + thumb_func_end ResetSerial - thumb_func_start sub_0800B0F4 -sub_0800B0F4: @ 0x0800B0F4 + thumb_func_start LinkMain1 +LinkMain1: @ 0x0800B0F4 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -23782,7 +23782,7 @@ _0800B118: @ jump table .4byte _0800B190 @ case 3 .4byte _0800B19A @ case 4 _0800B12C: - bl sub_0800AFF8 + bl DisableSerial ldr r1, _0800B138 movs r0, #1 strb r0, [r1, #1] @@ -23793,7 +23793,7 @@ _0800B13C: ldrb r0, [r4] cmp r0, #1 bne _0800B1A6 - bl sub_0800B050 + bl EnableSerial ldr r1, _0800B150 movs r0, #2 strb r0, [r1, #1] @@ -23806,7 +23806,7 @@ _0800B154: beq _0800B164 cmp r1, #2 beq _0800B17C - bl sub_0800B220 + bl CheckMasterOrSlave b _0800B1A6 _0800B164: ldr r2, _0800B178 @@ -23831,15 +23831,15 @@ _0800B17C: _0800B188: .4byte gUnknown_3003210 _0800B18C: .4byte 0x0400012A _0800B190: - bl sub_0800B24C + bl InitTimer ldr r1, _0800B1E0 movs r0, #4 strb r0, [r1, #1] _0800B19A: adds r0, r5, #0 - bl sub_0800B27C + bl EnqueueSendCmd adds r0, r6, #0 - bl sub_0800B364 + bl DequeueRecvCmds _0800B1A6: movs r0, #0 strb r0, [r4] @@ -23908,10 +23908,10 @@ _0800B216: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800B0F4 + thumb_func_end LinkMain1 - thumb_func_start sub_0800B220 -sub_0800B220: @ 0x0800B220 + thumb_func_start CheckMasterOrSlave +CheckMasterOrSlave: @ 0x0800B220 push {lr} ldr r0, _0800B23C ldr r1, [r0] @@ -23934,10 +23934,10 @@ _0800B244: _0800B248: pop {r0} bx r0 - thumb_func_end sub_0800B220 + thumb_func_end CheckMasterOrSlave - thumb_func_start sub_0800B24C -sub_0800B24C: @ 0x0800B24C + thumb_func_start InitTimer +InitTimer: @ 0x0800B24C push {lr} ldr r0, _0800B270 ldrb r0, [r0] @@ -23959,10 +23959,10 @@ _0800B26A: _0800B270: .4byte gUnknown_3003210 _0800B274: .4byte 0x0400010C _0800B278: .4byte 0x0000FF3B - thumb_func_end sub_0800B24C + thumb_func_end InitTimer - thumb_func_start sub_0800B27C -sub_0800B27C: @ 0x0800B27C + thumb_func_start EnqueueSendCmd +EnqueueSendCmd: @ 0x0800B27C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -24075,10 +24075,10 @@ _0800B354: .4byte gUnknown_3003200 _0800B358: .4byte 0x00000339 _0800B35C: .4byte 0x04000208 _0800B360: .4byte gUnknown_30041D4 - thumb_func_end sub_0800B27C + thumb_func_end EnqueueSendCmd - thumb_func_start sub_0800B364 -sub_0800B364: @ 0x0800B364 + thumb_func_start DequeueRecvCmds +DequeueRecvCmds: @ 0x0800B364 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -24216,10 +24216,10 @@ _0800B464: .4byte 0x00000FBC _0800B468: .4byte 0x00000FBD _0800B46C: .4byte 0x04000208 _0800B470: .4byte gUnknown_30041D4 - thumb_func_end sub_0800B364 + thumb_func_end DequeueRecvCmds - thumb_func_start sub_0800B474 -sub_0800B474: @ 0x0800B474 + thumb_func_start LinkVSync +LinkVSync: @ 0x0800B474 push {r4, lr} ldr r3, _0800B49C ldrb r4, [r3] @@ -24281,20 +24281,20 @@ _0800B4DA: bx r0 .align 2, 0 _0800B4E0: .4byte gUnknown_3000D6C - thumb_func_end sub_0800B474 + thumb_func_end LinkVSync - thumb_func_start sub_0800B4E4 -sub_0800B4E4: @ 0x0800B4E4 + thumb_func_start Timer3Intr +Timer3Intr: @ 0x0800B4E4 push {lr} bl StopTimer bl sub_0800B57C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0800B4E4 + thumb_func_end Timer3Intr - thumb_func_start sub_0800B4F4 -sub_0800B4F4: @ 0x0800B4F4 + thumb_func_start SerialCB +SerialCB: @ 0x0800B4F4 push {r4, lr} ldr r4, _0800B520 ldr r0, _0800B524 @@ -24310,15 +24310,15 @@ sub_0800B4F4: @ 0x0800B4F4 lsls r0, r1, #0x19 lsrs r0, r0, #0x1f strb r0, [r4, #0x10] - bl sub_0800B688 - bl sub_0800B7A0 - bl sub_0800B888 + bl DoRecv + bl DoSend + bl SendRecvDone b _0800B546 .align 2, 0 _0800B520: .4byte gUnknown_3003210 _0800B524: .4byte 0x04000128 _0800B528: - bl sub_0800B58C + bl DoHandshake lsls r0, r0, #0x18 cmp r0, #0 beq _0800B546 @@ -24359,7 +24359,7 @@ _0800B56C: .4byte gUnknown_3003210 _0800B570: .4byte gUnknown_3000D6C _0800B574: .4byte gUnknown_30041D0 _0800B578: .4byte 0x00000FBD - thumb_func_end sub_0800B4F4 + thumb_func_end SerialCB thumb_func_start sub_0800B57C sub_0800B57C: @ 0x0800B57C @@ -24373,8 +24373,8 @@ sub_0800B57C: @ 0x0800B57C _0800B588: .4byte 0x04000128 thumb_func_end sub_0800B57C - thumb_func_start sub_0800B58C -sub_0800B58C: @ 0x0800B58C + thumb_func_start DoHandshake +DoHandshake: @ 0x0800B58C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -24502,10 +24502,10 @@ _0800B67A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800B58C + thumb_func_end DoHandshake - thumb_func_start sub_0800B688 -sub_0800B688: @ 0x0800B688 + thumb_func_start DoRecv +DoRecv: @ 0x0800B688 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -24651,10 +24651,10 @@ _0800B78C: .align 2, 0 _0800B798: .4byte gUnknown_3000D70 _0800B79C: .4byte 0x00000FBD - thumb_func_end sub_0800B688 + thumb_func_end DoRecv - thumb_func_start sub_0800B7A0 -sub_0800B7A0: @ 0x0800B7A0 + thumb_func_start DoSend +DoSend: @ 0x0800B7A0 push {r4, lr} ldr r0, _0800B7DC ldrb r1, [r0, #0x16] @@ -24745,7 +24745,7 @@ _0800B848: bx r0 .align 2, 0 _0800B850: .4byte 0x0400012A - thumb_func_end sub_0800B7A0 + thumb_func_end DoSend thumb_func_start StopTimer StopTimer: @ 0x0800B854 @@ -24774,8 +24774,8 @@ _0800B880: .4byte 0x0400010C _0800B884: .4byte 0x0000FF3B thumb_func_end StopTimer - thumb_func_start sub_0800B888 -sub_0800B888: @ 0x0800B888 + thumb_func_start SendRecvDone +SendRecvDone: @ 0x0800B888 push {lr} ldr r1, _0800B89C ldrb r0, [r1, #0x17] @@ -24801,7 +24801,7 @@ _0800B8B0: bx r0 .align 2, 0 _0800B8B4: .4byte 0x0400010E - thumb_func_end sub_0800B888 + thumb_func_end SendRecvDone thumb_func_start ResetSendBuffer ResetSendBuffer: @ 0x0800B8B8 @@ -24948,8 +24948,8 @@ _0800B9C0: .4byte 0x00008001 _0800B9C4: .4byte gUnknown_30041E0 thumb_func_end sub_0800B97C - thumb_func_start sub_0800B9C8 -sub_0800B9C8: @ 0x0800B9C8 + thumb_func_start rfu_REQ_sendData_wrapper +rfu_REQ_sendData_wrapper: @ 0x0800B9C8 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -24980,7 +24980,7 @@ _0800B9F8: bx r0 .align 2, 0 _0800BA04: .4byte gUnknown_30041E0 - thumb_func_end sub_0800B9C8 + thumb_func_end rfu_REQ_sendData_wrapper thumb_func_start sub_0800BA08 sub_0800BA08: @ 0x0800BA08 @@ -25774,8 +25774,8 @@ _0800BFE4: .4byte gUnknown_3007630 _0800BFE8: .4byte gUnknown_30041E0 thumb_func_end sub_0800BE28 - thumb_func_start sub_0800BFEC -sub_0800BFEC: @ 0x0800BFEC + thumb_func_start rfu_syncVBlank_ +rfu_syncVBlank_: @ 0x0800BFEC push {lr} bl rfu_syncVBlank lsls r0, r0, #0x10 @@ -25788,7 +25788,7 @@ sub_0800BFEC: @ 0x0800BFEC _0800C004: pop {r0} bx r0 - thumb_func_end sub_0800BFEC + thumb_func_end rfu_syncVBlank_ thumb_func_start sub_0800C008 sub_0800C008: @ 0x0800C008 @@ -29139,7 +29139,7 @@ _0800D894: ands r4, r1 orrs r4, r0 strb r4, [r7] - bl sub_0809CD04 + bl IsNationalPokedexEnabled ands r0, r6 ldrb r1, [r7, #1] ands r5, r1 @@ -29324,8 +29324,8 @@ _0800DA78: .4byte gUnknown_20227CC _0800DA7C: .4byte gUnknown_20227DA thumb_func_end sub_0800DA5C - thumb_func_start sub_0800DA80 -sub_0800DA80: @ 0x0800DA80 + thumb_func_start CreateWirelessStatusIndicatorSprite +CreateWirelessStatusIndicatorSprite: @ 0x0800DA80 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -29346,7 +29346,7 @@ _0800DA96: ldr r0, _0800DADC adds r1, r3, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -29380,7 +29380,7 @@ _0800DAF0: ldr r0, _0800DB3C adds r1, r3, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0800DB40 strb r0, [r4] ldr r5, _0800DB44 @@ -29420,10 +29420,10 @@ _0800DB40: .4byte gUnknown_20227C8 _0800DB44: .4byte gUnknown_20205AC _0800DB48: .4byte 0x00001234 _0800DB4C: .4byte gUnknown_82C0330 - thumb_func_end sub_0800DA80 + thumb_func_end CreateWirelessStatusIndicatorSprite - thumb_func_start sub_0800DB50 -sub_0800DB50: @ 0x0800DB50 + thumb_func_start DestroyWirelessStatusIndicatorSprite +DestroyWirelessStatusIndicatorSprite: @ 0x0800DB50 push {r4, lr} ldr r4, _0800DB9C ldr r3, _0800DBA0 @@ -29468,10 +29468,10 @@ _0800DBA4: .4byte 0x00001234 _0800DBA8: .4byte gUnknown_3002360 _0800DBAC: .4byte gUnknown_82BF2F8 _0800DBB0: .4byte 0x070003E8 - thumb_func_end sub_0800DB50 + thumb_func_end DestroyWirelessStatusIndicatorSprite - thumb_func_start sub_0800DBB4 -sub_0800DBB4: @ 0x0800DBB4 + thumb_func_start LoadWirelessStatusIndicatorSpriteGfx +LoadWirelessStatusIndicatorSpriteGfx: @ 0x0800DBB4 push {r4, lr} ldr r4, _0800DBE0 ldrh r0, [r4, #6] @@ -29481,7 +29481,7 @@ sub_0800DBB4: @ 0x0800DBB4 cmp r0, r1 bne _0800DBCC adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet _0800DBCC: ldr r0, _0800DBE8 bl LoadSpritePalette @@ -29496,7 +29496,7 @@ _0800DBE0: .4byte gUnknown_82C0330 _0800DBE4: .4byte 0xFFFF0000 _0800DBE8: .4byte gUnknown_82C0338 _0800DBEC: .4byte gUnknown_20227C8 - thumb_func_end sub_0800DBB4 + thumb_func_end LoadWirelessStatusIndicatorSpriteGfx thumb_func_start sub_0800DBF0 sub_0800DBF0: @ 0x0800DBF0 @@ -29607,7 +29607,7 @@ _0800DC94: lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _0800DCB2: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #1 @@ -29786,7 +29786,7 @@ _0800DD7E: lsrs r0, r0, #0x18 cmp r0, #1 bne _0800DE12 - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite _0800DE12: pop {r3} mov r8, r3 @@ -29806,8 +29806,8 @@ _0800DE3C: .4byte 0xFFFFFC00 _0800DE40: .4byte 0x070003E8 thumb_func_end sub_0800DC40 - thumb_func_start sub_0800DE44 -sub_0800DE44: @ 0x0800DE44 + thumb_func_start CopyTrainerRecord +CopyTrainerRecord: @ 0x0800DE44 push {lr} stm r0!, {r1} adds r1, r2, #0 @@ -29815,7 +29815,7 @@ sub_0800DE44: @ 0x0800DE44 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0800DE44 + thumb_func_end CopyTrainerRecord thumb_func_start NameIsNotEmpty NameIsNotEmpty: @ 0x0800DE54 @@ -29840,8 +29840,8 @@ _0800DE6E: .align 2, 0 thumb_func_end NameIsNotEmpty - thumb_func_start sub_0800DE74 -sub_0800DE74: @ 0x0800DE74 + thumb_func_start RecordMixTrainerNames +RecordMixTrainerNames: @ 0x0800DE74 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -29855,7 +29855,7 @@ sub_0800DE74: @ 0x0800DE74 b _0800DFE8 _0800DE8A: movs r0, #0xf0 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0x14] movs r4, #0 b _0800DF00 @@ -29914,7 +29914,7 @@ _0800DEF4: ble _0800DEC8 mov r4, sb _0800DF00: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -29936,7 +29936,7 @@ _0800DF28: .4byte 0x00003B98 _0800DF2C: .4byte gUnknown_3005AEC _0800DF30: .4byte gUnknown_20226A0 _0800DF34: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -29947,7 +29947,7 @@ _0800DF34: ldrh r1, [r0] adds r0, r5, #0 mov r2, sb - bl sub_0800DE44 + bl CopyTrainerRecord ldr r2, [r6] cmp r2, #0 blt _0800DF6A @@ -29971,7 +29971,7 @@ _0800DF6E: add r8, r1 adds r4, #1 _0800DF78: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -30003,7 +30003,7 @@ _0800DF98: adds r2, r2, r6 adds r2, #4 adds r0, r5, #0 - bl sub_0800DE44 + bl CopyTrainerRecord adds r5, #0xc adds r7, #1 cmp r7, #0x13 @@ -30024,7 +30024,7 @@ _0800DFD2: movs r2, #0xf0 bl memcpy ldr r0, [sp, #0x14] - bl sub_08000BF0 + bl Free _0800DFE8: add sp, #0x20 pop {r3, r4, r5} @@ -30038,7 +30038,7 @@ _0800DFE8: _0800DFF8: .4byte gUnknown_3005AEC _0800DFFC: .4byte 0x00003B9C _0800E000: .4byte 0x00003B98 - thumb_func_end sub_0800DE74 + thumb_func_end RecordMixTrainerNames thumb_func_start sub_0800E004 sub_0800E004: @ 0x0800E004 @@ -30098,8 +30098,8 @@ _0800E062: .align 2, 0 thumb_func_end sub_0800E004 - thumb_func_start sub_0800E070 -sub_0800E070: @ 0x0800E070 + thumb_func_start WipeTrainerNameRecords +WipeTrainerNameRecords: @ 0x0800E070 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -30138,7 +30138,7 @@ _0800E084: _0800E0B4: .4byte 0x00003B98 _0800E0B8: .4byte gUnknown_3005AEC _0800E0BC: .4byte 0x01000004 - thumb_func_end sub_0800E070 + thumb_func_end WipeTrainerNameRecords thumb_func_start sub_0800E0C0 sub_0800E0C0: @ 0x0800E0C0 @@ -30408,9 +30408,9 @@ _0800E2EC: strh r1, [r0, #0xa] ldr r0, _0800E33C movs r1, #5 - bl sub_080A8878 + bl CreateTask adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0800E326: pop {r4, r5} pop {r0} @@ -30648,7 +30648,7 @@ _0800E4E0: movs r1, #2 strb r1, [r0] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask b _0800E55E .align 2, 0 _0800E4F8: .4byte gUnknown_30050A0 @@ -30683,7 +30683,7 @@ _0800E500: movs r1, #8 strh r1, [r0, #0xa] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r4, _0800E570 ldrb r0, [r4, #0xf] cmp r0, #0 @@ -30695,7 +30695,7 @@ _0800E500: _0800E556: ldr r0, _0800E574 movs r1, #5 - bl sub_080A8878 + bl CreateTask _0800E55E: pop {r4, r5, r6, r7} pop {r0} @@ -30891,7 +30891,7 @@ _0800E6FC: bne _0800E7BA strb r0, [r6, #0xc] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _0800E744 lsls r1, r5, #2 adds r1, r1, r5 @@ -30903,7 +30903,7 @@ _0800E6FC: beq _0800E74C ldr r0, _0800E748 movs r1, #1 - bl sub_080A8878 + bl CreateTask b _0800E7BA .align 2, 0 _0800E740: .4byte 0x000008F6 @@ -30912,7 +30912,7 @@ _0800E748: .4byte sub_080107FC _0800E74C: ldr r0, _0800E758 movs r1, #5 - bl sub_080A8878 + bl CreateTask b _0800E7BA .align 2, 0 _0800E758: .4byte sub_0801034C @@ -30950,13 +30950,13 @@ _0800E770: strb r4, [r6, #0xc] ldr r0, _0800E7CC movs r1, #5 - bl sub_080A8878 + bl CreateTask movs r1, #0x9a lsls r1, r1, #4 adds r0, r6, r1 strb r4, [r0] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0800E7BA: pop {r4, r5, r6} pop {r0} @@ -30982,14 +30982,14 @@ sub_0800E7D0: @ 0x0800E7D0 _0800E7E4: .4byte gUnknown_82C0430 thumb_func_end sub_0800E7D0 - thumb_func_start sub_0800E7E8 -sub_0800E7E8: @ 0x0800E7E8 + thumb_func_start SaveSuccessCallback +SaveSuccessCallback: @ 0x0800E7E8 push {lr} movs r0, #0 bl sub_0800BD38 pop {r0} bx r0 - thumb_func_end sub_0800E7E8 + thumb_func_end SaveSuccessCallback thumb_func_start sub_0800E7F4 sub_0800E7F4: @ 0x0800E7F4 @@ -31033,14 +31033,14 @@ _0800E7FE: ldrh r0, [r1, #6] adds r0, #1 strh r0, [r1, #6] - bl sub_0800EB08 + bl BattleAICmd_if_in_hwords ldrb r0, [r4] bl rfu_UNI_readySendData ldrb r0, [r4] bl rfu_UNI_clearRecvNewDataFlag _0800E858: movs r0, #1 - bl sub_0800B9C8 + bl rfu_REQ_sendData_wrapper pop {r4} pop {r0} bx r0 @@ -31085,7 +31085,7 @@ _0800E8B0: bne _0800E8D8 ldr r0, _0800E8D4 _0800E8B6: - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -31093,7 +31093,7 @@ _0800E8B6: adds r0, r4, #0 adds r0, #0x67 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask bl sub_0800E0C8 b _0800E8F8 .align 2, 0 @@ -31102,7 +31102,7 @@ _0800E8D8: cmp r0, #2 bne _0800E8F8 ldr r0, _0800E930 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -31110,7 +31110,7 @@ _0800E8D8: adds r0, r4, #0 adds r0, #0x67 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask bl sub_0800E0C8 _0800E8F8: movs r5, #0 @@ -31120,16 +31120,16 @@ _0800E8FC: adds r0, r0, r6 ldr r4, [r0] adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _0800E91E adds r0, r4, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0800E91E: adds r0, r5, #1 lsls r0, r0, #0x18 @@ -31149,7 +31149,7 @@ sub_0800E938: @ 0x0800E938 push {lr} ldr r0, _0800E94C movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r1, _0800E950 adds r1, #0x67 strb r0, [r1] @@ -31226,7 +31226,7 @@ sub_0800E9C0: @ 0x0800E9C0 push {lr} ldr r0, _0800E9D4 movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r1, _0800E9D8 adds r1, #0x67 strb r0, [r1] @@ -31415,8 +31415,8 @@ _0800EB00: .4byte gUnknown_30031B0 _0800EB04: .4byte gUnknown_3003130 thumb_func_end sub_0800EAD4 - thumb_func_start sub_0800EB08 -sub_0800EB08: @ 0x0800EB08 + thumb_func_start BattleAICmd_if_in_hwords +BattleAICmd_if_in_hwords: @ 0x0800EB08 push {r4, r5, lr} ldr r4, _0800EB68 ldr r0, _0800EB6C @@ -31469,10 +31469,10 @@ _0800EB68: .4byte gUnknown_30050A0 _0800EB6C: .4byte 0x000008F4 _0800EB70: .4byte 0x000008D4 _0800EB74: .4byte 0x000008F2 - thumb_func_end sub_0800EB08 + thumb_func_end BattleAICmd_if_in_hwords - thumb_func_start sub_0800EB78 -sub_0800EB78: @ 0x0800EB78 + thumb_func_start IsRfuRecvQueueEmpty +IsRfuRecvQueueEmpty: @ 0x0800EB78 push {r4, lr} ldr r0, _0800EB88 ldr r0, [r0] @@ -31509,7 +31509,7 @@ _0800EBAC: bx r1 .align 2, 0 _0800EBB4: .4byte gUnknown_3003130 - thumb_func_end sub_0800EB78 + thumb_func_end IsRfuRecvQueueEmpty thumb_func_start sub_0800EBB8 sub_0800EBB8: @ 0x0800EBB8 @@ -31521,7 +31521,7 @@ sub_0800EBB8: @ 0x0800EBB8 bl rfu_REQ_recvData bl rfu_waitREQComplete movs r0, #0 - bl sub_0800B9C8 + bl rfu_REQ_sendData_wrapper b _0800EC92 .align 2, 0 _0800EBD4: .4byte gUnknown_30050A0 @@ -31595,7 +31595,7 @@ _0800EC68: ldrb r0, [r0] bl rfu_UNI_readySendData movs r0, #1 - bl sub_0800B9C8 + bl rfu_REQ_sendData_wrapper b _0800EC8C .align 2, 0 _0800EC80: .4byte gUnknown_30050A0 @@ -31896,7 +31896,7 @@ _0800EE96: strb r0, [r1] ldr r0, _0800EF00 movs r1, #0 - bl sub_080A8878 + bl CreateTask b _0800EF12 .align 2, 0 _0800EEE0: .4byte gUnknown_30050A0 @@ -32141,7 +32141,7 @@ _0800F0B4: cmp r1, #6 bls _0800F0B4 _0800F0C4: - bl sub_0800EB78 + bl IsRfuRecvQueueEmpty add sp, #0x58 pop {r3} mov r8, r3 @@ -32349,8 +32349,8 @@ _0800F24C: .4byte 0x00000996 _0800F250: .4byte 0x000008F6 thumb_func_end sub_0800F20C - thumb_func_start sub_0800F254 -sub_0800F254: @ 0x0800F254 + thumb_func_start rfu_func_080F97B8 +rfu_func_080F97B8: @ 0x0800F254 push {lr} ldr r0, _0800F28C ldrb r0, [r0] @@ -32383,7 +32383,7 @@ _0800F28C: .4byte gUnknown_30031C4 _0800F290: .4byte gUnknown_3005B08 _0800F294: .4byte gUnknown_3002354 _0800F298: .4byte gUnknown_3000D78 - thumb_func_end sub_0800F254 + thumb_func_end rfu_func_080F97B8 thumb_func_start sub_0800F29C sub_0800F29C: @ 0x0800F29C @@ -32409,7 +32409,7 @@ _0800F2B4: bx r1 .align 2, 0 _0800F2BC: .4byte gUnknown_30050A0 -_0800F2C0: .4byte sub_0800F254 +_0800F2C0: .4byte rfu_func_080F97B8 thumb_func_end IsSendingKeysToRfu thumb_func_start sub_0800F2C4 @@ -32435,7 +32435,7 @@ _0800F2E4: .4byte gUnknown_30050A0 _0800F2E8: .4byte gUnknown_82C053C _0800F2EC: .4byte 0x000005E6 _0800F2F0: .4byte gUnknown_82C0544 -_0800F2F4: .4byte sub_0800F254 +_0800F2F4: .4byte rfu_func_080F97B8 thumb_func_end sub_0800F2C4 thumb_func_start sub_0800F2F8 @@ -32454,11 +32454,11 @@ sub_0800F304: @ 0x0800F304 movs r0, #0x88 lsls r0, r0, #7 bl sub_0800F7F8 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0800F320 - bl sub_08082734 + bl GetBlenderArrowPosition ldr r1, _0800F32C strh r0, [r1, #0xc] _0800F320: @@ -33352,7 +33352,7 @@ _0800F9C8: rsbs r4, r0, #0 orrs r4, r0 lsrs r4, r4, #0x1f - bl sub_0800A02C + bl GetMultiplayerId adds r1, r5, #0 adds r1, #0x7d strb r0, [r1] @@ -33407,11 +33407,11 @@ _0800FA32: .align 2, 0 _0800FA40: .4byte gUnknown_202257C _0800FA44: .4byte gUnknown_30050A0 -_0800FA48: .4byte sub_0800FA4C +_0800FA48: .4byte rfufunc_80F9F44 thumb_func_end sub_0800F968 - thumb_func_start sub_0800FA4C -sub_0800FA4C: @ 0x0800FA4C + thumb_func_start rfufunc_80F9F44 +rfufunc_80F9F44: @ 0x0800FA4C push {r4, r5, lr} ldr r0, _0800FA7C ldrh r0, [r0] @@ -33439,7 +33439,7 @@ sub_0800FA4C: @ 0x0800FA4C _0800FA7C: .4byte gUnknown_30031B0 _0800FA80: .4byte gUnknown_30050A0 _0800FA84: - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _0800FAA8 lsls r0, r0, #0x18 lsrs r0, r0, #0x14 @@ -33460,7 +33460,7 @@ _0800FAA0: .align 2, 0 _0800FAA8: .4byte gUnknown_3003130 _0800FAAC: .4byte sub_0800FAB0 - thumb_func_end sub_0800FA4C + thumb_func_end rfufunc_80F9F44 thumb_func_start sub_0800FAB0 sub_0800FAB0: @ 0x0800FAB0 @@ -33522,11 +33522,11 @@ _0800FB14: .align 2, 0 _0800FB1C: .4byte gUnknown_30050A0 _0800FB20: .4byte gUnknown_30031B0 -_0800FB24: .4byte sub_0800FB28 +_0800FB24: .4byte rfufunc_80FA020 thumb_func_end sub_0800FAB0 - thumb_func_start sub_0800FB28 -sub_0800FB28: @ 0x0800FB28 + thumb_func_start rfufunc_80FA020 +rfufunc_80FA020: @ 0x0800FB28 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -33534,7 +33534,7 @@ sub_0800FB28: @ 0x0800FB28 ldr r5, _0800FBD0 ldr r0, [r5, #0x70] mov r8, r0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r5, #0xc] @@ -33632,7 +33632,7 @@ _0800FBF4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0800FB28 + thumb_func_end rfufunc_80FA020 thumb_func_start sub_0800FC00 sub_0800FC00: @ 0x0800FC00 @@ -33716,8 +33716,8 @@ _0800FC8C: _0800FC94: .4byte sub_0800FC48 thumb_func_end sub_0800FC68 - thumb_func_start sub_0800FC98 -sub_0800FC98: @ 0x0800FC98 + thumb_func_start OpponentHandleEndBounceEffect +OpponentHandleEndBounceEffect: @ 0x0800FC98 push {lr} bl sub_0800D0EC ldr r2, _0800FCBC @@ -33740,7 +33740,7 @@ _0800FCBC: .4byte gUnknown_30050A0 _0800FCC0: .4byte 0x0000099C _0800FCC4: .4byte gUnknown_3007630 _0800FCC8: .4byte 0x0000099B - thumb_func_end sub_0800FC98 + thumb_func_end OpponentHandleEndBounceEffect thumb_func_start sub_0800FCCC sub_0800FCCC: @ 0x0800FCCC @@ -33839,7 +33839,7 @@ sub_0800FD64: @ 0x0800FD64 ldr r0, _0800FD90 str r0, [r2] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask _0800FD84: pop {r0} bx r0 @@ -33849,30 +33849,30 @@ _0800FD8C: .4byte 0x00000991 _0800FD90: .4byte sub_0800FD2C thumb_func_end sub_0800FD64 - thumb_func_start sub_0800FD94 -sub_0800FD94: @ 0x0800FD94 + thumb_func_start task_add_05_task_del_08FA224_when_no_RfuFunc +task_add_05_task_del_08FA224_when_no_RfuFunc: @ 0x0800FD94 push {r4, lr} ldr r4, _0800FDB4 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0800FDAC adds r0, r4, #0 movs r1, #5 - bl sub_080A8878 + bl CreateTask _0800FDAC: pop {r4} pop {r0} bx r0 .align 2, 0 _0800FDB4: .4byte sub_0800FD64 - thumb_func_end sub_0800FD94 + thumb_func_end task_add_05_task_del_08FA224_when_no_RfuFunc thumb_func_start sub_0800FDB8 sub_0800FDB8: @ 0x0800FDB8 push {r4, r5, lr} - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _0800FDE6 @@ -33893,7 +33893,7 @@ sub_0800FDB8: @ 0x0800FDB8 bl sub_0800F7F8 strh r4, [r5] _0800FDE6: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r1, #0 @@ -33985,7 +33985,7 @@ _0800FE8C: .4byte sub_0800FDB8 thumb_func_start sub_0800FE90 sub_0800FE90: @ 0x0800FE90 push {r4, lr} - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _0800FECC @@ -34010,7 +34010,7 @@ _0800FEC0: .4byte 0x0000069E _0800FEC4: .4byte gUnknown_30031B0 _0800FEC8: .4byte sub_0800FDB8 _0800FECC: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r1, #1 @@ -34156,8 +34156,8 @@ _0800FFC8: .4byte gUnknown_30050A0 _0800FFCC: .4byte 0x00000991 thumb_func_end sub_0800FFB0 - thumb_func_start sub_0800FFD0 -sub_0800FFD0: @ 0x0800FFD0 + thumb_func_start rfu_get_multiplayer_id +rfu_get_multiplayer_id: @ 0x0800FFD0 push {lr} ldr r1, _0800FFE4 ldrb r0, [r1, #0xc] @@ -34176,7 +34176,7 @@ _0800FFEE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0800FFD0 + thumb_func_end rfu_get_multiplayer_id thumb_func_start sub_0800FFF4 sub_0800FFF4: @ 0x0800FFF4 @@ -34654,7 +34654,7 @@ sub_0801034C: @ 0x0801034C movs r0, #0 strb r0, [r1] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08010374: ldr r2, _080103A0 lsls r1, r6, #2 @@ -34695,7 +34695,7 @@ _080103B6: bne _080103C2 b _080104D4 _080103C2: - bl sub_0800A178 + bl ResetBlockReceivedFlags bl sub_0800AE24 b _08010448 _080103CC: @@ -34795,7 +34795,7 @@ _0801046E: _08010480: .4byte gUnknown_3005B60 _08010484: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _080104DC movs r0, #1 strb r0, [r1] @@ -34937,7 +34937,7 @@ sub_08010568: @ 0x08010568 adds r1, r4, #0 bl CpuSet movs r0, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag _08010594: add sp, #4 pop {r4, r5} @@ -34979,7 +34979,7 @@ sub_080105A4: @ 0x080105A4 movs r0, #0 strb r0, [r1] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080105E2: ldr r0, _08010614 lsls r2, r6, #2 @@ -35021,7 +35021,7 @@ _08010634: b _080107E2 _0801063E: adds r0, r4, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag movs r0, #0xf0 lsls r0, r0, #7 bl sub_0800F7F8 @@ -35042,7 +35042,7 @@ _0801065E: .align 2, 0 _08010668: .4byte gUnknown_30031B0 _0801066C: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 asrs r0, r4 @@ -35053,7 +35053,7 @@ _0801066C: b _080107E2 _08010680: adds r0, r4, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag lsls r1, r4, #8 ldr r0, _080106A8 adds r1, r1, r0 @@ -35139,7 +35139,7 @@ _08010710: ldr r1, _0801074C movs r0, #0 movs r2, #0xa0 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _080107E2 @@ -35177,11 +35177,11 @@ _08010764: .align 2, 0 _08010780: .4byte 0x0000099D _08010784: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080107E2 - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #1 ands r1, r0 cmp r1, #0 @@ -35193,7 +35193,7 @@ _08010784: ldr r2, _080107F0 bl CpuSet movs r0, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag ldr r1, _080107F4 movs r2, #0x9a lsls r2, r2, #4 @@ -35220,7 +35220,7 @@ _080107CC: ble _080107CC _080107DC: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080107E2: add sp, #4 pop {r4, r5, r6, r7} @@ -35248,7 +35248,7 @@ sub_080107FC: @ 0x080107FC cmp r0, #1 bhi _0801081A adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0801081A: ldr r1, _0801083C lsls r0, r5, #2 @@ -35279,12 +35279,12 @@ _08010846: ldr r1, _0801085C movs r0, #0 movs r2, #0x3c - bl sub_0800A070 + bl SendBlock b _0801086A .align 2, 0 _0801085C: .4byte gUnknown_202257C _08010860: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08010896 @@ -35294,7 +35294,7 @@ _0801086A: strh r0, [r4, #8] b _08010896 _08010872: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r4, #1 adds r1, r4, #0 ands r1, r0 @@ -35303,11 +35303,11 @@ _08010872: ldr r0, _0801089C bl sub_08010514 movs r0, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag ldr r0, _080108A0 strb r4, [r0] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08010896: pop {r4, r5, r6} pop {r0} @@ -35347,7 +35347,7 @@ _080108CE: _080108D4: ldr r4, _08010940 adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08010934 str r4, [r0, #8] ldr r5, _0801092C @@ -35383,15 +35383,15 @@ _08010910: ldrb r1, [r0] movs r1, #2 strb r1, [r0] - bl sub_08009384 + bl CloseLink b _0801097E .align 2, 0 _0801092C: .4byte gUnknown_30050A0 _08010930: .4byte gUnknown_30041E0 _08010934: .4byte gUnknown_3002360 -_08010938: .4byte sub_08017ED0 +_08010938: .4byte c2_mystery_gift_e_reader_run _0801093C: .4byte gUnknown_300319C -_08010940: .4byte sub_0800AA0C +_08010940: .4byte CB2_LinkError _08010944: .4byte 0x0000069E _08010948: .4byte 0x000008D2 _0801094C: @@ -35429,8 +35429,8 @@ _08010988: .4byte 0x0000069F _0801098C: .4byte gUnknown_30041E0 thumb_func_end sub_080108A4 - thumb_func_start sub_08010990 -sub_08010990: @ 0x08010990 + thumb_func_start rfu_REQ_recvData_then_sendData +rfu_REQ_recvData_then_sendData: @ 0x08010990 push {lr} ldr r0, _080109AC ldrb r0, [r0, #6] @@ -35439,13 +35439,13 @@ sub_08010990: @ 0x08010990 bl rfu_REQ_recvData bl rfu_waitREQComplete movs r0, #0 - bl sub_0800B9C8 + bl rfu_REQ_sendData_wrapper _080109A8: pop {r0} bx r0 .align 2, 0 _080109AC: .4byte gUnknown_30041E0 - thumb_func_end sub_08010990 + thumb_func_end rfu_REQ_recvData_then_sendData thumb_func_start sub_080109B0 sub_080109B0: @ 0x080109B0 @@ -35487,7 +35487,7 @@ _080109F8: adds r5, r0, #0 b _08010A04 _08010A00: - bl sub_08010990 + bl rfu_REQ_recvData_then_sendData _08010A04: adds r0, r5, #0 pop {r4, r5} @@ -35673,7 +35673,7 @@ _08010B38: strb r0, [r1, #3] adds r4, #1 _08010B44: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -36781,7 +36781,7 @@ _08011374: strb r0, [r1] ldr r0, _0801139C movs r1, #2 - bl sub_080A8878 + bl CreateTask b _08011532 .align 2, 0 _08011394: .4byte gUnknown_30050A0 @@ -36923,7 +36923,7 @@ _080114A4: cmp r0, #0 bne _080114CA ldr r0, _080114E4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -37052,19 +37052,19 @@ sub_0801158C: @ 0x0801158C _08011598: .4byte gUnknown_30050A0 thumb_func_end sub_0801158C - thumb_func_start sub_0801159C -sub_0801159C: @ 0x0801159C + thumb_func_start Rfu_IsMaster +Rfu_IsMaster: @ 0x0801159C ldr r0, _080115A4 ldrb r0, [r0, #0xc] bx lr .align 2, 0 _080115A4: .4byte gUnknown_30050A0 - thumb_func_end sub_0801159C + thumb_func_end Rfu_IsMaster thumb_func_start sub_080115A8 sub_080115A8: @ 0x080115A8 push {lr} - bl sub_0800BFEC + bl rfu_syncVBlank_ pop {r0} bx r0 .align 2, 0 @@ -37091,24 +37091,24 @@ _080115D0: .4byte 0x05000014 thumb_func_start sub_080115D4 sub_080115D4: @ 0x080115D4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080115D4 - thumb_func_start sub_080115E8 -sub_080115E8: @ 0x080115E8 + thumb_func_start atk57 +atk57: @ 0x080115E8 push {r4, lr} bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks bl ResetPaletteFade ldr r0, _08011664 - bl sub_080006F0 - bl sub_08008F68 + bl SetVBlankCallback + bl LoadHeldItemIcons lsls r0, r0, #0x18 cmp r0, #0 beq _0801165C @@ -37117,10 +37117,10 @@ sub_080115E8: @ 0x080115E8 adds r0, r2, #0 strh r0, [r1] bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink ldr r0, _08011670 ldrh r0, [r0, #0x24] - bl sub_0806F07C + bl SeedRng movs r4, #0 _08011624: bl Random @@ -37136,13 +37136,13 @@ _08011624: lsls r1, r1, #5 movs r0, #0 bl SetGpuReg - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade bl sub_08011690 ldr r0, _08011678 - bl sub_08000540 + bl SetMainCallback2 _0801165C: pop {r4} pop {r0} @@ -37154,13 +37154,13 @@ _0801166C: .4byte 0x00001111 _08011670: .4byte gUnknown_3002360 _08011674: .4byte gUnknown_3005AF0 _08011678: .4byte sub_080116E4 - thumb_func_end sub_080115E8 + thumb_func_end atk57 thumb_func_start sub_0801167C sub_0801167C: @ 0x0801167C push {lr} ldr r0, _0801168C - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -37174,13 +37174,13 @@ sub_08011690: @ 0x08011690 push {r4, lr} ldr r4, _080116B4 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080116AE adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, _080116B8 adds r1, #0x66 strb r0, [r1] @@ -37197,7 +37197,7 @@ _080116B8: .4byte gUnknown_30050A0 sub_080116BC: @ 0x080116BC push {lr} ldr r0, _080116DC - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -37205,7 +37205,7 @@ sub_080116BC: @ 0x080116BC ldr r0, _080116E0 adds r0, #0x66 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask _080116D6: pop {r0} bx r0 @@ -37217,10 +37217,10 @@ _080116E0: .4byte gUnknown_30050A0 thumb_func_start sub_080116E4 sub_080116E4: @ 0x080116E4 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -37304,7 +37304,7 @@ sub_08011770: @ 0x08011770 strh r0, [r2, #0x12] ldr r0, _080117C0 movs r1, #1 - bl sub_080A8878 + bl CreateTask adds r4, #0x67 strb r0, [r4] pop {r4, r5, r6, r7} @@ -37539,7 +37539,7 @@ sub_08011918: @ 0x08011918 ldrb r0, [r5, #0xd] strh r0, [r6, #6] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08011968: pop {r4, r5, r6} pop {r0} @@ -37558,14 +37558,14 @@ sub_08011980: @ 0x08011980 adds r6, r1, #0 ldr r5, _080119B0 adds r0, r5, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff bne _080119B8 adds r0, r5, #0 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080119B4 @@ -37667,7 +37667,7 @@ _08011A48: bl sub_08011554 _08011A70: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask b _08011A96 _08011A78: ldrh r0, [r4, #0x1e] @@ -37695,7 +37695,7 @@ _08011A96: movs r0, #2 bl sub_08011554 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08011AAE: pop {r4, r5, r6} pop {r0} @@ -37714,7 +37714,7 @@ sub_08011AB4: @ 0x08011AB4 strb r1, [r0] ldr r0, _08011AF0 movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -37828,7 +37828,7 @@ sub_08011B88: @ 0x08011B88 cmp r0, #4 bne _08011BA6 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08011BA6: ldr r1, _08011C44 lsls r0, r5, #2 @@ -37848,7 +37848,7 @@ _08011BA6: movs r0, #2 bl sub_08011554 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08011BD0: ldr r1, _08011C48 adds r0, r6, r1 @@ -37899,7 +37899,7 @@ _08011BD0: movs r0, #0xa strh r0, [r6, #4] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _08011C68 .align 2, 0 _08011C40: .4byte gUnknown_30050A0 @@ -37914,7 +37914,7 @@ _08011C58: movs r0, #2 bl sub_08011554 mov r0, r8 - bl sub_080A8964 + bl DestroyTask _08011C68: pop {r3} mov r8, r3 @@ -37952,7 +37952,7 @@ sub_08011C74: @ 0x08011C74 bl sub_0800D114 ldr r0, _08011CF0 movs r1, #2 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _08011CF4 @@ -37962,7 +37962,7 @@ sub_08011C74: @ 0x08011C74 adds r1, r1, r5 strh r4, [r1, #0xa] ldr r0, _08011CF8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r2, r1, #0 @@ -38078,7 +38078,7 @@ sub_08011D88: @ 0x08011D88 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x1c @@ -38376,7 +38376,7 @@ sub_08011FD8: @ 0x08011FD8 lsrs r5, r2, #0x18 adds r0, r6, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer lsls r4, r4, #8 movs r0, #0x90 lsls r0, r0, #6 @@ -38463,7 +38463,7 @@ _08012074: _08012092: adds r0, r6, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #8 pop {r4, r5, r6} pop {r0} @@ -38585,7 +38585,7 @@ _08012150: @ jump table _080121C0: ldr r0, _080121CC ldr r1, _080121D0 - bl sub_08008BCC + bl StringExpandPlaceholders _080121C8: pop {r0} bx r0 @@ -38638,12 +38638,12 @@ _0801223E: .align 2, 0 thumb_func_end sub_080121D4 - thumb_func_start sub_08012244 -sub_08012244: @ 0x08012244 + thumb_func_start BerryBlenderLinkBecomeLeader +BerryBlenderLinkBecomeLeader: @ 0x08012244 push {lr} ldr r0, _08012274 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08012278 @@ -38668,7 +38668,7 @@ _08012278: .4byte gUnknown_20228E4 _0801227C: .4byte gUnknown_3005B68 _08012280: .4byte gUnknown_3000DA0 _08012284: .4byte gUnknown_2037290 - thumb_func_end sub_08012244 + thumb_func_end BerryBlenderLinkBecomeLeader thumb_func_start sub_08012288 sub_08012288: @ 0x08012288 @@ -38760,7 +38760,7 @@ _0801234C: movs r2, #0 bl sub_08010A74 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink ldrb r1, [r4] movs r0, #0xf ands r0, r1 @@ -38777,13 +38777,13 @@ _0801239C: .4byte gUnknown_82C1FCC _080123A0: .4byte gUnknown_20228E1 _080123A4: movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r5, #4] movs r0, #0xa0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #0xa0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5, #8] ldr r0, [r5, #4] movs r1, #4 @@ -38819,7 +38819,7 @@ _080123A4: bl sub_08016AD0 strb r0, [r5, #0x17] ldr r0, _08012424 - bl sub_08003250 + bl AddWindow strb r0, [r5, #0x10] ldr r0, _08012428 ldrb r0, [r0] @@ -38843,15 +38843,15 @@ _08012430: .4byte gUnknown_82C2024 _08012434: ldr r0, _080124B8 _08012436: - bl sub_08003250 + bl AddWindow strb r0, [r5, #0xf] _0801243C: ldr r0, _080124BC - bl sub_08003250 + bl AddWindow strb r0, [r5, #0x11] ldrb r0, [r5, #0x10] movs r1, #0x22 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #0x10] ldr r2, _080124C0 movs r1, #2 @@ -38862,10 +38862,10 @@ _0801243C: movs r3, #8 bl sub_08016EA4 ldrb r0, [r5, #0x10] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r5, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r5, #0xf] movs r1, #0 bl sub_08196FF0 @@ -38880,18 +38880,18 @@ _0801243C: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit strb r0, [r5, #0x12] ldrb r0, [r5, #0x11] movs r1, #0 bl sub_08196FF0 ldrb r0, [r5, #0x11] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r5, #0x11] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 strb r0, [r5, #0x13] strb r4, [r5, #0xc] @@ -38926,7 +38926,7 @@ _080124CC: beq _0801251C ldr r0, _08012514 ldr r1, _08012518 - bl sub_08008BCC + bl StringExpandPlaceholders b _08012538 .align 2, 0 _08012504: .4byte gUnknown_2021C40 @@ -38938,7 +38938,7 @@ _08012518: .4byte gUnknown_82C06B8 _0801251C: ldr r0, _08012528 ldr r1, _0801252C - bl sub_08008BCC + bl StringExpandPlaceholders b _08012538 .align 2, 0 _08012528: .4byte gUnknown_2021C7C @@ -38963,7 +38963,7 @@ _08012554: adds r0, r5, #0 adds r0, #0xd ldr r1, _0801256C - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08012566 @@ -39076,7 +39076,7 @@ _08012628: lsls r1, r3, #2 adds r1, r1, r2 ldr r1, [r1] - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08012640 @@ -39086,7 +39086,7 @@ _08012640: bl sub_08012E9C strb r0, [r5, #0x13] ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu b _08012960 .align 2, 0 _08012650: .4byte gUnknown_20228E0 @@ -39107,7 +39107,7 @@ _08012658: lsls r1, r3, #2 adds r1, r1, r2 ldr r1, [r1] - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08012682 @@ -39123,7 +39123,7 @@ _08012690: adds r0, r5, #0 adds r0, #0xd ldr r1, _080126A8 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _080126A2 @@ -39173,10 +39173,10 @@ _080126F0: beq _0801272C b _08012A54 _080126FA: - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite movs r0, #5 strb r0, [r5, #0x19] ldrb r1, [r5, #0x13] @@ -39249,7 +39249,7 @@ _08012760: movs r0, #0 strb r0, [r1, #0x1b] ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu ldrb r0, [r5, #0x13] adds r0, #1 strb r0, [r5, #0x13] @@ -39280,10 +39280,10 @@ _080127C8: ldr r2, [r5] adds r1, r1, r2 subs r1, #0x10 - bl sub_08008888 + bl StringCopy7 ldr r0, _080127FC ldr r1, _08012800 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0xd strb r0, [r5, #0xc] _080127E4: @@ -39325,7 +39325,7 @@ _08012808: ldr r0, [r5] bl sub_08012E9C ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu _08012844: movs r0, #4 strb r0, [r5, #0xc] @@ -39346,7 +39346,7 @@ _0801285E: adds r0, r5, #0 adds r0, #0xd ldr r1, _08012878 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08012870 @@ -39372,7 +39372,7 @@ _0801288E: adds r0, r5, #0 adds r0, #0xd ldr r1, _080128A8 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _080128A0 @@ -39427,7 +39427,7 @@ _080128F6: adds r0, r5, #0 adds r0, #0xd ldr r1, _08012910 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08012908 @@ -39530,7 +39530,7 @@ _080129BA: adds r0, r5, #0 adds r0, #0xd ldr r1, _080129D0 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 beq _08012A54 @@ -39541,7 +39541,7 @@ _080129CA: .align 2, 0 _080129D0: .4byte gUnknown_82C09A8 _080129D4: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite bl sub_0800E894 adds r0, r5, #0 bl sub_08012A64 @@ -39550,9 +39550,9 @@ _080129D4: strb r0, [r5, #0xc] b _08012A54 _080129EA: - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _080129FC movs r0, #5 strh r0, [r1] @@ -39560,9 +39560,9 @@ _080129EA: .align 2, 0 _080129FC: .4byte gUnknown_2037290 _08012A00: - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _08012A14 movs r0, #8 strh r0, [r1] @@ -39594,7 +39594,7 @@ _08012A3E: adds r0, r5, #0 bl sub_08012A64 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08012A54: add sp, #8 pop {r4, r5, r6, r7} @@ -39610,35 +39610,35 @@ sub_08012A64: @ 0x08012A64 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0x11] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #0x11] movs r1, #0 bl sub_08197060 ldrb r0, [r4, #0x12] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r4, #0x10] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #0xf] movs r1, #0 bl sub_08197060 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrb r0, [r4, #0x11] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0xf] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0x10] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0x17] - bl sub_080A8964 + bl DestroyTask ldr r0, [r4, #8] - bl sub_08000BF0 + bl Free ldr r0, [r4] - bl sub_08000BF0 + bl Free ldr r0, [r4, #4] - bl sub_08000BF0 + bl Free pop {r4} pop {r0} bx r0 @@ -39698,14 +39698,14 @@ _08012B58: ldr r1, _08012B64 _08012B5A: adds r0, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _08012B70 .align 2, 0 _08012B64: .4byte gUnknown_82C08DC _08012B68: ldr r1, _08012B74 adds r0, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _08012B70: pop {r0} bx r0 @@ -39734,13 +39734,13 @@ _08012B8E: b _08012BAA _08012B98: ldr r1, _08012BA0 - bl sub_08008BCC + bl StringExpandPlaceholders b _08012BAA .align 2, 0 _08012BA0: .4byte gUnknown_82C0EE0 _08012BA4: ldr r1, _08012BB0 - bl sub_08008BCC + bl StringExpandPlaceholders _08012BAA: pop {r0} bx r0 @@ -39796,14 +39796,14 @@ _08012BD0: @ jump table _08012C40: ldr r1, _08012C4C adds r0, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _08012C58 .align 2, 0 _08012C4C: .4byte gUnknown_82C1C80 _08012C50: ldr r1, _08012C5C adds r0, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _08012C58: pop {r0} bx r0 @@ -39859,14 +39859,14 @@ _08012C7C: @ jump table _08012CEC: ldr r1, _08012CF8 adds r0, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _08012D04 .align 2, 0 _08012CF8: .4byte gUnknown_82C09F8 _08012CFC: ldr r1, _08012D08 adds r0, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _08012D04: pop {r0} bx r0 @@ -39893,14 +39893,14 @@ _08012D28: movs r0, #2 bl sub_080A306C ldrb r0, [r4, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu ldr r0, _08012D54 ldrb r2, [r4, #0x13] lsls r2, r2, #5 ldr r1, [r4] adds r1, r1, r2 adds r1, #0x10 - bl sub_08008888 + bl StringCopy7 ldr r0, _08012D58 ldr r1, _08012D5C ldrb r1, [r1] @@ -39916,7 +39916,7 @@ _08012D60: movs r1, #0 bl sub_08011554 ldrb r0, [r4, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu strb r5, [r4, #0xc] movs r0, #1 b _08012D76 @@ -40230,12 +40230,12 @@ _08012F98: bx r1 thumb_func_end sub_08012E9C - thumb_func_start sub_08012FA8 -sub_08012FA8: @ 0x08012FA8 + thumb_func_start BerryBlenderLinkJoinGroup +BerryBlenderLinkJoinGroup: @ 0x08012FA8 push {lr} ldr r0, _08012FD8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08012FDC @@ -40260,7 +40260,7 @@ _08012FDC: .4byte gUnknown_20228E4 _08012FE0: .4byte gUnknown_3005B68 _08012FE4: .4byte gUnknown_3000DA4 _08012FE8: .4byte gUnknown_2037290 - thumb_func_end sub_08012FA8 + thumb_func_end BerryBlenderLinkJoinGroup thumb_func_start sub_08012FEC sub_08012FEC: @ 0x08012FEC @@ -40337,14 +40337,14 @@ _08013094: movs r2, #0 bl sub_08010A74 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011748 movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r6, #4] movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] movs r0, #1 strb r0, [r6, #8] @@ -40364,7 +40364,7 @@ _080130E4: lsls r1, r1, #2 adds r1, r1, r2 ldr r1, [r1] - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08013100 @@ -40390,17 +40390,17 @@ _08013110: movs r4, #0 strb r0, [r6, #0x11] ldr r0, _080131C4 - bl sub_08003250 + bl AddWindow strb r0, [r6, #0xc] ldr r0, _080131C8 - bl sub_08003250 + bl AddWindow strb r0, [r6, #0xb] ldr r0, _080131CC - bl sub_08003250 + bl AddWindow strb r0, [r6, #0xd] ldrb r0, [r6, #0xc] movs r1, #0x22 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r6, #0xc] ldr r2, _080131D0 movs r1, #2 @@ -40411,10 +40411,10 @@ _08013110: movs r3, #8 bl sub_08016EA4 ldrb r0, [r6, #0xc] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6, #0xc] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r6, #0xb] movs r1, #0 bl sub_08196FF0 @@ -40429,20 +40429,20 @@ _08013110: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit strb r0, [r6, #0xe] ldrb r0, [r6, #0xd] movs r1, #0 bl sub_08196FF0 ldrb r0, [r6, #0xd] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6, #0xd] bl sub_080120A8 ldrb r0, [r6, #0xd] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram strb r4, [r6, #0xf] movs r0, #3 strb r0, [r6, #8] @@ -40470,7 +40470,7 @@ _080131EE: b _08013576 _080131F6: ldrb r0, [r6, #0xe] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r4, r0, #0 ldr r0, _08013244 ldrh r1, [r0, #0x2e] @@ -40551,7 +40551,7 @@ _0801328C: adds r0, r6, #0 adds r0, #9 adds r1, r4, #0 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _080132AA @@ -40563,7 +40563,7 @@ _080132AA: ldr r1, [r6] adds r1, r1, r2 adds r1, #0x10 - bl sub_08008888 + bl StringCopy7 b _0801358A .align 2, 0 _080132BC: .4byte gUnknown_2021C7C @@ -40675,7 +40675,7 @@ _080133CC: adds r0, r6, #0 adds r0, #9 adds r1, r5, #0 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _080133EA @@ -40707,7 +40707,7 @@ _08013408: bl StringCopy ldr r1, _08013434 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _080134F0 .align 2, 0 _0801342C: .4byte gUnknown_2021C40 @@ -40721,7 +40721,7 @@ _08013438: adds r0, r6, #0 adds r0, #9 ldr r1, _0801345C - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 beq _080134F0 @@ -40803,7 +40803,7 @@ _08013514: adds r0, r6, #0 adds r0, #9 ldr r1, _0801352C - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08013526 @@ -40854,7 +40854,7 @@ _08013574: strb r0, [r6, #8] _08013576: ldrb r0, [r6, #0xe] - bl sub_081AE3E4 + bl RedrawListMenu b _08013686 _0801357E: bl sub_08011564 @@ -40868,39 +40868,39 @@ _0801358A: b _08013686 _08013590: ldrb r0, [r6, #0xd] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r6, #0xd] movs r1, #0 bl sub_08197060 ldrb r0, [r6, #0xe] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r6, #0xc] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r6, #0xb] movs r1, #0 bl sub_08197060 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrb r0, [r6, #0xd] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r6, #0xb] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r6, #0xc] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r6, #0x11] - bl sub_080A8964 + bl DestroyTask ldr r0, [r6] - bl sub_08000BF0 + bl Free ldr r0, [r6, #4] - bl sub_08000BF0 + bl Free ldrb r0, [r6, #8] adds r0, #1 strb r0, [r6, #8] b _08013686 _080135E8: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite adds r5, r6, #0 adds r5, #9 ldr r4, _08013610 @@ -40910,7 +40910,7 @@ _080135E8: adds r0, r0, r4 ldr r1, [r0] adds r0, r5, #0 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 beq _08013686 @@ -40921,14 +40921,14 @@ _080135E8: _08013610: .4byte gUnknown_82C0A84 _08013614: .4byte gUnknown_2037290 _08013618: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite ldr r0, _08013624 movs r1, #5 b _0801365C .align 2, 0 _08013624: .4byte gUnknown_2037290 _08013628: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite adds r5, r6, #0 adds r5, #9 ldr r4, _08013644 @@ -40946,7 +40946,7 @@ _08013648: adds r0, #9 ldr r1, _08013664 _0801364E: - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 beq _08013686 @@ -40962,14 +40962,14 @@ _08013664: .4byte gUnknown_2021C7C _08013668: .4byte gUnknown_2037290 _0801366C: adds r0, r4, #0 - bl sub_080A8964 - bl sub_08016E98 + bl DestroyTask + bl Contest_RunTextPrinters bl sub_0800E894 b _08013686 _0801367C: bl sub_080144CC adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08013686: add sp, #8 pop {r4, r5, r6, r7} @@ -41027,19 +41027,19 @@ sub_080136DC: @ 0x080136DC push {r4, lr} adds r4, r0, #0 strb r1, [r4, #0xf] - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite ldrb r0, [r4, #0xe] - bl sub_081AE3E4 + bl RedrawListMenu ldr r0, _0801373C ldrb r2, [r4, #0xf] lsls r2, r2, #5 ldr r1, [r4] adds r1, r1, r2 adds r1, #0x10 - bl sub_08008888 + bl StringCopy7 ldr r1, _08013740 ldr r0, _08013744 ldrh r0, [r0] @@ -41075,7 +41075,7 @@ sub_08013748: @ 0x08013748 push {lr} ldr r0, _08013774 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _08013778 @@ -41136,16 +41136,16 @@ _080137D8: movs r2, #0 bl sub_08010A74 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011748 movs r0, #1 bl sub_08010CA0 movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #4] movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #2 strb r0, [r4, #8] @@ -41191,11 +41191,11 @@ _08013842: _0801385C: .4byte gUnknown_3005B60 _08013860: ldrb r0, [r4, #0x11] - bl sub_080A8964 + bl DestroyTask ldr r0, [r4] - bl sub_08000BF0 + bl Free ldr r0, [r4, #4] - bl sub_08000BF0 + bl Free bl sub_0800E894 ldrb r0, [r4, #8] adds r0, #1 @@ -41204,7 +41204,7 @@ _08013860: _0801387E: bl sub_0800E894 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08013888: pop {r4, r5} pop {r0} @@ -41483,7 +41483,7 @@ sub_08013A68: @ 0x08013A68 lsrs r4, r4, #0x18 bl sub_08076DB4 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -41494,7 +41494,7 @@ sub_08013A80: @ 0x08013A80 push {lr} ldr r0, _08013A94 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -41512,7 +41512,7 @@ sub_08013A98: @ 0x08013A98 lsrs r6, r0, #0x18 ldr r0, _08013AD4 mov r8, r0 - bl sub_0800A02C + bl GetMultiplayerId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -41553,17 +41553,17 @@ _08013AE6: adds r1, r1, r0 movs r0, #0 movs r2, #0x64 - bl sub_0800A070 + bl SendBlock b _08013BC4 .align 2, 0 _08013B00: .4byte gUnknown_2024190 _08013B04: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 bne _08013BC4 - bl sub_0800A02C + bl GetMultiplayerId adds r1, r0, #0 ldr r0, _08013B38 movs r2, #1 @@ -41576,7 +41576,7 @@ _08013B04: bl memcpy movs r0, #0x32 bl IncrementGameStat - bl sub_0800A178 + bl ResetBlockReceivedFlags b _08013B62 .align 2, 0 _08013B38: .4byte gUnknown_20243E8 @@ -41593,7 +41593,7 @@ _08013B40: movs r0, #0 adds r1, r4, #0 movs r2, #0xdc - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _08013BC4 @@ -41607,13 +41607,13 @@ _08013B6C: .4byte gUnknown_202257C _08013B70: .4byte gUnknown_3005AEC _08013B74: .4byte 0x00002BE0 _08013B78: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 bne _08013BC4 ldr r4, _08013BD0 - bl sub_0800A02C + bl GetMultiplayerId adds r1, r0, #0 movs r0, #1 eors r1, r0 @@ -41624,7 +41624,7 @@ _08013B78: adds r0, r4, #0 movs r2, #0xd8 bl memcpy - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r1, _08013BD8 strb r7, [r1] movs r0, #6 @@ -41633,11 +41633,11 @@ _08013B78: ldr r0, _08013BE0 str r0, [r1, #8] ldr r0, _08013BE4 - bl sub_08000540 + bl SetMainCallback2 mov r0, r8 bl sub_08017B38 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08013BC4: pop {r3} mov r8, r3 @@ -41673,7 +41673,7 @@ sub_08013BE8: @ 0x08013BE8 .align 2, 0 _08013C08: .4byte gUnknown_3005B60 _08013C0C: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _08013C1C @@ -41685,7 +41685,7 @@ _08013C1C: strh r0, [r4, #8] b _08013CA6 _08013C24: - bl sub_0800A114 + bl GetBlockReceivedStatus adds r4, r0, #0 bl sub_0800A59C lsls r4, r4, #0x18 @@ -41707,21 +41707,21 @@ _08013C40: adds r0, r0, r1 ldrb r2, [r5] adds r1, r3, #0 - bl sub_080C2750 + bl CopyTrainerCardData adds r5, #0x1c adds r4, #1 _08013C5A: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 blt _08013C40 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 bne _08013C98 - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -41739,9 +41739,9 @@ _08013C94: .4byte gUnknown_20397F8 _08013C98: bl sub_0801B458 _08013C9C: - bl sub_0800A178 + bl ResetBlockReceivedFlags adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08013CA6: pop {r4, r5, r6} pop {r0} @@ -41766,7 +41766,7 @@ _08013CC4: .4byte gUnknown_3002360 _08013CC8: ldr r0, _08013CD8 movs r1, #5 - bl sub_080A8878 + bl CreateTask ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -41775,21 +41775,21 @@ _08013CC8: _08013CD8: .4byte sub_08013BE8 _08013CDC: ldr r0, _08013D10 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _08013CFA - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08013D14 - bl sub_080C4798 + bl ShowTrainerCardInLink _08013CFA: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer pop {r4} pop {r0} @@ -41805,15 +41805,15 @@ sub_08013D18: @ 0x08013D18 adds r6, r0, #0 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 - bl sub_080F9A10 - bl sub_08076794 + bl HealPlayerParty + bl SavePlayerParty bl LoadPlayerBag ldr r5, _08013D84 ldr r0, _08013D88 str r0, [r5, #0x14] - bl sub_0800A02C + bl GetMultiplayerId adds r4, r0, #0 - bl sub_0800A02C + bl GetMultiplayerId lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r1, r4, #3 @@ -41823,9 +41823,9 @@ sub_08013D18: @ 0x08013D18 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r1, #0x18] - bl sub_0800A02C + bl GetMultiplayerId adds r4, r0, #0 - bl sub_0800A02C + bl GetMultiplayerId movs r2, #1 eors r4, r2 lsls r4, r4, #0x18 @@ -41900,7 +41900,7 @@ sub_08013D98: @ 0x08013D98 movs r0, #0 mov r3, r8 bl SetDynamicWarpWithCoords - bl sub_08084540 + bl WarpIntoMap add sp, #8 pop {r3} mov r8, r3 @@ -41933,13 +41933,13 @@ sub_08013E0C: @ 0x08013E0C strh r1, [r0] ldr r0, _08013E80 bl VarSet - bl sub_08009B64 + bl GetLinkPlayerCount ldr r1, _08013E84 strb r0, [r1] - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _08013E88 strb r0, [r1] - bl sub_0809CB94 + bl SetCableClubWarp lsls r4, r4, #0x18 asrs r4, r4, #0x18 lsls r5, r5, #0x18 @@ -41957,7 +41957,7 @@ sub_08013E0C: @ 0x08013E0C adds r1, r5, #0 mov r3, r8 bl SetWarpDestination - bl sub_08084540 + bl WarpIntoMap add sp, #4 pop {r3} mov r8, r3 @@ -41989,7 +41989,7 @@ _08013EA4: .4byte gUnknown_3002360 _08013EA8: ldr r0, _08013EB8 movs r1, #5 - bl sub_080A8878 + bl CreateTask ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -41998,16 +41998,16 @@ _08013EA8: _08013EB8: .4byte sub_08013BE8 _08013EBC: ldr r0, _08013EE4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _08013ECE ldr r0, _08013EE8 - bl sub_08000540 + bl SetMainCallback2 _08013ECE: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer pop {r4} pop {r0} @@ -42022,10 +42022,10 @@ sub_08013EEC: @ 0x08013EEC push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_080C26D4 + bl TrainerCard_GenerateCardForPlayer cmp r5, #0 beq _08013F06 - bl sub_0801AE5C + bl GetWonderCardFlagID adds r1, r4, #0 adds r1, #0x60 strh r0, [r1] @@ -42078,7 +42078,7 @@ _08013F3C: @ jump table .4byte _08013F7C @ case 13 .4byte _08013F78 @ case 14 _08013F78: - bl sub_0800DE74 + bl RecordMixTrainerNames _08013F7C: ldr r0, _08013F94 ldrb r0, [r0] @@ -42178,23 +42178,23 @@ _08013F9C: @ jump table .4byte _0801426C @ case 79 .4byte _080140E0 @ case 80 _080140E0: - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r1, _080140F4 ldr r0, _080140F8 str r0, [r1, #8] movs r0, #3 - bl sub_081B81B8 + bl InitChooseHalfPartyForBattle b _0801426C .align 2, 0 _080140F4: .4byte gUnknown_3002360 _080140F8: .4byte sub_0801A728 _080140FC: - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r0, _08014124 movs r1, #1 bl sub_08013EEC - bl sub_080F9A10 - bl sub_08076794 + bl HealPlayerParty + bl SavePlayerParty bl LoadPlayerBag movs r0, #1 str r0, [sp] @@ -42206,9 +42206,9 @@ _080140FC: .align 2, 0 _08014124: .4byte gUnknown_202257C _08014128: - bl sub_0808569C - bl sub_080F9A10 - bl sub_08076794 + bl CleanupOverworldWindowsAndTilemaps + bl HealPlayerParty + bl SavePlayerParty bl LoadPlayerBag ldr r0, _08014150 movs r1, #1 @@ -42223,9 +42223,9 @@ _08014128: .align 2, 0 _08014150: .4byte gUnknown_202257C _08014154: - bl sub_0808569C - bl sub_080F9A10 - bl sub_08076794 + bl CleanupOverworldWindowsAndTilemaps + bl HealPlayerParty + bl SavePlayerParty bl LoadPlayerBag ldr r0, _0801417C movs r1, #1 @@ -42243,7 +42243,7 @@ _08014180: ldr r0, _0801419C movs r1, #1 bl sub_08013EEC - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps movs r0, #3 str r0, [sp] movs r0, #0x19 @@ -42257,7 +42257,7 @@ _080141A0: ldr r0, _080141C4 movs r1, #1 bl sub_08013EEC - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps movs r0, #4 str r0, [sp] movs r0, #0x19 @@ -42267,28 +42267,28 @@ _080141A0: _080141B8: bl sub_08013E0C ldr r0, _080141C8 - bl sub_08000540 + bl SetMainCallback2 b _0801426C .align 2, 0 _080141C4: .4byte gUnknown_202257C _080141C8: .4byte sub_08013E8C _080141CC: - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r0, _080141DC movs r1, #0 - bl sub_080A8878 + bl CreateTask b _0801426C .align 2, 0 _080141DC: .4byte sub_08013A98 _080141E0: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080141F0 bl sub_0800E7D0 b _080141FE _080141F0: - bl sub_0800E7E8 + bl SaveSuccessCallback movs r0, #0x45 movs r1, #0 movs r2, #1 @@ -42301,7 +42301,7 @@ _08014204: movs r1, #0 bl sub_08013EEC ldr r0, _08014218 - bl sub_08000540 + bl SetMainCallback2 b _0801426C .align 2, 0 _08014214: .4byte gUnknown_202257C @@ -42311,14 +42311,14 @@ _0801421C: movs r1, #5 movs r2, #1 bl sub_08013D98 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08014238 bl sub_0802A69C b _0801426C .align 2, 0 -_08014238: .4byte sub_08085934 +_08014238: .4byte CB2_LoadMap _0801423C: movs r0, #7 movs r1, #9 @@ -42328,20 +42328,20 @@ _0801423C: bl sub_08020988 b _0801426C .align 2, 0 -_08014250: .4byte sub_08085934 +_08014250: .4byte CB2_LoadMap _08014254: movs r0, #8 movs r1, #5 movs r2, #1 bl sub_08013D98 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0801428C bl sub_08024704 _0801426C: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _08014290 movs r0, #1 strh r0, [r1] @@ -42356,7 +42356,7 @@ _08014284: pop {r0} bx r0 .align 2, 0 -_0801428C: .4byte sub_08085934 +_0801428C: .4byte CB2_LoadMap _08014290: .4byte gUnknown_2037290 _08014294: .4byte gUnknown_20228E0 thumb_func_end sub_08013F14 @@ -42453,7 +42453,7 @@ _0801435C: ldr r4, _080143B8 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sb strh r0, [r1] ldrb r0, [r6, #1] @@ -42461,7 +42461,7 @@ _0801435C: adds r0, r0, r4 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r2, sb strh r0, [r2, #2] ldr r0, _080143BC @@ -42469,8 +42469,8 @@ _0801435C: str r1, [r0, #8] movs r0, #4 strh r0, [r7] - bl sub_0800DE74 - bl sub_0800A178 + bl RecordMixTrainerNames + bl ResetBlockReceivedFlags b _080144BA .align 2, 0 _080143AC: .4byte gUnknown_20226A0 @@ -42479,11 +42479,11 @@ _080143B4: .4byte gUnknown_203CBC4 _080143B8: .4byte gUnknown_202412C _080143BC: .4byte gUnknown_3002360 _080143C0: - bl sub_0800DE74 + bl RecordMixTrainerNames adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080143CA: - bl sub_080988C4 + bl EnableBothScriptContexts movs r0, #1 strh r0, [r7] b _080144BA @@ -42494,7 +42494,7 @@ _080143D4: bne _080144BA movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen movs r0, #2 strh r0, [r7] b _080144BA @@ -42510,9 +42510,9 @@ _080143EC: cmp r0, #0x1d bne _0801441C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _08014418 - bl sub_08000540 + bl SetMainCallback2 b _080144BA .align 2, 0 _08014410: .4byte gUnknown_2037C74 @@ -42524,19 +42524,19 @@ _0801441C: strh r0, [r7] b _080144BA _08014426: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080144BA adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask bl sub_080144E0 b _080144BA _0801443C: movs r0, #0 adds r1, r2, #0 movs r2, #0xe - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _080144BA @@ -42544,12 +42544,12 @@ _0801443C: strh r0, [r7] b _080144BA _08014452: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 bne _080144BA - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _08014480 movs r2, #0x80 lsls r2, r2, #1 @@ -42571,9 +42571,9 @@ _08014488: strh r0, [r7] b _080144BA _0801448E: - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _080144BA _0801449A: bl sub_0800A7F8 @@ -42585,10 +42585,10 @@ _080144A4: ldrb r0, [r0] cmp r0, #0 bne _080144BA - bl sub_0800DB50 - bl sub_080988C4 + bl DestroyWirelessStatusIndicatorSprite + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080144BA: pop {r3, r4} mov r8, r3 @@ -42605,7 +42605,7 @@ sub_080144CC: @ 0x080144CC push {lr} ldr r0, _080144DC movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -42617,7 +42617,7 @@ sub_080144E0: @ 0x080144E0 push {lr} ldr r0, _08014500 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08014504 @@ -42634,13 +42634,13 @@ _08014500: .4byte sub_08013F14 _08014504: .4byte gUnknown_3005B60 thumb_func_end sub_080144E0 - thumb_func_start sub_08014508 -sub_08014508: @ 0x08014508 + thumb_func_start MEvent_CreateTask_Leader +MEvent_CreateTask_Leader: @ 0x08014508 push {r4, lr} adds r4, r0, #0 ldr r0, _08014538 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0801453C @@ -42664,7 +42664,7 @@ _08014538: .4byte sub_08014548 _0801453C: .4byte gUnknown_20228E4 _08014540: .4byte gUnknown_3005B68 _08014544: .4byte gUnknown_2037290 - thumb_func_end sub_08014508 + thumb_func_end MEvent_CreateTask_Leader thumb_func_start sub_08014548 sub_08014548: @ 0x08014548 @@ -42721,7 +42721,7 @@ _080145B8: movs r1, #0 bl sub_08010A90 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink movs r0, #2 bl sub_080116FC movs r0, #1 @@ -42732,13 +42732,13 @@ _080145EC: .4byte gUnknown_20228E0 _080145F0: .4byte gUnknown_20228E1 _080145F4: movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r5, #4] movs r0, #0xa0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #0xa0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5, #8] ldr r0, [r5, #4] movs r1, #4 @@ -42791,10 +42791,10 @@ _080145F4: orrs r1, r0 str r1, [sp, #4] mov r0, sp - bl sub_08003250 + bl AddWindow strb r0, [r5, #0xf] ldrb r0, [r5, #0xf] - bl sub_0801822C + bl MG_DrawTextBorder ldr r0, _080146BC adds r2, r0, #0 ldr r1, _080146C0 @@ -42806,10 +42806,10 @@ _080145F4: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit strb r0, [r5, #0x12] movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 strb r0, [r5, #0x13] b _0801474A @@ -42841,7 +42841,7 @@ _080146EC: .4byte gUnknown_20228E0 _080146F0: .4byte gUnknown_2021C7C _080146F4: ldr r0, _08014700 - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #4 strb r0, [r5, #0xc] b _080149FA @@ -42862,7 +42862,7 @@ _08014704: _0801471C: movs r0, #0xd strb r0, [r5, #0xc] - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite b _080149FA .align 2, 0 _08014728: .4byte gUnknown_3002360 @@ -42870,7 +42870,7 @@ _0801472C: adds r0, r5, #0 adds r0, #0xd ldr r1, _08014750 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 bne _0801473C b _080149FA @@ -42879,7 +42879,7 @@ _0801473C: bl sub_08012E9C strb r0, [r5, #0x13] ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu _0801474A: movs r0, #2 strb r0, [r5, #0xc] @@ -42897,7 +42897,7 @@ _0801475A: adds r1, #0x14 ldr r3, _08014780 movs r2, #0 - bl sub_08018560 + bl mevent_message_print_and_prompt_yes_no lsls r0, r0, #0x18 asrs r4, r0, #0x18 cmp r4, #0 @@ -42916,17 +42916,17 @@ _08014784: beq _080147CC b _080149FA _0801478A: - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite ldr r1, [r5] ldrb r0, [r5, #0x13] lsls r0, r0, #5 adds r1, r1, r0 strb r4, [r1, #0x1b] ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu movs r0, #5 strb r0, [r5, #0x19] ldrb r1, [r5, #0x13] @@ -42996,7 +42996,7 @@ _080147FA: movs r0, #0 strb r0, [r1, #0x1b] ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu ldrb r0, [r5, #0x13] adds r0, #1 strb r0, [r5, #0x13] @@ -43006,10 +43006,10 @@ _080147FA: ldr r2, [r5] adds r1, r1, r2 subs r1, #0x10 - bl sub_08008888 + bl StringCopy7 ldr r0, _08014864 ldr r1, _08014868 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #9 strb r0, [r5, #0xc] bl sub_0800E9F8 @@ -43044,7 +43044,7 @@ _0801486C: ldr r0, [r5] bl sub_08012E9C ldrb r0, [r5, #0x12] - bl sub_081AE3E4 + bl RedrawListMenu movs r0, #2 strb r0, [r5, #0xc] _080148AC: @@ -43063,7 +43063,7 @@ _080148B8: b _080149FA _080148C4: ldr r0, _080148D0 - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #0xa strb r0, [r5, #0xc] b _080149FA @@ -43110,34 +43110,34 @@ _08014918: strb r0, [r5, #0xc] b _080149FA _0801491E: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite bl sub_0800E894 ldrb r0, [r5, #0x12] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrb r0, [r5, #0xf] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r5, #0x17] - bl sub_080A8964 + bl DestroyTask ldr r0, [r5, #8] - bl sub_08000BF0 + bl Free ldr r0, [r5] - bl sub_08000BF0 + bl Free ldr r0, [r5, #4] - bl sub_08000BF0 + bl Free b _080149E2 _08014956: adds r0, r5, #0 adds r0, #0xd ldr r1, _08014974 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 beq _080149FA adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _08014978 movs r0, #5 strh r0, [r1] @@ -43174,19 +43174,19 @@ _080149B0: ldrb r0, [r5, #0x12] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrb r0, [r5, #0xf] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r5, #0x17] - bl sub_080A8964 + bl DestroyTask ldr r0, [r5, #8] - bl sub_08000BF0 + bl Free ldr r0, [r5] - bl sub_08000BF0 + bl Free ldr r0, [r5, #4] - bl sub_08000BF0 + bl Free bl sub_0800A8D4 _080149E2: ldrb r0, [r5, #0xc] @@ -43194,12 +43194,12 @@ _080149E2: strb r0, [r5, #0xc] b _080149FA _080149EA: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080149FA adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080149FA: add sp, #8 pop {r4, r5, r6} @@ -43214,7 +43214,7 @@ sub_08014A04: @ 0x08014A04 adds r4, r0, #0 ldr r0, _08014A3C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08014A40 @@ -43288,21 +43288,21 @@ _08014AAC: movs r2, #0 bl sub_08010A74 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011748 movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r7, #4] movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r7] movs r0, #1 strb r0, [r7, #8] b _08014DA8 _08014AE0: ldr r0, _08014AEC - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #2 strb r0, [r7, #8] b _08014DA8 @@ -43339,7 +43339,7 @@ _08014AF0: orrs r1, r4 str r1, [sp, #4] mov r0, sp - bl sub_08003250 + bl AddWindow strb r0, [r7, #0xb] ldr r0, _08014BB4 ldr r1, [r0, #4] @@ -43351,10 +43351,10 @@ _08014AF0: ands r1, r5 orrs r1, r4 str r1, [r0, #4] - bl sub_08003250 + bl AddWindow strb r0, [r7, #0xd] ldrb r0, [r7, #0xb] - bl sub_0801822C + bl MG_DrawTextBorder ldr r0, _08014BB8 adds r2, r0, #0 ldr r1, _08014BBC @@ -43366,22 +43366,22 @@ _08014AF0: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit strb r0, [r7, #0xe] ldrb r0, [r7, #0xd] - bl sub_0801822C + bl MG_DrawTextBorder ldrb r0, [r7, #0xd] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r7, #0xd] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r7, #0xd] bl sub_080120A8 ldrb r0, [r7, #0xd] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram strb r6, [r7, #0xf] movs r0, #3 strb r0, [r7, #8] @@ -43405,11 +43405,11 @@ _08014BC0: bl sub_080A306C _08014BD6: ldrb r0, [r7, #0xe] - bl sub_081AE3E4 + bl RedrawListMenu b _08014DA8 _08014BDE: ldrb r0, [r7, #0xe] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r2, r0, #0 ldr r0, _08014C60 ldrh r1, [r0, #0x2e] @@ -43434,12 +43434,12 @@ _08014BDE: cmp r0, #0 bne _08014C68 strb r2, [r7, #0xf] - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite ldrb r0, [r7, #0xe] - bl sub_081AE3E4 + bl RedrawListMenu ldr r0, _08014C64 ldrb r2, [r7, #0xf] lsls r2, r2, #5 @@ -43488,7 +43488,7 @@ _08014C7E: _08014C84: .4byte gUnknown_3002360 _08014C88: ldr r0, _08014CA4 - bl sub_0801832C + bl AddTextPrinterToWindow1 ldr r0, _08014CA8 ldrb r2, [r7, #0xf] lsls r2, r2, #5 @@ -43543,7 +43543,7 @@ _08014CF0: b _08014DA8 _08014CF6: ldr r0, _08014D08 - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #0 movs r1, #0 bl sub_08011554 @@ -43554,19 +43554,19 @@ _08014D0C: ldrb r0, [r7, #0xe] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrb r0, [r7, #0xd] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r7, #0xb] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r7, #0x11] - bl sub_080A8964 + bl DestroyTask ldr r0, [r7] - bl sub_08000BF0 + bl Free ldr r0, [r7, #4] - bl sub_08000BF0 + bl Free ldrb r0, [r7, #8] adds r0, #1 strb r0, [r7, #8] @@ -43581,20 +43581,20 @@ _08014D42: adds r0, r0, r4 ldr r1, [r0] adds r0, r5, #0 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 beq _08014DA8 - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite b _08014D72 .align 2, 0 _08014D64: .4byte gUnknown_82C0B1C _08014D68: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite ldr r0, _08014D84 - bl sub_0801832C + bl AddTextPrinterToWindow1 _08014D72: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask bl sub_0800E894 ldr r1, _08014D88 movs r0, #5 @@ -43610,12 +43610,12 @@ _08014D8C: bl sub_0800A8D4 b _08014DA8 _08014D98: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08014DA8 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08014DA8: add sp, #0x10 pop {r4, r5, r6, r7} @@ -43623,13 +43623,13 @@ _08014DA8: bx r0 thumb_func_end sub_08014A50 - thumb_func_start sub_08014DB0 -sub_08014DB0: @ 0x08014DB0 + thumb_func_start MEvent_CreateTask_CardOrNewsOverWireless +MEvent_CreateTask_CardOrNewsOverWireless: @ 0x08014DB0 push {r4, lr} adds r4, r0, #0 ldr r0, _08014DE8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08014DEC @@ -43657,7 +43657,7 @@ _08014DEC: .4byte gUnknown_20228E4 _08014DF0: .4byte gUnknown_3005B68 _08014DF4: .4byte gUnknown_3000DA4 _08014DF8: .4byte gUnknown_2037290 - thumb_func_end sub_08014DB0 + thumb_func_end MEvent_CreateTask_CardOrNewsOverWireless thumb_func_start sub_08014DFC sub_08014DFC: @ 0x08014DFC @@ -43702,21 +43702,21 @@ _08014E60: movs r2, #0 bl sub_08010A74 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011748 movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r5, #4] movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #1 strb r0, [r5, #8] b _0801510C _08014E8E: ldr r0, _08014E9C - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #2 strb r0, [r5, #8] b _0801510C @@ -43750,10 +43750,10 @@ _08014EA0: orrs r1, r0 str r1, [sp, #4] mov r0, sp - bl sub_08003250 + bl AddWindow strb r0, [r5, #0xb] ldrb r0, [r5, #0xb] - bl sub_0801822C + bl MG_DrawTextBorder ldr r0, _08014F20 adds r2, r0, #0 ldr r1, _08014F24 @@ -43765,10 +43765,10 @@ _08014EA0: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit strb r0, [r5, #0xe] movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _08014F0C: movs r0, #0 strb r0, [r5, #0xf] @@ -43797,14 +43797,14 @@ _08014F3E: b _0801510C _08014F46: ldrb r0, [r5, #0xe] - bl sub_081AE3E4 + bl RedrawListMenu b _0801510C _08014F4E: ldrb r0, [r5, #0x13] cmp r0, #0 beq _08014F5A ldrb r0, [r5, #0xe] - bl sub_081AE2DC + bl ListMenu_ProcessInput _08014F5A: ldrb r0, [r5, #0x14] cmp r0, #0x78 @@ -43830,10 +43830,10 @@ _08014F5A: beq _08014FBC strb r4, [r5, #0xf] strb r4, [r5, #0x14] - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite ldr r0, [r5] adds r4, r0, #0 adds r4, #0x10 @@ -43875,7 +43875,7 @@ _08014FDC: _08014FE4: .4byte gUnknown_3002360 _08014FE8: ldr r0, _08015004 - bl sub_0801832C + bl AddTextPrinterToWindow1 ldr r0, _08015008 ldrb r2, [r5, #0xf] lsls r2, r2, #5 @@ -43930,7 +43930,7 @@ _08015050: b _0801510C _08015056: ldr r0, _08015068 - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #0 movs r1, #0 bl sub_08011554 @@ -43944,18 +43944,18 @@ _0801506C: ldrb r0, [r5, #0xe] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrb r0, [r5, #0xb] - bl sub_08003444 + bl RemoveWindow _08015088: ldrb r0, [r5, #0x11] - bl sub_080A8964 + bl DestroyTask ldr r0, [r5] - bl sub_08000BF0 + bl Free ldr r0, [r5, #4] - bl sub_08000BF0 + bl Free ldrb r0, [r5, #8] adds r0, #1 strb r0, [r5, #8] @@ -43983,12 +43983,12 @@ _080150BC: adds r1, r1, r2 ldr r1, [r1] _080150CA: - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 beq _0801510C - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask bl sub_0800E894 ldr r1, _080150EC movs r0, #5 @@ -44004,12 +44004,12 @@ _080150F0: bl sub_0800A8D4 b _0801510C _080150FC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801510C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0801510C: add sp, #8 pop {r4, r5, r6} @@ -44017,17 +44017,17 @@ _0801510C: bx r0 thumb_func_end sub_08014DFC - thumb_func_start sub_08015114 -sub_08015114: @ 0x08015114 + thumb_func_start UnionRoomSpecial +UnionRoomSpecial: @ 0x08015114 push {r4, lr} bl sub_08010A50 ldr r0, _08015150 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r4, _08015154 movs r0, #0x89 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _08015158 str r0, [r1] @@ -44049,7 +44049,7 @@ _08015150: .4byte sub_080151E8 _08015154: .4byte gUnknown_20228E4 _08015158: .4byte gUnknown_3000DA8 _0801515C: .4byte gUnknown_2037290 - thumb_func_end sub_08015114 + thumb_func_end UnionRoomSpecial thumb_func_start sub_08015160 sub_08015160: @ 0x08015160 @@ -44074,7 +44074,7 @@ sub_0801516C: @ 0x0801516C cmp r3, r0 beq _08015186 adds r1, r3, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _08015186: pop {r0} bx r0 @@ -44095,7 +44095,7 @@ sub_08015194: @ 0x08015194 cmp r2, r0 beq _080151AC adds r1, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _080151AC: pop {r0} bx r0 @@ -44221,17 +44221,17 @@ _08015220: @ jump table .4byte _080160EC @ case 56 _08015304: movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r6, #4] movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r6, #0xc] movs r0, #0x80 lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] movs r0, #0x20 - bl sub_08000BDC + bl AllocZeroed str r0, [r6, #8] ldr r0, [r6] movs r1, #8 @@ -44282,7 +44282,7 @@ _08015380: ldrh r2, [r2, #0xc] bl sub_08010ABC bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011770 ldr r0, [r6, #8] movs r1, #1 @@ -44317,7 +44317,7 @@ _080153E8: ldrh r0, [r4] cmp r0, #0 beq _080154A8 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldrh r0, [r4] @@ -44347,7 +44347,7 @@ _08015408: .align 2, 0 _08015430: .4byte gUnknown_82C1808 _08015434: - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -44383,7 +44383,7 @@ _08015474: ldr r1, _080154A0 movs r0, #0x44 strb r0, [r1] - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -44541,7 +44541,7 @@ _080155D8: bl _0801638C _080155E2: ldr r0, _08015604 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _080155F2 @@ -44652,7 +44652,7 @@ _080156D2: bl sub_08013EEC ldr r0, _080156F8 movs r1, #5 - bl sub_080A8878 + bl CreateTask movs r0, #0x26 bl _0801638A .align 2, 0 @@ -44663,7 +44663,7 @@ _080156F4: .4byte gUnknown_202257C _080156F8: .4byte sub_08013BE8 _080156FC: ldr r0, _08015720 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _0801570C @@ -44832,7 +44832,7 @@ _08015854: adds r1, r1, r2 adds r1, r1, r3 ldr r1, [r1] - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08015894 @@ -44933,7 +44933,7 @@ _08015964: lsls r1, r1, #5 ldr r0, [r6] adds r0, r0, r1 - bl sub_08017468 + bl StartFieldEffectForEventObject adds r5, r0, #0 movs r1, #2 ldrsh r0, [r7, r1] @@ -44955,7 +44955,7 @@ _0801599C: adds r0, r6, #0 adds r0, #0x16 ldr r1, _080159C8 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _080159B0 @@ -44974,18 +44974,18 @@ _080159B0: .align 2, 0 _080159C8: .4byte gUnknown_2021C7C _080159CC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080159DA bl _0801638C _080159DA: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _08015A34 ldr r5, _08015A24 - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -45007,7 +45007,7 @@ _080159DA: lsls r1, r5, #2 adds r1, r1, r2 ldr r1, [r1] - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0x21 bl _0801638A .align 2, 0 @@ -45040,7 +45040,7 @@ _08015A5C: bl _0801638C _08015A64: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r4, _08015A9C movs r0, #0x45 strb r0, [r4] @@ -45223,7 +45223,7 @@ _08015BEE: bl sub_08013EEC ldr r0, _08015C0C movs r1, #5 - bl sub_080A8878 + bl CreateTask movs r0, #0x27 b _0801638A .align 2, 0 @@ -45234,7 +45234,7 @@ _08015C10: adds r0, r6, #0 bl sub_080163B0 ldr r0, _08015C50 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _08015C24 @@ -45257,7 +45257,7 @@ _08015C24: lsls r1, r5, #2 adds r1, r1, r2 ldr r1, [r1] - bl sub_08008BCC + bl StringExpandPlaceholders b _0801638C .align 2, 0 _08015C50: .4byte sub_08013BE8 @@ -45271,7 +45271,7 @@ _08015C64: adds r0, r6, #0 adds r0, #0x16 ldr r1, _08015C80 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08015C7C @@ -45496,7 +45496,7 @@ _08015E54: movs r0, #0xf b _0801638A _08015E5C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08015E68 @@ -45506,17 +45506,17 @@ _08015E68: b _0801638A _08015E6C: ldr r0, [r6, #8] - bl sub_08000BF0 + bl Free ldr r0, [r6] - bl sub_08000BF0 + bl Free ldr r0, [r6, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r6, #4] - bl sub_08000BF0 + bl Free adds r0, r6, #0 adds r0, #0x20 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask adds r0, r6, #0 adds r0, #0x21 bl sub_080199A0 @@ -45529,11 +45529,11 @@ _08015E9A: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0x12 b _0801638A _08015EAE: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _08015EBA @@ -45541,10 +45541,10 @@ _08015EAE: _08015EBA: bl sub_080198D8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _08015ED4 ldr r0, [r0] - bl sub_08000BF0 + bl Free bl sub_080144E0 b _0801638C .align 2, 0 @@ -45600,7 +45600,7 @@ _08015F14: bl sub_080089D8 ldr r0, _08015F64 ldr r1, _08015F68 - bl sub_08008BCC + bl StringExpandPlaceholders _08015F4C: ldr r1, _08015F64 movs r0, #0x2c @@ -45616,7 +45616,7 @@ _08015F6C: adds r0, r6, #0 adds r0, #0x16 ldr r1, _08015F84 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08015F7E @@ -45685,7 +45685,7 @@ _08015FF0: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0x36 b _0801638A _08016004: @@ -45802,7 +45802,7 @@ _080160EC: adds r0, r6, #0 adds r0, #0x16 ldr r1, _08016118 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _080160FE @@ -45825,7 +45825,7 @@ _08016120: adds r0, r6, #0 adds r0, #0x16 ldr r1, _08016138 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08016132 @@ -45854,7 +45854,7 @@ _08016144: str r4, [sp, #4] ldr r4, [r6] str r4, [sp, #8] - bl sub_08016D5C + bl MainMenu_FormatSavegameBadges adds r5, r0, #0 movs r0, #1 rsbs r0, r0, #0 @@ -45992,7 +45992,7 @@ _08016280: adds r0, r6, #0 adds r0, #0x16 ldr r1, _080162E8 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 bne _08016292 @@ -46082,7 +46082,7 @@ _0801634C: adds r0, r6, #0 adds r0, #0x16 ldr r1, _08016374 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 beq _0801638C @@ -46102,7 +46102,7 @@ _08016378: adds r0, r6, #0 adds r0, #0x16 ldr r1, _08016394 - bl sub_08016B74 + bl PrintOnTextbox lsls r0, r0, #0x18 cmp r0, #0 beq _0801638C @@ -46118,8 +46118,8 @@ _0801638C: _08016394: .4byte gUnknown_2021C7C thumb_func_end sub_080151E8 - thumb_func_start sub_08016398 -sub_08016398: @ 0x08016398 + thumb_func_start var_800D_set_xB +var_800D_set_xB: @ 0x08016398 push {lr} bl InUnionRoom cmp r0, #1 @@ -46132,7 +46132,7 @@ _080163A8: bx r0 .align 2, 0 _080163AC: .4byte gUnknown_2037290 - thumb_func_end sub_08016398 + thumb_func_end var_800D_set_xB thumb_func_start sub_080163B0 sub_080163B0: @ 0x080163B0 @@ -46225,11 +46225,11 @@ sub_08016448: @ 0x08016448 strb r0, [r5] ldr r0, _08016484 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r4, _08016488 movs r0, #0x89 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _0801648C str r0, [r1] @@ -46287,7 +46287,7 @@ _080164CE: movs r2, #0 bl sub_08010A74 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011770 movs r0, #1 bl sub_08010CA0 @@ -46296,23 +46296,23 @@ _080164CE: b _080165D8 _080164F0: movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #4] movs r1, #4 bl sub_080170B0 movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0xc] movs r1, #4 bl sub_080170B0 movs r0, #0x80 lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r1, #8 bl sub_08017044 movs r0, #0x20 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #8] movs r1, #1 bl sub_08017044 @@ -46376,23 +46376,23 @@ _08016590: _080165A0: .4byte gUnknown_20228D8 _080165A4: ldr r0, [r4, #8] - bl sub_08000BF0 + bl Free ldr r0, [r4] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r4, #4] - bl sub_08000BF0 + bl Free adds r0, r4, #0 adds r0, #0x20 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask ldr r0, _080165E0 ldr r0, [r0] - bl sub_08000BF0 + bl Free bl sub_0800E894 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080165D8: pop {r4, r5, r6} pop {r0} @@ -46401,8 +46401,8 @@ _080165D8: _080165E0: .4byte gUnknown_20228E4 thumb_func_end sub_08016490 - thumb_func_start sub_080165E4 -sub_080165E4: @ 0x080165E4 + thumb_func_start sp182_move_string +sp182_move_string: @ 0x080165E4 push {r4, lr} ldr r4, _080165F4 ldrb r0, [r4] @@ -46425,7 +46425,7 @@ _08016606: bx r1 .align 2, 0 _0801660C: .4byte gUnknown_2021C40 - thumb_func_end sub_080165E4 + thumb_func_end sp182_move_string thumb_func_start sub_08016610 sub_08016610: @ 0x08016610 @@ -46826,7 +46826,7 @@ sub_08016900: @ 0x08016900 adds r6, r2, #0 ldr r0, _0801692C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -47071,7 +47071,7 @@ sub_08016AD0: @ 0x08016AD0 adds r5, r1, #0 ldr r0, _08016AF8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #2 @@ -47097,7 +47097,7 @@ sub_08016B00: @ 0x08016B00 adds r5, r1, #0 ldr r0, _08016B28 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #2 @@ -47126,7 +47126,7 @@ sub_08016B30: @ 0x08016B30 bl sub_08196FB8 ldr r0, _08016B58 adds r1, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 movs r1, #1 bl AddTextPrinterWithCustomSpeedForMessage @@ -47141,7 +47141,7 @@ _08016B58: .4byte gUnknown_2021C7C thumb_func_start sub_08016B5C sub_08016B5C: @ 0x08016B5C push {lr} - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 beq _08016B6C @@ -47155,8 +47155,8 @@ _08016B6E: .align 2, 0 thumb_func_end sub_08016B5C - thumb_func_start sub_08016B74 -sub_08016B74: @ 0x08016B74 + thumb_func_start PrintOnTextbox +PrintOnTextbox: @ 0x08016B74 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -47173,9 +47173,9 @@ _08016B86: bl sub_08196FB8 ldr r0, _08016BA8 adds r1, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196F04 + bl AddTextPrinterForMessage_2 ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -47183,7 +47183,7 @@ _08016B86: .align 2, 0 _08016BA8: .4byte gUnknown_2021C7C _08016BAC: - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -47198,7 +47198,7 @@ _08016BC0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08016B74 + thumb_func_end PrintOnTextbox thumb_func_start sub_08016BC8 sub_08016BC8: @ 0x08016BC8 @@ -47226,7 +47226,7 @@ _08016BE4: _08016BF0: cmp r5, #0 beq _08016C02 - bl sub_08198D88 + bl MovementType_WalkSequenceUpLeftDownRight_callback movs r0, #0 strb r0, [r4] movs r0, #3 @@ -47259,7 +47259,7 @@ _08016C20: sub_08016C28: @ 0x08016C28 push {r4, lr} sub sp, #8 - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -47268,7 +47268,7 @@ sub_08016C28: @ 0x08016C28 bl sub_08196FF0 adds r0, r4, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _08016C74 movs r0, #1 str r0, [sp] @@ -47280,9 +47280,9 @@ sub_08016C28: @ 0x08016C28 bl sub_08016EA4 adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 add sp, #8 pop {r4} @@ -47297,7 +47297,7 @@ sub_08016C78: @ 0x08016C78 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow pop {r0} bx r0 .align 2, 0 @@ -47320,7 +47320,7 @@ sub_08016C88: @ 0x08016C88 beq _08016CE4 b _08016D4A _08016CA4: - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 @@ -47336,12 +47336,12 @@ _08016CA4: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit mov r1, sb strb r0, [r1] ldrb r0, [r5] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r7] adds r0, #1 strb r0, [r7] @@ -47351,7 +47351,7 @@ _08016CE0: .4byte gUnknown_3006050 _08016CE4: mov r3, sb ldrb r0, [r3] - bl sub_081AE2DC + bl ListMenu_ProcessInput mov r8, r0 ldr r0, _08016D1C ldrh r1, [r0, #0x2e] @@ -47362,12 +47362,12 @@ _08016CE4: ldrb r0, [r4] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r5] movs r1, #1 bl sub_08197060 ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow movs r0, #0 strb r0, [r7] mov r0, r8 @@ -47383,12 +47383,12 @@ _08016D20: ldrb r0, [r6] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r5] movs r1, #1 bl sub_08197060 ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow strb r4, [r7] movs r0, #2 rsbs r0, r0, #0 @@ -47406,8 +47406,8 @@ _08016D4E: .align 2, 0 thumb_func_end sub_08016C88 - thumb_func_start sub_08016D5C -sub_08016D5C: @ 0x08016D5C + thumb_func_start MainMenu_FormatSavegameBadges +MainMenu_FormatSavegameBadges: @ 0x08016D5C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -47435,7 +47435,7 @@ _08016D84: mov r1, r8 strb r0, [r1] ldr r0, [sp, #0x20] - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 @@ -47451,7 +47451,7 @@ _08016D84: strb r1, [r0, #0x10] movs r1, #0 movs r2, #1 - bl sub_081AE25C + bl ListMenuInit mov r1, sl strb r0, [r1] b _08016DD0 @@ -47461,7 +47461,7 @@ _08016DC4: .4byte gUnknown_3006050 _08016DC8: ldrb r0, [r5] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram _08016DD0: ldrb r0, [r6] adds r0, #1 @@ -47470,7 +47470,7 @@ _08016DD0: _08016DD8: mov r3, sl ldrb r0, [r3] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r1, r0, #0 ldr r0, _08016E20 ldrh r2, [r0, #0x2e] @@ -47489,9 +47489,9 @@ _08016DFA: ldrb r0, [r4] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow mov r7, r8 ldrb r0, [r7] bl sub_08016C78 @@ -47512,12 +47512,12 @@ _08016E24: ldrb r0, [r1] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r5] movs r1, #1 bl sub_08197060 ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow mov r3, r8 ldrb r0, [r3] bl sub_08016C78 @@ -47540,7 +47540,7 @@ _08016E64: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08016D5C + thumb_func_end MainMenu_FormatSavegameBadges thumb_func_start sub_08016E74 sub_08016E74: @ 0x08016E74 @@ -47556,20 +47556,20 @@ sub_08016E74: @ 0x08016E74 movs r3, #0 bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r0} bx r0 thumb_func_end sub_08016E74 - thumb_func_start sub_08016E98 -sub_08016E98: @ 0x08016E98 + thumb_func_start Contest_RunTextPrinters +Contest_RunTextPrinters: @ 0x08016E98 push {lr} - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08016E98 + thumb_func_end Contest_RunTextPrinters thumb_func_start sub_08016EA4 sub_08016EA4: @ 0x08016EA4 @@ -47779,7 +47779,7 @@ _08017032: mov r0, sp movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r4, r5} pop {r0} @@ -48299,7 +48299,7 @@ sub_080173FC: @ 0x080173FC adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -48359,8 +48359,8 @@ _08017462: .align 2, 0 thumb_func_end sub_08017440 - thumb_func_start sub_08017468 -sub_08017468: @ 0x08017468 + thumb_func_start StartFieldEffectForEventObject +StartFieldEffectForEventObject: @ 0x08017468 push {r4, lr} adds r4, r0, #0 adds r0, r4, #2 @@ -48373,7 +48373,7 @@ sub_08017468: @ 0x08017468 pop {r4} pop {r1} bx r1 - thumb_func_end sub_08017468 + thumb_func_end StartFieldEffectForEventObject thumb_func_start sub_08017484 sub_08017484: @ 0x08017484 @@ -48415,7 +48415,7 @@ sub_08017484: @ 0x08017484 adds r1, r1, r2 adds r1, r1, r3 ldr r1, [r1] - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 b _080175DE .align 2, 0 @@ -48529,7 +48529,7 @@ _080175BC: ldr r1, [r0] _080175C2: adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _080175DC .align 2, 0 _080175CC: .4byte gUnknown_2021C7C @@ -48537,7 +48537,7 @@ _080175D0: .4byte gUnknown_82C15E8 _080175D4: ldr r0, _080175E4 ldr r1, _080175E8 - bl sub_08008BCC + bl StringExpandPlaceholders _080175DC: movs r0, #0 _080175DE: @@ -48605,7 +48605,7 @@ _08017648: adds r0, r6, #0 movs r2, #0x46 adds r3, r5, #0 - bl sub_08199F90 + bl blit_move_info_icon lsls r2, r4, #1 adds r2, r2, r4 lsls r2, r2, #1 @@ -48650,8 +48650,8 @@ _0801769E: _080176AC: .4byte gUnknown_82EA31C thumb_func_end sub_080175F0 - thumb_func_start sub_080176B0 -sub_080176B0: @ 0x080176B0 + thumb_func_start UpdateHpTextInHealthbox +UpdateHpTextInHealthbox: @ 0x080176B0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -48746,7 +48746,7 @@ _08017760: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080176B0 + thumb_func_end UpdateHpTextInHealthbox thumb_func_start sub_08017770 sub_08017770: @ 0x08017770 @@ -48817,7 +48817,7 @@ _080177D4: ldr r1, _080177FC adds r0, r0, r1 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0xce lsls r0, r0, #1 @@ -48847,7 +48847,7 @@ _08017810: ldr r1, _08017840 adds r0, r0, r1 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r0, r1, #3 subs r0, r0, r1 @@ -48919,7 +48919,7 @@ _08017898: ldr r1, _080178A4 _0801789A: adds r0, r3, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _080178B6 .align 2, 0 _080178A4: .4byte gUnknown_82C1998 @@ -48929,7 +48929,7 @@ _080178A8: adds r1, r1, r0 ldr r1, [r1] adds r0, r3, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _080178B6: pop {r0} bx r0 @@ -48944,7 +48944,7 @@ sub_080178C0: @ 0x080178C0 lsls r1, r1, #0x18 lsrs r4, r1, #0x18 adds r6, r4, #0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r2, _080178F4 @@ -49141,7 +49141,7 @@ _08017A48: ble _08017A48 ldr r1, _08017A64 adds r0, r7, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _08017A70 .align 2, 0 _08017A64: .4byte gUnknown_82C0E68 @@ -49149,7 +49149,7 @@ _08017A68: ldr r1, _08017A74 _08017A6A: adds r0, r7, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _08017A70: movs r2, #1 b _08017A82 @@ -49158,7 +49158,7 @@ _08017A74: .4byte gUnknown_82C0DEC _08017A78: ldr r1, _08017A90 adds r0, r7, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r2, #2 _08017A82: adds r0, r2, #0 @@ -49236,12 +49236,12 @@ _08017AEE: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x1e bhi _08017B16 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -49305,15 +49305,15 @@ sub_08017B5C: @ 0x08017B5C adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0xa] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0xc] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r5, #4] ldrh r1, [r5, #0xa] movs r0, #0xce @@ -49343,15 +49343,15 @@ sub_08017BA4: @ 0x08017BA4 adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0xe] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x10] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r5, #0x14] pop {r4, r5} pop {r0} @@ -49392,12 +49392,12 @@ _08017C02: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData cmp r0, r6 bne _08017C28 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, r7 @@ -49455,7 +49455,7 @@ _08017C84: .4byte gUnknown_20228F4 sub_08017C88: @ 0x08017C88 push {lr} bl sub_080987DC - bl sub_08097D70 + bl ScriptFreezeEventObjects pop {r0} bx r0 .align 2, 0 @@ -49514,7 +49514,7 @@ sub_08017CDC: @ 0x08017CDC lsls r2, r2, #0x18 lsrs r2, r2, #0x18 str r2, [sp] - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -49595,7 +49595,7 @@ sub_08017CDC: @ 0x08017CDC add r4, sb ldr r1, _08017E74 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, _08017E78 adds r1, r4, #0 bl StringCopy @@ -49644,7 +49644,7 @@ _08017DE2: _08017E16: ldrh r1, [r5] adds r0, r4, #0 - bl sub_0811F180 + bl CopyEasyChatWord lsrs r0, r6, #0x18 adds r1, r4, #0 bl DynamicPlaceholderTextUtil_SetPlaceholderPtr @@ -49661,7 +49661,7 @@ _08017E16: add r4, sb ldr r1, _08017E80 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r5, _08017E78 adds r0, r5, #0 adds r1, r4, #0 @@ -49671,7 +49671,7 @@ _08017E16: bne _08017E88 ldr r1, _08017E84 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders adds r0, r5, #0 adds r1, r4, #0 bl StringAppend @@ -49696,7 +49696,7 @@ _08017E88: adds r1, r1, r0 ldr r1, [r1] adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders adds r0, r5, #0 adds r1, r4, #0 bl StringAppend @@ -49716,28 +49716,28 @@ _08017EB8: .4byte gUnknown_82C1FA4 thumb_func_start sub_08017EBC sub_08017EBC: @ 0x08017EBC push {lr} - bl sub_08007144 - bl sub_08006EA0 + bl ProcessSpriteCopyRequests + bl LoadOam bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08017EBC - thumb_func_start sub_08017ED0 -sub_08017ED0: @ 0x08017ED0 + thumb_func_start c2_mystery_gift_e_reader_run +c2_mystery_gift_e_reader_run: @ 0x08017ED0 push {lr} - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08017ED0 + thumb_func_end c2_mystery_gift_e_reader_run - thumb_func_start sub_08017EE8 -sub_08017EE8: @ 0x08017EE8 + thumb_func_start HandleMysteryGiftOrEReaderSetup +HandleMysteryGiftOrEReaderSetup: @ 0x08017EE8 push {r4, r5, r6, r7, lr} sub sp, #0xc adds r7, r0, #0 @@ -49769,12 +49769,12 @@ _08017F18: b _080180D8 _08017F1A: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl ResetPaletteFade bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 - bl sub_080B9710 + bl ResetTasks + bl ScanlineEffect_Stop movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _08018004 @@ -49784,66 +49784,66 @@ _08017F1A: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r4, #0x80 lsls r4, r4, #4 adds r0, r4, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #3 - bl sub_08019330 + bl bgid_upload_textbox_1 ldr r0, _08018008 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r1, #0xc0 lsls r1, r1, #7 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -49861,14 +49861,14 @@ _0801800C: ldr r0, _08018088 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #2 - bl sub_080985A0 + bl stdpal_get movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0xc0 - bl sub_08197694 + bl Menu_LoadStdPalAt movs r0, #0 movs r1, #0xa movs r2, #0xe0 @@ -49904,7 +49904,7 @@ _0801800C: movs r3, #0 bl FillBgTilemapBufferRect movs r0, #3 - bl sub_08018240 + bl MG_DrawCheckerboardPattern lsls r0, r7, #0x18 lsrs r0, r0, #0x18 bl sub_08018180 @@ -49913,13 +49913,13 @@ _0801800C: _08018088: .4byte gUnknown_82C2454 _0801808C: movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080180A4: ldrb r0, [r6] adds r0, #1 @@ -49927,13 +49927,13 @@ _080180A4: b _080180D8 _080180AC: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r0, _080180D0 - bl sub_080A3040 + bl PlayBGM ldr r0, _080180D4 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0xc5 bl EnableInterrupts movs r0, #1 @@ -49949,39 +49949,39 @@ _080180DA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08017EE8 + thumb_func_end HandleMysteryGiftOrEReaderSetup thumb_func_start sub_080180E4 sub_080180E4: @ 0x080180E4 push {lr} movs r0, #0 - bl sub_08017EE8 + bl HandleMysteryGiftOrEReaderSetup cmp r0, #0 beq _08018100 ldr r0, _08018108 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0801810C movs r0, #0 strb r0, [r1] - bl sub_08018C14 + bl task_add_00_mystery_gift _08018100: - bl sub_080A89D4 + bl RunTasks pop {r0} bx r0 .align 2, 0 -_08018108: .4byte sub_08017ED0 +_08018108: .4byte c2_mystery_gift_e_reader_run _0801810C: .4byte gUnknown_2022914 thumb_func_end sub_080180E4 - thumb_func_start sub_08018110 -sub_08018110: @ 0x08018110 + thumb_func_start c2_ereader +c2_ereader: @ 0x08018110 push {lr} movs r0, #1 - bl sub_08017EE8 + bl HandleMysteryGiftOrEReaderSetup cmp r0, #0 beq _0801812C ldr r0, _08018130 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _08018134 movs r0, #1 strb r0, [r1] @@ -49990,37 +49990,37 @@ _0801812C: pop {r0} bx r0 .align 2, 0 -_08018130: .4byte sub_08017ED0 +_08018130: .4byte c2_mystery_gift_e_reader_run _08018134: .4byte gUnknown_2022914 - thumb_func_end sub_08018110 + thumb_func_end c2_ereader - thumb_func_start sub_08018138 -sub_08018138: @ 0x08018138 + thumb_func_start MainCB_FreeAllBuffersAndReturnToInitTitleScreen +MainCB_FreeAllBuffersAndReturnToInitTitleScreen: @ 0x08018138 push {lr} ldr r1, _08018178 movs r0, #0 strb r0, [r1] - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #1 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #2 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #3 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free ldr r0, _0801817C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _08018178: .4byte gUnknown_2022914 _0801817C: .4byte sub_080AA06C - thumb_func_end sub_08018138 + thumb_func_end MainCB_FreeAllBuffersAndReturnToInitTitleScreen thumb_func_start sub_08018180 sub_08018180: @ 0x08018180 @@ -50030,7 +50030,7 @@ sub_08018180: @ 0x08018180 lsrs r5, r0, #0x18 movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r5, #0 bne _080181D4 str r5, [sp] @@ -50044,7 +50044,7 @@ sub_08018180: @ 0x08018180 movs r1, #1 movs r2, #2 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 str r5, [sp] str r5, [sp, #4] str r4, [sp, #8] @@ -50055,7 +50055,7 @@ sub_08018180: @ 0x08018180 movs r1, #0 movs r2, #0x64 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 b _08018208 .align 2, 0 _080181C8: .4byte gUnknown_82C2B64 @@ -50074,7 +50074,7 @@ _080181D4: movs r1, #1 movs r2, #2 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 str r4, [sp] str r4, [sp, #4] str r5, [sp, #8] @@ -50085,13 +50085,13 @@ _080181D4: movs r1, #0 movs r2, #0x78 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 _08018208: movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap add sp, #0x14 pop {r4, r5} pop {r0} @@ -50102,21 +50102,21 @@ _08018224: .4byte gUnknown_85CCED5 _08018228: .4byte gUnknown_85CCEDF thumb_func_end sub_08018180 - thumb_func_start sub_0801822C -sub_0801822C: @ 0x0801822C + thumb_func_start MG_DrawTextBorder +MG_DrawTextBorder: @ 0x0801822C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 movs r2, #0xf - bl sub_080981E0 + bl DrawTextBorderOuter pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801822C + thumb_func_end MG_DrawTextBorder - thumb_func_start sub_08018240 -sub_08018240: @ 0x08018240 + thumb_func_start MG_DrawCheckerboardPattern +MG_DrawCheckerboardPattern: @ 0x08018240 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -50198,10 +50198,10 @@ _080182BA: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08018240 + thumb_func_end MG_DrawCheckerboardPattern - thumb_func_start sub_080182E0 -sub_080182E0: @ 0x080182E0 + thumb_func_start ClearScreenInBg0 +ClearScreenInBg0: @ 0x080182E0 push {lr} sub sp, #0xc cmp r0, #0 @@ -50235,24 +50235,24 @@ _08018306: bl FillBgTilemapBufferRect _0801831E: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080182E0 + thumb_func_end ClearScreenInBg0 - thumb_func_start sub_0801832C -sub_0801832C: @ 0x0801832C + thumb_func_start AddTextPrinterToWindow1 +AddTextPrinterToWindow1: @ 0x0801832C push {r4, lr} sub sp, #0x14 adds r1, r0, #0 ldr r4, _08018380 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r1, #0 str r1, [sp] movs r0, #1 @@ -50265,16 +50265,16 @@ sub_0801832C: @ 0x0801832C movs r1, #1 movs r2, #2 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 movs r0, #1 movs r1, #1 movs r2, #0xf - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x14 pop {r4} pop {r0} @@ -50282,25 +50282,25 @@ sub_0801832C: @ 0x0801832C .align 2, 0 _08018380: .4byte gUnknown_2021C7C _08018384: .4byte gUnknown_82C2B6C - thumb_func_end sub_0801832C + thumb_func_end AddTextPrinterToWindow1 - thumb_func_start sub_08018388 -sub_08018388: @ 0x08018388 + thumb_func_start ClearTextWindow +ClearTextWindow: @ 0x08018388 push {lr} movs r0, #1 - bl sub_08098504 + bl rbox_fill_rectangle movs r0, #1 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08018388 + thumb_func_end ClearTextWindow - thumb_func_start sub_080183A4 -sub_080183A4: @ 0x080183A4 + thumb_func_start MG_PrintTextOnWindow1AndWaitButton +MG_PrintTextOnWindow1AndWaitButton: @ 0x080183A4 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -50320,7 +50320,7 @@ _080183BC: beq _08018428 b _0801842C _080183C6: - bl sub_0801832C + bl AddTextPrinterToWindow1 b _080183F0 _080183CC: movs r0, #0 @@ -50333,7 +50333,7 @@ _080183CC: movs r1, #0xd0 movs r2, #0x14 movs r3, #1 - bl sub_0800568C + bl DrawDownArrow ldr r0, _080183FC ldrh r1, [r0, #0x2e] movs r0, #3 @@ -50358,10 +50358,10 @@ _08018400: movs r1, #0xd0 movs r2, #0x14 movs r3, #1 - bl sub_0800568C + bl DrawDownArrow movs r0, #0 strb r0, [r4] - bl sub_08018388 + bl ClearTextWindow movs r0, #1 b _0801842E .align 2, 0 @@ -50378,10 +50378,10 @@ _0801842E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080183A4 + thumb_func_end MG_PrintTextOnWindow1AndWaitButton - thumb_func_start sub_08018438 -sub_08018438: @ 0x08018438 + thumb_func_start HideDownArrow +HideDownArrow: @ 0x08018438 push {lr} sub sp, #0xc movs r0, #0 @@ -50394,16 +50394,16 @@ sub_08018438: @ 0x08018438 movs r1, #0xd0 movs r2, #0x14 movs r3, #1 - bl sub_0800568C + bl DrawDownArrow add sp, #0xc pop {r0} bx r0 .align 2, 0 _0801845C: .4byte gUnknown_202290C - thumb_func_end sub_08018438 + thumb_func_end HideDownArrow - thumb_func_start sub_08018460 -sub_08018460: @ 0x08018460 + thumb_func_start ShowDownArrow +ShowDownArrow: @ 0x08018460 push {lr} sub sp, #0xc movs r0, #1 @@ -50416,16 +50416,16 @@ sub_08018460: @ 0x08018460 movs r1, #0xd0 movs r2, #0x14 movs r3, #1 - bl sub_0800568C + bl DrawDownArrow add sp, #0xc pop {r0} bx r0 .align 2, 0 _08018484: .4byte gUnknown_202290C - thumb_func_end sub_08018460 + thumb_func_end ShowDownArrow - thumb_func_start sub_08018488 -sub_08018488: @ 0x08018488 + thumb_func_start unref_HideDownArrowAndWaitButton +unref_HideDownArrowAndWaitButton: @ 0x08018488 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] @@ -50435,7 +50435,7 @@ sub_08018488: @ 0x08018488 beq _080184B4 b _080184C0 _08018498: - bl sub_08018438 + bl HideDownArrow ldr r0, _080184B0 ldrh r1, [r0, #0x2e] movs r0, #3 @@ -50449,7 +50449,7 @@ _08018498: .align 2, 0 _080184B0: .4byte gUnknown_3002360 _080184B4: - bl sub_08018460 + bl ShowDownArrow movs r0, #0 strb r0, [r4] movs r0, #1 @@ -50460,17 +50460,17 @@ _080184C2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08018488 + thumb_func_end unref_HideDownArrowAndWaitButton - thumb_func_start sub_080184C8 -sub_080184C8: @ 0x080184C8 + thumb_func_start PrintStringAndWait2Seconds +PrintStringAndWait2Seconds: @ 0x080184C8 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] cmp r0, #0 bne _080184D8 adds r0, r1, #0 - bl sub_0801832C + bl AddTextPrinterToWindow1 _080184D8: ldrb r0, [r4] adds r0, #1 @@ -50484,17 +50484,17 @@ _080184D8: _080184EA: movs r0, #0 strb r0, [r4] - bl sub_08018388 + bl ClearTextWindow movs r0, #1 _080184F4: pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080184C8 + thumb_func_end PrintStringAndWait2Seconds - thumb_func_start sub_080184FC -sub_080184FC: @ 0x080184FC + thumb_func_start MysteryGift_HandleThreeOptionMenu +MysteryGift_HandleThreeOptionMenu: @ 0x080184FC push {r4, r5, lr} sub sp, #0x1c lsls r2, r2, #0x18 @@ -50521,17 +50521,17 @@ _08018522: add r1, sp, #4 movs r2, #1 movs r3, #0xa - bl sub_081AE134 + bl DoMysteryGiftListMenu adds r4, r0, #0 movs r0, #1 rsbs r0, r0, #0 cmp r4, r0 beq _0801854C movs r0, #2 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #2 movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram _0801854C: adds r0, r4, #0 add sp, #0x1c @@ -50541,10 +50541,10 @@ _0801854C: .align 2, 0 _08018558: .4byte gUnknown_82C2554 _0801855C: .4byte gUnknown_82C24EC - thumb_func_end sub_080184FC + thumb_func_end MysteryGift_HandleThreeOptionMenu - thumb_func_start sub_08018560 -sub_08018560: @ 0x08018560 + thumb_func_start mevent_message_print_and_prompt_yes_no +mevent_message_print_and_prompt_yes_no: @ 0x08018560 push {r4, r5, r6, lr} sub sp, #0x1c adds r5, r0, #0 @@ -50570,7 +50570,7 @@ _08018588: b _080186A6 _0801858A: ldr r0, _08018598 - bl sub_08008BCC + bl StringExpandPlaceholders cmp r6, #0 bne _080185A0 ldr r0, _0801859C @@ -50581,11 +50581,11 @@ _0801859C: .4byte gUnknown_82C24D4 _080185A0: ldr r0, _080185E8 _080185A2: - bl sub_08003250 + bl AddWindow strh r0, [r4] ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] movs r2, #0 str r2, [sp] @@ -50599,16 +50599,16 @@ _080185A2: movs r1, #1 movs r2, #2 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 ldrb r0, [r4] movs r1, #1 movs r2, #0xf - bl sub_080981E0 + bl DrawTextBorderOuter ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap b _0801863E .align 2, 0 _080185E8: .4byte gUnknown_82C24DC @@ -50671,28 +50671,28 @@ _0801864C: movs r0, #0 strb r0, [r5] ldrb r0, [r4] - bl sub_08098504 + bl rbox_fill_rectangle ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow adds r0, r6, #0 b _080186AA _08018682: movs r0, #0 strb r0, [r5] ldrb r0, [r4] - bl sub_08098504 + bl rbox_fill_rectangle ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #1 rsbs r0, r0, #0 b _080186AA @@ -50705,10 +50705,10 @@ _080186AA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08018560 + thumb_func_end mevent_message_print_and_prompt_yes_no - thumb_func_start sub_080186B4 -sub_080186B4: @ 0x080186B4 + thumb_func_start BufferMonTrainerMemo +BufferMonTrainerMemo: @ 0x080186B4 push {r4, r5, r6, lr} sub sp, #0x14 adds r6, r0, #0 @@ -50732,7 +50732,7 @@ _080186D4: bne _080186EC ldr r0, _080186E4 ldr r1, _080186E8 - bl sub_08008BCC + bl StringExpandPlaceholders b _080186F4 .align 2, 0 _080186E4: .4byte gUnknown_2021C7C @@ -50740,15 +50740,15 @@ _080186E8: .4byte gUnknown_82C2974 _080186EC: ldr r0, _08018744 ldr r1, _08018748 - bl sub_08008BCC + bl StringExpandPlaceholders _080186F4: ldr r0, _0801874C - bl sub_08003250 + bl AddWindow strh r0, [r5] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5] movs r2, #0 str r2, [sp] @@ -50762,16 +50762,16 @@ _080186F4: movs r1, #1 movs r2, #2 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 ldrb r0, [r5] movs r1, #1 movs r2, #0xf - bl sub_080981E0 + bl DrawTextBorderOuter ldrb r0, [r5] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r5] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6] adds r0, #1 strb r0, [r6] @@ -50816,7 +50816,7 @@ _08018794: str r2, [sp] movs r2, #1 movs r3, #0xa - bl sub_081AE134 + bl DoMysteryGiftListMenu adds r4, r0, #0 movs r0, #1 rsbs r0, r0, #0 @@ -50825,14 +50825,14 @@ _08018794: movs r0, #0 strb r0, [r6] ldrb r0, [r5] - bl sub_08098504 + bl rbox_fill_rectangle ldrb r0, [r5] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r5] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 b _080187FC .align 2, 0 @@ -50842,14 +50842,14 @@ _080187D4: movs r0, #0 strb r0, [r6] ldrb r0, [r5] - bl sub_08098504 + bl rbox_fill_rectangle ldrb r0, [r5] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r5] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow movs r0, #2 rsbs r0, r0, #0 b _080187FC @@ -50861,24 +50861,24 @@ _080187FC: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080186B4 + thumb_func_end BufferMonTrainerMemo - thumb_func_start sub_08018804 -sub_08018804: @ 0x08018804 + thumb_func_start ValidateCardOrNews +ValidateCardOrNews: @ 0x08018804 push {lr} cmp r0, #0 beq _08018810 - bl sub_0801ABA0 + bl ItemUseInBattle_Escape b _08018814 _08018810: - bl sub_0801AD40 + bl CreateSetStatusSprite _08018814: pop {r1} bx r1 - thumb_func_end sub_08018804 + thumb_func_end ValidateCardOrNews - thumb_func_start sub_08018818 -sub_08018818: @ 0x08018818 + thumb_func_start HandleLoadWonderCardOrNews +HandleLoadWonderCardOrNews: @ 0x08018818 push {r4, r5, lr} adds r5, r0, #0 ldrb r0, [r5] @@ -50927,14 +50927,14 @@ _0801886E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08018818 + thumb_func_end HandleLoadWonderCardOrNews - thumb_func_start sub_08018874 -sub_08018874: @ 0x08018874 + thumb_func_start DestroyNewsOrCard +DestroyNewsOrCard: @ 0x08018874 push {lr} cmp r0, #0 bne _08018880 - bl sub_0801ACB0 + bl DestroyWonderCard b _08018884 _08018880: bl sub_0801AB44 @@ -50943,7 +50943,7 @@ _08018884: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08018874 + thumb_func_end DestroyNewsOrCard thumb_func_start sub_0801888C sub_0801888C: @ 0x0801888C @@ -50953,7 +50953,7 @@ sub_0801888C: @ 0x0801888C bl sub_0801B8B0 cmp r0, #0 beq _080188A8 - bl sub_0801B670 + bl DestroyWonderCardResources b _080188B0 _080188A0: bl sub_0801C588 @@ -50963,7 +50963,7 @@ _080188A8: movs r0, #0 b _080188B2 _080188AC: - bl sub_0801C280 + bl DestroyWonderNewsResources _080188B0: movs r0, #1 _080188B2: @@ -50972,8 +50972,8 @@ _080188B2: .align 2, 0 thumb_func_end sub_0801888C - thumb_func_start sub_080188B8 -sub_080188B8: @ 0x080188B8 + thumb_func_start mevent_message_prompt_discard +mevent_message_prompt_discard: @ 0x080188B8 push {lr} cmp r2, #0 beq _080188C8 @@ -50985,17 +50985,17 @@ _080188C8: ldr r3, _080188D8 _080188CA: movs r2, #1 - bl sub_08018560 + bl mevent_message_print_and_prompt_yes_no lsls r0, r0, #0x18 asrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _080188D8: .4byte gUnknown_82C2A94 - thumb_func_end sub_080188B8 + thumb_func_end mevent_message_prompt_discard - thumb_func_start sub_080188DC -sub_080188DC: @ 0x080188DC + thumb_func_start mevent_message_was_thrown_away +mevent_message_was_thrown_away: @ 0x080188DC push {lr} cmp r1, #0 beq _080188EC @@ -51006,15 +51006,15 @@ _080188E8: .4byte gUnknown_82C2B38 _080188EC: ldr r1, _080188F8 _080188EE: - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton pop {r1} bx r1 .align 2, 0 _080188F8: .4byte gUnknown_82C2B28 - thumb_func_end sub_080188DC + thumb_func_end mevent_message_was_thrown_away - thumb_func_start sub_080188FC -sub_080188FC: @ 0x080188FC + thumb_func_start mevent_save_game +mevent_save_game: @ 0x080188FC push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] @@ -51035,17 +51035,17 @@ _08018914: @ jump table .4byte _08018960 @ case 4 _08018928: ldr r0, _08018930 - bl sub_0801832C + bl AddTextPrinterToWindow1 b _08018954 .align 2, 0 _08018930: .4byte gUnknown_82C2AEC _08018934: movs r0, #0 - bl sub_08153274 + bl TrySavingData b _08018954 _0801893C: ldr r0, _08018944 - bl sub_0801832C + bl AddTextPrinterToWindow1 b _08018954 .align 2, 0 _08018944: .4byte gUnknown_82C2B08 @@ -51066,7 +51066,7 @@ _0801895C: .4byte gUnknown_3002360 _08018960: movs r0, #0 strb r0, [r4] - bl sub_08018388 + bl ClearTextWindow movs r0, #1 b _0801896E _0801896C: @@ -51075,10 +51075,10 @@ _0801896E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080188FC + thumb_func_end mevent_save_game - thumb_func_start sub_08018974 -sub_08018974: @ 0x08018974 + thumb_func_start mevent_message +mevent_message: @ 0x08018974 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -51229,10 +51229,10 @@ _08018A9C: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08018974 + thumb_func_end mevent_message - thumb_func_start sub_08018AA4 -sub_08018AA4: @ 0x08018AA4 + thumb_func_start PrintMGSuccessMessage +PrintMGSuccessMessage: @ 0x08018AA4 push {r4, r5, r6, lr} adds r6, r0, #0 adds r0, r1, #0 @@ -51252,11 +51252,11 @@ _08018ABC: _08018AC2: cmp r0, #0 beq _08018ACA - bl sub_0801832C + bl AddTextPrinterToWindow1 _08018ACA: movs r0, #0xb9 lsls r0, r0, #1 - bl sub_080A29AC + bl PlayFanfare strh r4, [r5] b _08018AE4 _08018AD6: @@ -51273,13 +51273,13 @@ _08018AE4: strb r0, [r6] b _08018B02 _08018AEC: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _08018B02 movs r0, #0 strb r0, [r6] - bl sub_08018388 + bl ClearTextWindow movs r0, #1 b _08018B04 _08018B02: @@ -51289,10 +51289,10 @@ _08018B04: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08018AA4 + thumb_func_end PrintMGSuccessMessage - thumb_func_start sub_08018B0C -sub_08018B0C: @ 0x08018B0C + thumb_func_start mevent_message_stamp_card_etc_send_status +mevent_message_stamp_card_etc_send_status: @ 0x08018B0C push {r4, lr} adds r3, r0, #0 ldr r1, _08018B28 @@ -51395,7 +51395,7 @@ _08018BCE: bx r1 .align 2, 0 _08018BD8: .4byte gUnknown_82C2A78 - thumb_func_end sub_08018B0C + thumb_func_end mevent_message_stamp_card_etc_send_status thumb_func_start sub_08018BDC sub_08018BDC: @ 0x08018BDC @@ -51408,18 +51408,18 @@ sub_08018BDC: @ 0x08018BDC lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, sp - bl sub_08018B0C + bl mevent_message_stamp_card_etc_send_status adds r1, r0, #0 ldr r0, [sp] cmp r0, #0 bne _08018C02 adds r0, r4, #0 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton b _08018C0A _08018C02: adds r0, r4, #0 adds r2, r5, #0 - bl sub_08018AA4 + bl PrintMGSuccessMessage _08018C0A: add sp, #4 pop {r4, r5} @@ -51428,12 +51428,12 @@ _08018C0A: .align 2, 0 thumb_func_end sub_08018BDC - thumb_func_start sub_08018C14 -sub_08018C14: @ 0x08018C14 + thumb_func_start task_add_00_mystery_gift +task_add_00_mystery_gift: @ 0x08018C14 push {r4, lr} ldr r0, _08018C54 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -51455,18 +51455,18 @@ sub_08018C14: @ 0x08018C14 strh r0, [r4, #6] strb r1, [r4, #0xe] movs r0, #0x40 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x10] pop {r4} pop {r0} bx r0 .align 2, 0 -_08018C54: .4byte sub_08018C5C +_08018C54: .4byte PrintMGSendStatus _08018C58: .4byte gUnknown_3005B68 - thumb_func_end sub_08018C14 + thumb_func_end task_add_00_mystery_gift - thumb_func_start sub_08018C5C -sub_08018C5C: @ 0x08018C5C + thumb_func_start PrintMGSendStatus +PrintMGSendStatus: @ 0x08018C5C push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -51538,7 +51538,7 @@ _08018D26: adds r0, #9 adds r1, r5, #0 movs r2, #0 - bl sub_080184FC + bl MysteryGift_HandleThreeOptionMenu adds r1, r0, #0 cmp r1, #1 beq _08018D50 @@ -51552,11 +51552,11 @@ _08018D26: _08018D46: movs r0, #0 strb r0, [r5, #0xc] - bl sub_0801AD40 + bl CreateSetStatusSprite b _08018D56 _08018D50: strb r1, [r5, #0xc] - bl sub_0801ABA0 + bl ItemUseInBattle_Escape _08018D56: cmp r0, #1 bne _08018D5C @@ -51574,7 +51574,7 @@ _08018D64: adds r0, r5, #0 adds r0, #9 ldr r1, _08018D78 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton b _080191D2 .align 2, 0 _08018D78: .4byte gUnknown_82C26C4 @@ -51582,7 +51582,7 @@ _08018D7C: adds r0, r5, #0 adds r0, #9 ldr r1, _08018D88 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton b _080191D2 .align 2, 0 _08018D88: .4byte gUnknown_82C26E8 @@ -51591,13 +51591,13 @@ _08018D8C: cmp r0, #0 bne _08018DA0 ldr r0, _08018D9C - bl sub_0801832C + bl AddTextPrinterToWindow1 b _08018DA6 .align 2, 0 _08018D9C: .4byte gUnknown_82C2710 _08018DA0: ldr r0, _08018DAC - bl sub_0801832C + bl AddTextPrinterToWindow1 _08018DA6: movs r0, #4 b _08018D22 @@ -51608,7 +51608,7 @@ _08018DB0: adds r0, #9 adds r1, r5, #0 movs r2, #1 - bl sub_080184FC + bl MysteryGift_HandleThreeOptionMenu adds r4, r0, #0 cmp r4, #1 beq _08018DDE @@ -51620,22 +51620,22 @@ _08018DB0: beq _08018DEA b _0801931A _08018DD0: - bl sub_08018388 + bl ClearTextWindow movs r1, #0 movs r0, #5 strb r0, [r5, #8] strb r1, [r5, #0xd] b _0801931A _08018DDE: - bl sub_08018388 + bl ClearTextWindow movs r0, #5 strb r0, [r5, #8] strb r4, [r5, #0xd] b _0801931A _08018DEA: - bl sub_08018388 + bl ClearTextWindow ldrb r0, [r5, #0xc] - bl sub_08018804 + bl ValidateCardOrNews cmp r0, #0 beq _08018DFA b _08019230 @@ -51670,7 +51670,7 @@ _08018E32: cmp r0, #0 bne _08018E56 movs r0, #6 - bl sub_08014DB0 + bl MEvent_CreateTask_CardOrNewsOverWireless b _08018E56 _08018E3E: ldrb r0, [r5, #0xd] @@ -51683,7 +51683,7 @@ _08018E4C: cmp r0, #0 bne _08018E56 movs r0, #7 - bl sub_08014DB0 + bl MEvent_CreateTask_CardOrNewsOverWireless _08018E56: movs r0, #6 b _08018D22 @@ -51693,11 +51693,11 @@ _08018E5A: cmp r0, #0 beq _08018E78 movs r0, #1 - bl sub_080182E0 + bl ClearScreenInBg0 movs r0, #7 strb r0, [r5, #8] ldrb r0, [r5, #0xc] - bl sub_0801D294 + bl mevent_client_do_init b _0801931A .align 2, 0 _08018E74: .4byte gUnknown_30031C4 @@ -51709,20 +51709,20 @@ _08018E78: b _0801931A _08018E82: movs r0, #1 - bl sub_080182E0 + bl ClearScreenInBg0 b _080191D8 .align 2, 0 _08018E8C: .4byte gUnknown_2037290 _08018E90: ldr r0, _08018E9C - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #8 b _08018D22 .align 2, 0 _08018E9C: .4byte gUnknown_82C276C _08018EA0: adds r0, r5, #0 - bl sub_0801D2B8 + bl mevent_client_do_exec subs r0, #2 cmp r0, #4 bls _08018EAE @@ -51742,19 +51742,19 @@ _08018EBC: @ jump table .4byte _08018EDC @ case 3 .4byte _08018ED0 @ case 4 _08018ED0: - bl sub_0800FD94 + bl task_add_05_task_del_08FA224_when_no_RfuFunc ldrh r0, [r5] strb r0, [r5, #0xe] movs r0, #0xd b _08018D22 _08018EDC: ldr r4, [r5, #0x10] - bl sub_0801D304 + bl mevent_client_get_buffer adds r1, r0, #0 adds r0, r4, #0 movs r2, #0x40 bl memcpy - bl sub_0801D2F4 + bl mevent_client_inc_flag b _0801931A _08018EF2: movs r0, #0xa @@ -51775,12 +51775,12 @@ _08018F0C: .4byte gUnknown_20226A8 _08018F10: adds r4, r5, #0 adds r4, #9 - bl sub_0801D304 + bl mevent_client_get_buffer adds r3, r0, #0 adds r0, r4, #0 adds r1, r5, #0 movs r2, #0 - bl sub_08018560 + bl mevent_message_print_and_prompt_yes_no lsls r0, r0, #0x18 asrs r1, r0, #0x18 cmp r1, #1 @@ -51792,10 +51792,10 @@ _08018F10: _08018F34: adds r4, r5, #0 adds r4, #9 - bl sub_0801D304 + bl mevent_client_get_buffer adds r1, r0, #0 adds r0, r4, #0 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 bne _08018F4A b _0801931A @@ -51807,14 +51807,14 @@ _08018F4C: ldr r3, _08018F74 adds r1, r5, #0 movs r2, #0 - bl sub_08018560 + bl mevent_message_print_and_prompt_yes_no lsls r0, r0, #0x18 asrs r1, r0, #0x18 cmp r1, #1 beq _08018FA8 cmp r1, #1 bhs _08018F96 - bl sub_0801AEB8 + bl CheckReceivedGiftFromWonderCard cmp r0, #1 bne _08018F78 movs r0, #0xc @@ -51830,7 +51830,7 @@ _08018F7C: ldr r3, _08018FA0 adds r1, r5, #0 movs r2, #0 - bl sub_08018560 + bl mevent_message_print_and_prompt_yes_no lsls r0, r0, #0x18 asrs r1, r0, #0x18 cmp r1, #1 @@ -51851,9 +51851,9 @@ _08018FA4: _08018FA8: movs r0, #1 _08018FAA: - bl sub_0801D310 + bl mevent_client_set_param _08018FAE: - bl sub_0801D2F4 + bl mevent_client_inc_flag movs r0, #7 b _08018D22 _08018FB6: @@ -51863,7 +51863,7 @@ _08018FB6: beq _08018FC0 b _0801931A _08018FC0: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite movs r0, #0xe b _08018D22 .align 2, 0 @@ -51872,7 +51872,7 @@ _08018FCC: adds r0, r5, #0 adds r0, #9 ldr r1, _08018FF0 - bl sub_080184C8 + bl PrintStringAndWait2Seconds cmp r0, #0 bne _08018FDC b _0801931A @@ -51895,7 +51895,7 @@ _08018FFC: ldrb r2, [r5, #0xd] ldrb r3, [r5, #0xe] mov r0, sp - bl sub_08018974 + bl mevent_message adds r1, r0, #0 cmp r1, #0 bne _08019010 @@ -51907,12 +51907,12 @@ _08019010: adds r0, r5, #0 adds r0, #9 adds r2, r5, #0 - bl sub_08018AA4 + bl PrintMGSuccessMessage b _0801902A _08019022: adds r0, r5, #0 adds r0, #9 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton _0801902A: adds r1, r0, #0 cmp r1, #0 @@ -51926,11 +51926,11 @@ _08019032: cmp r0, #1 bne _08019046 movs r0, #1 - bl sub_0801D978 + bl GenerateRandomNews b _0801904C _08019046: movs r0, #2 - bl sub_0801D978 + bl GenerateRandomNews _0801904C: ldr r0, [sp] cmp r0, #0 @@ -51941,7 +51941,7 @@ _08019054: _08019056: adds r0, r5, #0 adds r0, #9 - bl sub_080188FC + bl mevent_save_game cmp r0, #0 bne _08019064 b _0801931A @@ -51951,7 +51951,7 @@ _08019066: adds r0, r5, #0 adds r0, #9 ldrb r1, [r5, #0xc] - bl sub_08018818 + bl HandleLoadWonderCardOrNews cmp r0, #0 bne _08019076 b _0801931A @@ -52011,7 +52011,7 @@ _080190C2: movs r3, #0 b _080190FA _080190DC: - bl sub_0801ABF8 + bl WonderNews_Test_Unk_02 cmp r0, #0 beq _080190F0 adds r0, r5, #0 @@ -52027,7 +52027,7 @@ _080190F0: adds r1, r5, #0 movs r3, #1 _080190FA: - bl sub_080186B4 + bl BufferMonTrainerMemo adds r1, r0, #0 cmp r1, #1 beq _0801911A @@ -52062,7 +52062,7 @@ _08019130: adds r0, #9 ldrb r2, [r5, #0xc] adds r1, r5, #0 - bl sub_080188B8 + bl mevent_message_prompt_discard adds r1, r0, #0 cmp r1, #0 beq _0801914C @@ -52075,7 +52075,7 @@ _0801914C: ldrb r0, [r5, #0xc] cmp r0, #0 bne _08019188 - bl sub_0801AEB8 + bl CheckReceivedGiftFromWonderCard cmp r0, #1 bne _08019188 movs r0, #0x17 @@ -52086,7 +52086,7 @@ _0801915E: ldr r3, _08019184 adds r1, r5, #0 movs r2, #1 - bl sub_08018560 + bl mevent_message_print_and_prompt_yes_no lsls r0, r0, #0x18 asrs r1, r0, #0x18 cmp r1, #1 @@ -52115,13 +52115,13 @@ _08019190: b _0801931A _0801919C: ldrb r0, [r5, #0xc] - bl sub_08018874 + bl DestroyNewsOrCard movs r0, #0x19 b _08018D22 _080191A6: adds r0, r5, #0 adds r0, #9 - bl sub_080188FC + bl mevent_save_game cmp r0, #0 bne _080191B4 b _0801931A @@ -52132,7 +52132,7 @@ _080191B8: adds r0, r5, #0 adds r0, #9 ldrb r1, [r5, #0xc] - bl sub_080188DC + bl mevent_message_was_thrown_away b _080192F6 _080191C4: ldrb r0, [r5, #0xc] @@ -52163,11 +52163,11 @@ _080191E8: b _08019202 _080191F4: movs r0, #6 - bl sub_08014508 + bl MEvent_CreateTask_Leader b _08019202 _080191FC: movs r0, #7 - bl sub_08014508 + bl MEvent_CreateTask_Leader _08019202: movs r0, #1 strb r0, [r5, #0xd] @@ -52179,7 +52179,7 @@ _0801920A: cmp r0, #0 beq _08019220 movs r0, #1 - bl sub_080182E0 + bl ClearScreenInBg0 movs r0, #0x1f b _08018D22 .align 2, 0 @@ -52192,7 +52192,7 @@ _08019220: b _0801931A _0801922A: movs r0, #1 - bl sub_080182E0 + bl ClearScreenInBg0 _08019230: movs r0, #0x12 b _08018D22 @@ -52210,7 +52210,7 @@ _08019238: cmp r0, #0 bne _08019268 ldr r0, _08019264 - bl sub_0801832C + bl AddTextPrinterToWindow1 bl sub_0801CB48 b _08019272 .align 2, 0 @@ -52220,8 +52220,8 @@ _08019260: .4byte gUnknown_2021C68 _08019264: .4byte gUnknown_82C2994 _08019268: ldr r0, _08019278 - bl sub_0801832C - bl sub_0801CB24 + bl AddTextPrinterToWindow1 + bl mevent_srv_init_wnews _08019272: movs r0, #0x20 b _08018D22 @@ -52237,7 +52237,7 @@ _0801927C: movs r0, #0x21 b _08018D22 _0801928E: - bl sub_0800FD94 + bl task_add_05_task_del_08FA224_when_no_RfuFunc ldr r0, _080192A0 ldr r1, _080192A4 bl StringCopy @@ -52251,7 +52251,7 @@ _080192A8: ldrb r0, [r0] cmp r0, #0 bne _0801931A - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite movs r0, #0x23 b _08018D22 .align 2, 0 @@ -52272,7 +52272,7 @@ _080192BC: cmp r0, r1 bne _080192FA movs r0, #3 - bl sub_0801D978 + bl GenerateRandomNews _080192E0: movs r0, #0x11 b _08018D22 @@ -52283,7 +52283,7 @@ _080192EC: adds r0, r5, #0 adds r0, #9 ldr r1, _08019300 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton _080192F6: cmp r0, #0 beq _0801931A @@ -52293,21 +52293,21 @@ _080192FA: .align 2, 0 _08019300: .4byte gUnknown_82C2790 _08019304: - bl sub_08009384 + bl CloseLink ldr r0, [r5, #0x10] - bl sub_08000BF0 + bl Free adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _08019324 - bl sub_08000540 + bl SetMainCallback2 _0801931A: add sp, #4 pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08019324: .4byte sub_08018138 - thumb_func_end sub_08018C5C +_08019324: .4byte MainCB_FreeAllBuffersAndReturnToInitTitleScreen + thumb_func_end PrintMGSendStatus thumb_func_start sub_08019328 sub_08019328: @ 0x08019328 @@ -52317,8 +52317,8 @@ sub_08019328: @ 0x08019328 _0801932C: .4byte 0x000001A9 thumb_func_end sub_08019328 - thumb_func_start sub_08019330 -sub_08019330: @ 0x08019330 + thumb_func_start bgid_upload_textbox_1 +bgid_upload_textbox_1: @ 0x08019330 push {lr} sub sp, #4 lsls r0, r0, #0x18 @@ -52328,16 +52328,16 @@ sub_08019330: @ 0x08019330 lsls r2, r2, #1 movs r3, #0 str r3, [sp] - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap add sp, #4 pop {r0} bx r0 .align 2, 0 _0801934C: .4byte gUnknown_82C2474 - thumb_func_end sub_08019330 + thumb_func_end bgid_upload_textbox_1 - thumb_func_start sub_08019350 -sub_08019350: @ 0x08019350 + thumb_func_start is_walking_or_running +is_walking_or_running: @ 0x08019350 push {lr} ldr r0, _08019364 ldrb r0, [r0, #3] @@ -52356,7 +52356,7 @@ _0801936A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08019350 + thumb_func_end is_walking_or_running thumb_func_start sub_08019370 sub_08019370: @ 0x08019370 @@ -52462,8 +52462,8 @@ _08019422: bx r1 thumb_func_end sub_080193D8 - thumb_func_start sub_08019428 -sub_08019428: @ 0x08019428 + thumb_func_start IsUnionRoomPlayerHidden +IsUnionRoomPlayerHidden: @ 0x08019428 push {lr} ldr r1, _08019440 adds r0, r0, r1 @@ -52476,7 +52476,7 @@ sub_08019428: @ 0x08019428 bx r1 .align 2, 0 _08019440: .4byte 0x000002BF - thumb_func_end sub_08019428 + thumb_func_end IsUnionRoomPlayerHidden thumb_func_start sub_08019444 sub_08019444: @ 0x08019444 @@ -52506,8 +52506,8 @@ sub_0801945C: @ 0x0801945C _08019470: .4byte 0x000002BF thumb_func_end sub_0801945C - thumb_func_start sub_08019474 -sub_08019474: @ 0x08019474 + thumb_func_start SetUnionRoomPlayerGfx +SetUnionRoomPlayerGfx: @ 0x08019474 push {lr} ldr r2, _0801948C adds r0, r0, r2 @@ -52520,10 +52520,10 @@ sub_08019474: @ 0x08019474 bx r0 .align 2, 0 _0801948C: .4byte 0x00004010 - thumb_func_end sub_08019474 + thumb_func_end SetUnionRoomPlayerGfx - thumb_func_start sub_08019490 -sub_08019490: @ 0x08019490 + thumb_func_start CreateUnionRoomPlayerEventObject +CreateUnionRoomPlayerEventObject: @ 0x08019490 push {lr} ldr r1, _080194A8 adds r0, r0, r1 @@ -52538,10 +52538,10 @@ sub_08019490: @ 0x08019490 .align 2, 0 _080194A8: .4byte gUnknown_82C2BC4 _080194AC: .4byte gUnknown_3005AEC - thumb_func_end sub_08019490 + thumb_func_end CreateUnionRoomPlayerEventObject - thumb_func_start sub_080194B0 -sub_080194B0: @ 0x080194B0 + thumb_func_start RemoveUnionRoomPlayerEventObject +RemoveUnionRoomPlayerEventObject: @ 0x080194B0 push {lr} ldr r1, _080194C8 adds r0, r0, r1 @@ -52550,16 +52550,16 @@ sub_080194B0: @ 0x080194B0 ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap pop {r0} bx r0 .align 2, 0 _080194C8: .4byte gUnknown_82C2BC4 _080194CC: .4byte gUnknown_3005AEC - thumb_func_end sub_080194B0 + thumb_func_end RemoveUnionRoomPlayerEventObject - thumb_func_start sub_080194D0 -sub_080194D0: @ 0x080194D0 + thumb_func_start SetUnionRoomPlayerEnterExitMovement +SetUnionRoomPlayerEnterExitMovement: @ 0x080194D0 push {r4, r5, lr} sub sp, #4 adds r5, r1, #0 @@ -52589,7 +52589,7 @@ sub_080194D0: @ 0x080194D0 bne _08019536 ldrb r1, [r5] adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement lsls r0, r0, #0x18 cmp r0, #0 bne _08019528 @@ -52616,7 +52616,7 @@ _08019538: .align 2, 0 _08019540: .4byte gUnknown_82C2BDC _08019544: .4byte gUnknown_82C2BF0 - thumb_func_end sub_080194D0 + thumb_func_end SetUnionRoomPlayerEnterExitMovement thumb_func_start sub_08019548 sub_08019548: @ 0x08019548 @@ -52662,7 +52662,7 @@ _08019590: b _080195A8 _080195A2: adds r0, r4, #0 - bl sub_08096D74 + bl FreezeEventObject _080195A8: movs r0, #1 _080195AA: @@ -52702,7 +52702,7 @@ _080195D8: subs r2, #1 cmp r2, #0 bge _080195D8 - bl sub_08019878 + bl unknown_ItemMenu_Show lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4} @@ -52731,7 +52731,7 @@ sub_0801960C: @ 0x0801960C _08019620: ldr r1, _0801963C adds r0, r4, #0 - bl sub_080194D0 + bl SetUnionRoomPlayerEnterExitMovement cmp r0, #1 bne _0801965E adds r0, r4, #0 @@ -52748,7 +52748,7 @@ _08019640: cmp r0, #0 beq _0801965E adds r0, r4, #0 - bl sub_080194B0 + bl RemoveUnionRoomPlayerEventObject adds r0, r4, #0 bl sub_08019444 movs r0, #0 @@ -52785,7 +52785,7 @@ _08019684: beq _080196EC b _08019716 _0801968A: - bl sub_08019350 + bl is_walking_or_running cmp r0, #0 beq _08019716 mov r4, sp @@ -52805,7 +52805,7 @@ _0801968A: beq _08019716 mov r0, sp adds r1, r4, #0 - bl sub_0808B440 + bl player_get_pos_including_state_based_drift mov r0, sp movs r1, #0 ldrsh r2, [r0, r1] @@ -52818,9 +52818,9 @@ _0801968A: beq _08019716 ldrb r1, [r7, #1] adds r0, r5, #0 - bl sub_08019474 + bl SetUnionRoomPlayerGfx adds r0, r5, #0 - bl sub_08019490 + bl CreateUnionRoomPlayerEventObject adds r0, r5, #0 bl sub_0801945C ldrb r0, [r6] @@ -52829,7 +52829,7 @@ _0801968A: _080196EC: ldr r1, _08019700 adds r0, r5, #0 - bl sub_080194D0 + bl SetUnionRoomPlayerEnterExitMovement cmp r0, #1 bne _08019716 ldrb r0, [r6] @@ -52971,7 +52971,7 @@ _080197D8: strb r1, [r4] strb r1, [r4, #2] adds r0, r5, #0 - bl sub_080194B0 + bl RemoveUnionRoomPlayerEventObject adds r0, r5, #0 bl sub_08019444 b _0801982E @@ -53042,19 +53042,19 @@ _08019870: .4byte 0x00000282 _08019874: .4byte gUnknown_82C2BF4 thumb_func_end sub_08019838 - thumb_func_start sub_08019878 -sub_08019878: @ 0x08019878 + thumb_func_start unknown_ItemMenu_Show +unknown_ItemMenu_Show: @ 0x08019878 push {r4, lr} ldr r4, _08019898 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0801989C adds r0, r4, #0 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080198AA @@ -53075,24 +53075,24 @@ _080198AA: _080198B0: .4byte gUnknown_82C2BDC _080198B4: .4byte 0x0000028E _080198B8: .4byte gUnknown_82C2BF0 - thumb_func_end sub_08019878 + thumb_func_end unknown_ItemMenu_Show - thumb_func_start sub_080198BC -sub_080198BC: @ 0x080198BC + thumb_func_start DestroyWonderNews +DestroyWonderNews: @ 0x080198BC push {lr} ldr r0, _080198D4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xf bhi _080198D0 - bl sub_080A8964 + bl DestroyTask _080198D0: pop {r0} bx r0 .align 2, 0 _080198D4: .4byte sub_08019838 - thumb_func_end sub_080198BC + thumb_func_end DestroyWonderNews thumb_func_start sub_080198D8 sub_080198D8: @ 0x080198D8 @@ -53100,11 +53100,11 @@ sub_080198D8: @ 0x080198D8 movs r4, #0 _080198DC: adds r0, r4, #0 - bl sub_08019428 + bl IsUnionRoomPlayerHidden cmp r0, #0 bne _080198F2 adds r0, r4, #0 - bl sub_080194B0 + bl RemoveUnionRoomPlayerEventObject adds r0, r4, #0 bl sub_08019444 _080198F2: @@ -53114,7 +53114,7 @@ _080198F2: ldr r1, _08019908 movs r0, #0 str r0, [r1] - bl sub_080198BC + bl DestroyWonderNews pop {r4} pop {r0} bx r0 @@ -53173,7 +53173,7 @@ _0801993A: str r0, [sp, #4] movs r0, #0x41 adds r1, r4, #0 - bl sub_0808D77C + bl sprite_new ldr r1, [sp, #8] adds r5, r1, r5 strb r0, [r5] @@ -53409,7 +53409,7 @@ sub_08019B00: @ 0x08019B00 adds r5, #6 adds r0, r4, #0 adds r1, r5, #0 - bl sub_0808B440 + bl player_get_pos_including_state_based_drift lsls r0, r7, #2 adds r0, r0, r7 subs r0, #0x38 @@ -53696,7 +53696,7 @@ sub_08019D60: @ 0x08019D60 adds r5, r0, #0 str r1, [sp, #4] str r2, [sp, #8] - bl sub_08019350 + bl is_walking_or_running cmp r0, #0 bne _08019DA8 b _08019E4E @@ -53725,7 +53725,7 @@ _08019DA8: adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer movs r0, #0 str r0, [sp, #0xc] ldr r0, _08019E60 @@ -53862,15 +53862,15 @@ sub_08019E88: @ 0x08019E88 thumb_func_start sub_08019EAC sub_08019EAC: @ 0x08019EAC push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08019ECC - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade _08019ECC: pop {r0} bx r0 @@ -53879,8 +53879,8 @@ _08019ECC: thumb_func_start sub_08019ED0 sub_08019ED0: @ 0x08019ED0 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -53891,7 +53891,7 @@ sub_08019ED0: @ 0x08019ED0 sub_08019EE4: @ 0x08019EE4 push {lr} ldr r0, _08019EF0 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -53907,10 +53907,10 @@ sub_08019EF4: @ 0x08019EF4 bl SetGpuReg ldr r5, _0801A018 movs r0, #0x6c - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _0801A01C @@ -53923,37 +53923,37 @@ sub_08019EF4: @ 0x08019EF4 bl sub_08000BC8 adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _0801A020 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _0801A024 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r0, _0801A028 - bl sub_08003090 + bl InitWindows bl sub_08004480 bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 - bl sub_080B9710 + bl ResetTasks + bl ScanlineEffect_Stop bl m4aSoundVSyncOn ldr r0, _0801A02C - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0801A030 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, [r5] adds r1, #0x60 strb r0, [r1] @@ -53967,25 +53967,25 @@ sub_08019EF4: @ 0x08019EF4 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, _0801A034 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0xf0 - bl sub_08197694 + bl Menu_LoadStdPalAt bl DynamicPlaceholderTextUtil_Reset movs r0, #0x20 str r0, [sp] @@ -53998,14 +53998,14 @@ sub_08019EF4: @ 0x08019EF4 movs r3, #0 bl FillBgTilemapBufferRect movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0801A038 - bl sub_08000540 - bl sub_080A89D4 + bl SetMainCallback2 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #0xc pop {r4, r5} pop {r0} @@ -54025,27 +54025,27 @@ _0801A038: .4byte sub_08019EAC thumb_func_start sub_0801A03C sub_0801A03C: @ 0x0801A03C push {r4, lr} - bl sub_080034D4 + bl FreeAllWindowBuffers movs r4, #0 _0801A044: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free adds r4, #1 cmp r4, #1 ble _0801A044 ldr r0, _0801A06C ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _0801A070 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 .align 2, 0 _0801A06C: .4byte gUnknown_3000DAC -_0801A070: .4byte sub_08085B34 +_0801A070: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_0801A03C thumb_func_start sub_0801A074 @@ -54080,7 +54080,7 @@ _0801A09C: adds r0, r0, r1 movs r1, #0 movs r2, #0x10 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 @@ -54093,13 +54093,13 @@ sub_0801A0B8: @ 0x0801A0B8 sub sp, #8 movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _0801A164 ldr r2, [r4] movs r0, #6 @@ -54153,15 +54153,15 @@ _0801A0EE: movs r3, #0 bl sub_0801A384 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #8 pop {r4, r5} pop {r0} @@ -54226,13 +54226,13 @@ _0801A1D4: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg b _0801A33C _0801A1F8: ldr r0, _0801A210 @@ -54267,7 +54267,7 @@ _0801A214: beq _0801A2C6 movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r4, #0 ldr r7, _0801A290 movs r2, #0xa0 @@ -54291,7 +54291,7 @@ _0801A246: ldr r1, _0801A294 adds r1, r6, r1 adds r0, r7, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders cmp r4, #3 beq _0801A298 mov r1, r8 @@ -54327,10 +54327,10 @@ _0801A2AA: cmp r4, #3 ble _0801A246 movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0801A2C6: ldr r0, _0801A31C ldrh r1, [r0, #0x2e] @@ -54386,7 +54386,7 @@ _0801A32C: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0801A33C: ldr r1, _0801A350 lsls r0, r5, #2 @@ -54408,9 +54408,9 @@ _0801A354: cmp r0, #0 bne _0801A36C ldr r0, _0801A380 - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0801A36C: add sp, #0x14 pop {r3, r4} @@ -54511,7 +54511,7 @@ _0801A40E: adds r0, r7, #0 adds r1, r6, #0 adds r2, r5, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4, r5, r6, r7} pop {r0} @@ -54756,7 +54756,7 @@ _0801A5B8: adds r5, r4, r0 _0801A5DE: adds r0, r4, #0 - bl sub_08067670 + bl ZeroMonData adds r4, #0x64 cmp r4, r5 ble _0801A5DE @@ -54783,7 +54783,7 @@ _0801A5F2: adds r1, r2, #0 strh r1, [r0] ldr r0, _0801A638 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -54792,7 +54792,7 @@ _0801A628: .4byte gUnknown_2024190 _0801A62C: .4byte gUnknown_20243E8 _0801A630: .4byte gUnknown_203CBC4 _0801A634: .4byte gUnknown_203886A -_0801A638: .4byte sub_080365B4 +_0801A638: .4byte CB2_InitBattle thumb_func_end sub_0801A5A8 thumb_func_start sub_0801A63C @@ -54826,7 +54826,7 @@ sub_0801A63C: @ 0x0801A63C lsrs r1, r1, #0x18 adds r0, r5, #0 str r3, [sp, #0x14] - bl sub_08003B18 + bl FillWindowPixelBuffer mov r1, sb str r1, [sp] mov r0, sl @@ -54841,7 +54841,7 @@ sub_0801A63C: @ 0x0801A63C movs r1, #1 adds r2, r6, #0 ldr r3, [sp, #0x14] - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r3, r4, r5} mov r8, r3 @@ -54872,7 +54872,7 @@ _0801A6C8: movs r0, #0 movs r1, #1 movs r2, #0xd - bl sub_080981E0 + bl DrawTextBorderOuter str r5, [sp] movs r0, #0 adds r1, r6, #0 @@ -54880,10 +54880,10 @@ _0801A6C8: movs r3, #1 bl sub_0801A63C movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrh r0, [r4] adds r0, #1 strh r0, [r4] @@ -54910,8 +54910,8 @@ _0801A70C: thumb_func_start sub_0801A714 sub_0801A714: @ 0x0801A714 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -54999,11 +54999,11 @@ _0801A820: bl SetGpuReg ldr r4, _0801A8BC movs r0, #4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _0801A8C0 @@ -55012,7 +55012,7 @@ _0801A820: bl InitBgsFromTemplates bl reset_temp_tile_data_buffers ldr r0, _0801A8C4 - bl sub_08003090 + bl InitWindows lsls r0, r0, #0x10 cmp r0, #0 bne _0801A860 @@ -55020,13 +55020,13 @@ _0801A820: _0801A860: bl sub_08004480 movs r0, #0 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x1e str r0, [sp] movs r0, #0x14 @@ -55048,7 +55048,7 @@ _0801A860: bl LoadUserWindowBorderGfx_ bl sub_08197680 ldr r0, _0801A8C8 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _0801A8CC movs r0, #0x87 lsls r0, r0, #3 @@ -55086,9 +55086,9 @@ _0801A8F8: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r1, _0801A918 movs r0, #0x87 lsls r0, r0, #3 @@ -55097,7 +55097,7 @@ _0801A8F8: .align 2, 0 _0801A918: .4byte gUnknown_3002360 _0801A91C: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _0801A928 @@ -55125,7 +55125,7 @@ _0801A94E: ldr r1, _0801A964 movs r0, #0 movs r2, #0x20 - bl sub_0800A070 + bl SendBlock ldr r1, _0801A968 movs r2, #0x87 lsls r2, r2, #3 @@ -55135,7 +55135,7 @@ _0801A94E: _0801A964: .4byte gUnknown_202257C _0801A968: .4byte gUnknown_3002360 _0801A96C: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -55158,7 +55158,7 @@ _0801A97A: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0801A9B0 movs r1, #0x87 lsls r1, r1, #3 @@ -55171,7 +55171,7 @@ _0801A9B0: .4byte gUnknown_3002360 _0801A9B4: bl sub_0800A7F8 ldr r4, _0801A9D8 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x10 adds r0, r0, r4 @@ -55195,12 +55195,12 @@ _0801A9E0: movs r1, #8 _0801A9EA: strb r1, [r0] - bl sub_0800A178 + bl ResetBlockReceivedFlags b _0801AA82 .align 2, 0 _0801A9F4: .4byte gUnknown_3002360 _0801A9F8: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0801AA82 @@ -55213,12 +55213,12 @@ _0801A9F8: .align 2, 0 _0801AA10: .4byte gUnknown_3002360 _0801AA14: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801AA82 ldr r0, _0801AA28 - bl sub_08000540 + bl SetMainCallback2 b _0801AA82 .align 2, 0 _0801AA28: .4byte sub_0801A5A8 @@ -55231,7 +55231,7 @@ _0801AA2C: cmp r0, #0 beq _0801AA82 ldr r0, _0801AA4C - bl sub_08000540 + bl SetMainCallback2 b _0801AA82 .align 2, 0 _0801AA44: .4byte gUnknown_2022920 @@ -55261,13 +55261,13 @@ _0801AA6C: cmp r0, #0 beq _0801AA82 ldr r0, _0801AAA8 - bl sub_08000540 + bl SetMainCallback2 _0801AA82: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade _0801AA96: add sp, #0xc pop {r4} @@ -55411,8 +55411,8 @@ _0801AB9A: bx r1 thumb_func_end sub_0801AB50 - thumb_func_start sub_0801ABA0 -sub_0801ABA0: @ 0x0801ABA0 + thumb_func_start ItemUseInBattle_Escape +ItemUseInBattle_Escape: @ 0x0801ABA0 push {r4, lr} ldr r4, _0801ABD0 ldr r0, [r4] @@ -55445,7 +55445,7 @@ _0801ABDE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0801ABA0 + thumb_func_end ItemUseInBattle_Escape thumb_func_start sub_0801ABE4 sub_0801ABE4: @ 0x0801ABE4 @@ -55463,8 +55463,8 @@ _0801ABF2: .align 2, 0 thumb_func_end sub_0801ABE4 - thumb_func_start sub_0801ABF8 -sub_0801ABF8: @ 0x0801ABF8 + thumb_func_start WonderNews_Test_Unk_02 +WonderNews_Test_Unk_02: @ 0x0801ABF8 push {lr} ldr r0, _0801AC0C ldr r0, [r0] @@ -55484,7 +55484,7 @@ _0801AC16: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0801ABF8 + thumb_func_end WonderNews_Test_Unk_02 thumb_func_start sub_0801AC1C sub_0801AC1C: @ 0x0801AC1C @@ -55539,7 +55539,7 @@ sub_0801AC74: @ 0x0801AC74 ldr r0, [r0] ldr r1, _0801AC90 adds r4, r0, r1 - bl sub_0801ABA0 + bl ItemUseInBattle_Escape cmp r0, #0 bne _0801AC94 _0801AC88: @@ -55567,8 +55567,8 @@ _0801ACAA: bx r1 thumb_func_end sub_0801AC74 - thumb_func_start sub_0801ACB0 -sub_0801ACB0: @ 0x0801ACB0 + thumb_func_start DestroyWonderCard +DestroyWonderCard: @ 0x0801ACB0 push {lr} bl sub_0801ADF0 bl sub_0801AE28 @@ -55580,13 +55580,13 @@ sub_0801ACB0: @ 0x0801ACB0 ldr r0, [r0] ldr r1, _0801ACE0 adds r0, r0, r1 - bl sub_081651C8 + bl ClearEReaderTrainer pop {r0} bx r0 .align 2, 0 _0801ACDC: .4byte gUnknown_3005AF0 _0801ACE0: .4byte 0x00000BEC - thumb_func_end sub_0801ACB0 + thumb_func_end DestroyWonderCard thumb_func_start sub_0801ACE4 sub_0801ACE4: @ 0x0801ACE4 @@ -55595,7 +55595,7 @@ sub_0801ACE4: @ 0x0801ACE4 bl sub_0801AD8C cmp r0, #0 beq _0801AD38 - bl sub_0801ACB0 + bl DestroyWonderCard ldr r4, _0801AD28 ldr r0, [r4] ldr r5, _0801AD2C @@ -55633,8 +55633,8 @@ _0801AD3A: bx r1 thumb_func_end sub_0801ACE4 - thumb_func_start sub_0801AD40 -sub_0801AD40: @ 0x0801AD40 + thumb_func_start CreateSetStatusSprite +CreateSetStatusSprite: @ 0x0801AD40 push {r4, r5, lr} ldr r5, _0801AD78 ldr r0, [r5] @@ -55655,7 +55655,7 @@ sub_0801AD40: @ 0x0801AD40 bl sub_0801AD8C cmp r0, #0 beq _0801AD84 - bl sub_08098B80 + bl ValidateSavedRamScript cmp r0, #0 beq _0801AD84 movs r0, #1 @@ -55670,7 +55670,7 @@ _0801AD86: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0801AD40 + thumb_func_end CreateSetStatusSprite thumb_func_start sub_0801AD8C sub_0801AD8C: @ 0x0801AD8C @@ -55788,10 +55788,10 @@ _0801AE54: .4byte gUnknown_3005AEC _0801AE58: .4byte 0x000033B8 thumb_func_end sub_0801AE28 - thumb_func_start sub_0801AE5C -sub_0801AE5C: @ 0x0801AE5C + thumb_func_start GetWonderCardFlagID +GetWonderCardFlagID: @ 0x0801AE5C push {lr} - bl sub_0801AD40 + bl CreateSetStatusSprite cmp r0, #0 bne _0801AE6A movs r0, #0 @@ -55808,7 +55808,7 @@ _0801AE74: .align 2, 0 _0801AE78: .4byte gUnknown_3005AEC _0801AE7C: .4byte 0x00003314 - thumb_func_end sub_0801AE5C + thumb_func_end GetWonderCardFlagID thumb_func_start WonderCard_ResetInternalReceivedFlag WonderCard_ResetInternalReceivedFlag: @ 0x0801AE80 @@ -55848,10 +55848,10 @@ _0801AEB2: .align 2, 0 thumb_func_end IsWonderCardFlagIDInValidRange - thumb_func_start sub_0801AEB8 -sub_0801AEB8: @ 0x0801AEB8 + thumb_func_start CheckReceivedGiftFromWonderCard +CheckReceivedGiftFromWonderCard: @ 0x0801AEB8 push {r4, lr} - bl sub_0801AE5C + bl GetWonderCardFlagID lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 @@ -55880,7 +55880,7 @@ _0801AEF2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0801AEB8 + thumb_func_end CheckReceivedGiftFromWonderCard thumb_func_start sub_0801AEF8 sub_0801AEF8: @ 0x0801AEF8 @@ -55977,10 +55977,10 @@ _0801AF86: .align 2, 0 thumb_func_end sub_0801AF64 - thumb_func_start sub_0801AF8C -sub_0801AF8C: @ 0x0801AF8C + thumb_func_start special_0x4a +special_0x4a: @ 0x0801AF8C push {lr} - bl sub_0801AD40 + bl CreateSetStatusSprite cmp r0, #0 beq _0801AFC0 ldr r0, _0801AFB4 @@ -56007,7 +56007,7 @@ _0801AFC2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0801AF8C + thumb_func_end special_0x4a thumb_func_start sub_0801AFC8 sub_0801AFC8: @ 0x0801AFC8 @@ -56112,7 +56112,7 @@ _0801B080: lsls r0, r0, #2 _0801B088: str r0, [r5, #0x10] - bl sub_0801AD40 + bl CreateSetStatusSprite cmp r0, #0 beq _0801B0BC bl sub_0801AAF4 @@ -56357,8 +56357,8 @@ sub_0801B230: @ 0x0801B230 bx r1 thumb_func_end sub_0801B230 - thumb_func_start sub_0801B244 -sub_0801B244: @ 0x0801B244 + thumb_func_start MEventStruct_Unk1442CC_GetValueNFrom_unk_20 +MEventStruct_Unk1442CC_GetValueNFrom_unk_20: @ 0x0801B244 push {lr} adds r2, r0, #0 cmp r1, #4 @@ -56410,10 +56410,10 @@ _0801B29E: _0801B2A4: .4byte gUnknown_82C332C _0801B2A8: .4byte 0x0000034F _0801B2AC: .4byte gUnknown_82C3338 - thumb_func_end sub_0801B244 + thumb_func_end MEventStruct_Unk1442CC_GetValueNFrom_unk_20 - thumb_func_start sub_0801B2B0 -sub_0801B2B0: @ 0x0801B2B0 + thumb_func_start MovementType_FaceDownAndRight_callback +MovementType_FaceDownAndRight_callback: @ 0x0801B2B0 push {r4, lr} adds r4, r0, #0 ldr r2, _0801B2D8 @@ -56491,7 +56491,7 @@ _0801B34A: bx r0 .align 2, 0 _0801B350: .4byte 0x000003E7 - thumb_func_end sub_0801B2B0 + thumb_func_end MovementType_FaceDownAndRight_callback thumb_func_start sub_0801B354 sub_0801B354: @ 0x0801B354 @@ -56575,7 +56575,7 @@ _0801B3F4: ands r0, r1 cmp r0, #1 bne _0801B438 - bl sub_0801AF8C + bl special_0x4a lsls r0, r0, #0x10 lsrs r0, r0, #0x10 b _0801B446 @@ -56634,7 +56634,7 @@ sub_0801B464: @ 0x0801B464 str r0, [r5] cmp r4, #0 beq _0801B4A2 - bl sub_0801AD40 + bl CreateSetStatusSprite cmp r0, #0 beq _0801B4A0 ldr r0, _0801B498 @@ -56659,8 +56659,8 @@ _0801B4A2: bx r1 thumb_func_end sub_0801B464 - thumb_func_start sub_0801B4A8 -sub_0801B4A8: @ 0x0801B4A8 + thumb_func_start WonderCard_Test_Unk_08_6 +WonderCard_Test_Unk_08_6: @ 0x0801B4A8 push {lr} adds r2, r0, #0 ldr r0, _0801B4D0 @@ -56719,7 +56719,7 @@ _0801B514: _0801B518: .4byte gUnknown_82C332C _0801B51C: .4byte 0x000003F2 _0801B520: .4byte gUnknown_82C3338 - thumb_func_end sub_0801B4A8 + thumb_func_end WonderCard_Test_Unk_08_6 thumb_func_start sub_0801B524 sub_0801B524: @ 0x0801B524 @@ -56818,7 +56818,7 @@ sub_0801B5B8: @ 0x0801B5B8 cmp r0, #0 beq _0801B5D0 adds r0, r4, #0 - bl sub_0801B2B0 + bl MovementType_FaceDownAndRight_callback _0801B5D0: pop {r4} pop {r0} @@ -56837,7 +56837,7 @@ sub_0801B5D8: @ 0x0801B5D8 beq _0801B5F4 ldr r6, _0801B5F8 ldr r0, _0801B5FC - bl sub_08000BDC + bl AllocZeroed str r0, [r6] cmp r0, #0 bne _0801B600 @@ -56908,8 +56908,8 @@ _0801B664: _0801B66C: .4byte gUnknown_82C428C thumb_func_end sub_0801B5D8 - thumb_func_start sub_0801B670 -sub_0801B670: @ 0x0801B670 + thumb_func_start DestroyWonderCardResources +DestroyWonderCardResources: @ 0x0801B670 push {r4, lr} ldr r4, _0801B694 ldr r0, [r4] @@ -56919,7 +56919,7 @@ sub_0801B670: @ 0x0801B670 movs r1, #0 bl memset ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0801B68C: @@ -56929,7 +56929,7 @@ _0801B68C: .align 2, 0 _0801B694: .4byte gUnknown_2022928 _0801B698: .4byte 0x0000126C - thumb_func_end sub_0801B670 + thumb_func_end DestroyWonderCardResources thumb_func_start sub_0801B69C sub_0801B69C: @ 0x0801B69C @@ -56974,10 +56974,10 @@ _0801B6EC: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0801B896 _0801B6FE: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0801B70A @@ -57009,11 +57009,11 @@ _0801B70C: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r5, _0801B798 ldr r0, [r5] adds r0, #0xc8 @@ -57024,22 +57024,22 @@ _0801B70C: movs r0, #2 movs r2, #0 movs r3, #8 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r4, _0801B79C adds r0, r4, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r5] adds r1, #0xce strh r0, [r1] adds r0, r4, #0 adds r0, #8 - bl sub_08003250 + bl AddWindow ldr r1, [r5] adds r1, #0xd0 strh r0, [r1] adds r4, #0x10 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r5] adds r1, #0xd2 strh r0, [r1] @@ -57048,16 +57048,16 @@ _0801B70C: _0801B798: .4byte gUnknown_2022928 _0801B79C: .4byte gUnknown_82C3348 _0801B7A0: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0 bne _0801B8A2 movs r0, #1 - bl sub_080985A0 + bl stdpal_get movs r1, #0x20 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r2, _0801B81C ldrb r0, [r2, #8] movs r1, #0x80 @@ -57070,7 +57070,7 @@ _0801B7A0: ldr r0, [r0, #0xc] movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, [r5] adds r0, r1, #0 adds r0, #0xc8 @@ -57098,9 +57098,9 @@ _0801B7A0: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801B896 .align 2, 0 _0801B81C: .4byte gUnknown_2037C74 @@ -57116,16 +57116,16 @@ _0801B82A: movs r0, #2 bl sub_0801BCA4 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801B896 _0801B844: - bl sub_080D27A4 + bl LoadMonIconPalettes b _0801B896 _0801B84A: movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r2, _0801B87C ldrb r1, [r2, #8] movs r0, #0x7f @@ -57138,13 +57138,13 @@ _0801B84A: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C - bl sub_080A12E4 + bl BeginNormalPaletteFade + bl UpdatePaletteFade b _0801B896 .align 2, 0 _0801B87C: .4byte gUnknown_2037C74 _0801B880: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -57211,10 +57211,10 @@ _0801B8F8: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0801B9D6 _0801B90A: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _0801B9D6 @@ -57244,55 +57244,55 @@ _0801B916: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801B9D6 _0801B95E: movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg ldr r4, _0801B98C ldr r0, [r4] adds r0, #0xd2 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r0, [r4] adds r0, #0xd0 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r0, [r4] adds r0, #0xce ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow b _0801B9D6 .align 2, 0 _0801B98C: .4byte gUnknown_2022928 _0801B990: bl sub_0801C17C - bl sub_080D283C + bl FreeMonIconPalettes b _0801B9D6 _0801B99A: ldr r0, _0801B9BC ldrb r0, [r0] bl sub_08018180 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _0801B9D6 .align 2, 0 _0801B9BC: .4byte gUnknown_2022914 _0801B9C0: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -57601,11 +57601,11 @@ _0801BBD4: ldrb r5, [r2] movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x18 @@ -57615,11 +57615,11 @@ _0801BBD4: ble _0801BC70 movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute ldr r3, [r7] adds r1, r3, #0 adds r1, #0xcd @@ -57689,10 +57689,10 @@ sub_0801BCA4: @ 0x0801BCA4 lsrs r3, r7, #0x18 mov sb, r3 mov r0, sb - bl sub_0800365C + bl PutWindowTilemap mov r0, sb movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r4, #1 bne _0801BCE2 b _0801BE20 @@ -57734,14 +57734,14 @@ _0801BCFE: movs r1, #3 movs r2, #0 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r5, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r6, r0, #0 mov r1, sl ldr r0, [r1] @@ -57750,11 +57750,11 @@ _0801BCFE: mov r8, r0 movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute lsls r5, r5, #0x18 lsrs r5, r5, #0x18 lsls r6, r6, #0x18 @@ -57797,7 +57797,7 @@ _0801BCFE: mov r0, sb movs r1, #3 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r1, sl ldr r0, [r1] ldr r0, [r0, #4] @@ -57808,11 +57808,11 @@ _0801BCFE: _0801BDC4: movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x18 @@ -57845,7 +57845,7 @@ _0801BDC4: mov r0, sb movs r1, #0 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0801C02A .align 2, 0 _0801BE1C: .4byte gUnknown_82C333C @@ -57885,7 +57885,7 @@ _0801BE22: lsrs r0, r1, #0x18 movs r1, #3 movs r2, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r4, #1 lsls r4, r4, #0x18 lsrs r3, r4, #0x18 @@ -57926,7 +57926,7 @@ _0801BE84: mov r0, sb movs r1, #3 movs r2, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r3, sl ldr r2, [r3] ldrb r1, [r2, #8] @@ -57960,7 +57960,7 @@ _0801BE84: mov r0, sb movs r1, #3 movs r2, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r8, r7 b _0801C02A .align 2, 0 @@ -58034,7 +58034,7 @@ _0801BF28: mov r1, r8 lsrs r0, r1, #0x18 movs r1, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0801BF9A: movs r3, #0xc6 lsls r3, r3, #1 @@ -58047,11 +58047,11 @@ _0801BF9A: adds r5, r0, #0 movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute lsls r5, r5, #0x10 lsrs r5, r5, #0x10 lsls r4, r4, #0x18 @@ -58098,7 +58098,7 @@ _0801BF9A: mov r1, r8 lsrs r0, r1, #0x18 movs r1, #3 - bl sub_08199AFC + bl AddTextPrinterParameterized3 subs r0, r7, #1 lsls r0, r0, #0x18 cmp r0, #0 @@ -58108,7 +58108,7 @@ _0801C02A: mov r3, r8 lsrs r0, r3, #0x18 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -58179,7 +58179,7 @@ _0801C0A8: cmp r0, #1 bne _0801C156 ldr r0, _0801C170 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, [r4] adds r0, #0xc8 ldr r0, [r0] @@ -58220,7 +58220,7 @@ _0801C0E6: adds r1, r5, #0 movs r2, #0x90 movs r3, #8 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] adds r1, #0xd5 adds r1, r1, r4 @@ -58364,7 +58364,7 @@ sub_0801C224: @ 0x0801C224 beq _0801C23A ldr r5, _0801C240 ldr r0, _0801C244 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] cmp r0, #0 bne _0801C248 @@ -58405,8 +58405,8 @@ _0801C274: _0801C27C: .4byte gUnknown_82C49F4 thumb_func_end sub_0801C224 - thumb_func_start sub_0801C280 -sub_0801C280: @ 0x0801C280 + thumb_func_start DestroyWonderNewsResources +DestroyWonderNewsResources: @ 0x0801C280 push {r4, lr} ldr r4, _0801C2A4 ldr r0, [r4] @@ -58416,7 +58416,7 @@ sub_0801C280: @ 0x0801C280 movs r1, #0 bl memset ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0801C29C: @@ -58426,7 +58426,7 @@ _0801C29C: .align 2, 0 _0801C2A4: .4byte gUnknown_202292C _0801C2A8: .4byte 0x000011EC - thumb_func_end sub_0801C280 + thumb_func_end DestroyWonderNewsResources thumb_func_start sub_0801C2AC sub_0801C2AC: @ 0x0801C2AC @@ -58475,10 +58475,10 @@ _0801C304: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0801C55A _0801C316: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _0801C322 @@ -58487,19 +58487,19 @@ _0801C322: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x40 movs r1, #0xf0 bl SetGpuReg @@ -58515,7 +58515,7 @@ _0801C322: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits b _0801C55A .align 2, 0 _0801C378: .4byte 0x00001C98 @@ -58551,13 +58551,13 @@ _0801C37C: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r5, _0801C410 ldr r0, [r5] adds r0, #0xe0 @@ -58568,16 +58568,16 @@ _0801C37C: movs r0, #3 movs r2, #0 movs r3, #8 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r4, _0801C414 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r5] adds r1, #0xec strh r0, [r1] adds r4, #8 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r5] adds r1, #0xee strh r0, [r1] @@ -58586,7 +58586,7 @@ _0801C37C: _0801C410: .4byte gUnknown_202292C _0801C414: .4byte gUnknown_82C4314 _0801C418: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r7, r0, #0x18 cmp r7, #0 @@ -58594,10 +58594,10 @@ _0801C418: b _0801C570 _0801C426: movs r0, #1 - bl sub_080985A0 + bl stdpal_get movs r1, #0x20 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r2, _0801C4CC ldrb r0, [r2, #8] movs r1, #0x80 @@ -58611,7 +58611,7 @@ _0801C426: ldr r0, [r0, #0xc] movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette mov r2, r8 ldr r1, [r2] adds r0, r1, #0 @@ -58643,7 +58643,7 @@ _0801C426: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect mov r2, r8 ldr r1, [r2] adds r1, r1, r6 @@ -58662,11 +58662,11 @@ _0801C426: movs r0, #3 movs r2, #0 movs r3, #3 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801C55A .align 2, 0 _0801C4CC: .4byte gUnknown_2037C74 @@ -58677,17 +58677,17 @@ _0801C4D4: _0801C4DA: bl sub_0801C95C movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801C55A _0801C4EC: movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r2, _0801C538 ldrb r1, [r2, #8] movs r0, #0x7f @@ -58699,7 +58699,7 @@ _0801C4EC: lsls r2, r2, #1 adds r0, r1, r2 adds r1, #0xea - bl sub_081AF058 + bl AddScrollIndicatorArrowPair ldr r1, [r4] adds r1, #0xe5 movs r2, #0 @@ -58710,14 +58710,14 @@ _0801C4EC: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C - bl sub_080A12E4 + bl BeginNormalPaletteFade + bl UpdatePaletteFade b _0801C55A .align 2, 0 _0801C538: .4byte gUnknown_2037C74 _0801C53C: .4byte gUnknown_202292C _0801C540: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0801C570 @@ -58798,10 +58798,10 @@ _0801C5D4: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0801C72E _0801C5E6: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _0801C5F2 @@ -58810,7 +58810,7 @@ _0801C5F2: movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x40 movs r1, #0 bl SetGpuReg @@ -58826,7 +58826,7 @@ _0801C5F2: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits b _0801C72E _0801C628: movs r4, #0x1e @@ -58861,28 +58861,28 @@ _0801C628: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801C72E _0801C688: movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg ldr r4, _0801C6AC ldr r0, [r4] adds r0, #0xee ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r0, [r4] adds r0, #0xec ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow b _0801C72E .align 2, 0 _0801C6AC: .4byte gUnknown_202292C @@ -58890,11 +58890,11 @@ _0801C6B0: movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r4, _0801C6E0 ldr r0, [r4] adds r1, r0, #0 @@ -58902,7 +58902,7 @@ _0801C6B0: ldrb r0, [r1] cmp r0, #0xff beq _0801C72E - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] adds r0, #0xe5 movs r1, #0xff @@ -58915,23 +58915,23 @@ _0801C6E4: ldrb r0, [r0] bl sub_08018180 movs r0, #3 - bl sub_08018240 + bl MG_DrawCheckerboardPattern movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _0801C72E .align 2, 0 _0801C710: .4byte gUnknown_2022914 _0801C714: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0801C744 @@ -58983,7 +58983,7 @@ sub_0801C754: @ 0x0801C754 ldrb r0, [r1] cmp r0, #0xff beq _0801C78A - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] adds r0, #0xe5 movs r1, #0xff @@ -59019,7 +59019,7 @@ sub_0801C794: @ 0x0801C794 adds r0, r2, r1 adds r1, r2, #0 adds r1, #0xea - bl sub_081AF058 + bl AddScrollIndicatorArrowPair ldr r1, [r4] adds r1, #0xe5 strb r0, [r1] @@ -59255,32 +59255,32 @@ sub_0801C95C: @ 0x0801C95C ldr r0, [r6] adds r0, #0xec ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] adds r0, #0xee ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] adds r0, #0xec ldrb r0, [r0] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] adds r0, #0xee ldrb r0, [r0] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] adds r0, #0xf2 bl StringLength adds r5, r0, #0 movs r0, #3 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 movs r0, #3 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute lsls r5, r5, #0x10 lsrs r5, r5, #0x10 lsls r4, r4, #0x18 @@ -59315,7 +59315,7 @@ sub_0801C95C: @ 0x0801C95C str r4, [sp, #8] movs r1, #3 movs r3, #6 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0801C9F4: ldr r5, _0801CA60 ldr r4, [r5] @@ -59348,7 +59348,7 @@ _0801C9F4: str r4, [sp, #8] movs r1, #3 movs r2, #3 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #1 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -59358,12 +59358,12 @@ _0801C9F4: adds r0, #0xec ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r5] adds r0, #0xee ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -59393,11 +59393,11 @@ sub_0801CA6C: @ 0x0801CA6C movs r0, #2 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY b _0801CAB8 .align 2, 0 _0801CAA0: .4byte gUnknown_202292C @@ -59405,11 +59405,11 @@ _0801CAA4: movs r0, #2 adds r1, r4, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 adds r1, r4, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY _0801CAB8: ldr r2, _0801CAF8 ldr r0, [r2] @@ -59470,36 +59470,36 @@ _0801CB1E: bx r0 thumb_func_end sub_0801CA6C - thumb_func_start sub_0801CB24 -sub_0801CB24: @ 0x0801CB24 + thumb_func_start mevent_srv_init_wnews +mevent_srv_init_wnews: @ 0x0801CB24 push {r4, lr} ldr r4, _0801CB40 movs r0, #0x60 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _0801CB44 movs r2, #0 movs r3, #1 - bl sub_0801CBA8 + bl mevent_srv_init_common pop {r4} pop {r0} bx r0 .align 2, 0 _0801CB40: .4byte gUnknown_2022930 _0801CB44: .4byte gUnknown_82C4F60 - thumb_func_end sub_0801CB24 + thumb_func_end mevent_srv_init_wnews thumb_func_start sub_0801CB48 sub_0801CB48: @ 0x0801CB48 push {r4, lr} ldr r4, _0801CB64 movs r0, #0x60 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _0801CB68 movs r2, #0 movs r3, #1 - bl sub_0801CBA8 + bl mevent_srv_init_common pop {r4} pop {r0} bx r0 @@ -59528,9 +59528,9 @@ _0801CB80: ldr r0, [r4] ldr r1, [r0, #4] strh r1, [r6] - bl sub_0801CBFC + bl mevent_srv_free_resources ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0801CB9E: @@ -59542,8 +59542,8 @@ _0801CBA0: .align 2, 0 thumb_func_end sub_0801CB6C - thumb_func_start sub_0801CBA8 -sub_0801CBA8: @ 0x0801CBA8 + thumb_func_start mevent_srv_init_common +mevent_srv_init_common: @ 0x0801CBA8 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -59556,17 +59556,17 @@ sub_0801CBA8: @ 0x0801CBA8 str r5, [r4] str r5, [r4, #8] movs r0, #0xa4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x18] movs r0, #0xe0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x1c] movs r0, #0x80 lsls r0, r0, #3 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x14] movs r0, #0x64 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x20] str r6, [r4, #0x10] str r5, [r4, #0xc] @@ -59581,25 +59581,25 @@ sub_0801CBA8: @ 0x0801CBA8 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0801CBA8 + thumb_func_end mevent_srv_init_common - thumb_func_start sub_0801CBFC -sub_0801CBFC: @ 0x0801CBFC + thumb_func_start mevent_srv_free_resources +mevent_srv_free_resources: @ 0x0801CBFC push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0x1c] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0x14] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0x20] - bl sub_08000BF0 + bl Free pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801CBFC + thumb_func_end mevent_srv_free_resources thumb_func_start sub_0801CC20 sub_0801CC20: @ 0x0801CC20 @@ -59633,8 +59633,8 @@ _0801CC58: .4byte 0x00000101 _0801CC5C: .4byte gUnknown_82C4A84 thumb_func_end sub_0801CC20 - thumb_func_start sub_0801CC60 -sub_0801CC60: @ 0x0801CC60 + thumb_func_start mevent_first_if_not_null_else_second +mevent_first_if_not_null_else_second: @ 0x0801CC60 push {lr} cmp r0, #0 bne _0801CC68 @@ -59642,7 +59642,7 @@ sub_0801CC60: @ 0x0801CC60 _0801CC68: pop {r1} bx r1 - thumb_func_end sub_0801CC60 + thumb_func_end mevent_first_if_not_null_else_second thumb_func_start mevent_compare_pointers mevent_compare_pointers: @ 0x0801CC6C @@ -59663,26 +59663,26 @@ _0801CC80: bx r1 thumb_func_end mevent_compare_pointers - thumb_func_start sub_0801CC84 -sub_0801CC84: @ 0x0801CC84 + thumb_func_start common_mainseq_0 +common_mainseq_0: @ 0x0801CC84 movs r1, #4 str r1, [r0, #8] movs r0, #0 bx lr - thumb_func_end sub_0801CC84 + thumb_func_end common_mainseq_0 - thumb_func_start sub_0801CC8C -sub_0801CC8C: @ 0x0801CC8C + thumb_func_start common_mainseq_1 +common_mainseq_1: @ 0x0801CC8C movs r0, #3 bx lr - thumb_func_end sub_0801CC8C + thumb_func_end common_mainseq_1 thumb_func_start sub_0801CC90 sub_0801CC90: @ 0x0801CC90 push {r4, lr} adds r4, r0, #0 adds r0, #0x38 - bl sub_0801D6D0 + bl mevent_srv_sub_recv cmp r0, #0 beq _0801CCA2 movs r0, #4 @@ -59700,7 +59700,7 @@ sub_0801CCAC: @ 0x0801CCAC push {r4, lr} adds r4, r0, #0 adds r0, #0x38 - bl sub_0801D6DC + bl mevent_srv_sub_send cmp r0, #0 beq _0801CCBE movs r0, #4 @@ -59807,7 +59807,7 @@ _0801CDB2: adds r0, #0x38 ldr r1, [r4, #4] ldr r2, [r5, #0x14] - bl sub_0801D738 + bl mevent_srv_sub_init_recv movs r0, #2 str r0, [r5, #8] b _0801D238 @@ -59942,7 +59942,7 @@ _0801CEC4: _0801CED8: ldr r0, [r4, #8] ldr r1, [r5, #0x18] - bl sub_0801CC60 + bl mevent_first_if_not_null_else_second adds r2, r0, #0 ldr r1, [r5, #0x20] bl sub_0801B1AC @@ -59994,7 +59994,7 @@ _0801CF48: ldr r0, [r4, #8] adds r1, r5, #0 adds r1, #0x34 - bl sub_0801CC60 + bl mevent_first_if_not_null_else_second adds r2, r0, #0 ldr r1, [r5, #0x20] bl sub_0801B1C8 @@ -60015,7 +60015,7 @@ _0801CF68: _0801CF7A: ldr r0, [r5, #0x20] ldr r1, [r4, #4] - bl sub_0801B244 + bl MEventStruct_Unk1442CC_GetValueNFrom_unk_20 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [r5, #4] @@ -60076,7 +60076,7 @@ _0801CFEC: _0801D000: ldr r0, [r4, #8] ldr r1, [r5, #0x1c] - bl sub_0801CC60 + bl mevent_first_if_not_null_else_second adds r2, r0, #0 adds r0, r5, #0 movs r1, #0x17 @@ -60099,7 +60099,7 @@ _0801D020: _0801D034: ldr r0, [r4, #8] ldr r1, [r5, #0x18] - bl sub_0801CC60 + bl mevent_first_if_not_null_else_second adds r2, r0, #0 adds r0, r5, #0 movs r1, #0x16 @@ -60123,7 +60123,7 @@ _0801D068: ldr r0, [r4, #8] adds r1, r5, #0 adds r1, #0x34 - bl sub_0801CC60 + bl mevent_first_if_not_null_else_second adds r2, r0, #0 adds r0, r5, #0 movs r1, #0x18 @@ -60328,7 +60328,7 @@ _0801D20C: movs r3, #1 bl AGBAssert _0801D218: - bl sub_08098BCC + bl GetSavedRamScriptIfValid str r0, [r5, #0x24] b _0801D238 .align 2, 0 @@ -60390,17 +60390,17 @@ _0801D28C: .4byte gUnknown_82C4AFC _0801D290: .4byte 0x0000022A thumb_func_end sub_0801D240 - thumb_func_start sub_0801D294 -sub_0801D294: @ 0x0801D294 + thumb_func_start mevent_client_do_init +mevent_client_do_init: @ 0x0801D294 push {r4, r5, lr} adds r5, r0, #0 ldr r4, _0801D2B4 movs r0, #0x50 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r1, #1 movs r2, #0 - bl sub_0801D31C + bl mevent_client_init ldr r0, [r4] str r5, [r0, #0x4c] pop {r4, r5} @@ -60408,10 +60408,10 @@ sub_0801D294: @ 0x0801D294 bx r0 .align 2, 0 _0801D2B4: .4byte gUnknown_2022934 - thumb_func_end sub_0801D294 + thumb_func_end mevent_client_do_init - thumb_func_start sub_0801D2B8 -sub_0801D2B8: @ 0x0801D2B8 + thumb_func_start mevent_client_do_exec +mevent_client_do_exec: @ 0x0801D2B8 push {r4, r5, r6, lr} adds r6, r0, #0 ldr r4, _0801D2C8 @@ -60423,16 +60423,16 @@ sub_0801D2B8: @ 0x0801D2B8 .align 2, 0 _0801D2C8: .4byte gUnknown_2022934 _0801D2CC: - bl sub_0801D6A4 + bl mevent_client_exec adds r5, r0, #0 cmp r5, #6 bne _0801D2EA ldr r0, [r4] ldr r1, [r0, #4] strh r1, [r6] - bl sub_0801D36C + bl mevent_client_free_resources ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0801D2EA: @@ -60442,10 +60442,10 @@ _0801D2EC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0801D2B8 + thumb_func_end mevent_client_do_exec - thumb_func_start sub_0801D2F4 -sub_0801D2F4: @ 0x0801D2F4 + thumb_func_start mevent_client_inc_flag +mevent_client_inc_flag: @ 0x0801D2F4 ldr r0, _0801D300 ldr r1, [r0] ldr r0, [r1, #0xc] @@ -60454,30 +60454,30 @@ sub_0801D2F4: @ 0x0801D2F4 bx lr .align 2, 0 _0801D300: .4byte gUnknown_2022934 - thumb_func_end sub_0801D2F4 + thumb_func_end mevent_client_inc_flag - thumb_func_start sub_0801D304 -sub_0801D304: @ 0x0801D304 + thumb_func_start mevent_client_get_buffer +mevent_client_get_buffer: @ 0x0801D304 ldr r0, _0801D30C ldr r0, [r0] ldr r0, [r0, #0x20] bx lr .align 2, 0 _0801D30C: .4byte gUnknown_2022934 - thumb_func_end sub_0801D304 + thumb_func_end mevent_client_get_buffer - thumb_func_start sub_0801D310 -sub_0801D310: @ 0x0801D310 + thumb_func_start mevent_client_set_param +mevent_client_set_param: @ 0x0801D310 ldr r1, _0801D318 ldr r1, [r1] str r0, [r1, #4] bx lr .align 2, 0 _0801D318: .4byte gUnknown_2022934 - thumb_func_end sub_0801D310 + thumb_func_end mevent_client_set_param - thumb_func_start sub_0801D31C -sub_0801D31C: @ 0x0801D31C + thumb_func_start mevent_client_init +mevent_client_init: @ 0x0801D31C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -60491,16 +60491,16 @@ sub_0801D31C: @ 0x0801D31C movs r5, #0x80 lsls r5, r5, #3 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x14] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x18] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x1c] movs r0, #0x40 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x20] adds r4, #0x24 adds r0, r4, #0 @@ -60513,28 +60513,28 @@ sub_0801D31C: @ 0x0801D31C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801D31C + thumb_func_end mevent_client_init - thumb_func_start sub_0801D36C -sub_0801D36C: @ 0x0801D36C + thumb_func_start mevent_client_free_resources +mevent_client_free_resources: @ 0x0801D36C push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0x14] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0x1c] - bl sub_08000BF0 + bl Free ldr r0, [r4, #0x20] - bl sub_08000BF0 + bl Free pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801D36C + thumb_func_end mevent_client_free_resources - thumb_func_start sub_0801D390 -sub_0801D390: @ 0x0801D390 + thumb_func_start mevent_client_jmp_buffer +mevent_client_jmp_buffer: @ 0x0801D390 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0x1c] @@ -60548,10 +60548,10 @@ sub_0801D390: @ 0x0801D390 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801D390 + thumb_func_end mevent_client_jmp_buffer - thumb_func_start sub_0801D3AC -sub_0801D3AC: @ 0x0801D3AC + thumb_func_start mevent_client_send_word +mevent_client_send_word: @ 0x0801D3AC push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 @@ -60576,10 +60576,10 @@ sub_0801D3AC: @ 0x0801D3AC bx r0 .align 2, 0 _0801D3DC: .4byte 0x05000100 - thumb_func_end sub_0801D3AC + thumb_func_end mevent_client_send_word - thumb_func_start sub_0801D3E0 -sub_0801D3E0: @ 0x0801D3E0 + thumb_func_start mainseq_0 +mainseq_0: @ 0x0801D3E0 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0x1c] @@ -60598,7 +60598,7 @@ sub_0801D3E0: @ 0x0801D3E0 bx r1 .align 2, 0 _0801D404: .4byte gUnknown_82C4B6C - thumb_func_end sub_0801D3E0 + thumb_func_end mainseq_0 thumb_func_start sub_0801D408 sub_0801D408: @ 0x0801D408 @@ -60611,7 +60611,7 @@ mainseq_2: @ 0x0801D40C push {r4, lr} adds r4, r0, #0 adds r0, #0x24 - bl sub_0801D6D0 + bl mevent_srv_sub_recv cmp r0, #0 beq _0801D422 movs r0, #4 @@ -60631,7 +60631,7 @@ mainseq_3: @ 0x0801D42C push {r4, lr} adds r4, r0, #0 adds r0, #0x24 - bl sub_0801D6DC + bl mevent_srv_sub_send cmp r0, #0 beq _0801D442 movs r0, #4 @@ -60646,8 +60646,8 @@ _0801D442: .align 2, 0 thumb_func_end mainseq_3 - thumb_func_start sub_0801D44C -sub_0801D44C: @ 0x0801D44C + thumb_func_start mainseq_4 +mainseq_4: @ 0x0801D44C push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0x10] @@ -60701,7 +60701,7 @@ _0801D4D4: adds r0, #0x24 ldr r1, [r2, #4] ldr r2, [r4, #0x18] - bl sub_0801D738 + bl mevent_srv_sub_init_recv movs r0, #2 b _0801D60E _0801D4E4: @@ -60718,11 +60718,11 @@ _0801D4E8: b _0801D60E _0801D4FA: ldrb r0, [r2, #4] - bl sub_08084180 + bl GetGameStat adds r2, r0, #0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0801D3AC + bl mevent_client_send_word movs r0, #3 b _0801D60E _0801D50E: @@ -60738,7 +60738,7 @@ _0801D518: bne _0801D614 _0801D51E: adds r0, r4, #0 - bl sub_0801D390 + bl mevent_client_jmp_buffer b _0801D614 _0801D526: ldr r0, [r4, #0x20] @@ -60795,7 +60795,7 @@ _0801D58C: ldr r2, [r4, #4] adds r0, r4, #0 movs r1, #0x13 - bl sub_0801D3AC + bl mevent_client_send_word b _0801D614 _0801D598: ldr r0, [r4, #0x18] @@ -60811,13 +60811,13 @@ _0801D5A0: adds r0, r4, #0 movs r1, #0x13 movs r2, #0 - bl sub_0801D3AC + bl mevent_client_send_word b _0801D614 _0801D5BC: adds r0, r4, #0 movs r1, #0x13 movs r2, #1 - bl sub_0801D3AC + bl mevent_client_send_word b _0801D614 _0801D5C8: movs r0, #6 @@ -60840,7 +60840,7 @@ _0801D5E0: ldr r1, [r4, #0x18] movs r2, #0xbc bl memcpy - bl sub_08165130 + bl ValidateEReaderTrainer b _0801D614 .align 2, 0 _0801D5F8: .4byte gUnknown_3005AF0 @@ -60864,7 +60864,7 @@ _0801D616: bx r1 .align 2, 0 _0801D61C: .4byte gUnknown_201C000 - thumb_func_end sub_0801D44C + thumb_func_end mainseq_4 thumb_func_start mainseq_5 mainseq_5: @ 0x0801D620 @@ -60883,8 +60883,8 @@ _0801D632: bx r1 thumb_func_end mainseq_5 - thumb_func_start sub_0801D638 -sub_0801D638: @ 0x0801D638 + thumb_func_start mainseq_6 +mainseq_6: @ 0x0801D638 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0xc] @@ -60914,10 +60914,10 @@ _0801D668: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0801D638 + thumb_func_end mainseq_6 - thumb_func_start sub_0801D670 -sub_0801D670: @ 0x0801D670 + thumb_func_start mainseq_7 +mainseq_7: @ 0x0801D670 push {r4, lr} adds r4, r0, #0 ldr r3, _0801D698 @@ -60942,10 +60942,10 @@ _0801D690: _0801D698: .4byte gUnknown_201C000 _0801D69C: .4byte gUnknown_3005AF0 _0801D6A0: .4byte gUnknown_3005AEC - thumb_func_end sub_0801D670 + thumb_func_end mainseq_7 - thumb_func_start sub_0801D6A4 -sub_0801D6A4: @ 0x0801D6A4 + thumb_func_start mevent_client_exec +mevent_client_exec: @ 0x0801D6A4 push {r4, r5, lr} sub sp, #0x20 mov r2, sp @@ -60967,25 +60967,25 @@ sub_0801D6A4: @ 0x0801D6A4 bx r1 .align 2, 0 _0801D6CC: .4byte gUnknown_82C4B34 - thumb_func_end sub_0801D6A4 + thumb_func_end mevent_client_exec - thumb_func_start sub_0801D6D0 -sub_0801D6D0: @ 0x0801D6D0 + thumb_func_start mevent_srv_sub_recv +mevent_srv_sub_recv: @ 0x0801D6D0 push {lr} ldr r1, [r0, #0x20] bl _call_via_r1 pop {r1} bx r1 - thumb_func_end sub_0801D6D0 + thumb_func_end mevent_srv_sub_recv - thumb_func_start sub_0801D6DC -sub_0801D6DC: @ 0x0801D6DC + thumb_func_start mevent_srv_sub_send +mevent_srv_sub_send: @ 0x0801D6DC push {lr} ldr r1, [r0, #0x24] bl _call_via_r1 pop {r1} bx r1 - thumb_func_end sub_0801D6DC + thumb_func_end mevent_srv_sub_send thumb_func_start mevent_srv_sub_init mevent_srv_sub_init: @ 0x0801D6E8 @@ -61007,8 +61007,8 @@ mevent_srv_sub_init: @ 0x0801D6E8 str r1, [r0, #0x20] bx lr .align 2, 0 -_0801D70C: .4byte sub_0801D86C -_0801D710: .4byte sub_0801D798 +_0801D70C: .4byte mevent_send_func +_0801D710: .4byte mevent_receive_func thumb_func_end mevent_srv_sub_init thumb_func_start mevent_srv_sub_init_send @@ -61035,8 +61035,8 @@ _0801D730: bx r0 thumb_func_end mevent_srv_sub_init_send - thumb_func_start sub_0801D738 -sub_0801D738: @ 0x0801D738 + thumb_func_start mevent_srv_sub_init_recv +mevent_srv_sub_init_recv: @ 0x0801D738 movs r3, #0 str r3, [r0] strh r1, [r0, #6] @@ -61045,10 +61045,10 @@ sub_0801D738: @ 0x0801D738 strh r3, [r0, #0xc] str r2, [r0, #0x18] bx lr - thumb_func_end sub_0801D738 + thumb_func_end mevent_srv_sub_init_recv - thumb_func_start sub_0801D748 -sub_0801D748: @ 0x0801D748 + thumb_func_start mevent_recv_block +mevent_recv_block: @ 0x0801D748 push {lr} adds r3, r0, #0 adds r0, r1, #0 @@ -61061,13 +61061,13 @@ sub_0801D748: @ 0x0801D748 bx r0 .align 2, 0 _0801D760: .4byte gUnknown_202207C - thumb_func_end sub_0801D748 + thumb_func_end mevent_recv_block - thumb_func_start sub_0801D764 -sub_0801D764: @ 0x0801D764 + thumb_func_start mevent_has_received +mevent_has_received: @ 0x0801D764 push {r4, lr} adds r4, r0, #0 - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 asrs r0, r4 @@ -61084,21 +61084,21 @@ _0801D780: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0801D764 + thumb_func_end mevent_has_received thumb_func_start sub_0801D788 sub_0801D788: @ 0x0801D788 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0801D788 - thumb_func_start sub_0801D798 -sub_0801D798: @ 0x0801D798 + thumb_func_start mevent_receive_func +mevent_receive_func: @ 0x0801D798 push {r4, r5, r6, lr} sub sp, #8 adds r5, r0, #0 @@ -61116,14 +61116,14 @@ _0801D7AE: b _0801D862 _0801D7B4: ldrb r0, [r5, #5] - bl sub_0801D764 + bl mevent_has_received cmp r0, #0 beq _0801D862 ldrb r0, [r5, #5] mov r4, sp mov r1, sp movs r2, #8 - bl sub_0801D748 + bl mevent_recv_block ldrh r1, [r4, #4] strh r1, [r5, #0xc] ldrh r0, [r4, #2] @@ -61134,7 +61134,7 @@ _0801D7B4: cmp r1, r0 bls _0801D7E2 _0801D7DC: - bl sub_0800FC98 + bl OpponentHandleEndBounceEffect b _0801D862 _0801D7E2: mov r1, sp @@ -61151,7 +61151,7 @@ _0801D7E2: b _0801D862 _0801D7FC: ldrb r0, [r5, #5] - bl sub_0801D764 + bl mevent_has_received cmp r0, #0 beq _0801D862 ldrh r0, [r5, #8] @@ -61165,7 +61165,7 @@ _0801D7FC: ldrb r0, [r5, #5] ldr r1, [r5, #0x18] adds r1, r1, r3 - bl sub_0801D748 + bl mevent_recv_block ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -61178,7 +61178,7 @@ _0801D82E: ldr r1, [r5, #0x18] adds r1, r1, r3 movs r2, #0xfc - bl sub_0801D748 + bl mevent_recv_block ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -61206,10 +61206,10 @@ _0801D864: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0801D798 + thumb_func_end mevent_receive_func - thumb_func_start sub_0801D86C -sub_0801D86C: @ 0x0801D86C + thumb_func_start mevent_send_func +mevent_send_func: @ 0x0801D86C push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -61228,7 +61228,7 @@ _0801D882: beq _0801D956 b _0801D96E _0801D88C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801D96E @@ -61257,18 +61257,18 @@ _0801D88C: movs r0, #0 mov r1, sp movs r2, #8 - bl sub_0800A070 + bl SendBlock b _0801D94E .align 2, 0 _0801D8D0: .4byte 0xFFFF0000 _0801D8D4: .4byte 0x0000FFFF _0801D8D8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801D96E ldrb r0, [r4, #4] - bl sub_0801D764 + bl mevent_has_received cmp r0, #0 beq _0801D96E ldrb r0, [r4, #4] @@ -61286,7 +61286,7 @@ _0801D8D8: lsls r2, r0, #0x10 lsrs r2, r2, #0x10 movs r0, #0 - bl sub_0800A070 + bl SendBlock ldrh r0, [r4, #0x10] adds r0, #1 strh r0, [r4, #0x10] @@ -61296,13 +61296,13 @@ _0801D918: adds r1, r1, r3 movs r0, #0 movs r2, #0xfc - bl sub_0800A070 + bl SendBlock ldrh r0, [r4, #0x10] adds r0, #1 strh r0, [r4, #0x10] b _0801D96E _0801D92C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801D96E @@ -61314,7 +61314,7 @@ _0801D92C: ldrh r1, [r4, #0x12] cmp r0, r1 beq _0801D94E - bl sub_0800FC98 + bl OpponentHandleEndBounceEffect b _0801D96E _0801D94E: ldr r0, [r4] @@ -61323,7 +61323,7 @@ _0801D94E: b _0801D96E _0801D956: ldrb r0, [r4, #4] - bl sub_0801D764 + bl mevent_has_received cmp r0, #0 beq _0801D96E ldrb r0, [r4, #4] @@ -61339,10 +61339,10 @@ _0801D970: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0801D86C + thumb_func_end mevent_send_func - thumb_func_start sub_0801D978 -sub_0801D978: @ 0x0801D978 + thumb_func_start GenerateRandomNews +GenerateRandomNews: @ 0x0801D978 push {r4, r5, lr} adds r4, r0, #0 bl sub_0801AB1C @@ -61387,7 +61387,7 @@ _0801D9C8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801D978 + thumb_func_end GenerateRandomNews thumb_func_start sub_0801D9D0 sub_0801D9D0: @ 0x0801D9D0 @@ -61408,7 +61408,7 @@ _0801D9E8: .4byte 0x0000402E sub_0801D9EC: @ 0x0801D9EC push {r4, lr} ldr r0, _0801DA28 - bl sub_0809CF20 + bl GetVarPointer adds r4, r0, #0 bl sub_0801AB1C adds r2, r0, #0 @@ -61445,10 +61445,10 @@ sub_0801DA30: @ 0x0801DA30 ldr r6, _0801DA50 bl sub_0801AB1C adds r4, r0, #0 - bl sub_0809CD68 + bl IsMysteryEventEnabled cmp r0, #0 beq _0801DA4A - bl sub_0801ABA0 + bl ItemUseInBattle_Escape cmp r0, #0 bne _0801DA54 _0801DA4A: @@ -61673,16 +61673,16 @@ sub_0801DBBC: @ 0x0801DBBC movs r0, #0x14 strh r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0801DBF0 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 .align 2, 0 _0801DBE8: .4byte gUnknown_2022938 _0801DBEC: .4byte gUnknown_3002350 -_0801DBF0: .4byte sub_0801DC78 +_0801DBF0: .4byte c2_081284E0 thumb_func_end sub_0801DBBC thumb_func_start sub_0801DBF4 @@ -61701,9 +61701,9 @@ sub_0801DBF4: @ 0x0801DBF4 strb r5, [r4, #0x16] movs r0, #0xff strb r0, [r4, #0x1a] - bl sub_08009B64 + bl GetLinkPlayerCount strb r0, [r4, #0xd] - bl sub_0800A02C + bl GetMultiplayerId strb r0, [r4, #0x13] strb r5, [r4, #0x17] strb r5, [r4, #0x18] @@ -61739,12 +61739,12 @@ sub_0801DC54: @ 0x0801DC54 ldr r4, _0801DC74 ldr r0, [r4] ldrb r0, [r0, #0xe] - bl sub_080A8964 + bl DestroyTask ldr r0, [r4] ldrb r0, [r0, #0xf] - bl sub_080A8964 + bl DestroyTask ldr r0, [r4] - bl sub_08000BF0 + bl Free pop {r4} pop {r0} bx r0 @@ -61752,8 +61752,8 @@ sub_0801DC54: @ 0x0801DC54 _0801DC74: .4byte gUnknown_2022938 thumb_func_end sub_0801DC54 - thumb_func_start sub_0801DC78 -sub_0801DC78: @ 0x0801DC78 + thumb_func_start c2_081284E0 +c2_081284E0: @ 0x0801DC78 push {r4, r5, r6, lr} sub sp, #4 ldr r0, _0801DC94 @@ -61775,7 +61775,7 @@ _0801DC98: beq _0801DCEC b _0801DD28 _0801DC9E: - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes bl sub_0801F2E0 @@ -61791,24 +61791,24 @@ _0801DCB0: adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes str r5, [sp] adds r0, r4, #0 adds r1, r4, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0801DCE8 - bl sub_080006F0 + bl SetVBlankCallback _0801DCE0: ldrb r0, [r6] adds r0, #1 strb r0, [r6] b _0801DD28 .align 2, 0 -_0801DCE8: .4byte sub_0801DD44 +_0801DCE8: .4byte FoundBlackGlasses _0801DCEC: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0801DD30 ldrb r1, [r0, #7] movs r0, #0x80 @@ -61816,22 +61816,22 @@ _0801DCEC: cmp r0, #0 bne _0801DD28 ldr r0, _0801DD34 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _0801DD38 movs r1, #8 - bl sub_080A8878 + bl CreateTask ldr r4, _0801DD3C ldr r1, [r4] strb r0, [r1, #0xe] ldr r0, _0801DD40 movs r1, #7 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] strb r0, [r1, #0xf] - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0xe8 movs r1, #0x96 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _0801DD28: add sp, #4 pop {r4, r5, r6} @@ -61839,36 +61839,36 @@ _0801DD28: bx r0 .align 2, 0 _0801DD30: .4byte gUnknown_2037C74 -_0801DD34: .4byte sub_0801DD5C +_0801DD34: .4byte ScrCmd_startcontest _0801DD38: .4byte sub_0801DD78 _0801DD3C: .4byte gUnknown_2022938 _0801DD40: .4byte sub_0801F0C4 - thumb_func_end sub_0801DC78 + thumb_func_end c2_081284E0 - thumb_func_start sub_0801DD44 -sub_0801DD44: @ 0x0801DD44 + thumb_func_start FoundBlackGlasses +FoundBlackGlasses: @ 0x0801DD44 push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 - bl sub_080B9800 + bl LoadOam + bl ProcessSpriteCopyRequests + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801DD44 + thumb_func_end FoundBlackGlasses - thumb_func_start sub_0801DD5C -sub_0801DD5C: @ 0x0801DD5C + thumb_func_start ScrCmd_startcontest +ScrCmd_startcontest: @ 0x0801DD5C push {lr} - bl sub_080A89D4 + bl RunTasks bl sub_0801F3C8 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0801DD5C + thumb_func_end ScrCmd_startcontest thumb_func_start sub_0801DD78 sub_0801DD78: @ 0x0801DD78 @@ -61952,7 +61952,7 @@ _0801DDF2: adds r0, #1 strh r0, [r1, #6] _0801DE04: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801DE4C @@ -61966,7 +61966,7 @@ _0801DE04: adds r1, r1, r0 movs r0, #0 movs r2, #0x28 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _0801DE4C @@ -61978,7 +61978,7 @@ _0801DE04: .align 2, 0 _0801DE38: .4byte gUnknown_2022938 _0801DE3C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801DE4C @@ -62157,7 +62157,7 @@ _0801DF8E: .align 2, 0 _0801DF9C: .4byte gUnknown_2022938 _0801DFA0: - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 asrs r0, r0, #8 lsrs r6, r0, #0x10 @@ -62192,7 +62192,7 @@ _0801DFD8: movs r0, #5 bl sub_080A306C movs r0, #1 - bl sub_081985E8 + bl Menu_MoveCursor b _0801E05E .align 2, 0 _0801DFF4: .4byte gUnknown_3002360 @@ -62444,7 +62444,7 @@ _0801E1D0: .align 2, 0 _0801E1F4: .4byte gUnknown_2022938 _0801E1F8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801E238 @@ -62458,7 +62458,7 @@ _0801E1F8: adds r1, r1, r0 movs r0, #0 movs r2, #0x28 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _0801E238 @@ -62547,7 +62547,7 @@ _0801E2A8: @ jump table .4byte _0801E3CC @ case 7 _0801E2C8: ldr r0, _0801E2E4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _0801E2D6 @@ -62593,7 +62593,7 @@ _0801E30C: .align 2, 0 _0801E32C: .4byte gUnknown_2022938 _0801E330: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801E3E0 @@ -62607,7 +62607,7 @@ _0801E330: adds r1, r1, r0 movs r0, #0 movs r2, #0x28 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _0801E3E0 @@ -62616,7 +62616,7 @@ _0801E330: .align 2, 0 _0801E360: .4byte gUnknown_2022938 _0801E364: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #1 ands r1, r0 cmp r1, #0 @@ -62630,7 +62630,7 @@ _0801E364: .align 2, 0 _0801E380: .4byte gUnknown_2022938 _0801E384: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801E3E0 @@ -62706,7 +62706,7 @@ _0801E404: b _0801E486 _0801E40E: ldr r0, _0801E424 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0801E486 @@ -62722,7 +62722,7 @@ _0801E428: lsls r0, r0, #0x18 cmp r0, #0 bne _0801E486 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801E486 @@ -62795,7 +62795,7 @@ _0801E4AC: @ jump table .4byte _0801E56C @ case 4 _0801E4C0: ldr r0, _0801E4E4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0801E580 @@ -62839,7 +62839,7 @@ _0801E514: lsrs r0, r0, #0x18 cmp r0, #1 beq _0801E580 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801E580 @@ -62936,7 +62936,7 @@ _0801E5D0: adds r0, #1 strh r0, [r1, #6] _0801E5E4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -62951,7 +62951,7 @@ _0801E5E4: adds r1, r1, r0 movs r0, #0 movs r2, #0x28 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _0801E654 @@ -62982,7 +62982,7 @@ _0801E636: .align 2, 0 _0801E640: .4byte gUnknown_2022938 _0801E644: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0801E654 @@ -63340,9 +63340,9 @@ _0801E928: lsls r0, r0, #0x18 cmp r0, #0 bne _0801E9E6 - bl sub_08076764 + bl SetContinueGameWarpStatusToDynamicWarp movs r0, #0 - bl sub_08153274 + bl TrySavingData ldr r0, _0801E948 ldr r1, [r0] movs r0, #8 @@ -63406,7 +63406,7 @@ _0801E9AC: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0801E9C8 ldr r1, [r0] movs r0, #0xd @@ -63424,7 +63424,7 @@ _0801E9CC: bl sub_0801F354 bl sub_0801DC54 ldr r0, _0801E9F4 - bl sub_08000540 + bl SetMainCallback2 _0801E9E6: add sp, #4 pop {r4} @@ -64102,7 +64102,7 @@ _0801EE7C: ldr r1, _0801EEA4 _0801EE96: adds r0, r6, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, #1 b _0801EEAA .align 2, 0 @@ -64328,8 +64328,8 @@ sub_0801EFE0: @ 0x0801EFE0 _0801EFE8: .4byte gUnknown_2022938 thumb_func_end sub_0801EFE0 - thumb_func_start sub_0801EFEC -sub_0801EFEC: @ 0x0801EFEC + thumb_func_start copy_strings_to_sav1 +copy_strings_to_sav1: @ 0x0801EFEC push {r4, lr} ldr r4, _0801F070 ldr r0, [r4] @@ -64407,7 +64407,7 @@ _0801F0B4: .4byte 0x00003D30 _0801F0B8: .4byte gUnknown_85CC792 _0801F0BC: .4byte 0x00003D45 _0801F0C0: .4byte gUnknown_85CC798 - thumb_func_end sub_0801EFEC + thumb_func_end copy_strings_to_sav1 thumb_func_start sub_0801F0C4 sub_0801F0C4: @ 0x0801F0C4 @@ -64452,7 +64452,7 @@ _0801F11A: movs r0, #1 strh r0, [r4] _0801F11E: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r2, r0, #0 @@ -64473,7 +64473,7 @@ _0801F11E: _0801F144: .4byte gUnknown_30031C4 _0801F148: .4byte gUnknown_2022938 _0801F14C: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #6] @@ -64530,7 +64530,7 @@ _0801F1B2: strh r1, [r4, #4] lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag movs r1, #2 ldrsh r0, [r4, r1] lsls r0, r0, #8 @@ -64618,7 +64618,7 @@ _0801F258: ldrsh r0, [r4, r3] cmp r0, #0 beq _0801F28C - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -64654,7 +64654,7 @@ _0801F2AA: strb r0, [r1, #0x17] _0801F2AC: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _0801F2D4 .align 2, 0 _0801F2B4: .4byte gUnknown_2022938 @@ -64700,7 +64700,7 @@ sub_0801F2E0: @ 0x0801F2E0 movs r2, #4 bl InitBgsFromTemplates ldr r0, _0801F338 - bl sub_08003090 + bl InitWindows bl reset_temp_tile_data_buffers bl sub_0802048C ldr r0, [r4] @@ -64743,11 +64743,11 @@ sub_0801F354: @ 0x0801F354 ldr r0, [r4] cmp r0, #0 beq _0801F36A - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0801F36A: - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r1, _0801F380 movs r0, #3 strb r0, [r1, #0x15] @@ -64897,7 +64897,7 @@ _0801F464: .4byte gUnknown_202293C sub_0801F468: @ 0x0801F468 push {r4, lr} adds r4, r0, #0 - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -64943,7 +64943,7 @@ _0801F4CA: bl sub_08020404 b _0801F4F8 _0801F4DC: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F4F8 @@ -64981,10 +64981,10 @@ _0801F518: bl sub_080200D8 movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0801F530 _0801F526: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801F538 @@ -65014,10 +65014,10 @@ _0801F550: bl sub_0802012C movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0801F568 _0801F55E: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801F570 @@ -65058,10 +65058,10 @@ _0801F592: bl sub_0801FF88 movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0801F5D4 _0801F5AE: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _0801F5D4 @@ -65120,12 +65120,12 @@ _0801F600: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0801F62E .align 2, 0 _0801F620: .4byte gUnknown_202293C _0801F624: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801F636 @@ -65154,10 +65154,10 @@ _0801F64C: bl sub_0801FEBC bl sub_0801FCE4 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0801F672 _0801F65C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F678 @@ -65210,10 +65210,10 @@ _0801F692: bl sub_0801FF40 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0801F6DC _0801F6CA: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F6E2 @@ -65275,10 +65275,10 @@ _0801F70C: bl sub_0801FF40 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0801F782 _0801F748: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F788 @@ -65289,12 +65289,12 @@ _0801F748: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0801F782 .align 2, 0 _0801F768: .4byte gUnknown_202293C _0801F76C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F788 @@ -65360,10 +65360,10 @@ _0801F7B4: bl sub_0801FF40 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0801F82A _0801F7F0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F830 @@ -65372,12 +65372,12 @@ _0801F7F0: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0801F82A .align 2, 0 _0801F80C: .4byte gUnknown_202293C _0801F810: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F830 @@ -65416,13 +65416,13 @@ _0801F84C: bl sub_0801FF88 movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] b _0801F86E _0801F860: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F86E @@ -65472,12 +65472,12 @@ _0801F8A4: bl sub_08020140 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0801F944 .align 2, 0 _0801F8CC: .4byte gUnknown_202293C _0801F8D0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -65509,7 +65509,7 @@ _0801F900: bl ScrollWindow movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0801F940 ldr r1, [r0] ldrh r0, [r1, #0x1c] @@ -65519,7 +65519,7 @@ _0801F900: adds r0, #1 strb r0, [r6] _0801F924: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0801F94A @@ -65593,7 +65593,7 @@ _0801F990: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65601,7 +65601,7 @@ _0801F990: .align 2, 0 _0801F9AC: .4byte gUnknown_202293C _0801F9B0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801F9BC @@ -65632,7 +65632,7 @@ _0801F9D4: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65640,7 +65640,7 @@ _0801F9D4: .align 2, 0 _0801F9F0: .4byte gUnknown_202293C _0801F9F4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FA00 @@ -65676,7 +65676,7 @@ _0801FA18: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65684,7 +65684,7 @@ _0801FA18: .align 2, 0 _0801FA44: .4byte gUnknown_202293C _0801FA48: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FA54 @@ -65719,7 +65719,7 @@ _0801FA6C: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65727,7 +65727,7 @@ _0801FA6C: .align 2, 0 _0801FA94: .4byte gUnknown_202293C _0801FA98: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FAA4 @@ -65762,7 +65762,7 @@ _0801FABC: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65770,7 +65770,7 @@ _0801FABC: .align 2, 0 _0801FAE4: .4byte gUnknown_202293C _0801FAE8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FAF4 @@ -65801,7 +65801,7 @@ _0801FB0C: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65809,7 +65809,7 @@ _0801FB0C: .align 2, 0 _0801FB28: .4byte gUnknown_202293C _0801FB2C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FB38 @@ -65845,7 +65845,7 @@ _0801FB50: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65854,7 +65854,7 @@ _0801FB50: _0801FB7C: .4byte gUnknown_3005AF0 _0801FB80: .4byte gUnknown_202293C _0801FB84: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FB90 @@ -65889,7 +65889,7 @@ _0801FBA8: ldr r0, [r0] ldrb r0, [r0, #0x1e] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -65897,7 +65897,7 @@ _0801FBA8: .align 2, 0 _0801FBD0: .4byte gUnknown_202293C _0801FBD4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0801FBE0 @@ -65959,7 +65959,7 @@ sub_0801FBEC: @ 0x0801FBEC orrs r0, r1 str r0, [sp, #0x10] add r0, sp, #0xc - bl sub_08003250 + bl AddWindow adds r1, r0, #0 ldr r6, _0801FCD8 ldr r0, [r6] @@ -65972,10 +65972,10 @@ sub_0801FBEC: @ 0x0801FBEC lsls r0, r1, #0x18 lsrs r0, r0, #0x18 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] ldrb r0, [r0, #0x18] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] ldrb r0, [r0, #0x18] ldr r2, _0801FCDC @@ -66001,7 +66001,7 @@ sub_0801FBEC: @ 0x0801FBEC ldrb r0, [r0, #0x18] movs r1, #1 movs r2, #0xd - bl sub_080981E0 + bl DrawTextBorderOuter ldr r0, [r6] ldrb r0, [r0, #0x18] movs r1, #0xe @@ -66045,7 +66045,7 @@ sub_0801FCE4: @ 0x0801FCE4 bl sub_08198134 ldr r0, [r4] ldrb r0, [r0, #0x18] - bl sub_08003774 + bl ClearWindowTilemap _0801FD02: pop {r4} pop {r0} @@ -66064,7 +66064,7 @@ sub_0801FD0C: @ 0x0801FD0C beq _0801FD26 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow ldr r1, [r4] movs r0, #0xff strh r0, [r1, #0x18] @@ -66079,7 +66079,7 @@ _0801FD2C: .4byte gUnknown_202293C thumb_func_start sub_0801FD30 sub_0801FD30: @ 0x0801FD30 push {lr} - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 asrs r0, r0, #0x18 pop {r1} @@ -66155,7 +66155,7 @@ sub_0801FD40: @ 0x0801FD40 str r0, [sp, #0x14] _0801FDC0: add r0, sp, #0x14 - bl sub_08003250 + bl AddWindow ldr r5, _0801FE04 ldr r1, [r5] strh r0, [r1, #0x1e] @@ -66169,7 +66169,7 @@ _0801FDC0: adds r0, r1, #0 adds r0, #0x22 ldr r1, [r4] - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, [r5] adds r6, r0, #0 adds r6, #0x22 @@ -66189,15 +66189,15 @@ _0801FE0A: lsls r1, r0, #8 movs r0, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY mov r1, r8 lsls r0, r1, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0801FE74 lsls r0, r7, #1 adds r0, r0, r7 @@ -66209,7 +66209,7 @@ _0801FE0A: adds r0, r5, #0 movs r1, #0xa movs r2, #2 - bl sub_08098368 + bl DrawTextBorderInner ldrb r3, [r4, #5] adds r3, #8 lsls r3, r3, #0x18 @@ -66230,7 +66230,7 @@ _0801FE0A: adds r0, r5, #0 movs r1, #1 adds r2, r6, #0 - bl sub_08199C0C + bl AddTextPrinterParameterized5 b _0801FEA2 .align 2, 0 _0801FE74: .4byte gUnknown_82C57D4 @@ -66238,7 +66238,7 @@ _0801FE78: adds r0, r5, #0 movs r1, #0xa movs r2, #2 - bl sub_080981E0 + bl DrawTextBorderOuter ldrb r3, [r4, #5] ldrb r0, [r4, #6] str r0, [sp] @@ -66253,7 +66253,7 @@ _0801FE78: adds r0, r5, #0 movs r1, #1 adds r2, r6, #0 - bl sub_08199C0C + bl AddTextPrinterParameterized5 _0801FEA2: ldr r0, _0801FEB8 ldr r0, [r0] @@ -66285,12 +66285,12 @@ sub_0801FEBC: @ 0x0801FEBC bl sub_08198134 ldr r0, [r4] ldrb r0, [r0, #0x1e] - bl sub_08003774 + bl ClearWindowTilemap _0801FEDA: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r4} pop {r0} bx r0 @@ -66308,7 +66308,7 @@ sub_0801FEF0: @ 0x0801FEF0 beq _0801FF0A lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow ldr r1, [r4] movs r0, #0xff strh r0, [r1, #0x1e] @@ -66376,7 +66376,7 @@ sub_0801FF40: @ 0x0801FF40 movs r1, #0 adds r2, r4, #0 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0x10 pop {r4, r5} pop {r0} @@ -66389,7 +66389,7 @@ sub_0801FF88: @ 0x0801FF88 sub sp, #0x10 movs r0, #2 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer bl sub_0801EEB0 lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -66424,7 +66424,7 @@ _0801FFBC: movs r0, #2 movs r1, #0 movs r2, #6 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r4, #4 adds r5, #1 adds r0, r6, #0 @@ -66462,7 +66462,7 @@ _0801FFFA: movs r0, #2 movs r1, #0 movs r2, #6 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r5, #1 adds r0, r6, #0 adds r0, #0xb @@ -66566,11 +66566,11 @@ sub_080200D8: @ 0x080200D8 sub sp, #0xc movs r0, #3 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #3 movs r1, #1 movs r2, #0xd - bl sub_080981E0 + bl DrawTextBorderOuter ldr r0, _08020128 str r0, [sp] movs r0, #3 @@ -66592,7 +66592,7 @@ sub_080200D8: @ 0x080200D8 movs r3, #0 bl sub_081984B0 movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap add sp, #0xc pop {r0} bx r0 @@ -66607,7 +66607,7 @@ sub_0802012C: @ 0x0802012C movs r1, #0 bl sub_08198134 movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap pop {r0} bx r0 thumb_func_end sub_0802012C @@ -66653,7 +66653,7 @@ sub_08020140: @ 0x08020140 movs r1, #0 movs r2, #0 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0x10 pop {r4, r5} pop {r0} @@ -66666,58 +66666,58 @@ sub_0802019C: @ 0x0802019C movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x50 movs r1, #0 bl SetGpuReg movs r1, #0xe0 lsls r1, r1, #8 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _08020250 movs r0, #0x40 bl SetGpuReg @@ -66745,22 +66745,22 @@ sub_08020254: @ 0x08020254 lsls r0, r0, #1 adds r1, r1, r0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _08020294 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _08020298 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _0802029C adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer pop {r4} pop {r0} bx r0 @@ -66790,7 +66790,7 @@ sub_080202A0: @ 0x080202A0 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r0} bx r0 @@ -66803,25 +66803,25 @@ sub_080202D0: @ 0x080202D0 ldr r0, _08020310 movs r1, #0x70 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08020314 movs r1, #0xc0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _08020318 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _0802031C movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #4 pop {r0} bx r0 @@ -66839,14 +66839,14 @@ sub_08020320: @ 0x08020320 ldr r0, _08020384 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _08020388 movs r0, #0 str r0, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram adds r5, r0, #0 cmp r5, #0 beq _0802036A @@ -66872,9 +66872,9 @@ _0802036A: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #4 pop {r4, r5} pop {r0} @@ -66894,7 +66894,7 @@ sub_0802039C: @ 0x0802039C ldr r0, _080203B8 movs r1, #0x80 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080203BC movs r0, #0 movs r2, #0x20 @@ -66913,15 +66913,15 @@ sub_080203C0: @ 0x080203C0 ldr r0, _080203E8 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 .align 2, 0 @@ -66932,11 +66932,11 @@ _080203E8: .4byte gUnknown_82C56D4 sub_080203EC: @ 0x080203EC push {lr} movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap bl sub_0801FF88 movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 thumb_func_end sub_080203EC @@ -66970,12 +66970,12 @@ _08020414: ble _08020414 movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} @@ -66990,7 +66990,7 @@ sub_0802045C: @ 0x0802045C push {lr} movs r0, #3 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #3 movs r1, #1 movs r2, #0xd0 @@ -67002,7 +67002,7 @@ sub_0802045C: @ 0x0802045C ldr r0, _08020488 movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 @@ -67034,7 +67034,7 @@ sub_0802048C: @ 0x0802048C ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams add sp, #0x10 pop {r0} bx r0 @@ -67154,7 +67154,7 @@ sub_080205AC: @ 0x080205AC ldr r4, _080205D8 _080205B2: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #4 @@ -67188,7 +67188,7 @@ sub_080205EC: @ 0x080205EC ldr r0, [r0] cmp r0, #0 beq _080205FA - bl sub_08000BF0 + bl Free _080205FA: pop {r0} bx r0 @@ -67203,7 +67203,7 @@ sub_08020604: @ 0x08020604 movs r1, #0xa movs r2, #0x18 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08020630 @@ -67306,7 +67306,7 @@ sub_080206C4: @ 0x080206C4 ldr r0, _080206F0 adds r4, r4, r0 movs r0, #0 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #4 @@ -67315,7 +67315,7 @@ sub_080206C4: @ 0x080206C4 lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #4 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -67408,7 +67408,7 @@ sub_08020780: @ 0x08020780 movs r1, #0x4c movs r2, #0x98 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _080207C8 @@ -67423,7 +67423,7 @@ sub_08020780: @ 0x08020780 movs r1, #0x40 movs r2, #0x98 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [r5] @@ -67509,7 +67509,7 @@ sub_08020838: @ 0x08020838 movs r1, #8 movs r2, #0x98 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _0802088C @@ -67524,7 +67524,7 @@ sub_08020838: @ 0x08020838 movs r1, #0x20 movs r2, #0x98 movs r3, #4 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [r5] @@ -67642,13 +67642,13 @@ _08020938: ldr r4, [r0] _0802093E: ldrb r0, [r0, #0xa] - bl sub_080A8964 + bl DestroyTask ldr r0, [r5] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r5] adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _0802097C cmp r4, r0 bne _08020972 @@ -67659,7 +67659,7 @@ _0802093E: strb r0, [r2] movs r0, #0xc8 lsls r0, r0, #1 - bl sub_080A27D8 + bl PlayNewMapMusic ldr r0, _08020984 bl sub_080857F0 _08020972: @@ -67693,7 +67693,7 @@ sub_08020988: @ 0x08020988 bne _080209C4 _080209A6: adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080209C0 mov r1, r8 strh r1, [r0, #0x10] @@ -67704,11 +67704,11 @@ _080209B8: .4byte gUnknown_30031C4 _080209BC: .4byte gUnknown_300319C _080209C0: .4byte gUnknown_30050A0 _080209C4: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 mov r0, r8 @@ -67718,7 +67718,7 @@ _080209C4: blo _080209F4 _080209E0: adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080209F0 movs r1, #0 strh r1, [r0, #0x10] @@ -67729,13 +67729,13 @@ _080209F0: .4byte gUnknown_30050A0 _080209F4: ldr r6, _08020A1C ldr r0, _08020A20 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 str r5, [r6] cmp r5, #0 bne _08020A28 adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08020A24 strh r5, [r0, #0x10] strh r5, [r0, #0x12] @@ -67757,7 +67757,7 @@ _08020A28: mov r1, r8 strb r1, [r0, #9] ldr r0, [r6] - bl sub_08020CE0 + bl PutPokeblockListMenuString ldr r1, [r6] movs r2, #1 movs r0, #1 @@ -67783,10 +67783,10 @@ _08020A28: movs r1, #1 bl sub_08022950 ldr r0, _08020A98 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08020A9C movs r1, #8 - bl sub_080A8878 + bl CreateTask ldr r1, [r6] strb r0, [r1, #0xa] ldr r2, _08020AA0 @@ -67803,7 +67803,7 @@ _08020A8C: pop {r0} bx r0 .align 2, 0 -_08020A98: .4byte sub_08020CA4 +_08020A98: .4byte PlaySE _08020A9C: .4byte sub_08020CBC _08020AA0: .4byte gUnknown_30030B4 thumb_func_end sub_08020988 @@ -67827,7 +67827,7 @@ _08020ABC: .4byte gUnknown_203CB48 _08020AC0: ldrh r0, [r1] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem _08020AC8: ldr r4, _08020B28 ldr r2, [r4] @@ -67864,11 +67864,11 @@ _08020AC8: bl sub_08022950 ldr r0, _08020B30 movs r1, #8 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] strb r0, [r1, #0xa] ldr r0, _08020B34 - bl sub_08000540 + bl SetMainCallback2 add sp, #0xc pop {r4} pop {r0} @@ -67877,7 +67877,7 @@ _08020AC8: _08020B28: .4byte gUnknown_2022944 _08020B2C: .4byte gUnknown_203CB48 _08020B30: .4byte sub_08020CBC -_08020B34: .4byte sub_08020CA4 +_08020B34: .4byte PlaySE thumb_func_end sub_08020AA4 thumb_func_start sub_08020B38 @@ -67886,7 +67886,7 @@ sub_08020B38: @ 0x08020B38 ldr r0, _08020B50 ldr r0, [r0] ldrb r0, [r0, #0xa] - bl sub_080A8964 + bl DestroyTask ldr r0, _08020B54 bl sub_081AA968 pop {r0} @@ -67900,7 +67900,7 @@ _08020B54: .4byte sub_08020AA4 sub_08020B58: @ 0x08020B58 push {lr} ldr r0, _08020B64 - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 @@ -67911,7 +67911,7 @@ _08020B64: .4byte sub_08020C90 sub_08020B68: @ 0x08020B68 push {lr} movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 thumb_func_end sub_08020B68 @@ -68044,7 +68044,7 @@ _08020C64: ldr r1, [r4] ldr r0, [r1, #0x68] str r0, [r1, #0x1c] - bl sub_080244CC + bl GiveBerryPowder lsls r0, r0, #0x18 cmp r0, #0 bne _08020C82 @@ -68067,24 +68067,24 @@ _08020C8C: .4byte gUnknown_2022944 sub_08020C90: @ 0x08020C90 push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08020C90 - thumb_func_start sub_08020CA4 -sub_08020CA4: @ 0x08020CA4 + thumb_func_start PlaySE +PlaySE: @ 0x08020CA4 push {lr} - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08020CA4 + thumb_func_end PlaySE thumb_func_start sub_08020CBC sub_08020CBC: @ 0x08020CBC @@ -68107,8 +68107,8 @@ _08020CD0: _08020CDC: .4byte gUnknown_2022944 thumb_func_end sub_08020CBC - thumb_func_start sub_08020CE0 -sub_08020CE0: @ 0x08020CE0 + thumb_func_start PutPokeblockListMenuString +PutPokeblockListMenuString: @ 0x08020CE0 push {r4, r5, r6, lr} adds r6, r0, #0 movs r5, #0 @@ -68189,7 +68189,7 @@ _08020D6E: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08020CE0 + thumb_func_end PutPokeblockListMenuString thumb_func_start sub_08020D74 sub_08020D74: @ 0x08020D74 @@ -68228,13 +68228,13 @@ _08020DA0: @ jump table .4byte _08020FE0 @ case 9 _08020DC8: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg - bl sub_080B9710 + bl ScanlineEffect_Stop bl reset_temp_tile_data_buffers b _08021028 _08020DE6: @@ -68269,39 +68269,39 @@ _08020E1A: lsls r0, r0, #1 adds r1, r5, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _08020E9C adds r1, r5, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _08020EA0 adds r1, r5, r0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -68347,31 +68347,31 @@ _08020EA4: b _08021028 _08020EEA: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, _08020F14 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _08021028 .align 2, 0 _08020F14: .4byte gUnknown_82C6104 _08020F18: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _08020F24 b _0802102E _08020F24: - bl sub_08196DC4 + bl InitStandardTextBoxWindows bl sub_08196DF4 adds r0, r5, #0 bl sub_080222E8 @@ -68390,30 +68390,30 @@ _08020F48: movs r2, #0xc0 lsls r2, r2, #1 movs r1, #0 - bl sub_080A1200 + bl LoadPalette ldr r1, _08020F98 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _08020F9C movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _08020FA0 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer adds r0, r5, #0 bl sub_08022434 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08021028 .align 2, 0 _08020F94: .4byte gUnknown_82C5F84 @@ -68421,10 +68421,10 @@ _08020F98: .4byte gUnknown_82C74D4 _08020F9C: .4byte gUnknown_82C7604 _08020FA0: .4byte gUnknown_82C779C _08020FA4: - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite adds r0, r5, #0 bl sub_08022494 ldr r0, _08020FDC @@ -68437,11 +68437,11 @@ _08020FA4: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY b _08021028 .align 2, 0 _08020FDC: .4byte gUnknown_2021B3A @@ -68455,19 +68455,19 @@ _08020FE0: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits bl sub_08020B58 movs r0, #0 strb r0, [r5, #0xc] @@ -68525,7 +68525,7 @@ _08021084: bl sub_0800FF34 b _0802116A _0802108A: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08021170 @@ -68536,11 +68536,11 @@ _08021094: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C - bl sub_080A12E4 + bl BeginNormalPaletteFade + bl UpdatePaletteFade b _0802116A _080210AA: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _0802116A @@ -68576,39 +68576,39 @@ _080210B6: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0802116A _08021112: - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits b _0802116A _08021152: - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite adds r0, r5, #0 bl sub_080226C4 bl sub_08034B20 @@ -68715,7 +68715,7 @@ _080211F2: lsrs r3, r3, #0x10 ldr r0, _08021328 adds r1, r2, #0 - bl sub_081AFC0C + bl AddCustomItemIconSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r2, sb @@ -69400,7 +69400,7 @@ sub_080216F8: @ 0x080216F8 movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r3} mov r8, r3 @@ -69537,7 +69537,7 @@ _080217F4: movs r1, #1 adds r2, r6, #0 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r2, [sp, #0x2c] ldrb r0, [r2] adds r2, r6, #0 @@ -69552,7 +69552,7 @@ _080217F4: str r1, [sp, #8] movs r1, #0 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r2, [sp, #0x20] adds r2, #0xa2 mov r8, r2 @@ -69657,7 +69657,7 @@ _08021916: adds r0, r2, r0 ldr r1, [r0] ldr r0, _08021988 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r4, [sp, #0x2c] ldrb r0, [r4] ldr r1, [sp, #0x30] @@ -69677,7 +69677,7 @@ _08021916: ldr r1, _08021988 str r1, [sp, #8] movs r1, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _08021A0A .align 2, 0 _08021974: .4byte gUnknown_2021C40 @@ -69711,7 +69711,7 @@ _080219A8: ldr r0, _08021A28 ldr r1, [r0, #8] ldr r0, _08021A2C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 ldr r1, _08021A2C movs r2, #1 @@ -69739,7 +69739,7 @@ _080219A8: ldr r1, _08021A2C str r1, [sp, #8] movs r1, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r2, #0xa2 adds r2, r2, r7 mov r8, r2 @@ -69782,7 +69782,7 @@ _08021A44: bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, _08021AB4 adds r1, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r1, [sp, #0x2c] ldrb r0, [r1] movs r1, #0xd @@ -69800,7 +69800,7 @@ _08021A44: str r2, [sp, #8] movs r1, #1 movs r2, #4 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r4, sb lsls r0, r4, #0x18 lsrs r7, r0, #0x18 @@ -69848,7 +69848,7 @@ sub_08021ABC: @ 0x08021ABC mov sb, r4 ldrb r0, [r4] movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x1b movs r1, #0xda lsls r1, r1, #0x18 @@ -69869,7 +69869,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #1 movs r2, #2 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r4, _08021CFC movs r0, #1 adds r1, r4, #0 @@ -69890,7 +69890,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #1 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r6, #0 subs r0, #0x29 lsls r0, r0, #0x18 @@ -69916,7 +69916,7 @@ sub_08021ABC: @ 0x08021ABC ldr r5, _08021D08 ldr r1, _08021D0C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r4, sb ldrb r0, [r4] ldr r1, _08021CF4 @@ -69927,7 +69927,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r4, _08021D10 movs r0, #1 adds r1, r4, #0 @@ -69948,7 +69948,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #1 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r6, #0 subs r0, #9 lsls r0, r0, #0x18 @@ -69964,7 +69964,7 @@ sub_08021ABC: @ 0x08021ABC bl sub_080089D8 ldr r1, _08021D14 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r4, sb ldrb r0, [r4] ldr r1, _08021CF4 @@ -69975,7 +69975,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #0 adds r0, #0xd lsls r0, r0, #0x18 @@ -69990,7 +69990,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #1 movs r2, #2 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r4, _08021D1C movs r0, #1 adds r1, r4, #0 @@ -70012,7 +70012,7 @@ sub_08021ABC: @ 0x08021ABC movs r1, #1 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r4, r8 ldrb r2, [r4, #0x16] ldrh r0, [r4, #0x16] @@ -70063,7 +70063,7 @@ _08021C80: ldr r4, _08021D08 ldr r1, _08021D28 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r6, #0 subs r0, #0x31 lsls r0, r0, #0x18 @@ -70088,7 +70088,7 @@ _08021C80: str r4, [sp, #8] adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _08021D4A .align 2, 0 _08021CF4: .4byte gUnknown_82C5EF0 @@ -70118,7 +70118,7 @@ _08021D30: movs r1, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _08021D4A: adds r0, r7, #0 adds r0, #0xd @@ -70139,7 +70139,7 @@ _08021D4A: movs r1, #1 movs r2, #2 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _08021DD0 ldr r4, [sp, #0x10] ldrh r1, [r4, #8] @@ -70149,7 +70149,7 @@ _08021D4A: ldr r4, _08021DD4 ldr r1, _08021DD8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 bl StringLength lsls r0, r0, #0x10 @@ -70169,7 +70169,7 @@ _08021D4A: movs r1, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0x1c pop {r3, r4, r5} mov r8, r3 @@ -70244,7 +70244,7 @@ _08021E4A: mov r0, sp strb r1, [r0, #4] mov r0, sp - bl sub_08003250 + bl AddWindow adds r1, r6, #0 adds r1, #0x82 strb r0, [r1] @@ -70255,10 +70255,10 @@ _08021E64: adds r4, r6, #0 adds r4, #0x82 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer b _08021F88 _08021E78: adds r5, r6, #0 @@ -70272,7 +70272,7 @@ _08021E78: movs r1, #0 adds r2, r4, #0 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette b _08021F88 .align 2, 0 _08021E98: .4byte 0x0000021D @@ -70383,7 +70383,7 @@ _08021F70: adds r0, #0x82 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r1, r6, #0 adds r1, #0x80 movs r0, #0 @@ -70416,7 +70416,7 @@ sub_08021F9C: @ 0x08021F9C movs r1, #1 bl sub_08198134 ldrb r0, [r5] - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 bl sub_08022360 pop {r4, r5} @@ -70466,14 +70466,14 @@ _08022004: b _0802221A _08022006: ldr r0, _08022038 - bl sub_08003250 + bl AddWindow strh r0, [r6, #2] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6, #2] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r6, #2] ldr r4, _0802203C adds r1, r4, #0 @@ -70483,7 +70483,7 @@ _08022006: movs r1, #0 adds r2, r4, #0 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette b _0802221A .align 2, 0 _08022038: .4byte gUnknown_82C5F04 @@ -70513,7 +70513,7 @@ _08022040: movs r1, #1 adds r2, r7, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _080221B8 mov sl, r0 movs r0, #1 @@ -70533,7 +70533,7 @@ _08022040: movs r1, #1 adds r2, r7, #0 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0x2a mov sl, r0 _080220A6: @@ -70545,7 +70545,7 @@ _080220A6: bl sub_080089D8 ldr r0, _080221C0 ldr r1, _080221C4 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r6, #2] ldr r1, _080221C8 str r1, [sp] @@ -70556,7 +70556,7 @@ _080220A6: movs r1, #1 movs r2, #4 mov r3, sl - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 ldr r1, _080221CC movs r2, #1 @@ -70576,7 +70576,7 @@ _080220A6: movs r1, #1 adds r2, r7, #0 mov r3, sl - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r2, #0 mov r0, sb lsls r4, r0, #1 @@ -70628,7 +70628,7 @@ _08022136: bl sub_080089D8 ldr r0, _080221C0 ldr r1, _080221DC - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r7, #0 subs r0, #0x31 lsls r0, r0, #0x18 @@ -70643,7 +70643,7 @@ _08022136: movs r1, #0 adds r2, r7, #0 mov r3, sl - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r1, [sp, #0x10] lsls r0, r1, #0x18 lsrs r0, r0, #0x18 @@ -70658,7 +70658,7 @@ _08022136: bls _080220A6 ldrb r0, [r6, #2] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0802221A .align 2, 0 _080221B0: .4byte gUnknown_85CCA70 @@ -70688,12 +70688,12 @@ _080221F4: movs r1, #1 bl sub_08198134 ldrb r0, [r6, #2] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r6, #2] - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts bl sub_080987E8 mov r0, sb b _0802221E @@ -70719,7 +70719,7 @@ sub_08022230: @ 0x08022230 bl sub_080987DC ldr r0, _08022278 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0802227C @@ -70837,16 +70837,16 @@ _080222F6: lsls r0, r0, #3 ldr r1, _08022358 adds r0, r0, r1 - bl sub_08003250 + bl AddWindow ldr r1, _0802235C adds r4, r5, r1 adds r4, r4, r6 strb r0, [r4] ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -70881,7 +70881,7 @@ _08022374: adds r0, r7, r1 adds r5, r0, r6 ldrb r0, [r5] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r7, #8] cmp r6, r0 bne _080223C8 @@ -70910,7 +70910,7 @@ _08022374: str r4, [sp, #0x10] movs r1, #1 movs r3, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 b _08022400 .align 2, 0 _080223C0: .4byte 0x000001A7 @@ -70941,14 +70941,14 @@ _080223C8: str r4, [sp, #0x10] movs r1, #1 movs r3, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 _08022400: ldr r1, _08022430 adds r0, r7, r1 adds r0, r0, r6 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -70957,7 +70957,7 @@ _08022400: blo _08022374 _0802241A: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x14 pop {r3} mov r8, r3 @@ -71011,7 +71011,7 @@ _0802247E: cmp r5, r0 blo _08022450 movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r4, r5, r6} pop {r0} @@ -71035,7 +71035,7 @@ sub_08022494: @ 0x08022494 _080224AA: lsls r0, r5, #3 adds r0, r0, r4 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -71047,7 +71047,7 @@ _080224AA: movs r1, #0x78 movs r2, #0x58 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r0, #0xa2 @@ -71097,7 +71097,7 @@ _0802250E: asrs r2, r2, #0x10 ldr r0, _080226B0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r0, #0xa4 @@ -71157,7 +71157,7 @@ _0802258C: adds r2, #0x88 ldr r0, _080226B8 movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r5, #2 @@ -71206,7 +71206,7 @@ _080225F2: ldr r0, _080226BC movs r2, #8 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r5, #2 @@ -71715,8 +71715,8 @@ sub_080229BC: @ 0x080229BC ldrb r3, [r1, #6] str r4, [sp] adds r1, r5, #0 - bl sub_080A139C - bl sub_080A12E4 + bl BeginNormalPaletteFade + bl UpdatePaletteFade movs r0, #2 strb r0, [r6, #0xe] movs r0, #0 @@ -71748,7 +71748,7 @@ _08022A2A: beq _08022A5A b _08022A6A _08022A34: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _08022A70 @@ -71761,7 +71761,7 @@ _08022A48: bl sub_0800FF34 b _08022A6A _08022A4E: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08022A6A @@ -71832,7 +71832,7 @@ _08022AA6: adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r3, [r7, #0xb] str r6, [sp] mov r0, r8 @@ -71844,7 +71844,7 @@ _08022AA6: movs r0, #0 movs r1, #1 adds r2, r4, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 b _08022B16 .align 2, 0 _08022AEC: .4byte gUnknown_2021C7C @@ -71865,11 +71865,11 @@ _08022AF4: str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 _08022B16: movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _08022B6C .align 2, 0 _08022B20: .4byte gUnknown_82C5EBC @@ -71977,12 +71977,12 @@ _08022BD0: bl sub_0800FF34 b _08022C00 _08022BD6: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08022C06 ldr r0, _08022BFC - bl sub_080A27D8 + bl PlayNewMapMusic movs r0, #7 movs r1, #1 movs r2, #0 @@ -72060,7 +72060,7 @@ sub_08022C68: @ 0x08022C68 movs r1, #0 str r1, [r0, #4] ldr r0, _08022C7C - bl sub_08000540 + bl SetMainCallback2 movs r0, #0 pop {r1} bx r1 @@ -72112,7 +72112,7 @@ _08022CD8: bl sub_0800FF34 b _08022DCC _08022CDE: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08022DD2 @@ -72133,10 +72133,10 @@ _08022CDE: movs r0, #0 adds r1, r4, #0 movs r2, #2 - bl sub_0800A070 + bl SendBlock b _08022DCC _08022D12: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08022DD2 @@ -72144,7 +72144,7 @@ _08022D12: strh r0, [r5, #0x10] b _08022DCC _08022D22: - bl sub_0800A114 + bl GetBlockReceivedStatus ldr r2, _08022DA4 ldrb r4, [r5, #9] subs r1, r4, #2 @@ -72200,7 +72200,7 @@ _08022D62: _08022D8A: movs r0, #0 strh r0, [r5, #0x10] - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r1, #0x18 ldrsh r0, [r5, r1] lsls r0, r0, #8 @@ -72271,7 +72271,7 @@ _08022E14: bl sub_0800FF34 b _08022F14 _08022E26: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08022F1A @@ -72343,7 +72343,7 @@ _08022E8C: .align 2, 0 _08022EB8: .4byte sub_08021338 _08022EBC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08022F1A @@ -72369,7 +72369,7 @@ _08022EDE: bl sub_0800FF34 b _08022F14 _08022EF0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08022F1A @@ -72526,7 +72526,7 @@ _08023008: bl sub_0800FF34 b _08023048 _0802302A: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0802304E @@ -72571,7 +72571,7 @@ _0802306E: beq _080230A4 b _080230F8 _08023078: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080230FE @@ -72592,7 +72592,7 @@ _0802309E: bl sub_0800FF34 b _080230F8 _080230A4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080230FE @@ -73578,7 +73578,7 @@ _080237F8: rsbs r0, r0, #0 ldr r2, _0802381C movs r1, #8 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0x92 lsls r0, r0, #1 adds r1, r4, r0 @@ -73604,7 +73604,7 @@ _08023836: rsbs r0, r0, #0 ldr r2, _08023864 movs r1, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r2, _08023868 adds r1, r4, r2 movs r0, #4 @@ -73713,7 +73713,7 @@ _0802390E: strh r0, [r4, #0x10] b _08023946 _08023928: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0802394C @@ -73767,7 +73767,7 @@ _08023976: rsbs r0, r0, #0 movs r1, #8 movs r2, #0x1f - bl sub_080A22E8 + bl BlendPalettes movs r0, #0x92 lsls r0, r0, #1 adds r1, r5, r0 @@ -73789,7 +73789,7 @@ _08023998: rsbs r0, r0, #0 movs r1, #0 movs r2, #0x1f - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 strb r0, [r4] b _08023A30 @@ -73815,7 +73815,7 @@ _080239BE: bl SetGpuReg b _08023A30 _080239F0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08023A36 @@ -73918,10 +73918,10 @@ _08023AAC: movs r0, #0 adds r1, r4, #0 movs r2, #2 - bl sub_0800A070 + bl SendBlock b _08023DF4 _08023ACA: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08023AD6 @@ -73932,7 +73932,7 @@ _08023AD6: strh r0, [r6, #0x10] b _08023DF4 _08023ADE: - bl sub_0800A114 + bl GetBlockReceivedStatus ldr r2, _08023B44 mov r1, r8 ldrb r3, [r1, #9] @@ -73977,7 +73977,7 @@ _08023B2C: mov r6, r8 strh r0, [r6, #0x10] strh r0, [r4] - bl sub_0800A178 + bl ResetBlockReceivedFlags ldrb r0, [r6, #8] cmp r0, #0 bne _08023B4C @@ -74279,10 +74279,10 @@ _08023D82: movs r0, #0 ldr r1, [sp, #0xc] movs r2, #0x30 - bl sub_0800A070 + bl SendBlock b _08023DF4 _08023D8E: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08023DFC @@ -74291,7 +74291,7 @@ _08023D8E: strh r0, [r3, #0x10] b _08023DF4 _08023DA0: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -74306,7 +74306,7 @@ _08023DA0: adds r0, r4, #0 movs r2, #0x30 bl memcpy - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #0 mov r5, r8 strh r0, [r5, #0x10] @@ -74380,7 +74380,7 @@ _08023E40: b _08023EF2 _08023E52: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0x92 lsls r0, r0, #1 adds r1, r5, r0 @@ -74517,7 +74517,7 @@ _08023F68: bl sub_0800FF34 b _08023FE0 _08023F6E: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08023FE6 @@ -74536,20 +74536,20 @@ _08023F6E: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08023FB4 movs r1, #0 - bl sub_080A8878 + bl CreateTask b _08023FE0 .align 2, 0 _08023FB0: .4byte gUnknown_8277071 _08023FB4: .4byte sub_081535C4 _08023FB8: ldr r0, _08023FC8 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _08023FE0 @@ -74631,7 +74631,7 @@ _08024038: bl memset cmp r4, #0 bne _0802406A - bl sub_080D5FDC + bl HasAtLeastOneBerry lsls r0, r0, #0x18 cmp r0, #0 beq _08024066 @@ -74699,7 +74699,7 @@ _080240C8: bl sub_0800FF34 b _08024174 _080240CE: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0802417A @@ -74712,17 +74712,17 @@ _080240CE: strh r5, [r0] movs r0, #0 movs r2, #2 - bl sub_0800A070 + bl SendBlock b _08024174 _080240F0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0802417A strh r5, [r4, #0x10] b _08024174 _080240FE: - bl sub_0800A114 + bl GetBlockReceivedStatus ldr r2, _08024150 ldrb r3, [r4, #9] subs r1, r3, #2 @@ -74771,7 +74771,7 @@ _08024158: movs r2, #0 bl sub_08022950 _08024162: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r1, #0 movs r0, #0 strh r0, [r7] @@ -74820,7 +74820,7 @@ _080241A4: movs r3, #0x10 b _080241D8 _080241B2: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _080241FC @@ -74838,11 +74838,11 @@ _080241BE: movs r2, #0x10 movs r3, #0 _080241D8: - bl sub_080A139C - bl sub_080A12E4 + bl BeginNormalPaletteFade + bl UpdatePaletteFade b _080241FC _080241E2: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _08024202 @@ -74901,7 +74901,7 @@ _08024228: str r1, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 b _08024274 .align 2, 0 _08024254: .4byte gUnknown_82C5EBC @@ -74918,11 +74918,11 @@ _08024258: str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 _08024274: movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _080242BE .align 2, 0 _08024280: .4byte gUnknown_82C5EBC @@ -74989,7 +74989,7 @@ _080242EA: bl sub_0800FF34 b _08024320 _080242F0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08024326 @@ -75192,8 +75192,8 @@ sub_08024448: @ 0x08024448 _08024458: .4byte gUnknown_3005AF0 thumb_func_end sub_08024448 - thumb_func_start sub_0802445C -sub_0802445C: @ 0x0802445C + thumb_func_start ApplyNewEncryptionKeyToBerryPowder +ApplyNewEncryptionKeyToBerryPowder: @ 0x0802445C push {lr} adds r1, r0, #0 ldr r0, _08024474 @@ -75201,15 +75201,15 @@ sub_0802445C: @ 0x0802445C movs r2, #0xfa lsls r2, r2, #1 adds r0, r0, r2 - bl sub_08076B20 + bl ApplyNewEncryptionKeyToWord pop {r0} bx r0 .align 2, 0 _08024474: .4byte gUnknown_3005AF0 - thumb_func_end sub_0802445C + thumb_func_end ApplyNewEncryptionKeyToBerryPowder - thumb_func_start sub_08024478 -sub_08024478: @ 0x08024478 + thumb_func_start HasEnoughBerryPowder_ +HasEnoughBerryPowder_: @ 0x08024478 push {r4, lr} adds r4, r0, #0 ldr r0, _08024494 @@ -75230,10 +75230,10 @@ _0802449A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08024478 + thumb_func_end HasEnoughBerryPowder_ - thumb_func_start sub_080244A0 -sub_080244A0: @ 0x080244A0 + thumb_func_start HasEnoughBerryPowder +HasEnoughBerryPowder: @ 0x080244A0 push {lr} ldr r0, _080244BC ldr r0, [r0] @@ -75256,10 +75256,10 @@ _080244C6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080244A0 + thumb_func_end HasEnoughBerryPowder - thumb_func_start sub_080244CC -sub_080244CC: @ 0x080244CC + thumb_func_start GiveBerryPowder +GiveBerryPowder: @ 0x080244CC push {r4, r5, lr} adds r4, r0, #0 ldr r0, _080244F4 @@ -75289,10 +75289,10 @@ _08024506: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080244CC + thumb_func_end GiveBerryPowder - thumb_func_start sub_0802450C -sub_0802450C: @ 0x0802450C + thumb_func_start TakeBerryPowder_ +TakeBerryPowder_: @ 0x0802450C push {r4, r5, lr} adds r5, r0, #0 ldr r0, _0802453C @@ -75301,7 +75301,7 @@ sub_0802450C: @ 0x0802450C lsls r1, r1, #1 adds r4, r0, r1 adds r0, r5, #0 - bl sub_08024478 + bl HasEnoughBerryPowder_ lsls r0, r0, #0x18 cmp r0, #0 beq _08024540 @@ -75321,10 +75321,10 @@ _08024542: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0802450C + thumb_func_end TakeBerryPowder_ - thumb_func_start sub_08024548 -sub_08024548: @ 0x08024548 + thumb_func_start TakeBerryPowder +TakeBerryPowder: @ 0x08024548 push {r4, r5, lr} ldr r0, _08024578 ldr r0, [r0] @@ -75333,7 +75333,7 @@ sub_08024548: @ 0x08024548 adds r4, r0, r1 ldr r5, _0802457C ldrh r0, [r5] - bl sub_08024478 + bl HasEnoughBerryPowder_ lsls r0, r0, #0x18 cmp r0, #0 beq _08024580 @@ -75355,7 +75355,7 @@ _08024582: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08024548 + thumb_func_end TakeBerryPowder thumb_func_start GetBerryPowder GetBerryPowder: @ 0x08024588 @@ -75372,8 +75372,8 @@ GetBerryPowder: @ 0x08024588 _0802459C: .4byte gUnknown_3005AF0 thumb_func_end GetBerryPowder - thumb_func_start sub_080245A0 -sub_080245A0: @ 0x080245A0 + thumb_func_start PrintBerryPowderAmount +PrintBerryPowderAmount: @ 0x080245A0 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -75416,10 +75416,10 @@ sub_080245A0: @ 0x080245A0 bx r0 .align 2, 0 _080245F4: .4byte gUnknown_2021C40 - thumb_func_end sub_080245A0 + thumb_func_end PrintBerryPowderAmount - thumb_func_start sub_080245F8 -sub_080245F8: @ 0x080245F8 + thumb_func_start DrawPlayerPowderAmount +DrawPlayerPowderAmount: @ 0x080245F8 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -75438,7 +75438,7 @@ sub_080245F8: @ 0x080245F8 movs r1, #0 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _08024650 movs r4, #0 str r4, [sp] @@ -75454,7 +75454,7 @@ sub_080245F8: @ 0x080245F8 mov r1, r8 movs r2, #0x10 movs r3, #0xc - bl sub_080245A0 + bl PrintBerryPowderAmount add sp, #0xc pop {r3} mov r8, r3 @@ -75463,7 +75463,7 @@ sub_080245F8: @ 0x080245F8 bx r0 .align 2, 0 _08024650: .4byte gUnknown_85CCCEE - thumb_func_end sub_080245F8 + thumb_func_end DrawPlayerPowderAmount thumb_func_start sub_08024654 sub_08024654: @ 0x08024654 @@ -75477,7 +75477,7 @@ sub_08024654: @ 0x08024654 str r2, [sp] movs r2, #0x10 movs r3, #0xc - bl sub_080245A0 + bl PrintBerryPowderAmount add sp, #4 pop {r0} bx r0 @@ -75504,13 +75504,13 @@ sub_08024678: @ 0x08024678 bl SetWindowTemplateFields ldr r4, _080246D8 add r0, sp, #0x10 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] ldr r5, _080246DC adds r1, r5, #0 @@ -75522,7 +75522,7 @@ sub_08024678: @ 0x08024678 adds r0, r4, #0 adds r1, r5, #0 movs r2, #0xd - bl sub_080245F8 + bl DrawPlayerPowderAmount add sp, #0x18 pop {r4, r5} pop {r0} @@ -75532,23 +75532,23 @@ _080246D8: .4byte gUnknown_2022948 _080246DC: .4byte 0x0000021D thumb_func_end sub_08024678 - thumb_func_start sub_080246E0 -sub_080246E0: @ 0x080246E0 + thumb_func_start RemoveBerryPowderVendorMenu +RemoveBerryPowderVendorMenu: @ 0x080246E0 push {r4, lr} ldr r4, _08024700 ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] movs r1, #1 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 _08024700: .4byte gUnknown_2022948 - thumb_func_end sub_080246E0 + thumb_func_end RemoveBerryPowderVendorMenu thumb_func_start sub_08024704 sub_08024704: @ 0x08024704 @@ -75565,7 +75565,7 @@ sub_08024704: @ 0x08024704 beq _080247D8 ldr r4, _080247B4 ldr r0, _080247B8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] cmp r0, #0 beq _080247D8 @@ -75574,7 +75574,7 @@ sub_08024704: @ 0x08024704 bl sub_080247F8 ldr r0, [r4] str r5, [r0] - bl sub_0800A02C + bl GetMultiplayerId ldr r1, [r4] adds r1, #0x28 strb r0, [r1] @@ -75607,9 +75607,9 @@ sub_08024704: @ 0x08024704 bl sub_08025FC0 ldr r0, _080247CC movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r0, _080247D0 - bl sub_08000540 + bl SetMainCallback2 bl sub_080271B0 ldr r2, [r4] adds r0, r2, #0 @@ -75619,9 +75619,9 @@ sub_08024704: @ 0x08024704 adds r1, #0x44 adds r2, #0x48 bl sub_0802691C - bl sub_080A27F8 + bl StopMapMusic ldr r0, _080247D4 - bl sub_080A27D8 + bl PlayNewMapMusic b _080247DE .align 2, 0 _080247AC: .4byte gUnknown_3000DB0 @@ -75637,7 +75637,7 @@ _080247D0: .4byte sub_08025F94 _080247D4: .4byte 0x0000021E _080247D8: adds r0, r5, #0 - bl sub_08000540 + bl SetMainCallback2 _080247DE: pop {r4, r5, r6} pop {r0} @@ -75647,7 +75647,7 @@ _080247DE: thumb_func_start sub_080247E4 sub_080247E4: @ 0x080247E4 push {lr} - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes pop {r0} @@ -75810,7 +75810,7 @@ _080248F4: lsrs r5, r0, #0x18 cmp r5, #0xa bls _080248F4 - bl sub_0800A02C + bl GetMultiplayerId movs r1, #0 lsls r0, r0, #0x18 cmp r0, #0 @@ -75819,10 +75819,10 @@ _080248F4: _08024932: ldr r0, [sp, #0x10] strb r1, [r0] - bl sub_08009B64 + bl GetLinkPlayerCount mov r1, r8 strb r0, [r1] - bl sub_0800A02C + bl GetMultiplayerId ldr r3, [sp, #0x18] strb r0, [r3] movs r5, #1 @@ -75898,7 +75898,7 @@ _080249B8: @ jump table .4byte _08024AD8 @ case 7 _080249D8: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080249E8 movs r1, #4 bl sub_08025FD4 @@ -75907,7 +75907,7 @@ _080249D8: _080249E8: .4byte sub_080256D8 _080249EC: ldr r0, _08024A0C - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _080249FA @@ -75931,7 +75931,7 @@ _08024A14: bl sub_0800FF34 b _08024AE8 _08024A22: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08024B08 @@ -75939,10 +75939,10 @@ _08024A22: ldrb r0, [r0] cmp r0, #0 beq _08024AE8 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _08024AE8 .align 2, 0 _08024A44: .4byte gUnknown_30031C4 @@ -75999,21 +75999,21 @@ _08024AAE: adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08024AD4 - bl sub_080006F0 + bl SetVBlankCallback b _08024AE8 .align 2, 0 _08024AD4: .4byte sub_08025FAC _08024AD8: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _08024AF4 ldrb r1, [r0, #7] movs r0, #0x80 @@ -76033,7 +76033,7 @@ _08024AF4: .4byte gUnknown_2037C74 _08024AF8: .4byte gUnknown_202294C _08024AFC: adds r0, r1, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _08024B10 bl sub_08025FE4 _08024B08: @@ -76220,7 +76220,7 @@ _08024C58: .align 2, 0 _08024C64: .4byte gUnknown_202294C _08024C68: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08024CD0 @@ -76263,7 +76263,7 @@ _08024CB8: strb r0, [r1, #0x10] b _08024CD0 _08024CC0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08024CD0 @@ -76393,7 +76393,7 @@ _08024DB0: bl sub_08026008 _08024DB6: bl sub_080264E4 - bl sub_08025D10 + bl BagMenu_SwapItems _08024DBE: pop {r4} pop {r0} @@ -76511,7 +76511,7 @@ _08024E92: sub_08024E9C: @ 0x08024E9C push {r4, r5, lr} bl sub_080264E4 - bl sub_08025D10 + bl BagMenu_SwapItems bl sub_08026A10 cmp r0, #1 bne _08024EBA @@ -76592,7 +76592,7 @@ _08024F34: thumb_func_start sub_08024F38 sub_08024F38: @ 0x08024F38 push {r4, lr} - bl sub_0800A114 + bl GetBlockReceivedStatus adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -76604,7 +76604,7 @@ sub_08024F38: @ 0x08024F38 movs r0, #0 b _08024F5A _08024F54: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #1 _08024F5A: pop {r4} @@ -76635,7 +76635,7 @@ _08024F82: adds r1, #0x4a movs r0, #0 movs r2, #0x3c - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _08024FEE @@ -76643,7 +76643,7 @@ _08024F82: strb r4, [r0, #8] b _08024FCA _08024F98: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08024FEE @@ -76676,7 +76676,7 @@ _08024FCA: b _08024FEE _08024FD4: movs r0, #1 - bl sub_080A295C + bl WaitFanfare lsls r0, r0, #0x18 cmp r0, #0 beq _08024FEE @@ -76721,7 +76721,7 @@ _0802501A: adds r1, r2, r1 movs r0, #0 movs r2, #0x3c - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _080250DE @@ -76730,7 +76730,7 @@ _0802501A: ldr r1, [r5] b _08025094 _0802503C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080250DE @@ -76785,7 +76785,7 @@ _0802509C: .4byte gUnknown_202207C _080250A0: .4byte gUnknown_202294C _080250A4: movs r0, #1 - bl sub_080A295C + bl WaitFanfare lsls r0, r0, #0x18 cmp r0, #0 beq _080250DE @@ -76878,7 +76878,7 @@ _08025164: strb r0, [r1] movs r0, #0 movs r2, #1 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _0802522E @@ -76888,7 +76888,7 @@ _08025164: .align 2, 0 _08025180: .4byte gUnknown_202294C _08025184: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0802522E @@ -77077,7 +77077,7 @@ _08025304: strb r0, [r1] movs r0, #0 movs r2, #1 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _08025404 @@ -77090,7 +77090,7 @@ _08025304: .align 2, 0 _08025328: .4byte gUnknown_202294C _0802532C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08025404 @@ -77288,10 +77288,10 @@ _08025496: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _080254E2 _080254A8: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _080254BC ldrb r1, [r0, #7] movs r0, #0x80 @@ -77329,13 +77329,13 @@ _080254F0: ldr r4, _0802551C ldr r0, [r4] ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 ldr r0, [r4] ldrb r0, [r0, #4] - bl sub_080A8964 + bl DestroyTask ldr r0, [r4] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers _08025514: add sp, #4 pop {r4} @@ -77381,48 +77381,48 @@ _08025560: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08025610 _08025578: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY b _08025610 _080255CA: - bl sub_080A27F8 + bl StopMapMusic b _08025610 _080255D0: ldr r0, _080255DC - bl sub_080A27D8 + bl PlayNewMapMusic bl sub_08028B78 b _08025610 .align 2, 0 @@ -77433,17 +77433,17 @@ _080255E0: adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _08025610 _08025600: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0802561C ldrb r1, [r0, #7] movs r0, #0x80 @@ -77462,7 +77462,7 @@ _0802561C: .4byte gUnknown_2037C74 _08025620: .4byte gUnknown_202294C _08025624: ldrb r0, [r1, #4] - bl sub_080A8964 + bl DestroyTask ldr r0, _0802565C bl sub_08025FE4 bl sub_08028D68 @@ -77545,7 +77545,7 @@ _080256C0: bl sub_08025FE4 _080256C6: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080256CC: pop {r4, r5} pop {r0} @@ -77591,7 +77591,7 @@ _08025706: adds r1, r1, r0 movs r0, #0 movs r2, #1 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 beq _080257B0 @@ -77602,7 +77602,7 @@ _08025706: _0802572C: .4byte gUnknown_202294C _08025730: .4byte 0x0000318C _08025734: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080257B0 @@ -77657,7 +77657,7 @@ _0802578C: cmp r0, r1 blo _080257B0 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask movs r0, #6 bl sub_0802900C ldr r1, [r4] @@ -78359,8 +78359,8 @@ _08025D08: .align 2, 0 thumb_func_end sub_08025CA0 - thumb_func_start sub_08025D10 -sub_08025D10: @ 0x08025D10 + thumb_func_start BagMenu_SwapItems +BagMenu_SwapItems: @ 0x08025D10 push {r4, r5, r6, lr} ldr r6, _08025D48 ldr r2, [r6] @@ -78376,7 +78376,7 @@ sub_08025D10: @ 0x08025D10 ldrb r0, [r0] cmp r0, #0 bne _08025D50 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -78425,7 +78425,7 @@ _08025D80: ldrb r0, [r0] cmp r0, #0 bne _08025DB2 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08025DB2 @@ -78452,7 +78452,7 @@ _08025DB2: ldrb r0, [r0] cmp r0, #9 bls _08025DE4 - bl sub_080A27F8 + bl StopMapMusic ldr r0, [r4] adds r0, r0, r5 movs r1, #1 @@ -78469,7 +78469,7 @@ _08025DE4: cmp r0, #1 bne _08025E04 movs r0, #0xb - bl sub_080A2928 + bl PlayFanfareByFanfareNum ldr r0, [r4] movs r2, #0xaa lsls r2, r2, #1 @@ -78482,7 +78482,7 @@ _08025E04: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08025D10 + thumb_func_end BagMenu_SwapItems thumb_func_start sub_08025E0C sub_08025E0C: @ 0x08025E0C @@ -78563,7 +78563,7 @@ _08025E94: ldrb r0, [r0] cmp r0, #0 bne _08025EC6 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08025EC6 @@ -78649,7 +78649,7 @@ _08025F3A: ldrb r0, [r0] cmp r0, #9 bls _08025F68 - bl sub_080A27F8 + bl StopMapMusic ldr r0, [r4] adds r0, r0, r5 movs r1, #1 @@ -78665,7 +78665,7 @@ _08025F68: cmp r0, #1 bne _08025F88 movs r0, #0xb - bl sub_080A2928 + bl PlayFanfareByFanfareNum ldr r0, [r4] movs r3, #0xaa lsls r3, r3, #1 @@ -78685,10 +78685,10 @@ _08025F88: thumb_func_start sub_08025F94 sub_08025F94: @ 0x08025F94 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -78698,8 +78698,8 @@ sub_08025F94: @ 0x08025F94 sub_08025FAC: @ 0x08025FAC push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests pop {r0} bx r0 .align 2, 0 @@ -78710,7 +78710,7 @@ sub_08025FC0: @ 0x08025FC0 push {r4, lr} adds r4, r0, #0 adds r0, r1, #0 - bl sub_0806E630 + bl IsMonShiny strb r0, [r4] pop {r4} pop {r0} @@ -78723,7 +78723,7 @@ sub_08025FD4: @ 0x08025FD4 push {lr} lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -78733,7 +78733,7 @@ sub_08025FD4: @ 0x08025FD4 sub_08025FE4: @ 0x08025FE4 push {lr} movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r1, _08026004 ldr r3, [r1] movs r2, #0 @@ -80468,7 +80468,7 @@ _08026CB6: adds r4, #0xc adds r5, #1 _08026CBE: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -80526,7 +80526,7 @@ _08026D08: adds r0, r0, r4 ldrh r0, [r0] ldr r1, _08026D34 - bl sub_080277E8 + bl IncrementWithLimit ldr r1, [r6] adds r1, #0x4a adds r1, r1, r4 @@ -81230,14 +81230,14 @@ sub_0802725C: @ 0x0802725C ldrb r0, [r0] bl sub_0802721C ldr r1, _080272C8 - bl sub_080277F8 + bl Min adds r4, r0, #0 ldr r0, [r5] adds r0, #0x28 ldrb r0, [r0] bl sub_08027480 ldr r1, _080272CC - bl sub_080277F8 + bl Min adds r2, r0, #0 ldr r3, _080272D0 ldr r0, [r3] @@ -81622,7 +81622,7 @@ _0802752C: _08027536: ldr r1, _08027548 adds r0, r5, #0 - bl sub_080277F8 + bl Min pop {r4, r5, r6} pop {r1} bx r1 @@ -81794,7 +81794,7 @@ _08027666: adds r0, r4, #0 bl sub_08027480 ldr r1, _080276F8 - bl sub_080277F8 + bl Min ldr r1, _080276EC ldr r1, [r1] lsls r2, r4, #3 @@ -81969,7 +81969,7 @@ _080277B0: .4byte gUnknown_202294C _080277B4: adds r0, r5, #0 movs r1, #1 - bl sub_080D6018 + bl CheckBagHasSpace lsls r0, r0, #0x18 cmp r0, #0 bne _080277C6 @@ -81978,10 +81978,10 @@ _080277B4: _080277C6: adds r0, r6, #0 movs r1, #1 - bl sub_080D6140 + bl AddBagItem adds r0, r6, #0 movs r1, #1 - bl sub_080D6018 + bl CheckBagHasSpace lsls r0, r0, #0x18 cmp r0, #0 beq _080277E0 @@ -81995,8 +81995,8 @@ _080277E2: bx r1 thumb_func_end sub_08027788 - thumb_func_start sub_080277E8 -sub_080277E8: @ 0x080277E8 + thumb_func_start IncrementWithLimit +IncrementWithLimit: @ 0x080277E8 push {lr} adds r2, r0, #0 adds r0, r1, #0 @@ -82006,10 +82006,10 @@ sub_080277E8: @ 0x080277E8 _080277F4: pop {r1} bx r1 - thumb_func_end sub_080277E8 + thumb_func_end IncrementWithLimit - thumb_func_start sub_080277F8 -sub_080277F8: @ 0x080277F8 + thumb_func_start Min +Min: @ 0x080277F8 push {lr} adds r2, r0, #0 adds r0, r1, #0 @@ -82019,7 +82019,7 @@ sub_080277F8: @ 0x080277F8 _08027804: pop {r1} bx r1 - thumb_func_end sub_080277F8 + thumb_func_end Min thumb_func_start sub_08027808 sub_08027808: @ 0x08027808 @@ -82048,12 +82048,12 @@ _08027822: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08027854 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0x55 bne _08027854 movs r0, #1 @@ -82083,7 +82083,7 @@ sub_0802786C: @ 0x0802786C ldr r4, _08027888 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -82123,7 +82123,7 @@ _080278B4: b _08027926 _080278BE: ldr r0, _080278D4 - bl sub_08003250 + bl AddWindow strh r0, [r4, #2] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -82134,7 +82134,7 @@ _080278BE: .align 2, 0 _080278D4: .4byte gUnknown_82CB3B8 _080278D8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08027926 @@ -82147,11 +82147,11 @@ _080278E4: cmp r0, #0 beq _08027926 ldrb r0, [r4, #2] - bl sub_08098504 + bl rbox_fill_rectangle ldrb r0, [r4, #2] movs r1, #1 _080278FA: - bl sub_08003528 + bl CopyWindowToVram _080278FE: ldrh r0, [r4] adds r0, #1 @@ -82160,15 +82160,15 @@ _080278FE: .align 2, 0 _08027908: .4byte gUnknown_3002360 _0802790C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08027926 ldrb r0, [r4, #2] - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _08027926: pop {r4, r5} pop {r0} @@ -82208,10 +82208,10 @@ sub_0802792C: @ 0x0802792C adds r0, r7, #0 adds r1, r4, #0 movs r2, #0xd - bl sub_080981E0 + bl DrawTextBorderOuter adds r0, r7, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _08027A34 movs r0, #2 str r0, [sp] @@ -82285,7 +82285,7 @@ _080279A2: cmp r6, #2 ble _080279A2 adds r0, r7, #0 - bl sub_0800365C + bl PutWindowTilemap add sp, #0x1c pop {r3, r4, r5} mov r8, r3 @@ -82306,10 +82306,10 @@ _08027A44: .4byte gUnknown_82CB3D0 _08027A48: .4byte gUnknown_82CB3D6 thumb_func_end sub_0802792C - thumb_func_start sub_08027A4C -sub_08027A4C: @ 0x08027A4C + thumb_func_start AddWallpaperSetsMenu +AddWallpaperSetsMenu: @ 0x08027A4C push {lr} - bl sub_08009B64 + bl GetLinkPlayerCount ldr r1, _08027A60 ldr r1, [r1] adds r1, #0x24 @@ -82318,7 +82318,7 @@ sub_08027A4C: @ 0x08027A4C bx r0 .align 2, 0 _08027A60: .4byte gUnknown_202294C - thumb_func_end sub_08027A4C + thumb_func_end AddWallpaperSetsMenu thumb_func_start sub_08027A64 sub_08027A64: @ 0x08027A64 @@ -83193,7 +83193,7 @@ sub_080280D4: @ 0x080280D4 movs r5, #0xc0 lsls r5, r5, #6 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 ldr r0, _08028128 ldr r1, [r0, #4] @@ -83213,9 +83213,9 @@ sub_080280D4: @ 0x080280D4 str r4, [sp] str r5, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r4, #0 - bl sub_08000BF0 + bl Free _08028114: add r0, sp, #8 bl LoadSpritePalette @@ -83268,7 +83268,7 @@ sub_08028134: @ 0x08028134 movs r2, #0x18 bl memcpy movs r0, #4 - bl sub_08000BDC + bl AllocZeroed ldr r1, _080281D0 mov r2, r8 lsls r4, r2, #2 @@ -83283,7 +83283,7 @@ sub_08028134: @ 0x08028134 mov r0, sp movs r2, #0x88 movs r3, #3 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -83331,7 +83331,7 @@ _080281F2: thumb_func_start sub_080281F8 sub_080281F8: @ 0x080281F8 push {lr} - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _08028228 lsls r0, r0, #0x18 lsrs r0, r0, #0x16 @@ -83360,7 +83360,7 @@ _0802822C: .4byte gUnknown_20205AC thumb_func_start sub_08028230 sub_08028230: @ 0x08028230 push {lr} - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _08028260 lsls r0, r0, #0x18 lsrs r0, r0, #0x16 @@ -83492,7 +83492,7 @@ _0802831C: strh r0, [r5, #0x2e] movs r4, #0 _0802832A: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -83677,7 +83677,7 @@ sub_08028460: @ 0x08028460 movs r4, #0xc0 lsls r4, r4, #1 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r6, r0, #0 ldr r0, _08028500 ldr r1, [r0, #4] @@ -83703,10 +83703,10 @@ sub_08028460: @ 0x08028460 stm r1!, {r2, r3, r4} ldr r4, _0802850C movs r0, #0x40 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] adds r0, r5, #0 - bl sub_08008210 + bl LoadSpriteSheet add r0, sp, #0x20 bl LoadSpritePalette movs r4, #0 @@ -83725,7 +83725,7 @@ _080284B6: asrs r2, r2, #0x10 mov r0, sp movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, _0802850C ldr r1, [r1] lsls r2, r4, #1 @@ -83741,7 +83741,7 @@ _080284B6: bls _080284B6 _080284F0: adds r0, r6, #0 - bl sub_08000BF0 + bl Free add sp, #0x28 pop {r4, r5, r6} pop {r0} @@ -83779,7 +83779,7 @@ _08028532: cmp r4, #9 bls _08028514 ldr r0, [r5] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r5] pop {r4, r5} @@ -84073,7 +84073,7 @@ sub_08028760: @ 0x08028760 movs r5, #0x90 lsls r5, r5, #3 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 ldr r0, _080287AC ldr r1, [r0, #4] @@ -84091,12 +84091,12 @@ sub_08028760: @ 0x08028760 orrs r0, r5 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet _08028796: add r0, sp, #8 bl LoadSpritePalette adds r0, r4, #0 - bl sub_08000BF0 + bl Free add sp, #0x10 pop {r4, r5} pop {r0} @@ -84130,7 +84130,7 @@ sub_080287B4: @ 0x080287B4 mov sb, r2 _080287DC: movs r0, #4 - bl sub_08000BDC + bl AllocZeroed ldr r1, _0802884C lsls r4, r5, #2 adds r4, r4, r1 @@ -84141,7 +84141,7 @@ _080287DC: mov r0, sp movs r2, #8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -84160,7 +84160,7 @@ _080287DC: mov r8, r4 _0802881C: movs r0, #4 - bl sub_08000BDC + bl AllocZeroed lsls r1, r5, #2 adds r4, r1, r7 str r0, [r4] @@ -84173,7 +84173,7 @@ _0802881C: mov r0, sb movs r2, #0x39 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7, #0xc] b _0802886C .align 2, 0 @@ -84190,7 +84190,7 @@ _08028858: mov r0, sb movs r2, #0x3c movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] _0802886C: lsls r0, r0, #0x18 @@ -84244,7 +84244,7 @@ _080288B2: bl DestroySprite _080288CC: ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] adds r0, r5, #1 @@ -84269,7 +84269,7 @@ _080288E4: bl DestroySprite _080288FE: ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] adds r0, r5, #1 @@ -84481,7 +84481,7 @@ sub_08028A70: @ 0x08028A70 movs r4, #0x80 lsls r4, r4, #3 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r6, r0, #0 ldr r0, _08028B14 ldr r1, [r0, #4] @@ -84505,7 +84505,7 @@ sub_08028A70: @ 0x08028A70 stm r2!, {r3, r4, r5} ldm r1!, {r3, r4, r5} stm r2!, {r3, r4, r5} - bl sub_08008210 + bl LoadSpriteSheet add r0, sp, #0x20 bl LoadSpritePalette movs r5, #0 @@ -84516,7 +84516,7 @@ sub_08028A70: @ 0x08028A70 mov r8, r1 _08028ACA: movs r0, #4 - bl sub_08000BDC + bl AllocZeroed lsls r2, r5, #2 mov r3, r8 adds r4, r2, r3 @@ -84529,7 +84529,7 @@ _08028ACA: ldrsh r2, [r2, r0] mov r0, sp movs r3, #4 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -84541,7 +84541,7 @@ _08028ACA: bls _08028ACA _08028AFE: adds r0, r6, #0 - bl sub_08000BF0 + bl Free add sp, #0x28 pop {r3, r4} mov r8, r3 @@ -84651,7 +84651,7 @@ _08028BB6: bl DestroySprite _08028BD0: ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] adds r0, r5, #1 @@ -84843,7 +84843,7 @@ sub_08028D24: @ 0x08028D24 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r1, [r0] movs r2, #0x90 lsls r2, r2, #1 @@ -84851,11 +84851,11 @@ sub_08028D24: @ 0x08028D24 movs r3, #1 bl LoadBgTiles adds r0, r4, #0 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r0, [r0, #4] movs r1, #0xa0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -85177,7 +85177,7 @@ sub_08028FA0: @ 0x08028FA0 strb r2, [r0] ldr r0, _08028FF4 movs r1, #3 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] ldr r2, _08028FF8 adds r1, r1, r2 @@ -85199,7 +85199,7 @@ _08028FFC: .4byte sub_08029064 thumb_func_start sub_08029000 sub_08029000: @ 0x08029000 push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers pop {r0} bx r0 .align 2, 0 @@ -85300,23 +85300,23 @@ _080290C0: movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _080290FC movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _08029100 movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08029140 .align 2, 0 _080290F8: .4byte gUnknown_82CE364 @@ -85324,13 +85324,13 @@ _080290FC: .4byte gUnknown_82CE820 _08029100: .4byte gUnknown_82CE5D0 _08029104: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r0, _08029128 ldr r1, [r0] ldr r2, _0802912C @@ -85485,7 +85485,7 @@ _08029208: orrs r0, r2 str r0, [sp, #0xc] add r0, sp, #0xc - bl sub_08003250 + bl AddWindow mov r2, sl ldr r1, [r2] add r1, sb @@ -85495,15 +85495,15 @@ _08029208: add r0, sb adds r0, r0, r6 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap mov r3, sl ldr r0, [r3] add r0, sb adds r0, r0, r6 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 - bl sub_0800A02C + bl FillWindowPixelBuffer + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -85534,14 +85534,14 @@ _08029286: str r4, [sp, #8] movs r1, #0 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r2, sl ldr r0, [r2] add r0, sb adds r0, r0, r6 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r3, [sp, #0x18] ldrh r0, [r3, #6] adds r0, #0xe @@ -85572,7 +85572,7 @@ _0802930C: .4byte gUnknown_82CEC0C _08029310: .4byte gUnknown_20229AC _08029314: .4byte 0x00003014 _08029318: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080293BA @@ -85588,7 +85588,7 @@ _08029330: adds r0, r0, r1 adds r0, r0, r6 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -85596,7 +85596,7 @@ _08029330: blo _08029330 _08029348: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _08029364 ldr r1, [r0] ldr r2, _08029368 @@ -85617,12 +85617,12 @@ _0802936C: adds r0, r0, r4 adds r0, r0, r6 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r5] adds r0, r0, r4 adds r0, r0, r6 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -85639,7 +85639,7 @@ _08029392: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _080293CC ldr r0, [r0] movs r3, #0xc0 @@ -85799,7 +85799,7 @@ _0802948E: movs r1, #0 movs r3, #8 bl AddTextPrinterParameterized - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -85827,7 +85827,7 @@ _080294E6: movs r1, #0 movs r2, #0x1c adds r3, r6, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add r0, sp, #0xc mov r1, sb movs r2, #0 @@ -85950,7 +85950,7 @@ _08029628: .4byte 0x0000301C _0802962C: ldr r6, _08029674 adds r0, r6, #0 - bl sub_08003250 + bl AddWindow ldr r4, _08029678 ldr r1, [r4] ldr r2, _0802967C @@ -85960,7 +85960,7 @@ _0802962C: movs r0, #8 adds r0, r0, r6 mov sb, r0 - bl sub_08003250 + bl AddWindow ldr r1, [r4] ldr r5, _08029680 adds r1, r1, r5 @@ -85968,11 +85968,11 @@ _0802962C: ldr r0, [r4] add r0, r8 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap adds r0, r6, #0 bl sub_08028EA0 mov r0, sb @@ -85990,14 +85990,14 @@ _08029684: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r4] ldr r1, _080297D8 mov sb, r1 add r0, sb ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _080297DC mov r8, r2 movs r2, #1 @@ -86042,7 +86042,7 @@ _08029684: b _08029844 _080296FE: movs r4, #0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp sb, r0 @@ -86073,7 +86073,7 @@ _0802970E: str r6, [sp, #8] movs r1, #0 movs r2, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r7, #0 mov r8, r5 mov r0, sb @@ -86088,14 +86088,14 @@ _08029752: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, _080297F0 - bl sub_080277F8 + bl Min adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r7, #0 bl sub_0802754C ldr r1, _080297F0 - bl sub_080277F8 + bl Min lsls r0, r0, #0x10 lsrs r6, r0, #0x10 mov r0, sl @@ -86136,7 +86136,7 @@ _08029752: mov r1, sl str r1, [sp, #8] movs r1, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0802982A .align 2, 0 _080297D0: .4byte gUnknown_20229AC @@ -86194,13 +86194,13 @@ _08029844: adds r0, r0, r1 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] ldr r2, _08029870 adds r0, r0, r2 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r4] ldr r0, _08029884 adds r1, r1, r0 @@ -86214,7 +86214,7 @@ _0802987C: .4byte gUnknown_2021C7C _08029880: .4byte 0x00003008 _08029884: .4byte 0x00003014 _08029888: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080298AC @@ -86223,15 +86223,15 @@ _08029888: ldr r1, _080298C8 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r4] ldr r2, _080298CC adds r0, r0, r2 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap _080298AC: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 bl sub_0802895C ldr r0, _080298C4 @@ -86284,13 +86284,13 @@ _08029918: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r4] ldr r1, _08029974 adds r0, r0, r1 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r6, _08029978 movs r2, #1 rsbs r2, r2, #0 @@ -86329,13 +86329,13 @@ _0802997C: adds r0, r0, r1 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] ldr r2, _080299B0 adds r0, r0, r2 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r4] ldr r0, _080299B4 adds r1, r1, r0 @@ -86346,7 +86346,7 @@ _080299AC: .4byte 0x00003008 _080299B0: .4byte 0x00003009 _080299B4: .4byte 0x00003014 _080299B8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080299DC @@ -86355,15 +86355,15 @@ _080299B8: ldr r1, _080299F0 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r4] ldr r2, _080299F4 adds r0, r0, r2 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap _080299DC: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _080299EC ldr r1, [r0] ldr r0, _080299F8 @@ -86417,7 +86417,7 @@ _08029A4C: .4byte gUnknown_3002360 _08029A50: .4byte 0x00000BB7 _08029A54: .4byte 0x00003014 _08029A58: - bl sub_080A27F8 + bl StopMapMusic ldr r1, [r4] ldr r0, _08029AAC adds r1, r1, r0 @@ -86439,17 +86439,17 @@ _08029A68: ldr r4, _08029AB4 adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r6, _08029AB8 adds r0, r6, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r5] adds r1, r1, r4 strb r0, [r1] ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap adds r0, r6, #0 bl sub_08028EA0 b _08029D10 @@ -86460,21 +86460,21 @@ _08029AB4: .4byte 0x00003009 _08029AB8: .4byte gUnknown_82CB458 _08029ABC: ldr r0, _08029B94 - bl sub_080A27D8 + bl PlayNewMapMusic ldr r4, _08029B98 ldr r0, [r4] ldr r6, _08029B9C adds r0, r0, r6 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r4] ldr r1, _08029BA0 mov sl, r1 add r0, sl ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _08029BA4 movs r2, #1 rsbs r2, r2, #0 @@ -86514,7 +86514,7 @@ _08029ABC: ldr r7, _08029BAC ldr r1, _08029BB0 adds r0, r7, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, [r4] add r0, sl ldrb r0, [r0] @@ -86548,7 +86548,7 @@ _08029ABC: bne _08029BB8 ldr r1, _08029BB4 adds r0, r7, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _08029BC4 .align 2, 0 _08029B94: .4byte 0x0000016F @@ -86565,7 +86565,7 @@ _08029BB8: bne _08029BC4 ldr r1, _08029C08 adds r0, r7, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders _08029BC4: ldr r0, _08029C0C ldr r0, [r0] @@ -86588,13 +86588,13 @@ _08029BE2: adds r0, r0, r1 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] ldr r2, _08029C10 adds r0, r0, r2 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r4] ldr r0, _08029C1C adds r1, r1, r0 @@ -86607,7 +86607,7 @@ _08029C14: .4byte gUnknown_2021C7C _08029C18: .4byte 0x00003008 _08029C1C: .4byte 0x00003014 _08029C20: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08029C44 @@ -86616,15 +86616,15 @@ _08029C20: ldr r1, _08029C64 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r4] ldr r2, _08029C68 adds r0, r0, r2 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap _08029C44: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _08029C6C movs r1, #0x14 movs r2, #0xa @@ -86681,20 +86681,20 @@ _08029CC0: ldr r5, _08029D20 adds r0, r1, r5 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r6] ldr r4, _08029D24 adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r6] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r0, [r6] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow movs r0, #0x1e str r0, [sp] movs r0, #0x14 @@ -86705,7 +86705,7 @@ _08029CC0: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, [r6] movs r1, #0xc0 lsls r1, r1, #6 @@ -86762,7 +86762,7 @@ _08029D64: b _08029FF4 _08029D66: ldr r0, _08029DC4 - bl sub_08003250 + bl AddWindow ldr r1, [r6] ldr r5, _08029DC8 adds r1, r1, r5 @@ -86770,7 +86770,7 @@ _08029D66: ldr r0, _08029DC4 adds r0, #8 mov r8, r0 - bl sub_08003250 + bl AddWindow ldr r1, [r6] ldr r4, _08029DCC adds r1, r1, r4 @@ -86778,11 +86778,11 @@ _08029D66: ldr r0, [r6] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r6] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, _08029DC4 bl sub_08028EA0 mov r0, r8 @@ -86815,13 +86815,13 @@ _08029DDC: adds r0, r2, r3 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] ldr r7, _08029E88 adds r0, r0, r7 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] add r0, r8 ldrb r0, [r0] @@ -86876,12 +86876,12 @@ _08029DDC: add r0, r8 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r6] adds r0, r0, r7 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r6] ldr r0, _08029E9C adds r1, r1, r0 @@ -86895,7 +86895,7 @@ _08029E94: .4byte gUnknown_85CAADB _08029E98: .4byte gUnknown_85C9421 _08029E9C: .4byte 0x00003014 _08029EA0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08029EC2 @@ -86903,15 +86903,15 @@ _08029EA0: ldr r1, _08029ECC adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] ldr r2, _08029ED0 adds r0, r0, r2 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap _08029EC2: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08029FE2 .align 2, 0 _08029ECC: .4byte 0x00003008 @@ -86930,7 +86930,7 @@ _08029EE2: adds r0, r2, r1 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] add r0, r8 ldrb r0, [r0] @@ -86977,7 +86977,7 @@ _08029EE2: add r0, r8 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08029F90 ldrh r1, [r0, #0x2e] movs r4, #1 @@ -87068,20 +87068,20 @@ _08029FF4: ldr r7, _0802A06C adds r0, r0, r7 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r6] ldr r4, _0802A070 adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r6] adds r0, r0, r7 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r0, [r6] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow movs r0, #0x1e str r0, [sp] movs r0, #0x14 @@ -87092,7 +87092,7 @@ _08029FF4: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, [r6] movs r1, #0xc0 lsls r1, r1, #6 @@ -87155,14 +87155,14 @@ _0802A0A2: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 b _0802A104 .align 2, 0 _0802A0C8: .4byte gUnknown_8277071 _0802A0CC: movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r5] ldr r0, _0802A0DC adds r1, r1, r0 @@ -87170,19 +87170,19 @@ _0802A0CC: .align 2, 0 _0802A0DC: .4byte 0x00003014 _0802A0E0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802A13C ldr r0, _0802A0F4 movs r1, #0 - bl sub_080A8878 + bl CreateTask b _0802A104 .align 2, 0 _0802A0F4: .4byte sub_081535C4 _0802A0F8: ldr r0, _0802A110 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0802A13C @@ -87207,7 +87207,7 @@ _0802A114: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0802A144 ldr r0, [r0] movs r1, #0xc0 @@ -87251,7 +87251,7 @@ _0802A170: _0802A176: ldr r4, _0802A198 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r5] ldr r2, _0802A19C adds r1, r1, r2 @@ -87259,7 +87259,7 @@ _0802A176: ldr r0, [r5] adds r0, r0, r2 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap adds r0, r4, #0 bl sub_08028EA0 b _0802A204 @@ -87271,7 +87271,7 @@ _0802A1A0: adds r0, r2, r4 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] @@ -87289,7 +87289,7 @@ _0802A1A0: adds r0, r0, r4 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r5] ldr r0, _0802A1E4 adds r1, r1, r0 @@ -87299,7 +87299,7 @@ _0802A1DC: .4byte 0x00003008 _0802A1E0: .4byte gUnknown_85CCDEA _0802A1E4: .4byte 0x00003014 _0802A1E8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802A1FE @@ -87307,10 +87307,10 @@ _0802A1E8: ldr r1, _0802A210 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap _0802A1FE: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0802A204: ldr r1, [r5] adds r1, r1, r6 @@ -87344,11 +87344,11 @@ sub_0802A228: @ 0x0802A228 ldr r4, _0802A278 adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow movs r0, #0x1e str r0, [sp] movs r0, #0x14 @@ -87359,7 +87359,7 @@ sub_0802A228: @ 0x0802A228 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, [r5] movs r1, #0xc0 lsls r1, r1, #6 @@ -87404,7 +87404,7 @@ _0802A2A4: _0802A2AE: ldr r4, _0802A2F4 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow ldr r1, [r6] ldr r2, _0802A2F8 adds r1, r1, r2 @@ -87412,7 +87412,7 @@ _0802A2AE: ldr r0, [r6] adds r0, r0, r2 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap adds r0, r4, #0 bl sub_08028EA0 ldr r1, [r6] @@ -87443,7 +87443,7 @@ _0802A304: adds r0, r1, r4 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r6] adds r0, r0, r4 ldrb r0, [r0] @@ -87461,7 +87461,7 @@ _0802A304: adds r0, r0, r4 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r6] ldr r2, _0802A348 adds r1, r1, r2 @@ -87471,7 +87471,7 @@ _0802A340: .4byte 0x00003008 _0802A344: .4byte gUnknown_85CCDCB _0802A348: .4byte 0x00003014 _0802A34C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802A362 @@ -87479,10 +87479,10 @@ _0802A34C: ldr r1, _0802A374 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap _0802A362: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, [r6] adds r1, r1, r7 _0802A36C: @@ -87518,11 +87518,11 @@ _0802A398: ldr r4, _0802A3EC adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r6] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow movs r0, #0x1e str r0, [sp] movs r0, #0x14 @@ -87533,7 +87533,7 @@ _0802A398: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, [r6] movs r2, #0xc0 lsls r2, r2, #6 @@ -87558,7 +87558,7 @@ sub_0802A3F0: @ 0x0802A3F0 ldr r1, _0802A418 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask ldr r0, [r4] movs r1, #0xc0 lsls r1, r1, #6 @@ -87735,36 +87735,36 @@ _0802A4C2: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 - bl sub_08196DC4 + bl ChangeBgY + bl InitStandardTextBoxWindows bl sub_08196DF4 movs r1, #0x82 lsls r1, r1, #5 @@ -87773,19 +87773,19 @@ _0802A4C2: ldr r4, _0802A5D8 ldr r1, [r4] movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r2, #0x80 lsls r2, r2, #5 adds r1, r1, r2 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r0, #0x80 lsls r0, r0, #6 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer add sp, #8 pop {r3} mov r8, r3 @@ -87830,7 +87830,7 @@ _0802A61C: ldr r0, _0802A628 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette b _0802A67E .align 2, 0 _0802A628: .4byte gUnknown_82CB67C @@ -87853,12 +87853,12 @@ _0802A640: _0802A648: movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _0802A67E .align 2, 0 _0802A654: .4byte gUnknown_82CC1A0 _0802A658: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -87866,10 +87866,10 @@ _0802A658: b _0802A68C _0802A666: movs r0, #3 - bl sub_080985A0 + bl stdpal_get movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _0802A67E _0802A676: movs r0, #0 @@ -87911,10 +87911,10 @@ sub_0802A69C: @ 0x0802A69C str r0, [r5] cmp r0, #0 beq _0802A730 - bl sub_080A8818 + bl ResetTasks ldr r0, _0802A720 movs r1, #1 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -87923,7 +87923,7 @@ sub_0802A69C: @ 0x0802A69C strh r1, [r0, #8] str r6, [r0] strb r4, [r0, #4] - bl sub_0800A02C + bl GetMultiplayerId ldr r1, [r5] strb r0, [r1, #6] ldr r0, [r5] @@ -87946,7 +87946,7 @@ sub_0802A69C: @ 0x0802A69C movs r1, #2 bl SetWordTaskArg ldr r0, _0802A72C - bl sub_08000540 + bl SetMainCallback2 b _0802A736 .align 2, 0 _0802A714: .4byte gUnknown_30031C4 @@ -87958,7 +87958,7 @@ _0802A728: .4byte gUnknown_2024190 _0802A72C: .4byte sub_0802A960 _0802A730: adds r0, r6, #0 - bl sub_08000540 + bl SetMainCallback2 _0802A736: pop {r4, r5, r6, r7} pop {r0} @@ -87971,7 +87971,7 @@ sub_0802A73C: @ 0x0802A73C bl sub_0802CDA0 ldr r0, _0802A750 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 @@ -87982,7 +87982,7 @@ _0802A750: .4byte gUnknown_20229B0 sub_0802A754: @ 0x0802A754 push {r4, lr} adds r4, r0, #0 - bl sub_08009B64 + bl GetLinkPlayerCount movs r2, #0 strb r0, [r4, #5] adds r1, r4, #0 @@ -88019,7 +88019,7 @@ sub_0802A788: @ 0x0802A788 strh r5, [r0] str r5, [r4, #0x1c] str r5, [r4, #0x5c] - bl sub_0800A02C + bl GetMultiplayerId movs r1, #0 lsls r0, r0, #0x18 cmp r0, #0 @@ -88223,15 +88223,15 @@ sub_0802A920: @ 0x0802A920 adds r4, r1, #0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [r5, #4] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r5, #8] pop {r4, r5} pop {r0} @@ -88243,8 +88243,8 @@ sub_0802A920: @ 0x0802A920 sub_0802A94C: @ 0x0802A94C push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests pop {r0} bx r0 .align 2, 0 @@ -88253,10 +88253,10 @@ sub_0802A94C: @ 0x0802A94C thumb_func_start sub_0802A960 sub_0802A960: @ 0x0802A960 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -88266,7 +88266,7 @@ sub_0802A960: @ 0x0802A960 sub_0802A978: @ 0x0802A978 push {lr} movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r2, _0802A990 ldr r1, [r2] movs r3, #0 @@ -88310,7 +88310,7 @@ _0802A9BC: @ jump table .4byte _0802AAC4 @ case 5 _0802A9D4: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes ldr r0, _0802A9F8 @@ -88326,7 +88326,7 @@ _0802A9F8: .4byte sub_0802BA78 _0802A9FC: .4byte gUnknown_20229B0 _0802AA00: ldr r0, _0802AA28 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0802AAFC @@ -88334,10 +88334,10 @@ _0802AA00: ldr r0, [r4] adds r0, #0xa4 bl sub_0802CD68 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite ldr r1, [r4] b _0802AAB4 .align 2, 0 @@ -88362,7 +88362,7 @@ _0802AA30: _0802AA54: .4byte 0x0000021A _0802AA58: .4byte gUnknown_20229B0 _0802AA5C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0802AAFC @@ -88371,16 +88371,16 @@ _0802AA5C: adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 adds r1, r4, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0802AA90 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0802AA94 ldr r1, [r0] b _0802AAB4 @@ -88388,7 +88388,7 @@ _0802AA5C: _0802AA90: .4byte sub_0802A94C _0802AA94: .4byte gUnknown_20229B0 _0802AA98: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0802AABC ldrb r1, [r0, #7] movs r0, #0x80 @@ -88434,7 +88434,7 @@ _0802AAEC: _0802AAF2: bl sub_0802BB74 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0802AAFC: add sp, #4 pop {r4} @@ -89616,7 +89616,7 @@ _0802B390: bne _0802B3A4 ldr r0, [r4] ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 bl sub_0802A73C _0802B3A4: movs r0, #1 @@ -89735,13 +89735,13 @@ _0802B474: beq _0802B4CC ldr r0, _0802B488 movs r1, #6 - bl sub_080A8878 + bl CreateTask b _0802B49C .align 2, 0 _0802B488: .4byte sub_081535C4 _0802B48C: ldr r0, _0802B4A8 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0802B4CC @@ -90193,14 +90193,14 @@ _0802B7F4: beq _0802B84C ldrh r0, [r1, #0x3e] ldrh r1, [r2] - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 beq _0802B84C ldr r0, [r4] ldrh r0, [r0, #0x3e] movs r1, #1 - bl sub_080D6018 + bl CheckBagHasSpace lsls r0, r0, #0x18 cmp r0, #0 bne _0802B844 @@ -90416,7 +90416,7 @@ _0802B9BC: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] b _0802B9F6 _0802B9E2: @@ -90537,7 +90537,7 @@ _0802BAAC: .4byte gUnknown_3005B68 _0802BAB0: bl sub_0802A814 mov r0, sl - bl sub_080A8964 + bl DestroyTask b _0802BB3C _0802BABC: movs r1, #0 @@ -90624,7 +90624,7 @@ sub_0802BB54: @ 0x0802BB54 push {lr} lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0802BB70 @@ -91956,7 +91956,7 @@ _0802C4CE: thumb_func_start sub_0802C4D4 sub_0802C4D4: @ 0x0802C4D4 push {r4, lr} - bl sub_0802C50C + bl SafariHandleStatusAnimation adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -91987,8 +91987,8 @@ sub_0802C4FC: @ 0x0802C4FC .align 2, 0 thumb_func_end sub_0802C4FC - thumb_func_start sub_0802C50C -sub_0802C50C: @ 0x0802C50C + thumb_func_start SafariHandleStatusAnimation +SafariHandleStatusAnimation: @ 0x0802C50C push {lr} bl Random lsls r0, r0, #0x10 @@ -92003,7 +92003,7 @@ sub_0802C50C: @ 0x0802C50C bx r1 .align 2, 0 _0802C528: .4byte gUnknown_82CEF90 - thumb_func_end sub_0802C50C + thumb_func_end SafariHandleStatusAnimation thumb_func_start sub_0802C52C sub_0802C52C: @ 0x0802C52C @@ -92062,7 +92062,7 @@ _0802C586: beq _0802C598 adds r0, r5, #0 adds r1, r4, #0 - bl sub_080D6018 + bl CheckBagHasSpace lsls r0, r0, #0x18 cmp r0, #0 beq _0802C580 @@ -92076,7 +92076,7 @@ _0802C598: thumb_func_start sub_0802C5A0 sub_0802C5A0: @ 0x0802C5A0 push {lr} - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -92158,12 +92158,12 @@ _0802C618: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0802C650 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0802C5FC @@ -92198,7 +92198,7 @@ sub_0802C668: @ 0x0802C668 ldr r5, _0802C6A8 _0802C670: adds r0, r5, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r5, #8 adds r4, #1 cmp r4, #4 @@ -92213,10 +92213,10 @@ _0802C682: cmp r4, #1 bls _0802C682 movs r0, #5 - bl sub_0800851C + bl IndexOfSpritePaletteTag strb r0, [r6, #0xe] movs r0, #6 - bl sub_0800851C + bl IndexOfSpritePaletteTag strb r0, [r6, #0xf] pop {r4, r5, r6} pop {r0} @@ -92314,22 +92314,22 @@ _0802C726: lsls r2, r2, #4 orrs r1, r2 str r1, [r0, #4] - bl sub_08008210 + bl LoadSpriteSheet ldrh r0, [r7] ldr r1, [r7, #4] ldr r2, [r7, #8] - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality str r0, [sp, #0x20] add r0, sp, #0x20 ldr r1, [r0, #4] ands r1, r5 orrs r1, r4 str r1, [r0, #4] - bl sub_080343E4 + bl LoadCompressedSpritePalette mov r0, r8 - bl sub_08000BF0 + bl Free mov r0, sl - bl sub_08000BF0 + bl Free mov r1, sp mov r0, sp ldrh r0, [r0] @@ -92347,7 +92347,7 @@ _0802C726: asrs r2, r2, #0x10 mov r0, sp ldr r3, [sp, #0x30] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -92864,7 +92864,7 @@ sub_0802CB3C: @ 0x0802CB3C lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -92915,7 +92915,7 @@ _0802CB9A: movs r3, #0 ldrsh r2, [r6, r3] movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r5, #2 @@ -92950,7 +92950,7 @@ _0802CBDC: movs r3, #0 ldrsh r2, [r2, r3] movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r5, #2 @@ -93148,7 +93148,7 @@ sub_0802CD68: @ 0x0802CD68 bl sub_0802CDB0 ldr r0, _0802CD98 movs r1, #3 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] strb r0, [r1, #6] ldr r2, [r4] @@ -93169,7 +93169,7 @@ _0802CD9C: .4byte sub_0802CE44 thumb_func_start sub_0802CDA0 sub_0802CDA0: @ 0x0802CDA0 push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers bl sub_08034B20 pop {r0} bx r0 @@ -93298,7 +93298,7 @@ _0802CE6C: movs r2, #4 bl InitBgsFromTemplates ldr r0, _0802CF60 - bl sub_08003090 + bl InitWindows bl reset_temp_tile_data_buffers ldr r0, [r6] bl sub_0802C668 @@ -93306,62 +93306,62 @@ _0802CE6C: ldr r0, _0802CF64 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0802CF68 str r5, [sp] movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _0802CF6C movs r4, #1 str r4, [sp] movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _0802CF70 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0802CF74 str r5, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _0802CF78 str r4, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _0802CF7C movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0802CF80 str r5, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _0802CF84 str r4, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _0802CF88 movs r1, #0x20 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, [r6] movs r0, #0xd3 lsls r0, r0, #1 adds r1, r1, r0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -93378,11 +93378,11 @@ _0802CE6C: movs r2, #0xe0 bl sub_080985F4 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram bl sub_08199A30 b _0802CFC0 .align 2, 0 @@ -93399,7 +93399,7 @@ _0802CF80: .4byte gUnknown_82D0A14 _0802CF84: .4byte gUnknown_82D14C4 _0802CF88: .4byte gUnknown_82CF8B0 _0802CF8C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _0802CFCE @@ -93410,13 +93410,13 @@ _0802CF8C: movs r1, #6 bl sub_0802CC44 movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B5C + bl HideBg _0802CFC0: ldr r1, [r6] ldrh r0, [r1, #4] @@ -93459,7 +93459,7 @@ _0802CFFE: bl sub_0802DB14 b _0802D024 _0802D004: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D03E @@ -93467,7 +93467,7 @@ _0802D004: bl sub_0802DC68 b _0802D024 _0802D016: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D03E @@ -93479,7 +93479,7 @@ _0802D024: strh r0, [r1, #4] b _0802D03E _0802D02E: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D03E @@ -93517,7 +93517,7 @@ _0802D06A: bl sub_0802DB14 b _0802D090 _0802D070: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D0AA @@ -93525,7 +93525,7 @@ _0802D070: bl sub_0802DC68 b _0802D090 _0802D082: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D0AA @@ -93537,7 +93537,7 @@ _0802D090: strh r0, [r1, #4] b _0802D0AA _0802D09A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D0AA @@ -93577,13 +93577,13 @@ _0802D0D6: adds r0, #0x1c adds r0, r0, r1 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap adds r4, #1 cmp r4, r5 blt _0802D0D6 _0802D0EC: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0802D100 ldr r1, [r0] ldrh r0, [r1, #4] @@ -93593,7 +93593,7 @@ _0802D0EC: .align 2, 0 _0802D100: .4byte gUnknown_20229B4 _0802D104: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D132 @@ -93607,7 +93607,7 @@ _0802D114: adds r0, #0x1c adds r0, r0, r1 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow adds r4, #1 cmp r4, r5 blt _0802D114 @@ -93666,29 +93666,29 @@ _0802D15E: ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0802D1C6 .align 2, 0 _0802D194: .4byte gUnknown_85CCE71 _0802D198: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D1E0 ldr r0, [r5] ldrb r0, [r0, #0x12] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0x17 movs r1, #7 movs r2, #0 bl sub_0802D808 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0802D1C6: ldr r1, [r5] ldrh r0, [r1, #4] @@ -93696,7 +93696,7 @@ _0802D1C6: strh r0, [r1, #4] b _0802D1E0 _0802D1D0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D1E0 @@ -93752,25 +93752,25 @@ _0802D20A: ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0802D268 .align 2, 0 _0802D240: .4byte gUnknown_8277071 _0802D244: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D282 ldr r0, [r5] ldrb r0, [r0, #0x12] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0802D268: ldr r1, [r5] ldrh r0, [r1, #4] @@ -93778,7 +93778,7 @@ _0802D268: strh r0, [r1, #4] b _0802D282 _0802D272: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D282 @@ -93808,9 +93808,9 @@ sub_0802D28C: @ 0x0802D28C _0802D2A0: .4byte gUnknown_20229B4 _0802D2A4: bl sub_0802D704 - bl sub_08198D88 + bl MovementType_WalkSequenceUpLeftDownRight_callback movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, [r5] ldrh r0, [r1, #4] adds r0, #1 @@ -93820,7 +93820,7 @@ _0802D2BC: bl sub_0802D734 cmp r0, #0 bne _0802D2D2 - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D2D2 @@ -93874,25 +93874,25 @@ _0802D2FA: ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0802D358 .align 2, 0 _0802D330: .4byte gUnknown_85CCE7F _0802D334: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D372 ldr r0, [r5] ldrb r0, [r0, #0x12] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0802D358: ldr r1, [r5] ldrh r0, [r1, #4] @@ -93900,7 +93900,7 @@ _0802D358: strh r0, [r1, #4] b _0802D372 _0802D362: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D372 @@ -93957,25 +93957,25 @@ _0802D39E: ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0802D3FC .align 2, 0 _0802D3D4: .4byte gUnknown_85CCE99 _0802D3D8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D416 ldr r0, [r5] ldrb r0, [r0, #0x12] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0802D3FC: ldr r1, [r5] ldrh r0, [r1, #4] @@ -93983,7 +93983,7 @@ _0802D3FC: strh r0, [r1, #4] b _0802D416 _0802D406: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D416 @@ -94138,7 +94138,7 @@ sub_0802D4DC: @ 0x0802D4DC ldr r0, [r5] adds r0, #0xa6 ldr r1, _0802D56C - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, #4 movs r1, #8 movs r2, #0x16 @@ -94161,7 +94161,7 @@ sub_0802D4DC: @ 0x0802D4DC ldr r0, [r5] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r5] ldr r0, _0802D570 strh r0, [r1, #0x14] @@ -94194,7 +94194,7 @@ sub_0802D574: @ 0x0802D574 ldr r0, [r4] adds r0, #0xa6 ldr r1, _0802D5E8 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, #4 movs r1, #8 movs r2, #0x16 @@ -94218,7 +94218,7 @@ sub_0802D574: @ 0x0802D574 ldr r0, [r4] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] strh r5, [r0, #0x14] strb r6, [r0, #0xd] @@ -94249,7 +94249,7 @@ sub_0802D5EC: @ 0x0802D5EC ldr r0, [r4] adds r0, #0xa6 ldr r1, _0802D660 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, #4 movs r1, #9 movs r2, #0x16 @@ -94273,7 +94273,7 @@ sub_0802D5EC: @ 0x0802D5EC ldr r0, [r4] ldrb r0, [r0, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] strh r5, [r0, #0x14] strb r6, [r0, #0xd] @@ -94308,27 +94308,27 @@ _0802D680: beq _0802D6F2 b _0802D6FC _0802D68A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D6FC ldr r0, [r4] ldrb r0, [r0, #0x12] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r4] ldrb r0, [r0, #0x12] movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, [r4] ldrb r0, [r1, #0xd] adds r0, #1 strb r0, [r1, #0xd] b _0802D6FC _0802D6B8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D6FC @@ -94341,13 +94341,13 @@ _0802D6B8: b _0802D6F0 _0802D6D0: ldrh r0, [r1, #0x14] - bl sub_080A29AC + bl PlayFanfare ldr r1, [r4] ldrb r0, [r1, #0xd] adds r0, #1 strb r0, [r1, #0xd] _0802D6DE: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _0802D6FC @@ -94380,11 +94380,11 @@ sub_0802D704: @ 0x0802D704 beq _0802D728 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08098504 + bl rbox_fill_rectangle ldr r0, [r4] ldrb r0, [r0, #0x12] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldr r1, [r4] movs r0, #0 strb r0, [r1, #0xd] @@ -94413,13 +94413,13 @@ _0802D748: ldrb r0, [r1, #0xd] cmp r0, #0 bne _0802D76E - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802D772 ldr r0, [r4] ldrb r0, [r0, #0x12] - bl sub_08003444 + bl RemoveWindow ldr r1, [r4] movs r0, #0xff strh r0, [r1, #0x12] @@ -94488,14 +94488,14 @@ sub_0802D78C: @ 0x0802D78C orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 lsls r0, r4, #0x18 lsrs r0, r0, #0x18 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 add sp, #8 pop {r4, r5, r6} @@ -94579,15 +94579,15 @@ sub_0802D884: @ 0x0802D884 movs r2, #3 bl memcpy movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer add r0, sp, #0xc str r0, [sp] movs r4, #0 @@ -94598,7 +94598,7 @@ sub_0802D884: @ 0x0802D884 movs r1, #0 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add r0, sp, #0xc str r0, [sp] str r4, [sp, #4] @@ -94608,7 +94608,7 @@ sub_0802D884: @ 0x0802D884 movs r1, #0 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0x10 pop {r4} pop {r0} @@ -94718,7 +94718,7 @@ sub_0802D994: @ 0x0802D994 lsls r1, r1, #0xd movs r0, #2 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r4} pop {r0} bx r0 @@ -94977,7 +94977,7 @@ _0802DB62: orrs r0, r2 str r0, [sp] mov r0, sp - bl sub_08003250 + bl AddWindow ldr r1, _0802DBCC ldr r1, [r1] lsls r2, r5, #1 @@ -94986,7 +94986,7 @@ _0802DB62: strh r0, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003774 + bl ClearWindowTilemap ldrh r0, [r6, #6] adds r0, #0x10 strh r0, [r6, #6] @@ -94996,7 +94996,7 @@ _0802DB62: blt _0802DB62 _0802DBA4: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r4, r5, r6, r7} pop {r0} @@ -95035,7 +95035,7 @@ sub_0802DBD0: @ 0x0802DBD0 add r0, r8 ldrb r0, [r0] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer lsls r5, r5, #0x18 lsrs r5, r5, #0x18 adds r0, r5, #0 @@ -95066,13 +95066,13 @@ sub_0802DBD0: @ 0x0802DBD0 movs r1, #0 adds r2, r4, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, [r6] adds r0, #0x1c add r0, r8 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -95155,13 +95155,13 @@ _0802DCDC: adds r0, #0x1c adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap adds r4, #1 cmp r4, r5 blt _0802DCDC _0802DCF2: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5} pop {r0} bx r0 @@ -95183,7 +95183,7 @@ sub_0802DD04: @ 0x0802DD04 lsls r1, r1, #0x10 movs r0, #1 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 ands r4, r0 lsls r4, r4, #8 @@ -95191,12 +95191,12 @@ sub_0802DD04: @ 0x0802DD04 lsls r4, r4, #8 adds r1, r4, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 - bl sub_08001B48 + bl ShowBg ldr r0, _0802DD4C movs r1, #4 - bl sub_080A8878 + bl CreateTask pop {r4} pop {r0} bx r0 @@ -95221,7 +95221,7 @@ _0802DD64: movs r0, #1 movs r1, #0x80 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY ldr r1, [r4] ldr r0, [r1, #0x18] adds r0, #1 @@ -95229,7 +95229,7 @@ _0802DD64: cmp r0, #0x1f bls _0802DD80 movs r0, #1 - bl sub_08001B5C + bl HideBg _0802DD80: movs r0, #1 _0802DD82: @@ -95247,7 +95247,7 @@ sub_0802DD88: @ 0x0802DD88 cmp r0, #0 bne _0802DD9C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0802DD9C: pop {r4} pop {r0} @@ -95705,7 +95705,7 @@ sub_0802E0BC: @ 0x0802E0BC ldr r4, _0802E0D8 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -95745,7 +95745,7 @@ _0802E104: b _0802E176 _0802E10E: ldr r0, _0802E124 - bl sub_08003250 + bl AddWindow strh r0, [r4, #2] ldrh r0, [r4, #2] bl sub_0802E17C @@ -95755,7 +95755,7 @@ _0802E10E: .align 2, 0 _0802E124: .4byte gUnknown_82D1AFC _0802E128: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802E176 @@ -95768,11 +95768,11 @@ _0802E134: cmp r0, #0 beq _0802E176 ldrb r0, [r4, #2] - bl sub_08098504 + bl rbox_fill_rectangle ldrb r0, [r4, #2] movs r1, #1 _0802E14A: - bl sub_08003528 + bl CopyWindowToVram _0802E14E: ldrh r0, [r4] adds r0, #1 @@ -95781,15 +95781,15 @@ _0802E14E: .align 2, 0 _0802E158: .4byte gUnknown_3002360 _0802E15C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0802E176 ldrb r0, [r4, #2] - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _0802E176: pop {r4, r5} pop {r0} @@ -95825,10 +95825,10 @@ sub_0802E17C: @ 0x0802E17C adds r0, r4, #0 adds r1, r5, #0 movs r2, #0xd - bl sub_080981E0 + bl DrawTextBorderOuter adds r0, r4, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0802E278 movs r0, #2 str r0, [sp] @@ -95903,7 +95903,7 @@ _0802E1F2: cmp r6, #2 bls _0802E1F2 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap add sp, #0x20 pop {r3, r4, r5} mov r8, r3 @@ -95949,7 +95949,7 @@ sub_0802E2A0: @ 0x0802E2A0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, _0802E2E0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -95981,7 +95981,7 @@ _0802E2E8: .4byte gUnknown_82D1FD4 sub_0802E2EC: @ 0x0802E2EC push {lr} ldr r0, _0802E310 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -96010,7 +96010,7 @@ _0802E31A: sub_0802E320: @ 0x0802E320 push {lr} ldr r0, _0802E330 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -96083,7 +96083,7 @@ _0802E39C: adds r0, r5, #0 bl _call_via_r1 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0802E3B6: pop {r4, r5} pop {r0} @@ -96106,7 +96106,7 @@ sub_0802E3C0: @ 0x0802E3C0 lsls r0, r0, #3 ldr r1, _0802E490 adds r0, r0, r1 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r2, #8 ldrsh r0, [r4, r2] lsls r0, r0, #3 @@ -96131,7 +96131,7 @@ _0802E3F4: movs r3, #0x14 ldrsh r2, [r4, r3] ldrb r3, [r4, #0xe] - bl sub_08006B0C + bl CreateSprite lsls r1, r5, #1 adds r1, r1, r4 lsls r0, r0, #0x18 @@ -96539,7 +96539,7 @@ sub_0802E714: @ 0x0802E714 ldrh r0, [r1, #4] strh r0, [r4, #0x16] _0802E73C: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0802E77E @@ -96599,7 +96599,7 @@ sub_0802E788: @ 0x0802E788 ldr r0, _0802E7E0 movs r1, #0x50 str r3, [sp] - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0802E7E4 @@ -96629,7 +96629,7 @@ _0802E7E4: .4byte gUnknown_3005B60 sub_0802E7E8: @ 0x0802E7E8 push {lr} ldr r0, _0802E7F8 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -96751,7 +96751,7 @@ _0802E8B0: ldrh r0, [r5, #6] bl FreeSpritePaletteByTag adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0802E8EE: add sp, #0xc pop {r4, r5, r6} @@ -97156,7 +97156,7 @@ sub_0802EBB4: @ 0x0802EBB4 orrs r0, r1 str r0, [r4, #4] mov r0, sp - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r0, r4, #0 bl LoadSpritePalette add sp, #0x10 @@ -97202,7 +97202,7 @@ sub_0802EC0C: @ 0x0802EC0C adds r1, r2, #0 adds r2, r6, #0 mov r3, r8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #0x18 @@ -97256,7 +97256,7 @@ sub_0802EC60: @ 0x0802EC60 adds r1, r2, #0 adds r2, r5, #0 mov r3, sl - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r3, sb @@ -97268,7 +97268,7 @@ sub_0802EC60: @ 0x0802EC60 adds r1, r4, #0 adds r2, r5, #0 mov r3, sl - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r4, r8 @@ -97318,8 +97318,8 @@ _0802ED28: .4byte 0xFFE00000 _0802ED2C: .4byte gUnknown_20205AC thumb_func_end sub_0802EC60 - thumb_func_start sub_0802ED30 -sub_0802ED30: @ 0x0802ED30 + thumb_func_start RtcDisableInterrupts +RtcDisableInterrupts: @ 0x0802ED30 ldr r2, _0802ED40 ldr r1, _0802ED44 ldrh r0, [r1] @@ -97330,10 +97330,10 @@ sub_0802ED30: @ 0x0802ED30 .align 2, 0 _0802ED40: .4byte gUnknown_3000DCE _0802ED44: .4byte 0x04000208 - thumb_func_end sub_0802ED30 + thumb_func_end RtcDisableInterrupts - thumb_func_start sub_0802ED48 -sub_0802ED48: @ 0x0802ED48 + thumb_func_start RtcRestoreInterrupts +RtcRestoreInterrupts: @ 0x0802ED48 ldr r0, _0802ED54 ldr r1, _0802ED58 ldrh r1, [r1] @@ -97342,7 +97342,7 @@ sub_0802ED48: @ 0x0802ED48 .align 2, 0 _0802ED54: .4byte 0x04000208 _0802ED58: .4byte gUnknown_3000DCE - thumb_func_end sub_0802ED48 + thumb_func_end RtcRestoreInterrupts thumb_func_start ConvertBcdToBinary ConvertBcdToBinary: @ 0x0802ED5C @@ -97371,8 +97371,8 @@ _0802ED80: bx r1 thumb_func_end ConvertBcdToBinary - thumb_func_start sub_0802ED84 -sub_0802ED84: @ 0x0802ED84 + thumb_func_start IsLeapYear +IsLeapYear: @ 0x0802ED84 push {r4, lr} adds r4, r0, #0 movs r0, #3 @@ -97401,7 +97401,7 @@ _0802EDB0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0802ED84 + thumb_func_end IsLeapYear thumb_func_start ConvertDateToDayCount ConvertDateToDayCount: @ 0x0802EDB8 @@ -97425,7 +97425,7 @@ _0802EDD4: lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 - bl sub_0802ED84 + bl IsLeapYear lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -97455,7 +97455,7 @@ _0802EE0E: cmp r6, #2 bls _0802EE26 adds r0, r7, #0 - bl sub_0802ED84 + bl IsLeapYear lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -97509,18 +97509,18 @@ RtcGetDayCount: @ 0x0802EE44 .align 2, 0 thumb_func_end RtcGetDayCount - thumb_func_start sub_0802EE80 -sub_0802EE80: @ 0x0802EE80 + thumb_func_start RtcInit +RtcInit: @ 0x0802EE80 push {r4, r5, lr} ldr r5, _0802EEAC movs r0, #0 strh r0, [r5] - bl sub_0802ED30 + bl RtcDisableInterrupts bl SiiRtcUnprotect bl SiiRtcProbe ldr r4, _0802EEB0 strb r0, [r4] - bl sub_0802ED48 + bl RtcRestoreInterrupts ldrb r4, [r4] movs r0, #0xf ands r0, r4 @@ -97544,7 +97544,7 @@ _0802EEBE: adds r0, r4, #0 bl RtcGetRawInfo adds r0, r4, #0 - bl sub_0802EF60 + bl RtcCheckInfo ldr r1, _0802EEDC strh r0, [r1] _0802EED2: @@ -97554,7 +97554,7 @@ _0802EED2: .align 2, 0 _0802EED8: .4byte gUnknown_3000DC0 _0802EEDC: .4byte gUnknown_3000DB8 - thumb_func_end sub_0802EE80 + thumb_func_end RtcInit thumb_func_start sub_0802EEE0 sub_0802EEE0: @ 0x0802EEE0 @@ -97565,8 +97565,8 @@ sub_0802EEE0: @ 0x0802EEE0 _0802EEE8: .4byte gUnknown_3000DB8 thumb_func_end sub_0802EEE0 - thumb_func_start sub_0802EEEC -sub_0802EEEC: @ 0x0802EEEC + thumb_func_start RtcGetInfo +RtcGetInfo: @ 0x0802EEEC push {r4, lr} adds r2, r0, #0 ldr r0, _0802EF08 @@ -97591,48 +97591,48 @@ _0802EF16: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0802EEEC + thumb_func_end RtcGetInfo - thumb_func_start sub_0802EF1C -sub_0802EF1C: @ 0x0802EF1C + thumb_func_start RtcGetDateTime +RtcGetDateTime: @ 0x0802EF1C push {r4, lr} adds r4, r0, #0 - bl sub_0802ED30 + bl RtcDisableInterrupts adds r0, r4, #0 bl SiiRtcGetDateTime - bl sub_0802ED48 + bl RtcRestoreInterrupts pop {r4} pop {r0} bx r0 - thumb_func_end sub_0802EF1C + thumb_func_end RtcGetDateTime - thumb_func_start sub_0802EF34 -sub_0802EF34: @ 0x0802EF34 + thumb_func_start RtcGetStatus +RtcGetStatus: @ 0x0802EF34 push {r4, lr} adds r4, r0, #0 - bl sub_0802ED30 + bl RtcDisableInterrupts adds r0, r4, #0 bl SiiRtcGetStatus - bl sub_0802ED48 + bl RtcRestoreInterrupts pop {r4} pop {r0} bx r0 - thumb_func_end sub_0802EF34 + thumb_func_end RtcGetStatus thumb_func_start RtcGetRawInfo RtcGetRawInfo: @ 0x0802EF4C push {r4, lr} adds r4, r0, #0 - bl sub_0802EF34 + bl RtcGetStatus adds r0, r4, #0 - bl sub_0802EF1C + bl RtcGetDateTime pop {r4} pop {r0} bx r0 thumb_func_end RtcGetRawInfo - thumb_func_start sub_0802EF60 -sub_0802EF60: @ 0x0802EF60 + thumb_func_start RtcCheckInfo +RtcCheckInfo: @ 0x0802EF60 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -97693,7 +97693,7 @@ _0802EFCE: cmp r6, #2 bne _0802EFE8 mov r0, r8 - bl sub_0802ED84 + bl IsLeapYear lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0802EFE4 @@ -97762,18 +97762,18 @@ _0802F04A: bx r1 .align 2, 0 _0802F058: .4byte gUnknown_82D2558 - thumb_func_end sub_0802EF60 + thumb_func_end RtcCheckInfo - thumb_func_start sub_0802F05C -sub_0802F05C: @ 0x0802F05C + thumb_func_start RtcReset +RtcReset: @ 0x0802F05C push {lr} - bl sub_0802ED30 + bl RtcDisableInterrupts bl SiiRtcReset - bl sub_0802ED48 + bl RtcRestoreInterrupts pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0802F05C + thumb_func_end RtcReset thumb_func_start sub_0802F070 sub_0802F070: @ 0x0802F070 @@ -97833,8 +97833,8 @@ sub_0802F0A8: @ 0x0802F0A8 .align 2, 0 thumb_func_end sub_0802F0A8 - thumb_func_start sub_0802F0E0 -sub_0802F0E0: @ 0x0802F0E0 + thumb_func_start FormatHexRtcTime +FormatHexRtcTime: @ 0x0802F0E0 push {lr} ldr r3, _0802F0F4 ldrb r1, [r3, #4] @@ -97845,7 +97845,7 @@ sub_0802F0E0: @ 0x0802F0E0 bx r0 .align 2, 0 _0802F0F4: .4byte gUnknown_3000DC0 - thumb_func_end sub_0802F0E0 + thumb_func_end FormatHexRtcTime thumb_func_start sub_0802F0F8 sub_0802F0F8: @ 0x0802F0F8 @@ -97979,7 +97979,7 @@ RtcCalcLocalTime: @ 0x0802F1EC push {r4, lr} ldr r4, _0802F20C adds r0, r4, #0 - bl sub_0802EEEC + bl RtcGetInfo ldr r1, _0802F210 ldr r0, _0802F214 ldr r2, [r0] @@ -98018,7 +98018,7 @@ RtcCalcLocalTimeOffset: @ 0x0802F22C strb r3, [r4, #4] ldr r5, _0802F258 adds r0, r5, #0 - bl sub_0802EEEC + bl RtcGetInfo ldr r0, _0802F25C ldr r1, [r0] adds r1, #0x98 @@ -98098,7 +98098,7 @@ RtcGetMinuteCount: @ 0x0802F2C8 push {r4, lr} ldr r4, _0802F2FC adds r0, r4, #0 - bl sub_0802EEEC + bl RtcGetInfo adds r0, r4, #0 bl RtcGetDayCount lsls r0, r0, #0x10 @@ -98122,8 +98122,8 @@ RtcGetMinuteCount: @ 0x0802F2C8 _0802F2FC: .4byte gUnknown_3000DC0 thumb_func_end RtcGetMinuteCount - thumb_func_start sub_0802F300 -sub_0802F300: @ 0x0802F300 + thumb_func_start RtcGetLocalDayCount +RtcGetLocalDayCount: @ 0x0802F300 push {lr} ldr r0, _0802F310 bl RtcGetDayCount @@ -98133,25 +98133,25 @@ sub_0802F300: @ 0x0802F300 bx r1 .align 2, 0 _0802F310: .4byte gUnknown_3000DC0 - thumb_func_end sub_0802F300 + thumb_func_end RtcGetLocalDayCount - thumb_func_start sub_0802F314 -sub_0802F314: @ 0x0802F314 + thumb_func_start CB2_MainMenu +CB2_MainMenu: @ 0x0802F314 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0802F314 + thumb_func_end CB2_MainMenu thumb_func_start sub_0802F32C sub_0802F32C: @ 0x0802F32C push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -98162,29 +98162,29 @@ sub_0802F32C: @ 0x0802F32C sub_0802F340: @ 0x0802F340 push {lr} movs r0, #0 - bl sub_0802F358 + bl InitMainMenu pop {r0} bx r0 thumb_func_end sub_0802F340 - thumb_func_start sub_0802F34C -sub_0802F34C: @ 0x0802F34C + thumb_func_start CB2_ReinitMainMenu +CB2_ReinitMainMenu: @ 0x0802F34C push {lr} movs r0, #1 - bl sub_0802F358 + bl InitMainMenu pop {r0} bx r0 - thumb_func_end sub_0802F34C + thumb_func_end CB2_ReinitMainMenu - thumb_func_start sub_0802F358 -sub_0802F358: @ 0x0802F358 + thumb_func_start InitMainMenu +InitMainMenu: @ 0x0802F358 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -98249,13 +98249,13 @@ sub_0802F358: @ 0x0802F358 ldr r0, _0802F448 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0802F44C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 - bl sub_080B9710 - bl sub_080A8818 + bl LoadPalette + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes cmp r4, #0 @@ -98266,7 +98266,7 @@ sub_0802F358: @ 0x0802F358 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _0802F462 .align 2, 0 _0802F434: .4byte 0x040000D4 @@ -98284,7 +98284,7 @@ _0802F450: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _0802F462: movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -98295,25 +98295,25 @@ _0802F462: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, _0802F528 - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r1, _0802F52C movs r0, #0 - bl sub_08031D9C + bl LoadMainMenuWindowFrameTiles movs r0, #0x40 movs r1, #0 bl SetGpuReg @@ -98338,20 +98338,20 @@ _0802F462: movs r0, #1 bl EnableInterrupts ldr r0, _0802F530 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0802F534 - bl sub_08000540 + bl SetMainCallback2 movs r1, #0xc1 lsls r1, r1, #6 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B5C + bl HideBg ldr r0, _0802F538 movs r1, #0 - bl sub_080A8878 + bl CreateTask movs r0, #0 add sp, #0xc pop {r4, r5} @@ -98363,12 +98363,12 @@ _0802F524: .4byte gUnknown_82D2978 _0802F528: .4byte gUnknown_82D28C8 _0802F52C: .4byte 0x000001D5 _0802F530: .4byte sub_0802F32C -_0802F534: .4byte sub_0802F314 -_0802F538: .4byte sub_0802F53C - thumb_func_end sub_0802F358 +_0802F534: .4byte CB2_MainMenu +_0802F538: .4byte BuyMenuBuildListMenuTemplate + thumb_func_end InitMainMenu - thumb_func_start sub_0802F53C -sub_0802F53C: @ 0x0802F53C + thumb_func_start BuyMenuBuildListMenuTemplate +BuyMenuBuildListMenuTemplate: @ 0x0802F53C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -98411,7 +98411,7 @@ _0802F564: movs r0, #0x54 movs r1, #7 bl SetGpuReg - bl sub_08008F68 + bl LoadHeldItemIcons lsls r0, r0, #0x18 cmp r0, #0 beq _0802F5AA @@ -98445,14 +98445,14 @@ _0802F5D6: ldrsh r0, [r4, r1] cmp r0, #0 bne _0802F5EE - bl sub_0809CD68 + bl IsMysteryEventEnabled cmp r0, #0 beq _0802F5EE ldrh r0, [r4] adds r0, #1 strh r0, [r4] _0802F5EE: - bl sub_0809CD9C + bl IsMysteryGiftEnabled cmp r0, #0 beq _0802F5FC ldrh r0, [r4] @@ -98469,7 +98469,7 @@ _0802F5FC: b _0802F69A .align 2, 0 _0802F60C: .4byte gUnknown_3005B60 -_0802F610: .4byte sub_0802F76C +_0802F610: .4byte Task_MainMenuCheckBattery _0802F614: ldr r0, _0802F624 bl sub_08031B84 @@ -98494,14 +98494,14 @@ _0802F628: ldrsh r0, [r4, r1] cmp r0, #0 bne _0802F652 - bl sub_0809CD68 + bl IsMysteryEventEnabled cmp r0, #1 bne _0802F652 ldrh r0, [r4] adds r0, #1 strh r0, [r4] _0802F652: - bl sub_0809CD9C + bl IsMysteryGiftEnabled cmp r0, #1 bne _0802F69A ldrh r0, [r4] @@ -98523,7 +98523,7 @@ _0802F66C: b _0802F698 .align 2, 0 _0802F680: .4byte gUnknown_3005B60 -_0802F684: .4byte sub_0802F76C +_0802F684: .4byte Task_MainMenuCheckBattery _0802F688: ldr r0, _0802F6BC bl sub_08031B84 @@ -98563,14 +98563,14 @@ _0802F6C8: adds r0, #1 b _0802F6F0 _0802F6D2: - bl sub_0809CD68 + bl IsMysteryEventEnabled cmp r0, #0 bne _0802F6EA movs r1, #0x1e ldrsh r0, [r4, r1] cmp r0, #0 beq _0802F6F2 - bl sub_0809CD9C + bl IsMysteryGiftEnabled cmp r0, #0 beq _0802F6F2 _0802F6EA: @@ -98599,7 +98599,7 @@ _0802F704: .align 2, 0 _0802F710: .4byte gUnknown_20229BA _0802F714: .4byte 0x00007FFF - thumb_func_end sub_0802F53C + thumb_func_end BuyMenuBuildListMenuTemplate thumb_func_start sub_0802F718 sub_0802F718: @ 0x0802F718 @@ -98619,9 +98619,9 @@ sub_0802F718: @ 0x0802F718 cmp r0, #0 beq _0802F754 movs r0, #7 - bl sub_08003774 + bl ClearWindowTilemap ldr r0, _0802F760 - bl sub_08031F48 + bl ClearMainMenuWindowTilemap ldr r1, _0802F764 lsls r0, r4, #2 adds r0, r0, r4 @@ -98637,11 +98637,11 @@ _0802F754: _0802F75C: .4byte gUnknown_3002360 _0802F760: .4byte gUnknown_82D2900 _0802F764: .4byte gUnknown_3005B60 -_0802F768: .4byte sub_0802F76C +_0802F768: .4byte Task_MainMenuCheckBattery thumb_func_end sub_0802F718 - thumb_func_start sub_0802F76C -sub_0802F76C: @ 0x0802F76C + thumb_func_start Task_MainMenuCheckBattery +Task_MainMenuCheckBattery: @ 0x0802F76C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -98709,7 +98709,7 @@ _0802F7F8: _0802F800: .4byte gUnknown_85C8D93 _0802F804: .4byte gUnknown_3005B60 _0802F808: .4byte sub_0802F80C - thumb_func_end sub_0802F76C + thumb_func_end Task_MainMenuCheckBattery thumb_func_start sub_0802F80C sub_0802F80C: @ 0x0802F80C @@ -98729,9 +98729,9 @@ sub_0802F80C: @ 0x0802F80C cmp r0, #0 beq _0802F848 movs r0, #7 - bl sub_08003774 + bl ClearWindowTilemap ldr r0, _0802F854 - bl sub_08031F48 + bl ClearMainMenuWindowTilemap ldr r1, _0802F858 lsls r0, r4, #2 adds r0, r0, r4 @@ -98800,7 +98800,7 @@ _0802F88C: strh r4, [r0] movs r1, #0xfe movs r2, #2 - bl sub_080A1200 + bl LoadPalette add r1, sp, #0xc ldr r2, _0802F92C adds r0, r2, #0 @@ -98808,7 +98808,7 @@ _0802F88C: adds r0, r1, #0 movs r1, #0xfa movs r2, #2 - bl sub_080A1200 + bl LoadPalette add r1, sp, #0xc ldr r2, _0802F930 adds r0, r2, #0 @@ -98816,7 +98816,7 @@ _0802F88C: adds r0, r1, #0 movs r1, #0xfb movs r2, #2 - bl sub_080A1200 + bl LoadPalette add r1, sp, #0xc ldr r2, _0802F934 adds r0, r2, #0 @@ -98824,7 +98824,7 @@ _0802F88C: adds r0, r1, #0 movs r1, #0xfc movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r0, _0802F938 ldr r0, [r0] ldrb r0, [r0, #8] @@ -98837,7 +98837,7 @@ _0802F88C: adds r0, r1, #0 movs r1, #0xf1 movs r2, #2 - bl sub_080A1200 + bl LoadPalette b _0802F952 .align 2, 0 _0802F924: .4byte gUnknown_3005B68 @@ -98855,7 +98855,7 @@ _0802F940: adds r0, r1, #0 movs r1, #0xf1 movs r2, #2 - bl sub_080A1200 + bl LoadPalette _0802F952: ldr r7, _0802F9E8 mov r0, r8 @@ -98880,10 +98880,10 @@ _0802F972: _0802F978: movs r0, #0 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0802F9EC str r5, [sp] movs r4, #1 @@ -98895,7 +98895,7 @@ _0802F978: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802F9F4 @@ -98904,22 +98904,22 @@ _0802F978: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r4, _0802F9F8 ldr r5, _0802F9FC adds r0, r4, #0 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r4, #8 b _0802FBDC .align 2, 0 @@ -98933,13 +98933,13 @@ _0802F9FC: .4byte 0x000001D5 _0802FA00: movs r0, #2 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #3 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #4 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0802FAA4 str r5, [sp] movs r4, #1 @@ -98951,7 +98951,7 @@ _0802FA00: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802FAAC @@ -98960,7 +98960,7 @@ _0802FA00: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802FAB0 @@ -98969,32 +98969,32 @@ _0802FA00: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 bl sub_08031BE8 movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #4 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r4, _0802FAB4 ldr r5, _0802FAB8 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r4, #0 adds r0, #8 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r4, #0x10 b _0802FBDC .align 2, 0 @@ -99007,16 +99007,16 @@ _0802FAB8: .4byte 0x000001D5 _0802FABC: movs r0, #2 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #3 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #4 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _0802FB1C str r4, [sp] movs r5, #1 @@ -99028,7 +99028,7 @@ _0802FABC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r4, [sp] str r5, [sp, #4] ldr r0, _0802FB24 @@ -99037,7 +99037,7 @@ _0802FABC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r1, #0x1e ldrsh r0, [r6, r1] cmp r0, #0 @@ -99052,7 +99052,7 @@ _0802FB20: .4byte gUnknown_85C8C7C _0802FB24: .4byte gUnknown_85C8C70 _0802FB28: .4byte gUnknown_85C8C91 _0802FB2C: - bl sub_0809CD68 + bl IsMysteryEventEnabled cmp r0, #0 beq _0802FB50 str r4, [sp] @@ -99064,7 +99064,7 @@ _0802FB3A: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0802FB64 .align 2, 0 _0802FB4C: .4byte gUnknown_85C8CA7 @@ -99077,7 +99077,7 @@ _0802FB50: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0802FB64: ldr r0, _0802FBEC str r0, [sp] @@ -99090,46 +99090,46 @@ _0802FB64: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 bl sub_08031BE8 movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #4 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r4, _0802FBF4 ldr r5, _0802FBF8 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r4, #0 adds r0, #8 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r4, #0 adds r0, #0x10 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r4, #0x18 _0802FBDC: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder b _0802FD5E .align 2, 0 _0802FBE8: .4byte gUnknown_85C8C9C @@ -99140,19 +99140,19 @@ _0802FBF8: .4byte 0x000001D5 _0802FBFC: movs r0, #2 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #3 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #4 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #6 movs r1, #0xaa - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0802FD7C str r5, [sp] movs r4, #1 @@ -99164,7 +99164,7 @@ _0802FBFC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802FD84 @@ -99173,7 +99173,7 @@ _0802FBFC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802FD88 @@ -99182,7 +99182,7 @@ _0802FBFC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802FD8C @@ -99191,7 +99191,7 @@ _0802FBFC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0802FD90 @@ -99200,58 +99200,58 @@ _0802FBFC: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 bl sub_08031BE8 movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap movs r0, #6 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #4 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #6 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r5, _0802FD94 ldr r4, _0802FD98 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r5, #0 adds r0, #8 adds r1, r4, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r5, #0 adds r0, #0x10 adds r1, r4, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r5, #0 adds r0, #0x18 adds r1, r4, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder adds r0, r5, #0 adds r0, #0x20 adds r1, r4, #0 - bl sub_08031DE4 + bl DrawMainMenuWindowBorder ldr r0, _0802FD9C ldr r4, _0802FDA0 adds r1, r4, #0 - bl sub_081AF058 + bl AddScrollIndicatorArrowPair lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x1a] @@ -99271,11 +99271,11 @@ _0802FBFC: movs r0, #0 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 strh r0, [r6, #0x1c] movs r0, #0x1a @@ -99313,13 +99313,13 @@ _0802FD94: .4byte gUnknown_82D28D8 _0802FD98: .4byte 0x000001D5 _0802FD9C: .4byte gUnknown_82D2984 _0802FDA0: .4byte gUnknown_20229BA -_0802FDA4: .4byte sub_081AF274 +_0802FDA4: .4byte Task_ScrollIndicatorArrowPairOnMainMenu _0802FDA8: .4byte gUnknown_3005B60 -_0802FDAC: .4byte sub_0802FDB0 +_0802FDAC: .4byte Task_HighlightSelectedMainMenuItem thumb_func_end sub_0802F860 - thumb_func_start sub_0802FDB0 -sub_0802FDB0: @ 0x0802FDB0 + thumb_func_start Task_HighlightSelectedMainMenuItem +Task_HighlightSelectedMainMenuItem: @ 0x0802FDB0 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -99332,7 +99332,7 @@ sub_0802FDB0: @ 0x0802FDB0 ldrb r1, [r4, #0xa] movs r3, #0x24 ldrsh r2, [r4, r3] - bl sub_080303D8 + bl HighlightSelectedMainMenuItem ldr r0, _0802FDDC str r0, [r4] pop {r4} @@ -99341,10 +99341,10 @@ sub_0802FDB0: @ 0x0802FDB0 .align 2, 0 _0802FDD8: .4byte gUnknown_3005B60 _0802FDDC: .4byte Task_HandleMainMenuInput - thumb_func_end sub_0802FDB0 + thumb_func_end Task_HighlightSelectedMainMenuItem - thumb_func_start sub_0802FDE0 -sub_0802FDE0: @ 0x0802FDE0 + thumb_func_start HandleMainMenuInput +HandleMainMenuInput: @ 0x0802FDE0 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -99362,14 +99362,14 @@ sub_0802FDE0: @ 0x0802FDE0 beq _0802FE30 movs r0, #5 bl sub_080A306C - bl sub_08008F68 + bl LoadHeldItemIcons movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade adds r0, r7, #0 subs r0, #8 adds r0, r4, r0 @@ -99396,7 +99396,7 @@ _0802FE30: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0x40 movs r1, #0xf0 bl SetGpuReg @@ -99411,7 +99411,7 @@ _0802FE30: b _0802FF40 .align 2, 0 _0802FE70: .4byte 0x0000FFFF -_0802FE74: .4byte sub_08030284 +_0802FE74: .4byte Task_HandleMainMenuBPressed _0802FE78: movs r0, #0x40 ands r0, r2 @@ -99436,11 +99436,11 @@ _0802FE78: movs r0, #0 adds r1, r4, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 adds r1, r4, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY movs r2, #0x1a ldrsh r1, [r5, r2] lsls r0, r1, #2 @@ -99483,11 +99483,11 @@ _0802FECA: movs r0, #0 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY ldr r2, _0802FF38 movs r0, #0x1a ldrsh r1, [r5, r0] @@ -99519,7 +99519,7 @@ _0802FF42: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0802FDE0 + thumb_func_end HandleMainMenuInput thumb_func_start Task_HandleMainMenuInput Task_HandleMainMenuInput: @ 0x0802FF4C @@ -99527,7 +99527,7 @@ Task_HandleMainMenuInput: @ 0x0802FF4C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_0802FDE0 + bl HandleMainMenuInput lsls r0, r0, #0x18 cmp r0, #0 beq _0802FF6C @@ -99544,7 +99544,7 @@ _0802FF6C: bx r0 .align 2, 0 _0802FF74: .4byte gUnknown_3005B60 -_0802FF78: .4byte sub_0802FDB0 +_0802FF78: .4byte Task_HighlightSelectedMainMenuItem thumb_func_end Task_HandleMainMenuInput thumb_func_start sub_0802FF7C @@ -99579,7 +99579,7 @@ _0802FF9A: ldrh r0, [r6, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair _0802FFBA: movs r0, #0 movs r1, #1 @@ -99605,7 +99605,7 @@ _0802FFBA: movs r0, #7 movs r1, #1 bl sub_08197060 - bl sub_08008F68 + bl LoadHeldItemIcons lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r3, #8 @@ -99652,7 +99652,7 @@ _0803003E: beq _0803010C b _080300B0 _08030054: - bl sub_0809CD9C + bl IsMysteryGiftEnabled cmp r0, #0 beq _0803007C movs r1, #0x26 @@ -99753,11 +99753,11 @@ _0803010E: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY cmp r7, #6 bhi _08030150 lsls r0, r7, #2 @@ -99793,7 +99793,7 @@ _08030150: _0803016C: .4byte gUnknown_20373B4 _08030170: .4byte gUnknown_20377B4 _08030174: .4byte gUnknown_3005B60 -_08030178: .4byte sub_080304F0 +_08030178: .4byte Task_NewGameBirchSpeech_Init _0803017C: ldr r0, _0803018C movs r1, #0 @@ -99805,7 +99805,7 @@ _0803017C: .align 2, 0 _0803018C: .4byte gUnknown_20373B4 _08030190: .4byte gUnknown_20377B4 -_08030194: .4byte sub_08085B98 +_08030194: .4byte CB2_ContinueSavedGame _08030198: ldr r0, _080301A4 ldr r1, _080301A8 @@ -99814,8 +99814,8 @@ _08030198: b _080301C2 .align 2, 0 _080301A4: .4byte gUnknown_3002360 -_080301A8: .4byte sub_0802F34C -_080301AC: .4byte sub_080B9C34 +_080301A8: .4byte CB2_ReinitMainMenu +_080301AC: .4byte CB2_InitOptionMenu _080301B0: ldr r0, _080301B4 b _080301C2 @@ -99825,16 +99825,16 @@ _080301B8: ldr r0, _080301BC b _080301C2 .align 2, 0 -_080301BC: .4byte sub_0817882C +_080301BC: .4byte CB2_InitMysteryEventMenu _080301C0: ldr r0, _080301D0 _080301C2: - bl sub_08000540 + bl SetMainCallback2 mov r0, r8 - bl sub_080A8964 + bl DestroyTask b _08030250 .align 2, 0 -_080301D0: .4byte sub_08018110 +_080301D0: .4byte c2_ereader _080301D4: ldr r1, _0803023C mov r0, sb @@ -99878,16 +99878,16 @@ _080301D4: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _08030272 .align 2, 0 _0803023C: .4byte gUnknown_3005B60 -_08030240: .4byte sub_080302E4 +_08030240: .4byte Task_DisplayMainMenuInvalidActionError _08030244: .4byte gUnknown_20373B4 _08030248: .4byte 0x00007FFF _0803024C: .4byte gUnknown_20377B4 _08030250: - bl sub_080034D4 + bl FreeAllWindowBuffers cmp r7, #2 beq _08030264 ldr r1, _08030260 @@ -99916,8 +99916,8 @@ _08030272: _08030280: .4byte gUnknown_20229BA thumb_func_end sub_0802FF7C - thumb_func_start sub_08030284 -sub_08030284: @ 0x08030284 + thumb_func_start Task_HandleMainMenuBPressed +Task_HandleMainMenuBPressed: @ 0x08030284 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -99942,15 +99942,15 @@ sub_08030284: @ 0x08030284 ldrh r0, [r1, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair _080302B8: ldr r0, _080302DC strh r4, [r0] - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _080302E0 - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080302CC: pop {r4, r5} pop {r0} @@ -99960,10 +99960,10 @@ _080302D4: .4byte gUnknown_2037C74 _080302D8: .4byte gUnknown_3005B60 _080302DC: .4byte gUnknown_20229BA _080302E0: .4byte sub_080AA06C - thumb_func_end sub_08030284 + thumb_func_end Task_HandleMainMenuBPressed - thumb_func_start sub_080302E4 -sub_080302E4: @ 0x080302E4 + thumb_func_start Task_DisplayMainMenuInvalidActionError +Task_DisplayMainMenuInvalidActionError: @ 0x080302E4 push {r4, r5, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -100075,7 +100075,7 @@ _080303A4: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080303D4 str r0, [r4] _080303C8: @@ -100085,11 +100085,11 @@ _080303C8: bx r0 .align 2, 0 _080303D0: .4byte gUnknown_3002360 -_080303D4: .4byte sub_08030284 - thumb_func_end sub_080302E4 +_080303D4: .4byte Task_HandleMainMenuBPressed + thumb_func_end Task_DisplayMainMenuInvalidActionError - thumb_func_start sub_080303D8 -sub_080303D8: @ 0x080303D8 + thumb_func_start HighlightSelectedMainMenuItem +HighlightSelectedMainMenuItem: @ 0x080303D8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -100240,10 +100240,10 @@ _080304E4: bx r0 .align 2, 0 _080304EC: .4byte 0x0000819F - thumb_func_end sub_080303D8 + thumb_func_end HighlightSelectedMainMenuItem - thumb_func_start sub_080304F0 -sub_080304F0: @ 0x080304F0 + thumb_func_start Task_NewGameBirchSpeech_Init +Task_NewGameBirchSpeech_Init: @ 0x080304F0 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -100289,21 +100289,21 @@ sub_080304F0: @ 0x080304F0 ldr r0, _080305E0 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r0, _080305E4 movs r1, #1 movs r2, #0x10 - bl sub_080A1200 - bl sub_080B9710 + bl LoadPalette + bl ScanlineEffect_Stop bl ResetSpriteData bl FreeAllSpritePalettes bl ResetAllPicSprites adds r0, r4, #0 - bl sub_0803166C + bl AddBirchSpeechObjects movs r0, #1 rsbs r0, r0, #0 movs r5, #0 - thumb_func_end sub_080304F0 + thumb_func_end Task_NewGameBirchSpeech_Init thumb_func_start sub_0803058C sub_0803058C: @ 0x0803058C @@ -100311,7 +100311,7 @@ sub_0803058C: @ 0x0803058C movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080305E8 lsls r0, r4, #2 adds r0, r0, r4 @@ -100327,11 +100327,11 @@ sub_0803058C: @ 0x0803058C strh r1, [r0, #0x16] movs r0, #0xbb lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg add sp, #4 pop {r4, r5} pop {r0} @@ -100344,11 +100344,11 @@ _080305DC: .4byte 0x06003800 _080305E0: .4byte gUnknown_82D2588 _080305E4: .4byte gUnknown_82D28B6 _080305E8: .4byte gUnknown_3005B60 -_080305EC: .4byte sub_080305F0 +_080305EC: .4byte Task_NewGameBirchSpeech_WaitToShowBirch thumb_func_end sub_0803058C - thumb_func_start sub_080305F0 -sub_080305F0: @ 0x080305F0 + thumb_func_start Task_NewGameBirchSpeech_WaitToShowBirch +Task_NewGameBirchSpeech_WaitToShowBirch: @ 0x080305F0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -100393,10 +100393,10 @@ _08030614: strb r0, [r1, #1] adds r0, r5, #0 movs r1, #0xa - bl sub_080318EC + bl NewGameBirchSpeech_StartFadeInTarget1OutTarget2 adds r0, r5, #0 movs r1, #0x14 - bl sub_08031A74 + bl NewGameBirchSpeech_StartFadePlatformOut movs r0, #0x50 strh r0, [r4, #0x16] ldr r0, _08030664 @@ -100407,11 +100407,11 @@ _0803065A: bx r0 .align 2, 0 _08030660: .4byte gUnknown_20205AC -_08030664: .4byte sub_08030668 - thumb_func_end sub_080305F0 +_08030664: .4byte Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome + thumb_func_end Task_NewGameBirchSpeech_WaitToShowBirch - thumb_func_start sub_08030668 -sub_08030668: @ 0x08030668 + thumb_func_start Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome +Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome: @ 0x08030668 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -100449,29 +100449,29 @@ _080306A8: .4byte gUnknown_3005B60 _080306AC: .4byte gUnknown_20205AC _080306B0: ldr r0, _080306FC - bl sub_08003090 + bl InitWindows movs r0, #0 movs r1, #0xdb - bl sub_08031D9C + bl LoadMainMenuWindowFrameTiles movs r0, #0 movs r1, #0xe4 movs r2, #0xf0 - bl sub_08098104 + bl LoadMessageBoxGfx movs r0, #0 movs r1, #1 bl sub_0803213C movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08032010 + bl NewGameBirchSpeech_ClearWindow ldr r0, _08030700 ldr r1, _08030704 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r0, _08030708 str r0, [r4] _080306F6: @@ -100482,11 +100482,11 @@ _080306F6: _080306FC: .4byte gUnknown_82D2910 _08030700: .4byte gUnknown_2021C7C _08030704: .4byte gUnknown_8277095 -_08030708: .4byte sub_0803070C - thumb_func_end sub_08030668 +_08030708: .4byte Task_NewGameBirchSpeech_ThisIsAPokemon + thumb_func_end Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome - thumb_func_start sub_0803070C -sub_0803070C: @ 0x0803070C + thumb_func_start Task_NewGameBirchSpeech_ThisIsAPokemon +Task_NewGameBirchSpeech_ThisIsAPokemon: @ 0x0803070C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -100496,7 +100496,7 @@ sub_0803070C: @ 0x0803070C ands r0, r1 cmp r0, #0 bne _0803074A - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _0803074A @@ -100509,10 +100509,10 @@ sub_0803070C: @ 0x0803070C str r1, [r0] ldr r0, _0803075C ldr r1, _08030760 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r1, _08030764 movs r0, #1 - bl sub_081978A4 + bl AddTextPrinterWithCallbackForMessage ldr r0, _08030768 strb r4, [r0] _0803074A: @@ -100522,27 +100522,27 @@ _0803074A: .align 2, 0 _08030750: .4byte gUnknown_2037C74 _08030754: .4byte gUnknown_3005B60 -_08030758: .4byte sub_0803076C +_08030758: .4byte Task_NewGameBirchSpeech_MainSpeech _0803075C: .4byte gUnknown_2021C7C _08030760: .4byte gUnknown_85C8F88 -_08030764: .4byte sub_08032098 +_08030764: .4byte NewGameBirchSpeech_ShowPokeBallPrinterCallback _08030768: .4byte gUnknown_3000DD0 - thumb_func_end sub_0803070C + thumb_func_end Task_NewGameBirchSpeech_ThisIsAPokemon - thumb_func_start sub_0803076C -sub_0803076C: @ 0x0803076C + thumb_func_start Task_NewGameBirchSpeech_MainSpeech +Task_NewGameBirchSpeech_MainSpeech: @ 0x0803076C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _08030798 ldr r0, _080307A0 ldr r1, _080307A4 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r1, _080307A8 lsls r0, r4, #2 adds r0, r0, r4 @@ -100558,11 +100558,11 @@ _08030798: _080307A0: .4byte gUnknown_2021C7C _080307A4: .4byte gUnknown_8277102 _080307A8: .4byte gUnknown_3005B60 -_080307AC: .4byte sub_0803090C - thumb_func_end sub_0803076C +_080307AC: .4byte Task_NewGameBirchSpeech_AndYouAre + thumb_func_end Task_NewGameBirchSpeech_MainSpeech - thumb_func_start sub_080307B0 -sub_080307B0: @ 0x080307B0 + thumb_func_start Task_NewGameBirchSpeechSub_InitPokeBall +Task_NewGameBirchSpeechSub_InitPokeBall: @ 0x080307B0 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -100611,7 +100611,7 @@ sub_080307B0: @ 0x080307B0 str r2, [sp, #0x10] movs r2, #0x70 movs r3, #0x3a - bl sub_08075E40 + bl CreatePokeballSpriteToReleaseMon lsls r0, r4, #2 adds r0, r0, r4 lsls r0, r0, #3 @@ -100637,11 +100637,11 @@ _08030840: .4byte gUnknown_3000DD0 _08030844: .4byte gUnknown_20205AC _08030848: .4byte 0x0000FFFF _0803084C: .4byte 0x00000127 -_08030850: .4byte sub_08030854 - thumb_func_end sub_080307B0 +_08030850: .4byte Task_NewGameBirchSpeechSub_WaitForLotad + thumb_func_end Task_NewGameBirchSpeechSub_InitPokeBall - thumb_func_start sub_08030854 -sub_08030854: @ 0x08030854 + thumb_func_start Task_NewGameBirchSpeechSub_WaitForLotad +Task_NewGameBirchSpeechSub_WaitForLotad: @ 0x08030854 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -100699,7 +100699,7 @@ _080308BC: cmp r0, #0x5f ble _080308FA adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldrb r1, [r7] lsls r0, r1, #2 adds r0, r0, r1 @@ -100735,14 +100735,14 @@ _080308FA: .align 2, 0 _08030904: .4byte gUnknown_3005B60 _08030908: .4byte 0x00003FFF - thumb_func_end sub_08030854 + thumb_func_end Task_NewGameBirchSpeechSub_WaitForLotad - thumb_func_start sub_0803090C -sub_0803090C: @ 0x0803090C + thumb_func_start Task_NewGameBirchSpeech_AndYouAre +Task_NewGameBirchSpeech_AndYouAre: @ 0x0803090C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -100751,9 +100751,9 @@ sub_0803090C: @ 0x0803090C strb r1, [r0] ldr r0, _08030948 ldr r1, _0803094C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r1, _08030950 lsls r0, r4, #2 adds r0, r0, r4 @@ -100770,15 +100770,15 @@ _08030944: .4byte gUnknown_20229B8 _08030948: .4byte gUnknown_2021C7C _0803094C: .4byte gUnknown_82771F4 _08030950: .4byte gUnknown_3005B60 -_08030954: .4byte sub_08030958 - thumb_func_end sub_0803090C +_08030954: .4byte Task_NewGameBirchSpeech_StartBirchLotadPlatformFade + thumb_func_end Task_NewGameBirchSpeech_AndYouAre - thumb_func_start sub_08030958 -sub_08030958: @ 0x08030958 + thumb_func_start Task_NewGameBirchSpeech_StartBirchLotadPlatformFade +Task_NewGameBirchSpeech_StartBirchLotadPlatformFade: @ 0x08030958 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _080309BC @@ -100814,10 +100814,10 @@ sub_08030958: @ 0x08030958 strb r2, [r0, #1] adds r0, r6, #0 movs r1, #2 - bl sub_0803180C + bl NewGameBirchSpeech_StartFadeOutTarget1InTarget2 adds r0, r6, #0 movs r1, #1 - bl sub_080319C8 + bl NewGameBirchSpeech_StartFadePlatformIn movs r0, #0x40 strh r0, [r4, #0x16] ldr r0, _080309CC @@ -100829,11 +100829,11 @@ _080309BC: .align 2, 0 _080309C4: .4byte gUnknown_20205AC _080309C8: .4byte gUnknown_3005B60 -_080309CC: .4byte sub_080309D0 - thumb_func_end sub_08030958 +_080309CC: .4byte Task_NewGameBirchSpeech_SlidePlatformAway + thumb_func_end Task_NewGameBirchSpeech_StartBirchLotadPlatformFade - thumb_func_start sub_080309D0 -sub_080309D0: @ 0x080309D0 + thumb_func_start Task_NewGameBirchSpeech_SlidePlatformAway +Task_NewGameBirchSpeech_SlidePlatformAway: @ 0x080309D0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -100867,11 +100867,11 @@ _08030A08: bx r0 .align 2, 0 _08030A0C: .4byte 0x0000FFC4 -_08030A10: .4byte sub_08030A14 - thumb_func_end sub_080309D0 +_08030A10: .4byte Task_NewGameBirchSpeech_StartPlayerFadeIn + thumb_func_end Task_NewGameBirchSpeech_SlidePlatformAway - thumb_func_start sub_08030A14 -sub_08030A14: @ 0x08030A14 + thumb_func_start Task_NewGameBirchSpeech_StartPlayerFadeIn +Task_NewGameBirchSpeech_StartPlayerFadeIn: @ 0x08030A14 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -100946,10 +100946,10 @@ _08030A74: strh r6, [r4, #0x14] adds r0, r5, #0 movs r1, #2 - bl sub_080318EC + bl NewGameBirchSpeech_StartFadeInTarget1OutTarget2 adds r0, r5, #0 movs r1, #1 - bl sub_08031A74 + bl NewGameBirchSpeech_StartFadePlatformOut ldr r0, _08030AC0 str r0, [r4] _08030ABA: @@ -100958,7 +100958,7 @@ _08030ABA: bx r0 .align 2, 0 _08030AC0: .4byte Task_NewGameBirchSpeech_WaitForPlayerFadeIn - thumb_func_end sub_08030A14 + thumb_func_end Task_NewGameBirchSpeech_StartPlayerFadeIn thumb_func_start Task_NewGameBirchSpeech_WaitForPlayerFadeIn Task_NewGameBirchSpeech_WaitForPlayerFadeIn: @ 0x08030AC4 @@ -100994,22 +100994,22 @@ _08030AF8: .align 2, 0 _08030AFC: .4byte gUnknown_3005B60 _08030B00: .4byte gUnknown_20205AC -_08030B04: .4byte sub_08030B08 +_08030B04: .4byte Task_NewGameBirchSpeech_BoyOrGirl thumb_func_end Task_NewGameBirchSpeech_WaitForPlayerFadeIn - thumb_func_start sub_08030B08 -sub_08030B08: @ 0x08030B08 + thumb_func_start Task_NewGameBirchSpeech_BoyOrGirl +Task_NewGameBirchSpeech_BoyOrGirl: @ 0x08030B08 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_08032010 + bl NewGameBirchSpeech_ClearWindow ldr r0, _08030B38 ldr r1, _08030B3C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r1, _08030B40 lsls r0, r4, #2 adds r0, r0, r4 @@ -101024,15 +101024,15 @@ sub_08030B08: @ 0x08030B08 _08030B38: .4byte gUnknown_2021C7C _08030B3C: .4byte gUnknown_8277200 _08030B40: .4byte gUnknown_3005B60 -_08030B44: .4byte sub_08030B48 - thumb_func_end sub_08030B08 +_08030B44: .4byte Task_NewGameBirchSpeech_WaitToShowGenderMenu + thumb_func_end Task_NewGameBirchSpeech_BoyOrGirl - thumb_func_start sub_08030B48 -sub_08030B48: @ 0x08030B48 + thumb_func_start Task_NewGameBirchSpeech_WaitToShowGenderMenu +Task_NewGameBirchSpeech_WaitToShowGenderMenu: @ 0x08030B48 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _08030B6A @@ -101050,15 +101050,15 @@ _08030B6A: bx r0 .align 2, 0 _08030B70: .4byte gUnknown_3005B60 -_08030B74: .4byte sub_08030B78 - thumb_func_end sub_08030B48 +_08030B74: .4byte Task_NewGameBirchSpeech_ChooseGender + thumb_func_end Task_NewGameBirchSpeech_WaitToShowGenderMenu - thumb_func_start sub_08030B78 -sub_08030B78: @ 0x08030B78 + thumb_func_start Task_NewGameBirchSpeech_ChooseGender +Task_NewGameBirchSpeech_ChooseGender: @ 0x08030B78 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_08031B20 + bl NewGameBirchSpeech_ProcessGenderMenuInput lsls r0, r0, #0x18 asrs r4, r0, #0x18 cmp r4, #0 @@ -101085,7 +101085,7 @@ _08030B92: str r1, [r0] adds r4, r2, #0 _08030BB6: - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r1, _08030C04 @@ -101113,7 +101113,7 @@ _08030BB6: strb r1, [r0, #1] adds r0, r5, #0 movs r1, #0 - bl sub_0803180C + bl NewGameBirchSpeech_StartFadeOutTarget1InTarget2 ldr r0, _08030C10 str r0, [r4] _08030BF8: @@ -101125,11 +101125,11 @@ _08030C00: .4byte gUnknown_3005AF0 _08030C04: .4byte gUnknown_3005B60 _08030C08: .4byte sub_08030D14 _08030C0C: .4byte gUnknown_20205AC -_08030C10: .4byte sub_08030C14 - thumb_func_end sub_08030B78 +_08030C10: .4byte Task_NewGameBirchSpeech_SlideOutOldGenderSprite + thumb_func_end Task_NewGameBirchSpeech_ChooseGender - thumb_func_start sub_08030C14 -sub_08030C14: @ 0x08030C14 + thumb_func_start Task_NewGameBirchSpeech_SlideOutOldGenderSprite +Task_NewGameBirchSpeech_SlideOutOldGenderSprite: @ 0x08030C14 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -101206,7 +101206,7 @@ _08030C72: strb r0, [r2, #1] adds r0, r6, #0 movs r1, #0 - bl sub_080318EC + bl NewGameBirchSpeech_StartFadeInTarget1OutTarget2 ldr r0, _08030CB8 str r0, [r4] _08030CB2: @@ -101214,11 +101214,11 @@ _08030CB2: pop {r0} bx r0 .align 2, 0 -_08030CB8: .4byte sub_08030CBC - thumb_func_end sub_08030C14 +_08030CB8: .4byte Task_NewGameBirchSpeech_SlideInNewGenderSprite + thumb_func_end Task_NewGameBirchSpeech_SlideOutOldGenderSprite - thumb_func_start sub_08030CBC -sub_08030CBC: @ 0x08030CBC + thumb_func_start Task_NewGameBirchSpeech_SlideInNewGenderSprite +Task_NewGameBirchSpeech_SlideInNewGenderSprite: @ 0x08030CBC push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -101263,8 +101263,8 @@ _08030D0A: pop {r0} bx r0 .align 2, 0 -_08030D10: .4byte sub_08030B78 - thumb_func_end sub_08030CBC +_08030D10: .4byte Task_NewGameBirchSpeech_ChooseGender + thumb_func_end Task_NewGameBirchSpeech_SlideInNewGenderSprite thumb_func_start sub_08030D14 sub_08030D14: @ 0x08030D14 @@ -101273,12 +101273,12 @@ sub_08030D14: @ 0x08030D14 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_08032010 + bl NewGameBirchSpeech_ClearWindow ldr r0, _08030D44 ldr r1, _08030D48 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r1, _08030D4C lsls r0, r4, #2 adds r0, r0, r4 @@ -101293,15 +101293,15 @@ sub_08030D14: @ 0x08030D14 _08030D44: .4byte gUnknown_2021C7C _08030D48: .4byte gUnknown_8277213 _08030D4C: .4byte gUnknown_3005B60 -_08030D50: .4byte sub_08030D54 +_08030D50: .4byte Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint thumb_func_end sub_08030D14 - thumb_func_start sub_08030D54 -sub_08030D54: @ 0x08030D54 + thumb_func_start Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint +Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint: @ 0x08030D54 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _08030D72 @@ -101318,11 +101318,11 @@ _08030D72: bx r0 .align 2, 0 _08030D78: .4byte gUnknown_3005B60 -_08030D7C: .4byte sub_08030D80 - thumb_func_end sub_08030D54 +_08030D7C: .4byte Task_NewGameBirchSpeech_WaitPressBeforeNameChoice + thumb_func_end Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint - thumb_func_start sub_08030D80 -sub_08030D80: @ 0x08030D80 + thumb_func_start Task_NewGameBirchSpeech_WaitPressBeforeNameChoice +Task_NewGameBirchSpeech_WaitPressBeforeNameChoice: @ 0x08030D80 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -101344,7 +101344,7 @@ _08030D9C: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08030DC8 lsls r0, r4, #2 adds r0, r0, r4 @@ -101360,11 +101360,11 @@ _08030DBA: .align 2, 0 _08030DC4: .4byte gUnknown_3002360 _08030DC8: .4byte gUnknown_3005B60 -_08030DCC: .4byte sub_08030DD0 - thumb_func_end sub_08030D80 +_08030DCC: .4byte Task_NewGameBirchSpeech_StartNamingScreen + thumb_func_end Task_NewGameBirchSpeech_WaitPressBeforeNameChoice - thumb_func_start sub_08030DD0 -sub_08030DD0: @ 0x08030DD0 + thumb_func_start Task_NewGameBirchSpeech_StartNamingScreen +Task_NewGameBirchSpeech_StartNamingScreen: @ 0x08030DD0 push {r4, r5, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -101377,14 +101377,14 @@ sub_08030DD0: @ 0x08030DD0 lsrs r5, r0, #0x18 cmp r5, #0 bne _08030E2C - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r1, _08030E38 lsls r0, r4, #2 adds r0, r0, r4 lsls r0, r0, #3 adds r0, r0, r1 ldrh r0, [r0, #0x1a] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite bl Random lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -101392,9 +101392,9 @@ sub_08030DD0: @ 0x08030DD0 bl __umodsi3 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08031B30 + bl NewGameBirchSpeech_SetDefaultPlayerName adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _08030E3C ldr r1, [r0] ldrb r2, [r1, #8] @@ -101403,7 +101403,7 @@ sub_08030DD0: @ 0x08030DD0 str r0, [sp, #4] movs r0, #0 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen _08030E2C: add sp, #8 pop {r4, r5} @@ -101413,8 +101413,8 @@ _08030E2C: _08030E34: .4byte gUnknown_2037C74 _08030E38: .4byte gUnknown_3005B60 _08030E3C: .4byte gUnknown_3005AF0 -_08030E40: .4byte sub_080313B8 - thumb_func_end sub_08030DD0 +_08030E40: .4byte CB2_NewGameBirchSpeech_ReturnFromNamingScreen + thumb_func_end Task_NewGameBirchSpeech_StartNamingScreen thumb_func_start sub_08030E44 sub_08030E44: @ 0x08030E44 @@ -101423,12 +101423,12 @@ sub_08030E44: @ 0x08030E44 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_08032010 + bl NewGameBirchSpeech_ClearWindow ldr r0, _08030E74 ldr r1, _08030E78 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r1, _08030E7C lsls r0, r4, #2 adds r0, r0, r4 @@ -101443,16 +101443,16 @@ sub_08030E44: @ 0x08030E44 _08030E74: .4byte gUnknown_2021C7C _08030E78: .4byte gUnknown_8277224 _08030E7C: .4byte gUnknown_3005B60 -_08030E80: .4byte sub_08030E84 +_08030E80: .4byte Task_NewGameBirchSpeech_CreateNameYesNo thumb_func_end sub_08030E44 - thumb_func_start sub_08030E84 -sub_08030E84: @ 0x08030E84 + thumb_func_start Task_NewGameBirchSpeech_CreateNameYesNo +Task_NewGameBirchSpeech_CreateNameYesNo: @ 0x08030E84 push {r4, lr} sub sp, #8 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _08030EB8 @@ -101464,7 +101464,7 @@ sub_08030E84: @ 0x08030E84 movs r1, #1 movs r2, #0xdb movs r3, #0xc7 - bl sub_080320C4 + bl CreateYesNoMenuParameterized ldr r1, _08030EC0 lsls r0, r4, #2 adds r0, r0, r4 @@ -101479,11 +101479,11 @@ _08030EB8: bx r0 .align 2, 0 _08030EC0: .4byte gUnknown_3005B60 -_08030EC4: .4byte sub_08030EC8 - thumb_func_end sub_08030E84 +_08030EC4: .4byte Task_NewGameBirchSpeech_ProcessNameYesNoMenu + thumb_func_end Task_NewGameBirchSpeech_CreateNameYesNo - thumb_func_start sub_08030EC8 -sub_08030EC8: @ 0x08030EC8 + thumb_func_start Task_NewGameBirchSpeech_ProcessNameYesNoMenu +Task_NewGameBirchSpeech_ProcessNameYesNoMenu: @ 0x08030EC8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -101527,17 +101527,17 @@ _08030EEE: strb r1, [r0, #1] adds r0, r5, #0 movs r1, #2 - bl sub_0803180C + bl NewGameBirchSpeech_StartFadeOutTarget1InTarget2 adds r0, r5, #0 movs r1, #1 - bl sub_080319C8 + bl NewGameBirchSpeech_StartFadePlatformIn ldr r0, _08030F38 str r0, [r4] b _08030F50 .align 2, 0 _08030F30: .4byte gUnknown_20205AC _08030F34: .4byte gUnknown_3005B60 -_08030F38: .4byte sub_08030F60 +_08030F38: .4byte Task_NewGameBirchSpeech_SlidePlatformAway2 _08030F3C: movs r0, #5 bl sub_080A306C @@ -101554,11 +101554,11 @@ _08030F50: bx r0 .align 2, 0 _08030F58: .4byte gUnknown_3005B60 -_08030F5C: .4byte sub_08030B08 - thumb_func_end sub_08030EC8 +_08030F5C: .4byte Task_NewGameBirchSpeech_BoyOrGirl + thumb_func_end Task_NewGameBirchSpeech_ProcessNameYesNoMenu - thumb_func_start sub_08030F60 -sub_08030F60: @ 0x08030F60 + thumb_func_start Task_NewGameBirchSpeech_SlidePlatformAway2 +Task_NewGameBirchSpeech_SlidePlatformAway2: @ 0x08030F60 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -101587,11 +101587,11 @@ _08030F90: pop {r0} bx r0 .align 2, 0 -_08030F94: .4byte sub_08030F98 - thumb_func_end sub_08030F60 +_08030F94: .4byte Task_NewGameBirchSpeech_ReshowBirchLotad + thumb_func_end Task_NewGameBirchSpeech_SlidePlatformAway2 - thumb_func_start sub_08030F98 -sub_08030F98: @ 0x08030F98 + thumb_func_start Task_NewGameBirchSpeech_ReshowBirchLotad +Task_NewGameBirchSpeech_ReshowBirchLotad: @ 0x08030F98 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -101674,17 +101674,17 @@ sub_08030F98: @ 0x08030F98 strb r2, [r0, #1] adds r0, r6, #0 movs r1, #2 - bl sub_080318EC + bl NewGameBirchSpeech_StartFadeInTarget1OutTarget2 adds r0, r6, #0 movs r1, #1 - bl sub_08031A74 + bl NewGameBirchSpeech_StartFadePlatformOut movs r0, #0 - bl sub_08032010 + bl NewGameBirchSpeech_ClearWindow ldr r0, _08031070 ldr r1, _08031074 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r0, _08031078 str r0, [r7] _08031060: @@ -101696,11 +101696,11 @@ _08031068: .4byte gUnknown_3005B60 _0803106C: .4byte gUnknown_20205AC _08031070: .4byte gUnknown_2021C7C _08031074: .4byte gUnknown_827722D -_08031078: .4byte sub_0803107C - thumb_func_end sub_08030F98 +_08031078: .4byte Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter + thumb_func_end Task_NewGameBirchSpeech_ReshowBirchLotad - thumb_func_start sub_0803107C -sub_0803107C: @ 0x0803107C + thumb_func_start Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter +Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter: @ 0x0803107C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -101736,7 +101736,7 @@ sub_0803107C: @ 0x0803107C adds r0, r6, #0 ands r0, r2 strb r0, [r1, #1] - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _08031112 @@ -101765,10 +101765,10 @@ sub_0803107C: @ 0x0803107C strb r0, [r1, #1] adds r0, r5, #0 movs r1, #2 - bl sub_0803180C + bl NewGameBirchSpeech_StartFadeOutTarget1InTarget2 adds r0, r5, #0 movs r1, #1 - bl sub_080319C8 + bl NewGameBirchSpeech_StartFadePlatformIn movs r0, #0x40 strh r0, [r4, #0x16] ldr r0, _08031120 @@ -101780,11 +101780,11 @@ _08031112: .align 2, 0 _08031118: .4byte gUnknown_3005B60 _0803111C: .4byte gUnknown_20205AC -_08031120: .4byte sub_08031124 - thumb_func_end sub_0803107C +_08031120: .4byte Task_NewGameBirchSpeech_AreYouReady + thumb_func_end Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter - thumb_func_start sub_08031124 -sub_08031124: @ 0x08031124 + thumb_func_start Task_NewGameBirchSpeech_AreYouReady +Task_NewGameBirchSpeech_AreYouReady: @ 0x08031124 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -101872,15 +101872,15 @@ _0803119A: strh r5, [r4, #0xc] adds r0, r6, #0 movs r1, #2 - bl sub_080318EC + bl NewGameBirchSpeech_StartFadeInTarget1OutTarget2 adds r0, r6, #0 movs r1, #1 - bl sub_08031A74 + bl NewGameBirchSpeech_StartFadePlatformOut ldr r0, _080311F8 ldr r1, _080311FC - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r0, _08031200 str r0, [r4] _080311F0: @@ -101890,11 +101890,11 @@ _080311F0: .align 2, 0 _080311F8: .4byte gUnknown_2021C7C _080311FC: .4byte gUnknown_8277265 -_08031200: .4byte sub_08031204 - thumb_func_end sub_08031124 +_08031200: .4byte Task_NewGameBirchSpeech_ShrinkPlayer + thumb_func_end Task_NewGameBirchSpeech_AreYouReady - thumb_func_start sub_08031204 -sub_08031204: @ 0x08031204 + thumb_func_start Task_NewGameBirchSpeech_ShrinkPlayer +Task_NewGameBirchSpeech_ShrinkPlayer: @ 0x08031204 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -101922,7 +101922,7 @@ sub_08031204: @ 0x08031204 rsbs r0, r0, #0 ands r0, r2 strb r0, [r1, #1] - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 @@ -101961,7 +101961,7 @@ sub_08031204: @ 0x08031204 movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #4 bl sub_080A2B08 ldr r0, _080312BC @@ -101980,7 +101980,7 @@ _080312B0: .4byte gUnknown_82D29A4 _080312B4: .4byte SpriteCB_MovePlayerDownWhileShrinking _080312B8: .4byte 0x0000FFFF _080312BC: .4byte Task_NewGameBirchSpeech_WaitForPlayerShrink - thumb_func_end sub_08031204 + thumb_func_end Task_NewGameBirchSpeech_ShrinkPlayer thumb_func_start Task_NewGameBirchSpeech_WaitForPlayerShrink Task_NewGameBirchSpeech_WaitForPlayerShrink: @ 0x080312C0 @@ -102011,11 +102011,11 @@ _080312EA: .align 2, 0 _080312F0: .4byte gUnknown_3005B60 _080312F4: .4byte gUnknown_20205AC -_080312F8: .4byte sub_080312FC +_080312F8: .4byte Task_NewGameBirchSpeech_FadePlayerToWhite thumb_func_end Task_NewGameBirchSpeech_WaitForPlayerShrink - thumb_func_start sub_080312FC -sub_080312FC: @ 0x080312FC + thumb_func_start Task_NewGameBirchSpeech_FadePlayerToWhite +Task_NewGameBirchSpeech_FadePlayerToWhite: @ 0x080312FC push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -102050,7 +102050,7 @@ sub_080312FC: @ 0x080312FC movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0803136C str r0, [r4] _0803134A: @@ -102066,7 +102066,7 @@ _08031360: .4byte sub_08031614 _08031364: .4byte 0xFFFF0000 _08031368: .4byte 0x0000FFFF _0803136C: .4byte sub_08031370 - thumb_func_end sub_080312FC + thumb_func_end Task_NewGameBirchSpeech_FadePlayerToWhite thumb_func_start sub_08031370 sub_08031370: @ 0x08031370 @@ -102079,19 +102079,19 @@ sub_08031370: @ 0x08031370 ands r0, r1 cmp r0, #0 bne _080313A6 - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r1, _080313B0 lsls r0, r4, #2 adds r0, r0, r4 lsls r0, r0, #3 adds r0, r0, r1 ldrh r0, [r0, #0x1a] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite bl ResetAllPicSprites ldr r0, _080313B4 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080313A6: pop {r4} pop {r0} @@ -102099,11 +102099,11 @@ _080313A6: .align 2, 0 _080313AC: .4byte gUnknown_2037C74 _080313B0: .4byte gUnknown_3005B60 -_080313B4: .4byte sub_08085860 +_080313B4: .4byte CB2_NewGame thumb_func_end sub_08031370 - thumb_func_start sub_080313B8 -sub_080313B8: @ 0x080313B8 + thumb_func_start CB2_NewGameBirchSpeech_ReturnFromNamingScreen +CB2_NewGameBirchSpeech_ReturnFromNamingScreen: @ 0x080313B8 push {r4, r5, lr} sub sp, #0xc movs r0, #0 @@ -102122,7 +102122,7 @@ sub_080313B8: @ 0x080313B8 ldr r0, _080314E4 bl InitBgFromTemplate movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0xc movs r1, #0 bl SetGpuReg @@ -102190,15 +102190,15 @@ sub_080313B8: @ 0x080313B8 ldr r0, _08031504 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r0, _08031508 movs r1, #1 movs r2, #0x10 - bl sub_080A1200 - bl sub_080A8818 + bl LoadPalette + bl ResetTasks ldr r0, _0803150C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r1, _08031510 @@ -102210,12 +102210,12 @@ sub_080313B8: @ 0x080313B8 strh r0, [r4, #0x16] ldr r0, _08031514 strh r0, [r4, #0x10] - bl sub_080B9710 + bl ScanlineEffect_Stop bl ResetSpriteData bl FreeAllSpritePalettes bl ResetAllPicSprites adds r0, r5, #0 - bl sub_0803166C + bl AddBirchSpeechObjects ldr r0, _08031518 ldr r0, [r0] ldrb r0, [r0, #8] @@ -102237,7 +102237,7 @@ _080314FC: .4byte gUnknown_82D277C _08031500: .4byte 0x06003800 _08031504: .4byte gUnknown_82D2588 _08031508: .4byte gUnknown_82D28A8 -_0803150C: .4byte sub_080324B4 +_0803150C: .4byte Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox _08031510: .4byte gUnknown_3005B60 _08031514: .4byte 0x0000FFC4 _08031518: .4byte gUnknown_3005AF0 @@ -102275,7 +102275,7 @@ _08031520: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0x40 movs r1, #0 bl SetGpuReg @@ -102298,9 +102298,9 @@ _08031520: movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg ldr r3, _08031600 ldrh r2, [r3] strh r4, [r3] @@ -102311,23 +102311,23 @@ _08031520: strh r0, [r4] strh r2, [r3] ldr r0, _08031608 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0803160C - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08031610 - bl sub_08003090 + bl InitWindows movs r0, #0 movs r1, #0xdb - bl sub_08031D9C + bl LoadMainMenuWindowFrameTiles movs r0, #0 movs r1, #0xe4 movs r2, #0xf0 - bl sub_08098104 + bl LoadMessageBoxGfx movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -102339,9 +102339,9 @@ _080315FC: .4byte 0x0000FFC4 _08031600: .4byte 0x04000208 _08031604: .4byte 0x04000200 _08031608: .4byte sub_0802F32C -_0803160C: .4byte sub_0802F314 +_0803160C: .4byte CB2_MainMenu _08031610: .4byte gUnknown_82D2910 - thumb_func_end sub_080313B8 + thumb_func_end CB2_NewGameBirchSpeech_ReturnFromNamingScreen thumb_func_start sub_08031614 sub_08031614: @ 0x08031614 @@ -102367,8 +102367,8 @@ SpriteCB_MovePlayerDownWhileShrinking: @ 0x08031618 .align 2, 0 thumb_func_end SpriteCB_MovePlayerDownWhileShrinking - thumb_func_start sub_08031634 -sub_08031634: @ 0x08031634 + thumb_func_start NewGameBirchSpeech_CreateLotadSprite +NewGameBirchSpeech_CreateLotadSprite: @ 0x08031634 push {lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -102386,7 +102386,7 @@ sub_08031634: @ 0x08031634 movs r1, #8 movs r2, #0 movs r3, #1 - bl sub_0818D110 + bl CreatePicSprite2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #0x10 @@ -102395,10 +102395,10 @@ sub_08031634: @ 0x08031634 .align 2, 0 _08031664: .4byte 0x00000127 _08031668: .4byte 0x0000FFFF - thumb_func_end sub_08031634 + thumb_func_end NewGameBirchSpeech_CreateLotadSprite - thumb_func_start sub_0803166C -sub_0803166C: @ 0x0803166C + thumb_func_start AddBirchSpeechObjects +AddBirchSpeechObjects: @ 0x0803166C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -102411,7 +102411,7 @@ sub_0803166C: @ 0x0803166C movs r0, #0x88 movs r1, #0x3c movs r2, #1 - bl sub_080B569C + bl AddNewGameBirchObject lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0803178C @@ -102447,7 +102447,7 @@ sub_0803166C: @ 0x0803166C strh r0, [r5, #0x18] movs r0, #0x64 movs r1, #0x4b - bl sub_08031634 + bl NewGameBirchSpeech_CreateLotadSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -102476,7 +102476,7 @@ sub_0803166C: @ 0x0803166C movs r1, #0x78 movs r2, #0x3c movs r3, #0 - bl sub_080B55C4 + bl CreateTrainerSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -102509,7 +102509,7 @@ sub_0803166C: @ 0x0803166C movs r1, #0x78 movs r2, #0x3c movs r3, #0 - bl sub_080B55C4 + bl CreateTrainerSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -102542,10 +102542,10 @@ _0803178C: .4byte gUnknown_20205AC _08031790: .4byte sub_08031614 _08031794: .4byte gUnknown_3005B60 _08031798: .4byte gUnknown_201C000 - thumb_func_end sub_0803166C + thumb_func_end AddBirchSpeechObjects - thumb_func_start sub_0803179C -sub_0803179C: @ 0x0803179C + thumb_func_start Task_NewGameBirchSpeech_FadeOutTarget1InTarget2 +Task_NewGameBirchSpeech_FadeOutTarget1InTarget2: @ 0x0803179C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -102568,7 +102568,7 @@ sub_0803179C: @ 0x0803179C movs r0, #1 strh r0, [r1, #0x12] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask b _08031804 .align 2, 0 _080317D0: .4byte gUnknown_3005B60 @@ -102602,10 +102602,10 @@ _08031804: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0803179C + thumb_func_end Task_NewGameBirchSpeech_FadeOutTarget1InTarget2 - thumb_func_start sub_0803180C -sub_0803180C: @ 0x0803180C + thumb_func_start NewGameBirchSpeech_StartFadeOutTarget1InTarget2 +NewGameBirchSpeech_StartFadeOutTarget1InTarget2: @ 0x0803180C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -102635,7 +102635,7 @@ sub_0803180C: @ 0x0803180C strh r6, [r0, #0x12] ldr r0, _08031878 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -102655,11 +102655,11 @@ sub_0803180C: @ 0x0803180C bx r0 .align 2, 0 _08031874: .4byte gUnknown_3005B60 -_08031878: .4byte sub_0803179C - thumb_func_end sub_0803180C +_08031878: .4byte Task_NewGameBirchSpeech_FadeOutTarget1InTarget2 + thumb_func_end NewGameBirchSpeech_StartFadeOutTarget1InTarget2 - thumb_func_start sub_0803187C -sub_0803187C: @ 0x0803187C + thumb_func_start Task_NewGameBirchSpeech_FadeInTarget1OutTarget2 +Task_NewGameBirchSpeech_FadeInTarget1OutTarget2: @ 0x0803187C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -102682,7 +102682,7 @@ sub_0803187C: @ 0x0803187C movs r0, #1 strh r0, [r1, #0x12] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask b _080318E4 .align 2, 0 _080318B0: .4byte gUnknown_3005B60 @@ -102716,10 +102716,10 @@ _080318E4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0803187C + thumb_func_end Task_NewGameBirchSpeech_FadeInTarget1OutTarget2 - thumb_func_start sub_080318EC -sub_080318EC: @ 0x080318EC + thumb_func_start NewGameBirchSpeech_StartFadeInTarget1OutTarget2 +NewGameBirchSpeech_StartFadeInTarget1OutTarget2: @ 0x080318EC push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -102750,7 +102750,7 @@ sub_080318EC: @ 0x080318EC strh r6, [r0, #0x12] ldr r0, _08031958 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -102770,11 +102770,11 @@ sub_080318EC: @ 0x080318EC bx r0 .align 2, 0 _08031954: .4byte gUnknown_3005B60 -_08031958: .4byte sub_0803187C - thumb_func_end sub_080318EC +_08031958: .4byte Task_NewGameBirchSpeech_FadeInTarget1OutTarget2 + thumb_func_end NewGameBirchSpeech_StartFadeInTarget1OutTarget2 - thumb_func_start sub_0803195C -sub_0803195C: @ 0x0803195C + thumb_func_start Task_NewGameBirchSpeech_FadePlatformIn +Task_NewGameBirchSpeech_FadePlatformIn: @ 0x0803195C push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -102800,7 +102800,7 @@ _08031980: cmp r0, #8 bne _08031992 adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _080319BC _08031992: ldrh r2, [r1, #0x10] @@ -102823,17 +102823,17 @@ _080319A2: adds r0, r0, r1 movs r1, #1 movs r2, #0x10 - bl sub_080A1200 + bl LoadPalette _080319BC: pop {r4} pop {r0} bx r0 .align 2, 0 _080319C4: .4byte gUnknown_82D28A6 - thumb_func_end sub_0803195C + thumb_func_end Task_NewGameBirchSpeech_FadePlatformIn - thumb_func_start sub_080319C8 -sub_080319C8: @ 0x080319C8 + thumb_func_start NewGameBirchSpeech_StartFadePlatformIn +NewGameBirchSpeech_StartFadePlatformIn: @ 0x080319C8 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -102843,7 +102843,7 @@ sub_080319C8: @ 0x080319C8 lsrs r5, r5, #0x18 ldr r0, _08031A00 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08031A04 @@ -102862,12 +102862,12 @@ sub_080319C8: @ 0x080319C8 pop {r0} bx r0 .align 2, 0 -_08031A00: .4byte sub_0803195C +_08031A00: .4byte Task_NewGameBirchSpeech_FadePlatformIn _08031A04: .4byte gUnknown_3005B60 - thumb_func_end sub_080319C8 + thumb_func_end NewGameBirchSpeech_StartFadePlatformIn - thumb_func_start sub_08031A08 -sub_08031A08: @ 0x08031A08 + thumb_func_start Task_NewGameBirchSpeech_FadePlatformOut +Task_NewGameBirchSpeech_FadePlatformOut: @ 0x08031A08 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -102893,7 +102893,7 @@ _08031A2C: cmp r0, #0 bne _08031A3E adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _08031A68 _08031A3E: ldrh r2, [r1, #0x10] @@ -102916,17 +102916,17 @@ _08031A4E: adds r0, r0, r1 movs r1, #1 movs r2, #0x10 - bl sub_080A1200 + bl LoadPalette _08031A68: pop {r4} pop {r0} bx r0 .align 2, 0 _08031A70: .4byte gUnknown_82D28A6 - thumb_func_end sub_08031A08 + thumb_func_end Task_NewGameBirchSpeech_FadePlatformOut - thumb_func_start sub_08031A74 -sub_08031A74: @ 0x08031A74 + thumb_func_start NewGameBirchSpeech_StartFadePlatformOut +NewGameBirchSpeech_StartFadePlatformOut: @ 0x08031A74 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -102936,7 +102936,7 @@ sub_08031A74: @ 0x08031A74 lsrs r5, r5, #0x18 ldr r0, _08031AAC movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08031AB0 @@ -102954,9 +102954,9 @@ sub_08031A74: @ 0x08031A74 pop {r0} bx r0 .align 2, 0 -_08031AAC: .4byte sub_08031A08 +_08031AAC: .4byte Task_NewGameBirchSpeech_FadePlatformOut _08031AB0: .4byte gUnknown_3005B60 - thumb_func_end sub_08031A74 + thumb_func_end NewGameBirchSpeech_StartFadePlatformOut thumb_func_start sub_08031AB4 sub_08031AB4: @ 0x08031AB4 @@ -102964,10 +102964,10 @@ sub_08031AB4: @ 0x08031AB4 sub sp, #0xc ldr r0, _08031B18 movs r1, #0xdb - bl sub_08031DE4 + bl DrawMainMenuWindowBorder movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #0 bl sub_0800629C @@ -102983,7 +102983,7 @@ sub_08031AB4: @ 0x08031AB4 movs r0, #1 movs r1, #1 movs r3, #2 - bl sub_08198850 + bl PrintTextArray str r5, [sp] str r4, [sp, #4] movs r0, #0 @@ -102994,10 +102994,10 @@ sub_08031AB4: @ 0x08031AB4 movs r3, #2 bl sub_081984B0 movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -103007,19 +103007,19 @@ _08031B18: .4byte gUnknown_82D2918 _08031B1C: .4byte gUnknown_82D29A8 thumb_func_end sub_08031AB4 - thumb_func_start sub_08031B20 -sub_08031B20: @ 0x08031B20 + thumb_func_start NewGameBirchSpeech_ProcessGenderMenuInput +NewGameBirchSpeech_ProcessGenderMenuInput: @ 0x08031B20 push {lr} - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08031B20 + thumb_func_end NewGameBirchSpeech_ProcessGenderMenuInput - thumb_func_start sub_08031B30 -sub_08031B30: @ 0x08031B30 + thumb_func_start NewGameBirchSpeech_SetDefaultPlayerName +NewGameBirchSpeech_SetDefaultPlayerName: @ 0x08031B30 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -103062,7 +103062,7 @@ _08031B5C: .align 2, 0 _08031B7C: .4byte gUnknown_82D2A08 _08031B80: .4byte gUnknown_3005AF0 - thumb_func_end sub_08031B30 + thumb_func_end NewGameBirchSpeech_SetDefaultPlayerName thumb_func_start sub_08031B84 sub_08031B84: @ 0x08031B84 @@ -103071,7 +103071,7 @@ sub_08031B84: @ 0x08031B84 adds r4, r0, #0 movs r0, #7 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] str r0, [sp, #4] @@ -103083,13 +103083,13 @@ sub_08031B84: @ 0x08031B84 movs r3, #0 bl AddTextPrinterParameterized movs r0, #7 - bl sub_0800365C + bl PutWindowTilemap movs r0, #7 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08031BD8 ldr r1, _08031BDC - bl sub_08031DE4 + bl DrawMainMenuWindowBorder ldr r1, _08031BE0 movs r0, #0x40 bl SetGpuReg @@ -103130,7 +103130,7 @@ sub_08031C00: @ 0x08031C00 ldr r4, _08031C40 ldr r1, _08031C44 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08031C48 str r0, [sp] movs r0, #1 @@ -103141,7 +103141,7 @@ sub_08031C00: @ 0x08031C00 movs r1, #1 movs r2, #0 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4} pop {r0} @@ -103174,7 +103174,7 @@ sub_08031C4C: @ 0x08031C4C ldr r4, _08031CA4 ldr r1, _08031CA8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08031CAC str r0, [sp] movs r0, #1 @@ -103185,7 +103185,7 @@ sub_08031C4C: @ 0x08031C4C movs r1, #1 movs r2, #0x67 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4} pop {r0} @@ -103209,7 +103209,7 @@ sub_08031CB0: @ 0x08031CB0 lsrs r0, r0, #0x18 cmp r0, #1 bne _08031D0E - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _08031CD8 movs r0, #1 @@ -103219,7 +103219,7 @@ sub_08031CB0: @ 0x08031CB0 _08031CD4: .4byte 0x00000861 _08031CD8: movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount _08031CDE: lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -103230,7 +103230,7 @@ _08031CDE: ldr r4, _08031D1C ldr r1, _08031D20 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08031D24 str r0, [sp] movs r0, #1 @@ -103241,7 +103241,7 @@ _08031CDE: movs r1, #1 movs r2, #0 movs r3, #0x21 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _08031D0E: add sp, #0xc pop {r4} @@ -103283,7 +103283,7 @@ _08031D44: ldr r4, _08031D90 ldr r1, _08031D94 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08031D98 str r0, [sp] movs r0, #1 @@ -103294,7 +103294,7 @@ _08031D44: movs r1, #1 movs r2, #0x6f movs r3, #0x21 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4, r5} pop {r0} @@ -103308,8 +103308,8 @@ _08031D94: .4byte gUnknown_85CCCE1 _08031D98: .4byte gUnknown_82D2973 thumb_func_end sub_08031D28 - thumb_func_start sub_08031D9C -sub_08031D9C: @ 0x08031D9C + thumb_func_start LoadMainMenuWindowFrameTiles +LoadMainMenuWindowFrameTiles: @ 0x08031D9C push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -103321,7 +103321,7 @@ sub_08031D9C: @ 0x08031D9C ldr r0, [r6] ldrb r0, [r0, #0x14] lsrs r0, r0, #3 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r1, [r0] movs r2, #0x90 lsls r2, r2, #1 @@ -103331,20 +103331,20 @@ sub_08031D9C: @ 0x08031D9C ldr r0, [r6] ldrb r0, [r0, #0x14] lsrs r0, r0, #3 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r0, [r0, #4] movs r1, #0x20 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08031DE0: .4byte gUnknown_3005AF0 - thumb_func_end sub_08031D9C + thumb_func_end LoadMainMenuWindowFrameTiles - thumb_func_start sub_08031DE4 -sub_08031DE4: @ 0x08031DE4 + thumb_func_start DrawMainMenuWindowBorder +DrawMainMenuWindowBorder: @ 0x08031DE4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -103505,7 +103505,7 @@ sub_08031DE4: @ 0x08031DE4 adds r1, r6, #0 bl FillBgTilemapBufferRect ldrb r0, [r4] - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x1c pop {r3, r4, r5} mov r8, r3 @@ -103514,10 +103514,10 @@ sub_08031DE4: @ 0x08031DE4 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08031DE4 + thumb_func_end DrawMainMenuWindowBorder - thumb_func_start sub_08031F48 -sub_08031F48: @ 0x08031F48 + thumb_func_start ClearMainMenuWindowTilemap +ClearMainMenuWindowTilemap: @ 0x08031F48 push {r4, r5, r6, lr} sub sp, #0xc adds r6, r0, #0 @@ -103547,15 +103547,15 @@ sub_08031F48: @ 0x08031F48 movs r1, #0 bl FillBgTilemapBufferRect ldrb r0, [r6] - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08031F48 + thumb_func_end ClearMainMenuWindowTilemap - thumb_func_start sub_08031F90 -sub_08031F90: @ 0x08031F90 + thumb_func_start NewGameBirchSpeech_ClearGenderWindowTilemap +NewGameBirchSpeech_ClearGenderWindowTilemap: @ 0x08031F90 push {r4, r5, lr} sub sp, #0xc adds r4, r1, #0 @@ -103591,7 +103591,7 @@ sub_08031F90: @ 0x08031F90 pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08031F90 + thumb_func_end NewGameBirchSpeech_ClearGenderWindowTilemap thumb_func_start sub_08031FD8 sub_08031FD8: @ 0x08031FD8 @@ -103603,27 +103603,27 @@ sub_08031FD8: @ 0x08031FD8 lsrs r4, r4, #0x18 ldr r1, _0803200C adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_08003774 + bl ClearWindowTilemap cmp r4, #1 bne _08032006 adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08032006: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0803200C: .4byte sub_08031F90 +_0803200C: .4byte NewGameBirchSpeech_ClearGenderWindowTilemap thumb_func_end sub_08031FD8 - thumb_func_start sub_08032010 -sub_08032010: @ 0x08032010 + thumb_func_start NewGameBirchSpeech_ClearWindow +NewGameBirchSpeech_ClearWindow: @ 0x08032010 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -103634,7 +103634,7 @@ sub_08032010: @ 0x08032010 lsrs r6, r6, #0x18 movs r0, #1 movs r1, #6 - bl sub_080061B4 + bl GetFontAttribute mov sb, r0 mov r0, sb lsls r0, r0, #0x18 @@ -103642,7 +103642,7 @@ sub_08032010: @ 0x08032010 mov sb, r0 movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -103650,19 +103650,19 @@ sub_08032010: @ 0x08032010 mov r8, r0 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 adds r0, r6, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r6, #0 movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -103677,7 +103677,7 @@ sub_08032010: @ 0x08032010 bl sub_08003A34 adds r0, r6, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #8 pop {r3, r4} mov r8, r3 @@ -103685,10 +103685,10 @@ sub_08032010: @ 0x08032010 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08032010 + thumb_func_end NewGameBirchSpeech_ClearWindow - thumb_func_start sub_08032098 -sub_08032098: @ 0x08032098 + thumb_func_start NewGameBirchSpeech_ShowPokeBallPrinterCallback +NewGameBirchSpeech_ShowPokeBallPrinterCallback: @ 0x08032098 push {lr} ldr r0, [r0] subs r0, #2 @@ -103703,17 +103703,17 @@ sub_08032098: @ 0x08032098 strb r0, [r1] ldr r0, _080320C0 movs r1, #0 - bl sub_080A8878 + bl CreateTask _080320B8: pop {r0} bx r0 .align 2, 0 _080320BC: .4byte gUnknown_20229B8 -_080320C0: .4byte sub_080307B0 - thumb_func_end sub_08032098 +_080320C0: .4byte Task_NewGameBirchSpeechSub_InitPokeBall + thumb_func_end NewGameBirchSpeech_ShowPokeBallPrinterCallback - thumb_func_start sub_080320C4 -sub_080320C4: @ 0x080320C4 + thumb_func_start CreateYesNoMenuParameterized +CreateYesNoMenuParameterized: @ 0x080320C4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -103772,7 +103772,7 @@ sub_080320C4: @ 0x080320C4 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080320C4 + thumb_func_end CreateYesNoMenuParameterized thumb_func_start sub_0803213C sub_0803213C: @ 0x0803213C @@ -103784,17 +103784,17 @@ sub_0803213C: @ 0x0803213C lsrs r4, r4, #0x18 ldr r1, _08032170 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _0803216A adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0803216A: pop {r4, r5} pop {r0} @@ -104178,8 +104178,8 @@ _080324AC: .4byte 0x000008E9 _080324B0: .4byte 0x000008EA thumb_func_end sub_08032174 - thumb_func_start sub_080324B4 -sub_080324B4: @ 0x080324B4 + thumb_func_start Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox +Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox: @ 0x080324B4 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -104206,10 +104206,10 @@ _080324DC: .align 2, 0 _080324E4: .4byte gUnknown_3005B60 _080324E8: .4byte sub_08030E44 - thumb_func_end sub_080324B4 + thumb_func_end Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox - thumb_func_start sub_080324EC -sub_080324EC: @ 0x080324EC + thumb_func_start HandleLinkBattleSetup +HandleLinkBattleSetup: @ 0x080324EC push {lr} ldr r0, _08032524 ldr r0, [r0] @@ -104227,12 +104227,12 @@ _08032506: ldrb r0, [r0] cmp r0, #0 bne _08032512 - bl sub_080092D0 + bl OpenLink _08032512: ldr r0, _08032530 movs r1, #0 - bl sub_080A8878 - bl sub_080330DC + bl CreateTask + bl CreateTasksForSendRecvLinkBuffers _0803251E: pop {r0} bx r0 @@ -104241,10 +104241,10 @@ _08032524: .4byte gUnknown_2022C90 _08032528: .4byte gUnknown_300319C _0803252C: .4byte gUnknown_30031C4 _08032530: .4byte sub_080B3188 - thumb_func_end sub_080324EC + thumb_func_end HandleLinkBattleSetup - thumb_func_start sub_08032534 -sub_08032534: @ 0x08032534 + thumb_func_start SetUpBattleVarsAndBirchZigzagoon +SetUpBattleVarsAndBirchZigzagoon: @ 0x08032534 push {r4, r5, r6, r7, lr} sub sp, #0x14 ldr r0, _080325D0 @@ -104278,7 +104278,7 @@ _08032550: adds r1, r0, #0 cmp r1, #3 ble _08032550 - bl sub_080324EC + bl HandleLinkBattleSetup ldr r0, _080325EC movs r5, #0 str r5, [r0] @@ -104303,12 +104303,12 @@ _08032550: adds r0, r4, #0 movs r2, #2 movs r3, #0x20 - bl sub_08067730 + bl CreateMon str r5, [sp, #0x10] adds r0, r4, #0 movs r1, #0xc add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData _080325C0: ldr r0, _080325F8 str r5, [r0] @@ -104331,7 +104331,7 @@ _080325F0: .4byte gUnknown_2022C90 _080325F4: .4byte gUnknown_20243E8 _080325F8: .4byte gUnknown_2022C98 _080325FC: .4byte gUnknown_2023F30 - thumb_func_end sub_08032534 + thumb_func_end SetUpBattleVarsAndBirchZigzagoon thumb_func_start sub_08032600 sub_08032600: @ 0x08032600 @@ -104366,14 +104366,14 @@ _08032634: ands r0, r1 cmp r0, #0 beq _08032648 - bl sub_08032B58 + bl InitLinkBtlControllers b _0803264C .align 2, 0 _08032644: .4byte gUnknown_2022C90 _08032648: - bl sub_080326BC + bl InitSinglePlayerBtlControllers _0803264C: - bl sub_08032EE8 + bl SetBattlePartyIds ldr r0, _080326B0 ldr r0, [r0] movs r1, #0x40 @@ -104431,8 +104431,8 @@ _080326B4: .4byte gUnknown_2023D10 _080326B8: .4byte gUnknown_2024140 thumb_func_end sub_08032600 - thumb_func_start sub_080326BC -sub_080326BC: @ 0x080326BC + thumb_func_start InitSinglePlayerBtlControllers +InitSinglePlayerBtlControllers: @ 0x080326BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -105010,10 +105010,10 @@ _08032B4A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080326BC + thumb_func_end InitSinglePlayerBtlControllers - thumb_func_start sub_08032B58 -sub_08032B58: @ 0x08032B58 + thumb_func_start InitLinkBtlControllers +InitLinkBtlControllers: @ 0x08032B58 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -105213,7 +105213,7 @@ _08032D18: .4byte SetControllerToPlayer _08032D1C: .4byte gUnknown_2023D10 _08032D20: .4byte gUnknown_2023D12 _08032D24: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, [r4] @@ -105451,10 +105451,10 @@ _08032ED4: bx r0 .align 2, 0 _08032EE4: .4byte gUnknown_2023D10 - thumb_func_end sub_08032B58 + thumb_func_end InitLinkBtlControllers - thumb_func_start sub_08032EE8 -sub_08032EE8: @ 0x08032EE8 + thumb_func_start SetBattlePartyIds +SetBattlePartyIds: @ 0x08032EE8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -105505,24 +105505,24 @@ _08032F42: adds r4, r7, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08033008 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08033008 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 beq _08033008 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08033008 ldr r0, _08032F84 @@ -105543,7 +105543,7 @@ _08032F88: adds r4, r7, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08033008 adds r0, r4, #0 @@ -105556,25 +105556,25 @@ _08032FB0: adds r4, r7, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08033008 adds r0, r4, #0 movs r1, #0x41 _08032FC4: - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08033008 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 beq _08033008 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08033008 ldr r1, _08033004 @@ -105629,10 +105629,10 @@ _08033034: _08033044: .4byte gUnknown_2023D10 _08033048: .4byte gUnknown_2022C90 _0803304C: .4byte gUnknown_2023D12 - thumb_func_end sub_08032EE8 + thumb_func_end SetBattlePartyIds - thumb_func_start sub_08033050 -sub_08033050: @ 0x08033050 + thumb_func_start PrepareBufferDataTransfer +PrepareBufferDataTransfer: @ 0x08033050 push {r4, r5, r6, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -105704,14 +105704,14 @@ _080330CE: .align 2, 0 _080330D4: .4byte gUnknown_2023508 _080330D8: .4byte gUnknown_2023D08 - thumb_func_end sub_08033050 + thumb_func_end PrepareBufferDataTransfer - thumb_func_start sub_080330DC -sub_080330DC: @ 0x080330DC + thumb_func_start CreateTasksForSendRecvLinkBuffers +CreateTasksForSendRecvLinkBuffers: @ 0x080330DC push {r4, r5, r6, lr} ldr r0, _08033174 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r2, _08033178 strb r0, [r2] ldr r5, _0803317C @@ -105749,7 +105749,7 @@ sub_080330DC: @ 0x080330DC strh r4, [r0, #0x26] ldr r0, _08033180 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r2, _08033184 strb r0, [r2] ldrb r1, [r2] @@ -105782,13 +105782,13 @@ sub_080330DC: @ 0x080330DC pop {r0} bx r0 .align 2, 0 -_08033174: .4byte sub_0803330C +_08033174: .4byte Task_HandleSendLinkBuffersData _08033178: .4byte gUnknown_20229BC _0803317C: .4byte gUnknown_3005B60 -_08033180: .4byte sub_080335F4 +_08033180: .4byte Task_HandleCopyReceivedLinkBuffersData _08033184: .4byte gUnknown_20229BD _08033188: .4byte gUnknown_20229BE - thumb_func_end sub_080330DC + thumb_func_end CreateTasksForSendRecvLinkBuffers thumb_func_start PrepareBufferDataTransferLink PrepareBufferDataTransferLink: @ 0x0803318C @@ -105982,8 +105982,8 @@ _08033304: .4byte gUnknown_2023EB4 _08033308: .4byte gUnknown_2023EB2 thumb_func_end PrepareBufferDataTransferLink - thumb_func_start sub_0803330C -sub_0803330C: @ 0x0803330C + thumb_func_start Task_HandleSendLinkBuffersData +Task_HandleSendLinkBuffersData: @ 0x0803330C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -106076,14 +106076,14 @@ _080333B4: _080333C0: adds r5, r0, #0 _080333C2: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r5 bhs _080333D0 b _080334D8 _080333D0: - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 beq _080333F4 @@ -106158,7 +106158,7 @@ _08033438: ldr r1, [r5] adds r1, r1, r2 adds r2, r6, #0 - bl sub_0800A070 + bl SendBlock ldrh r0, [r4, #0x1e] adds r0, #1 strh r0, [r4, #0x1e] @@ -106170,7 +106170,7 @@ _08033478: strh r0, [r2, #0x22] b _080334D8 _0803347E: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080334D8 @@ -106220,7 +106220,7 @@ _080334D8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0803330C + thumb_func_end Task_HandleSendLinkBuffersData thumb_func_start sub_080334E0 sub_080334E0: @ 0x080334E0 @@ -106249,7 +106249,7 @@ _0803350C: .4byte gUnknown_30031C4 _08033510: .4byte gUnknown_2022C90 _08033514: .4byte gUnknown_202207C _08033518: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080335E0 @@ -106262,7 +106262,7 @@ _08033518: cmp r0, #0 beq _080335BE adds r0, r4, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag lsls r0, r4, #8 mov r4, sl adds r3, r0, r4 @@ -106338,7 +106338,7 @@ _080335BE: lsls r0, r1, #0x18 lsrs r4, r0, #0x18 _080335C4: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -106359,8 +106359,8 @@ _080335EC: .4byte gUnknown_20229BD _080335F0: .4byte gUnknown_2024148 thumb_func_end sub_080334E0 - thumb_func_start sub_080335F4 -sub_080335F4: @ 0x080335F4 + thumb_func_start Task_HandleCopyReceivedLinkBuffersData +Task_HandleCopyReceivedLinkBuffersData: @ 0x080335F4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -106526,7 +106526,7 @@ _08033734: _08033740: .4byte gUnknown_2023D0C _08033744: .4byte gUnknown_82FACB4 _08033748: .4byte gUnknown_3005B60 - thumb_func_end sub_080335F4 + thumb_func_end Task_HandleCopyReceivedLinkBuffersData thumb_func_start BtlController_EmitGetMonData BtlController_EmitGetMonData: @ 0x0803374C @@ -106541,7 +106541,7 @@ BtlController_EmitGetMonData: @ 0x0803374C strb r2, [r1, #2] strb r3, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 @@ -106563,7 +106563,7 @@ BtlController_EmitGetRawMonData: @ 0x08033770 strb r2, [r1, #2] strb r4, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5} pop {r0} bx r0 @@ -106600,7 +106600,7 @@ _080337B8: _080337C6: adds r2, r5, #3 adds r0, r6, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 @@ -106637,7 +106637,7 @@ _08033804: adds r2, r4, #3 adds r0, r6, #0 adds r1, r5, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 @@ -106656,7 +106656,7 @@ BtlController_EmitLoadMonSprite: @ 0x08033818 strb r2, [r1, #1] strb r2, [r1, #2] strb r2, [r1, #3] - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106676,7 +106676,7 @@ BtlController_EmitSwitchInAnim: @ 0x08033838 strb r2, [r1, #2] strb r3, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 @@ -106695,7 +106695,7 @@ BtlController_EmitReturnMonToBall: @ 0x0803385C strb r2, [r1] strb r3, [r1, #1] movs r2, #2 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106714,7 +106714,7 @@ BtlController_EmitDrawTrainerPic: @ 0x0803387C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106733,7 +106733,7 @@ BtlController_EmitTrainerSlide: @ 0x0803389C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106752,7 +106752,7 @@ BtlController_EmitTrainerSlideBack: @ 0x080338BC strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106771,7 +106771,7 @@ BtlController_EmitFaintAnimation: @ 0x080338DC strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106790,7 +106790,7 @@ BtlController_EmitPaletteFade: @ 0x080338FC strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106809,7 +106809,7 @@ BtlController_EmitSuccessBallThrowAnim: @ 0x0803391C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106827,7 +106827,7 @@ BtlController_EmitBallThrowAnim: @ 0x0803393C strb r2, [r1] strb r3, [r1, #1] movs r2, #2 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 @@ -106866,7 +106866,7 @@ _0803398A: adds r2, #2 adds r0, r6, #0 adds r1, r5, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 @@ -106874,8 +106874,8 @@ _0803398A: _080339A0: .4byte gUnknown_20229C4 thumb_func_end BtlController_EmitPause - thumb_func_start sub_080339A4 -sub_080339A4: @ 0x080339A4 + thumb_func_start BtlController_EmitMoveAnimation +BtlController_EmitMoveAnimation: @ 0x080339A4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -106927,7 +106927,7 @@ sub_080339A4: @ 0x080339A4 movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -106937,7 +106937,7 @@ sub_080339A4: @ 0x080339A4 movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _08033A44 @@ -106970,7 +106970,7 @@ _08033A4E: mov r0, sb adds r1, r4, #0 movs r2, #0x2c - bl sub_08033050 + bl PrepareBufferDataTransfer add sp, #4 pop {r3, r4} mov r8, r3 @@ -106980,10 +106980,10 @@ _08033A4E: bx r0 .align 2, 0 _08033A78: .4byte gUnknown_20229C4 - thumb_func_end sub_080339A4 + thumb_func_end BtlController_EmitMoveAnimation - thumb_func_start sub_08033A7C -sub_08033A7C: @ 0x08033A7C + thumb_func_start BtlController_EmitPrintSelectionString +BtlController_EmitPrintSelectionString: @ 0x08033A7C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -107077,7 +107077,7 @@ _08033B16: mov r0, r8 adds r1, r7, #0 movs r2, #0x34 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -107097,7 +107097,7 @@ _08033B64: .4byte gUnknown_82ED220 _08033B68: .4byte gUnknown_2023D28 _08033B6C: .4byte gUnknown_2022C0C _08033B70: .4byte gUnknown_2022C1C - thumb_func_end sub_08033A7C + thumb_func_end BtlController_EmitPrintSelectionString thumb_func_start sub_08033B74 sub_08033B74: @ 0x08033B74 @@ -107176,7 +107176,7 @@ _08033BEA: mov r0, r8 adds r1, r7, #0 movs r2, #0x34 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -107195,8 +107195,8 @@ _08033C34: .4byte gUnknown_2022C0C _08033C38: .4byte gUnknown_2022C1C thumb_func_end sub_08033B74 - thumb_func_start sub_08033C3C -sub_08033C3C: @ 0x08033C3C + thumb_func_start BtlController_EmitChooseAction +BtlController_EmitChooseAction: @ 0x08033C3C push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -107211,16 +107211,16 @@ sub_08033C3C: @ 0x08033C3C lsrs r2, r2, #8 strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08033C64: .4byte gUnknown_20229C4 - thumb_func_end sub_08033C3C + thumb_func_end BtlController_EmitChooseAction - thumb_func_start sub_08033C68 -sub_08033C68: @ 0x08033C68 + thumb_func_start BtlController_EmitUnknownYesNoBox +BtlController_EmitUnknownYesNoBox: @ 0x08033C68 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107231,15 +107231,15 @@ sub_08033C68: @ 0x08033C68 strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08033C84: .4byte gUnknown_20229C4 - thumb_func_end sub_08033C68 + thumb_func_end BtlController_EmitUnknownYesNoBox - thumb_func_start sub_08033C88 -sub_08033C88: @ 0x08033C88 + thumb_func_start BtlController_EmitChooseMove +BtlController_EmitChooseMove: @ 0x08033C88 push {r4, r5, r6, lr} adds r5, r3, #0 lsls r0, r0, #0x18 @@ -107264,16 +107264,16 @@ _08033CA4: bls _08033CA4 adds r0, r6, #0 movs r2, #0x18 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033CC0: .4byte gUnknown_20229C4 - thumb_func_end sub_08033C88 + thumb_func_end BtlController_EmitChooseMove - thumb_func_start sub_08033CC4 -sub_08033CC4: @ 0x08033CC4 + thumb_func_start BtlController_EmitChooseItem +BtlController_EmitChooseItem: @ 0x08033CC4 push {r4, r5, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -107293,16 +107293,16 @@ _08033CD6: ble _08033CD6 adds r0, r5, #0 movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08033CF4: .4byte gUnknown_20229C4 - thumb_func_end sub_08033CC4 + thumb_func_end BtlController_EmitChooseItem - thumb_func_start sub_08033CF8 -sub_08033CF8: @ 0x08033CF8 + thumb_func_start BtlController_EmitChoosePokemon +BtlController_EmitChoosePokemon: @ 0x08033CF8 push {r4, r5, r6, lr} ldr r6, [sp, #0x10] lsls r0, r0, #0x18 @@ -107326,16 +107326,16 @@ _08033D12: ble _08033D12 adds r0, r5, #0 movs r2, #8 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033D30: .4byte gUnknown_20229C4 - thumb_func_end sub_08033CF8 + thumb_func_end BtlController_EmitChoosePokemon - thumb_func_start sub_08033D34 -sub_08033D34: @ 0x08033D34 + thumb_func_start BtlController_EmitCmd23 +BtlController_EmitCmd23: @ 0x08033D34 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107346,15 +107346,15 @@ sub_08033D34: @ 0x08033D34 strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08033D50: .4byte gUnknown_20229C4 - thumb_func_end sub_08033D34 + thumb_func_end BtlController_EmitCmd23 - thumb_func_start sub_08033D54 -sub_08033D54: @ 0x08033D54 + thumb_func_start BtlController_EmitHealthBarUpdate +BtlController_EmitHealthBarUpdate: @ 0x08033D54 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107375,16 +107375,16 @@ sub_08033D54: @ 0x08033D54 strb r1, [r3, #3] adds r1, r3, #0 movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08033D88: .4byte gUnknown_20229C4 - thumb_func_end sub_08033D54 + thumb_func_end BtlController_EmitHealthBarUpdate - thumb_func_start sub_08033D8C -sub_08033D8C: @ 0x08033D8C + thumb_func_start BtlController_EmitExpUpdate +BtlController_EmitExpUpdate: @ 0x08033D8C push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -107404,16 +107404,16 @@ sub_08033D8C: @ 0x08033D8C asrs r2, r2, #8 strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08033DBC: .4byte gUnknown_20229C4 - thumb_func_end sub_08033D8C + thumb_func_end BtlController_EmitExpUpdate - thumb_func_start sub_08033DC0 -sub_08033DC0: @ 0x08033DC0 + thumb_func_start BtlController_EmitStatusIconUpdate +BtlController_EmitStatusIconUpdate: @ 0x08033DC0 push {r4, r5, r6, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -107448,16 +107448,16 @@ sub_08033DC0: @ 0x08033DC0 lsrs r2, r2, #0x18 strb r2, [r1, #8] movs r2, #9 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033E10: .4byte gUnknown_20229C4 - thumb_func_end sub_08033DC0 + thumb_func_end BtlController_EmitStatusIconUpdate - thumb_func_start sub_08033E14 -sub_08033E14: @ 0x08033E14 + thumb_func_start BtlController_EmitStatusAnimation +BtlController_EmitStatusAnimation: @ 0x08033E14 push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -107480,16 +107480,16 @@ sub_08033E14: @ 0x08033E14 lsrs r2, r2, #0x18 strb r2, [r1, #5] movs r2, #6 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08033E4C: .4byte gUnknown_20229C4 - thumb_func_end sub_08033E14 + thumb_func_end BtlController_EmitStatusAnimation - thumb_func_start sub_08033E50 -sub_08033E50: @ 0x08033E50 + thumb_func_start BtlController_EmitStatusXor +BtlController_EmitStatusXor: @ 0x08033E50 push {lr} adds r3, r1, #0 lsls r0, r0, #0x18 @@ -107499,15 +107499,15 @@ sub_08033E50: @ 0x08033E50 strb r2, [r1] strb r3, [r1, #1] movs r2, #2 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08033E6C: .4byte gUnknown_20229C4 - thumb_func_end sub_08033E50 + thumb_func_end BtlController_EmitStatusXor - thumb_func_start sub_08033E70 -sub_08033E70: @ 0x08033E70 + thumb_func_start BtlController_EmitDataTransfer +BtlController_EmitDataTransfer: @ 0x08033E70 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -107539,16 +107539,16 @@ _08033EA0: lsrs r2, r2, #0x10 adds r0, r6, #0 adds r1, r5, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033EB4: .4byte gUnknown_20229C4 - thumb_func_end sub_08033E70 + thumb_func_end BtlController_EmitDataTransfer - thumb_func_start sub_08033EB8 -sub_08033EB8: @ 0x08033EB8 + thumb_func_start BtlController_EmitDMA3Transfer +BtlController_EmitDMA3Transfer: @ 0x08033EB8 push {r4, r5, r6, lr} adds r4, r3, #0 lsls r0, r0, #0x18 @@ -107595,16 +107595,16 @@ _08033F08: lsls r2, r2, #0x10 lsrs r2, r2, #0x10 adds r0, r6, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033F1C: .4byte gUnknown_20229C4 - thumb_func_end sub_08033EB8 + thumb_func_end BtlController_EmitDMA3Transfer - thumb_func_start sub_08033F20 -sub_08033F20: @ 0x08033F20 + thumb_func_start BtlController_EmitPlayBGM +BtlController_EmitPlayBGM: @ 0x08033F20 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -107635,16 +107635,16 @@ _08033F4E: lsrs r2, r2, #0x10 adds r0, r6, #0 adds r1, r5, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033F64: .4byte gUnknown_20229C4 - thumb_func_end sub_08033F20 + thumb_func_end BtlController_EmitPlayBGM - thumb_func_start sub_08033F68 -sub_08033F68: @ 0x08033F68 + thumb_func_start BtlController_EmitCmd32 +BtlController_EmitCmd32: @ 0x08033F68 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -107675,16 +107675,16 @@ _08033F96: lsrs r2, r2, #0x10 adds r0, r6, #0 adds r1, r5, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08033FAC: .4byte gUnknown_20229C4 - thumb_func_end sub_08033F68 + thumb_func_end BtlController_EmitCmd32 - thumb_func_start sub_08033FB0 -sub_08033FB0: @ 0x08033FB0 + thumb_func_start BtlController_EmitTwoReturnValues +BtlController_EmitTwoReturnValues: @ 0x08033FB0 push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -107699,16 +107699,16 @@ sub_08033FB0: @ 0x08033FB0 lsrs r2, r2, #8 strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08033FD8: .4byte gUnknown_20229C4 - thumb_func_end sub_08033FB0 + thumb_func_end BtlController_EmitTwoReturnValues - thumb_func_start sub_08033FDC -sub_08033FDC: @ 0x08033FDC + thumb_func_start BtlController_EmitChosenMonReturnValue +BtlController_EmitChosenMonReturnValue: @ 0x08033FDC push {r4, r5, lr} adds r4, r2, #0 lsls r0, r0, #0x18 @@ -107730,16 +107730,16 @@ _08033FF0: adds r0, r5, #0 adds r1, r2, #0 movs r2, #5 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08034010: .4byte gUnknown_20229C4 - thumb_func_end sub_08033FDC + thumb_func_end BtlController_EmitChosenMonReturnValue - thumb_func_start sub_08034014 -sub_08034014: @ 0x08034014 + thumb_func_start BtlController_EmitOneReturnValue +BtlController_EmitOneReturnValue: @ 0x08034014 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107755,16 +107755,16 @@ sub_08034014: @ 0x08034014 strb r4, [r3, #3] adds r1, r3, #0 movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _0803403C: .4byte gUnknown_20229C4 - thumb_func_end sub_08034014 + thumb_func_end BtlController_EmitOneReturnValue - thumb_func_start sub_08034040 -sub_08034040: @ 0x08034040 + thumb_func_start BtlController_EmitOneReturnValue_Duplicate +BtlController_EmitOneReturnValue_Duplicate: @ 0x08034040 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107780,16 +107780,16 @@ sub_08034040: @ 0x08034040 strb r4, [r3, #3] adds r1, r3, #0 movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08034068: .4byte gUnknown_20229C4 - thumb_func_end sub_08034040 + thumb_func_end BtlController_EmitOneReturnValue_Duplicate - thumb_func_start sub_0803406C -sub_0803406C: @ 0x0803406C + thumb_func_start BtlController_EmitCmd37 +BtlController_EmitCmd37: @ 0x0803406C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107800,15 +107800,15 @@ sub_0803406C: @ 0x0803406C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08034088: .4byte gUnknown_20229C4 - thumb_func_end sub_0803406C + thumb_func_end BtlController_EmitCmd37 - thumb_func_start sub_0803408C -sub_0803408C: @ 0x0803408C + thumb_func_start BtlController_EmitCmd38 +BtlController_EmitCmd38: @ 0x0803408C push {lr} adds r3, r1, #0 lsls r0, r0, #0x18 @@ -107818,15 +107818,15 @@ sub_0803408C: @ 0x0803408C strb r2, [r1] strb r3, [r1, #1] movs r2, #2 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _080340A8: .4byte gUnknown_20229C4 - thumb_func_end sub_0803408C + thumb_func_end BtlController_EmitCmd38 - thumb_func_start sub_080340AC -sub_080340AC: @ 0x080340AC + thumb_func_start BtlController_EmitCmd39 +BtlController_EmitCmd39: @ 0x080340AC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107837,15 +107837,15 @@ sub_080340AC: @ 0x080340AC strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _080340C8: .4byte gUnknown_20229C4 - thumb_func_end sub_080340AC + thumb_func_end BtlController_EmitCmd39 - thumb_func_start sub_080340CC -sub_080340CC: @ 0x080340CC + thumb_func_start BtlController_EmitCmd40 +BtlController_EmitCmd40: @ 0x080340CC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107856,15 +107856,15 @@ sub_080340CC: @ 0x080340CC strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _080340E8: .4byte gUnknown_20229C4 - thumb_func_end sub_080340CC + thumb_func_end BtlController_EmitCmd40 - thumb_func_start sub_080340EC -sub_080340EC: @ 0x080340EC + thumb_func_start BtlController_EmitHitAnimation +BtlController_EmitHitAnimation: @ 0x080340EC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107875,12 +107875,12 @@ sub_080340EC: @ 0x080340EC strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08034108: .4byte gUnknown_20229C4 - thumb_func_end sub_080340EC + thumb_func_end BtlController_EmitHitAnimation thumb_func_start sub_0803410C sub_0803410C: @ 0x0803410C @@ -107894,15 +107894,15 @@ sub_0803410C: @ 0x0803410C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08034128: .4byte gUnknown_20229C4 thumb_func_end sub_0803410C - thumb_func_start sub_0803412C -sub_0803412C: @ 0x0803412C + thumb_func_start BtlController_EmitPlaySE +BtlController_EmitPlaySE: @ 0x0803412C push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107918,16 +107918,16 @@ sub_0803412C: @ 0x0803412C strb r4, [r3, #3] adds r1, r3, #0 movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08034154: .4byte gUnknown_20229C4 - thumb_func_end sub_0803412C + thumb_func_end BtlController_EmitPlaySE - thumb_func_start sub_08034158 -sub_08034158: @ 0x08034158 + thumb_func_start BtlController_EmitPlayFanfareOrBGM +BtlController_EmitPlayFanfareOrBGM: @ 0x08034158 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107942,16 +107942,16 @@ sub_08034158: @ 0x08034158 strb r2, [r4, #3] adds r1, r4, #0 movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _08034180: .4byte gUnknown_20229C4 - thumb_func_end sub_08034158 + thumb_func_end BtlController_EmitPlayFanfareOrBGM - thumb_func_start sub_08034184 -sub_08034184: @ 0x08034184 + thumb_func_start BtlController_EmitFaintingCry +BtlController_EmitFaintingCry: @ 0x08034184 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107962,15 +107962,15 @@ sub_08034184: @ 0x08034184 strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _080341A0: .4byte gUnknown_20229C4 - thumb_func_end sub_08034184 + thumb_func_end BtlController_EmitFaintingCry - thumb_func_start sub_080341A4 -sub_080341A4: @ 0x080341A4 + thumb_func_start BtlController_EmitIntroSlide +BtlController_EmitIntroSlide: @ 0x080341A4 push {lr} adds r3, r1, #0 lsls r0, r0, #0x18 @@ -107980,15 +107980,15 @@ sub_080341A4: @ 0x080341A4 strb r2, [r1] strb r3, [r1, #1] movs r2, #2 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _080341C0: .4byte gUnknown_20229C4 - thumb_func_end sub_080341A4 + thumb_func_end BtlController_EmitIntroSlide - thumb_func_start sub_080341C4 -sub_080341C4: @ 0x080341C4 + thumb_func_start BtlController_EmitIntroTrainerBallThrow +BtlController_EmitIntroTrainerBallThrow: @ 0x080341C4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -107999,15 +107999,15 @@ sub_080341C4: @ 0x080341C4 strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _080341E0: .4byte gUnknown_20229C4 - thumb_func_end sub_080341C4 + thumb_func_end BtlController_EmitIntroTrainerBallThrow - thumb_func_start sub_080341E4 -sub_080341E4: @ 0x080341E4 + thumb_func_start BtlController_EmitDrawPartyStatusSummary +BtlController_EmitDrawPartyStatusSummary: @ 0x080341E4 push {r4, r5, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -108038,16 +108038,16 @@ _0803420C: ble _0803420C adds r0, r5, #0 movs r2, #0x34 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08034228: .4byte gUnknown_20229C4 - thumb_func_end sub_080341E4 + thumb_func_end BtlController_EmitDrawPartyStatusSummary - thumb_func_start sub_0803422C -sub_0803422C: @ 0x0803422C + thumb_func_start BtlController_EmitHidePartyStatusSummary +BtlController_EmitHidePartyStatusSummary: @ 0x0803422C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -108058,15 +108058,15 @@ sub_0803422C: @ 0x0803422C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08034248: .4byte gUnknown_20229C4 - thumb_func_end sub_0803422C + thumb_func_end BtlController_EmitHidePartyStatusSummary - thumb_func_start sub_0803424C -sub_0803424C: @ 0x0803424C + thumb_func_start BtlController_EmitEndBounceEffect +BtlController_EmitEndBounceEffect: @ 0x0803424C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -108077,15 +108077,15 @@ sub_0803424C: @ 0x0803424C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _08034268: .4byte gUnknown_20229C4 - thumb_func_end sub_0803424C + thumb_func_end BtlController_EmitEndBounceEffect - thumb_func_start sub_0803426C -sub_0803426C: @ 0x0803426C + thumb_func_start BtlController_EmitSpriteInvisibility +BtlController_EmitSpriteInvisibility: @ 0x0803426C push {lr} adds r3, r1, #0 lsls r0, r0, #0x18 @@ -108097,15 +108097,15 @@ sub_0803426C: @ 0x0803426C strb r2, [r1, #2] strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _0803428C: .4byte gUnknown_20229C4 - thumb_func_end sub_0803426C + thumb_func_end BtlController_EmitSpriteInvisibility - thumb_func_start sub_08034290 -sub_08034290: @ 0x08034290 + thumb_func_start BtlController_EmitBattleAnimation +BtlController_EmitBattleAnimation: @ 0x08034290 push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -108120,16 +108120,16 @@ sub_08034290: @ 0x08034290 lsrs r2, r2, #8 strb r2, [r1, #3] movs r2, #4 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4} pop {r0} bx r0 .align 2, 0 _080342B8: .4byte gUnknown_20229C4 - thumb_func_end sub_08034290 + thumb_func_end BtlController_EmitBattleAnimation - thumb_func_start sub_080342BC -sub_080342BC: @ 0x080342BC + thumb_func_start BtlController_EmitLinkStandbyMsg +BtlController_EmitLinkStandbyMsg: @ 0x080342BC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -108156,16 +108156,16 @@ _080342E8: ldrb r2, [r1, #2] adds r2, #4 adds r0, r5, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080342FC: .4byte gUnknown_20229C4 - thumb_func_end sub_080342BC + thumb_func_end BtlController_EmitLinkStandbyMsg - thumb_func_start sub_08034300 -sub_08034300: @ 0x08034300 + thumb_func_start BtlController_EmitResetActionMoveSelection +BtlController_EmitResetActionMoveSelection: @ 0x08034300 push {lr} adds r3, r1, #0 lsls r0, r0, #0x18 @@ -108175,15 +108175,15 @@ sub_08034300: @ 0x08034300 strb r2, [r1] strb r3, [r1, #1] movs r2, #2 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r0} bx r0 .align 2, 0 _0803431C: .4byte gUnknown_20229C4 - thumb_func_end sub_08034300 + thumb_func_end BtlController_EmitResetActionMoveSelection - thumb_func_start sub_08034320 -sub_08034320: @ 0x08034320 + thumb_func_start BtlController_EmitCmd55 +BtlController_EmitCmd55: @ 0x08034320 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -108212,7 +108212,7 @@ sub_08034320: @ 0x08034320 adds r2, #6 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08033050 + bl PrepareBufferDataTransfer pop {r4, r5} pop {r0} bx r0 @@ -108220,7 +108220,7 @@ sub_08034320: @ 0x08034320 _08034364: .4byte gUnknown_20229C4 _08034368: .4byte gUnknown_3005AF0 _0803436C: .4byte 0x00000CA9 - thumb_func_end sub_08034320 + thumb_func_end BtlController_EmitCmd55 thumb_func_start sub_08034370 sub_08034370: @ 0x08034370 @@ -108240,8 +108240,8 @@ sub_0803437C: @ 0x0803437C .align 2, 0 thumb_func_end sub_0803437C - thumb_func_start sub_08034388 -sub_08034388: @ 0x08034388 + thumb_func_start LoadCompressedSpriteSheet +LoadCompressedSpriteSheet: @ 0x08034388 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -108256,7 +108256,7 @@ sub_08034388: @ 0x08034388 orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #8 @@ -108265,10 +108265,10 @@ sub_08034388: @ 0x08034388 bx r1 .align 2, 0 _080343B8: .4byte gUnknown_201C000 - thumb_func_end sub_08034388 + thumb_func_end LoadCompressedSpriteSheet - thumb_func_start sub_080343BC -sub_080343BC: @ 0x080343BC + thumb_func_start LoadCompressedSpriteSheetOverrideBuffer +LoadCompressedSpriteSheetOverrideBuffer: @ 0x080343BC push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -108282,15 +108282,15 @@ sub_080343BC: @ 0x080343BC orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet add sp, #8 pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080343BC + thumb_func_end LoadCompressedSpriteSheetOverrideBuffer - thumb_func_start sub_080343E4 -sub_080343E4: @ 0x080343E4 + thumb_func_start LoadCompressedSpritePalette +LoadCompressedSpritePalette: @ 0x080343E4 push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -108314,10 +108314,10 @@ sub_080343E4: @ 0x080343E4 .align 2, 0 _08034410: .4byte gUnknown_201C000 _08034414: .4byte 0xFFFF0000 - thumb_func_end sub_080343E4 + thumb_func_end LoadCompressedSpritePalette - thumb_func_start sub_08034418 -sub_08034418: @ 0x08034418 + thumb_func_start LoadCompressedSpritePaletteOverrideBuffer +LoadCompressedSpritePaletteOverrideBuffer: @ 0x08034418 push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -108339,10 +108339,10 @@ sub_08034418: @ 0x08034418 bx r0 .align 2, 0 _08034444: .4byte 0xFFFF0000 - thumb_func_end sub_08034418 + thumb_func_end LoadCompressedSpritePaletteOverrideBuffer - thumb_func_start sub_08034448 -sub_08034448: @ 0x08034448 + thumb_func_start DecompressPicFromTable +DecompressPicFromTable: @ 0x08034448 push {r4, r5, lr} adds r3, r0, #0 adds r4, r1, #0 @@ -108364,12 +108364,12 @@ _08034468: _08034470: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08034A88 + bl DuplicateDeoxysTiles pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08034448 + thumb_func_end DecompressPicFromTable thumb_func_start HandleLoadSpecialPokePic HandleLoadSpecialPokePic: @ 0x08034480 @@ -108482,13 +108482,13 @@ _08034540: _08034548: adds r0, r4, #0 adds r1, r7, #0 - bl sub_08034A88 + bl DuplicateDeoxysTiles lsls r0, r7, #0x10 lsrs r0, r0, #0x10 adds r1, r5, #0 adds r2, r4, #0 mov r3, r8 - bl sub_0806D128 + bl DrawSpindaSpots pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -108496,14 +108496,14 @@ _08034548: bx r0 thumb_func_end sub_080344AC - thumb_func_start sub_08034568 -sub_08034568: @ 0x08034568 + thumb_func_start Unused_LZDecompressWramIndirect +Unused_LZDecompressWramIndirect: @ 0x08034568 push {lr} ldr r0, [r0] bl LZ77UnCompWram pop {r0} bx r0 - thumb_func_end sub_08034568 + thumb_func_end Unused_LZDecompressWramIndirect thumb_func_start sub_08034574 sub_08034574: @ 0x08034574 @@ -108846,8 +108846,8 @@ _080347BC: bx r0 thumb_func_end sub_08034574 - thumb_func_start sub_080347CC -sub_080347CC: @ 0x080347CC + thumb_func_start GetDecompressedDataSize +GetDecompressedDataSize: @ 0x080347CC adds r2, r0, #0 ldrb r0, [r2, #3] lsls r0, r0, #0x10 @@ -108858,17 +108858,17 @@ sub_080347CC: @ 0x080347CC orrs r0, r1 bx lr .align 2, 0 - thumb_func_end sub_080347CC + thumb_func_end GetDecompressedDataSize - thumb_func_start sub_080347E0 -sub_080347E0: @ 0x080347E0 + thumb_func_start LoadCompressedSpriteSheetUsingHeap +LoadCompressedSpriteSheetUsingHeap: @ 0x080347E0 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 ldr r0, [r4] ldr r0, [r0] lsrs r0, r0, #8 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 ldr r0, [r4] adds r1, r5, #0 @@ -108880,25 +108880,25 @@ sub_080347E0: @ 0x080347E0 orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r5, #0 - bl sub_08000BF0 + bl Free movs r0, #0 add sp, #8 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080347E0 + thumb_func_end LoadCompressedSpriteSheetUsingHeap - thumb_func_start sub_0803481C -sub_0803481C: @ 0x0803481C + thumb_func_start LoadCompressedSpritePaletteUsingHeap +LoadCompressedSpritePaletteUsingHeap: @ 0x0803481C push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 ldr r0, [r4] ldr r0, [r0] lsrs r0, r0, #8 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 ldr r0, [r4] adds r1, r5, #0 @@ -108913,7 +108913,7 @@ sub_0803481C: @ 0x0803481C mov r0, sp bl LoadSpritePalette adds r0, r5, #0 - bl sub_08000BF0 + bl Free movs r0, #0 add sp, #8 pop {r4, r5} @@ -108921,7 +108921,7 @@ sub_0803481C: @ 0x0803481C bx r1 .align 2, 0 _0803485C: .4byte 0xFFFF0000 - thumb_func_end sub_0803481C + thumb_func_end LoadCompressedSpritePaletteUsingHeap thumb_func_start sub_08034860 sub_08034860: @ 0x08034860 @@ -108946,7 +108946,7 @@ _08034880: _08034888: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08034A88 + bl DuplicateDeoxysTiles pop {r4, r5} pop {r0} bx r0 @@ -109038,13 +109038,13 @@ _0803492C: _08034934: adds r0, r4, #0 adds r1, r7, #0 - bl sub_08034A88 + bl DuplicateDeoxysTiles lsls r0, r7, #0x10 lsrs r0, r0, #0x10 adds r1, r5, #0 adds r2, r4, #0 mov r3, r8 - bl sub_0806D128 + bl DrawSpindaSpots pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -109078,8 +109078,8 @@ _0803496A: _0803497C: .4byte gUnknown_82DDA1C thumb_func_end HandleLoadSpecialPokePic_2 - thumb_func_start sub_08034980 -sub_08034980: @ 0x08034980 + thumb_func_start DecompressPicFromTable_DontHandleDeoxys +DecompressPicFromTable_DontHandleDeoxys: @ 0x08034980 push {lr} adds r3, r0, #0 movs r0, #0xce @@ -109099,7 +109099,7 @@ _080349A2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08034980 + thumb_func_end DecompressPicFromTable_DontHandleDeoxys thumb_func_start HandleLoadSpecialPokePic_DontHandleDeoxys HandleLoadSpecialPokePic_DontHandleDeoxys: @ 0x080349A8 @@ -109118,7 +109118,7 @@ _080349BE: str r1, [sp] adds r0, r4, #0 adds r1, r5, #0 - bl sub_080349D4 + bl LoadSpecialPokePic_DontHandleDeoxys add sp, #4 pop {r4, r5} pop {r0} @@ -109127,8 +109127,8 @@ _080349BE: _080349D0: .4byte gUnknown_82DDA1C thumb_func_end HandleLoadSpecialPokePic_DontHandleDeoxys - thumb_func_start sub_080349D4 -sub_080349D4: @ 0x080349D4 + thumb_func_start LoadSpecialPokePic_DontHandleDeoxys +LoadSpecialPokePic_DontHandleDeoxys: @ 0x080349D4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -109215,16 +109215,16 @@ _08034A70: adds r1, r4, #0 adds r2, r5, #0 mov r3, r8 - bl sub_0806D128 + bl DrawSpindaSpots pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080349D4 + thumb_func_end LoadSpecialPokePic_DontHandleDeoxys - thumb_func_start sub_08034A88 -sub_08034A88: @ 0x08034A88 + thumb_func_start DuplicateDeoxysTiles +DuplicateDeoxysTiles: @ 0x08034A88 push {lr} adds r3, r0, #0 movs r0, #0xcd @@ -109242,7 +109242,7 @@ _08034AA2: bx r0 .align 2, 0 _08034AA8: .4byte 0x04000200 - thumb_func_end sub_08034A88 + thumb_func_end DuplicateDeoxysTiles thumb_func_start sub_08034AAC sub_08034AAC: @ 0x08034AAC @@ -109273,7 +109273,7 @@ _08034AD0: cmp r0, #0 bne _08034AEC adds r0, r1, #0 - bl sub_08000BF0 + bl Free movs r0, #0 b _08034B18 _08034AEC: @@ -109335,11 +109335,11 @@ _08034B4A: ldr r0, _08034B68 ldr r0, [r0] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free _08034B54: ldr r4, _08034B68 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08034B60: @@ -109407,7 +109407,7 @@ sub_08034B6C: @ 0x08034B6C cmp r0, #0 beq _08034BEC adds r0, r1, #0 - bl sub_08008210 + bl LoadSpriteSheet b _08034C0C .align 2, 0 _08034BE4: .4byte gUnknown_2022AC4 @@ -109418,7 +109418,7 @@ _08034BEC: str r0, [sp] str r1, [sp, #4] ldr r0, [r2] - bl sub_080347CC + bl GetDecompressedDataSize lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, [sp, #4] @@ -109426,7 +109426,7 @@ _08034BEC: orrs r1, r0 str r1, [sp, #4] mov r0, sp - bl sub_08034388 + bl LoadCompressedSpriteSheet _08034C0C: ldr r1, [r6] ldr r1, [r1, #4] @@ -109453,7 +109453,7 @@ _08034C34: .4byte 0x0000FFFF _08034C38: ldr r0, [r5, #0xc] ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r6, _08034D50 ldr r1, [r6] ldr r1, [r1, #4] @@ -110277,7 +110277,7 @@ _0803526C: bne _0803526C _0803527E: adds r0, r4, #0 - bl sub_080353C8 + bl SharesTileWithAnyActive cmp r0, #0 bne _0803529A ldr r0, _080352CC @@ -110290,7 +110290,7 @@ _0803527E: bl FreeSpriteTilesByTag _0803529A: adds r0, r4, #0 - bl sub_0803540C + bl SharesPalWithAnyActive cmp r0, #0 bne _080352B6 ldr r0, _080352CC @@ -110457,8 +110457,8 @@ _080353C2: bx r1 thumb_func_end sub_08035370 - thumb_func_start sub_080353C8 -sub_080353C8: @ 0x080353C8 + thumb_func_start SharesTileWithAnyActive +SharesTileWithAnyActive: @ 0x080353C8 push {r4, r5, r6, lr} adds r3, r0, #0 movs r2, #0 @@ -110497,10 +110497,10 @@ _08035406: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080353C8 + thumb_func_end SharesTileWithAnyActive - thumb_func_start sub_0803540C -sub_0803540C: @ 0x0803540C + thumb_func_start SharesPalWithAnyActive +SharesPalWithAnyActive: @ 0x0803540C push {r4, r5, r6, lr} adds r3, r0, #0 movs r2, #0 @@ -110539,7 +110539,7 @@ _0803544A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0803540C + thumb_func_end SharesPalWithAnyActive thumb_func_start sub_08035450 sub_08035450: @ 0x08035450 @@ -110561,7 +110561,7 @@ sub_08035460: @ 0x08035460 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08035498 @@ -110575,7 +110575,7 @@ sub_08035460: @ 0x08035460 orrs r0, r2 strb r0, [r1] ldr r0, _0803549C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -110587,15 +110587,15 @@ _0803549C: .4byte sub_080354A0 thumb_func_start sub_080354A0 sub_080354A0: @ 0x080354A0 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080354A0 - thumb_func_start sub_080354B0 -sub_080354B0: @ 0x080354B0 + thumb_func_start BattleInitBgsAndWindows +BattleInitBgsAndWindows: @ 0x080354B0 push {r4, lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -110617,10 +110617,10 @@ sub_080354B0: @ 0x080354B0 ldr r4, _080354F8 ldr r1, [r4] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer b _08035502 .align 2, 0 _080354EC: .4byte gUnknown_82EB860 @@ -110639,7 +110639,7 @@ _08035502: lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08003090 + bl InitWindows bl sub_08004480 pop {r4} pop {r0} @@ -110647,7 +110647,7 @@ _08035502: .align 2, 0 _08035520: .4byte gUnknown_2024118 _08035524: .4byte gUnknown_82EB9F8 - thumb_func_end sub_080354B0 + thumb_func_end BattleInitBgsAndWindows thumb_func_start sub_08035528 sub_08035528: @ 0x08035528 @@ -110656,7 +110656,7 @@ sub_08035528: @ 0x08035528 bl DisableInterrupts movs r0, #0xc5 bl EnableInterrupts - bl sub_080354B0 + bl BattleInitBgsAndWindows movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -110675,8 +110675,8 @@ sub_08035528: @ 0x08035528 _08035560: .4byte 0x0000B040 thumb_func_end sub_08035528 - thumb_func_start sub_08035564 -sub_08035564: @ 0x08035564 + thumb_func_start LoadBattleMenuWindowGfx +LoadBattleMenuWindowGfx: @ 0x08035564 push {lr} movs r0, #2 movs r1, #0x12 @@ -110689,7 +110689,7 @@ sub_08035564: @ 0x08035564 ldr r0, _080355B8 movs r1, #0x50 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _080355BC ldr r0, [r0] movs r1, #0x80 @@ -110698,11 +110698,11 @@ sub_08035564: @ 0x08035564 cmp r0, #0 beq _080355B2 movs r0, #0x70 - bl sub_08197694 + bl Menu_LoadStdPalAt movs r0, #0 movs r1, #0x30 movs r2, #0x70 - bl sub_08098104 + bl LoadMessageBoxGfx ldr r0, _080355C0 adds r0, #0xec movs r1, #0 @@ -110718,10 +110718,10 @@ _080355B8: .4byte gUnknown_8D855E4 _080355BC: .4byte gUnknown_2022C90 _080355C0: .4byte gUnknown_20373B4 _080355C4: .4byte gUnknown_20378A0 - thumb_func_end sub_08035564 + thumb_func_end LoadBattleMenuWindowGfx - thumb_func_start sub_080355C8 -sub_080355C8: @ 0x080355C8 + thumb_func_start DrawMainBattleBackground +DrawMainBattleBackground: @ 0x080355C8 push {r4, r5, lr} ldr r0, _080355EC ldr r1, [r0] @@ -111008,7 +111008,7 @@ _08035894: _080358A6: movs r1, #0x20 movs r2, #0x60 - bl sub_080A11BC + bl LoadCompressedPalette b _080358DE .align 2, 0 _080358B0: .4byte gUnknown_8D7CD7C @@ -111026,7 +111026,7 @@ _080358C4: ldr r0, _080358F4 movs r1, #0x20 movs r2, #0x60 - bl sub_080A11BC + bl LoadCompressedPalette _080358DE: pop {r4, r5} pop {r0} @@ -111037,7 +111037,7 @@ _080358E8: .4byte 0x06008000 _080358EC: .4byte gUnknown_8D7CACC _080358F0: .4byte 0x0600D000 _080358F4: .4byte gUnknown_8D7CA90 - thumb_func_end sub_080355C8 + thumb_func_end DrawMainBattleBackground thumb_func_start sub_080358F8 sub_080358F8: @ 0x080358F8 @@ -111051,15 +111051,15 @@ sub_080358F8: @ 0x080358F8 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _08035934 movs r1, #0 movs r2, #0x40 - bl sub_080A11BC - bl sub_08035564 - bl sub_080355C8 + bl LoadCompressedPalette + bl LoadBattleMenuWindowGfx + bl DrawMainBattleBackground pop {r0} bx r0 .align 2, 0 @@ -111190,7 +111190,7 @@ _080359E6: mov r3, sb bl CopyToBgTilemapBufferRect_ChangePalette mov r0, r8 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08035A8A .align 2, 0 _08035A1C: .4byte 0x00006001 @@ -111247,7 +111247,7 @@ _08035A56: mov r3, sb bl CopyToBgTilemapBufferRect_ChangePalette mov r0, r8 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _08035A8A: add sp, #0x18 pop {r3, r4} @@ -111403,8 +111403,8 @@ _08035BC0: .4byte gUnknown_85ABC82 _08035BC4: .4byte gUnknown_85ABC88 thumb_func_end sub_08035AA0 - thumb_func_start sub_08035BC8 -sub_08035BC8: @ 0x08035BC8 + thumb_func_start UpdateFastPaletteFade +UpdateFastPaletteFade: @ 0x08035BC8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -111449,7 +111449,7 @@ _08035C00: _08035C12: add r0, sp, #4 adds r1, r4, #0 - bl sub_08008888 + bl StringCopy7 ldrh r0, [r4, #0x10] cmp r0, #1 beq _08035C4C @@ -111540,7 +111540,7 @@ _08035CBE: adds r4, #8 adds r1, r1, r4 add r0, sp, #4 - bl sub_08008888 + bl StringCopy7 add r0, sp, #4 movs r1, #0xf bl sub_0814FA04 @@ -111549,7 +111549,7 @@ _08035CBE: lsls r1, r1, #2 adds r1, r1, r4 add r0, sp, #4 - bl sub_08008888 + bl StringCopy7 add r0, sp, #4 movs r1, #0x10 bl sub_0814FA04 @@ -111598,7 +111598,7 @@ _08035D28: movs r1, #0x6f movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _08035DBC ldr r1, [r4] adds r1, #0x7d @@ -111607,7 +111607,7 @@ _08035D28: movs r1, #0x81 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #0x7e strb r0, [r1] @@ -111656,7 +111656,7 @@ _08035DC8: beq _08035E30 ldr r4, _08035E1C ldrh r0, [r5, #0xa] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -111671,7 +111671,7 @@ _08035DE2: strh r0, [r4] ldr r4, _08035E20 ldrh r0, [r5, #0xc] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -111700,7 +111700,7 @@ _08035E2C: .4byte gUnknown_2022AD2 _08035E30: ldr r4, _08035EC0 ldrh r0, [r5, #0xa] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -111727,7 +111727,7 @@ _08035E60: strh r0, [r4] ldr r4, _08035EC8 ldrh r0, [r5, #0xc] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -111786,7 +111786,7 @@ _08035EE0: movs r0, #0x78 bl sub_080A306C adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask ldr r4, _08035FA8 ldr r5, _08035FAC ldr r0, [r5] @@ -111887,10 +111887,10 @@ _08035FA8: .4byte gUnknown_20205AC _08035FAC: .4byte gUnknown_2024140 _08035FB0: .4byte 0x000003FF _08035FB4: .4byte 0xFFFFFC00 - thumb_func_end sub_08035BC8 + thumb_func_end UpdateFastPaletteFade - thumb_func_start sub_08035FB8 -sub_08035FB8: @ 0x08035FB8 + thumb_func_start DrawBattleEntryBackground +DrawBattleEntryBackground: @ 0x08035FB8 push {r4, r5, lr} ldr r0, _0803603C ldr r1, [r0] @@ -111907,11 +111907,11 @@ sub_08035FB8: @ 0x08035FB8 ldr r0, _08036050 movs r1, #0x60 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r1, _08036054 movs r0, #0xa bl SetGpuReg @@ -111920,16 +111920,16 @@ sub_08035FB8: @ 0x08035FB8 adds r1, r4, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #2 adds r1, r4, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0x48 movs r1, #0x36 bl SetGpuReg @@ -111943,7 +111943,7 @@ sub_08035FB8: @ 0x08035FB8 ldr r0, _08036064 strh r1, [r0] ldr r0, _08036068 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap b _0803620C .align 2, 0 _0803603C: .4byte gUnknown_2022C90 @@ -111990,25 +111990,25 @@ _080360AC: movs r0, #1 movs r1, #1 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute ldr r1, _080360E8 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _080360EC movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0803620C .align 2, 0 _080360E8: .4byte gUnknown_8D8578C @@ -112143,7 +112143,7 @@ _08036214: .4byte gUnknown_8D82178 _08036218: .4byte 0x06004000 _0803621C: .4byte gUnknown_8D82588 _08036220: .4byte 0x0600E000 - thumb_func_end sub_08035FB8 + thumb_func_end DrawBattleEntryBackground thumb_func_start sub_08036224 sub_08036224: @ 0x08036224 @@ -112182,9 +112182,9 @@ _0803626A: movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080365AC .align 2, 0 _08036280: .4byte gUnknown_8C00530 @@ -112192,7 +112192,7 @@ _08036284: ldr r0, _08036290 movs r1, #0 movs r2, #0x40 - bl sub_080A11BC + bl LoadCompressedPalette b _080365AC .align 2, 0 _08036290: .4byte gUnknown_8C004EC @@ -112570,12 +112570,12 @@ _08036594: _08036596: movs r1, #0x20 movs r2, #0x60 - bl sub_080A11BC + bl LoadCompressedPalette b _080365AC .align 2, 0 _080365A0: .4byte gUnknown_8D7CA90 _080365A4: - bl sub_08035564 + bl LoadBattleMenuWindowGfx b _080365AC _080365AA: movs r4, #1 @@ -112586,13 +112586,13 @@ _080365AC: bx r1 thumb_func_end sub_08036224 - thumb_func_start sub_080365B4 -sub_080365B4: @ 0x080365B4 + thumb_func_start CB2_InitBattle +CB2_InitBattle: @ 0x080365B4 push {lr} - bl sub_08076634 - bl sub_08056B38 - bl sub_0805CD34 - bl sub_0805EBD8 + bl MoveSaveBlocks_ResetHeap + bl AllocateBattleResources + bl GetSecretBaseMapName + bl AllocateMonSpritesGfx bl sub_08185CDC ldr r0, _080365E8 ldr r1, [r0] @@ -112605,7 +112605,7 @@ sub_080365B4: @ 0x080365B4 ands r0, r1 cmp r0, #0 beq _080365EC - bl sub_08036628 + bl CB2_InitBattleInternal b _0803660E .align 2, 0 _080365E8: .4byte gUnknown_2022C90 @@ -112615,38 +112615,38 @@ _080365EC: ands r1, r0 cmp r1, #0 bne _08036608 - bl sub_080324EC + bl HandleLinkBattleSetup ldr r0, _08036604 - bl sub_08000540 + bl SetMainCallback2 b _0803660E .align 2, 0 -_08036604: .4byte sub_0803782C +_08036604: .4byte CB2_PreInitMultiBattle _08036608: ldr r0, _08036618 - bl sub_08000540 + bl SetMainCallback2 _0803660E: ldr r1, _0803661C movs r0, #0 strb r0, [r1] b _08036624 .align 2, 0 -_08036618: .4byte sub_08037A7C +_08036618: .4byte CB2_PreInitIngamePlayerPartnerBattle _0803661C: .4byte gUnknown_2023FD6 _08036620: - bl sub_08036628 + bl CB2_InitBattleInternal _08036624: pop {r0} bx r0 - thumb_func_end sub_080365B4 + thumb_func_end CB2_InitBattle - thumb_func_start sub_08036628 -sub_08036628: @ 0x08036628 + thumb_func_start CB2_InitBattleInternal +CB2_InitBattleInternal: @ 0x08036628 push {r4, r5, lr} sub sp, #4 movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 str r0, [sp] movs r1, #0xc0 @@ -112708,7 +112708,7 @@ _080366C4: ldr r2, _080367A0 adds r1, r2, #0 strh r1, [r0] - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _080367A4 movs r3, #0xf0 movs r5, #0xf0 @@ -112742,7 +112742,7 @@ _080366FA: ldr r0, [r4] ldr r1, [r4, #4] ldr r2, [r4, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams _08036712: bl ResetPaletteFade ldr r0, _080367B0 @@ -112778,15 +112778,15 @@ _08036752: bl sub_08035528 bl sub_080358F8 bl ResetSpriteData - bl sub_080A8818 - bl sub_08035FB8 + bl ResetTasks + bl DrawBattleEntryBackground bl FreeAllSpritePalettes ldr r1, _080367D8 movs r0, #4 strb r0, [r1] ldr r0, _080367DC - bl sub_080006F0 - bl sub_08032534 + bl SetVBlankCallback + bl SetUpBattleVarsAndBirchZigzagoon ldr r2, [r4] movs r1, #0xa0 lsls r1, r1, #1 @@ -112801,7 +112801,7 @@ _08036752: bne _080367E8 _08036792: ldr r0, _080367E4 - bl sub_08000540 + bl SetMainCallback2 b _08036802 .align 2, 0 _0803679C: .4byte gUnknown_2022ADA @@ -112820,7 +112820,7 @@ _080367CC: .4byte gUnknown_2022AD6 _080367D0: .4byte gUnknown_2022C94 _080367D4: .4byte gUnknown_2022C90 _080367D8: .4byte gUnknown_30030BC -_080367DC: .4byte sub_080386DC +_080367DC: .4byte VBlankCB_Battle _080367E0: .4byte 0x00400040 _080367E4: .4byte sub_08037274 _080367E8: @@ -112829,13 +112829,13 @@ _080367E8: cmp r2, #0 beq _080367FC ldr r0, _080367F8 - bl sub_08000540 + bl SetMainCallback2 b _08036802 .align 2, 0 -_080367F8: .4byte sub_08037B44 +_080367F8: .4byte CB2_HandleStartMultiBattle _080367FC: ldr r0, _08036880 - bl sub_08000540 + bl SetMainCallback2 _08036802: ldr r5, _08036884 ldr r0, [r5] @@ -112863,7 +112863,7 @@ _08036802: movs r2, #0 bl sub_080382C4 _08036838: - bl sub_0806E4F4 + bl SetWildMonHeldItem _0803683C: ldr r1, _08036898 ldr r2, _0803689C @@ -112888,7 +112888,7 @@ _0803683C: _08036864: adds r0, r4, #0 movs r1, #3 - bl sub_0806D3CC + bl AdjustFriendship adds r4, #0x64 cmp r4, r5 ble _08036864 @@ -112900,7 +112900,7 @@ _08036864: pop {r0} bx r0 .align 2, 0 -_08036880: .4byte sub_08036E00 +_08036880: .4byte CB2_HandleStartBattle _08036884: .4byte gUnknown_2022C90 _08036888: .4byte 0x01000002 _0803688C: .4byte gUnknown_20243E8 @@ -112912,7 +112912,7 @@ _080368A0: .4byte gUnknown_3005AF0 _080368A4: .4byte 0x00000CA9 _080368A8: .4byte gUnknown_2024190 _080368AC: .4byte gUnknown_2023FD6 - thumb_func_end sub_08036628 + thumb_func_end CB2_InitBattleInternal thumb_func_start sub_080368B0 sub_080368B0: @ 0x080368B0 @@ -112935,17 +112935,17 @@ _080368C6: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r5, #0 beq _08036942 @@ -113031,15 +113031,15 @@ _08036990: .4byte 0x00000183 _08036994: .4byte 0x000008D2 thumb_func_end sub_080368B0 - thumb_func_start sub_08036998 -sub_08036998: @ 0x08036998 + thumb_func_start SetPlayerBerryDataInBattleStruct +SetPlayerBerryDataInBattleStruct: @ 0x08036998 push {r4, r5, r6, r7, lr} ldr r0, _08036A00 ldr r5, [r0] movs r0, #0xc2 lsls r0, r0, #1 adds r4, r5, r0 - bl sub_080E0B78 + bl IsEnigmaBerryValid cmp r0, #1 bne _08036A14 movs r2, #0 @@ -113097,7 +113097,7 @@ _08036A14: bl ItemIdToBerryType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0BC8 + bl GetBerryInfo adds r3, r0, #0 movs r2, #0 movs r0, #0xc6 @@ -113130,10 +113130,10 @@ _08036A54: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08036998 + thumb_func_end SetPlayerBerryDataInBattleStruct - thumb_func_start sub_08036A5C -sub_08036A5C: @ 0x08036A5C + thumb_func_start SetAllPlayersBerryData +SetAllPlayersBerryData: @ 0x08036A5C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -113147,7 +113147,7 @@ sub_08036A5C: @ 0x08036A5C beq _08036A74 b _08036BA0 _08036A74: - bl sub_080E0B78 + bl IsEnigmaBerryValid cmp r0, #1 bne _08036B30 movs r5, #0 @@ -113241,7 +113241,7 @@ _08036B30: bl ItemIdToBerryType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0BC8 + bl GetBerryInfo adds r6, r0, #0 movs r5, #0 ldr r4, _08036B9C @@ -113482,7 +113482,7 @@ _08036CF4: .align 2, 0 _08036D04: .4byte gUnknown_20240A8 _08036D08: .4byte gUnknown_2022080 - thumb_func_end sub_08036A5C + thumb_func_end SetAllPlayersBerryData thumb_func_start sub_08036D0C sub_08036D0C: @ 0x08036D0C @@ -113622,13 +113622,13 @@ _08036DF4: .align 2, 0 thumb_func_end sub_08036D0C - thumb_func_start sub_08036E00 -sub_08036E00: @ 0x08036E00 + thumb_func_start CB2_HandleStartBattle +CB2_HandleStartBattle: @ 0x08036E00 push {r4, r5, r6, lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _08036E38 @@ -113673,18 +113673,18 @@ _08036E44: @ jump table .4byte _080371BC @ case 17 .4byte _080371FC @ case 18 _08036E90: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08036EBC movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl sub_0805EB30 ldr r1, _08036ECC movs r0, #1 @@ -113696,7 +113696,7 @@ _08036EBC: bne _08036EC6 b _08037268 _08036EC6: - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx b _08037268 .align 2, 0 _08036ECC: .4byte gUnknown_2023FD6 @@ -113715,7 +113715,7 @@ _08036ED4: bne _08036EEC b _08037268 _08036EEC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08036F42 @@ -113732,7 +113732,7 @@ _08036EEC: movs r0, #3 strb r0, [r1] bl sub_080368B0 - bl sub_08036998 + bl SetPlayerBerryDataInBattleStruct ldr r0, _08036F68 ldrh r1, [r0] movs r0, #0xc0 @@ -113751,7 +113751,7 @@ _08036F2C: ldr r1, [r4] adds r1, r1, r5 movs r2, #0x20 - bl sub_0800A070 + bl SendBlock ldr r0, _08036F70 strb r6, [r0] _08036F42: @@ -113763,7 +113763,7 @@ _08036F42: _08036F4C: movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _08037268 .align 2, 0 _08036F58: .4byte gUnknown_2022C90 @@ -113787,26 +113787,26 @@ _08036F88: ldr r1, _08036F94 movs r0, #0xf strb r0, [r1] - bl sub_08036A5C + bl SetAllPlayersBerryData b _08037268 .align 2, 0 _08036F94: .4byte gUnknown_2023FD6 _08036F98: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _08036FA6 b _08037268 _08036FA6: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #2 adds r1, r5, #0 bl sub_08036D0C - bl sub_08036A5C + bl SetAllPlayersBerryData ldr r0, _08037018 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0803701C @@ -113845,17 +113845,17 @@ _08036FA6: bl sub_08185CE8 ldrh r0, [r4] bl sub_08185CE8 - bl sub_080685E4 + bl SetDeoxysStats ldr r1, _08037028 b _08037262 .align 2, 0 -_08037018: .4byte sub_08035BC8 +_08037018: .4byte UpdateFastPaletteFade _0803701C: .4byte gUnknown_3005B60 _08037020: .4byte gUnknown_2024140 _08037024: .4byte gUnknown_202207C _08037028: .4byte gUnknown_2023FD6 _0803702C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037038 @@ -113866,21 +113866,21 @@ _08037038: lsrs r0, r0, #0x18 ldr r1, _0803704C movs r2, #0xc8 - bl sub_0800A070 + bl SendBlock ldr r1, _08037050 b _08037262 .align 2, 0 _0803704C: .4byte gUnknown_2024190 _08037050: .4byte gUnknown_2023FD6 _08037054: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _08037062 b _08037268 _08037062: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _08037078 lsls r1, r4, #8 ldr r2, _0803707C @@ -113894,7 +113894,7 @@ _08037078: .4byte gUnknown_20243E8 _0803707C: .4byte gUnknown_202207C _08037080: .4byte gUnknown_2023FD6 _08037084: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037090 @@ -113905,21 +113905,21 @@ _08037090: lsrs r0, r0, #0x18 ldr r1, _080370A4 movs r2, #0xc8 - bl sub_0800A070 + bl SendBlock ldr r1, _080370A8 b _08037262 .align 2, 0 _080370A4: .4byte gUnknown_2024258 _080370A8: .4byte gUnknown_2023FD6 _080370AC: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _080370BA b _08037268 _080370BA: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _080370D0 lsls r1, r4, #8 ldr r2, _080370D4 @@ -113933,7 +113933,7 @@ _080370D0: .4byte gUnknown_20244B0 _080370D4: .4byte gUnknown_202207C _080370D8: .4byte gUnknown_2023FD6 _080370DC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080370E8 @@ -113944,21 +113944,21 @@ _080370E8: lsrs r0, r0, #0x18 ldr r1, _080370FC movs r2, #0xc8 - bl sub_0800A070 + bl SendBlock ldr r1, _08037100 b _08037262 .align 2, 0 _080370FC: .4byte gUnknown_2024320 _08037100: .4byte gUnknown_2023FD6 _08037104: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _08037112 b _08037268 _08037112: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _08037128 lsls r1, r4, #8 ldr r2, _0803712C @@ -114021,7 +114021,7 @@ _0803718E: strb r0, [r2] b _08037268 _08037194: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08037268 @@ -114030,19 +114030,19 @@ _08037194: lsrs r0, r0, #0x18 ldr r1, _080371B4 movs r2, #4 - bl sub_0800A070 + bl SendBlock ldr r1, _080371B8 b _08037262 .align 2, 0 _080371B4: .4byte gUnknown_203B9F8 _080371B8: .4byte gUnknown_2023FD6 _080371BC: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 bne _08037268 - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _080371EC ldr r0, [r0] movs r1, #4 @@ -114066,7 +114066,7 @@ _080371F8: .4byte gUnknown_2023FD6 _080371FC: ldr r0, _08037230 adds r1, r0, #1 - bl sub_0805DDF4 + bl BattleInitAllSprites lsls r0, r0, #0x18 cmp r0, #0 beq _08037268 @@ -114077,7 +114077,7 @@ _080371FC: ldr r0, _0803723C str r0, [r1] ldr r0, _08037240 - bl sub_08000540 + bl SetMainCallback2 ldr r2, _08037244 ldr r1, [r2] movs r0, #2 @@ -114093,7 +114093,7 @@ _08037230: .4byte gUnknown_2023FD7 _08037234: .4byte gUnknown_3005A60 _08037238: .4byte gUnknown_3002360 _0803723C: .4byte sub_08039B34 -_08037240: .4byte sub_080380FC +_08037240: .4byte BattleMainCB2 _08037244: .4byte gUnknown_2022C90 _08037248: ldr r0, _08037270 @@ -114120,15 +114120,15 @@ _08037268: bx r0 .align 2, 0 _08037270: .4byte gUnknown_2023FD6 - thumb_func_end sub_08036E00 + thumb_func_end CB2_HandleStartBattle thumb_func_start sub_08037274 sub_08037274: @ 0x08037274 push {r4, r5, r6, r7, lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _080372AC @@ -114171,18 +114171,18 @@ _080372B8: @ jump table .4byte _080376D8 @ case 15 .4byte _0803771C @ case 16 _080372FC: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08037328 movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl sub_0805EB30 ldr r1, _080373D0 movs r0, #1 @@ -114192,7 +114192,7 @@ _08037328: ldrb r0, [r0] cmp r0, #0 beq _08037334 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx _08037334: ldr r2, _080373D8 ldr r1, [r2] @@ -114228,7 +114228,7 @@ _0803734C: ldr r1, _080373E8 ldrh r1, [r1] bl sub_08162D24 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080373BC @@ -114245,14 +114245,14 @@ _0803734C: movs r0, #3 strb r0, [r1] bl sub_080368B0 - bl sub_08036998 + bl SetPlayerBerryDataInBattleStruct bl bitmask_all_link_players_but_self lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [r4] adds r1, r1, r5 movs r2, #0x20 - bl sub_0800A070 + bl SendBlock ldr r1, _080373D0 movs r0, #2 strb r0, [r1] @@ -114265,7 +114265,7 @@ _080373BC: _080373C6: movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _08037752 .align 2, 0 _080373D0: .4byte gUnknown_2023FD6 @@ -114290,26 +114290,26 @@ _08037404: ldr r1, _08037410 movs r0, #0xd strb r0, [r1] - bl sub_08036A5C + bl SetAllPlayersBerryData b _08037752 .align 2, 0 _08037410: .4byte gUnknown_2023FD6 _08037414: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _08037422 b _08037752 _08037422: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #2 adds r1, r6, #0 bl sub_08036D0C - bl sub_08036A5C + bl SetAllPlayersBerryData ldr r0, _08037460 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08037464 @@ -114329,10 +114329,10 @@ _08037422: strh r0, [r1, #0x10] b _08037702 .align 2, 0 -_08037460: .4byte sub_08035BC8 +_08037460: .4byte UpdateFastPaletteFade _08037464: .4byte gUnknown_3005B60 _08037468: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037474 @@ -114344,19 +114344,19 @@ _08037474: ldr r1, _08037488 _0803747E: movs r2, #0xc8 - bl sub_0800A070 + bl SendBlock b _08037702 .align 2, 0 _08037488: .4byte gUnknown_2024190 _0803748C: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _0803749A b _08037752 _0803749A: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _080374D4 lsls r1, r6, #3 subs r1, r1, r6 @@ -114405,7 +114405,7 @@ _080374E0: _08037500: .4byte gUnknown_2024190 _08037504: .4byte gUnknown_202207C _08037508: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037514 @@ -114416,19 +114416,19 @@ _08037514: lsrs r0, r0, #0x18 ldr r1, _08037528 movs r2, #0x64 - bl sub_0800A070 + bl SendBlock b _08037702 .align 2, 0 _08037528: .4byte gUnknown_2024258 _0803752C: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _0803753A b _08037752 _0803753A: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _08037574 lsls r1, r6, #3 subs r1, r1, r6 @@ -114477,7 +114477,7 @@ _08037580: _080375A0: .4byte gUnknown_2024258 _080375A4: .4byte gUnknown_202207C _080375A8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080375B4 @@ -114491,15 +114491,15 @@ _080375B4: .align 2, 0 _080375C0: .4byte gUnknown_20243E8 _080375C4: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _080375D2 b _08037752 _080375D2: - bl sub_0800A178 - bl sub_0800A02C + bl ResetBlockReceivedFlags + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080375E2 @@ -114513,7 +114513,7 @@ _080375E2: _080375EC: .4byte gUnknown_20243E8 _080375F0: .4byte gUnknown_202207C _080375F4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037600 @@ -114527,15 +114527,15 @@ _08037600: .align 2, 0 _0803760C: .4byte gUnknown_20244B0 _08037610: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _0803761E b _08037752 _0803761E: - bl sub_0800A178 - bl sub_0800A02C + bl ResetBlockReceivedFlags + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _08037702 @@ -114547,7 +114547,7 @@ _0803761E: _08037634: .4byte gUnknown_20244B0 _08037638: .4byte gUnknown_202207C _0803763C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037648 @@ -114561,13 +114561,13 @@ _08037648: .align 2, 0 _08037654: .4byte gUnknown_2024578 _08037658: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 bne _08037752 - bl sub_0800A178 - bl sub_0800A02C + bl ResetBlockReceivedFlags + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _08037702 @@ -114602,7 +114602,7 @@ _080376B0: strb r0, [r2] b _08037752 _080376B6: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08037752 @@ -114611,17 +114611,17 @@ _080376B6: lsrs r0, r0, #0x18 ldr r1, _080376D4 movs r2, #4 - bl sub_0800A070 + bl SendBlock b _08037702 .align 2, 0 _080376D4: .4byte gUnknown_203B9F8 _080376D8: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 bne _08037752 - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _0803770C ldr r0, [r0] movs r1, #4 @@ -114649,7 +114649,7 @@ _08037718: .4byte gUnknown_2023FD6 _0803771C: ldr r0, _08037758 adds r1, r0, #1 - bl sub_0805DDF4 + bl BattleInitAllSprites lsls r0, r0, #0x18 cmp r0, #0 beq _08037752 @@ -114661,7 +114661,7 @@ _0803771C: ldr r0, _08037764 str r0, [r1] ldr r0, _08037768 - bl sub_08000540 + bl SetMainCallback2 ldr r2, _0803776C ldr r1, [r2] movs r0, #2 @@ -114680,7 +114680,7 @@ _08037758: .4byte gUnknown_2023FD7 _0803775C: .4byte gUnknown_3005A60 _08037760: .4byte gUnknown_3002360 _08037764: .4byte sub_08039B34 -_08037768: .4byte sub_080380FC +_08037768: .4byte BattleMainCB2 _0803776C: .4byte gUnknown_2022C90 thumb_func_end sub_08037274 @@ -114707,12 +114707,12 @@ _08037786: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r5, r7, #5 strh r0, [r6] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData strh r0, [r6, #2] movs r0, #4 add r0, sb @@ -114720,32 +114720,32 @@ _08037786: adds r2, r5, r0 adds r0, r4, #0 movs r1, #2 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0xf] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r6, #0x10] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r6, #0x12] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData mov r1, sb adds r1, #0x14 adds r5, r5, r1 str r0, [r5] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r6, #0x18] adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender strb r0, [r6, #0x1c] adds r6, #0x20 adds r7, #1 @@ -114770,8 +114770,8 @@ _08037824: .4byte gUnknown_2024190 _08037828: .4byte gUnknown_2022CFC thumb_func_end sub_08037770 - thumb_func_start sub_0803782C -sub_0803782C: @ 0x0803782C + thumb_func_start CB2_PreInitMultiBattle +CB2_PreInitMultiBattle: @ 0x0803782C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -114792,7 +114792,7 @@ sub_0803782C: @ 0x0803782C mov sb, r1 movs r4, #3 _08037852: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _08037894 @@ -114807,8 +114807,8 @@ _08037852: str r1, [sp] adds r0, #0xac mov sl, r0 - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer ldr r5, _0803789C ldrb r0, [r5] @@ -114841,7 +114841,7 @@ _080378AE: bne _080378B8 b _08037A5A _080378B8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080378C4 @@ -114858,7 +114858,7 @@ _080378C4: lsrs r0, r0, #0x18 ldr r1, [r4] movs r2, #0x60 - bl sub_0800A070 + bl SendBlock ldrb r0, [r5] adds r0, #1 strb r0, [r5] @@ -114867,14 +114867,14 @@ _080378C4: _080378EC: .4byte gUnknown_30031C4 _080378F0: .4byte gUnknown_2022CFC _080378F4: - bl sub_0800A114 + bl GetBlockReceivedStatus adds r1, r4, #0 ands r1, r0 cmp r1, r4 beq _08037902 b _08037A5A _08037902: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r5, #0 cmp r8, sb bge _0803797E @@ -114959,9 +114959,9 @@ _080379A0: .4byte gUnknown_2022C9C _080379A4: .4byte gUnknown_2023FD6 _080379A8: .4byte gUnknown_3002360 _080379AC: .4byte gUnknown_2022C90 -_080379B0: .4byte sub_0803782C +_080379B0: .4byte CB2_PreInitMultiBattle _080379B4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08037A5A @@ -115003,17 +115003,17 @@ _080379EE: ldr r0, [r2] str r0, [r1, #8] ldr r0, _08037A2C - bl sub_08000540 + bl SetMainCallback2 ldr r4, _08037A30 ldr r0, [r4] - bl sub_08000BF0 + bl Free mov r0, r8 str r0, [r4] b _08037A5A .align 2, 0 _08037A24: .4byte gUnknown_300319C _08037A28: .4byte gUnknown_3002360 -_08037A2C: .4byte sub_08036628 +_08037A2C: .4byte CB2_InitBattleInternal _08037A30: .4byte gUnknown_2022CFC _08037A34: ldr r0, _08037A6C @@ -115028,10 +115028,10 @@ _08037A34: ldr r0, [r2] str r0, [r1, #8] ldr r0, _08037A74 - bl sub_08000540 + bl SetMainCallback2 ldr r4, _08037A78 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] _08037A5A: add sp, #4 @@ -115045,12 +115045,12 @@ _08037A5A: .align 2, 0 _08037A6C: .4byte gUnknown_30031C4 _08037A70: .4byte gUnknown_3002360 -_08037A74: .4byte sub_08036628 +_08037A74: .4byte CB2_InitBattleInternal _08037A78: .4byte gUnknown_2022CFC - thumb_func_end sub_0803782C + thumb_func_end CB2_PreInitMultiBattle - thumb_func_start sub_08037A7C -sub_08037A7C: @ 0x08037A7C + thumb_func_start CB2_PreInitIngamePlayerPartnerBattle +CB2_PreInitIngamePlayerPartnerBattle: @ 0x08037A7C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -115061,8 +115061,8 @@ sub_08037A7C: @ 0x08037A7C mov r8, r1 adds r7, r0, #0 adds r7, #0xac - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer ldr r5, _08037AB0 ldrb r0, [r5] @@ -115099,7 +115099,7 @@ _08037AB4: _08037AE4: .4byte gUnknown_2022CFC _08037AE8: .4byte gUnknown_3002360 _08037AEC: .4byte gUnknown_2022C90 -_08037AF0: .4byte sub_08037A7C +_08037AF0: .4byte CB2_PreInitIngamePlayerPartnerBattle _08037AF4: ldr r0, _08037B30 ldrb r1, [r0, #7] @@ -115119,10 +115119,10 @@ _08037AF4: ldr r0, [r2] str r0, [r1, #8] ldr r0, _08037B3C - bl sub_08000540 + bl SetMainCallback2 ldr r4, _08037B40 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r6, [r4] _08037B26: pop {r3} @@ -115134,24 +115134,24 @@ _08037B26: _08037B30: .4byte gUnknown_2037C74 _08037B34: .4byte gUnknown_2022C90 _08037B38: .4byte gUnknown_3002360 -_08037B3C: .4byte sub_08036628 +_08037B3C: .4byte CB2_InitBattleInternal _08037B40: .4byte gUnknown_2022CFC - thumb_func_end sub_08037A7C + thumb_func_end CB2_PreInitIngamePlayerPartnerBattle - thumb_func_start sub_08037B44 -sub_08037B44: @ 0x08037B44 + thumb_func_start CB2_HandleStartMultiBattle +CB2_HandleStartMultiBattle: @ 0x08037B44 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #4 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _08037B7C adds r0, #0x25 strb r7, [r0] - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer ldr r0, _08037B80 ldrb r0, [r0] @@ -115181,18 +115181,18 @@ _08037B88: @ jump table .4byte _08038048 @ case 9 .4byte _08038098 @ case 10 _08037BB4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08037BE0 movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl sub_0805EB30 ldr r1, _08037BF0 movs r0, #1 @@ -115204,7 +115204,7 @@ _08037BE0: bne _08037BEA b _080380D4 _08037BEA: - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx b _080380D4 .align 2, 0 _08037BF0: .4byte gUnknown_2023FD6 @@ -115222,7 +115222,7 @@ _08037BF8: bne _08037C0E b _080380D4 _08037C0E: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08037C52 @@ -115239,14 +115239,14 @@ _08037C0E: movs r0, #3 strb r0, [r1] bl sub_080368B0 - bl sub_08036998 + bl SetPlayerBerryDataInBattleStruct bl bitmask_all_link_players_but_self lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [r4] adds r1, r1, r5 movs r2, #0x20 - bl sub_0800A070 + bl SendBlock ldr r1, _08037C78 ldrb r0, [r1] adds r0, #1 @@ -115260,7 +115260,7 @@ _08037C52: _08037C5C: movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _080380D4 .align 2, 0 _08037C68: .4byte gUnknown_2022C90 @@ -115282,27 +115282,27 @@ _08037C90: ldr r1, _08037C9C movs r0, #7 strb r0, [r1] - bl sub_08036A5C + bl SetAllPlayersBerryData b _080380D4 .align 2, 0 _08037C9C: .4byte gUnknown_2023FD6 _08037CA0: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #0xf ands r1, r0 cmp r1, #0xf beq _08037CAE b _080380D4 _08037CAE: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #4 adds r1, r7, #0 bl sub_08036D0C - bl sub_08036A5C - bl sub_080685E4 + bl SetAllPlayersBerryData + bl SetDeoxysStats ldr r0, _08037D14 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _08037D18 @@ -115340,7 +115340,7 @@ _08037CF4: beq _08037D2E b _08037D5C .align 2, 0 -_08037D14: .4byte sub_08035BC8 +_08037D14: .4byte UpdateFastPaletteFade _08037D18: .4byte gUnknown_3005B60 _08037D1C: .4byte gUnknown_202207C _08037D20: .4byte gUnknown_20226A0 @@ -115393,7 +115393,7 @@ _08037D5C: adds r0, #1 strb r0, [r1] _08037D76: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037D82 @@ -115404,20 +115404,20 @@ _08037D82: lsrs r0, r0, #0x18 ldr r1, _08037D98 movs r2, #0xc8 - bl sub_0800A070 + bl SendBlock b _08038082 .align 2, 0 _08037D94: .4byte gUnknown_2023FD6 _08037D98: .4byte gUnknown_2024190 _08037D9C: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #0xf ands r1, r0 cmp r1, #0xf beq _08037DAA b _080380D4 _08037DAA: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r6, #0 lsls r0, r7, #3 subs r0, r0, r7 @@ -115543,7 +115543,7 @@ _08037E7A: .align 2, 0 _08037E8C: .4byte gUnknown_2024514 _08037E90: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08037E9C @@ -115554,19 +115554,19 @@ _08037E9C: lsrs r0, r0, #0x18 ldr r1, _08037EB0 movs r2, #0x64 - bl sub_0800A070 + bl SendBlock b _08038082 .align 2, 0 _08037EB0: .4byte gUnknown_2024258 _08037EB4: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #0xf ands r1, r0 cmp r1, #0xf beq _08037EC2 b _080380D4 _08037EC2: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r6, #0 lsls r0, r7, #3 subs r0, r0, r7 @@ -115741,7 +115741,7 @@ _08038002: strb r0, [r3] b _080380D4 _08038008: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080380D4 @@ -115761,19 +115761,19 @@ _08038008: lsrs r0, r0, #0x18 adds r1, r4, #0 movs r2, #8 - bl sub_0800A070 + bl SendBlock b _08038082 .align 2, 0 _0803803C: .4byte gUnknown_2024140 _08038040: .4byte gUnknown_2022C90 _08038044: .4byte gUnknown_203B9F8 _08038048: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #0xf ands r1, r0 cmp r1, #0xf bne _080380D4 - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r2, #0 b _08038062 _0803805C: @@ -115809,7 +115809,7 @@ _08038094: .4byte gUnknown_2023FD6 _08038098: ldr r0, _080380E0 adds r1, r0, #1 - bl sub_0805DDF4 + bl BattleInitAllSprites lsls r0, r0, #0x18 cmp r0, #0 beq _080380D4 @@ -115820,7 +115820,7 @@ _08038098: ldr r0, _080380EC str r0, [r1] ldr r0, _080380F0 - bl sub_08000540 + bl SetMainCallback2 ldr r3, _080380F4 ldr r2, [r3] movs r0, #2 @@ -115847,20 +115847,20 @@ _080380E0: .4byte gUnknown_2023FD7 _080380E4: .4byte gUnknown_3005A60 _080380E8: .4byte gUnknown_3002360 _080380EC: .4byte sub_08039B34 -_080380F0: .4byte sub_080380FC +_080380F0: .4byte BattleMainCB2 _080380F4: .4byte gUnknown_2022C90 _080380F8: .4byte gUnknown_203886A - thumb_func_end sub_08037B44 + thumb_func_end CB2_HandleStartMultiBattle - thumb_func_start sub_080380FC -sub_080380FC: @ 0x080380FC + thumb_func_start BattleMainCB2 +BattleMainCB2: @ 0x080380FC push {lr} sub sp, #4 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks ldr r0, _08038164 ldrh r1, [r0, #0x2c] movs r0, #2 @@ -115891,9 +115891,9 @@ sub_080380FC: @ 0x080380FC str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08038174 - bl sub_08000540 + bl SetMainCallback2 _0803815E: add sp, #4 pop {r0} @@ -115903,11 +115903,11 @@ _08038164: .4byte gUnknown_3002360 _08038168: .4byte gUnknown_2022C90 _0803816C: .4byte gUnknown_2037290 _08038170: .4byte gUnknown_2023FDE -_08038174: .4byte sub_080381C0 - thumb_func_end sub_080380FC +_08038174: .4byte CB2_QuitRecordedBattle + thumb_func_end BattleMainCB2 - thumb_func_start sub_08038178 -sub_08038178: @ 0x08038178 + thumb_func_start FreeRestoreBattleData +FreeRestoreBattleData: @ 0x08038178 push {lr} ldr r1, _080381B0 ldr r0, _080381B4 @@ -115926,9 +115926,9 @@ sub_08038178: @ 0x08038178 bl ZeroEnemyPartyMons movs r0, #0x5a bl m4aSongNumStop - bl sub_0805ECB0 - bl sub_0805CD74 - bl sub_08056C38 + bl FreeMonSpritesGfx + bl FreeBattleSpritesData + bl FreeBattleResources pop {r0} bx r0 .align 2, 0 @@ -115936,12 +115936,12 @@ _080381B0: .4byte gUnknown_3002360 _080381B4: .4byte gUnknown_3005A60 _080381B8: .4byte gUnknown_20397C8 _080381BC: .4byte 0x00000439 - thumb_func_end sub_08038178 + thumb_func_end FreeRestoreBattleData - thumb_func_start sub_080381C0 -sub_080381C0: @ 0x080381C0 + thumb_func_start CB2_QuitRecordedBattle +CB2_QuitRecordedBattle: @ 0x080381C0 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _080381F4 ldrb r1, [r0, #7] movs r0, #0x80 @@ -115952,11 +115952,11 @@ sub_080381C0: @ 0x080381C0 bl m4aMPlayStop ldr r0, _080381FC bl m4aMPlayStop - bl sub_08038178 - bl sub_080034D4 + bl FreeRestoreBattleData + bl FreeAllWindowBuffers ldr r0, _08038200 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _080381EE: pop {r0} bx r0 @@ -115965,7 +115965,7 @@ _080381F4: .4byte gUnknown_2037C74 _080381F8: .4byte gUnknown_3007510 _080381FC: .4byte gUnknown_3007550 _08038200: .4byte gUnknown_3002360 - thumb_func_end sub_080381C0 + thumb_func_end CB2_QuitRecordedBattle thumb_func_start sub_08038204 sub_08038204: @ 0x08038204 @@ -116064,13 +116064,13 @@ _080382A4: cmp r0, #0x14 bne _080382B8 ldr r0, _080382C0 - bl sub_08000540 + bl SetMainCallback2 _080382B8: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080382C0: .4byte sub_080365B4 +_080382C0: .4byte CB2_InitBattle thumb_func_end sub_08038214 thumb_func_start sub_080382C4 @@ -116277,7 +116277,7 @@ _08038406: movs r3, #0 str r3, [sp, #0xc] adds r3, r6, #0 - bl sub_08067730 + bl CreateMon b _08038670 .align 2, 0 _08038448: .4byte gUnknown_82EA31C @@ -116349,7 +116349,7 @@ _08038492: str r0, [sp, #0xc] adds r0, r5, #0 adds r3, r6, #0 - bl sub_08067730 + bl CreateMon movs r6, #0 mov r0, r8 adds r0, #6 @@ -116359,7 +116359,7 @@ _080384DC: adds r1, #0xd adds r0, r5, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData adds r1, r6, #0 adds r1, #0x11 ldrh r0, [r4] @@ -116369,7 +116369,7 @@ _080384DC: ldr r0, _0803850C adds r2, r2, r0 adds r0, r5, #0 - bl sub_0806A774 + bl SetMonData adds r4, #2 adds r6, #1 cmp r6, #3 @@ -116445,12 +116445,12 @@ _08038556: str r0, [sp, #0xc] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08067730 + bl CreateMon adds r5, #6 adds r0, r4, #0 movs r1, #0xc adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData b _08038670 .align 2, 0 _080385A4: .4byte gUnknown_82EA31C @@ -116522,12 +116522,12 @@ _080385EE: str r0, [sp, #0xc] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08067730 + bl CreateMon adds r5, #6 adds r0, r4, #0 movs r1, #0xc adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData movs r6, #0 adds r5, r4, #0 mov r0, r8 @@ -116538,7 +116538,7 @@ _08038646: adds r1, #0xd adds r0, r5, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData adds r1, r6, #0 adds r1, #0x11 ldrh r0, [r4] @@ -116548,7 +116548,7 @@ _08038646: ldr r0, _080386AC adds r2, r2, r0 adds r0, r5, #0 - bl sub_0806A774 + bl SetMonData adds r4, #2 adds r6, #1 cmp r6, #3 @@ -116612,8 +116612,8 @@ _080386D2: _080386D8: .4byte 0x04000006 thumb_func_end sub_080386B8 - thumb_func_start sub_080386DC -sub_080386DC: @ 0x080386DC + thumb_func_start VBlankCB_Battle +VBlankCB_Battle: @ 0x080386DC push {lr} ldr r0, _0803877C ldr r0, [r0] @@ -116671,10 +116671,10 @@ _080386EE: ldrh r1, [r0] movs r0, #0x46 bl SetGpuReg - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -116692,7 +116692,7 @@ _080387A4: .4byte gUnknown_2022AD8 _080387A8: .4byte gUnknown_2022ADA _080387AC: .4byte gUnknown_2022ADC _080387B0: .4byte gUnknown_2022ADE - thumb_func_end sub_080386DC + thumb_func_end VBlankCB_Battle thumb_func_start sub_080387B4 sub_080387B4: @ 0x080387B4 @@ -116855,17 +116855,17 @@ _080388D4: adds r4, r3, r4 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r5, #0 beq _08038944 @@ -116934,17 +116934,17 @@ _0803896E: adds r4, r2, r4 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r5, #0 beq _080389DE @@ -117017,9 +117017,9 @@ sub_08038A18: @ 0x08038A18 push {r4, lr} sub sp, #4 movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08038A54 ldr r1, [r0] movs r2, #0x21 @@ -117032,10 +117032,10 @@ sub_08038A18: @ 0x08038A18 beq _08038A60 ldr r0, _08038A5C ldr r0, [r0, #8] - bl sub_08000540 - bl sub_08056C38 - bl sub_0805CD74 - bl sub_0805ECB0 + bl SetMainCallback2 + bl FreeBattleResources + bl FreeBattleSpritesData + bl FreeMonSpritesGfx b _08038B6A .align 2, 0 _08038A54: .4byte gUnknown_2022C90 @@ -117069,7 +117069,7 @@ _08038A60: strh r0, [r1] ldr r0, _08038B80 strh r4, [r0] - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _08038B84 movs r3, #0xf0 movs r1, #0xf0 @@ -117121,11 +117121,11 @@ _08038ACE: ldr r0, _08038BAC movs r1, #0 movs r2, #0x40 - bl sub_080A11BC - bl sub_08035564 + bl LoadCompressedPalette + bl LoadBattleMenuWindowGfx bl ResetSpriteData - bl sub_080A8818 - bl sub_08035FB8 + bl ResetTasks + bl DrawBattleEntryBackground movs r0, #0x4a movs r1, #0x37 bl SetGpuReg @@ -117134,10 +117134,10 @@ _08038ACE: movs r0, #4 strb r0, [r1] ldr r0, _08038BB4 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08038BB8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08038BBC @@ -117154,7 +117154,7 @@ _08038ACE: strh r2, [r1, #0x12] bl sub_08038848 ldr r0, _08038BC0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08038BC4 strb r4, [r0] _08038B6A: @@ -117179,8 +117179,8 @@ _08038BA4: .4byte gUnknown_2022AD4 _08038BA8: .4byte gUnknown_2022AD6 _08038BAC: .4byte gUnknown_8C004EC _08038BB0: .4byte gUnknown_30030BC -_08038BB4: .4byte sub_080386DC -_08038BB8: .4byte sub_08035BC8 +_08038BB4: .4byte VBlankCB_Battle +_08038BB8: .4byte UpdateFastPaletteFade _08038BBC: .4byte gUnknown_3005B60 _08038BC0: .4byte sub_08038BC8 _08038BC4: .4byte gUnknown_2023FD6 @@ -117190,11 +117190,11 @@ _08038BC4: .4byte gUnknown_2023FD6 sub_08038BC8: @ 0x08038BC8 push {lr} bl sub_08038BE8 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 @@ -117232,11 +117232,11 @@ _08038C0C: @ jump table .4byte _08038E38 @ case 9 _08038C34: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r1, _08038C50 movs r0, #0xff strb r0, [r1, #1] @@ -117259,7 +117259,7 @@ _08038C64: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08038DC0 _08038C76: ldr r0, _08038D04 @@ -117328,9 +117328,9 @@ _08038CD6: lsls r0, r0, #0x18 cmp r0, #0 beq _08038D28 - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _08038D24 - bl sub_08000540 + bl SetMainCallback2 b _08038E7A .align 2, 0 _08038D04: .4byte gUnknown_2037C74 @@ -117363,7 +117363,7 @@ _08038D44: bne _08038E26 ldr r0, _08038D5C movs r1, #5 - bl sub_080A8878 + bl CreateTask b _08038E26 .align 2, 0 _08038D58: .4byte gUnknown_30031C4 @@ -117372,10 +117372,10 @@ _08038D60: ldr r0, _08038D78 ldr r0, [r0, #8] _08038D64: - bl sub_08000540 - bl sub_08056C38 - bl sub_0805CD74 - bl sub_0805ECB0 + bl SetMainCallback2 + bl FreeBattleResources + bl FreeBattleSpritesData + bl FreeMonSpritesGfx b _08038E7A .align 2, 0 _08038D78: .4byte gUnknown_3002360 @@ -117401,7 +117401,7 @@ _08038D8E: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _08038E26 .align 2, 0 _08038DB0: .4byte 0x05006000 @@ -117421,7 +117421,7 @@ _08038DC0: _08038DC8: .4byte gUnknown_2037C74 _08038DCC: ldr r0, _08038DDC - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _08038E7A @@ -117429,7 +117429,7 @@ _08038DCC: .align 2, 0 _08038DDC: .4byte sub_080B3250 _08038DE0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -117447,7 +117447,7 @@ _08038E00: lsls r0, r0, #0x10 cmp r0, #0 bne _08038E7A - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -117496,10 +117496,10 @@ _08038E5A: ands r0, r1 strb r0, [r2] ldr r0, [r3, #8] - bl sub_08000540 - bl sub_08056C38 - bl sub_0805CD74 - bl sub_0805ECB0 + bl SetMainCallback2 + bl FreeBattleResources + bl FreeBattleSpritesData + bl FreeMonSpritesGfx _08038E7A: add sp, #8 pop {r4, r5, r6} @@ -117616,9 +117616,9 @@ sub_08038F5C: @ 0x08038F5C push {r4, lr} sub sp, #8 movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r4, #0 str r4, [sp, #4] movs r1, #0xc0 @@ -117648,7 +117648,7 @@ sub_08038F5C: @ 0x08038F5C lsls r1, r1, #5 movs r0, #0 bl SetGpuReg - bl sub_08035564 + bl LoadBattleMenuWindowGfx _08038FB2: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 @@ -117657,15 +117657,15 @@ _08038FB2: cmp r4, #1 ble _08038FB2 bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl FreeAllSpritePalettes ldr r1, _08039020 movs r0, #4 strb r0, [r1] ldr r0, _08039024 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08039028 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 rsbs r0, r0, #0 movs r4, #0 @@ -117673,7 +117673,7 @@ _08038FB2: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0803902C strb r4, [r0] add sp, #8 @@ -117691,7 +117691,7 @@ _08039014: .4byte gUnknown_2022AD2 _08039018: .4byte gUnknown_2022AD4 _0803901C: .4byte gUnknown_2022AD6 _08039020: .4byte gUnknown_30030BC -_08039024: .4byte sub_080386DC +_08039024: .4byte VBlankCB_Battle _08039028: .4byte sub_08039030 _0803902C: .4byte gUnknown_2023FD6 thumb_func_end sub_08038F5C @@ -117700,11 +117700,11 @@ _0803902C: .4byte gUnknown_2023FD6 sub_08039030: @ 0x08039030 push {lr} bl sub_08039050 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 @@ -117745,11 +117745,11 @@ _08039074: @ jump table .4byte _080393B8 @ case 12 _080390A8: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r1, _080390C4 ldrb r0, [r1] adds r0, #1 @@ -117771,7 +117771,7 @@ _080390C8: bne _080390E8 ldr r0, _080390FC movs r1, #5 - bl sub_080A8878 + bl CreateTask _080390E8: ldr r1, _08039100 ldrb r0, [r1] @@ -117785,7 +117785,7 @@ _080390FC: .4byte sub_080B3250 _08039100: .4byte gUnknown_2023FD6 _08039104: ldr r0, _0803911C - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _08039112 @@ -117832,14 +117832,14 @@ _08039160: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _08039184 movs r1, #0xc bl sub_0814FA04 ldr r4, _08039188 movs r0, #1 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _0803939E .align 2, 0 _08039184: .4byte gUnknown_85ABBC9 @@ -117859,7 +117859,7 @@ _080391A0: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 b _080391D2 .align 2, 0 @@ -117877,11 +117877,11 @@ _080391C4: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 _080391D2: strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _08039412 _080391DA: movs r5, #1 @@ -117902,8 +117902,8 @@ _080391F4: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C - bl sub_08185198 + bl HandleBattleWindow + bl MoveRecordedBattleToSaveData strb r0, [r4, #1] movs r0, #0xa strb r0, [r4] @@ -117926,7 +117926,7 @@ _0803921E: .align 2, 0 _0803922C: .4byte gUnknown_2023FD6 _08039230: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -117938,7 +117938,7 @@ _0803923E: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _08039270 ldr r1, _08039274 adds r0, r0, r1 @@ -118029,10 +118029,10 @@ _080392E8: b _08039412 _08039304: ldr r0, [r3, #8] - bl sub_08000540 - bl sub_08056C38 - bl sub_0805CD74 - bl sub_0805ECB0 + bl SetMainCallback2 + bl FreeBattleResources + bl FreeBattleSpritesData + bl FreeMonSpritesGfx b _08039412 .align 2, 0 _08039318: .4byte gUnknown_3002360 @@ -118048,7 +118048,7 @@ _0803932C: bl sub_080A306C ldr r0, _0803934C _0803933A: - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _08039350 movs r1, #0 bl sub_0814FA04 @@ -118064,7 +118064,7 @@ _08039354: .align 2, 0 _08039358: .4byte gUnknown_822247E _0803935C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -118120,7 +118120,7 @@ _080393B8: lsrs r1, r0, #0x18 cmp r1, #0 beq _080393F8 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -118140,7 +118140,7 @@ _080393FE: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0803941C movs r0, #0x20 strb r0, [r1, #1] @@ -118156,8 +118156,8 @@ _08039412: _0803941C: .4byte gUnknown_2023FD6 thumb_func_end sub_08039050 - thumb_func_start sub_08039420 -sub_08039420: @ 0x08039420 + thumb_func_start SpriteCb_WildMon +SpriteCb_WildMon: @ 0x08039420 push {lr} sub sp, #4 ldr r1, _08039448 @@ -118171,14 +118171,14 @@ sub_08039420: @ 0x08039420 movs r1, #0 movs r2, #0xa movs r3, #0xa - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 .align 2, 0 _08039448: .4byte SpriteCb_MoveWildMonToRight _0803944C: .4byte 0x00002108 - thumb_func_end sub_08039420 + thumb_func_end SpriteCb_WildMon thumb_func_start SpriteCb_MoveWildMonToRight SpriteCb_MoveWildMonToRight: @ 0x08039450 @@ -118203,11 +118203,11 @@ _08039470: bx r0 .align 2, 0 _08039474: .4byte gUnknown_20240A0 -_08039478: .4byte sub_0803947C +_08039478: .4byte SpriteCb_WildMonShowHealthbox thumb_func_end SpriteCb_MoveWildMonToRight - thumb_func_start sub_0803947C -sub_0803947C: @ 0x0803947C + thumb_func_start SpriteCb_WildMonShowHealthbox +SpriteCb_WildMonShowHealthbox: @ 0x0803947C push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -118239,7 +118239,7 @@ sub_0803947C: @ 0x0803947C movs r1, #0 movs r2, #0xa movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _080394C4: add sp, #4 pop {r4} @@ -118247,12 +118247,12 @@ _080394C4: bx r0 .align 2, 0 _080394CC: .4byte gUnknown_3005AD0 -_080394D0: .4byte sub_080394D8 +_080394D0: .4byte SpriteCb_WildMonAnimate _080394D4: .4byte 0x00002108 - thumb_func_end sub_0803947C + thumb_func_end SpriteCb_WildMonShowHealthbox - thumb_func_start sub_080394D8 -sub_080394D8: @ 0x080394D8 + thumb_func_start SpriteCb_WildMonAnimate +SpriteCb_WildMonAnimate: @ 0x080394D8 push {lr} adds r2, r0, #0 ldr r0, _080394F8 @@ -118265,13 +118265,13 @@ sub_080394D8: @ 0x080394D8 adds r0, r2, #0 movs r2, #0 movs r3, #1 - bl sub_0806E778 + bl BattleAnimateFrontSprite _080394F4: pop {r0} bx r0 .align 2, 0 _080394F8: .4byte gUnknown_2037C74 - thumb_func_end sub_080394D8 + thumb_func_end SpriteCb_WildMonAnimate thumb_func_start sub_080394FC sub_080394FC: @ 0x080394FC @@ -118345,8 +118345,8 @@ _08039570: .4byte sub_080394FC _08039574: .4byte gUnknown_2022C2C thumb_func_end sub_08039514 - thumb_func_start sub_08039578 -sub_08039578: @ 0x08039578 + thumb_func_start SpriteCB_FaintOpponentMon +SpriteCB_FaintOpponentMon: @ 0x08039578 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -118383,7 +118383,7 @@ _080395A4: ldr r7, _08039610 adds r0, r0, r7 movs r1, #0 - bl sub_0806A058 + bl GetMonData cmp r4, #0xc9 bne _08039628 ldrh r0, [r5] @@ -118392,7 +118392,7 @@ _080395A4: adds r0, r1, #0 adds r0, r0, r7 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 movs r0, #0xc0 lsls r0, r0, #0x12 @@ -118484,11 +118484,11 @@ _08039664: bx r0 .align 2, 0 _08039684: .4byte gUnknown_82D45C8 -_08039688: .4byte sub_0803968C - thumb_func_end sub_08039578 +_08039688: .4byte SpriteCB_AnimFaintOpponent + thumb_func_end SpriteCB_FaintOpponentMon - thumb_func_start sub_0803968C -sub_0803968C: @ 0x0803968C + thumb_func_start SpriteCB_AnimFaintOpponent +SpriteCB_AnimFaintOpponent: @ 0x0803968C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x36] @@ -118558,7 +118558,7 @@ _0803970C: .align 2, 0 _08039714: .4byte gUnknown_2024178 _08039718: .4byte gUnknown_2024188 - thumb_func_end sub_0803968C + thumb_func_end SpriteCB_AnimFaintOpponent thumb_func_start sub_0803971C sub_0803971C: @ 0x0803971C @@ -118672,7 +118672,7 @@ _080397D8: adds r0, r4, #0 movs r2, #1 movs r3, #1 - bl sub_0806E778 + bl BattleAnimateFrontSprite _080397E4: pop {r4} pop {r0} @@ -118760,8 +118760,8 @@ _08039864: _08039868: .4byte gUnknown_20240A0 thumb_func_end sub_08039844 - thumb_func_start sub_0803986C -sub_0803986C: @ 0x0803986C + thumb_func_start DoBounceEffect +DoBounceEffect: @ 0x0803986C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -118808,7 +118808,7 @@ _080398BA: cmp r0, #0 bne _08039970 ldr r0, _08039908 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback lsls r0, r0, #0x18 lsrs r5, r0, #0x18 mov r0, r8 @@ -118840,7 +118840,7 @@ _080398BA: b _08039942 .align 2, 0 _08039904: .4byte gUnknown_2024174 -_08039908: .4byte sub_08039A3C +_08039908: .4byte SpriteCB_BounceEffect _0803990C: .4byte gUnknown_3005AD0 _08039910: .4byte gUnknown_20205AC _08039914: @@ -118903,10 +118903,10 @@ _08039970: _08039980: .4byte gUnknown_2023E88 _08039984: .4byte gUnknown_2024174 _08039988: .4byte gUnknown_20205AC - thumb_func_end sub_0803986C + thumb_func_end DoBounceEffect - thumb_func_start sub_0803998C -sub_0803998C: @ 0x0803998C + thumb_func_start EndBounceEffect +EndBounceEffect: @ 0x0803998C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -118993,10 +118993,10 @@ _08039A2E: .align 2, 0 _08039A34: .4byte gUnknown_2024174 _08039A38: .4byte gUnknown_20205AC - thumb_func_end sub_0803998C + thumb_func_end EndBounceEffect - thumb_func_start sub_08039A3C -sub_08039A3C: @ 0x08039A3C + thumb_func_start SpriteCB_BounceEffect +SpriteCB_BounceEffect: @ 0x08039A3C push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x34] @@ -119035,7 +119035,7 @@ _08039A58: bx r0 .align 2, 0 _08039A84: .4byte gUnknown_20205AC - thumb_func_end sub_08039A3C + thumb_func_end SpriteCB_BounceEffect thumb_func_start sub_08039A88 sub_08039A88: @ 0x08039A88 @@ -119049,7 +119049,7 @@ sub_08039A88: @ 0x08039A88 beq _08039AA0 ldrh r1, [r2, #0x32] adds r0, r2, #0 - bl sub_0806E940 + bl BattleAnimateBackSprite _08039AA0: pop {r0} bx r0 @@ -119127,7 +119127,7 @@ sub_08039B0C: @ 0x08039B0C thumb_func_start BeginBattleIntro BeginBattleIntro: @ 0x08039B10 push {lr} - bl sub_08039B84 + bl BattleStartClearSetData ldr r1, _08039B28 movs r0, #0 strb r0, [r1, #1] @@ -119139,7 +119139,7 @@ BeginBattleIntro: @ 0x08039B10 .align 2, 0 _08039B28: .4byte gUnknown_2023FD6 _08039B2C: .4byte gUnknown_3005A64 -_08039B30: .4byte sub_0803A804 +_08039B30: .4byte BattleIntroGetMonsData thumb_func_end BeginBattleIntro thumb_func_start sub_08039B34 @@ -119187,15 +119187,15 @@ _08039B7C: .4byte gUnknown_2023D10 _08039B80: .4byte gUnknown_3005AC0 thumb_func_end sub_08039B40 - thumb_func_start sub_08039B84 -sub_08039B84: @ 0x08039B84 + thumb_func_start BattleStartClearSetData +BattleStartClearSetData: @ 0x08039B84 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb mov r5, r8 push {r5, r6, r7} movs r0, #0 - bl sub_0803D1C4 + bl TurnValuesCleanUp bl SpecialStatusesClear movs r2, #0 movs r3, #0 @@ -119423,7 +119423,7 @@ _08039D3E: strb r4, [r0] mov r0, sl movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldr r6, [r5] adds r6, #0x7c ldr r2, _08039EB4 @@ -119519,7 +119519,7 @@ _08039E28: cmp r2, #0x43 bls _08039E28 ldr r0, _08039EA8 - bl sub_0806E630 + bl IsMonShiny ldr r3, _08039EC0 movs r1, #1 ands r1, r0 @@ -119571,10 +119571,10 @@ _08039EB8: .4byte 0x000004FB _08039EBC: .4byte gUnknown_2023FD4 _08039EC0: .4byte gUnknown_3005A70 _08039EC4: .4byte 0x000002A1 - thumb_func_end sub_08039B84 + thumb_func_end BattleStartClearSetData - thumb_func_start sub_08039EC8 -sub_08039EC8: @ 0x08039EC8 + thumb_func_start SwitchInClearSetData +SwitchInClearSetData: @ 0x08039EC8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -119717,11 +119717,11 @@ _08039FA0: movs r6, #0 _08039FD4: ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -120074,11 +120074,11 @@ _0803A29A: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 str r3, [sp, #0x1c] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r3, [sp, #0x1c] ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 ldr r3, [sp, #0x1c] @@ -120179,10 +120179,10 @@ _0803A390: .4byte gUnknown_2023F04 _0803A394: .4byte gUnknown_2023EE4 _0803A398: .4byte gUnknown_2023F14 _0803A39C: .4byte gUnknown_202414C - thumb_func_end sub_08039EC8 + thumb_func_end SwitchInClearSetData - thumb_func_start sub_0803A3A0 -sub_0803A3A0: @ 0x0803A3A0 + thumb_func_start FaintClearSetData +FaintClearSetData: @ 0x0803A3A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -120617,11 +120617,11 @@ _0803A6E8: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 str r3, [sp] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r3, [sp] ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 ldr r3, [sp] @@ -120732,10 +120732,10 @@ _0803A7B0: .align 2, 0 _0803A7FC: .4byte gUnknown_82F0D54 _0803A800: .4byte gUnknown_2023D08 - thumb_func_end sub_0803A3A0 + thumb_func_end FaintClearSetData - thumb_func_start sub_0803A804 -sub_0803A804: @ 0x0803A804 + thumb_func_start BattleIntroGetMonsData +BattleIntroGetMonsData: @ 0x0803A804 push {r4, r5, lr} ldr r5, _0803A814 ldrb r0, [r5] @@ -120755,7 +120755,7 @@ _0803A818: movs r2, #0 bl BtlController_EmitGetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r0, [r5] adds r0, #1 strb r0, [r5] @@ -120784,17 +120784,17 @@ _0803A83C: _0803A860: .4byte gUnknown_2023D0C _0803A864: .4byte gUnknown_2023D10 _0803A868: .4byte gUnknown_3005A64 -_0803A86C: .4byte sub_0803A878 +_0803A86C: .4byte BattleIntroPrepareBackgroundSlide _0803A870: strb r2, [r5] _0803A872: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0803A804 + thumb_func_end BattleIntroGetMonsData - thumb_func_start sub_0803A878 -sub_0803A878: @ 0x0803A878 + thumb_func_start BattleIntroPrepareBackgroundSlide +BattleIntroPrepareBackgroundSlide: @ 0x0803A878 push {r4, r5, lr} ldr r0, _0803A8B0 ldr r5, [r0] @@ -120807,9 +120807,9 @@ sub_0803A878: @ 0x0803A878 ldr r0, _0803A8B8 ldrb r1, [r0] movs r0, #0 - bl sub_080341A4 + bl BtlController_EmitIntroSlide ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0803A8BC ldr r0, _0803A8C0 str r0, [r1] @@ -120825,12 +120825,12 @@ _0803A8B0: .4byte gUnknown_2023D0C _0803A8B4: .4byte gUnknown_2023D08 _0803A8B8: .4byte gUnknown_2022C94 _0803A8BC: .4byte gUnknown_3005A64 -_0803A8C0: .4byte sub_0803A8C8 +_0803A8C0: .4byte BattleIntroDrawTrainersOrMonsSprites _0803A8C4: .4byte gUnknown_2023FD6 - thumb_func_end sub_0803A878 + thumb_func_end BattleIntroPrepareBackgroundSlide - thumb_func_start sub_0803A8C8 -sub_0803A8C8: @ 0x0803A8C8 + thumb_func_start BattleIntroDrawTrainersOrMonsSprites +BattleIntroDrawTrainersOrMonsSprites: @ 0x0803A8C8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -120866,7 +120866,7 @@ _0803A8F8: beq _0803A940 ldr r4, _0803A930 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803A940 @@ -120945,7 +120945,7 @@ _0803A952: ldrh r0, [r1] ldrb r1, [r1, #0x17] lsrs r1, r1, #7 - bl sub_0806B15C + bl GetAbilityBySpecies mov r2, sb ldrb r1, [r2] muls r1, r7, r1 @@ -120953,7 +120953,7 @@ _0803A952: adds r1, #0x20 strb r0, [r1] ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide ldr r1, _0803AA94 lsls r0, r0, #0x18 lsrs r0, r0, #0x17 @@ -121003,7 +121003,7 @@ _0803AA0E: movs r0, #0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803AA28: ldr r5, _0803AA9C ldr r0, [r5] @@ -121020,10 +121020,10 @@ _0803AA28: movs r0, #0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803AA4E: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -121045,7 +121045,7 @@ _0803AA4E: add r1, sl ldr r2, [r1] movs r1, #2 - bl sub_0806EAA8 + bl HandleSetPokedexFlag b _0803AB04 .align 2, 0 _0803AA88: .4byte gUnknown_82F0D54 @@ -121057,7 +121057,7 @@ _0803AA9C: .4byte gUnknown_2022C90 _0803AAA0: .4byte 0x063F0902 _0803AAA4: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -121079,12 +121079,12 @@ _0803AAA4: add r1, sl ldr r2, [r1] movs r1, #2 - bl sub_0806EAA8 + bl HandleSetPokedexFlag _0803AADA: movs r0, #0 bl BtlController_EmitLoadMonSprite ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0803ABA4 ldrb r0, [r4] lsls r0, r0, #1 @@ -121096,7 +121096,7 @@ _0803AADA: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0803ABAC strh r0, [r1, #0x20] _0803AB04: @@ -121123,7 +121123,7 @@ _0803AB2E: movs r0, #0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803AB3A: ldr r0, _0803ABB0 ldr r0, [r0] @@ -121142,7 +121142,7 @@ _0803AB3A: movs r0, #0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803AB64: ldr r0, _0803ABB0 ldr r0, [r0] @@ -121185,11 +121185,11 @@ _0803ABB0: .4byte gUnknown_2022C90 _0803ABB4: .4byte gUnknown_2023D08 _0803ABB8: .4byte gUnknown_2023D10 _0803ABBC: .4byte gUnknown_3005A64 -_0803ABC0: .4byte sub_0803ABC4 - thumb_func_end sub_0803A8C8 +_0803ABC0: .4byte BattleIntroDrawPartySummaryScreens + thumb_func_end BattleIntroDrawTrainersOrMonsSprites - thumb_func_start sub_0803ABC4 -sub_0803ABC4: @ 0x0803ABC4 + thumb_func_start BattleIntroDrawPartySummaryScreens +BattleIntroDrawPartySummaryScreens: @ 0x0803ABC4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -121221,12 +121221,12 @@ _0803ABEE: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0803AC14 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -121244,11 +121244,11 @@ _0803AC28: .4byte 0x0000FFFF _0803AC2C: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData _0803AC3E: str r0, [r6] adds r6, #8 @@ -121263,9 +121263,9 @@ _0803AC3E: movs r0, #0 mov r1, sp movs r2, #0x80 - bl sub_080341E4 + bl BtlController_EmitDrawPartyStatusSummary ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec movs r7, #0 mov r6, r8 mov r5, sp @@ -121277,12 +121277,12 @@ _0803AC6A: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0803AC90 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -121299,11 +121299,11 @@ _0803ACA0: .4byte 0x0000FFFF _0803ACA4: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData _0803ACB6: str r0, [r6] adds r6, #8 @@ -121318,16 +121318,16 @@ _0803ACB6: movs r0, #0 mov r1, sp movs r2, #0x80 - bl sub_080341E4 + bl BtlController_EmitDrawPartyStatusSummary ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0803ACE8 ldr r0, _0803ACEC b _0803AD4E .align 2, 0 _0803ACE4: .4byte gUnknown_2023D08 _0803ACE8: .4byte gUnknown_3005A64 -_0803ACEC: .4byte sub_0803AD64 +_0803ACEC: .4byte BattleIntroPrintTrainerWantsToBattle _0803ACF0: movs r7, #0 add r6, sp, #4 @@ -121340,12 +121340,12 @@ _0803ACF6: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0803AD1C adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -121361,11 +121361,11 @@ _0803AD28: .4byte 0x0000FFFF _0803AD2C: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData _0803AD3E: str r0, [r6] adds r6, #8 @@ -121386,11 +121386,11 @@ _0803AD50: bx r0 .align 2, 0 _0803AD5C: .4byte gUnknown_3005A64 -_0803AD60: .4byte sub_0803AD9C - thumb_func_end sub_0803ABC4 +_0803AD60: .4byte BattleIntroPrintWildMonAttacked + thumb_func_end BattleIntroDrawPartySummaryScreens - thumb_func_start sub_0803AD64 -sub_0803AD64: @ 0x0803AD64 + thumb_func_start BattleIntroPrintTrainerWantsToBattle +BattleIntroPrintTrainerWantsToBattle: @ 0x0803AD64 push {lr} ldr r0, _0803AD8C ldr r0, [r0] @@ -121402,7 +121402,7 @@ sub_0803AD64: @ 0x0803AD64 strb r0, [r1] ldrb r1, [r1] movs r0, #0 - bl sub_0803F5A4 + bl PrepareStringBattle ldr r1, _0803AD94 ldr r0, _0803AD98 str r0, [r1] @@ -121413,11 +121413,11 @@ _0803AD86: _0803AD8C: .4byte gUnknown_2023D0C _0803AD90: .4byte gUnknown_2023D08 _0803AD94: .4byte gUnknown_3005A64 -_0803AD98: .4byte sub_0803ADC4 - thumb_func_end sub_0803AD64 +_0803AD98: .4byte BattleIntroPrintOpponentSendsOut + thumb_func_end BattleIntroPrintTrainerWantsToBattle - thumb_func_start sub_0803AD9C -sub_0803AD9C: @ 0x0803AD9C + thumb_func_start BattleIntroPrintWildMonAttacked +BattleIntroPrintWildMonAttacked: @ 0x0803AD9C push {lr} ldr r0, _0803ADB8 ldr r0, [r0] @@ -121428,18 +121428,18 @@ sub_0803AD9C: @ 0x0803AD9C str r0, [r1] movs r0, #0 movs r1, #0 - bl sub_0803F5A4 + bl PrepareStringBattle _0803ADB4: pop {r0} bx r0 .align 2, 0 _0803ADB8: .4byte gUnknown_2023D0C _0803ADBC: .4byte gUnknown_3005A64 -_0803ADC0: .4byte sub_0803B010 - thumb_func_end sub_0803AD9C +_0803ADC0: .4byte BattleIntroPrintPlayerSendsOut + thumb_func_end BattleIntroPrintWildMonAttacked - thumb_func_start sub_0803ADC4 -sub_0803ADC4: @ 0x0803ADC4 + thumb_func_start BattleIntroPrintOpponentSendsOut +BattleIntroPrintOpponentSendsOut: @ 0x0803ADC4 push {lr} ldr r0, _0803ADF4 ldr r0, [r0] @@ -121475,7 +121475,7 @@ _0803ADFE: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #1 - bl sub_0803F5A4 + bl PrepareStringBattle ldr r1, _0803AE18 ldr r0, _0803AE1C str r0, [r1] @@ -121484,11 +121484,11 @@ _0803AE14: bx r0 .align 2, 0 _0803AE18: .4byte gUnknown_3005A64 -_0803AE1C: .4byte sub_0803AEA0 - thumb_func_end sub_0803ADC4 +_0803AE1C: .4byte BattleIntroOpponent1SendsOutMonAnimation + thumb_func_end BattleIntroPrintOpponentSendsOut - thumb_func_start sub_0803AE20 -sub_0803AE20: @ 0x0803AE20 + thumb_func_start BattleIntroOpponent2SendsOutMonAnimation +BattleIntroOpponent2SendsOutMonAnimation: @ 0x0803AE20 push {r4, r5, lr} ldr r0, _0803AE8C ldr r1, [r0] @@ -121524,9 +121524,9 @@ _0803AE52: cmp r0, r5 bne _0803AE6C movs r0, #0 - bl sub_080341C4 + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803AE6C: ldrb r0, [r4] adds r0, #1 @@ -121549,11 +121549,11 @@ _0803AE8C: .4byte gUnknown_2022C90 _0803AE90: .4byte gUnknown_2023D08 _0803AE94: .4byte gUnknown_2023D10 _0803AE98: .4byte gUnknown_3005A64 -_0803AE9C: .4byte sub_0803AF58 - thumb_func_end sub_0803AE20 +_0803AE9C: .4byte BattleIntroRecordMonsToDex + thumb_func_end BattleIntroOpponent2SendsOutMonAnimation - thumb_func_start sub_0803AEA0 -sub_0803AEA0: @ 0x0803AEA0 + thumb_func_start BattleIntroOpponent1SendsOutMonAnimation +BattleIntroOpponent1SendsOutMonAnimation: @ 0x0803AEA0 push {r4, r5, r6, lr} ldr r0, _0803AEC8 ldr r2, [r0] @@ -121582,7 +121582,7 @@ _0803AECC: b _0803AF34 .align 2, 0 _0803AED4: .4byte gUnknown_3005A64 -_0803AED8: .4byte sub_0803AE20 +_0803AED8: .4byte BattleIntroOpponent2SendsOutMonAnimation _0803AEDC: movs r5, #1 _0803AEDE: @@ -121606,9 +121606,9 @@ _0803AEF6: cmp r0, r5 bne _0803AF1C movs r0, #0 - bl sub_080341C4 + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, _0803AF48 ldr r0, [r0] ldr r1, _0803AF4C @@ -121642,11 +121642,11 @@ _0803AF44: .4byte gUnknown_2023D10 _0803AF48: .4byte gUnknown_2022C90 _0803AF4C: .4byte 0x00008040 _0803AF50: .4byte gUnknown_3005A64 -_0803AF54: .4byte sub_0803AF58 - thumb_func_end sub_0803AEA0 +_0803AF54: .4byte BattleIntroRecordMonsToDex + thumb_func_end BattleIntroOpponent1SendsOutMonAnimation - thumb_func_start sub_0803AF58 -sub_0803AF58: @ 0x0803AF58 + thumb_func_start BattleIntroRecordMonsToDex +BattleIntroRecordMonsToDex: @ 0x0803AF58 push {r4, r5, r6, r7, lr} ldr r0, _0803AFD0 ldr r1, [r0] @@ -121665,7 +121665,7 @@ sub_0803AF58: @ 0x0803AF58 adds r7, #0x48 _0803AF78: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -121688,7 +121688,7 @@ _0803AF78: adds r1, r1, r7 ldr r2, [r1] movs r1, #2 - bl sub_0806EAA8 + bl HandleSetPokedexFlag _0803AFB0: ldrb r0, [r4] adds r0, #1 @@ -121715,8 +121715,8 @@ _0803AFDC: .4byte gUnknown_2023D28 _0803AFE0: .4byte gUnknown_2022C90 _0803AFE4: .4byte 0x063F0902 _0803AFE8: .4byte gUnknown_3005A64 -_0803AFEC: .4byte sub_0803B010 - thumb_func_end sub_0803AF58 +_0803AFEC: .4byte BattleIntroPrintPlayerSendsOut + thumb_func_end BattleIntroRecordMonsToDex thumb_func_start sub_0803AFF0 sub_0803AFF0: @ 0x0803AFF0 @@ -121734,11 +121734,11 @@ _0803B000: .align 2, 0 _0803B004: .4byte gUnknown_2023D0C _0803B008: .4byte gUnknown_3005A64 -_0803B00C: .4byte sub_0803B010 +_0803B00C: .4byte BattleIntroPrintPlayerSendsOut thumb_func_end sub_0803AFF0 - thumb_func_start sub_0803B010 -sub_0803B010: @ 0x0803B010 + thumb_func_start BattleIntroPrintPlayerSendsOut +BattleIntroPrintPlayerSendsOut: @ 0x0803B010 push {lr} ldr r0, _0803B060 ldr r0, [r0] @@ -121773,7 +121773,7 @@ _0803B03A: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #1 - bl sub_0803F5A4 + bl PrepareStringBattle _0803B056: ldr r1, _0803B068 ldr r0, _0803B06C @@ -121785,11 +121785,11 @@ _0803B05C: _0803B060: .4byte gUnknown_2023D0C _0803B064: .4byte gUnknown_2022C90 _0803B068: .4byte gUnknown_3005A64 -_0803B06C: .4byte sub_0803B10C - thumb_func_end sub_0803B010 +_0803B06C: .4byte BattleIntroPlayer1SendsOutMonAnimation + thumb_func_end BattleIntroPrintPlayerSendsOut - thumb_func_start sub_0803B070 -sub_0803B070: @ 0x0803B070 + thumb_func_start BattleIntroPlayer2SendsOutMonAnimation +BattleIntroPlayer2SendsOutMonAnimation: @ 0x0803B070 push {r4, r5, lr} ldr r0, _0803B0F4 ldr r1, [r0] @@ -121825,9 +121825,9 @@ _0803B0A2: cmp r0, r5 bne _0803B0BC movs r0, #0 - bl sub_080341C4 + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803B0BC: ldrb r0, [r4] adds r0, #1 @@ -121864,11 +121864,11 @@ _0803B0F8: .4byte gUnknown_2023D08 _0803B0FC: .4byte gUnknown_2023D10 _0803B100: .4byte gUnknown_2024140 _0803B104: .4byte gUnknown_3005A64 -_0803B108: .4byte sub_0803B26C - thumb_func_end sub_0803B070 +_0803B108: .4byte TryDoEventsBeforeFirstTurn + thumb_func_end BattleIntroPlayer2SendsOutMonAnimation - thumb_func_start sub_0803B10C -sub_0803B10C: @ 0x0803B10C + thumb_func_start BattleIntroPlayer1SendsOutMonAnimation +BattleIntroPlayer1SendsOutMonAnimation: @ 0x0803B10C push {r4, r5, r6, lr} ldr r0, _0803B130 ldr r1, [r0] @@ -121894,7 +121894,7 @@ _0803B134: b _0803B1B6 .align 2, 0 _0803B13C: .4byte gUnknown_3005A64 -_0803B140: .4byte sub_0803B070 +_0803B140: .4byte BattleIntroPlayer2SendsOutMonAnimation _0803B144: movs r6, #0 _0803B146: @@ -121918,9 +121918,9 @@ _0803B15E: cmp r0, r6 bne _0803B184 movs r0, #0 - bl sub_080341C4 + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, _0803B1CC ldr r0, [r0] movs r1, #0x40 @@ -121967,8 +121967,8 @@ _0803B1C8: .4byte gUnknown_2023D10 _0803B1CC: .4byte gUnknown_2022C90 _0803B1D0: .4byte gUnknown_2024140 _0803B1D4: .4byte gUnknown_3005A64 -_0803B1D8: .4byte sub_0803B26C - thumb_func_end sub_0803B10C +_0803B1D8: .4byte TryDoEventsBeforeFirstTurn + thumb_func_end BattleIntroPlayer1SendsOutMonAnimation thumb_func_start sub_0803B1DC sub_0803B1DC: @ 0x0803B1DC @@ -121987,7 +121987,7 @@ sub_0803B1DC: @ 0x0803B1DC ldr r5, _0803B25C _0803B1F6: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803B218 @@ -121999,7 +121999,7 @@ _0803B1F6: movs r2, #0 bl BtlController_EmitSwitchInAnim ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803B218: ldrb r0, [r4] adds r0, #1 @@ -122038,11 +122038,11 @@ _0803B258: .4byte gUnknown_2023D10 _0803B25C: .4byte gUnknown_2023D12 _0803B260: .4byte gUnknown_2024140 _0803B264: .4byte gUnknown_3005A64 -_0803B268: .4byte sub_0803B26C +_0803B268: .4byte TryDoEventsBeforeFirstTurn thumb_func_end sub_0803B1DC - thumb_func_start sub_0803B26C -sub_0803B26C: @ 0x0803B26C + thumb_func_start TryDoEventsBeforeFirstTurn +TryDoEventsBeforeFirstTurn: @ 0x0803B26C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -122101,7 +122101,7 @@ _0803B2D2: adds r1, r4, r6 ldrb r1, [r1] movs r2, #1 - bl sub_0803CB54 + bl GetWhoStrikesFirst lsls r0, r0, #0x18 cmp r0, #0 beq _0803B2F0 @@ -122137,7 +122137,7 @@ _0803B306: movs r1, #0 movs r2, #0 movs r3, #0xff - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0803B340 @@ -122171,7 +122171,7 @@ _0803B354: str r0, [sp] movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0803B37A @@ -122205,7 +122205,7 @@ _0803B39A: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -122217,7 +122217,7 @@ _0803B3B4: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0803B3CA @@ -122241,7 +122241,7 @@ _0803B3DE: ldrb r1, [r0] movs r0, #0 movs r2, #0 - bl sub_0804411C + bl ItemBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0803B400 @@ -122291,7 +122291,7 @@ _0803B42E: cmp r5, #3 ble _0803B42E movs r0, #0 - bl sub_0803D1C4 + bl TurnValuesCleanUp bl SpecialStatusesClear ldr r0, _0803B508 ldr r0, [r0] @@ -122390,7 +122390,7 @@ _0803B518: .4byte gUnknown_2023F18 _0803B51C: .4byte gUnknown_2023EB4 _0803B520: .4byte gUnknown_85AB3BD _0803B524: .4byte gUnknown_3005A64 -_0803B528: .4byte sub_0803BAB8 +_0803B528: .4byte HandleTurnActionSelectionState _0803B52C: .4byte gUnknown_2023FD6 _0803B530: .4byte gUnknown_2024118 _0803B534: .4byte gUnknown_2023F20 @@ -122398,10 +122398,10 @@ _0803B538: .4byte gUnknown_2023D28 _0803B53C: .4byte gUnknown_2023FD4 _0803B540: .4byte gUnknown_2022C90 _0803B544: .4byte gUnknown_8289E46 - thumb_func_end sub_0803B26C + thumb_func_end TryDoEventsBeforeFirstTurn - thumb_func_start sub_0803B548 -sub_0803B548: @ 0x0803B548 + thumb_func_start HandleEndTurn_ContinueBattle +HandleEndTurn_ContinueBattle: @ 0x0803B548 push {r4, r5, r6, lr} ldr r0, _0803B5E0 ldr r0, [r0] @@ -122484,39 +122484,39 @@ _0803B5D8: .align 2, 0 _0803B5E0: .4byte gUnknown_2023D0C _0803B5E4: .4byte gUnknown_3005A64 -_0803B5E8: .4byte sub_0803B600 +_0803B5E8: .4byte BattleTurnPassed _0803B5EC: .4byte gUnknown_2023D10 _0803B5F0: .4byte gUnknown_2023FD6 _0803B5F4: .4byte gUnknown_2023D28 _0803B5F8: .4byte gUnknown_2024140 _0803B5FC: .4byte gUnknown_2023F20 - thumb_func_end sub_0803B548 + thumb_func_end HandleEndTurn_ContinueBattle - thumb_func_start sub_0803B600 -sub_0803B600: @ 0x0803B600 + thumb_func_start BattleTurnPassed +BattleTurnPassed: @ 0x0803B600 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} movs r0, #1 - bl sub_0803D1C4 + bl TurnValuesCleanUp ldr r0, _0803B6A4 ldrb r0, [r0] cmp r0, #0 bne _0803B62E - bl sub_0803FE10 + bl DoFieldEndTurnEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0803B622 b _0803B7BC _0803B622: - bl sub_08040564 + bl DoBattlerEndTurnEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0803B62E b _0803B7BC _0803B62E: - bl sub_08041368 + bl HandleFaintedMonActions lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -122527,7 +122527,7 @@ _0803B63C: ldr r0, [r0] adds r0, #0x4d strb r1, [r0] - bl sub_08040FA4 + bl HandleWishPerishSongOnTurnEnd lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -122535,7 +122535,7 @@ _0803B63C: b _0803B7BC _0803B652: movs r0, #0 - bl sub_0803D1C4 + bl TurnValuesCleanUp ldr r2, _0803B6AC ldr r0, [r2] ldr r1, _0803B6B0 @@ -122588,7 +122588,7 @@ _0803B6C8: .4byte gUnknown_2023F20 _0803B6CC: .4byte gUnknown_2023FD6 _0803B6D0: .4byte gUnknown_2023D27 _0803B6D4: .4byte gUnknown_3005A64 -_0803B6D8: .4byte sub_0803D45C +_0803B6D8: .4byte RunTurnActionsFunctions _0803B6DC: ldr r1, _0803B770 ldrb r0, [r1, #0x13] @@ -122674,7 +122674,7 @@ _0803B780: .4byte gUnknown_85AB3BD _0803B784: .4byte gUnknown_2023EC0 _0803B788: .4byte gUnknown_2023F18 _0803B78C: .4byte gUnknown_3005A64 -_0803B790: .4byte sub_0803BAB8 +_0803B790: .4byte HandleTurnActionSelectionState _0803B794: .4byte gUnknown_2023FD4 _0803B798: .4byte gUnknown_2022C90 _0803B79C: .4byte gUnknown_8289E09 @@ -122701,10 +122701,10 @@ _0803B7BC: bx r0 .align 2, 0 _0803B7C8: .4byte gUnknown_8289E46 - thumb_func_end sub_0803B600 + thumb_func_end BattleTurnPassed - thumb_func_start sub_0803B7CC -sub_0803B7CC: @ 0x0803B7CC + thumb_func_start IsRunningFromBattleImpossible +IsRunningFromBattleImpossible: @ 0x0803B7CC push {r4, r5, r6, r7, lr} sub sp, #4 ldr r1, _0803B7F0 @@ -122761,7 +122761,7 @@ _0803B822: b _0803B990 _0803B836: adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r5, #0 @@ -122773,7 +122773,7 @@ _0803B836: _0803B84C: lsrs r4, r7, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -122790,7 +122790,7 @@ _0803B84C: b _0803B998 _0803B870: adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -122842,7 +122842,7 @@ _0803B8CA: movs r0, #0xf movs r2, #0x2a movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -122969,7 +122969,7 @@ _0803B9D6: bx r1 .align 2, 0 _0803B9E0: .4byte gUnknown_2023FD6 - thumb_func_end sub_0803B7CC + thumb_func_end IsRunningFromBattleImpossible thumb_func_start sub_0803B9E4 sub_0803B9E4: @ 0x0803B9E4 @@ -123002,7 +123002,7 @@ _0803BA00: mov r1, r8 adds r0, r6, r1 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -123011,7 +123011,7 @@ _0803BA00: adds r0, r5, r0 adds r0, #0x5c ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -123080,8 +123080,8 @@ _0803BAAA: _0803BAB4: .4byte gUnknown_203CBCC thumb_func_end sub_0803B9E4 - thumb_func_start sub_0803BAB8 -sub_0803BAB8: @ 0x0803BAB8 + thumb_func_start HandleTurnActionSelectionState +HandleTurnActionSelectionState: @ 0x0803BAB8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -123099,7 +123099,7 @@ sub_0803BAB8: @ 0x0803BAB8 _0803BAD4: .4byte gUnknown_2023FD6 _0803BAD8: .4byte gUnknown_2023D08 _0803BADC: .4byte gUnknown_2023D10 - thumb_func_end sub_0803BAB8 + thumb_func_end HandleTurnActionSelectionState thumb_func_start sub_0803BAE0 sub_0803BAE0: @ 0x0803BAE0 @@ -123136,7 +123136,7 @@ _0803BB14: @ jump table .4byte _0803C838 @ case 7 .4byte _0803C87C @ case 8 _0803BB38: - bl sub_08185D28 + bl RecordedBattle_CopyBattlerMoves ldr r1, _0803BB48 ldr r0, _0803BB4C ldrb r0, [r0] @@ -123272,7 +123272,7 @@ _0803BC50: lsls r0, r0, #8 orrs r2, r0 movs r0, #0 - bl sub_08033C3C + bl BtlController_EmitChooseAction bl _0803C7AC .align 2, 0 _0803BC68: .4byte gUnknown_2023EC0 @@ -123349,7 +123349,7 @@ _0803BCEC: @ jump table .4byte _0803C308 @ case 11 .4byte _0803C0F8 @ case 12 _0803BD20: - bl sub_0803FD08 + bl AreAllMovesUnusable lsls r0, r0, #0x18 cmp r0, #0 beq _0803BD78 @@ -123488,7 +123488,7 @@ _0803BE0E: ldrb r1, [r1] lsls r2, r4, #0x18 lsrs r2, r2, #0x18 - bl sub_0806B424 + bl CalculatePPWithBonus mov r2, sl adds r1, r2, r4 strb r0, [r1] @@ -123503,7 +123503,7 @@ _0803BE0E: movs r0, #0 movs r2, #0 add r3, sp, #4 - bl sub_08033C88 + bl BtlController_EmitChooseMove b _0803C072 .align 2, 0 _0803BE6C: .4byte gUnknown_2023D28 @@ -123601,7 +123601,7 @@ _0803BF30: adds r1, r2, #0 movs r2, #0x17 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -123611,7 +123611,7 @@ _0803BF30: movs r0, #0xc movs r2, #0x47 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -123642,7 +123642,7 @@ _0803BF80: movs r0, #0xf movs r2, #0x2a movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -123682,7 +123682,7 @@ _0803BFB8: str r0, [sp] movs r0, #0 movs r2, #6 - bl sub_08033CF8 + bl BtlController_EmitChoosePokemon b _0803C072 .align 2, 0 _0803BFE4: .4byte gUnknown_2023D08 @@ -123732,7 +123732,7 @@ _0803C032: movs r1, #0 _0803C044: movs r3, #0 - bl sub_08033CF8 + bl BtlController_EmitChoosePokemon b _0803C072 .align 2, 0 _0803C04C: .4byte gUnknown_2023EC0 @@ -123751,17 +123751,17 @@ _0803C054: movs r1, #0 movs r2, #6 movs r3, #0 - bl sub_08033CF8 + bl BtlController_EmitChoosePokemon _0803C072: ldr r0, _0803C080 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0803C308 .align 2, 0 _0803C07C: .4byte gUnknown_2024140 _0803C080: .4byte gUnknown_2023D08 _0803C084: - bl sub_0806B378 + bl IsPlayerPartyAndPokemonStorageFull lsls r0, r0, #0x18 cmp r0, #0 bne _0803C090 @@ -123804,9 +123804,9 @@ _0803C0D0: ldr r1, [r2] adds r1, r1, r0 movs r0, #0 - bl sub_08033CC4 + bl BtlController_EmitChooseItem ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0803C308 .align 2, 0 _0803C0F0: .4byte gUnknown_2024140 @@ -123870,9 +123870,9 @@ _0803C0F8: beq _0803C194 _0803C176: movs r0, #0 - bl sub_0803424C + bl BtlController_EmitEndBounceEffect ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec bl _0803C9B4 .align 2, 0 _0803C188: .4byte gUnknown_2023FD6 @@ -124033,10 +124033,10 @@ _0803C2D4: bl RecordedBattle_ClearBattlerAction _0803C2F2: movs r0, #0 - bl sub_0803424C + bl BtlController_EmitEndBounceEffect ldr r0, _0803C304 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0803C9B4 .align 2, 0 _0803C304: .4byte gUnknown_2023D08 @@ -124109,7 +124109,7 @@ _0803C398: .4byte gUnknown_2023D08 _0803C39C: .4byte gUnknown_8289086 _0803C3A0: .4byte gUnknown_2023FD6 _0803C3A4: - bl sub_0803B7CC + bl IsRunningFromBattleImpossible lsls r0, r0, #0x18 cmp r0, #0 beq _0803C408 @@ -124276,7 +124276,7 @@ _0803C508: .4byte gUnknown_2023D08 _0803C50C: .4byte 0x0000FFFF _0803C510: .4byte gUnknown_2023FD6 _0803C514: - bl sub_0803F78C + bl TrySetCantSelectMoveBattleScript lsls r0, r0, #0x18 cmp r0, #0 beq _0803C560 @@ -124536,7 +124536,7 @@ _0803C714: beq _0803C73E b _0803C948 _0803C73E: - bl sub_0803C9FC + bl AllAtActionConfirmed lsls r0, r0, #0x18 lsrs r0, r0, #0x18 rsbs r1, r0, #0 @@ -124571,7 +124571,7 @@ _0803C780: movs r0, #0 movs r1, #0 adds r2, r4, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg b _0803C7AA .align 2, 0 _0803C78C: .4byte gUnknown_2023D0C @@ -124583,12 +124583,12 @@ _0803C7A0: movs r0, #0 movs r1, #1 adds r2, r4, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg _0803C7AA: ldr r4, _0803C7C0 _0803C7AC: ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803C7B2: ldr r0, _0803C7C4 ldrb r1, [r4] @@ -124863,14 +124863,14 @@ _0803C9DC: .4byte gUnknown_2023D08 _0803C9E0: .4byte gUnknown_2023D10 _0803C9E4: .4byte gUnknown_2023FD6 _0803C9E8: .4byte gUnknown_3005A64 -_0803C9EC: .4byte sub_0803CF2C +_0803C9EC: .4byte SetActionsAndBattlersTurnOrder _0803C9F0: .4byte gUnknown_2022C90 _0803C9F4: .4byte gUnknown_2023EC0 _0803C9F8: .4byte gUnknown_2024140 thumb_func_end sub_0803BAE0 - thumb_func_start sub_0803C9FC -sub_0803C9FC: @ 0x0803C9FC + thumb_func_start AllAtActionConfirmed +AllAtActionConfirmed: @ 0x0803C9FC push {r4, r5, lr} movs r3, #0 movs r1, #0 @@ -124906,7 +124906,7 @@ _0803CA36: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0803C9FC + thumb_func_end AllAtActionConfirmed thumb_func_start sub_0803CA3C sub_0803CA3C: @ 0x0803CA3C @@ -125052,8 +125052,8 @@ _0803CB4C: .4byte gUnknown_2023D1E _0803CB50: .4byte gUnknown_2023D22 thumb_func_end SwapTurnOrder - thumb_func_start sub_0803CB54 -sub_0803CB54: @ 0x0803CB54 + thumb_func_start GetWhoStrikesFirst +GetWhoStrikesFirst: @ 0x0803CB54 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -125076,7 +125076,7 @@ sub_0803CB54: @ 0x0803CB54 movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0803CC1C @@ -125086,7 +125086,7 @@ sub_0803CB54: @ 0x0803CB54 movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0803CC1C @@ -125218,7 +125218,7 @@ _0803CC84: cmp r0, #0 beq _0803CCB8 mov r0, sb - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803CCB8 @@ -125329,7 +125329,7 @@ _0803CD70: cmp r0, #0 beq _0803CDA0 mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803CDA0 @@ -125541,10 +125541,10 @@ _0803CF1A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0803CB54 + thumb_func_end GetWhoStrikesFirst - thumb_func_start sub_0803CF2C -sub_0803CF2C: @ 0x0803CF2C + thumb_func_start SetActionsAndBattlersTurnOrder +SetActionsAndBattlersTurnOrder: @ 0x0803CF2C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -125713,7 +125713,7 @@ _0803D070: .4byte gUnknown_2023D08 _0803D074: .4byte gUnknown_2023D1E _0803D078: .4byte gUnknown_2023D22 _0803D07C: .4byte gUnknown_3005A64 -_0803D080: .4byte sub_0803D334 +_0803D080: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts _0803D084: .4byte gUnknown_2024140 _0803D088: .4byte gUnknown_2023D10 _0803D08C: @@ -125828,7 +125828,7 @@ _0803D13C: beq _0803D178 adds r0, r3, #0 movs r2, #0 - bl sub_0803CB54 + bl GetWhoStrikesFirst lsls r0, r0, #0x18 cmp r0, #0 beq _0803D178 @@ -125873,12 +125873,12 @@ _0803D1AC: .4byte gUnknown_2023D1E _0803D1B0: .4byte gUnknown_2023D22 _0803D1B4: .4byte gUnknown_2023D10 _0803D1B8: .4byte gUnknown_3005A64 -_0803D1BC: .4byte sub_0803D334 +_0803D1BC: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts _0803D1C0: .4byte gUnknown_2024140 - thumb_func_end sub_0803CF2C + thumb_func_end SetActionsAndBattlersTurnOrder - thumb_func_start sub_0803D1C4 -sub_0803D1C4: @ 0x0803D1C4 + thumb_func_start TurnValuesCleanUp +TurnValuesCleanUp: @ 0x0803D1C4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -126021,7 +126021,7 @@ _0803D2D4: .4byte 0xFFBFFFFF _0803D2D8: .4byte 0xFEFFFFFF _0803D2DC: .4byte gUnknown_2023D10 _0803D2E0: .4byte gUnknown_2023F38 - thumb_func_end sub_0803D1C4 + thumb_func_end TurnValuesCleanUp thumb_func_start SpecialStatusesClear SpecialStatusesClear: @ 0x0803D2E4 @@ -126068,8 +126068,8 @@ _0803D32C: .4byte gUnknown_2023D10 _0803D330: .4byte gUnknown_2024020 thumb_func_end SpecialStatusesClear - thumb_func_start sub_0803D334 -sub_0803D334: @ 0x0803D334 + thumb_func_start CheckFocusPunch_ClearVarsBeforeTurnStarts +CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 0x0803D334 push {r4, r5, r6, r7, lr} ldr r0, _0803D3BC ldr r0, [r0] @@ -126197,14 +126197,14 @@ _0803D43C: .4byte gUnknown_2023D1E _0803D440: .4byte gUnknown_20240A4 _0803D444: .4byte gUnknown_2024140 _0803D448: .4byte gUnknown_3005A64 -_0803D44C: .4byte sub_0803D45C +_0803D44C: .4byte RunTurnActionsFunctions _0803D450: .4byte gUnknown_2023FD6 _0803D454: .4byte gUnknown_2024118 _0803D458: .4byte gUnknown_202414C - thumb_func_end sub_0803D334 + thumb_func_end CheckFocusPunch_ClearVarsBeforeTurnStarts - thumb_func_start sub_0803D45C -sub_0803D45C: @ 0x0803D45C + thumb_func_start RunTurnActionsFunctions +RunTurnActionsFunctions: @ 0x0803D45C push {r4, r5, r6, lr} ldr r6, _0803D4B0 ldrb r0, [r6] @@ -126227,7 +126227,7 @@ _0803D46C: ldr r0, [r0] bl _call_via_r0 ldr r0, _0803D4C4 - thumb_func_end sub_0803D45C + thumb_func_end RunTurnActionsFunctions thumb_func_start sub_0803D488 sub_0803D488: @ 0x0803D488 @@ -126284,8 +126284,8 @@ _0803D4FC: .4byte 0xFFFFFDFF _0803D500: .4byte 0xFFF7FFFF thumb_func_end sub_0803D488 - thumb_func_start sub_0803D504 -sub_0803D504: @ 0x0803D504 + thumb_func_start HandleEndTurn_BattleWon +HandleEndTurn_BattleWon: @ 0x0803D504 push {r4, lr} ldr r1, _0803D540 movs r0, #0 @@ -126334,7 +126334,7 @@ _0803D564: ands r2, r0 cmp r2, #0 beq _0803D5A0 - bl sub_0805E67C + bl BattleStopLowHpSound ldr r1, _0803D590 ldr r0, _0803D594 str r0, [r1] @@ -126360,7 +126360,7 @@ _0803D5A0: beq _0803D5AC b _0803D6DE _0803D5AC: - bl sub_0805E67C + bl BattleStopLowHpSound ldr r1, _0803D5D4 ldr r0, _0803D5D8 str r0, [r1] @@ -126440,24 +126440,24 @@ _0803D5E8: @ jump table .4byte _0803D6C0 @ case 50 _0803D6B4: ldr r0, _0803D6BC - bl sub_080A3040 + bl PlayBGM b _0803D6E4 .align 2, 0 _0803D6BC: .4byte 0x00000163 _0803D6C0: movs r0, #0xd4 lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM b _0803D6E4 _0803D6CA: movs r0, #0xb1 lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM b _0803D6E4 _0803D6D4: movs r0, #0xce lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM b _0803D6E4 _0803D6DE: ldr r1, _0803D6F0 @@ -126474,11 +126474,11 @@ _0803D6E4: _0803D6F0: .4byte gUnknown_2023EB8 _0803D6F4: .4byte gUnknown_8288EF2 _0803D6F8: .4byte gUnknown_3005A64 -_0803D6FC: .4byte sub_0803D918 - thumb_func_end sub_0803D504 +_0803D6FC: .4byte HandleEndTurn_FinishBattle + thumb_func_end HandleEndTurn_BattleWon - thumb_func_start sub_0803D700 -sub_0803D700: @ 0x0803D700 + thumb_func_start HandleEndTurn_BattleLost +HandleEndTurn_BattleLost: @ 0x0803D700 push {r4, lr} ldr r1, _0803D748 movs r0, #0 @@ -126573,11 +126573,11 @@ _0803D7C2: _0803D7D0: .4byte gUnknown_2023EB8 _0803D7D4: .4byte gUnknown_8288EF5 _0803D7D8: .4byte gUnknown_3005A64 -_0803D7DC: .4byte sub_0803D918 - thumb_func_end sub_0803D700 +_0803D7DC: .4byte HandleEndTurn_FinishBattle + thumb_func_end HandleEndTurn_BattleLost - thumb_func_start sub_0803D7E0 -sub_0803D7E0: @ 0x0803D7E0 + thumb_func_start HandleEndTurn_RanFromBattle +HandleEndTurn_RanFromBattle: @ 0x0803D7E0 push {lr} ldr r1, _0803D81C movs r0, #0 @@ -126677,8 +126677,8 @@ _0803D8AA: _0803D8B4: .4byte gUnknown_2023EB8 _0803D8B8: .4byte gUnknown_8289071 _0803D8BC: .4byte gUnknown_3005A64 -_0803D8C0: .4byte sub_0803D918 - thumb_func_end sub_0803D7E0 +_0803D8C0: .4byte HandleEndTurn_FinishBattle + thumb_func_end HandleEndTurn_RanFromBattle thumb_func_start HandleEndTurn_MonFled HandleEndTurn_MonFled: @ 0x0803D8C4 @@ -126716,11 +126716,11 @@ _0803D904: .4byte gUnknown_2023D12 _0803D908: .4byte gUnknown_2023EB8 _0803D90C: .4byte gUnknown_828907F _0803D910: .4byte gUnknown_3005A64 -_0803D914: .4byte sub_0803D918 +_0803D914: .4byte HandleEndTurn_FinishBattle thumb_func_end HandleEndTurn_MonFled - thumb_func_start sub_0803D918 -sub_0803D918: @ 0x0803D918 + thumb_func_start HandleEndTurn_FinishBattle +HandleEndTurn_FinishBattle: @ 0x0803D918 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -126752,7 +126752,7 @@ _0803D92E: ldr r6, _0803D9AC _0803D950: ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803D9E0 @@ -126768,7 +126768,7 @@ _0803D950: adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #6] ldrb r0, [r5] lsls r0, r0, #1 @@ -126779,7 +126779,7 @@ _0803D950: movs r1, #2 adds r2, r4, #0 adds r2, #8 - bl sub_0806A058 + bl GetMonData b _0803D9E0 .align 2, 0 _0803D994: .4byte gUnknown_2023D27 @@ -126799,7 +126799,7 @@ _0803D9B4: adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #0x26] ldrb r0, [r5] lsls r0, r0, #1 @@ -126810,7 +126810,7 @@ _0803D9B4: movs r1, #2 adds r2, r4, #0 adds r2, #0x14 - bl sub_0806A058 + bl GetMonData _0803D9E0: ldrb r0, [r5] adds r0, #1 @@ -126822,7 +126822,7 @@ _0803D9E0: cmp r0, r1 blo _0803D950 _0803D9F2: - bl sub_080ED2C8 + bl PutPokemonTodayCaughtOnAir _0803D9F6: ldr r0, _0803DA34 ldr r0, [r0] @@ -126856,9 +126856,9 @@ _0803DA34: .4byte gUnknown_2022C90 _0803DA38: .4byte 0x023F0B9A _0803DA3C: .4byte gUnknown_3005A70 _0803DA40: .4byte gUnknown_3005A64 -_0803DA44: .4byte sub_0803DA80 +_0803DA44: .4byte FreeResetData_ReturnToOvOrDoEvolutions _0803DA48: .4byte gUnknown_3005F28 -_0803DA4C: .4byte sub_080380FC +_0803DA4C: .4byte BattleMainCB2 _0803DA50: ldr r0, _0803DA74 ldr r0, [r0] @@ -126882,10 +126882,10 @@ _0803DA6A: _0803DA74: .4byte gUnknown_2023D0C _0803DA78: .4byte gUnknown_82EC694 _0803DA7C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0803D918 + thumb_func_end HandleEndTurn_FinishBattle - thumb_func_start sub_0803DA80 -sub_0803DA80: @ 0x0803DA80 + thumb_func_start FreeResetData_ReturnToOvOrDoEvolutions +FreeResetData_ReturnToOvOrDoEvolutions: @ 0x0803DA80 push {lr} ldr r0, _0803DAAC ldrb r1, [r0, #7] @@ -126912,33 +126912,33 @@ _0803DAAC: .4byte gUnknown_2037C74 _0803DAB0: .4byte gUnknown_3005AB4 _0803DAB4: .4byte gUnknown_2023FDE _0803DAB8: .4byte gUnknown_3005A64 -_0803DABC: .4byte sub_0803DBB0 +_0803DABC: .4byte ReturnFromBattleToOverworld _0803DAC0: ldr r1, _0803DAE8 ldr r0, _0803DAEC str r0, [r1] _0803DAC6: - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0803DAF0 ldr r0, [r0] movs r1, #2 ands r0, r1 cmp r0, #0 bne _0803DAE2 - bl sub_0805ECB0 - bl sub_08056C38 - bl sub_0805CD74 + bl FreeMonSpritesGfx + bl FreeBattleResources + bl FreeBattleSpritesData _0803DAE2: pop {r0} bx r0 .align 2, 0 _0803DAE8: .4byte gUnknown_3005A64 -_0803DAEC: .4byte sub_0803DAF4 +_0803DAEC: .4byte TryEvolvePokemon _0803DAF0: .4byte gUnknown_2022C90 - thumb_func_end sub_0803DA80 + thumb_func_end FreeResetData_ReturnToOvOrDoEvolutions - thumb_func_start sub_0803DAF4 -sub_0803DAF4: @ 0x0803DAF4 + thumb_func_start TryEvolvePokemon +TryEvolvePokemon: @ 0x0803DAF4 push {r4, r5, r6, lr} ldr r0, _0803DB4C ldrb r1, [r0] @@ -126966,12 +126966,12 @@ _0803DB02: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0 - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 beq _0803DB60 - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0803DB58 ldr r1, _0803DB5C str r1, [r0] @@ -126980,7 +126980,7 @@ _0803DB02: adds r0, r5, #0 adds r1, r4, #0 movs r2, #1 - bl sub_0813DB90 + bl EvolutionScene b _0803DB74 .align 2, 0 _0803DB4C: .4byte gUnknown_3005AB4 @@ -127007,8 +127007,8 @@ _0803DB74: .align 2, 0 _0803DB7C: .4byte gUnknown_3005AB4 _0803DB80: .4byte gUnknown_3005A64 -_0803DB84: .4byte sub_0803DBB0 - thumb_func_end sub_0803DAF4 +_0803DB84: .4byte ReturnFromBattleToOverworld + thumb_func_end TryEvolvePokemon thumb_func_start WaitForEvoSceneToFinish WaitForEvoSceneToFinish: @ 0x0803DB88 @@ -127026,13 +127026,13 @@ _0803DB9A: bx r0 .align 2, 0 _0803DBA0: .4byte gUnknown_3002360 -_0803DBA4: .4byte sub_080380FC +_0803DBA4: .4byte BattleMainCB2 _0803DBA8: .4byte gUnknown_3005A64 -_0803DBAC: .4byte sub_0803DAF4 +_0803DBAC: .4byte TryEvolvePokemon thumb_func_end WaitForEvoSceneToFinish - thumb_func_start sub_0803DBB0 -sub_0803DBB0: @ 0x0803DBB0 + thumb_func_start ReturnFromBattleToOverworld +ReturnFromBattleToOverworld: @ 0x0803DBB0 push {r4, r5, r6, lr} ldr r6, _0803DC34 ldr r0, [r6] @@ -127042,9 +127042,9 @@ sub_0803DBB0: @ 0x0803DBB0 bne _0803DBCC ldr r4, _0803DC38 adds r0, r4, #0 - bl sub_0806D748 + bl RandomlyGivePartyPokerus adds r0, r4, #0 - bl sub_0806D958 + bl PartySpreadPokerus _0803DBCC: ldr r4, [r6] adds r0, r4, #0 @@ -127077,7 +127077,7 @@ _0803DBDE: cmp r4, #0 beq _0803DC1E ldr r0, _0803DC54 - bl sub_08161E2C + bl UpdateRoamerHPStatus ldrb r1, [r5] movs r0, #1 ands r0, r1 @@ -127086,13 +127086,13 @@ _0803DBDE: cmp r1, #7 bne _0803DC1E _0803DC1A: - bl sub_08161E60 + bl SetRoamerInactive _0803DC1E: movs r0, #0x5a bl m4aSongNumStop ldr r0, _0803DC48 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _0803DC2C: pop {r4, r5, r6} pop {r0} @@ -127107,10 +127107,10 @@ _0803DC48: .4byte gUnknown_3002360 _0803DC4C: .4byte 0x00000439 _0803DC50: .4byte gUnknown_3005A60 _0803DC54: .4byte gUnknown_20243E8 - thumb_func_end sub_0803DBB0 + thumb_func_end ReturnFromBattleToOverworld - thumb_func_start sub_0803DC58 -sub_0803DC58: @ 0x0803DC58 + thumb_func_start RunBattleScriptCommands_PopCallbacksStack +RunBattleScriptCommands_PopCallbacksStack: @ 0x0803DC58 push {lr} ldr r0, _0803DC94 ldrb r0, [r0] @@ -127165,7 +127165,7 @@ _0803DCBA: _0803DCC0: .4byte gUnknown_2023D0C _0803DCC4: .4byte gUnknown_82EC694 _0803DCC8: .4byte gUnknown_2023EB8 - thumb_func_end sub_0803DC58 + thumb_func_end RunBattleScriptCommands_PopCallbacksStack thumb_func_start sub_0803DCCC sub_0803DCCC: @ 0x0803DCCC @@ -127191,8 +127191,8 @@ _0803DCF0: .4byte gUnknown_82EC694 _0803DCF4: .4byte gUnknown_2023EB8 thumb_func_end sub_0803DCCC - thumb_func_start sub_0803DCF8 -sub_0803DCF8: @ 0x0803DCF8 + thumb_func_start HandleAction_UseMove +HandleAction_UseMove: @ 0x0803DCF8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -127285,7 +127285,7 @@ _0803DD50: str r0, [r2] movs r0, #0xa5 movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldrb r1, [r6] ldr r3, _0803DDE8 ldr r2, [r3] @@ -127375,7 +127375,7 @@ _0803DE44: strb r0, [r5] ldrh r0, [r2] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldrb r1, [r6] ldr r3, _0803DEA4 ldr r2, [r3] @@ -127431,7 +127431,7 @@ _0803DEA8: strb r0, [r1, #0xe] ldrh r0, [r3] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldrb r1, [r6] ldr r3, _0803DF18 ldr r2, [r3] @@ -127465,7 +127465,7 @@ _0803DF1C: strh r3, [r1] ldrh r0, [r1] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldrb r1, [r4] ldr r2, _0803DF70 ldr r2, [r2] @@ -127497,7 +127497,7 @@ _0803DF7C: cmp r0, #0 beq _0803DFC4 adds r0, r3, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803DFBC @@ -127520,7 +127520,7 @@ _0803DFBC: _0803DFC4: mov r1, r8 ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -127545,10 +127545,10 @@ _0803DFC4: bne _0803E040 mov r3, r8 ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldrb r0, [r5, #9] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -127630,7 +127630,7 @@ _0803E0A0: b _0803E270 _0803E0A8: adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r1, _0803E178 @@ -127642,7 +127642,7 @@ _0803E0A8: adds r4, r1, #0 _0803E0C0: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -127706,7 +127706,7 @@ _0803E128: beq _0803E1A8 ldr r0, _0803E160 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803E188 @@ -127774,10 +127774,10 @@ _0803E1B8: _0803E1D2: ldr r6, _0803E1F4 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -127818,7 +127818,7 @@ _0803E222: adds r1, r1, r2 adds r1, #0x20 ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle ldr r2, _0803E268 ldrb r1, [r4] lsls r0, r1, #2 @@ -127860,7 +127860,7 @@ _0803E270: beq _0803E320 mov r5, r8 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803E2C4 @@ -127905,10 +127905,10 @@ _0803E2D6: beq _0803E3AA ldr r0, _0803E31C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -127940,10 +127940,10 @@ _0803E320: cmp r1, #0 beq _0803E3AA ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -128100,7 +128100,7 @@ _0803E498: .4byte gUnknown_82ED220 _0803E49C: .4byte gUnknown_2023E8E _0803E4A0: .4byte gUnknown_2023EAF _0803E4A4: .4byte gUnknown_2023D27 - thumb_func_end sub_0803DCF8 + thumb_func_end HandleAction_UseMove thumb_func_start HandleAction_Switch HandleAction_Switch: @ 0x0803E4A8 @@ -128176,8 +128176,8 @@ _0803E544: .4byte gUnknown_2023D27 _0803E548: .4byte gUnknown_3005A70 thumb_func_end HandleAction_Switch - thumb_func_start sub_0803E54C -sub_0803E54C: @ 0x0803E54C + thumb_func_start HandleAction_UseItem +HandleAction_UseItem: @ 0x0803E54C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -128256,7 +128256,7 @@ _0803E5F8: .4byte gUnknown_828A2DC _0803E5FC: .4byte gUnknown_2023D27 _0803E600: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803E628 @@ -128539,10 +128539,10 @@ _0803E850: .4byte gUnknown_2023EAF _0803E854: .4byte gUnknown_2023EB8 _0803E858: .4byte gUnknown_828A2C4 _0803E85C: .4byte gUnknown_2023D27 - thumb_func_end sub_0803E54C + thumb_func_end HandleAction_UseItem - thumb_func_start sub_0803E860 -sub_0803E860: @ 0x0803E860 + thumb_func_start TryRunFromBattle +TryRunFromBattle: @ 0x0803E860 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -128614,7 +128614,7 @@ _0803E8DC: ldrb r6, [r0] cmp r6, #0x32 bne _0803E99C - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0803E978 @@ -128715,7 +128715,7 @@ _0803E9C0: ands r0, r1 cmp r0, #0 bne _0803EA46 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0803E9FC @@ -128807,10 +128807,10 @@ _0803EA78: .4byte gUnknown_2024140 _0803EA7C: .4byte gUnknown_2023D26 _0803EA80: .4byte gUnknown_2023D10 _0803EA84: .4byte gUnknown_2023FDE - thumb_func_end sub_0803E860 + thumb_func_end TryRunFromBattle - thumb_func_start sub_0803EA88 -sub_0803EA88: @ 0x0803EA88 + thumb_func_start HandleAction_Run +HandleAction_Run: @ 0x0803EA88 push {r4, r5, r6, lr} ldr r4, _0803EAD8 ldr r1, _0803EADC @@ -128839,7 +128839,7 @@ sub_0803EA88: @ 0x0803EA88 ldr r5, _0803EAF8 _0803EABC: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803EAFC @@ -128903,12 +128903,12 @@ _0803EB44: .4byte gUnknown_3005AF0 _0803EB48: .4byte 0x00000CA9 _0803EB4C: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0803EB8C ldrb r0, [r4] - bl sub_0803E860 + bl TryRunFromBattle lsls r0, r0, #0x18 cmp r0, #0 bne _0803EBD8 @@ -128971,7 +128971,7 @@ _0803EBD8: .align 2, 0 _0803EBE0: .4byte gUnknown_2023D10 _0803EBE4: .4byte gUnknown_2023FDE - thumb_func_end sub_0803EA88 + thumb_func_end HandleAction_Run thumb_func_start HandleAction_WatchesCarefully HandleAction_WatchesCarefully: @ 0x0803EBE8 @@ -129048,8 +129048,8 @@ _0803EC88: .4byte gUnknown_828A290 _0803EC8C: .4byte gUnknown_2023D27 thumb_func_end HandleAction_SafariZoneBallThrow - thumb_func_start sub_0803EC90 -sub_0803EC90: @ 0x0803EC90 + thumb_func_start HandleAction_ThrowPokeblock +HandleAction_ThrowPokeblock: @ 0x0803EC90 push {r4, r5, r6, lr} ldr r3, _0803ED10 ldr r1, _0803ED14 @@ -129147,10 +129147,10 @@ _0803ED40: _0803ED54: .4byte gUnknown_2023EB8 _0803ED58: .4byte gUnknown_828A2E0 _0803ED5C: .4byte gUnknown_2023D27 - thumb_func_end sub_0803EC90 + thumb_func_end HandleAction_ThrowPokeblock - thumb_func_start sub_0803ED60 -sub_0803ED60: @ 0x0803ED60 + thumb_func_start HandleAction_GoNear +HandleAction_GoNear: @ 0x0803ED60 push {r4, lr} ldr r2, _0803EDE0 ldr r1, _0803EDE4 @@ -129246,10 +129246,10 @@ _0803EE20: .4byte gUnknown_2023FD6 _0803EE24: .4byte gUnknown_2023EB8 _0803EE28: .4byte gUnknown_828A2E0 _0803EE2C: .4byte gUnknown_2023D27 - thumb_func_end sub_0803ED60 + thumb_func_end HandleAction_GoNear - thumb_func_start sub_0803EE30 -sub_0803EE30: @ 0x0803EE30 + thumb_func_start HandleAction_SafariZoneRun +HandleAction_SafariZoneRun: @ 0x0803EE30 push {r4, lr} ldr r2, _0803EE58 ldr r1, _0803EE5C @@ -129275,7 +129275,7 @@ _0803EE5C: .4byte gUnknown_2023D22 _0803EE60: .4byte gUnknown_2023D26 _0803EE64: .4byte gUnknown_2023D10 _0803EE68: .4byte gUnknown_2023FDE - thumb_func_end sub_0803EE30 + thumb_func_end HandleAction_SafariZoneRun thumb_func_start HandleAction_WallyBallThrow HandleAction_WallyBallThrow: @ 0x0803EE6C @@ -129333,7 +129333,7 @@ _0803EEE0: .4byte gUnknown_2023D1E thumb_func_start HandleAction_TryFinish HandleAction_TryFinish: @ 0x0803EEE4 push {lr} - bl sub_08041368 + bl HandleFaintedMonActions lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -129379,8 +129379,8 @@ _0803EF38: .4byte gUnknown_2023F24 _0803EF3C: .4byte 0xF1E892AF thumb_func_end HandleAction_NothingIsFainted - thumb_func_start sub_0803EF40 -sub_0803EF40: @ 0x0803EF40 + thumb_func_start HandleAction_ActionFinished +HandleAction_ActionFinished: @ 0x0803EF40 push {r4, r5, r6, lr} ldr r1, _0803EFC8 ldr r2, _0803EFCC @@ -129465,10 +129465,10 @@ _0803EFFC: .4byte gUnknown_2023EFC _0803F000: .4byte gUnknown_20240A4 _0803F004: .4byte gUnknown_2023FD6 _0803F008: .4byte gUnknown_202414C - thumb_func_end sub_0803EF40 + thumb_func_end HandleAction_ActionFinished - thumb_func_start sub_0803F00C -sub_0803F00C: @ 0x0803F00C + thumb_func_start GetBattlerForBattleScript +GetBattlerForBattleScript: @ 0x0803F00C push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -129550,10 +129550,10 @@ _0803F0BA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0803F00C + thumb_func_end GetBattlerForBattleScript - thumb_func_start sub_0803F0C0 -sub_0803F0C0: @ 0x0803F0C0 + thumb_func_start PressurePPLose +PressurePPLose: @ 0x0803F0C0 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -129643,7 +129643,7 @@ _0803F11E: movs r3, #1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803F172: add sp, #4 pop {r4, r5, r6, r7} @@ -129653,10 +129653,10 @@ _0803F172: _0803F17C: .4byte gUnknown_2023F60 _0803F180: .4byte gUnknown_82FACB4 _0803F184: .4byte gUnknown_2023D08 - thumb_func_end sub_0803F0C0 + thumb_func_end PressurePPLose - thumb_func_start sub_0803F188 -sub_0803F188: @ 0x0803F188 + thumb_func_start PressurePPLoseOnUsingImprison +PressurePPLoseOnUsingImprison: @ 0x0803F188 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -129668,7 +129668,7 @@ sub_0803F188: @ 0x0803F188 movs r0, #4 mov r8, r0 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -129686,7 +129686,7 @@ sub_0803F188: @ 0x0803F188 _0803F1BE: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r6, r4, #1 @@ -129793,7 +129793,7 @@ _0803F230: movs r3, #1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803F298: add sp, #4 pop {r3, r4, r5} @@ -129809,10 +129809,10 @@ _0803F2AC: .4byte gUnknown_2023D28 _0803F2B0: .4byte gUnknown_2023F60 _0803F2B4: .4byte gUnknown_82FACB4 _0803F2B8: .4byte gUnknown_2023D08 - thumb_func_end sub_0803F188 + thumb_func_end PressurePPLoseOnUsingImprison - thumb_func_start sub_0803F2BC -sub_0803F2BC: @ 0x0803F2BC + thumb_func_start PressurePPLoseOnUsingPerishSong +PressurePPLoseOnUsingPerishSong: @ 0x0803F2BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -129930,7 +129930,7 @@ _0803F33E: movs r3, #1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0803F3A2: add sp, #4 pop {r3, r4, r5} @@ -129948,10 +129948,10 @@ _0803F3C0: .4byte gUnknown_2023D4C _0803F3C4: .4byte gUnknown_2023F60 _0803F3C8: .4byte gUnknown_82FACB4 _0803F3CC: .4byte gUnknown_2023D08 - thumb_func_end sub_0803F2BC + thumb_func_end PressurePPLoseOnUsingPerishSong - thumb_func_start sub_0803F3D0 -sub_0803F3D0: @ 0x0803F3D0 + thumb_func_start MarkAllBattlersForControllerExec +MarkAllBattlersForControllerExec: @ 0x0803F3D0 push {r4, r5, lr} ldr r0, _0803F400 ldr r0, [r0] @@ -130007,10 +130007,10 @@ _0803F42E: _0803F434: .4byte gUnknown_2023D10 _0803F438: .4byte gUnknown_2023D0C _0803F43C: .4byte gUnknown_82FACB4 - thumb_func_end sub_0803F3D0 + thumb_func_end MarkAllBattlersForControllerExec - thumb_func_start sub_0803F440 -sub_0803F440: @ 0x0803F440 + thumb_func_start MarkBattlerForControllerExec +MarkBattlerForControllerExec: @ 0x0803F440 push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -130049,7 +130049,7 @@ _0803F484: .align 2, 0 _0803F488: .4byte gUnknown_2023D0C _0803F48C: .4byte gUnknown_82FACB4 - thumb_func_end sub_0803F440 + thumb_func_end MarkBattlerForControllerExec thumb_func_start sub_0803F490 sub_0803F490: @ 0x0803F490 @@ -130074,7 +130074,7 @@ _0803F4AC: str r0, [r5] adds r4, #1 _0803F4BA: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -130144,8 +130144,8 @@ _0803F544: .4byte 0xFFFBFF3F _0803F548: .4byte gUnknown_2023F60 thumb_func_end CancelMultiTurnMoves - thumb_func_start sub_0803F54C -sub_0803F54C: @ 0x0803F54C + thumb_func_start WasUnableToUseMove +WasUnableToUseMove: @ 0x0803F54C push {lr} lsls r0, r0, #0x18 ldr r1, _0803F598 @@ -130192,10 +130192,10 @@ _0803F59E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0803F54C + thumb_func_end WasUnableToUseMove - thumb_func_start sub_0803F5A4 -sub_0803F5A4: @ 0x0803F5A4 + thumb_func_start PrepareStringBattle +PrepareStringBattle: @ 0x0803F5A4 push {r4, lr} adds r2, r0, #0 lsls r2, r2, #0x10 @@ -130204,15 +130204,15 @@ sub_0803F5A4: @ 0x0803F5A4 strb r1, [r4] movs r0, #0 adds r1, r2, #0 - bl sub_08033A7C + bl BtlController_EmitPrintSelectionString ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec pop {r4} pop {r0} bx r0 .align 2, 0 _0803F5C4: .4byte gUnknown_2023D08 - thumb_func_end sub_0803F5A4 + thumb_func_end PrepareStringBattle thumb_func_start ResetSentPokesToOpponentValue ResetSentPokesToOpponentValue: @ 0x0803F5C8 @@ -130278,7 +130278,7 @@ sub_0803F62C: @ 0x0803F62C lsrs r5, r0, #0x18 movs r4, #0 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -130343,7 +130343,7 @@ sub_0803F6B0: @ 0x0803F6B0 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -130457,8 +130457,8 @@ _0803F784: .4byte gUnknown_2023EB8 _0803F788: .4byte gUnknown_202414C thumb_func_end BattleScriptPop - thumb_func_start sub_0803F78C -sub_0803F78C: @ 0x0803F78C + thumb_func_start TrySetCantSelectMoveBattleScript +TrySetCantSelectMoveBattleScript: @ 0x0803F78C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -130671,7 +130671,7 @@ _0803F95A: ldr r4, _0803F9A4 ldrb r0, [r4] adds r1, r5, #0 - bl sub_0803FD70 + bl GetImprisonedMovesCount lsls r0, r0, #0x18 cmp r0, #0 beq _0803F9CE @@ -130865,10 +130865,10 @@ _0803FAF8: .align 2, 0 _0803FB04: .4byte gUnknown_2023EC4 _0803FB08: .4byte gUnknown_82895FE - thumb_func_end sub_0803F78C + thumb_func_end TrySetCantSelectMoveBattleScript - thumb_func_start sub_0803FB0C -sub_0803FB0C: @ 0x0803FB0C + thumb_func_start CheckMoveLimitations +CheckMoveLimitations: @ 0x0803FB0C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -131044,7 +131044,7 @@ _0803FC5C: ldrh r1, [r5] adds r0, r7, #0 str r3, [sp, #0x14] - bl sub_0803FD70 + bl GetImprisonedMovesCount lsls r0, r0, #0x18 ldr r3, [sp, #0x14] cmp r0, #0 @@ -131123,16 +131123,16 @@ _0803FCF8: .4byte gUnknown_82FACB4 _0803FCFC: .4byte gUnknown_2023EEC _0803FD00: .4byte gUnknown_82ED220 _0803FD04: .4byte 0x0000FFFF - thumb_func_end sub_0803FB0C + thumb_func_end CheckMoveLimitations - thumb_func_start sub_0803FD08 -sub_0803FD08: @ 0x0803FD08 + thumb_func_start AreAllMovesUnusable +AreAllMovesUnusable: @ 0x0803FD08 push {r4, lr} ldr r4, _0803FD3C ldrb r0, [r4] movs r1, #0 movs r2, #0xff - bl sub_0803FB0C + bl CheckMoveLimitations lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0xf @@ -131178,10 +131178,10 @@ _0803FD66: bx r1 .align 2, 0 _0803FD6C: .4byte gUnknown_2023FE0 - thumb_func_end sub_0803FD08 + thumb_func_end AreAllMovesUnusable - thumb_func_start sub_0803FD70 -sub_0803FD70: @ 0x0803FD70 + thumb_func_start GetImprisonedMovesCount +GetImprisonedMovesCount: @ 0x0803FD70 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -131191,7 +131191,7 @@ sub_0803FD70: @ 0x0803FD70 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 movs r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -131205,7 +131205,7 @@ sub_0803FD70: @ 0x0803FD70 _0803FD9A: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r3, r4, #1 @@ -131262,10 +131262,10 @@ _0803FDF4: _0803FE04: .4byte gUnknown_2023D10 _0803FE08: .4byte gUnknown_2023D34 _0803FE0C: .4byte gUnknown_2023F50 - thumb_func_end sub_0803FD70 + thumb_func_end GetImprisonedMovesCount - thumb_func_start sub_0803FE10 -sub_0803FE10: @ 0x0803FE10 + thumb_func_start DoFieldEndTurnEffects +DoFieldEndTurnEffects: @ 0x0803FE10 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -131411,7 +131411,7 @@ _0803FF38: adds r1, r4, r7 ldrb r1, [r1] movs r2, #0 - bl sub_0803CB54 + bl GetWhoStrikesFirst lsls r0, r0, #0x18 cmp r0, #0 beq _0803FF58 @@ -132168,11 +132168,11 @@ _0804053E: bx r1 .align 2, 0 _0804055C: .4byte gUnknown_3005A64 -_08040560: .4byte sub_0803B600 - thumb_func_end sub_0803FE10 +_08040560: .4byte BattleTurnPassed + thumb_func_end DoFieldEndTurnEffects - thumb_func_start sub_08040564 -sub_08040564: @ 0x08040564 + thumb_func_start DoBattlerEndTurnEffects +DoBattlerEndTurnEffects: @ 0x08040564 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -132203,7 +132203,7 @@ _08040598: .4byte gUnknown_2023F24 _0804059C: .4byte 0x01000020 _080405A0: .4byte gUnknown_2024140 _080405A4: .4byte gUnknown_2023D10 - thumb_func_end sub_08040564 + thumb_func_end DoBattlerEndTurnEffects thumb_func_start sub_080405A8 sub_080405A8: @ 0x080405A8 @@ -132324,7 +132324,7 @@ _080406B8: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _080406D2 @@ -132335,7 +132335,7 @@ _080406D6: ldrb r1, [r6] movs r0, #1 movs r2, #0 - bl sub_0804411C + bl ItemBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _080406EA @@ -132346,7 +132346,7 @@ _080406EE: ldrb r1, [r6] movs r0, #1 movs r2, #1 - bl sub_0804411C + bl ItemBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _08040702 @@ -132799,7 +132799,7 @@ _08040A40: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _08040B08 .align 2, 0 _08040A90: .4byte 0xF7FFFFFF @@ -132891,7 +132891,7 @@ _08040B28: subs r0, #0x10 str r0, [r1] ldrb r0, [r5] - bl sub_0803F54C + bl WasUnableToUseMove lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -132968,7 +132968,7 @@ _08040BDA: adds r0, r1, r3 str r0, [r2] ldrb r0, [r6] - bl sub_0803F54C + bl WasUnableToUseMove lsls r0, r0, #0x18 cmp r0, #0 beq _08040BFC @@ -133014,7 +133014,7 @@ _08040C32: strb r0, [r1, #3] movs r0, #1 movs r1, #0 - bl sub_080483A0 + bl SetMoveEffect ldrb r0, [r6] muls r0, r7, r0 adds r0, r0, r5 @@ -133345,7 +133345,7 @@ _08040E78: cmp r0, #0xf beq _08040F1E adds r0, r2, #0 - bl sub_08050260 + bl UproarWakeUpCheck lsls r0, r0, #0x18 cmp r0, #0 bne _08040F1E @@ -133372,7 +133372,7 @@ _08040E78: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r6] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08040F38 ldrb r0, [r6] strb r0, [r1] @@ -133453,8 +133453,8 @@ _08040F9C: .4byte gUnknown_2023F24 _08040FA0: .4byte 0xFEFFFFDF thumb_func_end sub_080405A8 - thumb_func_start sub_08040FA4 -sub_08040FA4: @ 0x08040FA4 + thumb_func_start HandleWishPerishSongOnTurnEnd +HandleWishPerishSongOnTurnEnd: @ 0x08040FA4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -133918,10 +133918,10 @@ _08041354: bx r1 .align 2, 0 _08041364: .4byte 0xFEFFFFDF - thumb_func_end sub_08040FA4 + thumb_func_end HandleWishPerishSongOnTurnEnd - thumb_func_start sub_08041368 -sub_08041368: @ 0x08041368 + thumb_func_start HandleFaintedMonActions +HandleFaintedMonActions: @ 0x08041368 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -134016,7 +134016,7 @@ _08041414: lsrs r0, r0, #0x18 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 bne _0804143C @@ -134229,7 +134229,7 @@ _080415D4: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -134241,7 +134241,7 @@ _080415EE: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08041604 @@ -134250,7 +134250,7 @@ _08041604: movs r0, #1 movs r1, #0 movs r2, #1 - bl sub_0804411C + bl ItemBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -134262,7 +134262,7 @@ _08041618: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0804162E @@ -134295,7 +134295,7 @@ _0804164C: bx r1 .align 2, 0 _08041658: .4byte gUnknown_2024140 - thumb_func_end sub_08041368 + thumb_func_end HandleFaintedMonActions thumb_func_start TryClearRageStatuses TryClearRageStatuses: @ 0x0804165C @@ -134451,7 +134451,7 @@ _08041788: b _080418AE _080417A8: adds r0, r1, #0 - bl sub_08050260 + bl UproarWakeUpCheck lsls r0, r0, #0x18 cmp r0, #0 beq _08041808 @@ -134950,7 +134950,7 @@ _08041C00: ldrb r0, [r4] ldr r1, _08041C4C ldrh r1, [r1] - bl sub_0803FD70 + bl GetImprisonedMovesCount lsls r0, r0, #0x18 cmp r0, #0 beq _08041C3E @@ -135050,7 +135050,7 @@ _08041CBC: adds r0, r1, #0 movs r2, #1 movs r3, #0 - bl sub_080690BC + bl CalculateBaseDamage ldr r1, _08041D14 str r0, [r1] ldr r0, _08041D18 @@ -135299,7 +135299,7 @@ _08041EC0: beq _08041F0A movs r0, #0x75 movs r1, #1 - bl sub_08045520 + bl GetMoveTarget strb r0, [r4] _08041F0A: ldr r1, _08041F30 @@ -135413,7 +135413,7 @@ _08041FC8: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08041FF4: mov r0, sb add sp, #0x10 @@ -135438,8 +135438,8 @@ _0804202C: .4byte gUnknown_2023D08 _08042030: .4byte gUnknown_2023D74 thumb_func_end sub_080416D0 - thumb_func_start sub_08042034 -sub_08042034: @ 0x08042034 + thumb_func_start HasNoMonsToSwitch +HasNoMonsToSwitch: @ 0x08042034 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -135470,7 +135470,7 @@ _08042064: cmp r0, #0 beq _080420DC adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _080420D4 mov r8, r1 @@ -135496,17 +135496,17 @@ _08042096: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080420C6 adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080420C6 adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -135534,14 +135534,14 @@ _080420DC: cmp r1, #0 beq _08042124 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08042110 ldr r2, _0804210C mov r8, r2 adds r0, r4, #0 - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 b _08042142 @@ -135560,11 +135560,11 @@ _08042110: _08042120: .4byte gUnknown_20243E8 _08042124: adds r0, r4, #0 - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _080421A4 mov r8, r1 @@ -135574,7 +135574,7 @@ _08042124: mov r8, r2 _08042142: adds r0, r7, #0 - bl sub_0806D2C8 + bl GetLinkTrainerFlankId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 _0804214C: @@ -135592,17 +135592,17 @@ _0804215A: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804218A adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804218A adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -135633,7 +135633,7 @@ _080421AC: cmp r1, #0 beq _0804221A adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -135661,17 +135661,17 @@ _080421DE: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080421DC adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080421DC adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -135683,7 +135683,7 @@ _08042212: b _080422DE _0804221A: adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -135739,17 +135739,17 @@ _08042282: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080422D2 adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080422D2 adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -135792,10 +135792,10 @@ _080422E0: _080422F0: .4byte gUnknown_2024190 _080422F4: .4byte gUnknown_2023D12 _080422F8: .4byte gUnknown_2024140 - thumb_func_end sub_08042034 + thumb_func_end HasNoMonsToSwitch - thumb_func_start sub_080422FC -sub_080422FC: @ 0x080422FC + thumb_func_start CastformDataTypeChange +CastformDataTypeChange: @ 0x080422FC push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -135822,7 +135822,7 @@ sub_080422FC: @ 0x080422FC movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804234E @@ -135831,7 +135831,7 @@ sub_080422FC: @ 0x080422FC movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08042374 @@ -135860,7 +135860,7 @@ _08042374: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -135870,7 +135870,7 @@ _08042374: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _080423A4 @@ -135980,10 +135980,10 @@ _08042458: .align 2, 0 _08042460: .4byte gUnknown_2024070 _08042464: .4byte gUnknown_2023D28 - thumb_func_end sub_080422FC + thumb_func_end CastformDataTypeChange - thumb_func_start sub_08042468 -sub_08042468: @ 0x08042468 + thumb_func_start AbilityBattleEffects +AbilityBattleEffects: @ 0x08042468 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -136016,7 +136016,7 @@ sub_08042468: @ 0x08042468 strb r1, [r5] _080424A4: ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080424D4 @@ -136055,7 +136055,7 @@ _080424E4: strb r2, [r5] _080424F6: ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08042528 @@ -136087,23 +136087,23 @@ _08042538: adds r5, r1, r0 adds r0, r7, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #8] adds r0, r7, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x10] adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0xc] adds r0, r5, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x14] ldr r0, _08042590 ldr r0, [r0] @@ -136273,7 +136273,7 @@ _080426C6: ands r0, r1 cmp r0, #0 bne _0804278C - bl sub_080ABC08 + bl GetCurrentWeather lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #3 @@ -136361,7 +136361,7 @@ _0804278C: bne _08042796 bl _0804407A _08042796: - bl sub_080ABC08 + bl GetCurrentWeather ldr r1, _080427B0 strb r0, [r1, #5] ldr r0, _080427B4 @@ -136463,7 +136463,7 @@ _08042874: .4byte gUnknown_2024020 _08042878: .4byte gUnknown_2023F50 _0804287C: mov r0, sl - bl sub_080422FC + bl CastformDataTypeChange lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -136517,7 +136517,7 @@ _080428E4: bl _0804405E _080428F0: adds r0, r6, #0 - bl sub_080422FC + bl CastformDataTypeChange lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -136578,7 +136578,7 @@ _08042962: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -136590,7 +136590,7 @@ _0804297E: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08042996 @@ -136717,7 +136717,7 @@ _08042A64: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec bl _08044010 .align 2, 0 _08042A9C: .4byte gUnknown_2022C0C @@ -137852,11 +137852,11 @@ _08043480: _08043494: ldr r0, [sp, #8] ldr r1, [sp, #0x10] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality adds r4, r0, #0 ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -137879,7 +137879,7 @@ _080434B2: _080434CE: ldr r0, [sp, #8] ldr r1, [sp, #0x10] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -137888,7 +137888,7 @@ _080434CE: _080434E2: ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -138261,7 +138261,7 @@ _0804383C: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec bl _0804407A .align 2, 0 _08043874: .4byte gUnknown_2023D28 @@ -138307,7 +138307,7 @@ _080438BC: cmp r0, #0x3b bne _080438E0 mov r0, sl - bl sub_080422FC + bl CastformDataTypeChange lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -138762,7 +138762,7 @@ _08043C60: .4byte gUnknown_2023D28 _08043C64: .4byte gUnknown_2023F50 _08043C68: mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r4, #0 @@ -138776,7 +138776,7 @@ _08043C7E: _08043C80: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r3, r4, #1 @@ -138807,7 +138807,7 @@ _08043CBC: .4byte gUnknown_2023D28 _08043CC0: .4byte gUnknown_2023EAE _08043CC4: mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r4, #0 @@ -138821,7 +138821,7 @@ _08043CDA: _08043CDC: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r3, r4, #1 @@ -139026,7 +139026,7 @@ _08043E58: .4byte gUnknown_2023D28 _08043E5C: .4byte gUnknown_2023EAE _08043E60: mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r4, #0 @@ -139040,7 +139040,7 @@ _08043E76: _08043E78: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r5 @@ -139072,7 +139072,7 @@ _08043EB4: .4byte gUnknown_2023D28 _08043EB8: .4byte gUnknown_2023EAE _08043EBC: mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r4, #0 @@ -139086,7 +139086,7 @@ _08043ED2: _08043ED4: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r5 @@ -139116,7 +139116,7 @@ _08043F00: _08043F0C: .4byte gUnknown_2023D10 _08043F10: .4byte gUnknown_2023D28 _08043F14: .4byte gUnknown_2023EAE - thumb_func_end sub_08042468 + thumb_func_end AbilityBattleEffects thumb_func_start sub_08043F18 sub_08043F18: @ 0x08043F18 @@ -139283,7 +139283,7 @@ _08044064: beq _0804407A adds r1, r0, #0 mov r0, sl - bl sub_0813114C + bl RecordAbilityBattle _0804407A: mov r0, sb add sp, #0x28 @@ -139328,7 +139328,7 @@ BattleScriptExecute: @ 0x08044098 _080440C4: .4byte gUnknown_2023EB8 _080440C8: .4byte gUnknown_202414C _080440CC: .4byte gUnknown_3005A64 -_080440D0: .4byte sub_0803DC58 +_080440D0: .4byte RunBattleScriptCommands_PopCallbacksStack _080440D4: .4byte gUnknown_2023D27 thumb_func_end BattleScriptExecute @@ -139365,8 +139365,8 @@ _08044114: .4byte gUnknown_3005A64 _08044118: .4byte sub_0803DCCC thumb_func_end BattleScriptPushCursorAndCallback - thumb_func_start sub_0804411C -sub_0804411C: @ 0x0804411C + thumb_func_start ItemBattleEffects +ItemBattleEffects: @ 0x0804411C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -139497,7 +139497,7 @@ _08044228: bl _0804546A _08044234: adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08044244 @@ -139673,7 +139673,7 @@ _080443F0: bl _08044E16 _080443F8: adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0804441C @@ -139705,17 +139705,17 @@ _08044432: mov r1, sl adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 mov r1, sl adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r5] adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r6, #0 @@ -139738,7 +139738,7 @@ _08044476: lsls r2, r5, #0x18 lsrs r2, r2, #0x18 adds r0, r6, #0 - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r2, r0, #0x18 add r0, sp, #4 @@ -139781,7 +139781,7 @@ _080444A4: bl BtlController_EmitSetMonData ldr r0, _080444EC ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec movs r0, #3 str r0, [sp, #0xc] bl _08044E1E @@ -139881,7 +139881,7 @@ _08044598: str r0, [sp, #0xc] adds r0, r7, #0 adds r1, r5, #0 - bl sub_0813117C + bl RecordItemEffectBattle bl _08044E16 .align 2, 0 _080445B4: .4byte gUnknown_2023E94 @@ -141507,7 +141507,7 @@ _080452CC: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804546A .align 2, 0 _080452E8: .4byte gUnknown_2024118 @@ -141607,7 +141607,7 @@ _08045360: bl BattleScriptPushCursor movs r0, #0 movs r1, #0 - bl sub_080483A0 + bl SetMoveEffect bl BattleScriptPop b _0804546A .align 2, 0 @@ -141715,7 +141715,7 @@ _08045498: .4byte gUnknown_2023EB3 _0804549C: .4byte gUnknown_2024118 _080454A0: .4byte gUnknown_2023EB8 _080454A4: .4byte gUnknown_8289D7F - thumb_func_end sub_0804411C + thumb_func_end ItemBattleEffects thumb_func_start ClearFuryCutterDestinyBondGrudge ClearFuryCutterDestinyBondGrudge: @ 0x080454A8 @@ -141778,8 +141778,8 @@ _08045518: .4byte gUnknown_82EC694 _0804551C: .4byte gUnknown_2023EB8 thumb_func_end sub_080454F4 - thumb_func_start sub_08045520 -sub_08045520: @ 0x08045520 + thumb_func_start GetMoveTarget +GetMoveTarget: @ 0x08045520 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -141884,7 +141884,7 @@ _08045564: @ jump table _08045668: ldr r0, _08045748 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -141909,7 +141909,7 @@ _08045668: _0804569A: ldr r0, _08045748 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r7, #1 @@ -141928,7 +141928,7 @@ _080456AA: cmp r5, r3 beq _080456AA adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -141957,7 +141957,7 @@ _080456F8: movs r0, #0x10 movs r2, #0x1f movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804570E @@ -141982,7 +141982,7 @@ _08045722: adds r0, #0x20 ldrb r1, [r0] adds r0, r5, #0 - bl sub_0813114C + bl RecordAbilityBattle ldr r1, _08045764 lsls r0, r5, #2 adds r0, r0, r5 @@ -142016,7 +142016,7 @@ _0804577C: .4byte gUnknown_2023EAF _08045780: ldr r0, _080457B4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -142057,7 +142057,7 @@ _080457C0: beq _0804583C ldr r0, _080457F8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08045800 @@ -142138,15 +142138,15 @@ _08045860: .align 2, 0 _0804587C: .4byte gUnknown_2023EAF _08045880: .4byte gUnknown_2024140 - thumb_func_end sub_08045520 + thumb_func_end GetMoveTarget - thumb_func_start sub_08045884 -sub_08045884: @ 0x08045884 + thumb_func_start HasObedientBitSet +HasObedientBitSet: @ 0x08045884 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -142161,7 +142161,7 @@ sub_08045884: @ 0x08045884 adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xcd lsls r1, r1, #1 cmp r0, r1 @@ -142171,7 +142171,7 @@ sub_08045884: @ 0x08045884 adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0x97 beq _080458D8 _080458CA: @@ -142190,7 +142190,7 @@ _080458D8: adds r0, r0, r1 movs r1, #0x50 movs r2, #0 - bl sub_0806A058 + bl GetMonData _080458EE: pop {r4, r5, r6, r7} pop {r1} @@ -142198,10 +142198,10 @@ _080458EE: .align 2, 0 _080458F4: .4byte gUnknown_2023D12 _080458F8: .4byte gUnknown_2024190 - thumb_func_end sub_08045884 + thumb_func_end HasObedientBitSet - thumb_func_start sub_080458FC -sub_080458FC: @ 0x080458FC + thumb_func_start IsMonDisobedient +IsMonDisobedient: @ 0x080458FC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -142216,13 +142216,13 @@ sub_080458FC: @ 0x080458FC bne _080459EC ldr r4, _080459F8 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080459EC ldrb r0, [r4] - bl sub_08045884 + bl HasObedientBitSet cmp r0, #0 beq _080459B6 ldr r0, [r5] @@ -142260,7 +142260,7 @@ _08045948: ldr r0, [r0] adds r2, #0x3c adds r1, r1, r2 - bl sub_0806E360 + bl IsOtherTrainer lsls r0, r0, #0x18 cmp r0, #0 beq _080459EC @@ -142397,7 +142397,7 @@ _08045A60: ldrb r1, [r0] adds r0, r3, #0 movs r2, #0xff - bl sub_0803FB0C + bl CheckMoveLimitations lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xf @@ -142439,7 +142439,7 @@ _08045AAE: str r0, [r1] ldrh r0, [r4] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _08045B20 strb r0, [r1] ldr r2, _08045B24 @@ -142558,7 +142558,7 @@ _08045BCC: adds r0, r1, #0 movs r2, #1 movs r3, #0 - bl sub_080690BC + bl CalculateBaseDamage ldr r1, _08045C28 str r0, [r1] ldr r1, _08045C2C @@ -142591,10 +142591,10 @@ _08045C2C: .4byte gUnknown_2023EB0 _08045C30: .4byte gUnknown_2023EB8 _08045C34: .4byte gUnknown_8289C78 _08045C38: .4byte gUnknown_2023F24 - thumb_func_end sub_080458FC + thumb_func_end IsMonDisobedient - thumb_func_start sub_08045C3C -sub_08045C3C: @ 0x08045C3C + thumb_func_start atk00_attackcanceler +atk00_attackcanceler: @ 0x08045C3C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -142655,7 +142655,7 @@ _08045CB2: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08045CCA @@ -142736,7 +142736,7 @@ _08045D48: ands r0, r1 cmp r0, #0 bne _08045DA0 - bl sub_080458FC + bl IsMonDisobedient lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -142792,7 +142792,7 @@ _08045DA0: ldrb r0, [r0] ldr r2, _08045E1C adds r1, r3, #0 - bl sub_0803F0C0 + bl PressurePPLose mov r0, r8 ldrb r1, [r0] lsls r1, r1, #4 @@ -142878,7 +142878,7 @@ _08045E6A: mov r1, r8 ldrb r0, [r1] ldrb r1, [r4] - bl sub_0813114C + bl RecordAbilityBattle b _08045FD8 .align 2, 0 _08045EA4: .4byte gUnknown_2023D10 @@ -142932,7 +142932,7 @@ _08045ED6: bne _08045FD0 _08045F14: ldrh r0, [r4] - bl sub_08052B58 + bl IsTwoTurnsMove lsls r0, r0, #0x18 cmp r0, #0 beq _08045F3A @@ -142989,7 +142989,7 @@ _08045F90: ldrb r0, [r0] ldr r2, _08045FC0 adds r1, r3, #0 - bl sub_0803F0C0 + bl PressurePPLose ldrb r1, [r4] lsls r1, r1, #4 adds r1, r1, r6 @@ -143027,10 +143027,10 @@ _08045FD8: bx r0 .align 2, 0 _08045FE8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08045C3C + thumb_func_end atk00_attackcanceler - thumb_func_start sub_08045FEC -sub_08045FEC: @ 0x08045FEC + thumb_func_start JumpIfMoveFailed +JumpIfMoveFailed: @ 0x08045FEC push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -143076,14 +143076,14 @@ _08046040: .4byte gUnknown_2023EF4 _08046044: .4byte gUnknown_2023EB0 _08046048: .4byte gUnknown_2023EFC _0804604C: - bl sub_08052D90 + bl TrySetDestinyBondToHappen ldr r0, _08046074 ldrb r1, [r0] str r6, [sp] movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804606A @@ -143098,10 +143098,10 @@ _0804606A: .align 2, 0 _08046074: .4byte gUnknown_2023EB0 _08046078: .4byte gUnknown_2023EB8 - thumb_func_end sub_08045FEC + thumb_func_end JumpIfMoveFailed - thumb_func_start sub_0804607C -sub_0804607C: @ 0x0804607C + thumb_func_start atk40_jumpifaffectedbyprotect +atk40_jumpifaffectedbyprotect: @ 0x0804607C push {lr} ldr r1, _080460C4 ldr r0, _080460C8 @@ -143131,7 +143131,7 @@ sub_0804607C: @ 0x0804607C strb r0, [r2] movs r0, #5 movs r1, #0 - bl sub_08045FEC + bl JumpIfMoveFailed ldr r1, _080460D8 movs r0, #1 strb r0, [r1, #6] @@ -143153,7 +143153,7 @@ _080460E4: bx r0 .align 2, 0 _080460E8: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804607C + thumb_func_end atk40_jumpifaffectedbyprotect thumb_func_start JumpIfMoveAffectedByProtect JumpIfMoveAffectedByProtect: @ 0x080460EC @@ -143189,7 +143189,7 @@ JumpIfMoveAffectedByProtect: @ 0x080460EC strb r0, [r2] movs r0, #7 adds r1, r3, #0 - bl sub_08045FEC + bl JumpIfMoveFailed ldr r1, _08046154 movs r0, #1 strb r0, [r1, #6] @@ -143208,8 +143208,8 @@ _08046150: .4byte gUnknown_2023F20 _08046154: .4byte gUnknown_2023FD6 thumb_func_end JumpIfMoveAffectedByProtect - thumb_func_start sub_08046158 -sub_08046158: @ 0x08046158 + thumb_func_start AccuracyCalcHelper +AccuracyCalcHelper: @ 0x08046158 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -143312,7 +143312,7 @@ _08046212: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r5, #1 @@ -143323,7 +143323,7 @@ _08046212: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _08046262 @@ -143353,7 +143353,7 @@ _08046262: _08046274: movs r0, #7 adds r1, r5, #0 - bl sub_08045FEC + bl JumpIfMoveFailed movs r0, #1 b _08046296 .align 2, 0 @@ -143370,10 +143370,10 @@ _08046296: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08046158 + thumb_func_end AccuracyCalcHelper - thumb_func_start sub_080462A0 -sub_080462A0: @ 0x080462A0 + thumb_func_start atk01_accuracycheck +atk01_accuracycheck: @ 0x080462A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -143501,7 +143501,7 @@ _08046392: b _08046612 _080463A0: adds r0, r6, #0 - bl sub_08046158 + bl AccuracyCalcHelper lsls r0, r0, #0x18 cmp r0, #0 beq _080463AE @@ -143570,7 +143570,7 @@ _08046410: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r4, [sp, #4] @@ -143581,7 +143581,7 @@ _08046410: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _08046462 @@ -143633,7 +143633,7 @@ _080464A0: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -143643,7 +143643,7 @@ _080464A0: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _080464F8 @@ -143793,11 +143793,11 @@ _08046600: movs r0, #0 _08046604: strb r0, [r1, #6] - bl sub_08046EE8 + bl CheckWonderGuardAndLevitate _0804660A: movs r0, #7 adds r1, r6, #0 - bl sub_08045FEC + bl JumpIfMoveFailed _08046612: add sp, #8 pop {r3, r4, r5} @@ -143809,7 +143809,7 @@ _08046612: bx r0 .align 2, 0 _08046624: .4byte gUnknown_2023FD6 - thumb_func_end sub_080462A0 + thumb_func_end atk01_accuracycheck thumb_func_start atk02_attackstring atk02_attackstring: @ 0x08046628 @@ -143828,7 +143828,7 @@ atk02_attackstring: @ 0x08046628 ldr r0, _08046670 ldrb r1, [r0] movs r0, #4 - bl sub_0803F5A4 + bl PrepareStringBattle ldr r0, [r4] movs r1, #0x80 lsls r1, r1, #3 @@ -143853,8 +143853,8 @@ _08046674: .4byte gUnknown_2023EB8 _08046678: .4byte gUnknown_2023FD6 thumb_func_end atk02_attackstring - thumb_func_start sub_0804667C -sub_0804667C: @ 0x0804667C + thumb_func_start atk03_ppreduce +atk03_ppreduce: @ 0x0804667C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -143912,7 +143912,7 @@ _080466E6: adds r1, r3, #0 movs r2, #0x2e movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r6, r0, #1 @@ -143925,7 +143925,7 @@ _080466FC: movs r0, #0x10 movs r2, #0x2e movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r6, r6, r0 @@ -144057,7 +144057,7 @@ _080467B2: bl BtlController_EmitSetMonData mov r7, sb ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804681C: ldr r2, _0804684C ldr r0, [r2] @@ -144084,10 +144084,10 @@ _08046848: .4byte gUnknown_2023D08 _0804684C: .4byte gUnknown_2023F24 _08046850: .4byte 0xFFFFF7FF _08046854: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804667C + thumb_func_end atk03_ppreduce - thumb_func_start sub_08046858 -sub_08046858: @ 0x08046858 + thumb_func_start atk04_critcalc +atk04_critcalc: @ 0x08046858 push {r4, r5, r6, r7, lr} ldr r1, _0804687C ldr r0, _08046880 @@ -144271,10 +144271,10 @@ _080469B4: .align 2, 0 _080469C4: .4byte gUnknown_2023EB5 _080469C8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08046858 + thumb_func_end atk04_critcalc - thumb_func_start sub_080469CC -sub_080469CC: @ 0x080469CC + thumb_func_start atk05_damagecalc +atk05_damagecalc: @ 0x080469CC push {r4, r5, r6, r7, lr} sub sp, #0x10 ldr r4, _08046A84 @@ -144308,7 +144308,7 @@ sub_080469CC: @ 0x080469CC str r4, [sp, #8] ldrb r4, [r5] str r4, [sp, #0xc] - bl sub_080690BC + bl CalculateBaseDamage ldr r4, _08046AA0 ldr r1, _08046AA4 ldrb r1, [r1] @@ -144380,10 +144380,10 @@ _08046AAC: .4byte gUnknown_2023F50 _08046AB0: .4byte gUnknown_82ED220 _08046AB4: .4byte gUnknown_2023FE0 _08046AB8: .4byte gUnknown_2023EB8 - thumb_func_end sub_080469CC + thumb_func_end atk05_damagecalc - thumb_func_start sub_08046ABC -sub_08046ABC: @ 0x08046ABC + thumb_func_start AI_CalcDmg +AI_CalcDmg: @ 0x08046ABC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -144420,7 +144420,7 @@ sub_08046ABC: @ 0x08046ABC str r4, [sp, #4] str r7, [sp, #8] str r5, [sp, #0xc] - bl sub_080690BC + bl CalculateBaseDamage ldr r4, _08046B88 movs r1, #0 strh r1, [r6] @@ -144487,10 +144487,10 @@ _08046B90: .4byte gUnknown_2024118 _08046B94: .4byte gUnknown_2023F50 _08046B98: .4byte gUnknown_82ED220 _08046B9C: .4byte gUnknown_2023FE0 - thumb_func_end sub_08046ABC + thumb_func_end AI_CalcDmg - thumb_func_start sub_08046BA0 -sub_08046BA0: @ 0x08046BA0 + thumb_func_start ModulateDmgByType +ModulateDmgByType: @ 0x08046BA0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -144601,10 +144601,10 @@ _08046C72: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08046BA0 + thumb_func_end ModulateDmgByType - thumb_func_start sub_08046C78 -sub_08046C78: @ 0x08046C78 + thumb_func_start atk06_typecalc +atk06_typecalc: @ 0x08046C78 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -144704,7 +144704,7 @@ _08046CF0: strb r1, [r0, #6] ldrb r0, [r4] ldrb r1, [r3] - bl sub_0813114C + bl RecordAbilityBattle b _08046E04 .align 2, 0 _08046D40: .4byte gUnknown_82ED220 @@ -144752,7 +144752,7 @@ _08046D7C: ldrb r0, [r0] str r2, [sp] str r3, [sp, #4] - bl sub_08046BA0 + bl ModulateDmgByType ldr r3, [sp, #4] ldr r2, [sp] _08046DB2: @@ -144772,7 +144772,7 @@ _08046DB2: adds r0, r0, r5 ldrb r0, [r0] str r3, [sp, #4] - bl sub_08046BA0 + bl ModulateDmgByType ldr r3, [sp, #4] _08046DD8: adds r3, #3 @@ -144814,7 +144814,7 @@ _08046E04: ldrb r0, [r0] ldr r7, _08046EC4 ldrh r1, [r7] - bl sub_08052BBC + bl AttacksThisTurn lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -144861,7 +144861,7 @@ _08046E40: strb r0, [r1, #6] ldrb r0, [r5] ldrb r1, [r3] - bl sub_0813114C + bl RecordAbilityBattle _08046E82: ldr r0, _08046EC8 ldrb r1, [r0] @@ -144903,10 +144903,10 @@ _08046ED8: .4byte gUnknown_2023EFC _08046EDC: .4byte gUnknown_2023FD6 _08046EE0: .4byte gUnknown_2023FE0 _08046EE4: .4byte gUnknown_2023EB8 - thumb_func_end sub_08046C78 + thumb_func_end atk06_typecalc - thumb_func_start sub_08046EE8 -sub_08046EE8: @ 0x08046EE8 + thumb_func_start CheckWonderGuardAndLevitate +CheckWonderGuardAndLevitate: @ 0x08046EE8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -144971,7 +144971,7 @@ _08046F38: strb r1, [r0, #6] ldrb r0, [r3] movs r1, #0x1a - bl sub_0813114C + bl RecordAbilityBattle b _08047148 .align 2, 0 _08046F6C: .4byte gUnknown_2023D28 @@ -145189,7 +145189,7 @@ _080470F2: ldrb r0, [r0] mov r2, sb ldrh r1, [r2] - bl sub_08052BBC + bl AttacksThisTurn lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -145216,7 +145216,7 @@ _080470F2: mov r1, r8 ldrb r0, [r1] movs r1, #0x19 - bl sub_0813114C + bl RecordAbilityBattle _08047148: pop {r3, r4} mov r8, r3 @@ -145231,10 +145231,10 @@ _0804715C: .4byte gUnknown_2023EAF _08047160: .4byte gUnknown_82ED220 _08047164: .4byte gUnknown_2023EAE _08047168: .4byte gUnknown_2023FD6 - thumb_func_end sub_08046EE8 + thumb_func_end CheckWonderGuardAndLevitate - thumb_func_start sub_0804716C -sub_0804716C: @ 0x0804716C + thumb_func_start ModulateDmgByType2 +ModulateDmgByType2: @ 0x0804716C push {r4, r5, r6, r7, lr} adds r6, r2, #0 lsls r0, r0, #0x18 @@ -145335,10 +145335,10 @@ _0804721E: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0804716C + thumb_func_end ModulateDmgByType2 - thumb_func_start sub_08047224 -sub_08047224: @ 0x08047224 + thumb_func_start TypeCalc +TypeCalc: @ 0x08047224 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -145473,7 +145473,7 @@ _080472F6: ldrb r0, [r0] mov r1, sl mov r2, sp - bl sub_0804716C + bl ModulateDmgByType2 _08047330: adds r0, r5, #0 adds r0, #0x22 @@ -145489,7 +145489,7 @@ _08047330: ldrb r0, [r0] mov r1, sl mov r2, sp - bl sub_0804716C + bl ModulateDmgByType2 _08047350: movs r1, #3 add r8, r1 @@ -145535,7 +145535,7 @@ _08047380: bne _080473DA ldr r0, [sp, #4] mov r1, sl - bl sub_08052BBC + bl AttacksThisTurn lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #2 @@ -145579,10 +145579,10 @@ _080473DE: _080473F0: .4byte gUnknown_82EBB38 _080473F4: .4byte gUnknown_2023D28 _080473F8: .4byte gUnknown_82ED220 - thumb_func_end sub_08047224 + thumb_func_end TypeCalc - thumb_func_start sub_080473FC -sub_080473FC: @ 0x080473FC + thumb_func_start AI_TypeCalc +AI_TypeCalc: @ 0x080473FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -145653,7 +145653,7 @@ _08047470: ldrb r0, [r4, #2] adds r1, r6, #0 mov r2, sp - bl sub_0804716C + bl ModulateDmgByType2 _0804748A: cmp r5, r8 bne _0804749C @@ -145662,7 +145662,7 @@ _0804748A: ldrb r0, [r4, #2] adds r1, r6, #0 mov r2, sp - bl sub_0804716C + bl ModulateDmgByType2 _0804749C: adds r4, #3 adds r7, #3 @@ -145713,10 +145713,10 @@ _080474E0: .align 2, 0 _080474F0: .4byte gUnknown_82EBB38 _080474F4: .4byte gUnknown_82ED220 - thumb_func_end sub_080473FC + thumb_func_end AI_TypeCalc - thumb_func_start sub_080474F8 -sub_080474F8: @ 0x080474F8 + thumb_func_start Unused_ApplyRandomDmgMultiplier +Unused_ApplyRandomDmgMultiplier: @ 0x080474F8 push {r4, lr} bl Random lsls r0, r0, #0x10 @@ -145746,10 +145746,10 @@ _0804752A: bx r0 .align 2, 0 _08047530: .4byte gUnknown_2023E94 - thumb_func_end sub_080474F8 + thumb_func_end Unused_ApplyRandomDmgMultiplier - thumb_func_start sub_08047534 -sub_08047534: @ 0x08047534 + thumb_func_start atk07_adjustnormaldamage +atk07_adjustnormaldamage: @ 0x08047534 push {r4, r5, r6, r7, lr} bl Random lsls r0, r0, #0x10 @@ -145827,7 +145827,7 @@ _080475B6: bhs _080475F4 ldrb r0, [r5] movs r1, #0x27 - bl sub_0813117C + bl RecordItemEffectBattle ldr r2, _08047680 ldrb r1, [r5] lsls r0, r1, #2 @@ -145950,10 +145950,10 @@ _080476D4: .4byte gUnknown_2024020 _080476D8: .4byte gUnknown_2023F20 _080476DC: .4byte gUnknown_2023EAC _080476E0: .4byte gUnknown_2023EB8 - thumb_func_end sub_08047534 + thumb_func_end atk07_adjustnormaldamage - thumb_func_start sub_080476E4 -sub_080476E4: @ 0x080476E4 + thumb_func_start atk08_adjustnormaldamage2 +atk08_adjustnormaldamage2: @ 0x080476E4 push {r4, r5, r6, r7, lr} bl Random lsls r0, r0, #0x10 @@ -146031,7 +146031,7 @@ _08047766: bhs _080477A4 ldrb r0, [r5] movs r1, #0x27 - bl sub_0813117C + bl RecordItemEffectBattle ldr r2, _08047814 ldrb r1, [r5] lsls r0, r1, #2 @@ -146138,10 +146138,10 @@ _08047860: .4byte gUnknown_2024020 _08047864: .4byte gUnknown_2023F20 _08047868: .4byte gUnknown_2023EAC _0804786C: .4byte gUnknown_2023EB8 - thumb_func_end sub_080476E4 + thumb_func_end atk08_adjustnormaldamage2 - thumb_func_start sub_08047870 -sub_08047870: @ 0x08047870 + thumb_func_start atk09_attackanimation +atk09_attackanimation: @ 0x08047870 push {r4, r5, r6, r7, lr} sub sp, #0x10 ldr r0, _080478B4 @@ -146295,7 +146295,7 @@ _08047984: str r0, [sp, #8] str r6, [sp, #0xc] movs r0, #0 - bl sub_080339A4 + bl BtlController_EmitMoveAnimation ldrb r0, [r5, #0x18] adds r0, #1 strb r0, [r5, #0x18] @@ -146303,7 +146303,7 @@ _08047984: adds r0, #1 strb r0, [r5, #0x19] ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec _080479C8: ldr r1, _080479E4 ldr r0, [r1] @@ -146331,7 +146331,7 @@ _080479F6: .align 2, 0 _08047A00: .4byte gUnknown_2023EB8 _08047A04: .4byte gUnknown_8289141 - thumb_func_end sub_08047870 + thumb_func_end atk09_attackanimation thumb_func_start sub_08047A08 sub_08047A08: @ 0x08047A08 @@ -146352,8 +146352,8 @@ _08047A20: .4byte gUnknown_2023D0C _08047A24: .4byte gUnknown_2023EB8 thumb_func_end sub_08047A08 - thumb_func_start sub_08047A28 -sub_08047A28: @ 0x08047A28 + thumb_func_start atk0B_healthbarupdate +atk0B_healthbarupdate: @ 0x08047A28 push {r4, lr} ldr r0, _08047A8C ldr r0, [r0] @@ -146368,7 +146368,7 @@ sub_08047A28: @ 0x08047A28 ldr r0, _08047A94 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r2, _08047A98 strb r0, [r2] ldr r1, _08047A9C @@ -146400,7 +146400,7 @@ sub_08047A28: @ 0x08047A28 bne _08047AA8 movs r0, #0x80 adds r1, r2, #0 - bl sub_0803F5A4 + bl PrepareStringBattle b _08047AE2 .align 2, 0 _08047A8C: .4byte gUnknown_2023D0C @@ -146420,12 +146420,12 @@ _08047AA8: lsrs r1, r0, #0x10 _08047AB6: movs r0, #0 - bl sub_08033D54 + bl BtlController_EmitHealthBarUpdate ldr r4, _08047AF8 ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08047AE2 @@ -146453,10 +146453,10 @@ _08047AF4: .4byte 0x00002710 _08047AF8: .4byte gUnknown_2023D08 _08047AFC: .4byte gUnknown_3005A70 _08047B00: .4byte gUnknown_2023EB8 - thumb_func_end sub_08047A28 + thumb_func_end atk0B_healthbarupdate - thumb_func_start sub_08047B04 -sub_08047B04: @ 0x08047B04 + thumb_func_start atk0C_datahpupdate +atk0C_datahpupdate: @ 0x08047B04 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r0, _08047B2C @@ -146501,7 +146501,7 @@ _08047B52: ldr r0, _08047BDC ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r7, _08047BE0 strb r0, [r7] ldr r1, _08047BE4 @@ -146903,7 +146903,7 @@ _08047E7A: movs r3, #2 bl BtlController_EmitSetMonData ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _08047EDA .align 2, 0 _08047EA8: .4byte gUnknown_2023EB0 @@ -146913,7 +146913,7 @@ _08047EB4: ldr r0, _08047EEC ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _08047EF0 strb r0, [r1] ldr r2, _08047EF4 @@ -146943,7 +146943,7 @@ _08047EEC: .4byte gUnknown_2023EB8 _08047EF0: .4byte gUnknown_2023D08 _08047EF4: .4byte gUnknown_2024020 _08047EF8: .4byte 0x0000FFFF - thumb_func_end sub_08047B04 + thumb_func_end atk0C_datahpupdate thumb_func_start atk0D_critmessage atk0D_critmessage: @ 0x08047EFC @@ -146965,7 +146965,7 @@ atk0D_critmessage: @ 0x08047EFC ldr r0, _08047F44 ldrb r1, [r0] movs r0, #0xd9 - bl sub_0803F5A4 + bl PrepareStringBattle ldr r1, _08047F48 movs r0, #1 strb r0, [r1, #7] @@ -146986,8 +146986,8 @@ _08047F48: .4byte gUnknown_2023FD6 _08047F4C: .4byte gUnknown_2023EB8 thumb_func_end atk0D_critmessage - thumb_func_start sub_08047F50 -sub_08047F50: @ 0x08047F50 + thumb_func_start atk0E_effectivenesssound +atk0E_effectivenesssound: @ 0x08047F50 push {r4, lr} ldr r0, _08047F88 ldr r0, [r0] @@ -147041,9 +147041,9 @@ _08047FB2: movs r0, #0 movs r1, #0xc _08047FB6: - bl sub_0803412C + bl BtlController_EmitPlaySE ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _08048008 _08047FC2: ldrb r1, [r1] @@ -147062,10 +147062,10 @@ _08047FD2: movs r0, #0 movs r1, #0xc _08047FDE: - bl sub_0803412C + bl BtlController_EmitPlaySE ldr r0, _08047FEC ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _08048008 .align 2, 0 _08047FEC: .4byte gUnknown_2023D08 @@ -147076,10 +147076,10 @@ _08047FF0: bne _08048008 movs r0, #0 movs r1, #0xd - bl sub_0803412C + bl BtlController_EmitPlaySE ldr r0, _08048018 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08048008: ldr r1, _0804801C ldr r0, [r1] @@ -147092,10 +147092,10 @@ _08048010: .align 2, 0 _08048018: .4byte gUnknown_2023D08 _0804801C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08047F50 + thumb_func_end atk0E_effectivenesssound - thumb_func_start sub_08048020 -sub_08048020: @ 0x08048020 + thumb_func_start atk0F_resultmessage +atk0F_resultmessage: @ 0x08048020 push {r4, r5, r6, r7, lr} movs r3, #0 ldr r0, _0804805C @@ -147301,7 +147301,7 @@ _080481AE: adds r0, r3, #0 ldr r1, _080481C8 ldrb r1, [r1] - bl sub_0803F5A4 + bl PrepareStringBattle _080481B8: ldr r1, _080481CC ldr r0, [r1] @@ -147315,7 +147315,7 @@ _080481C0: .align 2, 0 _080481C8: .4byte gUnknown_2023EAF _080481CC: .4byte gUnknown_2023EB8 - thumb_func_end sub_08048020 + thumb_func_end atk0F_resultmessage thumb_func_start atk10_printstring atk10_printstring: @ 0x080481D0 @@ -147332,7 +147332,7 @@ atk10_printstring: @ 0x080481D0 orrs r0, r1 ldr r1, _08048208 ldrb r1, [r1] - bl sub_0803F5A4 + bl PrepareStringBattle ldr r0, [r4] adds r0, #3 str r0, [r4] @@ -147350,8 +147350,8 @@ _08048208: .4byte gUnknown_2023EAF _0804820C: .4byte gUnknown_2023FD6 thumb_func_end atk10_printstring - thumb_func_start sub_08048210 -sub_08048210: @ 0x08048210 + thumb_func_start atk11_printselectionstring +atk11_printselectionstring: @ 0x08048210 push {r4, r5, lr} ldr r5, _08048244 ldr r0, _08048248 @@ -147366,7 +147366,7 @@ sub_08048210: @ 0x08048210 movs r0, #0 bl sub_08033B74 ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, #3 str r0, [r4] @@ -147381,10 +147381,10 @@ _08048244: .4byte gUnknown_2023D08 _08048248: .4byte gUnknown_2023EAF _0804824C: .4byte gUnknown_2023EB8 _08048250: .4byte gUnknown_2023FD6 - thumb_func_end sub_08048210 + thumb_func_end atk11_printselectionstring - thumb_func_start sub_08048254 -sub_08048254: @ 0x08048254 + thumb_func_start atk12_waitmessage +atk12_waitmessage: @ 0x08048254 push {r4, r5, r6, lr} ldr r0, _08048270 ldr r4, [r0] @@ -147430,7 +147430,7 @@ _080482A2: .align 2, 0 _080482A8: .4byte gUnknown_2023EB8 _080482AC: .4byte gUnknown_2023FD0 - thumb_func_end sub_08048254 + thumb_func_end atk12_waitmessage thumb_func_start atk13_printfromtable atk13_printfromtable: @ 0x080482B0 @@ -147458,7 +147458,7 @@ atk13_printfromtable: @ 0x080482B0 ldrh r0, [r1] ldr r1, _08048300 ldrb r1, [r1] - bl sub_0803F5A4 + bl PrepareStringBattle ldr r0, [r4] adds r0, #5 str r0, [r4] @@ -147475,8 +147475,8 @@ _080482FC: .4byte gUnknown_2023FD6 _08048300: .4byte gUnknown_2023EAF thumb_func_end atk13_printfromtable - thumb_func_start sub_08048304 -sub_08048304: @ 0x08048304 + thumb_func_start atk14_printselectionstringfromtable +atk14_printselectionstringfromtable: @ 0x08048304 push {r4, r5, r6, lr} ldr r0, _08048354 ldr r0, [r0] @@ -147506,7 +147506,7 @@ sub_08048304: @ 0x08048304 movs r0, #0 bl sub_08033B74 ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #5 str r0, [r5] @@ -147522,7 +147522,7 @@ _08048358: .4byte gUnknown_2023EB8 _0804835C: .4byte gUnknown_2023FD6 _08048360: .4byte gUnknown_2023D08 _08048364: .4byte gUnknown_2023EAF - thumb_func_end sub_08048304 + thumb_func_end atk14_printselectionstringfromtable thumb_func_start GetBattlerTurnOrderNum GetBattlerTurnOrderNum: @ 0x08048368 @@ -147557,8 +147557,8 @@ _08048398: .4byte gUnknown_2023D10 _0804839C: .4byte gUnknown_2023D22 thumb_func_end GetBattlerTurnOrderNum - thumb_func_start sub_080483A0 -sub_080483A0: @ 0x080483A0 + thumb_func_start SetMoveEffect +SetMoveEffect: @ 0x080483A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -147904,7 +147904,7 @@ _0804865A: mov r3, sb ldrb r0, [r3] movs r1, #0x11 - bl sub_0813114C + bl RecordAbilityBattle ldr r4, _0804869C ldr r0, [r4] adds r0, #1 @@ -148035,7 +148035,7 @@ _08048756: mov r3, sb ldrb r0, [r3] movs r1, #0x29 - bl sub_0813114C + bl RecordAbilityBattle ldr r4, _08048788 ldr r0, [r4] adds r0, #1 @@ -148144,7 +148144,7 @@ _0804882A: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -148154,7 +148154,7 @@ _0804882A: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _08048866 @@ -148237,7 +148237,7 @@ _080488E2: mov r4, sb ldrb r0, [r4] movs r1, #7 - bl sub_0813114C + bl RecordAbilityBattle ldr r4, _08048918 ldr r0, [r4] adds r0, #1 @@ -148475,7 +148475,7 @@ _08048AA4: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r2, _08048B10 ldr r1, [r2] movs r0, #0x80 @@ -148711,7 +148711,7 @@ _08048D30: mov r1, sb ldrb r0, [r1] movs r1, #0x27 - bl sub_0813114C + bl RecordAbilityBattle ldr r1, _08048D4C ldr r0, _08048D50 str r0, [r1] @@ -148879,7 +148879,7 @@ _08048E9A: strb r0, [r4, #3] movs r0, #0 movs r1, #0 - bl sub_080483A0 + bl SetMoveEffect b _080495F2 .align 2, 0 _08048EB8: .4byte gUnknown_2023FD6 @@ -149057,7 +149057,7 @@ _08049014: movs r0, #0x10 adds r2, r7, #0 movs r3, #0 - bl sub_0805062C + bl ChangeStatBuffs lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -149091,7 +149091,7 @@ _0804905C: lsrs r1, r1, #0x18 adds r2, r7, #0 movs r3, #0 - bl sub_0805062C + bl ChangeStatBuffs lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -149124,7 +149124,7 @@ _080490A8: movs r0, #0x20 adds r2, r7, #0 movs r3, #0 - bl sub_0805062C + bl ChangeStatBuffs lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -149158,7 +149158,7 @@ _080490F0: lsrs r1, r1, #0x18 adds r2, r7, #0 movs r3, #0 - bl sub_0805062C + bl ChangeStatBuffs lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -149247,11 +149247,11 @@ _080491A4: _080491B4: ldr r6, _080491E0 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -149319,7 +149319,7 @@ _08049214: strb r0, [r1] ldrb r0, [r7] ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle b _080495F2 .align 2, 0 _08049258: .4byte 0x0A3F0902 @@ -149395,7 +149395,7 @@ _080492BC: bl BtlController_EmitSetMonData mov r2, sl ldrb r0, [r2] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r0, [r7] strb r0, [r4] ldrb r0, [r7] @@ -149412,7 +149412,7 @@ _080492BC: movs r3, #2 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r4, _08049358 ldr r0, [r4] adds r0, #1 @@ -149534,7 +149534,7 @@ _08049402: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r4, _08049440 ldr r0, [r4] adds r0, #1 @@ -149653,7 +149653,7 @@ _08049500: str r0, [r1] ldrb r0, [r4] movs r1, #0x3c - bl sub_0813114C + bl RecordAbilityBattle b _080495F2 .align 2, 0 _08049534: .4byte gUnknown_2023EAE @@ -149664,7 +149664,7 @@ _08049540: cmp r0, #0 beq _080495D4 adds r0, r3, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r1, _080495B8 @@ -149759,10 +149759,10 @@ _080495F8: _08049608: .4byte gUnknown_2023EB8 _0804960C: .4byte gUnknown_828975D _08049610: .4byte gUnknown_2023FD6 - thumb_func_end sub_080483A0 + thumb_func_end SetMoveEffect - thumb_func_start sub_08049614 -sub_08049614: @ 0x08049614 + thumb_func_start atk15_seteffectwithchance +atk15_seteffectwithchance: @ 0x08049614 push {r4, lr} ldr r2, _08049640 ldr r0, _08049644 @@ -149845,7 +149845,7 @@ _08049690: _080496BE: movs r0, #0 movs r1, #0x80 - bl sub_080483A0 + bl SetMoveEffect b _080496E2 .align 2, 0 _080496C8: .4byte gUnknown_2023FD6 @@ -149853,7 +149853,7 @@ _080496CC: .4byte gUnknown_2023F20 _080496D0: movs r0, #0 movs r1, #0 - bl sub_080483A0 + bl SetMoveEffect b _080496E2 _080496DA: ldr r1, _080496F4 @@ -149873,37 +149873,37 @@ _080496E2: _080496F4: .4byte gUnknown_2023EB8 _080496F8: .4byte gUnknown_2023FD6 _080496FC: .4byte gUnknown_2024118 - thumb_func_end sub_08049614 + thumb_func_end atk15_seteffectwithchance - thumb_func_start sub_08049700 -sub_08049700: @ 0x08049700 + thumb_func_start atk16_seteffectprimary +atk16_seteffectprimary: @ 0x08049700 push {lr} movs r0, #1 movs r1, #0 - bl sub_080483A0 + bl SetMoveEffect pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08049700 + thumb_func_end atk16_seteffectprimary - thumb_func_start sub_08049710 -sub_08049710: @ 0x08049710 + thumb_func_start atk17_seteffectsecondary +atk17_seteffectsecondary: @ 0x08049710 push {lr} movs r0, #0 movs r1, #0 - bl sub_080483A0 + bl SetMoveEffect pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08049710 + thumb_func_end atk17_seteffectsecondary - thumb_func_start sub_08049720 -sub_08049720: @ 0x08049720 + thumb_func_start atk18_clearstatusfromeffect +atk18_clearstatusfromeffect: @ 0x08049720 push {lr} ldr r0, _08049744 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r2, _08049748 strb r0, [r2] ldr r3, _0804974C @@ -149954,10 +149954,10 @@ _0804978C: .4byte gUnknown_82ECAB8 _08049790: .4byte gUnknown_2023FD6 _08049794: .4byte gUnknown_2023EB8 _08049798: .4byte gUnknown_2024118 - thumb_func_end sub_08049720 + thumb_func_end atk18_clearstatusfromeffect - thumb_func_start sub_0804979C -sub_0804979C: @ 0x0804979C + thumb_func_start atk19_tryfaintmon +atk19_tryfaintmon: @ 0x0804979C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -149970,7 +149970,7 @@ sub_0804979C: @ 0x0804979C cmp r1, #0 beq _08049820 ldrb r0, [r2, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r5, _0804980C strb r0, [r5] ldr r2, _08049810 @@ -150000,7 +150000,7 @@ _080497D4: bl BattleScriptPop str r4, [r6] ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide ldr r1, _08049818 lsls r0, r0, #0x18 lsrs r0, r0, #0x17 @@ -150078,7 +150078,7 @@ _08049882: bl BattleScriptPush str r4, [r6] ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080498E4 @@ -150095,7 +150095,7 @@ _08049882: strb r0, [r1] _080498B8: ldrb r0, [r7] - bl sub_08056D04 + bl AdjustFriendshipOnBattleFaint b _0804990E .align 2, 0 _080498C0: .4byte gUnknown_2023D08 @@ -150127,7 +150127,7 @@ _080498F0: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #0x20] _0804990E: ldr r2, _08049A38 @@ -150186,10 +150186,10 @@ _08049974: ldr r3, _08049A40 mov r8, r3 ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -150242,7 +150242,7 @@ _08049974: movs r3, #1 bl BtlController_EmitSetMonData ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08049A68 movs r0, #0xfd strb r0, [r1] @@ -150298,10 +150298,10 @@ _08049A72: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0804979C + thumb_func_end atk19_tryfaintmon - thumb_func_start sub_08049A80 -sub_08049A80: @ 0x08049A80 + thumb_func_start atk1A_dofaintanimation +atk1A_dofaintanimation: @ 0x08049A80 push {r4, r5, lr} ldr r0, _08049AB0 ldr r0, [r0] @@ -150310,13 +150310,13 @@ sub_08049A80: @ 0x08049A80 ldr r5, _08049AB4 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _08049AB8 strb r0, [r4] movs r0, #0 bl BtlController_EmitFaintAnimation ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -150328,10 +150328,10 @@ _08049AAA: _08049AB0: .4byte gUnknown_2023D0C _08049AB4: .4byte gUnknown_2023EB8 _08049AB8: .4byte gUnknown_2023D08 - thumb_func_end sub_08049A80 + thumb_func_end atk1A_dofaintanimation - thumb_func_start sub_08049ABC -sub_08049ABC: @ 0x08049ABC + thumb_func_start atk1B_cleareffectsonfaint +atk1B_cleareffectsonfaint: @ 0x08049ABC push {r4, r5, lr} sub sp, #4 ldr r0, _08049B30 @@ -150341,7 +150341,7 @@ sub_08049ABC: @ 0x08049ABC ldr r0, _08049B34 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _08049B38 strb r0, [r4] ldr r0, _08049B3C @@ -150377,9 +150377,9 @@ _08049AF4: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08049B1C: - bl sub_0803A3A0 + bl FaintClearSetData ldr r1, _08049B34 ldr r0, [r1] adds r0, #2 @@ -150395,15 +150395,15 @@ _08049B34: .4byte gUnknown_2023EB8 _08049B38: .4byte gUnknown_2023D08 _08049B3C: .4byte gUnknown_2022C90 _08049B40: .4byte gUnknown_2023D28 - thumb_func_end sub_08049ABC + thumb_func_end atk1B_cleareffectsonfaint - thumb_func_start sub_08049B44 -sub_08049B44: @ 0x08049B44 + thumb_func_start atk1C_jumpifstatus +atk1C_jumpifstatus: @ 0x08049B44 push {r4, r5, lr} ldr r5, _08049BA0 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [r5] @@ -150457,15 +150457,15 @@ _08049BB0: bx r0 .align 2, 0 _08049BB8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08049B44 + thumb_func_end atk1C_jumpifstatus - thumb_func_start sub_08049BBC -sub_08049BBC: @ 0x08049BBC + thumb_func_start atk1D_jumpifstatus2 +atk1D_jumpifstatus2: @ 0x08049BBC push {r4, r5, lr} ldr r5, _08049C18 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [r5] @@ -150519,10 +150519,10 @@ _08049C28: bx r0 .align 2, 0 _08049C30: .4byte gUnknown_2023EB8 - thumb_func_end sub_08049BBC + thumb_func_end atk1D_jumpifstatus2 - thumb_func_start sub_08049C34 -sub_08049C34: @ 0x08049C34 + thumb_func_start atk1E_jumpifability +atk1E_jumpifability: @ 0x08049C34 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -150551,7 +150551,7 @@ sub_08049C34: @ 0x08049C34 movs r0, #0xd adds r2, r5, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -150578,7 +150578,7 @@ _08049C94: movs r0, #0xc adds r2, r5, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -150596,7 +150596,7 @@ _08049CC4: .4byte gUnknown_2023EAF _08049CC8: .4byte gUnknown_2023EAE _08049CCC: ldrb r0, [r2, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r1, _08049CFC @@ -150613,7 +150613,7 @@ _08049CCC: ldrb r1, [r0] adds r0, r4, #0 _08049CF0: - bl sub_0813114C + bl RecordAbilityBattle ldr r0, _08049D04 strb r4, [r0, #0x15] b _08049D0E @@ -150633,10 +150633,10 @@ _08049D0E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08049C34 + thumb_func_end atk1E_jumpifability - thumb_func_start sub_08049D1C -sub_08049D1C: @ 0x08049D1C + thumb_func_start atk1F_jumpifsideaffecting +atk1F_jumpifsideaffecting: @ 0x08049D1C push {r4, r5, r6, lr} ldr r0, _08049D34 ldr r0, [r0] @@ -150694,16 +150694,16 @@ _08049D8E: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08049D1C + thumb_func_end atk1F_jumpifsideaffecting - thumb_func_start sub_08049D94 -sub_08049D94: @ 0x08049D94 + thumb_func_start atk20_jumpifstat +atk20_jumpifstat: @ 0x08049D94 push {r4, r5, lr} movs r5, #0 ldr r4, _08049DC8 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08049DCC @@ -150821,15 +150821,15 @@ _08049E80: bx r0 .align 2, 0 _08049E88: .4byte gUnknown_2023EB8 - thumb_func_end sub_08049D94 + thumb_func_end atk20_jumpifstat - thumb_func_start sub_08049E8C -sub_08049E8C: @ 0x08049E8C + thumb_func_start atk21_jumpifstatus3condition +atk21_jumpifstatus3condition: @ 0x08049E8C push {r4, r5, r6, lr} ldr r4, _08049EE0 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r5, _08049EE4 strb r0, [r5] ldr r2, [r4] @@ -150891,15 +150891,15 @@ _08049F0A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08049E8C + thumb_func_end atk21_jumpifstatus3condition - thumb_func_start sub_08049F10 -sub_08049F10: @ 0x08049F10 + thumb_func_start atk22_jumpiftype +atk22_jumpiftype: @ 0x08049F10 push {r4, r5, r6, lr} ldr r4, _08049F58 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, [r4] @@ -150942,10 +150942,10 @@ _08049F64: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08049F10 + thumb_func_end atk22_jumpiftype - thumb_func_start sub_08049F6C -sub_08049F6C: @ 0x08049F6C + thumb_func_start atk23_getexp +atk23_getexp: @ 0x08049F6C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -150958,7 +150958,7 @@ sub_08049F6C: @ 0x08049F6C ldr r0, _08049FB8 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _08049FBC strb r0, [r1] ldr r2, _08049FC0 @@ -150998,7 +150998,7 @@ _08049FCC: @ jump table _08049FE8: ldr r4, _0804A038 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -151052,12 +151052,12 @@ _0804A058: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804A0C6 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804A0C6 ldr r0, _0804A0AC @@ -151072,7 +151072,7 @@ _0804A058: _0804A08C: adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xaf @@ -151192,7 +151192,7 @@ _0804A178: ldr r1, _0804A1B0 adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xaf @@ -151242,7 +151242,7 @@ _0804A1EC: ldr r1, _0804A21C adds r0, r0, r1 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x64 bne _0804A228 ldr r1, [r5] @@ -151277,9 +151277,9 @@ _0804A228: ldrb r0, [r0, #0x12] cmp r0, #0 bne _0804A256 - bl sub_0805E67C + bl BattleStopLowHpSound ldr r0, _0804A294 - bl sub_080A3040 + bl PlayBGM ldr r1, [r5] ldrb r0, [r1, #0x12] adds r0, #1 @@ -151293,7 +151293,7 @@ _0804A256: ldr r1, _0804A29C adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804A270 b _0804A45A @@ -151364,7 +151364,7 @@ _0804A2EC: muls r0, r1, r0 ldr r1, _0804A330 adds r0, r0, r1 - bl sub_0806E334 + bl IsTradedMon lsls r0, r0, #0x18 cmp r0, #0 beq _0804A354 @@ -151517,7 +151517,7 @@ _0804A3CE: mov r2, r8 ldrb r1, [r2] movs r0, #0xd - bl sub_0803F5A4 + bl PrepareStringBattle ldr r0, [r6] ldrb r1, [r0, #0x10] movs r0, #0x64 @@ -151531,7 +151531,7 @@ _0804A3CE: muls r1, r2, r1 adds r1, r1, r3 ldrh r1, [r1] - bl sub_0806D570 + bl MonGainEVs _0804A45A: ldr r0, _0804A468 ldr r1, [r0] @@ -151569,7 +151569,7 @@ _0804A48A: ldr r5, _0804A570 adds r0, r0, r5 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804A55A ldr r0, [r7] @@ -151577,7 +151577,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x64 beq _0804A55A ldr r0, [r7] @@ -151585,7 +151585,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData ldr r4, _0804A574 ldr r1, [r4] ldr r1, [r1, #0x10] @@ -151595,7 +151595,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r1, [r1, #0x10] strh r0, [r1, #2] @@ -151604,7 +151604,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r1, [r1, #0x10] strh r0, [r1, #4] @@ -151613,7 +151613,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r1, [r1, #0x10] strh r0, [r1, #6] @@ -151622,7 +151622,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r1, [r1, #0x10] strh r0, [r1, #8] @@ -151631,7 +151631,7 @@ _0804A48A: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r1, [r1, #0x10] strh r0, [r1, #0xa] @@ -151645,9 +151645,9 @@ _0804A48A: ldr r0, _0804A57C ldrh r2, [r0] movs r0, #0 - bl sub_08033D8C + bl BtlController_EmitExpUpdate ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804A55A: ldr r1, _0804A580 ldrb r0, [r1, #0x1c] @@ -151712,7 +151712,7 @@ _0804A5B8: ldr r1, _0804A834 adds r0, r0, r1 adds r1, r2, #0 - bl sub_0805E5AC + bl HandleLowHpMusicChange _0804A5E2: ldr r1, _0804A838 movs r3, #0xfd @@ -151745,7 +151745,7 @@ _0804A5E2: ldr r7, _0804A834 adds r0, r0, r7 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData strb r0, [r4, #4] movs r0, #1 rsbs r0, r0, #0 @@ -151784,7 +151784,7 @@ _0804A5E2: adds r0, r1, #0 adds r0, r0, r7 movs r1, #0 - bl sub_0806D3CC + bl AdjustFriendship ldr r1, _0804A830 mov r2, sb ldr r0, [r2] @@ -151800,7 +151800,7 @@ _0804A5E2: muls r0, r2, r0 adds r0, r0, r7 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r1, r4, #0 adds r1, #0x2a strb r0, [r1] @@ -151812,7 +151812,7 @@ _0804A5E2: adds r0, r1, #0 adds r0, r0, r7 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #0x28] mov r2, sb ldr r0, [r2] @@ -151822,7 +151822,7 @@ _0804A5E2: adds r0, r3, #0 adds r0, r0, r7 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r4, #0x2c] mov r1, sb ldr r0, [r1] @@ -151832,7 +151832,7 @@ _0804A5E2: adds r0, r2, #0 adds r0, r0, r7 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData strh r0, [r4, #2] mov r3, sb ldr r0, [r3] @@ -151842,7 +151842,7 @@ _0804A5E2: adds r0, r1, #0 adds r0, r0, r7 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData strh r0, [r4, #4] mov r2, sb ldr r0, [r2] @@ -151852,7 +151852,7 @@ _0804A5E2: adds r0, r3, #0 adds r0, r0, r7 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData strh r0, [r4, #6] mov r1, sb ldr r0, [r1] @@ -151862,7 +151862,7 @@ _0804A5E2: adds r0, r2, #0 adds r0, r0, r7 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData strh r0, [r4, #6] mov r3, sb ldr r0, [r3] @@ -151872,7 +151872,7 @@ _0804A5E2: adds r0, r1, #0 adds r0, r0, r7 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData strh r0, [r4, #8] mov r2, sb ldr r0, [r2] @@ -151882,7 +151882,7 @@ _0804A5E2: adds r0, r3, #0 adds r0, r0, r7 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData strh r0, [r4, #0xa] _0804A74E: ldr r0, _0804A830 @@ -151913,7 +151913,7 @@ _0804A75E: ldr r4, _0804A834 adds r0, r0, r4 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xda strb r0, [r1] @@ -151922,7 +151922,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] ldr r0, [r7] @@ -151930,7 +151930,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xdc strh r0, [r1] @@ -151939,7 +151939,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xb2 strh r0, [r1] @@ -151948,7 +151948,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xb4 strh r0, [r1] @@ -151957,7 +151957,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData movs r2, #0xb6 adds r2, r2, r6 mov r8, r2 @@ -151967,7 +151967,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r3, r8 strh r0, [r3] ldr r0, [r7] @@ -151975,7 +151975,7 @@ _0804A75E: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xb8 strh r0, [r1] @@ -152078,10 +152078,10 @@ _0804A8F0: .4byte gUnknown_2023D0C _0804A8F4: .4byte gUnknown_2023D28 _0804A8F8: .4byte gUnknown_2023EB1 _0804A8FC: .4byte gUnknown_2023EB8 - thumb_func_end sub_08049F6C + thumb_func_end atk23_getexp - thumb_func_start sub_0804A900 -sub_0804A900: @ 0x0804A900 + thumb_func_start atk24 +atk24: @ 0x0804A900 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -152113,17 +152113,17 @@ _0804A92C: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804A95C adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804A95C adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r0, r6, r0 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -152148,12 +152148,12 @@ _0804A97A: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804A9D2 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804A9D2 ldr r0, _0804AAF4 @@ -152179,7 +152179,7 @@ _0804A97A: _0804A9C4: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r0, r6, r0 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -152206,12 +152206,12 @@ _0804A9EA: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804AA40 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804AA40 ldr r0, _0804AAF4 @@ -152236,7 +152236,7 @@ _0804A9EA: _0804AA32: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r0, r6, r0 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -152385,7 +152385,7 @@ _0804AB52: bx r0 .align 2, 0 _0804AB5C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804A900 + thumb_func_end atk24 thumb_func_start MoveValuesCleanUp MoveValuesCleanUp: @ 0x0804AB60 @@ -152418,8 +152418,8 @@ _0804AB98: .4byte gUnknown_2023F24 _0804AB9C: .4byte 0xFFFFBFFF thumb_func_end MoveValuesCleanUp - thumb_func_start sub_0804ABA0 -sub_0804ABA0: @ 0x0804ABA0 + thumb_func_start atk25_movevaluescleanup +atk25_movevaluescleanup: @ 0x0804ABA0 push {lr} bl MoveValuesCleanUp ldr r1, _0804ABB4 @@ -152430,10 +152430,10 @@ sub_0804ABA0: @ 0x0804ABA0 bx r0 .align 2, 0 _0804ABB4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804ABA0 + thumb_func_end atk25_movevaluescleanup - thumb_func_start sub_0804ABB8 -sub_0804ABB8: @ 0x0804ABB8 + thumb_func_start atk26_setmultihit +atk26_setmultihit: @ 0x0804ABB8 ldr r3, _0804ABC8 ldr r2, _0804ABCC ldr r0, [r2] @@ -152445,10 +152445,10 @@ sub_0804ABB8: @ 0x0804ABB8 .align 2, 0 _0804ABC8: .4byte gUnknown_2023EB6 _0804ABCC: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804ABB8 + thumb_func_end atk26_setmultihit - thumb_func_start sub_0804ABD0 -sub_0804ABD0: @ 0x0804ABD0 + thumb_func_start atk27_decrementmultihit +atk27_decrementmultihit: @ 0x0804ABD0 push {lr} ldr r1, _0804ABEC ldrb r0, [r1] @@ -152484,7 +152484,7 @@ _0804AC0E: bx r0 .align 2, 0 _0804AC14: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804ABD0 + thumb_func_end atk27_decrementmultihit thumb_func_start atk28_goto atk28_goto: @ 0x0804AC18 @@ -152506,8 +152506,8 @@ atk28_goto: @ 0x0804AC18 _0804AC34: .4byte gUnknown_2023EB8 thumb_func_end atk28_goto - thumb_func_start sub_0804AC38 -sub_0804AC38: @ 0x0804AC38 + thumb_func_start atk29_jumpifbyte +atk29_jumpifbyte: @ 0x0804AC38 push {r4, r5, r6, lr} ldr r3, _0804AC7C ldr r1, [r3] @@ -152590,10 +152590,10 @@ _0804ACD0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804AC38 + thumb_func_end atk29_jumpifbyte - thumb_func_start sub_0804ACD8 -sub_0804ACD8: @ 0x0804ACD8 + thumb_func_start atk2A_jumpifhalfword +atk2A_jumpifhalfword: @ 0x0804ACD8 push {r4, r5, r6, lr} ldr r3, _0804AD24 ldr r1, [r3] @@ -152679,10 +152679,10 @@ _0804AD78: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804ACD8 + thumb_func_end atk2A_jumpifhalfword - thumb_func_start sub_0804AD80 -sub_0804AD80: @ 0x0804AD80 + thumb_func_start atk2B_jumpifword +atk2B_jumpifword: @ 0x0804AD80 push {r4, r5, r6, lr} ldr r3, _0804ADD8 ldr r1, [r3] @@ -152774,10 +152774,10 @@ _0804AE2C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804AD80 + thumb_func_end atk2B_jumpifword - thumb_func_start sub_0804AE34 -sub_0804AE34: @ 0x0804AE34 + thumb_func_start atk2C_jumpifarrayequal +atk2C_jumpifarrayequal: @ 0x0804AE34 push {r4, r5, r6, r7, lr} ldr r2, _0804AE8C ldr r3, [r2] @@ -152850,10 +152850,10 @@ _0804AEB4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804AE34 + thumb_func_end atk2C_jumpifarrayequal - thumb_func_start sub_0804AEBC -sub_0804AEBC: @ 0x0804AEBC + thumb_func_start atk2D_jumpifarraynotequal +atk2D_jumpifarraynotequal: @ 0x0804AEBC push {r4, r5, r6, r7, lr} movs r7, #0 ldr r3, _0804AF30 @@ -152924,7 +152924,7 @@ _0804AF38: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0804AEBC + thumb_func_end atk2D_jumpifarraynotequal thumb_func_start atk2E_setbyte atk2E_setbyte: @ 0x0804AF40 @@ -153355,8 +153355,8 @@ _0804B228: .4byte gUnknown_2023D0C _0804B22C: .4byte gUnknown_2023EB8 thumb_func_end sub_0804B210 - thumb_func_start sub_0804B230 -sub_0804B230: @ 0x0804B230 + thumb_func_start atk3B_healthbar_update +atk3B_healthbar_update: @ 0x0804B230 push {lr} ldr r0, _0804B244 ldr r0, [r0] @@ -153379,10 +153379,10 @@ _0804B254: ldr r0, _0804B280 ldrh r1, [r0] movs r0, #0 - bl sub_08033D54 + bl BtlController_EmitHealthBarUpdate ldr r0, _0804B278 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804B284 ldr r0, [r1] adds r0, #2 @@ -153394,19 +153394,19 @@ _0804B278: .4byte gUnknown_2023D08 _0804B27C: .4byte gUnknown_2023EAF _0804B280: .4byte gUnknown_2023E94 _0804B284: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804B230 + thumb_func_end atk3B_healthbar_update - thumb_func_start sub_0804B288 -sub_0804B288: @ 0x0804B288 + thumb_func_start atk3C_return +atk3C_return: @ 0x0804B288 push {lr} bl BattleScriptPop pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804B288 + thumb_func_end atk3C_return - thumb_func_start sub_0804B294 -sub_0804B294: @ 0x0804B294 + thumb_func_start atk3D_end +atk3D_end: @ 0x0804B294 push {lr} ldr r0, _0804B2C0 ldr r0, [r0] @@ -153417,7 +153417,7 @@ sub_0804B294: @ 0x0804B294 beq _0804B2AC ldr r0, _0804B2C4 ldrb r0, [r0] - bl sub_081A5308 + bl BattleArena_AddSkillPoints _0804B2AC: ldr r0, _0804B2C8 movs r1, #0 @@ -153435,10 +153435,10 @@ _0804B2C4: .4byte gUnknown_2023EAF _0804B2C8: .4byte gUnknown_2023F20 _0804B2CC: .4byte gUnknown_2023D08 _0804B2D0: .4byte gUnknown_2023D27 - thumb_func_end sub_0804B294 + thumb_func_end atk3D_end - thumb_func_start sub_0804B2D4 -sub_0804B2D4: @ 0x0804B2D4 + thumb_func_start atk3E_end2 +atk3E_end2: @ 0x0804B2D4 ldr r1, _0804B2E4 movs r0, #0 strb r0, [r1] @@ -153449,10 +153449,10 @@ sub_0804B2D4: @ 0x0804B2D4 .align 2, 0 _0804B2E4: .4byte gUnknown_2023D08 _0804B2E8: .4byte gUnknown_2023D27 - thumb_func_end sub_0804B2D4 + thumb_func_end atk3E_end2 - thumb_func_start sub_0804B2EC -sub_0804B2EC: @ 0x0804B2EC + thumb_func_start atk3F_end3 +atk3F_end3: @ 0x0804B2EC push {lr} bl BattleScriptPop ldr r3, _0804B320 @@ -153481,10 +153481,10 @@ _0804B306: .align 2, 0 _0804B320: .4byte gUnknown_202414C _0804B324: .4byte gUnknown_3005A64 - thumb_func_end sub_0804B2EC + thumb_func_end atk3F_end3 - thumb_func_start sub_0804B328 -sub_0804B328: @ 0x0804B328 + thumb_func_start atk41_call +atk41_call: @ 0x0804B328 push {r4, lr} ldr r4, _0804B354 ldr r0, [r4] @@ -153507,15 +153507,15 @@ sub_0804B328: @ 0x0804B328 bx r0 .align 2, 0 _0804B354: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804B328 + thumb_func_end atk41_call - thumb_func_start sub_0804B358 -sub_0804B358: @ 0x0804B358 + thumb_func_start atk42_jumpiftype2 +atk42_jumpiftype2: @ 0x0804B358 push {r4, lr} ldr r4, _0804B3A0 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, [r4] @@ -153557,10 +153557,10 @@ _0804B3AC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804B358 + thumb_func_end atk42_jumpiftype2 - thumb_func_start sub_0804B3B4 -sub_0804B3B4: @ 0x0804B3B4 + thumb_func_start atk43_jumpifabilitypresent +atk43_jumpifabilitypresent: @ 0x0804B3B4 push {r4, lr} sub sp, #4 ldr r4, _0804B3EC @@ -153571,7 +153571,7 @@ sub_0804B3B4: @ 0x0804B3B4 movs r0, #0x13 movs r1, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0804B3F0 @@ -153600,10 +153600,10 @@ _0804B3F6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804B3B4 + thumb_func_end atk43_jumpifabilitypresent - thumb_func_start sub_0804B400 -sub_0804B400: @ 0x0804B400 + thumb_func_start atk44_endselectionscript +atk44_endselectionscript: @ 0x0804B400 ldr r0, _0804B414 ldrb r0, [r0] ldr r1, _0804B418 @@ -153616,15 +153616,15 @@ sub_0804B400: @ 0x0804B400 .align 2, 0 _0804B414: .4byte gUnknown_2023EAF _0804B418: .4byte gUnknown_2024140 - thumb_func_end sub_0804B400 + thumb_func_end atk44_endselectionscript - thumb_func_start sub_0804B41C -sub_0804B41C: @ 0x0804B41C + thumb_func_start atk45_playanimation +atk45_playanimation: @ 0x0804B41C push {r4, r5, r6, lr} ldr r5, _0804B470 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r6, _0804B474 strb r0, [r6] ldr r2, [r5] @@ -153652,10 +153652,10 @@ _0804B452: ldrb r1, [r0, #2] ldrh r2, [r3] movs r0, #0 - bl sub_08034290 + bl BtlController_EmitBattleAnimation ldr r0, _0804B474 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, #7 str r0, [r4] @@ -153702,9 +153702,9 @@ _0804B4C4: ldrb r1, [r2, #2] ldrh r2, [r3] movs r0, #0 - bl sub_08034290 + bl BtlController_EmitBattleAnimation ldrb r0, [r6] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #7 _0804B4D8: @@ -153713,15 +153713,15 @@ _0804B4DA: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0804B41C + thumb_func_end atk45_playanimation - thumb_func_start sub_0804B4E0 -sub_0804B4E0: @ 0x0804B4E0 + thumb_func_start atk46_playanimation2 +atk46_playanimation2: @ 0x0804B4E0 push {r4, r5, r6, r7, lr} ldr r6, _0804B548 ldr r0, [r6] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r7, _0804B54C strb r0, [r7] ldr r2, [r6] @@ -153757,10 +153757,10 @@ _0804B52A: ldrb r1, [r3] ldrh r2, [r4] movs r0, #0 - bl sub_08034290 + bl BtlController_EmitBattleAnimation ldr r0, _0804B54C ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804B548 ldr r0, [r1] adds r0, #0xa @@ -153805,9 +153805,9 @@ _0804B590: ldrb r1, [r3] ldrh r2, [r4] movs r0, #0 - bl sub_08034290 + bl BtlController_EmitBattleAnimation ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r6] _0804B5A2: adds r0, #0xa @@ -153816,10 +153816,10 @@ _0804B5A6: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0804B4E0 + thumb_func_end atk46_playanimation2 - thumb_func_start sub_0804B5AC -sub_0804B5AC: @ 0x0804B5AC + thumb_func_start atk47_setgraphicalstatchangevalues +atk47_setgraphicalstatchangevalues: @ 0x0804B5AC push {r4, lr} movs r3, #0 ldr r1, _0804B5C8 @@ -153871,10 +153871,10 @@ _0804B5E4: bx r0 .align 2, 0 _0804B604: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804B5AC + thumb_func_end atk47_setgraphicalstatchangevalues - thumb_func_start sub_0804B608 -sub_0804B608: @ 0x0804B608 + thumb_func_start atk48_playstatchangeanimation +atk48_playstatchangeanimation: @ 0x0804B608 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -153889,7 +153889,7 @@ sub_0804B608: @ 0x0804B608 ldr r0, [r5] ldrb r0, [r0, #1] str r3, [sp] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r2, _0804B680 strb r0, [r2] ldr r0, [r5] @@ -154094,10 +154094,10 @@ _0804B79C: movs r1, #1 mov r2, r8 str r3, [sp] - bl sub_08034290 + bl BtlController_EmitBattleAnimation ldr r0, _0804B7DC ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, _0804B7E0 ldr r0, [r0] ldrb r1, [r0, #3] @@ -154132,10 +154132,10 @@ _0804B7EA: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0804B608 + thumb_func_end atk48_playstatchangeanimation - thumb_func_start sub_0804B7FC -sub_0804B7FC: @ 0x0804B7FC + thumb_func_start atk49_moveend +atk49_moveend: @ 0x0804B7FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -154213,9 +154213,9 @@ _0804B898: strb r2, [r4] movs r0, #0 movs r1, #1 - bl sub_0803426C + bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804BD8A .align 2, 0 _0804B8AC: .4byte gUnknown_2023D08 @@ -154224,9 +154224,9 @@ _0804B8B0: strb r2, [r4] movs r0, #0 movs r1, #0 - bl sub_0803426C + bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r1, [r6] lsls r1, r1, #2 adds r1, r1, r5 @@ -154238,7 +154238,7 @@ _0804B8B0: .align 2, 0 _0804B8D4: .4byte gUnknown_2023D08 _0804B8D8: .4byte 0xFFFBFF3F - thumb_func_end sub_0804B7FC + thumb_func_end atk49_moveend thumb_func_start sub_0804B8DC sub_0804B8DC: @ 0x0804B8DC @@ -154359,10 +154359,10 @@ _0804B9DA: b _0804BDB4 _0804B9E4: adds r0, r1, #0 - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -154508,7 +154508,7 @@ _0804BAEA: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec bl BattleScriptPushCursor ldr r1, _0804BB40 ldr r0, _0804BB44 @@ -154533,7 +154533,7 @@ _0804BB48: movs r0, #7 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804BB62 @@ -154552,7 +154552,7 @@ _0804BB6C: movs r0, #4 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects b _0804BCE2 .align 2, 0 _0804BB80: .4byte gUnknown_2023EB0 @@ -154563,7 +154563,7 @@ _0804BB84: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804BB9C @@ -154584,7 +154584,7 @@ _0804BBAC: movs r0, #8 movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804BBC6 @@ -154718,7 +154718,7 @@ _0804BCB8: movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_0804411C + bl ItemBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0804BDB4 @@ -154733,7 +154733,7 @@ _0804BCD8: movs r0, #4 movs r1, #0 movs r2, #0 - bl sub_0804411C + bl ItemBattleEffects _0804BCE2: lsls r0, r0, #0x18 cmp r0, #0 @@ -154787,7 +154787,7 @@ _0804BD24: cmp r0, #0 beq _0804BD50 adds r0, r2, #0 - bl sub_0803F54C + bl WasUnableToUseMove lsls r0, r0, #0x18 cmp r0, #0 beq _0804BDB4 @@ -154798,9 +154798,9 @@ _0804BD50: strb r0, [r4] movs r0, #0 movs r1, #0 - bl sub_0803426C + bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, _0804BD98 ldrb r2, [r5] lsls r2, r2, #2 @@ -155381,8 +155381,8 @@ _0804C21C: .4byte gUnknown_2024118 _0804C220: .4byte gUnknown_2023EB8 thumb_func_end sub_0804B944 - thumb_func_start sub_0804C224 -sub_0804C224: @ 0x0804C224 + thumb_func_start atk4A_typecalc2 +atk4A_typecalc2: @ 0x0804C224 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -155429,7 +155429,7 @@ sub_0804C224: @ 0x0804C224 strb r2, [r0, #6] ldrb r0, [r7] ldrb r1, [r3] - bl sub_0813114C + bl RecordAbilityBattle b _0804C39A .align 2, 0 _0804C288: .4byte gUnknown_82ED220 @@ -155589,7 +155589,7 @@ _0804C39A: ldrb r0, [r0] ldr r7, _0804C454 ldrh r1, [r7] - bl sub_08052BBC + bl AttacksThisTurn lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #2 @@ -155630,7 +155630,7 @@ _0804C3DC: strb r0, [r1, #6] ldrb r0, [r2] ldrb r1, [r3] - bl sub_0813114C + bl RecordAbilityBattle _0804C416: ldr r0, _0804C460 ldrb r1, [r0] @@ -155669,10 +155669,10 @@ _0804C464: .4byte gUnknown_2023EF4 _0804C468: .4byte gUnknown_2023FD6 _0804C46C: .4byte gUnknown_2023FE0 _0804C470: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804C224 + thumb_func_end atk4A_typecalc2 - thumb_func_start sub_0804C474 -sub_0804C474: @ 0x0804C474 + thumb_func_start atk4B_returnatktoball +atk4B_returnatktoball: @ 0x0804C474 push {r4, lr} ldr r4, _0804C4B0 ldr r0, _0804C4B4 @@ -155693,7 +155693,7 @@ sub_0804C474: @ 0x0804C474 movs r1, #0 bl BtlController_EmitReturnMonToBall ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804C4A2: ldr r1, _0804C4C0 ldr r0, [r1] @@ -155708,10 +155708,10 @@ _0804C4B4: .4byte gUnknown_2023EAF _0804C4B8: .4byte gUnknown_2023F24 _0804C4BC: .4byte gUnknown_82FACB4 _0804C4C0: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804C474 + thumb_func_end atk4B_returnatktoball - thumb_func_start sub_0804C4C4 -sub_0804C4C4: @ 0x0804C4C4 + thumb_func_start atk4C_getswitchedmondata +atk4C_getswitchedmondata: @ 0x0804C4C4 push {r4, r5, lr} ldr r0, _0804C51C ldr r0, [r0] @@ -155720,7 +155720,7 @@ sub_0804C4C4: @ 0x0804C4C4 ldr r5, _0804C520 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804C524 strb r0, [r4] ldr r3, _0804C528 @@ -155745,7 +155745,7 @@ sub_0804C4C4: @ 0x0804C4C4 movs r1, #0 bl BtlController_EmitGetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -155760,10 +155760,10 @@ _0804C524: .4byte gUnknown_2023D08 _0804C528: .4byte gUnknown_2023D12 _0804C52C: .4byte gUnknown_2024140 _0804C530: .4byte gUnknown_82FACB4 - thumb_func_end sub_0804C4C4 + thumb_func_end atk4C_getswitchedmondata - thumb_func_start sub_0804C534 -sub_0804C534: @ 0x0804C534 + thumb_func_start atk4D_switchindataupdate +atk4D_switchindataupdate: @ 0x0804C534 push {r4, r5, r6, r7, lr} sub sp, #0x58 ldr r0, _0804C6DC @@ -155775,7 +155775,7 @@ _0804C542: ldr r0, _0804C6E0 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804C6E4 strb r0, [r4] ldr r6, _0804C6E8 @@ -155839,14 +155839,14 @@ _0804C56E: ldrh r0, [r1] ldrb r1, [r1, #0x17] lsrs r1, r1, #7 - bl sub_0806B15C + bl GetAbilityBySpecies ldrb r1, [r6] muls r1, r7, r1 adds r1, r1, r4 adds r1, #0x20 strb r0, [r1] ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _0804C6F4 @@ -155910,7 +155910,7 @@ _0804C62E: ldr r1, [sp, #0x50] str r1, [r0] _0804C656: - bl sub_08039EC8 + bl SwitchInClearSetData ldr r0, _0804C708 ldr r0, [r0] movs r1, #0x80 @@ -155994,10 +155994,10 @@ _0804C708: .4byte gUnknown_2022C90 _0804C70C: .4byte gUnknown_2024140 _0804C710: .4byte gUnknown_2024118 _0804C714: .4byte gUnknown_2022C0C - thumb_func_end sub_0804C534 + thumb_func_end atk4D_switchindataupdate - thumb_func_start sub_0804C718 -sub_0804C718: @ 0x0804C718 + thumb_func_start atk4E_switchinanim +atk4E_switchinanim: @ 0x0804C718 push {r4, r5, r6, lr} ldr r0, _0804C7BC ldr r0, [r0] @@ -156006,11 +156006,11 @@ sub_0804C718: @ 0x0804C718 ldr r0, _0804C7C0 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r6, _0804C7C4 strb r0, [r6] ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -156036,7 +156036,7 @@ sub_0804C718: @ 0x0804C718 adds r1, r1, r4 ldr r2, [r1] movs r1, #2 - bl sub_0806EAA8 + bl HandleSetPokedexFlag _0804C76E: ldr r2, _0804C7D4 ldr r1, _0804C7D8 @@ -156059,7 +156059,7 @@ _0804C76E: movs r0, #0 bl BtlController_EmitSwitchInAnim ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, #3 str r0, [r4] @@ -156085,10 +156085,10 @@ _0804C7D0: .4byte gUnknown_2023D28 _0804C7D4: .4byte gUnknown_2023EB4 _0804C7D8: .4byte gUnknown_82FACB4 _0804C7DC: .4byte gUnknown_2023D12 - thumb_func_end sub_0804C718 + thumb_func_end atk4E_switchinanim - thumb_func_start sub_0804C7E0 -sub_0804C7E0: @ 0x0804C7E0 + thumb_func_start atk4F_jumpifcantswitch +atk4F_jumpifcantswitch: @ 0x0804C7E0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -156097,7 +156097,7 @@ sub_0804C7E0: @ 0x0804C7E0 ldrb r1, [r0, #1] movs r0, #0x7f ands r0, r1 - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r3, _0804C848 strb r0, [r3] ldr r2, [r4] @@ -156155,7 +156155,7 @@ _0804C858: beq _0804C8F0 ldr r5, _0804C8E0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0804C8E4 @@ -156184,17 +156184,17 @@ _0804C894: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804C8CE adds r0, r5, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804C8CE adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804C8CE ldr r0, _0804C8E0 @@ -156232,7 +156232,7 @@ _0804C8F0: beq _0804C930 ldr r5, _0804C914 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0804C91C @@ -156255,7 +156255,7 @@ _0804C92C: .4byte gUnknown_20243E8 _0804C930: ldr r5, _0804C9AC ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0804C9B0 @@ -156268,10 +156268,10 @@ _0804C946: _0804C948: movs r4, #0 ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0806D2C8 + bl GetLinkTrainerFlankId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -156289,17 +156289,17 @@ _0804C96A: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804C9A4 adds r0, r5, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804C9A4 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804C9A4 ldr r0, _0804C9AC @@ -156327,7 +156327,7 @@ _0804C9BC: beq _0804CA40 ldr r5, _0804CA34 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -156353,17 +156353,17 @@ _0804C9EE: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804CA2A adds r0, r5, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804CA2A adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804CA2A ldr r0, _0804CA34 @@ -156386,7 +156386,7 @@ _0804CA3C: .4byte gUnknown_2023D12 _0804CA40: ldr r0, _0804CA70 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #1 @@ -156448,17 +156448,17 @@ _0804CAB4: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804CAF6 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804CAF6 adds r0, r5, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0804CAF6 ldr r1, _0804CB20 @@ -156511,7 +156511,7 @@ _0804CB30: bx r0 .align 2, 0 _0804CB3C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804C7E0 + thumb_func_end atk4F_jumpifcantswitch thumb_func_start sub_0804CB40 sub_0804CB40: @ 0x0804CB40 @@ -156557,9 +156557,9 @@ sub_0804CB40: @ 0x0804CB40 movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08033CF8 + bl BtlController_EmitChoosePokemon ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec add sp, #4 pop {r4, r5} pop {r0} @@ -156633,7 +156633,7 @@ _0804CC12: adds r0, r2, #0 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804CC84 @@ -156656,9 +156656,9 @@ _0804CC12: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804CCC8 .align 2, 0 _0804CC68: .4byte gUnknown_2023EB8 @@ -156697,9 +156697,9 @@ _0804CCB8: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804CCC8: ldrb r0, [r4] adds r0, #1 @@ -156733,7 +156733,7 @@ _0804CCE8: movs r0, #0 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804CD50 @@ -156757,7 +156757,7 @@ _0804CCE8: movs r0, #0 bl sub_0803410C ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804CDA0 .align 2, 0 _0804CD40: .4byte gUnknown_2023F24 @@ -156797,9 +156797,9 @@ _0804CD8C: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec movs r0, #1 mov sb, r0 _0804CDA0: @@ -156818,7 +156818,7 @@ _0804CDA0: movs r0, #2 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804CE08 @@ -156842,7 +156842,7 @@ _0804CDA0: movs r0, #0 bl sub_0803410C ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804CE5E .align 2, 0 _0804CDF8: .4byte gUnknown_82FACB4 @@ -156887,9 +156887,9 @@ _0804CE44: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804CE5E: ldr r6, _0804CEB0 ldr r0, [r6, #4] @@ -156902,7 +156902,7 @@ _0804CE5E: movs r0, #1 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804CEC0 @@ -156926,7 +156926,7 @@ _0804CE5E: movs r0, #0 bl sub_0803410C ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804CF14 .align 2, 0 _0804CEB0: .4byte gUnknown_82FACB4 @@ -156966,9 +156966,9 @@ _0804CEFC: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec movs r0, #2 mov r2, sb orrs r2, r0 @@ -156989,7 +156989,7 @@ _0804CF14: movs r0, #3 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804CF7C @@ -157013,7 +157013,7 @@ _0804CF14: movs r0, #0 bl sub_0803410C ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804CFD2 .align 2, 0 _0804CF6C: .4byte gUnknown_82FACB4 @@ -157058,9 +157058,9 @@ _0804CFB8: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804CFD2: ldr r1, _0804D004 ldrb r0, [r1] @@ -157098,10 +157098,10 @@ _0804D018: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldr r0, _0804D058 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804D02A: ldr r1, _0804D05C ldrb r0, [r1, #0x14] @@ -157139,10 +157139,10 @@ _0804D06C: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldr r0, _0804D08C ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804D080: ldr r1, _0804D090 ldr r0, [r1] @@ -157190,7 +157190,7 @@ _0804D0B2: ldrb r1, [r0, #1] movs r0, #2 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804D128 @@ -157213,7 +157213,7 @@ _0804D0B2: movs r0, #0 bl sub_0803410C ldrb r0, [r6] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804D15A .align 2, 0 _0804D110: .4byte gUnknown_2022C90 @@ -157266,7 +157266,7 @@ _0804D15A: ldrb r1, [r0] movs r0, #3 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804D1D8 @@ -157290,7 +157290,7 @@ _0804D15A: movs r0, #0 bl sub_0803410C ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804D20A .align 2, 0 _0804D1B8: .4byte gUnknown_2024020 @@ -157398,7 +157398,7 @@ _0804D288: _0804D294: movs r0, #0x7f ands r0, r1 - bl sub_0803F00C + bl GetBattlerForBattleScript lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _0804D2BC @@ -157420,7 +157420,7 @@ _0804D2C0: adds r0, r7, #0 movs r1, #6 movs r2, #6 - bl sub_08042034 + bl HasNoMonsToSwitch lsls r0, r0, #0x18 cmp r0, #0 beq _0804D310 @@ -157497,9 +157497,9 @@ _0804D310: movs r0, #0 adds r1, r5, #0 movs r3, #0 - bl sub_08033CF8 + bl BtlController_EmitChoosePokemon ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r6] adds r0, #6 str r0, [r6] @@ -157536,9 +157536,9 @@ _0804D3AC: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804D3C2: ldrb r0, [r4] adds r0, #1 @@ -157585,9 +157585,9 @@ _0804D424: movs r0, #0 movs r1, #2 movs r2, #0 - bl sub_080342BC + bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804D434: add sp, #4 pop {r3, r4} @@ -157602,8 +157602,8 @@ _0804D448: .4byte gUnknown_2023EB4 _0804D44C: .4byte gUnknown_82FACB4 thumb_func_end sub_0804CBB8 - thumb_func_start sub_0804D450 -sub_0804D450: @ 0x0804D450 + thumb_func_start atk51_switchhandleorder +atk51_switchhandleorder: @ 0x0804D450 push {r4, r5, r6, r7, lr} ldr r0, _0804D47C ldr r0, [r0] @@ -157614,7 +157614,7 @@ _0804D45C: ldr r4, _0804D480 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r5, _0804D484 strb r0, [r5] ldr r0, [r4] @@ -157921,10 +157921,10 @@ _0804D6CC: .4byte gUnknown_2022C1C _0804D6D0: .4byte gUnknown_2023D08 _0804D6D4: .4byte gUnknown_2023508 _0804D6D8: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804D450 + thumb_func_end atk51_switchhandleorder - thumb_func_start sub_0804D6DC -sub_0804D6DC: @ 0x0804D6DC + thumb_func_start atk52_switchineffects +atk52_switchineffects: @ 0x0804D6DC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -157935,7 +157935,7 @@ sub_0804D6DC: @ 0x0804D6DC mov sb, r0 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804D818 strb r0, [r4] ldrb r0, [r4] @@ -157964,7 +157964,7 @@ sub_0804D6DC: @ 0x0804D6DC ands r0, r2 strb r0, [r1] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide ldr r5, _0804D828 lsls r0, r0, #0x18 lsrs r0, r0, #0x17 @@ -157980,7 +157980,7 @@ sub_0804D6DC: @ 0x0804D6DC b _0804D860 _0804D74C: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x17 adds r0, r0, r5 @@ -158013,7 +158013,7 @@ _0804D764: cmp r0, #0x1a beq _0804D860 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x17 adds r0, r0, r5 @@ -158038,7 +158038,7 @@ _0804D764: ands r0, r2 str r0, [r1] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide ldr r2, _0804D834 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -158144,7 +158144,7 @@ _0804D88E: str r0, [sp] movs r2, #0 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0804D8B8 @@ -158153,12 +158153,12 @@ _0804D8B8: ldrb r1, [r5] movs r0, #0 movs r2, #0 - bl sub_0804411C + bl ItemBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _0804D9BE ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide ldr r1, _0804D968 lsls r0, r0, #0x18 lsrs r0, r0, #0x17 @@ -158201,7 +158201,7 @@ _0804D908: _0804D916: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x17 adds r0, #0xa8 @@ -158285,7 +158285,7 @@ _0804D9BE: .align 2, 0 _0804D9D0: .4byte gUnknown_2023D10 _0804D9D4: .4byte gUnknown_2023EB4 - thumb_func_end sub_0804D6DC + thumb_func_end atk52_switchineffects thumb_func_start sub_0804D9D8 sub_0804D9D8: @ 0x0804D9D8 @@ -158299,7 +158299,7 @@ sub_0804D9D8: @ 0x0804D9D8 movs r0, #0 bl BtlController_EmitTrainerSlide ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -158311,8 +158311,8 @@ _0804DA00: .4byte gUnknown_2023EB8 _0804DA04: .4byte gUnknown_2023D08 thumb_func_end sub_0804D9D8 - thumb_func_start sub_0804DA08 -sub_0804DA08: @ 0x0804DA08 + thumb_func_start atk54_playse +atk54_playse: @ 0x0804DA08 push {r4, r5, lr} ldr r5, _0804DA38 ldr r0, _0804DA3C @@ -158325,9 +158325,9 @@ sub_0804DA08: @ 0x0804DA08 lsls r0, r0, #8 orrs r1, r0 movs r0, #0 - bl sub_0803412C + bl BtlController_EmitPlaySE ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, #3 str r0, [r4] @@ -158338,10 +158338,10 @@ sub_0804DA08: @ 0x0804DA08 _0804DA38: .4byte gUnknown_2023D08 _0804DA3C: .4byte gUnknown_2023EAF _0804DA40: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804DA08 + thumb_func_end atk54_playse - thumb_func_start sub_0804DA44 -sub_0804DA44: @ 0x0804DA44 + thumb_func_start atk55_fanfare +atk55_fanfare: @ 0x0804DA44 push {r4, r5, lr} ldr r5, _0804DA74 ldr r0, _0804DA78 @@ -158355,9 +158355,9 @@ sub_0804DA44: @ 0x0804DA44 orrs r1, r0 movs r0, #0 movs r2, #0 - bl sub_08034158 + bl BtlController_EmitPlayFanfareOrBGM ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, #3 str r0, [r4] @@ -158368,21 +158368,21 @@ sub_0804DA44: @ 0x0804DA44 _0804DA74: .4byte gUnknown_2023D08 _0804DA78: .4byte gUnknown_2023EAF _0804DA7C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804DA44 + thumb_func_end atk55_fanfare - thumb_func_start sub_0804DA80 -sub_0804DA80: @ 0x0804DA80 + thumb_func_start atk56_playfaintcry +atk56_playfaintcry: @ 0x0804DA80 push {r4, r5, lr} ldr r5, _0804DAA8 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804DAAC strb r0, [r4] movs r0, #0 - bl sub_08034184 + bl BtlController_EmitFaintingCry ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -158392,7 +158392,7 @@ sub_0804DA80: @ 0x0804DA80 .align 2, 0 _0804DAA8: .4byte gUnknown_2023EB8 _0804DAAC: .4byte gUnknown_2023D08 - thumb_func_end sub_0804DA80 + thumb_func_end atk56_playfaintcry thumb_func_start sub_0804DAB0 sub_0804DAB0: @ 0x0804DAB0 @@ -158404,9 +158404,9 @@ sub_0804DAB0: @ 0x0804DAB0 ldr r0, _0804DAE0 ldrb r1, [r0] movs r0, #0 - bl sub_08034320 + bl BtlController_EmitCmd55 ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804DAE4 ldr r0, [r1] adds r0, #1 @@ -158420,20 +158420,20 @@ _0804DAE0: .4byte gUnknown_2023FDE _0804DAE4: .4byte gUnknown_2023EB8 thumb_func_end sub_0804DAB0 - thumb_func_start sub_0804DAE8 -sub_0804DAE8: @ 0x0804DAE8 + thumb_func_start atk58_returntoball +atk58_returntoball: @ 0x0804DAE8 push {r4, r5, lr} ldr r5, _0804DB14 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804DB18 strb r0, [r4] movs r0, #0 movs r1, #1 bl BtlController_EmitReturnMonToBall ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -158443,10 +158443,10 @@ sub_0804DAE8: @ 0x0804DAE8 .align 2, 0 _0804DB14: .4byte gUnknown_2023EB8 _0804DB18: .4byte gUnknown_2023D08 - thumb_func_end sub_0804DAE8 + thumb_func_end atk58_returntoball - thumb_func_start sub_0804DB1C -sub_0804DB1C: @ 0x0804DB1C + thumb_func_start atk59_handlelearnnewmove +atk59_handlelearnnewmove: @ 0x0804DB1C push {r4, r5, r6, r7, lr} ldr r0, _0804DB90 ldr r2, [r0] @@ -158478,7 +158478,7 @@ sub_0804DB1C: @ 0x0804DB1C ldr r1, _0804DB98 adds r0, r0, r1 ldrb r1, [r2, #9] - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _0804DB9C @@ -158494,7 +158494,7 @@ _0804DB6A: ldr r1, _0804DB98 adds r0, r0, r1 movs r1, #0 - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, r7 @@ -158552,7 +158552,7 @@ _0804DBB8: bne _0804DBF8 adds r0, r2, r4 adds r1, r5, #0 - bl sub_08068CF0 + bl GiveMoveToBattleMon _0804DBF8: ldr r0, _0804DC60 ldr r0, [r0] @@ -158589,7 +158589,7 @@ _0804DBF8: bne _0804DC44 adds r0, r2, r4 adds r1, r5, #0 - bl sub_08068CF0 + bl GiveMoveToBattleMon _0804DC44: ldr r0, _0804DC64 str r6, [r0] @@ -158604,10 +158604,10 @@ _0804DC58: .4byte gUnknown_2024140 _0804DC5C: .4byte gUnknown_2023D28 _0804DC60: .4byte gUnknown_2022C90 _0804DC64: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804DB1C + thumb_func_end atk59_handlelearnnewmove - thumb_func_start sub_0804DC68 -sub_0804DC68: @ 0x0804DC68 + thumb_func_start atk5A_yesnoboxlearnmove +atk5A_yesnoboxlearnmove: @ 0x0804DC68 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -158646,7 +158646,7 @@ _0804DCB4: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _0804DCE0 movs r1, #0xc bl sub_0814FA04 @@ -158657,7 +158657,7 @@ _0804DCB4: ldr r0, _0804DCE8 strb r4, [r0, #1] movs r0, #0 - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _0804DFE8 .align 2, 0 _0804DCE0: .4byte gUnknown_85ABBC9 @@ -158677,10 +158677,10 @@ _0804DCEC: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0804DD14: ldr r0, _0804DD78 ldrh r1, [r0, #0x2e] @@ -158695,10 +158695,10 @@ _0804DD14: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0804DD3C: ldr r0, _0804DD78 ldrh r1, [r0, #0x2e] @@ -158718,14 +158718,14 @@ _0804DD3C: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow movs r0, #1 rsbs r0, r0, #0 str r4, [sp] movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0804DDC2 .align 2, 0 _0804DD78: .4byte gUnknown_3002360 @@ -158749,7 +158749,7 @@ _0804DD92: beq _0804DDA0 b _0804DFE8 _0804DDA0: - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0804DDD0 ldr r1, _0804DDD4 ldr r1, [r1] @@ -158775,7 +158775,7 @@ _0804DDCC: .4byte gUnknown_2037C74 _0804DDD0: .4byte gUnknown_2024190 _0804DDD4: .4byte gUnknown_2024140 _0804DDD8: .4byte gUnknown_202418D -_0804DDDC: .4byte sub_080A8BC0 +_0804DDDC: .4byte ReshowBattleScreenAfterMenu _0804DDE0: .4byte gUnknown_2024186 _0804DDE4: .4byte gUnknown_2024118 _0804DDE8: @@ -158800,7 +158800,7 @@ _0804DE02: .align 2, 0 _0804DE08: .4byte gUnknown_2037C74 _0804DE0C: .4byte gUnknown_3002360 -_0804DE10: .4byte sub_080380FC +_0804DE10: .4byte BattleMainCB2 _0804DE14: ldr r0, _0804DE44 ldrb r1, [r0, #7] @@ -158830,7 +158830,7 @@ _0804DE3A: .align 2, 0 _0804DE44: .4byte gUnknown_2037C74 _0804DE48: .4byte gUnknown_3002360 -_0804DE4C: .4byte sub_080380FC +_0804DE4C: .4byte BattleMainCB2 _0804DE50: .4byte gUnknown_2024118 _0804DE54: ldr r6, _0804DE90 @@ -158845,17 +158845,17 @@ _0804DE54: adds r0, r0, r7 adds r1, r5, #0 adds r1, #0xd - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0806E290 + bl IsHMMove2 cmp r0, #0 beq _0804DEA4 ldr r0, _0804DE98 ldr r1, _0804DE9C ldrb r1, [r1] - bl sub_0803F5A4 + bl PrepareStringBattle ldr r1, _0804DEA0 movs r0, #6 strb r0, [r1, #0x1f] @@ -158897,7 +158897,7 @@ _0804DEA4: adds r0, r1, #0 adds r0, r0, r7 adds r1, r5, #0 - bl sub_0806B46C + bl RemoveMonPPBonus ldr r0, [r6] ldrb r0, [r0, #0x10] mov r1, r8 @@ -158907,7 +158907,7 @@ _0804DEA4: ldr r7, _0804DFA0 ldrh r1, [r7] adds r2, r5, #0 - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, _0804DFA4 ldr r1, [r6] ldrh r0, [r0] @@ -159000,7 +159000,7 @@ _0804DFBC: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r1, _0804DFD8 ldr r0, [r1] adds r0, #5 @@ -159025,10 +159025,10 @@ _0804DFE8: bx r0 .align 2, 0 _0804DFF4: .4byte gUnknown_2023D0C - thumb_func_end sub_0804DC68 + thumb_func_end atk5A_yesnoboxlearnmove - thumb_func_start sub_0804DFF8 -sub_0804DFF8: @ 0x0804DFF8 + thumb_func_start RegionMap_GetMarineCaveCoords +RegionMap_GetMarineCaveCoords: @ 0x0804DFF8 push {r4, r5, lr} sub sp, #4 ldr r5, _0804E00C @@ -159046,7 +159046,7 @@ _0804E010: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _0804E038 movs r1, #0xc bl sub_0814FA04 @@ -159056,7 +159056,7 @@ _0804E010: ldr r0, _0804E03C strb r4, [r0, #1] movs r0, #0 - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _0804E12A .align 2, 0 _0804E038: .4byte gUnknown_85ABBC9 @@ -159075,10 +159075,10 @@ _0804E040: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0804E068: ldr r0, _0804E0C8 ldrh r1, [r0, #0x2e] @@ -159093,10 +159093,10 @@ _0804E068: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0804E090: ldr r0, _0804E0C8 ldrh r1, [r0, #0x2e] @@ -159141,7 +159141,7 @@ _0804E0DC: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow b _0804E12A .align 2, 0 _0804E0F0: .4byte gUnknown_2023EB8 @@ -159170,7 +159170,7 @@ _0804E0F4: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow _0804E12A: add sp, #4 pop {r4, r5} @@ -159178,15 +159178,15 @@ _0804E12A: bx r0 .align 2, 0 _0804E134: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804DFF8 + thumb_func_end RegionMap_GetMarineCaveCoords - thumb_func_start sub_0804E138 -sub_0804E138: @ 0x0804E138 + thumb_func_start atk5C_hitanimation +atk5C_hitanimation: @ 0x0804E138 push {r4, lr} ldr r4, _0804E1A4 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r2, _0804E1A8 strb r0, [r2] ldr r0, _0804E1AC @@ -159224,10 +159224,10 @@ sub_0804E138: @ 0x0804E138 bne _0804E1BC _0804E18A: movs r0, #0 - bl sub_080340EC + bl BtlController_EmitHitAnimation ldr r0, _0804E1A8 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804E1A4 ldr r0, [r1] adds r0, #2 @@ -159248,10 +159248,10 @@ _0804E1C2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0804E138 + thumb_func_end atk5C_hitanimation - thumb_func_start sub_0804E1C8 -sub_0804E1C8: @ 0x0804E1C8 + thumb_func_start RubyBattleTowerRecordToEmerald +RubyBattleTowerRecordToEmerald: @ 0x0804E1C8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -159407,14 +159407,14 @@ _0804E2E4: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0804E1C8 + thumb_func_end RubyBattleTowerRecordToEmerald - thumb_func_start sub_0804E2F0 -sub_0804E2F0: @ 0x0804E2F0 + thumb_func_start atk5D_getmoneyreward +atk5D_getmoneyreward: @ 0x0804E2F0 push {r4, lr} ldr r0, _0804E364 ldrh r0, [r0] - bl sub_0804E1C8 + bl RubyBattleTowerRecordToEmerald adds r4, r0, #0 ldr r0, _0804E368 ldr r0, [r0] @@ -159425,7 +159425,7 @@ sub_0804E2F0: @ 0x0804E2F0 beq _0804E314 ldr r0, _0804E36C ldrh r0, [r0] - bl sub_0804E1C8 + bl RubyBattleTowerRecordToEmerald adds r4, r4, r0 _0804E314: ldr r0, _0804E370 @@ -159473,17 +159473,17 @@ _0804E36C: .4byte gUnknown_203886C _0804E370: .4byte gUnknown_3005AEC _0804E374: .4byte gUnknown_2022C0C _0804E378: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804E2F0 + thumb_func_end atk5D_getmoneyreward - thumb_func_start sub_0804E37C -sub_0804E37C: @ 0x0804E37C + thumb_func_start atk5E +atk5E: @ 0x0804E37C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} ldr r4, _0804E3A0 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r6, _0804E3A4 strb r0, [r6] ldr r5, _0804E3A8 @@ -159504,7 +159504,7 @@ _0804E3AC: movs r2, #0 bl BtlController_EmitGetMonData ldrb r0, [r6] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r0, [r5] adds r0, #1 strb r0, [r5] @@ -159563,10 +159563,10 @@ _0804E418: _0804E424: .4byte gUnknown_2023D0C _0804E428: .4byte gUnknown_202350C _0804E42C: .4byte gUnknown_2023D4C - thumb_func_end sub_0804E37C + thumb_func_end atk5E - thumb_func_start sub_0804E430 -sub_0804E430: @ 0x0804E430 + thumb_func_start atk5F_swapattackerwithtarget +atk5F_swapattackerwithtarget: @ 0x0804E430 push {lr} ldr r0, _0804E458 ldr r2, _0804E45C @@ -159605,14 +159605,14 @@ _0804E46E: bx r0 .align 2, 0 _0804E47C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804E430 + thumb_func_end atk5F_swapattackerwithtarget - thumb_func_start sub_0804E480 -sub_0804E480: @ 0x0804E480 + thumb_func_start atk60_incrementgamestat +atk60_incrementgamestat: @ 0x0804E480 push {lr} ldr r0, _0804E4A8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0804E49A @@ -159630,10 +159630,10 @@ _0804E49A: .align 2, 0 _0804E4A8: .4byte gUnknown_2023EAF _0804E4AC: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804E480 + thumb_func_end atk60_incrementgamestat - thumb_func_start sub_0804E4B0 -sub_0804E4B0: @ 0x0804E4B0 + thumb_func_start atk61_drawpartystatussummary +atk61_drawpartystatussummary: @ 0x0804E4B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -159645,11 +159645,11 @@ sub_0804E4B0: @ 0x0804E4B0 ldr r0, _0804E518 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _0804E51C strb r0, [r1] ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _0804E520 mov r8, r1 @@ -159668,12 +159668,12 @@ _0804E4E8: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0804E50C adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -159693,11 +159693,11 @@ _0804E528: .4byte 0x0000FFFF _0804E52C: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData _0804E53E: str r0, [r6] adds r6, #8 @@ -159708,10 +159708,10 @@ _0804E53E: movs r0, #0 mov r1, sp movs r2, #1 - bl sub_080341E4 + bl BtlController_EmitDrawPartyStatusSummary ldr r0, _0804E570 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804E574 ldr r0, [r1] adds r0, #2 @@ -159726,21 +159726,21 @@ _0804E564: .align 2, 0 _0804E570: .4byte gUnknown_2023D08 _0804E574: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804E4B0 + thumb_func_end atk61_drawpartystatussummary - thumb_func_start sub_0804E578 -sub_0804E578: @ 0x0804E578 + thumb_func_start atk62_hidepartystatussummary +atk62_hidepartystatussummary: @ 0x0804E578 push {r4, r5, lr} ldr r5, _0804E5A0 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804E5A4 strb r0, [r4] movs r0, #0 - bl sub_0803422C + bl BtlController_EmitHidePartyStatusSummary ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -159750,10 +159750,10 @@ sub_0804E578: @ 0x0804E578 .align 2, 0 _0804E5A0: .4byte gUnknown_2023EB8 _0804E5A4: .4byte gUnknown_2023D08 - thumb_func_end sub_0804E578 + thumb_func_end atk62_hidepartystatussummary - thumb_func_start sub_0804E5A8 -sub_0804E5A8: @ 0x0804E5A8 + thumb_func_start atk63_jumptocalledmove +atk63_jumptocalledmove: @ 0x0804E5A8 push {r4, lr} ldr r0, _0804E5C0 ldr r1, [r0] @@ -159800,10 +159800,10 @@ _0804E5FC: .4byte gUnknown_2023E8E _0804E600: .4byte gUnknown_2023E92 _0804E604: .4byte gUnknown_8286C30 _0804E608: .4byte gUnknown_82ED220 - thumb_func_end sub_0804E5A8 + thumb_func_end atk63_jumptocalledmove - thumb_func_start sub_0804E60C -sub_0804E60C: @ 0x0804E60C + thumb_func_start atk64_statusanimation +atk64_statusanimation: @ 0x0804E60C push {r4, lr} ldr r0, _0804E67C ldr r0, [r0] @@ -159812,7 +159812,7 @@ sub_0804E60C: @ 0x0804E60C ldr r0, _0804E680 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804E684 strb r0, [r4] ldr r1, _0804E688 @@ -159846,9 +159846,9 @@ sub_0804E60C: @ 0x0804E60C ldr r2, [r0] movs r0, #0 movs r1, #0 - bl sub_08033E14 + bl BtlController_EmitStatusAnimation ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804E66C: ldr r1, _0804E680 ldr r0, [r1] @@ -159867,10 +159867,10 @@ _0804E68C: .4byte 0x000400C0 _0804E690: .4byte gUnknown_2023F60 _0804E694: .4byte gUnknown_2023F24 _0804E698: .4byte gUnknown_2023D28 - thumb_func_end sub_0804E60C + thumb_func_end atk64_statusanimation - thumb_func_start sub_0804E69C -sub_0804E69C: @ 0x0804E69C + thumb_func_start atk65_status2animation +atk65_status2animation: @ 0x0804E69C push {r4, r5, lr} ldr r0, _0804E724 ldr r0, [r0] @@ -159879,7 +159879,7 @@ sub_0804E69C: @ 0x0804E69C ldr r4, _0804E728 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r5, _0804E72C strb r0, [r5] ldr r1, [r4] @@ -159925,9 +159925,9 @@ sub_0804E69C: @ 0x0804E69C ands r2, r3 movs r0, #0 movs r1, #1 - bl sub_08033E14 + bl BtlController_EmitStatusAnimation ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804E714: ldr r1, _0804E728 ldr r0, [r1] @@ -159946,10 +159946,10 @@ _0804E734: .4byte 0x000400C0 _0804E738: .4byte gUnknown_2023F60 _0804E73C: .4byte gUnknown_2023F24 _0804E740: .4byte gUnknown_2023D28 - thumb_func_end sub_0804E69C + thumb_func_end atk65_status2animation - thumb_func_start sub_0804E744 -sub_0804E744: @ 0x0804E744 + thumb_func_start atk66_chosenstatusanimation +atk66_chosenstatusanimation: @ 0x0804E744 push {r4, r5, lr} ldr r0, _0804E7BC ldr r0, [r0] @@ -159958,7 +159958,7 @@ sub_0804E744: @ 0x0804E744 ldr r4, _0804E7C0 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r5, _0804E7C4 strb r0, [r5] ldr r4, [r4] @@ -159997,9 +159997,9 @@ sub_0804E744: @ 0x0804E744 bne _0804E7AE ldrb r1, [r4, #2] movs r0, #0 - bl sub_08033E14 + bl BtlController_EmitStatusAnimation ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804E7AE: ldr r1, _0804E7C0 ldr r0, [r1] @@ -160017,10 +160017,10 @@ _0804E7C8: .4byte gUnknown_2023F50 _0804E7CC: .4byte 0x000400C0 _0804E7D0: .4byte gUnknown_2023F60 _0804E7D4: .4byte gUnknown_2023F24 - thumb_func_end sub_0804E744 + thumb_func_end atk66_chosenstatusanimation - thumb_func_start sub_0804E7D8 -sub_0804E7D8: @ 0x0804E7D8 + thumb_func_start atk67_yesnobox +atk67_yesnobox: @ 0x0804E7D8 push {r4, r5, lr} sub sp, #4 ldr r5, _0804E7EC @@ -160038,7 +160038,7 @@ _0804E7F0: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _0804E818 movs r1, #0xc bl sub_0814FA04 @@ -160047,7 +160047,7 @@ _0804E7F0: strb r0, [r5] strb r4, [r5, #1] movs r0, #0 - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _0804E8AE .align 2, 0 _0804E818: .4byte gUnknown_85ABBC9 @@ -160064,10 +160064,10 @@ _0804E81C: movs r0, #5 bl sub_080A306C ldrb r0, [r5, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 strb r0, [r5, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0804E842: ldr r0, _0804E880 ldrh r1, [r0, #0x2e] @@ -160082,10 +160082,10 @@ _0804E842: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0804E86A: ldr r0, _0804E880 ldrh r1, [r0, #0x2e] @@ -160114,7 +160114,7 @@ _0804E892: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r1, _0804E8B8 ldr r0, [r1] adds r0, #1 @@ -160126,7 +160126,7 @@ _0804E8AE: bx r0 .align 2, 0 _0804E8B8: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804E7D8 + thumb_func_end atk67_yesnobox thumb_func_start atk68_cancelallactions atk68_cancelallactions: @ 0x0804E8BC @@ -160159,8 +160159,8 @@ _0804E8EC: .4byte gUnknown_2023EB8 _0804E8F0: .4byte gUnknown_2023D1E thumb_func_end atk68_cancelallactions - thumb_func_start sub_0804E8F4 -sub_0804E8F4: @ 0x0804E8F4 + thumb_func_start atk69_adjustsetdamage +atk69_adjustsetdamage: @ 0x0804E8F4 push {r4, r5, r6, r7, lr} ldr r7, _0804E91C ldr r6, _0804E920 @@ -160214,7 +160214,7 @@ _0804E942: bhs _0804E980 ldrb r0, [r5] movs r1, #0x27 - bl sub_0813117C + bl RecordItemEffectBattle ldr r2, _0804EA0C ldrb r1, [r5] lsls r0, r1, #2 @@ -160337,16 +160337,16 @@ _0804EA60: .4byte gUnknown_2024020 _0804EA64: .4byte gUnknown_2023F20 _0804EA68: .4byte gUnknown_2023EAC _0804EA6C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804E8F4 + thumb_func_end atk69_adjustsetdamage - thumb_func_start sub_0804EA70 -sub_0804EA70: @ 0x0804EA70 + thumb_func_start atk6A_removeitem +atk6A_removeitem: @ 0x0804EA70 push {r4, r5, r6, lr} sub sp, #4 ldr r6, _0804EAD0 ldr r0, [r6] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r5, _0804EAD4 strb r0, [r5] ldr r1, _0804EAD8 @@ -160378,7 +160378,7 @@ sub_0804EA70: @ 0x0804EA70 movs r3, #2 bl BtlController_EmitSetMonData ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r6] adds r0, #2 str r0, [r6] @@ -160391,7 +160391,7 @@ _0804EAD0: .4byte gUnknown_2023EB8 _0804EAD4: .4byte gUnknown_2023D08 _0804EAD8: .4byte gUnknown_2024140 _0804EADC: .4byte gUnknown_2023D28 - thumb_func_end sub_0804EA70 + thumb_func_end atk6A_removeitem thumb_func_start atk6B_atknameinbuff1 atk6B_atknameinbuff1: @ 0x0804EAE0 @@ -160423,8 +160423,8 @@ _0804EB14: .4byte gUnknown_2023D12 _0804EB18: .4byte gUnknown_2023EB8 thumb_func_end atk6B_atknameinbuff1 - thumb_func_start sub_0804EB1C -sub_0804EB1C: @ 0x0804EB1C + thumb_func_start atk6C_drawlvlupbox +atk6C_drawlvlupbox: @ 0x0804EB1C push {r4, lr} sub sp, #4 ldr r0, _0804EB38 @@ -160432,7 +160432,7 @@ sub_0804EB1C: @ 0x0804EB1C adds r4, r0, #0 cmp r1, #0 bne _0804EB40 - bl sub_0804F0A4 + bl IsMonGettingExpSentOut cmp r0, #0 beq _0804EB3C movs r0, #3 @@ -160475,9 +160475,9 @@ _0804EB80: movs r0, #2 movs r1, #7 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 - bl sub_08001B48 + bl ShowBg bl sub_0804ED94 ldr r1, _0804EBA8 movs r0, #2 @@ -160511,22 +160511,22 @@ _0804EBC4: movs r0, #0 movs r1, #7 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 movs r1, #7 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #0x80 str r0, [sp] movs r0, #0x12 movs r1, #7 movs r2, #0x1d movs r3, #0x13 - bl sub_0805664C + bl HandleBattleWindow ldr r1, _0804EC14 movs r0, #4 strb r0, [r1, #0x1e] @@ -160536,15 +160536,15 @@ _0804EC0C: .4byte gUnknown_2022ACC _0804EC10: .4byte gUnknown_2022ACE _0804EC14: .4byte gUnknown_2024118 _0804EC18: - bl sub_0804ED18 + bl DrawLevelUpWindow1 movs r0, #0xd - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xd movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0804EC82 _0804EC2C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -160561,10 +160561,10 @@ _0804EC44: beq _0804ED0A movs r0, #5 bl sub_080A306C - bl sub_0804ED5C + bl DrawLevelUpWindow2 movs r0, #0xd movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0804EC82 .align 2, 0 _0804EC60: .4byte gUnknown_3002360 @@ -160581,7 +160581,7 @@ _0804EC64: movs r1, #7 movs r2, #0x1d movs r3, #0x13 - bl sub_0805664C + bl HandleBattleWindow _0804EC82: ldr r1, _0804EC90 ldrb r0, [r1, #0x1e] @@ -160597,21 +160597,21 @@ _0804EC94: cmp r0, #0 bne _0804ED0A movs r0, #0xe - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xe movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xd movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r1, _0804ECD4 movs r0, #0xa strb r0, [r1, #0x1e] @@ -160619,22 +160619,22 @@ _0804EC94: .align 2, 0 _0804ECD4: .4byte gUnknown_2024118 _0804ECD8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0804ED0A movs r0, #0 movs r1, #7 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 movs r1, #7 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg ldr r1, _0804ED14 ldr r0, [r1] adds r0, #1 @@ -160646,10 +160646,10 @@ _0804ED0A: bx r0 .align 2, 0 _0804ED14: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804EB1C + thumb_func_end atk6C_drawlvlupbox - thumb_func_start sub_0804ED18 -sub_0804ED18: @ 0x0804ED18 + thumb_func_start DrawLevelUpWindow1 +DrawLevelUpWindow1: @ 0x0804ED18 push {lr} sub sp, #0x14 ldr r0, _0804ED50 @@ -160660,7 +160660,7 @@ sub_0804ED18: @ 0x0804ED18 ldr r1, _0804ED54 adds r0, r0, r1 add r1, sp, #8 - bl sub_081D2EB8 + bl GetMonLevelUpWindowStats ldr r0, _0804ED58 ldr r0, [r0] ldr r1, [r0, #0x10] @@ -160671,7 +160671,7 @@ sub_0804ED18: @ 0x0804ED18 movs r0, #0xd add r2, sp, #8 movs r3, #0xe - bl sub_081D2C70 + bl DrawLevelUpWindowPg1 add sp, #0x14 pop {r0} bx r0 @@ -160679,10 +160679,10 @@ sub_0804ED18: @ 0x0804ED18 _0804ED50: .4byte gUnknown_2024140 _0804ED54: .4byte gUnknown_2024190 _0804ED58: .4byte gUnknown_202414C - thumb_func_end sub_0804ED18 + thumb_func_end DrawLevelUpWindow1 - thumb_func_start sub_0804ED5C -sub_0804ED5C: @ 0x0804ED5C + thumb_func_start DrawLevelUpWindow2 +DrawLevelUpWindow2: @ 0x0804ED5C push {lr} sub sp, #0x10 ldr r0, _0804ED8C @@ -160693,21 +160693,21 @@ sub_0804ED5C: @ 0x0804ED5C ldr r1, _0804ED90 adds r0, r0, r1 add r1, sp, #4 - bl sub_081D2EB8 + bl GetMonLevelUpWindowStats movs r0, #0xf str r0, [sp] movs r0, #0xd add r1, sp, #4 movs r2, #0xe movs r3, #0xd - bl sub_081D2DB4 + bl DrawLevelUpWindowPg2 add sp, #0x10 pop {r0} bx r0 .align 2, 0 _0804ED8C: .4byte gUnknown_2024140 _0804ED90: .4byte gUnknown_2024190 - thumb_func_end sub_0804ED5C + thumb_func_end DrawLevelUpWindow2 thumb_func_start sub_0804ED94 sub_0804ED94: @ 0x0804ED94 @@ -160723,18 +160723,18 @@ sub_0804ED94: @ 0x0804ED94 ldr r0, _0804EDDC movs r1, #0x60 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0804EDE0 movs r0, #0xe movs r2, #0 movs r3, #0 - bl sub_08003AC0 + bl CopyToWindowPixelBuffer movs r0, #0xe - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xe movs r1, #3 - bl sub_08003528 - bl sub_0804EF90 + bl CopyWindowToVram + bl PutMonIconOnLvlUpBox pop {r0} bx r0 .align 2, 0 @@ -160747,7 +160747,7 @@ _0804EDE0: .4byte gUnknown_82ECC6C thumb_func_start sub_0804EDE4 sub_0804EDE4: @ 0x0804EDE4 push {r4, r5, lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _0804EDF4 @@ -160769,7 +160769,7 @@ _0804EE08: lsls r0, r0, #1 cmp r1, r0 bne _0804EE14 - bl sub_0804EE38 + bl PutLevelAndGenderOnLvlUpBox _0804EE14: ldrh r0, [r4] adds r0, #8 @@ -160793,8 +160793,8 @@ _0804EE2E: _0804EE34: .4byte 0x01FF0000 thumb_func_end sub_0804EDE4 - thumb_func_start sub_0804EE38 -sub_0804EE38: @ 0x0804EE38 + thumb_func_start PutLevelAndGenderOnLvlUpBox +PutLevelAndGenderOnLvlUpBox: @ 0x0804EE38 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -160807,7 +160807,7 @@ sub_0804EE38: @ 0x0804EE38 ldr r4, _0804EF04 adds r0, r0, r4 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -160816,7 +160816,7 @@ sub_0804EE38: @ 0x0804EE38 ldrb r0, [r0, #0x10] muls r0, r5, r0 adds r0, r0, r4 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, [r6] @@ -160825,7 +160825,7 @@ sub_0804EE38: @ 0x0804EE38 adds r0, r0, r4 ldr r5, _0804EF08 adds r1, r5, #0 - bl sub_081B1814 + bl GetMonNickname str r5, [sp] mov r2, sp movs r1, #0 @@ -160856,7 +160856,7 @@ sub_0804EE38: @ 0x0804EE38 strb r4, [r0, #0xd] movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter movs r0, #0xf9 strb r0, [r5] adds r5, #1 @@ -160914,17 +160914,17 @@ _0804EF2C: strb r1, [r0, #9] movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter movs r0, #0xe movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0804EE38 + thumb_func_end PutLevelAndGenderOnLvlUpBox thumb_func_start sub_0804EF50 sub_0804EF50: @ 0x0804EF50 @@ -160966,8 +160966,8 @@ _0804EF8C: bx r1 thumb_func_end sub_0804EF50 - thumb_func_start sub_0804EF90 -sub_0804EF90: @ 0x0804EF90 + thumb_func_start PutMonIconOnLvlUpBox +PutMonIconOnLvlUpBox: @ 0x0804EF90 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -160981,7 +160981,7 @@ sub_0804EF90: @ 0x0804EF90 ldr r5, _0804F03C adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -160991,7 +160991,7 @@ sub_0804EF90: @ 0x0804EF90 muls r0, r6, r0 adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r4, #0 movs r2, #1 @@ -161018,7 +161018,7 @@ sub_0804EF90: @ 0x0804EF90 orrs r0, r1 str r0, [r4, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r4, #0 bl LoadSpritePalette ldr r0, _0804F050 @@ -161026,7 +161026,7 @@ sub_0804EF90: @ 0x0804EF90 lsls r1, r1, #1 movs r2, #0xa movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0804F054 @@ -161055,10 +161055,10 @@ _0804F04C: .4byte 0x0000D75A _0804F050: .4byte gUnknown_82ECD44 _0804F054: .4byte gUnknown_20205AC _0804F058: .4byte gUnknown_2022AD0 - thumb_func_end sub_0804EF90 + thumb_func_end PutMonIconOnLvlUpBox - thumb_func_start sub_0804F05C -sub_0804F05C: @ 0x0804F05C + thumb_func_start SpriteCB_MonIconOnLvlUpBox +SpriteCB_MonIconOnLvlUpBox: @ 0x0804F05C push {r4, lr} adds r2, r0, #0 ldr r0, _0804F078 @@ -161092,10 +161092,10 @@ _0804F098: bx r0 .align 2, 0 _0804F0A0: .4byte 0x0000D75A - thumb_func_end sub_0804F05C + thumb_func_end SpriteCB_MonIconOnLvlUpBox - thumb_func_start sub_0804F0A4 -sub_0804F0A4: @ 0x0804F0A4 + thumb_func_start IsMonGettingExpSentOut +IsMonGettingExpSentOut: @ 0x0804F0A4 push {lr} ldr r3, _0804F0CC ldr r0, _0804F0D0 @@ -161126,10 +161126,10 @@ _0804F0DA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0804F0A4 + thumb_func_end IsMonGettingExpSentOut - thumb_func_start sub_0804F0E0 -sub_0804F0E0: @ 0x0804F0E0 + thumb_func_start atk6D_resetsentmonsvalue +atk6D_resetsentmonsvalue: @ 0x0804F0E0 push {lr} bl ResetSentPokesToOpponentValue ldr r1, _0804F0F4 @@ -161140,10 +161140,10 @@ sub_0804F0E0: @ 0x0804F0E0 bx r0 .align 2, 0 _0804F0F4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F0E0 + thumb_func_end atk6D_resetsentmonsvalue - thumb_func_start sub_0804F0F8 -sub_0804F0F8: @ 0x0804F0F8 + thumb_func_start atk6E_setatktoplayer0 +atk6E_setatktoplayer0: @ 0x0804F0F8 push {lr} movs r0, #0 bl GetBattlerAtPosition @@ -161158,22 +161158,22 @@ sub_0804F0F8: @ 0x0804F0F8 .align 2, 0 _0804F110: .4byte gUnknown_2023EAF _0804F114: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F0F8 + thumb_func_end atk6E_setatktoplayer0 - thumb_func_start sub_0804F118 -sub_0804F118: @ 0x0804F118 + thumb_func_start atk6F_makevisible +atk6F_makevisible: @ 0x0804F118 push {r4, r5, lr} ldr r5, _0804F144 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _0804F148 strb r0, [r4] movs r0, #0 movs r1, #0 - bl sub_0803426C + bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -161183,21 +161183,21 @@ sub_0804F118: @ 0x0804F118 .align 2, 0 _0804F144: .4byte gUnknown_2023EB8 _0804F148: .4byte gUnknown_2023D08 - thumb_func_end sub_0804F118 + thumb_func_end atk6F_makevisible - thumb_func_start sub_0804F14C -sub_0804F14C: @ 0x0804F14C + thumb_func_start atk70_recordlastability +atk70_recordlastability: @ 0x0804F14C push {r4, lr} ldr r4, _0804F174 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _0804F178 strb r0, [r1] ldrb r0, [r1] ldr r1, _0804F17C ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle ldr r0, [r4] adds r0, #1 str r0, [r4] @@ -161208,7 +161208,7 @@ sub_0804F14C: @ 0x0804F14C _0804F174: .4byte gUnknown_2023EB8 _0804F178: .4byte gUnknown_2023D08 _0804F17C: .4byte gUnknown_2023EAE - thumb_func_end sub_0804F14C + thumb_func_end atk70_recordlastability thumb_func_start BufferMoveToLearnIntoBattleTextBuff2 BufferMoveToLearnIntoBattleTextBuff2: @ 0x0804F180 @@ -161233,8 +161233,8 @@ _0804F1A0: .4byte gUnknown_2022C1C _0804F1A4: .4byte gUnknown_2024186 thumb_func_end BufferMoveToLearnIntoBattleTextBuff2 - thumb_func_start sub_0804F1A8 -sub_0804F1A8: @ 0x0804F1A8 + thumb_func_start atk71_buffermovetolearn +atk71_buffermovetolearn: @ 0x0804F1A8 push {lr} bl BufferMoveToLearnIntoBattleTextBuff2 ldr r1, _0804F1BC @@ -161245,14 +161245,14 @@ sub_0804F1A8: @ 0x0804F1A8 bx r0 .align 2, 0 _0804F1BC: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F1A8 + thumb_func_end atk71_buffermovetolearn - thumb_func_start sub_0804F1C0 -sub_0804F1C0: @ 0x0804F1C0 + thumb_func_start atk72_jumpifplayerran +atk72_jumpifplayerran: @ 0x0804F1C0 push {lr} ldr r0, _0804F1EC ldrb r0, [r0] - bl sub_0803E860 + bl TryRunFromBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0804F1F4 @@ -161283,10 +161283,10 @@ _0804F1FC: bx r0 .align 2, 0 _0804F200: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F1C0 + thumb_func_end atk72_jumpifplayerran - thumb_func_start sub_0804F204 -sub_0804F204: @ 0x0804F204 + thumb_func_start atk73_hpthresholds +atk73_hpthresholds: @ 0x0804F204 push {r4, r5, r6, lr} ldr r0, _0804F254 ldr r4, [r0] @@ -161297,7 +161297,7 @@ sub_0804F204: @ 0x0804F204 ldr r0, _0804F258 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _0804F25C strb r0, [r1] movs r1, #1 @@ -161371,10 +161371,10 @@ _0804F29A: .align 2, 0 _0804F2A8: .4byte gUnknown_2024140 _0804F2AC: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F204 + thumb_func_end atk73_hpthresholds - thumb_func_start sub_0804F2B0 -sub_0804F2B0: @ 0x0804F2B0 + thumb_func_start atk74_hpthresholds2 +atk74_hpthresholds2: @ 0x0804F2B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -161388,7 +161388,7 @@ sub_0804F2B0: @ 0x0804F2B0 ldr r0, _0804F318 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript adds r4, r0, #0 ldr r0, _0804F31C strb r4, [r0] @@ -161397,7 +161397,7 @@ sub_0804F2B0: @ 0x0804F2B0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _0804F320 ldr r6, [r1] @@ -161461,10 +161461,10 @@ _0804F34A: bx r0 .align 2, 0 _0804F35C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F2B0 + thumb_func_end atk74_hpthresholds2 - thumb_func_start sub_0804F360 -sub_0804F360: @ 0x0804F360 + thumb_func_start atk75_useitemonopponent +atk75_useitemonopponent: @ 0x0804F360 push {lr} sub sp, #4 ldr r2, _0804F3A0 @@ -161487,7 +161487,7 @@ sub_0804F360: @ 0x0804F360 movs r3, #1 str r3, [sp] movs r3, #0 - bl sub_0806B7EC + bl PokemonUseItemEffects ldr r1, _0804F3B4 ldr r0, [r1] adds r0, #1 @@ -161502,17 +161502,17 @@ _0804F3A8: .4byte gUnknown_2023D12 _0804F3AC: .4byte gUnknown_20243E8 _0804F3B0: .4byte gUnknown_2023EAC _0804F3B4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F360 + thumb_func_end atk75_useitemonopponent - thumb_func_start sub_0804F3B8 -sub_0804F3B8: @ 0x0804F3B8 + thumb_func_start atk76_various +atk76_various: @ 0x0804F3B8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} ldr r4, _0804F3E0 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _0804F3E4 strb r0, [r1] ldr r0, [r4] @@ -161571,7 +161571,7 @@ _0804F468: ldrb r0, [r4] strb r0, [r1] ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -161609,7 +161609,7 @@ _0804F4B4: _0804F4C0: .4byte gUnknown_2023EB0 _0804F4C4: .4byte gUnknown_2023D08 _0804F4C8: - bl sub_0803B7CC + bl IsRunningFromBattleImpossible ldr r1, _0804F4D4 strb r0, [r1] b _0804F97C @@ -161619,7 +161619,7 @@ _0804F4D8: ldr r0, _0804F4E8 ldrh r0, [r0] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _0804F4EC strb r0, [r1] b _0804F97C @@ -161853,7 +161853,7 @@ _0804F68E: adds r1, #0x48 adds r0, r0, r1 ldr r0, [r0] - bl sub_0806CB4C + bl GetNatureFromPersonality ldr r1, _0804F6D4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -161873,7 +161873,7 @@ _0804F6D4: .4byte gUnknown_82ECE7C _0804F6D8: ldr r4, _0804F6F0 adds r0, r4, #0 - bl sub_081A4E48 + bl BattleArena_ShowJudgmentWindow lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -162024,15 +162024,15 @@ _0804F81C: .4byte 0x000002A1 _0804F820: .4byte gUnknown_2023F60 _0804F824: movs r0, #0 - bl sub_08033C68 + bl BtlController_EmitUnknownYesNoBox ldr r0, _0804F834 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804F97C .align 2, 0 _0804F834: .4byte gUnknown_2023D08 _0804F838: - bl sub_081A57E8 + bl DrawArenaRefereeTextBox b _0804F97C _0804F83E: bl sub_081A5AD8 @@ -162045,7 +162045,7 @@ _0804F844: lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0804F868 movs r1, #0x16 bl sub_0814FA04 @@ -162060,7 +162060,7 @@ _0804F86C: lsls r0, r0, #0x10 b _0804F930 _0804F876: - bl sub_080A2F40 + bl IsCryFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0804F882 @@ -162097,7 +162097,7 @@ _0804F8AE: movs r1, #0 bl BtlController_EmitReturnMonToBall ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _0804F97C .align 2, 0 _0804F8C4: .4byte gUnknown_2023D10 @@ -162155,7 +162155,7 @@ _0804F938: .4byte gUnknown_2023D08 _0804F93C: ldr r0, _0804F954 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0804F95C @@ -162178,10 +162178,10 @@ _0804F968: lsls r1, r1, #1 movs r0, #0 movs r2, #1 - bl sub_08034158 + bl BtlController_EmitPlayFanfareOrBGM ldr r0, _0804F990 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec _0804F97C: ldr r1, _0804F994 ldr r0, [r1] @@ -162196,10 +162196,10 @@ _0804F984: .align 2, 0 _0804F990: .4byte gUnknown_2023D08 _0804F994: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F3B8 + thumb_func_end atk76_various - thumb_func_start sub_0804F998 -sub_0804F998: @ 0x0804F998 + thumb_func_start atk77_setprotectlike +atk77_setprotectlike: @ 0x0804F998 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -162349,10 +162349,10 @@ _0804FAC4: .4byte gUnknown_2023EAF _0804FAC8: .4byte gUnknown_2023FD6 _0804FACC: .4byte gUnknown_2023F20 _0804FAD0: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804F998 + thumb_func_end atk77_setprotectlike - thumb_func_start sub_0804FAD4 -sub_0804FAD4: @ 0x0804FAD4 + thumb_func_start atk78_faintifabilitynotdamp +atk78_faintifabilitynotdamp: @ 0x0804FAD4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -162411,9 +162411,9 @@ _0804FB20: str r0, [r2] ldr r1, _0804FBAC movs r0, #0 - bl sub_08033D54 + bl BtlController_EmitHealthBarUpdate ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804FBB0 ldr r0, [r1] adds r0, #1 @@ -162471,7 +162471,7 @@ _0804FBBC: adds r1, r1, r6 adds r1, #0x20 ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle ldr r1, _0804FBE8 ldr r0, _0804FBEC str r0, [r1] @@ -162485,10 +162485,10 @@ _0804FBD8: _0804FBE4: .4byte gUnknown_2023EAE _0804FBE8: .4byte gUnknown_2023EB8 _0804FBEC: .4byte gUnknown_8289AE8 - thumb_func_end sub_0804FAD4 + thumb_func_end atk78_faintifabilitynotdamp - thumb_func_start sub_0804FBF0 -sub_0804FBF0: @ 0x0804FBF0 + thumb_func_start atk79_setatkhptozero +atk79_setatkhptozero: @ 0x0804FBF0 push {r4, lr} sub sp, #4 ldr r0, _0804FC3C @@ -162516,7 +162516,7 @@ sub_0804FBF0: @ 0x0804FBF0 movs r3, #2 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _0804FC4C ldr r0, [r1] adds r0, #1 @@ -162532,10 +162532,10 @@ _0804FC40: .4byte gUnknown_2023D08 _0804FC44: .4byte gUnknown_2023EAF _0804FC48: .4byte gUnknown_2023D28 _0804FC4C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804FBF0 + thumb_func_end atk79_setatkhptozero - thumb_func_start sub_0804FC50 -sub_0804FC50: @ 0x0804FC50 + thumb_func_start atk7A_jumpifnexttargetvalid +atk7A_jumpifnexttargetvalid: @ 0x0804FC50 push {r4, r5, r6, r7, lr} ldr r3, _0804FCC8 ldr r2, [r3] @@ -162617,10 +162617,10 @@ _0804FCEC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0804FC50 + thumb_func_end atk7A_jumpifnexttargetvalid - thumb_func_start sub_0804FCF4 -sub_0804FCF4: @ 0x0804FCF4 + thumb_func_start atk7B_tryhealhalfhealth +atk7B_tryhealhalfhealth: @ 0x0804FCF4 push {r4, r5, r6, lr} ldr r4, _0804FD50 ldr r1, [r4] @@ -162682,10 +162682,10 @@ _0804FD6A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0804FCF4 + thumb_func_end atk7B_tryhealhalfhealth - thumb_func_start sub_0804FD70 -sub_0804FD70: @ 0x0804FD70 + thumb_func_start atk7C_trymirrormove +atk7C_trymirrormove: @ 0x0804FD70 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -162801,7 +162801,7 @@ _0804FE2C: _0804FE56: ldrh r0, [r4] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _0804FE8C strb r0, [r1] ldr r5, _0804FE90 @@ -162855,10 +162855,10 @@ _0804FEBA: _0804FECC: .4byte gUnknown_2024020 _0804FED0: .4byte gUnknown_2023EAF _0804FED4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804FD70 + thumb_func_end atk7C_trymirrormove - thumb_func_start sub_0804FED8 -sub_0804FED8: @ 0x0804FED8 + thumb_func_start atk7D_setrain +atk7D_setrain: @ 0x0804FED8 push {lr} ldr r2, _0804FEF8 ldrh r0, [r2] @@ -162899,10 +162899,10 @@ _0804FF14: _0804FF20: .4byte gUnknown_2023FD6 _0804FF24: .4byte gUnknown_2024074 _0804FF28: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804FED8 + thumb_func_end atk7D_setrain - thumb_func_start sub_0804FF2C -sub_0804FF2C: @ 0x0804FF2C + thumb_func_start atk7E_setreflect +atk7E_setreflect: @ 0x0804FF2C push {r4, r5, r6, lr} ldr r6, _0804FF5C ldrb r0, [r6] @@ -162969,7 +162969,7 @@ _0804FF6C: cmp r0, #0 beq _0804FFDC movs r0, #1 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #2 @@ -162997,10 +162997,10 @@ _0804FFE2: .align 2, 0 _0804FFF0: .4byte gUnknown_2023FD6 _0804FFF4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804FF2C + thumb_func_end atk7E_setreflect - thumb_func_start sub_0804FFF8 -sub_0804FFF8: @ 0x0804FFF8 + thumb_func_start atk7F_setseeded +atk7F_setseeded: @ 0x0804FFF8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -163095,10 +163095,10 @@ _08050098: _080500AC: .4byte gUnknown_2023EAF _080500B0: .4byte gUnknown_2023FD6 _080500B4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0804FFF8 + thumb_func_end atk7F_setseeded - thumb_func_start sub_080500B8 -sub_080500B8: @ 0x080500B8 + thumb_func_start atk80_manipulatedamage +atk80_manipulatedamage: @ 0x080500B8 push {r4, lr} ldr r1, _080500D0 ldr r0, [r1] @@ -163167,10 +163167,10 @@ _08050128: bx r0 .align 2, 0 _08050134: .4byte gUnknown_2023E94 - thumb_func_end sub_080500B8 + thumb_func_end atk80_manipulatedamage - thumb_func_start sub_08050138 -sub_08050138: @ 0x08050138 + thumb_func_start atk81_trysetrest +atk81_trysetrest: @ 0x08050138 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r0, _08050190 @@ -163258,7 +163258,7 @@ _080501C8: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08050204 ldr r0, [r1] adds r0, #5 @@ -163271,10 +163271,10 @@ _080501F8: .align 2, 0 _08050200: .4byte gUnknown_2023FD6 _08050204: .4byte gUnknown_2023EB8 - thumb_func_end sub_08050138 + thumb_func_end atk81_trysetrest - thumb_func_start sub_08050208 -sub_08050208: @ 0x08050208 + thumb_func_start atk82_jumpifnotfirstturn +atk82_jumpifnotfirstturn: @ 0x08050208 push {r4, r5, lr} ldr r5, _0805023C ldr r4, [r5] @@ -163311,10 +163311,10 @@ _0805024A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08050208 + thumb_func_end atk82_jumpifnotfirstturn - thumb_func_start sub_08050250 -sub_08050250: @ 0x08050250 + thumb_func_start atk83_nop +atk83_nop: @ 0x08050250 ldr r1, _0805025C ldr r0, [r1] adds r0, #1 @@ -163322,10 +163322,10 @@ sub_08050250: @ 0x08050250 bx lr .align 2, 0 _0805025C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08050250 + thumb_func_end atk83_nop - thumb_func_start sub_08050260 -sub_08050260: @ 0x08050260 + thumb_func_start UproarWakeUpCheck +UproarWakeUpCheck: @ 0x08050260 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -163406,10 +163406,10 @@ _080502F2: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08050260 + thumb_func_end UproarWakeUpCheck - thumb_func_start sub_080502FC -sub_080502FC: @ 0x080502FC + thumb_func_start atk84_jumpifcantmakeasleep +atk84_jumpifcantmakeasleep: @ 0x080502FC push {r4, r5, r6, lr} ldr r5, _08050328 ldr r1, [r5] @@ -163425,7 +163425,7 @@ sub_080502FC: @ 0x080502FC orrs r4, r0 ldr r6, _0805032C ldrb r0, [r6] - bl sub_08050260 + bl UproarWakeUpCheck lsls r0, r0, #0x18 cmp r0, #0 beq _08050330 @@ -163456,7 +163456,7 @@ _08050348: str r4, [r5] ldrb r1, [r2] adds r0, r3, #0 - bl sub_0813114C + bl RecordAbilityBattle b _08050372 .align 2, 0 _08050360: .4byte gUnknown_2023D28 @@ -163470,10 +163470,10 @@ _08050372: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080502FC + thumb_func_end atk84_jumpifcantmakeasleep - thumb_func_start sub_08050378 -sub_08050378: @ 0x08050378 + thumb_func_start atk85_stockpile +atk85_stockpile: @ 0x08050378 push {r4, r5, lr} ldr r5, _080503A0 ldr r4, _080503A4 @@ -163533,10 +163533,10 @@ _080503DA: _080503E8: .4byte gUnknown_2022C0C _080503EC: .4byte gUnknown_2023FD6 _080503F0: .4byte gUnknown_2023EB8 - thumb_func_end sub_08050378 + thumb_func_end atk85_stockpile - thumb_func_start sub_080503F4 -sub_080503F4: @ 0x080503F4 + thumb_func_start atk86_stockpiletobasedamage +atk86_stockpiletobasedamage: @ 0x080503F4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -163602,7 +163602,7 @@ _08050438: str r4, [sp, #8] ldrb r4, [r5] str r4, [sp, #0xc] - bl sub_080690BC + bl CalculateBaseDamage ldrb r2, [r6] lsls r1, r2, #3 subs r1, r1, r2 @@ -163668,10 +163668,10 @@ _08050504: .4byte gUnknown_2023FE0 _08050508: .4byte gUnknown_2023F60 _0805050C: .4byte gUnknown_2023EAF _08050510: .4byte gUnknown_2023EB8 - thumb_func_end sub_080503F4 + thumb_func_end atk86_stockpiletobasedamage - thumb_func_start sub_08050514 -sub_08050514: @ 0x08050514 + thumb_func_start atk87_stockpiletohpheal +atk87_stockpiletohpheal: @ 0x08050514 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -163780,7 +163780,7 @@ _080505E0: _080505EC: .4byte gUnknown_2023E94 _080505F0: .4byte gUnknown_2024118 _080505F4: .4byte gUnknown_2023EB0 - thumb_func_end sub_08050514 + thumb_func_end atk87_stockpiletohpheal thumb_func_start atk88_negativedamage atk88_negativedamage: @ 0x080505F8 @@ -163811,8 +163811,8 @@ _08050624: .4byte gUnknown_2023E98 _08050628: .4byte gUnknown_2023EB8 thumb_func_end atk88_negativedamage - thumb_func_start sub_0805062C -sub_0805062C: @ 0x0805062C + thumb_func_start ChangeStatBuffs +ChangeStatBuffs: @ 0x0805062C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -164044,7 +164044,7 @@ _080507E4: strb r0, [r1] ldrb r0, [r2] ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle ldr r6, _0805082C ldrb r1, [r6] lsls r0, r1, #2 @@ -164097,7 +164097,7 @@ _0805083C: strb r0, [r1] ldrb r0, [r3] ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle b _08050778 .align 2, 0 _08050888: .4byte gUnknown_2023D08 @@ -164142,7 +164142,7 @@ _080508BE: strb r0, [r1] ldrb r0, [r2] ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle b _08050778 .align 2, 0 _080508EC: .4byte gUnknown_2023D08 @@ -164371,7 +164371,7 @@ _08050AA0: .4byte gUnknown_2023EB0 _08050AA4: .4byte gUnknown_2023FD6 _08050AA8: .4byte gUnknown_2023D08 _08050AAC: .4byte gUnknown_2023F20 - thumb_func_end sub_0805062C + thumb_func_end ChangeStatBuffs thumb_func_start atk89_statbuffchange atk89_statbuffchange: @ 0x08050AB0 @@ -164397,7 +164397,7 @@ atk89_statbuffchange: @ 0x08050AB0 movs r1, #0xf ands r1, r4 ldrb r2, [r2, #1] - bl sub_0805062C + bl ChangeStatBuffs lsls r0, r0, #0x18 cmp r0, #0 bne _08050AEC @@ -164546,8 +164546,8 @@ _08050BF8: .4byte gUnknown_2023FD6 _08050BFC: .4byte gUnknown_2023EB8 thumb_func_end atk8C_confuseifrepeatingattackends - thumb_func_start sub_08050C00 -sub_08050C00: @ 0x08050C00 + thumb_func_start atk8D_setmultihitcounter +atk8D_setmultihitcounter: @ 0x08050C00 push {r4, r5, lr} ldr r0, _08050C14 ldr r0, [r0] @@ -164584,7 +164584,7 @@ _08050C36: .align 2, 0 _08050C44: .4byte gUnknown_2023EB6 _08050C48: .4byte gUnknown_2023EB8 - thumb_func_end sub_08050C00 + thumb_func_end atk8D_setmultihitcounter thumb_func_start atk8E_initmultihitstring atk8E_initmultihitstring: @ 0x08050C4C @@ -164609,8 +164609,8 @@ _08050C6C: .4byte gUnknown_2024118 _08050C70: .4byte gUnknown_2023EB8 thumb_func_end atk8E_initmultihitstring - thumb_func_start sub_08050C74 -sub_08050C74: @ 0x08050C74 + thumb_func_start TryDoForceSwitchOut +TryDoForceSwitchOut: @ 0x08050C74 push {r4, r5, r6, r7, lr} ldr r6, _08050CA8 ldr r7, _08050CAC @@ -164707,10 +164707,10 @@ _08050D2C: .4byte gUnknown_2024140 _08050D30: .4byte gUnknown_2023D12 _08050D34: .4byte gUnknown_2023EB8 _08050D38: .4byte gUnknown_8289360 - thumb_func_end sub_08050C74 + thumb_func_end TryDoForceSwitchOut - thumb_func_start sub_08050D3C -sub_08050D3C: @ 0x08050D3C + thumb_func_start atk8F_forcerandomswitch +atk8F_forcerandomswitch: @ 0x08050D3C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -164729,7 +164729,7 @@ sub_08050D3C: @ 0x08050D3C _08050D5A: ldr r4, _08050DAC ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _08050DB0 str r1, [sp] @@ -164800,10 +164800,10 @@ _08050DD8: bne _08050E2C _08050DEA: ldrb r0, [r4] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0806D2C8 + bl GetLinkTrainerFlankId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -164838,7 +164838,7 @@ _08050E2C: cmp r0, #0 beq _08050E84 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08050E50 @@ -164928,17 +164928,17 @@ _08050ED4: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08050F06 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08050F06 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08050F06 ldr r0, [sp, #4] @@ -164971,7 +164971,7 @@ _08050F0C: _08050F30: .4byte gUnknown_2023D12 _08050F34: .4byte gUnknown_2023EB8 _08050F38: - bl sub_08050C74 + bl TryDoForceSwitchOut lsls r0, r0, #0x18 cmp r0, #0 beq _08050F88 @@ -164993,17 +164993,17 @@ _08050F42: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08050F42 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #1 beq _08050F42 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08050F42 _08050F88: @@ -165014,7 +165014,7 @@ _08050F88: adds r0, r0, r1 adds r0, #0x5c strb r6, [r0] - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08050FA6 @@ -165077,7 +165077,7 @@ _08051014: .4byte gUnknown_2022C90 _08051018: .4byte gUnknown_2000100 _0805101C: .4byte gUnknown_2000040 _08051020: - bl sub_08050C74 + bl TryDoForceSwitchOut _08051024: add sp, #0xc pop {r3, r4, r5} @@ -165087,10 +165087,10 @@ _08051024: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08050D3C + thumb_func_end atk8F_forcerandomswitch - thumb_func_start sub_08051034 -sub_08051034: @ 0x08051034 + thumb_func_start atk90_tryconversiontypechange +atk90_tryconversiontypechange: @ 0x08051034 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -165307,10 +165307,10 @@ _080511C0: .align 2, 0 _080511D0: .4byte gUnknown_2022C0C _080511D4: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051034 + thumb_func_end atk90_tryconversiontypechange - thumb_func_start sub_080511D8 -sub_080511D8: @ 0x080511D8 + thumb_func_start atk91_givepaydaymoney +atk91_givepaydaymoney: @ 0x080511D8 push {r4, lr} ldr r0, _08051240 ldr r0, [r0] @@ -165380,10 +165380,10 @@ _08051268: bx r0 .align 2, 0 _08051270: .4byte gUnknown_2023EB8 - thumb_func_end sub_080511D8 + thumb_func_end atk91_givepaydaymoney - thumb_func_start sub_08051274 -sub_08051274: @ 0x08051274 + thumb_func_start atk92_setlightscreen +atk92_setlightscreen: @ 0x08051274 push {r4, r5, r6, lr} ldr r5, _080512A4 ldrb r0, [r5] @@ -165450,7 +165450,7 @@ _080512B4: cmp r0, #0 beq _08051324 movs r0, #1 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -165477,10 +165477,10 @@ _08051328: .align 2, 0 _08051338: .4byte gUnknown_2023FD6 _0805133C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051274 + thumb_func_end atk92_setlightscreen - thumb_func_start sub_08051340 -sub_08051340: @ 0x08051340 + thumb_func_start atk93_tryKO +atk93_tryKO: @ 0x08051340 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -165537,7 +165537,7 @@ _08051392: bhs _080513D0 ldrb r0, [r5] movs r1, #0x27 - bl sub_0813117C + bl RecordItemEffectBattle ldr r2, _08051414 ldrb r1, [r5] lsls r0, r1, #2 @@ -165576,7 +165576,7 @@ _080513D0: mov r1, sb ldrb r0, [r1] movs r1, #5 - bl sub_0813114C + bl RecordAbilityBattle b _08051680 .align 2, 0 _0805140C: .4byte gUnknown_2023EB3 @@ -165883,7 +165883,7 @@ _08051680: .align 2, 0 _0805168C: .4byte gUnknown_2023FD6 _08051690: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051340 + thumb_func_end atk93_tryKO thumb_func_start atk94_damagetohalftargethp atk94_damagetohalftargethp: @ 0x08051694 @@ -165916,8 +165916,8 @@ _080516C8: .4byte gUnknown_2023EB0 _080516CC: .4byte gUnknown_2023EB8 thumb_func_end atk94_damagetohalftargethp - thumb_func_start sub_080516D0 -sub_080516D0: @ 0x080516D0 + thumb_func_start atk95_setsandstorm +atk95_setsandstorm: @ 0x080516D0 push {lr} ldr r2, _080516F0 ldrh r1, [r2] @@ -165959,10 +165959,10 @@ _0805170E: _0805171C: .4byte gUnknown_2023FD6 _08051720: .4byte gUnknown_2024074 _08051724: .4byte gUnknown_2023EB8 - thumb_func_end sub_080516D0 + thumb_func_end atk95_setsandstorm - thumb_func_start sub_08051728 -sub_08051728: @ 0x08051728 + thumb_func_start atk96_weatherdamage +atk96_weatherdamage: @ 0x08051728 push {r4, r5, lr} sub sp, #4 movs r0, #0 @@ -165971,7 +165971,7 @@ sub_08051728: @ 0x08051728 movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -165983,7 +165983,7 @@ _08051746: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0805175C @@ -166146,10 +166146,10 @@ _08051890: .4byte gUnknown_2023EAF _08051894: .4byte gUnknown_2023EB4 _08051898: .4byte gUnknown_82FACB4 _0805189C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051728 + thumb_func_end atk96_weatherdamage - thumb_func_start sub_080518A0 -sub_080518A0: @ 0x080518A0 + thumb_func_start atk97_tryinfatuating +atk97_tryinfatuating: @ 0x080518A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -166157,7 +166157,7 @@ sub_080518A0: @ 0x080518A0 push {r5, r6, r7} ldr r4, _080518CC ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080518D8 @@ -166187,7 +166187,7 @@ _080518E8: adds r5, r1, r0 ldr r4, _08051914 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0805191C @@ -166218,23 +166218,23 @@ _0805192C: adds r4, r1, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sl, r0 adds r0, r5, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r7, r0, #0 ldr r5, _08051990 ldrb r0, [r5] @@ -166253,7 +166253,7 @@ _0805192C: strb r2, [r0] ldrb r0, [r5] movs r1, #0xc - bl sub_0813114C + bl RecordAbilityBattle b _08051A3C .align 2, 0 _08051988: .4byte gUnknown_2023D12 @@ -166266,11 +166266,11 @@ _080519A0: .4byte gUnknown_2023EAE _080519A4: mov r0, sl mov r1, sb - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality adds r4, r0, #0 mov r0, r8 adds r1, r7, #0 - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -166288,14 +166288,14 @@ _080519A4: bne _080519F4 mov r0, sl mov r1, sb - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _080519F4 mov r0, r8 adds r1, r7, #0 - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -166349,10 +166349,10 @@ _08051A3C: _08051A4C: .4byte gUnknown_82FACB4 _08051A50: .4byte gUnknown_2023EAF _08051A54: .4byte gUnknown_2023EB8 - thumb_func_end sub_080518A0 + thumb_func_end atk97_tryinfatuating - thumb_func_start sub_08051A58 -sub_08051A58: @ 0x08051A58 + thumb_func_start atk98_updatestatusicon +atk98_updatestatusicon: @ 0x08051A58 push {r4, r5, r6, r7, lr} ldr r0, _08051AA0 ldr r0, [r0] @@ -166363,7 +166363,7 @@ sub_08051A58: @ 0x08051A58 ldrb r0, [r1, #1] cmp r0, #4 beq _08051AB0 - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _08051AA8 strb r0, [r4] ldr r3, _08051AAC @@ -166379,9 +166379,9 @@ sub_08051A58: @ 0x08051A58 adds r2, r2, r3 ldr r2, [r2] movs r0, #0 - bl sub_08033DC0 + bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -166417,9 +166417,9 @@ _08051AB0: adds r2, r2, r3 ldr r2, [r2] movs r0, #0 - bl sub_08033DC0 + bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08051AEC: ldr r0, _08051B60 ldr r0, [r0] @@ -166454,9 +166454,9 @@ _08051AEC: adds r2, r2, r3 ldr r2, [r2] movs r0, #0 - bl sub_08033DC0 + bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08051B3C: ldr r1, _08051B64 ldr r0, [r1] @@ -166474,10 +166474,10 @@ _08051B58: .4byte gUnknown_82FACB4 _08051B5C: .4byte gUnknown_2023D28 _08051B60: .4byte gUnknown_2022C90 _08051B64: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051A58 + thumb_func_end atk98_updatestatusicon - thumb_func_start sub_08051B68 -sub_08051B68: @ 0x08051B68 + thumb_func_start atk99_setmist +atk99_setmist: @ 0x08051B68 push {r4, r5, r6, lr} ldr r6, _08051B98 ldr r4, _08051B9C @@ -166555,10 +166555,10 @@ _08051BF6: _08051C04: .4byte gUnknown_2023F32 _08051C08: .4byte gUnknown_2023FD6 _08051C0C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051B68 + thumb_func_end atk99_setmist - thumb_func_start sub_08051C10 -sub_08051C10: @ 0x08051C10 + thumb_func_start atk9A_setfocusenergy +atk9A_setfocusenergy: @ 0x08051C10 push {lr} ldr r1, _08051C40 ldr r0, _08051C44 @@ -166603,10 +166603,10 @@ _08051C58: .align 2, 0 _08051C64: .4byte gUnknown_2023FD6 _08051C68: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051C10 + thumb_func_end atk9A_setfocusenergy - thumb_func_start sub_08051C6C -sub_08051C6C: @ 0x08051C6C + thumb_func_start atk9B_transformdataexecution +atk9B_transformdataexecution: @ 0x08051C6C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -166790,10 +166790,10 @@ _08051DDA: strb r0, [r1] movs r0, #0 movs r1, #2 - bl sub_08034300 + bl BtlController_EmitResetActionMoveSelection mov r2, r8 ldrb r0, [r2] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08051E08 movs r0, #0 _08051DFC: @@ -166805,10 +166805,10 @@ _08051DFC: bx r0 .align 2, 0 _08051E08: .4byte gUnknown_2023FD6 - thumb_func_end sub_08051C6C + thumb_func_end atk9B_transformdataexecution - thumb_func_start sub_08051E0C -sub_08051E0C: @ 0x08051E0C + thumb_func_start atk9C_setsubstitute +atk9C_setsubstitute: @ 0x08051E0C push {r4, r5, r6, r7, lr} ldr r7, _08051E3C ldr r6, _08051E40 @@ -166897,7 +166897,7 @@ _08051EB8: .4byte gUnknown_2023F60 _08051EBC: .4byte gUnknown_2023FD6 _08051EC0: .4byte gUnknown_2023F24 _08051EC4: .4byte gUnknown_2023EB8 - thumb_func_end sub_08051E0C + thumb_func_end atk9C_setsubstitute thumb_func_start IsMoveUncopyableByMimic IsMoveUncopyableByMimic: @ 0x08051EC8 @@ -166939,8 +166939,8 @@ _08051F08: .4byte gUnknown_82ECD64 _08051F0C: .4byte 0x0000FFFE thumb_func_end IsMoveUncopyableByMimic - thumb_func_start sub_08051F10 -sub_08051F10: @ 0x08051F10 + thumb_func_start atk9D_mimicattackcopy +atk9D_mimicattackcopy: @ 0x08051F10 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -167171,10 +167171,10 @@ _080520DC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08051F10 + thumb_func_end atk9D_mimicattackcopy - thumb_func_start sub_080520EC -sub_080520EC: @ 0x080520EC + thumb_func_start atk9E_metronome +atk9E_metronome: @ 0x080520EC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -167233,7 +167233,7 @@ _0805212C: str r0, [r1] ldrh r0, [r4] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _08052190 strb r0, [r1] pop {r3} @@ -167252,7 +167252,7 @@ _08052184: .4byte 0xFFFFFBFF _08052188: .4byte gUnknown_8286C30 _0805218C: .4byte gUnknown_82ED220 _08052190: .4byte gUnknown_2023EB0 - thumb_func_end sub_080520EC + thumb_func_end atk9E_metronome thumb_func_start atk9F_dmgtolevel atk9F_dmgtolevel: @ 0x08052194 @@ -167278,8 +167278,8 @@ _080521BC: .4byte gUnknown_2023EAF _080521C0: .4byte gUnknown_2023EB8 thumb_func_end atk9F_dmgtolevel - thumb_func_start sub_080521C4 -sub_080521C4: @ 0x080521C4 + thumb_func_start atkA0_psywavedamageeffect +atkA0_psywavedamageeffect: @ 0x080521C4 push {r4, lr} movs r4, #0xf _080521C8: @@ -167318,14 +167318,14 @@ _08052208: .4byte gUnknown_2023E94 _0805220C: .4byte gUnknown_2023D28 _08052210: .4byte gUnknown_2023EAF _08052214: .4byte gUnknown_2023EB8 - thumb_func_end sub_080521C4 + thumb_func_end atkA0_psywavedamageeffect - thumb_func_start sub_08052218 -sub_08052218: @ 0x08052218 + thumb_func_start atkA1_counterdamagecalculator +atkA1_counterdamagecalculator: @ 0x08052218 push {r4, r5, r6, lr} ldr r4, _08052288 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r5, _0805228C @@ -167333,7 +167333,7 @@ sub_08052218: @ 0x08052218 lsls r0, r0, #4 adds r0, r0, r5 ldrb r0, [r0, #0xc] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldrb r0, [r4] @@ -167435,14 +167435,14 @@ _080522FC: _08052304: .4byte gUnknown_2024020 _08052308: .4byte gUnknown_2023EAF _0805230C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052218 + thumb_func_end atkA1_counterdamagecalculator - thumb_func_start sub_08052310 -sub_08052310: @ 0x08052310 + thumb_func_start atkA2_mirrorcoatdamagecalculator +atkA2_mirrorcoatdamagecalculator: @ 0x08052310 push {r4, r5, r6, lr} ldr r4, _08052380 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r5, _08052384 @@ -167450,7 +167450,7 @@ sub_08052310: @ 0x08052310 lsls r0, r0, #4 adds r0, r0, r5 ldrb r0, [r0, #0xd] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldrb r0, [r4] @@ -167553,10 +167553,10 @@ _080523F4: _080523FC: .4byte gUnknown_2024020 _08052400: .4byte gUnknown_2023EAF _08052404: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052310 + thumb_func_end atkA2_mirrorcoatdamagecalculator - thumb_func_start sub_08052408 -sub_08052408: @ 0x08052408 + thumb_func_start atkA3_disablelastusedattack +atkA3_disablelastusedattack: @ 0x08052408 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -167716,10 +167716,10 @@ _0805253A: bx r0 .align 2, 0 _08052548: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052408 + thumb_func_end atkA3_disablelastusedattack - thumb_func_start sub_0805254C -sub_0805254C: @ 0x0805254C + thumb_func_start atkA4_trysetencore +atkA4_trysetencore: @ 0x0805254C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -167875,10 +167875,10 @@ _0805266E: bx r0 .align 2, 0 _0805267C: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805254C + thumb_func_end atkA4_trysetencore - thumb_func_start sub_08052680 -sub_08052680: @ 0x08052680 + thumb_func_start atkA5_painsplitdmgcalc +atkA5_painsplitdmgcalc: @ 0x08052680 push {r4, r5, r6, r7, lr} ldr r6, _08052700 ldr r0, _08052704 @@ -167972,10 +167972,10 @@ _0805273A: bx r0 .align 2, 0 _08052740: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052680 + thumb_func_end atkA5_painsplitdmgcalc - thumb_func_start sub_08052744 -sub_08052744: @ 0x08052744 + thumb_func_start atkA6_settypetorandomresistance +atkA6_settypetorandomresistance: @ 0x08052744 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -167993,7 +167993,7 @@ sub_08052744: @ 0x08052744 cmp r1, r0 beq _0805278E ldrh r0, [r2] - bl sub_08052B58 + bl IsTwoTurnsMove lsls r0, r0, #0x18 cmp r0, #0 beq _0805282C @@ -168225,7 +168225,7 @@ _08052934: .4byte gUnknown_2023D28 _08052938: .4byte 0x000003E7 _0805293C: .4byte gUnknown_2023EB8 _08052940: .4byte 0x0000014F - thumb_func_end sub_08052744 + thumb_func_end atkA6_settypetorandomresistance thumb_func_start atkA7_setalwayshitflag atkA7_setalwayshitflag: @ 0x08052944 @@ -168271,8 +168271,8 @@ _08052994: .4byte gUnknown_2023EAF _08052998: .4byte gUnknown_2023EB8 thumb_func_end atkA7_setalwayshitflag - thumb_func_start sub_0805299C -sub_0805299C: @ 0x0805299C + thumb_func_start atkA8_copymovepermanently +atkA8_copymovepermanently: @ 0x0805299C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -168431,7 +168431,7 @@ _08052A8A: bl BtlController_EmitSetMonData ldr r0, _08052B1C ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08052B20 movs r0, #0xfd strb r0, [r1] @@ -168494,10 +168494,10 @@ _08052B42: bx r0 .align 2, 0 _08052B54: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805299C + thumb_func_end atkA8_copymovepermanently - thumb_func_start sub_08052B58 -sub_08052B58: @ 0x08052B58 + thumb_func_start IsTwoTurnsMove +IsTwoTurnsMove: @ 0x08052B58 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -168530,7 +168530,7 @@ _08052B8E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08052B58 + thumb_func_end IsTwoTurnsMove thumb_func_start IsInvalidForSleepTalkOrAssist IsInvalidForSleepTalkOrAssist: @ 0x08052B94 @@ -168559,8 +168559,8 @@ _08052BB8: bx r1 thumb_func_end IsInvalidForSleepTalkOrAssist - thumb_func_start sub_08052BBC -sub_08052BBC: @ 0x08052BBC + thumb_func_start AttacksThisTurn +AttacksThisTurn: @ 0x08052BBC push {lr} lsls r1, r1, #0x10 lsrs r2, r1, #0x10 @@ -168617,10 +168617,10 @@ _08052C22: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08052BBC + thumb_func_end AttacksThisTurn - thumb_func_start sub_08052C28 -sub_08052C28: @ 0x08052C28 + thumb_func_start atkA9_trychoosesleeptalkmove +atkA9_trychoosesleeptalkmove: @ 0x08052C28 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -168663,7 +168663,7 @@ _08052C46: cmp r1, #0xfd beq _08052C86 adds r0, r1, #0 - bl sub_08052B58 + bl IsTwoTurnsMove lsls r0, r0, #0x18 cmp r0, #0 beq _08052C94 @@ -168683,7 +168683,7 @@ _08052C94: ldrb r0, [r0] adds r1, r6, #0 movs r2, #0xfd - bl sub_0803FB0C + bl CheckMoveLimitations lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0xf @@ -168732,7 +168732,7 @@ _08052CCC: str r0, [r2] ldrh r0, [r4] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _08052D58 strb r0, [r1] ldr r3, _08052D5C @@ -168766,7 +168766,7 @@ _08052D50: .4byte gUnknown_2023F24 _08052D54: .4byte 0xFFFFFBFF _08052D58: .4byte gUnknown_2023EB0 _08052D5C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052C28 + thumb_func_end atkA9_trychoosesleeptalkmove thumb_func_start atkAA_setdestinybond atkAA_setdestinybond: @ 0x08052D60 @@ -168793,17 +168793,17 @@ _08052D88: .4byte gUnknown_2023EAF _08052D8C: .4byte gUnknown_2023EB8 thumb_func_end atkAA_setdestinybond - thumb_func_start sub_08052D90 -sub_08052D90: @ 0x08052D90 + thumb_func_start TrySetDestinyBondToHappen +TrySetDestinyBondToHappen: @ 0x08052D90 push {r4, r5, lr} ldr r0, _08052DE0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _08052DE4 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r1, _08052DE8 @@ -168839,12 +168839,12 @@ _08052DE0: .4byte gUnknown_2023EAF _08052DE4: .4byte gUnknown_2023EB0 _08052DE8: .4byte gUnknown_2023D28 _08052DEC: .4byte gUnknown_2023F24 - thumb_func_end sub_08052D90 + thumb_func_end TrySetDestinyBondToHappen - thumb_func_start sub_08052DF0 -sub_08052DF0: @ 0x08052DF0 + thumb_func_start atkAB_trysetdestinybondtohappen +atkAB_trysetdestinybondtohappen: @ 0x08052DF0 push {lr} - bl sub_08052D90 + bl TrySetDestinyBondToHappen ldr r1, _08052E04 ldr r0, [r1] adds r0, #1 @@ -168853,10 +168853,10 @@ sub_08052DF0: @ 0x08052DF0 bx r0 .align 2, 0 _08052E04: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052DF0 + thumb_func_end atkAB_trysetdestinybondtohappen - thumb_func_start sub_08052E08 -sub_08052E08: @ 0x08052E08 + thumb_func_start atkAC_remaininghptopower +atkAC_remaininghptopower: @ 0x08052E08 push {lr} ldr r2, _08052E5C ldr r0, _08052E60 @@ -168869,7 +168869,7 @@ sub_08052E08: @ 0x08052E08 movs r2, #0x2c ldrsh r1, [r1, r2] movs r2, #0x30 - bl sub_08074BC4 + bl GetScaledHPFraction lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r3, #0 @@ -168905,10 +168905,10 @@ _08052E60: .4byte gUnknown_2023EAF _08052E64: .4byte gUnknown_82ECD8C _08052E68: .4byte gUnknown_20240A4 _08052E6C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052E08 + thumb_func_end atkAC_remaininghptopower - thumb_func_start sub_08052E70 -sub_08052E70: @ 0x08052E70 + thumb_func_start atkAD_tryspiteppreduce +atkAD_tryspiteppreduce: @ 0x08052E70 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -169083,7 +169083,7 @@ _08052F14: movs r3, #1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08052FC8: ldr r1, _08053014 ldr r0, [r1] @@ -169139,10 +169139,10 @@ _08053032: bx r0 .align 2, 0 _08053044: .4byte gUnknown_2023EB8 - thumb_func_end sub_08052E70 + thumb_func_end atkAD_tryspiteppreduce - thumb_func_start sub_08053048 -sub_08053048: @ 0x08053048 + thumb_func_start atkAE_healpartystatus +atkAE_healpartystatus: @ 0x08053048 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -169163,7 +169163,7 @@ _08053064: strb r0, [r6, #5] ldr r5, _080530C0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _080530C4 mov sl, r1 @@ -169210,7 +169210,7 @@ _080530D0: .4byte 0xF7FFFFFF _080530D4: ldrb r1, [r1] adds r0, r3, #0 - bl sub_0813114C + bl RecordAbilityBattle ldrb r0, [r6, #5] movs r1, #1 orrs r0, r1 @@ -169283,7 +169283,7 @@ _08053174: .4byte 0xF7FFFFFF _08053178: ldrb r1, [r1] adds r0, r3, #0 - bl sub_0813114C + bl RecordAbilityBattle ldr r1, _080531D0 ldrb r0, [r1, #5] mov r2, sb @@ -169299,12 +169299,12 @@ _0805318E: add r4, sl adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r5, #0 @@ -169367,7 +169367,7 @@ _08053224: .4byte gUnknown_82FACB4 _08053228: adds r0, r5, #0 adds r1, r4, #0 - bl sub_0806B15C + bl GetAbilityBySpecies lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _08053234: @@ -169462,7 +169462,7 @@ _080532CC: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _080532EE: ldr r1, _08053328 ldr r0, [r1] @@ -169486,10 +169486,10 @@ _0805331C: .4byte gUnknown_2022C90 _08053320: .4byte gUnknown_2023EB4 _08053324: .4byte gUnknown_82FACB4 _08053328: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053048 + thumb_func_end atkAE_healpartystatus - thumb_func_start sub_0805332C -sub_0805332C: @ 0x0805332C + thumb_func_start atkAF_cursetarget +atkAF_cursetarget: @ 0x0805332C push {r4, r5, lr} ldr r5, _0805336C ldr r0, _08053370 @@ -169553,14 +169553,14 @@ _0805339C: _080533A4: .4byte gUnknown_2023E94 _080533A8: .4byte gUnknown_2023EAF _080533AC: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805332C + thumb_func_end atkAF_cursetarget - thumb_func_start sub_080533B0 -sub_080533B0: @ 0x080533B0 + thumb_func_start atkB0_trysetspikes +atkB0_trysetspikes: @ 0x080533B0 push {r4, lr} ldr r4, _08053404 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -169623,7 +169623,7 @@ _0805342E: .align 2, 0 _08053434: .4byte gUnknown_2023F32 _08053438: .4byte gUnknown_2023EB8 - thumb_func_end sub_080533B0 + thumb_func_end atkB0_trysetspikes thumb_func_start atkB1_setforesight atkB1_setforesight: @ 0x0805343C @@ -169650,8 +169650,8 @@ _08053464: .4byte gUnknown_2023EB0 _08053468: .4byte gUnknown_2023EB8 thumb_func_end atkB1_setforesight - thumb_func_start sub_0805346C -sub_0805346C: @ 0x0805346C + thumb_func_start atkB2_trysetperishsong +atkB2_trysetperishsong: @ 0x0805346C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -169709,7 +169709,7 @@ _080534CC: _080534D8: mov r1, r8 ldrb r0, [r1] - bl sub_0803F2BC + bl PressurePPLoseOnUsingPerishSong ldr r0, _08053504 ldrb r0, [r0] cmp r6, r0 @@ -169745,10 +169745,10 @@ _08053514: bx r0 .align 2, 0 _08053520: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805346C + thumb_func_end atkB2_trysetperishsong - thumb_func_start sub_08053524 -sub_08053524: @ 0x08053524 + thumb_func_start atkB3_rolloutdamagecalculation +atkB3_rolloutdamagecalculation: @ 0x08053524 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -169934,10 +169934,10 @@ _08053690: .4byte 0xFFFFEFFF _08053694: .4byte gUnknown_20240A4 _08053698: .4byte gUnknown_82ED220 _0805369C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053524 + thumb_func_end atkB3_rolloutdamagecalculation - thumb_func_start sub_080536A0 -sub_080536A0: @ 0x080536A0 + thumb_func_start atkB4_jumpifconfusedandstatmaxed +atkB4_jumpifconfusedandstatmaxed: @ 0x080536A0 push {r4, r5, lr} ldr r5, _080536F0 ldr r0, _080536F4 @@ -169989,10 +169989,10 @@ _08053702: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080536A0 + thumb_func_end atkB4_jumpifconfusedandstatmaxed - thumb_func_start sub_08053708 -sub_08053708: @ 0x08053708 + thumb_func_start atkB5_furycuttercalc +atkB5_furycuttercalc: @ 0x08053708 push {r4, r5, lr} ldr r0, _08053730 ldrb r1, [r0] @@ -170078,10 +170078,10 @@ _080537AC: .4byte gUnknown_20240A4 _080537B0: .4byte gUnknown_82ED220 _080537B4: .4byte gUnknown_2023E8E _080537B8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053708 + thumb_func_end atkB5_furycuttercalc - thumb_func_start sub_080537BC -sub_080537BC: @ 0x080537BC + thumb_func_start atkB6_happinesstodamagecalculation +atkB6_happinesstodamagecalculation: @ 0x080537BC push {r4, lr} ldr r2, _080537E8 ldr r0, _080537EC @@ -170140,10 +170140,10 @@ _08053830: .4byte gUnknown_20240A4 _08053834: .4byte gUnknown_2023D28 _08053838: .4byte gUnknown_2023EAF _0805383C: .4byte gUnknown_2023EB8 - thumb_func_end sub_080537BC + thumb_func_end atkB6_happinesstodamagecalculation - thumb_func_start sub_08053840 -sub_08053840: @ 0x08053840 + thumb_func_start atkB7_presentdamagecalculation +atkB7_presentdamagecalculation: @ 0x08053840 push {r4, lr} bl Random movs r4, #0xff @@ -170241,10 +170241,10 @@ _080538F6: _08053900: .4byte gUnknown_2023F20 _08053904: .4byte gUnknown_2023EB8 _08053908: .4byte gUnknown_8288469 - thumb_func_end sub_08053840 + thumb_func_end atkB7_presentdamagecalculation - thumb_func_start sub_0805390C -sub_0805390C: @ 0x0805390C + thumb_func_start atkB8_setsafeguard +atkB8_setsafeguard: @ 0x0805390C push {r4, r5, r6, r7, lr} ldr r7, _08053940 ldrb r0, [r7] @@ -170320,10 +170320,10 @@ _08053998: _080539A8: .4byte gUnknown_2023F38 _080539AC: .4byte gUnknown_2023FD6 _080539B0: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805390C + thumb_func_end atkB8_setsafeguard - thumb_func_start sub_080539B4 -sub_080539B4: @ 0x080539B4 + thumb_func_start atkB9_magnitudedamagecalculation +atkB9_magnitudedamagecalculation: @ 0x080539B4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -170464,10 +170464,10 @@ _08053AC8: .4byte gUnknown_2023EB8 _08053ACC: .4byte gUnknown_2023EAF _08053AD0: .4byte gUnknown_82FACB4 _08053AD4: .4byte gUnknown_2023EB4 - thumb_func_end sub_080539B4 + thumb_func_end atkB9_magnitudedamagecalculation - thumb_func_start sub_08053AD8 -sub_08053AD8: @ 0x08053AD8 + thumb_func_start atkBA_jumpifnopursuitswitchdmg +atkBA_jumpifnopursuitswitchdmg: @ 0x08053AD8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -170479,7 +170479,7 @@ sub_08053AD8: @ 0x08053AD8 bne _08053B08 ldr r0, _08053B00 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08053B04 @@ -170494,7 +170494,7 @@ _08053B04: _08053B08: ldr r0, _08053B1C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08053B20 @@ -170659,10 +170659,10 @@ _08053C5A: bx r0 .align 2, 0 _08053C68: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053AD8 + thumb_func_end atkBA_jumpifnopursuitswitchdmg - thumb_func_start sub_08053C6C -sub_08053C6C: @ 0x08053C6C + thumb_func_start atkBB_setsunny +atkBB_setsunny: @ 0x08053C6C push {lr} ldr r2, _08053C8C ldrh r1, [r2] @@ -170704,10 +170704,10 @@ _08053CAA: _08053CB8: .4byte gUnknown_2023FD6 _08053CBC: .4byte gUnknown_2024074 _08053CC0: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053C6C + thumb_func_end atkBB_setsunny - thumb_func_start sub_08053CC4 -sub_08053CC4: @ 0x08053CC4 + thumb_func_start atkBC_maxattackhalvehp +atkBC_maxattackhalvehp: @ 0x08053CC4 push {r4, r5, lr} ldr r5, _08053D10 ldr r4, _08053D14 @@ -170772,7 +170772,7 @@ _08053D3A: bx r0 .align 2, 0 _08053D40: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053CC4 + thumb_func_end atkBC_maxattackhalvehp thumb_func_start atkBD_copyfoestats atkBD_copyfoestats: @ 0x08053D44 @@ -170811,8 +170811,8 @@ _08053D84: .4byte gUnknown_2023D40 _08053D88: .4byte gUnknown_2023EB0 thumb_func_end atkBD_copyfoestats - thumb_func_start sub_08053D8C -sub_08053D8C: @ 0x08053D8C + thumb_func_start atkBE_rapidspinfree +atkBE_rapidspinfree: @ 0x08053D8C push {r4, r5, r6, lr} ldr r1, _08053DFC ldr r5, _08053E00 @@ -170909,7 +170909,7 @@ _08053E58: .4byte gUnknown_2023EB8 _08053E5C: .4byte gUnknown_828955E _08053E60: adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide ldr r4, _08053EB0 lsls r0, r0, #0x18 lsrs r0, r0, #0x17 @@ -170920,7 +170920,7 @@ _08053E60: cmp r0, #0 beq _08053EC4 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x17 adds r0, r0, r4 @@ -170930,7 +170930,7 @@ _08053E60: movs r4, #0 strh r1, [r0] ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide ldr r2, _08053EB8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -170960,7 +170960,7 @@ _08053ECA: bx r0 .align 2, 0 _08053ED4: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053D8C + thumb_func_end atkBE_rapidspinfree thumb_func_start atkBF_setdefensecurlbit atkBF_setdefensecurlbit: @ 0x08053ED8 @@ -170987,8 +170987,8 @@ _08053F00: .4byte gUnknown_2023EAF _08053F04: .4byte gUnknown_2023EB8 thumb_func_end atkBF_setdefensecurlbit - thumb_func_start sub_08053F08 -sub_08053F08: @ 0x08053F08 + thumb_func_start atkC0_recoverbasedonsunlight +atkC0_recoverbasedonsunlight: @ 0x08053F08 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r1, _08053F74 @@ -171014,7 +171014,7 @@ sub_08053F08: @ 0x08053F08 movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -171024,7 +171024,7 @@ sub_08053F08: @ 0x08053F08 movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08053F88 @@ -171116,10 +171116,10 @@ _08054002: bx r0 .align 2, 0 _0805400C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08053F08 + thumb_func_end atkC0_recoverbasedonsunlight - thumb_func_start sub_08054010 -sub_08054010: @ 0x08054010 + thumb_func_start atkC1_hiddenpowercalc +atkC1_hiddenpowercalc: @ 0x08054010 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -171261,7 +171261,7 @@ _08054124: .4byte gUnknown_2023EAF _08054128: .4byte gUnknown_20240A4 _0805412C: .4byte gUnknown_2024140 _08054130: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054010 + thumb_func_end atkC1_hiddenpowercalc thumb_func_start atkC2_selectfirstvalidtarget atkC2_selectfirstvalidtarget: @ 0x08054134 @@ -171323,8 +171323,8 @@ _080541A0: .4byte gUnknown_82FACB4 _080541A4: .4byte gUnknown_2023EB4 thumb_func_end atkC2_selectfirstvalidtarget - thumb_func_start sub_080541A8 -sub_080541A8: @ 0x080541A8 + thumb_func_start atkC3_trysetfutureattack +atkC3_trysetfutureattack: @ 0x080541A8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -171418,7 +171418,7 @@ _080541EC: str r4, [sp, #8] ldrb r4, [r6] str r4, [sp, #0xc] - bl sub_080690BC + bl CalculateBaseDamage ldrb r1, [r6] lsls r1, r1, #2 mov r2, r8 @@ -171482,17 +171482,17 @@ _080542DC: .align 2, 0 _080542EC: .4byte gUnknown_2023FD6 _080542F0: .4byte gUnknown_2023EB8 - thumb_func_end sub_080541A8 + thumb_func_end atkC3_trysetfutureattack - thumb_func_start sub_080542F4 -sub_080542F4: @ 0x080542F4 + thumb_func_start atkC4_trydobeatup +atkC4_trydobeatup: @ 0x080542F4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} ldr r0, _08054338 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r7, _0805433C cmp r0, #0 @@ -171541,21 +171541,21 @@ _08054360: muls r0, r5, r0 adds r0, r7, r0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080543A4 ldrb r0, [r6] muls r0, r5, r0 adds r0, r7, r0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080543A4 ldrb r0, [r4] muls r0, r5, r0 adds r0, r7, r0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -171564,7 +171564,7 @@ _08054360: muls r0, r5, r0 adds r0, r7, r0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080543B4 _080543A4: @@ -171606,7 +171606,7 @@ _080543B4: muls r0, r4, r0 adds r0, r7, r0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -171630,7 +171630,7 @@ _080543B4: muls r0, r4, r0 adds r0, r7, r0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #1 movs r1, #5 bl __udivsi3 @@ -171732,10 +171732,10 @@ _080544F2: bx r0 .align 2, 0 _08054500: .4byte gUnknown_2023EB8 - thumb_func_end sub_080542F4 + thumb_func_end atkC4_trydobeatup - thumb_func_start sub_08054504 -sub_08054504: @ 0x08054504 + thumb_func_start atkC5_setsemiinvulnerablebit +atkC5_setsemiinvulnerablebit: @ 0x08054504 push {lr} ldr r0, _08054518 ldrh r1, [r0] @@ -171803,10 +171803,10 @@ _08054570: _0805457C: .4byte gUnknown_2023F50 _08054580: .4byte gUnknown_2023EAF _08054584: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054504 + thumb_func_end atkC5_setsemiinvulnerablebit - thumb_func_start sub_08054588 -sub_08054588: @ 0x08054588 + thumb_func_start atkC6_clearsemiinvulnerablebit +atkC6_clearsemiinvulnerablebit: @ 0x08054588 push {lr} ldr r0, _0805459C ldrh r1, [r0] @@ -171876,7 +171876,7 @@ _08054608: .4byte gUnknown_2023F50 _0805460C: .4byte gUnknown_2023EAF _08054610: .4byte 0xFFFBFFFF _08054614: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054588 + thumb_func_end atkC6_clearsemiinvulnerablebit thumb_func_start atkC7_setminimize atkC7_setminimize: @ 0x08054618 @@ -171912,8 +171912,8 @@ _08054650: .4byte gUnknown_2023EAF _08054654: .4byte gUnknown_2023EB8 thumb_func_end atkC7_setminimize - thumb_func_start sub_08054658 -sub_08054658: @ 0x08054658 + thumb_func_start atkC8_sethail +atkC8_sethail: @ 0x08054658 push {lr} ldr r3, _0805467C ldrh r1, [r3] @@ -171954,10 +171954,10 @@ _08054696: _080546A4: .4byte gUnknown_2023FD6 _080546A8: .4byte gUnknown_2024074 _080546AC: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054658 + thumb_func_end atkC8_sethail - thumb_func_start sub_080546B0 -sub_080546B0: @ 0x080546B0 + thumb_func_start atkC9_jumpifattackandspecialattackcannotfall +atkC9_jumpifattackandspecialattackcannotfall: @ 0x080546B0 push {r4, lr} ldr r2, _080546F4 ldr r0, _080546F8 @@ -172011,9 +172011,9 @@ _08054704: str r0, [r2] ldr r1, _08054744 movs r0, #0 - bl sub_08033D54 + bl BtlController_EmitHealthBarUpdate ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08054748 ldr r0, [r1] adds r0, #5 @@ -172028,14 +172028,14 @@ _0805473C: .4byte gUnknown_2023EAF _08054740: .4byte gUnknown_2023E94 _08054744: .4byte 0x00007FFF _08054748: .4byte gUnknown_2023EB8 - thumb_func_end sub_080546B0 + thumb_func_end atkC9_jumpifattackandspecialattackcannotfall - thumb_func_start sub_0805474C -sub_0805474C: @ 0x0805474C + thumb_func_start atkCA_setforcedtarget +atkCA_setforcedtarget: @ 0x0805474C push {r4, r5, lr} ldr r4, _0805478C ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide ldr r5, _08054790 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -172046,7 +172046,7 @@ sub_0805474C: @ 0x0805474C movs r0, #1 strb r0, [r1, #8] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #1 @@ -172066,7 +172066,7 @@ sub_0805474C: @ 0x0805474C _0805478C: .4byte gUnknown_2023EAF _08054790: .4byte gUnknown_2023F38 _08054794: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805474C + thumb_func_end atkCA_setforcedtarget thumb_func_start atkCB_setcharge atkCB_setcharge: @ 0x08054798 @@ -172119,8 +172119,8 @@ _080547F4: .4byte gUnknown_2023F60 _080547F8: .4byte gUnknown_2023EB8 thumb_func_end atkCB_setcharge - thumb_func_start sub_080547FC -sub_080547FC: @ 0x080547FC + thumb_func_start atkCC_callterrainattack +atkCC_callterrainattack: @ 0x080547FC push {r4, lr} ldr r2, _0805484C ldr r0, [r2] @@ -172137,7 +172137,7 @@ sub_080547FC: @ 0x080547FC strh r0, [r4] ldrh r0, [r4] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _08054860 strb r0, [r1] ldr r3, _08054864 @@ -172169,10 +172169,10 @@ _08054860: .4byte gUnknown_2023EB0 _08054864: .4byte gUnknown_8286C30 _08054868: .4byte gUnknown_82ED220 _0805486C: .4byte gUnknown_2023EB8 - thumb_func_end sub_080547FC + thumb_func_end atkCC_callterrainattack - thumb_func_start sub_08054870 -sub_08054870: @ 0x08054870 + thumb_func_start atkCD_cureifburnedparalysedorpoisoned +atkCD_cureifburnedparalysedorpoisoned: @ 0x08054870 push {r4, r5, r6, lr} sub sp, #4 ldr r1, _080548BC @@ -172207,7 +172207,7 @@ sub_08054870: @ 0x08054870 movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec b _080548E6 .align 2, 0 _080548BC: .4byte gUnknown_2023D28 @@ -172235,10 +172235,10 @@ _080548E6: bx r0 .align 2, 0 _080548F0: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054870 + thumb_func_end atkCD_cureifburnedparalysedorpoisoned - thumb_func_start sub_080548F4 -sub_080548F4: @ 0x080548F4 + thumb_func_start atkCE_settorment +atkCE_settorment: @ 0x080548F4 push {lr} ldr r1, _0805492C ldr r0, _08054930 @@ -172282,10 +172282,10 @@ _08054944: bx r0 .align 2, 0 _08054948: .4byte gUnknown_2023EB8 - thumb_func_end sub_080548F4 + thumb_func_end atkCE_settorment - thumb_func_start sub_0805494C -sub_0805494C: @ 0x0805494C + thumb_func_start atkCF_jumpifnodamage +atkCF_jumpifnodamage: @ 0x0805494C push {lr} ldr r2, _08054978 ldr r0, _0805497C @@ -172331,10 +172331,10 @@ _0805499E: bx r0 .align 2, 0 _080549A4: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805494C + thumb_func_end atkCF_jumpifnodamage - thumb_func_start sub_080549A8 -sub_080549A8: @ 0x080549A8 + thumb_func_start atkD0_settaunt +atkD0_settaunt: @ 0x080549A8 push {r4, lr} ldr r4, _080549EC ldr r3, _080549F0 @@ -172393,10 +172393,10 @@ _08054A12: bx r0 .align 2, 0 _08054A18: .4byte gUnknown_2023EB8 - thumb_func_end sub_080549A8 + thumb_func_end atkD0_settaunt - thumb_func_start sub_08054A1C -sub_08054A1C: @ 0x08054A1C + thumb_func_start atkD1_trysethelpinghand +atkD1_trysethelpinghand: @ 0x08054A1C push {r4, lr} ldr r4, _08054A84 ldrb r0, [r4] @@ -172474,10 +172474,10 @@ _08054ABA: bx r0 .align 2, 0 _08054AC0: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054A1C + thumb_func_end atkD1_trysethelpinghand - thumb_func_start sub_08054AC4 -sub_08054AC4: @ 0x08054AC4 + thumb_func_start atkD2_tryswapitems +atkD2_tryswapitems: @ 0x08054AC4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -172493,7 +172493,7 @@ sub_08054AC4: @ 0x08054AC4 bne _08054BAA ldr r0, _08054BCC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -172506,12 +172506,12 @@ sub_08054AC4: @ 0x08054AC4 _08054AF8: ldr r6, _08054BCC ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r7, _08054BD4 ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _08054BC8 @@ -172636,7 +172636,7 @@ _08054BEC: strb r0, [r1] ldrb r0, [r7] ldrb r1, [r1] - bl sub_0813114C + bl RecordAbilityBattle b _08054D42 .align 2, 0 _08054C14: .4byte gUnknown_2023EB8 @@ -172676,7 +172676,7 @@ _08054C20: bl BtlController_EmitSetMonData ldr r1, _08054D10 ldrb r0, [r1] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r0, [r7] strb r0, [r4] ldrb r0, [r7] @@ -172691,7 +172691,7 @@ _08054C20: movs r3, #2 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldrb r0, [r7] mov r2, sl ldr r1, [r2] @@ -172791,10 +172791,10 @@ _08054D42: bx r0 .align 2, 0 _08054D54: .4byte gUnknown_2023FD6 - thumb_func_end sub_08054AC4 + thumb_func_end atkD2_tryswapitems - thumb_func_start sub_08054D58 -sub_08054D58: @ 0x08054D58 + thumb_func_start atkD3_trycopyability +atkD3_trycopyability: @ 0x08054D58 push {r4, lr} ldr r3, _08054D98 ldr r4, _08054D9C @@ -172853,10 +172853,10 @@ _08054DC6: bx r0 .align 2, 0 _08054DCC: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054D58 + thumb_func_end atkD3_trycopyability - thumb_func_start sub_08054DD0 -sub_08054DD0: @ 0x08054DD0 + thumb_func_start atkD4_trywish +atkD4_trywish: @ 0x08054DD0 push {r4, r5, r6, r7, lr} ldr r7, _08054DE4 ldr r2, [r7] @@ -172963,10 +172963,10 @@ _08054E9C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08054DD0 + thumb_func_end atkD4_trywish - thumb_func_start sub_08054EA4 -sub_08054EA4: @ 0x08054EA4 + thumb_func_start atkD5_trysetroots +atkD5_trysetroots: @ 0x08054EA4 push {lr} ldr r1, _08054EDC ldr r0, _08054EE0 @@ -173010,7 +173010,7 @@ _08054EF4: bx r0 .align 2, 0 _08054EF8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054EA4 + thumb_func_end atkD5_trysetroots thumb_func_start atkD6_doubledamagedealtifdamaged atkD6_doubledamagedealtifdamaged: @ 0x08054EFC @@ -173062,8 +173062,8 @@ _08054F54: .4byte gUnknown_2024118 _08054F58: .4byte gUnknown_2023EB8 thumb_func_end atkD6_doubledamagedealtifdamaged - thumb_func_start sub_08054F5C -sub_08054F5C: @ 0x08054F5C + thumb_func_start atkD7_setyawn +atkD7_setyawn: @ 0x08054F5C push {r4, lr} ldr r1, _08054FA0 ldr r0, _08054FA4 @@ -173119,10 +173119,10 @@ _08054FC0: bx r0 .align 2, 0 _08054FC8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054F5C + thumb_func_end atkD7_setyawn - thumb_func_start sub_08054FCC -sub_08054FCC: @ 0x08054FCC + thumb_func_start atkD8_setdamagetohealthdifference +atkD8_setdamagetohealthdifference: @ 0x08054FCC push {lr} ldr r2, _08055008 ldr r0, _0805500C @@ -173173,10 +173173,10 @@ _0805502A: .align 2, 0 _08055030: .4byte gUnknown_2023E94 _08055034: .4byte gUnknown_2023EB8 - thumb_func_end sub_08054FCC + thumb_func_end atkD8_setdamagetohealthdifference - thumb_func_start sub_08055038 -sub_08055038: @ 0x08055038 + thumb_func_start atkD9_scaledamagebyhealthratio +atkD9_scaledamagebyhealthratio: @ 0x08055038 push {r4, lr} ldr r4, _08055084 ldrh r0, [r4] @@ -173221,10 +173221,10 @@ _0805508C: .4byte gUnknown_2023E8E _08055090: .4byte gUnknown_2023D28 _08055094: .4byte gUnknown_2023EAF _08055098: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055038 + thumb_func_end atkD9_scaledamagebyhealthratio - thumb_func_start sub_0805509C -sub_0805509C: @ 0x0805509C + thumb_func_start atkDA_tryswapabilities +atkDA_tryswapabilities: @ 0x0805509C push {r4, r5, r6, lr} ldr r5, _08055100 ldr r0, _08055104 @@ -173301,10 +173301,10 @@ _0805512A: bx r0 .align 2, 0 _08055130: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805509C + thumb_func_end atkDA_tryswapabilities - thumb_func_start sub_08055134 -sub_08055134: @ 0x08055134 + thumb_func_start atkDB_tryimprison +atkDB_tryimprison: @ 0x08055134 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -173345,17 +173345,17 @@ _0805517C: .4byte gUnknown_2023F50 _08055180: .4byte gUnknown_2023EB8 _08055184: adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldrb r0, [r4] - bl sub_0803F188 + bl PressurePPLoseOnUsingImprison movs r6, #0 b _080551F6 _0805519A: adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r8, r0 @@ -173441,10 +173441,10 @@ _0805522C: .4byte gUnknown_2023EAF _08055230: .4byte gUnknown_2023D28 _08055234: .4byte gUnknown_2023D10 _08055238: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055134 + thumb_func_end atkDB_tryimprison - thumb_func_start sub_0805523C -sub_0805523C: @ 0x0805523C + thumb_func_start atkDC_trysetgrudge +atkDC_trysetgrudge: @ 0x0805523C push {lr} ldr r1, _08055274 ldr r0, _08055278 @@ -173488,10 +173488,10 @@ _0805528C: bx r0 .align 2, 0 _08055290: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805523C + thumb_func_end atkDC_trysetgrudge - thumb_func_start sub_08055294 -sub_08055294: @ 0x08055294 + thumb_func_start atkDD_weightdamagecalculation +atkDD_weightdamagecalculation: @ 0x08055294 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -173517,7 +173517,7 @@ _080552B0: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFB80 + bl GetPokedexHeightWeight ldrh r1, [r4] lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -173565,10 +173565,10 @@ _08055312: .align 2, 0 _08055324: .4byte gUnknown_20240A4 _08055328: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055294 + thumb_func_end atkDD_weightdamagecalculation - thumb_func_start sub_0805532C -sub_0805532C: @ 0x0805532C + thumb_func_start atkDE_assistattackselect +atkDE_assistattackselect: @ 0x0805532C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -173612,12 +173612,12 @@ _0805535E: adds r4, r0, r6 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08055404 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -173636,7 +173636,7 @@ _080553A8: adds r1, #0xd ldr r0, [sp] add r0, sb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 @@ -173705,7 +173705,7 @@ _08055404: strh r0, [r4] ldrh r0, [r4] movs r1, #0 - bl sub_08045520 + bl GetMoveTarget ldr r1, _08055474 strb r0, [r1] ldr r1, _08055478 @@ -173751,10 +173751,10 @@ _08055496: bx r0 .align 2, 0 _080554A8: .4byte gUnknown_2023EB8 - thumb_func_end sub_0805532C + thumb_func_end atkDE_assistattackselect - thumb_func_start sub_080554AC -sub_080554AC: @ 0x080554AC + thumb_func_start atkDF_trysetmagiccoat +atkDF_trysetmagiccoat: @ 0x080554AC push {lr} ldr r1, _080554F4 ldr r3, _080554F8 @@ -173817,10 +173817,10 @@ _08055524: .align 2, 0 _08055528: .4byte gUnknown_2023FE0 _0805552C: .4byte gUnknown_2023EB8 - thumb_func_end sub_080554AC + thumb_func_end atkDF_trysetmagiccoat - thumb_func_start sub_08055530 -sub_08055530: @ 0x08055530 + thumb_func_start atkE0_trysetsnatch +atkE0_trysetsnatch: @ 0x08055530 push {lr} ldr r2, _08055574 ldr r3, _08055578 @@ -173878,10 +173878,10 @@ _0805559E: .align 2, 0 _080555A4: .4byte gUnknown_2023FE0 _080555A8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055530 + thumb_func_end atkE0_trysetsnatch - thumb_func_start sub_080555AC -sub_080555AC: @ 0x080555AC + thumb_func_start atkE1_trygetintimidatetarget +atkE1_trygetintimidatetarget: @ 0x080555AC push {r4, r5, r6, lr} ldr r4, _08055650 ldr r0, _08055654 @@ -173890,7 +173890,7 @@ sub_080555AC: @ 0x080555AC ldrb r0, [r0] strb r0, [r4, #0x17] ldrb r0, [r4, #0x17] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r2, _08055658 @@ -173918,7 +173918,7 @@ sub_080555AC: @ 0x080555AC ldr r6, _08055668 _080555F2: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r5 @@ -173986,16 +173986,16 @@ _0805567C: bx r0 .align 2, 0 _08055684: .4byte gUnknown_2023EB8 - thumb_func_end sub_080555AC + thumb_func_end atkE1_trygetintimidatetarget - thumb_func_start sub_08055688 -sub_08055688: @ 0x08055688 + thumb_func_start atkE2_switchoutabilities +atkE2_switchoutabilities: @ 0x08055688 push {r4, r5, r6, lr} sub sp, #4 ldr r5, _080556F0 ldr r0, [r5] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r4, _080556F4 strb r0, [r4] ldr r3, _080556F8 @@ -174031,7 +174031,7 @@ sub_08055688: @ 0x08055688 movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _080556E2: ldr r0, [r5] adds r0, #2 @@ -174046,15 +174046,15 @@ _080556F4: .4byte gUnknown_2023D08 _080556F8: .4byte gUnknown_2023D28 _080556FC: .4byte gUnknown_82FACB4 _08055700: .4byte gUnknown_2024140 - thumb_func_end sub_08055688 + thumb_func_end atkE2_switchoutabilities - thumb_func_start sub_08055704 -sub_08055704: @ 0x08055704 + thumb_func_start atkE3_jumpifhasnohp +atkE3_jumpifhasnohp: @ 0x08055704 push {r4, lr} ldr r4, _08055740 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_0803F00C + bl GetBattlerForBattleScript ldr r1, _08055744 strb r0, [r1] ldr r2, _08055748 @@ -174090,10 +174090,10 @@ _08055752: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08055704 + thumb_func_end atkE3_jumpifhasnohp - thumb_func_start sub_08055758 -sub_08055758: @ 0x08055758 + thumb_func_start atkE4_getsecretpowereffect +atkE4_getsecretpowereffect: @ 0x08055758 push {lr} ldr r0, _0805576C ldrb r0, [r0] @@ -174178,10 +174178,10 @@ _080557F8: .align 2, 0 _08055808: .4byte gUnknown_2023FD6 _0805580C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055758 + thumb_func_end atkE4_getsecretpowereffect - thumb_func_start sub_08055810 -sub_08055810: @ 0x08055810 + thumb_func_start atkE5_pickup +atkE5_pickup: @ 0x08055810 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -174194,7 +174194,7 @@ sub_08055810: @ 0x08055810 beq _08055828 b _080559E8 _08055828: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080558D4 @@ -174210,16 +174210,16 @@ _0805583A: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData strh r0, [r7] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0805587C lsls r0, r5, #3 @@ -174257,7 +174257,7 @@ _08055886: lsls r0, r0, #0x10 cmp r0, #0 bne _080558C6 - bl sub_081AA858 + bl GetBattlePyramidPickupItemId strh r0, [r7] movs r0, #0x64 muls r0, r6, r0 @@ -174265,7 +174265,7 @@ _08055886: adds r0, r0, r1 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData _080558C6: adds r6, #1 cmp r6, #5 @@ -174285,17 +174285,17 @@ _080558DE: adds r4, r4, r7 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sl strh r0, [r1] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08055940 lsls r0, r5, #3 @@ -174319,7 +174319,7 @@ _08055920: ldr r1, _0805593C adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _080559E0 .align 2, 0 _0805593C: .4byte gUnknown_82ECDE8 @@ -174364,7 +174364,7 @@ _0805594C: muls r0, r6, r0 adds r0, r0, r7 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData subs r0, #1 movs r1, #0xa bl __udivsi3 @@ -174400,7 +174400,7 @@ _080559BE: ldr r1, _08055A04 adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData _080559E0: mov r6, sb cmp r6, #5 @@ -174423,10 +174423,10 @@ _080559E8: _08055A00: .4byte gUnknown_82ECDFE _08055A04: .4byte gUnknown_82ECDC4 _08055A08: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055810 + thumb_func_end atkE5_pickup - thumb_func_start sub_08055A0C -sub_08055A0C: @ 0x08055A0C + thumb_func_start atkE6_docastformchangeanimation +atkE6_docastformchangeanimation: @ 0x08055A0C push {r4, lr} ldr r4, _08055A60 ldr r0, _08055A64 @@ -174457,9 +174457,9 @@ _08055A3C: ldrb r2, [r0] movs r0, #0 movs r1, #0 - bl sub_08034290 + bl BtlController_EmitBattleAnimation ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08055A70 ldr r0, [r1] adds r0, #1 @@ -174473,10 +174473,10 @@ _08055A64: .4byte gUnknown_2024118 _08055A68: .4byte gUnknown_2023D28 _08055A6C: .4byte gUnknown_2024140 _08055A70: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055A0C + thumb_func_end atkE6_docastformchangeanimation - thumb_func_start sub_08055A74 -sub_08055A74: @ 0x08055A74 + thumb_func_start atkE7_trycastformdatachange +atkE7_trycastformdatachange: @ 0x08055A74 push {r4, lr} ldr r1, _08055AA4 ldr r0, [r1] @@ -174484,7 +174484,7 @@ sub_08055A74: @ 0x08055A74 str r0, [r1] ldr r0, _08055AA8 ldrb r0, [r0, #0x17] - bl sub_080422FC + bl CastformDataTypeChange lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -174505,10 +174505,10 @@ _08055AA4: .4byte gUnknown_2023EB8 _08055AA8: .4byte gUnknown_2024118 _08055AAC: .4byte gUnknown_8289A31 _08055AB0: .4byte gUnknown_2024140 - thumb_func_end sub_08055A74 + thumb_func_end atkE7_trycastformdatachange - thumb_func_start sub_08055AB4 -sub_08055AB4: @ 0x08055AB4 + thumb_func_start atkE8_settypebasedhalvers +atkE8_settypebasedhalvers: @ 0x08055AB4 push {r4, lr} movs r4, #0 ldr r2, _08055AF0 @@ -174597,10 +174597,10 @@ _08055B62: bx r0 .align 2, 0 _08055B68: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055AB4 + thumb_func_end atkE8_settypebasedhalvers - thumb_func_start sub_08055B6C -sub_08055B6C: @ 0x08055B6C + thumb_func_start atkE9_setweatherballtype +atkE9_setweatherballtype: @ 0x08055B6C push {lr} sub sp, #4 movs r0, #0 @@ -174609,7 +174609,7 @@ sub_08055B6C: @ 0x08055B6C movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -174619,7 +174619,7 @@ sub_08055B6C: @ 0x08055B6C movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _08055C0C @@ -174694,10 +174694,10 @@ _08055C0C: .align 2, 0 _08055C1C: .4byte gUnknown_2024140 _08055C20: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055B6C + thumb_func_end atkE9_setweatherballtype - thumb_func_start sub_08055C24 -sub_08055C24: @ 0x08055C24 + thumb_func_start atkEA_tryrecycleitem +atkEA_tryrecycleitem: @ 0x08055C24 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r7, _08055C8C @@ -174741,7 +174741,7 @@ sub_08055C24: @ 0x08055C24 movs r3, #2 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08055CA0 ldr r0, [r1] adds r0, #5 @@ -174775,10 +174775,10 @@ _08055CBE: bx r0 .align 2, 0 _08055CC8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055C24 + thumb_func_end atkEA_tryrecycleitem - thumb_func_start sub_08055CCC -sub_08055CCC: @ 0x08055CCC + thumb_func_start atkEB_settypetoterrain +atkEB_settypetoterrain: @ 0x08055CCC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -174864,10 +174864,10 @@ _08055D6E: bx r0 .align 2, 0 _08055D78: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055CCC + thumb_func_end atkEB_settypetoterrain - thumb_func_start sub_08055D7C -sub_08055D7C: @ 0x08055D7C + thumb_func_start atkEC_pursuitrelated +atkEC_pursuitrelated: @ 0x08055D7C push {r4, r5, r6, lr} ldr r5, _08055DF0 ldrb r0, [r5] @@ -174956,10 +174956,10 @@ _08055E36: bx r0 .align 2, 0 _08055E3C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055D7C + thumb_func_end atkEC_pursuitrelated - thumb_func_start sub_08055E40 -sub_08055E40: @ 0x08055E40 + thumb_func_start atkEF_snatchsetbattlers +atkEF_snatchsetbattlers: @ 0x08055E40 push {r4, lr} ldr r1, _08055E64 ldr r3, _08055E68 @@ -174999,14 +174999,14 @@ _08055E7A: .align 2, 0 _08055E8C: .4byte gUnknown_2024118 _08055E90: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055E40 + thumb_func_end atkEF_snatchsetbattlers - thumb_func_start sub_08055E94 -sub_08055E94: @ 0x08055E94 + thumb_func_start atkEE_removelightscreenreflect +atkEE_removelightscreenreflect: @ 0x08055E94 push {r4, lr} ldr r0, _08055EDC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -175061,10 +175061,10 @@ _08055EFA: .align 2, 0 _08055F08: .4byte gUnknown_2024118 _08055F0C: .4byte gUnknown_2023EB8 - thumb_func_end sub_08055E94 + thumb_func_end atkEE_removelightscreenreflect - thumb_func_start sub_08055F10 -sub_08055F10: @ 0x08055F10 + thumb_func_start atkEF_handleballthrow +atkEF_handleballthrow: @ 0x08055F10 push {r4, r5, r6, lr} movs r4, #0 ldr r0, _08055F50 @@ -175091,7 +175091,7 @@ _08055F1E: movs r1, #5 bl BtlController_EmitBallThrowAnim ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08055F64 ldr r0, _08055F68 b _080562A4 @@ -175113,7 +175113,7 @@ _08055F6C: movs r1, #4 bl BtlController_EmitBallThrowAnim ldrb r0, [r5] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _08055F8C ldr r0, _08055F90 b _080562A4 @@ -175252,7 +175252,7 @@ _08056090: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 movs r4, #0xa cmp r0, #0 @@ -175358,7 +175358,7 @@ _08056174: bl BtlController_EmitBallThrowAnim ldr r0, _080561BC ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r1, _080561C0 ldr r0, _080561C4 str r0, [r1] @@ -175374,7 +175374,7 @@ _08056174: adds r0, r0, r1 ldr r2, _080561D4 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData bl sub_0806B004 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -175433,7 +175433,7 @@ _08056224: bl BtlController_EmitBallThrowAnim ldr r0, _08056274 ldrb r0, [r0] - bl sub_0803F440 + bl MarkBattlerForControllerExec cmp r4, #4 bne _0805629C ldr r1, _08056278 @@ -175451,7 +175451,7 @@ _08056224: adds r0, r0, r1 movs r1, #0x26 adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData bl sub_0806B004 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -175493,10 +175493,10 @@ _080562A6: _080562AC: .4byte gUnknown_2023FD6 _080562B0: .4byte gUnknown_2023EB8 _080562B4: .4byte gUnknown_828A35C - thumb_func_end sub_08055F10 + thumb_func_end atkEF_handleballthrow - thumb_func_start sub_080562B8 -sub_080562B8: @ 0x080562B8 + thumb_func_start atkF0_givecaughtmon +atkF0_givecaughtmon: @ 0x080562B8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -175516,7 +175516,7 @@ sub_080562B8: @ 0x080562B8 ldr r1, _08056330 mov r8, r1 add r0, r8 - bl sub_0806AEDC + bl GiveMonToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _080563A2 @@ -175545,7 +175545,7 @@ sub_080562B8: @ 0x080562B8 add r0, r8 ldr r2, _08056340 movs r1, #2 - bl sub_0806A058 + bl GetMonData b _0805638E .align 2, 0 _08056328: .4byte gUnknown_2023D12 @@ -175574,7 +175574,7 @@ _08056344: add r0, r8 ldr r2, _0805643C movs r1, #2 - bl sub_0806A058 + bl GetMonData ldr r4, _08056440 bl sub_0813B248 lsls r0, r0, #0x18 @@ -175616,7 +175616,7 @@ _080563A2: adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r5, _08056458 strh r0, [r5, #0x28] mov r1, sb @@ -175632,7 +175632,7 @@ _080563A2: adds r2, r5, #0 adds r2, #0x2a movs r1, #2 - bl sub_0806A058 + bl GetMonData mov r1, sb ldrb r0, [r1] eors r4, r0 @@ -175645,7 +175645,7 @@ _080563A2: adds r0, r0, r6 movs r1, #0x26 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xf ands r0, r1 lsls r0, r0, #2 @@ -175678,29 +175678,29 @@ _08056450: .4byte gUnknown_2023EAF _08056454: .4byte gUnknown_20243E8 _08056458: .4byte gUnknown_3005A70 _0805645C: .4byte gUnknown_2023EB8 - thumb_func_end sub_080562B8 + thumb_func_end atkF0_givecaughtmon - thumb_func_start sub_08056460 -sub_08056460: @ 0x08056460 + thumb_func_start atkF1_trysetcaughtmondexflags +atkF1_trysetcaughtmondexflags: @ 0x08056460 push {r4, r5, lr} ldr r4, _080564B0 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r0, r5, #0 bl sub_0806CF68 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080564B8 @@ -175728,7 +175728,7 @@ _080564B8: lsrs r0, r0, #0x10 movs r1, #3 adds r2, r4, #0 - bl sub_0806EAA8 + bl HandleSetPokedexFlag ldr r1, _080564D8 ldr r0, [r1] adds r0, #5 @@ -175739,16 +175739,16 @@ _080564D2: bx r0 .align 2, 0 _080564D8: .4byte gUnknown_2023EB8 - thumb_func_end sub_08056460 + thumb_func_end atkF1_trysetcaughtmondexflags - thumb_func_start sub_080564DC -sub_080564DC: @ 0x080564DC + thumb_func_start atkF2_displaydexinfo +atkF2_displaydexinfo: @ 0x080564DC push {r4, lr} sub sp, #4 ldr r0, _08056504 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r0, _08056508 @@ -175780,7 +175780,7 @@ _08056528: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08056616 _0805653A: ldr r0, _08056578 @@ -175791,7 +175791,7 @@ _0805653A: beq _08056548 b _0805663C _08056548: - bl sub_080034D4 + bl FreeAllWindowBuffers adds r0, r4, #0 bl sub_0806CF68 lsls r0, r0, #0x10 @@ -175808,7 +175808,7 @@ _08056548: adds r3, #0x48 adds r2, r2, r3 ldr r2, [r2] - bl sub_080BF6B0 + bl CreateDexDisplayMonDataTask ldr r1, _08056584 strb r0, [r1, #1] b _08056618 @@ -175840,7 +175840,7 @@ _08056588: cmp r0, #0 bne _0805663C ldr r0, _080565D4 - bl sub_080006F0 + bl SetVBlankCallback ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -175848,10 +175848,10 @@ _08056588: .align 2, 0 _080565C0: .4byte gUnknown_2037C74 _080565C4: .4byte gUnknown_3002360 -_080565C8: .4byte sub_080380FC +_080565C8: .4byte BattleMainCB2 _080565CC: .4byte gUnknown_3005B60 _080565D0: .4byte gUnknown_2023FD6 -_080565D4: .4byte sub_080386DC +_080565D4: .4byte VBlankCB_Battle _080565D8: bl sub_08035528 bl sub_080358F8 @@ -175864,7 +175864,7 @@ _080565D8: .align 2, 0 _080565EC: .4byte gUnknown_2022AD4 _080565F0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -175874,11 +175874,11 @@ _080565F0: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _08056616: ldr r1, _08056624 _08056618: @@ -175908,10 +175908,10 @@ _0805663C: .align 2, 0 _08056644: .4byte gUnknown_2037C74 _08056648: .4byte gUnknown_2023EB8 - thumb_func_end sub_080564DC + thumb_func_end atkF2_displaydexinfo - thumb_func_start sub_0805664C -sub_0805664C: @ 0x0805664C + thumb_func_start HandleBattleWindow +HandleBattleWindow: @ 0x0805664C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -176076,10 +176076,10 @@ _08056772: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805664C + thumb_func_end HandleBattleWindow - thumb_func_start sub_08056784 -sub_08056784: @ 0x08056784 + thumb_func_start BattleCreateYesNoCursorAt +BattleCreateYesNoCursorAt: @ 0x08056784 push {lr} sub sp, #0x10 adds r3, r0, #0 @@ -176102,14 +176102,14 @@ sub_08056784: @ 0x08056784 movs r2, #0x19 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x10 pop {r0} bx r0 - thumb_func_end sub_08056784 + thumb_func_end BattleCreateYesNoCursorAt - thumb_func_start sub_080567BC -sub_080567BC: @ 0x080567BC + thumb_func_start BattleDestroyYesNoCursorAt +BattleDestroyYesNoCursorAt: @ 0x080567BC push {lr} sub sp, #0x10 adds r3, r0, #0 @@ -176133,16 +176133,16 @@ sub_080567BC: @ 0x080567BC movs r2, #0x19 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x10 pop {r0} bx r0 .align 2, 0 _080567F8: .4byte 0x00001016 - thumb_func_end sub_080567BC + thumb_func_end BattleDestroyYesNoCursorAt - thumb_func_start sub_080567FC -sub_080567FC: @ 0x080567FC + thumb_func_start atkF3_trygivecaughtmonnick +atkF3_trygivecaughtmonnick: @ 0x080567FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -176177,7 +176177,7 @@ _0805683C: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _08056868 movs r1, #0xc bl sub_0814FA04 @@ -176187,7 +176187,7 @@ _0805683C: strb r0, [r1] strb r4, [r1, #1] movs r0, #0 - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _08056A72 .align 2, 0 _08056868: .4byte gUnknown_85ABBC9 @@ -176205,10 +176205,10 @@ _08056870: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _08056896: ldr r0, _080568E8 ldrh r1, [r0, #0x2e] @@ -176223,10 +176223,10 @@ _08056896: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _080568BE: ldr r0, _080568E8 ldrh r1, [r0, #0x2e] @@ -176295,8 +176295,8 @@ _0805691A: ldr r2, [r1] adds r2, #0x6d movs r1, #2 - bl sub_0806A058 - bl sub_080034D4 + bl GetMonData + bl FreeAllWindowBuffers mov r2, sl ldrb r0, [r2] eors r0, r4 @@ -176308,7 +176308,7 @@ _0805691A: adds r0, r1, #0 add r0, r8 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 @@ -176322,7 +176322,7 @@ _0805691A: muls r1, r0, r1 adds r0, r1, #0 add r0, r8 - bl sub_08069AF4 + bl GetMonGender adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -176338,7 +176338,7 @@ _0805691A: add r0, r8 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r2, _080569D8 ldr r1, [r2] adds r1, #0x6d @@ -176348,7 +176348,7 @@ _0805691A: movs r0, #2 adds r2, r6, #0 adds r3, r5, #0 - bl sub_080E2244 + bl DoNamingScreen ldr r1, _080569E0 ldrb r0, [r1] adds r0, #1 @@ -176360,7 +176360,7 @@ _080569CC: .4byte gUnknown_2023D12 _080569D0: .4byte gUnknown_2023EAF _080569D4: .4byte gUnknown_20243E8 _080569D8: .4byte gUnknown_2024140 -_080569DC: .4byte sub_080380FC +_080569DC: .4byte BattleMainCB2 _080569E0: .4byte gUnknown_2023FD6 _080569E4: ldr r0, _08056A20 @@ -176390,11 +176390,11 @@ _080569E4: ldr r2, [r1] adds r2, #0x6d movs r1, #2 - bl sub_0806A774 + bl SetMonData b _08056A58 .align 2, 0 _08056A20: .4byte gUnknown_3002360 -_08056A24: .4byte sub_080380FC +_08056A24: .4byte BattleMainCB2 _08056A28: .4byte gUnknown_2037C74 _08056A2C: .4byte gUnknown_2023D12 _08056A30: .4byte gUnknown_2023EAF @@ -176438,7 +176438,7 @@ _08056A72: bx r0 .align 2, 0 _08056A84: .4byte gUnknown_2023EB8 - thumb_func_end sub_080567FC + thumb_func_end atkF3_trygivecaughtmonnick thumb_func_start atkF4_subattackerhpbydmg atkF4_subattackerhpbydmg: @ 0x08056A88 @@ -176487,18 +176487,18 @@ _08056AD8: .4byte gUnknown_2023EAF _08056ADC: .4byte gUnknown_2023EB8 thumb_func_end atkF5_removeattackerstatus1 - thumb_func_start sub_08056AE0 -sub_08056AE0: @ 0x08056AE0 + thumb_func_start atkF6_finishaction +atkF6_finishaction: @ 0x08056AE0 ldr r1, _08056AE8 movs r0, #0xc strb r0, [r1] bx lr .align 2, 0 _08056AE8: .4byte gUnknown_2023D27 - thumb_func_end sub_08056AE0 + thumb_func_end atkF6_finishaction - thumb_func_start sub_08056AEC -sub_08056AEC: @ 0x08056AEC + thumb_func_start atkF7_finishturn +atkF7_finishturn: @ 0x08056AEC ldr r1, _08056AFC movs r0, #0xc strb r0, [r1] @@ -176511,10 +176511,10 @@ sub_08056AEC: @ 0x08056AEC _08056AFC: .4byte gUnknown_2023D27 _08056B00: .4byte gUnknown_2023D26 _08056B04: .4byte gUnknown_2023D10 - thumb_func_end sub_08056AEC + thumb_func_end atkF7_finishturn - thumb_func_start sub_08056B08 -sub_08056B08: @ 0x08056B08 + thumb_func_start atkF8_trainerslideout +atkF8_trainerslideout: @ 0x08056B08 push {r4, r5, lr} ldr r5, _08056B30 ldr r0, [r5] @@ -176525,7 +176525,7 @@ sub_08056B08: @ 0x08056B08 movs r0, #0 bl BtlController_EmitTrainerSlideBack ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, #2 str r0, [r5] @@ -176535,10 +176535,10 @@ sub_08056B08: @ 0x08056B08 .align 2, 0 _08056B30: .4byte gUnknown_2023EB8 _08056B34: .4byte gUnknown_2023D08 - thumb_func_end sub_08056B08 + thumb_func_end atkF8_trainerslideout - thumb_func_start sub_08056B38 -sub_08056B38: @ 0x08056B38 + thumb_func_start AllocateBattleResources +AllocateBattleResources: @ 0x08056B38 push {r4, r5, r6, lr} ldr r5, _08056C10 ldr r6, _08056C14 @@ -176553,61 +176553,61 @@ _08056B4E: ldr r4, _08056C18 movs r0, #0xa9 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0x20 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #0xa0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1] movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #4] movs r0, #0x24 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #8] movs r0, #0x24 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #0xc] movs r0, #0xc - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #0x10] movs r0, #0x1c - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #0x14] movs r0, #0x54 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #0x18] movs r0, #0x24 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r5] str r0, [r1, #0x1c] ldr r4, _08056C1C movs r5, #0x80 lsls r5, r5, #5 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r4, _08056C20 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r4, _08056C24 movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r4, _08056C28 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r0, [r6] movs r1, #0x80 @@ -176627,7 +176627,7 @@ _08056B4E: adds r1, r1, r0 ldr r0, [r2] adds r0, r0, r1 - bl sub_0806B1D4 + bl CreateSecretBaseEnemyParty _08056C0A: pop {r4, r5, r6} pop {r0} @@ -176643,10 +176643,10 @@ _08056C28: .4byte gUnknown_2022D04 _08056C2C: .4byte 0x00004054 _08056C30: .4byte gUnknown_3005AEC _08056C34: .4byte 0x00001A9C - thumb_func_end sub_08056B38 + thumb_func_end AllocateBattleResources - thumb_func_start sub_08056C38 -sub_08056C38: @ 0x08056C38 + thumb_func_start FreeBattleResources +FreeBattleResources: @ 0x08056C38 push {r4, r5, r6, lr} ldr r0, _08056CE8 ldr r0, [r0] @@ -176663,59 +176663,59 @@ _08056C4C: beq _08056CE0 ldr r4, _08056CF0 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r5, #0 str r5, [r4] ldr r0, [r6] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #4] ldr r0, [r0, #8] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #8] ldr r0, [r0, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #0xc] ldr r0, [r0, #0x10] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #0x10] ldr r0, [r0, #0x14] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #0x14] ldr r0, [r0, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #0x18] ldr r0, [r0, #0x1c] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r5, [r0, #0x1c] - bl sub_08000BF0 + bl Free str r5, [r6] ldr r4, _08056CF4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _08056CF8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _08056CFC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _08056D00 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] _08056CE0: pop {r4, r5, r6} @@ -176729,10 +176729,10 @@ _08056CF4: .4byte gUnknown_2024144 _08056CF8: .4byte gUnknown_2024148 _08056CFC: .4byte gUnknown_2022D00 _08056D00: .4byte gUnknown_2022D04 - thumb_func_end sub_08056C38 + thumb_func_end FreeBattleResources - thumb_func_start sub_08056D04 -sub_08056D04: @ 0x08056D04 + thumb_func_start AdjustFriendshipOnBattleFaint +AdjustFriendshipOnBattleFaint: @ 0x08056D04 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -176803,7 +176803,7 @@ _08056D5A: ldr r1, _08056DA4 adds r0, r0, r1 movs r1, #8 - bl sub_0806D3CC + bl AdjustFriendship b _08056DDE .align 2, 0 _08056D9C: .4byte gUnknown_2023D28 @@ -176819,7 +176819,7 @@ _08056DA8: ldr r1, _08056DC4 adds r0, r0, r1 movs r1, #6 - bl sub_0806D3CC + bl AdjustFriendship b _08056DDE .align 2, 0 _08056DC0: .4byte gUnknown_2023D12 @@ -176834,7 +176834,7 @@ _08056DC8: ldr r1, _08056DE8 adds r0, r0, r1 movs r1, #6 - bl sub_0806D3CC + bl AdjustFriendship _08056DDE: pop {r4, r5} pop {r0} @@ -176842,7 +176842,7 @@ _08056DDE: .align 2, 0 _08056DE4: .4byte gUnknown_2023D12 _08056DE8: .4byte gUnknown_2024190 - thumb_func_end sub_08056D04 + thumb_func_end AdjustFriendshipOnBattleFaint thumb_func_start sub_08056DEC sub_08056DEC: @ 0x08056DEC @@ -176852,7 +176852,7 @@ sub_08056DEC: @ 0x08056DEC lsls r1, r1, #0x18 lsrs r7, r1, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -176874,12 +176874,12 @@ _08056E0E: ble _08056E0E adds r0, r3, r6 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r7, #0 - bl sub_081B8C8C + bl pokemon_order_func adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -176959,7 +176959,7 @@ _08056EAA: cmp r0, #0 beq _08056F82 mov r0, sb - bl sub_08050260 + bl UproarWakeUpCheck lsls r0, r0, #0x18 cmp r0, #0 beq _08056F0C @@ -177139,7 +177139,7 @@ _08057016: movs r3, #4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec _08057040: mov r0, r8 add sp, #4 @@ -177187,8 +177187,8 @@ _08057094: .4byte gUnknown_202415D _08057098: .4byte gUnknown_2024170 thumb_func_end SetControllerToPlayer - thumb_func_start sub_0805709C -sub_0805709C: @ 0x0805709C + thumb_func_start PlayerBufferExecCompleted +PlayerBufferExecCompleted: @ 0x0805709C push {r4, lr} sub sp, #4 ldr r1, _080570DC @@ -177204,7 +177204,7 @@ sub_0805709C: @ 0x0805709C ands r0, r1 cmp r0, #0 beq _080570F0 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -177242,7 +177242,7 @@ _08057102: .align 2, 0 _0805710C: .4byte gUnknown_2023D0C _08057110: .4byte gUnknown_82FACB4 - thumb_func_end sub_0805709C + thumb_func_end PlayerBufferExecCompleted thumb_func_start sub_08057114 sub_08057114: @ 0x08057114 @@ -177278,7 +177278,7 @@ _08057150: .4byte gUnknown_2023D08 _08057154: .4byte gUnknown_2022D08 _08057158: .4byte gUnknown_82ECE9C _0805715C: - bl sub_0805709C + bl PlayerBufferExecCompleted _08057160: pop {r0} bx r0 @@ -177301,7 +177301,7 @@ CompleteOnBankSpritePosX_0: @ 0x08057164 ldrsh r0, [r0, r1] cmp r0, #0 bne _08057186 - bl sub_0805709C + bl PlayerBufferExecCompleted _08057186: pop {r0} bx r0 @@ -177329,12 +177329,12 @@ sub_08057198: @ 0x08057198 movs r1, #1 movs r2, #7 movs r3, #1 - bl sub_0803986C + bl DoBounceEffect ldrb r0, [r4] movs r1, #0 movs r2, #7 movs r3, #1 - bl sub_0803986C + bl DoBounceEffect ldr r0, _080571F0 ldrh r1, [r0, #0x30] movs r0, #0xf0 @@ -177409,7 +177409,7 @@ _0805725C: movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _080573D2 _08057268: movs r0, #0x20 @@ -177432,7 +177432,7 @@ _08057284: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -177462,7 +177462,7 @@ _080572C4: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -177510,7 +177510,7 @@ _0805732A: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -177522,7 +177522,7 @@ _08057342: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt b _080573F8 .align 2, 0 _08057354: .4byte gUnknown_2024150 @@ -177576,7 +177576,7 @@ _0805736A: bhi _080573F8 adds r0, r5, #0 movs r1, #1 - bl sub_080D6140 + bl AddBagItem _080573C2: movs r0, #5 bl sub_080A306C @@ -177584,9 +177584,9 @@ _080573C2: movs r1, #0xc _080573CC: movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _080573D2: - bl sub_0805709C + bl PlayerBufferExecCompleted b _080573F8 .align 2, 0 _080573D8: .4byte gUnknown_2022C90 @@ -177613,10 +177613,10 @@ sub_08057400: @ 0x08057400 ldr r4, _08057428 ldrb r0, [r4] movs r1, #1 - bl sub_0803998C + bl EndBounceEffect ldrb r0, [r4] movs r1, #0 - bl sub_0803998C + bl EndBounceEffect ldr r1, _0805742C ldrb r0, [r4] lsls r0, r0, #2 @@ -177629,11 +177629,11 @@ sub_08057400: @ 0x08057400 .align 2, 0 _08057428: .4byte gUnknown_2023D08 _0805742C: .4byte gUnknown_3005AC0 -_08057430: .4byte sub_08057434 +_08057430: .4byte HandleInputChooseTarget thumb_func_end sub_08057400 - thumb_func_start sub_08057434 -sub_08057434: @ 0x08057434 + thumb_func_start HandleInputChooseTarget +HandleInputChooseTarget: @ 0x08057434 push {r4, r5, lr} sub sp, #4 ldr r1, _08057494 @@ -177645,7 +177645,7 @@ sub_08057434: @ 0x08057434 movs r1, #1 movs r2, #0xf movs r3, #1 - bl sub_0803986C + bl DoBounceEffect movs r4, #0 ldr r0, _0805749C ldrb r0, [r0] @@ -177659,7 +177659,7 @@ _0805745A: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0803998C + bl EndBounceEffect _0805746C: adds r4, #1 ldr r0, _0805749C @@ -177724,11 +177724,11 @@ _080574B0: orrs r2, r0 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues ldrb r0, [r4] movs r1, #1 - bl sub_0803998C - bl sub_0805709C + bl EndBounceEffect + bl PlayerBufferExecCompleted b _080577D8 .align 2, 0 _08057504: .4byte gUnknown_2024170 @@ -177773,15 +177773,15 @@ _0805752E: movs r1, #1 movs r2, #7 movs r3, #1 - bl sub_0803986C + bl DoBounceEffect ldrb r0, [r4] movs r1, #0 movs r2, #7 movs r3, #1 - bl sub_0803986C + bl DoBounceEffect ldrb r0, [r5] movs r1, #1 - bl sub_0803998C + bl EndBounceEffect b _080577D8 .align 2, 0 _08057580: .4byte gUnknown_20205AC @@ -177790,7 +177790,7 @@ _08057588: .4byte gUnknown_3005AD4 _0805758C: .4byte sub_08039770 _08057590: .4byte gUnknown_3005AC0 _08057594: .4byte gUnknown_2023D08 -_08057598: .4byte sub_0805780C +_08057598: .4byte HandleInputChooseMove _0805759C: movs r0, #0x60 ands r0, r2 @@ -177893,7 +177893,7 @@ _08057642: adds r2, r2, r1 ldrb r1, [r2] adds r1, #0xd - bl sub_0806A058 + bl GetMonData ldr r2, _080576B0 lsls r1, r0, #1 adds r1, r1, r0 @@ -178034,7 +178034,7 @@ _08057766: adds r2, r2, r1 ldrb r1, [r2] adds r1, #0xd - bl sub_0806A058 + bl GetMonData ldr r2, _080577F0 lsls r1, r0, #1 adds r1, r1, r0 @@ -178093,10 +178093,10 @@ _080577FC: .4byte gUnknown_3005AD4 _08057800: .4byte gUnknown_20205AC _08057804: .4byte gUnknown_2023E88 _08057808: .4byte sub_0803971C - thumb_func_end sub_08057434 + thumb_func_end HandleInputChooseTarget - thumb_func_start sub_0805780C -sub_0805780C: @ 0x0805780C + thumb_func_start HandleInputChooseMove +HandleInputChooseMove: @ 0x0805780C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -178254,13 +178254,13 @@ _08057934: cmp r0, #0 bne _0805796A movs r0, #0 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bhi _0805796A ldrb r0, [r7] - bl sub_08069A74 + bl GetDefaultMoveTarget ldr r1, _08057988 strb r0, [r1] movs r0, #0 @@ -178300,7 +178300,7 @@ _08057990: b _080579E8 .align 2, 0 _080579AC: .4byte gUnknown_3005AC0 -_080579B0: .4byte sub_08057434 +_080579B0: .4byte HandleInputChooseTarget _080579B4: .4byte gUnknown_3005AD4 _080579B8: movs r0, #1 @@ -178361,8 +178361,8 @@ _08057A24: _08057A2C: movs r0, #1 movs r1, #0xa - bl sub_08033FB0 - bl sub_0805709C + bl BtlController_EmitTwoReturnValues + bl PlayerBufferExecCompleted b _08057BAE .align 2, 0 _08057A3C: .4byte 0x0000FFFF @@ -178482,8 +178482,8 @@ _08057B18: adds r0, r0, r4 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C - bl sub_0805976C + bl MoveSelectionCreateCursorAt + bl MoveSelectionDisplayPpNumber bl sub_080597E0 b _08057BAE .align 2, 0 @@ -178508,7 +178508,7 @@ _08057B40: adds r0, r0, r4 ldrb r0, [r0] movs r1, #0x1d - bl sub_0805983C + bl MoveSelectionCreateCursorAt ldrb r0, [r7] adds r0, r0, r4 ldrb r0, [r0] @@ -178530,7 +178530,7 @@ _08057B88: _08057B90: ldrb r0, [r0] movs r1, #0x1b - bl sub_0805983C + bl MoveSelectionCreateCursorAt ldr r0, _08057BBC movs r1, #0xb bl sub_0814FA04 @@ -178553,8 +178553,8 @@ _08057BB8: .4byte gUnknown_3005AD4 _08057BBC: .4byte gUnknown_85ABBD8 _08057BC0: .4byte gUnknown_3005AC0 _08057BC4: .4byte gUnknown_2023D08 -_08057BC8: .4byte sub_08057D48 - thumb_func_end sub_0805780C +_08057BC8: .4byte HandleMoveSwitching + thumb_func_end HandleInputChooseMove thumb_func_start sub_08057BCC sub_08057BCC: @ 0x08057BCC @@ -178616,7 +178616,7 @@ _08057C08: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt _08057C48: ldr r0, _08057D30 ldrh r1, [r0, #0x2e] @@ -178653,7 +178653,7 @@ _08057C48: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt _08057C96: ldr r0, _08057D30 ldrh r1, [r0, #0x2e] @@ -178684,7 +178684,7 @@ _08057C96: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt _08057CD8: ldr r0, _08057D30 ldrh r1, [r0, #0x2e] @@ -178721,7 +178721,7 @@ _08057CD8: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt _08057D26: adds r0, r7, #0 pop {r4, r5, r6, r7} @@ -178736,8 +178736,8 @@ _08057D40: .4byte gUnknown_2023D08 _08057D44: .4byte gUnknown_3005AD8 thumb_func_end sub_08057BCC - thumb_func_start sub_08057D48 -sub_08057D48: @ 0x08057D48 + thumb_func_start HandleMoveSwitching +HandleMoveSwitching: @ 0x08057D48 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -179006,7 +179006,7 @@ _08057F42: adds r0, r0, r5 adds r1, r6, #0 adds r1, #0xd - bl sub_0806A058 + bl GetMonData strh r0, [r4] mov r2, r8 ldrb r0, [r2] @@ -179017,7 +179017,7 @@ _08057F42: adds r0, r0, r5 adds r1, r6, #0 adds r1, #0x11 - bl sub_0806A058 + bl GetMonData mov r3, sl adds r1, r3, r6 strb r0, [r1] @@ -179036,7 +179036,7 @@ _08057F42: ldr r1, _08058104 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData ldr r5, [sp, #0x1c] strb r0, [r5] movs r6, #0 @@ -179149,7 +179149,7 @@ _0805805A: adds r1, r6, #0 adds r1, #0xd adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, sb ldrb r0, [r1] lsls r0, r0, #1 @@ -179162,7 +179162,7 @@ _0805805A: adds r1, r6, #0 adds r1, #0x11 adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData adds r5, #1 adds r4, #2 adds r6, #1 @@ -179180,7 +179180,7 @@ _0805805A: adds r0, r0, r1 movs r1, #0x15 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData _080580B8: ldr r1, _08058108 ldr r2, _080580E8 @@ -179199,7 +179199,7 @@ _080580B8: adds r0, r0, r3 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt b _08058142 .align 2, 0 _080580E0: .4byte gUnknown_3002360 @@ -179213,7 +179213,7 @@ _080580FC: .4byte gUnknown_2023D28 _08058100: .4byte gUnknown_2023D12 _08058104: .4byte gUnknown_2024190 _08058108: .4byte gUnknown_3005AC0 -_0805810C: .4byte sub_0805780C +_0805810C: .4byte HandleInputChooseMove _08058110: movs r0, #6 ands r0, r1 @@ -179230,7 +179230,7 @@ _08058110: adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt ldr r1, _0805815C ldrb r0, [r4] lsls r0, r0, #2 @@ -179239,7 +179239,7 @@ _08058110: str r1, [r0] _08058142: bl sub_08059734 - bl sub_0805976C + bl MoveSelectionDisplayPpNumber bl sub_080597E0 b _080582F8 .align 2, 0 @@ -179247,7 +179247,7 @@ _08058150: .4byte gUnknown_3005AD4 _08058154: .4byte gUnknown_2024154 _08058158: .4byte gUnknown_2023D08 _0805815C: .4byte gUnknown_3005AC0 -_08058160: .4byte sub_0805780C +_08058160: .4byte HandleInputChooseMove _08058164: movs r0, #0x20 ands r0, r1 @@ -179271,7 +179271,7 @@ _0805817A: _08058188: ldrb r0, [r1] movs r1, #0x1d - bl sub_0805983C + bl MoveSelectionCreateCursorAt b _080581A6 .align 2, 0 _08058194: .4byte gUnknown_3005AD4 @@ -179341,7 +179341,7 @@ _080581F8: bne _08058230 ldrb r0, [r1] movs r1, #0x1d - bl sub_0805983C + bl MoveSelectionCreateCursorAt b _08058236 .align 2, 0 _08058224: .4byte gUnknown_3005AD4 @@ -179369,7 +179369,7 @@ _0805823C: beq _080582DA ldrb r0, [r4] movs r1, #0x1b - bl sub_0805983C + bl MoveSelectionCreateCursorAt b _080582F8 .align 2, 0 _08058260: .4byte gUnknown_3005AD4 @@ -179401,7 +179401,7 @@ _0805826C: bne _080582B4 ldrb r0, [r1] movs r1, #0x1d - bl sub_0805983C + bl MoveSelectionCreateCursorAt b _080582BA .align 2, 0 _080582A4: .4byte gUnknown_3005AD4 @@ -179430,7 +179430,7 @@ _080582BA: _080582DA: adds r0, r1, #0 movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt b _080582F8 .align 2, 0 _080582E4: .4byte gUnknown_3005AD4 @@ -179439,7 +179439,7 @@ _080582EC: .4byte gUnknown_2023D08 _080582F0: ldrb r0, [r4] movs r1, #0x1b - bl sub_0805983C + bl MoveSelectionCreateCursorAt _080582F8: add sp, #0x24 pop {r3, r4, r5} @@ -179449,7 +179449,7 @@ _080582F8: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08057D48 + thumb_func_end HandleMoveSwitching thumb_func_start sub_08058308 sub_08058308: @ 0x08058308 @@ -179476,14 +179476,14 @@ sub_08058308: @ 0x08058308 ldr r0, [r0] str r0, [r3] ldr r0, _08058364 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08058368 ldrb r0, [r0] cmp r0, #1 bne _08058348 - bl sub_0817E2A0 + bl TryPutLinkBattleTvShowOnAir _08058348: - bl sub_080034D4 + bl FreeAllWindowBuffers b _080583A8 .align 2, 0 _08058350: .4byte gUnknown_300319C @@ -179494,7 +179494,7 @@ _08058360: .4byte gUnknown_3005A60 _08058364: .4byte sub_08038A18 _08058368: .4byte gUnknown_2023FDE _0805836C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080583A8 @@ -179512,14 +179512,14 @@ _0805836C: ldr r0, [r0] str r0, [r3] ldr r0, _080583B8 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080583BC ldrb r0, [r0] cmp r0, #1 bne _080583A4 - bl sub_0817E2A0 + bl TryPutLinkBattleTvShowOnAir _080583A4: - bl sub_080034D4 + bl FreeAllWindowBuffers _080583A8: pop {r0} bx r0 @@ -179546,7 +179546,7 @@ sub_080583C0: @ 0x080583C0 ands r0, r1 cmp r0, #0 beq _08058420 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08058442 @@ -179590,7 +179590,7 @@ _08058420: ldr r0, [r0] str r0, [r2] ldr r0, [r2, #8] - bl sub_08000540 + bl SetMainCallback2 _08058442: pop {r0} bx r0 @@ -179618,7 +179618,7 @@ sub_08058454: @ 0x08058454 ldr r0, _08058488 cmp r1, r0 bne _08058478 - bl sub_0805709C + bl PlayerBufferExecCompleted _08058478: pop {r0} bx r0 @@ -179647,7 +179647,7 @@ sub_0805848C: @ 0x0805848C ldr r0, _080584C0 cmp r1, r0 bne _080584B0 - bl sub_0805709C + bl PlayerBufferExecCompleted _080584B0: pop {r0} bx r0 @@ -179697,7 +179697,7 @@ sub_080584C4: @ 0x080584C4 lsls r0, r0, #2 adds r0, r0, r6 bl DestroySprite - bl sub_0805709C + bl PlayerBufferExecCompleted _08058518: pop {r4, r5, r6} pop {r0} @@ -179738,7 +179738,7 @@ sub_08058534: @ 0x08058534 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_0805709C + bl PlayerBufferExecCompleted _0805856C: pop {r4} pop {r0} @@ -179756,11 +179756,11 @@ sub_0805857C: @ 0x0805857C mov r5, r8 push {r5, r6, r7} movs r7, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080585A8 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080585E0 @@ -179916,8 +179916,8 @@ _0805861E: muls r0, r5, r0 ldr r4, _08058744 adds r0, r0, r4 - bl sub_0805E5AC - bl sub_080A63E8 + bl HandleLowHpMusicChange + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080586F4 @@ -179929,7 +179929,7 @@ _0805861E: ldrh r0, [r0] muls r0, r5, r0 adds r0, r0, r4 - bl sub_0805E5AC + bl HandleLowHpMusicChange _080586F4: mov r2, sb ldr r0, [r2] @@ -180058,7 +180058,7 @@ _080587C2: ands r0, r1 cmp r0, #0 bne _08058878 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08058848 @@ -180083,7 +180083,7 @@ _080587C2: ldr r2, _08058908 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] eors r0, r6 bl sub_08076320 @@ -180107,7 +180107,7 @@ _08058848: ldr r2, _08058908 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -180154,7 +180154,7 @@ _08058892: ands r0, r1 cmp r0, #0 bne _08058942 - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08058942 @@ -180210,11 +180210,11 @@ _08058924: movs r0, #1 mov sb, r0 _08058942: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08058962 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080589BC @@ -180317,7 +180317,7 @@ _08058A1A: mov r0, r8 cmp r0, #0 beq _08058ABA - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08058A58 @@ -180491,7 +180491,7 @@ sub_08058AEC: @ 0x08058AEC adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08058B98: ldr r0, _08058BC8 ldrb r1, [r6] @@ -180532,7 +180532,7 @@ sub_08058BD0: @ 0x08058BD0 ands r0, r1 cmp r0, #0 bne _08058C1E - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08058C1E @@ -180550,8 +180550,8 @@ sub_08058BD0: @ 0x08058BD0 muls r0, r2, r0 ldr r2, _08058C38 adds r0, r0, r2 - bl sub_0805E5AC - bl sub_0805709C + bl HandleLowHpMusicChange + bl PlayerBufferExecCompleted _08058C1E: pop {r4} pop {r0} @@ -180633,7 +180633,7 @@ _08058C6E: ldr r2, _08058CF4 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r5] bl sub_08076320 ldrb r0, [r5] @@ -180668,7 +180668,7 @@ sub_08058D10: @ 0x08058D10 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08058D32 @@ -180678,7 +180678,7 @@ sub_08058D10: @ 0x08058D10 lsls r2, r2, #1 bl m4aMPlayVolumeControl adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08058D32: pop {r4} pop {r0} @@ -180698,7 +180698,7 @@ sub_08058D40: @ 0x08058D40 ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -180731,8 +180731,8 @@ _08058D88: muls r0, r2, r0 ldr r2, _08058DAC adds r0, r0, r2 - bl sub_0805E5AC - bl sub_0805709C + bl HandleLowHpMusicChange + bl PlayerBufferExecCompleted _08058DA2: pop {r4, r5, r6} pop {r0} @@ -180750,7 +180750,7 @@ sub_08058DB0: @ 0x08058DB0 lsls r0, r0, #0x10 cmp r0, #0 bne _08058DC2 - bl sub_0805709C + bl PlayerBufferExecCompleted _08058DC2: pop {r0} bx r0 @@ -180781,7 +180781,7 @@ sub_08058DC8: @ 0x08058DC8 str r7, [sp, #8] ldrh r2, [r1, #0xa] str r2, [sp, #0xc] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -180801,19 +180801,19 @@ _08058E0E: adds r6, r1, r0 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r6, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] ldr r3, _08058ED4 adds r4, #1 @@ -180840,9 +180840,9 @@ _08058E0E: adds r0, r6, #0 movs r1, #0x19 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 - bl sub_0806884C + bl CalculateMonStats ldr r2, [sp] add r0, sp, #4 ldrh r0, [r0] @@ -180856,9 +180856,9 @@ _08058E0E: lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xb - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues strb r5, [r4] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -180887,7 +180887,7 @@ _08058ED0: .4byte gUnknown_2024190 _08058ED4: .4byte gUnknown_82F00B4 _08058ED8: .4byte gUnknown_82F0D54 _08058EDC: .4byte gUnknown_2023D08 -_08058EE0: .4byte sub_08059154 +_08058EE0: .4byte Task_LaunchLvlUpAnim _08058EE4: ldr r0, _08058EF4 mov r2, sb @@ -180899,13 +180899,13 @@ _08058EE4: b _08058F28 .align 2, 0 _08058EF4: .4byte gUnknown_3005B60 -_08058EF8: .4byte sub_0805926C +_08058EF8: .4byte DestroyExpTaskAndCompleteOnInactiveTextPrinter _08058EFC: str r0, [sp, #4] add r2, sp, #4 adds r0, r6, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData ldr r1, _08058F1C ldr r3, [sp, #8] lsls r0, r3, #2 @@ -180913,7 +180913,7 @@ _08058EFC: ldr r1, _08058F20 str r1, [r0] mov r0, sb - bl sub_080A8964 + bl DestroyTask b _08058F2A .align 2, 0 _08058F1C: .4byte gUnknown_3005AC0 @@ -180934,11 +180934,11 @@ _08058F2A: pop {r0} bx r0 .align 2, 0 -_08058F3C: .4byte sub_08058F40 +_08058F3C: .4byte Task_PrepareToGiveExpWithExpBar thumb_func_end sub_08058DC8 - thumb_func_start sub_08058F40 -sub_08058F40: @ 0x08058F40 + thumb_func_start Task_PrepareToGiveExpWithExpBar +Task_PrepareToGiveExpWithExpBar: @ 0x08058F40 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -180970,19 +180970,19 @@ sub_08058F40: @ 0x08058F40 adds r6, r6, r0 adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 ldr r6, _08059000 lsls r1, r4, #2 @@ -181033,7 +181033,7 @@ _08059000: .4byte gUnknown_82F00B4 _08059004: .4byte gUnknown_82F0D54 _08059008: .4byte gUnknown_3005AD0 _0805900C: .4byte sub_08059010 - thumb_func_end sub_08058F40 + thumb_func_end Task_PrepareToGiveExpWithExpBar thumb_func_start sub_08059010 sub_08059010: @ 0x08059010 @@ -181073,7 +181073,7 @@ _08059040: adds r0, r7, #0 movs r2, #1 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -181094,17 +181094,17 @@ _08059040: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r3, _08059110 @@ -181133,9 +181133,9 @@ _08059040: adds r0, r5, #0 movs r1, #0x19 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 - bl sub_0806884C + bl CalculateMonStats ldr r2, [sp] add r0, sp, #4 ldrh r0, [r0] @@ -181148,7 +181148,7 @@ _08059040: lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xb - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues strb r5, [r4] ldr r0, _0805911C str r0, [r6] @@ -181159,20 +181159,20 @@ _0805910C: .4byte gUnknown_2024190 _08059110: .4byte gUnknown_82F00B4 _08059114: .4byte gUnknown_82F0D54 _08059118: .4byte gUnknown_2023D08 -_0805911C: .4byte sub_08059154 +_0805911C: .4byte Task_LaunchLvlUpAnim _08059120: str r0, [sp, #4] add r2, sp, #4 adds r0, r5, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData ldr r1, _0805914C lsls r0, r7, #2 adds r0, r0, r1 ldr r1, _08059150 str r1, [r0] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _0805913C: add sp, #8 pop {r3, r4, r5} @@ -181187,8 +181187,8 @@ _0805914C: .4byte gUnknown_3005AC0 _08059150: .4byte sub_08058DB0 thumb_func_end sub_08059010 - thumb_func_start sub_08059154 -sub_08059154: @ 0x08059154 + thumb_func_start Task_LaunchLvlUpAnim +Task_LaunchLvlUpAnim: @ 0x08059154 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -181199,7 +181199,7 @@ sub_08059154: @ 0x08059154 adds r0, r0, r1 ldrb r4, [r0, #0xc] ldrb r6, [r0, #8] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -181219,7 +181219,7 @@ _08059188: adds r1, r4, #0 adds r2, r4, #0 movs r3, #0 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, _080591A8 lsls r1, r5, #2 adds r1, r1, r5 @@ -181233,11 +181233,11 @@ _08059188: .align 2, 0 _080591A8: .4byte gUnknown_3005B60 _080591AC: .4byte gUnknown_2023D12 -_080591B0: .4byte sub_080591B4 - thumb_func_end sub_08059154 +_080591B0: .4byte Task_UpdateLvlInHealthbox + thumb_func_end Task_LaunchLvlUpAnim - thumb_func_start sub_080591B4 -sub_080591B4: @ 0x080591B4 + thumb_func_start Task_UpdateLvlInHealthbox +Task_UpdateLvlInHealthbox: @ 0x080591B4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -181267,8 +181267,8 @@ sub_080591B4: @ 0x080591B4 adds r7, r1, r0 adds r0, r7, #0 movs r1, #0x38 - bl sub_0806A058 - bl sub_080A63E8 + bl GetMonData + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -181287,7 +181287,7 @@ sub_080591B4: @ 0x080591B4 ldrb r0, [r0] adds r1, r7, #0 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute b _08059248 .align 2, 0 _08059220: .4byte gUnknown_3005B60 @@ -181304,7 +181304,7 @@ _08059234: ldr r2, _08059260 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute _08059248: ldr r0, _08059264 lsls r1, r6, #2 @@ -181321,11 +181321,11 @@ _08059256: _0805925C: .4byte gUnknown_3005AD0 _08059260: .4byte gUnknown_2024190 _08059264: .4byte gUnknown_3005B60 -_08059268: .4byte sub_0805926C - thumb_func_end sub_080591B4 +_08059268: .4byte DestroyExpTaskAndCompleteOnInactiveTextPrinter + thumb_func_end Task_UpdateLvlInHealthbox - thumb_func_start sub_0805926C -sub_0805926C: @ 0x0805926C + thumb_func_start DestroyExpTaskAndCompleteOnInactiveTextPrinter +DestroyExpTaskAndCompleteOnInactiveTextPrinter: @ 0x0805926C push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -181341,7 +181341,7 @@ sub_0805926C: @ 0x0805926C ldr r1, _080592AC adds r0, r0, r1 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldrb r0, [r4, #0xc] ldr r1, _080592B0 lsls r0, r0, #2 @@ -181349,7 +181349,7 @@ sub_0805926C: @ 0x0805926C ldr r1, _080592B4 str r1, [r0] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5} pop {r0} bx r0 @@ -181358,7 +181358,7 @@ _080592A8: .4byte gUnknown_3005B60 _080592AC: .4byte gUnknown_2024190 _080592B0: .4byte gUnknown_3005AC0 _080592B4: .4byte sub_08058DB0 - thumb_func_end sub_0805926C + thumb_func_end DestroyExpTaskAndCompleteOnInactiveTextPrinter thumb_func_start sub_080592B8 sub_080592B8: @ 0x080592B8 @@ -181389,7 +181389,7 @@ sub_080592B8: @ 0x080592B8 ldr r1, _0805934C adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0805DB50 @@ -181417,7 +181417,7 @@ sub_080592B8: @ 0x080592B8 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0805709C + bl PlayerBufferExecCompleted _08059334: pop {r4, r5, r6} pop {r0} @@ -181470,7 +181470,7 @@ sub_08059354: @ 0x08059354 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0805709C + bl PlayerBufferExecCompleted _080593A8: pop {r4, r5, r6} pop {r0} @@ -181491,15 +181491,15 @@ sub_080593C4: @ 0x080593C4 lsls r0, r0, #0x10 cmp r0, #0 bne _080593D6 - bl sub_0805709C + bl PlayerBufferExecCompleted _080593D6: pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080593C4 - thumb_func_start sub_080593DC -sub_080593DC: @ 0x080593DC + thumb_func_start OpenPartyMenuToChooseMon +OpenPartyMenuToChooseMon: @ 0x080593DC push {r4, lr} ldr r0, _08059420 ldrb r1, [r0, #7] @@ -181524,10 +181524,10 @@ sub_080593DC: @ 0x080593DC lsls r1, r1, #3 adds r1, r1, r3 ldrb r4, [r1, #8] - bl sub_080A8964 - bl sub_080034D4 + bl DestroyTask + bl FreeAllWindowBuffers adds r0, r4, #0 - bl sub_081B864C + bl OpenPartyMenuInBattle _0805941A: pop {r4} pop {r0} @@ -181536,13 +181536,13 @@ _0805941A: _08059420: .4byte gUnknown_2037C74 _08059424: .4byte gUnknown_3005AC0 _08059428: .4byte gUnknown_2023D08 -_0805942C: .4byte sub_08059438 +_0805942C: .4byte WaitForMonSelection _08059430: .4byte gUnknown_3005B60 _08059434: .4byte gUnknown_3005ADC - thumb_func_end sub_080593DC + thumb_func_end OpenPartyMenuToChooseMon - thumb_func_start sub_08059438 -sub_08059438: @ 0x08059438 + thumb_func_start WaitForMonSelection +WaitForMonSelection: @ 0x08059438 push {lr} ldr r0, _08059468 ldr r1, [r0, #4] @@ -181563,11 +181563,11 @@ sub_08059438: @ 0x08059438 ldrb r1, [r0] ldr r2, _0805947C movs r0, #1 - bl sub_08033FDC + bl BtlController_EmitChosenMonReturnValue b _0805948A .align 2, 0 _08059468: .4byte gUnknown_3002360 -_0805946C: .4byte sub_080380FC +_0805946C: .4byte BattleMainCB2 _08059470: .4byte gUnknown_2037C74 _08059474: .4byte gUnknown_203CBB4 _08059478: .4byte gUnknown_203CBB5 @@ -181576,7 +181576,7 @@ _08059480: movs r0, #1 movs r1, #6 movs r2, #0 - bl sub_08033FDC + bl BtlController_EmitChosenMonReturnValue _0805948A: ldr r1, _080594AC ldr r0, _080594B0 @@ -181589,19 +181589,19 @@ _0805948A: ands r0, r1 cmp r0, #1 bne _080594A4 - bl sub_080599DC + bl PrintLinkStandbyMsg _080594A4: - bl sub_0805709C + bl PlayerBufferExecCompleted _080594A8: pop {r0} bx r0 .align 2, 0 _080594AC: .4byte gUnknown_2022D08 _080594B0: .4byte gUnknown_2023D08 - thumb_func_end sub_08059438 + thumb_func_end WaitForMonSelection - thumb_func_start sub_080594B4 -sub_080594B4: @ 0x080594B4 + thumb_func_start OpenBagAndChooseItem +OpenBagAndChooseItem: @ 0x080594B4 push {lr} ldr r0, _080594E0 ldrb r1, [r0, #7] @@ -181617,7 +181617,7 @@ sub_080594B4: @ 0x080594B4 ldr r1, _080594EC str r1, [r0] bl sub_080A8BBC - bl sub_080034D4 + bl FreeAllWindowBuffers bl sub_081AA928 _080594DC: pop {r0} @@ -181626,11 +181626,11 @@ _080594DC: _080594E0: .4byte gUnknown_2037C74 _080594E4: .4byte gUnknown_3005AC0 _080594E8: .4byte gUnknown_2023D08 -_080594EC: .4byte sub_080594F0 - thumb_func_end sub_080594B4 +_080594EC: .4byte CompleteWhenChoseItem + thumb_func_end OpenBagAndChooseItem - thumb_func_start sub_080594F0 -sub_080594F0: @ 0x080594F0 + thumb_func_start CompleteWhenChoseItem +CompleteWhenChoseItem: @ 0x080594F0 push {lr} ldr r0, _0805951C ldr r1, [r0, #4] @@ -181646,17 +181646,17 @@ sub_080594F0: @ 0x080594F0 ldr r0, _08059528 ldrh r1, [r0] movs r0, #1 - bl sub_08034014 - bl sub_0805709C + bl BtlController_EmitOneReturnValue + bl PlayerBufferExecCompleted _08059516: pop {r0} bx r0 .align 2, 0 _0805951C: .4byte gUnknown_3002360 -_08059520: .4byte sub_080380FC +_08059520: .4byte BattleMainCB2 _08059524: .4byte gUnknown_2037C74 _08059528: .4byte gUnknown_203CB48 - thumb_func_end sub_080594F0 + thumb_func_end CompleteWhenChoseItem thumb_func_start sub_0805952C sub_0805952C: @ 0x0805952C @@ -181680,7 +181680,7 @@ sub_0805952C: @ 0x0805952C cmp r0, #0 bne _08059556 _08059552: - bl sub_0805709C + bl PlayerBufferExecCompleted _08059556: pop {r0} bx r0 @@ -181718,7 +181718,7 @@ sub_08059568: @ 0x08059568 strb r0, [r2] ldr r0, _080595B0 strb r3, [r0] - bl sub_0805709C + bl PlayerBufferExecCompleted b _080595DE .align 2, 0 _080595A4: .4byte gUnknown_2023E88 @@ -181754,8 +181754,8 @@ _080595DE: bx r0 thumb_func_end sub_08059568 - thumb_func_start sub_080595E4 -sub_080595E4: @ 0x080595E4 + thumb_func_start PlayerHandleUnknownYesNoInput +PlayerHandleUnknownYesNoInput: @ 0x080595E4 push {r4, lr} sub sp, #4 ldr r0, _08059674 @@ -181771,11 +181771,11 @@ sub_080595E4: @ 0x080595E4 movs r0, #5 bl sub_080A306C ldrb r0, [r4] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 strb r0, [r4] movs r0, #0 - bl sub_08056784 + bl BattleCreateYesNoCursorAt _08059612: ldr r0, _08059674 ldrh r1, [r0, #0x2e] @@ -181790,11 +181790,11 @@ _08059612: movs r0, #5 bl sub_080A306C ldrb r0, [r4] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 strb r0, [r4] movs r0, #1 - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0805963C: ldr r0, _08059674 ldrh r1, [r0, #0x2e] @@ -181808,7 +181808,7 @@ _0805963C: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow movs r0, #5 bl sub_080A306C ldr r0, _08059678 @@ -181818,7 +181818,7 @@ _0805963C: movs r0, #1 movs r1, #0xe movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _08059686 .align 2, 0 _08059674: .4byte gUnknown_3002360 @@ -181827,9 +181827,9 @@ _0805967C: movs r0, #1 movs r1, #0xd movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _08059686: - bl sub_0805709C + bl PlayerBufferExecCompleted _0805968A: ldr r0, _080596B8 ldrh r1, [r0, #0x2e] @@ -181843,10 +181843,10 @@ _0805968A: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow movs r0, #5 bl sub_080A306C - bl sub_0805709C + bl PlayerBufferExecCompleted _080596B0: add sp, #4 pop {r4} @@ -181854,7 +181854,7 @@ _080596B0: bx r0 .align 2, 0 _080596B8: .4byte gUnknown_3002360 - thumb_func_end sub_080595E4 + thumb_func_end PlayerHandleUnknownYesNoInput thumb_func_start sub_080596BC sub_080596BC: @ 0x080596BC @@ -181940,8 +181940,8 @@ _08059764: .4byte gUnknown_85ABB9B _08059768: .4byte gUnknown_85ABBA1 thumb_func_end sub_08059734 - thumb_func_start sub_0805976C -sub_0805976C: @ 0x0805976C + thumb_func_start MoveSelectionDisplayPpNumber +MoveSelectionDisplayPpNumber: @ 0x0805976C push {r4, r5, r6, r7, lr} ldr r5, _080597D0 ldr r7, _080597D4 @@ -181993,7 +181993,7 @@ _080597D0: .4byte gUnknown_2022D08 _080597D4: .4byte gUnknown_2023D08 _080597D8: .4byte gUnknown_2022AE0 _080597DC: .4byte gUnknown_2024154 - thumb_func_end sub_0805976C + thumb_func_end MoveSelectionDisplayPpNumber thumb_func_start sub_080597E0 sub_080597E0: @ 0x080597E0 @@ -182037,8 +182037,8 @@ _08059834: .4byte gUnknown_2024154 _08059838: .4byte gUnknown_82EBC88 thumb_func_end sub_080597E0 - thumb_func_start sub_0805983C -sub_0805983C: @ 0x0805983C + thumb_func_start MoveSelectionCreateCursorAt +MoveSelectionCreateCursorAt: @ 0x0805983C push {lr} sub sp, #0x10 adds r3, r0, #0 @@ -182068,12 +182068,12 @@ sub_0805983C: @ 0x0805983C add r1, sp, #0xc bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x10 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805983C + thumb_func_end MoveSelectionCreateCursorAt thumb_func_start sub_08059884 sub_08059884: @ 0x08059884 @@ -182102,7 +182102,7 @@ sub_08059884: @ 0x08059884 add r1, sp, #0xc bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x10 pop {r0} bx r0 @@ -182110,8 +182110,8 @@ sub_08059884: @ 0x08059884 _080598C4: .4byte 0x00001016 thumb_func_end sub_08059884 - thumb_func_start sub_080598C8 -sub_080598C8: @ 0x080598C8 + thumb_func_start ActionSelectionCreateCursorAt +ActionSelectionCreateCursorAt: @ 0x080598C8 push {r4, lr} sub sp, #0x10 adds r3, r0, #0 @@ -182141,15 +182141,15 @@ sub_080598C8: @ 0x080598C8 add r1, sp, #0xc bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x10 pop {r4} pop {r0} bx r0 - thumb_func_end sub_080598C8 + thumb_func_end ActionSelectionCreateCursorAt - thumb_func_start sub_08059910 -sub_08059910: @ 0x08059910 + thumb_func_start MoveSelectionDestroyCursorAt +MoveSelectionDestroyCursorAt: @ 0x08059910 push {lr} sub sp, #0x10 adds r3, r0, #0 @@ -182180,34 +182180,34 @@ sub_08059910: @ 0x08059910 add r1, sp, #0xc bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x10 pop {r0} bx r0 .align 2, 0 _08059958: .4byte 0x00001016 - thumb_func_end sub_08059910 + thumb_func_end MoveSelectionDestroyCursorAt thumb_func_start sub_0805995C sub_0805995C: @ 0x0805995C push {lr} ldr r0, _08059968 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_08059968: .4byte sub_080A8BC0 +_08059968: .4byte ReshowBattleScreenAfterMenu thumb_func_end sub_0805995C thumb_func_start sub_0805996C sub_0805996C: @ 0x0805996C push {lr} ldr r0, _08059978 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_08059978: .4byte sub_080A8BC0 +_08059978: .4byte ReshowBattleScreenAfterMenu thumb_func_end sub_0805996C thumb_func_start sub_0805997C @@ -182227,7 +182227,7 @@ sub_0805997C: @ 0x0805997C ands r0, r1 cmp r0, #0 bne _0805999E - bl sub_0805709C + bl PlayerBufferExecCompleted _0805999E: pop {r0} bx r0 @@ -182253,7 +182253,7 @@ sub_080599AC: @ 0x080599AC ands r0, r1 cmp r0, #0 bne _080599CE - bl sub_0805709C + bl PlayerBufferExecCompleted _080599CE: pop {r0} bx r0 @@ -182262,8 +182262,8 @@ _080599D4: .4byte gUnknown_2024174 _080599D8: .4byte gUnknown_2023D08 thumb_func_end sub_080599AC - thumb_func_start sub_080599DC -sub_080599DC: @ 0x080599DC + thumb_func_start PrintLinkStandbyMsg +PrintLinkStandbyMsg: @ 0x080599DC push {lr} ldr r0, _08059A00 ldr r0, [r0] @@ -182287,7 +182287,7 @@ _08059A00: .4byte gUnknown_2022C90 _08059A04: .4byte gUnknown_2022AC8 _08059A08: .4byte gUnknown_2022ACA _08059A0C: .4byte gUnknown_85ABB62 - thumb_func_end sub_080599DC + thumb_func_end PrintLinkStandbyMsg thumb_func_start sub_08059A10 sub_08059A10: @ 0x08059A10 @@ -182308,7 +182308,7 @@ sub_08059A10: @ 0x08059A10 adds r1, r1, r0 ldrb r0, [r1] mov r1, sp - bl sub_08059A84 + bl CopyPlayerMonData adds r6, r0, #0 b _08059A6A .align 2, 0 @@ -182327,7 +182327,7 @@ _08059A4C: lsrs r0, r0, #0x18 mov r2, sp adds r1, r2, r6 - bl sub_08059A84 + bl CopyPlayerMonData adds r6, r6, r0 _08059A62: lsrs r4, r4, #1 @@ -182339,8 +182339,8 @@ _08059A6A: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_0805709C + bl BtlController_EmitDataTransfer + bl PlayerBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} @@ -182348,8 +182348,8 @@ _08059A6A: .align 2, 0 thumb_func_end sub_08059A10 - thumb_func_start sub_08059A84 -sub_08059A84: @ 0x08059A84 + thumb_func_start CopyPlayerMonData +CopyPlayerMonData: @ 0x08059A84 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -182449,12 +182449,12 @@ _08059BB4: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -182482,12 +182482,12 @@ _08059C00: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -182502,21 +182502,21 @@ _08059C00: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -182528,7 +182528,7 @@ _08059C00: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -182540,7 +182540,7 @@ _08059C00: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -182552,7 +182552,7 @@ _08059C00: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -182563,7 +182563,7 @@ _08059C00: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -182574,7 +182574,7 @@ _08059C00: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -182586,55 +182586,55 @@ _08059C00: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -182647,7 +182647,7 @@ _08059C00: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -182657,19 +182657,19 @@ _08059C00: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _08059DB8: @@ -182720,13 +182720,13 @@ _08059E0E: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -182740,7 +182740,7 @@ _08059E0E: ldr r1, _08059E5C adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -182782,7 +182782,7 @@ _08059E88: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -182793,7 +182793,7 @@ _08059E88: ldr r1, _08059EB4 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -182830,7 +182830,7 @@ _08059EE4: adds r0, r0, r1 movs r1, #0x19 _08059EEE: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -182963,27 +182963,27 @@ _08059FD4: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _0805A21A @@ -183068,7 +183068,7 @@ _0805A0A4: adds r0, r0, r1 movs r1, #0x37 _0805A0AE: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -183157,7 +183157,7 @@ _0805A148: adds r0, r0, r1 movs r1, #0x3f _0805A152: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -183264,7 +183264,7 @@ _0805A208: adds r0, r0, r1 movs r1, #0x36 _0805A212: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _0805A21A: @@ -183279,10 +183279,10 @@ _0805A21A: bx r1 .align 2, 0 _0805A22C: .4byte gUnknown_2024190 - thumb_func_end sub_08059A84 + thumb_func_end CopyPlayerMonData - thumb_func_start sub_0805A230 -sub_0805A230: @ 0x0805A230 + thumb_func_start PlayerHandleGetRawMonData +PlayerHandleGetRawMonData: @ 0x0805A230 push {r4, r5, r6, r7, lr} sub sp, #0x58 ldr r2, _0805A2A8 @@ -183336,8 +183336,8 @@ _0805A286: ldrb r1, [r0] movs r0, #1 adds r2, r4, #0 - bl sub_08033E70 - bl sub_0805709C + bl BtlController_EmitDataTransfer + bl PlayerBufferExecCompleted add sp, #0x58 pop {r4, r5, r6, r7} pop {r0} @@ -183347,7 +183347,7 @@ _0805A2A8: .4byte gUnknown_2023D12 _0805A2AC: .4byte gUnknown_2023D08 _0805A2B0: .4byte gUnknown_2022D08 _0805A2B4: .4byte gUnknown_2024190 - thumb_func_end sub_0805A230 + thumb_func_end PlayerHandleGetRawMonData thumb_func_start sub_0805A2B8 sub_0805A2B8: @ 0x0805A2B8 @@ -183365,7 +183365,7 @@ sub_0805A2B8: @ 0x0805A2B8 lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_0805A310 + bl SetPlayerMonData b _0805A306 .align 2, 0 _0805A2DC: .4byte gUnknown_2022D08 @@ -183380,7 +183380,7 @@ _0805A2EC: cmp r0, #0 beq _0805A2FA adds r0, r5, #0 - bl sub_0805A310 + bl SetPlayerMonData _0805A2FA: lsrs r4, r4, #1 adds r0, r5, #1 @@ -183389,14 +183389,14 @@ _0805A2FA: cmp r5, #5 bls _0805A2EC _0805A306: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_0805A2B8 - thumb_func_start sub_0805A310 -sub_0805A310: @ 0x0805A310 + thumb_func_start SetPlayerMonData +SetPlayerMonData: @ 0x0805A310 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -183498,12 +183498,12 @@ _0805A444: adds r0, r4, #0 movs r1, #0xb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -183544,12 +183544,12 @@ _0805A4AA: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r7, #1 adds r4, #2 movs r0, #1 @@ -183565,15 +183565,15 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -183582,7 +183582,7 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x14] lsls r0, r0, #0x16 @@ -183591,7 +183591,7 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x15] lsls r0, r0, #0x19 @@ -183600,7 +183600,7 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r6, #0x14] lsls r0, r0, #0xc @@ -183609,7 +183609,7 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x16] lsls r0, r0, #0x17 @@ -183618,7 +183618,7 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x17] lsls r0, r0, #0x1a @@ -183627,47 +183627,47 @@ _0805A4AA: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A5D8: .4byte gUnknown_2024190 @@ -183681,7 +183681,7 @@ _0805A5DC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A5F4: .4byte gUnknown_2024190 @@ -183696,7 +183696,7 @@ _0805A5FC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A614: .4byte gUnknown_2024190 @@ -183720,12 +183720,12 @@ _0805A636: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -183739,7 +183739,7 @@ _0805A636: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A670: .4byte gUnknown_2024190 @@ -183773,35 +183773,35 @@ _0805A69C: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x11 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A6F8: .4byte gUnknown_2024190 @@ -183822,7 +183822,7 @@ _0805A700: _0805A718: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A724: .4byte gUnknown_2024190 @@ -183838,7 +183838,7 @@ _0805A730: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A748: .4byte gUnknown_2024190 @@ -183853,7 +183853,7 @@ _0805A750: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A768: .4byte gUnknown_2024190 @@ -183868,7 +183868,7 @@ _0805A770: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A788: .4byte gUnknown_2024190 @@ -183883,7 +183883,7 @@ _0805A790: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A7A8: .4byte gUnknown_2024190 @@ -183898,7 +183898,7 @@ _0805A7B0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A7C8: .4byte gUnknown_2024190 @@ -183913,7 +183913,7 @@ _0805A7D0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A7E8: .4byte gUnknown_2024190 @@ -183928,7 +183928,7 @@ _0805A7F0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A808: .4byte gUnknown_2024190 @@ -183943,7 +183943,7 @@ _0805A810: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A828: .4byte gUnknown_2024190 @@ -183958,7 +183958,7 @@ _0805A830: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A848: .4byte gUnknown_2024190 @@ -183973,7 +183973,7 @@ _0805A850: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A868: .4byte gUnknown_2024190 @@ -183988,7 +183988,7 @@ _0805A870: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A888: .4byte gUnknown_2024190 @@ -184003,7 +184003,7 @@ _0805A890: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A8A8: .4byte gUnknown_2024190 @@ -184018,7 +184018,7 @@ _0805A8B0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A8C8: .4byte gUnknown_2024190 @@ -184033,7 +184033,7 @@ _0805A8D0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A8E8: .4byte gUnknown_2024190 @@ -184050,35 +184050,35 @@ _0805A8F0: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #5 @@ -184098,7 +184098,7 @@ _0805A960: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A978: .4byte gUnknown_2024190 @@ -184113,7 +184113,7 @@ _0805A980: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A998: .4byte gUnknown_2024190 @@ -184128,7 +184128,7 @@ _0805A9A0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A9B8: .4byte gUnknown_2024190 @@ -184143,7 +184143,7 @@ _0805A9C0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A9D8: .4byte gUnknown_2024190 @@ -184158,7 +184158,7 @@ _0805A9E0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805A9F8: .4byte gUnknown_2024190 @@ -184174,7 +184174,7 @@ _0805AA00: adds r2, r2, r7 _0805AA10: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AA18: .4byte gUnknown_2024190 @@ -184189,7 +184189,7 @@ _0805AA20: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AA38: .4byte gUnknown_2024190 @@ -184204,7 +184204,7 @@ _0805AA40: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AA58: .4byte gUnknown_2024190 @@ -184219,7 +184219,7 @@ _0805AA60: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AA78: .4byte gUnknown_2024190 @@ -184234,7 +184234,7 @@ _0805AA80: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AA98: .4byte gUnknown_2024190 @@ -184249,7 +184249,7 @@ _0805AAA0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AAB8: .4byte gUnknown_2024190 @@ -184264,7 +184264,7 @@ _0805AAC0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AAD8: .4byte gUnknown_2024190 @@ -184279,7 +184279,7 @@ _0805AAE0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AAF8: .4byte gUnknown_2024190 @@ -184294,7 +184294,7 @@ _0805AB00: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AB18: .4byte gUnknown_2024190 @@ -184309,7 +184309,7 @@ _0805AB20: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AB38: .4byte gUnknown_2024190 @@ -184324,7 +184324,7 @@ _0805AB40: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AB58: .4byte gUnknown_2024190 @@ -184339,7 +184339,7 @@ _0805AB60: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AB78: .4byte gUnknown_2024190 @@ -184354,7 +184354,7 @@ _0805AB80: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AB98: .4byte gUnknown_2024190 @@ -184369,7 +184369,7 @@ _0805ABA0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805ABB8: .4byte gUnknown_2024190 @@ -184384,7 +184384,7 @@ _0805ABC0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805ABD8: .4byte gUnknown_2024190 @@ -184399,7 +184399,7 @@ _0805ABE0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805ABF8: .4byte gUnknown_2024190 @@ -184414,7 +184414,7 @@ _0805AC00: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AC18: .4byte gUnknown_2024190 @@ -184429,7 +184429,7 @@ _0805AC20: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AC38: .4byte gUnknown_2024190 @@ -184444,7 +184444,7 @@ _0805AC40: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AC58: .4byte gUnknown_2024190 @@ -184459,7 +184459,7 @@ _0805AC60: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AC78: .4byte gUnknown_2024190 @@ -184474,7 +184474,7 @@ _0805AC80: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805AC98: .4byte gUnknown_2024190 @@ -184489,7 +184489,7 @@ _0805ACA0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _0805ACD6 .align 2, 0 _0805ACB8: .4byte gUnknown_2024190 @@ -184504,7 +184504,7 @@ _0805ACC0: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _0805ACD6: ldr r2, _0805AD08 ldr r0, _0805AD04 @@ -184516,7 +184516,7 @@ _0805ACD6: muls r0, r2, r0 ldr r2, _0805AD00 adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange add sp, #0x34 pop {r3, r4, r5} mov r8, r3 @@ -184529,10 +184529,10 @@ _0805ACD6: _0805AD00: .4byte gUnknown_2024190 _0805AD04: .4byte gUnknown_2023D08 _0805AD08: .4byte gUnknown_2023D12 - thumb_func_end sub_0805A310 + thumb_func_end SetPlayerMonData - thumb_func_start sub_0805AD0C -sub_0805AD0C: @ 0x0805AD0C + thumb_func_start PlayerHandleSetRawMonData +PlayerHandleSetRawMonData: @ 0x0805AD0C push {r4, r5, r6, r7, lr} ldr r1, _0805AD70 ldr r7, _0805AD74 @@ -184579,7 +184579,7 @@ _0805AD42: cmp r3, r0 blo _0805AD42 _0805AD64: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -184588,7 +184588,7 @@ _0805AD70: .4byte gUnknown_2023D12 _0805AD74: .4byte gUnknown_2023D08 _0805AD78: .4byte gUnknown_2022D08 _0805AD7C: .4byte gUnknown_2024190 - thumb_func_end sub_0805AD0C + thumb_func_end PlayerHandleSetRawMonData thumb_func_start PlayerHandleLoadMonSprite PlayerHandleLoadMonSprite: @ 0x0805AD80 @@ -184603,7 +184603,7 @@ PlayerHandleLoadMonSprite: @ 0x0805AD80 muls r0, r2, r0 ldr r2, _0805ADD4 adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldr r2, _0805ADD8 ldr r0, _0805ADDC ldrb r3, [r4] @@ -184667,7 +184667,7 @@ PlayerHandleSwitchInAnim: @ 0x0805ADE8 muls r0, r2, r0 ldr r2, _0805AE60 adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldr r1, _0805AE64 ldrb r0, [r5] adds r0, r0, r1 @@ -184730,13 +184730,13 @@ sub_0805AE74: @ 0x0805AE74 ldr r1, _0805AFD0 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _0805AFD4 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _0805AFD8 mov sb, r1 add sb, r6 @@ -184748,12 +184748,12 @@ sub_0805AE74: @ 0x0805AE74 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0805AFDC mov sl, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -184770,7 +184770,7 @@ sub_0805AE74: @ 0x0805AE74 mov r0, sl adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0805AFE0 adds r4, r6, r4 strb r0, [r4] @@ -184844,7 +184844,7 @@ sub_0805AE74: @ 0x0805AE74 str r1, [r0] movs r0, #0 movs r1, #0xff - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sb ldrb r2, [r1] lsls r1, r2, #4 @@ -184874,8 +184874,8 @@ _0805AFE8: .4byte gUnknown_2024188 _0805AFEC: .4byte sub_08007140 thumb_func_end sub_0805AE74 - thumb_func_start sub_0805AFF0 -sub_0805AFF0: @ 0x0805AFF0 + thumb_func_start PlayerHandleReturnMonToBall +PlayerHandleReturnMonToBall: @ 0x0805AFF0 push {r4, r5, r6, lr} ldr r1, _0805B024 ldr r6, _0805B028 @@ -184930,7 +184930,7 @@ _0805B038: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0805709C + bl PlayerBufferExecCompleted _0805B06E: pop {r4, r5, r6} pop {r0} @@ -184939,7 +184939,7 @@ _0805B06E: _0805B074: .4byte gUnknown_2023E88 _0805B078: .4byte gUnknown_20205AC _0805B07C: .4byte gUnknown_3005AD0 - thumb_func_end sub_0805AFF0 + thumb_func_end PlayerHandleReturnMonToBall thumb_func_start sub_0805B080 sub_0805B080: @ 0x0805B080 @@ -184974,7 +184974,7 @@ _0805B0A8: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0805B0C2: ldr r0, [r6] ldrb r1, [r5] @@ -184999,7 +184999,7 @@ _0805B0D6: adds r0, r2, #0 adds r1, r2, #0 movs r3, #1 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _0805B104 ldrb r0, [r5] lsls r0, r0, #2 @@ -185015,8 +185015,8 @@ _0805B104: .4byte gUnknown_3005AC0 _0805B108: .4byte sub_08059354 thumb_func_end sub_0805B080 - thumb_func_start sub_0805B10C -sub_0805B10C: @ 0x0805B10C + thumb_func_start PlayerHandleDrawTrainerPic +PlayerHandleDrawTrainerPic: @ 0x0805B10C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -185027,7 +185027,7 @@ sub_0805B10C: @ 0x0805B10C ands r0, r1 cmp r0, #0 beq _0805B1D0 - bl sub_0800A02C + bl GetMultiplayerId ldr r5, _0805B170 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -185039,7 +185039,7 @@ sub_0805B10C: @ 0x0805B10C ldrb r0, [r1] cmp r0, #4 beq _0805B154 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185052,7 +185052,7 @@ sub_0805B10C: @ 0x0805B10C cmp r0, #5 bne _0805B174 _0805B154: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185066,7 +185066,7 @@ _0805B154: _0805B16C: .4byte gUnknown_2022C90 _0805B170: .4byte gUnknown_20226A0 _0805B174: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185078,7 +185078,7 @@ _0805B174: ands r0, r1 cmp r0, #2 beq _0805B1A6 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185090,7 +185090,7 @@ _0805B174: cmp r4, #1 bne _0805B1BC _0805B1A6: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185101,7 +185101,7 @@ _0805B1A6: adds r4, r0, #4 b _0805B1D6 _0805B1BC: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185214,14 +185214,14 @@ _0805B28C: ldr r6, _0805B394 ldrb r1, [r6] adds r0, r5, #0 - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08069D00 + bl SetMultiuseSpriteTemplateToTrainerFront ldr r0, _0805B398 mov r8, r0 lsls r4, r7, #0x10 @@ -185234,7 +185234,7 @@ _0805B28C: mov r0, r8 mov r1, sb adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0805B39C ldrb r1, [r6] adds r1, r1, r4 @@ -185243,7 +185243,7 @@ _0805B28C: lsls r5, r5, #3 adds r5, r5, r0 ldrh r0, [r5, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r5, _0805B3A4 ldrb r1, [r6] adds r1, r1, r4 @@ -185337,14 +185337,14 @@ _0805B3B0: ldr r5, _0805B460 ldrb r1, [r5] adds r0, r4, #0 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _0805B464 mov r8, sb lsls r4, r7, #0x10 @@ -185357,7 +185357,7 @@ _0805B3B0: adds r0, r6, #0 mov r1, r8 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _0805B468 ldrb r1, [r5] adds r1, r1, r6 @@ -185427,10 +185427,10 @@ _0805B470: .4byte 0x0000FFFE _0805B474: .4byte sub_0805D3C8 _0805B478: .4byte gUnknown_3005AC0 _0805B47C: .4byte sub_08058454 - thumb_func_end sub_0805B10C + thumb_func_end PlayerHandleDrawTrainerPic - thumb_func_start sub_0805B480 -sub_0805B480: @ 0x0805B480 + thumb_func_start PlayerHandleTrainerSlide +PlayerHandleTrainerSlide: @ 0x0805B480 push {r4, r5, r6, lr} ldr r0, _0805B4D8 ldr r0, [r0] @@ -185438,7 +185438,7 @@ sub_0805B480: @ 0x0805B480 ands r0, r1 cmp r0, #0 beq _0805B53C - bl sub_0800A02C + bl GetMultiplayerId ldr r5, _0805B4DC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -185450,7 +185450,7 @@ sub_0805B480: @ 0x0805B480 ldrb r0, [r1] cmp r0, #4 beq _0805B4C2 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185463,7 +185463,7 @@ sub_0805B480: @ 0x0805B480 cmp r0, #5 bne _0805B4E0 _0805B4C2: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185477,7 +185477,7 @@ _0805B4C2: _0805B4D8: .4byte gUnknown_2022C90 _0805B4DC: .4byte gUnknown_20226A0 _0805B4E0: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185489,7 +185489,7 @@ _0805B4E0: ands r0, r1 cmp r0, #2 beq _0805B512 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185501,7 +185501,7 @@ _0805B4E0: cmp r4, #1 bne _0805B528 _0805B512: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185512,7 +185512,7 @@ _0805B512: adds r4, r0, #4 b _0805B542 _0805B528: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -185529,14 +185529,14 @@ _0805B542: ldr r5, _0805B5F0 ldrb r1, [r5] adds r0, r4, #0 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r0, _0805B5F4 ldr r1, _0805B5F8 lsls r4, r4, #2 @@ -185551,7 +185551,7 @@ _0805B542: asrs r2, r2, #0x10 movs r1, #0x50 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r6, _0805B5FC ldrb r1, [r5] adds r1, r1, r6 @@ -185618,10 +185618,10 @@ _0805B604: .4byte 0x0000FFA0 _0805B608: .4byte sub_0805D3C8 _0805B60C: .4byte gUnknown_3005AC0 _0805B610: .4byte sub_0805848C - thumb_func_end sub_0805B480 + thumb_func_end PlayerHandleTrainerSlide - thumb_func_start sub_0805B614 -sub_0805B614: @ 0x0805B614 + thumb_func_start PlayerHandleTrainerSlideBack +PlayerHandleTrainerSlideBack: @ 0x0805B614 push {r4, r5, r6, lr} ldr r5, _0805B6B4 ldr r6, _0805B6B8 @@ -185680,7 +185680,7 @@ sub_0805B614: @ 0x0805B614 lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _0805B6C8 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r0, [r6] adds r0, r0, r5 ldrb r1, [r0] @@ -185708,10 +185708,10 @@ _0805B6C4: .4byte sub_080A67B4 _0805B6C8: .4byte sub_08007140 _0805B6CC: .4byte gUnknown_3005AC0 _0805B6D0: .4byte sub_080584C4 - thumb_func_end sub_0805B614 + thumb_func_end PlayerHandleTrainerSlideBack - thumb_func_start sub_0805B6D4 -sub_0805B6D4: @ 0x0805B6D4 + thumb_func_start PlayerHandleFaintAnimation +PlayerHandleFaintAnimation: @ 0x0805B6D4 push {r4, r5, r6, lr} ldr r6, _0805B720 ldr r4, [r6] @@ -185736,7 +185736,7 @@ sub_0805B6D4: @ 0x0805B6D4 adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0805B708: ldr r0, [r6] ldrb r1, [r5] @@ -185770,11 +185770,11 @@ _0805B728: muls r0, r2, r0 ldr r2, _0805B7A8 adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange movs r1, #0x40 rsbs r1, r1, #0 movs r0, #0x10 - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _0805B7AC ldr r3, _0805B7B0 ldrb r0, [r5] @@ -185822,10 +185822,10 @@ _0805B7B0: .4byte gUnknown_2023E88 _0805B7B4: .4byte sub_08039844 _0805B7B8: .4byte gUnknown_3005AC0 _0805B7BC: .4byte sub_080592B8 - thumb_func_end sub_0805B6D4 + thumb_func_end PlayerHandleFaintAnimation - thumb_func_start sub_0805B7C0 -sub_0805B7C0: @ 0x0805B7C0 + thumb_func_start PlayerHandlePaletteFade +PlayerHandlePaletteFade: @ 0x0805B7C0 push {lr} sub sp, #4 movs r0, #1 @@ -185835,15 +185835,15 @@ sub_0805B7C0: @ 0x0805B7C0 movs r1, #2 movs r2, #0 movs r3, #0x10 - bl sub_080A139C - bl sub_0805709C + bl BeginNormalPaletteFade + bl PlayerBufferExecCompleted add sp, #4 pop {r0} bx r0 - thumb_func_end sub_0805B7C0 + thumb_func_end PlayerHandlePaletteFade - thumb_func_start sub_0805B7E0 -sub_0805B7E0: @ 0x0805B7E0 + thumb_func_start PlayerHandleSuccessBallThrowAnim +PlayerHandleSuccessBallThrowAnim: @ 0x0805B7E0 push {r4, r5, lr} ldr r0, _0805B820 ldr r0, [r0] @@ -185863,7 +185863,7 @@ sub_0805B7E0: @ 0x0805B7E0 adds r0, r4, #0 adds r1, r4, #0 movs r3, #3 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _0805B82C ldrb r0, [r5] lsls r0, r0, #2 @@ -185879,10 +185879,10 @@ _0805B824: .4byte gUnknown_202415D _0805B828: .4byte gUnknown_2023D08 _0805B82C: .4byte gUnknown_3005AC0 _0805B830: .4byte sub_0805952C - thumb_func_end sub_0805B7E0 + thumb_func_end PlayerHandleSuccessBallThrowAnim - thumb_func_start sub_0805B834 -sub_0805B834: @ 0x0805B834 + thumb_func_start PlayerHandleBallThrowAnim +PlayerHandleBallThrowAnim: @ 0x0805B834 push {r4, r5, lr} ldr r1, _0805B87C ldr r5, _0805B880 @@ -185907,7 +185907,7 @@ sub_0805B834: @ 0x0805B834 adds r0, r4, #0 adds r1, r4, #0 movs r3, #3 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _0805B88C ldrb r0, [r5] lsls r0, r0, #2 @@ -185924,10 +185924,10 @@ _0805B884: .4byte gUnknown_2024174 _0805B888: .4byte gUnknown_202415D _0805B88C: .4byte gUnknown_3005AC0 _0805B890: .4byte sub_0805952C - thumb_func_end sub_0805B834 + thumb_func_end PlayerHandleBallThrowAnim - thumb_func_start sub_0805B894 -sub_0805B894: @ 0x0805B894 + thumb_func_start PlayerHandlePause +PlayerHandlePause: @ 0x0805B894 push {lr} ldr r1, _0805B8BC ldr r0, _0805B8C0 @@ -185945,22 +185945,22 @@ _0805B8A8: cmp r0, #0 bne _0805B8A8 _0805B8B2: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805B8BC: .4byte gUnknown_2022D08 _0805B8C0: .4byte gUnknown_2023D08 - thumb_func_end sub_0805B894 + thumb_func_end PlayerHandlePause - thumb_func_start sub_0805B8C4 -sub_0805B8C4: @ 0x0805B8C4 + thumb_func_start PlayerHandleMoveAnimation +PlayerHandleMoveAnimation: @ 0x0805B8C4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} ldr r5, _0805B9B4 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _0805B8DA @@ -186070,7 +186070,7 @@ _0805B8DA: lsrs r3, r0, #0x18 cmp r3, #0 beq _0805B9D8 - bl sub_0805709C + bl PlayerBufferExecCompleted b _0805BA00 .align 2, 0 _0805B9B4: .4byte gUnknown_2023D08 @@ -186101,7 +186101,7 @@ _0805B9D8: ldrh r1, [r4] ldr r2, [r7] adds r0, r6, #0 - bl sub_0817DFA8 + bl BattleTv_SetDataBasedOnMove _0805BA00: pop {r3} mov r8, r3 @@ -186112,7 +186112,7 @@ _0805BA00: _0805BA0C: .4byte gUnknown_2024174 _0805BA10: .4byte gUnknown_3005AC0 _0805BA14: .4byte sub_0805BA18 - thumb_func_end sub_0805B8C4 + thumb_func_end PlayerHandleMoveAnimation thumb_func_start sub_0805BA18 sub_0805BA18: @ 0x0805BA18 @@ -186180,7 +186180,7 @@ _0805BA7A: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0805BA9C: ldr r0, [r7] ldrb r1, [r6] @@ -186238,7 +186238,7 @@ _0805BADA: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -186294,7 +186294,7 @@ _0805BB50: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_0805709C + bl PlayerBufferExecCompleted _0805BB8C: pop {r3, r4, r5} mov r8, r3 @@ -186306,8 +186306,8 @@ _0805BB8C: .align 2, 0 thumb_func_end sub_0805BA18 - thumb_func_start sub_0805BB9C -sub_0805BB9C: @ 0x0805BB9C + thumb_func_start PlayerHandlePrintString +PlayerHandlePrintString: @ 0x0805BB9C push {r4, r5, lr} ldr r0, _0805BBE0 movs r1, #0 @@ -186320,7 +186320,7 @@ sub_0805BB9C: @ 0x0805BB9C ldr r0, _0805BBEC adds r4, r4, r0 ldrh r0, [r4] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _0805BBF0 movs r1, #0 bl sub_0814FA04 @@ -186331,10 +186331,10 @@ sub_0805BB9C: @ 0x0805BB9C ldr r1, _0805BBF8 str r1, [r0] ldrh r0, [r4] - bl sub_0817C808 + bl BattleTv_SetDataBasedOnString ldrb r0, [r5] ldrh r1, [r4] - bl sub_081A53D4 + bl BattleArena_DeductMindPoints pop {r4, r5} pop {r0} bx r0 @@ -186346,32 +186346,32 @@ _0805BBEC: .4byte gUnknown_2022D0A _0805BBF0: .4byte gUnknown_2022AE0 _0805BBF4: .4byte gUnknown_3005AC0 _0805BBF8: .4byte sub_080593C4 - thumb_func_end sub_0805BB9C + thumb_func_end PlayerHandlePrintString - thumb_func_start sub_0805BBFC -sub_0805BBFC: @ 0x0805BBFC + thumb_func_start PlayerHandlePrintSelectionString +PlayerHandlePrintSelectionString: @ 0x0805BBFC push {lr} ldr r0, _0805BC14 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0805BC18 - bl sub_0805BB9C + bl PlayerHandlePrintString b _0805BC1C .align 2, 0 _0805BC14: .4byte gUnknown_2023D08 _0805BC18: - bl sub_0805709C + bl PlayerBufferExecCompleted _0805BC1C: pop {r0} bx r0 - thumb_func_end sub_0805BBFC + thumb_func_end PlayerHandlePrintSelectionString thumb_func_start sub_0805BC20 sub_0805BC20: @ 0x0805BC20 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -186399,8 +186399,8 @@ _0805BC58: .4byte gUnknown_2023D08 _0805BC5C: .4byte sub_08057198 thumb_func_end sub_0805BC20 - thumb_func_start sub_0805BC60 -sub_0805BC60: @ 0x0805BC60 + thumb_func_start PlayerHandleChooseAction +PlayerHandleChooseAction: @ 0x0805BC60 push {r4, lr} ldr r1, _0805BCB0 ldr r0, _0805BCB4 @@ -186417,7 +186417,7 @@ sub_0805BC60: @ 0x0805BC60 _0805BC7E: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_08059910 + bl MoveSelectionDestroyCursorAt adds r4, #1 cmp r4, #3 ble _0805BC7E @@ -186427,9 +186427,9 @@ _0805BC7E: adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt ldr r0, _0805BCC4 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0805BCC8 movs r1, #1 bl sub_0814FA04 @@ -186444,15 +186444,15 @@ _0805BCBC: .4byte gUnknown_85ABB72 _0805BCC0: .4byte gUnknown_2024150 _0805BCC4: .4byte gUnknown_85ABB43 _0805BCC8: .4byte gUnknown_2022AE0 - thumb_func_end sub_0805BC60 + thumb_func_end PlayerHandleChooseAction - thumb_func_start sub_0805BCCC -sub_0805BCCC: @ 0x0805BCCC + thumb_func_start PlayerHandleUnknownYesNoBox +PlayerHandleUnknownYesNoBox: @ 0x0805BCCC push {r4, lr} sub sp, #4 ldr r4, _0805BD10 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -186462,7 +186462,7 @@ sub_0805BCCC: @ 0x0805BCCC movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _0805BD14 movs r1, #0xc bl sub_0814FA04 @@ -186470,7 +186470,7 @@ sub_0805BCCC: @ 0x0805BCCC movs r0, #1 strb r0, [r1] movs r0, #1 - bl sub_08056784 + bl BattleCreateYesNoCursorAt ldr r1, _0805BD1C ldrb r0, [r4] lsls r0, r0, #2 @@ -186483,20 +186483,20 @@ _0805BD10: .4byte gUnknown_2023D08 _0805BD14: .4byte gUnknown_85ABBC9 _0805BD18: .4byte gUnknown_3005AD4 _0805BD1C: .4byte gUnknown_3005AC0 -_0805BD20: .4byte sub_080595E4 +_0805BD20: .4byte PlayerHandleUnknownYesNoInput _0805BD24: - bl sub_0805709C + bl PlayerBufferExecCompleted _0805BD28: add sp, #4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_0805BCCC + thumb_func_end PlayerHandleUnknownYesNoBox - thumb_func_start sub_0805BD30 -sub_0805BD30: @ 0x0805BD30 + thumb_func_start HandleChooseMoveAfterDma3 +HandleChooseMoveAfterDma3: @ 0x0805BD30 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -186523,11 +186523,11 @@ _0805BD60: .4byte gUnknown_2022AC8 _0805BD64: .4byte gUnknown_2022ACA _0805BD68: .4byte gUnknown_3005AC0 _0805BD6C: .4byte gUnknown_2023D08 -_0805BD70: .4byte sub_0805780C - thumb_func_end sub_0805BD30 +_0805BD70: .4byte HandleInputChooseMove + thumb_func_end HandleChooseMoveAfterDma3 - thumb_func_start sub_0805BD74 -sub_0805BD74: @ 0x0805BD74 + thumb_func_start PlayerChooseMoveInBattlePalace +PlayerChooseMoveInBattlePalace: @ 0x0805BD74 push {lr} ldr r0, _0805BDB4 ldrb r1, [r0] @@ -186547,14 +186547,14 @@ sub_0805BD74: @ 0x0805BD74 ldr r0, _0805BDC0 ldr r0, [r0] str r0, [r1] - bl sub_0805CDB8 + bl ChooseMoveAndTargetInBattlePalace adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 - bl sub_0805709C + bl BtlController_EmitTwoReturnValues + bl PlayerBufferExecCompleted _0805BDB0: pop {r0} bx r0 @@ -186563,10 +186563,10 @@ _0805BDB4: .4byte gUnknown_2023D08 _0805BDB8: .4byte gUnknown_2024140 _0805BDBC: .4byte gUnknown_203B9FC _0805BDC0: .4byte gUnknown_3005AE0 - thumb_func_end sub_0805BD74 + thumb_func_end PlayerChooseMoveInBattlePalace - thumb_func_start sub_0805BDC4 -sub_0805BDC4: @ 0x0805BDC4 + thumb_func_start PlayerHandleChooseMove +PlayerHandleChooseMove: @ 0x0805BDC4 push {lr} ldr r0, _0805BDF4 ldr r0, [r0] @@ -186596,9 +186596,9 @@ _0805BDF4: .4byte gUnknown_2022C90 _0805BDF8: .4byte gUnknown_2023D08 _0805BDFC: .4byte gUnknown_2024140 _0805BE00: .4byte gUnknown_3005AC0 -_0805BE04: .4byte sub_0805BD74 +_0805BE04: .4byte PlayerChooseMoveInBattlePalace _0805BE08: - bl sub_0805BE2C + bl InitMoveSelectionsVarsAndStrings ldr r1, _0805BE20 ldr r0, _0805BE24 ldrb r0, [r0] @@ -186612,11 +186612,11 @@ _0805BE18: .align 2, 0 _0805BE20: .4byte gUnknown_3005AC0 _0805BE24: .4byte gUnknown_2023D08 -_0805BE28: .4byte sub_0805BD30 - thumb_func_end sub_0805BDC4 +_0805BE28: .4byte HandleChooseMoveAfterDma3 + thumb_func_end PlayerHandleChooseMove - thumb_func_start sub_0805BE2C -sub_0805BE2C: @ 0x0805BE2C + thumb_func_start InitMoveSelectionsVarsAndStrings +InitMoveSelectionsVarsAndStrings: @ 0x0805BE2C push {lr} bl sub_080596BC ldr r1, _0805BE58 @@ -186628,9 +186628,9 @@ sub_0805BE2C: @ 0x0805BE2C adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_0805983C + bl MoveSelectionCreateCursorAt bl sub_08059734 - bl sub_0805976C + bl MoveSelectionDisplayPpNumber bl sub_080597E0 pop {r0} bx r0 @@ -186638,10 +186638,10 @@ sub_0805BE2C: @ 0x0805BE2C _0805BE58: .4byte gUnknown_3005AD4 _0805BE5C: .4byte gUnknown_2024154 _0805BE60: .4byte gUnknown_2023D08 - thumb_func_end sub_0805BE2C + thumb_func_end InitMoveSelectionsVarsAndStrings - thumb_func_start sub_0805BE64 -sub_0805BE64: @ 0x0805BE64 + thumb_func_start PlayerHandleChooseItem +PlayerHandleChooseItem: @ 0x0805BE64 push {r4, r5, lr} sub sp, #4 movs r0, #1 @@ -186650,7 +186650,7 @@ sub_0805BE64: @ 0x0805BE64 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0805BEB0 ldr r2, _0805BEB4 ldrb r0, [r2] @@ -186683,14 +186683,14 @@ _0805BE92: .align 2, 0 _0805BEB0: .4byte gUnknown_3005AC0 _0805BEB4: .4byte gUnknown_2023D08 -_0805BEB8: .4byte sub_080594B4 +_0805BEB8: .4byte OpenBagAndChooseItem _0805BEBC: .4byte gUnknown_202415C _0805BEC0: .4byte gUnknown_203CBCC _0805BEC4: .4byte gUnknown_2022D08 - thumb_func_end sub_0805BE64 + thumb_func_end PlayerHandleChooseItem - thumb_func_start sub_0805BEC8 -sub_0805BEC8: @ 0x0805BEC8 + thumb_func_start PlayerHandleChoosePokemon +PlayerHandleChoosePokemon: @ 0x0805BEC8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -186742,8 +186742,8 @@ _0805BEE4: lsrs r1, r1, #0x18 movs r0, #1 mov r2, ip - bl sub_08033FDC - bl sub_0805709C + bl BtlController_EmitChosenMonReturnValue + bl PlayerBufferExecCompleted b _0805BFD8 .align 2, 0 _0805BF38: .4byte gUnknown_203CBCC @@ -186754,7 +186754,7 @@ _0805BF48: .4byte gUnknown_2023D12 _0805BF4C: ldr r0, _0805BFE4 movs r1, #0xff - bl sub_080A8878 + bl CreateTask ldr r3, _0805BFE8 ldr r4, _0805BFEC ldrb r1, [r4] @@ -186810,7 +186810,7 @@ _0805BF4C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0805BFFC ldrb r0, [r4] lsls r0, r0, #2 @@ -186835,15 +186835,15 @@ _0805BFF0: .4byte gUnknown_3005B60 _0805BFF4: .4byte gUnknown_2022D08 _0805BFF8: .4byte gUnknown_2024140 _0805BFFC: .4byte gUnknown_3005AC0 -_0805C000: .4byte sub_080593DC +_0805C000: .4byte OpenPartyMenuToChooseMon _0805C004: .4byte gUnknown_202415C - thumb_func_end sub_0805BEC8 + thumb_func_end PlayerHandleChoosePokemon - thumb_func_start sub_0805C008 -sub_0805C008: @ 0x0805C008 + thumb_func_start PlayerHandleCmd23 +PlayerHandleCmd23: @ 0x0805C008 push {lr} sub sp, #4 - bl sub_0805E67C + bl BattleStopLowHpSound movs r0, #1 rsbs r0, r0, #0 movs r1, #0 @@ -186851,22 +186851,22 @@ sub_0805C008: @ 0x0805C008 movs r1, #2 movs r2, #0 movs r3, #0x10 - bl sub_080A139C - bl sub_0805709C + bl BeginNormalPaletteFade + bl PlayerBufferExecCompleted add sp, #4 pop {r0} bx r0 - thumb_func_end sub_0805C008 + thumb_func_end PlayerHandleCmd23 - thumb_func_start sub_0805C02C -sub_0805C02C: @ 0x0805C02C + thumb_func_start PlayerHandleHealthBarUpdate +PlayerHandleHealthBarUpdate: @ 0x0805C02C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _0805C0B4 ldr r0, _0805C0B8 mov sb, r0 @@ -186903,7 +186903,7 @@ _0805C066: ldr r4, _0805C0C8 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r2, sb ldrb r0, [r2] @@ -186913,7 +186913,7 @@ _0805C066: muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -186944,7 +186944,7 @@ _0805C0D0: ldr r1, _0805C130 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -186983,10 +186983,10 @@ _0805C134: .4byte gUnknown_3005AD0 _0805C138: .4byte gUnknown_3005AC0 _0805C13C: .4byte gUnknown_2023D08 _0805C140: .4byte sub_08058D40 - thumb_func_end sub_0805C02C + thumb_func_end PlayerHandleHealthBarUpdate - thumb_func_start sub_0805C144 -sub_0805C144: @ 0x0805C144 + thumb_func_start PlayerHandleExpUpdate +PlayerHandleExpUpdate: @ 0x0805C144 push {r4, r5, r6, r7, lr} ldr r5, _0805C170 ldr r6, _0805C174 @@ -187002,10 +187002,10 @@ sub_0805C144: @ 0x0805C144 adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x63 bls _0805C17C - bl sub_0805709C + bl PlayerBufferExecCompleted b _0805C1C8 .align 2, 0 _0805C170: .4byte gUnknown_2022D08 @@ -187013,10 +187013,10 @@ _0805C174: .4byte gUnknown_2023D08 _0805C178: .4byte gUnknown_2024190 _0805C17C: movs r0, #1 - bl sub_0805DDD4 + bl LoadBattleBarGfx adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldrb r1, [r6] lsls r1, r1, #9 adds r0, r5, #2 @@ -187029,7 +187029,7 @@ _0805C17C: orrs r4, r0 ldr r0, _0805C1D0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0805C1D4 @@ -187056,14 +187056,14 @@ _0805C1D0: .4byte sub_08058DC8 _0805C1D4: .4byte gUnknown_3005B60 _0805C1D8: .4byte gUnknown_3005AC0 _0805C1DC: .4byte sub_08057068 - thumb_func_end sub_0805C144 + thumb_func_end PlayerHandleExpUpdate - thumb_func_start sub_0805C1E0 -sub_0805C1E0: @ 0x0805C1E0 + thumb_func_start PlayerHandleStatusIconUpdate +PlayerHandleStatusIconUpdate: @ 0x0805C1E0 push {r4, lr} ldr r4, _0805C23C ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0805C234 @@ -187080,7 +187080,7 @@ sub_0805C1E0: @ 0x0805C1E0 ldr r2, _0805C248 adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _0805C24C ldr r0, [r0] @@ -187112,14 +187112,14 @@ _0805C248: .4byte gUnknown_2024190 _0805C24C: .4byte gUnknown_2024174 _0805C250: .4byte gUnknown_3005AC0 _0805C254: .4byte sub_0805997C - thumb_func_end sub_0805C1E0 + thumb_func_end PlayerHandleStatusIconUpdate thumb_func_start PlayerHandleStatusAnimation PlayerHandleStatusAnimation: @ 0x0805C258 push {r4, r5, lr} ldr r5, _0805C2B0 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0805C2A8 @@ -187147,7 +187147,7 @@ PlayerHandleStatusAnimation: @ 0x0805C258 ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _0805C2B8 ldrb r0, [r5] lsls r0, r0, #2 @@ -187165,8 +187165,8 @@ _0805C2B8: .4byte gUnknown_3005AC0 _0805C2BC: .4byte sub_0805997C thumb_func_end PlayerHandleStatusAnimation - thumb_func_start sub_0805C2C0 -sub_0805C2C0: @ 0x0805C2C0 + thumb_func_start PlayerHandleStatusXor +PlayerHandleStatusXor: @ 0x0805C2C0 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -187183,7 +187183,7 @@ sub_0805C2C0: @ 0x0805C2C0 ldr r5, _0805C324 adds r0, r0, r5 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData ldr r2, _0805C328 ldrb r1, [r4] lsls r1, r1, #9 @@ -187201,8 +187201,8 @@ sub_0805C2C0: @ 0x0805C2C0 adds r0, r0, r5 movs r1, #0x37 mov r2, sp - bl sub_0806A774 - bl sub_0805709C + bl SetMonData + bl PlayerBufferExecCompleted add sp, #4 pop {r3} mov r8, r3 @@ -187214,19 +187214,19 @@ _0805C31C: .4byte gUnknown_2023D12 _0805C320: .4byte gUnknown_2023D08 _0805C324: .4byte gUnknown_2024190 _0805C328: .4byte gUnknown_2022D08 - thumb_func_end sub_0805C2C0 + thumb_func_end PlayerHandleStatusXor thumb_func_start sub_0805C32C sub_0805C32C: @ 0x0805C32C push {lr} - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0805C32C - thumb_func_start sub_0805C338 -sub_0805C338: @ 0x0805C338 + thumb_func_start PlayerHandleDMA3Transfer +PlayerHandleDMA3Transfer: @ 0x0805C338 push {r4, r5, lr} ldr r3, _0805C39C ldr r0, _0805C3A0 @@ -187304,7 +187304,7 @@ _0805C3A8: str r0, [r3, #8] ldr r0, [r3, #8] _0805C3D4: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 @@ -187312,10 +187312,10 @@ _0805C3D4: _0805C3E0: .4byte 0x040000D4 _0805C3E4: .4byte 0x80000800 _0805C3E8: .4byte 0xFFFFF000 - thumb_func_end sub_0805C338 + thumb_func_end PlayerHandleDMA3Transfer - thumb_func_start sub_0805C3EC -sub_0805C3EC: @ 0x0805C3EC + thumb_func_start PlayerHandlePlayBGM +PlayerHandlePlayBGM: @ 0x0805C3EC push {lr} ldr r2, _0805C414 ldr r0, _0805C418 @@ -187329,23 +187329,23 @@ sub_0805C3EC: @ 0x0805C3EC ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 - bl sub_0805709C + bl PlayBGM + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805C414: .4byte gUnknown_2022D08 _0805C418: .4byte gUnknown_2023D08 - thumb_func_end sub_0805C3EC + thumb_func_end PlayerHandlePlayBGM - thumb_func_start sub_0805C41C -sub_0805C41C: @ 0x0805C41C + thumb_func_start ScrCmd_choosecontestmon +ScrCmd_choosecontestmon: @ 0x0805C41C push {lr} - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805C41C + thumb_func_end ScrCmd_choosecontestmon thumb_func_start sub_0805C428 sub_0805C428: @ 0x0805C428 @@ -187353,8 +187353,8 @@ sub_0805C428: @ 0x0805C428 movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08033FB0 - bl sub_0805709C + bl BtlController_EmitTwoReturnValues + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_0805C428 @@ -187365,8 +187365,8 @@ sub_0805C43C: @ 0x0805C43C movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08033FDC - bl sub_0805709C + bl BtlController_EmitChosenMonReturnValue + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_0805C43C @@ -187376,8 +187376,8 @@ sub_0805C450: @ 0x0805C450 push {lr} movs r0, #1 movs r1, #0 - bl sub_08034014 - bl sub_0805709C + bl BtlController_EmitOneReturnValue + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -187388,8 +187388,8 @@ sub_0805C464: @ 0x0805C464 push {lr} movs r0, #1 movs r1, #0 - bl sub_08034040 - bl sub_0805709C + bl BtlController_EmitOneReturnValue_Duplicate + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -187404,15 +187404,15 @@ sub_0805C478: @ 0x0805C478 rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805C490: .4byte gUnknown_20229C0 thumb_func_end sub_0805C478 - thumb_func_start sub_0805C494 -sub_0805C494: @ 0x0805C494 + thumb_func_start PlayerHandleCmd38 +PlayerHandleCmd38: @ 0x0805C494 push {lr} ldr r3, _0805C4C0 ldr r1, _0805C4C4 @@ -187430,32 +187430,32 @@ sub_0805C494: @ 0x0805C494 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805C4C0: .4byte gUnknown_20229C0 _0805C4C4: .4byte gUnknown_2022D08 _0805C4C8: .4byte gUnknown_2023D08 - thumb_func_end sub_0805C494 + thumb_func_end PlayerHandleCmd38 - thumb_func_start sub_0805C4CC -sub_0805C4CC: @ 0x0805C4CC + thumb_func_start PlayerHandleCmd39 +PlayerHandleCmd39: @ 0x0805C4CC push {lr} ldr r2, _0805C4E0 ldrb r1, [r2] movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805C4E0: .4byte gUnknown_20229C0 - thumb_func_end sub_0805C4CC + thumb_func_end PlayerHandleCmd39 - thumb_func_start sub_0805C4E4 -sub_0805C4E4: @ 0x0805C4E4 + thumb_func_start PlayerHandleCmd40 +PlayerHandleCmd40: @ 0x0805C4E4 push {lr} ldr r3, _0805C508 ldr r1, [r3] @@ -187469,12 +187469,12 @@ sub_0805C4E4: @ 0x0805C4E4 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805C508: .4byte gUnknown_20229C0 - thumb_func_end sub_0805C4E4 + thumb_func_end PlayerHandleCmd40 thumb_func_start sub_0805C50C sub_0805C50C: @ 0x0805C50C @@ -187494,7 +187494,7 @@ sub_0805C50C: @ 0x0805C50C lsls r0, r0, #0x1d cmp r0, #0 bge _0805C540 - bl sub_0805709C + bl PlayerBufferExecCompleted b _0805C56A .align 2, 0 _0805C534: .4byte gUnknown_20205AC @@ -187534,18 +187534,18 @@ _0805C578: .4byte sub_08059568 thumb_func_start sub_0805C57C sub_0805C57C: @ 0x0805C57C push {lr} - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0805C57C - thumb_func_start sub_0805C588 -sub_0805C588: @ 0x0805C588 + thumb_func_start PlayerHandlePlaySE +PlayerHandlePlaySE: @ 0x0805C588 push {r4, lr} ldr r4, _0805C5C4 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -187565,18 +187565,18 @@ _0805C59C: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_0805709C + bl PlaySE12WithPanning + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _0805C5C4: .4byte gUnknown_2023D08 _0805C5C8: .4byte gUnknown_2022D08 - thumb_func_end sub_0805C588 + thumb_func_end PlayerHandlePlaySE - thumb_func_start sub_0805C5CC -sub_0805C5CC: @ 0x0805C5CC + thumb_func_start PlayerHandlePlayFanfareOrBGM +PlayerHandlePlayFanfareOrBGM: @ 0x0805C5CC push {r4, r5, lr} ldr r4, _0805C600 ldr r5, _0805C604 @@ -187587,7 +187587,7 @@ sub_0805C5CC: @ 0x0805C5CC ldrb r0, [r0] cmp r0, #0 beq _0805C608 - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -187598,7 +187598,7 @@ sub_0805C5CC: @ 0x0805C5CC ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _0805C61C .align 2, 0 _0805C600: .4byte gUnknown_2022D08 @@ -187612,17 +187612,17 @@ _0805C608: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _0805C61C: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805C5CC + thumb_func_end PlayerHandlePlayFanfareOrBGM - thumb_func_start sub_0805C628 -sub_0805C628: @ 0x0805C628 + thumb_func_start PlayerHandleFaintingCry +PlayerHandleFaintingCry: @ 0x0805C628 push {lr} ldr r1, _0805C65C ldr r0, _0805C660 @@ -187635,21 +187635,21 @@ sub_0805C628: @ 0x0805C628 ldr r1, _0805C664 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 rsbs r1, r1, #0 movs r2, #5 - bl sub_080A2BAC - bl sub_0805709C + bl PlayCry3 + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0805C65C: .4byte gUnknown_2023D12 _0805C660: .4byte gUnknown_2023D08 _0805C664: .4byte gUnknown_2024190 - thumb_func_end sub_0805C628 + thumb_func_end PlayerHandleFaintingCry thumb_func_start sub_0805C668 sub_0805C668: @ 0x0805C668 @@ -187661,13 +187661,13 @@ sub_0805C668: @ 0x0805C668 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _0805C698 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -187676,8 +187676,8 @@ _0805C694: .4byte gUnknown_2023D08 _0805C698: .4byte gUnknown_20240A0 thumb_func_end sub_0805C668 - thumb_func_start sub_0805C69C -sub_0805C69C: @ 0x0805C69C + thumb_func_start PlayerHandleIntroTrainerBallThrow +PlayerHandleIntroTrainerBallThrow: @ 0x0805C69C push {r4, r5, r6, r7, lr} ldr r6, _0805C7DC ldr r7, _0805C7E0 @@ -187744,7 +187744,7 @@ sub_0805C69C: @ 0x0805C69C lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _0805C7F0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r0, [r7] adds r0, r0, r6 ldrb r1, [r0] @@ -187770,7 +187770,7 @@ sub_0805C69C: @ 0x0805C69C lsls r2, r2, #1 adds r1, r4, r2 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldrb r0, [r7] adds r0, r0, r6 ldrb r0, [r0] @@ -187785,7 +187785,7 @@ sub_0805C69C: @ 0x0805C69C strb r0, [r1, #5] ldr r0, _0805C800 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _0805C804 @@ -187843,14 +187843,14 @@ _0805C7F0: .4byte sub_0805C81C _0805C7F4: .4byte 0x0000D6F8 _0805C7F8: .4byte gUnknown_82D961C _0805C7FC: .4byte gUnknown_3005AF0 -_0805C800: .4byte sub_0805C884 +_0805C800: .4byte task05_08033660 _0805C804: .4byte gUnknown_3005B60 _0805C808: .4byte gUnknown_2024174 _0805C80C: .4byte gUnknown_2024158 -_0805C810: .4byte sub_0807352C +_0805C810: .4byte Task_HidePartyStatusSummary _0805C814: .4byte gUnknown_3005AC0 _0805C818: .4byte sub_08057068 - thumb_func_end sub_0805C69C + thumb_func_end PlayerHandleIntroTrainerBallThrow thumb_func_start sub_0805C81C sub_0805C81C: @ 0x0805C81C @@ -187877,7 +187877,7 @@ sub_0805C81C: @ 0x0805C81C ldr r1, _0805C878 adds r0, r0, r1 adds r1, r4, #0 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldr r0, _0805C87C adds r4, r4, r0 ldrb r1, [r4] @@ -187898,8 +187898,8 @@ _0805C87C: .4byte gUnknown_2023E88 _0805C880: .4byte gUnknown_20205AC thumb_func_end sub_0805C81C - thumb_func_start sub_0805C884 -sub_0805C884: @ 0x0805C884 + thumb_func_start task05_08033660 +task05_08033660: @ 0x0805C884 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -187928,7 +187928,7 @@ _0805C8B0: mov sb, r0 ldrh r0, [r1, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805C8D0 @@ -187991,7 +187991,7 @@ _0805C900: muls r0, r2, r0 ldr r2, _0805C980 adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r7] movs r1, #0 bl sub_0805AE74 @@ -188009,7 +188009,7 @@ _0805C954: mov r3, sb strb r3, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _0805C96C: pop {r3, r4} mov r8, r3 @@ -188024,10 +188024,10 @@ _0805C980: .4byte gUnknown_2024190 _0805C984: .4byte gUnknown_3005AC0 _0805C988: .4byte gUnknown_2023D08 _0805C98C: .4byte sub_08058750 - thumb_func_end sub_0805C884 + thumb_func_end task05_08033660 - thumb_func_start sub_0805C990 -sub_0805C990: @ 0x0805C990 + thumb_func_start PlayerHandleDrawPartyStatusSummary +PlayerHandleDrawPartyStatusSummary: @ 0x0805C990 push {r4, r5, r6, lr} ldr r1, _0805C9B8 ldr r0, _0805C9BC @@ -188039,11 +188039,11 @@ sub_0805C990: @ 0x0805C990 cmp r0, #0 beq _0805C9C0 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0805C9C0 - bl sub_0805709C + bl PlayerBufferExecCompleted b _0805CA34 .align 2, 0 _0805C9B8: .4byte gUnknown_2022D08 @@ -188072,7 +188072,7 @@ _0805C9C0: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _0805CA48 ldrb r1, [r5] adds r1, r1, r2 @@ -188118,7 +188118,7 @@ _0805CA44: .4byte gUnknown_2022D0C _0805CA48: .4byte gUnknown_2024158 _0805CA4C: .4byte gUnknown_3005AC0 _0805CA50: .4byte sub_0805CA54 - thumb_func_end sub_0805C990 + thumb_func_end PlayerHandleDrawPartyStatusSummary thumb_func_start sub_0805CA54 sub_0805CA54: @ 0x0805CA54 @@ -188148,7 +188148,7 @@ sub_0805CA54: @ 0x0805CA54 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_0805709C + bl PlayerBufferExecCompleted _0805CA8C: pop {r4} pop {r0} @@ -188158,8 +188158,8 @@ _0805CA94: .4byte gUnknown_2024174 _0805CA98: .4byte gUnknown_2023D08 thumb_func_end sub_0805CA54 - thumb_func_start sub_0805CA9C -sub_0805CA9C: @ 0x0805CA9C + thumb_func_start PlayerHandleHidePartyStatusSummary +PlayerHandleHidePartyStatusSummary: @ 0x0805CA9C push {lr} ldr r0, _0805CAD8 ldr r1, [r0] @@ -188186,7 +188186,7 @@ sub_0805CA9C: @ 0x0805CA9C ldr r1, _0805CAE8 str r1, [r0] _0805CACE: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -188194,33 +188194,33 @@ _0805CAD8: .4byte gUnknown_2024174 _0805CADC: .4byte gUnknown_2023D08 _0805CAE0: .4byte gUnknown_3005B60 _0805CAE4: .4byte gUnknown_2024158 -_0805CAE8: .4byte sub_0807352C - thumb_func_end sub_0805CA9C +_0805CAE8: .4byte Task_HidePartyStatusSummary + thumb_func_end PlayerHandleHidePartyStatusSummary - thumb_func_start sub_0805CAEC -sub_0805CAEC: @ 0x0805CAEC + thumb_func_start PlayerHandleEndBounceEffect +PlayerHandleEndBounceEffect: @ 0x0805CAEC push {r4, lr} ldr r4, _0805CB0C ldrb r0, [r4] movs r1, #1 - bl sub_0803998C + bl EndBounceEffect ldrb r0, [r4] movs r1, #0 - bl sub_0803998C - bl sub_0805709C + bl EndBounceEffect + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _0805CB0C: .4byte gUnknown_2023D08 - thumb_func_end sub_0805CAEC + thumb_func_end PlayerHandleEndBounceEffect - thumb_func_start sub_0805CB10 -sub_0805CB10: @ 0x0805CB10 + thumb_func_start PlayerHandleSpriteInvisibility +PlayerHandleSpriteInvisibility: @ 0x0805CB10 push {r4, lr} ldr r4, _0805CB60 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _0805CB56 @@ -188251,7 +188251,7 @@ sub_0805CB10: @ 0x0805CB10 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _0805CB56: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -188260,15 +188260,15 @@ _0805CB60: .4byte gUnknown_2023D08 _0805CB64: .4byte gUnknown_20205AC _0805CB68: .4byte gUnknown_2023E88 _0805CB6C: .4byte gUnknown_2022D08 - thumb_func_end sub_0805CB10 + thumb_func_end PlayerHandleSpriteInvisibility - thumb_func_start sub_0805CB70 -sub_0805CB70: @ 0x0805CB70 + thumb_func_start PlayerHandleBattleAnimation +PlayerHandleBattleAnimation: @ 0x0805CB70 push {r4, r5, r6, lr} sub sp, #4 ldr r5, _0805CBB8 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0805CBD2 @@ -188290,11 +188290,11 @@ sub_0805CB70: @ 0x0805CB70 adds r0, r2, #0 adds r1, r2, #0 adds r3, r6, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _0805CBC0 - bl sub_0805709C + bl PlayerBufferExecCompleted b _0805CBCC .align 2, 0 _0805CBB8: .4byte gUnknown_2023D08 @@ -188308,7 +188308,7 @@ _0805CBC0: str r0, [r1] _0805CBCC: adds r0, r6, #0 - bl sub_0817E1D8 + bl BattleTv_SetDataBasedOnAnimation _0805CBD2: add sp, #4 pop {r4, r5, r6} @@ -188317,10 +188317,10 @@ _0805CBD2: .align 2, 0 _0805CBDC: .4byte gUnknown_3005AC0 _0805CBE0: .4byte sub_080599AC - thumb_func_end sub_0805CB70 + thumb_func_end PlayerHandleBattleAnimation - thumb_func_start sub_0805CBE4 -sub_0805CBE4: @ 0x0805CBE4 + thumb_func_start PlayerHandleLinkStandbyMsg +PlayerHandleLinkStandbyMsg: @ 0x0805CBE4 push {r4, r5, lr} ldr r5, _0805CC0C ldrb r0, [r5] @@ -188348,30 +188348,30 @@ _0805CC14: beq _0805CC38 b _0805CC3C _0805CC1A: - bl sub_080599DC + bl PrintLinkStandbyMsg _0805CC1E: ldr r4, _0805CC34 ldrb r0, [r4] movs r1, #1 - bl sub_0803998C + bl EndBounceEffect ldrb r0, [r4] movs r1, #0 - bl sub_0803998C + bl EndBounceEffect b _0805CC3C .align 2, 0 _0805CC34: .4byte gUnknown_2023D08 _0805CC38: - bl sub_080599DC + bl PrintLinkStandbyMsg _0805CC3C: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805CBE4 + thumb_func_end PlayerHandleLinkStandbyMsg - thumb_func_start sub_0805CC48 -sub_0805CC48: @ 0x0805CC48 + thumb_func_start PlayerHandleResetActionMoveSelection +PlayerHandleResetActionMoveSelection: @ 0x0805CC48 push {r4, lr} ldr r1, _0805CC68 ldr r4, _0805CC6C @@ -188418,16 +188418,16 @@ _0805CC9A: movs r1, #0 strb r1, [r0] _0805CCA0: - bl sub_0805709C + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _0805CCAC: .4byte gUnknown_2024154 - thumb_func_end sub_0805CC48 + thumb_func_end PlayerHandleResetActionMoveSelection - thumb_func_start sub_0805CCB0 -sub_0805CCB0: @ 0x0805CCB0 + thumb_func_start PlayerHandleCmd55 +PlayerHandleCmd55: @ 0x0805CCB0 push {r4, r5, lr} ldr r5, _0805CD14 ldrb r0, [r5] @@ -188464,7 +188464,7 @@ sub_0805CCB0: @ 0x0805CCB0 bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_0805709C + bl PlayerBufferExecCompleted ldr r1, _0805CD28 ldrb r0, [r5] lsls r0, r0, #2 @@ -188482,7 +188482,7 @@ _0805CD20: .4byte gUnknown_3005AF0 _0805CD24: .4byte 0x00000CA9 _0805CD28: .4byte gUnknown_3005AC0 _0805CD2C: .4byte sub_080583C0 - thumb_func_end sub_0805CCB0 + thumb_func_end PlayerHandleCmd55 thumb_func_start sub_0805CD30 sub_0805CD30: @ 0x0805CD30 @@ -188490,27 +188490,27 @@ sub_0805CD30: @ 0x0805CD30 .align 2, 0 thumb_func_end sub_0805CD30 - thumb_func_start sub_0805CD34 -sub_0805CD34: @ 0x0805CD34 + thumb_func_start GetSecretBaseMapName +GetSecretBaseMapName: @ 0x0805CD34 push {r4, lr} ldr r4, _0805CD70 movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1] movs r0, #0x30 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #4] movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #8] movs r0, #0x50 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0xc] pop {r4} @@ -188518,33 +188518,33 @@ sub_0805CD34: @ 0x0805CD34 bx r0 .align 2, 0 _0805CD70: .4byte gUnknown_2024174 - thumb_func_end sub_0805CD34 + thumb_func_end GetSecretBaseMapName - thumb_func_start sub_0805CD74 -sub_0805CD74: @ 0x0805CD74 + thumb_func_start FreeBattleSpritesData +FreeBattleSpritesData: @ 0x0805CD74 push {r4, r5, lr} ldr r5, _0805CDB4 ldr r0, [r5] cmp r0, #0 beq _0805CDAE ldr r0, [r0, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r5] movs r4, #0 str r4, [r0, #0xc] ldr r0, [r0, #8] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #8] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #4] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0] - bl sub_08000BF0 + bl Free str r4, [r5] _0805CDAE: pop {r4, r5} @@ -188552,10 +188552,10 @@ _0805CDAE: bx r0 .align 2, 0 _0805CDB4: .4byte gUnknown_2024174 - thumb_func_end sub_0805CD74 + thumb_func_end FreeBattleSpritesData - thumb_func_start sub_0805CDB8 -sub_0805CDB8: @ 0x0805CDB8 + thumb_func_start ChooseMoveAndTargetInBattlePalace +ChooseMoveAndTargetInBattlePalace: @ 0x0805CDB8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -188572,7 +188572,7 @@ sub_0805CDB8: @ 0x0805CDB8 mov sl, r2 movs r1, #0 movs r2, #0xff - bl sub_0803FB0C + bl CheckMoveLimitations lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -188618,7 +188618,7 @@ _0805CE2A: ldr r1, _0805CF90 adds r0, r0, r1 ldr r0, [r0] - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r4, r0 @@ -188684,7 +188684,7 @@ _0805CE98: strb r0, [r1] lsls r0, r6, #0x18 lsrs r0, r0, #0x18 - bl sub_081309A4 + bl BattleAI_SetupAIData bl sub_08130BEC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -188914,7 +188914,7 @@ _0805D074: .4byte gUnknown_2023D08 _0805D078: cmp r5, #0 bne _0805D08C - bl sub_0805D210 + bl BattlePalaceGetTargetRetValue lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r2, sb @@ -188951,7 +188951,7 @@ _0805D0B2: bx r1 .align 2, 0 _0805D0C0: .4byte gUnknown_2023D08 - thumb_func_end sub_0805CDB8 + thumb_func_end ChooseMoveAndTargetInBattlePalace thumb_func_start sub_0805D0C4 sub_0805D0C4: @ 0x0805D0C4 @@ -189064,8 +189064,8 @@ _0805D20C: bx r1 thumb_func_end sub_0805D0C4 - thumb_func_start sub_0805D210 -sub_0805D210: @ 0x0805D210 + thumb_func_start BattlePalaceGetTargetRetValue +BattlePalaceGetTargetRetValue: @ 0x0805D210 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -189078,7 +189078,7 @@ sub_0805D210: @ 0x0805D210 beq _0805D316 ldr r0, _0805D248 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0805D24C @@ -189139,7 +189139,7 @@ _0805D29C: adds r1, #0x48 adds r0, r0, r1 ldr r0, [r0] - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r4 @@ -189210,7 +189210,7 @@ _0805D320: bx r1 .align 2, 0 _0805D32C: .4byte gUnknown_2023D08 - thumb_func_end sub_0805D210 + thumb_func_end BattlePalaceGetTargetRetValue thumb_func_start sub_0805D330 sub_0805D330: @ 0x0805D330 @@ -189290,7 +189290,7 @@ _0805D3B4: bl StartSpriteAffineAnim _0805D3BC: adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite pop {r4} pop {r0} bx r0 @@ -189352,8 +189352,8 @@ _0805D41C: _0805D420: .4byte sub_08007140 thumb_func_end sub_0805D408 - thumb_func_start sub_0805D424 -sub_0805D424: @ 0x0805D424 + thumb_func_start InitAndLaunchChosenStatusAnimation +InitAndLaunchChosenStatusAnimation: @ 0x0805D424 push {r4, r5, r6, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -189482,10 +189482,10 @@ _0805D51E: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0805D424 + thumb_func_end InitAndLaunchChosenStatusAnimation - thumb_func_start sub_0805D524 -sub_0805D524: @ 0x0805D524 + thumb_func_start TryHandleLaunchBattleTableAnimation +TryHandleLaunchBattleTableAnimation: @ 0x0805D524 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -189571,7 +189571,7 @@ _0805D59C: bge _0805D5E8 adds r0, r6, #0 movs r1, #1 - bl sub_0805E510 + bl LoadBattleMonGfxAndAnimate adds r0, r6, #0 bl ClearBehindSubstituteBit movs r0, #1 @@ -189594,10 +189594,10 @@ _0805D5E8: ldr r0, _0805D658 adds r1, r5, #0 movs r2, #0 - bl sub_080A3310 + bl LaunchBattleAnimation ldr r0, _0805D65C movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0805D660 @@ -189635,7 +189635,7 @@ _0805D654: .4byte gUnknown_2024174 _0805D658: .4byte gUnknown_82778AC _0805D65C: .4byte sub_0805D664 _0805D660: .4byte gUnknown_3005B60 - thumb_func_end sub_0805D524 + thumb_func_end TryHandleLaunchBattleTableAnimation thumb_func_start sub_0805D664 sub_0805D664: @ 0x0805D664 @@ -189673,7 +189673,7 @@ sub_0805D674: @ 0x0805D674 ands r0, r2 strb r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0805D6A6: pop {r4} pop {r0} @@ -189711,8 +189711,8 @@ _0805D6DA: .align 2, 0 thumb_func_end ShouldAnimBeDoneRegardlessOfSubsitute - thumb_func_start sub_0805D6E0 -sub_0805D6E0: @ 0x0805D6E0 + thumb_func_start InitAndLaunchSpecialAnimation +InitAndLaunchSpecialAnimation: @ 0x0805D6E0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -189726,10 +189726,10 @@ sub_0805D6E0: @ 0x0805D6E0 ldr r0, _0805D740 adds r1, r3, #0 movs r2, #0 - bl sub_080A3310 + bl LaunchBattleAnimation ldr r0, _0805D744 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0805D748 @@ -189761,7 +189761,7 @@ _0805D740: .4byte gUnknown_8277908 _0805D744: .4byte sub_0805D750 _0805D748: .4byte gUnknown_3005B60 _0805D74C: .4byte gUnknown_2024174 - thumb_func_end sub_0805D6E0 + thumb_func_end InitAndLaunchSpecialAnimation thumb_func_start sub_0805D750 sub_0805D750: @ 0x0805D750 @@ -189799,7 +189799,7 @@ sub_0805D760: @ 0x0805D760 ands r0, r2 strb r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0805D792: pop {r4} pop {r0} @@ -189817,13 +189817,13 @@ sub_0805D7A8: @ 0x0805D7A8 bx lr thumb_func_end sub_0805D7A8 - thumb_func_start sub_0805D7AC -sub_0805D7AC: @ 0x0805D7AC + thumb_func_start mplay_80342A4 +mplay_80342A4: @ 0x0805D7AC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r5, #0 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0805D7F4 @@ -189879,10 +189879,10 @@ _0805D81E: bx r1 .align 2, 0 _0805D824: .4byte gUnknown_2024174 - thumb_func_end sub_0805D7AC + thumb_func_end mplay_80342A4 - thumb_func_start sub_0805D828 -sub_0805D828: @ 0x0805D828 + thumb_func_start BattleLoadOpponentMonSpriteGfx +BattleLoadOpponentMonSpriteGfx: @ 0x0805D828 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -189894,7 +189894,7 @@ sub_0805D828: @ 0x0805D828 lsrs r1, r1, #0x18 mov r8, r1 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldr r0, _0805D868 ldr r0, [r0] @@ -189907,7 +189907,7 @@ sub_0805D828: @ 0x0805D828 bne _0805D86C adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r6, [sp] @@ -189922,7 +189922,7 @@ _0805D86C: _0805D874: adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov sl, r0 mov r0, r8 bl sub_080A630C @@ -189967,7 +189967,7 @@ _0805D8D8: adds r0, r5, #0 mov r1, sl ldr r2, [sp] - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality _0805D8E2: adds r6, r0, #0 ldr r4, _0805D974 @@ -189977,12 +189977,12 @@ _0805D8E2: adds r0, r4, #0 adds r1, r7, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette mov r1, sb adds r1, #0x80 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0805D978 cmp r5, r0 bne _0805D936 @@ -190005,7 +190005,7 @@ _0805D8E2: adds r0, r0, r1 adds r1, r7, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _0805D936: ldr r0, _0805D984 ldr r0, [r0] @@ -190046,10 +190046,10 @@ _0805D988: .4byte 0x00007FFF _0805D98C: .4byte gUnknown_20377B4 _0805D990: .4byte gUnknown_20373B4 _0805D994: .4byte 0x04000008 - thumb_func_end sub_0805D828 + thumb_func_end BattleLoadOpponentMonSpriteGfx - thumb_func_start sub_0805D998 -sub_0805D998: @ 0x0805D998 + thumb_func_start BattleLoadPlayerMonSpriteGfx +BattleLoadPlayerMonSpriteGfx: @ 0x0805D998 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -190061,7 +190061,7 @@ sub_0805D998: @ 0x0805D998 lsrs r1, r1, #0x18 mov r8, r1 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldr r0, _0805D9D8 ldr r0, [r0] @@ -190074,7 +190074,7 @@ sub_0805D998: @ 0x0805D998 bne _0805D9DC adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r4, [sp] @@ -190089,7 +190089,7 @@ _0805D9DC: _0805D9E4: adds r0, r6, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] mov r0, r8 bl sub_080A630C @@ -190169,7 +190169,7 @@ _0805DA90: adds r0, r5, #0 ldr r1, [sp, #4] ldr r2, [sp] - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality _0805DA9A: adds r6, r0, #0 ldr r4, _0805DB28 @@ -190179,12 +190179,12 @@ _0805DA9A: adds r0, r4, #0 adds r1, r7, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette mov r1, sb adds r1, #0x80 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0805DB2C cmp r5, r0 bne _0805DAEE @@ -190207,7 +190207,7 @@ _0805DA9A: adds r0, r0, r1 adds r1, r7, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _0805DAEE: ldr r0, _0805DB38 ldr r0, [r0] @@ -190247,7 +190247,7 @@ _0805DB3C: .4byte 0x00007FFF _0805DB40: .4byte gUnknown_20377B4 _0805DB44: .4byte gUnknown_20373B4 _0805DB48: .4byte 0x04000008 - thumb_func_end sub_0805D998 + thumb_func_end BattleLoadPlayerMonSpriteGfx thumb_func_start sub_0805DB4C sub_0805DB4C: @ 0x0805DB4C @@ -190261,8 +190261,8 @@ sub_0805DB50: @ 0x0805DB50 .align 2, 0 thumb_func_end sub_0805DB50 - thumb_func_start sub_0805DB54 -sub_0805DB54: @ 0x0805DB54 + thumb_func_start DecompressTrainerFrontPic +DecompressTrainerFrontPic: @ 0x0805DB54 push {r4, lr} adds r4, r0, #0 adds r0, r1, #0 @@ -190287,7 +190287,7 @@ sub_0805DB54: @ 0x0805DB54 ldr r0, _0805DB9C adds r4, r4, r0 adds r0, r4, #0 - bl sub_080343E4 + bl LoadCompressedSpritePalette pop {r4} pop {r0} bx r0 @@ -190295,10 +190295,10 @@ sub_0805DB54: @ 0x0805DB54 _0805DB94: .4byte gUnknown_82D8EE4 _0805DB98: .4byte gUnknown_2024178 _0805DB9C: .4byte gUnknown_82D91CC - thumb_func_end sub_0805DB54 + thumb_func_end DecompressTrainerFrontPic - thumb_func_start sub_0805DBA0 -sub_0805DBA0: @ 0x0805DBA0 + thumb_func_start DecompressTrainerBackPic +DecompressTrainerBackPic: @ 0x0805DBA0 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -190331,7 +190331,7 @@ sub_0805DBA0: @ 0x0805DBA0 lsrs r4, r4, #0x10 adds r1, r4, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette pop {r4, r5} pop {r0} bx r0 @@ -190339,7 +190339,7 @@ sub_0805DBA0: @ 0x0805DBA0 _0805DBF0: .4byte gUnknown_82D95DC _0805DBF4: .4byte gUnknown_2024178 _0805DBF8: .4byte gUnknown_82D961C - thumb_func_end sub_0805DBA0 + thumb_func_end DecompressTrainerBackPic thumb_func_start sub_0805DBFC sub_0805DBFC: @ 0x0805DBFC @@ -190347,8 +190347,8 @@ sub_0805DBFC: @ 0x0805DBFC .align 2, 0 thumb_func_end sub_0805DBFC - thumb_func_start sub_0805DC00 -sub_0805DC00: @ 0x0805DC00 + thumb_func_start FreeTrainerFrontPicPalette +FreeTrainerFrontPicPalette: @ 0x0805DC00 push {lr} lsls r0, r0, #0x10 ldr r1, _0805DC14 @@ -190360,10 +190360,10 @@ sub_0805DC00: @ 0x0805DC00 bx r0 .align 2, 0 _0805DC14: .4byte gUnknown_82D91CC - thumb_func_end sub_0805DC00 + thumb_func_end FreeTrainerFrontPicPalette - thumb_func_start sub_0805DC18 -sub_0805DC18: @ 0x0805DC18 + thumb_func_start BattleLoadAllHealthBoxesGfxAtOnce +BattleLoadAllHealthBoxesGfxAtOnce: @ 0x0805DC18 push {r4, r5, r6, r7, lr} ldr r4, _0805DC44 adds r0, r4, #0 @@ -190371,14 +190371,14 @@ sub_0805DC18: @ 0x0805DC18 adds r4, #8 adds r0, r4, #0 bl LoadSpritePalette - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _0805DC50 ldr r0, _0805DC48 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0805DC4C - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r5, #2 b _0805DC72 .align 2, 0 @@ -190388,16 +190388,16 @@ _0805DC4C: .4byte gUnknown_82FCAD0 _0805DC50: ldr r4, _0805DC98 adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r4, _0805DC9C adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r5, #4 _0805DC72: movs r4, #0 @@ -190410,7 +190410,7 @@ _0805DC7C: ldrb r0, [r0] lsls r0, r0, #3 adds r0, r0, r6 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -190425,10 +190425,10 @@ _0805DC98: .4byte gUnknown_82FCAD8 _0805DC9C: .4byte gUnknown_82FCAE8 _0805DCA0: .4byte gUnknown_2023D1A _0805DCA4: .4byte gUnknown_82FCB00 - thumb_func_end sub_0805DC18 + thumb_func_end BattleLoadAllHealthBoxesGfxAtOnce - thumb_func_start sub_0805DCA8 -sub_0805DCA8: @ 0x0805DCA8 + thumb_func_start BattleLoadAllHealthBoxesGfx +BattleLoadAllHealthBoxesGfx: @ 0x0805DCA8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -190450,7 +190450,7 @@ _0805DCB8: .align 2, 0 _0805DCD0: .4byte gUnknown_82FCB20 _0805DCD4: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _0805DD3C @@ -190463,14 +190463,14 @@ _0805DCD4: cmp r0, #0 beq _0805DD00 ldr r0, _0805DCFC - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DCF8: .4byte gUnknown_2022C90 _0805DCFC: .4byte gUnknown_82FCAF8 _0805DD00: ldr r0, _0805DD08 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DD08: .4byte gUnknown_82FCAC8 @@ -190478,7 +190478,7 @@ _0805DD0C: cmp r4, #3 bne _0805DD1C ldr r0, _0805DD18 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DD18: .4byte gUnknown_82FCAD0 @@ -190502,7 +190502,7 @@ _0805DD3C: cmp r4, #2 bne _0805DD4C ldr r0, _0805DD48 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DD48: .4byte gUnknown_82FCAD8 @@ -190510,7 +190510,7 @@ _0805DD4C: cmp r4, #3 bne _0805DD5C ldr r0, _0805DD58 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DD58: .4byte gUnknown_82FCAE0 @@ -190518,7 +190518,7 @@ _0805DD5C: cmp r4, #4 bne _0805DD6C ldr r0, _0805DD68 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DD68: .4byte gUnknown_82FCAE8 @@ -190526,7 +190526,7 @@ _0805DD6C: cmp r4, #5 bne _0805DD7C ldr r0, _0805DD78 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DD78: .4byte gUnknown_82FCAF0 @@ -190563,7 +190563,7 @@ _0805DDB4: lsls r0, r0, #3 ldr r1, _0805DDC4 adds r0, r0, r1 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0805DDCA .align 2, 0 _0805DDC0: .4byte gUnknown_2023D1A @@ -190576,10 +190576,10 @@ _0805DDCA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0805DCA8 + thumb_func_end BattleLoadAllHealthBoxesGfx - thumb_func_start sub_0805DDD4 -sub_0805DDD4: @ 0x0805DDD4 + thumb_func_start LoadBattleBarGfx +LoadBattleBarGfx: @ 0x0805DDD4 push {lr} ldr r0, _0805DDEC ldr r1, _0805DDF0 @@ -190594,10 +190594,10 @@ sub_0805DDD4: @ 0x0805DDD4 .align 2, 0 _0805DDEC: .4byte gUnknown_8C093F8 _0805DDF0: .4byte gUnknown_2024178 - thumb_func_end sub_0805DDD4 + thumb_func_end LoadBattleBarGfx - thumb_func_start sub_0805DDF4 -sub_0805DDF4: @ 0x0805DDF4 + thumb_func_start BattleInitAllSprites +BattleInitAllSprites: @ 0x0805DDF4 push {r4, r5, r6, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -190623,11 +190623,11 @@ _0805DE14: @ jump table .4byte _0805DEB8 @ case 5 .4byte _0805DF58 @ case 6 _0805DE30: - bl sub_0805DF94 + bl ClearSpritesBattlerHealthboxAnimData b _0805DF40 _0805DE36: ldrb r0, [r4] - bl sub_0805DCA8 + bl BattleLoadAllHealthBoxesGfx lsls r0, r0, #0x18 cmp r0, #0 beq _0805DE44 @@ -190647,13 +190647,13 @@ _0805DE4C: ldrb r0, [r4] cmp r0, #0 bne _0805DE68 - bl sub_08072214 + bl CreateSafariPlayerHealthboxSprites b _0805DE6E .align 2, 0 _0805DE64: .4byte gUnknown_2022C90 _0805DE68: ldrb r0, [r4] - bl sub_08071EEC + bl CreateBattlerHealthboxSprites _0805DE6E: ldr r2, _0805DE78 ldrb r1, [r4] @@ -190664,7 +190664,7 @@ _0805DE6E: _0805DE78: .4byte gUnknown_3005AD0 _0805DE7C: ldrb r0, [r4] - bl sub_08072528 + bl InitBattlerHealthboxCoords ldr r0, _0805DE9C ldrb r1, [r4] adds r0, r1, r0 @@ -190691,7 +190691,7 @@ _0805DEA4: _0805DEB4: .4byte gUnknown_3005AD0 _0805DEB8: ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0805DF00 @@ -190714,7 +190714,7 @@ _0805DEB8: ldr r2, _0805DEFC adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute b _0805DF1E .align 2, 0 _0805DEF0: .4byte gUnknown_2022C90 @@ -190735,7 +190735,7 @@ _0805DF00: ldr r2, _0805DF50 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute _0805DF1E: ldr r1, _0805DF48 ldrb r0, [r4] @@ -190766,7 +190766,7 @@ _0805DF4C: .4byte gUnknown_2023D12 _0805DF50: .4byte gUnknown_20243E8 _0805DF54: .4byte gUnknown_2023D10 _0805DF58: - bl sub_0805E8A0 + bl LoadAndCreateEnemyShadowSprites bl sub_081B8908 movs r6, #1 _0805DF62: @@ -190775,10 +190775,10 @@ _0805DF62: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0805DDF4 + thumb_func_end BattleInitAllSprites - thumb_func_start sub_0805DF6C -sub_0805DF6C: @ 0x0805DF6C + thumb_func_start ClearSpritesHealthboxAnimData +ClearSpritesHealthboxAnimData: @ 0x0805DF6C push {r4, lr} ldr r4, _0805DF90 ldr r0, [r4] @@ -190796,12 +190796,12 @@ sub_0805DF6C: @ 0x0805DF6C bx r0 .align 2, 0 _0805DF90: .4byte gUnknown_2024174 - thumb_func_end sub_0805DF6C + thumb_func_end ClearSpritesHealthboxAnimData - thumb_func_start sub_0805DF94 -sub_0805DF94: @ 0x0805DF94 + thumb_func_start ClearSpritesBattlerHealthboxAnimData +ClearSpritesBattlerHealthboxAnimData: @ 0x0805DF94 push {lr} - bl sub_0805DF6C + bl ClearSpritesHealthboxAnimData ldr r0, _0805DFAC ldr r0, [r0] ldr r0, [r0] @@ -190812,7 +190812,7 @@ sub_0805DF94: @ 0x0805DF94 bx r0 .align 2, 0 _0805DFAC: .4byte gUnknown_2024174 - thumb_func_end sub_0805DF94 + thumb_func_end ClearSpritesBattlerHealthboxAnimData thumb_func_start CopyAllBattleSpritesInvisibilities CopyAllBattleSpritesInvisibilities: @ 0x0805DFB0 @@ -190908,8 +190908,8 @@ _0805E05C: .4byte gUnknown_20205AC _0805E060: .4byte gUnknown_2023E88 thumb_func_end CopyBattleSpriteInvisibility - thumb_func_start sub_0805E064 -sub_0805E064: @ 0x0805E064 + thumb_func_start HandleSpeciesGfxDataChange +HandleSpeciesGfxDataChange: @ 0x0805E064 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -190955,7 +190955,7 @@ sub_0805E064: @ 0x0805E064 adds r0, r0, r1 adds r1, r6, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0805E124 adds r1, r7, r1 ldr r0, [r4] @@ -191004,7 +191004,7 @@ _0805E12C: .4byte gUnknown_20377B4 _0805E130: .4byte gUnknown_20373B4 _0805E134: .4byte 0x04000008 _0805E138: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0805E174 @@ -191037,7 +191037,7 @@ _0805E174: lsrs r0, r0, #0x18 mov sl, r0 ldr r0, [sp] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -191066,12 +191066,12 @@ _0805E1A8: _0805E1B8: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0805E234 @@ -191084,13 +191084,13 @@ _0805E1B8: ldr r5, _0805E224 adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 ldrh r0, [r4] muls r0, r6, r0 adds r0, r0, r5 movs r1, #1 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r1, r8 lsls r0, r1, #3 @@ -191127,13 +191127,13 @@ _0805E234: ldr r5, _0805E3AC adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 ldrh r0, [r4] muls r0, r6, r0 adds r0, r0, r5 movs r1, #1 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r1, r8 lsls r0, r1, #3 @@ -191188,7 +191188,7 @@ _0805E27E: mov r0, r8 adds r1, r4, #0 mov r2, sb - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality mov sb, r0 ldr r4, _0805E3D0 adds r1, r4, #0 @@ -191196,7 +191196,7 @@ _0805E27E: adds r0, r4, #0 adds r1, r6, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0805E3D4 cmp r8, r0 bne _0805E326 @@ -191231,7 +191231,7 @@ _0805E27E: adds r0, r0, r1 adds r1, r6, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _0805E326: ldr r3, _0805E3E4 adds r0, r6, #0 @@ -191245,7 +191245,7 @@ _0805E326: adds r1, r1, r2 ldr r2, _0805E3F0 bl CpuSet - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0805E366 @@ -191315,7 +191315,7 @@ _0805E3E8: .4byte gUnknown_20377B4 _0805E3EC: .4byte gUnknown_20373B4 _0805E3F0: .4byte 0x04000008 _0805E3F4: .4byte gUnknown_2024174 - thumb_func_end sub_0805E064 + thumb_func_end HandleSpeciesGfxDataChange thumb_func_start sub_0805E3F8 sub_0805E3F8: @ 0x0805E3F8 @@ -191326,7 +191326,7 @@ sub_0805E3F8: @ 0x0805E3F8 lsls r1, r1, #0x18 cmp r1, #0 bne _0805E4B4 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0805E414 @@ -191338,7 +191338,7 @@ _0805E414: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _0805E41E: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0805E430 @@ -191348,7 +191348,7 @@ _0805E41E: _0805E42C: .4byte gUnknown_8C2D1C4 _0805E430: adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0805E458 @@ -191399,7 +191399,7 @@ _0805E47A: adds r1, r6, r0 ldr r0, _0805E4B0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _0805E502 .align 2, 0 _0805E4A0: .4byte gUnknown_8C2D1C4 @@ -191408,12 +191408,12 @@ _0805E4A8: .4byte 0x040000D4 _0805E4AC: .4byte 0x84000200 _0805E4B0: .4byte gUnknown_8C2CF60 _0805E4B4: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0805E502 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0805E4EC @@ -191426,7 +191426,7 @@ _0805E4B4: ldr r1, _0805E4E8 adds r0, r0, r1 adds r1, r4, #0 - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx b _0805E502 .align 2, 0 _0805E4E4: .4byte gUnknown_2023D12 @@ -191441,7 +191441,7 @@ _0805E4EC: ldr r1, _0805E50C adds r0, r0, r1 adds r1, r5, #0 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx _0805E502: pop {r4, r5, r6} pop {r0} @@ -191451,8 +191451,8 @@ _0805E508: .4byte gUnknown_2023D12 _0805E50C: .4byte gUnknown_2024190 thumb_func_end sub_0805E3F8 - thumb_func_start sub_0805E510 -sub_0805E510: @ 0x0805E510 + thumb_func_start LoadBattleMonGfxAndAnimate +LoadBattleMonGfxAndAnimate: @ 0x0805E510 push {r4, r5, r6, lr} adds r5, r1, #0 adds r4, r2, #0 @@ -191494,7 +191494,7 @@ _0805E55A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805E510 + thumb_func_end LoadBattleMonGfxAndAnimate thumb_func_start TrySetBehindSubstituteSpriteBit TrySetBehindSubstituteSpriteBit: @ 0x0805E568 @@ -191539,21 +191539,21 @@ ClearBehindSubstituteBit: @ 0x0805E590 _0805E5A8: .4byte gUnknown_2024174 thumb_func_end ClearBehindSubstituteBit - thumb_func_start sub_0805E5AC -sub_0805E5AC: @ 0x0805E5AC + thumb_func_start HandleLowHpMusicChange +HandleLowHpMusicChange: @ 0x0805E5AC push {r4, r5, r6, r7, lr} adds r5, r0, #0 lsls r1, r1, #0x18 lsrs r6, r1, #0x18 adds r7, r6, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -191609,7 +191609,7 @@ _0805E624: rsbs r0, r0, #0 ands r0, r2 strb r0, [r1] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _0805E650 @@ -191619,7 +191619,7 @@ _0805E624: .align 2, 0 _0805E64C: .4byte gUnknown_2024174 _0805E650: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805E676 @@ -191640,10 +191640,10 @@ _0805E676: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0805E5AC + thumb_func_end HandleLowHpMusicChange - thumb_func_start sub_0805E67C -sub_0805E67C: @ 0x0805E67C + thumb_func_start BattleStopLowHpSound +BattleStopLowHpSound: @ 0x0805E67C push {r4, r5, r6, lr} movs r0, #0 bl GetBattlerAtPosition @@ -191660,7 +191660,7 @@ sub_0805E67C: @ 0x0805E67C adds r0, r6, #0 ands r0, r2 strb r0, [r1] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805E6BE @@ -191683,20 +191683,20 @@ _0805E6BE: bx r0 .align 2, 0 _0805E6CC: .4byte gUnknown_2024174 - thumb_func_end sub_0805E67C + thumb_func_end BattleStopLowHpSound - thumb_func_start sub_0805E6D0 -sub_0805E6D0: @ 0x0805E6D0 + thumb_func_start GetMonHPBarLevel +GetMonHPBarLevel: @ 0x0805E6D0 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -191710,10 +191710,10 @@ sub_0805E6D0: @ 0x0805E6D0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0805E6D0 + thumb_func_end GetMonHPBarLevel - thumb_func_start sub_0805E704 -sub_0805E704: @ 0x0805E704 + thumb_func_start HandleBattleLowHpMusicChange +HandleBattleLowHpMusicChange: @ 0x0805E704 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -191741,7 +191741,7 @@ sub_0805E704: @ 0x0805E704 lsls r0, r1, #1 adds r0, r0, r5 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -191749,7 +191749,7 @@ sub_0805E704: @ 0x0805E704 lsls r0, r1, #1 adds r0, r0, r5 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r7, #0x64 @@ -191759,14 +191759,14 @@ sub_0805E704: @ 0x0805E704 adds r4, r0, r6 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0805E776 adds r0, r4, #0 mov r1, r8 - bl sub_0805E5AC + bl HandleLowHpMusicChange _0805E776: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805E79A @@ -191775,12 +191775,12 @@ _0805E776: adds r4, r0, r6 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0805E79A adds r0, r4, #0 mov r1, sb - bl sub_0805E5AC + bl HandleLowHpMusicChange _0805E79A: pop {r3, r4} mov r8, r3 @@ -191793,7 +191793,7 @@ _0805E7A8: .4byte gUnknown_3002360 _0805E7AC: .4byte 0x00000439 _0805E7B0: .4byte gUnknown_2023D12 _0805E7B4: .4byte gUnknown_2024190 - thumb_func_end sub_0805E704 + thumb_func_end HandleBattleLowHpMusicChange thumb_func_start sub_0805E7B8 sub_0805E7B8: @ 0x0805E7B8 @@ -191822,7 +191822,7 @@ sub_0805E7B8: @ 0x0805E7B8 _0805E7E4: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _0805E87C @@ -191912,13 +191912,13 @@ _0805E898: .4byte gUnknown_2024174 _0805E89C: .4byte gUnknown_2023D10 thumb_func_end sub_0805E7B8 - thumb_func_start sub_0805E8A0 -sub_0805E8A0: @ 0x0805E8A0 + thumb_func_start LoadAndCreateEnemyShadowSprites +LoadAndCreateEnemyShadowSprites: @ 0x0805E8A0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} ldr r0, _0805E97C - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r0, #1 bl GetBattlerAtPosition adds r5, r0, #0 @@ -191928,13 +191928,13 @@ sub_0805E8A0: @ 0x0805E8A0 mov r8, r0 adds r0, r5, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #8 @@ -191945,7 +191945,7 @@ sub_0805E8A0: @ 0x0805E8A0 mov r0, r8 adds r1, r4, #0 movs r3, #0xc8 - bl sub_08006B0C + bl CreateSprite ldr r6, _0805E984 ldr r1, [r6] ldr r2, [r1, #4] @@ -191964,7 +191964,7 @@ sub_0805E8A0: @ 0x0805E8A0 lsls r0, r0, #2 adds r0, r0, r7 strh r5, [r0, #0x2e] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805E972 @@ -191975,13 +191975,13 @@ sub_0805E8A0: @ 0x0805E8A0 lsrs r5, r5, #0x18 adds r0, r5, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #8 @@ -191992,7 +191992,7 @@ sub_0805E8A0: @ 0x0805E8A0 mov r0, r8 adds r1, r4, #0 movs r3, #0xc8 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] ldr r2, [r1, #4] lsls r1, r5, #1 @@ -192020,10 +192020,10 @@ _0805E97C: .4byte gUnknown_82ED028 _0805E980: .4byte gUnknown_82ED038 _0805E984: .4byte gUnknown_2024174 _0805E988: .4byte gUnknown_20205AC - thumb_func_end sub_0805E8A0 + thumb_func_end LoadAndCreateEnemyShadowSprites - thumb_func_start sub_0805E98C -sub_0805E98C: @ 0x0805E98C + thumb_func_start SpriteCB_EnemyShadow +SpriteCB_EnemyShadow: @ 0x0805E98C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -192049,7 +192049,7 @@ sub_0805E98C: @ 0x0805E98C cmp r0, #0 beq _0805E9C8 adds r0, r4, #0 - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 bne _0805E9DC @@ -192133,7 +192133,7 @@ _0805EA52: .align 2, 0 _0805EA5C: .4byte gUnknown_2024174 _0805EA60: .4byte gUnknown_82D965C - thumb_func_end sub_0805E98C + thumb_func_end SpriteCB_EnemyShadow thumb_func_start sub_0805EA64 sub_0805EA64: @ 0x0805EA64 @@ -192145,8 +192145,8 @@ sub_0805EA64: @ 0x0805EA64 bx lr thumb_func_end sub_0805EA64 - thumb_func_start sub_0805EA70 -sub_0805EA70: @ 0x0805EA70 + thumb_func_start SetBattlerShadowSpriteCallback +SetBattlerShadowSpriteCallback: @ 0x0805EA70 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -192154,7 +192154,7 @@ sub_0805EA70: @ 0x0805EA70 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0805EAEC @@ -192191,7 +192191,7 @@ _0805EA9A: _0805EAC0: .4byte gUnknown_2024174 _0805EAC4: .4byte gUnknown_82D965C _0805EAC8: .4byte gUnknown_20205AC -_0805EACC: .4byte sub_0805E98C +_0805EACC: .4byte SpriteCB_EnemyShadow _0805EAD0: ldr r2, _0805EAF4 ldr r1, [r3, #4] @@ -192215,7 +192215,7 @@ _0805EAEC: .align 2, 0 _0805EAF4: .4byte gUnknown_20205AC _0805EAF8: .4byte sub_0805EA64 - thumb_func_end sub_0805EA70 + thumb_func_end SetBattlerShadowSpriteCallback thumb_func_start HideBattlerShadowSprite HideBattlerShadowSprite: @ 0x0805EAFC @@ -192339,8 +192339,8 @@ _0805EBD0: .4byte gUnknown_2024174 _0805EBD4: .4byte gUnknown_2024188 thumb_func_end ClearTemporarySpeciesSpriteData - thumb_func_start sub_0805EBD8 -sub_0805EBD8: @ 0x0805EBD8 + thumb_func_start AllocateMonSpritesGfx +AllocateMonSpritesGfx: @ 0x0805EBD8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -192351,11 +192351,11 @@ sub_0805EBD8: @ 0x0805EBD8 str r6, [r4] movs r0, #0xc0 lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0x80 lsls r0, r0, #8 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1] _0805EBFE: @@ -192430,7 +192430,7 @@ _0805EC36: bls _0805EBFE movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed ldr r1, _0805ECA8 ldr r1, [r1] movs r2, #0xba @@ -192447,10 +192447,10 @@ _0805EC36: .align 2, 0 _0805ECA8: .4byte gUnknown_2024178 _0805ECAC: .4byte gUnknown_82FA724 - thumb_func_end sub_0805EBD8 + thumb_func_end AllocateMonSpritesGfx - thumb_func_start sub_0805ECB0 -sub_0805ECB0: @ 0x0805ECB0 + thumb_func_start FreeMonSpritesGfx +FreeMonSpritesGfx: @ 0x0805ECB0 push {r4, r5, r6, lr} ldr r6, _0805ED28 ldr r0, [r6] @@ -192462,7 +192462,7 @@ sub_0805ECB0: @ 0x0805ECB0 ldr r0, [r0] cmp r0, #0 beq _0805ECD6 - bl sub_08000BF0 + bl Free ldr r0, [r6] movs r1, #0xbe lsls r1, r1, #1 @@ -192477,7 +192477,7 @@ _0805ECD6: ldr r0, [r0] cmp r0, #0 beq _0805ECF4 - bl sub_08000BF0 + bl Free ldr r0, [r6] movs r1, #0xbc lsls r1, r1, #1 @@ -192490,20 +192490,20 @@ _0805ECF4: lsls r5, r5, #1 adds r0, r0, r5 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r5, r0, r5 movs r4, #0 str r4, [r5] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] str r4, [r0] str r4, [r0, #4] str r4, [r0, #8] str r4, [r0, #0xc] str r4, [r0, #0x10] - bl sub_08000BF0 + bl Free str r4, [r6] _0805ED22: pop {r4, r5, r6} @@ -192511,27 +192511,27 @@ _0805ED22: bx r0 .align 2, 0 _0805ED28: .4byte gUnknown_2024178 - thumb_func_end sub_0805ECB0 + thumb_func_end FreeMonSpritesGfx - thumb_func_start sub_0805ED2C -sub_0805ED2C: @ 0x0805ED2C + thumb_func_start ShouldPlayNormalMonCry +ShouldPlayNormalMonCry: @ 0x0805ED2C push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData ldr r1, _0805ED70 ands r1, r0 cmp r1, #0 bne _0805ED74 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -192553,7 +192553,7 @@ _0805ED76: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0805ED2C + thumb_func_end ShouldPlayNormalMonCry thumb_func_start sub_0805ED7C sub_0805ED7C: @ 0x0805ED7C @@ -192611,7 +192611,7 @@ _0805EDD8: .4byte gUnknown_2023D08 _0805EDDC: .4byte gUnknown_2022D08 _0805EDE0: .4byte gUnknown_82ED050 _0805EDE4: - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805EDE8: pop {r0} bx r0 @@ -192635,7 +192635,7 @@ sub_0805EDEC: @ 0x0805EDEC ldr r0, _0805EE20 cmp r1, r0 bne _0805EE10 - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805EE10: pop {r0} bx r0 @@ -192664,7 +192664,7 @@ sub_0805EE24: @ 0x0805EE24 ldr r0, _0805EE58 cmp r1, r0 bne _0805EE48 - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805EE48: pop {r0} bx r0 @@ -192696,7 +192696,7 @@ sub_0805EE5C: @ 0x0805EE5C bne _0805EEAE adds r0, r2, r5 ldrh r0, [r0, #6] - bl sub_0805DC00 + bl FreeTrainerFrontPicPalette ldrb r0, [r4] adds r0, r0, r6 ldrb r1, [r0] @@ -192713,7 +192713,7 @@ sub_0805EE5C: @ 0x0805EE5C lsls r0, r0, #2 adds r0, r0, r5 bl DestroySprite - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805EEAE: pop {r4, r5, r6} pop {r0} @@ -192753,7 +192753,7 @@ sub_0805EEC4: @ 0x0805EEC4 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805EEFC: pop {r4} pop {r0} @@ -192772,11 +192772,11 @@ sub_0805EF0C: @ 0x0805EF0C push {r5, r6, r7} movs r0, #0 mov sb, r0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805EF48 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805EF3A @@ -193088,7 +193088,7 @@ _0805F192: ands r0, r1 cmp r0, #0 bne _0805F1DA - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805F1DA @@ -193151,7 +193151,7 @@ _0805F1DA: ands r0, r1 cmp r0, #0 bne _0805F2A0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805F270 @@ -193177,7 +193177,7 @@ _0805F1DA: ldr r2, _0805F340 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute mov r1, r8 ldrb r0, [r1] eors r0, r7 @@ -193203,7 +193203,7 @@ _0805F270: ldr r2, _0805F340 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -193251,7 +193251,7 @@ _0805F2BC: ands r0, r1 cmp r0, #0 bne _0805F37E - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _0805F37E @@ -193315,11 +193315,11 @@ _0805F360: movs r0, #1 str r0, [sp] _0805F37E: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805F39E - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805F3FC @@ -193423,7 +193423,7 @@ _0805F45A: mov r0, sl cmp r0, #0 beq _0805F544 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0805F4BE @@ -193457,12 +193457,12 @@ _0805F45A: ldr r1, _0805F570 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback _0805F4BE: ldr r1, _0805F558 ldr r4, _0805F55C @@ -193485,12 +193485,12 @@ _0805F4BE: ldr r1, _0805F570 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r3, _0805F574 ldr r0, [r3] ldr r2, [r0, #8] @@ -193639,7 +193639,7 @@ _0805F5CC: bl FreeSpriteTilesByTag adds r0, r4, #0 bl FreeSpritePaletteByTag - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805F634: pop {r4, r5} pop {r0} @@ -193665,7 +193665,7 @@ sub_0805F65C: @ 0x0805F65C ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -193689,7 +193689,7 @@ sub_0805F65C: @ 0x0805F65C _0805F69C: .4byte gUnknown_2023D08 _0805F6A0: .4byte gUnknown_3005AD0 _0805F6A4: - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805F6A8: pop {r4, r5, r6} pop {r0} @@ -193719,7 +193719,7 @@ sub_0805F6B0: @ 0x0805F6B0 adds r0, r3, r0 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805F6DE: pop {r0} bx r0 @@ -193771,7 +193771,7 @@ sub_0805F6F4: @ 0x0805F6F4 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805F74E: pop {r4, r5, r6} pop {r0} @@ -193792,7 +193792,7 @@ sub_0805F768: @ 0x0805F768 lsls r0, r0, #0x10 cmp r0, #0 bne _0805F77A - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805F77A: pop {r0} bx r0 @@ -193827,7 +193827,7 @@ sub_0805F780: @ 0x0805F780 strb r0, [r2] ldr r0, _0805F7C8 strb r3, [r0] - bl sub_0805FB04 + bl OpponentBufferExecCompleted b _0805F7F6 .align 2, 0 _0805F7BC: .4byte gUnknown_2023E88 @@ -193895,7 +193895,7 @@ sub_0805F7FC: @ 0x0805F7FC adds r1, r3, #0 adds r2, r3, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0805F83C: ldr r0, _0805F864 ldrb r1, [r4] @@ -193934,7 +193934,7 @@ sub_0805F86C: @ 0x0805F86C ands r0, r1 cmp r0, #0 bne _0805F8C6 - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _0805F8C6 @@ -193961,7 +193961,7 @@ _0805F8B6: movs r2, #0x80 lsls r2, r2, #1 bl m4aMPlayVolumeControl - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805F8C6: pop {r4} pop {r0} @@ -194051,7 +194051,7 @@ sub_0805F8EC: @ 0x0805F8EC ldr r2, _0805F9D0 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r5] bl sub_08076320 ldrb r0, [r5] @@ -194149,12 +194149,12 @@ _0805FA0E: ldr r1, _0805FA8C adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r1, _0805FA9C ldrb r0, [r5] lsls r0, r0, #2 @@ -194194,7 +194194,7 @@ sub_0805FAA4: @ 0x0805FAA4 ands r0, r1 cmp r0, #0 bne _0805FAC6 - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805FAC6: pop {r0} bx r0 @@ -194220,7 +194220,7 @@ sub_0805FAD4: @ 0x0805FAD4 ands r0, r1 cmp r0, #0 bne _0805FAF6 - bl sub_0805FB04 + bl OpponentBufferExecCompleted _0805FAF6: pop {r0} bx r0 @@ -194229,8 +194229,8 @@ _0805FAFC: .4byte gUnknown_2024174 _0805FB00: .4byte gUnknown_2023D08 thumb_func_end sub_0805FAD4 - thumb_func_start sub_0805FB04 -sub_0805FB04: @ 0x0805FB04 + thumb_func_start OpponentBufferExecCompleted +OpponentBufferExecCompleted: @ 0x0805FB04 push {r4, lr} sub sp, #4 ldr r1, _0805FB44 @@ -194246,7 +194246,7 @@ sub_0805FB04: @ 0x0805FB04 ands r0, r1 cmp r0, #0 beq _0805FB58 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -194284,10 +194284,10 @@ _0805FB6A: .align 2, 0 _0805FB74: .4byte gUnknown_2023D0C _0805FB78: .4byte gUnknown_82FACB4 - thumb_func_end sub_0805FB04 + thumb_func_end OpponentBufferExecCompleted - thumb_func_start sub_0805FB7C -sub_0805FB7C: @ 0x0805FB7C + thumb_func_start OpponentHandleGetMonData +OpponentHandleGetMonData: @ 0x0805FB7C push {r4, r5, r6, lr} sub sp, #0x100 movs r6, #0 @@ -194336,14 +194336,14 @@ _0805FBD6: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_0805FB04 + bl BtlController_EmitDataTransfer + bl OpponentBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0805FB7C + thumb_func_end OpponentHandleGetMonData thumb_func_start sub_0805FBF0 sub_0805FBF0: @ 0x0805FBF0 @@ -194446,12 +194446,12 @@ _0805FD20: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -194479,12 +194479,12 @@ _0805FD6C: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -194499,21 +194499,21 @@ _0805FD6C: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -194525,7 +194525,7 @@ _0805FD6C: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -194537,7 +194537,7 @@ _0805FD6C: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -194549,7 +194549,7 @@ _0805FD6C: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -194560,7 +194560,7 @@ _0805FD6C: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -194571,7 +194571,7 @@ _0805FD6C: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -194583,55 +194583,55 @@ _0805FD6C: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -194644,7 +194644,7 @@ _0805FD6C: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -194654,19 +194654,19 @@ _0805FD6C: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _0805FF24: @@ -194717,13 +194717,13 @@ _0805FF7A: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -194737,7 +194737,7 @@ _0805FF7A: ldr r1, _0805FFC8 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -194779,7 +194779,7 @@ _0805FFF4: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -194790,7 +194790,7 @@ _0805FFF4: ldr r1, _08060020 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -194827,7 +194827,7 @@ _08060050: adds r0, r0, r1 movs r1, #0x19 _0806005A: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -194960,27 +194960,27 @@ _08060140: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _08060386 @@ -195065,7 +195065,7 @@ _08060210: adds r0, r0, r1 movs r1, #0x37 _0806021A: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -195154,7 +195154,7 @@ _080602B4: adds r0, r0, r1 movs r1, #0x3f _080602BE: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -195261,7 +195261,7 @@ _08060374: adds r0, r0, r1 movs r1, #0x36 _0806037E: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _08060386: @@ -195278,8 +195278,8 @@ _08060386: _08060398: .4byte gUnknown_20243E8 thumb_func_end sub_0805FBF0 - thumb_func_start sub_0806039C -sub_0806039C: @ 0x0806039C + thumb_func_start OpponentHandleGetRawMonData +OpponentHandleGetRawMonData: @ 0x0806039C push {r4, r5, r6, r7, lr} sub sp, #0x58 ldr r2, _08060414 @@ -195333,8 +195333,8 @@ _080603F2: ldrb r1, [r0] movs r0, #1 adds r2, r4, #0 - bl sub_08033E70 - bl sub_0805FB04 + bl BtlController_EmitDataTransfer + bl OpponentBufferExecCompleted add sp, #0x58 pop {r4, r5, r6, r7} pop {r0} @@ -195344,7 +195344,7 @@ _08060414: .4byte gUnknown_2023D12 _08060418: .4byte gUnknown_2023D08 _0806041C: .4byte gUnknown_2022D08 _08060420: .4byte gUnknown_20243E8 - thumb_func_end sub_0806039C + thumb_func_end OpponentHandleGetRawMonData thumb_func_start sub_08060424 sub_08060424: @ 0x08060424 @@ -195362,7 +195362,7 @@ sub_08060424: @ 0x08060424 lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_0806047C + bl SetOpponentMonData b _08060472 .align 2, 0 _08060448: .4byte gUnknown_2022D08 @@ -195377,7 +195377,7 @@ _08060458: cmp r0, #0 beq _08060466 adds r0, r5, #0 - bl sub_0806047C + bl SetOpponentMonData _08060466: lsrs r4, r4, #1 adds r0, r5, #1 @@ -195386,14 +195386,14 @@ _08060466: cmp r5, #5 bls _08060458 _08060472: - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_08060424 - thumb_func_start sub_0806047C -sub_0806047C: @ 0x0806047C + thumb_func_start SetOpponentMonData +SetOpponentMonData: @ 0x0806047C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -195496,12 +195496,12 @@ _080605B0: adds r0, r4, #0 movs r1, #0xb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r2, r7, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -195542,12 +195542,12 @@ _08060616: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -195563,15 +195563,15 @@ _08060616: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r7, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -195580,7 +195580,7 @@ _08060616: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r7, #0x14] lsls r0, r0, #0x16 @@ -195589,7 +195589,7 @@ _08060616: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r7, #0x15] lsls r0, r0, #0x19 @@ -195598,7 +195598,7 @@ _08060616: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r7, #0x14] lsls r0, r0, #0xc @@ -195607,7 +195607,7 @@ _08060616: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r7, #0x16] lsls r0, r0, #0x17 @@ -195616,7 +195616,7 @@ _08060616: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r7, #0x17] lsls r0, r0, #0x1a @@ -195625,47 +195625,47 @@ _08060616: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060744: .4byte gUnknown_20243E8 @@ -195678,7 +195678,7 @@ _08060748: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060760: .4byte gUnknown_20243E8 @@ -195691,7 +195691,7 @@ _08060764: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _0806077C: .4byte gUnknown_20243E8 @@ -195713,12 +195713,12 @@ _08060798: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -195732,7 +195732,7 @@ _08060798: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080607D0: .4byte gUnknown_20243E8 @@ -195764,7 +195764,7 @@ _080607F4: adds r0, r4, #0 movs r1, #0x11 str r3, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -195772,7 +195772,7 @@ _080607F4: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -195780,7 +195780,7 @@ _080607F4: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -195788,7 +195788,7 @@ _080607F4: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -195796,7 +195796,7 @@ _080607F4: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060858: .4byte gUnknown_20243E8 @@ -195815,7 +195815,7 @@ _0806085C: _08060872: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _0806087C: .4byte gUnknown_20243E8 @@ -195829,7 +195829,7 @@ _08060884: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _0806089C: .4byte gUnknown_20243E8 @@ -195842,7 +195842,7 @@ _080608A0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080608B8: .4byte gUnknown_20243E8 @@ -195855,7 +195855,7 @@ _080608BC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080608D4: .4byte gUnknown_20243E8 @@ -195868,7 +195868,7 @@ _080608D8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080608F0: .4byte gUnknown_20243E8 @@ -195881,7 +195881,7 @@ _080608F4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _0806090C: .4byte gUnknown_20243E8 @@ -195894,7 +195894,7 @@ _08060910: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060928: .4byte gUnknown_20243E8 @@ -195907,7 +195907,7 @@ _0806092C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060944: .4byte gUnknown_20243E8 @@ -195920,7 +195920,7 @@ _08060948: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060960: .4byte gUnknown_20243E8 @@ -195933,7 +195933,7 @@ _08060964: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _0806097C: .4byte gUnknown_20243E8 @@ -195946,7 +195946,7 @@ _08060980: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060998: .4byte gUnknown_20243E8 @@ -195959,7 +195959,7 @@ _0806099C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080609B4: .4byte gUnknown_20243E8 @@ -195972,7 +195972,7 @@ _080609B8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080609D0: .4byte gUnknown_20243E8 @@ -195985,7 +195985,7 @@ _080609D4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _080609EC: .4byte gUnknown_20243E8 @@ -195998,7 +195998,7 @@ _080609F0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060A08: .4byte gUnknown_20243E8 @@ -196014,7 +196014,7 @@ _08060A0C: adds r0, r4, #0 movs r1, #0x27 str r3, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -196022,7 +196022,7 @@ _08060A0C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -196030,7 +196030,7 @@ _08060A0C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -196038,7 +196038,7 @@ _08060A0C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -196046,7 +196046,7 @@ _08060A0C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -196065,7 +196065,7 @@ _08060A80: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060A98: .4byte gUnknown_20243E8 @@ -196078,7 +196078,7 @@ _08060A9C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060AB4: .4byte gUnknown_20243E8 @@ -196091,7 +196091,7 @@ _08060AB8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060AD0: .4byte gUnknown_20243E8 @@ -196104,7 +196104,7 @@ _08060AD4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060AEC: .4byte gUnknown_20243E8 @@ -196117,7 +196117,7 @@ _08060AF0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060B08: .4byte gUnknown_20243E8 @@ -196131,7 +196131,7 @@ _08060B0C: adds r2, r2, r3 _08060B1A: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060B24: .4byte gUnknown_20243E8 @@ -196144,7 +196144,7 @@ _08060B28: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060B40: .4byte gUnknown_20243E8 @@ -196157,7 +196157,7 @@ _08060B44: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060B5C: .4byte gUnknown_20243E8 @@ -196170,7 +196170,7 @@ _08060B60: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060B78: .4byte gUnknown_20243E8 @@ -196183,7 +196183,7 @@ _08060B7C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060B94: .4byte gUnknown_20243E8 @@ -196196,7 +196196,7 @@ _08060B98: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060BB0: .4byte gUnknown_20243E8 @@ -196209,7 +196209,7 @@ _08060BB4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060BCC: .4byte gUnknown_20243E8 @@ -196222,7 +196222,7 @@ _08060BD0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060BE8: .4byte gUnknown_20243E8 @@ -196235,7 +196235,7 @@ _08060BEC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060C04: .4byte gUnknown_20243E8 @@ -196248,7 +196248,7 @@ _08060C08: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060C20: .4byte gUnknown_20243E8 @@ -196261,7 +196261,7 @@ _08060C24: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060C3C: .4byte gUnknown_20243E8 @@ -196274,7 +196274,7 @@ _08060C40: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060C58: .4byte gUnknown_20243E8 @@ -196287,7 +196287,7 @@ _08060C5C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060C74: .4byte gUnknown_20243E8 @@ -196300,7 +196300,7 @@ _08060C78: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060C90: .4byte gUnknown_20243E8 @@ -196313,7 +196313,7 @@ _08060C94: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060CAC: .4byte gUnknown_20243E8 @@ -196326,7 +196326,7 @@ _08060CB0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060CC8: .4byte gUnknown_20243E8 @@ -196339,7 +196339,7 @@ _08060CCC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060CE4: .4byte gUnknown_20243E8 @@ -196352,7 +196352,7 @@ _08060CE8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060D00: .4byte gUnknown_20243E8 @@ -196365,7 +196365,7 @@ _08060D04: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060D1C: .4byte gUnknown_20243E8 @@ -196378,7 +196378,7 @@ _08060D20: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060D38: .4byte gUnknown_20243E8 @@ -196391,7 +196391,7 @@ _08060D3C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060D54: .4byte gUnknown_20243E8 @@ -196404,7 +196404,7 @@ _08060D58: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _08060D88 .align 2, 0 _08060D70: .4byte gUnknown_20243E8 @@ -196417,7 +196417,7 @@ _08060D74: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _08060D88: add sp, #0x38 pop {r3, r4, r5} @@ -196429,7 +196429,7 @@ _08060D88: bx r0 .align 2, 0 _08060D98: .4byte gUnknown_20243E8 - thumb_func_end sub_0806047C + thumb_func_end SetOpponentMonData thumb_func_start OpponentHandleSetRawMonData OpponentHandleSetRawMonData: @ 0x08060D9C @@ -196479,7 +196479,7 @@ _08060DD2: cmp r3, r0 blo _08060DD2 _08060DF4: - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -196490,8 +196490,8 @@ _08060E08: .4byte gUnknown_2022D08 _08060E0C: .4byte gUnknown_20243E8 thumb_func_end OpponentHandleSetRawMonData - thumb_func_start sub_08060E10 -sub_08060E10: @ 0x08060E10 + thumb_func_start OpponentHandleLoadMonSprite +OpponentHandleLoadMonSprite: @ 0x08060E10 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -196509,7 +196509,7 @@ sub_08060E10: @ 0x08060E10 mov sl, r2 add r0, sl movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -196521,19 +196521,19 @@ sub_08060E10: @ 0x08060E10 ldrh r0, [r0] muls r0, r7, r0 add r0, sl - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _08060F4C mov sb, r0 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -196550,7 +196550,7 @@ sub_08060E10: @ 0x08060E10 mov r0, sb adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _08060F50 ldrb r1, [r6] adds r1, r1, r4 @@ -196614,12 +196614,12 @@ sub_08060E10: @ 0x08060E10 muls r0, r7, r0 add r0, sl movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r1, _08060F60 ldrb r0, [r6] lsls r0, r0, #2 @@ -196644,7 +196644,7 @@ _08060F58: .4byte 0x0000FF10 _08060F5C: .4byte gUnknown_2024188 _08060F60: .4byte gUnknown_3005AC0 _08060F64: .4byte sub_0805F580 - thumb_func_end sub_08060E10 + thumb_func_end OpponentHandleLoadMonSprite thumb_func_start OpponentHandleSwitchInAnim OpponentHandleSwitchInAnim: @ 0x08060F68 @@ -196723,13 +196723,13 @@ sub_08060FC8: @ 0x08060FC8 ldr r5, _08061138 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _0806113C - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _08061140 mov sl, r1 add sl, r6 @@ -196741,19 +196741,19 @@ sub_08060FC8: @ 0x08060FC8 adds r0, r1, #0 adds r0, r0, r5 adds r1, r6, #0 - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx adds r0, r6, #0 bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _08061144 mov sb, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -196770,7 +196770,7 @@ sub_08060FC8: @ 0x08060FC8 mov r0, sb adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _08061148 adds r4, r6, r4 strb r0, [r4] @@ -196844,7 +196844,7 @@ sub_08060FC8: @ 0x08060FC8 str r1, [r0] movs r0, #0 movs r1, #0xfe - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sl ldrb r2, [r1] lsls r1, r2, #4 @@ -196874,8 +196874,8 @@ _08061150: .4byte gUnknown_2024188 _08061154: .4byte sub_08007140 thumb_func_end sub_08060FC8 - thumb_func_start sub_08061158 -sub_08061158: @ 0x08061158 + thumb_func_start OpponentHandleReturnMonToBall +OpponentHandleReturnMonToBall: @ 0x08061158 push {r4, r5, r6, lr} ldr r1, _0806118C ldr r6, _08061190 @@ -196932,7 +196932,7 @@ _080611A0: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0805FB04 + bl OpponentBufferExecCompleted _080611DC: pop {r4, r5, r6} pop {r0} @@ -196941,7 +196941,7 @@ _080611DC: _080611E4: .4byte gUnknown_2023E88 _080611E8: .4byte gUnknown_20205AC _080611EC: .4byte gUnknown_3005AD0 - thumb_func_end sub_08061158 + thumb_func_end OpponentHandleReturnMonToBall thumb_func_start sub_080611F0 sub_080611F0: @ 0x080611F0 @@ -196976,7 +196976,7 @@ _08061218: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08061232: ldr r0, [r6] ldrb r1, [r5] @@ -197001,7 +197001,7 @@ _08061246: adds r0, r2, #0 adds r1, r2, #0 movs r3, #2 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _08061274 ldrb r0, [r5] lsls r0, r0, #2 @@ -197017,8 +197017,8 @@ _08061274: .4byte gUnknown_3005AC0 _08061278: .4byte sub_0805F6F4 thumb_func_end sub_080611F0 - thumb_func_start sub_0806127C -sub_0806127C: @ 0x0806127C + thumb_func_start OpponentHandleDrawTrainerPic +OpponentHandleDrawTrainerPic: @ 0x0806127C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -197061,20 +197061,20 @@ _080612B4: cmp r0, #1 bne _080612DC ldrh r0, [r3] - bl sub_081D4BE4 + bl GetTrainerHillTrainerFrontSpriteId b _08061346 .align 2, 0 _080612D8: .4byte gUnknown_2023D08 _080612DC: ldr r0, _080612E8 ldrh r0, [r0] - bl sub_081D4BE4 + bl GetTrainerHillTrainerFrontSpriteId b _08061346 .align 2, 0 _080612E8: .4byte gUnknown_203886C _080612EC: ldrh r0, [r3] - bl sub_081D4BE4 + bl GetTrainerHillTrainerFrontSpriteId b _08061346 _080612F4: ldr r0, _08061314 @@ -197090,7 +197090,7 @@ _080612F4: cmp r0, #1 bne _08061320 ldrh r0, [r3] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId b _08061346 .align 2, 0 _08061314: .4byte 0x003F0100 @@ -197099,13 +197099,13 @@ _0806131C: .4byte gUnknown_2023D08 _08061320: ldr r0, _0806132C ldrh r0, [r0] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId b _08061346 .align 2, 0 _0806132C: .4byte gUnknown_203886C _08061330: ldrh r0, [r3] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId b _08061346 _08061338: movs r0, #0x80 @@ -197172,14 +197172,14 @@ _080613B2: ldr r5, _08061498 ldrb r1, [r5] mov r0, r8 - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _0806149C mov sb, r7 ldr r1, _080614A0 @@ -197202,7 +197202,7 @@ _080613B2: adds r0, r6, #0 mov r1, sb adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _080614A4 ldrb r1, [r5] adds r1, r1, r6 @@ -197231,7 +197231,7 @@ _080613B2: lsls r0, r2, #3 adds r0, r0, r1 ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldrb r1, [r5] adds r1, r1, r6 ldrb r1, [r1] @@ -197287,7 +197287,7 @@ _080614B0: .4byte gUnknown_82D91CC _080614B4: .4byte sub_0805D3C8 _080614B8: .4byte gUnknown_3005AC0 _080614BC: .4byte sub_0805EDEC - thumb_func_end sub_0806127C + thumb_func_end OpponentHandleDrawTrainerPic thumb_func_start sub_080614C0 sub_080614C0: @ 0x080614C0 @@ -197332,20 +197332,20 @@ _080614F8: cmp r0, #1 bne _08061520 ldrh r0, [r3] - bl sub_081D4BE4 + bl GetTrainerHillTrainerFrontSpriteId b _0806158A .align 2, 0 _0806151C: .4byte gUnknown_2023D08 _08061520: ldr r0, _0806152C ldrh r0, [r0] - bl sub_081D4BE4 + bl GetTrainerHillTrainerFrontSpriteId b _0806158A .align 2, 0 _0806152C: .4byte gUnknown_203886C _08061530: ldrh r0, [r3] - bl sub_081D4BE4 + bl GetTrainerHillTrainerFrontSpriteId b _0806158A _08061538: ldr r0, _08061558 @@ -197361,7 +197361,7 @@ _08061538: cmp r0, #1 bne _08061564 ldrh r0, [r3] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId b _0806158A .align 2, 0 _08061558: .4byte 0x003F0100 @@ -197370,13 +197370,13 @@ _08061560: .4byte gUnknown_2023D08 _08061564: ldr r0, _08061570 ldrh r0, [r0] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId b _0806158A .align 2, 0 _08061570: .4byte gUnknown_203886C _08061574: ldrh r0, [r3] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId b _0806158A _0806157C: movs r0, #0x80 @@ -197418,14 +197418,14 @@ _080615C2: mov r8, r0 ldr r6, _080616AC ldrb r1, [r6] - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r0, _080616B0 ldr r2, _080616B4 mov r3, r8 @@ -197441,7 +197441,7 @@ _080615C2: asrs r2, r2, #0x10 movs r1, #0xb0 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r5, _080616B8 ldrb r1, [r6] adds r1, r1, r5 @@ -197480,7 +197480,7 @@ _080615C2: lsls r0, r2, #3 adds r0, r0, r1 ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldrb r1, [r6] adds r1, r1, r5 ldrb r1, [r1] @@ -197538,8 +197538,8 @@ _080616CC: .4byte gUnknown_3005AC0 _080616D0: .4byte sub_0805EE24 thumb_func_end sub_080614C0 - thumb_func_start sub_080616D4 -sub_080616D4: @ 0x080616D4 + thumb_func_start OpponentHandleTrainerSlideBack +OpponentHandleTrainerSlideBack: @ 0x080616D4 push {r4, r5, r6, lr} ldr r6, _08061764 ldr r4, _08061768 @@ -197599,7 +197599,7 @@ sub_080616D4: @ 0x080616D4 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _08061774 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _08061778 ldrb r0, [r4] lsls r0, r0, #2 @@ -197617,7 +197617,7 @@ _08061770: .4byte sub_080A67B4 _08061774: .4byte sub_08007140 _08061778: .4byte gUnknown_3005AC0 _0806177C: .4byte sub_0805EE5C - thumb_func_end sub_080616D4 + thumb_func_end OpponentHandleTrainerSlideBack thumb_func_start sub_08061780 sub_08061780: @ 0x08061780 @@ -197645,7 +197645,7 @@ sub_08061780: @ 0x08061780 adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _080617B4: ldr r0, [r6] ldrb r1, [r5] @@ -197672,7 +197672,7 @@ _080617D4: strb r0, [r3, #4] movs r0, #0x10 movs r1, #0x3f - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _08061818 ldr r1, _0806181C ldrb r0, [r5] @@ -197698,24 +197698,24 @@ _08061810: .align 2, 0 _08061818: .4byte gUnknown_20205AC _0806181C: .4byte gUnknown_2023E88 -_08061820: .4byte sub_08039578 +_08061820: .4byte SpriteCB_FaintOpponentMon _08061824: .4byte gUnknown_3005AC0 _08061828: .4byte sub_0805F6B0 thumb_func_end sub_08061780 - thumb_func_start sub_0806182C -sub_0806182C: @ 0x0806182C + thumb_func_start RunSaveCallback +RunSaveCallback: @ 0x0806182C push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806182C + thumb_func_end RunSaveCallback thumb_func_start sub_08061838 sub_08061838: @ 0x08061838 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -197724,7 +197724,7 @@ sub_08061838: @ 0x08061838 thumb_func_start sub_08061844 sub_08061844: @ 0x08061844 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -197733,18 +197733,18 @@ sub_08061844: @ 0x08061844 thumb_func_start sub_08061850 sub_08061850: @ 0x08061850 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08061850 - thumb_func_start sub_0806185C -sub_0806185C: @ 0x0806185C + thumb_func_start OpponentHandleMoveAnimation +OpponentHandleMoveAnimation: @ 0x0806185C push {r4, r5, r6, lr} ldr r6, _08061940 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _0806186E @@ -197850,7 +197850,7 @@ _0806186E: lsrs r3, r0, #0x18 cmp r3, #0 beq _08061964 - bl sub_0805FB04 + bl OpponentBufferExecCompleted b _08061982 .align 2, 0 _08061940: .4byte gUnknown_2023D08 @@ -197886,7 +197886,7 @@ _08061982: _08061988: .4byte gUnknown_2024174 _0806198C: .4byte gUnknown_3005AC0 _08061990: .4byte sub_08061994 - thumb_func_end sub_0806185C + thumb_func_end OpponentHandleMoveAnimation thumb_func_start sub_08061994 sub_08061994: @ 0x08061994 @@ -197954,7 +197954,7 @@ _080619F6: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08061A18: ldr r0, [r7] ldrb r1, [r6] @@ -198012,7 +198012,7 @@ _08061A56: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -198068,7 +198068,7 @@ _08061ACC: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_0805FB04 + bl OpponentBufferExecCompleted _08061B08: pop {r3, r4, r5} mov r8, r3 @@ -198080,8 +198080,8 @@ _08061B08: .align 2, 0 thumb_func_end sub_08061994 - thumb_func_start sub_08061B18 -sub_08061B18: @ 0x08061B18 + thumb_func_start OpponentHandlePrintString +OpponentHandlePrintString: @ 0x08061B18 push {r4, r5, lr} ldr r0, _08061B58 movs r1, #0 @@ -198094,7 +198094,7 @@ sub_08061B18: @ 0x08061B18 ldr r0, _08061B64 adds r4, r4, r0 ldrh r0, [r4] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _08061B68 movs r1, #0 bl sub_0814FA04 @@ -198106,7 +198106,7 @@ sub_08061B18: @ 0x08061B18 str r1, [r0] ldrb r0, [r5] ldrh r1, [r4] - bl sub_081A53D4 + bl BattleArena_DeductMindPoints pop {r4, r5} pop {r0} bx r0 @@ -198118,38 +198118,38 @@ _08061B64: .4byte gUnknown_2022D0A _08061B68: .4byte gUnknown_2022AE0 _08061B6C: .4byte gUnknown_3005AC0 _08061B70: .4byte sub_0805F768 - thumb_func_end sub_08061B18 + thumb_func_end OpponentHandlePrintString thumb_func_start sub_08061B74 sub_08061B74: @ 0x08061B74 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08061B74 - thumb_func_start sub_08061B80 -sub_08061B80: @ 0x08061B80 + thumb_func_start OpponentHandleChooseAction +OpponentHandleChooseAction: @ 0x08061B80 push {lr} - bl sub_08063464 - bl sub_0805FB04 + bl AI_TrySwitchOrUseItem + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08061B80 + thumb_func_end OpponentHandleChooseAction thumb_func_start sub_08061B90 sub_08061B90: @ 0x08061B90 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08061B90 - thumb_func_start sub_08061B9C -sub_08061B9C: @ 0x08061B9C + thumb_func_start OpponentHandleChooseMove +OpponentHandleChooseMove: @ 0x08061B9C push {r4, r5, r6, lr} ldr r0, _08061BC4 ldr r2, [r0] @@ -198158,16 +198158,16 @@ sub_08061B9C: @ 0x08061B9C ands r0, r2 cmp r0, #0 beq _08061BC8 - bl sub_0805CDB8 + bl ChooseMoveAndTargetInBattlePalace adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xa _08061BBA: - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _08061BBE: - bl sub_0805FB04 + bl OpponentBufferExecCompleted b _08061D3A .align 2, 0 _08061BC4: .4byte gUnknown_2022C90 @@ -198183,7 +198183,7 @@ _08061BC8: cmp r2, #0 beq _08061CA8 movs r0, #0xf - bl sub_081309A4 + bl BattleAI_SetupAIData bl sub_08130BEC lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -198273,7 +198273,7 @@ _08061C80: movs r0, #1 movs r1, #0xa adds r2, r4, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _08061BBE .align 2, 0 _08061C94: .4byte gUnknown_82ED220 @@ -198309,7 +198309,7 @@ _08061CAA: movs r0, #1 movs r1, #0xa adds r2, r4, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _08061D36 .align 2, 0 _08061CE4: .4byte gUnknown_82ED220 @@ -198334,7 +198334,7 @@ _08061CEC: orrs r2, r4 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _08061D36 .align 2, 0 _08061D1C: .4byte gUnknown_2022C90 @@ -198347,17 +198347,17 @@ _08061D20: orrs r2, r4 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _08061D36: - bl sub_0805FB04 + bl OpponentBufferExecCompleted _08061D3A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08061B9C + thumb_func_end OpponentHandleChooseMove - thumb_func_start sub_08061D40 -sub_08061D40: @ 0x08061D40 + thumb_func_start OpponentHandleChooseItem +OpponentHandleChooseItem: @ 0x08061D40 push {lr} ldr r0, _08061D64 ldrb r0, [r0] @@ -198369,17 +198369,17 @@ sub_08061D40: @ 0x08061D40 adds r0, #0xc0 ldrb r1, [r0] movs r0, #1 - bl sub_08034014 - bl sub_0805FB04 + bl BtlController_EmitOneReturnValue + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08061D64: .4byte gUnknown_2023D08 _08061D68: .4byte gUnknown_2024140 - thumb_func_end sub_08061D40 + thumb_func_end OpponentHandleChooseItem - thumb_func_start sub_08061D6C -sub_08061D6C: @ 0x08061D6C + thumb_func_start OpponentHandleChoosePokemon +OpponentHandleChoosePokemon: @ 0x08061D6C push {r4, r5, r6, r7, lr} ldr r0, _08061DAC ldrb r0, [r0] @@ -198392,7 +198392,7 @@ sub_08061D6C: @ 0x08061D6C ldrb r0, [r1] cmp r0, #6 bne _08061E38 - bl sub_08063674 + bl GetMostSuitableMonToSwitchInto lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #6 @@ -198460,7 +198460,7 @@ _08061E02: ldr r1, _08061E30 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08061E00 ldr r1, _08061E34 @@ -198494,34 +198494,34 @@ _08061E3E: lsrs r1, r1, #0x18 movs r0, #1 movs r2, #0 - bl sub_08033FDC - bl sub_0805FB04 + bl BtlController_EmitChosenMonReturnValue + bl OpponentBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _08061E64: .4byte gUnknown_2023D08 _08061E68: .4byte gUnknown_2024140 - thumb_func_end sub_08061D6C + thumb_func_end OpponentHandleChoosePokemon thumb_func_start sub_08061E6C sub_08061E6C: @ 0x08061E6C push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08061E6C - thumb_func_start sub_08061E78 -sub_08061E78: @ 0x08061E78 + thumb_func_start OpponentHandleHealthBarUpdate +OpponentHandleHealthBarUpdate: @ 0x08061E78 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _08061EF0 ldr r0, _08061EF4 mov sb, r0 @@ -198549,7 +198549,7 @@ sub_08061E78: @ 0x08061E78 ldr r4, _08061F00 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -198559,7 +198559,7 @@ sub_08061E78: @ 0x08061E78 muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -198587,7 +198587,7 @@ _08061F08: ldr r1, _08061F54 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -198619,23 +198619,23 @@ _08061F58: .4byte gUnknown_3005AD0 _08061F5C: .4byte gUnknown_3005AC0 _08061F60: .4byte gUnknown_2023D08 _08061F64: .4byte sub_0805F65C - thumb_func_end sub_08061E78 + thumb_func_end OpponentHandleHealthBarUpdate thumb_func_start sub_08061F68 sub_08061F68: @ 0x08061F68 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08061F68 - thumb_func_start sub_08061F74 -sub_08061F74: @ 0x08061F74 + thumb_func_start OpponentHandleStatusIconUpdate +OpponentHandleStatusIconUpdate: @ 0x08061F74 push {r4, lr} ldr r4, _08061FD0 ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _08061FC8 @@ -198652,7 +198652,7 @@ sub_08061F74: @ 0x08061F74 ldr r2, _08061FDC adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _08061FE0 ldr r0, [r0] @@ -198684,14 +198684,14 @@ _08061FDC: .4byte gUnknown_20243E8 _08061FE0: .4byte gUnknown_2024174 _08061FE4: .4byte gUnknown_3005AC0 _08061FE8: .4byte sub_0805FAA4 - thumb_func_end sub_08061F74 + thumb_func_end OpponentHandleStatusIconUpdate - thumb_func_start sub_08061FEC -sub_08061FEC: @ 0x08061FEC + thumb_func_start OpponentHandleStatusAnimation +OpponentHandleStatusAnimation: @ 0x08061FEC push {r4, r5, lr} ldr r5, _08062044 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0806203C @@ -198719,7 +198719,7 @@ sub_08061FEC: @ 0x08061FEC ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _0806204C ldrb r0, [r5] lsls r0, r0, #2 @@ -198735,12 +198735,12 @@ _08062044: .4byte gUnknown_2023D08 _08062048: .4byte gUnknown_2022D08 _0806204C: .4byte gUnknown_3005AC0 _08062050: .4byte sub_0805FAA4 - thumb_func_end sub_08061FEC + thumb_func_end OpponentHandleStatusAnimation thumb_func_start sub_08062054 sub_08062054: @ 0x08062054 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198749,7 +198749,7 @@ sub_08062054: @ 0x08062054 thumb_func_start sub_08062060 sub_08062060: @ 0x08062060 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198758,7 +198758,7 @@ sub_08062060: @ 0x08062060 thumb_func_start sub_0806206C sub_0806206C: @ 0x0806206C push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198767,7 +198767,7 @@ sub_0806206C: @ 0x0806206C thumb_func_start sub_08062078 sub_08062078: @ 0x08062078 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198776,34 +198776,34 @@ sub_08062078: @ 0x08062078 thumb_func_start sub_08062084 sub_08062084: @ 0x08062084 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08062084 - thumb_func_start sub_08062090 -sub_08062090: @ 0x08062090 + thumb_func_start RfuVSync +RfuVSync: @ 0x08062090 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08062090 + thumb_func_end RfuVSync - thumb_func_start sub_0806209C -sub_0806209C: @ 0x0806209C + thumb_func_start SwapRentalMons +SwapRentalMons: @ 0x0806209C push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806209C + thumb_func_end SwapRentalMons thumb_func_start sub_080620A8 sub_080620A8: @ 0x080620A8 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198812,7 +198812,7 @@ sub_080620A8: @ 0x080620A8 thumb_func_start sub_080620B4 sub_080620B4: @ 0x080620B4 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198827,7 +198827,7 @@ sub_080620C0: @ 0x080620C0 rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198853,7 +198853,7 @@ sub_080620DC: @ 0x080620DC ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198870,7 +198870,7 @@ sub_08062114: @ 0x08062114 movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198892,7 +198892,7 @@ sub_0806212C: @ 0x0806212C ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -198917,7 +198917,7 @@ sub_08062154: @ 0x08062154 lsls r0, r0, #0x1d cmp r0, #0 bge _08062188 - bl sub_0805FB04 + bl OpponentBufferExecCompleted b _080621B2 .align 2, 0 _0806217C: .4byte gUnknown_20205AC @@ -198957,18 +198957,18 @@ _080621C0: .4byte sub_0805F780 thumb_func_start sub_080621C4 sub_080621C4: @ 0x080621C4 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080621C4 - thumb_func_start sub_080621D0 -sub_080621D0: @ 0x080621D0 + thumb_func_start OpponentHandlePlaySE +OpponentHandlePlaySE: @ 0x080621D0 push {r4, lr} ldr r4, _0806220C ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -198988,15 +198988,15 @@ _080621E4: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_0805FB04 + bl PlaySE12WithPanning + bl OpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _0806220C: .4byte gUnknown_2023D08 _08062210: .4byte gUnknown_2022D08 - thumb_func_end sub_080621D0 + thumb_func_end OpponentHandlePlaySE thumb_func_start sub_08062214 sub_08062214: @ 0x08062214 @@ -199010,7 +199010,7 @@ sub_08062214: @ 0x08062214 ldrb r0, [r0] cmp r0, #0 beq _08062250 - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -199021,7 +199021,7 @@ sub_08062214: @ 0x08062214 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _08062264 .align 2, 0 _08062248: .4byte gUnknown_2022D08 @@ -199035,17 +199035,17 @@ _08062250: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _08062264: - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08062214 - thumb_func_start sub_08062270 -sub_08062270: @ 0x08062270 + thumb_func_start OpponentHandleFaintingCry +OpponentHandleFaintingCry: @ 0x08062270 push {lr} ldr r1, _080622A0 ldr r0, _080622A4 @@ -199058,20 +199058,20 @@ sub_08062270: @ 0x08062270 ldr r1, _080622A8 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 movs r2, #5 - bl sub_080A2BAC - bl sub_0805FB04 + bl PlayCry3 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _080622A0: .4byte gUnknown_2023D12 _080622A4: .4byte gUnknown_2023D08 _080622A8: .4byte gUnknown_20243E8 - thumb_func_end sub_08062270 + thumb_func_end OpponentHandleFaintingCry thumb_func_start sub_080622AC sub_080622AC: @ 0x080622AC @@ -199083,13 +199083,13 @@ sub_080622AC: @ 0x080622AC adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _080622DC ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -199159,10 +199159,10 @@ sub_080622E0: @ 0x080622E0 lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _080623D0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080623D4 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _080623D8 @@ -199220,7 +199220,7 @@ _080623D4: .4byte sub_0806240C _080623D8: .4byte gUnknown_3005B60 _080623DC: .4byte gUnknown_2024174 _080623E0: .4byte gUnknown_2024158 -_080623E4: .4byte sub_0807352C +_080623E4: .4byte Task_HidePartyStatusSummary _080623E8: .4byte gUnknown_3005AC0 _080623EC: .4byte sub_0805ED7C thumb_func_end sub_080622E0 @@ -199230,7 +199230,7 @@ sub_080623F0: @ 0x080623F0 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #6] - bl sub_0805DC00 + bl FreeTrainerFrontPicPalette adds r0, r4, #0 bl FreeSpriteOamMatrix adds r0, r4, #0 @@ -199260,7 +199260,7 @@ sub_0806240C: @ 0x0806240C adds r0, r0, r1 ldrh r0, [r0, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08062450 @@ -199338,7 +199338,7 @@ _080624C4: mov r0, sb strb r0, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask pop {r3, r4} mov r8, r3 mov sb, r4 @@ -199366,11 +199366,11 @@ sub_080624FC: @ 0x080624FC cmp r0, #0 beq _0806252C adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0806252C - bl sub_0805FB04 + bl OpponentBufferExecCompleted b _080625F6 .align 2, 0 _08062524: .4byte gUnknown_2022D08 @@ -199440,7 +199440,7 @@ _08062598: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _08062600 ldrb r1, [r5] adds r1, r1, r2 @@ -199516,7 +199516,7 @@ sub_08062610: @ 0x08062610 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_0805FB04 + bl OpponentBufferExecCompleted _08062648: pop {r4} pop {r0} @@ -199554,7 +199554,7 @@ sub_08062658: @ 0x08062658 ldr r1, _080626A4 str r1, [r0] _0806268A: - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -199562,24 +199562,24 @@ _08062694: .4byte gUnknown_2024174 _08062698: .4byte gUnknown_2023D08 _0806269C: .4byte gUnknown_3005B60 _080626A0: .4byte gUnknown_2024158 -_080626A4: .4byte sub_0807352C +_080626A4: .4byte Task_HidePartyStatusSummary thumb_func_end sub_08062658 thumb_func_start sub_080626A8 sub_080626A8: @ 0x080626A8 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080626A8 - thumb_func_start sub_080626B4 -sub_080626B4: @ 0x080626B4 + thumb_func_start OpponentHandleSpriteInvisibility +OpponentHandleSpriteInvisibility: @ 0x080626B4 push {r4, lr} ldr r4, _08062704 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _080626FA @@ -199610,7 +199610,7 @@ sub_080626B4: @ 0x080626B4 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _080626FA: - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -199619,15 +199619,15 @@ _08062704: .4byte gUnknown_2023D08 _08062708: .4byte gUnknown_20205AC _0806270C: .4byte gUnknown_2023E88 _08062710: .4byte gUnknown_2022D08 - thumb_func_end sub_080626B4 + thumb_func_end OpponentHandleSpriteInvisibility - thumb_func_start sub_08062714 -sub_08062714: @ 0x08062714 + thumb_func_start OpponentHandleBattleAnimation +OpponentHandleBattleAnimation: @ 0x08062714 push {r4, r5, r6, lr} sub sp, #4 ldr r6, _08062758 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0806276C @@ -199648,11 +199648,11 @@ sub_08062714: @ 0x08062714 str r4, [sp] adds r0, r2, #0 adds r1, r2, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _08062760 - bl sub_0805FB04 + bl OpponentBufferExecCompleted b _0806276C .align 2, 0 _08062758: .4byte gUnknown_2023D08 @@ -199672,28 +199672,28 @@ _0806276C: .align 2, 0 _08062774: .4byte gUnknown_3005AC0 _08062778: .4byte sub_0805FAD4 - thumb_func_end sub_08062714 + thumb_func_end OpponentHandleBattleAnimation - thumb_func_start sub_0806277C -sub_0806277C: @ 0x0806277C + thumb_func_start WallyHandleCmd38 +WallyHandleCmd38: @ 0x0806277C push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806277C + thumb_func_end WallyHandleCmd38 thumb_func_start sub_08062788 sub_08062788: @ 0x08062788 push {lr} - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08062788 - thumb_func_start sub_08062794 -sub_08062794: @ 0x08062794 + thumb_func_start OpponentHandleCmd55 +OpponentHandleCmd55: @ 0x08062794 push {lr} ldr r0, _080627C8 ldr r0, [r0] @@ -199713,9 +199713,9 @@ sub_08062794: @ 0x08062794 ldr r0, [r0] str r0, [r2] ldr r0, [r2, #8] - bl sub_08000540 + bl SetMainCallback2 _080627BE: - bl sub_0805FB04 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -199723,7 +199723,7 @@ _080627C8: .4byte gUnknown_2022C90 _080627CC: .4byte gUnknown_3002360 _080627D0: .4byte 0x00000439 _080627D4: .4byte gUnknown_3005A60 - thumb_func_end sub_08062794 + thumb_func_end OpponentHandleCmd55 thumb_func_start sub_080627D8 sub_080627D8: @ 0x080627D8 @@ -199731,8 +199731,8 @@ sub_080627D8: @ 0x080627D8 .align 2, 0 thumb_func_end sub_080627D8 - thumb_func_start sub_080627DC -sub_080627DC: @ 0x080627DC + thumb_func_start ShouldSwitchIfPerishSong +ShouldSwitchIfPerishSong: @ 0x080627DC push {lr} ldr r1, _08062824 ldr r0, _08062828 @@ -199764,7 +199764,7 @@ sub_080627DC: @ 0x080627DC movs r0, #1 movs r1, #2 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues movs r0, #1 b _08062836 .align 2, 0 @@ -199778,10 +199778,10 @@ _08062836: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080627DC + thumb_func_end ShouldSwitchIfPerishSong - thumb_func_start sub_0806283C -sub_0806283C: @ 0x0806283C + thumb_func_start ShouldSwitchIfWonderGuard +ShouldSwitchIfWonderGuard: @ 0x0806283C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -199845,7 +199845,7 @@ _0806289E: ldrh r1, [r4] mov r3, sb ldrb r2, [r3] - bl sub_080473FC + bl AI_TypeCalc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #2 @@ -199896,7 +199896,7 @@ _0806290C: movs r0, #1 movs r1, #2 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues movs r0, #1 b _08062A12 .align 2, 0 @@ -199909,7 +199909,7 @@ _08062934: adds r1, r5, #0 _0806293C: ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _08062A24 mov sb, r1 @@ -199930,17 +199930,17 @@ _08062958: adds r4, r1, r5 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08062A08 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08062A08 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -199955,10 +199955,10 @@ _08062958: beq _08062A08 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r0, sl bl GetBattlerAtPosition lsls r0, r0, #0x18 @@ -199976,14 +199976,14 @@ _080629C4: adds r1, #0xd mov r0, sb add r0, r8 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 beq _08062A02 ldrh r1, [r5] ldrb r2, [r7] - bl sub_080473FC + bl AI_TypeCalc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #2 @@ -200025,10 +200025,10 @@ _08062A28: .4byte gUnknown_2024190 _08062A2C: .4byte gUnknown_2023D12 _08062A30: .4byte gUnknown_2023D08 _08062A34: .4byte gUnknown_2023D28 - thumb_func_end sub_0806283C + thumb_func_end ShouldSwitchIfWonderGuard - thumb_func_start sub_08062A38 -sub_08062A38: @ 0x08062A38 + thumb_func_start FindMonThatAbsorbsOpponentsMove +FindMonThatAbsorbsOpponentsMove: @ 0x08062A38 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -200036,7 +200036,7 @@ sub_08062A38: @ 0x08062A38 push {r5, r6, r7} sub sp, #8 movs r0, #1 - bl sub_08062DA0 + bl HasSuperEffectiveMoveAgainstOpponents lsls r0, r0, #0x18 cmp r0, #0 beq _08062A66 @@ -200206,7 +200206,7 @@ _08062B88: movs r0, #1 movs r1, #2 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues movs r0, #1 b _08062C92 .align 2, 0 @@ -200219,7 +200219,7 @@ _08062BB4: mov sl, r0 _08062BB6: ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _08062C58 str r1, [sp, #4] @@ -200240,17 +200240,17 @@ _08062BD4: adds r6, r1, r0 adds r0, r6, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08062C8A adds r0, r6, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08062C8A adds r0, r6, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -200281,12 +200281,12 @@ _08062BD4: beq _08062C8A adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r6, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08062C6C lsls r0, r4, #3 @@ -200333,10 +200333,10 @@ _08062C92: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08062A38 + thumb_func_end FindMonThatAbsorbsOpponentsMove - thumb_func_start sub_08062CA4 -sub_08062CA4: @ 0x08062CA4 + thumb_func_start ShouldSwitchIfNaturalCure +ShouldSwitchIfNaturalCure: @ 0x08062CA4 push {r4, r5, lr} ldr r3, _08062CFC ldr r5, _08062D00 @@ -200414,13 +200414,13 @@ _08062D40: .4byte gUnknown_2023D08 _08062D44: movs r0, #8 movs r1, #1 - bl sub_08062F48 + bl FindMonWithFlagsAndSuperEffective lsls r0, r0, #0x18 cmp r0, #0 bne _08062D8E movs r0, #4 movs r1, #1 - bl sub_08062F48 + bl FindMonWithFlagsAndSuperEffective lsls r0, r0, #0x18 cmp r0, #0 bne _08062D8E @@ -200447,7 +200447,7 @@ _08062D74: movs r0, #1 movs r1, #2 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _08062D8E: movs r0, #1 _08062D90: @@ -200457,10 +200457,10 @@ _08062D90: .align 2, 0 _08062D98: .4byte gUnknown_2023D08 _08062D9C: .4byte gUnknown_2024140 - thumb_func_end sub_08062CA4 + thumb_func_end ShouldSwitchIfNaturalCure - thumb_func_start sub_08062DA0 -sub_08062DA0: @ 0x08062DA0 + thumb_func_start HasSuperEffectiveMoveAgainstOpponents +HasSuperEffectiveMoveAgainstOpponents: @ 0x08062DA0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -200513,7 +200513,7 @@ _08062DEE: ldrh r1, [r5] mov r3, r8 ldrb r2, [r3] - bl sub_080473FC + bl AI_TypeCalc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #2 @@ -200592,7 +200592,7 @@ _08062E92: ldrh r1, [r5] mov r3, r8 ldrb r2, [r3] - bl sub_080473FC + bl AI_TypeCalc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #2 @@ -200629,7 +200629,7 @@ _08062EF0: .4byte gUnknown_2023EB4 _08062EF4: .4byte gUnknown_82FACB4 _08062EF8: .4byte gUnknown_2023D28 _08062EFC: .4byte gUnknown_2023D08 - thumb_func_end sub_08062DA0 + thumb_func_end HasSuperEffectiveMoveAgainstOpponents thumb_func_start AreStatsRaised AreStatsRaised: @ 0x08062F00 @@ -200673,8 +200673,8 @@ _08062F40: .4byte gUnknown_2023D28 _08062F44: .4byte gUnknown_2023D08 thumb_func_end AreStatsRaised - thumb_func_start sub_08062F48 -sub_08062F48: @ 0x08062F48 + thumb_func_start FindMonWithFlagsAndSuperEffective +FindMonWithFlagsAndSuperEffective: @ 0x08062F48 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -200811,7 +200811,7 @@ _0806304C: movs r0, #1 movs r1, #2 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues movs r0, #1 b _080631D4 .align 2, 0 @@ -200824,7 +200824,7 @@ _08063074: ldr r5, _08063094 _0806307C: ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _08063098 str r1, [sp, #0xc] @@ -200846,21 +200846,21 @@ _080630A0: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080630B6 b _080631C8 _080630B6: adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080630C4 b _080631C8 _080630C4: adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -200894,12 +200894,12 @@ _080630C4: beq _080631C8 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r5, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806313C lsls r0, r4, #3 @@ -200928,7 +200928,7 @@ _08063148: adds r0, r0, r1 ldrh r0, [r0] adds r1, r4, #0 - bl sub_080473FC + bl AI_TypeCalc ldr r1, [sp] ands r1, r0 cmp r1, #0 @@ -200956,14 +200956,14 @@ _08063186: adds r1, #0xd ldr r0, [sp, #0xc] add r0, r8 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 beq _080631C2 ldrh r1, [r5] ldrb r2, [r7] - bl sub_080473FC + bl AI_TypeCalc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #2 @@ -201006,10 +201006,10 @@ _080631E8: .4byte gUnknown_2023EF4 _080631EC: .4byte gUnknown_2023D08 _080631F0: .4byte gUnknown_2023F14 _080631F4: .4byte gUnknown_2023D28 - thumb_func_end sub_08062F48 + thumb_func_end FindMonWithFlagsAndSuperEffective - thumb_func_start sub_080631F8 -sub_080631F8: @ 0x080631F8 + thumb_func_start ShouldSwitch +ShouldSwitch: @ 0x080631F8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -201048,7 +201048,7 @@ _08063236: adds r1, r2, #0 movs r2, #0x17 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -201060,7 +201060,7 @@ _0806324E: movs r0, #0xc movs r2, #0x47 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -201072,7 +201072,7 @@ _08063266: movs r1, #0 movs r2, #0x2a movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08063298 @@ -201182,7 +201182,7 @@ _0806334C: ldr r2, _0806343C _08063354: ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _08063440 mov sb, r1 @@ -201201,17 +201201,17 @@ _0806336E: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080633D0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080633D0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -201249,24 +201249,24 @@ _080633D6: mov r1, sl cmp r1, #0 beq _08063450 - bl sub_080627DC + bl ShouldSwitchIfPerishSong lsls r0, r0, #0x18 cmp r0, #0 bne _08063436 - bl sub_0806283C + bl ShouldSwitchIfWonderGuard lsls r0, r0, #0x18 cmp r0, #0 bne _08063436 - bl sub_08062A38 + bl FindMonThatAbsorbsOpponentsMove lsls r0, r0, #0x18 cmp r0, #0 bne _08063436 - bl sub_08062CA4 + bl ShouldSwitchIfNaturalCure lsls r0, r0, #0x18 cmp r0, #0 bne _08063436 movs r0, #0 - bl sub_08062DA0 + bl HasSuperEffectiveMoveAgainstOpponents lsls r0, r0, #0x18 cmp r0, #0 bne _08063450 @@ -201276,13 +201276,13 @@ _080633D6: bne _08063450 movs r0, #8 movs r1, #2 - bl sub_08062F48 + bl FindMonWithFlagsAndSuperEffective lsls r0, r0, #0x18 cmp r0, #0 bne _08063436 movs r0, #4 movs r1, #3 - bl sub_08062F48 + bl FindMonWithFlagsAndSuperEffective lsls r0, r0, #0x18 cmp r0, #0 beq _08063450 @@ -201307,10 +201307,10 @@ _08063452: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080631F8 + thumb_func_end ShouldSwitch - thumb_func_start sub_08063464 -sub_08063464: @ 0x08063464 + thumb_func_start AI_TrySwitchOrUseItem +AI_TrySwitchOrUseItem: @ 0x08063464 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -201321,7 +201321,7 @@ sub_08063464: @ 0x08063464 lsrs r6, r0, #0x18 adds r5, r6, #0 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _080634E4 mov r8, r1 @@ -201338,7 +201338,7 @@ _0806348C: bne _0806349A b _080635CA _0806349A: - bl sub_080631F8 + bl ShouldSwitch lsls r0, r0, #0x18 cmp r0, #0 bne _080634A6 @@ -201354,7 +201354,7 @@ _080634A6: ldrb r0, [r0] cmp r0, #6 bne _0806359C - bl sub_08063674 + bl GetMostSuitableMonToSwitchInto lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #6 @@ -201423,7 +201423,7 @@ _08063546: muls r0, r4, r0 add r0, r8 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08063584 ldr r1, _080635B4 @@ -201481,7 +201481,7 @@ _080635B4: .4byte gUnknown_2023D12 _080635B8: .4byte gUnknown_2024140 _080635BC: .4byte gUnknown_2023D08 _080635C0: - bl sub_08063AC4 + bl ShouldUseItem lsls r0, r0, #0x18 cmp r0, #0 bne _080635DC @@ -201493,7 +201493,7 @@ _080635CA: lsls r2, r2, #8 movs r0, #1 movs r1, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _080635DC: pop {r3} mov r8, r3 @@ -201502,10 +201502,10 @@ _080635DC: bx r0 .align 2, 0 _080635E8: .4byte gUnknown_2023D08 - thumb_func_end sub_08063464 + thumb_func_end AI_TrySwitchOrUseItem - thumb_func_start sub_080635EC -sub_080635EC: @ 0x080635EC + thumb_func_start ModulateByTypeEffectiveness +ModulateByTypeEffectiveness: @ 0x080635EC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -201575,10 +201575,10 @@ _0806365E: bx r0 .align 2, 0 _08063670: .4byte gUnknown_82EBB38 - thumb_func_end sub_080635EC + thumb_func_end ModulateByTypeEffectiveness - thumb_func_start sub_08063674 -sub_08063674: @ 0x08063674 + thumb_func_start GetMostSuitableMonToSwitchInto +GetMostSuitableMonToSwitchInto: @ 0x08063674 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -201731,7 +201731,7 @@ _080637A6: ldr r2, _0806389C _080637B0: ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r4, _080638A0 str r4, [sp, #0x20] @@ -201765,14 +201765,14 @@ _080637E4: adds r4, r2, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, #0 beq _080638BC adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080638BC mov r4, r8 @@ -201828,13 +201828,13 @@ _080637E4: adds r1, r5, #0 adds r2, r6, #0 mov r3, sp - bl sub_080635EC + bl ModulateByTypeEffectiveness adds r4, #0x22 ldrb r0, [r4] adds r1, r5, #0 adds r2, r6, #0 mov r3, sp - bl sub_080635EC + bl ModulateByTypeEffectiveness ldr r2, [sp, #8] mov r1, sl ldrb r1, [r1] @@ -201885,7 +201885,7 @@ _080638E6: adds r1, #0xd ldr r2, [sp, #0x20] adds r0, r2, r5 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -201894,7 +201894,7 @@ _080638E6: ldrb r1, [r0] adds r0, r4, #0 ldr r2, [sp, #4] - bl sub_08047224 + bl TypeCalc movs r1, #2 ands r1, r0 cmp r1, #0 @@ -201960,7 +201960,7 @@ _0806396E: adds r4, r0, r6 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 adds r1, r7, #1 mov sl, r1 @@ -201968,7 +201968,7 @@ _0806396E: beq _08063A2A adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08063A2A ldr r1, _08063A58 @@ -202006,7 +202006,7 @@ _080639D2: adds r1, #0xd ldr r0, [sp, #0x20] add r0, sb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #0 @@ -202024,11 +202024,11 @@ _080639D2: beq _08063A0E ldrb r0, [r6] ldr r1, [sp, #4] - bl sub_08046ABC + bl AI_CalcDmg ldrb r1, [r6] adds r0, r4, #0 ldr r2, [sp, #4] - bl sub_08047224 + bl TypeCalc _08063A0E: mov r2, r8 ldr r0, [r2] @@ -202071,7 +202071,7 @@ _08063A58: .4byte gUnknown_2023D12 _08063A5C: .4byte gUnknown_2023E94 _08063A60: .4byte gUnknown_2023D08 _08063A64: .4byte gUnknown_82ED220 - thumb_func_end sub_08063674 + thumb_func_end GetMostSuitableMonToSwitchInto thumb_func_start GetAI_ItemType GetAI_ItemType: @ 0x08063A68 @@ -202130,8 +202130,8 @@ _08063ABE: bx r1 thumb_func_end GetAI_ItemType - thumb_func_start sub_08063AC4 -sub_08063AC4: @ 0x08063AC4 + thumb_func_start ShouldUseItem +ShouldUseItem: @ 0x08063AC4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -202159,7 +202159,7 @@ sub_08063AC4: @ 0x08063AC4 _08063AF6: ldr r0, _08063BB0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r5, _08063BB4 cmp r0, #0 @@ -202176,17 +202176,17 @@ _08063B0C: adds r4, r5, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08063B48 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08063B48 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -202329,7 +202329,7 @@ _08063C58: mov r0, sb movs r1, #4 movs r2, #4 - bl sub_0806C8A0 + bl GetItemEffectParamOffset lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -202660,7 +202660,7 @@ _08063ED4: .4byte gUnknown_2023F60 _08063ED8: ldr r4, _08063F40 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r2, _08063F44 @@ -202688,7 +202688,7 @@ _08063F0C: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues ldr r0, _08063F40 ldrb r0, [r0] lsrs r0, r0, #1 @@ -202734,7 +202734,7 @@ _08063F62: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08063AC4 + thumb_func_end ShouldUseItem thumb_func_start sub_08063F74 sub_08063F74: @ 0x08063F74 @@ -202792,7 +202792,7 @@ _08063FD0: .4byte gUnknown_2023D08 _08063FD4: .4byte gUnknown_2022D08 _08063FD8: .4byte gUnknown_82ED13C _08063FDC: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08063FE0: pop {r0} bx r0 @@ -202816,7 +202816,7 @@ sub_08063FE4: @ 0x08063FE4 ldr r0, _08064018 cmp r1, r0 bne _08064008 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064008: pop {r0} bx r0 @@ -202845,7 +202845,7 @@ sub_0806401C: @ 0x0806401C ldr r0, _08064050 cmp r1, r0 bne _08064040 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064040: pop {r0} bx r0 @@ -202877,7 +202877,7 @@ sub_08064054: @ 0x08064054 bne _080640A6 adds r0, r2, r5 ldrh r0, [r0, #6] - bl sub_0805DC00 + bl FreeTrainerFrontPicPalette ldrb r0, [r4] adds r0, r0, r6 ldrb r1, [r0] @@ -202894,7 +202894,7 @@ sub_08064054: @ 0x08064054 lsls r0, r0, #2 adds r0, r0, r5 bl DestroySprite - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _080640A6: pop {r4, r5, r6} pop {r0} @@ -202934,7 +202934,7 @@ sub_080640BC: @ 0x080640BC adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _080640F4: pop {r4} pop {r0} @@ -202952,11 +202952,11 @@ sub_08064104: @ 0x08064104 movs r0, #0 mov r8, r0 movs r4, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08064130 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08064168 @@ -203034,7 +203034,7 @@ _080641AE: ldrb r1, [r7] movs r0, #2 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _08064280 @@ -203300,7 +203300,7 @@ _08064398: ands r0, r1 cmp r0, #0 bne _0806445E - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0806442E @@ -203326,7 +203326,7 @@ _08064398: ldr r2, _08064504 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute mov r1, sb ldrb r0, [r1] eors r0, r7 @@ -203352,7 +203352,7 @@ _0806442E: ldr r2, _08064504 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -203401,7 +203401,7 @@ _0806447C: ands r0, r1 cmp r0, #0 bne _0806453E - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _0806453E @@ -203536,7 +203536,7 @@ _0806457C: movs r1, #0 strb r1, [r0, #9] _080645C6: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0806461E @@ -203570,12 +203570,12 @@ _080645C6: ldr r1, _080646DC adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback _0806461E: ldr r1, _080646C8 ldr r4, _080646C0 @@ -203598,12 +203598,12 @@ _0806461E: ldr r1, _080646DC adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r3, _080646BC ldr r0, [r3] ldr r2, [r0, #8] @@ -203745,7 +203745,7 @@ _08064760: bl FreeSpriteTilesByTag adds r0, r4, #0 bl FreeSpritePaletteByTag - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _0806479A: pop {r4, r5, r6, r7} pop {r0} @@ -203764,7 +203764,7 @@ sub_080647A4: @ 0x080647A4 ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -203788,7 +203788,7 @@ sub_080647A4: @ 0x080647A4 _080647E4: .4byte gUnknown_2023D08 _080647E8: .4byte gUnknown_3005AD0 _080647EC: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _080647F0: pop {r4, r5, r6} pop {r0} @@ -203818,7 +203818,7 @@ sub_080647F8: @ 0x080647F8 adds r0, r3, r0 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064826: pop {r0} bx r0 @@ -203870,7 +203870,7 @@ sub_0806483C: @ 0x0806483C adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064896: pop {r4, r5, r6} pop {r0} @@ -203891,7 +203891,7 @@ sub_080648B0: @ 0x080648B0 lsls r0, r0, #0x10 cmp r0, #0 bne _080648C2 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _080648C2: pop {r0} bx r0 @@ -203926,7 +203926,7 @@ sub_080648C8: @ 0x080648C8 strb r0, [r2] ldr r0, _08064910 strb r3, [r0] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted b _0806493E .align 2, 0 _08064904: .4byte gUnknown_2023E88 @@ -203994,7 +203994,7 @@ sub_08064944: @ 0x08064944 adds r1, r3, #0 adds r2, r3, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08064984: ldr r0, _080649AC ldrb r1, [r4] @@ -204033,7 +204033,7 @@ sub_080649B4: @ 0x080649B4 ands r0, r1 cmp r0, #0 bne _08064A0E - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08064A0E @@ -204060,7 +204060,7 @@ _080649FE: movs r2, #0x80 lsls r2, r2, #1 bl m4aMPlayVolumeControl - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064A0E: pop {r4} pop {r0} @@ -204150,7 +204150,7 @@ sub_08064A34: @ 0x08064A34 ldr r2, _08064B18 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r5] bl sub_08076320 ldrb r0, [r5] @@ -204248,12 +204248,12 @@ _08064B56: ldr r1, _08064BD4 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r1, _08064BE4 ldrb r0, [r5] lsls r0, r0, #2 @@ -204293,7 +204293,7 @@ sub_08064BEC: @ 0x08064BEC ands r0, r1 cmp r0, #0 bne _08064C0E - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064C0E: pop {r0} bx r0 @@ -204319,7 +204319,7 @@ sub_08064C1C: @ 0x08064C1C ands r0, r1 cmp r0, #0 bne _08064C3E - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08064C3E: pop {r0} bx r0 @@ -204328,8 +204328,8 @@ _08064C44: .4byte gUnknown_2024174 _08064C48: .4byte gUnknown_2023D08 thumb_func_end sub_08064C1C - thumb_func_start sub_08064C4C -sub_08064C4C: @ 0x08064C4C + thumb_func_start LinkOpponentBufferExecCompleted +LinkOpponentBufferExecCompleted: @ 0x08064C4C push {r4, lr} sub sp, #4 ldr r1, _08064C8C @@ -204345,7 +204345,7 @@ sub_08064C4C: @ 0x08064C4C ands r0, r1 cmp r0, #0 beq _08064CA0 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -204383,7 +204383,7 @@ _08064CB2: .align 2, 0 _08064CBC: .4byte gUnknown_2023D0C _08064CC0: .4byte gUnknown_82FACB4 - thumb_func_end sub_08064C4C + thumb_func_end LinkOpponentBufferExecCompleted thumb_func_start sub_08064CC4 sub_08064CC4: @ 0x08064CC4 @@ -204404,7 +204404,7 @@ sub_08064CC4: @ 0x08064CC4 adds r1, r1, r0 ldrb r0, [r1] mov r1, sp - bl sub_08064D38 + bl CopyLinkOpponentMonData adds r6, r0, #0 b _08064D1E .align 2, 0 @@ -204423,7 +204423,7 @@ _08064D00: lsrs r0, r0, #0x18 mov r2, sp adds r1, r2, r6 - bl sub_08064D38 + bl CopyLinkOpponentMonData adds r6, r6, r0 _08064D16: lsrs r4, r4, #1 @@ -204435,8 +204435,8 @@ _08064D1E: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_08064C4C + bl BtlController_EmitDataTransfer + bl LinkOpponentBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} @@ -204444,8 +204444,8 @@ _08064D1E: .align 2, 0 thumb_func_end sub_08064CC4 - thumb_func_start sub_08064D38 -sub_08064D38: @ 0x08064D38 + thumb_func_start CopyLinkOpponentMonData +CopyLinkOpponentMonData: @ 0x08064D38 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -204545,12 +204545,12 @@ _08064E68: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -204578,12 +204578,12 @@ _08064EB4: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -204598,21 +204598,21 @@ _08064EB4: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -204624,7 +204624,7 @@ _08064EB4: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -204636,7 +204636,7 @@ _08064EB4: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -204648,7 +204648,7 @@ _08064EB4: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -204659,7 +204659,7 @@ _08064EB4: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -204670,7 +204670,7 @@ _08064EB4: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -204682,55 +204682,55 @@ _08064EB4: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -204743,7 +204743,7 @@ _08064EB4: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -204753,19 +204753,19 @@ _08064EB4: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _0806506C: @@ -204816,13 +204816,13 @@ _080650C2: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -204836,7 +204836,7 @@ _080650C2: ldr r1, _08065110 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -204878,7 +204878,7 @@ _0806513C: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -204889,7 +204889,7 @@ _0806513C: ldr r1, _08065168 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -204926,7 +204926,7 @@ _08065198: adds r0, r0, r1 movs r1, #0x19 _080651A2: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -205059,27 +205059,27 @@ _08065288: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _080654CE @@ -205164,7 +205164,7 @@ _08065358: adds r0, r0, r1 movs r1, #0x37 _08065362: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -205253,7 +205253,7 @@ _080653FC: adds r0, r0, r1 movs r1, #0x3f _08065406: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -205360,7 +205360,7 @@ _080654BC: adds r0, r0, r1 movs r1, #0x36 _080654C6: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _080654CE: @@ -205375,12 +205375,12 @@ _080654CE: bx r1 .align 2, 0 _080654E0: .4byte gUnknown_20243E8 - thumb_func_end sub_08064D38 + thumb_func_end CopyLinkOpponentMonData thumb_func_start sub_080654E4 sub_080654E4: @ 0x080654E4 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -205426,7 +205426,7 @@ _08065532: cmp r5, #5 bls _08065524 _0806553E: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 @@ -205536,12 +205536,12 @@ _0806567C: adds r0, r4, #0 movs r1, #0xb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r2, r7, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -205582,12 +205582,12 @@ _080656E2: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -205603,15 +205603,15 @@ _080656E2: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r7, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -205620,7 +205620,7 @@ _080656E2: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r7, #0x14] lsls r0, r0, #0x16 @@ -205629,7 +205629,7 @@ _080656E2: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r7, #0x15] lsls r0, r0, #0x19 @@ -205638,7 +205638,7 @@ _080656E2: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r7, #0x14] lsls r0, r0, #0xc @@ -205647,7 +205647,7 @@ _080656E2: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r7, #0x16] lsls r0, r0, #0x17 @@ -205656,7 +205656,7 @@ _080656E2: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r7, #0x17] lsls r0, r0, #0x1a @@ -205665,47 +205665,47 @@ _080656E2: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065810: .4byte gUnknown_20243E8 @@ -205718,7 +205718,7 @@ _08065814: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _0806582C: .4byte gUnknown_20243E8 @@ -205731,7 +205731,7 @@ _08065830: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065848: .4byte gUnknown_20243E8 @@ -205753,12 +205753,12 @@ _08065864: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -205772,7 +205772,7 @@ _08065864: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _0806589C: .4byte gUnknown_20243E8 @@ -205804,7 +205804,7 @@ _080658C0: adds r0, r4, #0 movs r1, #0x11 str r3, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -205812,7 +205812,7 @@ _080658C0: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -205820,7 +205820,7 @@ _080658C0: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -205828,7 +205828,7 @@ _080658C0: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -205836,7 +205836,7 @@ _080658C0: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065924: .4byte gUnknown_20243E8 @@ -205855,7 +205855,7 @@ _08065928: _0806593E: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065948: .4byte gUnknown_20243E8 @@ -205869,7 +205869,7 @@ _08065950: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065968: .4byte gUnknown_20243E8 @@ -205882,7 +205882,7 @@ _0806596C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065984: .4byte gUnknown_20243E8 @@ -205895,7 +205895,7 @@ _08065988: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _080659A0: .4byte gUnknown_20243E8 @@ -205908,7 +205908,7 @@ _080659A4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _080659BC: .4byte gUnknown_20243E8 @@ -205921,7 +205921,7 @@ _080659C0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _080659D8: .4byte gUnknown_20243E8 @@ -205934,7 +205934,7 @@ _080659DC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _080659F4: .4byte gUnknown_20243E8 @@ -205947,7 +205947,7 @@ _080659F8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065A10: .4byte gUnknown_20243E8 @@ -205960,7 +205960,7 @@ _08065A14: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065A2C: .4byte gUnknown_20243E8 @@ -205973,7 +205973,7 @@ _08065A30: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065A48: .4byte gUnknown_20243E8 @@ -205986,7 +205986,7 @@ _08065A4C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065A64: .4byte gUnknown_20243E8 @@ -205999,7 +205999,7 @@ _08065A68: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065A80: .4byte gUnknown_20243E8 @@ -206012,7 +206012,7 @@ _08065A84: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065A9C: .4byte gUnknown_20243E8 @@ -206025,7 +206025,7 @@ _08065AA0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065AB8: .4byte gUnknown_20243E8 @@ -206038,7 +206038,7 @@ _08065ABC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065AD4: .4byte gUnknown_20243E8 @@ -206054,7 +206054,7 @@ _08065AD8: adds r0, r4, #0 movs r1, #0x27 str r3, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -206062,7 +206062,7 @@ _08065AD8: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -206070,7 +206070,7 @@ _08065AD8: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -206078,7 +206078,7 @@ _08065AD8: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -206086,7 +206086,7 @@ _08065AD8: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -206105,7 +206105,7 @@ _08065B4C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065B64: .4byte gUnknown_20243E8 @@ -206118,7 +206118,7 @@ _08065B68: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065B80: .4byte gUnknown_20243E8 @@ -206131,7 +206131,7 @@ _08065B84: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065B9C: .4byte gUnknown_20243E8 @@ -206144,7 +206144,7 @@ _08065BA0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065BB8: .4byte gUnknown_20243E8 @@ -206157,7 +206157,7 @@ _08065BBC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065BD4: .4byte gUnknown_20243E8 @@ -206171,7 +206171,7 @@ _08065BD8: adds r2, r2, r3 _08065BE6: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065BF0: .4byte gUnknown_20243E8 @@ -206184,7 +206184,7 @@ _08065BF4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065C0C: .4byte gUnknown_20243E8 @@ -206197,7 +206197,7 @@ _08065C10: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065C28: .4byte gUnknown_20243E8 @@ -206210,7 +206210,7 @@ _08065C2C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065C44: .4byte gUnknown_20243E8 @@ -206223,7 +206223,7 @@ _08065C48: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065C60: .4byte gUnknown_20243E8 @@ -206236,7 +206236,7 @@ _08065C64: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065C7C: .4byte gUnknown_20243E8 @@ -206249,7 +206249,7 @@ _08065C80: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065C98: .4byte gUnknown_20243E8 @@ -206262,7 +206262,7 @@ _08065C9C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065CB4: .4byte gUnknown_20243E8 @@ -206275,7 +206275,7 @@ _08065CB8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065CD0: .4byte gUnknown_20243E8 @@ -206288,7 +206288,7 @@ _08065CD4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065CEC: .4byte gUnknown_20243E8 @@ -206301,7 +206301,7 @@ _08065CF0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065D08: .4byte gUnknown_20243E8 @@ -206314,7 +206314,7 @@ _08065D0C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065D24: .4byte gUnknown_20243E8 @@ -206327,7 +206327,7 @@ _08065D28: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065D40: .4byte gUnknown_20243E8 @@ -206340,7 +206340,7 @@ _08065D44: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065D5C: .4byte gUnknown_20243E8 @@ -206353,7 +206353,7 @@ _08065D60: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065D78: .4byte gUnknown_20243E8 @@ -206366,7 +206366,7 @@ _08065D7C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065D94: .4byte gUnknown_20243E8 @@ -206379,7 +206379,7 @@ _08065D98: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065DB0: .4byte gUnknown_20243E8 @@ -206392,7 +206392,7 @@ _08065DB4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065DCC: .4byte gUnknown_20243E8 @@ -206405,7 +206405,7 @@ _08065DD0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065DE8: .4byte gUnknown_20243E8 @@ -206418,7 +206418,7 @@ _08065DEC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065E04: .4byte gUnknown_20243E8 @@ -206431,7 +206431,7 @@ _08065E08: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065E20: .4byte gUnknown_20243E8 @@ -206444,7 +206444,7 @@ _08065E24: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _08065E54 .align 2, 0 _08065E3C: .4byte gUnknown_20243E8 @@ -206457,7 +206457,7 @@ _08065E40: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _08065E54: add sp, #0x38 pop {r3, r4, r5} @@ -206519,7 +206519,7 @@ _08065E9E: cmp r3, r0 blo _08065E9E _08065EC0: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -206530,8 +206530,8 @@ _08065ED4: .4byte gUnknown_2022D08 _08065ED8: .4byte gUnknown_20243E8 thumb_func_end sub_08065E68 - thumb_func_start sub_08065EDC -sub_08065EDC: @ 0x08065EDC + thumb_func_start LinkOpponentHandleLoadMonSprite +LinkOpponentHandleLoadMonSprite: @ 0x08065EDC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -206552,7 +206552,7 @@ sub_08065EDC: @ 0x08065EDC mov sb, r1 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -206564,19 +206564,19 @@ sub_08065EDC: @ 0x08065EDC muls r2, r0, r2 adds r0, r2, #0 add r0, sb - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _08066010 mov r8, r0 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -206593,7 +206593,7 @@ sub_08065EDC: @ 0x08065EDC mov r0, r8 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _08066014 ldrb r1, [r6] adds r1, r1, r4 @@ -206649,12 +206649,12 @@ sub_08065EDC: @ 0x08065EDC adds r0, r1, #0 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r1, _08066024 ldrb r0, [r6] lsls r0, r0, #2 @@ -206679,7 +206679,7 @@ _0806601C: .4byte 0x0000FF10 _08066020: .4byte gUnknown_2024188 _08066024: .4byte gUnknown_3005AC0 _08066028: .4byte sub_080646E8 - thumb_func_end sub_08065EDC + thumb_func_end LinkOpponentHandleLoadMonSprite thumb_func_start sub_0806602C sub_0806602C: @ 0x0806602C @@ -206750,13 +206750,13 @@ sub_08066078: @ 0x08066078 ldr r5, _080661E8 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _080661EC - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _080661F0 mov sl, r1 add sl, r6 @@ -206768,19 +206768,19 @@ sub_08066078: @ 0x08066078 adds r0, r1, #0 adds r0, r0, r5 adds r1, r6, #0 - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx adds r0, r6, #0 bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _080661F4 mov sb, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -206797,7 +206797,7 @@ sub_08066078: @ 0x08066078 mov r0, sb adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _080661F8 adds r4, r6, r4 strb r0, [r4] @@ -206871,7 +206871,7 @@ sub_08066078: @ 0x08066078 str r1, [r0] movs r0, #0 movs r1, #0xfe - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sl ldrb r2, [r1] lsls r1, r2, #4 @@ -206901,8 +206901,8 @@ _08066200: .4byte gUnknown_2024188 _08066204: .4byte sub_08007140 thumb_func_end sub_08066078 - thumb_func_start sub_08066208 -sub_08066208: @ 0x08066208 + thumb_func_start LinkOpponentHandleReturnMonToBall +LinkOpponentHandleReturnMonToBall: @ 0x08066208 push {r4, r5, r6, lr} ldr r1, _0806623C ldr r6, _08066240 @@ -206959,7 +206959,7 @@ _08066250: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _0806628C: pop {r4, r5, r6} pop {r0} @@ -206968,7 +206968,7 @@ _0806628C: _08066294: .4byte gUnknown_2023E88 _08066298: .4byte gUnknown_20205AC _0806629C: .4byte gUnknown_3005AD0 - thumb_func_end sub_08066208 + thumb_func_end LinkOpponentHandleReturnMonToBall thumb_func_start sub_080662A0 sub_080662A0: @ 0x080662A0 @@ -207003,7 +207003,7 @@ _080662C8: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _080662E2: ldr r0, [r6] ldrb r1, [r5] @@ -207028,7 +207028,7 @@ _080662F6: adds r0, r2, #0 adds r1, r2, #0 movs r3, #2 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _08066324 ldrb r0, [r5] lsls r0, r0, #2 @@ -207044,8 +207044,8 @@ _08066324: .4byte gUnknown_3005AC0 _08066328: .4byte sub_0806483C thumb_func_end sub_080662A0 - thumb_func_start sub_0806632C -sub_0806632C: @ 0x0806632C + thumb_func_start LinkOpponentHandleDrawTrainerPic +LinkOpponentHandleDrawTrainerPic: @ 0x0806632C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -207085,7 +207085,7 @@ _08066378: ldr r0, _08066388 _0806637A: ldrh r0, [r0] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08066530 @@ -207093,7 +207093,7 @@ _0806637A: _08066388: .4byte gUnknown_203886C _0806638C: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId ldr r6, _080663D4 lsls r1, r0, #3 subs r1, r1, r0 @@ -207104,7 +207104,7 @@ _0806638C: cmp r0, #4 beq _080663BC ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -207116,7 +207116,7 @@ _0806638C: bne _080663D8 _080663BC: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -207129,7 +207129,7 @@ _080663BC: _080663D4: .4byte gUnknown_20226A0 _080663D8: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -207140,7 +207140,7 @@ _080663D8: cmp r0, #2 beq _08066406 ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -207151,7 +207151,7 @@ _080663D8: bne _0806641C _08066406: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -207162,7 +207162,7 @@ _08066406: b _08066508 _0806641C: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId b _0806651E _08066424: movs r7, #0xb0 @@ -207177,7 +207177,7 @@ _08066424: .align 2, 0 _08066438: .4byte gUnknown_203886A _0806643C: - bl sub_0800A02C + bl GetMultiplayerId ldr r6, _08066498 movs r5, #1 eors r0, r5 @@ -207191,7 +207191,7 @@ _0806643C: ldrb r0, [r1] cmp r0, #4 beq _08066476 - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -207205,7 +207205,7 @@ _0806643C: cmp r0, #5 bne _080664AC _08066476: - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -207232,7 +207232,7 @@ _080664A0: .align 2, 0 _080664A8: .4byte gUnknown_82EFF00 _080664AC: - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -207245,7 +207245,7 @@ _080664AC: ands r0, r1 cmp r0, #2 beq _080664E2 - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -207258,7 +207258,7 @@ _080664AC: cmp r4, #1 bne _08066514 _080664E2: - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -207284,7 +207284,7 @@ _08066508: .align 2, 0 _08066510: .4byte gUnknown_82EFF00 _08066514: - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -207302,14 +207302,14 @@ _08066530: mov r8, r0 ldr r5, _08066614 ldrb r1, [r5] - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _08066618 mov sb, r7 ldr r1, _0806661C @@ -207332,7 +207332,7 @@ _08066530: adds r0, r6, #0 mov r1, sb adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _08066620 ldrb r1, [r5] adds r1, r1, r6 @@ -207361,7 +207361,7 @@ _08066530: lsls r0, r2, #3 adds r0, r0, r1 ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldrb r1, [r5] adds r1, r1, r6 ldrb r1, [r1] @@ -207417,10 +207417,10 @@ _0806662C: .4byte gUnknown_82D91CC _08066630: .4byte sub_0805D3C8 _08066634: .4byte gUnknown_3005AC0 _08066638: .4byte sub_08063FE4 - thumb_func_end sub_0806632C + thumb_func_end LinkOpponentHandleDrawTrainerPic - thumb_func_start sub_0806663C -sub_0806663C: @ 0x0806663C + thumb_func_start LinkOpponentHandleTrainerSlide +LinkOpponentHandleTrainerSlide: @ 0x0806663C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -207437,20 +207437,20 @@ _08066658: ldr r0, _0806674C _0806665A: ldrh r0, [r0] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldr r6, _08066750 ldrb r1, [r6] - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r0, _08066754 ldr r2, _08066758 mov r3, r8 @@ -207466,7 +207466,7 @@ _0806665A: asrs r2, r2, #0x10 movs r1, #0xb0 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r5, _0806675C ldrb r1, [r6] adds r1, r1, r5 @@ -207505,7 +207505,7 @@ _0806665A: lsls r0, r2, #3 adds r0, r0, r1 ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldrb r1, [r6] adds r1, r1, r5 ldrb r1, [r1] @@ -207544,7 +207544,7 @@ _0806665A: adds r0, r0, r1 ldr r1, _08066774 str r1, [r0] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -207562,7 +207562,7 @@ _08066768: .4byte gUnknown_82D91CC _0806676C: .4byte sub_0805D3C8 _08066770: .4byte gUnknown_3005AC0 _08066774: .4byte sub_0806401C - thumb_func_end sub_0806663C + thumb_func_end LinkOpponentHandleTrainerSlide thumb_func_start sub_08066778 sub_08066778: @ 0x08066778 @@ -207625,7 +207625,7 @@ sub_08066778: @ 0x08066778 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _08066818 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _0806681C ldrb r0, [r4] lsls r0, r0, #2 @@ -207645,8 +207645,8 @@ _0806681C: .4byte gUnknown_3005AC0 _08066820: .4byte sub_08064054 thumb_func_end sub_08066778 - thumb_func_start sub_08066824 -sub_08066824: @ 0x08066824 + thumb_func_start LinkOpponentHandleFaintAnimation +LinkOpponentHandleFaintAnimation: @ 0x08066824 push {r4, r5, r6, lr} ldr r6, _08066870 ldr r4, [r6] @@ -207671,7 +207671,7 @@ sub_08066824: @ 0x08066824 adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08066858: ldr r0, [r6] ldrb r1, [r5] @@ -207698,7 +207698,7 @@ _08066878: strb r0, [r3, #4] movs r0, #0x10 movs r1, #0x3f - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _080668BC ldr r1, _080668C0 ldrb r0, [r5] @@ -207724,15 +207724,15 @@ _080668B4: .align 2, 0 _080668BC: .4byte gUnknown_20205AC _080668C0: .4byte gUnknown_2023E88 -_080668C4: .4byte sub_08039578 +_080668C4: .4byte SpriteCB_FaintOpponentMon _080668C8: .4byte gUnknown_3005AC0 _080668CC: .4byte sub_080647F8 - thumb_func_end sub_08066824 + thumb_func_end LinkOpponentHandleFaintAnimation thumb_func_start sub_080668D0 sub_080668D0: @ 0x080668D0 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -207741,29 +207741,29 @@ sub_080668D0: @ 0x080668D0 thumb_func_start sub_080668DC sub_080668DC: @ 0x080668DC push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080668DC - thumb_func_start sub_080668E8 -sub_080668E8: @ 0x080668E8 + thumb_func_start LinkOpponentHandleBallThrowAnim +LinkOpponentHandleBallThrowAnim: @ 0x080668E8 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080668E8 + thumb_func_end LinkOpponentHandleBallThrowAnim - thumb_func_start sub_080668F4 -sub_080668F4: @ 0x080668F4 + thumb_func_start LinkOpponentHandlePause +LinkOpponentHandlePause: @ 0x080668F4 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080668F4 + thumb_func_end LinkOpponentHandlePause thumb_func_start sub_08066900 sub_08066900: @ 0x08066900 @@ -207772,7 +207772,7 @@ sub_08066900: @ 0x08066900 push {r7} ldr r5, _080669F0 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _08066916 @@ -207882,7 +207882,7 @@ _08066916: lsrs r3, r0, #0x18 cmp r3, #0 beq _08066A14 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted b _08066A3C .align 2, 0 _080669F0: .4byte gUnknown_2023D08 @@ -207913,7 +207913,7 @@ _08066A14: ldrh r1, [r4] ldr r2, [r7] adds r0, r6, #0 - bl sub_0817DFA8 + bl BattleTv_SetDataBasedOnMove _08066A3C: pop {r3} mov r8, r3 @@ -207992,7 +207992,7 @@ _08066AB6: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08066AD8: ldr r0, [r7] ldrb r1, [r6] @@ -208050,7 +208050,7 @@ _08066B16: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -208106,7 +208106,7 @@ _08066B8C: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08066BC8: pop {r3, r4, r5} mov r8, r3 @@ -208118,8 +208118,8 @@ _08066BC8: .align 2, 0 thumb_func_end sub_08066A54 - thumb_func_start sub_08066BD8 -sub_08066BD8: @ 0x08066BD8 + thumb_func_start LinkOpponentHandlePrintString +LinkOpponentHandlePrintString: @ 0x08066BD8 push {r4, r5, lr} ldr r0, _08066C14 movs r1, #0 @@ -208132,7 +208132,7 @@ sub_08066BD8: @ 0x08066BD8 ldr r0, _08066C20 adds r4, r4, r0 ldrh r0, [r4] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _08066C24 movs r1, #0 bl sub_0814FA04 @@ -208143,7 +208143,7 @@ sub_08066BD8: @ 0x08066BD8 ldr r1, _08066C2C str r1, [r0] ldrh r0, [r4] - bl sub_0817C808 + bl BattleTv_SetDataBasedOnString pop {r4, r5} pop {r0} bx r0 @@ -208155,80 +208155,80 @@ _08066C20: .4byte gUnknown_2022D0A _08066C24: .4byte gUnknown_2022AE0 _08066C28: .4byte gUnknown_3005AC0 _08066C2C: .4byte sub_080648B0 - thumb_func_end sub_08066BD8 + thumb_func_end LinkOpponentHandlePrintString thumb_func_start sub_08066C30 sub_08066C30: @ 0x08066C30 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08066C30 - thumb_func_start sub_08066C3C -sub_08066C3C: @ 0x08066C3C + thumb_func_start LinkOpponentHandleChooseAction +LinkOpponentHandleChooseAction: @ 0x08066C3C push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066C3C + thumb_func_end LinkOpponentHandleChooseAction - thumb_func_start sub_08066C48 -sub_08066C48: @ 0x08066C48 + thumb_func_start LinkOpponentHandleUnknownYesNoBox +LinkOpponentHandleUnknownYesNoBox: @ 0x08066C48 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066C48 + thumb_func_end LinkOpponentHandleUnknownYesNoBox - thumb_func_start sub_08066C54 -sub_08066C54: @ 0x08066C54 + thumb_func_start LinkOpponentHandleChooseMove +LinkOpponentHandleChooseMove: @ 0x08066C54 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066C54 + thumb_func_end LinkOpponentHandleChooseMove - thumb_func_start sub_08066C60 -sub_08066C60: @ 0x08066C60 + thumb_func_start LinkOpponentHandleChooseItem +LinkOpponentHandleChooseItem: @ 0x08066C60 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066C60 + thumb_func_end LinkOpponentHandleChooseItem - thumb_func_start sub_08066C6C -sub_08066C6C: @ 0x08066C6C + thumb_func_start LinkOpponentHandleChoosePokemon +LinkOpponentHandleChoosePokemon: @ 0x08066C6C push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066C6C + thumb_func_end LinkOpponentHandleChoosePokemon - thumb_func_start sub_08066C78 -sub_08066C78: @ 0x08066C78 + thumb_func_start LinkOpponentHandleCmd23 +LinkOpponentHandleCmd23: @ 0x08066C78 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066C78 + thumb_func_end LinkOpponentHandleCmd23 - thumb_func_start sub_08066C84 -sub_08066C84: @ 0x08066C84 + thumb_func_start LinkOpponentHandleHealthBarUpdate +LinkOpponentHandleHealthBarUpdate: @ 0x08066C84 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _08066CFC ldr r0, _08066D00 mov sb, r0 @@ -208256,7 +208256,7 @@ sub_08066C84: @ 0x08066C84 ldr r4, _08066D0C adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -208266,7 +208266,7 @@ sub_08066C84: @ 0x08066C84 muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -208294,7 +208294,7 @@ _08066D14: ldr r1, _08066D60 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -208326,23 +208326,23 @@ _08066D64: .4byte gUnknown_3005AD0 _08066D68: .4byte gUnknown_3005AC0 _08066D6C: .4byte gUnknown_2023D08 _08066D70: .4byte sub_080647A4 - thumb_func_end sub_08066C84 + thumb_func_end LinkOpponentHandleHealthBarUpdate - thumb_func_start sub_08066D74 -sub_08066D74: @ 0x08066D74 + thumb_func_start LinkOpponentHandleExpUpdate +LinkOpponentHandleExpUpdate: @ 0x08066D74 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066D74 + thumb_func_end LinkOpponentHandleExpUpdate - thumb_func_start sub_08066D80 -sub_08066D80: @ 0x08066D80 + thumb_func_start LinkOpponentHandleStatusIconUpdate +LinkOpponentHandleStatusIconUpdate: @ 0x08066D80 push {r4, lr} ldr r4, _08066DDC ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _08066DD4 @@ -208359,7 +208359,7 @@ sub_08066D80: @ 0x08066D80 ldr r2, _08066DE8 adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _08066DEC ldr r0, [r0] @@ -208391,14 +208391,14 @@ _08066DE8: .4byte gUnknown_20243E8 _08066DEC: .4byte gUnknown_2024174 _08066DF0: .4byte gUnknown_3005AC0 _08066DF4: .4byte sub_08064BEC - thumb_func_end sub_08066D80 + thumb_func_end LinkOpponentHandleStatusIconUpdate - thumb_func_start sub_08066DF8 -sub_08066DF8: @ 0x08066DF8 + thumb_func_start LinkOpponentHandleStatusAnimation +LinkOpponentHandleStatusAnimation: @ 0x08066DF8 push {r4, r5, lr} ldr r5, _08066E50 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _08066E48 @@ -208426,7 +208426,7 @@ sub_08066DF8: @ 0x08066DF8 ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _08066E58 ldrb r0, [r5] lsls r0, r0, #2 @@ -208442,88 +208442,88 @@ _08066E50: .4byte gUnknown_2023D08 _08066E54: .4byte gUnknown_2022D08 _08066E58: .4byte gUnknown_3005AC0 _08066E5C: .4byte sub_08064BEC - thumb_func_end sub_08066DF8 + thumb_func_end LinkOpponentHandleStatusAnimation - thumb_func_start sub_08066E60 -sub_08066E60: @ 0x08066E60 + thumb_func_start LinkOpponentHandleStatusXor +LinkOpponentHandleStatusXor: @ 0x08066E60 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066E60 + thumb_func_end LinkOpponentHandleStatusXor - thumb_func_start sub_08066E6C -sub_08066E6C: @ 0x08066E6C + thumb_func_start LinkOpponentHandleDataTransfer +LinkOpponentHandleDataTransfer: @ 0x08066E6C push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066E6C + thumb_func_end LinkOpponentHandleDataTransfer - thumb_func_start sub_08066E78 -sub_08066E78: @ 0x08066E78 + thumb_func_start LinkOpponentHandleDMA3Transfer +LinkOpponentHandleDMA3Transfer: @ 0x08066E78 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066E78 + thumb_func_end LinkOpponentHandleDMA3Transfer - thumb_func_start sub_08066E84 -sub_08066E84: @ 0x08066E84 + thumb_func_start LinkOpponentHandlePlayBGM +LinkOpponentHandlePlayBGM: @ 0x08066E84 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066E84 + thumb_func_end LinkOpponentHandlePlayBGM - thumb_func_start sub_08066E90 -sub_08066E90: @ 0x08066E90 + thumb_func_start LinkOpponentHandleCmd32 +LinkOpponentHandleCmd32: @ 0x08066E90 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066E90 + thumb_func_end LinkOpponentHandleCmd32 - thumb_func_start sub_08066E9C -sub_08066E9C: @ 0x08066E9C + thumb_func_start LinkOpponentHandleTwoReturnValues +LinkOpponentHandleTwoReturnValues: @ 0x08066E9C push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066E9C + thumb_func_end LinkOpponentHandleTwoReturnValues - thumb_func_start sub_08066EA8 -sub_08066EA8: @ 0x08066EA8 + thumb_func_start LinkOpponentHandleChosenMonReturnValue +LinkOpponentHandleChosenMonReturnValue: @ 0x08066EA8 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066EA8 + thumb_func_end LinkOpponentHandleChosenMonReturnValue - thumb_func_start sub_08066EB4 -sub_08066EB4: @ 0x08066EB4 + thumb_func_start LinkOpponentHandleOneReturnValue +LinkOpponentHandleOneReturnValue: @ 0x08066EB4 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066EB4 + thumb_func_end LinkOpponentHandleOneReturnValue - thumb_func_start sub_08066EC0 -sub_08066EC0: @ 0x08066EC0 + thumb_func_start LinkOpponentHandleOneReturnValue_Duplicate +LinkOpponentHandleOneReturnValue_Duplicate: @ 0x08066EC0 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066EC0 + thumb_func_end LinkOpponentHandleOneReturnValue_Duplicate thumb_func_start LinkOpponentHandleCmd37 LinkOpponentHandleCmd37: @ 0x08066ECC @@ -208534,7 +208534,7 @@ LinkOpponentHandleCmd37: @ 0x08066ECC rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -208560,7 +208560,7 @@ LinkOpponentHandleCmd38: @ 0x08066EE8 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -208577,7 +208577,7 @@ LinkOpponentHandleCmd39: @ 0x08066F20 movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -208599,15 +208599,15 @@ LinkOpponentHandleCmd40: @ 0x08066F38 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08066F5C: .4byte gUnknown_20229C0 thumb_func_end LinkOpponentHandleCmd40 - thumb_func_start sub_08066F60 -sub_08066F60: @ 0x08066F60 + thumb_func_start LinkOpponentHandleHitAnimation +LinkOpponentHandleHitAnimation: @ 0x08066F60 push {r4, lr} ldr r3, _08066F88 ldr r2, _08066F8C @@ -208624,7 +208624,7 @@ sub_08066F60: @ 0x08066F60 lsls r0, r0, #0x1d cmp r0, #0 bge _08066F94 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted b _08066FBE .align 2, 0 _08066F88: .4byte gUnknown_20205AC @@ -208659,23 +208659,23 @@ _08066FBE: _08066FC4: .4byte gUnknown_202415D _08066FC8: .4byte gUnknown_3005AC0 _08066FCC: .4byte sub_080648C8 - thumb_func_end sub_08066F60 + thumb_func_end LinkOpponentHandleHitAnimation - thumb_func_start sub_08066FD0 -sub_08066FD0: @ 0x08066FD0 + thumb_func_start LinkOpponentHandleCmd42 +LinkOpponentHandleCmd42: @ 0x08066FD0 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08066FD0 + thumb_func_end LinkOpponentHandleCmd42 - thumb_func_start sub_08066FDC -sub_08066FDC: @ 0x08066FDC + thumb_func_start LinkOpponentHandlePlaySE +LinkOpponentHandlePlaySE: @ 0x08066FDC push {r4, lr} ldr r4, _08067018 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -208695,15 +208695,15 @@ _08066FF0: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_08064C4C + bl PlaySE12WithPanning + bl LinkOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _08067018: .4byte gUnknown_2023D08 _0806701C: .4byte gUnknown_2022D08 - thumb_func_end sub_08066FDC + thumb_func_end LinkOpponentHandlePlaySE thumb_func_start sub_08067020 sub_08067020: @ 0x08067020 @@ -208717,7 +208717,7 @@ sub_08067020: @ 0x08067020 ldrb r0, [r0] cmp r0, #0 beq _0806705C - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -208728,7 +208728,7 @@ sub_08067020: @ 0x08067020 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _08067070 .align 2, 0 _08067054: .4byte gUnknown_2022D08 @@ -208742,9 +208742,9 @@ _0806705C: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _08067070: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 @@ -208765,13 +208765,13 @@ sub_0806707C: @ 0x0806707C ldr r1, _080670B4 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 movs r2, #5 - bl sub_080A2BAC - bl sub_08064C4C + bl PlayCry3 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -208790,13 +208790,13 @@ sub_080670B8: @ 0x080670B8 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _080670E8 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -208805,8 +208805,8 @@ _080670E4: .4byte gUnknown_2023D08 _080670E8: .4byte gUnknown_20240A0 thumb_func_end sub_080670B8 - thumb_func_start sub_080670EC -sub_080670EC: @ 0x080670EC + thumb_func_start LinkOpponentHandleIntroTrainerBallThrow +LinkOpponentHandleIntroTrainerBallThrow: @ 0x080670EC push {r4, r5, r6, lr} ldr r5, _080671CC ldr r6, _080671D0 @@ -208866,10 +208866,10 @@ sub_080670EC: @ 0x080670EC lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _080671DC - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080671E0 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _080671E4 @@ -208927,10 +208927,10 @@ _080671E0: .4byte sub_080671FC _080671E4: .4byte gUnknown_3005B60 _080671E8: .4byte gUnknown_2024174 _080671EC: .4byte gUnknown_2024158 -_080671F0: .4byte sub_0807352C +_080671F0: .4byte Task_HidePartyStatusSummary _080671F4: .4byte gUnknown_3005AC0 _080671F8: .4byte sub_08063F74 - thumb_func_end sub_080670EC + thumb_func_end LinkOpponentHandleIntroTrainerBallThrow thumb_func_start sub_080671FC sub_080671FC: @ 0x080671FC @@ -208952,7 +208952,7 @@ sub_080671FC: @ 0x080671FC adds r0, r0, r1 ldrh r0, [r0, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08067236 @@ -209025,7 +209025,7 @@ _080672A8: mov r0, sb strb r0, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask pop {r3, r4} mov r8, r3 mov sb, r4 @@ -209045,7 +209045,7 @@ sub_080672E0: @ 0x080672E0 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #6] - bl sub_0805DC00 + bl FreeTrainerFrontPicPalette adds r0, r4, #0 bl FreeSpriteOamMatrix adds r0, r4, #0 @@ -209068,11 +209068,11 @@ sub_080672FC: @ 0x080672FC cmp r0, #0 beq _0806732C adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0806732C - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted b _080673F6 .align 2, 0 _08067324: .4byte gUnknown_2022D08 @@ -209142,7 +209142,7 @@ _08067398: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _08067400 ldrb r1, [r5] adds r1, r1, r2 @@ -209218,7 +209218,7 @@ sub_08067410: @ 0x08067410 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted _08067448: pop {r4} pop {r0} @@ -209256,7 +209256,7 @@ LinkOpponentHandleHidePartyStatusSummary: @ 0x08067458 ldr r1, _080674A4 str r1, [r0] _0806748A: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -209264,24 +209264,24 @@ _08067494: .4byte gUnknown_2024174 _08067498: .4byte gUnknown_2023D08 _0806749C: .4byte gUnknown_3005B60 _080674A0: .4byte gUnknown_2024158 -_080674A4: .4byte sub_0807352C +_080674A4: .4byte Task_HidePartyStatusSummary thumb_func_end LinkOpponentHandleHidePartyStatusSummary - thumb_func_start sub_080674A8 -sub_080674A8: @ 0x080674A8 + thumb_func_start LinkOpponentHandleEndBounceEffect +LinkOpponentHandleEndBounceEffect: @ 0x080674A8 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080674A8 + thumb_func_end LinkOpponentHandleEndBounceEffect - thumb_func_start sub_080674B4 -sub_080674B4: @ 0x080674B4 + thumb_func_start LinkOpponentHandleSpriteInvisibility +LinkOpponentHandleSpriteInvisibility: @ 0x080674B4 push {r4, lr} ldr r4, _08067504 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _080674FA @@ -209312,7 +209312,7 @@ sub_080674B4: @ 0x080674B4 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _080674FA: - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -209321,15 +209321,15 @@ _08067504: .4byte gUnknown_2023D08 _08067508: .4byte gUnknown_20205AC _0806750C: .4byte gUnknown_2023E88 _08067510: .4byte gUnknown_2022D08 - thumb_func_end sub_080674B4 + thumb_func_end LinkOpponentHandleSpriteInvisibility - thumb_func_start sub_08067514 -sub_08067514: @ 0x08067514 + thumb_func_start LinkOpponentHandleBattleAnimation +LinkOpponentHandleBattleAnimation: @ 0x08067514 push {r4, r5, r6, lr} sub sp, #4 ldr r5, _0806755C ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _08067576 @@ -209351,11 +209351,11 @@ sub_08067514: @ 0x08067514 adds r0, r2, #0 adds r1, r2, #0 adds r3, r6, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _08067564 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted b _08067570 .align 2, 0 _0806755C: .4byte gUnknown_2023D08 @@ -209369,7 +209369,7 @@ _08067564: str r0, [r1] _08067570: adds r0, r6, #0 - bl sub_0817E1D8 + bl BattleTv_SetDataBasedOnAnimation _08067576: add sp, #4 pop {r4, r5, r6} @@ -209378,10 +209378,10 @@ _08067576: .align 2, 0 _08067580: .4byte gUnknown_3005AC0 _08067584: .4byte sub_08064C1C - thumb_func_end sub_08067514 + thumb_func_end LinkOpponentHandleBattleAnimation - thumb_func_start sub_08067588 -sub_08067588: @ 0x08067588 + thumb_func_start LinkOpponentHandleLinkStandbyMsg +LinkOpponentHandleLinkStandbyMsg: @ 0x08067588 push {lr} ldr r0, _080675A0 ldrb r0, [r0] @@ -209389,25 +209389,25 @@ sub_08067588: @ 0x08067588 ldr r1, _080675A4 adds r0, r0, r1 bl sub_08185008 - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _080675A0: .4byte gUnknown_2023D08 _080675A4: .4byte gUnknown_2022D0A - thumb_func_end sub_08067588 + thumb_func_end LinkOpponentHandleLinkStandbyMsg - thumb_func_start sub_080675A8 -sub_080675A8: @ 0x080675A8 + thumb_func_start LinkOpponentHandleResetActionMoveSelection +LinkOpponentHandleResetActionMoveSelection: @ 0x080675A8 push {lr} - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080675A8 + thumb_func_end LinkOpponentHandleResetActionMoveSelection - thumb_func_start sub_080675B4 -sub_080675B4: @ 0x080675B4 + thumb_func_start LinkOpponentHandleCmd55 +LinkOpponentHandleCmd55: @ 0x080675B4 push {r4, r5, lr} ldr r5, _080675D8 ldrb r0, [r5] @@ -209459,7 +209459,7 @@ _080675EC: bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_08064C4C + bl LinkOpponentBufferExecCompleted ldr r1, _0806764C ldrb r0, [r4] lsls r0, r0, #2 @@ -209477,7 +209477,7 @@ _08067644: .4byte gUnknown_2023D08 _08067648: .4byte 0x00000CA9 _0806764C: .4byte gUnknown_3005AC0 _08067650: .4byte sub_080583C0 - thumb_func_end sub_080675B4 + thumb_func_end LinkOpponentHandleCmd55 thumb_func_start sub_08067654 sub_08067654: @ 0x08067654 @@ -209502,8 +209502,8 @@ _08067660: .align 2, 0 thumb_func_end ZeroBoxMonData - thumb_func_start sub_08067670 -sub_08067670: @ 0x08067670 + thumb_func_start ZeroMonData +ZeroMonData: @ 0x08067670 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -209513,51 +209513,51 @@ sub_08067670: @ 0x08067670 adds r0, r4, #0 movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f mov r2, sp - bl sub_0806A774 + bl SetMonData movs r0, #0xff str r0, [sp] adds r0, r4, #0 movs r1, #0x40 mov r2, sp - bl sub_0806A774 + bl SetMonData add sp, #4 pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067670 + thumb_func_end ZeroMonData thumb_func_start ZeroPlayerPartyMons ZeroPlayerPartyMons: @ 0x080676F0 @@ -209568,7 +209568,7 @@ ZeroPlayerPartyMons: @ 0x080676F0 adds r5, r4, r0 _080676FA: adds r0, r4, #0 - bl sub_08067670 + bl ZeroMonData adds r4, #0x64 cmp r4, r5 ble _080676FA @@ -209588,7 +209588,7 @@ ZeroEnemyPartyMons: @ 0x08067710 adds r5, r4, r0 _0806771A: adds r0, r4, #0 - bl sub_08067670 + bl ZeroMonData adds r4, #0x64 cmp r4, r5 ble _0806771A @@ -209599,8 +209599,8 @@ _0806771A: _0806772C: .4byte gUnknown_20243E8 thumb_func_end ZeroEnemyPartyMons - thumb_func_start sub_08067730 -sub_08067730: @ 0x08067730 + thumb_func_start CreateMon +CreateMon: @ 0x08067730 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -209622,7 +209622,7 @@ sub_08067730: @ 0x08067730 lsrs r5, r5, #0x18 mov r0, r8 str r3, [sp, #0x18] - bl sub_08067670 + bl ZeroMonData str r4, [sp] str r7, [sp, #4] str r5, [sp, #8] @@ -209633,29 +209633,29 @@ sub_08067730: @ 0x08067730 add r2, sp, #0x10 ldrb r2, [r2] ldr r3, [sp, #0x18] - bl sub_080677A0 + bl CreateBoxMon mov r0, r8 movs r1, #0x38 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData movs r0, #0xff str r0, [sp, #0x14] add r2, sp, #0x14 mov r0, r8 movs r1, #0x40 - bl sub_0806A774 + bl SetMonData mov r0, r8 - bl sub_0806884C + bl CalculateMonStats add sp, #0x1c pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08067730 + thumb_func_end CreateMon - thumb_func_start sub_080677A0 -sub_080677A0: @ 0x080677A0 + thumb_func_start CreateBoxMon +CreateBoxMon: @ 0x080677A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -209698,7 +209698,7 @@ _080677F0: add r2, sp, #0x14 adds r0, r7, #0 movs r1, #0 - bl sub_0806A864 + bl SetBoxMonData add r0, sp, #0x18 mov sb, r0 add r5, sp, #0xc @@ -209761,14 +209761,14 @@ _0806786E: adds r0, r7, #0 movs r1, #1 mov r2, sb - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 bl CalculateBoxMonChecksum strh r0, [r5] adds r0, r7, #0 movs r1, #9 adds r2, r5, #0 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 bl EncryptBoxMon mov r0, sp @@ -209777,21 +209777,21 @@ _0806786E: adds r0, r7, #0 movs r1, #2 mov r2, sp - bl sub_0806A864 + bl SetBoxMonData ldr r2, _0806799C adds r0, r7, #0 movs r1, #3 - bl sub_0806A864 + bl SetBoxMonData ldr r5, _08067998 ldr r2, [r5] adds r0, r7, #0 movs r1, #7 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0xb mov r2, sp adds r2, #0xe - bl sub_0806A864 + bl SetBoxMonData ldr r4, _080679A0 mov r2, sp ldrh r1, [r2, #0xe] @@ -209812,7 +209812,7 @@ _0806786E: adds r2, r2, r0 adds r0, r7, #0 movs r1, #0x19 - bl sub_0806A864 + bl SetBoxMonData mov r1, sp ldrh r0, [r1, #0xe] lsls r2, r0, #3 @@ -209822,7 +209822,7 @@ _0806786E: adds r2, r2, r4 adds r0, r7, #0 movs r1, #0x20 - bl sub_0806A864 + bl SetBoxMonData bl GetCurrentRegionMapSectionId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -209830,26 +209830,26 @@ _0806786E: adds r0, r7, #0 movs r1, #0x23 mov r2, sb - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x24 add r2, sp, #0x10 - bl sub_0806A864 + bl SetBoxMonData ldr r2, _080679A8 adds r0, r7, #0 movs r1, #0x25 - bl sub_0806A864 + bl SetBoxMonData movs r0, #4 str r0, [sp, #0x18] adds r0, r7, #0 movs r1, #0x26 mov r2, sb - bl sub_0806A864 + bl SetBoxMonData ldr r2, [r5] adds r2, #8 adds r0, r7, #0 movs r1, #0x31 - bl sub_0806A864 + bl SetBoxMonData mov r2, sp ldrb r0, [r2, #0x11] cmp r0, #0x1f @@ -209857,32 +209857,32 @@ _0806786E: adds r0, r7, #0 movs r1, #0x27 adds r2, #0x11 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x28 mov r2, sp adds r2, #0x11 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x29 mov r2, sp adds r2, #0x11 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x2a mov r2, sp adds r2, #0x11 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x2b mov r2, sp adds r2, #0x11 - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x2c mov r2, sp adds r2, #0x11 - bl sub_0806A864 + bl SetBoxMonData b _08067A34 .align 2, 0 _08067998: .4byte gUnknown_3005AF0 @@ -209903,7 +209903,7 @@ _080679AC: adds r0, r7, #0 movs r1, #0x27 adds r2, r4, #0 - bl sub_0806A864 + bl SetBoxMonData ldr r0, [sp, #0x18] movs r6, #0xf8 lsls r6, r6, #2 @@ -209913,7 +209913,7 @@ _080679AC: adds r0, r7, #0 movs r1, #0x28 adds r2, r4, #0 - bl sub_0806A864 + bl SetBoxMonData ldr r0, [sp, #0x18] movs r5, #0xf8 lsls r5, r5, #7 @@ -209923,7 +209923,7 @@ _080679AC: adds r0, r7, #0 movs r1, #0x29 adds r2, r4, #0 - bl sub_0806A864 + bl SetBoxMonData bl Random lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -209934,7 +209934,7 @@ _080679AC: adds r0, r7, #0 movs r1, #0x2a adds r2, r4, #0 - bl sub_0806A864 + bl SetBoxMonData ldr r0, [sp, #0x18] ands r0, r6 lsrs r0, r0, #5 @@ -209942,7 +209942,7 @@ _080679AC: adds r0, r7, #0 movs r1, #0x2b adds r2, r4, #0 - bl sub_0806A864 + bl SetBoxMonData ldr r0, [sp, #0x18] ands r0, r5 lsrs r0, r0, #0xa @@ -209950,7 +209950,7 @@ _080679AC: adds r0, r7, #0 movs r1, #0x2c adds r2, r4, #0 - bl sub_0806A864 + bl SetBoxMonData _08067A34: ldr r2, _08067A70 mov r3, sp @@ -209969,7 +209969,7 @@ _08067A34: adds r0, r7, #0 movs r1, #0x2e mov r2, sb - bl sub_0806A864 + bl SetBoxMonData _08067A5A: adds r0, r7, #0 bl GiveBoxMonInitialMoveset @@ -209983,10 +209983,10 @@ _08067A5A: bx r0 .align 2, 0 _08067A70: .4byte gUnknown_82F0D54 - thumb_func_end sub_080677A0 + thumb_func_end CreateBoxMon - thumb_func_start sub_08067A74 -sub_08067A74: @ 0x08067A74 + thumb_func_start CreateMonWithNature +CreateMonWithNature: @ 0x08067A74 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -210012,7 +210012,7 @@ _08067A94: lsls r0, r0, #0x10 orrs r4, r0 adds r0, r4, #0 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -210027,7 +210027,7 @@ _08067A94: mov r1, r8 adds r2, r7, #0 adds r3, r6, #0 - bl sub_08067730 + bl CreateMon add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -210036,10 +210036,10 @@ _08067A94: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067A74 + thumb_func_end CreateMonWithNature - thumb_func_start sub_08067ADC -sub_08067ADC: @ 0x08067ADC + thumb_func_start CreateMonWithGenderNatureLetter +CreateMonWithGenderNatureLetter: @ 0x08067ADC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -210102,14 +210102,14 @@ _08067B1C: lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 bne _08067B1C adds r0, r7, #0 adds r1, r4, #0 - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r8, r0 @@ -210128,14 +210128,14 @@ _08067B82: lsls r0, r0, #0x10 orrs r4, r0 adds r0, r4, #0 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 bne _08067B82 adds r0, r7, #0 adds r1, r4, #0 - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r8, r0 @@ -210151,7 +210151,7 @@ _08067BB2: adds r1, r7, #0 ldr r2, [sp, #0x14] mov r3, sl - bl sub_08067730 + bl CreateMon add sp, #0x18 pop {r3, r4, r5} mov r8, r3 @@ -210161,10 +210161,10 @@ _08067BB2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067ADC + thumb_func_end CreateMonWithGenderNatureLetter - thumb_func_start sub_08067BDC -sub_08067BDC: @ 0x08067BDC + thumb_func_start CreateMaleMon +CreateMaleMon: @ 0x08067BDC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -210191,7 +210191,7 @@ _08067BEE: orrs r4, r0 adds r0, r6, #0 adds r1, r4, #0 - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 cmp r0, #0 bne _08067BEE @@ -210204,7 +210204,7 @@ _08067BEE: adds r1, r6, #0 adds r2, r7, #0 movs r3, #0x20 - bl sub_08067730 + bl CreateMon add sp, #0x10 pop {r3} mov r8, r3 @@ -210212,10 +210212,10 @@ _08067BEE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067BDC + thumb_func_end CreateMaleMon - thumb_func_start sub_08067C44 -sub_08067C44: @ 0x08067C44 + thumb_func_start CreateMonWithIVsPersonality +CreateMonWithIVsPersonality: @ 0x08067C44 push {r4, lr} sub sp, #0x14 adds r4, r0, #0 @@ -210233,22 +210233,22 @@ sub_08067C44: @ 0x08067C44 str r0, [sp, #0xc] adds r0, r4, #0 movs r3, #0 - bl sub_08067730 + bl CreateMon adds r0, r4, #0 movs r1, #0x42 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x14 pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067C44 + thumb_func_end CreateMonWithIVsPersonality - thumb_func_start sub_08067C84 -sub_08067C84: @ 0x08067C84 + thumb_func_start CreateMonWithIVsOTID +CreateMonWithIVsOTID: @ 0x08067C84 push {r4, r5, lr} sub sp, #0x10 adds r5, r0, #0 @@ -210266,43 +210266,43 @@ sub_08067C84: @ 0x08067C84 str r3, [sp, #0xc] adds r0, r5, #0 movs r3, #0 - bl sub_08067730 + bl CreateMon adds r0, r5, #0 movs r1, #0x27 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData adds r2, r4, #1 adds r0, r5, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData adds r2, r4, #2 adds r0, r5, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData adds r2, r4, #3 adds r0, r5, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData adds r2, r4, #4 adds r0, r5, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData adds r4, #5 adds r0, r5, #0 movs r1, #0x2c adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x10 pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067C84 + thumb_func_end CreateMonWithIVsOTID - thumb_func_start sub_08067CF8 -sub_08067CF8: @ 0x08067CF8 + thumb_func_start CreateMonWithEVSpread +CreateMonWithEVSpread: @ 0x08067CF8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -210324,7 +210324,7 @@ sub_08067CF8: @ 0x08067CF8 str r6, [sp, #8] str r6, [sp, #0xc] adds r0, r7, #0 - bl sub_08067730 + bl CreateMon mov r4, r8 movs r1, #1 movs r5, #5 @@ -210356,7 +210356,7 @@ _08067D50: adds r1, #0x1a adds r0, r7, #0 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData _08067D64: lsls r0, r4, #0x19 lsrs r4, r0, #0x18 @@ -210364,14 +210364,14 @@ _08067D64: cmp r5, #5 ble _08067D50 adds r0, r7, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x14 pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08067CF8 + thumb_func_end CreateMonWithEVSpread thumb_func_start sub_08067D80 sub_08067D80: @ 0x08067D80 @@ -210390,7 +210390,7 @@ sub_08067D80: @ 0x08067D80 str r0, [sp, #0xc] adds r0, r7, #0 movs r3, #0 - bl sub_08067730 + bl CreateMon movs r5, #0 adds r4, r6, #4 _08067DA6: @@ -210398,7 +210398,7 @@ _08067DA6: lsls r2, r5, #0x18 lsrs r2, r2, #0x18 adds r0, r7, #0 - bl sub_08068D34 + bl SetMonMoveSlot adds r4, #2 adds r5, #1 cmp r5, #3 @@ -210407,51 +210407,51 @@ _08067DA6: adds r2, #0xd adds r0, r7, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData adds r2, r6, #2 adds r0, r7, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x20 adds r0, r7, #0 movs r1, #2 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x2b adds r0, r7, #0 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0xe adds r0, r7, #0 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0xf adds r0, r7, #0 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x10 adds r0, r7, #0 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x11 adds r0, r7, #0 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x12 adds r0, r7, #0 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x13 adds r0, r7, #0 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #0x1b] lsrs r0, r0, #7 add r1, sp, #0x10 @@ -210459,7 +210459,7 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x2e add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrb r0, [r6, #0x18] lsls r0, r0, #0x1b @@ -210468,7 +210468,7 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x27 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrh r0, [r6, #0x18] lsls r0, r0, #0x16 @@ -210477,7 +210477,7 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x28 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrb r0, [r6, #0x19] lsls r0, r0, #0x19 @@ -210486,7 +210486,7 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x29 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldr r0, [r6, #0x18] lsls r0, r0, #0xc @@ -210495,7 +210495,7 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x2a add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrh r0, [r6, #0x1a] lsls r0, r0, #0x17 @@ -210504,7 +210504,7 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x2b add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrb r0, [r6, #0x1b] lsls r0, r0, #0x1a @@ -210513,11 +210513,11 @@ _08067DA6: adds r0, r7, #0 movs r1, #0x2c add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 bl sub_0806E3B0 adds r0, r7, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x14 pop {r4, r5, r6, r7} pop {r0} @@ -210525,8 +210525,8 @@ _08067DA6: .align 2, 0 thumb_func_end sub_08067D80 - thumb_func_start sub_08067ED0 -sub_08067ED0: @ 0x08067ED0 + thumb_func_start CreateBattleTowerMon2 +CreateBattleTowerMon2: @ 0x08067ED0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -210572,7 +210572,7 @@ _08067F14: adds r0, r7, #0 adds r2, r3, #0 movs r3, #0 - bl sub_08067730 + bl CreateMon movs r6, #0 movs r0, #0xd adds r0, r0, r5 @@ -210603,7 +210603,7 @@ _08067F60: lsls r2, r6, #0x18 lsrs r2, r2, #0x18 adds r0, r7, #0 - bl sub_08068D34 + bl SetMonMoveSlot adds r4, #2 adds r6, #1 cmp r6, #3 @@ -210611,43 +210611,43 @@ _08067F60: adds r0, r7, #0 movs r1, #0x15 mov r2, r8 - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0xc mov r2, sb - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #2 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x20 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x1a ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x1b ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x1c ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x1d ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x1e ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x1f ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r5, #0x1b] lsrs r0, r0, #7 add r1, sp, #0x10 @@ -210655,7 +210655,7 @@ _08067F60: adds r0, r7, #0 movs r1, #0x2e add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrb r0, [r5, #0x18] lsls r0, r0, #0x1b @@ -210664,7 +210664,7 @@ _08067F60: adds r0, r7, #0 movs r1, #0x27 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrh r0, [r5, #0x18] lsls r0, r0, #0x16 @@ -210673,7 +210673,7 @@ _08067F60: adds r0, r7, #0 movs r1, #0x28 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrb r0, [r5, #0x19] lsls r0, r0, #0x19 @@ -210682,7 +210682,7 @@ _08067F60: adds r0, r7, #0 movs r1, #0x29 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldr r0, [r5, #0x18] lsls r0, r0, #0xc @@ -210691,7 +210691,7 @@ _08067F60: adds r0, r7, #0 movs r1, #0x2a add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrh r0, [r5, #0x1a] lsls r0, r0, #0x17 @@ -210700,7 +210700,7 @@ _08067F60: adds r0, r7, #0 movs r1, #0x2b add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 ldrb r0, [r5, #0x1b] lsls r0, r0, #0x1a @@ -210709,11 +210709,11 @@ _08067F60: adds r0, r7, #0 movs r1, #0x2c add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 bl sub_0806E3B0 adds r0, r7, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x30 pop {r3, r4, r5} mov r8, r3 @@ -210723,7 +210723,7 @@ _08067F60: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08067ED0 + thumb_func_end CreateBattleTowerMon2 thumb_func_start sub_08068080 sub_08068080: @ 0x08068080 @@ -210787,13 +210787,13 @@ sub_08068080: @ 0x08068080 str r0, [sp, #0xc] adds r0, r7, #0 movs r3, #0x1f - bl sub_08067730 + bl CreateMon mov r1, sb adds r2, r5, r1 adds r2, #0xe adds r0, r7, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r4, #0 mov r6, sb adds r6, #6 @@ -210803,7 +210803,7 @@ _08068112: lsls r2, r4, #0x18 lsrs r2, r2, #0x18 adds r0, r7, #0 - bl sub_08068D34 + bl SetMonMoveSlot adds r5, #2 adds r4, #1 cmp r4, #3 @@ -210817,7 +210817,7 @@ _08068130: adds r1, #0x1a adds r0, r7, #0 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r4, #1 cmp r4, #5 ble _08068130 @@ -210832,9 +210832,9 @@ _08068130: adds r2, r2, r0 adds r0, r7, #0 movs r1, #7 - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x14 pop {r3, r4} mov r8, r3 @@ -210846,8 +210846,8 @@ _08068130: _08068170: .4byte gUnknown_85DC21C thumb_func_end sub_08068080 - thumb_func_start sub_08068174 -sub_08068174: @ 0x08068174 + thumb_func_start CreateMonWithEVSpreadNatureOTID +CreateMonWithEVSpreadNatureOTID: @ 0x08068174 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -210881,7 +210881,7 @@ _080681A4: lsls r0, r0, #0x10 orrs r4, r0 adds r0, r4, #0 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -210896,7 +210896,7 @@ _080681A4: ldr r1, [sp, #0x14] mov r2, sl mov r3, sb - bl sub_08067730 + bl CreateMon mov r5, r8 movs r1, #1 movs r4, #5 @@ -210928,7 +210928,7 @@ _08068206: adds r1, #0x1a adds r0, r7, #0 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData _0806821A: lsls r0, r5, #0x19 lsrs r5, r0, #0x18 @@ -210936,7 +210936,7 @@ _0806821A: cmp r4, #5 ble _08068206 adds r0, r7, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x18 pop {r3, r4, r5} mov r8, r3 @@ -210946,7 +210946,7 @@ _0806821A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08068174 + thumb_func_end CreateMonWithEVSpreadNatureOTID thumb_func_start sub_0806823C sub_0806823C: @ 0x0806823C @@ -210958,12 +210958,12 @@ sub_0806823C: @ 0x0806823C adds r6, r1, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r6] adds r0, r7, #0 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xaf @@ -210984,7 +210984,7 @@ _08068278: adds r1, #0xd adds r0, r7, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r4, #2 adds r5, #1 @@ -210993,58 +210993,58 @@ _08068278: adds r0, r7, #0 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0xc] adds r0, r7, #0 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0xd] adds r0, r7, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [r6, #0x14] adds r0, r7, #0 movs r1, #0x1a movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0xe] adds r0, r7, #0 movs r1, #0x1b movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0xf] adds r0, r7, #0 movs r1, #0x1c movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0x10] adds r0, r7, #0 movs r1, #0x1d movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0x11] adds r0, r7, #0 movs r1, #0x1e movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0x12] adds r0, r7, #0 movs r1, #0x1f movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r6, #0x13] adds r0, r7, #0 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strb r0, [r1] adds r0, r7, #0 movs r1, #0x27 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r4, #0x1f ands r0, r4 ldrb r2, [r6, #0x18] @@ -211056,7 +211056,7 @@ _08068278: adds r0, r7, #0 movs r1, #0x28 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r5, #0x1f ands r0, r5 lsls r0, r0, #5 @@ -211068,7 +211068,7 @@ _08068278: adds r0, r7, #0 movs r1, #0x29 movs r2, #0 - bl sub_0806A058 + bl GetMonData ands r0, r4 lsls r0, r0, #2 ldrb r2, [r6, #0x19] @@ -211080,7 +211080,7 @@ _08068278: adds r0, r7, #0 movs r1, #0x2a movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -211092,7 +211092,7 @@ _08068278: adds r0, r7, #0 movs r1, #0x2b movs r2, #0 - bl sub_0806A058 + bl GetMonData ands r0, r5 lsls r0, r0, #4 ldrh r2, [r6, #0x1a] @@ -211103,7 +211103,7 @@ _08068278: adds r0, r7, #0 movs r1, #0x2c movs r2, #0 - bl sub_0806A058 + bl GetMonData ands r0, r4 lsls r0, r0, #1 ldrb r2, [r6, #0x1b] @@ -211115,7 +211115,7 @@ _08068278: adds r0, r7, #0 movs r1, #0x2e movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #7 ldrb r2, [r6, #0x1b] movs r1, #0x7f @@ -211125,12 +211125,12 @@ _08068278: adds r0, r7, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [r6, #0x1c] adds r0, r7, #0 movs r1, #2 mov r2, sb - bl sub_0806A058 + bl GetMonData pop {r3, r4} mov r8, r3 mov sb, r4 @@ -211143,8 +211143,8 @@ _080683E0: .4byte 0xFFF07FFF _080683E4: .4byte 0xFFFFFE0F thumb_func_end sub_0806823C - thumb_func_start sub_080683E8 -sub_080683E8: @ 0x080683E8 + thumb_func_start CreateObedientMon +CreateObedientMon: @ 0x080683E8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -211171,11 +211171,11 @@ sub_080683E8: @ 0x080683E8 str r5, [sp, #8] str r7, [sp, #0xc] mov r0, r8 - bl sub_08067730 + bl CreateMon mov r0, r8 movs r1, #0x50 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add sp, #0x14 pop {r3} mov r8, r3 @@ -211183,7 +211183,7 @@ sub_080683E8: @ 0x080683E8 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080683E8 + thumb_func_end CreateObedientMon thumb_func_start sub_08068438 sub_08068438: @ 0x08068438 @@ -211276,7 +211276,7 @@ _080684D0: beq _08068534 _080684F6: ldr r4, _08068520 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -211305,7 +211305,7 @@ _08068524: beq _0806850E _08068534: adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0806850E @@ -211320,8 +211320,8 @@ _08068548: .4byte gUnknown_3002360 _0806854C: .4byte 0x00000439 thumb_func_end sub_08068438 - thumb_func_start sub_08068550 -sub_08068550: @ 0x08068550 + thumb_func_start GetDeoxysStat +GetDeoxysStat: @ 0x08068550 push {r4, r5, r6, lr} adds r5, r0, #0 adds r6, r1, #0 @@ -211334,7 +211334,7 @@ sub_08068550: @ 0x08068550 adds r0, r5, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xcd lsls r1, r1, #1 cmp r0, r1 @@ -211349,13 +211349,13 @@ _0806857C: adds r1, #0x27 adds r0, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r1, r6, #0 adds r1, #0x1a adds r0, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r2, _080685E0 lsls r1, r6, #1 adds r1, r1, r2 @@ -211378,13 +211378,13 @@ _080685A8: lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r6, #0x18 lsrs r2, r2, #0x18 adds r1, r4, #0 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 @@ -211394,10 +211394,10 @@ _080685DA: bx r1 .align 2, 0 _080685E0: .4byte gUnknown_82FA6D6 - thumb_func_end sub_08068550 + thumb_func_end GetDeoxysStat - thumb_func_start sub_080685E4 -sub_080685E4: @ 0x080685E4 + thumb_func_start SetDeoxysStats +SetDeoxysStats: @ 0x080685E4 push {r4, r5, lr} sub sp, #4 movs r5, #0 @@ -211410,7 +211410,7 @@ _080685EA: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xcd lsls r1, r1, #1 cmp r0, r1 @@ -211418,48 +211418,48 @@ _080685EA: adds r0, r4, #0 movs r1, #0x3b movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] adds r0, r4, #0 movs r1, #0x3b mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] adds r0, r4, #0 movs r1, #0x3c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] adds r0, r4, #0 movs r1, #0x3d mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] adds r0, r4, #0 movs r1, #0x3e mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] adds r0, r4, #0 movs r1, #0x3f mov r2, sp - bl sub_0806A774 + bl SetMonData _08068674: adds r5, #1 cmp r5, #5 @@ -211470,7 +211470,7 @@ _08068674: bx r0 .align 2, 0 _08068684: .4byte gUnknown_2024190 - thumb_func_end sub_080685E4 + thumb_func_end SetDeoxysStats thumb_func_start sub_08068688 sub_08068688: @ 0x08068688 @@ -211491,7 +211491,7 @@ sub_08068688: @ 0x08068688 _080686A4: .4byte gUnknown_2022C90 _080686A8: .4byte gUnknown_203C480 _080686AC: - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -211543,7 +211543,7 @@ sub_080686F0: @ 0x080686F0 _0806870C: .4byte gUnknown_2022C90 _08068710: .4byte gUnknown_203C480 _08068714: - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -211577,8 +211577,8 @@ _08068750: .4byte gUnknown_82EFF52 _08068754: .4byte gUnknown_82FA6E2 thumb_func_end sub_080686F0 - thumb_func_start sub_08068758 -sub_08068758: @ 0x08068758 + thumb_func_start CreateObedientEnemyMon +CreateObedientEnemyMon: @ 0x08068758 push {r4, r5, r6, r7, lr} sub sp, #0x14 ldr r0, _080687A8 @@ -211600,7 +211600,7 @@ sub_08068758: @ 0x08068758 adds r1, r5, #0 adds r2, r4, #0 movs r3, #0x20 - bl sub_080683E8 + bl CreateObedientMon cmp r6, #0 beq _080687A0 add r0, sp, #0x10 @@ -211611,7 +211611,7 @@ sub_08068758: @ 0x08068758 adds r0, r7, #0 movs r1, #0xc add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData _080687A0: add sp, #0x14 pop {r4, r5, r6, r7} @@ -211622,7 +211622,7 @@ _080687A8: .4byte gUnknown_2037280 _080687AC: .4byte gUnknown_2037282 _080687B0: .4byte gUnknown_2037284 _080687B4: .4byte gUnknown_20243E8 - thumb_func_end sub_08068758 + thumb_func_end CreateObedientEnemyMon thumb_func_start CalculateBoxMonChecksum CalculateBoxMonChecksum: @ 0x080687B8 @@ -211633,22 +211633,22 @@ CalculateBoxMonChecksum: @ 0x080687B8 movs r6, #0 ldr r1, [r4] movs r2, #0 - bl sub_08069DB0 + bl GetSubstruct adds r5, r0, #0 ldr r1, [r4] adds r0, r4, #0 movs r2, #1 - bl sub_08069DB0 + bl GetSubstruct adds r7, r0, #0 ldr r1, [r4] adds r0, r4, #0 movs r2, #2 - bl sub_08069DB0 + bl GetSubstruct mov r8, r0 ldr r1, [r4] adds r0, r4, #0 movs r2, #3 - bl sub_08069DB0 + bl GetSubstruct adds r3, r0, #0 movs r1, #5 _080687F2: @@ -211702,8 +211702,8 @@ _0806882E: .align 2, 0 thumb_func_end CalculateBoxMonChecksum - thumb_func_start sub_0806884C -sub_0806884C: @ 0x0806884C + thumb_func_start CalculateMonStats +CalculateMonStats: @ 0x0806884C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -211713,77 +211713,77 @@ sub_0806884C: @ 0x0806884C adds r5, r0, #0 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r8, r0 adds r0, r5, #0 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x1c] adds r0, r5, #0 movs r1, #0x27 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 adds r0, r5, #0 movs r1, #0x1a movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r0, r5, #0 movs r1, #0x28 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov sl, r0 adds r0, r5, #0 movs r1, #0x1b movs r2, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 adds r0, r5, #0 movs r1, #0x29 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x20] adds r0, r5, #0 movs r1, #0x1c movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x24] adds r0, r5, #0 movs r1, #0x2a movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x28] adds r0, r5, #0 movs r1, #0x1d movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x2c] adds r0, r5, #0 movs r1, #0x2b movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x30] adds r0, r5, #0 movs r1, #0x1e movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x34] adds r0, r5, #0 movs r1, #0x2c movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x38] adds r0, r5, #0 movs r1, #0x1f movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x3c] adds r0, r5, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r5, #0 @@ -211794,7 +211794,7 @@ sub_0806884C: @ 0x0806884C adds r0, r5, #0 movs r1, #0x38 mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r0, _08068934 cmp r7, r0 bne _08068938 @@ -211844,7 +211844,7 @@ _08068966: _0806897E: adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData ldr r0, _08068B04 subs r1, r6, r7 lsls r1, r1, #2 @@ -211867,20 +211867,20 @@ _0806899E: adds r0, #5 str r0, [sp, #8] adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r4, sp, #8 ldrh r1, [r4] movs r2, #1 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #8] adds r0, r5, #0 movs r1, #0x3b adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #2] lsls r0, r0, #1 ldr r3, [sp, #0x20] @@ -211899,20 +211899,20 @@ _080689E4: adds r0, #5 str r0, [sp, #0xc] adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r4, sp, #0xc ldrh r1, [r4] movs r2, #2 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0xc] adds r0, r5, #0 movs r1, #0x3c adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #3] lsls r0, r0, #1 ldr r2, [sp, #0x28] @@ -211931,20 +211931,20 @@ _08068A2A: adds r0, #5 str r0, [sp, #0x10] adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r4, sp, #0x10 ldrh r1, [r4] movs r2, #3 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x10] adds r0, r5, #0 movs r1, #0x3d adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #4] lsls r0, r0, #1 ldr r3, [sp, #0x30] @@ -211963,20 +211963,20 @@ _08068A70: adds r0, #5 str r0, [sp, #0x14] adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r4, sp, #0x14 ldrh r1, [r4] movs r2, #4 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x14] adds r0, r5, #0 movs r1, #0x3e adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #5] lsls r0, r0, #1 ldr r2, [sp, #0x38] @@ -211995,20 +211995,20 @@ _08068AB6: adds r0, #5 str r0, [sp, #0x18] adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r4, sp, #0x18 ldrh r1, [r4] movs r2, #5 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x18] adds r0, r5, #0 movs r1, #0x3f adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldr r0, _08068B0C cmp r7, r0 bne _08068B10 @@ -212044,7 +212044,7 @@ _08068B28: add r2, sp, #0x1c adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData _08068B34: add sp, #0x40 pop {r3, r4, r5} @@ -212054,10 +212054,10 @@ _08068B34: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0806884C + thumb_func_end CalculateMonStats - thumb_func_start sub_08068B44 -sub_08068B44: @ 0x08068B44 + thumb_func_start BoxMonToMon +BoxMonToMon: @ 0x08068B44 push {r4, lr} sub sp, #4 adds r2, r0, #0 @@ -212071,28 +212071,28 @@ sub_08068B44: @ 0x08068B44 adds r0, r4, #0 movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a mov r2, sp - bl sub_0806A774 + bl SetMonData movs r0, #0xff str r0, [sp] adds r0, r4, #0 movs r1, #0x40 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_08068B44 + thumb_func_end BoxMonToMon thumb_func_start GetLevelFromMonExp GetLevelFromMonExp: @ 0x08068B94 @@ -212100,14 +212100,14 @@ GetLevelFromMonExp: @ 0x08068B94 adds r5, r0, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x19 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 movs r2, #1 ldr r6, _08068BF8 @@ -212206,21 +212206,21 @@ _08068C64: .4byte gUnknown_82F00B4 _08068C68: .4byte gUnknown_82F0D54 thumb_func_end GetLevelFromBoxMonExp - thumb_func_start sub_08068C6C -sub_08068C6C: @ 0x08068C6C + thumb_func_start GiveMoveToMon +GiveMoveToMon: @ 0x08068C6C push {lr} lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_08068C80 + bl GiveMoveToBoxMon lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08068C6C + thumb_func_end GiveMoveToMon - thumb_func_start sub_08068C80 -sub_08068C80: @ 0x08068C80 + thumb_func_start GiveMoveToBoxMon +GiveMoveToBoxMon: @ 0x08068C80 push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -212242,7 +212242,7 @@ _08068C8E: adds r0, r7, #0 adds r1, r4, #0 mov r2, sp - bl sub_0806A864 + bl SetBoxMonData adds r1, r5, #0 adds r1, #0x11 ldrh r0, [r6] @@ -212252,7 +212252,7 @@ _08068C8E: ldr r0, _08068CC8 adds r2, r2, r0 adds r0, r7, #0 - bl sub_0806A864 + bl SetBoxMonData ldrh r0, [r6] b _08068CE4 .align 2, 0 @@ -212277,10 +212277,10 @@ _08068CE4: bx r1 .align 2, 0 _08068CEC: .4byte 0x0000FFFF - thumb_func_end sub_08068C80 + thumb_func_end GiveMoveToBoxMon - thumb_func_start sub_08068CF0 -sub_08068CF0: @ 0x08068CF0 + thumb_func_start GiveMoveToBattleMon +GiveMoveToBattleMon: @ 0x08068CF0 push {r4, r5, lr} lsls r1, r1, #0x10 lsrs r4, r1, #0x10 @@ -212318,10 +212318,10 @@ _08068D2A: bx r1 .align 2, 0 _08068D30: .4byte 0x0000FFFF - thumb_func_end sub_08068CF0 + thumb_func_end GiveMoveToBattleMon - thumb_func_start sub_08068D34 -sub_08068D34: @ 0x08068D34 + thumb_func_start SetMonMoveSlot +SetMonMoveSlot: @ 0x08068D34 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -212334,7 +212334,7 @@ sub_08068D34: @ 0x08068D34 adds r1, #0xd adds r0, r5, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r4, #0x11 mov r0, sp ldrh r0, [r0] @@ -212345,14 +212345,14 @@ sub_08068D34: @ 0x08068D34 adds r2, r2, r0 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0806A774 + bl SetMonData add sp, #4 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08068D70: .4byte gUnknown_82ED224 - thumb_func_end sub_08068D34 + thumb_func_end SetMonMoveSlot thumb_func_start SetBattleMonMoveSlot SetBattleMonMoveSlot: @ 0x08068D74 @@ -212443,7 +212443,7 @@ _08068DEE: mov r0, r8 adds r1, r4, #0 str r3, [sp] - bl sub_08068C80 + bl GiveMoveToBoxMon lsls r0, r0, #0x10 mov r1, sb lsrs r5, r1, #0x10 @@ -212452,7 +212452,7 @@ _08068DEE: bne _08068E30 mov r0, r8 adds r1, r4, #0 - bl sub_08069010 + bl DeleteFirstMoveAndGiveMoveToBoxMon ldr r3, [sp] _08068E30: adds r3, #2 @@ -212476,8 +212476,8 @@ _08068E50: .4byte 0xFFFF0000 _08068E54: .4byte 0x000001FF thumb_func_end GiveBoxMonInitialMoveset - thumb_func_start sub_08068E58 -sub_08068E58: @ 0x08068E58 + thumb_func_start MonTryLearningNewMove +MonTryLearningNewMove: @ 0x08068E58 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -212492,14 +212492,14 @@ sub_08068E58: @ 0x08068E58 mov r0, r8 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 mov r0, r8 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -212590,7 +212590,7 @@ _08068F18: strb r0, [r6] ldrh r1, [r2] mov r0, r8 - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp] @@ -212610,10 +212610,10 @@ _08068F54: .4byte gUnknown_82F9D04 _08068F58: .4byte gUnknown_202418C _08068F5C: .4byte gUnknown_2024186 _08068F60: .4byte 0x000001FF - thumb_func_end sub_08068E58 + thumb_func_end MonTryLearningNewMove - thumb_func_start sub_08068F64 -sub_08068F64: @ 0x08068F64 + thumb_func_start DeleteFirstMoveAndGiveMoveToMon +DeleteFirstMoveAndGiveMoveToMon: @ 0x08068F64 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -212633,13 +212633,13 @@ _08068F80: adds r1, #0xe adds r0, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r1, r4, #0 adds r1, #0x12 adds r0, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r7, r4 strb r0, [r1] adds r5, #2 @@ -212649,7 +212649,7 @@ _08068F80: adds r0, r6, #0 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1] ldrb r0, [r1] @@ -212673,12 +212673,12 @@ _08068FD4: adds r1, #0xd adds r0, r6, #0 adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData adds r1, r4, #0 adds r1, #0x11 adds r2, r7, r4 adds r0, r6, #0 - bl sub_0806A774 + bl SetMonData adds r5, #2 adds r4, #1 cmp r4, #3 @@ -212686,7 +212686,7 @@ _08068FD4: adds r0, r6, #0 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -212696,10 +212696,10 @@ _08068FD4: bx r0 .align 2, 0 _0806900C: .4byte gUnknown_82ED220 - thumb_func_end sub_08068F64 + thumb_func_end DeleteFirstMoveAndGiveMoveToMon - thumb_func_start sub_08069010 -sub_08069010: @ 0x08069010 + thumb_func_start DeleteFirstMoveAndGiveMoveToBoxMon +DeleteFirstMoveAndGiveMoveToBoxMon: @ 0x08069010 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -212759,12 +212759,12 @@ _08069080: adds r1, #0xd adds r0, r6, #0 adds r2, r5, #0 - bl sub_0806A864 + bl SetBoxMonData adds r1, r4, #0 adds r1, #0x11 adds r2, r7, r4 adds r0, r6, #0 - bl sub_0806A864 + bl SetBoxMonData adds r5, #2 adds r4, #1 cmp r4, #3 @@ -212772,7 +212772,7 @@ _08069080: adds r0, r6, #0 movs r1, #0x15 mov r2, sb - bl sub_0806A864 + bl SetBoxMonData add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -212782,10 +212782,10 @@ _08069080: bx r0 .align 2, 0 _080690B8: .4byte gUnknown_82ED220 - thumb_func_end sub_08069010 + thumb_func_end DeleteFirstMoveAndGiveMoveToBoxMon - thumb_func_start sub_080690BC -sub_080690BC: @ 0x080690BC + thumb_func_start CalculateBaseDamage +CalculateBaseDamage: @ 0x080690BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -212938,7 +212938,7 @@ _080691E4: _080691E8: ldr r0, _080692A4 ldr r1, [sp, #0x10] - bl sub_08069A18 + bl ShouldGetStatBadgeBoost lsls r0, r0, #0x18 cmp r0, #0 beq _08069204 @@ -212951,7 +212951,7 @@ _080691E8: _08069204: ldr r0, _080692A8 ldr r1, [sp, #0x14] - bl sub_08069A18 + bl ShouldGetStatBadgeBoost lsls r0, r0, #0x18 cmp r0, #0 beq _08069224 @@ -212967,7 +212967,7 @@ _08069224: ldr r4, _080692AC adds r0, r4, #0 ldr r1, [sp, #0x10] - bl sub_08069A18 + bl ShouldGetStatBadgeBoost lsls r0, r0, #0x18 cmp r0, #0 beq _08069248 @@ -212983,7 +212983,7 @@ _08069224: _08069248: adds r0, r4, #0 ldr r1, [sp, #0x14] - bl sub_08069A18 + bl ShouldGetStatBadgeBoost lsls r0, r0, #0x18 cmp r0, #0 beq _08069268 @@ -213194,7 +213194,7 @@ _080693D8: movs r1, #0 movs r2, #0x3a movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08069406 @@ -213218,7 +213218,7 @@ _08069406: movs r1, #0 movs r2, #0x39 movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _08069438 @@ -213272,7 +213272,7 @@ _08069476: movs r1, #0 movs r2, #0 movs r3, #0xfd - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _0806949A @@ -213290,7 +213290,7 @@ _0806949A: movs r1, #0 movs r2, #0 movs r3, #0xfe - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 beq _080694BE @@ -213534,7 +213534,7 @@ _08069688: cmp r0, #0 beq _080696C4 movs r0, #2 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -213568,7 +213568,7 @@ _080696CA: cmp r0, #8 bne _080696FC movs r0, #2 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -213694,7 +213694,7 @@ _080697B6: cmp r0, #0 beq _08069804 movs r0, #2 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -213728,7 +213728,7 @@ _0806980A: cmp r0, #8 bne _0806983C movs r0, #2 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -213743,7 +213743,7 @@ _0806983C: movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -213753,7 +213753,7 @@ _0806983C: movs r1, #0 movs r2, #0x4d movs r3, #0 - bl sub_08042468 + bl AbilityBattleEffects lsls r0, r0, #0x18 cmp r0, #0 bne _080698EC @@ -213855,10 +213855,10 @@ _08069914: bx r1 .align 2, 0 _08069928: .4byte gUnknown_202414C - thumb_func_end sub_080690BC + thumb_func_end CalculateBaseDamage - thumb_func_start sub_0806992C -sub_0806992C: @ 0x0806992C + thumb_func_start CountAliveMonsInBattle +CountAliveMonsInBattle: @ 0x0806992C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -213907,11 +213907,11 @@ _08069980: _08069982: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r0, _080699BC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -213942,11 +213942,11 @@ _080699C8: _080699CA: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r0, _08069A0C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -213976,10 +213976,10 @@ _08069A02: _08069A0C: .4byte gUnknown_2023EB0 _08069A10: .4byte gUnknown_2023EB4 _08069A14: .4byte gUnknown_82FACB4 - thumb_func_end sub_0806992C + thumb_func_end CountAliveMonsInBattle - thumb_func_start sub_08069A18 -sub_08069A18: @ 0x08069A18 + thumb_func_start ShouldGetStatBadgeBoost +ShouldGetStatBadgeBoost: @ 0x08069A18 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -213992,7 +213992,7 @@ sub_08069A18: @ 0x08069A18 cmp r0, #0 bne _08069A5C adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08069A5C @@ -214026,10 +214026,10 @@ _08069A6E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08069A18 + thumb_func_end ShouldGetStatBadgeBoost - thumb_func_start sub_08069A74 -sub_08069A74: @ 0x08069A74 + thumb_func_start GetDefaultMoveTarget +GetDefaultMoveTarget: @ 0x08069A74 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -214051,7 +214051,7 @@ sub_08069A74: @ 0x08069A74 _08069A98: .4byte gUnknown_2022C90 _08069A9C: movs r0, #0 - bl sub_0806992C + bl CountAliveMonsInBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -214093,21 +214093,21 @@ _08069AE6: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08069A74 + thumb_func_end GetDefaultMoveTarget - thumb_func_start sub_08069AF4 -sub_08069AF4: @ 0x08069AF4 + thumb_func_start GetMonGender +GetMonGender: @ 0x08069AF4 push {lr} - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08069AF4 + thumb_func_end GetMonGender - thumb_func_start sub_08069B04 -sub_08069B04: @ 0x08069B04 + thumb_func_start GetBoxMonGender +GetBoxMonGender: @ 0x08069B04 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0xb @@ -214155,10 +214155,10 @@ _08069B5A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08069B04 + thumb_func_end GetBoxMonGender - thumb_func_start sub_08069B60 -sub_08069B60: @ 0x08069B60 + thumb_func_start GetGenderFromSpeciesAndPersonality +GetGenderFromSpeciesAndPersonality: @ 0x08069B60 push {lr} adds r3, r1, #0 lsls r0, r0, #0x10 @@ -214197,10 +214197,10 @@ _08069BA2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08069B60 + thumb_func_end GetGenderFromSpeciesAndPersonality - thumb_func_start sub_08069BA8 -sub_08069BA8: @ 0x08069BA8 + thumb_func_start SetMultiuseSpriteTemplateToPokemon +SetMultiuseSpriteTemplateToPokemon: @ 0x08069BA8 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -214302,10 +214302,10 @@ _08069C62: bx r0 .align 2, 0 _08069C68: .4byte gUnknown_82DD33C - thumb_func_end sub_08069BA8 + thumb_func_end SetMultiuseSpriteTemplateToPokemon - thumb_func_start sub_08069C6C -sub_08069C6C: @ 0x08069C6C + thumb_func_start SetMultiuseSpriteTemplateToTrainerBack +SetMultiuseSpriteTemplateToTrainerBack: @ 0x08069C6C push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -214380,10 +214380,10 @@ _08069CF0: .align 2, 0 _08069CF8: .4byte gUnknown_82FA724 _08069CFC: .4byte gUnknown_82D8BFC - thumb_func_end sub_08069C6C + thumb_func_end SetMultiuseSpriteTemplateToTrainerBack - thumb_func_start sub_08069D00 -sub_08069D00: @ 0x08069D00 + thumb_func_start SetMultiuseSpriteTemplateToTrainerFront +SetMultiuseSpriteTemplateToTrainerFront: @ 0x08069D00 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -214435,7 +214435,7 @@ _08069D4A: _08069D5C: .4byte gUnknown_2024640 _08069D60: .4byte gUnknown_82FA724 _08069D64: .4byte gUnknown_82D8BFC - thumb_func_end sub_08069D00 + thumb_func_end SetMultiuseSpriteTemplateToTrainerFront thumb_func_start EncryptBoxMon EncryptBoxMon: @ 0x08069D68 @@ -214483,8 +214483,8 @@ _08069D96: bx r0 thumb_func_end DecryptBoxMon - thumb_func_start sub_08069DB0 -sub_08069DB0: @ 0x08069DB0 + thumb_func_start GetSubstruct +GetSubstruct: @ 0x08069DB0 push {r4, r5, r6, lr} adds r5, r0, #0 adds r0, r1, #0 @@ -214870,10 +214870,10 @@ _0806A050: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08069DB0 + thumb_func_end GetSubstruct - thumb_func_start sub_0806A058 -sub_0806A058: @ 0x0806A058 + thumb_func_start GetMonData +GetMonData: @ 0x0806A058 push {r4, lr} adds r4, r0, #0 adds r3, r1, #0 @@ -214946,7 +214946,7 @@ _0806A114: _0806A11C: adds r0, r4, #0 movs r1, #1 - bl sub_08068550 + bl GetDeoxysStat lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -214955,7 +214955,7 @@ _0806A11C: _0806A12E: adds r0, r4, #0 movs r1, #2 - bl sub_08068550 + bl GetDeoxysStat lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -214964,7 +214964,7 @@ _0806A12E: _0806A140: adds r0, r4, #0 movs r1, #3 - bl sub_08068550 + bl GetDeoxysStat lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -214973,7 +214973,7 @@ _0806A140: _0806A152: adds r0, r4, #0 movs r1, #4 - bl sub_08068550 + bl GetDeoxysStat lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -214982,7 +214982,7 @@ _0806A152: _0806A164: adds r0, r4, #0 movs r1, #5 - bl sub_08068550 + bl GetDeoxysStat lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -215026,7 +215026,7 @@ _0806A1AE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0806A058 + thumb_func_end GetMonData thumb_func_start sub_0806A1B4 sub_0806A1B4: @ 0x0806A1B4 @@ -215048,23 +215048,23 @@ sub_0806A1B4: @ 0x0806A1B4 ble _0806A232 ldr r1, [r0] movs r2, #0 - bl sub_08069DB0 + bl GetSubstruct mov r8, r0 mov r0, sb ldr r1, [r0] movs r2, #1 - bl sub_08069DB0 + bl GetSubstruct mov sl, r0 mov r2, sb ldr r1, [r2] mov r0, sb movs r2, #2 - bl sub_08069DB0 + bl GetSubstruct adds r6, r0, #0 mov r0, sb ldr r1, [r0] movs r2, #3 - bl sub_08069DB0 + bl GetSubstruct adds r5, r0, #0 mov r0, sb bl DecryptBoxMon @@ -215769,8 +215769,8 @@ _0806A760: .align 2, 0 thumb_func_end sub_0806A1B4 - thumb_func_start sub_0806A774 -sub_0806A774: @ 0x0806A774 + thumb_func_start SetMonData +SetMonData: @ 0x0806A774 push {lr} adds r3, r0, #0 adds r0, r1, #0 @@ -215886,15 +215886,15 @@ _0806A84E: b _0806A85E _0806A858: adds r0, r3, #0 - bl sub_0806A864 + bl SetBoxMonData _0806A85E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806A774 + thumb_func_end SetMonData - thumb_func_start sub_0806A864 -sub_0806A864: @ 0x0806A864 + thumb_func_start SetBoxMonData +SetBoxMonData: @ 0x0806A864 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -215913,22 +215913,22 @@ sub_0806A864: @ 0x0806A864 ldr r1, [r7] adds r0, r7, #0 movs r2, #0 - bl sub_08069DB0 + bl GetSubstruct mov r8, r0 ldr r1, [r7] adds r0, r7, #0 movs r2, #1 - bl sub_08069DB0 + bl GetSubstruct mov sb, r0 ldr r1, [r7] adds r0, r7, #0 movs r2, #2 - bl sub_08069DB0 + bl GetSubstruct adds r6, r0, #0 ldr r1, [r7] adds r0, r7, #0 movs r2, #3 - bl sub_08069DB0 + bl GetSubstruct adds r5, r0, #0 adds r0, r7, #0 bl DecryptBoxMon @@ -216701,7 +216701,7 @@ _0806AEB4: _0806AEC4: .4byte 0xFFFFFC1F _0806AEC8: .4byte 0xFFF07FFF _0806AECC: .4byte 0xFFFFFE0F - thumb_func_end sub_0806A864 + thumb_func_end SetBoxMonData thumb_func_start sub_0806AED0 sub_0806AED0: @ 0x0806AED0 @@ -216712,24 +216712,24 @@ sub_0806AED0: @ 0x0806AED0 .align 2, 0 thumb_func_end sub_0806AED0 - thumb_func_start sub_0806AEDC -sub_0806AEDC: @ 0x0806AEDC + thumb_func_start GiveMonToPlayer +GiveMonToPlayer: @ 0x0806AEDC push {r4, r5, r6, lr} adds r6, r0, #0 ldr r4, _0806AF08 ldr r2, [r4] movs r1, #7 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] adds r2, #8 adds r0, r6, #0 movs r1, #0x31 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] adds r2, #0xa adds r0, r6, #0 movs r1, #1 - bl sub_0806A774 + bl SetMonData movs r5, #0 b _0806AF0E .align 2, 0 @@ -216747,7 +216747,7 @@ _0806AF0E: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806AF0C adds r0, r4, #0 @@ -216764,17 +216764,17 @@ _0806AF40: .4byte gUnknown_2024190 _0806AF44: .4byte gUnknown_202418D _0806AF48: adds r0, r6, #0 - bl sub_0806AF58 + bl SendMonToPC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0806AF52: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0806AEDC + thumb_func_end GiveMonToPlayer - thumb_func_start sub_0806AF58 -sub_0806AF58: @ 0x0806AF58 + thumb_func_start SendMonToPC +SendMonToPC: @ 0x0806AF58 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -216794,7 +216794,7 @@ _0806AF7A: lsls r1, r6, #0x18 lsrs r1, r1, #0x18 lsrs r0, r7, #0x18 - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 movs r1, #0xb movs r2, #0 @@ -216852,7 +216852,7 @@ _0806AFF8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806AF58 + thumb_func_end SendMonToPC thumb_func_start sub_0806B004 sub_0806B004: @ 0x0806B004 @@ -216880,7 +216880,7 @@ _0806B01C: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806B014 _0806B03A: @@ -216918,7 +216918,7 @@ _0806B060: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806B058 _0806B07E: @@ -216930,8 +216930,8 @@ _0806B07E: _0806B088: .4byte gUnknown_20243E8 thumb_func_end sub_0806B048 - thumb_func_start sub_0806B08C -sub_0806B08C: @ 0x0806B08C + thumb_func_start GetMonsStateToDoubles +GetMonsStateToDoubles: @ 0x0806B08C push {r4, r5, r6, lr} movs r6, #0 bl sub_0806B004 @@ -216952,7 +216952,7 @@ _0806B0A4: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -216960,13 +216960,13 @@ _0806B0A4: adds r0, r4, #0 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806B0DE adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806B0DE adds r6, #1 @@ -216988,10 +216988,10 @@ _0806B0F0: .align 2, 0 _0806B0F8: .4byte gUnknown_202418D _0806B0FC: .4byte gUnknown_2024190 - thumb_func_end sub_0806B08C + thumb_func_end GetMonsStateToDoubles - thumb_func_start sub_0806B100 -sub_0806B100: @ 0x0806B100 + thumb_func_start GetMonsStateToDoubles_2 +GetMonsStateToDoubles_2: @ 0x0806B100 push {r4, r5, r6, lr} movs r6, #0 movs r5, #0 @@ -217004,7 +217004,7 @@ _0806B106: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0xce lsls r0, r0, #1 @@ -217015,7 +217015,7 @@ _0806B106: adds r0, r4, #0 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806B138 adds r6, #1 @@ -217039,10 +217039,10 @@ _0806B154: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806B100 + thumb_func_end GetMonsStateToDoubles_2 - thumb_func_start sub_0806B15C -sub_0806B15C: @ 0x0806B15C + thumb_func_start GetAbilityBySpecies +GetAbilityBySpecies: @ 0x0806B15C push {lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -217076,37 +217076,37 @@ _0806B18E: .align 2, 0 _0806B198: .4byte gUnknown_2023EAE _0806B19C: .4byte gUnknown_82F0D54 - thumb_func_end sub_0806B15C + thumb_func_end GetAbilityBySpecies - thumb_func_start sub_0806B1A0 -sub_0806B1A0: @ 0x0806B1A0 + thumb_func_start GetMonAbility +GetMonAbility: @ 0x0806B1A0 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x2e movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0806B15C + bl GetAbilityBySpecies lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806B1A0 + thumb_func_end GetMonAbility - thumb_func_start sub_0806B1D4 -sub_0806B1D4: @ 0x0806B1D4 + thumb_func_start CreateSecretBaseEnemyParty +CreateSecretBaseEnemyParty: @ 0x0806B1D4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -217163,7 +217163,7 @@ _0806B1F8: str r0, [sp, #0xc] adds r0, r5, #0 movs r3, #0xf - bl sub_08067730 + bl CreateMon ldr r1, _0806B2EC ldr r0, [r1] adds r1, r7, #0 @@ -217172,7 +217172,7 @@ _0806B1F8: adds r2, r2, r1 adds r0, r5, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r5, #0 mov sl, r4 mov r7, sb @@ -217186,7 +217186,7 @@ _0806B268: ldr r2, [r0] adds r2, r2, r7 adds r0, r6, r4 - bl sub_0806A774 + bl SetMonData adds r5, #1 cmp r5, #5 ble _0806B268 @@ -217209,7 +217209,7 @@ _0806B296: ldr r2, [r0] adds r2, r2, r6 adds r0, r7, #0 - bl sub_0806A774 + bl SetMonData adds r1, r5, #0 adds r1, #0x11 ldr r3, _0806B2EC @@ -217224,7 +217224,7 @@ _0806B296: ldr r0, _0806B2F4 adds r2, r2, r0 adds r0, r7, #0 - bl sub_0806A774 + bl SetMonData adds r6, #2 adds r4, #2 adds r5, #1 @@ -217247,7 +217247,7 @@ _0806B2D2: _0806B2EC: .4byte gUnknown_202414C _0806B2F0: .4byte gUnknown_20243E8 _0806B2F4: .4byte gUnknown_82ED224 - thumb_func_end sub_0806B1D4 + thumb_func_end CreateSecretBaseEnemyParty thumb_func_start sub_0806B2F8 sub_0806B2F8: @ 0x0806B2F8 @@ -217313,8 +217313,8 @@ _0806B370: .4byte gUnknown_202414C _0806B374: .4byte gUnknown_82EFF52 thumb_func_end sub_0806B338 - thumb_func_start sub_0806B378 -sub_0806B378: @ 0x0806B378 + thumb_func_start IsPlayerPartyAndPokemonStorageFull +IsPlayerPartyAndPokemonStorageFull: @ 0x0806B378 push {r4, lr} movs r4, #0 _0806B37C: @@ -217324,7 +217324,7 @@ _0806B37C: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806B398 movs r0, #0 @@ -217335,17 +217335,17 @@ _0806B398: adds r4, #1 cmp r4, #5 ble _0806B37C - bl sub_0806B3AC + bl IsPokemonStorageFull lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0806B3A6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0806B378 + thumb_func_end IsPlayerPartyAndPokemonStorageFull - thumb_func_start sub_0806B3AC -sub_0806B3AC: @ 0x0806B3AC + thumb_func_start IsPokemonStorageFull +IsPokemonStorageFull: @ 0x0806B3AC push {r4, r5, r6, lr} movs r6, #0 _0806B3B0: @@ -217356,7 +217356,7 @@ _0806B3B4: lsrs r1, r1, #0x18 lsrs r0, r5, #0x18 movs r2, #0xb - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 bne _0806B3C8 movs r0, #0 @@ -217373,7 +217373,7 @@ _0806B3D6: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0806B3AC + thumb_func_end IsPokemonStorageFull thumb_func_start sub_0806B3DC sub_0806B3DC: @ 0x0806B3DC @@ -217419,8 +217419,8 @@ _0806B418: bx r0 thumb_func_end sub_0806B3DC - thumb_func_start sub_0806B424 -sub_0806B424: @ 0x0806B424 + thumb_func_start CalculatePPWithBonus +CalculatePPWithBonus: @ 0x0806B424 push {r4, lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -217454,10 +217454,10 @@ sub_0806B424: @ 0x0806B424 .align 2, 0 _0806B464: .4byte gUnknown_82ED220 _0806B468: .4byte gUnknown_82FA6AA - thumb_func_end sub_0806B424 + thumb_func_end CalculatePPWithBonus - thumb_func_start sub_0806B46C -sub_0806B46C: @ 0x0806B46C + thumb_func_start RemoveMonPPBonus +RemoveMonPPBonus: @ 0x0806B46C push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -217465,7 +217465,7 @@ sub_0806B46C: @ 0x0806B46C lsrs r4, r4, #0x18 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sp @@ -217479,14 +217479,14 @@ sub_0806B46C: @ 0x0806B46C adds r0, r5, #0 movs r1, #0x15 mov r2, sp - bl sub_0806A774 + bl SetMonData add sp, #4 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0806B4A4: .4byte gUnknown_82FA6AE - thumb_func_end sub_0806B46C + thumb_func_end RemoveMonPPBonus thumb_func_start RemoveBattleMonPPBonus RemoveBattleMonPPBonus: @ 0x0806B4A8 @@ -217504,8 +217504,8 @@ RemoveBattleMonPPBonus: @ 0x0806B4A8 _0806B4BC: .4byte gUnknown_82FA6AE thumb_func_end RemoveBattleMonPPBonus - thumb_func_start sub_0806B4C0 -sub_0806B4C0: @ 0x0806B4C0 + thumb_func_start CopyPlayerPartyMonToBattleData +CopyPlayerPartyMonToBattleData: @ 0x0806B4C0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -217526,7 +217526,7 @@ sub_0806B4C0: @ 0x0806B4C0 adds r0, r5, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0806B7B0 mov r8, r1 movs r1, #0x58 @@ -217539,7 +217539,7 @@ sub_0806B4C0: @ 0x0806B4C0 adds r0, r5, #0 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r6, #0x2e] movs r6, #0 mov r0, r8 @@ -217550,7 +217550,7 @@ _0806B512: adds r1, #0xd adds r0, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xc add r1, r8 mov sl, r1 @@ -217560,7 +217560,7 @@ _0806B512: adds r1, #0x11 adds r0, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r7, #1 adds r4, #2 @@ -217575,7 +217575,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r2, #0xc rsbs r2, r2, #0 add r2, sl @@ -217591,14 +217591,14 @@ _0806B512: adds r0, r4, #0 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r7, #0 adds r1, #0x2b strb r0, [r1] adds r0, r4, #0 movs r1, #0x19 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sl adds r1, #0x38 adds r1, r5, r1 @@ -217606,7 +217606,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x27 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r6, #0x1f ands r0, r6 ldrb r2, [r7, #0x14] @@ -217618,7 +217618,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x28 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0x1f mov r8, r1 mov r2, r8 @@ -217632,7 +217632,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x29 movs r2, #0 - bl sub_0806A058 + bl GetMonData ands r0, r6 lsls r0, r0, #2 ldrb r2, [r7, #0x15] @@ -217644,7 +217644,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x2a movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -217656,7 +217656,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x2b movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r3, r8 ands r0, r3 lsls r0, r0, #4 @@ -217668,7 +217668,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x2c movs r2, #0 - bl sub_0806A058 + bl GetMonData ands r0, r6 lsls r0, r0, #1 ldrb r2, [r7, #0x17] @@ -217680,7 +217680,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sl adds r1, #0x3c adds r1, r5, r1 @@ -217688,7 +217688,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x37 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sl adds r1, #0x40 adds r1, r5, r1 @@ -217696,49 +217696,49 @@ _0806B512: adds r0, r4, #0 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r7, #0 adds r1, #0x2a strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #0x28] adds r0, r4, #0 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #0x2c] adds r0, r4, #0 movs r1, #0x3b movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #2] adds r0, r4, #0 movs r1, #0x3c movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #4] adds r0, r4, #0 movs r1, #0x3d movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #6] adds r0, r4, #0 movs r1, #0x3e movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #8] adds r0, r4, #0 movs r1, #0x3f movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #0xa] adds r0, r4, #0 movs r1, #0x2d movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #1 ands r0, r1 lsls r0, r0, #6 @@ -217751,7 +217751,7 @@ _0806B512: adds r0, r4, #0 movs r1, #0x2e movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #7 ldrb r2, [r7, #0x17] movs r1, #0x7f @@ -217761,7 +217761,7 @@ _0806B512: adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sl adds r1, #0x48 adds r1, r5, r1 @@ -217788,27 +217788,27 @@ _0806B512: ldrh r0, [r7] ldrb r1, [r7, #0x17] lsrs r1, r1, #7 - bl sub_0806B15C + bl GetAbilityBySpecies adds r1, r7, #0 adds r1, #0x20 strb r0, [r1] adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sl adds r0, #0x24 adds r0, r5, r0 mov r1, sp - bl sub_08008828 + bl StringCopy10 mov r2, sl adds r2, #0x30 adds r2, r5, r2 adds r0, r4, #0 movs r1, #7 - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x14] - bl sub_080A62F8 + bl GetBattlerSide ldr r1, _0806B7C4 lsls r0, r0, #0x18 lsrs r0, r0, #0x17 @@ -217857,7 +217857,7 @@ _0806B7B8: .4byte 0xFFF07FFF _0806B7BC: .4byte 0xFFFFFE0F _0806B7C0: .4byte gUnknown_82F0D54 _0806B7C4: .4byte gUnknown_2024140 - thumb_func_end sub_0806B4C0 + thumb_func_end CopyPlayerPartyMonToBattleData thumb_func_start ExecuteTableBasedItemEffect ExecuteTableBasedItemEffect: @ 0x0806B7C8 @@ -217871,7 +217871,7 @@ ExecuteTableBasedItemEffect: @ 0x0806B7C8 lsrs r3, r3, #0x18 movs r4, #0 str r4, [sp] - bl sub_0806B7EC + bl PokemonUseItemEffects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #4 @@ -217880,8 +217880,8 @@ ExecuteTableBasedItemEffect: @ 0x0806B7C8 bx r1 thumb_func_end ExecuteTableBasedItemEffect - thumb_func_start sub_0806B7EC -sub_0806B7EC: @ 0x0806B7EC + thumb_func_start PokemonUseItemEffects +PokemonUseItemEffects: @ 0x0806B7EC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -217914,7 +217914,7 @@ sub_0806B7EC: @ 0x0806B7EC str r5, [sp, #0x3c] mov r0, r8 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xaf @@ -217974,7 +217974,7 @@ _0806B888: ldr r0, _0806B8F4 strb r2, [r0] ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 rsbs r1, r0, #0 @@ -218090,14 +218090,14 @@ _0806B990: .align 2, 0 _0806B99C: .4byte gUnknown_3005AEC _0806B9A0: .4byte 0x00003214 - thumb_func_end sub_0806B7EC + thumb_func_end PokemonUseItemEffects thumb_func_start sub_0806B9A4 sub_0806B9A4: @ 0x0806B9A4 mov r0, r8 movs r2, #0 ldr r3, [sp, #0x10] - bl sub_0813DB44 + bl BeginEvolutionScene movs r0, #0 bl sub_0806C820 _0806B9B4: @@ -218396,7 +218396,7 @@ _0806BBE4: ldr r5, _0806BDA0 ldr r4, _0806BDA4 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #1 @@ -218407,7 +218407,7 @@ _0806BBE4: cmp r0, #0 bne _0806BC2C ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #1 @@ -218427,19 +218427,19 @@ _0806BC2C: mov r0, r8 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0x64 beq _0806BC8E ldr r5, _0806BDA8 mov r0, r8 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, #1 lsls r4, r4, #2 ldr r2, _0806BDAC @@ -218458,9 +218458,9 @@ _0806BC2C: mov r0, r8 movs r1, #0x19 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r0, r8 - bl sub_0806884C + bl CalculateMonStats movs r0, #0 str r0, [sp, #0x20] _0806BC8E: @@ -218628,7 +218628,7 @@ _0806BDC4: mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0806BEC8 ldr r3, [sp, #0x14] adds r1, r3, r1 @@ -218642,20 +218642,20 @@ _0806BDC4: mov r0, r8 adds r1, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x2c] @@ -218668,7 +218668,7 @@ _0806BDC4: mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0806BECC ldr r2, [sp, #0x14] adds r1, r2, r1 @@ -218678,18 +218678,18 @@ _0806BDC4: mov r0, r8 movs r1, #0x15 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r0, r8 adds r1, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, [sp] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, [sp, #0x2c] @@ -218700,14 +218700,14 @@ _0806BDC4: mov r0, r8 adds r1, r4, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [sp] adds r0, r0, r1 str r0, [sp] mov r0, r8 adds r1, r4, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData movs r5, #0 str r5, [sp, #0x20] _0806BE9C: @@ -218750,7 +218750,7 @@ _0806BED4: @ jump table .4byte _0806C458 @ case 7 _0806BEF4: mov r0, r8 - bl sub_0806D720 + bl GetMonEVCount lsls r0, r0, #0x10 lsrs r6, r0, #0x10 ldr r5, [sp, #0x24] @@ -218763,7 +218763,7 @@ _0806BEF4: ldrb r1, [r0] mov r0, r8 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 str r1, [sp, #4] lsls r0, r5, #0x18 @@ -218827,9 +218827,9 @@ _0806BF78: ldrb r1, [r0] add r2, sp, #4 mov r0, r8 - bl sub_0806A774 + bl SetMonData mov r0, r8 - bl sub_0806884C + bl CalculateMonStats ldr r0, [sp, #0x28] adds r0, #1 lsls r0, r0, #0x18 @@ -218847,7 +218847,7 @@ _0806BFA0: mov r0, r8 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806BFC0 ldr r0, [sp, #0x28] @@ -218879,12 +218879,12 @@ _0806BFC0: lsls r0, r3, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, [sp, #0x38] - bl sub_0806B4C0 + bl CopyPlayerPartyMonToBattleData ldr r0, _0806C01C ldrb r0, [r0] b _0806C038 @@ -218909,7 +218909,7 @@ _0806C020: strb r0, [r3] ldrb r0, [r2] _0806C038: - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0806C076 @@ -218929,7 +218929,7 @@ _0806C060: mov r0, r8 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806C076 ldr r0, [sp, #0x28] @@ -218960,12 +218960,12 @@ _0806C098: mov r0, r8 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData subs r4, r4, r0 str r4, [sp] b _0806C0D6 @@ -218973,7 +218973,7 @@ _0806C0B8: mov r0, r8 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData lsrs r0, r0, #1 str r0, [sp] cmp r0, #0 @@ -218990,12 +218990,12 @@ _0806C0D6: mov r0, r8 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 beq _0806C1B4 ldr r0, [sp, #0x18] @@ -219004,27 +219004,27 @@ _0806C0D6: mov r0, r8 movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [sp] adds r0, r0, r1 str r0, [sp] mov r0, r8 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [sp] cmp r1, r0 bls _0806C122 mov r0, r8 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] _0806C122: mov r0, r8 movs r1, #0x39 mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r0, _0806C194 ldr r1, _0806C198 adds r0, r0, r1 @@ -219049,7 +219049,7 @@ _0806C122: bne _0806C1B0 ldr r4, _0806C1A0 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0806C1B0 @@ -219069,7 +219069,7 @@ _0806C172: movs r2, #0 bl BtlController_EmitGetMonData ldrb r0, [r4] - bl sub_0803F440 + bl MarkBattlerForControllerExec strb r5, [r4] b _0806C1B0 .align 2, 0 @@ -219114,21 +219114,21 @@ _0806C1D8: mov r0, r8 mov r1, sb movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] adds r7, r5, #0 adds r7, #0xd mov r0, r8 adds r1, r7, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -219136,7 +219136,7 @@ _0806C1D8: lsrs r6, r0, #0x18 adds r0, r4, #0 adds r2, r6, #0 - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [sp] @@ -219151,20 +219151,20 @@ _0806C1D8: mov r0, r8 adds r1, r7, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 adds r2, r6, #0 - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [sp] @@ -219173,20 +219173,20 @@ _0806C1D8: mov r0, r8 adds r1, r7, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 adds r2, r6, #0 - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp] @@ -219194,7 +219194,7 @@ _0806C290: mov r0, r8 mov r1, sb mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r0, _0806C308 ldr r1, _0806C30C adds r0, r0, r1 @@ -219266,27 +219266,27 @@ _0806C31C: mov r0, r8 adds r1, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldr r5, [sp, #0x14] adds r5, #0xd mov r0, r8 adds r1, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [sp] @@ -219307,20 +219307,20 @@ _0806C364: mov r0, r8 adds r1, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [sp] @@ -219329,20 +219329,20 @@ _0806C364: mov r0, r8 adds r1, r5, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp] @@ -219350,7 +219350,7 @@ _0806C3D8: mov r0, r8 adds r1, r6, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r0, _0806C444 ldr r1, _0806C448 adds r0, r0, r1 @@ -219410,7 +219410,7 @@ _0806C458: mov r0, r8 movs r1, #2 ldr r2, [sp, #0xc] - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -219471,7 +219471,7 @@ _0806C4BC: @ jump table .4byte _0806C72C @ case 7 _0806C4DC: mov r0, r8 - bl sub_0806D720 + bl GetMonEVCount lsls r0, r0, #0x10 lsrs r6, r0, #0x10 ldr r5, [sp, #0x24] @@ -219485,7 +219485,7 @@ _0806C4DC: ldrb r1, [r0] mov r0, r8 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 str r1, [sp, #4] lsls r0, r5, #0x18 @@ -219545,9 +219545,9 @@ _0806C55E: ldrb r1, [r0] add r2, sp, #4 mov r0, r8 - bl sub_0806A774 + bl SetMonData mov r0, r8 - bl sub_0806884C + bl CalculateMonStats movs r3, #0 str r3, [sp, #0x20] b _0806C7F4 @@ -219557,7 +219557,7 @@ _0806C57C: mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0806C64C ldr r5, [sp, #0x14] adds r1, r5, r1 @@ -219571,20 +219571,20 @@ _0806C57C: mov r0, r8 adds r1, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, [sp] @@ -219599,7 +219599,7 @@ _0806C5D4: mov r0, r8 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldr r1, _0806C650 ldr r2, [sp, #0x14] @@ -219618,18 +219618,18 @@ _0806C5D4: mov r0, r8 movs r1, #0x15 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r0, r8 adds r1, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, [sp] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r2, [sp, #0x14] - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, r0, r5 @@ -219639,14 +219639,14 @@ _0806C5D4: mov r0, r8 adds r1, r4, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [sp] adds r0, r0, r1 str r0, [sp] mov r0, r8 adds r1, r4, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData movs r5, #0 str r5, [sp, #0x20] b _0806C7FE @@ -219658,7 +219658,7 @@ _0806C658: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0x63 bls _0806C668 b _0806C7F4 @@ -219690,7 +219690,7 @@ _0806C68A: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 str r5, [sp, #8] ldr r0, [sp, #0x30] @@ -219713,7 +219713,7 @@ _0806C6C4: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0x63 bhi _0806C6D4 b _0806C7F4 @@ -219721,7 +219721,7 @@ _0806C6D4: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _0806C6E4 b _0806C7F4 @@ -219749,7 +219749,7 @@ _0806C6F2: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 str r4, [sp, #8] ldr r0, [sp, #0x30] @@ -219765,7 +219765,7 @@ _0806C72C: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _0806C7F4 ldr r0, [sp, #0x20] @@ -219790,7 +219790,7 @@ _0806C746: mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 str r4, [sp, #8] ldr r0, [sp, #0x30] @@ -219823,7 +219823,7 @@ _0806C79C: mov r0, r8 movs r1, #0x26 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0xb bne _0806C7B4 ldr r0, [sp, #8] @@ -219833,7 +219833,7 @@ _0806C7B4: mov r0, r8 movs r1, #0x23 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 bl GetCurrentRegionMapSectionId lsls r0, r0, #0x18 @@ -219859,7 +219859,7 @@ _0806C7E6: add r2, sp, #8 mov r0, r8 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData movs r5, #0 str r5, [sp, #0x20] _0806C7F4: @@ -219911,7 +219911,7 @@ sub_0806C830: @ 0x0806C830 lsrs r6, r3, #0x18 movs r1, #0x37 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 str r1, [sp] ands r0, r4 @@ -219923,7 +219923,7 @@ sub_0806C830: @ 0x0806C830 adds r0, r5, #0 movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r0, _0806C888 ldr r1, _0806C88C adds r0, r0, r1 @@ -219959,8 +219959,8 @@ _0806C896: .align 2, 0 thumb_func_end sub_0806C830 - thumb_func_start sub_0806C8A0 -sub_0806C8A0: @ 0x0806C8A0 + thumb_func_start GetItemEffectParamOffset +GetItemEffectParamOffset: @ 0x0806C8A0 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -220140,7 +220140,7 @@ _0806C9E0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806C8A0 + thumb_func_end GetItemEffectParamOffset thumb_func_start sub_0806C9E8 sub_0806C9E8: @ 0x0806C9E8 @@ -220163,7 +220163,7 @@ sub_0806C9E8: @ 0x0806C9E8 ldr r1, _0806CA34 bl StringCopy ldr r0, _0806CA38 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString pop {r0} bx r0 .align 2, 0 @@ -220263,7 +220263,7 @@ _0806CAE4: mov r1, r8 strb r0, [r1] ldr r0, _0806CB24 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString _0806CAF2: adds r6, #2 adds r5, #1 @@ -220279,7 +220279,7 @@ _0806CAF2: ldrb r0, [r0] strb r0, [r1] ldr r0, _0806CB2C - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString _0806CB12: ldr r0, _0806CB30 pop {r3} @@ -220295,22 +220295,22 @@ _0806CB2C: .4byte gUnknown_85A9D15 _0806CB30: .4byte gUnknown_2022AE0 thumb_func_end sub_0806CA3C - thumb_func_start sub_0806CB34 -sub_0806CB34: @ 0x0806CB34 + thumb_func_start GetNature +GetNature: @ 0x0806CB34 push {lr} movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0x19 bl __umodsi3 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_0806CB34 + thumb_func_end GetNature - thumb_func_start sub_0806CB4C -sub_0806CB4C: @ 0x0806CB4C + thumb_func_start GetNatureFromPersonality +GetNatureFromPersonality: @ 0x0806CB4C push {lr} movs r1, #0x19 bl __umodsi3 @@ -220318,10 +220318,10 @@ sub_0806CB4C: @ 0x0806CB4C lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_0806CB4C + thumb_func_end GetNatureFromPersonality - thumb_func_start sub_0806CB5C -sub_0806CB5C: @ 0x0806CB5C + thumb_func_start GetEvolutionTargetSpecies +GetEvolutionTargetSpecies: @ 0x0806CB5C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -220339,24 +220339,24 @@ sub_0806CB5C: @ 0x0806CB5C mov r0, r8 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 mov r0, r8 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] mov r0, r8 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x17 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0xc] @@ -220412,14 +220412,14 @@ _0806CC08: mov r0, r8 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 mov r0, r8 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #8] @@ -220541,12 +220541,12 @@ _0806CD0C: mov r0, r8 movs r1, #0x3b movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x3c movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 bls _0806CDF6 b _0806CD88 @@ -220561,12 +220561,12 @@ _0806CD36: mov r0, r8 movs r1, #0x3b movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x3c movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 bne _0806CDF6 b _0806CD88 @@ -220581,12 +220581,12 @@ _0806CD60: mov r0, r8 movs r1, #0x3b movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x3c movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 bhs _0806CDF6 _0806CD88: @@ -220682,7 +220682,7 @@ _0806CE14: mov r0, r8 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData _0806CE34: ldrh r2, [r4, #4] mov sl, r2 @@ -220729,7 +220729,7 @@ _0806CE74: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0806CB5C + thumb_func_end GetEvolutionTargetSpecies thumb_func_start sub_0806CE84 sub_0806CE84: @ 0x0806CE84 @@ -220932,8 +220932,8 @@ _0806CFCE: .align 2, 0 thumb_func_end sub_0806CFB0 - thumb_func_start sub_0806CFD4 -sub_0806CFD4: @ 0x0806CFD4 + thumb_func_start SpeciesToCryId +SpeciesToCryId: @ 0x0806CFD4 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -220960,7 +220960,7 @@ _0806D002: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806CFD4 + thumb_func_end SpeciesToCryId thumb_func_start sub_0806D008 sub_0806D008: @ 0x0806D008 @@ -221116,8 +221116,8 @@ _0806D116: .align 2, 0 thumb_func_end sub_0806D008 - thumb_func_start sub_0806D128 -sub_0806D128: @ 0x0806D128 + thumb_func_start DrawSpindaSpots +DrawSpindaSpots: @ 0x0806D128 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -221264,7 +221264,7 @@ _0806D22A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806D128 + thumb_func_end DrawSpindaSpots thumb_func_start sub_0806D23C sub_0806D23C: @ 0x0806D23C @@ -221278,7 +221278,7 @@ sub_0806D23C: @ 0x0806D23C ldr r5, _0806D280 movs r1, #2 adds r2, r5, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r4, #1 adds r0, r0, r4 lsls r0, r0, #1 @@ -221294,7 +221294,7 @@ sub_0806D23C: @ 0x0806D23C adds r2, r2, r4 adds r0, r7, #0 movs r1, #2 - bl sub_0806A774 + bl SetMonData _0806D278: pop {r4, r5, r6, r7} pop {r0} @@ -221309,7 +221309,7 @@ sub_0806D288: @ 0x0806D288 push {r4, r5, lr} movs r5, #0 ldr r4, _0806D2B0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -221342,8 +221342,8 @@ _0806D2BE: .align 2, 0 thumb_func_end sub_0806D288 - thumb_func_start sub_0806D2C8 -sub_0806D2C8: @ 0x0806D2C8 + thumb_func_start GetLinkTrainerFlankId +GetLinkTrainerFlankId: @ 0x0806D2C8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -221375,10 +221375,10 @@ _0806D2FA: adds r0, r3, #0 pop {r1} bx r1 - thumb_func_end sub_0806D2C8 + thumb_func_end GetLinkTrainerFlankId - thumb_func_start sub_0806D300 -sub_0806D300: @ 0x0806D300 + thumb_func_start GetBattlerMultiplayerId +GetBattlerMultiplayerId: @ 0x0806D300 push {lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -221400,7 +221400,7 @@ _0806D31E: adds r0, r2, #0 pop {r1} bx r1 - thumb_func_end sub_0806D300 + thumb_func_end GetBattlerMultiplayerId thumb_func_start sub_0806D324 sub_0806D324: @ 0x0806D324 @@ -221408,12 +221408,12 @@ sub_0806D324: @ 0x0806D324 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0806D33E adds r0, r4, #0 - bl sub_081A9CB4 + bl GetBattlePyramindTrainerEncounterMusicId b _0806D362 _0806D33E: bl sub_081D52F0 @@ -221441,8 +221441,8 @@ _0806D366: bx r1 thumb_func_end sub_0806D324 - thumb_func_start sub_0806D36C -sub_0806D36C: @ 0x0806D36C + thumb_func_start ModifyStatByNature +ModifyStatByNature: @ 0x0806D36C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -221495,10 +221495,10 @@ _0806D3C6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0806D36C + thumb_func_end ModifyStatByNature - thumb_func_start sub_0806D3CC -sub_0806D3CC: @ 0x0806D3CC + thumb_func_start AdjustFriendship +AdjustFriendship: @ 0x0806D3CC push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -221513,13 +221513,13 @@ _0806D3E2: adds r0, r7, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r7, #0 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xaf @@ -221568,7 +221568,7 @@ _0806D450: adds r0, r7, #0 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r1, sp @@ -221648,7 +221648,7 @@ _0806D4DA: adds r0, r7, #0 movs r1, #0x26 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0xb bne _0806D508 mov r0, sp @@ -221661,7 +221661,7 @@ _0806D508: adds r0, r7, #0 movs r1, #0x23 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 bl GetCurrentRegionMapSectionId lsls r0, r0, #0x18 @@ -221696,7 +221696,7 @@ _0806D54C: adds r0, r7, #0 movs r1, #0x20 mov r2, sp - bl sub_0806A774 + bl SetMonData _0806D556: add sp, #4 pop {r4, r5, r6, r7} @@ -221707,10 +221707,10 @@ _0806D560: .4byte gUnknown_2022C90 _0806D564: .4byte gUnknown_82E383C _0806D568: .4byte gUnknown_203886A _0806D56C: .4byte gUnknown_82FA85A - thumb_func_end sub_0806D3CC + thumb_func_end AdjustFriendship - thumb_func_start sub_0806D570 -sub_0806D570: @ 0x0806D570 + thumb_func_start MonGainEVs +MonGainEVs: @ 0x0806D570 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -221726,7 +221726,7 @@ _0806D584: adds r1, #0x1a mov r0, r8 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r2, sp adds r1, r2, r6 strb r0, [r1] @@ -221742,7 +221742,7 @@ _0806D584: _0806D5A8: mov r0, r8 movs r1, #0 - bl sub_0806D878 + bl CheckPartyHasHadPokerus lsls r0, r0, #0x18 movs r2, #1 cmp r0, #0 @@ -221837,7 +221837,7 @@ _0806D65C: mov r0, r8 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xaf @@ -221914,7 +221914,7 @@ _0806D6EC: adds r1, r6, #0 adds r1, #0x1a mov r0, r8 - bl sub_0806A774 + bl SetMonData adds r6, #1 cmp r6, #5 bgt _0806D70E @@ -221932,10 +221932,10 @@ _0806D70E: bx r0 .align 2, 0 _0806D71C: .4byte 0x000001FD - thumb_func_end sub_0806D570 + thumb_func_end MonGainEVs - thumb_func_start sub_0806D720 -sub_0806D720: @ 0x0806D720 + thumb_func_start GetMonEVCount +GetMonEVCount: @ 0x0806D720 push {r4, r5, r6, lr} adds r6, r0, #0 movs r5, #0 @@ -221945,7 +221945,7 @@ _0806D728: adds r1, #0x1a adds r0, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r0, r5, r0 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -221956,10 +221956,10 @@ _0806D728: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0806D720 + thumb_func_end GetMonEVCount - thumb_func_start sub_0806D748 -sub_0806D748: @ 0x0806D748 + thumb_func_start RandomlyGivePartyPokerus +RandomlyGivePartyPokerus: @ 0x0806D748 push {r4, r5, r6, lr} sub sp, #4 adds r6, r0, #0 @@ -221992,13 +221992,13 @@ _0806D76E: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806D76E adds r0, r4, #0 movs r1, #0x2d movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806D76E ldr r1, _0806D80C @@ -222006,7 +222006,7 @@ _0806D76E: adds r0, r0, r1 ldrb r1, [r0] adds r0, r6, #0 - bl sub_0806D878 + bl CheckPartyHasHadPokerus lsls r0, r0, #0x18 cmp r0, #0 bne _0806D804 @@ -222048,7 +222048,7 @@ _0806D7DA: adds r0, r6, r0 movs r1, #0x22 mov r2, sp - bl sub_0806A774 + bl SetMonData _0806D804: add sp, #4 pop {r4, r5, r6} @@ -222056,10 +222056,10 @@ _0806D804: bx r0 .align 2, 0 _0806D80C: .4byte gUnknown_82FACB4 - thumb_func_end sub_0806D748 + thumb_func_end RandomlyGivePartyPokerus - thumb_func_start sub_0806D810 -sub_0806D810: @ 0x0806D810 + thumb_func_start CheckPartyPokerus +CheckPartyPokerus: @ 0x0806D810 push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -222081,7 +222081,7 @@ _0806D824: movs r1, #0x22 movs r2, #0 str r3, [sp] - bl sub_0806A058 + bl GetMonData movs r1, #0xf ands r1, r0 ldr r3, [sp] @@ -222101,7 +222101,7 @@ _0806D858: adds r0, r7, #0 movs r1, #0x22 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xf ands r1, r0 cmp r1, #0 @@ -222114,10 +222114,10 @@ _0806D86C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806D810 + thumb_func_end CheckPartyPokerus - thumb_func_start sub_0806D878 -sub_0806D878: @ 0x0806D878 + thumb_func_start CheckPartyHasHadPokerus +CheckPartyHasHadPokerus: @ 0x0806D878 push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -222139,7 +222139,7 @@ _0806D88C: movs r1, #0x22 movs r2, #0 str r3, [sp] - bl sub_0806A058 + bl GetMonData ldr r3, [sp] cmp r0, #0 beq _0806D8B0 @@ -222157,7 +222157,7 @@ _0806D8BC: adds r0, r7, #0 movs r1, #0x22 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806D8CC movs r5, #1 @@ -222168,10 +222168,10 @@ _0806D8CC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806D878 + thumb_func_end CheckPartyHasHadPokerus - thumb_func_start sub_0806D8D8 -sub_0806D8D8: @ 0x0806D8D8 + thumb_func_start UpdatePartyPokerusTime +UpdatePartyPokerusTime: @ 0x0806D8D8 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -222187,13 +222187,13 @@ _0806D8E4: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806D946 adds r0, r4, #0 movs r1, #0x22 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strb r0, [r5] @@ -222228,7 +222228,7 @@ _0806D936: adds r0, r0, r1 movs r1, #0x22 mov r2, sp - bl sub_0806A774 + bl SetMonData _0806D946: adds r6, #1 cmp r6, #5 @@ -222239,10 +222239,10 @@ _0806D946: bx r0 .align 2, 0 _0806D954: .4byte gUnknown_2024190 - thumb_func_end sub_0806D8D8 + thumb_func_end UpdatePartyPokerusTime - thumb_func_start sub_0806D958 -sub_0806D958: @ 0x0806D958 + thumb_func_start PartySpreadPokerus +PartySpreadPokerus: @ 0x0806D958 push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -222263,13 +222263,13 @@ _0806D974: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0806D9F8 adds r0, r4, #0 movs r1, #0x22 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 mov r0, sp @@ -222288,7 +222288,7 @@ _0806D974: adds r0, r4, #0 movs r1, #0x22 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xf0 ands r1, r0 cmp r1, #0 @@ -222296,7 +222296,7 @@ _0806D974: adds r0, r4, #0 movs r1, #0x22 mov r2, sp - bl sub_0806A774 + bl SetMonData _0806D9CE: cmp r5, #5 beq _0806D9F8 @@ -222307,7 +222307,7 @@ _0806D9CE: adds r0, r4, #0 movs r1, #0x22 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xf0 ands r1, r0 cmp r1, #0 @@ -222315,7 +222315,7 @@ _0806D9CE: adds r0, r4, #0 movs r1, #0x22 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r5, #1 _0806D9F8: adds r5, #1 @@ -222327,30 +222327,30 @@ _0806D9FE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806D958 + thumb_func_end PartySpreadPokerus - thumb_func_start sub_0806DA08 -sub_0806DA08: @ 0x0806DA08 + thumb_func_start TryIncrementMonLevel +TryIncrementMonLevel: @ 0x0806DA08 push {r4, r5, r6, lr} sub sp, #8 adds r5, r0, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r0, #1 mov r1, sp strb r0, [r1] adds r0, r5, #0 movs r1, #0x19 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] ldr r6, _0806DA84 ldr r2, _0806DA88 @@ -222374,7 +222374,7 @@ sub_0806DA08: @ 0x0806DA08 add r2, sp, #4 adds r0, r5, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData _0806DA68: mov r0, sp ldrb r0, [r0] @@ -222397,24 +222397,24 @@ _0806DA8C: adds r0, r5, #0 movs r1, #0x38 mov r2, sp - bl sub_0806A774 + bl SetMonData movs r0, #1 _0806DA98: add sp, #8 pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0806DA08 + thumb_func_end TryIncrementMonLevel - thumb_func_start sub_0806DAA0 -sub_0806DAA0: @ 0x0806DAA0 + thumb_func_start CanMonLearnTMHM +CanMonLearnTMHM: @ 0x0806DAA0 push {r4, r5, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 adds r5, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 adds r3, r1, #0 @@ -222454,10 +222454,10 @@ _0806DAEE: bx r1 .align 2, 0 _0806DAF4: .4byte gUnknown_82EF220 - thumb_func_end sub_0806DAA0 + thumb_func_end CanMonLearnTMHM - thumb_func_start sub_0806DAF8 -sub_0806DAF8: @ 0x0806DAF8 + thumb_func_start CanSpeciesLearnTMHM +CanSpeciesLearnTMHM: @ 0x0806DAF8 push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -222501,10 +222501,10 @@ _0806DB3E: bx r1 .align 2, 0 _0806DB44: .4byte gUnknown_82EF220 - thumb_func_end sub_0806DAF8 + thumb_func_end CanSpeciesLearnTMHM - thumb_func_start sub_0806DB48 -sub_0806DB48: @ 0x0806DB48 + thumb_func_start GetMoveRelearnerMoves +GetMoveRelearnerMoves: @ 0x0806DB48 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -222518,13 +222518,13 @@ sub_0806DB48: @ 0x0806DB48 adds r0, r6, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r6, #0 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0xc] @@ -222535,7 +222535,7 @@ _0806DB7E: adds r1, #0xd adds r0, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r4, #2 adds r5, #1 @@ -222675,7 +222675,7 @@ _0806DC78: _0806DC8C: .4byte gUnknown_82F9D04 _0806DC90: .4byte 0x0000FFFF _0806DC94: .4byte 0x000001FF - thumb_func_end sub_0806DB48 + thumb_func_end GetMoveRelearnerMoves thumb_func_start GetLevelUpMovesBySpecies GetLevelUpMovesBySpecies: @ 0x0806DC98 @@ -222725,8 +222725,8 @@ _0806DCE8: .4byte 0x0000FFFF _0806DCEC: .4byte 0x000001FF thumb_func_end GetLevelUpMovesBySpecies - thumb_func_start sub_0806DCF0 -sub_0806DCF0: @ 0x0806DCF0 + thumb_func_start GetNumberOfRelearnableMoves +GetNumberOfRelearnableMoves: @ 0x0806DCF0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -222739,13 +222739,13 @@ sub_0806DCF0: @ 0x0806DCF0 adds r0, r6, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r6, #0 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x30] @@ -222765,7 +222765,7 @@ _0806DD34: adds r1, #0xd adds r0, r6, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r4, #2 adds r5, #1 @@ -222909,14 +222909,14 @@ _0806DE36: _0806DE48: .4byte gUnknown_82F9D04 _0806DE4C: .4byte 0x0000FFFF _0806DE50: .4byte 0x000001FF - thumb_func_end sub_0806DCF0 + thumb_func_end GetNumberOfRelearnableMoves - thumb_func_start sub_0806DE54 -sub_0806DE54: @ 0x0806DE54 + thumb_func_start SpeciesToPokedexNum +SpeciesToPokedexNum: @ 0x0806DE54 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _0806DE6E adds r0, r4, #0 @@ -222940,10 +222940,10 @@ _0806DE86: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0806DE54 + thumb_func_end SpeciesToPokedexNum - thumb_func_start sub_0806DE8C -sub_0806DE8C: @ 0x0806DE8C + thumb_func_start MainMenu_FormatSavegameText +MainMenu_FormatSavegameText: @ 0x0806DE8C push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -222959,7 +222959,7 @@ _0806DEA2: _0806DEA4: pop {r1} bx r1 - thumb_func_end sub_0806DE8C + thumb_func_end MainMenu_FormatSavegameText thumb_func_start ClearBattleMonForms ClearBattleMonForms: @ 0x0806DEA8 @@ -222978,8 +222978,8 @@ _0806DEB0: _0806DEBC: .4byte gUnknown_2024188 thumb_func_end ClearBattleMonForms - thumb_func_start sub_0806DEC0 -sub_0806DEC0: @ 0x0806DEC0 + thumb_func_start GetBattleBGM +GetBattleBGM: @ 0x0806DEC0 push {lr} ldr r0, _0806DED8 ldr r1, [r0] @@ -223022,7 +223022,7 @@ _0806DF04: beq _0806DF28 ldr r0, _0806DF24 ldrh r0, [r0] - bl sub_08162ADC + bl GetFrontierOpponentClass lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0806DF42 @@ -223191,24 +223191,24 @@ _0806E0D2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806DEC0 + thumb_func_end GetBattleBGM thumb_func_start sub_0806E0D8 sub_0806E0D8: @ 0x0806E0D8 push {lr} bl ResetMapMusic bl m4aMPlayAllStop - bl sub_0806DEC0 + bl GetBattleBGM lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A3040 + bl PlayBGM pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0806E0D8 - thumb_func_start sub_0806E0F4 -sub_0806E0F4: @ 0x0806E0F4 + thumb_func_start PlayMapChosenOrBattleBGM +PlayMapChosenOrBattleBGM: @ 0x0806E0F4 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -223217,18 +223217,18 @@ sub_0806E0F4: @ 0x0806E0F4 cmp r4, #0 beq _0806E10E adds r0, r4, #0 - bl sub_080A27D8 + bl PlayNewMapMusic b _0806E11A _0806E10E: - bl sub_0806DEC0 + bl GetBattleBGM lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A27D8 + bl PlayNewMapMusic _0806E11A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0806E0F4 + thumb_func_end PlayMapChosenOrBattleBGM thumb_func_start sub_0806E120 sub_0806E120: @ 0x0806E120 @@ -223240,7 +223240,7 @@ sub_0806E120: @ 0x0806E120 bl m4aMPlayAllStop ldr r0, _0806E150 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0806E154 @@ -223272,18 +223272,18 @@ sub_0806E158: @ 0x0806E158 cmp r0, #0 beq _0806E17C ldrh r0, [r1, #8] - bl sub_080A27D8 + bl PlayNewMapMusic b _0806E188 .align 2, 0 _0806E178: .4byte gUnknown_3005B60 _0806E17C: - bl sub_0806DEC0 + bl GetBattleBGM lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A27D8 + bl PlayNewMapMusic _0806E188: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -223295,30 +223295,30 @@ sub_0806E194: @ 0x0806E194 adds r5, r0, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 adds r0, r5, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 adds r0, r4, #0 adds r1, r6, #0 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality pop {r4, r5, r6} pop {r1} bx r1 thumb_func_end sub_0806E194 - thumb_func_start sub_0806E1CC -sub_0806E1CC: @ 0x0806E1CC + thumb_func_start GetMonSpritePalFromSpeciesAndPersonality +GetMonSpritePalFromSpeciesAndPersonality: @ 0x0806E1CC push {r4, r5, lr} adds r3, r2, #0 lsls r0, r0, #0x10 @@ -223362,7 +223362,7 @@ _0806E214: bx r1 .align 2, 0 _0806E21C: .4byte gUnknown_82D7CC8 - thumb_func_end sub_0806E1CC + thumb_func_end GetMonSpritePalFromSpeciesAndPersonality thumb_func_start sub_0806E220 sub_0806E220: @ 0x0806E220 @@ -223370,30 +223370,30 @@ sub_0806E220: @ 0x0806E220 adds r5, r0, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 adds r0, r5, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 adds r0, r4, #0 adds r1, r6, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality pop {r4, r5, r6} pop {r1} bx r1 thumb_func_end sub_0806E220 - thumb_func_start sub_0806E258 -sub_0806E258: @ 0x0806E258 + thumb_func_start GetMonSpritePalStructFromOtIdPersonality +GetMonSpritePalStructFromOtIdPersonality: @ 0x0806E258 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -223423,10 +223423,10 @@ _0806E284: bx r1 .align 2, 0 _0806E28C: .4byte gUnknown_82D7CC8 - thumb_func_end sub_0806E258 + thumb_func_end GetMonSpritePalStructFromOtIdPersonality - thumb_func_start sub_0806E290 -sub_0806E290: @ 0x0806E290 + thumb_func_start IsHMMove2 +IsHMMove2: @ 0x0806E290 push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -223459,7 +223459,7 @@ _0806E2C4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806E290 + thumb_func_end IsHMMove2 thumb_func_start IsMonSpriteNotFlipped IsMonSpriteNotFlipped: @ 0x0806E2CC @@ -223482,7 +223482,7 @@ sub_0806E2E4: @ 0x0806E2E4 push {r4, lr} lsls r4, r1, #0x18 lsrs r4, r4, #0x18 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0806E308 @@ -223504,7 +223504,7 @@ sub_0806E30C: @ 0x0806E30C push {r4, lr} lsls r4, r1, #0x18 lsrs r4, r4, #0x18 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0806E330 @@ -223521,20 +223521,20 @@ sub_0806E30C: @ 0x0806E30C _0806E330: .4byte gUnknown_8591FEC thumb_func_end sub_0806E30C - thumb_func_start sub_0806E334 -sub_0806E334: @ 0x0806E334 + thumb_func_start IsTradedMon +IsTradedMon: @ 0x0806E334 push {r4, lr} sub sp, #8 adds r4, r0, #0 movs r1, #7 mov r2, sp - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp - bl sub_0806E360 + bl IsOtherTrainer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #8 @@ -223542,10 +223542,10 @@ sub_0806E334: @ 0x0806E334 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806E334 + thumb_func_end IsTradedMon - thumb_func_start sub_0806E360 -sub_0806E360: @ 0x0806E360 + thumb_func_start IsOtherTrainer +IsOtherTrainer: @ 0x0806E360 push {r4, r5, lr} adds r5, r1, #0 ldr r1, _0806E3A4 @@ -223589,19 +223589,19 @@ _0806E3AA: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0806E360 + thumb_func_end IsOtherTrainer thumb_func_start sub_0806E3B0 sub_0806E3B0: @ 0x0806E3B0 push {lr} - bl sub_0806E3BC + bl BoxMonRestorePP pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0806E3B0 - thumb_func_start sub_0806E3BC -sub_0806E3BC: @ 0x0806E3BC + thumb_func_start BoxMonRestorePP +BoxMonRestorePP: @ 0x0806E3BC push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 @@ -223632,14 +223632,14 @@ _0806E3C4: lsls r2, r6, #0x18 lsrs r2, r2, #0x18 adds r0, r4, #0 - bl sub_0806B424 + bl CalculatePPWithBonus mov r1, sp strb r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r5, #0 mov r2, sp - bl sub_0806A864 + bl SetBoxMonData _0806E410: adds r6, #1 cmp r6, #3 @@ -223649,10 +223649,10 @@ _0806E410: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806E3BC + thumb_func_end BoxMonRestorePP - thumb_func_start sub_0806E420 -sub_0806E420: @ 0x0806E420 + thumb_func_start SetMonPreventsSwitchingString +SetMonPreventsSwitchingString: @ 0x0806E420 push {r4, r5, lr} ldr r2, _0806E464 ldr r5, _0806E468 @@ -223672,7 +223672,7 @@ sub_0806E420: @ 0x0806E420 movs r0, #0xff strb r0, [r4, #4] ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0806E474 @@ -223683,7 +223683,7 @@ sub_0806E420: @ 0x0806E420 lsls r0, r0, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func b _0806E482 .align 2, 0 _0806E464: .4byte gUnknown_2023EAE @@ -223713,13 +223713,13 @@ _0806E482: lsls r0, r0, #1 adds r0, r0, r2 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func strb r0, [r4, #3] movs r0, #0xff strb r0, [r4, #4] ldr r0, _0806E4C4 ldr r1, _0806E4C8 - bl sub_0814E7B0 + bl BattleStringExpandPlaceholders pop {r4, r5} pop {r0} bx r0 @@ -223729,10 +223729,10 @@ _0806E4BC: .4byte gUnknown_2022C1C _0806E4C0: .4byte gUnknown_202415C _0806E4C4: .4byte gUnknown_85AA7DF _0806E4C8: .4byte gUnknown_2021C7C - thumb_func_end sub_0806E420 + thumb_func_end SetMonPreventsSwitchingString - thumb_func_start sub_0806E4CC -sub_0806E4CC: @ 0x0806E4CC + thumb_func_start GetWildMonTableIdInAlteringCave +GetWildMonTableIdInAlteringCave: @ 0x0806E4CC push {lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -223756,10 +223756,10 @@ _0806E4EE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806E4CC + thumb_func_end GetWildMonTableIdInAlteringCave - thumb_func_start sub_0806E4F4 -sub_0806E4F4: @ 0x0806E4F4 + thumb_func_start SetWildMonHeldItem +SetWildMonHeldItem: @ 0x0806E4F4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -223781,7 +223781,7 @@ _0806E508: ldr r0, _0806E580 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #0x2d @@ -223791,11 +223791,11 @@ _0806E508: adds r0, r5, #0 movs r1, #6 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0806E552 adds r0, r5, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xe @@ -223811,7 +223811,7 @@ _0806E552: cmp r1, r0 bne _0806E5B8 adds r0, r4, #0 - bl sub_0806E4CC + bl GetWildMonTableIdInAlteringCave adds r2, r0, #0 cmp r2, #0 beq _0806E590 @@ -223885,7 +223885,7 @@ _0806E5F8: adds r2, r2, r1 _0806E5FA: movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _0806E61C .align 2, 0 _0806E604: .4byte gUnknown_20243E8 @@ -223897,7 +223897,7 @@ _0806E60C: ldr r1, _0806E62C adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData _0806E61C: pop {r3} mov r8, r3 @@ -223907,20 +223907,20 @@ _0806E61C: .align 2, 0 _0806E628: .4byte gUnknown_20243E8 _0806E62C: .4byte gUnknown_82F0D62 - thumb_func_end sub_0806E4F4 + thumb_func_end SetWildMonHeldItem - thumb_func_start sub_0806E630 -sub_0806E630: @ 0x0806E630 + thumb_func_start IsMonShiny +IsMonShiny: @ 0x0806E630 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r5, #0 bl IsShinyOtIdPersonality @@ -223930,7 +223930,7 @@ sub_0806E630: @ 0x0806E630 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806E630 + thumb_func_end IsMonShiny thumb_func_start IsShinyOtIdPersonality IsShinyOtIdPersonality: @ 0x0806E65C @@ -223956,8 +223956,8 @@ _0806E676: _0806E680: .4byte 0x0000FFFF thumb_func_end IsShinyOtIdPersonality - thumb_func_start sub_0806E684 -sub_0806E684: @ 0x0806E684 + thumb_func_start GetTrainerPartnerName +GetTrainerPartnerName: @ 0x0806E684 push {r4, lr} ldr r0, _0806E6A4 ldr r0, [r0] @@ -223988,7 +223988,7 @@ _0806E6B4: .align 2, 0 _0806E6C4: .4byte gUnknown_2021C40 _0806E6C8: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _0806E6F8 @@ -223999,7 +223999,7 @@ _0806E6C8: ldrh r1, [r1, #0x18] movs r0, #2 eors r0, r1 - bl sub_0806D300 + bl GetBattlerMultiplayerId adds r1, r0, #0 lsls r0, r1, #3 subs r0, r0, r1 @@ -224012,10 +224012,10 @@ _0806E6F0: bx r1 .align 2, 0 _0806E6F8: .4byte gUnknown_20226A0 - thumb_func_end sub_0806E684 + thumb_func_end GetTrainerPartnerName - thumb_func_start sub_0806E6FC -sub_0806E6FC: @ 0x0806E6FC + thumb_func_start Task_AnimateAfterDelay +Task_AnimateAfterDelay: @ 0x0806E6FC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -224035,19 +224035,19 @@ sub_0806E6FC: @ 0x0806E6FC lsls r1, r1, #0x10 orrs r0, r1 ldrb r1, [r2, #0xc] - bl sub_0817F3F0 + bl LaunchAnimationTaskForFrontSprite adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0806E72C: pop {r4} pop {r0} bx r0 .align 2, 0 _0806E734: .4byte gUnknown_3005B60 - thumb_func_end sub_0806E6FC + thumb_func_end Task_AnimateAfterDelay - thumb_func_start sub_0806E738 -sub_0806E738: @ 0x0806E738 + thumb_func_start Task_PokemonSummaryAnimateAfterDelay +Task_PokemonSummaryAnimateAfterDelay: @ 0x0806E738 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -224071,17 +224071,17 @@ sub_0806E738: @ 0x0806E738 movs r0, #0xff bl sub_081C4094 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0806E76E: pop {r4} pop {r0} bx r0 .align 2, 0 _0806E774: .4byte gUnknown_3005B60 - thumb_func_end sub_0806E738 + thumb_func_end Task_PokemonSummaryAnimateAfterDelay - thumb_func_start sub_0806E778 -sub_0806E778: @ 0x0806E778 + thumb_func_start BattleAnimateFrontSprite +BattleAnimateFrontSprite: @ 0x0806E778 push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x10 @@ -224106,7 +224106,7 @@ sub_0806E778: @ 0x0806E778 orrs r3, r0 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation b _0806E7C4 .align 2, 0 _0806E7B0: .4byte gUnknown_2023F24 @@ -224115,16 +224115,16 @@ _0806E7B8: .4byte gUnknown_2000002 _0806E7BC: adds r0, r5, #0 adds r1, r4, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation _0806E7C4: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806E778 + thumb_func_end BattleAnimateFrontSprite - thumb_func_start sub_0806E7CC -sub_0806E7CC: @ 0x0806E7CC + thumb_func_start DoMonFrontSpriteAnimation +DoMonFrontSpriteAnimation: @ 0x0806E7CC push {r4, r5, r6, lr} adds r5, r0, #0 lsls r1, r1, #0x10 @@ -224156,7 +224156,7 @@ _0806E7F2: lsls r1, r1, #0x18 asrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080A2B3C + bl PlayCry1 _0806E808: ldr r0, _0806E80C b _0806E886 @@ -224168,7 +224168,7 @@ _0806E810: lsls r1, r1, #0x18 asrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080A2B3C + bl PlayCry1 adds r0, r4, #0 bl HasTwoFramesAnimation lsls r0, r0, #0x18 @@ -224186,7 +224186,7 @@ _0806E832: beq _0806E878 ldr r0, _0806E86C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0806E870 @@ -224206,7 +224206,7 @@ _0806E832: b _0806E884 .align 2, 0 _0806E868: .4byte gUnknown_82FA50F -_0806E86C: .4byte sub_0806E6FC +_0806E86C: .4byte Task_AnimateAfterDelay _0806E870: .4byte gUnknown_3005B60 _0806E874: .4byte gUnknown_82FA374 _0806E878: @@ -224214,7 +224214,7 @@ _0806E878: adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, #0 - bl sub_0817F3F0 + bl LaunchAnimationTaskForFrontSprite _0806E884: ldr r0, _0806E894 _0806E886: @@ -224225,10 +224225,10 @@ _0806E886: .align 2, 0 _0806E890: .4byte gUnknown_82FA374 _0806E894: .4byte sub_080394FC - thumb_func_end sub_0806E7CC + thumb_func_end DoMonFrontSpriteAnimation - thumb_func_start sub_0806E898 -sub_0806E898: @ 0x0806E898 + thumb_func_start PokemonSummaryDoMonAnimation +PokemonSummaryDoMonAnimation: @ 0x0806E898 push {r4, r5, r6, lr} adds r5, r0, #0 lsls r1, r1, #0x10 @@ -224253,7 +224253,7 @@ _0806E8BA: beq _0806E90C ldr r0, _0806E900 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0806E904 @@ -224276,7 +224276,7 @@ _0806E8BA: b _0806E918 .align 2, 0 _0806E8FC: .4byte gUnknown_82FA50F -_0806E900: .4byte sub_0806E738 +_0806E900: .4byte Task_PokemonSummaryAnimateAfterDelay _0806E904: .4byte gUnknown_3005B60 _0806E908: .4byte gUnknown_82FA374 _0806E90C: @@ -224291,27 +224291,27 @@ _0806E918: bx r0 .align 2, 0 _0806E920: .4byte gUnknown_82FA374 - thumb_func_end sub_0806E898 + thumb_func_end PokemonSummaryDoMonAnimation - thumb_func_start sub_0806E924 -sub_0806E924: @ 0x0806E924 + thumb_func_start StopPokemonAnimationDelayTask +StopPokemonAnimationDelayTask: @ 0x0806E924 push {lr} ldr r0, _0806E93C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _0806E938 - bl sub_080A8964 + bl DestroyTask _0806E938: pop {r0} bx r0 .align 2, 0 -_0806E93C: .4byte sub_0806E738 - thumb_func_end sub_0806E924 +_0806E93C: .4byte Task_PokemonSummaryAnimateAfterDelay + thumb_func_end StopPokemonAnimationDelayTask - thumb_func_start sub_0806E940 -sub_0806E940: @ 0x0806E940 + thumb_func_start BattleAnimateBackSprite +BattleAnimateBackSprite: @ 0x0806E940 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x10 @@ -224337,12 +224337,12 @@ _0806E96C: .4byte gUnknown_2000002 _0806E970: .4byte sub_08007140 _0806E974: adds r0, r2, #0 - bl sub_0817F320 + bl GetSpeciesBackAnimSet adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0817F440 + bl LaunchAnimationTaskForBackSprite ldr r0, _0806E990 _0806E988: str r0, [r4, #0x1c] @@ -224351,7 +224351,7 @@ _0806E988: bx r0 .align 2, 0 _0806E990: .4byte sub_080394FC - thumb_func_end sub_0806E940 + thumb_func_end BattleAnimateBackSprite thumb_func_start sub_0806E994 sub_0806E994: @ 0x0806E994 @@ -224359,7 +224359,7 @@ sub_0806E994: @ 0x0806E994 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r5, #0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0806E9C0 @@ -224516,8 +224516,8 @@ _0806EA9A: .align 2, 0 thumb_func_end PlayerGenderToFrontTrainerPicId - thumb_func_start sub_0806EAA8 -sub_0806EAA8: @ 0x0806EAA8 + thumb_func_start HandleSetPokedexFlag +HandleSetPokedexFlag: @ 0x0806EAA8 push {r4, r5, r6, r7, lr} adds r7, r2, #0 lsls r0, r0, #0x10 @@ -224531,13 +224531,13 @@ sub_0806EAA8: @ 0x0806EAA8 orrs r1, r0 lsrs r1, r1, #0x1f adds r0, r4, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 bne _0806EAFE adds r0, r4, #0 adds r1, r5, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag adds r0, r4, #0 bl sub_0806CED0 lsls r0, r0, #0x10 @@ -224564,7 +224564,7 @@ _0806EAFE: bx r0 .align 2, 0 _0806EB04: .4byte gUnknown_3005AF0 - thumb_func_end sub_0806EAA8 + thumb_func_end HandleSetPokedexFlag thumb_func_start sub_0806EB08 sub_0806EB08: @ 0x0806EB08 @@ -224669,7 +224669,7 @@ _0806EBA6: lsls r0, r0, #0x18 cmp r0, #0 bne _0806EBC8 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0806EBDC @@ -224883,7 +224883,7 @@ sub_0806ED30: @ 0x0806ED30 movs r0, #1 ands r6, r0 movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 cmp r4, #0 bne _0806ED54 @@ -224930,12 +224930,12 @@ _0806ED92: lsls r0, r0, #0x1c lsrs r0, r0, #0xf muls r0, r1, r0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #4] ldrb r0, [r4] lsls r0, r0, #0x1c lsrs r0, r0, #0x17 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 str r1, [r4, #8] ldr r2, [r4, #4] @@ -224984,7 +224984,7 @@ _0806EDFC: lsls r0, r1, #1 adds r0, r0, r1 lsls r0, r0, #3 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0xc] ldrb r1, [r4] lsls r1, r1, #0x1c @@ -224992,7 +224992,7 @@ _0806EDFC: ldrb r0, [r4, #1] lsls r0, r0, #3 muls r0, r1, r0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 str r1, [r4, #0x10] ldr r0, [r4, #0xc] @@ -225055,14 +225055,14 @@ _0806EE84: ldr r0, [r4, #0x10] cmp r0, #0 beq _0806EE9A - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #0x10] _0806EE9A: ldr r0, [r4, #0xc] cmp r0, #0 beq _0806EEA8 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #0xc] _0806EEA8: @@ -225073,14 +225073,14 @@ _0806EEA8: ldr r0, [r4, #8] cmp r0, #0 beq _0806EEBE - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #8] _0806EEBE: ldr r0, [r4, #4] cmp r0, #0 beq _0806EECC - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #4] _0806EECC: @@ -225091,7 +225091,7 @@ _0806EECC: movs r2, #0x14 bl memset adds r0, r4, #0 - bl sub_08000BF0 + bl Free b _0806EEEC _0806EEE2: movs r0, #0xa3 @@ -225140,28 +225140,28 @@ _0806EF2C: ldr r0, [r4, #0x10] cmp r0, #0 beq _0806EF3A - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #0x10] _0806EF3A: ldr r0, [r4, #0xc] cmp r0, #0 beq _0806EF48 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #0xc] _0806EF48: ldr r0, [r4, #8] cmp r0, #0 beq _0806EF56 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #8] _0806EF56: ldr r0, [r4, #4] cmp r0, #0 beq _0806EF64 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4, #4] _0806EF64: @@ -225170,7 +225170,7 @@ _0806EF64: movs r2, #0x14 bl memset adds r0, r4, #0 - bl sub_08000BF0 + bl Free _0806EF74: pop {r4} pop {r0} @@ -225252,8 +225252,8 @@ Cos: @ 0x0806EFD4 _0806EFF0: .4byte gUnknown_82FA8CC thumb_func_end Cos - thumb_func_start sub_0806EFF4 -sub_0806EFF4: @ 0x0806EFF4 + thumb_func_start Sin2 +Sin2: @ 0x0806EFF4 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x10 @@ -225287,7 +225287,7 @@ _0806F030: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0806EFF4 + thumb_func_end Sin2 thumb_func_start Cos2 Cos2: @ 0x0806F038 @@ -225297,7 +225297,7 @@ Cos2: @ 0x0806F038 lsls r1, r1, #0xf adds r0, r0, r1 lsrs r0, r0, #0x10 - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 pop {r1} @@ -225326,8 +225326,8 @@ _0806F074: .4byte 0x00006073 _0806F078: .4byte gUnknown_2024664 thumb_func_end Random - thumb_func_start sub_0806F07C -sub_0806F07C: @ 0x0806F07C + thumb_func_start SeedRng +SeedRng: @ 0x0806F07C lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, _0806F08C @@ -225339,7 +225339,7 @@ sub_0806F07C: @ 0x0806F07C .align 2, 0 _0806F08C: .4byte gUnknown_3005AE0 _0806F090: .4byte gUnknown_2024660 - thumb_func_end sub_0806F07C + thumb_func_end SeedRng thumb_func_start sub_0806F094 sub_0806F094: @ 0x0806F094 @@ -225369,15 +225369,15 @@ _0806F0BC: .4byte 0x41C64E6D _0806F0C0: .4byte 0x00006073 thumb_func_end sub_0806F0A4 - thumb_func_start sub_0806F0C4 -sub_0806F0C4: @ 0x0806F0C4 + thumb_func_start CreateInvisibleSpriteWithCallback +CreateInvisibleSpriteWithCallback: @ 0x0806F0C4 push {r4, r5, r6, lr} adds r6, r0, #0 ldr r0, _0806F0F8 movs r1, #0xf8 movs r2, #0xa8 movs r3, #0xe - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _0806F0FC @@ -225399,18 +225399,18 @@ sub_0806F0C4: @ 0x0806F0C4 .align 2, 0 _0806F0F8: .4byte gUnknown_82FAD34 _0806F0FC: .4byte gUnknown_20205AC - thumb_func_end sub_0806F0C4 + thumb_func_end CreateInvisibleSpriteWithCallback - thumb_func_start sub_0806F100 -sub_0806F100: @ 0x0806F100 + thumb_func_start StoreWordInTwoHalfwords +StoreWordInTwoHalfwords: @ 0x0806F100 strh r1, [r0] lsrs r1, r1, #0x10 strh r1, [r0, #2] bx lr - thumb_func_end sub_0806F100 + thumb_func_end StoreWordInTwoHalfwords - thumb_func_start sub_0806F108 -sub_0806F108: @ 0x0806F108 + thumb_func_start LoadWordFromTwoHalfwords +LoadWordFromTwoHalfwords: @ 0x0806F108 ldrh r2, [r0] movs r3, #2 ldrsh r0, [r0, r3] @@ -225419,7 +225419,7 @@ sub_0806F108: @ 0x0806F108 str r2, [r1] bx lr .align 2, 0 - thumb_func_end sub_0806F108 + thumb_func_end LoadWordFromTwoHalfwords thumb_func_start SetBgAffineStruct SetBgAffineStruct: @ 0x0806F118 @@ -225447,8 +225447,8 @@ SetBgAffineStruct: @ 0x0806F118 .align 2, 0 thumb_func_end SetBgAffineStruct - thumb_func_start sub_0806F144 -sub_0806F144: @ 0x0806F144 + thumb_func_start DoBgAffineSet +DoBgAffineSet: @ 0x0806F144 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -225485,10 +225485,10 @@ sub_0806F144: @ 0x0806F144 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806F144 + thumb_func_end DoBgAffineSet - thumb_func_start sub_0806F190 -sub_0806F190: @ 0x0806F190 + thumb_func_start CopySpriteTiles +CopySpriteTiles: @ 0x0806F190 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -225702,7 +225702,7 @@ _0806F318: bx r0 .align 2, 0 _0806F328: .4byte 0x04000008 - thumb_func_end sub_0806F190 + thumb_func_end CopySpriteTiles thumb_func_start CountTrailingZeroBits CountTrailingZeroBits: @ 0x0806F32C @@ -225934,10 +225934,10 @@ sub_0806F4B0: @ 0x0806F4B0 adds r4, r1, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 mov r1, sp - bl sub_08008828 + bl StringCopy10 add sp, #0x14 pop {r4} pop {r1} @@ -225955,7 +225955,7 @@ sub_0806F4D0: @ 0x0806F4D0 bl sub_0806A1B4 adds r0, r4, #0 mov r1, sp - bl sub_08008828 + bl StringCopy10 add sp, #0x14 pop {r4} pop {r1} @@ -225963,8 +225963,8 @@ sub_0806F4D0: @ 0x0806F4D0 .align 2, 0 thumb_func_end sub_0806F4D0 - thumb_func_start sub_0806F4F0 -sub_0806F4F0: @ 0x0806F4F0 + thumb_func_start CountPokemonInDaycare +CountPokemonInDaycare: @ 0x0806F4F0 push {r4, r5, r6, lr} adds r6, r0, #0 movs r5, #0 @@ -225990,10 +225990,10 @@ _0806F50E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0806F4F0 + thumb_func_end CountPokemonInDaycare - thumb_func_start sub_0806F520 -sub_0806F520: @ 0x0806F520 + thumb_func_start InitDaycareMailRecordMixing +InitDaycareMailRecordMixing: @ 0x0806F520 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -226049,10 +226049,10 @@ _0806F56E: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0806F520 + thumb_func_end InitDaycareMailRecordMixing - thumb_func_start sub_0806F58C -sub_0806F58C: @ 0x0806F58C + thumb_func_start Daycare_FindEmptySpot +Daycare_FindEmptySpot: @ 0x0806F58C push {r4, r5, lr} adds r5, r0, #0 movs r4, #0 @@ -226079,14 +226079,14 @@ _0806F5B6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0806F58C + thumb_func_end Daycare_FindEmptySpot thumb_func_start sub_0806F5BC sub_0806F5BC: @ 0x0806F5BC push {r4, r5, r6, lr} adds r5, r0, #0 adds r4, r1, #0 - bl sub_080D3C90 + bl MonHasMail lsls r0, r0, #0x18 cmp r0, #0 beq _0806F614 @@ -226101,7 +226101,7 @@ sub_0806F5BC: @ 0x0806F5BC bl sub_0806F4B0 adds r0, r5, #0 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0806F644 @@ -226121,21 +226121,21 @@ sub_0806F5BC: @ 0x0806F5BC ldm r1!, {r2, r3, r6} stm r0!, {r2, r3, r6} adds r0, r5, #0 - bl sub_080D3F04 + bl TakeMailFromMon _0806F614: adds r0, r4, #0 adds r1, r5, #0 movs r2, #0x50 bl memcpy adds r0, r4, #0 - bl sub_0806E3BC + bl BoxMonRestorePP adds r1, r4, #0 adds r1, #0x88 movs r0, #0 str r0, [r1] adds r0, r5, #0 - bl sub_08067670 - bl sub_080CE188 + bl ZeroMonData + bl CompactPartySlots bl sub_0806B004 pop {r4, r5, r6} pop {r0} @@ -226146,13 +226146,13 @@ _0806F644: .4byte gUnknown_3005AEC _0806F648: .4byte 0x00002BE0 thumb_func_end sub_0806F5BC - thumb_func_start sub_0806F64C -sub_0806F64C: @ 0x0806F64C + thumb_func_start StorePokemonInEmptyDaycareSlot +StorePokemonInEmptyDaycareSlot: @ 0x0806F64C push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 adds r0, r4, #0 - bl sub_0806F58C + bl Daycare_FindEmptySpot lsls r0, r0, #0x18 asrs r0, r0, #0x18 movs r1, #0x8c @@ -226164,12 +226164,12 @@ sub_0806F64C: @ 0x0806F64C pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0806F64C + thumb_func_end StorePokemonInEmptyDaycareSlot - thumb_func_start sub_0806F670 -sub_0806F670: @ 0x0806F670 + thumb_func_start StoreSelectedPokemonInDaycare +StoreSelectedPokemonInDaycare: @ 0x0806F670 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -226180,17 +226180,17 @@ sub_0806F670: @ 0x0806F670 ldr r1, [r1] ldr r2, _0806F69C adds r1, r1, r2 - bl sub_0806F64C + bl StorePokemonInEmptyDaycareSlot pop {r0} bx r0 .align 2, 0 _0806F694: .4byte gUnknown_2024190 _0806F698: .4byte gUnknown_3005AEC _0806F69C: .4byte 0x00003030 - thumb_func_end sub_0806F670 + thumb_func_end StoreSelectedPokemonInDaycare - thumb_func_start sub_0806F6A0 -sub_0806F6A0: @ 0x0806F6A0 + thumb_func_start ShiftDaycareSlots +ShiftDaycareSlots: @ 0x0806F6A0 push {r4, r5, r6, lr} adds r5, r0, #0 adds r4, r5, #0 @@ -226227,22 +226227,22 @@ sub_0806F6A0: @ 0x0806F6A0 str r0, [r2] str r6, [r1] adds r0, r4, #0 - bl sub_0806F9D8 + bl ClearDaycareMonMail _0806F6F6: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0806F6A0 + thumb_func_end ShiftDaycareSlots - thumb_func_start sub_0806F6FC -sub_0806F6FC: @ 0x0806F6FC + thumb_func_start ApplyDaycareExperience +ApplyDaycareExperience: @ 0x0806F6FC push {r4, r5, r6, r7, lr} adds r4, r0, #0 movs r5, #0 ldr r7, _0806F718 _0806F704: adds r0, r4, #0 - bl sub_0806DA08 + bl TryIncrementMonLevel lsls r0, r0, #0x18 cmp r0, #0 beq _0806F740 @@ -226258,11 +226258,11 @@ _0806F71C: ldr r0, _0806F74C ldrh r1, [r0] adds r0, r4, #0 - bl sub_08068F64 + bl DeleteFirstMoveAndGiveMoveToMon _0806F72C: adds r0, r4, #0 adds r1, r6, #0 - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -226271,16 +226271,16 @@ _0806F72C: ble _0806F704 _0806F740: adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _0806F74C: .4byte gUnknown_2024186 - thumb_func_end sub_0806F6FC + thumb_func_end ApplyDaycareExperience - thumb_func_start sub_0806F750 -sub_0806F750: @ 0x0806F750 + thumb_func_start TakeSelectedPokemonFromDaycare +TakeSelectedPokemonFromDaycare: @ 0x0806F750 push {r4, r5, r6, r7, lr} sub sp, #0x68 adds r5, r0, #0 @@ -226293,15 +226293,15 @@ sub_0806F750: @ 0x0806F750 lsrs r7, r0, #0x10 adds r0, r5, #0 mov r1, sp - bl sub_08068B44 + bl BoxMonToMon mov r0, sp movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x64 beq _0806F79E mov r0, sp movs r1, #0x19 - bl sub_0806A058 + bl GetMonData adds r1, r5, #0 adds r1, #0x88 ldr r1, [r1] @@ -226310,9 +226310,9 @@ sub_0806F750: @ 0x0806F750 add r2, sp, #0x64 mov r0, sp movs r1, #0x19 - bl sub_0806A774 + bl SetMonData mov r0, sp - bl sub_0806F6FC + bl ApplyDaycareExperience _0806F79E: ldr r0, _0806F7F0 movs r1, #0xfa @@ -226331,9 +226331,9 @@ _0806F79E: adds r4, #0x50 adds r0, r6, #0 adds r1, r4, #0 - bl sub_080D3E90 + bl GiveMailToMon2 adds r0, r4, #0 - bl sub_0806F9D8 + bl ClearDaycareMonMail _0806F7CC: adds r0, r5, #0 bl ZeroBoxMonData @@ -226341,7 +226341,7 @@ _0806F7CC: adds r1, #0x88 movs r0, #0 str r0, [r1] - bl sub_080CE188 + bl CompactPartySlots bl sub_0806B004 adds r0, r7, #0 add sp, #0x68 @@ -226351,7 +226351,7 @@ _0806F7CC: .align 2, 0 _0806F7EC: .4byte gUnknown_2021C40 _0806F7F0: .4byte gUnknown_2024190 - thumb_func_end sub_0806F750 + thumb_func_end TakeSelectedPokemonFromDaycare thumb_func_start TakeSelectedPokemonMonFromDaycareShiftSlots TakeSelectedPokemonMonFromDaycareShiftSlots: @ 0x0806F7F4 @@ -226362,12 +226362,12 @@ TakeSelectedPokemonMonFromDaycareShiftSlots: @ 0x0806F7F4 movs r0, #0x8c muls r0, r1, r0 adds r0, r5, r0 - bl sub_0806F750 + bl TakeSelectedPokemonFromDaycare adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 - bl sub_0806F6A0 + bl ShiftDaycareSlots adds r0, r4, #0 pop {r4, r5} pop {r1} @@ -226395,8 +226395,8 @@ _0806F83C: .4byte 0x00003030 _0806F840: .4byte gUnknown_2037280 thumb_func_end TakePokemonFromDaycare - thumb_func_start sub_0806F844 -sub_0806F844: @ 0x0806F844 + thumb_func_start GetLevelAfterDaycareSteps +GetLevelAfterDaycareSteps: @ 0x0806F844 push {r4, r5, lr} sub sp, #0x54 adds r4, r0, #0 @@ -226413,7 +226413,7 @@ sub_0806F844: @ 0x0806F844 add r2, sp, #0x50 mov r0, sp movs r1, #0x19 - bl sub_0806A864 + bl SetBoxMonData mov r0, sp bl GetLevelFromBoxMonExp lsls r0, r0, #0x18 @@ -226423,10 +226423,10 @@ sub_0806F844: @ 0x0806F844 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806F844 + thumb_func_end GetLevelAfterDaycareSteps - thumb_func_start sub_0806F880 -sub_0806F880: @ 0x0806F880 + thumb_func_start GetNumLevelsGainedFromSteps +GetNumLevelsGainedFromSteps: @ 0x0806F880 push {r4, r5, lr} adds r5, r0, #0 bl GetLevelFromBoxMonExp @@ -226437,7 +226437,7 @@ sub_0806F880: @ 0x0806F880 adds r0, #0x88 ldr r1, [r0] adds r0, r5, #0 - bl sub_0806F844 + bl GetLevelAfterDaycareSteps lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, r0, r4 @@ -226447,13 +226447,13 @@ sub_0806F880: @ 0x0806F880 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806F880 + thumb_func_end GetNumLevelsGainedFromSteps - thumb_func_start sub_0806F8AC -sub_0806F8AC: @ 0x0806F8AC + thumb_func_start GetNumLevelsGainedForDaycareMon +GetNumLevelsGainedForDaycareMon: @ 0x0806F8AC push {r4, r5, lr} adds r5, r0, #0 - bl sub_0806F880 + bl GetNumLevelsGainedFromSteps adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -226472,13 +226472,13 @@ sub_0806F8AC: @ 0x0806F8AC .align 2, 0 _0806F8D8: .4byte gUnknown_2021C54 _0806F8DC: .4byte gUnknown_2021C40 - thumb_func_end sub_0806F8AC + thumb_func_end GetNumLevelsGainedForDaycareMon - thumb_func_start sub_0806F8E0 -sub_0806F8E0: @ 0x0806F8E0 + thumb_func_start GetDaycareCostForSelectedMon +GetDaycareCostForSelectedMon: @ 0x0806F8E0 push {r4, r5, lr} adds r5, r0, #0 - bl sub_0806F880 + bl GetNumLevelsGainedFromSteps adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -226500,7 +226500,7 @@ sub_0806F8E0: @ 0x0806F8E0 .align 2, 0 _0806F910: .4byte gUnknown_2021C40 _0806F914: .4byte gUnknown_2021C54 - thumb_func_end sub_0806F8E0 + thumb_func_end GetDaycareCostForSelectedMon thumb_func_start GetDaycareCostForMon GetDaycareCostForMon: @ 0x0806F918 @@ -226510,7 +226510,7 @@ GetDaycareCostForMon: @ 0x0806F918 movs r2, #0x8c muls r1, r2, r1 adds r0, r0, r1 - bl sub_0806F8E0 + bl GetDaycareCostForSelectedMon lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} @@ -226561,8 +226561,8 @@ _0806F980: .4byte 0x000030B8 _0806F984: .4byte 0x00003144 thumb_func_end Debug_AddDaycareSteps - thumb_func_start sub_0806F988 -sub_0806F988: @ 0x0806F988 + thumb_func_start GetNumLevelsGainedFromDaycare +GetNumLevelsGainedFromDaycare: @ 0x0806F988 push {r4, r5, r6, lr} ldr r6, _0806F9AC ldr r5, _0806F9B0 @@ -226592,7 +226592,7 @@ _0806F9B8: adds r1, r1, r0 ldr r0, [r6] adds r0, r0, r1 - bl sub_0806F8AC + bl GetNumLevelsGainedForDaycareMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0806F9CE: @@ -226601,10 +226601,10 @@ _0806F9CE: bx r1 .align 2, 0 _0806F9D4: .4byte 0x00003030 - thumb_func_end sub_0806F988 + thumb_func_end GetNumLevelsGainedFromDaycare - thumb_func_start sub_0806F9D8 -sub_0806F9D8: @ 0x0806F9D8 + thumb_func_start ClearDaycareMonMail +ClearDaycareMonMail: @ 0x0806F9D8 push {lr} movs r3, #0 movs r2, #7 @@ -226630,10 +226630,10 @@ _0806F9F6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806F9D8 + thumb_func_end ClearDaycareMonMail - thumb_func_start sub_0806FA08 -sub_0806FA08: @ 0x0806FA08 + thumb_func_start ClearDaycareMon +ClearDaycareMon: @ 0x0806FA08 push {r4, lr} adds r4, r0, #0 bl ZeroBoxMonData @@ -226643,12 +226643,12 @@ sub_0806FA08: @ 0x0806FA08 str r0, [r1] adds r4, #0x50 adds r0, r4, #0 - bl sub_0806F9D8 + bl ClearDaycareMonMail pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806FA08 + thumb_func_end ClearDaycareMon thumb_func_start ClearAllDaycareData ClearAllDaycareData: @ 0x0806FA28 @@ -226660,7 +226660,7 @@ _0806FA30: adds r0, r4, #0 muls r0, r6, r0 adds r0, r5, r0 - bl sub_0806FA08 + bl ClearDaycareMon adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -226680,8 +226680,8 @@ _0806FA30: bx r0 thumb_func_end ClearAllDaycareData - thumb_func_start sub_0806FA5C -sub_0806FA5C: @ 0x0806FA5C + thumb_func_start GetEggSpecies +GetEggSpecies: @ 0x0806FA5C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -226751,10 +226751,10 @@ _0806FACA: bx r1 .align 2, 0 _0806FAD8: .4byte 0x0000019B - thumb_func_end sub_0806FA5C + thumb_func_end GetEggSpecies - thumb_func_start sub_0806FADC -sub_0806FADC: @ 0x0806FADC + thumb_func_start GetSlotToInheritNature +GetSlotToInheritNature: @ 0x0806FADC push {r4, r5, r6, r7, lr} sub sp, #8 adds r6, r0, #0 @@ -226765,7 +226765,7 @@ _0806FAE8: movs r0, #0x8c muls r0, r4, r0 adds r0, r6, r0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xfe @@ -226830,10 +226830,10 @@ _0806FB62: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0806FADC + thumb_func_end GetSlotToInheritNature - thumb_func_start sub_0806FB6C -sub_0806FB6C: @ 0x0806FB6C + thumb_func_start _TriggerPendingDaycareEgg +_TriggerPendingDaycareEgg: @ 0x0806FB6C push {r4, r5, r6, r7, lr} adds r5, r0, #0 movs r6, #0 @@ -226841,7 +226841,7 @@ sub_0806FB6C: @ 0x0806FB6C ldrh r0, [r0, #0x24] bl sub_0806F094 adds r0, r5, #0 - bl sub_0806FADC + bl GetSlotToInheritNature adds r1, r0, #0 cmp r1, #0 bge _0806FBB8 @@ -226872,7 +226872,7 @@ _0806FBB8: movs r1, #0 movs r2, #0 bl sub_0806A1B4 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r7, r0, #0x18 _0806FBCE: @@ -226884,7 +226884,7 @@ _0806FBCE: lsrs r0, r0, #0x10 orrs r4, r0 adds r0, r4, #0 - bl sub_0806CB4C + bl GetNatureFromPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r7, r0 @@ -226908,10 +226908,10 @@ _0806FC04: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0806FB6C + thumb_func_end _TriggerPendingDaycareEgg - thumb_func_start sub_0806FC10 -sub_0806FC10: @ 0x0806FC10 + thumb_func_start _TriggerPendingDaycareMaleEgg +_TriggerPendingDaycareMaleEgg: @ 0x0806FC10 push {r4, lr} adds r4, r0, #0 bl Random @@ -226930,37 +226930,37 @@ sub_0806FC10: @ 0x0806FC10 pop {r4} pop {r0} bx r0 - thumb_func_end sub_0806FC10 + thumb_func_end _TriggerPendingDaycareMaleEgg - thumb_func_start sub_0806FC38 -sub_0806FC38: @ 0x0806FC38 + thumb_func_start TriggerPendingDaycareEgg +TriggerPendingDaycareEgg: @ 0x0806FC38 push {lr} ldr r0, _0806FC4C ldr r0, [r0] ldr r1, _0806FC50 adds r0, r0, r1 - bl sub_0806FB6C + bl _TriggerPendingDaycareEgg pop {r0} bx r0 .align 2, 0 _0806FC4C: .4byte gUnknown_3005AEC _0806FC50: .4byte 0x00003030 - thumb_func_end sub_0806FC38 + thumb_func_end TriggerPendingDaycareEgg - thumb_func_start sub_0806FC54 -sub_0806FC54: @ 0x0806FC54 + thumb_func_start TriggerPendingDaycareMaleEgg +TriggerPendingDaycareMaleEgg: @ 0x0806FC54 push {lr} ldr r0, _0806FC68 ldr r0, [r0] ldr r1, _0806FC6C adds r0, r0, r1 - bl sub_0806FC10 + bl _TriggerPendingDaycareMaleEgg pop {r0} bx r0 .align 2, 0 _0806FC68: .4byte gUnknown_3005AEC _0806FC6C: .4byte 0x00003030 - thumb_func_end sub_0806FC54 + thumb_func_end TriggerPendingDaycareMaleEgg thumb_func_start RemoveIVIndexFromList RemoveIVIndexFromList: @ 0x0806FC70 @@ -227005,8 +227005,8 @@ _0806FCA8: .align 2, 0 thumb_func_end RemoveIVIndexFromList - thumb_func_start sub_0806FCB8 -sub_0806FCB8: @ 0x0806FCB8 + thumb_func_start InheritIVs +InheritIVs: @ 0x0806FCB8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -227095,7 +227095,7 @@ _0806FD5C: strb r0, [r2] mov r0, sb movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _0806FE06 _0806FD7A: add r4, sp, #0x10 @@ -227150,7 +227150,7 @@ _0806FDC8: movs r1, #0x2b _0806FDE0: adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData b _0806FE06 _0806FDE8: add r4, sp, #0x10 @@ -227165,7 +227165,7 @@ _0806FDE8: mov r0, sb movs r1, #0x2c adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData _0806FE06: adds r0, r5, #1 lsls r0, r0, #0x18 @@ -227180,10 +227180,10 @@ _0806FE06: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0806FCB8 + thumb_func_end InheritIVs - thumb_func_start sub_0806FE20 -sub_0806FE20: @ 0x0806FE20 + thumb_func_start GetEggMoves +GetEggMoves: @ 0x0806FE20 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -227191,7 +227191,7 @@ sub_0806FE20: @ 0x0806FE20 movs r6, #0 movs r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r3, r0, #0x10 movs r2, #0 @@ -227268,10 +227268,10 @@ _0806FEAE: _0806FEBC: .4byte 0x00000471 _0806FEC0: .4byte gUnknown_82FB764 _0806FEC4: .4byte 0x00004E20 - thumb_func_end sub_0806FE20 + thumb_func_end GetEggMoves - thumb_func_start sub_0806FEC8 -sub_0806FEC8: @ 0x0806FEC8 + thumb_func_start BuildEggMoveset +BuildEggMoveset: @ 0x0806FEC8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -227327,7 +227327,7 @@ _0806FF1C: bls _0806FF1C adds r0, r7, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, _0806FFDC @@ -227361,7 +227361,7 @@ _0806FF4A: bls _0806FF4A ldr r1, _0806FFD8 adds r0, r7, #0 - bl sub_0806FE20 + bl GetEggMoves lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -227390,7 +227390,7 @@ _0806FF9E: adds r1, r0, #0 adds r0, r7, #0 str r2, [sp, #8] - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r2, [sp, #8] @@ -227398,7 +227398,7 @@ _0806FF9E: bne _0806FFEE ldrh r1, [r4] adds r0, r7, #0 - bl sub_08068F64 + bl DeleteFirstMoveAndGiveMoveToMon b _0806FFEE .align 2, 0 _0806FFCC: .4byte gUnknown_20246F0 @@ -227443,7 +227443,7 @@ _0807001A: adds r0, r5, r3 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_081B69B4 + bl ItemIdToBattleMoveId ldrh r1, [r4] lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -227452,19 +227452,19 @@ _0807001A: lsls r1, r5, #0x18 lsrs r1, r1, #0x18 adds r0, r7, #0 - bl sub_0806DAA0 + bl CanMonLearnTMHM cmp r0, #0 beq _08070056 ldrh r1, [r4] adds r0, r7, #0 - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, r6 bne _08070056 ldrh r1, [r4] adds r0, r7, #0 - bl sub_08068F64 + bl DeleteFirstMoveAndGiveMoveToMon _08070056: adds r0, r5, #1 lsls r0, r0, #0x10 @@ -227558,7 +227558,7 @@ _080700E2: adds r1, r0, #0 adds r0, r7, #0 str r2, [sp, #8] - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r2, [sp, #8] @@ -227566,7 +227566,7 @@ _080700E2: bne _0807013C ldrh r1, [r4] adds r0, r7, #0 - bl sub_08068F64 + bl DeleteFirstMoveAndGiveMoveToMon b _0807013C .align 2, 0 _08070118: .4byte gUnknown_20246CC @@ -227606,7 +227606,7 @@ _08070154: bx r0 .align 2, 0 _08070164: .4byte gUnknown_20246D4 - thumb_func_end sub_0806FEC8 + thumb_func_end BuildEggMoveset thumb_func_start RemoveEggFromDayCare RemoveEggFromDayCare: @ 0x08070168 @@ -227624,8 +227624,8 @@ RemoveEggFromDayCare: @ 0x08070168 .align 2, 0 thumb_func_end RemoveEggFromDayCare - thumb_func_start sub_08070180 -sub_08070180: @ 0x08070180 + thumb_func_start RejectEggFromDayCare +RejectEggFromDayCare: @ 0x08070180 push {lr} ldr r0, _08070194 ldr r0, [r0] @@ -227637,10 +227637,10 @@ sub_08070180: @ 0x08070180 .align 2, 0 _08070194: .4byte gUnknown_3005AEC _08070198: .4byte 0x00003030 - thumb_func_end sub_08070180 + thumb_func_end RejectEggFromDayCare - thumb_func_start sub_0807019C -sub_0807019C: @ 0x0807019C + thumb_func_start AlterEggSpeciesWithIncenseItem +AlterEggSpeciesWithIncenseItem: @ 0x0807019C push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -227690,10 +227690,10 @@ _080701F6: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0807019C + thumb_func_end AlterEggSpeciesWithIncenseItem - thumb_func_start sub_080701FC -sub_080701FC: @ 0x080701FC + thumb_func_start GiveVoltTackleIfLightBall +GiveVoltTackleIfLightBall: @ 0x080701FC push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -227714,24 +227714,24 @@ _0807021E: lsls r4, r4, #1 adds r0, r6, #0 adds r1, r4, #0 - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 ldr r1, _08070240 cmp r0, r1 bne _0807023A adds r0, r6, #0 adds r1, r4, #0 - bl sub_08068F64 + bl DeleteFirstMoveAndGiveMoveToMon _0807023A: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08070240: .4byte 0xFFFF0000 - thumb_func_end sub_080701FC + thumb_func_end GiveVoltTackleIfLightBall - thumb_func_start sub_08070244 -sub_08070244: @ 0x08070244 + thumb_func_start DetermineEggSpeciesAndParentSlots +DetermineEggSpeciesAndParentSlots: @ 0x08070244 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -227763,7 +227763,7 @@ _08070256: b _08070296 _0807027E: adds r0, r5, #0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xfe @@ -227783,7 +227783,7 @@ _08070296: lsls r0, r0, #1 add r0, sp ldrh r0, [r0] - bl sub_0806FA5C + bl GetEggSpecies lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0x1d @@ -227824,7 +227824,7 @@ _080702E4: movs r0, #0x8c muls r0, r1, r0 adds r0, r7, r0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xfe @@ -227843,28 +227843,28 @@ _0807030C: bx r1 .align 2, 0 _0807031C: .4byte 0x00000183 - thumb_func_end sub_08070244 + thumb_func_end DetermineEggSpeciesAndParentSlots - thumb_func_start sub_08070320 -sub_08070320: @ 0x08070320 + thumb_func_start _GiveEggFromDaycare +_GiveEggFromDaycare: @ 0x08070320 push {r4, r5, r6, lr} sub sp, #0x6c adds r6, r0, #0 add r5, sp, #0x64 adds r1, r5, #0 - bl sub_08070244 + bl DetermineEggSpeciesAndParentSlots add r4, sp, #0x68 strh r0, [r4] adds r0, r4, #0 adds r1, r6, #0 - bl sub_0807019C + bl AlterEggSpeciesWithIncenseItem ldrh r1, [r4] mov r0, sp adds r2, r6, #0 - bl sub_0807044C + bl AnimSolarbeamSmallOrb mov r0, sp adds r1, r6, #0 - bl sub_0806FCB8 + bl InheritIVs ldrb r0, [r5, #1] movs r2, #0x8c adds r1, r0, #0 @@ -227874,13 +227874,13 @@ sub_08070320: @ 0x08070320 muls r2, r0, r2 adds r2, r6, r2 mov r0, sp - bl sub_0806FEC8 + bl BuildEggMoveset ldrh r0, [r4] cmp r0, #0xac bne _08070370 mov r0, sp adds r1, r6, #0 - bl sub_080701FC + bl GiveVoltTackleIfLightBall _08070370: mov r2, sp adds r2, #0x6a @@ -227888,7 +227888,7 @@ _08070370: strb r0, [r2] mov r0, sp movs r1, #0x2d - bl sub_0806A774 + bl SetMonData ldr r0, _080703A8 movs r1, #0xfa lsls r1, r1, #1 @@ -227896,7 +227896,7 @@ _08070370: mov r1, sp movs r2, #0x64 bl memcpy - bl sub_080CE188 + bl CompactPartySlots bl sub_0806B004 adds r0, r6, #0 bl RemoveEggFromDayCare @@ -227906,7 +227906,7 @@ _08070370: bx r0 .align 2, 0 _080703A8: .4byte gUnknown_2024190 - thumb_func_end sub_08070320 + thumb_func_end _GiveEggFromDaycare thumb_func_start sub_080703AC sub_080703AC: @ 0x080703AC @@ -227929,7 +227929,7 @@ sub_080703AC: @ 0x080703AC adds r1, r5, #0 movs r2, #5 movs r3, #0x20 - bl sub_08067730 + bl CreateMon movs r0, #0x12 add r0, sp mov r8, r0 @@ -227940,11 +227940,11 @@ sub_080703AC: @ 0x080703AC adds r0, r7, #0 movs r1, #0x26 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData ldr r2, _08070444 adds r0, r7, #0 movs r1, #2 - bl sub_0806A774 + bl SetMonData lsls r2, r5, #3 subs r2, r2, r5 lsls r2, r2, #2 @@ -227952,11 +227952,11 @@ sub_080703AC: @ 0x080703AC adds r2, r2, r0 adds r0, r7, #0 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x24 mov r2, r8 - bl sub_0806A774 + bl SetMonData cmp r6, #0 beq _08070428 mov r2, sp @@ -227965,14 +227965,14 @@ sub_080703AC: @ 0x080703AC strb r0, [r2] adds r0, r7, #0 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData _08070428: add r2, sp, #0x14 movs r0, #1 strb r0, [r2] adds r0, r7, #0 movs r1, #0x2d - bl sub_0806A774 + bl SetMonData add sp, #0x18 pop {r3} mov r8, r3 @@ -227984,8 +227984,8 @@ _08070444: .4byte gUnknown_85C8C62 _08070448: .4byte gUnknown_82F0D65 thumb_func_end sub_080703AC - thumb_func_start sub_0807044C -sub_0807044C: @ 0x0807044C + thumb_func_start AnimSolarbeamSmallOrb +AnimSolarbeamSmallOrb: @ 0x0807044C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -228008,7 +228008,7 @@ sub_0807044C: @ 0x0807044C adds r1, r5, #0 movs r2, #5 movs r3, #0x20 - bl sub_08067730 + bl CreateMon movs r0, #0x12 add r0, sp mov r8, r0 @@ -228019,11 +228019,11 @@ sub_0807044C: @ 0x0807044C adds r0, r6, #0 movs r1, #0x26 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData ldr r2, _080704C8 adds r0, r6, #0 movs r1, #2 - bl sub_0806A774 + bl SetMonData lsls r2, r5, #3 subs r2, r2, r5 lsls r2, r2, #2 @@ -228031,11 +228031,11 @@ sub_0807044C: @ 0x0807044C adds r2, r2, r0 adds r0, r6, #0 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #0x24 mov r2, r8 - bl sub_0806A774 + bl SetMonData add sp, #0x14 pop {r3} mov r8, r3 @@ -228045,7 +228045,7 @@ sub_0807044C: @ 0x0807044C .align 2, 0 _080704C8: .4byte gUnknown_85C8C62 _080704CC: .4byte gUnknown_82F0D65 - thumb_func_end sub_0807044C + thumb_func_end AnimSolarbeamSmallOrb thumb_func_start sub_080704D0 sub_080704D0: @ 0x080704D0 @@ -228054,7 +228054,7 @@ sub_080704D0: @ 0x080704D0 ldr r0, [r0] ldr r1, _080704E8 adds r0, r0, r1 - bl sub_08070320 + bl _GiveEggFromDaycare pop {r0} bx r0 .align 2, 0 @@ -228062,8 +228062,8 @@ _080704E4: .4byte gUnknown_3005AEC _080704E8: .4byte 0x00003030 thumb_func_end sub_080704D0 - thumb_func_start sub_080704EC -sub_080704EC: @ 0x080704EC + thumb_func_start _DoEggActions_CheckHatch +_DoEggActions_CheckHatch: @ 0x080704EC push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r0, #0 @@ -228103,7 +228103,7 @@ _08070516: cmp r0, #0xff bne _0807055C adds r0, r6, #0 - bl sub_08070774 + bl GetDaycareCompatibilityScore adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -228116,7 +228116,7 @@ _08070516: bl __udivsi3 cmp r4, r0 bls _0807055C - bl sub_0806FC38 + bl TriggerPendingDaycareEgg _0807055C: movs r0, #0x8e lsls r0, r0, #1 @@ -228128,7 +228128,7 @@ _0807055C: lsrs r0, r0, #0x18 cmp r0, #0xff bne _080705E8 - bl sub_08071C9C + bl GetEggStepsToSubtract lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r5, #0 @@ -228140,17 +228140,17 @@ _0807055C: _08070584: adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080705DC adds r0, r4, #0 movs r1, #4 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080705DC adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 str r1, [sp] cmp r0, #0 @@ -228170,7 +228170,7 @@ _080705C2: adds r0, r4, #0 movs r1, #0x20 mov r2, sp - bl sub_0806A774 + bl SetMonData b _080705DC _080705D0: ldr r0, _080705D8 @@ -228195,7 +228195,7 @@ _080705EA: bx r1 .align 2, 0 _080705F4: .4byte gUnknown_202418D - thumb_func_end sub_080704EC + thumb_func_end _DoEggActions_CheckHatch thumb_func_start ShouldEggHatch ShouldEggHatch: @ 0x080705F8 @@ -228204,7 +228204,7 @@ ShouldEggHatch: @ 0x080705F8 ldr r0, [r0] ldr r1, _08070614 adds r0, r0, r1 - bl sub_080704EC + bl _DoEggActions_CheckHatch lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -228229,8 +228229,8 @@ _08070628: bx r1 thumb_func_end IsEggPending - thumb_func_start sub_0807062C -sub_0807062C: @ 0x0807062C + thumb_func_start _GetDaycareMonNicknames +_GetDaycareMonNicknames: @ 0x0807062C push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -228267,12 +228267,12 @@ _0807066C: _08070674: .4byte gUnknown_2021C40 _08070678: .4byte gUnknown_2021C68 _0807067C: .4byte gUnknown_2021C54 - thumb_func_end sub_0807062C + thumb_func_end _GetDaycareMonNicknames - thumb_func_start sub_08070680 -sub_08070680: @ 0x08070680 + thumb_func_start GetSelectedMonNickAndSpecies +GetSelectedMonNickAndSpecies: @ 0x08070680 push {r4, r5, lr} - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0x64 @@ -228281,7 +228281,7 @@ sub_08070680: @ 0x08070680 adds r0, r0, r4 ldr r1, _080706B8 bl sub_0806F4D0 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r5, r0 @@ -228296,25 +228296,25 @@ sub_08070680: @ 0x08070680 .align 2, 0 _080706B4: .4byte gUnknown_2024190 _080706B8: .4byte gUnknown_2021C40 - thumb_func_end sub_08070680 + thumb_func_end GetSelectedMonNickAndSpecies - thumb_func_start sub_080706BC -sub_080706BC: @ 0x080706BC + thumb_func_start GetDaycareMonNicknames +GetDaycareMonNicknames: @ 0x080706BC push {lr} ldr r0, _080706D0 ldr r0, [r0] ldr r1, _080706D4 adds r0, r0, r1 - bl sub_0807062C + bl _GetDaycareMonNicknames pop {r0} bx r0 .align 2, 0 _080706D0: .4byte gUnknown_3005AEC _080706D4: .4byte 0x00003030 - thumb_func_end sub_080706BC + thumb_func_end GetDaycareMonNicknames - thumb_func_start sub_080706D8 -sub_080706D8: @ 0x080706D8 + thumb_func_start GetDaycareState +GetDaycareState: @ 0x080706D8 push {r4, lr} ldr r4, _080706F0 ldr r0, [r4] @@ -228333,7 +228333,7 @@ _080706F8: ldr r0, [r4] ldr r1, _08070710 adds r0, r0, r1 - bl sub_0806F4F0 + bl CountPokemonInDaycare lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -228350,16 +228350,16 @@ _0807071A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080706D8 + thumb_func_end GetDaycareState - thumb_func_start sub_08070720 -sub_08070720: @ 0x08070720 + thumb_func_start GetDaycarePokemonCount +GetDaycarePokemonCount: @ 0x08070720 push {lr} ldr r0, _0807073C ldr r0, [r0] ldr r1, _08070740 adds r0, r0, r1 - bl sub_0806F4F0 + bl CountPokemonInDaycare lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -228371,7 +228371,7 @@ _08070738: .align 2, 0 _0807073C: .4byte gUnknown_3005AEC _08070740: .4byte 0x00003030 - thumb_func_end sub_08070720 + thumb_func_end GetDaycarePokemonCount thumb_func_start EggGroupsOverlap EggGroupsOverlap: @ 0x08070744 @@ -228405,8 +228405,8 @@ _0807076E: bx r1 thumb_func_end EggGroupsOverlap - thumb_func_start sub_08070774 -sub_08070774: @ 0x08070774 + thumb_func_start GetDaycareCompatibilityScore +GetDaycareCompatibilityScore: @ 0x08070774 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -228453,7 +228453,7 @@ _080707A6: bl sub_0806A1B4 adds r1, r0, #0 ldrh r0, [r5] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [sp, #0x28] @@ -228555,7 +228555,7 @@ _08070884: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08070774 + thumb_func_end GetDaycareCompatibilityScore thumb_func_start GetDaycareCompatibilityScoreFromSave GetDaycareCompatibilityScoreFromSave: @ 0x08070894 @@ -228564,7 +228564,7 @@ GetDaycareCompatibilityScoreFromSave: @ 0x08070894 ldr r0, [r0] ldr r1, _080708B0 adds r0, r0, r1 - bl sub_08070774 + bl GetDaycareCompatibilityScore lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -228574,8 +228574,8 @@ _080708AC: .4byte gUnknown_3005AEC _080708B0: .4byte 0x00003030 thumb_func_end GetDaycareCompatibilityScoreFromSave - thumb_func_start sub_080708B4 -sub_080708B4: @ 0x080708B4 + thumb_func_start SetDaycareCompatibilityString +SetDaycareCompatibilityString: @ 0x080708B4 push {lr} bl GetDaycareCompatibilityScoreFromSave lsls r0, r0, #0x18 @@ -228609,7 +228609,7 @@ _080708DA: .align 2, 0 _080708EC: .4byte gUnknown_2021C7C _080708F0: .4byte gUnknown_82FC0E8 - thumb_func_end sub_080708B4 + thumb_func_end SetDaycareCompatibilityString thumb_func_start NameHasGenderSymbol NameHasGenderSymbol: @ 0x080708F4 @@ -228685,8 +228685,8 @@ _08070966: .align 2, 0 thumb_func_end NameHasGenderSymbol - thumb_func_start sub_08070970 -sub_08070970: @ 0x08070970 + thumb_func_start AppendGenderSymbol +AppendGenderSymbol: @ 0x08070970 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -228725,26 +228725,26 @@ _080709AE: bx r1 .align 2, 0 _080709BC: .4byte gUnknown_8300A99 - thumb_func_end sub_08070970 + thumb_func_end AppendGenderSymbol - thumb_func_start sub_080709C0 -sub_080709C0: @ 0x080709C0 + thumb_func_start AppendMonGenderSymbol +AppendMonGenderSymbol: @ 0x080709C0 push {r4, lr} adds r4, r0, #0 adds r0, r1, #0 - bl sub_08069B04 + bl GetBoxMonGender adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08070970 + bl AppendGenderSymbol pop {r4} pop {r1} bx r1 - thumb_func_end sub_080709C0 + thumb_func_end AppendMonGenderSymbol - thumb_func_start sub_080709DC -sub_080709DC: @ 0x080709DC + thumb_func_start GetDaycareLevelMenuText +GetDaycareLevelMenuText: @ 0x080709DC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -228772,7 +228772,7 @@ _080709F4: bl sub_0806F4D0 adds r0, r5, #0 adds r1, r4, #0 - bl sub_080709C0 + bl AppendMonGenderSymbol adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -228804,10 +228804,10 @@ _080709F4: .align 2, 0 _08070A58: .4byte gUnknown_82FC0F8 _08070A5C: .4byte gUnknown_82FC0FA - thumb_func_end sub_080709DC + thumb_func_end GetDaycareLevelMenuText - thumb_func_start sub_08070A60 -sub_08070A60: @ 0x08070A60 + thumb_func_start GetDaycareLevelMenuLevelText +GetDaycareLevelMenuLevelText: @ 0x08070A60 push {r4, r5, r6, lr} sub sp, #0x14 adds r6, r0, #0 @@ -228827,7 +228827,7 @@ _08070A6E: adds r1, #0x88 adds r1, r1, r2 ldr r1, [r1] - bl sub_0806F844 + bl GetLevelAfterDaycareSteps adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -228853,10 +228853,10 @@ _08070A6E: .align 2, 0 _08070ABC: .4byte gUnknown_82FC0FE _08070AC0: .4byte gUnknown_82FC0F8 - thumb_func_end sub_08070A60 + thumb_func_end GetDaycareLevelMenuLevelText - thumb_func_start sub_08070AC4 -sub_08070AC4: @ 0x08070AC4 + thumb_func_start DaycareAddTextPrinter +DaycareAddTextPrinter: @ 0x08070AC4 push {r4, r5, r6, lr} sub sp, #0x10 str r1, [sp] @@ -228907,17 +228907,17 @@ sub_08070AC4: @ 0x08070AC4 mov r0, sp movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08070B34: .4byte gUnknown_30030B4 - thumb_func_end sub_08070AC4 + thumb_func_end DaycareAddTextPrinter - thumb_func_start sub_08070B38 -sub_08070B38: @ 0x08070B38 + thumb_func_start DaycarePrintMonNick +DaycarePrintMonNick: @ 0x08070B38 push {r4, r5, r6, lr} sub sp, #0x14 adds r5, r0, #0 @@ -228933,19 +228933,19 @@ sub_08070B38: @ 0x08070B38 bl sub_0806F4D0 mov r0, sp adds r1, r5, #0 - bl sub_080709C0 + bl AppendMonGenderSymbol adds r6, #2 adds r0, r4, #0 mov r1, sp movs r2, #0xc adds r3, r6, #0 - bl sub_08070AC4 + bl DaycareAddTextPrinter add sp, #0x14 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08070B38 + thumb_func_end DaycarePrintMonNick thumb_func_start sub_08070B74 sub_08070B74: @ 0x08070B74 @@ -228969,7 +228969,7 @@ sub_08070B74: @ 0x08070B74 adds r4, #0x88 adds r4, r4, r1 ldr r1, [r4] - bl sub_0806F844 + bl GetLevelAfterDaycareSteps adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -228985,7 +228985,7 @@ sub_08070B74: @ 0x08070B74 mov r1, sp movs r2, #0x59 mov r3, r8 - bl sub_08070AC4 + bl DaycareAddTextPrinter add sp, #0x14 pop {r3} mov r8, r3 @@ -228996,8 +228996,8 @@ sub_08070B74: @ 0x08070B74 _08070BD4: .4byte gUnknown_82FC0FE thumb_func_end sub_08070B74 - thumb_func_start sub_08070BD8 -sub_08070BD8: @ 0x08070BD8 + thumb_func_start DaycarePrintMonInfo +DaycarePrintMonInfo: @ 0x08070BD8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -229016,7 +229016,7 @@ sub_08070BD8: @ 0x08070BD8 adds r1, r7, #0 adds r2, r6, #0 adds r3, r5, #0 - bl sub_08070B38 + bl DaycarePrintMonNick mov r1, r8 ldr r0, [r1] adds r0, r0, r4 @@ -229033,10 +229033,10 @@ _08070C10: .align 2, 0 _08070C1C: .4byte gUnknown_3005AEC _08070C20: .4byte 0x00003030 - thumb_func_end sub_08070BD8 + thumb_func_end DaycarePrintMonInfo - thumb_func_start sub_08070C24 -sub_08070C24: @ 0x08070C24 + thumb_func_start Task_HandleDaycareLevelMenuInput +Task_HandleDaycareLevelMenuInput: @ 0x08070C24 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -229047,7 +229047,7 @@ sub_08070C24: @ 0x08070C24 lsls r0, r0, #3 adds r4, r0, r1 ldrb r0, [r4, #8] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r1, r0, #0 ldr r0, _08070C58 ldrh r2, [r0, #0x2e] @@ -229082,15 +229082,15 @@ _08070C6E: ldrb r0, [r4, #8] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r4, #0xa] movs r1, #1 bl sub_08197060 ldrb r0, [r4, #0xa] - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts b _08070CD4 .align 2, 0 _08070C9C: .4byte gUnknown_2037290 @@ -229106,29 +229106,29 @@ _08070CA4: ldrb r0, [r4, #8] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r4, #0xa] movs r1, #1 bl sub_08197060 ldrb r0, [r4, #0xa] - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _08070CD4: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08070CDC: .4byte gUnknown_2037290 - thumb_func_end sub_08070C24 + thumb_func_end Task_HandleDaycareLevelMenuInput - thumb_func_start sub_08070CE0 -sub_08070CE0: @ 0x08070CE0 + thumb_func_start ShowDaycareLevelMenu +ShowDaycareLevelMenu: @ 0x08070CE0 push {r4, r5, lr} sub sp, #0x18 ldr r0, _08070D40 - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -229145,16 +229145,16 @@ sub_08070CE0: @ 0x08070CE0 strb r4, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08070D48 movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08070D4C @@ -229171,12 +229171,12 @@ sub_08070CE0: @ 0x08070CE0 .align 2, 0 _08070D40: .4byte gUnknown_82FC04C _08070D44: .4byte gUnknown_82FC06C -_08070D48: .4byte sub_08070C24 +_08070D48: .4byte Task_HandleDaycareLevelMenuInput _08070D4C: .4byte gUnknown_3005B60 - thumb_func_end sub_08070CE0 + thumb_func_end ShowDaycareLevelMenu - thumb_func_start sub_08070D50 -sub_08070D50: @ 0x08070D50 + thumb_func_start FieldCallback_SecretBaseCave +FieldCallback_SecretBaseCave: @ 0x08070D50 push {lr} bl sub_081B8FC8 ldr r1, _08070D60 @@ -229187,10 +229187,10 @@ sub_08070D50: @ 0x08070D50 .align 2, 0 _08070D60: .4byte gUnknown_3002360 _08070D64: .4byte sub_08085A30 - thumb_func_end sub_08070D50 + thumb_func_end FieldCallback_SecretBaseCave - thumb_func_start sub_08070D68 -sub_08070D68: @ 0x08070D68 + thumb_func_start CreatedHatchedMon +CreatedHatchedMon: @ 0x08070D68 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -229200,7 +229200,7 @@ sub_08070D68: @ 0x08070D68 adds r5, r0, #0 adds r6, r1, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x3c] @@ -229225,7 +229225,7 @@ _08070DA6: adds r1, r4, #0 adds r1, #0xd adds r0, r5, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r4, #1 add r1, sp adds r1, #0x10 @@ -229237,14 +229237,14 @@ _08070DA6: bls _08070DA6 adds r0, r5, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov r8, r0 movs r4, #0 _08070DCE: adds r1, r4, #0 adds r1, #0x27 adds r0, r5, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r4, #2 adds r1, r7, r1 str r0, [r1] @@ -229255,26 +229255,26 @@ _08070DCE: bls _08070DCE adds r0, r5, #0 movs r1, #3 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1] adds r0, r5, #0 movs r1, #0x25 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r5, #0 movs r1, #8 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x40] strb r0, [r1] adds r0, r5, #0 movs r1, #0x22 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x38] adds r0, r5, #0 movs r1, #0x50 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x48] strb r0, [r1] movs r0, #1 @@ -229288,7 +229288,7 @@ _08070DCE: ldr r1, [sp, #0x3c] movs r2, #5 movs r3, #0x20 - bl sub_08067730 + bl CreateMon movs r4, #0 _08070E3E: adds r1, r4, #0 @@ -229298,7 +229298,7 @@ _08070E3E: adds r2, r2, r0 adds r2, #0x10 adds r0, r6, #0 - bl sub_0806A774 + bl SetMonData adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -229311,7 +229311,7 @@ _08070E5C: lsls r2, r4, #2 adds r2, r7, r2 adds r0, r6, #0 - bl sub_0806A774 + bl SetMonData adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -229320,30 +229320,30 @@ _08070E5C: adds r0, r6, #0 movs r1, #3 mov r2, sb - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #0x25 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #8 ldr r2, [sp, #0x40] - bl sub_0806A774 + bl SetMonData movs r0, #0x78 ldr r1, [sp, #0x44] strb r0, [r1] adds r0, r6, #0 movs r1, #0x20 ldr r2, [sp, #0x44] - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #0x22 ldr r2, [sp, #0x4c] - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #0x50 ldr r2, [sp, #0x48] - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 adds r1, r6, #0 movs r2, #0x64 @@ -229356,10 +229356,10 @@ _08070E5C: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08070D68 + thumb_func_end CreatedHatchedMon - thumb_func_start sub_08070ED0 -sub_08070ED0: @ 0x08070ED0 + thumb_func_start AddHatchedMonToParty +AddHatchedMonToParty: @ 0x08070ED0 push {r4, r5, lr} sub sp, #0x14 lsls r0, r0, #0x18 @@ -229374,14 +229374,14 @@ sub_08070ED0: @ 0x08070ED0 adds r5, r5, r0 ldr r1, _08070F88 adds r0, r5, #0 - bl sub_08070D68 + bl CreatedHatchedMon adds r0, r5, #0 movs r1, #0x2d adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -229391,7 +229391,7 @@ sub_08070ED0: @ 0x08070ED0 adds r0, r5, #0 movs r1, #2 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 bl sub_0806CF68 adds r4, r0, #0 @@ -229399,10 +229399,10 @@ sub_08070ED0: @ 0x08070ED0 lsrs r4, r4, #0x10 adds r0, r4, #0 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag adds r0, r4, #0 movs r1, #3 - bl sub_080BFBBC + bl GetSetPokedexFlag ldr r1, _08070F8C adds r0, r5, #0 bl sub_0806F4B0 @@ -229412,24 +229412,24 @@ sub_08070ED0: @ 0x08070ED0 strh r0, [r2] adds r0, r5, #0 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData add r2, sp, #0x10 movs r0, #0 strh r0, [r2] adds r0, r5, #0 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData bl GetCurrentRegionMapSectionId mov r2, sp adds r2, #0x12 strb r0, [r2] adds r0, r5, #0 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 bl sub_0806E3B0 adds r0, r5, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x14 pop {r4, r5} pop {r0} @@ -229438,19 +229438,19 @@ sub_08070ED0: @ 0x08070ED0 _08070F84: .4byte gUnknown_2024190 _08070F88: .4byte gUnknown_20243E8 _08070F8C: .4byte gUnknown_2021C40 - thumb_func_end sub_08070ED0 + thumb_func_end AddHatchedMonToParty - thumb_func_start sub_08070F90 -sub_08070F90: @ 0x08070F90 + thumb_func_start ScriptHatchMon +ScriptHatchMon: @ 0x08070F90 push {lr} ldr r0, _08070FA0 ldrb r0, [r0] - bl sub_08070ED0 + bl AddHatchedMonToParty pop {r0} bx r0 .align 2, 0 _08070FA0: .4byte gUnknown_2037280 - thumb_func_end sub_08070F90 + thumb_func_end ScriptHatchMon thumb_func_start sub_08070FA4 sub_08070FA4: @ 0x08070FA4 @@ -229530,8 +229530,8 @@ _0807103C: .4byte 0x00003030 _08071040: .4byte gUnknown_2037280 thumb_func_end sub_0807101C - thumb_func_start sub_08071044 -sub_08071044: @ 0x08071044 + thumb_func_start EggHatchCreateMonSprite +EggHatchCreateMonSprite: @ 0x08071044 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -229575,13 +229575,13 @@ _0807108C: .4byte gUnknown_2024190 _08071090: adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 lsls r0, r4, #3 ldr r1, _080710D8 @@ -229599,7 +229599,7 @@ _08071090: bl HandleLoadSpecialPokePic_DontHandleDeoxys adds r0, r5, #0 bl sub_0806E220 - bl sub_080343E4 + bl LoadCompressedSpritePalette mov r0, sb strh r4, [r0] b _0807111A @@ -229611,12 +229611,12 @@ _080710E0: bl sub_0806E220 ldrh r0, [r0, #4] adds r1, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _08071128 movs r1, #0x78 movs r2, #0x4b movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r4, _0807112C @@ -229645,37 +229645,37 @@ _0807111A: _08071128: .4byte gUnknown_2024640 _0807112C: .4byte gUnknown_20205AC _08071130: .4byte sub_08007140 - thumb_func_end sub_08071044 + thumb_func_end EggHatchCreateMonSprite - thumb_func_start sub_08071134 -sub_08071134: @ 0x08071134 + thumb_func_start VBlankCB_EggHatch +VBlankCB_EggHatch: @ 0x08071134 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08071134 + thumb_func_end VBlankCB_EggHatch - thumb_func_start sub_08071148 -sub_08071148: @ 0x08071148 + thumb_func_start EggHatch +EggHatch: @ 0x08071148 push {lr} bl sub_080987DC ldr r0, _08071164 movs r1, #0xa - bl sub_080A8878 + bl CreateTask movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 -_08071164: .4byte sub_08071168 - thumb_func_end sub_08071148 +_08071164: .4byte Task_EggHatch + thumb_func_end EggHatch - thumb_func_start sub_08071168 -sub_08071168: @ 0x08071168 + thumb_func_start Task_EggHatch +Task_EggHatch: @ 0x08071168 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -229685,14 +229685,14 @@ sub_08071168: @ 0x08071168 ands r0, r1 cmp r0, #0 bne _08071190 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0807119C - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080711A0 ldr r0, _080711A4 str r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08071190: pop {r4} pop {r0} @@ -229701,8 +229701,8 @@ _08071190: _08071198: .4byte gUnknown_2037C74 _0807119C: .4byte sub_080711A8 _080711A0: .4byte gUnknown_3005B0C -_080711A4: .4byte sub_080AEA64 - thumb_func_end sub_08071168 +_080711A4: .4byte FieldCallback_ReturnToEventScript2 + thumb_func_end Task_EggHatch thumb_func_start sub_080711A8 sub_080711A8: @ 0x080711A8 @@ -229743,7 +229743,7 @@ _080711F4: movs r0, #0x14 bl sub_08000BC8 str r0, [r4] - bl sub_0805EBD8 + bl AllocateMonSpritesGfx ldr r2, [r4] ldr r0, _080712B0 ldrh r0, [r0] @@ -229752,7 +229752,7 @@ _080711F4: ldr r0, [r4] strb r1, [r0, #7] ldr r0, _080712B4 - bl sub_080006F0 + bl SetVBlankCallback bl sub_080A27CC ldr r1, _080712B8 strh r0, [r1] @@ -229766,52 +229766,52 @@ _080711F4: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #0x80 lsls r0, r0, #5 bl sub_08000BC8 adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0x80 lsls r0, r0, #6 bl sub_08000BC8 adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer bl sub_08004480 bl ResetPaletteFade bl FreeAllSpritePalettes bl ResetSpriteData - bl sub_080A8818 - bl sub_080B9710 + bl ResetTasks + bl ScanlineEffect_Stop bl m4aSoundVSyncOn b _080713AA .align 2, 0 _080712AC: .4byte gUnknown_3000DE0 _080712B0: .4byte gUnknown_2037280 -_080712B4: .4byte sub_08071134 +_080712B4: .4byte VBlankCB_EggHatch _080712B8: .4byte gUnknown_2037282 _080712BC: .4byte gUnknown_82FCA5C _080712C0: ldr r0, _080712D0 - bl sub_08003090 + bl InitWindows ldr r0, _080712D4 ldr r1, [r0] movs r0, #0 @@ -229827,25 +229827,25 @@ _080712D8: str r0, [sp] movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _08071300 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r0, _08071304 movs r1, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _080713AA .align 2, 0 _08071300: .4byte gUnknown_8C00530 _08071304: .4byte gUnknown_8C004EC _08071308: ldr r0, _0807131C - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _08071320 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _08071324 bl LoadSpritePalette b _080713AA @@ -229855,11 +229855,11 @@ _08071320: .4byte gUnknown_82FC9E4 _08071324: .4byte gUnknown_82FC9EC _08071328: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0807133C ldr r0, [r0] ldrb r0, [r0, #4] - bl sub_08070ED0 + bl AddHatchedMonToParty b _080713AA .align 2, 0 _0807133C: .4byte gUnknown_3000DE0 @@ -229870,7 +229870,7 @@ _08071340: adds r3, #0xc movs r0, #0 movs r1, #0 - bl sub_08071044 + bl EggHatchCreateMonSprite b _080713AA .align 2, 0 _08071354: .4byte gUnknown_3000DE0 @@ -229881,7 +229881,7 @@ _08071358: adds r3, #0xc movs r0, #0 movs r1, #1 - bl sub_08071044 + bl EggHatchCreateMonSprite ldr r1, [r4] strb r0, [r1, #1] b _080713AA @@ -229895,7 +229895,7 @@ _08071374: ldr r0, _080713BC movs r1, #0x10 movs r2, #0xa0 - bl sub_080A1200 + bl LoadPalette ldr r1, _080713C0 movs r2, #0x98 lsls r2, r2, #5 @@ -229907,9 +229907,9 @@ _08071374: lsls r2, r2, #5 movs r0, #1 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080713AA: ldr r1, _080713C8 movs r0, #0x87 @@ -229926,28 +229926,28 @@ _080713C4: .4byte gUnknown_8304D04 _080713C8: .4byte gUnknown_3002360 _080713CC: ldr r0, _080713F8 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080713FC ldr r1, [r0] movs r0, #0 strb r0, [r1, #2] _080713DA: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4} pop {r0} bx r0 .align 2, 0 -_080713F8: .4byte sub_08071498 +_080713F8: .4byte CB2_EggHatch_1 _080713FC: .4byte gUnknown_3000DE0 thumb_func_end sub_080711A8 - thumb_func_start sub_08071400 -sub_08071400: @ 0x08071400 + thumb_func_start EggHatchSetMonNickname +EggHatchSetMonNickname: @ 0x08071400 push {lr} ldr r0, _0807142C ldrh r1, [r0] @@ -229957,13 +229957,13 @@ sub_08071400: @ 0x08071400 adds r0, r0, r1 ldr r2, _08071434 movs r1, #2 - bl sub_0806A774 - bl sub_0805ECB0 + bl SetMonData + bl FreeMonSpritesGfx ldr r0, _08071438 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _0807143C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -229972,10 +229972,10 @@ _08071430: .4byte gUnknown_2024190 _08071434: .4byte gUnknown_2021C68 _08071438: .4byte gUnknown_3000DE0 _0807143C: .4byte sub_08085A30 - thumb_func_end sub_08071400 + thumb_func_end EggHatchSetMonNickname - thumb_func_start sub_08071440 -sub_08071440: @ 0x08071440 + thumb_func_start Task_EggHatchPlayBGM +Task_EggHatchPlayBGM: @ 0x08071440 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -229988,8 +229988,8 @@ sub_08071440: @ 0x08071440 ldrsh r0, [r4, r1] cmp r0, #0 bne _08071460 - bl sub_080A27F8 - bl sub_080ABC74 + bl StopMapMusic + bl PlayRainStoppingSoundEffect _08071460: movs r1, #8 ldrsh r0, [r4, r1] @@ -229997,16 +229997,16 @@ _08071460: bne _08071470 movs r0, #0xbc lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM _08071470: movs r1, #8 ldrsh r0, [r4, r1] cmp r0, #0x3c ble _08071484 ldr r0, _08071494 - bl sub_080A3040 + bl PlayBGM adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08071484: ldrh r0, [r4, #8] adds r0, #1 @@ -230017,10 +230017,10 @@ _08071484: .align 2, 0 _08071490: .4byte gUnknown_3005B60 _08071494: .4byte 0x00000179 - thumb_func_end sub_08071440 + thumb_func_end Task_EggHatchPlayBGM - thumb_func_start sub_08071498 -sub_08071498: @ 0x08071498 + thumb_func_start CB2_EggHatch_1 +CB2_EggHatch_1: @ 0x08071498 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -230063,31 +230063,31 @@ _080714F8: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08071538 movs r1, #0x78 movs r2, #0x4b movs r3, #5 - bl sub_08006B0C + bl CreateSprite ldr r4, _0807153C ldr r1, [r4] strb r0, [r1] movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg ldr r1, [r4] ldrb r0, [r1, #2] adds r0, #1 strb r0, [r1, #2] ldr r0, _08071540 movs r1, #5 - bl sub_080A8878 + bl CreateTask b _08071816 .align 2, 0 _08071538: .4byte gUnknown_82FC9F4 _0807153C: .4byte gUnknown_3000DE0 -_08071540: .4byte sub_08071440 +_08071540: .4byte Task_EggHatchPlayBGM _08071544: ldr r0, _08071568 ldrb r1, [r0, #7] @@ -230102,7 +230102,7 @@ _08071556: ldr r0, [r5] ldrb r0, [r0, #8] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r5] strb r4, [r0, #3] ldr r1, [r5] @@ -230137,7 +230137,7 @@ _0807157E: b _08071816 .align 2, 0 _0807159C: .4byte gUnknown_20205AC -_080715A0: .4byte sub_08071844 +_080715A0: .4byte SpriteCB_Egg_0 _080715A4: ldr r4, _080715F0 ldr r2, [r5] @@ -230160,7 +230160,7 @@ _080715C0: ldr r1, _080715F8 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldr r0, [r5] @@ -230172,7 +230172,7 @@ _080715C0: adds r1, r7, #0 movs r2, #0 movs r3, #1 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation ldr r1, [r5] b _080717D8 .align 2, 0 @@ -230213,7 +230213,7 @@ _08071628: ldr r4, _08071680 ldr r1, _08071684 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, [r5] ldrb r0, [r0, #8] movs r1, #0xff @@ -230221,20 +230221,20 @@ _08071628: adds r1, r4, #0 movs r2, #0 movs r3, #3 - bl sub_08071C24 + bl EggHatchPrintMessage ldr r0, _08071688 - bl sub_080A29AC + bl PlayFanfare ldr r1, [r5] ldrb r0, [r1, #2] adds r0, #1 strb r0, [r1, #2] ldr r0, [r5] ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _08071816 .align 2, 0 _08071678: .4byte gUnknown_2024190 @@ -230243,7 +230243,7 @@ _08071680: .4byte gUnknown_2021C7C _08071684: .4byte gUnknown_85CC874 _08071688: .4byte 0x00000173 _0807168C: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 bne _08071698 @@ -230251,7 +230251,7 @@ _0807168C: _08071698: b _080717D4 _0807169A: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 bne _080716A6 @@ -230270,7 +230270,7 @@ _080716A8: ldr r4, _080716E4 ldr r1, _080716E8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, [r5] ldrb r0, [r0, #8] movs r1, #1 @@ -230278,7 +230278,7 @@ _080716A8: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_08071C24 + bl EggHatchPrintMessage ldr r1, [r5] b _080717D8 .align 2, 0 @@ -230351,7 +230351,7 @@ _0807174C: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 mov r1, r8 @@ -230359,7 +230359,7 @@ _0807174C: ldrb r0, [r0, #4] muls r0, r6, r0 adds r0, r0, r5 - bl sub_08069AF4 + bl GetMonGender adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -230370,7 +230370,7 @@ _0807174C: adds r0, r0, r5 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldr r0, _080717C0 str r0, [sp, #4] @@ -230378,13 +230378,13 @@ _0807174C: mov r1, sb adds r2, r7, #0 adds r3, r4, #0 - bl sub_080E2244 + bl DoNamingScreen b _08071816 .align 2, 0 _080717B4: .4byte gUnknown_3000DE0 _080717B8: .4byte gUnknown_2024190 _080717BC: .4byte gUnknown_2021C68 -_080717C0: .4byte sub_08071400 +_080717C0: .4byte EggHatchSetMonNickname _080717C4: movs r0, #1 rsbs r0, r0, #0 @@ -230392,7 +230392,7 @@ _080717C4: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _080717D4: ldr r0, _080717E0 ldr r1, [r0] @@ -230410,25 +230410,25 @@ _080717E4: ands r0, r1 cmp r0, #0 bne _08071816 - bl sub_0805ECB0 + bl FreeMonSpritesGfx ldr r4, _0807183C ldr r0, [r4] ldrb r0, [r0, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer ldr r0, [r4] - bl sub_08000BF0 + bl Free ldr r0, _08071840 - bl sub_08000540 + bl SetMainCallback2 _08071816: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #0xc pop {r3, r4} mov r8, r3 @@ -230440,10 +230440,10 @@ _08071816: _08071838: .4byte gUnknown_2037C74 _0807183C: .4byte gUnknown_3000DE0 _08071840: .4byte sub_08085A30 - thumb_func_end sub_08071498 + thumb_func_end CB2_EggHatch_1 - thumb_func_start sub_08071844 -sub_08071844: @ 0x08071844 + thumb_func_start SpriteCB_Egg_0 +SpriteCB_Egg_0: @ 0x08071844 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -230459,7 +230459,7 @@ sub_08071844: @ 0x08071844 strh r0, [r4, #0x2e] b _08071894 .align 2, 0 -_08071860: .4byte sub_0807189C +_08071860: .4byte SpriteCB_Egg_1 _08071864: ldrh r0, [r4, #0x30] adds r0, #0x14 @@ -230480,16 +230480,16 @@ _08071864: adds r0, r4, #0 movs r1, #1 bl StartSpriteAnim - bl sub_08071B50 + bl CreateRandomEggShardSprite _08071894: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08071844 + thumb_func_end SpriteCB_Egg_0 - thumb_func_start sub_0807189C -sub_0807189C: @ 0x0807189C + thumb_func_start SpriteCB_Egg_1 +SpriteCB_Egg_1: @ 0x0807189C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x32] @@ -230513,7 +230513,7 @@ sub_0807189C: @ 0x0807189C strh r1, [r4, #0x32] b _080718F8 .align 2, 0 -_080718C8: .4byte sub_08071900 +_080718C8: .4byte SpriteCB_Egg_2 _080718CC: ldrh r0, [r4, #0x30] adds r0, #0x14 @@ -230539,10 +230539,10 @@ _080718F8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0807189C + thumb_func_end SpriteCB_Egg_1 - thumb_func_start sub_08071900 -sub_08071900: @ 0x08071900 + thumb_func_start SpriteCB_Egg_2 +SpriteCB_Egg_2: @ 0x08071900 push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x32] @@ -230571,7 +230571,7 @@ sub_08071900: @ 0x08071900 ldr r1, _08071964 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldr r3, _08071968 ldr r2, [r4] ldrb r1, [r2, #1] @@ -230612,8 +230612,8 @@ _0807196C: adds r0, r4, #0 movs r1, #2 bl StartSpriteAnim - bl sub_08071B50 - bl sub_08071B50 + bl CreateRandomEggShardSprite + bl CreateRandomEggShardSprite _080719A0: movs r1, #0x2e ldrsh r0, [r4, r1] @@ -230625,7 +230625,7 @@ _080719AE: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08071900 + thumb_func_end SpriteCB_Egg_2 thumb_func_start SpriteCB_Egg_3 SpriteCB_Egg_3: @ 0x080719B4 @@ -230646,11 +230646,11 @@ _080719CE: pop {r0} bx r0 .align 2, 0 -_080719D4: .4byte sub_080719D8 +_080719D4: .4byte SpriteCB_Egg_4 thumb_func_end SpriteCB_Egg_3 - thumb_func_start sub_080719D8 -sub_080719D8: @ 0x080719D8 + thumb_func_start SpriteCB_Egg_4 +SpriteCB_Egg_4: @ 0x080719D8 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -230665,14 +230665,14 @@ sub_080719D8: @ 0x080719D8 adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _080719F8: ldrh r0, [r5, #0x2e] cmp r0, #3 bhi _08071A14 movs r4, #0 _08071A00: - bl sub_08071B50 + bl CreateRandomEggShardSprite lsls r0, r4, #0x10 movs r1, #0x80 lsls r1, r1, #9 @@ -230712,11 +230712,11 @@ _08071A42: .align 2, 0 _08071A4C: .4byte 0x0000FFFF _08071A50: .4byte gUnknown_2037C74 -_08071A54: .4byte sub_08071A58 - thumb_func_end sub_080719D8 +_08071A54: .4byte SpriteCB_Egg_5 + thumb_func_end SpriteCB_Egg_4 - thumb_func_start sub_08071A58 -sub_08071A58: @ 0x08071A58 + thumb_func_start SpriteCB_Egg_5 +SpriteCB_Egg_5: @ 0x08071A58 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -230758,7 +230758,7 @@ _08071A94: adds r0, r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _08071AAE: movs r1, #0x2e ldrsh r0, [r5, r1] @@ -230795,10 +230795,10 @@ _08071AE8: .4byte gUnknown_20205AC _08071AEC: .4byte gUnknown_3000DE0 _08071AF0: .4byte 0x0000FFFF _08071AF4: .4byte sub_08007140 - thumb_func_end sub_08071A58 + thumb_func_end SpriteCB_Egg_5 - thumb_func_start sub_08071AF8 -sub_08071AF8: @ 0x08071AF8 + thumb_func_start SpriteCB_EggShard +SpriteCB_EggShard: @ 0x08071AF8 push {r4, lr} adds r2, r0, #0 ldrh r0, [r2, #0x30] @@ -230845,10 +230845,10 @@ _08071B4A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08071AF8 + thumb_func_end SpriteCB_EggShard - thumb_func_start sub_08071B50 -sub_08071B50: @ 0x08071B50 + thumb_func_start CreateRandomEggShardSprite +CreateRandomEggShardSprite: @ 0x08071B50 push {r4, r5, r6, lr} sub sp, #8 ldr r2, _08071B9C @@ -230880,7 +230880,7 @@ sub_08071B50: @ 0x08071B50 movs r1, #0x3c adds r2, r5, #0 adds r3, r4, #0 - bl sub_08071BA4 + bl CreateEggShardSprite add sp, #8 pop {r4, r5, r6} pop {r0} @@ -230888,10 +230888,10 @@ sub_08071B50: @ 0x08071B50 .align 2, 0 _08071B9C: .4byte gUnknown_82FCA7C _08071BA0: .4byte gUnknown_3000DE0 - thumb_func_end sub_08071B50 + thumb_func_end CreateRandomEggShardSprite - thumb_func_start sub_08071BA4 -sub_08071BA4: @ 0x08071BA4 + thumb_func_start CreateEggShardSprite +CreateEggShardSprite: @ 0x08071BA4 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -230927,7 +230927,7 @@ sub_08071BA4: @ 0x08071BA4 adds r1, r4, #0 adds r2, r5, #0 movs r3, #4 - bl sub_08006B0C + bl CreateSprite adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -230953,10 +230953,10 @@ sub_08071BA4: @ 0x08071BA4 .align 2, 0 _08071C1C: .4byte gUnknown_82FCA44 _08071C20: .4byte gUnknown_20205AC - thumb_func_end sub_08071BA4 + thumb_func_end CreateEggShardSprite - thumb_func_start sub_08071C24 -sub_08071C24: @ 0x08071C24 + thumb_func_start EggHatchPrintMessage +EggHatchPrintMessage: @ 0x08071C24 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -230979,7 +230979,7 @@ sub_08071C24: @ 0x08071C24 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r3, _08071C98 ldr r0, [r3] movs r2, #0 @@ -231004,7 +231004,7 @@ sub_08071C24: @ 0x08071C24 movs r1, #1 adds r2, r6, #0 mov r3, r8 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r3, r4} mov r8, r3 @@ -231014,10 +231014,10 @@ sub_08071C24: @ 0x08071C24 bx r0 .align 2, 0 _08071C98: .4byte gUnknown_3000DE0 - thumb_func_end sub_08071C24 + thumb_func_end EggHatchPrintMessage - thumb_func_start sub_08071C9C -sub_08071C9C: @ 0x08071C9C + thumb_func_start GetEggStepsToSubtract +GetEggStepsToSubtract: @ 0x08071C9C push {r4, r5, r6, lr} bl sub_0806B004 lsls r0, r0, #0x18 @@ -231033,11 +231033,11 @@ _08071CAC: adds r4, r1, r0 adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08071CDC adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x28 @@ -231062,17 +231062,17 @@ _08071CE8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08071C9C + thumb_func_end GetEggStepsToSubtract thumb_func_start sub_08071CF0 sub_08071CF0: @ 0x08071CF0 push {r4, lr} - bl sub_080D1B70 + bl CountStorageNonEggMons adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 movs r0, #6 - bl sub_080C68DC + bl CountPartyAliveNonEggMonsExcept lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r4, r4, r0 @@ -231084,11 +231084,11 @@ sub_08071CF0: @ 0x08071CF0 bx r1 thumb_func_end sub_08071CF0 - thumb_func_start sub_08071D14 -sub_08071D14: @ 0x08071D14 + thumb_func_start DummiedOutFunction +DummiedOutFunction: @ 0x08071D14 movs r0, #9 bx lr - thumb_func_end sub_08071D14 + thumb_func_end DummiedOutFunction thumb_func_start sub_08071D18 sub_08071D18: @ 0x08071D18 @@ -231342,8 +231342,8 @@ sub_08071EB8: @ 0x08071EB8 .align 2, 0 thumb_func_end sub_08071EB8 - thumb_func_start sub_08071EEC -sub_08071EEC: @ 0x08071EEC + thumb_func_start CreateBattlerHealthboxSprites +CreateBattlerHealthboxSprites: @ 0x08071EEC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -231355,12 +231355,12 @@ sub_08071EEC: @ 0x08071EEC mov sl, r0 movs r0, #0 str r0, [sp] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08072000 mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08071F84 @@ -231369,14 +231369,14 @@ sub_08071EEC: @ 0x08071EEC movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r4, #0 movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r4, _08071F78 @@ -231419,14 +231419,14 @@ _08071F84: movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r4, #0 movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _08071FF0 @@ -231472,7 +231472,7 @@ _08071FF8: .4byte 0xFFFFFC00 _08071FFC: .4byte SpriteCB_HealthBoxOther _08072000: mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080720A4 @@ -231489,7 +231489,7 @@ _08072000: movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 mov r0, sl @@ -231504,7 +231504,7 @@ _08072000: movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r4, _08072094 @@ -231558,7 +231558,7 @@ _080720A4: movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 mov r0, sl @@ -231573,7 +231573,7 @@ _080720A4: movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r4, _080721F0 @@ -231620,7 +231620,7 @@ _08072128: movs r1, #0x8c movs r2, #0x3c movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -231631,14 +231631,14 @@ _08072128: mov r8, r1 add r4, r8 mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x15 ldr r0, _08072208 adds r1, r1, r0 adds r0, r4, #0 - bl sub_0800858C + bl SetSubspriteTables adds r2, r4, #0 adds r2, #0x42 ldrb r1, [r2] @@ -231657,7 +231657,7 @@ _08072128: orrs r0, r1 strb r0, [r4, #5] movs r0, #1 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr ldrh r1, [r4, #4] lsls r1, r1, #0x16 lsrs r1, r1, #0x11 @@ -231713,10 +231713,10 @@ _08072204: .4byte gUnknown_82FCBB8 _08072208: .4byte gUnknown_82FCC84 _0807220C: .4byte 0x06010000 _08072210: .4byte 0x04000010 - thumb_func_end sub_08071EEC + thumb_func_end CreateBattlerHealthboxSprites - thumb_func_start sub_08072214 -sub_08072214: @ 0x08072214 + thumb_func_start CreateSafariPlayerHealthboxSprites +CreateSafariPlayerHealthboxSprites: @ 0x08072214 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -231726,7 +231726,7 @@ sub_08072214: @ 0x08072214 movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -231734,7 +231734,7 @@ sub_08072214: @ 0x08072214 movs r1, #0xf0 movs r2, #0xa0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080722A4 @@ -231790,10 +231790,10 @@ _080722A4: .4byte gUnknown_20205AC _080722A8: .4byte 0x000003FF _080722AC: .4byte 0xFFFFFC00 _080722B0: .4byte SpriteCB_HealthBoxOther - thumb_func_end sub_08072214 + thumb_func_end CreateSafariPlayerHealthboxSprites - thumb_func_start sub_080722B4 -sub_080722B4: @ 0x080722B4 + thumb_func_start GetHealthboxElementGfxPtr +GetHealthboxElementGfxPtr: @ 0x080722B4 lsls r0, r0, #0x18 lsrs r0, r0, #0x13 ldr r1, _080722C0 @@ -231801,10 +231801,10 @@ sub_080722B4: @ 0x080722B4 bx lr .align 2, 0 _080722C0: .4byte gUnknown_8C11BE4 - thumb_func_end sub_080722B4 + thumb_func_end GetHealthboxElementGfxPtr - thumb_func_start sub_080722C4 -sub_080722C4: @ 0x080722C4 + thumb_func_start SpriteCB_HealthBar +SpriteCB_HealthBar: @ 0x080722C4 push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x38] @@ -231863,7 +231863,7 @@ _08072316: bx r0 .align 2, 0 _08072330: .4byte gUnknown_20205AC - thumb_func_end sub_080722C4 + thumb_func_end SpriteCB_HealthBar thumb_func_start SpriteCB_HealthBoxOther SpriteCB_HealthBoxOther: @ 0x08072334 @@ -232025,8 +232025,8 @@ UpdateSpritePos: @ 0x08072434 _08072450: .4byte gUnknown_20205AC thumb_func_end UpdateSpritePos - thumb_func_start sub_08072454 -sub_08072454: @ 0x08072454 + thumb_func_start DestoryHealthboxSprite +DestoryHealthboxSprite: @ 0x08072454 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -232055,7 +232055,7 @@ sub_08072454: @ 0x08072454 bx r0 .align 2, 0 _08072490: .4byte gUnknown_20205AC - thumb_func_end sub_08072454 + thumb_func_end DestoryHealthboxSprite thumb_func_start sub_08072494 sub_08072494: @ 0x08072494 @@ -232139,19 +232139,19 @@ _08072520: .4byte gUnknown_20205AC _08072524: .4byte gUnknown_3005AD0 thumb_func_end UpdateOamPriorityInAllHealthboxes - thumb_func_start sub_08072528 -sub_08072528: @ 0x08072528 + thumb_func_start InitBattlerHealthboxCoords +InitBattlerHealthboxCoords: @ 0x08072528 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r5, #0 movs r4, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08072554 adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0807254E @@ -232207,7 +232207,7 @@ _0807258C: bx r0 .align 2, 0 _080725A0: .4byte gUnknown_3005AD0 - thumb_func_end sub_08072528 + thumb_func_end InitBattlerHealthboxCoords thumb_func_start sub_080725A4 sub_080725A4: @ 0x080725A4 @@ -232224,7 +232224,7 @@ sub_080725A4: @ 0x080725A4 mov r0, sp movs r2, #0x1e bl memcpy - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _080725F4 @@ -232236,7 +232236,7 @@ sub_080725A4: @ 0x080725A4 ldrh r0, [r0, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r5, #0x28 adds r7, r4, #0 @@ -232256,7 +232256,7 @@ _080725F4: ldrh r0, [r0, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r5, #0x28 adds r7, r4, #0 @@ -232280,7 +232280,7 @@ _08072614: _08072630: .4byte gUnknown_20205AC _08072634: movs r0, #0x2a - bl sub_080722B4 + bl GetHealthboxElementGfxPtr ldr r2, _080726E0 adds r1, r7, r6 lsls r1, r1, #2 @@ -232322,7 +232322,7 @@ _0807267E: ldr r0, [r0] movs r1, #7 mov r2, sp - bl sub_08005F7C + bl RenderTextFont9 movs r4, #0 cmp r4, r8 bhs _080726D2 @@ -232395,13 +232395,13 @@ sub_080726F4: @ 0x080726F4 ldrh r0, [r7, #0x3a] lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0807273E adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -232412,7 +232412,7 @@ _0807273E: asrs r1, r1, #0x10 adds r0, r6, #0 adds r2, r5, #0 - bl sub_080727FC + bl SwapHpBarsWithHpText b _080727DE .align 2, 0 _08072750: .4byte gUnknown_82FCDDA @@ -232421,7 +232421,7 @@ _08072758: ldrh r0, [r7, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08072772 @@ -232452,7 +232452,7 @@ _0807277A: ldr r0, [r0] movs r1, #7 mov r2, sp - bl sub_08005F7C + bl RenderTextFont9 movs r4, #0 lsls r0, r6, #4 ldr r1, _080727F0 @@ -232498,8 +232498,8 @@ _080727F4: .4byte 0x06010000 _080727F8: .4byte 0x04000008 thumb_func_end sub_080726F4 - thumb_func_start sub_080727FC -sub_080727FC: @ 0x080727FC + thumb_func_start SwapHpBarsWithHpText +SwapHpBarsWithHpText: @ 0x080727FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -232571,7 +232571,7 @@ _0807287C: ldr r0, [r0] movs r1, #7 mov r2, sp - bl sub_08005F7C + bl RenderTextFont9 adds r4, r6, #0 adds r0, r4, #3 cmp r4, r0 @@ -232682,12 +232682,12 @@ _08072978: .4byte 0x06010000 _0807297C: .4byte 0x05000008 _08072980: mov r0, sl - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080729B4 movs r0, #0x74 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr ldr r2, _080729C4 mov r3, sb lsls r1, r3, #4 @@ -232717,10 +232717,10 @@ _080729B4: _080729C4: .4byte gUnknown_20205AC _080729C8: .4byte 0x06010000 _080729CC: .4byte 0x04000008 - thumb_func_end sub_080727FC + thumb_func_end SwapHpBarsWithHpText - thumb_func_start sub_080729D0 -sub_080729D0: @ 0x080729D0 + thumb_func_start PrintSafariMonInfo +PrintSafariMonInfo: @ 0x080729D0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -232763,7 +232763,7 @@ sub_080729D0: @ 0x080729D0 movs r1, #5 mov r8, r1 adds r0, r4, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 mov r4, sp adds r4, #6 @@ -232776,7 +232776,7 @@ sub_080729D0: @ 0x080729D0 adds r0, r6, #0 movs r1, #7 mov r2, sp - bl sub_08005F7C + bl RenderTextFont9 movs r7, #6 movs r5, #0 mov r2, sp @@ -232825,7 +232825,7 @@ _08072AA0: _08072AA4: movs r0, #0x2b _08072AA6: - bl sub_080722B4 + bl GetHealthboxElementGfxPtr lsls r1, r5, #6 adds r1, r6, r1 ldr r2, _08072BBC @@ -232932,7 +232932,7 @@ _08072B32: ldr r0, [r0] movs r1, #7 mov r2, sp - bl sub_08005F7C + bl RenderTextFont9 movs r7, #0 lsls r0, r4, #4 adds r0, r0, r4 @@ -232997,7 +232997,7 @@ _08072BF0: .align 2, 0 _08072C08: .4byte 0x060100C0 _08072C0C: .4byte 0x04000008 - thumb_func_end sub_080729D0 + thumb_func_end PrintSafariMonInfo thumb_func_start sub_08072C10 sub_08072C10: @ 0x08072C10 @@ -233040,19 +233040,19 @@ _08072C50: lsls r0, r2, #0x18 lsrs r7, r0, #0x18 adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08072C66 b _08072EA4 _08072C66: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08072C7E adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08072C7E @@ -233086,11 +233086,11 @@ _08072C7E: lsls r0, r0, #0x1b lsrs r4, r0, #0x1f adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08072DAC - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08072CCC @@ -233135,13 +233135,13 @@ _08072CDA: ldr r1, _08072D60 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 asrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0 - bl sub_080727FC + bl SwapHpBarsWithHpText ldrb r4, [r6] mov r2, r8 ldrh r0, [r2] @@ -233162,7 +233162,7 @@ _08072D5C: .4byte 0x05000040 _08072D60: .4byte gUnknown_2024190 _08072D64: ldrb r0, [r6] - bl sub_08073E68 + bl UpdateStatusIconInHealthbox ldrb r0, [r6] mov r2, r8 ldrh r1, [r2] @@ -233171,9 +233171,9 @@ _08072D64: ldr r2, _08072DA0 adds r1, r1, r2 movs r2, #5 - bl sub_080743F0 + bl UpdateHealthboxAttribute movs r0, #0x75 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr ldrb r2, [r6] lsls r1, r2, #4 adds r1, r1, r2 @@ -233207,7 +233207,7 @@ _08072DAC: muls r1, r2, r1 ldr r2, _08072DD4 adds r1, r1, r2 - bl sub_080729D0 + bl PrintSafariMonInfo b _08072E8E .align 2, 0 _08072DD0: .4byte gUnknown_2022C90 @@ -233242,13 +233242,13 @@ _08072DD8: ldr r1, _08072E54 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 asrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0 - bl sub_080727FC + bl SwapHpBarsWithHpText ldrb r4, [r6] mov r2, r8 ldrh r0, [r2] @@ -233258,13 +233258,13 @@ _08072DD8: _08072E32: adds r0, r0, r2 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 asrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #1 - bl sub_080727FC + bl SwapHpBarsWithHpText b _08072E8E .align 2, 0 _08072E4C: .4byte 0x06010000 @@ -233272,7 +233272,7 @@ _08072E50: .4byte 0x05000040 _08072E54: .4byte gUnknown_20243E8 _08072E58: ldrb r0, [r6] - bl sub_08073E68 + bl UpdateStatusIconInHealthbox ldrb r0, [r6] mov r2, r8 ldrh r1, [r2] @@ -233281,7 +233281,7 @@ _08072E58: ldr r4, _08072EC8 adds r1, r1, r4 movs r2, #5 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldr r0, _08072ECC ldr r0, [r0] movs r1, #0x80 @@ -233294,7 +233294,7 @@ _08072E58: muls r1, r5, r1 adds r1, r1, r4 movs r2, #4 - bl sub_080743F0 + bl UpdateHealthboxAttribute _08072E8E: ldr r0, _08072ED0 add r0, sb @@ -233333,8 +233333,8 @@ _08072ED0: .4byte gUnknown_3005AD0 _08072ED4: .4byte gUnknown_2023D10 thumb_func_end sub_08072C10 - thumb_func_start sub_08072ED8 -sub_08072ED8: @ 0x08072ED8 + thumb_func_start CreatePartyStatusSummarySprites +CreatePartyStatusSummarySprites: @ 0x08072ED8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -233360,7 +233360,7 @@ sub_08072ED8: @ 0x08072ED8 beq _08072F58 _08072F08: ldr r0, [sp, #8] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08072F2C @@ -233380,7 +233380,7 @@ _08072F2C: mov sb, r3 cmp r4, #0 beq _08072F3E - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08072F44 @@ -233410,9 +233410,9 @@ _08072F58: mov r8, r3 _08072F68: ldr r0, _08072FE0 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _08072FE4 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _08072FE8 bl LoadSpritePalette ldr r0, _08072FEC @@ -233428,7 +233428,7 @@ _08072F68: lsls r4, r4, #0x10 asrs r2, r4, #0x10 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x14] @@ -233440,7 +233440,7 @@ _08072F68: adds r7, r0, r1 ldr r1, _08072FF8 adds r0, r7, #0 - bl sub_0800858C + bl SetSubspriteTables mov r2, sl strh r2, [r7, #0x24] mov r3, r8 @@ -233497,7 +233497,7 @@ _08073018: asrs r1, r3, #0x10 asrs r2, r2, #0x10 movs r3, #9 - bl sub_08006B60 + bl CreateSpriteAtEnd strb r0, [r7] ldr r0, [sp, #0x10] cmp r0, #0 @@ -233623,7 +233623,7 @@ _08073106: b _08073018 _08073128: ldr r0, [sp, #8] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08073136 @@ -234067,7 +234067,7 @@ _0807348E: _08073496: ldr r0, _08073520 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r2, _08073524 @@ -234124,7 +234124,7 @@ _080734C2: _08073506: movs r0, #0x72 movs r1, #0 - bl sub_080A307C + bl PlaySE12WithPanning adds r0, r4, #0 add sp, #0x24 pop {r3, r4, r5} @@ -234138,10 +234138,10 @@ _08073506: _08073520: .4byte sub_080A8A40 _08073524: .4byte gUnknown_3005B60 _08073528: .4byte gUnknown_2024174 - thumb_func_end sub_08072ED8 + thumb_func_end CreatePartyStatusSummarySprites - thumb_func_start sub_0807352C -sub_0807352C: @ 0x0807352C + thumb_func_start Task_HidePartyStatusSummary +Task_HidePartyStatusSummary: @ 0x0807352C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -234238,7 +234238,7 @@ _080735D6: _080735E4: ldr r0, [sp, #8] str r3, [sp, #0x14] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r3, [sp, #0x14] @@ -234335,7 +234335,7 @@ _0807367E: ldr r1, _080736CC str r1, [r3] ldr r1, _080736D0 - bl sub_0800858C + bl SetSubspriteTables ldr r1, _080736D4 ldr r0, [sp, #0xc] add r0, r8 @@ -234371,7 +234371,7 @@ _080736EA: .align 2, 0 _080736FC: .4byte gUnknown_3005B60 _08073700: .4byte sub_08073894 - thumb_func_end sub_0807352C + thumb_func_end Task_HidePartyStatusSummary thumb_func_start sub_08073704 sub_08073704: @ 0x08073704 @@ -234563,7 +234563,7 @@ _08073850: movs r1, #0 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08073886: add sp, #8 pop {r4, r5, r6, r7} @@ -234676,7 +234676,7 @@ _08073930: movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08073966: add sp, #8 pop {r4, r5, r6, r7} @@ -234735,8 +234735,8 @@ _080739B2: bx r0 thumb_func_end sub_0807398C - thumb_func_start sub_080739C0 -sub_080739C0: @ 0x080739C0 + thumb_func_start SpriteCB_StatusSummaryBallsOnBattleStart +SpriteCB_StatusSummaryBallsOnBattleStart: @ 0x080739C0 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x30] @@ -234815,7 +234815,7 @@ _08073A4A: bx r0 .align 2, 0 _08073A50: .4byte sub_08007140 - thumb_func_end sub_080739C0 + thumb_func_end SpriteCB_StatusSummaryBallsOnBattleStart thumb_func_start sub_08073A54 sub_08073A54: @ 0x08073A54 @@ -234920,20 +234920,20 @@ sub_08073AE4: @ 0x08073AE4 adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 adds r0, r5, #0 mov r1, sp bl StringAppend adds r7, r0, #0 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r2, r0, #0 @@ -235026,7 +235026,7 @@ _08073B7E: adds r0, r7, #0 movs r1, #7 adds r2, r4, #0 - bl sub_08005F7C + bl RenderTextFont9 movs r6, #3 cmp sb, r8 bhs _08073C72 @@ -235074,7 +235074,7 @@ _08073C4C: _08073C50: movs r0, #0x2b _08073C52: - bl sub_080722B4 + bl GetHealthboxElementGfxPtr mov r2, sb lsls r1, r2, #6 adds r1, r7, r1 @@ -235097,11 +235097,11 @@ _08073C72: ldrh r0, [r4, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08073CF4 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _08073CF4 @@ -235158,7 +235158,7 @@ _08073CF4: ldrh r0, [r5, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08073D12 @@ -235220,8 +235220,8 @@ _08073D78: .4byte 0x06010000 _08073D7C: .4byte 0x04000008 thumb_func_end sub_08073AE4 - thumb_func_start sub_08073D80 -sub_08073D80: @ 0x08073D80 + thumb_func_start TryAddPokeballIconToHealthbox +TryAddPokeballIconToHealthbox: @ 0x08073D80 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -235248,7 +235248,7 @@ sub_08073D80: @ 0x08073D80 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08073E56 @@ -235261,14 +235261,14 @@ sub_08073D80: @ 0x08073D80 ldr r1, _08073E28 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0806CF68 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _08073E56 @@ -235278,7 +235278,7 @@ sub_08073D80: @ 0x08073D80 cmp r7, #0 beq _08073E34 movs r0, #0x46 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr lsls r1, r4, #4 adds r1, r1, r4 lsls r1, r1, #2 @@ -235326,10 +235326,10 @@ _08073E56: .align 2, 0 _08073E60: .4byte 0x06010000 _08073E64: .4byte 0x05000008 - thumb_func_end sub_08073D80 + thumb_func_end TryAddPokeballIconToHealthbox - thumb_func_start sub_08073E68 -sub_08073E68: @ 0x08073E68 + thumb_func_start UpdateStatusIconInHealthbox +UpdateStatusIconInHealthbox: @ 0x08073E68 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -235352,7 +235352,7 @@ sub_08073E68: @ 0x08073E68 lsrs r0, r0, #0x18 mov sl, r0 adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08073ED8 @@ -235365,9 +235365,9 @@ sub_08073E68: @ 0x08073E68 ldr r1, _08073ED4 adds r0, r0, r1 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 movs r3, #0x12 mov r8, r3 @@ -235390,7 +235390,7 @@ _08073ED8: ldr r1, _08073F18 adds r0, r0, r1 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 movs r1, #0x11 mov r8, r1 @@ -235401,10 +235401,10 @@ _08073EF4: beq _08073F1C movs r0, #0x1b adds r1, r7, #0 - bl sub_08074118 + bl GetStatusIconForBattlerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr adds r6, r0, #0 movs r0, #2 b _08074028 @@ -235418,10 +235418,10 @@ _08073F1C: beq _08073F3A movs r0, #0x15 adds r1, r7, #0 - bl sub_08074118 + bl GetStatusIconForBattlerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr adds r6, r0, #0 movs r0, #0 b _08074028 @@ -235432,10 +235432,10 @@ _08073F3A: beq _08073F58 movs r0, #0x21 adds r1, r7, #0 - bl sub_08074118 + bl GetStatusIconForBattlerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr adds r6, r0, #0 movs r0, #4 b _08074028 @@ -235446,10 +235446,10 @@ _08073F58: beq _08073F76 movs r0, #0x1e adds r1, r7, #0 - bl sub_08074118 + bl GetStatusIconForBattlerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr adds r6, r0, #0 movs r0, #3 b _08074028 @@ -235460,16 +235460,16 @@ _08073F76: beq _08073F94 movs r0, #0x18 adds r1, r7, #0 - bl sub_08074118 + bl GetStatusIconForBattlerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr adds r6, r0, #0 movs r0, #1 b _08074028 _08073F94: movs r0, #0x27 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr adds r6, r0, #0 movs r4, #0 mov r2, sb @@ -235509,7 +235509,7 @@ _08073FB2: cmp r0, #0 bne _08074008 movs r0, #1 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr ldr r2, _08074014 mov r3, sl lsls r1, r3, #4 @@ -235526,7 +235526,7 @@ _08073FB2: _08074008: mov r0, sb movs r1, #1 - bl sub_08073D80 + bl TryAddPokeballIconToHealthbox b _080740EA .align 2, 0 _08074014: .4byte gUnknown_20205AC @@ -235554,7 +235554,7 @@ _08074028: lsls r3, r3, #1 adds r1, r4, r3 movs r2, #2 - bl sub_080A1238 + bl FillPalette lsls r4, r4, #1 ldr r0, _08074100 adds r0, r4, r0 @@ -235574,13 +235574,13 @@ _08074028: ldr r2, _0807410C adds r0, r6, #0 bl CpuSet - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _08074096 adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -235597,7 +235597,7 @@ _08074096: cmp r0, #0 bne _080740E2 movs r0, #0 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr mov r3, sl lsls r4, r3, #4 add r4, sl @@ -235612,7 +235612,7 @@ _08074096: adds r2, r5, #0 bl CpuSet movs r0, #0x41 - bl sub_080722B4 + bl GetHealthboxElementGfxPtr ldrh r1, [r4, #4] lsls r1, r1, #0x16 lsrs r1, r1, #0x11 @@ -235623,7 +235623,7 @@ _08074096: _080740E2: mov r0, sb movs r1, #0 - bl sub_08073D80 + bl TryAddPokeballIconToHealthbox _080740EA: pop {r3, r4, r5} mov r8, r3 @@ -235641,10 +235641,10 @@ _08074108: .4byte 0x06010000 _0807410C: .4byte 0x04000018 _08074110: .4byte gUnknown_2024174 _08074114: .4byte 0x04000008 - thumb_func_end sub_08073E68 + thumb_func_end UpdateStatusIconInHealthbox - thumb_func_start sub_08074118 -sub_08074118: @ 0x08074118 + thumb_func_start GetStatusIconForBattlerId +GetStatusIconForBattlerId: @ 0x08074118 push {lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -235739,7 +235739,7 @@ _080741D8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08074118 + thumb_func_end GetStatusIconForBattlerId thumb_func_start sub_080741E0 sub_080741E0: @ 0x080741E0 @@ -235778,7 +235778,7 @@ sub_080741E0: @ 0x080741E0 mov r8, r1 ldr r2, _0807425C adds r0, r6, #0 - bl sub_08005F7C + bl RenderTextFont9 movs r7, #3 movs r4, #0 _08074230: @@ -235823,7 +235823,7 @@ _08074278: _0807427C: movs r0, #0x2b _0807427E: - bl sub_080722B4 + bl GetHealthboxElementGfxPtr lsls r1, r4, #6 adds r1, r6, r1 ldr r2, _08074314 @@ -235952,7 +235952,7 @@ sub_08074320: @ 0x08074320 adds r0, r7, #0 movs r1, #7 mov r2, r8 - bl sub_08005F7C + bl RenderTextFont9 adds r7, #0x20 movs r5, #4 _08074390: @@ -235998,8 +235998,8 @@ _080743E8: .4byte 0x06010000 _080743EC: .4byte 0x04000008 thumb_func_end sub_08074320 - thumb_func_start sub_080743F0 -sub_080743F0: @ 0x080743F0 + thumb_func_start UpdateHealthboxAttribute +UpdateHealthboxAttribute: @ 0x080743F0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -236022,12 +236022,12 @@ sub_080743F0: @ 0x080743F0 mov sb, r0 cmp r7, #0 bne _0807442C - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _0807442C mov r0, sb - bl sub_080A62F8 + bl GetBattlerSide _0807442C: ldr r1, _0807459C lsls r0, r6, #4 @@ -236037,7 +236037,7 @@ _0807442C: ldrh r0, [r0, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08074448 @@ -236050,7 +236050,7 @@ _08074448: _08074450: mov r0, r8 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -236061,7 +236061,7 @@ _08074464: bhi _0807447E mov r0, r8 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 asrs r1, r1, #0x10 @@ -236076,7 +236076,7 @@ _0807447E: _08074486: mov r0, r8 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 asrs r1, r1, #0x10 @@ -236090,14 +236090,14 @@ _0807449C: bne _080744D8 _080744A4: movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx mov r0, r8 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 movs r0, #0 str r0, [sp] @@ -236109,9 +236109,9 @@ _080744A4: adds r1, r6, #0 movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar _080744D8: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -236123,22 +236123,22 @@ _080744D8: bne _0807455E _080744EE: movs r0, #3 - bl sub_0805DDD4 + bl LoadBattleBarGfx mov r0, r8 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 mov r0, r8 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 mov r0, r8 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 ldr r0, _080745A0 mov ip, r0 @@ -236171,7 +236171,7 @@ _080744EE: adds r1, r6, #0 movs r2, #1 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar _0807455E: cmp r7, #4 beq _08074566 @@ -236188,7 +236188,7 @@ _0807456E: bne _0807457C _08074576: adds r0, r6, #0 - bl sub_08073E68 + bl UpdateStatusIconInHealthbox _0807457C: cmp r7, #0xa bne _08074586 @@ -236216,7 +236216,7 @@ _080745A8: _080745B0: mov r0, r8 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -236229,14 +236229,14 @@ _080745C4: bne _08074600 _080745CC: movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx mov r0, r8 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 mov r0, r8 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 movs r0, #0 str r0, [sp] @@ -236248,7 +236248,7 @@ _080745CC: adds r1, r6, #0 movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar _08074600: cmp r7, #4 beq _08074608 @@ -236265,7 +236265,7 @@ _08074610: bne _0807461E _08074618: adds r0, r6, #0 - bl sub_08073E68 + bl UpdateStatusIconInHealthbox _0807461E: add sp, #4 pop {r3, r4, r5} @@ -236276,10 +236276,10 @@ _0807461E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080743F0 + thumb_func_end UpdateHealthboxAttribute - thumb_func_start sub_08074630 -sub_08074630: @ 0x08074630 + thumb_func_start MoveBattleBar +MoveBattleBar: @ 0x08074630 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -236310,7 +236310,7 @@ sub_08074630: @ 0x08074630 str r4, [sp] movs r4, #1 str r4, [sp, #4] - bl sub_08074948 + bl CalcNewBarValue adds r4, r0, #0 adds r7, r5, #0 b _080746D8 @@ -236330,7 +236330,7 @@ _0807467C: ldr r1, [r2, #0xc] ldr r2, [r2, #4] movs r3, #8 - bl sub_08074B78 + bl GetScaledExpFraction lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r7, r4, #0 @@ -236360,7 +236360,7 @@ _080746BE: str r2, [sp] str r5, [sp, #4] adds r2, r6, #0 - bl sub_08074948 + bl CalcNewBarValue adds r4, r0, #0 _080746D8: mov r2, sb @@ -236380,7 +236380,7 @@ _080746D8: _080746F4: mov r0, r8 mov r1, sb - bl sub_0807472C + bl MoveBattleBarGraphically _080746FC: movs r0, #1 rsbs r0, r0, #0 @@ -236407,10 +236407,10 @@ _08074716: bx r1 .align 2, 0 _08074728: .4byte gUnknown_2024174 - thumb_func_end sub_08074630 + thumb_func_end MoveBattleBar - thumb_func_start sub_0807472C -sub_0807472C: @ 0x0807472C + thumb_func_start MoveBattleBarGraphically +MoveBattleBarGraphically: @ 0x0807472C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -236441,7 +236441,7 @@ _08074748: str r4, [sp] movs r4, #6 str r4, [sp, #4] - bl sub_08074A1C + bl CalcBarFilledPixels lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 @@ -236477,7 +236477,7 @@ _0807478A: cmp r5, #1 bhi _080747EC mov r0, sb - bl sub_080722B4 + bl GetHealthboxElementGfxPtr mov r1, sp adds r1, r1, r5 adds r1, #8 @@ -236506,7 +236506,7 @@ _080747E4: .4byte 0x06010000 _080747E8: .4byte 0x04000008 _080747EC: mov r0, sb - bl sub_080722B4 + bl GetHealthboxElementGfxPtr mov r1, sp adds r1, r1, r5 adds r1, #8 @@ -236552,7 +236552,7 @@ _08074830: str r4, [sp] movs r4, #8 str r4, [sp, #4] - bl sub_08074A1C + bl CalcBarFilledPixels ldr r1, _080748D8 lsls r0, r6, #1 adds r0, r0, r1 @@ -236562,7 +236562,7 @@ _08074830: ldr r1, _080748DC adds r0, r0, r1 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r7, r5, #0 @@ -236590,7 +236590,7 @@ _08074892: cmp r5, #3 bhi _080748EC movs r0, #0xc - bl sub_080722B4 + bl GetHealthboxElementGfxPtr mov r1, sp adds r1, r1, r5 adds r1, #8 @@ -236627,7 +236627,7 @@ _080748E4: .4byte 0x06010000 _080748E8: .4byte 0x04000008 _080748EC: movs r0, #0xc - bl sub_080722B4 + bl GetHealthboxElementGfxPtr mov r1, sp adds r1, r1, r5 adds r1, #8 @@ -236670,10 +236670,10 @@ _0807492E: _0807493C: .4byte gUnknown_2024174 _08074940: .4byte 0x06010B80 _08074944: .4byte 0x04000008 - thumb_func_end sub_0807472C + thumb_func_end MoveBattleBarGraphically - thumb_func_start sub_08074948 -sub_08074948: @ 0x08074948 + thumb_func_start CalcNewBarValue +CalcNewBarValue: @ 0x08074948 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -236794,10 +236794,10 @@ _08074A10: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08074948 + thumb_func_end CalcNewBarValue - thumb_func_start sub_08074A1C -sub_08074A1C: @ 0x08074A1C + thumb_func_start CalcBarFilledPixels +CalcBarFilledPixels: @ 0x08074A1C push {r4, r5, r6, r7, lr} adds r4, r0, #0 mov ip, r3 @@ -236884,7 +236884,7 @@ _08074AAE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08074A1C + thumb_func_end CalcBarFilledPixels thumb_func_start sub_08074AB8 sub_08074AB8: @ 0x08074AB8 @@ -236904,7 +236904,7 @@ sub_08074AB8: @ 0x08074AB8 movs r3, #1 str r3, [sp, #4] adds r3, r6, #0 - bl sub_08074948 + bl CalcNewBarValue lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r5, #0 @@ -236926,7 +236926,7 @@ _08074AFA: lsls r1, r1, #0x10 asrs r1, r1, #0x10 mov r2, r8 - bl sub_08071D14 + bl DummiedOutFunction lsls r0, r7, #0x10 asrs r0, r0, #0x10 add sp, #8 @@ -236953,7 +236953,7 @@ sub_08074B18: @ 0x08074B18 str r4, [sp] movs r4, #6 str r4, [sp, #4] - bl sub_08074A1C + bl CalcBarFilledPixels movs r3, #0 add r7, sp, #0x10 mov ip, r7 @@ -236988,8 +236988,8 @@ _08074B44: bx r0 thumb_func_end sub_08074B18 - thumb_func_start sub_08074B78 -sub_08074B78: @ 0x08074B78 + thumb_func_start GetScaledExpFraction +GetScaledExpFraction: @ 0x08074B78 push {r4, r5, r6, r7, lr} adds r6, r2, #0 lsls r3, r3, #0x1b @@ -237029,10 +237029,10 @@ _08074BB8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08074B78 + thumb_func_end GetScaledExpFraction - thumb_func_start sub_08074BC4 -sub_08074BC4: @ 0x08074BC4 + thumb_func_start GetScaledHPFraction +GetScaledHPFraction: @ 0x08074BC4 push {r4, lr} lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -237055,7 +237055,7 @@ _08074BE8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08074BC4 + thumb_func_end GetScaledHPFraction thumb_func_start GetHPBarLevel GetHPBarLevel: @ 0x08074BF0 @@ -237070,7 +237070,7 @@ GetHPBarLevel: @ 0x08074BF0 b _08074C1E _08074C02: movs r2, #0x30 - bl sub_08074BC4 + bl GetScaledHPFraction lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #3 @@ -237109,12 +237109,12 @@ sub_08074C24: @ 0x08074C24 cmp r0, r1 bne _08074C56 adds r0, r5, #0 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _08074D64 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap _08074C56: ldr r0, _08074D68 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -237142,7 +237142,7 @@ _08074C56: adds r1, r6, #0 adds r2, r4, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -237156,12 +237156,12 @@ _08074C56: adds r0, #1 strh r0, [r5, #0x2e] adds r0, r1, #0 - bl sub_08007358 + bl AnimateSprite mov r0, sb mov r1, sl adds r2, r4, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -237178,12 +237178,12 @@ _08074C56: movs r1, #1 bl StartSpriteAnim adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite mov r0, sb adds r1, r6, #0 adds r2, r7, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -237200,12 +237200,12 @@ _08074C56: movs r1, #2 bl StartSpriteAnim adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite mov r0, sb mov r1, sl adds r2, r7, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -237222,7 +237222,7 @@ _08074C56: movs r1, #3 bl StartSpriteAnim adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite mov r0, r8 pop {r3, r4, r5} mov r8, r3 @@ -237305,8 +237305,8 @@ _08074DE6: _08074DEC: .4byte gUnknown_20205AC thumb_func_end sub_08074DBC - thumb_func_start sub_08074DF0 -sub_08074DF0: @ 0x08074DF0 + thumb_func_start DoPokeballSendOutAnimation +DoPokeballSendOutAnimation: @ 0x08074DF0 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -237332,7 +237332,7 @@ sub_08074DF0: @ 0x08074DF0 strb r1, [r0] ldr r0, _08074E50 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08074E54 @@ -237352,12 +237352,12 @@ sub_08074DF0: @ 0x08074DF0 _08074E44: .4byte gUnknown_202415D _08074E48: .4byte gUnknown_2024174 _08074E4C: .4byte gUnknown_2023D08 -_08074E50: .4byte sub_08074E58 +_08074E50: .4byte Task_DoPokeballSendOutAnim _08074E54: .4byte gUnknown_3005B60 - thumb_func_end sub_08074DF0 + thumb_func_end DoPokeballSendOutAnimation - thumb_func_start sub_08074E58 -sub_08074E58: @ 0x08074E58 + thumb_func_start Task_DoPokeballSendOutAnim +Task_DoPokeballSendOutAnim: @ 0x08074E58 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -237390,7 +237390,7 @@ _08074E90: mov r8, r0 ldrb r5, [r1, #0xe] adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08074EBC @@ -237416,15 +237416,15 @@ _08074EBC: _08074ECA: adds r0, r0, r1 movs r1, #0x26 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08170B68 + bl ItemIdToBallId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_08076480 + bl LoadBallGfx lsls r0, r4, #1 adds r0, r0, r4 lsls r0, r0, #3 @@ -237433,7 +237433,7 @@ _08074ECA: movs r1, #0x20 movs r2, #0x50 movs r3, #0x1d - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r2, _08074F44 @@ -237471,17 +237471,17 @@ _08074F3C: .4byte gUnknown_2024190 _08074F40: .4byte gUnknown_82FCF94 _08074F44: .4byte gUnknown_20205AC _08074F48: .4byte gUnknown_2023EB0 -_08074F4C: .4byte sub_08075BBC +_08074F4C: .4byte SpriteCB_PlayerMonSendOut_1 _08074F50: adds r0, r5, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] adds r0, r5, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x18 @@ -237498,7 +237498,7 @@ _08074F50: b _08074F9A .align 2, 0 _08074F84: .4byte gUnknown_2023EB0 -_08074F88: .4byte sub_08075DA0 +_08074F88: .4byte SpriteCB_OpponentMonSendOut _08074F8C: movs r0, #1 bl GetBattlerAtPosition @@ -237519,7 +237519,7 @@ _08074F9A: cmp r2, #0 bne _08074FC0 mov r0, sl - bl sub_080A8964 + bl DestroyTask b _0807500A .align 2, 0 _08074FB8: .4byte gUnknown_2023EB0 @@ -237529,13 +237529,13 @@ _08074FC0: strh r0, [r4, #0x2e] ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0x10 @@ -237543,7 +237543,7 @@ _08074FC0: ldr r0, _0807501C strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation mov r3, sl strh r3, [r4, #6] ldr r1, _08075020 @@ -237571,16 +237571,16 @@ _0807500A: _0807501C: .4byte 0x0000FFD8 _08075020: .4byte gUnknown_3005B60 _08075024: .4byte sub_080A8A40 - thumb_func_end sub_08074E58 + thumb_func_end Task_DoPokeballSendOutAnim - thumb_func_start sub_08075028 -sub_08075028: @ 0x08075028 + thumb_func_start SpriteCB_TestBallThrow +SpriteCB_TestBallThrow: @ 0x08075028 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #4 adds r7, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _080750C8 @@ -237615,10 +237615,10 @@ sub_08075028: @ 0x08075028 strh r1, [r7, #0x26] strh r1, [r7, #0x38] adds r0, r5, #0 - bl sub_0807651C + bl GetBattlerPokeballItemId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08170B68 + bl ItemIdToBallId adds r4, r0, #0 ldrh r0, [r7, #0x20] lsls r0, r0, #0x18 @@ -237632,12 +237632,12 @@ sub_08075028: @ 0x08075028 str r4, [sp] movs r2, #1 movs r3, #0x1c - bl sub_08171B7C + bl AnimateBallOpenParticles movs r0, #0 adds r1, r5, #0 movs r2, #0xe adds r3, r4, #0 - bl sub_081727CC + bl LaunchBallFadeMonTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x2e] @@ -237645,7 +237645,7 @@ sub_08075028: @ 0x08075028 mov r0, r8 strh r0, [r7, #0x3c] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080750D8 str r0, [r7, #0x1c] _080750C8: @@ -237658,7 +237658,7 @@ _080750C8: .align 2, 0 _080750D4: .4byte gUnknown_3005B60 _080750D8: .4byte sub_080750DC - thumb_func_end sub_08075028 + thumb_func_end SpriteCB_TestBallThrow thumb_func_start sub_080750DC sub_080750DC: @ 0x080750DC @@ -237704,7 +237704,7 @@ sub_080750E8: @ 0x080750E8 adds r0, r0, r1 lsls r0, r0, #2 adds r0, r0, r4 - bl sub_08007358 + bl AnimateSprite movs r1, #0x3a ldrsh r0, [r6, r1] adds r0, r0, r5 @@ -237963,7 +237963,7 @@ _080752F6: b _0807532E .align 2, 0 _0807531C: .4byte 0xFFFFFF00 -_08075320: .4byte sub_0807571C +_08075320: .4byte SpriteCB_ReleaseMonFromBall _08075324: ldr r0, _08075334 str r0, [r4, #0x1c] @@ -238120,7 +238120,7 @@ _0807542E: str r0, [r4, #0x1c] b _080754BE .align 2, 0 -_0807544C: .4byte sub_0807571C +_0807544C: .4byte SpriteCB_ReleaseMonFromBall _08075450: cmp r1, #4 bne _08075464 @@ -238183,8 +238183,8 @@ _080754BE: bx r0 thumb_func_end sub_08075378 - thumb_func_start sub_080754C4 -sub_080754C4: @ 0x080754C4 + thumb_func_start Task_PlayCryWhenReleasedFromBall +Task_PlayCryWhenReleasedFromBall: @ 0x080754C4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -238278,21 +238278,21 @@ _080755A6: _080755B8: .4byte gUnknown_20205AC _080755BC: adds r0, r3, #0 - bl sub_0805ED2C + bl ShouldPlayNormalMonCry cmp r0, #1 bne _080755D4 lsls r1, r5, #0x18 asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0 - bl sub_080A2BAC + bl PlayCry3 b _08075636 _080755D4: lsls r1, r5, #0x18 asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0xb - bl sub_080A2BAC + bl PlayCry3 b _08075636 _080755E2: bl sub_080A2F64 @@ -238319,21 +238319,21 @@ _08075600: cmp r0, #0 bne _080756C2 adds r0, r3, #0 - bl sub_0805ED2C + bl ShouldPlayNormalMonCry cmp r0, #1 bne _0807562A lsls r1, r5, #0x18 asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #1 - bl sub_080A2C0C + bl PlayCry4 b _08075636 _0807562A: lsls r1, r5, #0x18 asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0xc - bl sub_080A2C0C + bl PlayCry4 _08075636: ldr r0, _08075658 ldr r0, [r0] @@ -238349,7 +238349,7 @@ _08075636: ands r0, r2 strb r0, [r1, #1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _0807570C .align 2, 0 _08075658: .4byte gUnknown_2024174 @@ -238377,7 +238377,7 @@ _0807566E: adds r0, #1 strh r0, [r1, #0x26] _08075686: - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _0807570C @@ -238411,21 +238411,21 @@ _080756C2: b _0807570C _080756C8: adds r0, r3, #0 - bl sub_0805ED2C + bl ShouldPlayNormalMonCry cmp r0, #1 bne _080756E0 lsls r1, r5, #0x18 asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0 - bl sub_080A2C0C + bl PlayCry4 b _080756EC _080756E0: lsls r1, r5, #0x18 asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0xb - bl sub_080A2C0C + bl PlayCry4 _080756EC: ldr r0, _08075718 ldr r0, [r0] @@ -238441,7 +238441,7 @@ _080756EC: ands r0, r2 strb r0, [r1, #1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0807570C: pop {r3} mov r8, r3 @@ -238450,10 +238450,10 @@ _0807570C: bx r0 .align 2, 0 _08075718: .4byte gUnknown_2024174 - thumb_func_end sub_080754C4 + thumb_func_end Task_PlayCryWhenReleasedFromBall - thumb_func_start sub_0807571C -sub_0807571C: @ 0x0807571C + thumb_func_start SpriteCB_ReleaseMonFromBall +SpriteCB_ReleaseMonFromBall: @ 0x0807571C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -238468,10 +238468,10 @@ sub_0807571C: @ 0x0807571C movs r1, #1 bl StartSpriteAnim adds r0, r5, #0 - bl sub_0807651C + bl GetBattlerPokeballItemId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08170B68 + bl ItemIdToBallId adds r4, r0, #0 ldrh r0, [r6, #0x20] lsls r0, r0, #0x18 @@ -238485,14 +238485,14 @@ sub_0807571C: @ 0x0807571C str r4, [sp] movs r2, #1 movs r3, #0x1c - bl sub_08171B7C + bl AnimateBallOpenParticles ldrh r1, [r6, #0x3a] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #1 movs r2, #0xe adds r3, r4, #0 - bl sub_081727CC + bl LaunchBallFadeMonTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x2e] @@ -238509,7 +238509,7 @@ sub_0807571C: @ 0x0807571C b _080758FC _08075790: adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080757C8 @@ -238525,7 +238525,7 @@ _08075790: mov sl, r4 b _080757DC .align 2, 0 -_080757B4: .4byte sub_080759DC +_080757B4: .4byte HandleBallAnimEnd _080757B8: .4byte gUnknown_3002360 _080757BC: .4byte 0x00000439 _080757C0: .4byte gUnknown_2023D12 @@ -238545,7 +238545,7 @@ _080757DC: mov r8, r2 adds r0, r7, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 @@ -238562,7 +238562,7 @@ _080757DC: cmp r5, r0 bne _0807585E _08075808: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0807585E @@ -238599,7 +238599,7 @@ _08075854: movs r2, #0x80 bl m4aMPlayVolumeControl _0807585E: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08075878 @@ -238650,7 +238650,7 @@ _080758AA: strb r0, [r1, #1] ldr r0, _08075944 movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08075948 @@ -238693,7 +238693,7 @@ _080758FC: ldrh r0, [r6, #0x3a] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -238712,7 +238712,7 @@ _080758FC: b _0807596E .align 2, 0 _08075940: .4byte gUnknown_2024174 -_08075944: .4byte sub_080754C4 +_08075944: .4byte Task_PlayCryWhenReleasedFromBall _08075948: .4byte gUnknown_3005B60 _0807594C: .4byte gUnknown_2023E88 _08075950: .4byte gUnknown_20205AC @@ -238741,7 +238741,7 @@ _0807596E: lsls r0, r0, #2 ldr r4, _080759B8 adds r0, r0, r4 - bl sub_08007358 + bl AnimateSprite movs r1, #0x3a ldrsh r0, [r6, r1] adds r0, r0, r5 @@ -238765,7 +238765,7 @@ _0807596E: _080759B0: .4byte sub_08039A88 _080759B4: .4byte gUnknown_2023E88 _080759B8: .4byte gUnknown_20205AC - thumb_func_end sub_0807571C + thumb_func_end SpriteCB_ReleaseMonFromBall thumb_func_start sub_080759BC sub_080759BC: @ 0x080759BC @@ -238786,8 +238786,8 @@ sub_080759BC: @ 0x080759BC _080759D8: .4byte sub_08075B00 thumb_func_end sub_080759BC - thumb_func_start sub_080759DC -sub_080759DC: @ 0x080759DC + thumb_func_start HandleBallAnimEnd +HandleBallAnimEnd: @ 0x080759DC push {r4, r5, r6, r7, lr} adds r5, r0, #0 movs r7, #0 @@ -238918,7 +238918,7 @@ _08075ACA: _08075AD8: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080764F0 + bl FreeBallGfx adds r4, #1 cmp r4, #0xb ble _08075AD8 @@ -238932,7 +238932,7 @@ _08075AF0: .4byte gUnknown_20205AC _08075AF4: .4byte gUnknown_2023E88 _08075AF8: .4byte gUnknown_202415D _08075AFC: .4byte gUnknown_2024174 - thumb_func_end sub_080759DC + thumb_func_end HandleBallAnimEnd thumb_func_start sub_08075B00 sub_08075B00: @ 0x08075B00 @@ -239022,8 +239022,8 @@ _08075BB4: .4byte 0x00000439 _08075BB8: .4byte gUnknown_2024174 thumb_func_end sub_08075B00 - thumb_func_start sub_08075BBC -sub_08075BBC: @ 0x08075BBC + thumb_func_start SpriteCB_PlayerMonSendOut_1 +SpriteCB_PlayerMonSendOut_1: @ 0x08075BBC push {r4, lr} adds r4, r0, #0 movs r0, #0x19 @@ -239032,7 +239032,7 @@ sub_08075BBC: @ 0x08075BBC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -239040,7 +239040,7 @@ sub_08075BBC: @ 0x08075BBC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x18 @@ -239050,7 +239050,7 @@ sub_08075BBC: @ 0x08075BBC ldrh r0, [r4, #0x3a] strh r0, [r4, #6] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _08075C08 str r0, [r4, #0x1c] pop {r4} @@ -239058,11 +239058,11 @@ sub_08075BBC: @ 0x08075BBC bx r0 .align 2, 0 _08075C04: .4byte 0x0000FFE2 -_08075C08: .4byte sub_08075C0C - thumb_func_end sub_08075BBC +_08075C08: .4byte SpriteCB_PlayerMonSendOut_2 + thumb_func_end SpriteCB_PlayerMonSendOut_1 - thumb_func_start sub_08075C0C -sub_08075C0C: @ 0x08075C0C + thumb_func_start SpriteCB_PlayerMonSendOut_2 +SpriteCB_PlayerMonSendOut_2: @ 0x08075C0C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -239183,7 +239183,7 @@ _08075CC6: b _08075D6C _08075D00: adds r0, r5, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08075D6C @@ -239201,7 +239201,7 @@ _08075D00: ldrb r0, [r5, #6] strh r0, [r5, #0x3a] strh r1, [r5, #0x2e] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08075D60 @@ -239240,8 +239240,8 @@ _08075D6C: pop {r0} bx r0 .align 2, 0 -_08075D78: .4byte sub_0807571C - thumb_func_end sub_08075C0C +_08075D78: .4byte SpriteCB_ReleaseMonFromBall + thumb_func_end SpriteCB_PlayerMonSendOut_2 thumb_func_start SpriteCB_ReleaseMon2FromBall SpriteCB_ReleaseMon2FromBall: @ 0x08075D7C @@ -239262,11 +239262,11 @@ _08075D96: pop {r0} bx r0 .align 2, 0 -_08075D9C: .4byte sub_0807571C +_08075D9C: .4byte SpriteCB_ReleaseMonFromBall thumb_func_end SpriteCB_ReleaseMon2FromBall - thumb_func_start sub_08075DA0 -sub_08075DA0: @ 0x08075DA0 + thumb_func_start SpriteCB_OpponentMonSendOut +SpriteCB_OpponentMonSendOut: @ 0x08075DA0 push {r4, r5, lr} adds r5, r0, #0 ldrh r0, [r5, #0x2e] @@ -239278,7 +239278,7 @@ sub_08075DA0: @ 0x08075DA0 ble _08075DF4 movs r0, #0 strh r0, [r5, #0x2e] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08075DF0 @@ -239312,11 +239312,11 @@ _08075DF4: pop {r0} bx r0 .align 2, 0 -_08075DFC: .4byte sub_0807571C - thumb_func_end sub_08075DA0 +_08075DFC: .4byte SpriteCB_ReleaseMonFromBall + thumb_func_end SpriteCB_OpponentMonSendOut - thumb_func_start sub_08075E00 -sub_08075E00: @ 0x08075E00 + thumb_func_start AnimateBallOpenParticlesForPokeball +AnimateBallOpenParticlesForPokeball: @ 0x08075E00 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -239329,32 +239329,32 @@ sub_08075E00: @ 0x08075E00 lsrs r3, r3, #0x18 movs r4, #0 str r4, [sp] - bl sub_08171B7C + bl AnimateBallOpenParticles lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #4 pop {r4} pop {r1} bx r1 - thumb_func_end sub_08075E00 + thumb_func_end AnimateBallOpenParticlesForPokeball - thumb_func_start sub_08075E28 -sub_08075E28: @ 0x08075E28 + thumb_func_start LaunchBallFadeMonTaskForPokeball +LaunchBallFadeMonTaskForPokeball: @ 0x08075E28 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r3, #0 - bl sub_081727CC + bl LaunchBallFadeMonTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_08075E28 + thumb_func_end LaunchBallFadeMonTaskForPokeball - thumb_func_start sub_08075E40 -sub_08075E40: @ 0x08075E40 + thumb_func_start CreatePokeballSpriteToReleaseMon +CreatePokeballSpriteToReleaseMon: @ 0x08075E40 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -239390,14 +239390,14 @@ sub_08075E40: @ 0x08075E40 lsls r0, r2, #0x10 lsrs r7, r0, #0x10 ldr r0, _08075F18 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _08075F1C - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap ldr r0, _08075F20 mov r1, sb mov r2, sl adds r3, r4, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08075F24 @@ -239465,7 +239465,7 @@ _08075F1C: .4byte gUnknown_82FCE6C _08075F20: .4byte gUnknown_82FCF94 _08075F24: .4byte gUnknown_20205AC _08075F28: .4byte sub_08075F2C - thumb_func_end sub_08075E40 + thumb_func_end CreatePokeballSpriteToReleaseMon thumb_func_start sub_08075F2C sub_08075F2C: @ 0x08075F2C @@ -239515,11 +239515,11 @@ _08075F68: lsls r2, r2, #0x1c lsrs r2, r2, #0x1e adds r3, r5, #0 - bl sub_08075E00 + bl AnimateBallOpenParticlesForPokeball movs r0, #1 mov r1, r8 adds r2, r4, #0 - bl sub_08075E28 + bl LaunchBallFadeMonTaskForPokeball lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 @@ -239542,7 +239542,7 @@ _08075F68: movs r1, #1 bl StartSpriteAffineAnim adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite movs r0, #0x80 lsls r0, r0, #5 strh r0, [r4, #0x30] @@ -239705,7 +239705,7 @@ _080760C2: adds r0, r2, #0 movs r2, #1 movs r3, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation b _08076110 .align 2, 0 _08076100: .4byte gUnknown_20205AC @@ -239714,7 +239714,7 @@ _08076104: adds r0, r2, #0 movs r2, #0 movs r3, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation _08076110: adds r0, r4, #0 bl DestroySpriteAndFreeResources @@ -239763,14 +239763,14 @@ sub_08076124: @ 0x08076124 lsrs r0, r0, #0x18 mov sb, r0 ldr r0, _080761C8 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _080761CC - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap ldr r0, _080761D0 adds r1, r6, #0 mov r2, r8 adds r3, r4, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r6, _080761D4 @@ -239865,11 +239865,11 @@ _08076218: lsls r2, r2, #0x1c lsrs r2, r2, #0x1e adds r3, r6, #0 - bl sub_08075E00 + bl AnimateBallOpenParticlesForPokeball movs r0, #1 mov r1, r8 adds r2, r5, #0 - bl sub_08075E28 + bl LaunchBallFadeMonTaskForPokeball lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 @@ -239885,7 +239885,7 @@ _08076218: movs r1, #2 bl StartSpriteAffineAnim adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite strh r5, [r4, #0x30] b _08076278 .align 2, 0 @@ -240016,7 +240016,7 @@ sub_08076320: @ 0x08076320 ldr r0, _080763A8 str r0, [r4, #0x1c] adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0807636E @@ -240117,7 +240117,7 @@ sub_080763FC: @ 0x080763FC lsrs r4, r4, #0x18 ldr r5, _08076434 adds r0, r5, #0 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08076438 @@ -240138,13 +240138,13 @@ sub_080763FC: @ 0x080763FC pop {r0} bx r0 .align 2, 0 -_08076434: .4byte sub_08076440 +_08076434: .4byte SpriteCB_HitAnimHealthoxEffect _08076438: .4byte gUnknown_20205AC _0807643C: .4byte gUnknown_3005AD0 thumb_func_end sub_080763FC - thumb_func_start sub_08076440 -sub_08076440: @ 0x08076440 + thumb_func_start SpriteCB_HitAnimHealthoxEffect +SpriteCB_HitAnimHealthoxEffect: @ 0x08076440 push {lr} adds r3, r0, #0 ldrh r1, [r3, #0x30] @@ -240177,10 +240177,10 @@ _08076478: bx r0 .align 2, 0 _0807647C: .4byte gUnknown_20205AC - thumb_func_end sub_08076440 + thumb_func_end SpriteCB_HitAnimHealthoxEffect - thumb_func_start sub_08076480 -sub_08076480: @ 0x08076480 + thumb_func_start LoadBallGfx +LoadBallGfx: @ 0x08076480 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -240194,10 +240194,10 @@ sub_08076480: @ 0x08076480 cmp r0, r1 bne _080764A8 adds r0, r5, #0 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _080764E4 adds r0, r6, r0 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap _080764A8: cmp r4, #6 beq _080764D4 @@ -240230,10 +240230,10 @@ _080764E0: .4byte 0xFFFF0000 _080764E4: .4byte gUnknown_82FCE6C _080764E8: .4byte gUnknown_8C02308 _080764EC: .4byte 0x06010100 - thumb_func_end sub_08076480 + thumb_func_end LoadBallGfx - thumb_func_start sub_080764F0 -sub_080764F0: @ 0x080764F0 + thumb_func_start FreeBallGfx +FreeBallGfx: @ 0x080764F0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -240252,15 +240252,15 @@ sub_080764F0: @ 0x080764F0 .align 2, 0 _08076514: .4byte gUnknown_82FCE0C _08076518: .4byte gUnknown_82FCE6C - thumb_func_end sub_080764F0 + thumb_func_end FreeBallGfx - thumb_func_start sub_0807651C -sub_0807651C: @ 0x0807651C + thumb_func_start GetBattlerPokeballItemId +GetBattlerPokeballItemId: @ 0x0807651C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08076548 @@ -240286,7 +240286,7 @@ _08076548: _08076556: adds r0, r0, r1 movs r1, #0x26 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r4} @@ -240295,10 +240295,10 @@ _08076556: .align 2, 0 _08076568: .4byte gUnknown_2023D12 _0807656C: .4byte gUnknown_2024190 - thumb_func_end sub_0807651C + thumb_func_end GetBattlerPokeballItemId - thumb_func_start sub_08076570 -sub_08076570: @ 0x08076570 + thumb_func_start CheckForFlashMemory +CheckForFlashMemory: @ 0x08076570 push {lr} bl IdentifyFlash lsls r0, r0, #0x10 @@ -240320,7 +240320,7 @@ _08076592: bx r0 .align 2, 0 _08076598: .4byte gUnknown_3005AE8 - thumb_func_end sub_08076570 + thumb_func_end CheckForFlashMemory thumb_func_start sub_0807659C sub_0807659C: @ 0x0807659C @@ -240360,8 +240360,8 @@ _080765DC: .4byte gUnknown_20256A4 _080765E0: .4byte 0x01001F04 thumb_func_end sub_080765C0 - thumb_func_start sub_080765E4 -sub_080765E4: @ 0x080765E4 + thumb_func_start SetSaveBlocksPointers +SetSaveBlocksPointers: @ 0x080765E4 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x10 @@ -240383,7 +240383,7 @@ sub_080765E4: @ 0x080765E4 adds r4, r4, r0 str r4, [r1] bl SetBagItemsPointers - bl sub_081616F8 + bl SetDecorationInventoriesPointers pop {r4, r5} pop {r0} bx r0 @@ -240394,10 +240394,10 @@ _08076624: .4byte gUnknown_20246F8 _08076628: .4byte gUnknown_20256A4 _0807662C: .4byte gUnknown_3005AF4 _08076630: .4byte gUnknown_20294AC - thumb_func_end sub_080765E4 + thumb_func_end SetSaveBlocksPointers - thumb_func_start sub_08076634 -sub_08076634: @ 0x08076634 + thumb_func_start MoveSaveBlocks_ResetHeap +MoveSaveBlocks_ResetHeap: @ 0x08076634 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -240443,7 +240443,7 @@ sub_08076634: @ 0x08076634 adds r1, r1, r0 ldrb r0, [r4, #0xd] adds r0, r0, r1 - bl sub_080765E4 + bl SetSaveBlocksPointers ldr r1, _0807670C ldr r0, [r1] adds r1, r4, #0 @@ -240462,7 +240462,7 @@ sub_08076634: @ 0x08076634 movs r1, #0xe0 lsls r1, r1, #9 adds r0, r4, #0 - bl sub_08000BAC + bl InitHeap ldr r0, [sp, #4] str r0, [r5, #0x10] ldr r1, [sp] @@ -240475,7 +240475,7 @@ sub_08076634: @ 0x08076634 lsrs r0, r0, #0x10 adds r4, r4, r0 adds r0, r4, #0 - bl sub_08076B38 + bl ApplyNewEncryptionKeyToAllEncryptedData ldr r1, _0807670C ldr r0, [r1] adds r0, #0xac @@ -240500,10 +240500,10 @@ _0807671C: .4byte gUnknown_2000F2C _08076720: .4byte gUnknown_3005AF4 _08076724: .4byte 0x000083D0 _08076728: .4byte gUnknown_2004CB4 - thumb_func_end sub_08076634 + thumb_func_end MoveSaveBlocks_ResetHeap - thumb_func_start sub_0807672C -sub_0807672C: @ 0x0807672C + thumb_func_start UseContinueGameWarp +UseContinueGameWarp: @ 0x0807672C ldr r0, _08076738 ldr r0, [r0] ldrb r1, [r0, #9] @@ -240512,7 +240512,7 @@ sub_0807672C: @ 0x0807672C bx lr .align 2, 0 _08076738: .4byte gUnknown_3005AF0 - thumb_func_end sub_0807672C + thumb_func_end UseContinueGameWarp thumb_func_start sub_0807673C sub_0807673C: @ 0x0807673C @@ -240527,8 +240527,8 @@ sub_0807673C: @ 0x0807673C _0807674C: .4byte gUnknown_3005AF0 thumb_func_end sub_0807673C - thumb_func_start sub_08076750 -sub_08076750: @ 0x08076750 + thumb_func_start SetContinueGameWarpStatus +SetContinueGameWarpStatus: @ 0x08076750 ldr r0, _08076760 ldr r2, [r0] ldrb r1, [r2, #9] @@ -240538,13 +240538,13 @@ sub_08076750: @ 0x08076750 bx lr .align 2, 0 _08076760: .4byte gUnknown_3005AF0 - thumb_func_end sub_08076750 + thumb_func_end SetContinueGameWarpStatus - thumb_func_start sub_08076764 -sub_08076764: @ 0x08076764 + thumb_func_start SetContinueGameWarpStatusToDynamicWarp +SetContinueGameWarpStatusToDynamicWarp: @ 0x08076764 push {lr} movs r0, #0 - bl sub_08084914 + bl SetContinueGameWarpToDynamicWarp ldr r0, _0807677C ldr r2, [r0] ldrb r1, [r2, #9] @@ -240555,7 +240555,7 @@ sub_08076764: @ 0x08076764 bx r0 .align 2, 0 _0807677C: .4byte gUnknown_3005AF0 - thumb_func_end sub_08076764 + thumb_func_end SetContinueGameWarpStatusToDynamicWarp thumb_func_start sub_08076780 sub_08076780: @ 0x08076780 @@ -240570,8 +240570,8 @@ sub_08076780: @ 0x08076780 _08076790: .4byte gUnknown_3005AF0 thumb_func_end sub_08076780 - thumb_func_start sub_08076794 -sub_08076794: @ 0x08076794 + thumb_func_start SavePlayerParty +SavePlayerParty: @ 0x08076794 push {r4, lr} ldr r0, _080767D0 ldr r0, [r0] @@ -240605,10 +240605,10 @@ _080767A8: _080767D0: .4byte gUnknown_3005AEC _080767D4: .4byte gUnknown_202418D _080767D8: .4byte gUnknown_2024190 - thumb_func_end sub_08076794 + thumb_func_end SavePlayerParty - thumb_func_start sub_080767DC -sub_080767DC: @ 0x080767DC + thumb_func_start LoadPlayerParty +LoadPlayerParty: @ 0x080767DC push {r4, r5, lr} ldr r1, _08076818 ldr r0, _0807681C @@ -240643,7 +240643,7 @@ _080767F2: _08076818: .4byte gUnknown_202418D _0807681C: .4byte gUnknown_3005AEC _08076820: .4byte gUnknown_2024190 - thumb_func_end sub_080767DC + thumb_func_end LoadPlayerParty thumb_func_start SaveEventObjects SaveEventObjects: @ 0x08076824 @@ -240725,25 +240725,25 @@ _080768AC: .4byte gUnknown_3005AEC _080768B0: .4byte gUnknown_2036FF0 thumb_func_end LoadEventObjects - thumb_func_start sub_080768B4 -sub_080768B4: @ 0x080768B4 + thumb_func_start SaveSerializedGame +SaveSerializedGame: @ 0x080768B4 push {lr} - bl sub_08076794 + bl SavePlayerParty bl SaveEventObjects pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080768B4 + thumb_func_end SaveSerializedGame - thumb_func_start sub_080768C4 -sub_080768C4: @ 0x080768C4 + thumb_func_start LoadSerializedGame +LoadSerializedGame: @ 0x080768C4 push {lr} - bl sub_080767DC + bl LoadPlayerParty bl LoadEventObjects pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080768C4 + thumb_func_end LoadSerializedGame thumb_func_start LoadPlayerBag LoadPlayerBag: @ 0x080768D4 @@ -240889,8 +240889,8 @@ _080769E0: .4byte gUnknown_20318FC _080769E4: .4byte 0x00002BE0 thumb_func_end LoadPlayerBag - thumb_func_start sub_080769E8 -sub_080769E8: @ 0x080769E8 + thumb_func_start SavePlayerBag +SavePlayerBag: @ 0x080769E8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -241019,7 +241019,7 @@ _08076AA8: ldr r1, [r2] str r1, [r0] adds r0, r4, #0 - bl sub_080D5E10 + bl ApplyNewEncryptionKeyToBagItems ldr r0, [r7] adds r0, #0xac str r4, [r0] @@ -241036,10 +241036,10 @@ _08076AF8: .4byte gUnknown_2031E24 _08076AFC: .4byte gUnknown_3005AEC _08076B00: .4byte gUnknown_20318FC _08076B04: .4byte 0x00002BE0 - thumb_func_end sub_080769E8 + thumb_func_end SavePlayerBag - thumb_func_start sub_08076B08 -sub_08076B08: @ 0x08076B08 + thumb_func_start ApplyNewEncryptionKeyToHword +ApplyNewEncryptionKeyToHword: @ 0x08076B08 ldr r2, _08076B1C ldr r2, [r2] adds r2, #0xac @@ -241051,10 +241051,10 @@ sub_08076B08: @ 0x08076B08 bx lr .align 2, 0 _08076B1C: .4byte gUnknown_3005AF0 - thumb_func_end sub_08076B08 + thumb_func_end ApplyNewEncryptionKeyToHword - thumb_func_start sub_08076B20 -sub_08076B20: @ 0x08076B20 + thumb_func_start ApplyNewEncryptionKeyToWord +ApplyNewEncryptionKeyToWord: @ 0x08076B20 ldr r2, _08076B34 ldr r3, [r2] adds r3, #0xac @@ -241066,36 +241066,36 @@ sub_08076B20: @ 0x08076B20 bx lr .align 2, 0 _08076B34: .4byte gUnknown_3005AF0 - thumb_func_end sub_08076B20 + thumb_func_end ApplyNewEncryptionKeyToWord - thumb_func_start sub_08076B38 -sub_08076B38: @ 0x08076B38 + thumb_func_start ApplyNewEncryptionKeyToAllEncryptedData +ApplyNewEncryptionKeyToAllEncryptedData: @ 0x08076B38 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080841EC + bl ApplyNewEncryptionKeyToGameStats adds r0, r4, #0 - bl sub_080D5E68 + bl ApplyNewEncryptionKeyToBagItems_ adds r0, r4, #0 - bl sub_0802445C + bl ApplyNewEncryptionKeyToBerryPowder ldr r5, _08076B70 ldr r0, [r5] movs r1, #0x92 lsls r1, r1, #3 adds r0, r0, r1 adds r1, r4, #0 - bl sub_08076B20 + bl ApplyNewEncryptionKeyToWord ldr r0, [r5] ldr r1, _08076B74 adds r0, r0, r1 adds r1, r4, #0 - bl sub_08076B08 + bl ApplyNewEncryptionKeyToHword pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08076B70: .4byte gUnknown_3005AEC _08076B74: .4byte 0x00000494 - thumb_func_end sub_08076B38 + thumb_func_end ApplyNewEncryptionKeyToAllEncryptedData thumb_func_start sub_08076B78 sub_08076B78: @ 0x08076B78 @@ -241110,7 +241110,7 @@ sub_08076B78: @ 0x08076B78 lsrs r2, r2, #0x10 movs r0, #0 adds r1, r4, #0 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08076BAA @@ -241169,7 +241169,7 @@ _08076BF4: movs r0, #0 b _08076C00 _08076BF8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _08076C00: @@ -241182,7 +241182,7 @@ _08076C00: thumb_func_start sub_08076C08 sub_08076C08: @ 0x08076C08 push {lr} - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -241204,7 +241204,7 @@ sub_08076C18: @ 0x08076C18 .align 2, 0 _08076C30: .4byte gUnknown_30041E0 _08076C34: - bl sub_0800A178 + bl ResetBlockReceivedFlags _08076C38: pop {r0} bx r0 @@ -241227,7 +241227,7 @@ _08076C54: .4byte gUnknown_30041E0 _08076C58: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag _08076C60: pop {r4} pop {r0} @@ -241271,7 +241271,7 @@ sub_08076C90: @ 0x08076C90 thumb_func_start sub_08076C9C sub_08076C9C: @ 0x08076C9C push {lr} - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -241285,7 +241285,7 @@ sub_08076CAC: @ 0x08076CAC sub sp, #0xc bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks bl ResetPaletteFade ldr r2, _08076D9C ldrb r0, [r2, #8] @@ -241293,16 +241293,16 @@ sub_08076CAC: @ 0x08076CAC orrs r0, r1 strb r0, [r2, #8] ldr r0, _08076DA0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _08076DA4 adds r0, r4, #0 movs r1, #0xf0 movs r2, #0x14 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xd0 movs r2, #0x14 - bl sub_080A1200 + bl LoadPalette movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _08076DA8 @@ -241315,9 +241315,9 @@ sub_08076CAC: @ 0x08076CAC lsls r0, r0, #4 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _08076DB0 - bl sub_08003090 + bl InitWindows lsls r0, r0, #0x10 cmp r0, #0 beq _08076D94 @@ -241327,10 +241327,10 @@ _08076D18: lsls r4, r5, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_08003774 + bl ClearWindowTilemap adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r5, #1 cmp r5, #0x11 bls _08076D18 @@ -241353,7 +241353,7 @@ _08076D18: movs r1, #1 movs r2, #0xe0 bl LoadUserWindowBorderGfx - bl sub_080D27A4 + bl LoadMonIconPalettes ldr r2, _08076DAC ldr r0, [r2] adds r0, #0x69 @@ -241398,7 +241398,7 @@ _08076DB0: .4byte gUnknown_8300C14 sub_08076DB4: @ 0x08076DB4 push {lr} ldr r0, _08076DCC - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08076DD0 movs r1, #0 str r1, [r0] @@ -241463,13 +241463,13 @@ _08076E04: @ jump table _08076E60: ldr r4, _08076E98 ldr r0, _08076E9C - bl sub_08000BDC + bl AllocZeroed str r0, [r4] bl sub_08076CAC ldr r4, _08076EA0 movs r0, #0xd0 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r6, #0 ldr r2, _08076EA4 @@ -241512,14 +241512,14 @@ _08076EBA: movs r1, #0 movs r2, #0 movs r3, #0x20 - bl sub_08067730 + bl CreateMon adds r6, #1 cmp r6, #5 ble _08076EBA movs r0, #0 bl sub_08079BD4 movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r0, _08076F1C ldrb r2, [r0] cmp r2, #0 @@ -241537,7 +241537,7 @@ _08076EBA: cmp r0, #0 beq _08076F30 bl sub_0800AF5C - bl sub_080092D0 + bl OpenLink bl sub_08011690 b _0807752A .align 2, 0 @@ -241549,7 +241549,7 @@ _08076F24: .4byte 0x00001122 _08076F28: .4byte gUnknown_2031F3C _08076F2C: .4byte gUnknown_300319C _08076F30: - bl sub_080092D0 + bl OpenLink ldr r0, _08076F4C movs r7, #0x87 lsls r7, r7, #3 @@ -241559,7 +241559,7 @@ _08076F30: strb r1, [r0] ldr r0, _08076F50 movs r1, #1 - bl sub_080A8878 + bl CreateTask b _0807752A .align 2, 0 _08076F4C: .4byte gUnknown_3002360 @@ -241598,7 +241598,7 @@ _08076F82: .align 2, 0 _08076F90: .4byte gUnknown_2031F3C _08076F94: - bl sub_0800A770 + bl GetLinkPlayerCount_2 adds r4, r0, #0 bl sub_0800A60C lsls r4, r4, #0x18 @@ -241607,7 +241607,7 @@ _08076F94: bhs _08076FA8 b _0807752A _08076FA8: - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 beq _08076FE0 @@ -241647,7 +241647,7 @@ _08076FF0: beq _08076FFA b _0807752A _08076FFA: - bl sub_08009E00 + bl IsLinkPlayerDataExchangeComplete lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -241701,10 +241701,10 @@ _08077064: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _0807752A .align 2, 0 _08077080: .4byte gUnknown_300319C @@ -241764,13 +241764,13 @@ _080770EA: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldrb r2, [r7] lsls r2, r2, #0x13 movs r4, #0xe0 @@ -241788,7 +241788,7 @@ _080770EA: str r1, [sp, #8] adds r0, r5, #0 ldr r1, _080771E4 - bl sub_080D2564 + bl CreateMonIcon mov r2, r8 ldr r1, [r2] adds r1, #0x28 @@ -241822,13 +241822,13 @@ _0807715E: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldrb r2, [r7] lsls r2, r2, #0x13 movs r3, #0xe0 @@ -241847,7 +241847,7 @@ _0807715E: str r0, [sp, #8] adds r0, r5, #0 ldr r1, _080771E4 - bl sub_080D2564 + bl CreateMonIcon mov r2, r8 ldr r1, [r2] adds r1, #0x2e @@ -241919,7 +241919,7 @@ _0807723C: movs r2, #0 movs r3, #0 bl sub_080C66A4 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 movs r1, #0x80 lsls r1, r1, #0x11 @@ -242000,14 +242000,14 @@ _080772E8: add r0, sp, #0x10 movs r2, #8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r3, #0x80 lsls r3, r3, #0xe adds r4, r4, r3 adds r6, #1 cmp r6, #2 ble _080772E8 - bl sub_0800A02C + bl GetMultiplayerId adds r1, r0, #0 movs r0, #1 eors r1, r0 @@ -242041,7 +242041,7 @@ _0807733C: add r0, sp, #0x10 movs r2, #8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r0, #0x80 lsls r0, r0, #0xe adds r4, r4, r0 @@ -242069,7 +242069,7 @@ _08077378: movs r1, #0xe0 movs r2, #0x98 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r6, #0 add r4, sp, #0x10 movs r5, #0xc0 @@ -242089,7 +242089,7 @@ _080773A2: add r0, sp, #0x10 movs r2, #0x96 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r0, #0x80 lsls r0, r0, #0xe adds r5, r5, r0 @@ -242107,7 +242107,7 @@ _080773A2: ldrb r2, [r2, #1] lsls r2, r2, #3 movs r3, #2 - bl sub_08006B0C + bl CreateSprite ldr r2, _0807741C ldr r1, [r2] adds r1, #0x34 @@ -242124,7 +242124,7 @@ _080773A2: adds r0, #1 strb r0, [r1] movs r0, #0 - bl sub_08098504 + bl rbox_fill_rectangle b _0807752A .align 2, 0 _08077410: .4byte gUnknown_83008A4 @@ -242152,7 +242152,7 @@ _08077424: adds r0, #1 strb r0, [r1] ldr r0, _08077460 - bl sub_080A3040 + bl PlayBGM b _0807752A .align 2, 0 _08077458: .4byte gUnknown_2031F3C @@ -242193,7 +242193,7 @@ _080774A0: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080774BC movs r4, #0x87 lsls r4, r4, #3 @@ -242251,13 +242251,13 @@ _08077514: ldr r0, _08077550 str r0, [r3] ldr r0, _08077554 - bl sub_08000540 + bl SetMainCallback2 _0807752A: bl sub_08004630 - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #0x28 pop {r3} mov r8, r3 @@ -242356,10 +242356,10 @@ _08077620: ldrb r0, [r0] cmp r0, #0 beq _08077634 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _08077634: ldr r1, _08077644 movs r2, #0x87 @@ -242388,7 +242388,7 @@ _08077650: adds r0, #0x37 strb r1, [r0] movs r0, #0 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 bl sub_08079690 movs r0, #1 @@ -242410,13 +242410,13 @@ _0807768C: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldrb r2, [r7] lsls r2, r2, #0x13 movs r4, #0xe0 @@ -242434,7 +242434,7 @@ _0807768C: str r1, [sp, #8] adds r0, r5, #0 ldr r1, _08077780 - bl sub_080D2564 + bl CreateMonIcon mov r2, r8 ldr r1, [r2] adds r1, #0x28 @@ -242470,13 +242470,13 @@ _08077704: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldrb r2, [r7] lsls r2, r2, #0x13 movs r3, #0xe0 @@ -242495,7 +242495,7 @@ _08077704: str r0, [sp, #8] adds r0, r5, #0 ldr r1, _08077780 - bl sub_080D2564 + bl CreateMonIcon mov r5, r8 ldr r1, [r5] adds r1, #0x2e @@ -242561,7 +242561,7 @@ _080777D4: movs r2, #0 movs r3, #0 bl sub_080C66A4 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 movs r1, #0x80 lsls r1, r1, #0x11 @@ -242649,14 +242649,14 @@ _0807788E: add r0, sp, #0xc movs r2, #8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r7, #0x80 lsls r7, r7, #0xe adds r4, r4, r7 adds r6, #1 cmp r6, #2 ble _0807788E - bl sub_0800A02C + bl GetMultiplayerId adds r1, r0, #0 movs r0, #1 eors r1, r0 @@ -242690,7 +242690,7 @@ _080778E2: add r0, sp, #0xc movs r2, #8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r2, #0x80 lsls r2, r2, #0xe adds r4, r4, r2 @@ -242723,7 +242723,7 @@ _08077928: movs r1, #0xe0 movs r2, #0x98 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r6, #0 add r4, sp, #0xc movs r5, #0xc0 @@ -242743,7 +242743,7 @@ _08077952: add r0, sp, #0xc movs r2, #0x96 movs r3, #1 - bl sub_08006B0C + bl CreateSprite movs r0, #0x80 lsls r0, r0, #0xe adds r5, r5, r0 @@ -242789,7 +242789,7 @@ _080779A6: ldrb r2, [r2] lsls r2, r2, #3 movs r3, #2 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #0x34 strb r0, [r1] @@ -242844,14 +242844,14 @@ _08077A30: adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08077A68 movs r3, #0x87 lsls r3, r3, #3 @@ -242901,12 +242901,12 @@ _08077AAC: cmp r0, #0 bne _08077ABE ldr r0, _08077AE0 - bl sub_08000540 + bl SetMainCallback2 _08077ABE: - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #0x24 pop {r3} mov r8, r3 @@ -242921,8 +242921,8 @@ _08077AE0: .4byte sub_08077C24 thumb_func_start sub_08077AE4 sub_08077AE4: @ 0x08077AE4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -242949,7 +242949,7 @@ sub_08077AF8: @ 0x08077AF8 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r4] adds r0, #0x6f movs r1, #0xa @@ -243026,16 +243026,16 @@ sub_08077B90: @ 0x08077B90 beq _08077C0C ldr r0, _08077BDC ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers ldr r0, _08077BE0 ldr r0, [r0] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r5] - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite ldr r0, _08077BE4 - bl sub_08000540 + bl SetMainCallback2 b _08077C0C .align 2, 0 _08077BD0: .4byte gUnknown_3002360 @@ -243051,14 +243051,14 @@ _08077BE8: bne _08077C0C ldr r0, _08077C18 ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers ldr r0, _08077C1C ldr r0, [r0] - bl sub_08000BF0 + bl Free str r4, [r5] ldr r0, _08077C20 - bl sub_08000540 + bl SetMainCallback2 _08077C0C: pop {r4, r5} pop {r0} @@ -243097,11 +243097,11 @@ sub_08077C24: @ 0x08077C24 lsrs r1, r1, #0x18 movs r0, #0x1c bl SetGpuReg - bl sub_08196E18 - bl sub_080A89D4 - bl sub_080066D8 + bl RunTextPrintersAndIsPrinter0Active + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4} pop {r0} bx r0 @@ -243130,7 +243130,7 @@ _08077C9C: ldr r0, _08077CDC movs r1, #0 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r1, _08077CE0 movs r2, #0x94 lsls r2, r2, #5 @@ -243171,7 +243171,7 @@ _08077CEC: movs r0, #1 bl sub_0807987C movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08077D46 .align 2, 0 _08077D10: .4byte gUnknown_82FF7C8 @@ -243190,13 +243190,13 @@ _08077D1A: cmp r4, #0 bge _08077D1A movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _08077D46: add sp, #0xc pop {r4, r5} @@ -243325,7 +243325,7 @@ _08077E1A: thumb_func_start sub_08077E20 sub_08077E20: @ 0x08077E20 push {r4, r5, lr} - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _08077E44 @@ -243678,11 +243678,11 @@ sub_08078120: @ 0x08078120 adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData add r6, sp, #0x1c adds r0, r6, #0 mov r1, sp - bl sub_08008828 + bl StringCopy10 ldr r0, [r5] adds r0, #0x7e ldrb r0, [r0] @@ -243695,11 +243695,11 @@ sub_08078120: @ 0x08078120 adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData add r4, sp, #0x28 adds r0, r4, #0 mov r1, sp - bl sub_08008828 + bl StringCopy10 mov r0, sp adds r1, r6, #0 bl StringCopy @@ -243928,7 +243928,7 @@ _08078334: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #4 bl sub_08079BD4 ldr r0, _08078354 @@ -243949,7 +243949,7 @@ _0807835C: adds r1, #0x7e strb r0, [r1] movs r0, #0 - bl sub_08098504 + bl rbox_fill_rectangle ldr r0, [r4] adds r0, #0x35 ldrb r0, [r0] @@ -243971,7 +243971,7 @@ _08078390: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080783AC ldr r0, [r0] adds r0, #0x6f @@ -244157,7 +244157,7 @@ _080784E4: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r6] adds r1, r0, #0 adds r1, #0x79 @@ -244295,7 +244295,7 @@ _08078614: .4byte gUnknown_2031F3C thumb_func_start sub_08078618 sub_08078618: @ 0x08078618 push {r4, lr} - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 bl sub_08076C08 @@ -244366,8 +244366,8 @@ _08078694: bx r1 thumb_func_end sub_08078650 - thumb_func_start sub_0807869C -sub_0807869C: @ 0x0807869C + thumb_func_start TradeMenuMoveCursor +TradeMenuMoveCursor: @ 0x0807869C push {r4, r5, r6, r7, lr} adds r7, r0, #0 lsls r1, r1, #0x18 @@ -244460,7 +244460,7 @@ _08078748: _08078750: .4byte gUnknown_2031F3C _08078754: .4byte gUnknown_20205AC _08078758: .4byte gUnknown_8300A1C - thumb_func_end sub_0807869C + thumb_func_end TradeMenuMoveCursor thumb_func_start sub_0807875C sub_0807875C: @ 0x0807875C @@ -244472,7 +244472,7 @@ sub_0807875C: @ 0x0807875C adds r0, #0x6f movs r1, #0x64 strb r1, [r0] - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -244512,7 +244512,7 @@ sub_080787A0: @ 0x080787A0 ldr r0, [r0] adds r0, #0x35 movs r1, #0 - bl sub_0807869C + bl TradeMenuMoveCursor b _08078814 .align 2, 0 _080787C0: .4byte gUnknown_3002360 @@ -244526,7 +244526,7 @@ _080787C8: ldr r0, [r0] adds r0, #0x35 movs r1, #1 - bl sub_0807869C + bl TradeMenuMoveCursor b _08078814 .align 2, 0 _080787E0: .4byte gUnknown_2031F3C @@ -244539,7 +244539,7 @@ _080787E4: ldr r0, [r0] adds r0, #0x35 movs r1, #2 - bl sub_0807869C + bl TradeMenuMoveCursor b _08078814 .align 2, 0 _080787FC: .4byte gUnknown_2031F3C @@ -244552,7 +244552,7 @@ _08078800: ldr r0, [r0] adds r0, #0x35 movs r1, #3 - bl sub_0807869C + bl TradeMenuMoveCursor _08078814: ldr r0, _0807888C ldrh r1, [r0, #0x2e] @@ -244572,10 +244572,10 @@ _08078814: movs r0, #1 movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _08078890 str r0, [sp] movs r0, #1 @@ -244595,10 +244595,10 @@ _08078814: movs r3, #2 bl sub_081984B0 movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] adds r0, #0x6f movs r1, #1 @@ -244617,7 +244617,7 @@ _08078894: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r4] adds r0, #0x6f movs r1, #2 @@ -244707,7 +244707,7 @@ _08078954: .4byte 0x06010000 sub_08078958: @ 0x08078958 push {lr} sub sp, #4 - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r0, r0, #0x18 movs r1, #1 @@ -244732,7 +244732,7 @@ _08078986: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080789A0 ldr r0, [r0] adds r0, #0x6f @@ -244865,7 +244865,7 @@ sub_08078A64: @ 0x08078A64 ldr r0, _08078AA8 str r0, [sp] movs r0, #1 - bl sub_081BF280 + bl ShowPokemonSummaryScreen b _08078AC8 .align 2, 0 _08078A9C: .4byte gUnknown_2037C74 @@ -244885,9 +244885,9 @@ _08078AAC: ldr r0, _08078AD8 str r0, [sp] movs r0, #1 - bl sub_081BF280 + bl ShowPokemonSummaryScreen _08078AC8: - bl sub_080034D4 + bl FreeAllWindowBuffers _08078ACC: add sp, #4 pop {r0} @@ -244935,7 +244935,7 @@ _08078B0A: adds r7, r0, r7 adds r0, r7, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #0xcd @@ -244947,11 +244947,11 @@ _08078B0A: _08078B34: adds r0, r7, #0 movs r1, #0x50 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08078B60 _08078B40: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _08078B6C ldr r0, _08078B68 @@ -244962,7 +244962,7 @@ _08078B40: cmp r0, #0 bne _08078B60 adds r0, r4, #0 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _08078B6C _08078B60: @@ -245109,7 +245109,7 @@ _08078C58: _08078C60: strb r1, [r0] movs r0, #0x11 - bl sub_0800365C + bl PutWindowTilemap b _08078C98 .align 2, 0 _08078C6C: .4byte gUnknown_2031F3C @@ -245130,7 +245130,7 @@ _08078C88: movs r1, #0x64 strb r1, [r0] movs r0, #0x11 - bl sub_0800365C + bl PutWindowTilemap _08078C98: pop {r0} bx r0 @@ -245155,10 +245155,10 @@ sub_08078CA4: @ 0x08078CA4 _08078CBA: lsrs r4, r6, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0x80 lsls r0, r0, #0x11 adds r6, r6, r0 @@ -245240,12 +245240,12 @@ _08078D5E: thumb_func_start sub_08078D64 sub_08078D64: @ 0x08078D64 push {r4, lr} - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _08078D8C movs r0, #0 - bl sub_08098504 + bl rbox_fill_rectangle ldr r4, _08078D9C ldr r0, [r4] adds r0, #0x35 @@ -245347,9 +245347,9 @@ sub_08078E1C: @ 0x08078E1C movs r0, #5 bl sub_080A306C movs r0, #0 - bl sub_08098504 + bl rbox_fill_rectangle movs r0, #1 - bl sub_08098504 + bl rbox_fill_rectangle movs r6, #0 movs r5, #0xe0 lsls r5, r5, #0x14 @@ -245357,9 +245357,9 @@ _08078E42: lsrs r4, r5, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 - bl sub_08098504 + bl rbox_fill_rectangle movs r0, #0x80 lsls r0, r0, #0x11 adds r5, r5, r0 @@ -245448,20 +245448,20 @@ sub_08078EE0: @ 0x08078EE0 bne _08078F4E ldr r0, _08078F20 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _08078F24 ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 - bl sub_0800DB50 + bl Free + bl FreeAllWindowBuffers + bl DestroyWirelessStatusIndicatorSprite ldr r0, _08078F28 - bl sub_08000540 + bl SetMainCallback2 b _08078F4E .align 2, 0 _08078F1C: .4byte gUnknown_300319C _08078F20: .4byte gUnknown_2031E28 _08078F24: .4byte gUnknown_2031F3C -_08078F28: .4byte sub_08085AA8 +_08078F28: .4byte CB2_ReturnToFieldFromMultiplayer _08078F2C: ldr r0, _08078F54 ldrb r0, [r0] @@ -245469,13 +245469,13 @@ _08078F2C: bne _08078F4E ldr r0, _08078F58 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _08078F5C ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers ldr r0, _08078F60 - bl sub_08000540 + bl SetMainCallback2 _08078F4E: pop {r0} bx r0 @@ -245483,7 +245483,7 @@ _08078F4E: _08078F54: .4byte gUnknown_30031C4 _08078F58: .4byte gUnknown_2031E28 _08078F5C: .4byte gUnknown_2031F3C -_08078F60: .4byte sub_08085AA8 +_08078F60: .4byte CB2_ReturnToFieldFromMultiplayer thumb_func_end sub_08078EE0 thumb_func_start sub_08078F64 @@ -245767,7 +245767,7 @@ _08079184: adds r0, r0, r4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003774 + bl ClearWindowTilemap adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -245843,7 +245843,7 @@ _08079184: lsls r0, r0, #2 adds r0, r0, r2 ldr r1, _08079298 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 mov r0, sb ldr r1, [r0] adds r1, #0x74 @@ -245877,9 +245877,9 @@ _08079184: movs r3, #0 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, [sp, #0x50] cmp r1, #0 beq _08079284 @@ -245939,7 +245939,7 @@ _080792D8: movs r3, #0 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r6, _08079408 ldr r1, _0807940C ldr r4, [r1] @@ -246015,7 +246015,7 @@ _080792D8: movs r1, #1 movs r2, #0 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r2, sp adds r2, #0x28 str r2, [sp, #0x54] @@ -246035,7 +246035,7 @@ _080792D8: movs r1, #1 movs r2, #0 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r1, sb str r1, [sp] str r1, [sp, #4] @@ -246047,17 +246047,17 @@ _080792D8: movs r1, #1 movs r2, #0x18 movs r3, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0807940C ldr r1, [r0] b _0807944A @@ -246143,18 +246143,18 @@ _0807949C: adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData adds r0, r5, #0 mov r1, sp - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -246177,7 +246177,7 @@ _0807949C: bne _080794F6 adds r0, r5, #0 mov r1, r8 - bl sub_08070970 + bl AppendGenderSymbol _080794F6: ldr r1, _08079534 adds r0, r5, #0 @@ -246276,7 +246276,7 @@ _080795B8: _080795BE: adds r0, r5, r2 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r4, #1 add r1, sp strh r0, [r1] @@ -246361,12 +246361,12 @@ sub_08079644: @ 0x08079644 movs r1, #1 movs r2, #0 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} @@ -246414,12 +246414,12 @@ _080796C8: adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData adds r0, r7, #0 mov r1, sp - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r2, r0, #0x18 mov r3, r8 @@ -246433,7 +246433,7 @@ _080796C8: bne _08079706 adds r0, r7, #0 adds r1, r2, #0 - bl sub_08070970 + bl AppendGenderSymbol _08079706: adds r0, r5, #0 adds r1, r6, #0 @@ -246501,7 +246501,7 @@ sub_08079740: @ 0x08079740 adds r3, r5, #0 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram cmp r7, #0 bne _080797A4 movs r0, #0x64 @@ -246523,7 +246523,7 @@ _080797AE: adds r0, r0, r1 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _08079828 @@ -246787,7 +246787,7 @@ _080799A8: .4byte gUnknown_8300A1C sub_080799AC: @ 0x080799AC push {lr} movs r0, #1 - bl sub_08098504 + bl rbox_fill_rectangle movs r0, #1 bl sub_08079690 pop {r0} @@ -246817,7 +246817,7 @@ sub_080799C0: @ 0x080799C0 movs r3, #0 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram adds r0, r4, #0 bl sub_0807987C adds r0, r4, #0 @@ -246864,7 +246864,7 @@ sub_08079A38: @ 0x08079A38 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r0} bx r0 @@ -246884,7 +246884,7 @@ sub_08079A5C: @ 0x08079A5C movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r0} bx r0 @@ -247075,7 +247075,7 @@ sub_08079BD4: @ 0x08079BD4 lsrs r4, r4, #0x18 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _08079C24 lsls r4, r4, #2 adds r4, r4, r0 @@ -247092,12 +247092,12 @@ sub_08079BD4: @ 0x08079BD4 movs r0, #0 movs r1, #0x14 movs r2, #0xc - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} @@ -247178,7 +247178,7 @@ _08079CD0: b _08079D0A _08079CD4: mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet ldr r1, _08079CE8 ldr r1, [r1] adds r2, r1, #0 @@ -247205,7 +247205,7 @@ _08079D04: .4byte gUnknown_830083C _08079D08: ldr r0, _08079D1C _08079D0A: - bl sub_08008210 + bl LoadSpriteSheet _08079D0E: ldr r0, _08079D20 ldr r1, [r0] @@ -247320,7 +247320,7 @@ _08079DC6: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r1, #1 bne _08079DF8 @@ -247339,7 +247339,7 @@ _08079DF4: .4byte gUnknown_2024190 _08079DF8: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r1, #0 bne _08079E16 @@ -247395,7 +247395,7 @@ _08079E5A: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r1, #1 bne _08079E8C @@ -247414,7 +247414,7 @@ _08079E88: .4byte gUnknown_20243E8 _08079E8C: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r1, #0 bne _08079EAA @@ -247485,12 +247485,12 @@ _08079F00: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r0, r5, #0x10 asrs r0, r0, #0x10 @@ -247530,12 +247530,12 @@ _08079F60: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r0, r5, #0x10 asrs r0, r0, #0x10 @@ -247680,17 +247680,17 @@ _0807A07C: add r4, r8 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData str r0, [r6, #0x18] adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData stm r6!, {r0} adds r5, #1 cmp r5, r7 blt _0807A07C _0807A09E: - bl sub_0809CD04 + bl IsNationalPokedexEnabled mov r1, sb lsls r4, r1, #2 cmp r0, #0 @@ -247707,13 +247707,13 @@ _0807A09E: _0807A0BC: lsls r0, r1, #0x10 lsrs r0, r0, #0x10 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _0807A0CC movs r0, #2 b _0807A188 _0807A0CC: - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -247748,7 +247748,7 @@ _0807A10C: .4byte gUnknown_20226A0 _0807A110: lsls r0, r1, #0x10 lsrs r0, r0, #0x10 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 beq _0807A142 _0807A11C: @@ -247768,7 +247768,7 @@ _0807A12E: adds r0, r1, #0 add r0, r8 movs r1, #0x50 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0807A146 _0807A142: @@ -247834,7 +247834,7 @@ sub_0807A198: @ 0x0807A198 cmp r0, #0 beq _0807A224 movs r4, #0 - bl sub_0800A02C + bl GetMultiplayerId ldr r5, _0807A21C movs r7, #1 eors r0, r7 @@ -247859,7 +247859,7 @@ sub_0807A198: @ 0x0807A198 _0807A1D2: cmp r4, #0 ble _0807A224 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -247874,7 +247874,7 @@ _0807A1D2: beq _0807A220 cmp r4, #2 bne _0807A224 - bl sub_0800A02C + bl GetMultiplayerId eors r0, r7 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -248023,7 +248023,7 @@ _0807A2EC: b _0807A330 _0807A2FE: adds r0, r7, #0 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _0807A30C _0807A308: @@ -248031,7 +248031,7 @@ _0807A308: b _0807A330 _0807A30C: mov r0, r8 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _0807A31A movs r0, #5 @@ -248041,7 +248041,7 @@ _0807A31A: cmp r0, #0 bne _0807A32E adds r0, r7, #0 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _0807A32E movs r0, #7 @@ -248086,7 +248086,7 @@ sub_0807A340: @ 0x0807A340 b _0807A380 _0807A370: adds r0, r6, #0 - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _0807A37E _0807A37A: @@ -248122,7 +248122,7 @@ _0807A3A4: muls r0, r5, r0 adds r0, r6, r0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData str r0, [r4] movs r1, #0xce lsls r1, r1, #1 @@ -248160,7 +248160,7 @@ _0807A3EC: adds r4, #0x1c adds r5, #1 _0807A3F0: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -248189,7 +248189,7 @@ _0807A420: adds r4, #0x1c adds r5, #1 _0807A424: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -248201,7 +248201,7 @@ _0807A424: mov r1, sp adds r4, r1, r0 ldrh r0, [r4] - bl sub_0806DE8C + bl MainMenu_FormatSavegameText cmp r0, #0 bne _0807A450 movs r0, #2 @@ -248330,7 +248330,7 @@ _0807A508: lsls r1, r1, #4 adds r1, #4 movs r2, #2 - bl sub_080A1200 + bl LoadPalette _0807A522: pop {r0} bx r0 @@ -248437,7 +248437,7 @@ sub_0807A598: @ 0x0807A598 ldrh r0, [r0] str r0, [sp, #0xc] add r0, sp, #0x10 - bl sub_0806F144 + bl DoBgAffineSet add r0, sp, #0x10 ldrh r1, [r0] movs r0, #0x20 @@ -248520,8 +248520,8 @@ _0807A678: sub_0807A680: @ 0x0807A680 push {lr} bl sub_0807A628 - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -248587,9 +248587,9 @@ _0807A6EE: lsls r0, r0, #1 cmp r1, r0 bls _0807A720 - bl sub_08009384 + bl CloseLink ldr r0, _0807A734 - bl sub_08000540 + bl SetMainCallback2 ldr r1, [r4] adds r3, r1, #0 adds r3, #0x8a @@ -248612,7 +248612,7 @@ _0807A720: pop {r0} bx r0 .align 2, 0 -_0807A734: .4byte sub_0800AA0C +_0807A734: .4byte CB2_LinkError thumb_func_end sub_0807A6C0 thumb_func_start sub_0807A738 @@ -248627,7 +248627,7 @@ sub_0807A738: @ 0x0807A738 .align 2, 0 _0807A748: .4byte gUnknown_30031C4 _0807A74C: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0807A754: @@ -248684,12 +248684,12 @@ _0807A7B0: .4byte gUnknown_20243E8 _0807A7B4: mov r0, r8 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 mov r0, r8 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r7, r0, #0 cmp r6, #0 bne _0807A7F0 @@ -248725,7 +248725,7 @@ _0807A7F0: _0807A80E: mov r0, r8 bl sub_0806E220 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _0807A838 ldr r1, [r0] adds r0, r1, #0 @@ -248746,12 +248746,12 @@ _0807A83C: bl sub_0806E220 ldrh r0, [r0, #4] adds r1, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0807A89C movs r1, #0x78 movs r2, #0x3c movs r3, #6 - bl sub_08006B0C + bl CreateSprite ldr r4, _0807A8A0 ldr r1, [r4] adds r1, #0x8e @@ -248840,20 +248840,20 @@ _0807A908: ldr r2, _0807A9A4 adds r0, r2, #0 strh r0, [r1] - bl sub_08009384 + bl CloseLink _0807A91C: ldr r4, _0807A9A8 movs r5, #0x80 lsls r5, r5, #1 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] - bl sub_0805EBD8 - bl sub_080A8818 + bl AllocateMonSpritesGfx + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes ldr r0, _0807A9AC - bl sub_080006F0 + bl SetVBlankCallback bl sub_0807ABCC bl sub_0807A698 ldr r1, _0807A9B0 @@ -248914,7 +248914,7 @@ _0807A9B4: adds r0, #0xfa movs r1, #1 strb r1, [r0] - bl sub_080092D0 + bl OpenLink ldr r1, _0807A9E8 movs r2, #0x87 lsls r2, r2, #3 @@ -248955,13 +248955,13 @@ _0807AA08: .align 2, 0 _0807AA14: .4byte gUnknown_2031F40 _0807AA18: - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 bne _0807AA24 b _0807AB38 _0807AA24: - bl sub_0800A770 + bl GetLinkPlayerCount_2 adds r4, r0, #0 bl sub_0800A60C lsls r4, r4, #0x18 @@ -248997,7 +248997,7 @@ _0807AA62: beq _0807AA70 b _0807AB72 _0807AA70: - bl sub_08009E00 + bl IsLinkPlayerDataExchangeComplete lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -249060,7 +249060,7 @@ _0807AAEC: .4byte gUnknown_3002360 _0807AAF0: bl sub_0807B4CC ldr r0, _0807AB04 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807AB08 bl LoadSpritePalette b _0807AB38 @@ -249074,9 +249074,9 @@ _0807AB0C: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r1, _0807AB2C movs r2, #0x87 lsls r2, r2, #3 @@ -249086,7 +249086,7 @@ _0807AB0C: _0807AB2C: .4byte gUnknown_3002360 _0807AB30: bl sub_0807AB9C - bl sub_0807B510 + bl SetTradeSceneStrings _0807AB38: ldr r1, _0807AB48 movs r0, #0x87 @@ -249110,19 +249110,19 @@ _0807AB4C: ldrb r0, [r0] cmp r0, #0 beq _0807AB6C - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _0807AB6C: ldr r0, _0807AB98 - bl sub_08000540 + bl SetMainCallback2 _0807AB72: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4, r5} pop {r0} @@ -249150,12 +249150,12 @@ sub_0807ABB0: @ 0x0807ABB0 push {lr} movs r0, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 thumb_func_end sub_0807ABB0 @@ -249180,28 +249180,28 @@ sub_0807ABCC: @ 0x0807ABCC movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r5, #0x80 lsls r5, r5, #4 adds r0, r5, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r5, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r5, #0 bl sub_08000BC8 adds r1, r0, #0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer bl sub_08004480 movs r0, #0x8c lsls r0, r0, #0x14 @@ -249212,7 +249212,7 @@ sub_0807ABCC: @ 0x0807ABCC mov r1, sl movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r0, _0807ACB8 mov r8, r0 ldr r4, _0807ACBC @@ -249222,21 +249222,21 @@ sub_0807ABCC: @ 0x0807ABCC adds r1, r4, #0 adds r2, r5, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r6, _0807ACC0 adds r0, r6, #0 movs r1, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _0807ACC4 - bl sub_08003090 + bl InitWindows mov r0, sb str r0, [sp] movs r0, #0 mov r1, sl movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap mov r0, r8 adds r1, r4, #0 bl sub_08034370 @@ -249244,11 +249244,11 @@ sub_0807ABCC: @ 0x0807ABCC adds r1, r4, #0 adds r2, r5, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer adds r0, r6, #0 movs r1, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette add sp, #4 pop {r3, r4, r5} mov r8, r3 @@ -249316,7 +249316,7 @@ _0807AD24: ldr r0, _0807ADD8 movs r1, #7 mov r2, sp - bl sub_0806A058 + bl GetMonData adds r4, #0x1c adds r0, r4, #0 mov r1, sp @@ -249325,14 +249325,14 @@ _0807AD24: movs r6, #0x80 lsls r6, r6, #1 adds r0, r6, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] - bl sub_0805EBD8 - bl sub_080A8818 + bl AllocateMonSpritesGfx + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes ldr r0, _0807ADE0 - bl sub_080006F0 + bl SetVBlankCallback bl sub_0807ABCC ldr r0, [r4] adds r0, #0xee @@ -249396,7 +249396,7 @@ _0807ADFC: movs r1, #0 bl sub_0807A758 movs r0, #0 - bl sub_08001B48 + bl ShowBg b _0807AE60 _0807AE0C: movs r0, #1 @@ -249404,17 +249404,17 @@ _0807AE0C: bl sub_0807A758 movs r0, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0807AE60 _0807AE2C: bl sub_0807B4CC ldr r0, _0807AE40 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807AE44 bl LoadSpritePalette b _0807AE60 @@ -249423,14 +249423,14 @@ _0807AE40: .4byte gUnknown_830CF5C _0807AE44: .4byte gUnknown_830CF64 _0807AE48: movs r0, #0 - bl sub_08001B48 + bl ShowBg b _0807AE60 _0807AE50: movs r0, #5 bl sub_0807B064 movs r0, #0 bl sub_0807B064 - bl sub_0807B510 + bl SetTradeSceneStrings _0807AE60: ldr r1, _0807AE70 movs r0, #0x87 @@ -249444,13 +249444,13 @@ _0807AE60: _0807AE70: .4byte gUnknown_3002360 _0807AE74: ldr r0, _0807AE98 - bl sub_08000540 + bl SetMainCallback2 _0807AE7A: - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -249470,20 +249470,20 @@ sub_0807AE9C: @ 0x0807AE9C adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0807AEF0 adds r0, r5, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 adds r0, r4, #0 bl sub_0806CF68 @@ -249492,11 +249492,11 @@ sub_0807AE9C: @ 0x0807AE9C lsrs r4, r4, #0x10 adds r0, r4, #0 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag adds r0, r4, #0 movs r1, #3 adds r2, r5, #0 - bl sub_0806EAA8 + bl HandleSetPokedexFlag _0807AEF0: pop {r4, r5} pop {r0} @@ -249508,7 +249508,7 @@ _0807AEF8: .4byte gUnknown_2024190 thumb_func_start sub_0807AEFC sub_0807AEFC: @ 0x0807AEFC push {lr} - bl sub_0800A02C + bl GetMultiplayerId pop {r0} bx r0 .align 2, 0 @@ -249534,7 +249534,7 @@ sub_0807AF08: @ 0x0807AF08 adds r7, r1, r0 adds r0, r7, #0 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r1, r4, #0 @@ -249543,7 +249543,7 @@ sub_0807AF08: @ 0x0807AF08 adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 @@ -249577,13 +249577,13 @@ _0807AF62: strb r1, [r0] adds r0, r7, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0807AF9E adds r0, r7, #0 movs r1, #0x20 mov r2, sp - bl sub_0806A774 + bl SetMonData _0807AF9E: mov r0, r8 cmp r0, #0xff @@ -249594,7 +249594,7 @@ _0807AF9E: ldr r0, _0807AFE8 adds r1, r1, r0 adds r0, r7, #0 - bl sub_080D3E90 + bl GiveMailToMon2 _0807AFB4: mov r0, sb bl sub_0807AE9C @@ -249636,7 +249636,7 @@ sub_0807AFF0: @ 0x0807AFF0 .align 2, 0 _0807B004: .4byte gUnknown_2031F40 _0807B008: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0807B02E @@ -249646,7 +249646,7 @@ _0807B008: ldr r1, [r4] adds r1, #0x74 movs r2, #0x14 - bl sub_0800A070 + bl SendBlock ldr r1, [r4] adds r1, #0x93 ldrb r0, [r1] @@ -249670,11 +249670,11 @@ _0807B040: .4byte gUnknown_2031F40 sub_0807B044: @ 0x0807B044 push {lr} bl sub_0807B600 - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -249725,7 +249725,7 @@ _0807B0A0: ldr r0, _0807B100 movs r1, #0x10 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r3, _0807B104 ldr r4, _0807B108 movs r5, #0xa1 @@ -249874,7 +249874,7 @@ _0807B1F8: _0807B212: movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes b _0807B4A0 .align 2, 0 _0807B21C: .4byte 0x00001241 @@ -249886,7 +249886,7 @@ _0807B230: ldr r0, _0807B260 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0807B264 ldr r1, _0807B268 bl LZ77UnCompVram @@ -250126,7 +250126,7 @@ _0807B434: ldr r0, _0807B4B0 movs r1, #0x10 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r3, _0807B4B4 ldr r4, _0807B4B8 movs r5, #0xa1 @@ -250183,13 +250183,13 @@ _0807B4C8: .4byte 0x06009000 sub_0807B4CC: @ 0x0807B4CC push {lr} ldr r0, _0807B4F8 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807B4FC - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807B500 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807B504 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807B508 bl LoadSpritePalette ldr r0, _0807B50C @@ -250205,8 +250205,8 @@ _0807B508: .4byte gUnknown_830CFBC _0807B50C: .4byte gUnknown_830CFC4 thumb_func_end sub_0807B4CC - thumb_func_start sub_0807B510 -sub_0807B510: @ 0x0807B510 + thumb_func_start SetTradeSceneStrings +SetTradeSceneStrings: @ 0x0807B510 push {r4, r5, lr} sub sp, #0x14 ldr r0, _0807B580 @@ -250215,7 +250215,7 @@ sub_0807B510: @ 0x0807B510 ldrb r0, [r0] cmp r0, #0 beq _0807B5A0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 ldr r3, _0807B584 movs r2, #0x80 @@ -250241,20 +250241,20 @@ sub_0807B510: @ 0x0807B510 adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _0807B594 mov r1, sp - bl sub_08008828 + bl StringCopy10 ldrb r0, [r5] muls r0, r4, r0 ldr r1, _0807B598 adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _0807B59C mov r1, sp - bl sub_08008828 + bl StringCopy10 b _0807B5DC .align 2, 0 _0807B580: .4byte gUnknown_2031F40 @@ -250279,7 +250279,7 @@ _0807B5A0: bl StringCopy ldr r0, _0807B5F0 adds r1, r4, #0 - bl sub_08008828 + bl StringCopy10 ldr r0, _0807B5F4 ldrh r1, [r0] movs r0, #0x64 @@ -250288,10 +250288,10 @@ _0807B5A0: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _0807B5FC mov r1, sp - bl sub_08008828 + bl StringCopy10 _0807B5DC: add sp, #0x14 pop {r4, r5} @@ -250305,7 +250305,7 @@ _0807B5F0: .4byte gUnknown_2021C68 _0807B5F4: .4byte gUnknown_2037282 _0807B5F8: .4byte gUnknown_2024190 _0807B5FC: .4byte gUnknown_2021C54 - thumb_func_end sub_0807B510 + thumb_func_end SetTradeSceneStrings thumb_func_start sub_0807B600 sub_0807B600: @ 0x0807B600 @@ -250669,7 +250669,7 @@ _0807BA84: adds r1, #0xf4 strh r0, [r1] ldr r0, _0807BAF8 - bl sub_080A27D8 + bl PlayNewMapMusic bl _0807C9EC .align 2, 0 _0807BAEC: .4byte gUnknown_20205AC @@ -250724,7 +250724,7 @@ _0807BB58: ldr r4, _0807BB94 ldr r1, _0807BB98 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -250740,7 +250740,7 @@ _0807BB58: beq _0807BB86 adds r0, r1, #0 movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 _0807BB86: ldr r3, [r4] adds r1, r3, #0 @@ -250793,7 +250793,7 @@ _0807BBB0: ldr r4, _0807BC0C ldr r1, _0807BC10 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -250825,7 +250825,7 @@ _0807BC34: movs r1, #0x78 movs r2, #0x20 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0xd3 strb r0, [r1] @@ -250860,7 +250860,7 @@ _0807BC80: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807BCA0 ldr r0, [r0] adds r0, #0x94 @@ -250882,10 +250882,10 @@ _0807BCB4: bl sub_0807B064 movs r0, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram bl _0807C980 .align 2, 0 _0807BCD0: .4byte gUnknown_2037C74 @@ -250964,7 +250964,7 @@ _0807BD60: movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x91 strb r0, [r1] @@ -251035,7 +251035,7 @@ _0807BDFC: movs r1, #0x80 movs r2, #0x41 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x92 strb r0, [r1] @@ -251047,7 +251047,7 @@ _0807BE18: movs r1, #0x80 movs r2, #0x50 movs r3, #3 - bl sub_08006B0C + bl CreateSprite ldr r4, _0807BE60 ldr r1, [r4] adds r1, #0x90 @@ -251056,7 +251056,7 @@ _0807BE18: movs r1, #0x80 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #0x91 strb r0, [r1] @@ -251149,7 +251149,7 @@ _0807BEF0: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807BF10 ldr r0, [r0] adds r0, #0x94 @@ -251199,13 +251199,13 @@ _0807BF60: adds r0, r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r5, _0807BFA4 adds r0, r5, #0 movs r1, #0x6f movs r2, #0xaa movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0807BFA8 ldr r1, [r4] adds r1, #0x90 @@ -251215,7 +251215,7 @@ _0807BF60: adds r0, r5, #0 movs r1, #0x81 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #0x91 strb r0, [r1] @@ -251319,7 +251319,7 @@ _0807C068: ldr r2, _0807C078 movs r0, #1 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes bl _0807C980 .align 2, 0 _0807C078: .4byte 0x0000FFFF @@ -251327,7 +251327,7 @@ _0807C07C: ldr r2, _0807C08C movs r0, #1 movs r1, #0 - bl sub_080A22E8 + bl BlendPalettes bl _0807C980 .align 2, 0 _0807C08C: .4byte 0x0000FFFF @@ -251335,7 +251335,7 @@ _0807C090: ldr r2, _0807C0A0 movs r0, #1 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes bl _0807C980 .align 2, 0 _0807C0A0: .4byte 0x0000FFFF @@ -251576,7 +251576,7 @@ _0807C234: ldr r2, _0807C298 movs r0, #1 movs r1, #0 - bl sub_080A22E8 + bl BlendPalettes b _0807C9EC .align 2, 0 _0807C294: .4byte gUnknown_20205AC @@ -251623,7 +251623,7 @@ _0807C2DE: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r7] adds r2, r1, #0 adds r2, #0x94 @@ -251674,7 +251674,7 @@ _0807C332: movs r1, #0x80 adds r2, r4, #0 movs r3, #3 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x90 strb r0, [r1] @@ -251682,7 +251682,7 @@ _0807C332: movs r1, #0x80 adds r2, r4, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x91 strb r0, [r1] @@ -251865,7 +251865,7 @@ _0807C4CA: movs r1, #0x80 movs r2, #0x41 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x92 strb r0, [r1] @@ -251890,7 +251890,7 @@ _0807C500: movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r2, _0807C524 ldr r1, [r2] adds r1, #0x91 @@ -251975,7 +251975,7 @@ _0807C5A8: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807C5C4 ldr r0, [r0] adds r0, #0x94 @@ -252041,7 +252041,7 @@ _0807C62C: rsbs r2, r2, #0 movs r1, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r5, _0807C6C4 ldr r1, [r5] adds r1, #0xd3 @@ -252096,7 +252096,7 @@ _0807C62C: lsls r0, r1 ldr r2, _0807C6D0 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes ldr r2, [r5] adds r1, r2, #0 adds r1, #0x94 @@ -252130,7 +252130,7 @@ _0807C6D4: movs r1, #1 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r7] b _0807C984 .align 2, 0 @@ -252239,7 +252239,7 @@ _0807C754: str r2, [sp, #0x10] movs r2, #0x78 movs r3, #0x54 - bl sub_08075E40 + bl CreatePokeballSpriteToReleaseMon ldr r0, [r7] adds r0, #0xd3 ldrb r1, [r0] @@ -252270,7 +252270,7 @@ _0807C814: ldr r4, _0807C844 ldr r1, _0807C848 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -252308,7 +252308,7 @@ _0807C85E: .align 2, 0 _0807C86C: .4byte 0x0000010B _0807C870: - bl sub_080A2F40 + bl IsCryFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0807C87C @@ -252330,7 +252330,7 @@ _0807C88C: cmp r0, #0xa bne _0807C89E ldr r0, _0807C8CC - bl sub_080A29AC + bl PlayFanfare _0807C89E: ldr r1, [r7] ldr r0, [r1, #0x64] @@ -252346,7 +252346,7 @@ _0807C8A8: ldr r4, _0807C8D0 ldr r1, _0807C8D4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -252407,7 +252407,7 @@ _0807C914: adds r0, r0, r5 movs r1, #1 movs r2, #0 - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -252421,7 +252421,7 @@ _0807C914: adds r1, #0x8f ldrb r2, [r1] adds r1, r4, #0 - bl sub_0813E2D8 + bl TradeEvolutionScene b _0807C980 .align 2, 0 _0807C958: .4byte gUnknown_2037282 @@ -252438,7 +252438,7 @@ _0807C970: movs r2, #0 movs r3, #0x10 _0807C97C: - bl sub_080A139C + bl BeginNormalPaletteFade _0807C980: ldr r0, _0807C990 ldr r1, [r0] @@ -252462,27 +252462,27 @@ _0807C994: ldr r0, [r7] adds r0, #0xf4 ldrh r0, [r0] - bl sub_080A27D8 + bl PlayNewMapMusic ldr r0, [r7] cmp r0, #0 beq _0807C9E2 - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #3 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #1 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #0 - bl sub_08002194 - bl sub_08000BF0 - bl sub_0805ECB0 + bl GetBgTilemapBuffer + bl Free + bl FreeMonSpritesGfx ldr r0, [r7] - bl sub_08000BF0 + bl Free str r4, [r7] _0807C9E2: ldr r0, _0807C9FC - bl sub_08000540 + bl SetMainCallback2 bl sub_0807E1C4 _0807C9EC: movs r0, #0 @@ -252836,7 +252836,7 @@ _0807CE60: adds r1, #0xf4 strh r0, [r1] ldr r0, _0807CED4 - bl sub_080A27D8 + bl PlayNewMapMusic bl _0807DE38 .align 2, 0 _0807CEC8: .4byte gUnknown_20205AC @@ -252891,7 +252891,7 @@ _0807CF34: ldr r4, _0807CF70 ldr r1, _0807CF74 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -252907,7 +252907,7 @@ _0807CF34: beq _0807CF62 adds r0, r1, #0 movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 _0807CF62: ldr r3, [r4] adds r1, r3, #0 @@ -252960,7 +252960,7 @@ _0807CF8C: ldr r4, _0807CFE8 ldr r1, _0807CFEC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -252992,7 +252992,7 @@ _0807D010: movs r1, #0x78 movs r2, #0x20 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0xd3 strb r0, [r1] @@ -253027,7 +253027,7 @@ _0807D05C: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807D07C ldr r0, [r0] adds r0, #0x94 @@ -253049,10 +253049,10 @@ _0807D090: bl sub_0807B064 movs r0, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram bl _0807DDCC .align 2, 0 _0807D0AC: .4byte gUnknown_2037C74 @@ -253131,7 +253131,7 @@ _0807D13C: movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x91 strb r0, [r1] @@ -253167,16 +253167,16 @@ _0807D180: bl SetGpuReg ldr r0, _0807D1B0 movs r1, #5 - bl sub_080A8878 + bl CreateTask ldr r1, [r7] bl _0807DDD0 .align 2, 0 _0807D1A8: .4byte gUnknown_20205AC _0807D1AC: .4byte 0x00000452 -_0807D1B0: .4byte sub_0807EC48 +_0807D1B0: .4byte c3_08054588 _0807D1B4: ldr r0, _0807D1D4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _0807D1C4 @@ -253189,7 +253189,7 @@ _0807D1C4: strh r1, [r0] bl _0807DE38 .align 2, 0 -_0807D1D4: .4byte sub_0807EC48 +_0807D1D4: .4byte c3_08054588 _0807D1D8: .4byte gUnknown_2031F40 _0807D1DC: ldr r2, [r7] @@ -253212,7 +253212,7 @@ _0807D1FC: movs r1, #0x78 movs r2, #0x50 movs r3, #3 - bl sub_08006B0C + bl CreateSprite ldr r4, _0807D258 ldr r1, [r4] adds r1, #0x90 @@ -253233,7 +253233,7 @@ _0807D1FC: movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #0x91 strb r0, [r1] @@ -253326,7 +253326,7 @@ _0807D2EC: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807D30C ldr r0, [r0] adds r0, #0x94 @@ -253376,13 +253376,13 @@ _0807D35C: adds r0, r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r5, _0807D3A0 adds r0, r5, #0 movs r1, #0x6f movs r2, #0xaa movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0807D3A4 ldr r1, [r4] adds r1, #0x90 @@ -253392,7 +253392,7 @@ _0807D35C: adds r0, r5, #0 movs r1, #0x81 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #0x91 strb r0, [r1] @@ -253497,12 +253497,12 @@ _0807D44A: b _0807D692 .align 2, 0 _0807D468: .4byte gUnknown_20205AC -_0807D46C: .4byte sub_0807ED1C +_0807D46C: .4byte c3_0805465C _0807D470: ldr r2, _0807D480 movs r0, #8 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes bl _0807DDCC .align 2, 0 _0807D480: .4byte 0x0000FFFF @@ -253510,7 +253510,7 @@ _0807D484: ldr r2, _0807D494 movs r0, #8 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes bl _0807DDCC .align 2, 0 _0807D494: .4byte 0x0000FFFF @@ -253518,7 +253518,7 @@ _0807D498: ldr r2, _0807D4A8 movs r0, #8 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes bl _0807DDCC .align 2, 0 _0807D4A8: .4byte 0x0000FFFF @@ -253759,7 +253759,7 @@ _0807D63C: ldr r0, _0807D6A0 _0807D692: movs r1, #5 - bl sub_080A8878 + bl CreateTask b _0807DE38 .align 2, 0 _0807D69C: .4byte gUnknown_20205AC @@ -253806,7 +253806,7 @@ _0807D6E6: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r7] adds r2, r1, #0 adds r2, #0x94 @@ -253864,7 +253864,7 @@ _0807D73A: movs r1, #0x78 adds r2, r4, #0 movs r3, #3 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x90 strb r0, [r1] @@ -253884,7 +253884,7 @@ _0807D73A: movs r1, #0x78 adds r2, r4, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x91 strb r0, [r1] @@ -253998,7 +253998,7 @@ _0807D854: bne _0807D898 ldr r0, _0807D8B4 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0807D8B8 @@ -254024,7 +254024,7 @@ _0807D8AC: b _0807DDD0 .align 2, 0 _0807D8B0: .4byte gUnknown_2031F40 -_0807D8B4: .4byte sub_0807EC48 +_0807D8B4: .4byte c3_08054588 _0807D8B8: .4byte gUnknown_3005B60 _0807D8BC: ldr r0, [r7] @@ -254057,7 +254057,7 @@ _0807D8BC: _0807D8F4: .4byte gUnknown_20205AC _0807D8F8: ldr r0, _0807D918 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -254073,7 +254073,7 @@ _0807D908: str r3, [r2, #0x64] b _0807DE38 .align 2, 0 -_0807D918: .4byte sub_0807EC48 +_0807D918: .4byte c3_08054588 _0807D91C: .4byte gUnknown_2031F40 _0807D920: ldr r1, [r7] @@ -254107,7 +254107,7 @@ _0807D94E: movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r2, _0807D970 ldr r1, [r2] adds r1, #0x91 @@ -254192,7 +254192,7 @@ _0807D9F4: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807DA10 ldr r0, [r0] adds r0, #0x94 @@ -254258,7 +254258,7 @@ _0807DA78: rsbs r2, r2, #0 movs r1, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r5, _0807DB10 ldr r1, [r5] adds r1, #0xd3 @@ -254313,7 +254313,7 @@ _0807DA78: lsls r0, r1 ldr r2, _0807DB1C movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes ldr r2, [r5] adds r1, r2, #0 adds r1, #0x94 @@ -254347,7 +254347,7 @@ _0807DB20: movs r1, #1 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r7] b _0807DDD0 .align 2, 0 @@ -254456,7 +254456,7 @@ _0807DBA0: str r2, [sp, #0x10] movs r2, #0x78 movs r3, #0x54 - bl sub_08075E40 + bl CreatePokeballSpriteToReleaseMon ldr r0, [r7] adds r0, #0xd3 ldrb r1, [r0] @@ -254487,7 +254487,7 @@ _0807DC60: ldr r4, _0807DC90 ldr r1, _0807DC94 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -254525,7 +254525,7 @@ _0807DCAA: .align 2, 0 _0807DCB8: .4byte 0x0000010B _0807DCBC: - bl sub_080A2F40 + bl IsCryFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0807DCC8 @@ -254547,7 +254547,7 @@ _0807DCD8: cmp r0, #0xa bne _0807DCEA ldr r0, _0807DD18 - bl sub_080A29AC + bl PlayFanfare _0807DCEA: ldr r1, [r7] ldr r0, [r1, #0x64] @@ -254563,7 +254563,7 @@ _0807DCF4: ldr r4, _0807DD1C ldr r1, _0807DD20 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -254624,7 +254624,7 @@ _0807DD60: adds r0, r0, r5 movs r1, #1 movs r2, #0 - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -254638,7 +254638,7 @@ _0807DD60: adds r1, #0x8f ldrb r2, [r1] adds r1, r4, #0 - bl sub_0813E2D8 + bl TradeEvolutionScene b _0807DDCC .align 2, 0 _0807DDA4: .4byte gUnknown_2037282 @@ -254655,7 +254655,7 @@ _0807DDBC: movs r2, #0 movs r3, #0x10 _0807DDC8: - bl sub_080A139C + bl BeginNormalPaletteFade _0807DDCC: ldr r0, _0807DDDC ldr r1, [r0] @@ -254679,27 +254679,27 @@ _0807DDE0: ldr r0, [r7] adds r0, #0xf4 ldrh r0, [r0] - bl sub_080A27D8 + bl PlayNewMapMusic ldr r0, [r7] cmp r0, #0 beq _0807DE2E - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #3 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #1 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #0 - bl sub_08002194 - bl sub_08000BF0 - bl sub_0805ECB0 + bl GetBgTilemapBuffer + bl Free + bl FreeMonSpritesGfx ldr r0, [r7] - bl sub_08000BF0 + bl Free str r4, [r7] _0807DE2E: ldr r0, _0807DE48 - bl sub_08000540 + bl SetMainCallback2 bl sub_0807E1C4 _0807DE38: movs r0, #0 @@ -254713,8 +254713,8 @@ _0807DE44: .4byte gUnknown_2037C74 _0807DE48: .4byte sub_08085A30 thumb_func_end sub_0807CA00 - thumb_func_start sub_0807DE4C -sub_0807DE4C: @ 0x0807DE4C + thumb_func_start c2_08053788 +c2_08053788: @ 0x0807DE4C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -254751,7 +254751,7 @@ _0807DE7C: adds r0, r0, r5 movs r1, #1 movs r2, #0 - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -254765,7 +254765,7 @@ _0807DE7C: adds r1, #0x8f ldrb r2, [r1] adds r1, r4, #0 - bl sub_0813E2D8 + bl TradeEvolutionScene b _0807DEE6 .align 2, 0 _0807DEB8: .4byte gUnknown_3005F28 @@ -254778,13 +254778,13 @@ _0807DECC: cmp r0, #0 beq _0807DEE0 ldr r0, _0807DEDC - bl sub_08000540 + bl SetMainCallback2 b _0807DEE6 .align 2, 0 _0807DEDC: .4byte sub_0807EE9C _0807DEE0: mov r0, r8 - bl sub_08000540 + bl SetMainCallback2 _0807DEE6: ldr r1, _0807DF10 movs r0, #0xff @@ -254795,11 +254795,11 @@ _0807DEEC: lsls r0, r0, #0x18 cmp r0, #0 bne _0807DEFA - bl sub_080A89D4 + bl RunTasks _0807DEFA: - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -254807,13 +254807,13 @@ _0807DEFA: bx r0 .align 2, 0 _0807DF10: .4byte gUnknown_2031F38 - thumb_func_end sub_0807DE4C + thumb_func_end c2_08053788 thumb_func_start sub_0807DF14 sub_0807DF14: @ 0x0807DF14 push {r4, r5, r6, lr} bl sub_0807A738 - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r6, #1 @@ -254827,7 +254827,7 @@ sub_0807DF14: @ 0x0807DF14 cmp r1, r0 bne _0807DF3C ldr r0, _0807DF88 - bl sub_08000540 + bl SetMainCallback2 _0807DF3C: ldrh r1, [r4] ldr r0, _0807DF8C @@ -254839,7 +254839,7 @@ _0807DF3C: strb r6, [r0] _0807DF4C: movs r0, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag _0807DF52: movs r0, #2 ands r0, r5 @@ -254860,7 +254860,7 @@ _0807DF52: strb r1, [r0] _0807DF74: movs r0, #1 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag _0807DF7A: pop {r4, r5, r6} pop {r0} @@ -254868,7 +254868,7 @@ _0807DF7A: .align 2, 0 _0807DF80: .4byte gUnknown_202207C _0807DF84: .4byte 0x0000DCBA -_0807DF88: .4byte sub_0807DE4C +_0807DF88: .4byte c2_08053788 _0807DF8C: .4byte 0x0000ABCD _0807DF90: .4byte gUnknown_2031F40 thumb_func_end sub_0807DF14 @@ -254985,7 +254985,7 @@ _0807E038: str r2, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0807E06E: add sp, #4 pop {r4} @@ -255179,10 +255179,10 @@ sub_0807E1C4: @ 0x0807E1C4 adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _0807E21C mov r1, sp - bl sub_08008828 + bl StringCopy10 ldr r0, _0807E220 ldrh r2, [r4, #0xc] lsls r1, r2, #1 @@ -255205,8 +255205,8 @@ _0807E220: .4byte gUnknown_2021C54 _0807E224: .4byte gUnknown_82EA31C thumb_func_end sub_0807E1C4 - thumb_func_start sub_0807E228 -sub_0807E228: @ 0x0807E228 + thumb_func_start _CreateInGameTradePokemon +_CreateInGameTradePokemon: @ 0x0807E228 push {r4, r5, r6, r7, lr} sub sp, #0x38 lsls r0, r0, #0x18 @@ -255223,7 +255223,7 @@ sub_0807E228: @ 0x0807E228 ldr r1, _0807E388 adds r0, r0, r1 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -255241,90 +255241,90 @@ sub_0807E228: @ 0x0807E228 str r0, [sp, #0xc] adds r0, r6, #0 movs r3, #0x20 - bl sub_08067730 + bl CreateMon adds r2, r5, #0 adds r2, #0xe adds r0, r6, #0 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0xf adds r0, r6, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x10 adds r0, r6, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x11 adds r0, r6, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x12 adds r0, r6, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x13 adds r0, r6, #0 movs r1, #0x2c - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #2 adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x2b adds r0, r6, #0 movs r1, #7 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x36 adds r0, r6, #0 movs r1, #0x31 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x14 adds r0, r6, #0 movs r1, #0x2e - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x1d adds r0, r6, #0 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x1e adds r0, r6, #0 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x1c adds r0, r6, #0 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x1f adds r0, r6, #0 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x20 adds r0, r6, #0 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x37 adds r0, r6, #0 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 movs r1, #0x23 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r4, sp adds r4, #0x35 movs r0, #0 @@ -255350,12 +255350,12 @@ sub_0807E228: @ 0x0807E228 adds r0, r6, #0 movs r1, #0x40 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData adds r2, r5, #0 adds r2, #0x28 adds r0, r6, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _0807E3A0 .align 2, 0 _0807E384: .4byte gUnknown_830D114 @@ -255367,17 +255367,17 @@ _0807E394: adds r2, #0x28 adds r0, r6, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData _0807E3A0: ldr r0, _0807E3B0 - bl sub_0806884C + bl CalculateMonStats add sp, #0x38 pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _0807E3B0: .4byte gUnknown_20243E8 - thumb_func_end sub_0807E228 + thumb_func_end _CreateInGameTradePokemon thumb_func_start sub_0807E3B4 sub_0807E3B4: @ 0x0807E3B4 @@ -255426,8 +255426,8 @@ _0807E3CE: _0807E408: .4byte gUnknown_830D204 thumb_func_end sub_0807E3B4 - thumb_func_start sub_0807E40C -sub_0807E40C: @ 0x0807E40C + thumb_func_start GetTradeSpecies +GetTradeSpecies: @ 0x0807E40C push {r4, r5, r6, lr} ldr r6, _0807E438 ldrh r0, [r6] @@ -255436,14 +255436,14 @@ sub_0807E40C: @ 0x0807E40C ldr r4, _0807E43C adds r0, r0, r4 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0807E440 ldrh r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 b _0807E442 @@ -255456,22 +255456,22 @@ _0807E442: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0807E40C + thumb_func_end GetTradeSpecies - thumb_func_start sub_0807E448 -sub_0807E448: @ 0x0807E448 + thumb_func_start CreateInGameTradePokemon +CreateInGameTradePokemon: @ 0x0807E448 push {lr} ldr r0, _0807E45C ldrb r0, [r0] ldr r1, _0807E460 ldrb r1, [r1] - bl sub_0807E228 + bl _CreateInGameTradePokemon pop {r0} bx r0 .align 2, 0 _0807E45C: .4byte gUnknown_2037282 _0807E460: .4byte gUnknown_2037280 - thumb_func_end sub_0807E448 + thumb_func_end CreateInGameTradePokemon thumb_func_start sub_0807E464 sub_0807E464: @ 0x0807E464 @@ -255521,15 +255521,15 @@ sub_0807E464: @ 0x0807E464 strb r6, [r0] _0807E4C8: ldr r0, _0807E500 - bl sub_08000540 + bl SetMainCallback2 _0807E4CE: bl sub_0807AFF0 bl sub_0807DF14 - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4, r5, r6} pop {r0} bx r0 @@ -255551,10 +255551,10 @@ sub_0807E504: @ 0x0807E504 cmp r0, #0 beq _0807E524 ldr r0, _0807E520 - bl sub_08000540 + bl SetMainCallback2 b _0807E564 .align 2, 0 -_0807E520: .4byte sub_0807DE4C +_0807E520: .4byte c2_08053788 _0807E524: bl sub_0807DF14 cmp r4, #0 @@ -255577,7 +255577,7 @@ _0807E524: ldr r1, [r4] adds r1, #0x74 movs r2, #0x14 - bl sub_0800A070 + bl SendBlock ldr r0, [r4] adds r0, #0x72 movs r1, #2 @@ -255586,10 +255586,10 @@ _0807E524: adds r0, #0x73 strb r1, [r0] _0807E564: - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4} pop {r0} bx r0 @@ -255804,7 +255804,7 @@ _0807E7D0: ldr r1, _0807E7F4 _0807E7DE: adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -255825,7 +255825,7 @@ _0807E806: cmp r0, #0 beq _0807E82E ldr r4, _0807E84C - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -255837,9 +255837,9 @@ _0807E806: adds r1, r1, r4 ldr r1, [r1] movs r0, #2 - bl sub_0801B4A8 + bl WonderCard_Test_Unk_08_6 _0807E82E: - bl sub_08076764 + bl SetContinueGameWarpStatusToDynamicWarp bl sub_081532BC ldr r1, _0807E850 movs r2, #0x87 @@ -255928,7 +255928,7 @@ _0807E8D4: bhi _0807E8E4 b _0807EA72 _0807E8E4: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0807E90C @@ -256025,7 +256025,7 @@ _0807E99C: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0807EA14 _0807E9B6: ldr r0, _0807E9D4 @@ -256045,7 +256045,7 @@ _0807E9B6: _0807E9D4: .4byte gUnknown_2037C74 _0807E9D8: .4byte gUnknown_3002360 _0807E9DC: - bl sub_080A2B20 + bl IsBGMStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -256096,7 +256096,7 @@ _0807EA28: movs r1, #0 strb r1, [r0] ldr r0, _0807EA5C - bl sub_08000540 + bl SetMainCallback2 b _0807EA72 .align 2, 0 _0807EA50: .4byte gUnknown_300319C @@ -256111,17 +256111,17 @@ _0807EA60: ldr r0, _0807EA98 strb r1, [r0] ldr r0, _0807EA9C - bl sub_08000540 + bl SetMainCallback2 _0807EA72: bl sub_0800AE18 lsls r0, r0, #0x18 cmp r0, #0 bne _0807EA80 - bl sub_080A89D4 + bl RunTasks _0807EA80: - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4} pop {r0} @@ -256143,35 +256143,35 @@ sub_0807EAA0: @ 0x0807EAA0 lsrs r5, r0, #0x18 cmp r5, #0 bne _0807EAF6 - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #3 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #1 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #0 - bl sub_08002194 - bl sub_08000BF0 - bl sub_0805ECB0 + bl GetBgTilemapBuffer + bl Free + bl FreeMonSpritesGfx ldr r4, _0807EB10 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r0, _0807EB14 ldrb r0, [r0] cmp r0, #0 beq _0807EAEE - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite _0807EAEE: ldr r0, _0807EB18 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _0807EAF6: - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4, r5} pop {r0} bx r0 @@ -256182,27 +256182,27 @@ _0807EB14: .4byte gUnknown_300319C _0807EB18: .4byte gUnknown_3002360 thumb_func_end sub_0807EAA0 - thumb_func_start sub_0807EB1C -sub_0807EB1C: @ 0x0807EB1C + thumb_func_start DoInGameTradeScene +DoInGameTradeScene: @ 0x0807EB1C push {lr} sub sp, #4 bl sub_080987DC ldr r0, _0807EB44 movs r1, #0xa - bl sub_080A8878 + bl CreateTask movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 .align 2, 0 _0807EB44: .4byte sub_0807EB48 - thumb_func_end sub_0807EB1C + thumb_func_end DoInGameTradeScene thumb_func_start sub_0807EB48 sub_0807EB48: @ 0x0807EB48 @@ -256216,12 +256216,12 @@ sub_0807EB48: @ 0x0807EB48 cmp r0, #0 bne _0807EB6C ldr r0, _0807EB78 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0807EB7C ldr r0, _0807EB80 str r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0807EB6C: pop {r4} pop {r0} @@ -256230,7 +256230,7 @@ _0807EB6C: _0807EB74: .4byte gUnknown_2037C74 _0807EB78: .4byte sub_0807ACC8 _0807EB7C: .4byte gUnknown_3005B0C -_0807EB80: .4byte sub_080AEA64 +_0807EB80: .4byte FieldCallback_ReturnToEventScript2 thumb_func_end sub_0807EB48 thumb_func_start sub_0807EB84 @@ -256251,7 +256251,7 @@ _0807EB8A: adds r0, r0, r1 adds r1, r4, #0 adds r1, #0x43 - bl sub_0806A058 + bl GetMonData adds r0, r5, r0 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -256296,7 +256296,7 @@ sub_0807EBE0: @ 0x0807EBE0 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0807EC44 ldr r0, [r2] adds r0, #0xf6 @@ -256324,10 +256324,10 @@ sub_0807EBE0: @ 0x0807EBE0 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6} pop {r0} @@ -256336,8 +256336,8 @@ sub_0807EBE0: @ 0x0807EBE0 _0807EC44: .4byte gUnknown_2031F40 thumb_func_end sub_0807EBE0 - thumb_func_start sub_0807EC48 -sub_0807EC48: @ 0x0807EC48 + thumb_func_start c3_08054588 +c3_08054588: @ 0x0807EC48 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -256380,7 +256380,7 @@ _0807EC94: _0807EC96: movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _0807ECB2 .align 2, 0 _0807ECA0: .4byte gUnknown_830C0E4 @@ -256390,7 +256390,7 @@ _0807ECA4: adds r0, r0, r1 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _0807ECB2: ldr r0, _0807ED0C movs r2, #0 @@ -256431,7 +256431,7 @@ _0807ECD0: cmp r0, #0xff bne _0807ED16 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _0807ED16 .align 2, 0 _0807ED08: .4byte gUnknown_830BEE4 @@ -256444,10 +256444,10 @@ _0807ED16: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0807EC48 + thumb_func_end c3_08054588 - thumb_func_start sub_0807ED1C -sub_0807ED1C: @ 0x0807ED1C + thumb_func_start c3_0805465C +c3_0805465C: @ 0x0807ED1C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -256479,7 +256479,7 @@ sub_0807ED1C: @ 0x0807ED1C movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x4a movs r1, #0x10 bl SetGpuReg @@ -256527,7 +256527,7 @@ _0807ED6E: cmp r0, #0x4f bhi _0807EDC6 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0807EDC6: pop {r4, r5, r6} pop {r0} @@ -256535,7 +256535,7 @@ _0807EDC6: .align 2, 0 _0807EDCC: .4byte gUnknown_3005B68 _0807EDD0: .4byte gUnknown_2031F40 - thumb_func_end sub_0807ED1C + thumb_func_end c3_0805465C thumb_func_start sub_0807EDD4 sub_0807EDD4: @ 0x0807EDD4 @@ -256615,7 +256615,7 @@ _0807EE10: ldr r2, _0807EE80 movs r0, #8 movs r1, #0 - bl sub_080A22E8 + bl BlendPalettes b _0807EE94 .align 2, 0 _0807EE78: .4byte gUnknown_3005B68 @@ -256625,9 +256625,9 @@ _0807EE84: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0807EE94: pop {r4, r5, r6} pop {r0} @@ -256680,7 +256680,7 @@ _0807EEF8: ldr r4, _0807EF18 ldr r1, _0807EF1C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -256717,7 +256717,7 @@ _0807EF42: ldr r4, _0807EF7C ldr r1, _0807EF80 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #0 @@ -256808,7 +256808,7 @@ _0807F008: bhi _0807F018 b _0807F144 _0807F018: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0807F040 @@ -256905,7 +256905,7 @@ _0807F0CC: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0807F0F8 movs r1, #0x87 lsls r1, r1, #3 @@ -256922,7 +256922,7 @@ _0807F0FC: ands r0, r1 cmp r0, #0 bne _0807F144 - bl sub_080A2B20 + bl IsBGMStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -256947,17 +256947,17 @@ _0807F130: movs r1, #0 strb r1, [r0] ldr r0, _0807F16C - bl sub_08000540 + bl SetMainCallback2 _0807F144: bl sub_0800AE18 lsls r0, r0, #0x18 cmp r0, #0 bne _0807F152 - bl sub_080A89D4 + bl RunTasks _0807F152: - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4, r5} pop {r0} @@ -256967,8 +256967,8 @@ _0807F168: .4byte gUnknown_30027A0 _0807F16C: .4byte sub_0807EAA0 thumb_func_end sub_0807EE9C - thumb_func_start sub_0807F170 -sub_0807F170: @ 0x0807F170 + thumb_func_start Blender_ControlHitPitch +Blender_ControlHitPitch: @ 0x0807F170 push {lr} ldr r0, _0807F190 ldr r1, _0807F194 @@ -256987,13 +256987,13 @@ sub_0807F170: @ 0x0807F170 _0807F190: .4byte gUnknown_3007550 _0807F194: .4byte 0x0000FFFF _0807F198: .4byte gUnknown_2031F44 - thumb_func_end sub_0807F170 + thumb_func_end Blender_ControlHitPitch - thumb_func_start sub_0807F19C -sub_0807F19C: @ 0x0807F19C + thumb_func_start VBlankCB0_BerryBlender +VBlankCB0_BerryBlender: @ 0x0807F19C push {r4, lr} sub sp, #0x10 - bl sub_08082810 + bl BerryBlender_SetBackgroundsPos ldr r0, _0807F20C ldr r0, [r0] mov ip, r0 @@ -257034,9 +257034,9 @@ sub_0807F19C: @ 0x0807F19C ldrh r0, [r0] str r0, [sp, #0xc] movs r0, #2 - bl sub_0800200C - bl sub_08006EA0 - bl sub_08007144 + bl SetBgAffine + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer add sp, #0x10 pop {r4} @@ -257044,10 +257044,10 @@ sub_0807F19C: @ 0x0807F19C bx r0 .align 2, 0 _0807F20C: .4byte gUnknown_2031F44 - thumb_func_end sub_0807F19C + thumb_func_end VBlankCB0_BerryBlender - thumb_func_start sub_0807F210 -sub_0807F210: @ 0x0807F210 + thumb_func_start LoadBerryBlenderGfx +LoadBerryBlenderGfx: @ 0x0807F210 push {r4, r5, lr} ldr r1, _0807F22C ldr r0, [r1] @@ -257079,9 +257079,9 @@ _0807F234: @ jump table _0807F25C: ldr r5, _0807F280 adds r0, r5, #0 - bl sub_080347CC + bl GetDecompressedDataSize adds r0, #0x64 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 ldr r4, _0807F284 ldr r0, [r4] @@ -257102,14 +257102,14 @@ _0807F28C: lsls r2, r2, #3 movs r0, #2 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0807F2B4 movs r2, #0x80 lsls r2, r2, #1 movs r1, #0 - bl sub_080A1200 + bl LoadPalette b _0807F39A .align 2, 0 _0807F2B0: .4byte gUnknown_830D374 @@ -257120,7 +257120,7 @@ _0807F2B8: adds r0, r0, r1 ldr r4, [r0] ldr r0, _0807F2E0 - bl sub_080347CC + bl GetDecompressedDataSize adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 @@ -257151,7 +257151,7 @@ _0807F300: adds r0, r0, r1 ldr r4, [r0] ldr r0, _0807F328 - bl sub_080347CC + bl GetDecompressedDataSize adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 @@ -257182,16 +257182,16 @@ _0807F348: adds r0, r0, r1 ldr r4, [r0] ldr r0, _0807F374 - bl sub_080347CC + bl GetDecompressedDataSize adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 movs r0, #1 adds r1, r4, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, [r5] b _0807F39E .align 2, 0 @@ -257201,17 +257201,17 @@ _0807F378: ldr r0, _0807F384 movs r1, #0x80 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _0807F39A .align 2, 0 _0807F384: .4byte gUnknown_830D774 _0807F388: ldr r0, _0807F3A8 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807F3AC - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807F3B0 - bl sub_08008210 + bl LoadSpriteSheet _0807F39A: ldr r0, _0807F3B4 ldr r1, [r0] @@ -257227,9 +257227,9 @@ _0807F3B0: .4byte gUnknown_830FA28 _0807F3B4: .4byte gUnknown_2031F44 _0807F3B8: ldr r0, _0807F3E8 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807F3EC - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0807F3F0 bl LoadSpritePalette ldr r0, _0807F3F4 @@ -257239,7 +257239,7 @@ _0807F3B8: ldr r2, _0807F3FC adds r0, r0, r2 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r1, [r4] movs r0, #0 strb r0, [r1, #1] @@ -257258,7 +257258,7 @@ _0807F402: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0807F210 + thumb_func_end LoadBerryBlenderGfx thumb_func_start sub_0807F408 sub_0807F408: @ 0x0807F408 @@ -257274,43 +257274,43 @@ sub_0807F408: @ 0x0807F408 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY add sp, #8 pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0807F408 - thumb_func_start sub_0807F46C -sub_0807F46C: @ 0x0807F46C + thumb_func_start InitBerryBlenderWindows +InitBerryBlenderWindows: @ 0x0807F46C push {r4, lr} sub sp, #8 ldr r0, _0807F4B4 - bl sub_08003090 + bl InitWindows lsls r0, r0, #0x10 cmp r0, #0 beq _0807F4AC @@ -257320,7 +257320,7 @@ _0807F482: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r4, #1 cmp r4, #4 ble _0807F482 @@ -257334,7 +257334,7 @@ _0807F482: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0xe0 - bl sub_08197694 + bl Menu_LoadStdPalAt _0807F4AC: add sp, #8 pop {r4} @@ -257342,7 +257342,7 @@ _0807F4AC: bx r0 .align 2, 0 _0807F4B4: .4byte gUnknown_830F870 - thumb_func_end sub_0807F46C + thumb_func_end InitBerryBlenderWindows thumb_func_start sub_0807F4B8 sub_0807F4B8: @ 0x0807F4B8 @@ -257352,7 +257352,7 @@ sub_0807F4B8: @ 0x0807F4B8 cmp r0, #0 bne _0807F4CA ldr r0, _0807F4F4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _0807F4CA: ldr r0, [r4] @@ -257368,7 +257368,7 @@ _0807F4CA: ldrb r0, [r0] bl sub_0807F88C ldr r0, _0807F4FC - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 @@ -257414,7 +257414,7 @@ _0807F540: bl ResetSpriteData bl FreeAllSpritePalettes movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _0807F5D8 @@ -257427,12 +257427,12 @@ _0807F540: lsls r0, r0, #1 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _0807F5E0 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0 movs r1, #1 movs r2, #0xd0 @@ -257440,8 +257440,8 @@ _0807F540: movs r0, #0 movs r1, #0x14 movs r2, #0xf0 - bl sub_08098104 - bl sub_0807F46C + bl LoadMessageBoxGfx + bl InitBerryBlenderWindows ldr r1, [r4] ldrb r0, [r1] adds r0, #1 @@ -257477,7 +257477,7 @@ _0807F5D8: .4byte gUnknown_830F864 _0807F5DC: .4byte gUnknown_2031F44 _0807F5E0: .4byte 0x000009B4 _0807F5E4: - bl sub_0807F210 + bl LoadBerryBlenderGfx lsls r0, r0, #0x18 cmp r0, #0 bne _0807F5F0 @@ -257491,7 +257491,7 @@ _0807F5F6: ldrb r2, [r5, #1] ldr r0, _0807F65C movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] adds r1, #0x50 adds r1, r1, r4 @@ -257522,13 +257522,13 @@ _0807F5F6: ldrb r0, [r0] cmp r0, #0 beq _0807F64C - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _0807F64C: ldr r0, _0807F66C - bl sub_080006F0 + bl SetVBlankCallback b _0807F6D8 .align 2, 0 _0807F654: .4byte gUnknown_830F8B8 @@ -257537,7 +257537,7 @@ _0807F65C: .4byte gUnknown_830F9C8 _0807F660: .4byte gUnknown_20205AC _0807F664: .4byte gUnknown_30031C4 _0807F668: .4byte gUnknown_300319C -_0807F66C: .4byte sub_0807F19C +_0807F66C: .4byte VBlankCB0_BerryBlender _0807F670: movs r0, #1 rsbs r0, r0, #0 @@ -257545,7 +257545,7 @@ _0807F670: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade bl sub_08082744 b _0807F6D8 _0807F686: @@ -257570,7 +257570,7 @@ _0807F69C: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08083B04 + bl Blender_PrintText cmp r0, #0 beq _0807F71A ldr r1, [r6] @@ -257585,7 +257585,7 @@ _0807F6C8: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0807F6D8: ldr r0, _0807F6E4 ldr r1, [r0] @@ -257605,23 +257605,23 @@ _0807F6E8: lsrs r4, r0, #0x18 cmp r4, #0 bne _0807F71A - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0807F738 bl sub_081AA968 ldr r0, _0807F73C ldr r0, [r0] strb r4, [r0] _0807F71A: - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4, r5, r6} pop {r0} @@ -257726,7 +257726,7 @@ sub_0807F7C8: @ 0x0807F7C8 ands r3, r6 movs r1, #0 movs r2, #0x50 - bl sub_080D49A0 + bl LoadSpinningBerryPicGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -257775,8 +257775,8 @@ _0807F844: .4byte gUnknown_20205AC _0807F848: .4byte gUnknown_830FB68 thumb_func_end sub_0807F7C8 - thumb_func_start sub_0807F84C -sub_0807F84C: @ 0x0807F84C + thumb_func_start Blender_CopyBerryData +Blender_CopyBerryData: @ 0x0807F84C push {r4, r5, r6, lr} adds r6, r0, #0 lsls r5, r1, #0x10 @@ -257785,7 +257785,7 @@ sub_0807F84C: @ 0x0807F84C adds r0, #0x7c lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0BC8 + bl GetBerryInfo adds r4, r0, #0 strh r5, [r6] adds r0, r6, #2 @@ -257807,7 +257807,7 @@ sub_0807F84C: @ 0x0807F84C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0807F84C + thumb_func_end Blender_CopyBerryData thumb_func_start sub_0807F88C sub_0807F88C: @ 0x0807F88C @@ -257952,7 +257952,7 @@ sub_0807F9AC: @ 0x0807F9AC cmp r0, #0 bne _0807F9C6 ldr r0, _0807FA04 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _0807F9C6: ldr r0, [r4] @@ -257981,7 +257981,7 @@ _0807F9DC: cmp r0, #0 bne _0807FA10 ldr r0, _0807FA0C - bl sub_08000540 + bl SetMainCallback2 b _0807FA16 .align 2, 0 _0807FA00: .4byte gUnknown_2031F44 @@ -257990,7 +257990,7 @@ _0807FA08: .4byte gUnknown_2037280 _0807FA0C: .4byte sub_0807FA20 _0807FA10: ldr r0, _0807FA1C - bl sub_08000540 + bl SetMainCallback2 _0807FA16: pop {r4, r5} pop {r0} @@ -258096,7 +258096,7 @@ _0807FAFC: .4byte gUnknown_202267E _0807FB00: .4byte 0x00004422 _0807FB04: .4byte gUnknown_2031F44 _0807FB08: - bl sub_0807F210 + bl LoadBerryBlenderGfx lsls r0, r0, #0x18 cmp r0, #0 bne _0807FB14 @@ -258120,7 +258120,7 @@ _0807FB2E: ldrb r2, [r4, #1] ldr r0, _0807FB94 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] adds r1, #0x54 adds r1, r1, r5 @@ -258155,10 +258155,10 @@ _0807FB72: bne _0807FB7C b _0807FF00 _0807FB7C: - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _0807FF00 .align 2, 0 _0807FB8C: .4byte gUnknown_830F8B8 @@ -258174,7 +258174,7 @@ _0807FBA4: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _0807FF00 _0807FBB6: bl sub_0807F408 @@ -258196,7 +258196,7 @@ _0807FBD0: adds r0, r0, r3 ldr r1, _0807FBFC movs r2, #0 - bl sub_08083B04 + bl Blender_PrintText ldr r1, [r4] movs r2, #0 movs r0, #8 @@ -258229,7 +258229,7 @@ _0807FC00: adds r0, r0, r5 ldr r1, _0807FC48 ldrh r1, [r1] - bl sub_0807F84C + bl Blender_CopyBerryData ldr r0, _0807FC4C ldr r1, [r4] adds r1, r1, r5 @@ -258247,14 +258247,14 @@ _0807FC44: .4byte gUnknown_2031F44 _0807FC48: .4byte gUnknown_203CB48 _0807FC4C: .4byte gUnknown_202257C _0807FC50: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0807FC5C b _0807FF4E _0807FC5C: - bl sub_0800A178 - bl sub_0800A02C + bl ResetBlockReceivedFlags + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _0807FC6C @@ -258279,7 +258279,7 @@ _0807FC8A: movs r0, #4 movs r1, #1 bl sub_08197EBC - bl sub_0800A114 + bl GetBlockReceivedStatus adds r4, r0, #0 bl sub_0800A59C lsls r4, r4, #0x18 @@ -258316,12 +258316,12 @@ _0807FCB4: strh r0, [r1] adds r5, #1 _0807FCDC: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 blt _0807FCB4 - bl sub_0800A178 + bl ResetBlockReceivedFlags b _0807FF00 .align 2, 0 _0807FCF0: .4byte gUnknown_202207C @@ -258337,7 +258337,7 @@ _0807FCF4: bl sub_0807F7C8 b _0807FD3E _0807FD0A: - bl sub_08009B64 + bl GetLinkPlayerCount ldr r2, _0807FD5C ldr r1, [r2] adds r1, #0x7c @@ -258444,7 +258444,7 @@ _0807FDC6: .align 2, 0 _0807FDD8: .4byte gUnknown_2031F44 _0807FDDC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0807FDE8 @@ -258463,7 +258463,7 @@ _0807FDE8: movs r0, #0x2b bl sub_080A306C movs r0, #2 - bl sub_08001B48 + bl ShowBg b _0807FF4E .align 2, 0 _0807FE0C: .4byte gUnknown_2031F44 @@ -258471,7 +258471,7 @@ _0807FE10: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r4, _0807FE98 ldr r2, [r4] adds r1, r2, #0 @@ -258494,7 +258494,7 @@ _0807FE10: bls _0807FE94 movs r0, #0xc movs r1, #2 - bl sub_08001200 + bl SetGpuRegBits ldr r1, [r4] ldrb r0, [r1] adds r0, #1 @@ -258568,7 +258568,7 @@ _0807FED8: rsbs r2, r2, #0 movs r1, #0x78 movs r3, #3 - bl sub_08006B0C + bl CreateSprite b _0807FF00 .align 2, 0 _0807FEE8: .4byte gUnknown_830FB1C @@ -258576,7 +258576,7 @@ _0807FEEC: bl sub_0800A8D4 b _0807FF00 _0807FEF2: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _0807FF4E @@ -258604,7 +258604,7 @@ _0807FF10: adds r0, r3, r1 str r2, [r0] ldr r0, _0807FF88 - bl sub_08000540 + bl SetMainCallback2 bl sub_080A27CC lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -258619,7 +258619,7 @@ _0807FF10: strh r0, [r1] _0807FF48: adds r0, r4, #0 - bl sub_080A3040 + bl PlayBGM _0807FF4E: ldr r0, _0807FF84 ldr r1, [r0] @@ -258633,11 +258633,11 @@ _0807FF4E: movs r2, #0 ldrsh r1, [r1, r2] bl sub_0808137C - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -258656,9 +258656,9 @@ sub_0807FF90: @ 0x0807FF90 bl SetGpuReg bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks ldr r0, _0808001C - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _08080020 @@ -258671,12 +258671,12 @@ sub_0807FF90: @ 0x0807FF90 lsls r0, r0, #1 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r3, _08080028 adds r1, r1, r3 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0 movs r1, #1 movs r2, #0xd0 @@ -258684,8 +258684,8 @@ sub_0807FF90: @ 0x0807FF90 movs r0, #0 movs r1, #0x14 movs r2, #0xf0 - bl sub_08098104 - bl sub_0807F46C + bl LoadMessageBoxGfx + bl InitBerryBlenderWindows ldr r2, [r4] adds r0, r2, #0 adds r0, #0x44 @@ -258708,7 +258708,7 @@ sub_0807FF90: @ 0x0807FF90 pop {r0} bx r0 .align 2, 0 -_0808001C: .4byte sub_0807F19C +_0808001C: .4byte VBlankCB0_BerryBlender _08080020: .4byte gUnknown_830F864 _08080024: .4byte gUnknown_2031F44 _08080028: .4byte 0x000009B4 @@ -258759,8 +258759,8 @@ _08080076: .align 2, 0 thumb_func_end sub_0808002C - thumb_func_start sub_0808007C -sub_0808007C: @ 0x0808007C + thumb_func_start Blender_SetOpponentsBerryData +Blender_SetOpponentsBerryData: @ 0x0808007C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -258855,7 +258855,7 @@ _08080122: adds r1, #0x85 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_080829F8 + bl Blender_SetParticipantBerryData lsls r4, r4, #0x10 lsrs r4, r4, #0x10 cmp r4, r7 @@ -258871,7 +258871,7 @@ _0808013C: _08080148: .4byte gUnknown_830FB90 _0808014C: .4byte gUnknown_2037280 _08080150: .4byte gUnknown_830FBAE - thumb_func_end sub_0808007C + thumb_func_end Blender_SetOpponentsBerryData thumb_func_start sub_08080154 sub_08080154: @ 0x08080154 @@ -258950,7 +258950,7 @@ sub_080801C4: @ 0x080801C4 ldrb r0, [r0] cmp r0, #0 beq _080801E6 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x1c] @@ -259041,7 +259041,7 @@ _080801F2: adds r0, r5, #0 add r1, sp, #8 movs r3, #1 - bl sub_08083A5C + bl Blender_AddTextPrinter b _080802C2 .align 2, 0 _0808029C: .4byte gUnknown_30031C4 @@ -259058,14 +259058,14 @@ _080802AC: adds r0, r5, #0 add r1, sp, #8 movs r3, #1 - bl sub_08083A5C + bl Blender_AddTextPrinter _080802C2: lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _080802D2: movs r2, #0x80 lsls r2, r2, #0x11 @@ -259133,21 +259133,21 @@ _0808036C: ldr r4, _080803F0 ldrh r1, [r4] movs r0, #0 - bl sub_080829F8 + bl Blender_SetParticipantBerryData ldr r5, _080803F4 ldr r0, [r5] movs r6, #0xac lsls r6, r6, #1 adds r0, r0, r6 ldrh r1, [r4] - bl sub_0807F84C + bl Blender_CopyBerryData ldrh r0, [r4] ldr r2, [r5] adds r1, r2, #0 adds r1, #0x7c ldrb r1, [r1] adds r2, r2, r6 - bl sub_0808007C + bl Blender_SetOpponentsBerryData movs r4, #0 movs r6, #0 ldr r0, _080803F8 @@ -259196,7 +259196,7 @@ _080803F4: .4byte gUnknown_2031F44 _080803F8: .4byte gUnknown_202267E _080803FC: .4byte 0x00004422 _08080400: - bl sub_0807F210 + bl LoadBerryBlenderGfx lsls r0, r0, #0x18 cmp r0, #0 bne _0808040C @@ -259220,7 +259220,7 @@ _08080426: ldrb r2, [r5, #1] ldr r0, _0808046C movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] adds r1, #0x54 adds r1, r1, r4 @@ -259257,7 +259257,7 @@ _08080474: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _0808049C ldr r1, [r2] ldrb r0, [r1] @@ -259438,7 +259438,7 @@ _080805CC: adds r0, r0, r5 bl sub_080826D0 movs r0, #2 - bl sub_08001B48 + bl ShowBg b _080807CA .align 2, 0 _080805F4: .4byte gUnknown_2031F44 @@ -259446,7 +259446,7 @@ _080805F8: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r4, _08080688 ldr r2, [r4] adds r1, r2, #0 @@ -259493,7 +259493,7 @@ _080805F8: strh r1, [r0] movs r0, #0xc movs r1, #2 - bl sub_08001200 + bl SetGpuRegBits ldr r0, [r4] movs r3, #0x84 lsls r3, r3, #1 @@ -259540,7 +259540,7 @@ _080806BC: rsbs r2, r2, #0 movs r1, #0x78 movs r3, #3 - bl sub_08006B0C + bl CreateSprite _080806CA: ldr r0, _080806DC ldr r1, [r0] @@ -259573,7 +259573,7 @@ _080806E0: adds r0, #0x72 strb r3, [r0] ldr r0, _08080740 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08080744 ldrh r0, [r0] cmp r0, #1 @@ -259586,7 +259586,7 @@ _080806E0: bne _0808074C ldr r0, _08080748 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, [r5] movs r3, #0x90 lsls r3, r3, #1 @@ -259602,7 +259602,7 @@ _0808074C: ldr r0, _08080804 ldr r0, [r0] movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, [r5] movs r5, #0x90 lsls r5, r5, #1 @@ -259624,7 +259624,7 @@ _08080760: _08080776: ldm r6!, {r0} lsrs r1, r5, #0x18 - bl sub_080A8878 + bl CreateTask ldr r1, _0808080C ldr r1, [r1] movs r2, #0x90 @@ -259656,10 +259656,10 @@ _0808079C: strh r0, [r1] _080807BA: adds r0, r4, #0 - bl sub_080A3040 + bl PlayBGM movs r0, #0x35 bl sub_080A306C - bl sub_0807F170 + bl Blender_ControlHitPitch _080807CA: ldr r0, _0808080C ldr r1, [r0] @@ -259674,11 +259674,11 @@ _080807CA: movs r2, #0 ldrsh r1, [r1, r2] bl sub_0808137C - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -259741,7 +259741,7 @@ sub_0808083C: @ 0x0808083C ldr r0, _08080884 strh r0, [r1] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask _08080874: pop {r4} pop {r0} @@ -259763,7 +259763,7 @@ sub_08080888: @ 0x08080888 lsrs r4, r4, #0x18 ldr r0, _080808B8 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080808BC @@ -260309,7 +260309,7 @@ sub_08080CA4: @ 0x08080CA4 subs r2, r2, r1 adds r1, r6, #0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r2, r1, #0 @@ -260385,7 +260385,7 @@ sub_08080D8C: @ 0x08080D8C lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_0807F170 + bl Blender_ControlHitPitch ldr r0, _08080DAC cmp r4, r0 beq _08080DC0 @@ -260870,7 +260870,7 @@ sub_08081160: @ 0x08081160 ldrb r0, [r0] cmp r0, #0 beq _08081176 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 _08081176: @@ -261054,7 +261054,7 @@ _080812D0: lsls r5, r5, #1 adds r1, r1, r5 ldrh r1, [r1] - bl sub_0800A558 + bl SetLinkDebugValues bl sub_08080F10 ldr r0, [r4] adds r0, r0, r5 @@ -261087,7 +261087,7 @@ _080812D0: movs r0, #1 strb r0, [r3] ldr r0, _08081378 - bl sub_08000540 + bl SetMainCallback2 _08081336: ldr r0, _0808136C ldr r1, [r0] @@ -261102,11 +261102,11 @@ _08081336: movs r2, #0 ldrsh r1, [r1, r2] bl sub_0808137C - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4, r5, r6} pop {r0} bx r0 @@ -261114,7 +261114,7 @@ _08081336: _0808136C: .4byte gUnknown_2031F44 _08081370: .4byte 0x00057E03 _08081374: .4byte 0x000003E7 -_08081378: .4byte sub_080819E4 +_08081378: .4byte CB2_HandleBlenderEndGame thumb_func_end sub_080812B4 thumb_func_start sub_0808137C @@ -261500,8 +261500,8 @@ sub_080815F0: @ 0x080815F0 _080815F8: .4byte gUnknown_3000E06 thumb_func_end sub_080815F0 - thumb_func_start sub_080815FC -sub_080815FC: @ 0x080815FC + thumb_func_start Blender_CalculatePokeblock +Blender_CalculatePokeblock: @ 0x080815FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -261782,7 +261782,7 @@ _080817FA: bx r0 .align 2, 0 _0808181C: .4byte gUnknown_3000DE8 - thumb_func_end sub_080815FC + thumb_func_end Blender_CalculatePokeblock thumb_func_start BlenderDebug_CalculatePokeblock BlenderDebug_CalculatePokeblock: @ 0x08081820 @@ -261794,7 +261794,7 @@ BlenderDebug_CalculatePokeblock: @ 0x08081820 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 str r4, [sp] - bl sub_080815FC + bl Blender_CalculatePokeblock add sp, #4 pop {r4} pop {r0} @@ -262021,8 +262021,8 @@ _080819D6: _080819E0: .4byte 0x00002FFF thumb_func_end sub_080819B0 - thumb_func_start sub_080819E4 -sub_080819E4: @ 0x080819E4 + thumb_func_start CB2_HandleBlenderEndGame +CB2_HandleBlenderEndGame: @ 0x080819E4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -262034,7 +262034,7 @@ sub_080819E4: @ 0x080819E4 bhi _080819FA bl sub_08082744 _080819FA: - bl sub_0800A02C + bl GetMultiplayerId ldr r0, [r4] adds r0, #0x63 ldrb r0, [r0] @@ -262082,7 +262082,7 @@ _08081A68: adds r0, r0, r1 adds r0, r0, r4 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -262135,19 +262135,19 @@ _08081AD2: ldr r0, _08081AEC bl m4aMPlayStop _08081AE2: - bl sub_0807F170 + bl Blender_ControlHitPitch b _08081EBA .align 2, 0 _08081AE8: .4byte gUnknown_2031F44 _08081AEC: .4byte gUnknown_3007550 _08081AF0: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _08081AFC b _08081E74 _08081AFC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08081B08 @@ -262215,7 +262215,7 @@ _08081B4E: adds r1, r1, r4 movs r0, #0 movs r2, #0x20 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 bne _08081B8C @@ -262250,7 +262250,7 @@ _08081BA8: strh r2, [r0] movs r0, #0 movs r2, #0x28 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 bne _08081BDA @@ -262261,13 +262261,13 @@ _08081BDA: .align 2, 0 _08081BE0: .4byte gUnknown_2031F44 _08081BE4: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 cmp r0, #0 bne _08081BF0 b _08081EBA _08081BF0: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r5, _08081C60 ldr r1, [r5] adds r1, #0x63 @@ -262386,7 +262386,7 @@ _08081CCC: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08083B04 + bl Blender_PrintText cmp r0, #0 bne _08081CEE b _08081EBA @@ -262452,10 +262452,10 @@ _08081D5A: cmp r0, #0xff beq _08081D78 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08081D78: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -262486,10 +262486,10 @@ _08081D9C: cmp r0, #0xff beq _08081DBA adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08081DBA: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -262511,7 +262511,7 @@ _08081DCC: cmp r5, #0 bne _08081E38 movs r0, #4 - bl sub_080D5F04 + bl IsBagPocketNonEmpty lsls r0, r0, #0x18 cmp r0, #0 bne _08081E08 @@ -262526,7 +262526,7 @@ _08081DFC: .4byte gUnknown_30031B0 _08081E00: .4byte gUnknown_2031F44 _08081E04: .4byte 0x00009999 _08081E08: - bl sub_08136F64 + bl GetFirstFreePokeblockSlot lsls r0, r0, #0x18 asrs r0, r0, #0x18 movs r1, #1 @@ -262568,7 +262568,7 @@ _08081E4C: cmp r0, #0 beq _08081E74 ldr r0, _08081E6C - bl sub_08000540 + bl SetMainCallback2 ldr r2, _08081E70 ldr r0, [r2] adds r0, #0x63 @@ -262578,7 +262578,7 @@ _08081E4C: b _08081EB8 .align 2, 0 _08081E68: .4byte gUnknown_3005AF8 -_08081E6C: .4byte sub_08082340 +_08081E6C: .4byte CB2_HandlePlayerPlayAgainChoice _08081E70: .4byte gUnknown_2031F44 _08081E74: ldr r0, _08081E84 @@ -262604,11 +262604,11 @@ _08081E88: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08083B04 + bl Blender_PrintText cmp r0, #0 beq _08081EBA ldr r0, _08081F14 - bl sub_08000540 + bl SetMainCallback2 ldr r0, [r6] adds r0, #0x63 movs r1, #0 @@ -262636,11 +262636,11 @@ _08081EBA: movs r2, #0 ldrsh r1, [r1, r2] bl sub_0808137C - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -262650,11 +262650,11 @@ _08081EBA: _08081F08: .4byte gUnknown_2031F44 _08081F0C: .4byte 0x000011B4 _08081F10: .4byte gUnknown_830F78E -_08081F14: .4byte sub_08082060 - thumb_func_end sub_080819E4 +_08081F14: .4byte CB2_HandlePlayerLinkPlayAgainChoice + thumb_func_end CB2_HandleBlenderEndGame - thumb_func_start sub_08081F18 -sub_08081F18: @ 0x08081F18 + thumb_func_start LinkPlayAgainHandleSaving +LinkPlayAgainHandleSaving: @ 0x08081F18 push {r4, lr} ldr r1, _08081F38 ldr r0, [r1] @@ -262695,7 +262695,7 @@ _08081F5C: .align 2, 0 _08081F70: .4byte gUnknown_2031F44 _08081F74: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08082058 @@ -262741,11 +262741,11 @@ _08081FB0: str r0, [r1] b _08082058 _08081FD6: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08082058 - bl sub_081533B0 + bl CheckSaveFile lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -262814,10 +262814,10 @@ _0808205A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08081F18 + thumb_func_end LinkPlayAgainHandleSaving - thumb_func_start sub_08082060 -sub_08082060: @ 0x08082060 + thumb_func_start CB2_HandlePlayerLinkPlayAgainChoice +CB2_HandlePlayerLinkPlayAgainChoice: @ 0x08082060 push {r4, r5, r6, lr} sub sp, #4 ldr r1, _08082080 @@ -262949,7 +262949,7 @@ _08082170: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08083B04 + bl Blender_PrintText cmp r0, #0 bne _08082190 b _080822F8 @@ -262988,14 +262988,14 @@ _080821C6: adds r0, r0, r1 ldr r1, _080821E0 movs r2, #0 - bl sub_08083B04 + bl Blender_PrintText bl sub_0800A8D4 b _080822D6 .align 2, 0 _080821DC: .4byte 0x000011B4 _080821E0: .4byte gUnknown_830FBC8 _080821E4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080821F0 @@ -263021,7 +263021,7 @@ _080821F0: .align 2, 0 _08082214: .4byte gUnknown_2031F44 _08082218: - bl sub_08081F18 + bl LinkPlayAgainHandleSaving lsls r0, r0, #0x18 cmp r0, #0 beq _080822F8 @@ -263041,7 +263041,7 @@ _08082234: bl sub_0800A8D4 b _080822F8 _08082244: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080822F8 @@ -263051,7 +263051,7 @@ _08082244: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08082264 ldr r1, [r0] b _080822D8 @@ -263073,16 +263073,16 @@ _08082268: ldr r0, _080822AC cmp r1, r0 bne _080822B4 - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer ldr r0, [r6] - bl sub_08000BF0 + bl Free str r4, [r6] ldr r0, _080822B0 - bl sub_08000540 + bl SetMainCallback2 b _080822F8 .align 2, 0 _080822A8: .4byte gUnknown_2037C74 @@ -263120,10 +263120,10 @@ _080822E2: cmp r4, #0 bne _080822F8 ldr r0, [r6] - bl sub_08000BF0 + bl Free str r4, [r6] ldr r0, _08082338 - bl sub_08000540 + bl SetMainCallback2 _080822F8: bl sub_080824F0 ldr r0, _0808233C @@ -263139,23 +263139,23 @@ _080822F8: movs r2, #0 ldrsh r1, [r1, r2] bl sub_0808137C - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08082334: .4byte gUnknown_30031C4 -_08082338: .4byte sub_08085B34 +_08082338: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _0808233C: .4byte gUnknown_2031F44 - thumb_func_end sub_08082060 + thumb_func_end CB2_HandlePlayerLinkPlayAgainChoice - thumb_func_start sub_08082340 -sub_08082340: @ 0x08082340 + thumb_func_start CB2_HandlePlayerPlayAgainChoice +CB2_HandlePlayerPlayAgainChoice: @ 0x08082340 push {r4, r5, r6, lr} ldr r1, _0808235C ldr r0, [r1] @@ -263264,7 +263264,7 @@ _0808241C: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08083B04 + bl Blender_PrintText cmp r0, #0 beq _080824AE ldr r0, [r6] @@ -263300,23 +263300,23 @@ _08082464: cmp r0, #0 bne _0808248C ldr r0, _08082488 - bl sub_08000540 + bl SetMainCallback2 b _08082492 .align 2, 0 _08082484: .4byte gUnknown_2037C74 _08082488: .4byte sub_0807F4B8 _0808248C: ldr r0, _080824E8 - bl sub_08000540 + bl SetMainCallback2 _08082492: - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer ldr r4, _080824EC ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080824AE: @@ -263334,18 +263334,18 @@ _080824AE: movs r2, #0 ldrsh r1, [r1, r2] bl sub_0808137C - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 -_080824E8: .4byte sub_08085B34 +_080824E8: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _080824EC: .4byte gUnknown_2031F44 - thumb_func_end sub_08082340 + thumb_func_end CB2_HandlePlayerPlayAgainChoice thumb_func_start sub_080824F0 sub_080824F0: @ 0x080824F0 @@ -263420,7 +263420,7 @@ _08082574: _08082580: strh r1, [r0] _08082582: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _0808258E @@ -263492,7 +263492,7 @@ _0808260A: lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _08082610: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -263507,7 +263507,7 @@ _08082628: lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _0808262E: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -263521,7 +263521,7 @@ _0808262E: cmp r0, #0 bne _08082628 _0808264A: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -263537,7 +263537,7 @@ _08082664: lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _0808266A: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -263554,7 +263554,7 @@ _08082686: ldr r4, _080826A4 adds r0, r4, #0 bl sub_080819B0 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -263639,8 +263639,8 @@ sub_080826D0: @ 0x080826D0 _08082730: .4byte gUnknown_2031F44 thumb_func_end sub_080826D0 - thumb_func_start sub_08082734 -sub_08082734: @ 0x08082734 + thumb_func_start GetBlenderArrowPosition +GetBlenderArrowPosition: @ 0x08082734 ldr r0, _08082740 ldr r0, [r0] adds r0, #0x4a @@ -263648,7 +263648,7 @@ sub_08082734: @ 0x08082734 bx lr .align 2, 0 _08082740: .4byte gUnknown_2031F44 - thumb_func_end sub_08082734 + thumb_func_end GetBlenderArrowPosition thumb_func_start sub_08082744 sub_08082744: @ 0x08082744 @@ -263658,7 +263658,7 @@ sub_08082744: @ 0x08082744 ldrb r0, [r4] cmp r0, #0 beq _08082758 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r1, r0, #0x18 _08082758: @@ -263751,8 +263751,8 @@ _08082806: _0808280C: .4byte gUnknown_2031F44 thumb_func_end sub_08082744 - thumb_func_start sub_08082810 -sub_08082810: @ 0x08082810 + thumb_func_start BerryBlender_SetBackgroundsPos +BerryBlender_SetBackgroundsPos: @ 0x08082810 push {r4, r5, r6, lr} ldr r4, _08082854 ldr r0, [r4] @@ -263784,7 +263784,7 @@ sub_08082810: @ 0x08082810 bx r0 .align 2, 0 _08082854: .4byte gUnknown_2031F44 - thumb_func_end sub_08082810 + thumb_func_end BerryBlender_SetBackgroundsPos thumb_func_start sub_08082858 sub_08082858: @ 0x08082858 @@ -263891,7 +263891,7 @@ _08082910: adds r2, #0x50 ldr r0, _08082978 movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -264004,8 +264004,8 @@ _080829F0: _080829F4: .4byte 0x0000FFF4 thumb_func_end sub_080829B8 - thumb_func_start sub_080829F8 -sub_080829F8: @ 0x080829F8 + thumb_func_start Blender_SetParticipantBerryData +Blender_SetParticipantBerryData: @ 0x080829F8 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -264024,13 +264024,13 @@ sub_080829F8: @ 0x080829F8 adds r0, r0, r2 adds r3, r3, r0 adds r0, r3, #0 - bl sub_0807F84C + bl Blender_CopyBerryData pop {r4} pop {r0} bx r0 .align 2, 0 _08082A28: .4byte gUnknown_2031F44 - thumb_func_end sub_080829F8 + thumb_func_end Blender_SetParticipantBerryData thumb_func_start sub_08082A2C sub_08082A2C: @ 0x08082A2C @@ -264102,7 +264102,7 @@ _08082A82: rsbs r2, r2, #0 movs r1, #0x78 movs r3, #2 - bl sub_08006B0C + bl CreateSprite b _08082ACE .align 2, 0 _08082AB8: .4byte gUnknown_830FB50 @@ -264736,7 +264736,7 @@ _08082F34: movs r0, #5 movs r2, #0x38 movs r3, #1 - bl sub_08083A5C + bl Blender_AddTextPrinter movs r6, #0 ldr r1, _08083158 ldr r0, [r1] @@ -264800,7 +264800,7 @@ _08082F66: str r2, [sp, #4] movs r0, #5 movs r2, #0x10 - bl sub_08083A5C + bl Blender_AddTextPrinter ldr r1, [r7] adds r0, r1, #0 adds r0, #0x9f @@ -264837,7 +264837,7 @@ _08082F66: str r2, [sp, #4] movs r0, #5 movs r2, #0x60 - bl sub_08083A5C + bl Blender_AddTextPrinter lsls r5, r5, #0x10 lsrs r6, r5, #0x10 ldr r0, [r7] @@ -264856,7 +264856,7 @@ _0808302A: movs r0, #5 movs r2, #8 movs r3, #0x50 - bl sub_08083A5C + bl Blender_AddTextPrinter ldr r6, _08083158 ldr r0, [r6] adds r4, r0, #0 @@ -264905,7 +264905,7 @@ _0808302A: movs r0, #5 movs r2, #0x48 movs r3, #0x50 - bl sub_08083A5C + bl Blender_AddTextPrinter ldr r1, _08083178 mov r0, sb str r0, [sp] @@ -264914,7 +264914,7 @@ _0808302A: movs r0, #5 movs r2, #8 movs r3, #0x60 - bl sub_08083A5C + bl Blender_AddTextPrinter ldr r5, [r6] movs r3, #0x82 lsls r3, r3, #1 @@ -264961,7 +264961,7 @@ _0808302A: movs r0, #5 movs r2, #0x48 movs r3, #0x60 - bl sub_08083A5C + bl Blender_AddTextPrinter ldr r1, [r6] movs r3, #0x84 lsls r3, r3, #1 @@ -264973,7 +264973,7 @@ _0808302A: strb r0, [r1] movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0808328C .align 2, 0 _08083154: .4byte gUnknown_830F81F @@ -265030,10 +265030,10 @@ _080831C0: lsls r4, r6, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _080831DE: adds r0, r6, #1 lsls r0, r0, #0x10 @@ -265054,27 +265054,27 @@ _080831DE: str r1, [sp] adds r1, r7, #0 add r3, sp, #8 - bl sub_080815FC + bl Blender_CalculatePokeblock ldr r1, [r4] adds r1, #0x9f adds r0, r7, #0 - bl sub_080832A0 + bl Blender_PrintMadePokeblockString ldr r1, [r4] movs r2, #0xd4 lsls r2, r2, #1 adds r1, r1, r2 adds r0, r7, #0 - bl sub_0808391C + bl TryAddContestLinkTvShow ldr r0, _08083254 movs r1, #6 - bl sub_080A8878 + bl CreateTask bl sub_080EF7F0 ldr r0, _08083258 ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem adds r0, r7, #0 - bl sub_08136F9C + bl AddPokeblock ldr r1, [r4] ldr r3, _0808325C adds r2, r1, r3 @@ -265101,7 +265101,7 @@ _08083260: lsrs r2, r2, #0x18 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08083B04 + bl Blender_PrintText cmp r0, #0 beq _0808328C bl TryUpdateBerryBlenderRecord @@ -265123,8 +265123,8 @@ _0808328E: .align 2, 0 thumb_func_end sub_08082E6C - thumb_func_start sub_080832A0 -sub_080832A0: @ 0x080832A0 + thumb_func_start Blender_PrintMadePokeblockString +Blender_PrintMadePokeblockString: @ 0x080832A0 push {r4, r5, r6, lr} sub sp, #0xc adds r5, r0, #0 @@ -265194,7 +265194,7 @@ _08083340: .4byte gUnknown_830F853 _08083344: .4byte gUnknown_830F857 _08083348: .4byte gUnknown_830F860 _0808334C: .4byte gUnknown_830F6FB - thumb_func_end sub_080832A0 + thumb_func_end Blender_PrintMadePokeblockString thumb_func_start Blender_SortBasedOnPoints Blender_SortBasedOnPoints: @ 0x08083350 @@ -265249,8 +265249,8 @@ _0808339C: bx r0 thumb_func_end Blender_SortBasedOnPoints - thumb_func_start sub_080833A8 -sub_080833A8: @ 0x080833A8 + thumb_func_start Blender_SortScores +Blender_SortScores: @ 0x080833A8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -265383,7 +265383,7 @@ _08083492: _080834A0: .4byte gUnknown_2031F44 _080834A4: .4byte gUnknown_30031C4 _080834A8: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r3, r0, #0x18 _080834B0: @@ -265427,7 +265427,7 @@ _080834E6: bx r0 .align 2, 0 _080834F8: .4byte gUnknown_2031F44 - thumb_func_end sub_080833A8 + thumb_func_end Blender_SortScores thumb_func_start sub_080834FC sub_080834FC: @ 0x080834FC @@ -265507,7 +265507,7 @@ _0808358E: movs r1, #0 movs r2, #1 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r1, _0808374C movs r0, #0 str r0, [sp] @@ -265515,14 +265515,14 @@ _0808358E: movs r0, #5 movs r2, #0x40 movs r3, #0 - bl sub_08083A5C + bl Blender_AddTextPrinter ldr r1, _08083750 mov r8, r1 mov r0, r8 movs r1, #0x80 movs r2, #0x34 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r7, _08083754 ldr r1, [r7] adds r1, #0x46 @@ -265552,7 +265552,7 @@ _0808358E: movs r1, #0xa0 movs r2, #0x34 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x47 strb r0, [r1] @@ -265568,7 +265568,7 @@ _0808358E: movs r1, #0xc0 movs r2, #0x34 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r1, #0x48 strb r0, [r1] @@ -265589,7 +265589,7 @@ _0808358E: lsls r0, r0, #2 adds r0, r0, r5 str r4, [r0] - bl sub_080833A8 + bl Blender_SortScores movs r2, #0 mov r8, r2 ldr r0, [r7] @@ -265643,7 +265643,7 @@ _0808365E: str r0, [sp, #4] movs r0, #5 movs r2, #0 - bl sub_08083A5C + bl Blender_AddTextPrinter movs r6, #0 lsls r0, r4, #1 adds r0, r0, r4 @@ -265684,7 +265684,7 @@ _080836C6: movs r0, #3 str r0, [sp, #4] movs r0, #5 - bl sub_08083A5C + bl Blender_AddTextPrinter adds r0, r6, #1 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -265700,10 +265700,10 @@ _080836C6: blo _0808365E _0808372C: movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap movs r0, #5 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08083754 ldr r1, [r0] movs r0, #0x84 @@ -265784,14 +265784,14 @@ sub_080837C8: @ 0x080837C8 str r1, [sp, #0x30] ldr r5, _080838A8 add r0, sp, #0x2c - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 bl sub_08196FF0 ldrb r0, [r5] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5] ldr r2, _080838AC movs r1, #2 @@ -265863,10 +265863,10 @@ _08083820: cmp r6, #2 ble _08083820 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x34 pop {r4, r5, r6, r7} pop {r0} @@ -265898,12 +265898,12 @@ sub_080838C4: @ 0x080838C4 cmp r0, #0 bne _080838EA ldr r0, _08083914 - bl sub_080A29AC + bl PlayFanfare ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] _080838EA: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _0808390A @@ -265913,9 +265913,9 @@ _080838EA: lsls r1, r1, #1 adds r0, r0, r1 ldrh r0, [r0] - bl sub_080A3040 + bl PlayBGM adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0808390A: pop {r4, r5} pop {r0} @@ -265926,8 +265926,8 @@ _08083914: .4byte 0x0000016F _08083918: .4byte gUnknown_2031F44 thumb_func_end sub_080838C4 - thumb_func_start sub_0808391C -sub_0808391C: @ 0x0808391C + thumb_func_start TryAddContestLinkTvShow +TryAddContestLinkTvShow: @ 0x0808391C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -266009,7 +266009,7 @@ sub_0808391C: @ 0x0808391C ldrb r0, [r5, #0x12] str r0, [sp] adds r0, r7, #0 - bl sub_080ED784 + bl Put3CheersForPokeblocksOnTheAir lsls r0, r0, #0x18 cmp r0, #0 bne _08083A42 @@ -266061,7 +266061,7 @@ _080839E0: ldrb r0, [r5, #0x12] str r0, [sp] adds r0, r7, #0 - bl sub_080ED784 + bl Put3CheersForPokeblocksOnTheAir lsls r0, r0, #0x18 cmp r0, #0 beq _08083A4C @@ -266080,10 +266080,10 @@ _08083A4E: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0808391C + thumb_func_end TryAddContestLinkTvShow - thumb_func_start sub_08083A5C -sub_08083A5C: @ 0x08083A5C + thumb_func_start Blender_AddTextPrinter +Blender_AddTextPrinter: @ 0x08083A5C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -266147,7 +266147,7 @@ _08083ABE: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r6, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer _08083AD0: movs r0, #0 str r0, [sp] @@ -266165,7 +266165,7 @@ _08083AD0: movs r1, #1 mov r2, r8 adds r3, r7, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r3, r4} mov r8, r3 @@ -266174,10 +266174,10 @@ _08083AD0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08083A5C + thumb_func_end Blender_AddTextPrinter - thumb_func_start sub_08083B04 -sub_08083B04: @ 0x08083B04 + thumb_func_start Blender_PrintText +Blender_PrintText: @ 0x08083B04 push {r4, r5, r6, r7, lr} sub sp, #8 adds r5, r0, #0 @@ -266195,19 +266195,19 @@ _08083B1C: movs r1, #0 movs r2, #0x14 movs r3, #0xf - bl sub_08197924 + bl DrawDialogFrameWithCustomTileAndPalette str r6, [sp] str r4, [sp, #4] movs r0, #4 adds r1, r7, #0 movs r2, #1 movs r3, #1 - bl sub_08083A5C + bl Blender_AddTextPrinter movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrh r0, [r5] adds r0, #1 strh r0, [r5] @@ -266229,7 +266229,7 @@ _08083B64: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08083B04 + thumb_func_end Blender_PrintText thumb_func_start PlayTimeCounter_Reset PlayTimeCounter_Reset: @ 0x08083B6C @@ -266360,8 +266360,8 @@ _08083C4C: .4byte gUnknown_3005AF0 _08083C50: .4byte 0x000003E7 thumb_func_end PlayTimeCounter_SetToMax - thumb_func_start sub_08083C54 -sub_08083C54: @ 0x08083C54 + thumb_func_start SetTrainerId +SetTrainerId: @ 0x08083C54 strb r0, [r1] lsrs r2, r0, #8 strb r2, [r1, #1] @@ -266370,7 +266370,7 @@ sub_08083C54: @ 0x08083C54 lsrs r0, r0, #0x18 strb r0, [r1, #3] bx lr - thumb_func_end sub_08083C54 + thumb_func_end SetTrainerId thumb_func_start GetTrainerId GetTrainerId: @ 0x08083C64 @@ -266407,8 +266407,8 @@ _08083C84: bx r0 thumb_func_end CopyTrainerId - thumb_func_start sub_08083C98 -sub_08083C98: @ 0x08083C98 + thumb_func_start InitPlayerTrainerId +InitPlayerTrainerId: @ 0x08083C98 push {r4, lr} bl Random adds r4, r0, #0 @@ -266421,13 +266421,13 @@ sub_08083C98: @ 0x08083C98 ldr r1, [r0] adds r1, #0xa adds r0, r4, #0 - bl sub_08083C54 + bl SetTrainerId pop {r4} pop {r0} bx r0 .align 2, 0 _08083CC0: .4byte gUnknown_3005AF0 - thumb_func_end sub_08083C98 + thumb_func_end InitPlayerTrainerId thumb_func_start SetDefaultOptions SetDefaultOptions: @ 0x08083CC4 @@ -266474,8 +266474,8 @@ SetDefaultOptions: @ 0x08083CC4 _08083D14: .4byte gUnknown_3005AF0 thumb_func_end SetDefaultOptions - thumb_func_start sub_08083D18 -sub_08083D18: @ 0x08083D18 + thumb_func_start ClearPokedexFlags +ClearPokedexFlags: @ 0x08083D18 push {r4, lr} ldr r1, _08083D40 movs r0, #0 @@ -266497,10 +266497,10 @@ sub_08083D18: @ 0x08083D18 .align 2, 0 _08083D40: .4byte gUnknown_3005E10 _08083D44: .4byte gUnknown_3005AF0 - thumb_func_end sub_08083D18 + thumb_func_end ClearPokedexFlags - thumb_func_start sub_08083D48 -sub_08083D48: @ 0x08083D48 + thumb_func_start ClearAllContestWinnerPics +ClearAllContestWinnerPics: @ 0x08083D48 push {r4, r5, r6, r7, lr} bl ClearContestWinnerPicsInContestHall movs r2, #8 @@ -266531,10 +266531,10 @@ _08083D58: _08083D7C: .4byte gUnknown_3005AEC _08083D80: .4byte 0x00002E90 _08083D84: .4byte gUnknown_830FC68 - thumb_func_end sub_08083D48 + thumb_func_end ClearAllContestWinnerPics - thumb_func_start sub_08083D88 -sub_08083D88: @ 0x08083D88 + thumb_func_start ClearFrontierRecord +ClearFrontierRecord: @ 0x08083D88 push {r4, lr} sub sp, #4 movs r0, #0 @@ -266567,10 +266567,10 @@ _08083DC4: .4byte 0x0000064C _08083DC8: .4byte 0x05000238 _08083DCC: .4byte 0x00000EE1 _08083DD0: .4byte 0x00000EE9 - thumb_func_end sub_08083D88 + thumb_func_end ClearFrontierRecord - thumb_func_start sub_08083DD4 -sub_08083DD4: @ 0x08083DD4 + thumb_func_start WarpToTruck +WarpToTruck: @ 0x08083DD4 push {lr} sub sp, #4 movs r3, #1 @@ -266580,42 +266580,42 @@ sub_08083DD4: @ 0x08083DD4 movs r1, #0x28 adds r2, r3, #0 bl SetWarpDestination - bl sub_08084540 + bl WarpIntoMap add sp, #4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08083DD4 + thumb_func_end WarpToTruck - thumb_func_start sub_08083DF4 -sub_08083DF4: @ 0x08083DF4 + thumb_func_start Sav2_ClearSetDefault +Sav2_ClearSetDefault: @ 0x08083DF4 push {lr} bl sub_0807659C bl SetDefaultOptions pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08083DF4 + thumb_func_end Sav2_ClearSetDefault - thumb_func_start sub_08083E04 -sub_08083E04: @ 0x08083E04 + thumb_func_start ResetMenuAndMonGlobals +ResetMenuAndMonGlobals: @ 0x08083E04 push {lr} ldr r1, _08083E24 movs r0, #0 strb r0, [r1] - bl sub_080BAA94 + bl ResetPokedexScrollPositions bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons - bl sub_081AA8E8 - bl sub_0813628C + bl ResetBagScrollPositions + bl ResetPokeblockScrollPositions pop {r0} bx r0 .align 2, 0 _08083E24: .4byte gUnknown_2031F74 - thumb_func_end sub_08083E04 + thumb_func_end ResetMenuAndMonGlobals - thumb_func_start sub_08083E28 -sub_08083E28: @ 0x08083E28 + thumb_func_start NewGameInitData +NewGameInitData: @ 0x08083E28 push {r4, r5, lr} ldr r0, _08083F34 ldrh r0, [r0] @@ -266624,7 +266624,7 @@ sub_08083E28: @ 0x08083E28 cmp r0, #2 bne _08083E3A _08083E36: - bl sub_0802F05C + bl RtcReset _08083E3A: ldr r1, _08083F38 movs r0, #1 @@ -266636,8 +266636,8 @@ _08083E3A: str r5, [r0] bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons - bl sub_080BAA0C - bl sub_08083D88 + bl ResetPokedex + bl ClearFrontierRecord bl sub_080765C0 bl ClearMailData ldr r0, [r4] @@ -266645,11 +266645,11 @@ _08083E3A: ldr r0, [r4] adds r0, #0xa8 str r5, [r0] - bl sub_08083C98 + bl InitPlayerTrainerId bl PlayTimeCounter_Reset - bl sub_08083D18 - bl sub_0809CBD8 - bl sub_080ECA80 + bl ClearPokedexFlags + bl InitEventData + bl ClearTVShowData bl ResetGabbyAndTy bl ClearSecretBases bl ClearBerryTrees @@ -266664,40 +266664,40 @@ _08083E3A: bl SetCoins bl sub_080D6E98 bl ResetGameStats - bl sub_08083D48 + bl ClearAllContestWinnerPics bl sub_0813C204 bl sub_080FA2EC bl sub_080FA344 ldr r0, _08083F48 strb r5, [r0] bl ZeroPlayerPartyMons - bl sub_080C7008 - bl sub_08161A48 + bl ResetPokemonStorageSystem + bl ClearRoamerData bl ClearRoamerLocationData ldr r0, [r4] ldr r1, _08083F4C adds r0, r0, r1 strh r5, [r0] bl ClearBag - bl sub_0816ABFC + bl NewGameInitPCItems bl ClearPokeblocks bl ClearDecorationInventories bl sub_0811F664 - bl sub_08120680 - bl sub_081224E0 + bl SetMauvilleOldMan + bl InitDewfordTrend bl ResetFanClub - bl sub_081773E4 - bl sub_08083DD4 + bl ResetLotteryCorner + bl WarpToTruck ldr r0, _08083F50 bl ScriptContext2_RunNewScript - bl sub_08083F54 - bl sub_0801EFEC - bl sub_0818D75C - bl sub_0819F978 - bl sub_081A4710 - bl sub_08195A10 + bl ResetMiniGamesResults + bl copy_strings_to_sav1 + bl SetLilycoveLady + bl ResetAllApprenticeData + bl ClearRankingHallRecords + bl InitMatchCallCounters bl sub_0801AAAC - bl sub_0800E070 + bl WipeTrainerNameRecords bl sub_081D4B3C bl ResetContestLinkResults pop {r4, r5} @@ -266712,10 +266712,10 @@ _08083F44: .4byte 0x00000BB8 _08083F48: .4byte gUnknown_202418D _08083F4C: .4byte 0x00000496 _08083F50: .4byte gUnknown_8242678 - thumb_func_end sub_08083E28 + thumb_func_end NewGameInitData - thumb_func_start sub_08083F54 -sub_08083F54: @ 0x08083F54 + thumb_func_start ResetMiniGamesResults +ResetMiniGamesResults: @ 0x08083F54 push {r4, r5, r6, lr} sub sp, #4 mov r0, sp @@ -266753,10 +266753,10 @@ sub_08083F54: @ 0x08083F54 .align 2, 0 _08083FA0: .4byte gUnknown_3005AF0 _08083FA4: .4byte 0x01000008 - thumb_func_end sub_08083F54 + thumb_func_end ResetMiniGamesResults - thumb_func_start sub_08083FA8 -sub_08083FA8: @ 0x08083FA8 + thumb_func_start DoWhiteOut +DoWhiteOut: @ 0x08083FA8 push {r4, lr} ldr r0, _08083FE0 bl ScriptContext2_RunNewScript @@ -266771,22 +266771,22 @@ sub_08083FA8: @ 0x08083FA8 lsrs r1, r1, #1 adds r0, r4, #0 bl sub_080E491C - bl sub_080F9A10 - bl sub_080840A8 - bl sub_0808466C - bl sub_08084540 + bl HealPlayerParty + bl Overworld_ResetStateAfterWhiteOut + bl SetWarpDestinationToLastHealLocation + bl WarpIntoMap pop {r4} pop {r0} bx r0 .align 2, 0 _08083FE0: .4byte gUnknown_82428F1 _08083FE4: .4byte gUnknown_3005AEC - thumb_func_end sub_08083FA8 + thumb_func_end DoWhiteOut thumb_func_start sub_08083FE8 sub_08083FE8: @ 0x08083FE8 push {lr} - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState ldr r0, _08084010 bl FlagClear ldr r0, _08084014 @@ -266807,10 +266807,10 @@ _0808401C: .4byte 0x00000889 _08084020: .4byte 0x00000888 thumb_func_end sub_08083FE8 - thumb_func_start sub_08084024 -sub_08084024: @ 0x08084024 + thumb_func_start Overworld_ResetStateAfterTeleport +Overworld_ResetStateAfterTeleport: @ 0x08084024 push {lr} - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState ldr r0, _08084054 bl FlagClear ldr r0, _08084058 @@ -266832,12 +266832,12 @@ _0808405C: .4byte 0x0000088C _08084060: .4byte 0x00000889 _08084064: .4byte 0x00000888 _08084068: .4byte gUnknown_82428FC - thumb_func_end sub_08084024 + thumb_func_end Overworld_ResetStateAfterTeleport thumb_func_start sub_0808406C sub_0808406C: @ 0x0808406C push {lr} - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState ldr r0, _08084094 bl FlagClear ldr r0, _08084098 @@ -266858,10 +266858,10 @@ _080840A0: .4byte 0x00000889 _080840A4: .4byte 0x00000888 thumb_func_end sub_0808406C - thumb_func_start sub_080840A8 -sub_080840A8: @ 0x080840A8 + thumb_func_start Overworld_ResetStateAfterWhiteOut +Overworld_ResetStateAfterWhiteOut: @ 0x080840A8 push {r4, lr} - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState ldr r0, _080840F4 bl FlagClear ldr r0, _080840F8 @@ -266897,17 +266897,17 @@ _08084100: .4byte 0x00000889 _08084104: .4byte 0x00000888 _08084108: .4byte 0x00004039 _0808410C: .4byte 0x00004037 - thumb_func_end sub_080840A8 + thumb_func_end Overworld_ResetStateAfterWhiteOut thumb_func_start sub_08084110 sub_08084110: @ 0x08084110 push {lr} ldr r0, _0808412C bl FlagClear - bl sub_08085494 - bl sub_08137D5C + bl ChooseAmbientCrySpecies + bl ResetCyclingRoadChallengeData bl UpdateLocationHistoryForRoamer - bl sub_08161C14 + bl RoamerMoveToOtherLocationSet pop {r0} bx r0 .align 2, 0 @@ -266940,7 +266940,7 @@ IncrementGameStat: @ 0x0808414C cmp r4, #0x33 bhi _08084174 adds r0, r4, #0 - bl sub_08084180 + bl GetGameStat adds r1, r0, #0 ldr r0, _08084168 cmp r1, r0 @@ -266962,8 +266962,8 @@ _08084174: _0808417C: .4byte 0x00FFFFFF thumb_func_end IncrementGameStat - thumb_func_start sub_08084180 -sub_08084180: @ 0x08084180 + thumb_func_start GetGameStat +GetGameStat: @ 0x08084180 push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -266992,7 +266992,7 @@ _080841B2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08084180 + thumb_func_end GetGameStat thumb_func_start SetGameStat SetGameStat: @ 0x080841B8 @@ -267023,8 +267023,8 @@ _080841E4: .4byte 0x0000159C _080841E8: .4byte gUnknown_3005AF0 thumb_func_end SetGameStat - thumb_func_start sub_080841EC -sub_080841EC: @ 0x080841EC + thumb_func_start ApplyNewEncryptionKeyToGameStats +ApplyNewEncryptionKeyToGameStats: @ 0x080841EC push {r4, r5, r6, lr} adds r5, r0, #0 movs r4, #0 @@ -267036,7 +267036,7 @@ _080841F4: ldr r0, [r6] adds r0, r0, r1 adds r1, r5, #0 - bl sub_08076B20 + bl ApplyNewEncryptionKeyToWord adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -267048,10 +267048,10 @@ _080841F4: .align 2, 0 _08084214: .4byte gUnknown_3005AEC _08084218: .4byte 0x0000159C - thumb_func_end sub_080841EC + thumb_func_end ApplyNewEncryptionKeyToGameStats - thumb_func_start sub_0808421C -sub_0808421C: @ 0x0808421C + thumb_func_start LoadEventObjTemplatesFromHeader +LoadEventObjTemplatesFromHeader: @ 0x0808421C push {r4, r5, lr} sub sp, #4 movs r0, #0 @@ -267085,7 +267085,7 @@ sub_0808421C: @ 0x0808421C _0808425C: .4byte gUnknown_3005AEC _08084260: .4byte 0x05000180 _08084264: .4byte gUnknown_2036FB8 - thumb_func_end sub_0808421C + thumb_func_end LoadEventObjTemplatesFromHeader thumb_func_start LoadSaveblockEventObjScripts LoadSaveblockEventObjScripts: @ 0x08084268 @@ -267114,8 +267114,8 @@ _08084290: .4byte gUnknown_2036FB8 _08084294: .4byte gUnknown_3005AEC thumb_func_end LoadSaveblockEventObjScripts - thumb_func_start sub_08084298 -sub_08084298: @ 0x08084298 + thumb_func_start Overworld_SetEventObjTemplateCoords +Overworld_SetEventObjTemplateCoords: @ 0x08084298 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -267148,10 +267148,10 @@ _080842CC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08084298 + thumb_func_end Overworld_SetEventObjTemplateCoords - thumb_func_start sub_080842D4 -sub_080842D4: @ 0x080842D4 + thumb_func_start Overworld_SetEventObjTemplateMovementType +Overworld_SetEventObjTemplateMovementType: @ 0x080842D4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -267181,28 +267181,28 @@ _08084300: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080842D4 + thumb_func_end Overworld_SetEventObjTemplateMovementType - thumb_func_start sub_08084308 -sub_08084308: @ 0x08084308 + thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw +mapdata_load_assets_to_gpu_and_full_redraw: @ 0x08084308 push {r4, lr} - bl sub_080894F8 + bl move_tilemap_camera_to_upper_left_corner ldr r4, _0808432C ldr r0, [r4] bl copy_map_tileset1_tileset2_to_vram ldr r0, [r4] bl apply_map_tileset1_tileset2_palette bl DrawWholeMapView - bl sub_080A02E0 + bl InitTilesetAnimations pop {r4} pop {r0} bx r0 .align 2, 0 _0808432C: .4byte gUnknown_2036FB8 - thumb_func_end sub_08084308 + thumb_func_end mapdata_load_assets_to_gpu_and_full_redraw - thumb_func_start sub_08084330 -sub_08084330: @ 0x08084330 + thumb_func_start GetMapLayout +GetMapLayout: @ 0x08084330 push {lr} ldr r0, _08084340 ldr r0, [r0] @@ -267224,7 +267224,7 @@ _0808434E: bx r1 .align 2, 0 _08084354: .4byte gUnknown_845A1F4 - thumb_func_end sub_08084330 + thumb_func_end GetMapLayout thumb_func_start ApplyCurrentWarp ApplyCurrentWarp: @ 0x08084358 @@ -267351,8 +267351,8 @@ GetDestinationWarpMapHeader: @ 0x08084410 _08084430: .4byte gUnknown_2031F84 thumb_func_end GetDestinationWarpMapHeader - thumb_func_start sub_08084434 -sub_08084434: @ 0x08084434 + thumb_func_start LoadCurrentMapData +LoadCurrentMapData: @ 0x08084434 push {r4, r5, r6, lr} ldr r1, _08084478 ldr r4, _0808447C @@ -267380,7 +267380,7 @@ sub_08084434: @ 0x08084434 ldr r1, [r5] ldrh r0, [r4, #0x12] strh r0, [r1, #0x32] - bl sub_08084330 + bl GetMapLayout str r0, [r4] pop {r4, r5, r6} pop {r0} @@ -267389,10 +267389,10 @@ sub_08084434: @ 0x08084434 _08084478: .4byte gUnknown_2031F9C _0808447C: .4byte gUnknown_2036FB8 _08084480: .4byte gUnknown_3005AEC - thumb_func_end sub_08084434 + thumb_func_end LoadCurrentMapData - thumb_func_start sub_08084484 -sub_08084484: @ 0x08084484 + thumb_func_start LoadSaveblockMapHeader +LoadSaveblockMapHeader: @ 0x08084484 push {r4, r5, lr} ldr r4, _080844BC ldr r0, _080844C0 @@ -267414,7 +267414,7 @@ sub_08084484: @ 0x08084484 stm r1!, {r2, r3, r5} ldr r0, [r0] str r0, [r1] - bl sub_08084330 + bl GetMapLayout str r0, [r4] pop {r4, r5} pop {r0} @@ -267422,10 +267422,10 @@ sub_08084484: @ 0x08084484 .align 2, 0 _080844BC: .4byte gUnknown_2036FB8 _080844C0: .4byte gUnknown_3005AEC - thumb_func_end sub_08084484 + thumb_func_end LoadSaveblockMapHeader - thumb_func_start sub_080844C4 -sub_080844C4: @ 0x080844C4 + thumb_func_start SetPlayerCoordsFromWarp +SetPlayerCoordsFromWarp: @ 0x080844C4 push {r4, r5, lr} ldr r0, _080844F4 ldr r2, [r0] @@ -267489,18 +267489,18 @@ _08084534: bx r0 .align 2, 0 _0808453C: .4byte gUnknown_2036FB8 - thumb_func_end sub_080844C4 + thumb_func_end SetPlayerCoordsFromWarp - thumb_func_start sub_08084540 -sub_08084540: @ 0x08084540 + thumb_func_start WarpIntoMap +WarpIntoMap: @ 0x08084540 push {lr} bl ApplyCurrentWarp - bl sub_08084434 - bl sub_080844C4 + bl LoadCurrentMapData + bl SetPlayerCoordsFromWarp pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08084540 + thumb_func_end WarpIntoMap thumb_func_start SetWarpDestination SetWarpDestination: @ 0x08084554 @@ -267613,8 +267613,8 @@ SetDynamicWarpWithCoords: @ 0x080845E4 _08084618: .4byte gUnknown_3005AEC thumb_func_end SetDynamicWarpWithCoords - thumb_func_start sub_0808461C -sub_0808461C: @ 0x0808461C + thumb_func_start SetWarpDestinationToDynamicWarp +SetWarpDestinationToDynamicWarp: @ 0x0808461C ldr r2, _0808462C ldr r0, _08084630 ldr r0, [r0] @@ -267626,15 +267626,15 @@ sub_0808461C: @ 0x0808461C .align 2, 0 _0808462C: .4byte gUnknown_2031F84 _08084630: .4byte gUnknown_3005AEC - thumb_func_end sub_0808461C + thumb_func_end SetWarpDestinationToDynamicWarp - thumb_func_start sub_08084634 -sub_08084634: @ 0x08084634 + thumb_func_start SetWarpDestinationToHealLocation +SetWarpDestinationToHealLocation: @ 0x08084634 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08122CC8 + bl GetHealLocation adds r4, r0, #0 cmp r4, #0 beq _08084662 @@ -267657,10 +267657,10 @@ _08084662: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08084634 + thumb_func_end SetWarpDestinationToHealLocation - thumb_func_start sub_0808466C -sub_0808466C: @ 0x0808466C + thumb_func_start SetWarpDestinationToLastHealLocation +SetWarpDestinationToLastHealLocation: @ 0x0808466C ldr r2, _0808467C ldr r0, _08084680 ldr r0, [r0] @@ -267672,15 +267672,15 @@ sub_0808466C: @ 0x0808466C .align 2, 0 _0808467C: .4byte gUnknown_2031F84 _08084680: .4byte gUnknown_3005AEC - thumb_func_end sub_0808466C + thumb_func_end SetWarpDestinationToLastHealLocation - thumb_func_start sub_08084684 -sub_08084684: @ 0x08084684 + thumb_func_start SetLastHealLocationWarp +SetLastHealLocationWarp: @ 0x08084684 push {r4, r5, lr} sub sp, #8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08122CC8 + bl GetHealLocation adds r5, r0, #0 cmp r5, #0 beq _080846B8 @@ -267707,7 +267707,7 @@ _080846B8: bx r0 .align 2, 0 _080846C0: .4byte gUnknown_3005AEC - thumb_func_end sub_08084684 + thumb_func_end SetLastHealLocationWarp thumb_func_start UpdateEscapeWarp UpdateEscapeWarp: @ 0x080846C4 @@ -267803,8 +267803,8 @@ SetEscapeWarp: @ 0x0808473C _08084778: .4byte gUnknown_3005AEC thumb_func_end SetEscapeWarp - thumb_func_start sub_0808477C -sub_0808477C: @ 0x0808477C + thumb_func_start SetWarpDestinationToEscapeWarp +SetWarpDestinationToEscapeWarp: @ 0x0808477C ldr r2, _0808478C ldr r0, _08084790 ldr r0, [r0] @@ -267816,7 +267816,7 @@ sub_0808477C: @ 0x0808477C .align 2, 0 _0808478C: .4byte gUnknown_2031F84 _08084790: .4byte gUnknown_3005AEC - thumb_func_end sub_0808477C + thumb_func_end SetWarpDestinationToEscapeWarp thumb_func_start SetFixedDiveWarp SetFixedDiveWarp: @ 0x08084794 @@ -267851,8 +267851,8 @@ SetFixedDiveWarp: @ 0x08084794 _080847CC: .4byte gUnknown_2031F8C thumb_func_end SetFixedDiveWarp - thumb_func_start sub_080847D0 -sub_080847D0: @ 0x080847D0 + thumb_func_start SetWarpDestinationToDiveWarp +SetWarpDestinationToDiveWarp: @ 0x080847D0 ldr r2, _080847E0 ldr r0, _080847E4 ldr r1, [r0, #4] @@ -267863,7 +267863,7 @@ sub_080847D0: @ 0x080847D0 .align 2, 0 _080847E0: .4byte gUnknown_2031F84 _080847E4: .4byte gUnknown_2031F8C - thumb_func_end sub_080847D0 + thumb_func_end SetWarpDestinationToDiveWarp thumb_func_start SetFixedHoleWarp SetFixedHoleWarp: @ 0x080847E8 @@ -267898,8 +267898,8 @@ SetFixedHoleWarp: @ 0x080847E8 _08084820: .4byte gUnknown_2031F94 thumb_func_end SetFixedHoleWarp - thumb_func_start sub_08084824 -sub_08084824: @ 0x08084824 + thumb_func_start SetWarpDestinationToFixedHoleWarp +SetWarpDestinationToFixedHoleWarp: @ 0x08084824 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -267941,10 +267941,10 @@ _08084872: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08084824 + thumb_func_end SetWarpDestinationToFixedHoleWarp - thumb_func_start sub_0808487C -sub_0808487C: @ 0x0808487C + thumb_func_start SetWarpDestinationToContinueGameWarp +SetWarpDestinationToContinueGameWarp: @ 0x0808487C ldr r2, _0808488C ldr r0, _08084890 ldr r0, [r0] @@ -267956,7 +267956,7 @@ sub_0808487C: @ 0x0808487C .align 2, 0 _0808488C: .4byte gUnknown_2031F84 _08084890: .4byte gUnknown_3005AEC - thumb_func_end sub_0808487C + thumb_func_end SetWarpDestinationToContinueGameWarp thumb_func_start SetContinueGameWarp SetContinueGameWarp: @ 0x08084894 @@ -267993,13 +267993,13 @@ SetContinueGameWarp: @ 0x08084894 _080848D0: .4byte gUnknown_3005AEC thumb_func_end SetContinueGameWarp - thumb_func_start sub_080848D4 -sub_080848D4: @ 0x080848D4 + thumb_func_start SetContinueGameWarpToHealLocation +SetContinueGameWarpToHealLocation: @ 0x080848D4 push {r4, r5, lr} sub sp, #8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08122CC8 + bl GetHealLocation adds r5, r0, #0 cmp r5, #0 beq _08084908 @@ -268026,10 +268026,10 @@ _08084908: bx r0 .align 2, 0 _08084910: .4byte gUnknown_3005AEC - thumb_func_end sub_080848D4 + thumb_func_end SetContinueGameWarpToHealLocation - thumb_func_start sub_08084914 -sub_08084914: @ 0x08084914 + thumb_func_start SetContinueGameWarpToDynamicWarp +SetContinueGameWarpToDynamicWarp: @ 0x08084914 ldr r0, _08084924 ldr r2, [r0] ldr r0, [r2, #0x14] @@ -268039,10 +268039,10 @@ sub_08084914: @ 0x08084914 bx lr .align 2, 0 _08084924: .4byte gUnknown_3005AEC - thumb_func_end sub_08084914 + thumb_func_end SetContinueGameWarpToDynamicWarp - thumb_func_start sub_08084928 -sub_08084928: @ 0x08084928 + thumb_func_start GetMapConnection +GetMapConnection: @ 0x08084928 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -268076,10 +268076,10 @@ _0808495A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08084928 + thumb_func_end GetMapConnection - thumb_func_start sub_08084960 -sub_08084960: @ 0x08084960 + thumb_func_start SetDiveWarp +SetDiveWarp: @ 0x08084960 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -268088,7 +268088,7 @@ sub_08084960: @ 0x08084960 lsrs r4, r1, #0x10 lsls r2, r2, #0x10 lsrs r5, r2, #0x10 - bl sub_08084928 + bl GetMapConnection adds r1, r0, #0 cmp r1, #0 beq _08084998 @@ -268107,7 +268107,7 @@ sub_08084960: @ 0x08084960 bl SetWarpDestination b _080849B4 _08084998: - bl sub_080989F8 + bl RunOnDiveWarpMapScript ldr r0, _080849AC bl IsDummyWarp cmp r0, #0 @@ -268117,7 +268117,7 @@ _08084998: .align 2, 0 _080849AC: .4byte gUnknown_2031F8C _080849B0: - bl sub_080847D0 + bl SetWarpDestinationToDiveWarp _080849B4: movs r0, #1 _080849B6: @@ -268126,7 +268126,7 @@ _080849B6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08084960 + thumb_func_end SetDiveWarp thumb_func_start SetDiveWarpEmerge SetDiveWarpEmerge: @ 0x080849C0 @@ -268139,7 +268139,7 @@ SetDiveWarpEmerge: @ 0x080849C0 lsrs r2, r2, #0x10 movs r0, #6 adds r1, r3, #0 - bl sub_08084960 + bl SetDiveWarp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -268158,7 +268158,7 @@ SetDiveWarpDive: @ 0x080849E0 lsrs r2, r2, #0x10 movs r0, #5 adds r1, r3, #0 - bl sub_08084960 + bl SetDiveWarp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -268166,8 +268166,8 @@ SetDiveWarpDive: @ 0x080849E0 .align 2, 0 thumb_func_end SetDiveWarpDive - thumb_func_start sub_08084A00 -sub_08084A00: @ 0x08084A00 + thumb_func_start LoadMapFromCameraTransition +LoadMapFromCameraTransition: @ 0x08084A00 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -268192,26 +268192,26 @@ sub_08084A00: @ 0x08084A00 bl sub_08085178 _08084A30: bl ApplyCurrentWarp - bl sub_08084434 - bl sub_0808421C - bl sub_081AFA64 - bl sub_0809CC1C - bl sub_08137D5C + bl LoadCurrentMapData + bl LoadEventObjTemplatesFromHeader + bl TrySetMapSaveWarpStatus + bl ClearTempFieldEventData + bl ResetCyclingRoadChallengeData bl sub_0809C4B4 adds r0, r6, #0 adds r1, r5, #0 bl TryUpdateRandomTrainerRematches - bl sub_0809E088 + bl DoTimeBasedEvents bl SetSav1WeatherFromCurrMapHeader - bl sub_08085494 - bl sub_08084DFC - bl sub_08085168 - bl sub_080989D4 - bl sub_080876B8 + bl ChooseAmbientCrySpecies + bl SetDefaultFlashLevel + bl Overworld_ClearSavedMusic + bl RunOnTransitionMapScript + bl InitMap ldr r0, [r4] - bl sub_080886DC + bl copy_map_tileset2_to_vram_2 ldr r0, [r4] - bl sub_08088700 + bl apply_map_tileset2_palette movs r4, #6 _08084A7E: lsls r0, r4, #0x18 @@ -268220,12 +268220,12 @@ _08084A7E: adds r4, #1 cmp r4, #0xc ble _08084A7E - bl sub_080A02F4 + bl InitSecondaryTilesetAnimation bl UpdateLocationHistoryForRoamer - bl sub_08161C68 - bl sub_080AE71C - bl sub_0809D2C8 - bl sub_080989E0 + bl RoamerMove + bl DoCurrentWeather + bl ResetFieldTasksArgs + bl RunOnResumeMapScript ldr r2, _08084AC0 ldrb r0, [r2, #0x14] cmp r0, #0x3a @@ -268235,7 +268235,7 @@ _08084A7E: cmp r0, r1 beq _08084AB8 _08084AB4: - bl sub_080D4068 + bl ShowMapNamePopup _08084AB8: add sp, #4 pop {r4, r5, r6} @@ -268244,13 +268244,13 @@ _08084AB8: .align 2, 0 _08084AC0: .4byte gUnknown_2036FB8 _08084AC4: .4byte gUnknown_2031F9C - thumb_func_end sub_08084A00 + thumb_func_end LoadMapFromCameraTransition - thumb_func_start sub_08084AC8 -sub_08084AC8: @ 0x08084AC8 + thumb_func_start mli0_load_map +mli0_load_map: @ 0x08084AC8 push {r4, r5, r6, r7, lr} adds r7, r0, #0 - bl sub_08084434 + bl LoadCurrentMapData ldr r0, _08084AEC ldrb r1, [r0] movs r0, #1 @@ -268262,7 +268262,7 @@ sub_08084AC8: @ 0x08084AC8 ldr r0, _08084AF4 cmp r1, r0 bne _08084AF8 - bl sub_081A9F50 + bl LoadBattlePyramidEventObjectTemplates b _08084B0A .align 2, 0 _08084AEC: .4byte gUnknown_2031F78 @@ -268275,7 +268275,7 @@ _08084AF8: bl sub_081D56F0 b _08084B0A _08084B06: - bl sub_0808421C + bl LoadEventObjTemplatesFromHeader _08084B0A: ldr r4, _08084B8C ldrb r0, [r4, #0x17] @@ -268287,9 +268287,9 @@ _08084B0A: lsls r0, r0, #0x18 lsrs r6, r0, #0x18 bl sub_080EBDB8 - bl sub_081AFA64 - bl sub_0809CC1C - bl sub_08137D5C + bl TrySetMapSaveWarpStatus + bl ClearTempFieldEventData + bl ResetCyclingRoadChallengeData bl sub_0809C4B4 ldr r0, _08084B90 ldr r1, [r0] @@ -268305,26 +268305,26 @@ _08084B0A: bl TryUpdateRandomTrainerRematches cmp r7, #1 beq _08084B56 - bl sub_0809E088 + bl DoTimeBasedEvents _08084B56: bl SetSav1WeatherFromCurrMapHeader - bl sub_08085494 + bl ChooseAmbientCrySpecies cmp r5, #0 beq _08084B68 ldr r0, _08084B94 bl FlagClear _08084B68: - bl sub_08084DFC - bl sub_08085168 - bl sub_080989D4 + bl SetDefaultFlashLevel + bl Overworld_ClearSavedMusic + bl RunOnTransitionMapScript bl UpdateLocationHistoryForRoamer - bl sub_08161C14 + bl RoamerMoveToOtherLocationSet ldrh r1, [r4, #0x12] ldr r0, _08084B98 cmp r1, r0 bne _08084B9C movs r0, #0 - bl sub_08087710 + bl InitBattlePyramidMap b _08084BAE .align 2, 0 _08084B8C: .4byte gUnknown_2036FB8 @@ -268335,10 +268335,10 @@ _08084B9C: bl InTrainerHill cmp r0, #0 beq _08084BAA - bl sub_08087748 + bl InitTrainerHillMap b _08084BAE _08084BAA: - bl sub_080876B8 + bl InitMap _08084BAE: cmp r7, #1 beq _08084BC6 @@ -268347,7 +268347,7 @@ _08084BAE: ldr r1, _08084BCC ldr r0, [r1] ldr r1, [r1, #4] - bl sub_080ECBE4 + bl UpdateTVScreensOnMap movs r0, #1 bl sub_080E9EC4 _08084BC6: @@ -268356,10 +268356,10 @@ _08084BC6: bx r0 .align 2, 0 _08084BCC: .4byte gUnknown_3005B20 - thumb_func_end sub_08084AC8 + thumb_func_end mli0_load_map - thumb_func_start sub_08084BD0 -sub_08084BD0: @ 0x08084BD0 + thumb_func_start ResetInitialPlayerAvatarState +ResetInitialPlayerAvatarState: @ 0x08084BD0 ldr r1, _08084BDC movs r0, #1 strb r0, [r1, #1] @@ -268367,16 +268367,16 @@ sub_08084BD0: @ 0x08084BD0 bx lr .align 2, 0 _08084BDC: .4byte gUnknown_2031FA0 - thumb_func_end sub_08084BD0 + thumb_func_end ResetInitialPlayerAvatarState - thumb_func_start sub_08084BE0 -sub_08084BE0: @ 0x08084BE0 + thumb_func_start StoreInitialPlayerAvatarState +StoreInitialPlayerAvatarState: @ 0x08084BE0 push {r4, lr} bl GetPlayerFacingDirection ldr r4, _08084BFC strb r0, [r4, #1] movs r0, #2 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _08084C00 @@ -268386,7 +268386,7 @@ sub_08084BE0: @ 0x08084BE0 _08084BFC: .4byte gUnknown_2031FA0 _08084C00: movs r0, #4 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _08084C10 @@ -268394,7 +268394,7 @@ _08084C00: b _08084C32 _08084C10: movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _08084C20 @@ -268402,7 +268402,7 @@ _08084C10: b _08084C32 _08084C20: movs r0, #0x10 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _08084C30 @@ -268416,7 +268416,7 @@ _08084C32: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08084BE0 + thumb_func_end StoreInitialPlayerAvatarState thumb_func_start GetInitialPlayerAvatarState GetInitialPlayerAvatarState: @ 0x08084C3C @@ -268425,7 +268425,7 @@ GetInitialPlayerAvatarState: @ 0x08084C3C adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 - bl sub_08084DB8 + bl GetCenterScreenMetatileBehavior adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -268433,7 +268433,7 @@ GetInitialPlayerAvatarState: @ 0x08084C3C adds r0, r6, #0 adds r1, r4, #0 adds r2, r5, #0 - bl sub_08084C94 + bl GetAdjustedInitialTransitionFlags adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -268443,7 +268443,7 @@ GetInitialPlayerAvatarState: @ 0x08084C3C adds r0, r6, #0 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08084CF4 + bl GetAdjustedInitialDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x10 ldr r1, _08084C90 @@ -268460,8 +268460,8 @@ _08084C8C: .4byte 0xFFFFFF00 _08084C90: .4byte 0xFFFF00FF thumb_func_end GetInitialPlayerAvatarState - thumb_func_start sub_08084C94 -sub_08084C94: @ 0x08084C94 + thumb_func_start GetAdjustedInitialTransitionFlags +GetAdjustedInitialTransitionFlags: @ 0x08084C94 push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x10 @@ -268485,7 +268485,7 @@ _08084CB8: .4byte 0x0000088D _08084CBC: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -268493,7 +268493,7 @@ _08084CBC: movs r0, #8 b _08084CEC _08084CD0: - bl sub_08084DDC + bl Overworld_IsBikingAllowed cmp r0, #1 bne _08084CEA ldrb r0, [r6] @@ -268513,10 +268513,10 @@ _08084CEC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08084C94 + thumb_func_end GetAdjustedInitialTransitionFlags - thumb_func_start sub_08084CF4 -sub_08084CF4: @ 0x08084CF4 + thumb_func_start GetAdjustedInitialDirection +GetAdjustedInitialDirection: @ 0x08084CF4 push {r4, r5, r6, r7, lr} adds r6, r0, #0 lsls r1, r1, #0x18 @@ -268617,10 +268617,10 @@ _08084DB0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08084CF4 + thumb_func_end GetAdjustedInitialDirection - thumb_func_start sub_08084DB8 -sub_08084DB8: @ 0x08084DB8 + thumb_func_start GetCenterScreenMetatileBehavior +GetCenterScreenMetatileBehavior: @ 0x08084DB8 push {lr} ldr r0, _08084DD8 ldr r1, [r0] @@ -268637,10 +268637,10 @@ sub_08084DB8: @ 0x08084DB8 bx r1 .align 2, 0 _08084DD8: .4byte gUnknown_3005AEC - thumb_func_end sub_08084DB8 + thumb_func_end GetCenterScreenMetatileBehavior - thumb_func_start sub_08084DDC -sub_08084DDC: @ 0x08084DDC + thumb_func_start Overworld_IsBikingAllowed +Overworld_IsBikingAllowed: @ 0x08084DDC push {lr} ldr r0, _08084DF0 ldrb r1, [r0, #0x1a] @@ -268658,10 +268658,10 @@ _08084DF6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08084DDC + thumb_func_end Overworld_IsBikingAllowed - thumb_func_start sub_08084DFC -sub_08084DFC: @ 0x08084DFC + thumb_func_start SetDefaultFlashLevel +SetDefaultFlashLevel: @ 0x08084DFC push {lr} ldr r0, _08084E10 ldrb r1, [r0, #0x15] @@ -268704,7 +268704,7 @@ _08084E46: .align 2, 0 _08084E4C: .4byte gUnknown_3005AEC _08084E50: .4byte gUnknown_852AB14 - thumb_func_end sub_08084DFC + thumb_func_end SetDefaultFlashLevel thumb_func_start Overworld_SetFlashLevel Overworld_SetFlashLevel: @ 0x08084E54 @@ -268730,8 +268730,8 @@ _08084E74: .4byte gUnknown_852AB14 _08084E78: .4byte gUnknown_3005AEC thumb_func_end Overworld_SetFlashLevel - thumb_func_start sub_08084E7C -sub_08084E7C: @ 0x08084E7C + thumb_func_start Overworld_GetFlashLevel +Overworld_GetFlashLevel: @ 0x08084E7C ldr r0, _08084E88 ldr r0, [r0] adds r0, #0x30 @@ -268739,15 +268739,15 @@ sub_08084E7C: @ 0x08084E7C bx lr .align 2, 0 _08084E88: .4byte gUnknown_3005AEC - thumb_func_end sub_08084E7C + thumb_func_end Overworld_GetFlashLevel - thumb_func_start sub_08084E8C -sub_08084E8C: @ 0x08084E8C + thumb_func_start SetCurrentMapLayout +SetCurrentMapLayout: @ 0x08084E8C push {lr} ldr r1, _08084EA0 ldr r1, [r1] strh r0, [r1, #0x32] - bl sub_08084330 + bl GetMapLayout ldr r1, _08084EA4 str r0, [r1] pop {r0} @@ -268755,7 +268755,7 @@ sub_08084E8C: @ 0x08084E8C .align 2, 0 _08084EA0: .4byte gUnknown_3005AEC _08084EA4: .4byte gUnknown_2036FB8 - thumb_func_end sub_08084E8C + thumb_func_end SetCurrentMapLayout thumb_func_start sub_08084EA8 sub_08084EA8: @ 0x08084EA8 @@ -268775,8 +268775,8 @@ sub_08084EB4: @ 0x08084EB4 _08084EBC: .4byte gUnknown_2031F78 thumb_func_end sub_08084EB4 - thumb_func_start sub_08084EC0 -sub_08084EC0: @ 0x08084EC0 + thumb_func_start ShouldLegendaryMusicPlayAtLocation +ShouldLegendaryMusicPlayAtLocation: @ 0x08084EC0 push {r4, lr} adds r4, r0, #0 ldr r0, _08084F0C @@ -268823,10 +268823,10 @@ _08084F16: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08084EC0 + thumb_func_end ShouldLegendaryMusicPlayAtLocation - thumb_func_start sub_08084F1C -sub_08084F1C: @ 0x08084F1C + thumb_func_start NoMusicInSotopolisWithLegendaries +NoMusicInSotopolisWithLegendaries: @ 0x08084F1C push {r4, lr} adds r4, r0, #0 ldr r0, _08084F44 @@ -268854,10 +268854,10 @@ _08084F4A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08084F1C + thumb_func_end NoMusicInSotopolisWithLegendaries - thumb_func_start sub_08084F50 -sub_08084F50: @ 0x08084F50 + thumb_func_start IsInfiltratedWeatherInstitute +IsInfiltratedWeatherInstitute: @ 0x08084F50 push {r4, lr} adds r4, r0, #0 ldr r0, _08084F74 @@ -268883,10 +268883,10 @@ _08084F7A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08084F50 + thumb_func_end IsInfiltratedWeatherInstitute - thumb_func_start sub_08084F80 -sub_08084F80: @ 0x08084F80 + thumb_func_start IsInflitratedSpaceCenter +IsInflitratedSpaceCenter: @ 0x08084F80 push {r4, r5, lr} adds r5, r0, #0 ldr r4, _08084FB8 @@ -268922,13 +268922,13 @@ _08084FBE: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08084F80 + thumb_func_end IsInflitratedSpaceCenter thumb_func_start GetLocationMusic GetLocationMusic: @ 0x08084FC4 push {r4, lr} adds r4, r0, #0 - bl sub_08084F1C + bl NoMusicInSotopolisWithLegendaries lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -268939,7 +268939,7 @@ GetLocationMusic: @ 0x08084FC4 _08084FD8: .4byte 0x0000FFFF _08084FDC: adds r0, r4, #0 - bl sub_08084EC0 + bl ShouldLegendaryMusicPlayAtLocation lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -268950,7 +268950,7 @@ _08084FDC: _08084FF0: .4byte 0x000001BB _08084FF4: adds r0, r4, #0 - bl sub_08084F80 + bl IsInflitratedSpaceCenter lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -268961,7 +268961,7 @@ _08084FF4: _08085008: .4byte 0x000001B9 _0808500C: adds r0, r4, #0 - bl sub_08084F50 + bl IsInfiltratedWeatherInstitute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -268986,8 +268986,8 @@ _08085036: bx r1 thumb_func_end GetLocationMusic - thumb_func_start sub_0808503C -sub_0808503C: @ 0x0808503C + thumb_func_start GetCurrLocationDefaultMusic +GetCurrLocationDefaultMusic: @ 0x0808503C push {r4, lr} ldr r0, _0808505C ldr r0, [r0] @@ -268996,7 +268996,7 @@ sub_0808503C: @ 0x0808503C lsls r0, r0, #5 cmp r1, r0 bne _08085064 - bl sub_080AE6A8 + bl GetSav1Weather lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #8 @@ -269038,10 +269038,10 @@ _08085098: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808503C + thumb_func_end GetCurrLocationDefaultMusic - thumb_func_start sub_080850A0 -sub_080850A0: @ 0x080850A0 + thumb_func_start CallBattleArenaFunction +CallBattleArenaFunction: @ 0x080850A0 push {lr} ldr r0, _080850B8 bl GetLocationMusic @@ -269073,21 +269073,21 @@ _080850D8: _080850DC: pop {r1} bx r1 - thumb_func_end sub_080850A0 + thumb_func_end CallBattleArenaFunction - thumb_func_start sub_080850E0 -sub_080850E0: @ 0x080850E0 + thumb_func_start Overworld_ResetMapMusic +Overworld_ResetMapMusic: @ 0x080850E0 push {lr} bl ResetMapMusic pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080850E0 + thumb_func_end Overworld_ResetMapMusic - thumb_func_start sub_080850EC -sub_080850EC: @ 0x080850EC + thumb_func_start Overworld_PlaySpecialMapMusic +Overworld_PlaySpecialMapMusic: @ 0x080850EC push {r4, lr} - bl sub_0808503C + bl GetCurrLocationDefaultMusic lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r0, _08085110 @@ -269119,7 +269119,7 @@ _0808511C: _0808512C: .4byte 0x0000019B _08085130: movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _0808513E @@ -269131,27 +269131,27 @@ _0808513E: cmp r4, r0 beq _08085150 adds r0, r4, #0 - bl sub_080A27D8 + bl PlayNewMapMusic _08085150: pop {r4} pop {r0} bx r0 .align 2, 0 _08085158: .4byte 0x0000016D - thumb_func_end sub_080850EC + thumb_func_end Overworld_PlaySpecialMapMusic - thumb_func_start sub_0808515C -sub_0808515C: @ 0x0808515C + thumb_func_start Overworld_SetSavedMusic +Overworld_SetSavedMusic: @ 0x0808515C ldr r1, _08085164 ldr r1, [r1] strh r0, [r1, #0x2c] bx lr .align 2, 0 _08085164: .4byte gUnknown_3005AEC - thumb_func_end sub_0808515C + thumb_func_end Overworld_SetSavedMusic - thumb_func_start sub_08085168 -sub_08085168: @ 0x08085168 + thumb_func_start Overworld_ClearSavedMusic +Overworld_ClearSavedMusic: @ 0x08085168 ldr r0, _08085174 ldr r1, [r0] movs r0, #0 @@ -269159,7 +269159,7 @@ sub_08085168: @ 0x08085168 bx lr .align 2, 0 _08085174: .4byte gUnknown_3005AEC - thumb_func_end sub_08085168 + thumb_func_end Overworld_ClearSavedMusic thumb_func_start sub_08085178 sub_08085178: @ 0x08085178 @@ -269170,7 +269170,7 @@ sub_08085178: @ 0x08085178 lsrs r0, r0, #0x18 cmp r0, #1 beq _080851F8 - bl sub_080850A0 + bl CallBattleArenaFunction lsls r0, r0, #0x10 lsrs r4, r0, #0x10 bl sub_080A27CC @@ -269189,7 +269189,7 @@ sub_08085178: @ 0x08085178 cmp r5, r6 beq _080851F8 movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _080851BE @@ -269198,7 +269198,7 @@ _080851BE: cmp r4, r5 beq _080851F8 movs r0, #6 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _080851F0 @@ -269224,19 +269224,19 @@ _080851F8: .align 2, 0 thumb_func_end sub_08085178 - thumb_func_start sub_08085200 -sub_08085200: @ 0x08085200 + thumb_func_start Overworld_ChangeMusicToDefault +Overworld_ChangeMusicToDefault: @ 0x08085200 push {r4, lr} bl sub_080A27CC adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_0808503C + bl GetCurrLocationDefaultMusic lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r4, r0 beq _08085226 - bl sub_0808503C + bl GetCurrLocationDefaultMusic lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #8 @@ -269245,10 +269245,10 @@ _08085226: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08085200 + thumb_func_end Overworld_ChangeMusicToDefault - thumb_func_start sub_0808522C -sub_0808522C: @ 0x0808522C + thumb_func_start GetTruckCameraBobbingY +GetTruckCameraBobbingY: @ 0x0808522C push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -269269,7 +269269,7 @@ _0808524C: bx r0 .align 2, 0 _08085254: .4byte 0x000001BB - thumb_func_end sub_0808522C + thumb_func_end GetTruckCameraBobbingY thumb_func_start GetMapMusicFadeoutSpeed GetMapMusicFadeoutSpeed: @ 0x08085258 @@ -269291,13 +269291,13 @@ _08085272: .align 2, 0 thumb_func_end GetMapMusicFadeoutSpeed - thumb_func_start sub_08085278 -sub_08085278: @ 0x08085278 + thumb_func_start TryFadeOutOldMapMusic +TryFadeOutOldMapMusic: @ 0x08085278 push {r4, r5, lr} bl sub_080A27CC lsls r0, r0, #0x10 lsrs r5, r0, #0x10 - bl sub_080850A0 + bl CallBattleArenaFunction lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r0, _080852EC @@ -269354,10 +269354,10 @@ _080852F8: .4byte gUnknown_3005AEC _080852FC: .4byte 0x0000FFFF _08085300: .4byte gUnknown_2031F84 _08085304: .4byte 0x0035001D - thumb_func_end sub_08085278 + thumb_func_end TryFadeOutOldMapMusic - thumb_func_start sub_08085308 -sub_08085308: @ 0x08085308 + thumb_func_start BGMusicStopped +BGMusicStopped: @ 0x08085308 push {lr} bl IsNotWaitingForBGMStop lsls r0, r0, #0x18 @@ -269365,19 +269365,19 @@ sub_08085308: @ 0x08085308 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08085308 + thumb_func_end BGMusicStopped - thumb_func_start sub_08085318 -sub_08085318: @ 0x08085318 + thumb_func_start Overworld_FadeOutMapMusic +Overworld_FadeOutMapMusic: @ 0x08085318 push {lr} movs r0, #4 bl FadeOutMapMusic pop {r0} bx r0 - thumb_func_end sub_08085318 + thumb_func_end Overworld_FadeOutMapMusic - thumb_func_start sub_08085324 -sub_08085324: @ 0x08085324 + thumb_func_start PlayAmbientCry +PlayAmbientCry: @ 0x08085324 push {r4, lr} sub sp, #4 mov r4, sp @@ -269397,7 +269397,7 @@ sub_08085324: @ 0x08085324 bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 beq _08085394 @@ -269435,10 +269435,10 @@ _08085394: .align 2, 0 _0808539C: .4byte gUnknown_2031FA6 _080853A0: .4byte gUnknown_2031FA4 - thumb_func_end sub_08085324 + thumb_func_end PlayAmbientCry - thumb_func_start sub_080853A4 -sub_080853A4: @ 0x080853A4 + thumb_func_start UpdateAmbientCry +UpdateAmbientCry: @ 0x080853A4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -269508,11 +269508,11 @@ _08085424: ldr r4, _08085470 adds r0, r0, r4 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0808541E adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x44 @@ -269544,7 +269544,7 @@ _08085474: lsls r0, r0, #0x10 cmp r0, #0 bne _08085488 - bl sub_08085324 + bl PlayAmbientCry movs r0, #2 _08085486: strh r0, [r6] @@ -269555,10 +269555,10 @@ _08085488: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080853A4 + thumb_func_end UpdateAmbientCry - thumb_func_start sub_08085494 -sub_08085494: @ 0x08085494 + thumb_func_start ChooseAmbientCrySpecies +ChooseAmbientCrySpecies: @ 0x08085494 push {lr} ldr r0, _080854BC ldr r0, [r0] @@ -269567,21 +269567,21 @@ sub_08085494: @ 0x08085494 lsls r0, r0, #6 cmp r1, r0 bne _080854C4 - bl sub_081379AC + bl IsMirageIslandPresent lsls r0, r0, #0x18 cmp r0, #0 bne _080854C4 ldr r1, _080854C0 movs r0, #1 strb r0, [r1] - bl sub_080B4F84 + bl GetLocalWaterMon b _080854CA .align 2, 0 _080854BC: .4byte gUnknown_3005AEC _080854C0: .4byte gUnknown_2031FA6 _080854C4: ldr r0, _080854D4 - bl sub_080B4EF8 + bl GetLocalWildMon _080854CA: ldr r1, _080854D8 strh r0, [r1] @@ -269590,7 +269590,7 @@ _080854CA: .align 2, 0 _080854D4: .4byte gUnknown_2031FA6 _080854D8: .4byte gUnknown_2031FA4 - thumb_func_end sub_08085494 + thumb_func_end ChooseAmbientCrySpecies thumb_func_start GetMapTypeByGroupAndId GetMapTypeByGroupAndId: @ 0x080854DC @@ -269637,8 +269637,8 @@ GetCurrentMapType: @ 0x0808550C _08085520: .4byte gUnknown_3005AEC thumb_func_end GetCurrentMapType - thumb_func_start sub_08085524 -sub_08085524: @ 0x08085524 + thumb_func_start GetLastUsedWarpMapType +GetLastUsedWarpMapType: @ 0x08085524 push {lr} ldr r0, _08085534 bl GetMapTypeByWarpData @@ -269648,7 +269648,7 @@ sub_08085524: @ 0x08085524 bx r1 .align 2, 0 _08085534: .4byte gUnknown_2031F7C - thumb_func_end sub_08085524 + thumb_func_end GetLastUsedWarpMapType thumb_func_start IsMapTypeOutdoors IsMapTypeOutdoors: @ 0x08085538 @@ -269784,8 +269784,8 @@ GetCurrentMapBattleScene: @ 0x080855E8 _0808560C: .4byte gUnknown_3005AEC thumb_func_end GetCurrentMapBattleScene - thumb_func_start sub_08085610 -sub_08085610: @ 0x08085610 + thumb_func_start InitOverworldBgs +InitOverworldBgs: @ 0x08085610 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -269796,42 +269796,42 @@ sub_08085610: @ 0x08085610 movs r0, #1 movs r1, #5 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #5 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #3 movs r1, #5 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r0, _08085690 mov r8, r0 movs r4, #0x80 lsls r4, r4, #4 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed mov r1, r8 str r0, [r1] ldr r6, _08085694 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] ldr r5, _08085698 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] mov r0, r8 ldr r1, [r0] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r6] movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r5] movs r0, #3 - bl sub_0800212C - bl sub_08196DC4 + bl SetBgTilemapBuffer + bl InitStandardTextBoxWindows pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -269842,18 +269842,18 @@ _0808568C: .4byte gUnknown_830FCF8 _08085690: .4byte gUnknown_3005B00 _08085694: .4byte gUnknown_3005AFC _08085698: .4byte gUnknown_3005B04 - thumb_func_end sub_08085610 + thumb_func_end InitOverworldBgs - thumb_func_start sub_0808569C -sub_0808569C: @ 0x0808569C + thumb_func_start CleanupOverworldWindowsAndTilemaps +CleanupOverworldWindowsAndTilemaps: @ 0x0808569C push {r4, lr} - bl sub_081BE3C8 + bl ClearMirageTowerPulseBlendEffect bl sub_08196DE8 ldr r4, _080856DC ldr r0, [r4] cmp r0, #0 beq _080856B6 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080856B6: @@ -269861,7 +269861,7 @@ _080856B6: ldr r0, [r4] cmp r0, #0 beq _080856C6 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080856C6: @@ -269869,7 +269869,7 @@ _080856C6: ldr r0, [r4] cmp r0, #0 beq _080856D6 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080856D6: @@ -269880,7 +269880,7 @@ _080856D6: _080856DC: .4byte gUnknown_3005B04 _080856E0: .4byte gUnknown_3005AFC _080856E4: .4byte gUnknown_3005B00 - thumb_func_end sub_0808569C + thumb_func_end CleanupOverworldWindowsAndTilemaps thumb_func_start sub_080856E8 sub_080856E8: @ 0x080856E8 @@ -269891,8 +269891,8 @@ sub_080856E8: @ 0x080856E8 .align 2, 0 thumb_func_end sub_080856E8 - thumb_func_start sub_080856F4 -sub_080856F4: @ 0x080856F4 + thumb_func_start IsUpdateLinkStateCBActive +IsUpdateLinkStateCBActive: @ 0x080856F4 push {lr} ldr r0, _08085704 ldr r1, [r0] @@ -269903,17 +269903,17 @@ sub_080856F4: @ 0x080856F4 b _0808570E .align 2, 0 _08085704: .4byte gUnknown_3002360 -_08085708: .4byte sub_0808653C +_08085708: .4byte CB1_UpdateLinkState _0808570C: movs r0, #1 _0808570E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080856F4 + thumb_func_end IsUpdateLinkStateCBActive - thumb_func_start sub_08085714 -sub_08085714: @ 0x08085714 + thumb_func_start DoCB1_Overworld +DoCB1_Overworld: @ 0x08085714 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -269929,30 +269929,30 @@ sub_08085714: @ 0x08085714 mov r0, sp adds r1, r5, #0 adds r2, r4, #0 - bl sub_0809B7E0 + bl FieldGetPlayerInput bl sub_080987F4 lsls r0, r0, #0x18 cmp r0, #0 bne _08085762 mov r0, sp - bl sub_0809B8EC + bl ProcessPlayerFieldInput cmp r0, #1 bne _08085758 bl sub_080987DC - bl sub_080D41F8 + bl HideMapNamePopUpWindow b _08085762 _08085758: ldrb r0, [r6, #2] adds r1, r5, #0 adds r2, r4, #0 - bl sub_0808A324 + bl player_step _08085762: add sp, #4 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08085714 + thumb_func_end DoCB1_Overworld thumb_func_start CB1_Overworld CB1_Overworld: @ 0x0808576C @@ -269964,43 +269964,43 @@ CB1_Overworld: @ 0x0808576C bne _08085780 ldrh r0, [r2, #0x2e] ldrh r1, [r2, #0x2c] - bl sub_08085714 + bl DoCB1_Overworld _08085780: pop {r0} bx r0 .align 2, 0 _08085784: .4byte gUnknown_3002360 -_08085788: .4byte sub_080857C4 +_08085788: .4byte CB2_Overworld thumb_func_end CB1_Overworld - thumb_func_start sub_0808578C -sub_0808578C: @ 0x0808578C + thumb_func_start OverworldBasic +OverworldBasic: @ 0x0808578C push {lr} bl ScriptContext2_RunScript - bl sub_080A89D4 - bl sub_080066D8 - bl sub_08089AD8 - bl sub_08089C78 + bl RunTasks + bl AnimateSprites + bl CameraUpdate + bl UpdateCameraPanning bl BuildOamBuffer - bl sub_080A12E4 - bl sub_080A0300 - bl sub_08199668 + bl UpdatePaletteFade + bl UpdateTilesetAnimations + bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808578C + thumb_func_end OverworldBasic - thumb_func_start sub_080857B8 -sub_080857B8: @ 0x080857B8 + thumb_func_start CB2_OverworldBasic +CB2_OverworldBasic: @ 0x080857B8 push {lr} - bl sub_0808578C + bl OverworldBasic pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080857B8 + thumb_func_end CB2_OverworldBasic - thumb_func_start sub_080857C4 -sub_080857C4: @ 0x080857C4 + thumb_func_start CB2_Overworld +CB2_Overworld: @ 0x080857C4 push {r4, lr} ldr r0, _080857EC ldrb r0, [r0, #7] @@ -270009,19 +270009,19 @@ sub_080857C4: @ 0x080857C4 cmp r4, #0 beq _080857D8 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback _080857D8: - bl sub_0808578C + bl OverworldBasic cmp r4, #0 beq _080857E4 - bl sub_08085CE4 + bl SetFieldVBlankCallback _080857E4: pop {r4} pop {r0} bx r0 .align 2, 0 _080857EC: .4byte gUnknown_2037C74 - thumb_func_end sub_080857C4 + thumb_func_end CB2_Overworld thumb_func_start sub_080857F0 sub_080857F0: @ 0x080857F0 @@ -270041,8 +270041,8 @@ sub_080857FC: @ 0x080857FC _08085804: .4byte gUnknown_3000E0C thumb_func_end sub_080857FC - thumb_func_start sub_08085808 -sub_08085808: @ 0x08085808 + thumb_func_start map_post_load_hook_exec +map_post_load_hook_exec: @ 0x08085808 push {r4, lr} ldr r4, _08085820 ldr r0, [r4] @@ -270074,7 +270074,7 @@ _08085834: .align 2, 0 _08085844: .4byte gUnknown_3005B0C _08085848: - bl sub_080AEC94 + bl mapldr_default _0808584C: ldr r1, _0808585C movs r0, #0 @@ -270087,16 +270087,16 @@ _08085854: bx r1 .align 2, 0 _0808585C: .4byte gUnknown_3005B0C - thumb_func_end sub_08085808 + thumb_func_end map_post_load_hook_exec - thumb_func_start sub_08085860 -sub_08085860: @ 0x08085860 + thumb_func_start CB2_NewGame +CB2_NewGame: @ 0x08085860 push {lr} - bl sub_08085C80 - bl sub_080A27F8 + bl FieldClearVBlankHBlankCallbacks + bl StopMapMusic bl sub_080856E8 - bl sub_08083E28 - bl sub_08084BD0 + bl NewGameInitData + bl ResetInitialPlayerAvatarState bl PlayTimeCounter_Start bl ScriptContext1_Init bl sub_080987E8 @@ -270108,24 +270108,24 @@ sub_08085860: @ 0x08085860 str r0, [r1] ldr r0, _080858B4 bl do_load_map_stuff_loop - bl sub_08085CE4 + bl SetFieldVBlankCallback ldr r0, _080858B8 bl sub_080857F0 ldr r0, _080858BC - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080858A8: .4byte gUnknown_3005B0C -_080858AC: .4byte sub_080FBD50 +_080858AC: .4byte ExecuteTruckSequence _080858B0: .4byte gUnknown_3005B10 _080858B4: .4byte gUnknown_3002798 _080858B8: .4byte CB1_Overworld -_080858BC: .4byte sub_080857C4 - thumb_func_end sub_08085860 +_080858BC: .4byte CB2_Overworld + thumb_func_end CB2_NewGame - thumb_func_start sub_080858C0 -sub_080858C0: @ 0x080858C0 + thumb_func_start CB2_WhiteOut +CB2_WhiteOut: @ 0x080858C0 push {lr} sub sp, #4 ldr r1, _08085920 @@ -270139,11 +270139,11 @@ sub_080858C0: @ 0x080858C0 lsrs r0, r0, #0x18 cmp r0, #0x77 bls _08085918 - bl sub_08085C80 - bl sub_080A27F8 + bl FieldClearVBlankHBlankCallbacks + bl StopMapMusic bl sub_080856E8 - bl sub_08083FA8 - bl sub_08084BD0 + bl DoWhiteOut + bl ResetInitialPlayerAvatarState bl ScriptContext1_Init bl sub_080987E8 ldr r1, _08085924 @@ -270154,11 +270154,11 @@ sub_080858C0: @ 0x080858C0 strb r0, [r1] mov r0, sp bl do_load_map_stuff_loop - bl sub_08085CE4 + bl SetFieldVBlankCallback ldr r0, _0808592C bl sub_080857F0 ldr r0, _08085930 - bl sub_08000540 + bl SetMainCallback2 _08085918: add sp, #4 pop {r0} @@ -270168,47 +270168,47 @@ _08085920: .4byte gUnknown_3002360 _08085924: .4byte gUnknown_3005B0C _08085928: .4byte sub_080AECC4 _0808592C: .4byte CB1_Overworld -_08085930: .4byte sub_080857C4 - thumb_func_end sub_080858C0 +_08085930: .4byte CB2_Overworld + thumb_func_end CB2_WhiteOut - thumb_func_start sub_08085934 -sub_08085934: @ 0x08085934 + thumb_func_start CB2_LoadMap +CB2_LoadMap: @ 0x08085934 push {lr} - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks bl ScriptContext1_Init bl sub_080987E8 movs r0, #0 bl sub_080857F0 ldr r0, _08085958 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0808595C ldr r0, _08085960 str r0, [r1, #8] pop {r0} bx r0 .align 2, 0 -_08085958: .4byte sub_08137270 +_08085958: .4byte c2_change_map _0808595C: .4byte gUnknown_3002360 -_08085960: .4byte sub_08085964 - thumb_func_end sub_08085934 +_08085960: .4byte CB2_LoadMap2 + thumb_func_end CB2_LoadMap - thumb_func_start sub_08085964 -sub_08085964: @ 0x08085964 + thumb_func_start CB2_LoadMap2 +CB2_LoadMap2: @ 0x08085964 push {lr} ldr r0, _08085980 bl do_load_map_stuff_loop - bl sub_08085CE4 + bl SetFieldVBlankCallback ldr r0, _08085984 bl sub_080857F0 ldr r0, _08085988 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _08085980: .4byte gUnknown_3002798 _08085984: .4byte CB1_Overworld -_08085988: .4byte sub_080857C4 - thumb_func_end sub_08085964 +_08085988: .4byte CB2_Overworld + thumb_func_end CB2_LoadMap2 thumb_func_start sub_0808598C sub_0808598C: @ 0x0808598C @@ -270220,7 +270220,7 @@ sub_0808598C: @ 0x0808598C ldrb r0, [r4] cmp r0, #0 bne _080859AE - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks bl ScriptContext1_Init bl sub_080987E8 movs r0, #0 @@ -270228,14 +270228,14 @@ sub_0808598C: @ 0x0808598C _080859AE: adds r0, r4, #0 movs r1, #1 - bl sub_08085E80 + bl load_map_stuff cmp r0, #0 beq _080859CA - bl sub_08085CE4 + bl SetFieldVBlankCallback ldr r0, _080859D4 bl sub_080857F0 ldr r0, _080859D8 - bl sub_08000540 + bl SetMainCallback2 _080859CA: pop {r4} pop {r0} @@ -270243,116 +270243,116 @@ _080859CA: .align 2, 0 _080859D0: .4byte gUnknown_3002360 _080859D4: .4byte CB1_Overworld -_080859D8: .4byte sub_080857C4 +_080859D8: .4byte CB2_Overworld thumb_func_end sub_0808598C thumb_func_start sub_080859DC sub_080859DC: @ 0x080859DC push {lr} - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks ldr r0, _080859F4 ldr r1, _080859F8 str r1, [r0] ldr r0, _080859FC - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080859F4: .4byte gUnknown_3005B0C _080859F8: .4byte sub_080AEC10 -_080859FC: .4byte sub_08085A00 +_080859FC: .4byte c2_80567AC thumb_func_end sub_080859DC - thumb_func_start sub_08085A00 -sub_08085A00: @ 0x08085A00 + thumb_func_start c2_80567AC +c2_80567AC: @ 0x08085A00 push {lr} ldr r0, _08085A24 - bl sub_08085D5C + bl map_loading_iteration_3 cmp r0, #0 beq _08085A20 - bl sub_08085CE4 + bl SetFieldVBlankCallback ldr r0, _08085A28 bl sub_080857F0 - bl sub_08086590 + bl ResetAllMultiplayerState ldr r0, _08085A2C - bl sub_08000540 + bl SetMainCallback2 _08085A20: pop {r0} bx r0 .align 2, 0 _08085A24: .4byte gUnknown_3002798 -_08085A28: .4byte sub_0808653C -_08085A2C: .4byte sub_080857C4 - thumb_func_end sub_08085A00 +_08085A28: .4byte CB1_UpdateLinkState +_08085A2C: .4byte CB2_Overworld + thumb_func_end c2_80567AC thumb_func_start sub_08085A30 sub_08085A30: @ 0x08085A30 push {lr} - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 bne _08085A48 ldr r0, _08085A44 - bl sub_08000540 + bl SetMainCallback2 b _08085A52 .align 2, 0 -_08085A44: .4byte sub_08085A80 +_08085A44: .4byte CB2_ReturnToFieldLink _08085A48: - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks ldr r0, _08085A58 - bl sub_08000540 + bl SetMainCallback2 _08085A52: pop {r0} bx r0 .align 2, 0 -_08085A58: .4byte sub_08085A5C +_08085A58: .4byte CB2_ReturnToFieldLocal thumb_func_end sub_08085A30 - thumb_func_start sub_08085A5C -sub_08085A5C: @ 0x08085A5C + thumb_func_start CB2_ReturnToFieldLocal +CB2_ReturnToFieldLocal: @ 0x08085A5C push {lr} ldr r0, _08085A78 bl sub_08085F9C cmp r0, #0 beq _08085A72 - bl sub_08085CE4 + bl SetFieldVBlankCallback ldr r0, _08085A7C - bl sub_08000540 + bl SetMainCallback2 _08085A72: pop {r0} bx r0 .align 2, 0 _08085A78: .4byte gUnknown_3002798 -_08085A7C: .4byte sub_080857C4 - thumb_func_end sub_08085A5C +_08085A7C: .4byte CB2_Overworld + thumb_func_end CB2_ReturnToFieldLocal - thumb_func_start sub_08085A80 -sub_08085A80: @ 0x08085A80 + thumb_func_start CB2_ReturnToFieldLink +CB2_ReturnToFieldLink: @ 0x08085A80 push {lr} bl sub_08086EFC cmp r0, #0 bne _08085A9A ldr r0, _08085AA0 - bl sub_08085FFC + bl map_loading_iteration_2_link cmp r0, #0 beq _08085A9A ldr r0, _08085AA4 - bl sub_08000540 + bl SetMainCallback2 _08085A9A: pop {r0} bx r0 .align 2, 0 _08085AA0: .4byte gUnknown_3002798 -_08085AA4: .4byte sub_080857C4 - thumb_func_end sub_08085A80 +_08085AA4: .4byte CB2_Overworld + thumb_func_end CB2_ReturnToFieldLink - thumb_func_start sub_08085AA8 -sub_08085AA8: @ 0x08085AA8 + thumb_func_start CB2_ReturnToFieldFromMultiplayer +CB2_ReturnToFieldFromMultiplayer: @ 0x08085AA8 push {lr} - bl sub_08085C80 - bl sub_080A27F8 + bl FieldClearVBlankHBlankCallbacks + bl StopMapMusic ldr r0, _08085ACC bl sub_080857F0 - bl sub_08086590 + bl ResetAllMultiplayerState ldr r0, _08085AD0 ldrb r0, [r0] cmp r0, #0 @@ -270361,7 +270361,7 @@ sub_08085AA8: @ 0x08085AA8 ldr r0, _08085AD8 b _08085AE0 .align 2, 0 -_08085ACC: .4byte sub_0808653C +_08085ACC: .4byte CB1_UpdateLinkState _08085AD0: .4byte gUnknown_300319C _08085AD4: .4byte gUnknown_3005B0C _08085AD8: .4byte sub_080AEC10 @@ -270378,12 +270378,12 @@ _08085AE0: .align 2, 0 _08085AF4: .4byte gUnknown_3005B0C _08085AF8: .4byte sub_080AEB10 - thumb_func_end sub_08085AA8 + thumb_func_end CB2_ReturnToFieldFromMultiplayer - thumb_func_start sub_08085AFC -sub_08085AFC: @ 0x08085AFC + thumb_func_start CB2_ReturnToFieldWithOpenMenu +CB2_ReturnToFieldWithOpenMenu: @ 0x08085AFC push {lr} - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks ldr r1, _08085B10 ldr r0, _08085B14 str r0, [r1] @@ -270393,12 +270393,12 @@ sub_08085AFC: @ 0x08085AFC .align 2, 0 _08085B10: .4byte gUnknown_3005B10 _08085B14: .4byte sub_080AEFA0 - thumb_func_end sub_08085AFC + thumb_func_end CB2_ReturnToFieldWithOpenMenu - thumb_func_start sub_08085B18 -sub_08085B18: @ 0x08085B18 + thumb_func_start CB2_ReturnToFieldContinueScript +CB2_ReturnToFieldContinueScript: @ 0x08085B18 push {lr} - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks ldr r1, _08085B2C ldr r0, _08085B30 str r0, [r1] @@ -270408,12 +270408,12 @@ sub_08085B18: @ 0x08085B18 .align 2, 0 _08085B2C: .4byte gUnknown_3005B0C _08085B30: .4byte sub_080AEA84 - thumb_func_end sub_08085B18 + thumb_func_end CB2_ReturnToFieldContinueScript - thumb_func_start sub_08085B34 -sub_08085B34: @ 0x08085B34 + thumb_func_start CB2_ReturnToFieldContinueScriptPlayMapMusic +CB2_ReturnToFieldContinueScriptPlayMapMusic: @ 0x08085B34 push {lr} - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks ldr r1, _08085B48 ldr r0, _08085B4C str r0, [r1] @@ -270422,13 +270422,13 @@ sub_08085B34: @ 0x08085B34 bx r0 .align 2, 0 _08085B48: .4byte gUnknown_3005B0C -_08085B4C: .4byte sub_080AEA64 - thumb_func_end sub_08085B34 +_08085B4C: .4byte FieldCallback_ReturnToEventScript2 + thumb_func_end CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_start sub_08085B50 sub_08085B50: @ 0x08085B50 push {lr} - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks ldr r1, _08085B64 ldr r0, _08085B68 str r0, [r1] @@ -270449,12 +270449,12 @@ sub_08085B6C: @ 0x08085B6C ands r0, r1 cmp r0, #8 bne _08085B8A - bl sub_080E9D28 + bl SecretBaseMapPopupEnabled lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08085B8A - bl sub_080D4068 + bl ShowMapNamePopup _08085B8A: bl sub_080AECC4 pop {r0} @@ -270463,11 +270463,11 @@ _08085B8A: _08085B94: .4byte gUnknown_2036FB8 thumb_func_end sub_08085B6C - thumb_func_start sub_08085B98 -sub_08085B98: @ 0x08085B98 + thumb_func_start CB2_ContinueSavedGame +CB2_ContinueSavedGame: @ 0x08085B98 push {r4, lr} - bl sub_08085C80 - bl sub_080A27F8 + bl FieldClearVBlankHBlankCallbacks + bl StopMapMusic bl sub_080856E8 ldr r0, _08085BD0 ldrh r0, [r0] @@ -270475,8 +270475,8 @@ sub_08085B98: @ 0x08085B98 bne _08085BB2 bl sub_081A36A0 _08085BB2: - bl sub_08084484 - bl sub_081D5A38 + bl LoadSaveblockMapHeader + bl GetCurrentTrainerHillMapId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _08085BD4 @@ -270484,7 +270484,7 @@ _08085BB2: ldr r0, _08085BD8 cmp r1, r0 bne _08085BDC - bl sub_081AA070 + bl LoadBattlePyramidFloorEventObjectScripts b _08085BEE .align 2, 0 _08085BD0: .4byte gUnknown_3005F50 @@ -270501,7 +270501,7 @@ _08085BEA: bl LoadSaveblockEventObjScripts _08085BEE: bl UnfreezeEventObjects - bl sub_0809E088 + bl DoTimeBasedEvents bl sub_08084110 ldr r0, _08085C0C ldrh r1, [r0, #0x12] @@ -270509,7 +270509,7 @@ _08085BEE: cmp r1, r0 bne _08085C14 movs r0, #1 - bl sub_08087710 + bl InitBattlePyramidMap b _08085C22 .align 2, 0 _08085C0C: .4byte gUnknown_2036FB8 @@ -270517,27 +270517,27 @@ _08085C10: .4byte 0x00000169 _08085C14: cmp r4, #0 beq _08085C1E - bl sub_08087748 + bl InitTrainerHillMap b _08085C22 _08085C1E: - bl sub_080876D8 + bl InitMapFromSavedGame _08085C22: bl PlayTimeCounter_Start bl ScriptContext1_Init bl sub_080987E8 - bl sub_08195A10 - bl sub_0807672C + bl InitMatchCallCounters + bl UseContinueGameWarp cmp r0, #1 bne _08085C58 bl sub_0807673C - bl sub_0808487C - bl sub_08084540 + bl SetWarpDestinationToContinueGameWarp + bl WarpIntoMap bl sub_080EE664 ldr r0, _08085C54 - bl sub_08000540 + bl SetMainCallback2 b _08085C6C .align 2, 0 -_08085C54: .4byte sub_08085934 +_08085C54: .4byte CB2_LoadMap _08085C58: bl sub_080EE664 ldr r0, _08085C74 @@ -270554,17 +270554,17 @@ _08085C6C: _08085C74: .4byte gUnknown_3005B0C _08085C78: .4byte sub_08085B6C _08085C7C: .4byte CB1_Overworld - thumb_func_end sub_08085B98 + thumb_func_end CB2_ContinueSavedGame - thumb_func_start sub_08085C80 -sub_08085C80: @ 0x08085C80 + thumb_func_start FieldClearVBlankHBlankCallbacks +FieldClearVBlankHBlankCallbacks: @ 0x08085C80 push {r4, lr} - bl sub_08139EBC + bl warp0_in_pokecenter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08085C92 - bl sub_08009384 + bl CloseLink _08085C92: ldr r0, _08085CA8 ldrb r0, [r0] @@ -270593,9 +270593,9 @@ _08085CAC: strh r3, [r4] _08085CC6: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback pop {r4} pop {r0} bx r0 @@ -270603,70 +270603,70 @@ _08085CC6: _08085CD8: .4byte 0x04000208 _08085CDC: .4byte 0x04000200 _08085CE0: .4byte 0x0000FFFD - thumb_func_end sub_08085C80 + thumb_func_end FieldClearVBlankHBlankCallbacks - thumb_func_start sub_08085CE4 -sub_08085CE4: @ 0x08085CE4 + thumb_func_start SetFieldVBlankCallback +SetFieldVBlankCallback: @ 0x08085CE4 push {lr} ldr r0, _08085CF0 - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_08085CF0: .4byte sub_08085CF4 - thumb_func_end sub_08085CE4 +_08085CF0: .4byte VBlankCB_Field + thumb_func_end SetFieldVBlankCallback - thumb_func_start sub_08085CF4 -sub_08085CF4: @ 0x08085CF4 + thumb_func_start VBlankCB_Field +VBlankCB_Field: @ 0x08085CF4 push {lr} - bl sub_08006EA0 - bl sub_08007144 - bl sub_080B9800 - bl sub_08089508 + bl LoadOam + bl ProcessSpriteCopyRequests + bl ScanlineEffect_InitHBlankDmaTransfer + bl FieldUpdateBgTilemapScroll bl TransferPlttBuffer bl TransferTilesetAnimsBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08085CF4 + thumb_func_end VBlankCB_Field - thumb_func_start sub_08085D14 -sub_08085D14: @ 0x08085D14 + thumb_func_start InitCurrentFlashLevelScanlineEffect +InitCurrentFlashLevelScanlineEffect: @ 0x08085D14 push {lr} bl InBattlePyramid_ lsls r0, r0, #0x18 cmp r0, #0 beq _08085D38 - bl sub_080AFA20 + bl WriteBattlePyramidViewScanlineEffectBuffer ldr r2, _08085D34 ldr r0, [r2] ldr r1, [r2, #4] ldr r2, [r2, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams b _08085D54 .align 2, 0 _08085D34: .4byte gUnknown_830FD08 _08085D38: - bl sub_08084E7C + bl Overworld_GetFlashLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 beq _08085D54 - bl sub_080AF9E4 + bl WriteFlashScanlineEffectBuffer ldr r2, _08085D58 ldr r0, [r2] ldr r1, [r2, #4] ldr r2, [r2, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams _08085D54: pop {r0} bx r0 .align 2, 0 _08085D58: .4byte gUnknown_830FD08 - thumb_func_end sub_08085D14 + thumb_func_end InitCurrentFlashLevelScanlineEffect - thumb_func_start sub_08085D5C -sub_08085D5C: @ 0x08085D5C + thumb_func_start map_loading_iteration_3 +map_loading_iteration_3: @ 0x08085D5C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] @@ -270697,15 +270697,15 @@ _08085D78: @ jump table .4byte _08085E60 @ case 12 .4byte _08085E72 @ case 13 _08085DB0: - bl sub_08085610 + bl InitOverworldBgs bl ScriptContext1_Init bl sub_080987E8 - bl sub_0808612C + bl CallTrainerHillFunction bl sub_0808613C b _08085E6A _08085DC6: movs r0, #1 - bl sub_08084AC8 + bl mli0_load_map b _08085E6A _08085DCE: movs r0, #1 @@ -270718,29 +270718,29 @@ _08085DD6: bl SetCameraToTrackGuestPlayer b _08085E6A _08085DE8: - bl sub_08085D14 - bl sub_080861DC + bl InitCurrentFlashLevelScanlineEffect + bl InitOverworldGraphicsRegisters bl sub_08196DF4 b _08085E6A _08085DF6: - bl sub_080894F8 + bl move_tilemap_camera_to_upper_left_corner b _08085E6A _08085DFC: ldr r0, _08085E08 ldr r0, [r0] - bl sub_080886B4 + bl copy_map_tileset1_to_vram b _08085E6A .align 2, 0 _08085E08: .4byte gUnknown_2036FB8 _08085E0C: ldr r0, _08085E18 ldr r0, [r0] - bl sub_080886C8 + bl copy_map_tileset2_to_vram b _08085E6A .align 2, 0 _08085E18: .4byte gUnknown_2036FB8 _08085E1C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -270755,22 +270755,22 @@ _08085E38: bl DrawWholeMapView b _08085E6A _08085E3E: - bl sub_080A02E0 + bl InitTilesetAnimations b _08085E6A _08085E44: ldr r0, _08085E5C ldrb r0, [r0] cmp r0, #0 beq _08085E6A - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _08085E6A .align 2, 0 _08085E5C: .4byte gUnknown_300319C _08085E60: - bl sub_08085808 + bl map_post_load_hook_exec lsls r0, r0, #0x18 cmp r0, #0 beq _08085E76 @@ -270789,10 +270789,10 @@ _08085E78: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08085D5C + thumb_func_end map_loading_iteration_3 - thumb_func_start sub_08085E80 -sub_08085E80: @ 0x08085E80 + thumb_func_start load_map_stuff +load_map_stuff: @ 0x08085E80 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -270824,12 +270824,12 @@ _08085E9C: @ jump table .4byte _08085F7C @ case 12 .4byte _08085F8E @ case 13 _08085ED4: - bl sub_08085C80 + bl FieldClearVBlankHBlankCallbacks adds r0, r5, #0 - bl sub_08084AC8 + bl mli0_load_map b _08085F86 _08085EE0: - bl sub_0808612C + bl CallTrainerHillFunction bl sub_0808613C b _08085F86 _08085EEA: @@ -270837,33 +270837,33 @@ _08085EEA: bl sub_080862EC b _08085F86 _08085EF2: - bl sub_08086368 + bl mli4_mapscripts_and_other bl sub_080863E4 b _08085F86 _08085EFC: - bl sub_08085D14 - bl sub_080861DC + bl InitCurrentFlashLevelScanlineEffect + bl InitOverworldGraphicsRegisters bl sub_08196DF4 b _08085F86 _08085F0A: - bl sub_080894F8 + bl move_tilemap_camera_to_upper_left_corner b _08085F86 _08085F10: ldr r0, _08085F1C ldr r0, [r0] - bl sub_080886B4 + bl copy_map_tileset1_to_vram b _08085F86 .align 2, 0 _08085F1C: .4byte gUnknown_2036FB8 _08085F20: ldr r0, _08085F2C ldr r0, [r0] - bl sub_080886C8 + bl copy_map_tileset2_to_vram b _08085F86 .align 2, 0 _08085F2C: .4byte gUnknown_2036FB8 _08085F30: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -270878,7 +270878,7 @@ _08085F4C: bl DrawWholeMapView b _08085F86 _08085F52: - bl sub_080A02E0 + bl InitTilesetAnimations b _08085F86 _08085F58: ldr r0, _08085F78 @@ -270887,17 +270887,17 @@ _08085F58: ands r0, r1 cmp r0, #8 bne _08085F86 - bl sub_080E9D28 + bl SecretBaseMapPopupEnabled lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08085F86 - bl sub_080D4068 + bl ShowMapNamePopup b _08085F86 .align 2, 0 _08085F78: .4byte gUnknown_2036FB8 _08085F7C: - bl sub_08085808 + bl map_post_load_hook_exec lsls r0, r0, #0x18 cmp r0, #0 beq _08085F92 @@ -270916,7 +270916,7 @@ _08085F94: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08085E80 + thumb_func_end load_map_stuff thumb_func_start sub_08085F9C sub_08085F9C: @ 0x08085F9C @@ -270937,7 +270937,7 @@ _08085FB0: beq _08085FEE b _08085FF2 _08085FBA: - bl sub_0808612C + bl CallTrainerHillFunction bl sub_0808613C movs r0, #0 bl sub_080862EC @@ -270949,7 +270949,7 @@ _08085FD2: bl sub_081D5E60 b _08085FE6 _08085FDC: - bl sub_08085808 + bl map_post_load_hook_exec lsls r0, r0, #0x18 cmp r0, #0 beq _08085FF2 @@ -270970,8 +270970,8 @@ _08085FF4: .align 2, 0 thumb_func_end sub_08085F9C - thumb_func_start sub_08085FFC -sub_08085FFC: @ 0x08085FFC + thumb_func_start map_loading_iteration_2_link +map_loading_iteration_2_link: @ 0x08085FFC push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] @@ -271002,8 +271002,8 @@ _08086018: @ jump table .4byte _080860EC @ case 12 .4byte _080860FE @ case 13 _08086050: - bl sub_08085C80 - bl sub_0808612C + bl FieldClearVBlankHBlankCallbacks + bl CallTrainerHillFunction bl sub_0808613C b _080860F6 _0808605E: @@ -271016,29 +271016,29 @@ _08086066: bl SetCameraToTrackGuestPlayer_2 b _080860F6 _08086074: - bl sub_08085D14 - bl sub_080861DC + bl InitCurrentFlashLevelScanlineEffect + bl InitOverworldGraphicsRegisters bl sub_08196DF4 b _080860F6 _08086082: - bl sub_080894F8 + bl move_tilemap_camera_to_upper_left_corner b _080860F6 _08086088: ldr r0, _08086094 ldr r0, [r0] - bl sub_080886B4 + bl copy_map_tileset1_to_vram b _080860F6 .align 2, 0 _08086094: .4byte gUnknown_2036FB8 _08086098: ldr r0, _080860A4 ldr r0, [r0] - bl sub_080886C8 + bl copy_map_tileset2_to_vram b _080860F6 .align 2, 0 _080860A4: .4byte gUnknown_2036FB8 _080860A8: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -271053,22 +271053,22 @@ _080860C4: bl DrawWholeMapView b _080860F6 _080860CA: - bl sub_080A02E0 + bl InitTilesetAnimations b _080860F6 _080860D0: ldr r0, _080860E8 ldrb r0, [r0] cmp r0, #0 beq _080860F6 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _080860F6 .align 2, 0 _080860E8: .4byte gUnknown_300319C _080860EC: - bl sub_08085808 + bl map_post_load_hook_exec lsls r0, r0, #0x18 cmp r0, #0 beq _0808610C @@ -271078,7 +271078,7 @@ _080860F6: strb r0, [r4] b _0808610C _080860FE: - bl sub_08085CE4 + bl SetFieldVBlankCallback ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -271090,7 +271090,7 @@ _0808610E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08085FFC + thumb_func_end map_loading_iteration_2_link thumb_func_start do_load_map_stuff_loop do_load_map_stuff_loop: @ 0x08086114 @@ -271099,7 +271099,7 @@ do_load_map_stuff_loop: @ 0x08086114 _08086118: adds r0, r4, #0 movs r1, #0 - bl sub_08085E80 + bl load_map_stuff cmp r0, #0 beq _08086118 pop {r4} @@ -271108,15 +271108,15 @@ _08086118: .align 2, 0 thumb_func_end do_load_map_stuff_loop - thumb_func_start sub_0808612C -sub_0808612C: @ 0x0808612C + thumb_func_start CallTrainerHillFunction +CallTrainerHillFunction: @ 0x0808612C push {lr} bl sub_081BE348 - bl sub_08076634 + bl MoveSaveBlocks_ResetHeap pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808612C + thumb_func_end CallTrainerHillFunction thumb_func_start sub_0808613C sub_0808613C: @ 0x0808613C @@ -271125,7 +271125,7 @@ sub_0808613C: @ 0x0808613C movs r0, #0 movs r1, #0 bl SetGpuReg - bl sub_080B9710 + bl ScanlineEffect_Stop ldr r2, _080861B4 mov r1, sp movs r0, #0 @@ -271172,7 +271172,7 @@ _0808617A: movs r0, #0 movs r1, #0x80 bl ResetOamRange - bl sub_08006EA0 + bl LoadOam add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -271187,17 +271187,17 @@ _080861C0: .4byte 0x81000800 thumb_func_start sub_080861C4 sub_080861C4: @ 0x080861C4 push {lr} - bl sub_08085D14 - bl sub_080861DC + bl InitCurrentFlashLevelScanlineEffect + bl InitOverworldGraphicsRegisters bl sub_08196DF4 - bl sub_08084308 + bl mapdata_load_assets_to_gpu_and_full_redraw pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080861C4 - thumb_func_start sub_080861DC -sub_080861DC: @ 0x080861DC + thumb_func_start InitOverworldGraphicsRegisters +InitOverworldGraphicsRegisters: @ 0x080861DC push {r4, lr} bl sub_08199640 bl reset_temp_tile_data_buffers @@ -271238,56 +271238,56 @@ sub_080861DC: @ 0x080861DC ldr r1, _080862E4 movs r0, #0x52 bl SetGpuReg - bl sub_08085610 + bl InitOverworldBgs movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r1, _080862E8 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl InitFieldMessageBox pop {r4} pop {r0} @@ -271299,18 +271299,18 @@ _080862DC: .4byte 0x0000FFFF _080862E0: .4byte gUnknown_82BF42C _080862E4: .4byte 0x0000070D _080862E8: .4byte 0x00007060 - thumb_func_end sub_080861DC + thumb_func_end InitOverworldGraphicsRegisters thumb_func_start sub_080862EC sub_080862EC: @ 0x080862EC push {r4, lr} adds r4, r0, #0 - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade - bl sub_080B9750 + bl ScanlineEffect_Clear bl ResetAllPicSprites - bl sub_08089A80 + bl ResetCameraUpdateInfo bl InstallCameraPanAheadCallback cmp r4, #0 bne _08086318 @@ -271322,14 +271322,14 @@ _08086318: bl sub_0808EC68 _0808631E: bl FieldEffectActiveListClear - bl sub_080AA8A0 - bl sub_080AE780 + bl StartWeather + bl ResumePausedWeather cmp r4, #0 bne _08086332 - bl sub_0809D214 + bl SetUpFieldTasks _08086332: - bl sub_080989E0 - bl sub_081BE354 + bl RunOnResumeMapScript + bl TryStartMirageTowerPulseBlendEffect pop {r4} pop {r0} bx r0 @@ -271343,10 +271343,10 @@ sub_08086340: @ 0x08086340 strh r1, [r0] ldr r0, _08086364 strh r1, [r0] - bl sub_0808CDA8 + bl ResetEventObjects movs r0, #0 movs r1, #0 - bl sub_0808D8F0 + bl TrySpawnEventObjects bl TryRunOnWarpIntoMapScript pop {r0} bx r0 @@ -271355,8 +271355,8 @@ _08086360: .4byte gUnknown_3005B4C _08086364: .4byte gUnknown_3005B48 thumb_func_end sub_08086340 - thumb_func_start sub_08086368 -sub_08086368: @ 0x08086368 + thumb_func_start mli4_mapscripts_and_other +mli4_mapscripts_and_other: @ 0x08086368 push {r4, r5, lr} sub sp, #4 ldr r0, _080863C0 @@ -271364,12 +271364,12 @@ sub_08086368: @ 0x08086368 strh r1, [r0] ldr r0, _080863C4 strh r1, [r0] - bl sub_0808CDA8 + bl ResetEventObjects mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_080884BC + bl GetCameraFocusCoords bl GetInitialPlayerAvatarState adds r5, r0, #0 mov r0, sp @@ -271381,13 +271381,13 @@ sub_08086368: @ 0x08086368 ldr r3, _080863C8 ldr r3, [r3] ldrb r3, [r3, #8] - bl sub_0808B944 + bl InitPlayerAvatar ldrb r0, [r5] bl SetPlayerAvatarTransitionFlags - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState movs r0, #0 movs r1, #0 - bl sub_0808D8F0 + bl TrySpawnEventObjects bl TryRunOnWarpIntoMapScript add sp, #4 pop {r4, r5} @@ -271397,7 +271397,7 @@ sub_08086368: @ 0x08086368 _080863C0: .4byte gUnknown_3005B4C _080863C4: .4byte gUnknown_3005B48 _080863C8: .4byte gUnknown_3005AF0 - thumb_func_end sub_08086368 + thumb_func_end mli4_mapscripts_and_other thumb_func_start sub_080863CC sub_080863CC: @ 0x080863CC @@ -271406,7 +271406,7 @@ sub_080863CC: @ 0x080863CC movs r1, #0 bl sub_0808DADC bl RotatingGate_InitPuzzleAndGraphics - bl sub_080989EC + bl RunOnReturnToFieldMapScript pop {r0} bx r0 .align 2, 0 @@ -271427,7 +271427,7 @@ sub_080863E4: @ 0x080863E4 orrs r1, r2 strb r1, [r0, #1] ldrb r0, [r3, #4] - bl sub_08089A98 + bl InitCameraUpdateCallback pop {r0} bx r0 .align 2, 0 @@ -271443,7 +271443,7 @@ SetCameraToTrackGuestPlayer: @ 0x08086410 bl GetSpriteForLinkedPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08089A98 + bl InitCameraUpdateCallback pop {r0} bx r0 .align 2, 0 @@ -271458,7 +271458,7 @@ SetCameraToTrackGuestPlayer_2: @ 0x0808642C bl GetSpriteForLinkedPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08089A98 + bl InitCameraUpdateCallback pop {r0} bx r0 .align 2, 0 @@ -271473,7 +271473,7 @@ sub_08086448: @ 0x08086448 adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_080884BC + bl GetCameraFocusCoords mov r2, sp ldr r0, _08086474 ldrb r1, [r0] @@ -271501,7 +271501,7 @@ sub_08086478: @ 0x08086478 adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_080884BC + bl GetCameraFocusCoords mov r3, sp mov r2, sp ldr r0, _080864F4 @@ -271536,7 +271536,7 @@ _080864A8: bl sub_08087054 ldrb r1, [r4] adds r0, r5, #0 - bl sub_08087530 + bl CreateLinkPlayerSprite adds r0, r6, #1 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -271545,7 +271545,7 @@ _080864A8: cmp r6, r0 blo _080864A8 _080864E2: - bl sub_080865A4 + bl ClearAllPlayerKeys add sp, #4 pop {r3} mov r8, r3 @@ -271575,7 +271575,7 @@ _0808650E: lsls r1, r1, #2 adds r1, r1, r5 ldrb r1, [r1] - bl sub_08087530 + bl CreateLinkPlayerSprite adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -271592,17 +271592,17 @@ _08086534: .4byte gUnknown_3005B18 _08086538: .4byte gUnknown_20226A0 thumb_func_end CreateLinkPlayerSprites - thumb_func_start sub_0808653C -sub_0808653C: @ 0x0808653C + thumb_func_start CB1_UpdateLinkState +CB1_UpdateLinkState: @ 0x0808653C push {r4, lr} ldr r0, _08086580 ldrb r0, [r0] cmp r0, #0 beq _08086556 - bl sub_0800EB78 + bl IsRfuRecvQueueEmpty cmp r0, #0 beq _08086556 - bl sub_08009AD4 + bl IsSendingKeysToLink cmp r0, #0 bne _08086578 _08086556: @@ -271617,8 +271617,8 @@ _08086556: bl _call_via_r1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08086904 - bl sub_080865A4 + bl UpdateHeldKeyCode + bl ClearAllPlayerKeys _08086578: pop {r4} pop {r0} @@ -271628,33 +271628,33 @@ _08086580: .4byte gUnknown_300319C _08086584: .4byte gUnknown_3005B14 _08086588: .4byte gUnknown_30030C0 _0808658C: .4byte gUnknown_3000E14 - thumb_func_end sub_0808653C + thumb_func_end CB1_UpdateLinkState - thumb_func_start sub_08086590 -sub_08086590: @ 0x08086590 + thumb_func_start ResetAllMultiplayerState +ResetAllMultiplayerState: @ 0x08086590 push {lr} bl ResetAllTradingStates ldr r0, _080865A0 - bl sub_080865B4 + bl SetKeyInterceptCallback pop {r0} bx r0 .align 2, 0 -_080865A0: .4byte sub_08086A14 - thumb_func_end sub_08086590 +_080865A0: .4byte KeyInterCB_SelfIdle + thumb_func_end ResetAllMultiplayerState - thumb_func_start sub_080865A4 -sub_080865A4: @ 0x080865A4 + thumb_func_start ClearAllPlayerKeys +ClearAllPlayerKeys: @ 0x080865A4 push {lr} ldr r0, _080865B0 - bl sub_08086A00 + bl ResetPlayerHeldKeys pop {r0} bx r0 .align 2, 0 _080865B0: .4byte gUnknown_30030C0 - thumb_func_end sub_080865A4 + thumb_func_end ClearAllPlayerKeys - thumb_func_start sub_080865B4 -sub_080865B4: @ 0x080865B4 + thumb_func_start SetKeyInterceptCallback +SetKeyInterceptCallback: @ 0x080865B4 ldr r2, _080865C0 movs r1, #0 strb r1, [r2] @@ -271664,10 +271664,10 @@ sub_080865B4: @ 0x080865B4 .align 2, 0 _080865C0: .4byte gUnknown_3000E19 _080865C4: .4byte gUnknown_3000E14 - thumb_func_end sub_080865B4 + thumb_func_end SetKeyInterceptCallback - thumb_func_start sub_080865C8 -sub_080865C8: @ 0x080865C8 + thumb_func_start CheckRfuKeepAliveTimer +CheckRfuKeepAliveTimer: @ 0x080865C8 push {lr} ldr r0, _080865EC ldrb r0, [r0] @@ -271681,14 +271681,14 @@ sub_080865C8: @ 0x080865C8 lsrs r0, r0, #0x18 cmp r0, #0x3c bls _080865E6 - bl sub_0800FC98 + bl OpponentHandleEndBounceEffect _080865E6: pop {r0} bx r0 .align 2, 0 _080865EC: .4byte gUnknown_300319C _080865F0: .4byte gUnknown_3000E19 - thumb_func_end sub_080865C8 + thumb_func_end CheckRfuKeepAliveTimer thumb_func_start ResetAllTradingStates ResetAllTradingStates: @ 0x080865F4 @@ -271707,8 +271707,8 @@ _080865FC: _08086608: .4byte gUnknown_3000E10 thumb_func_end ResetAllTradingStates - thumb_func_start sub_0808660C -sub_0808660C: @ 0x0808660C + thumb_func_start AreAllPlayersInTradingState +AreAllPlayersInTradingState: @ 0x0808660C push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -271739,10 +271739,10 @@ _0808663C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808660C + thumb_func_end AreAllPlayersInTradingState - thumb_func_start sub_08086644 -sub_08086644: @ 0x08086644 + thumb_func_start IsAnyPlayerInTradingState +IsAnyPlayerInTradingState: @ 0x08086644 push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -271773,10 +271773,10 @@ _08086674: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08086644 + thumb_func_end IsAnyPlayerInTradingState - thumb_func_start sub_0808667C -sub_0808667C: @ 0x0808667C + thumb_func_start HandleLinkPlayerKeyInput +HandleLinkPlayerKeyInput: @ 0x0808667C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -271795,11 +271795,11 @@ sub_0808667C: @ 0x0808667C b _08086816 _0808669C: adds r0, r6, #0 - bl sub_08086CD4 + bl TryGetTileEventScript adds r4, r0, #0 cmp r4, #0 beq _080866D4 - bl sub_08086DE4 + bl GetDirectionForEventScript mov r1, sb strh r0, [r1] movs r0, #0x81 @@ -271810,16 +271810,16 @@ _0808669C: b _0808688A _080866BC: ldr r0, _080866D0 - bl sub_080865B4 + bl SetKeyInterceptCallback adds r0, r4, #0 bl sub_08086E94 b _0808688A .align 2, 0 _080866CC: .4byte gUnknown_3000E10 -_080866D0: .4byte sub_08086A5C +_080866D0: .4byte KeyInterCB_DeferToEventScript _080866D4: movs r0, #0x83 - bl sub_08086644 + bl IsAnyPlayerInTradingState cmp r0, #1 bne _080866FC movs r0, #0x81 @@ -271830,11 +271830,11 @@ _080866D4: b _0808688A _080866EA: ldr r0, _080866F8 - bl sub_080865B4 + bl SetKeyInterceptCallback bl sub_08086EE8 b _0808688A .align 2, 0 -_080866F8: .4byte sub_08086A5C +_080866F8: .4byte KeyInterCB_DeferToEventScript _080866FC: mov r0, r8 subs r0, #0x12 @@ -271874,12 +271874,12 @@ _08086740: cmp r0, #0 beq _08086816 ldr r0, _08086768 - bl sub_080865B4 - bl sub_08086E80 + bl SetKeyInterceptCallback + bl InitLinkRoomStartMenuScript b _08086816 .align 2, 0 _08086764: .4byte gUnknown_3000E10 -_08086768: .4byte sub_08086A5C +_08086768: .4byte KeyInterCB_DeferToEventScript _0808676C: adds r0, r6, #0 bl PlayerIsAtSouthExit @@ -271893,15 +271893,15 @@ _0808676C: cmp r0, #0 beq _08086816 ldr r0, _08086794 - bl sub_080865B4 - bl sub_08086EB0 + bl SetKeyInterceptCallback + bl CreateConfirmLeaveTradeRoomPrompt b _08086816 .align 2, 0 _08086790: .4byte gUnknown_3000E10 -_08086794: .4byte sub_08086A5C +_08086794: .4byte KeyInterCB_DeferToEventScript _08086798: adds r0, r6, #0 - bl sub_08086D18 + bl TryInteractWithPlayer adds r4, r0, #0 cmp r4, #0 beq _08086816 @@ -271913,13 +271913,13 @@ _08086798: cmp r0, #0 beq _08086816 ldr r0, _080867C4 - bl sub_080865B4 + bl SetKeyInterceptCallback adds r0, r4, #0 bl sub_08086ECC b _08086816 .align 2, 0 _080867C0: .4byte gUnknown_3000E10 -_080867C4: .4byte sub_08086A5C +_080867C4: .4byte KeyInterCB_DeferToEventScript _080867C8: adds r0, r6, #0 bl sub_08086CA4 @@ -271933,7 +271933,7 @@ _080867C8: cmp r0, #0 beq _08086816 ldr r0, _080867F0 - bl sub_080865B4 + bl SetKeyInterceptCallback bl sub_08086E74 b _08086816 .align 2, 0 @@ -271952,7 +271952,7 @@ _080867F4: cmp r0, #0 beq _08086816 ldr r0, _0808682C - bl sub_080865B4 + bl SetKeyInterceptCallback bl sub_08086E74 _08086816: mov r0, r8 @@ -271965,7 +271965,7 @@ _08086816: b _0808688A .align 2, 0 _08086828: .4byte gUnknown_3000E10 -_0808682C: .4byte sub_08086AA4 +_0808682C: .4byte KeyInterCB_DeferToSendQueue _08086830: mov r1, r8 cmp r1, #0x1a @@ -271998,11 +271998,11 @@ _0808685C: cmp r0, #0 beq _0808688A ldr r0, _08086878 - bl sub_080865B4 + bl SetKeyInterceptCallback b _0808688A .align 2, 0 _08086874: .4byte gUnknown_3000E10 -_08086878: .4byte sub_08086A14 +_08086878: .4byte KeyInterCB_SelfIdle _0808687C: ldr r0, _08086898 adds r1, r7, r0 @@ -272020,7 +272020,7 @@ _0808688A: bx r0 .align 2, 0 _08086898: .4byte gUnknown_3000E10 - thumb_func_end sub_0808667C + thumb_func_end HandleLinkPlayerKeyInput thumb_func_start UpdateAllLinkPlayers UpdateAllLinkPlayers: @ 0x0808689C @@ -272046,7 +272046,7 @@ _080868B0: adds r1, r4, #0 mov r2, sp adds r3, r5, #0 - bl sub_0808667C + bl HandleLinkPlayerKeyInput ldr r0, _08086900 adds r0, r6, r0 ldrb r0, [r0] @@ -272060,7 +272060,7 @@ _080868E0: lsls r0, r6, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r5] - bl sub_080872D0 + bl SetPlayerFacingDirection adds r7, #2 adds r6, #1 cmp r6, #3 @@ -272076,8 +272076,8 @@ _080868E0: _08086900: .4byte gUnknown_3000E10 thumb_func_end UpdateAllLinkPlayers - thumb_func_start sub_08086904 -sub_08086904: @ 0x08086904 + thumb_func_start UpdateHeldKeyCode +UpdateHeldKeyCode: @ 0x08086904 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -272101,13 +272101,13 @@ _0808692A: ldrb r0, [r0] cmp r0, #0 beq _08086960 - bl sub_08086FF4 + bl GetLinkSendQueueLength cmp r0, #1 bls _08086960 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 bne _08086960 - bl sub_08009AD4 + bl IsSendingKeysToLink cmp r0, #1 bne _08086960 cmp r4, #0x11 @@ -272129,10 +272129,10 @@ _08086960: .align 2, 0 _08086968: .4byte gUnknown_3005B08 _0808696C: .4byte gUnknown_300319C - thumb_func_end sub_08086904 + thumb_func_end UpdateHeldKeyCode - thumb_func_start sub_08086970 -sub_08086970: @ 0x08086970 + thumb_func_start KeyInterCB_ReadButtons +KeyInterCB_ReadButtons: @ 0x08086970 push {lr} ldr r2, _08086984 ldrh r1, [r2, #0x2c] @@ -272185,7 +272185,7 @@ _080869C6: _080869C8: pop {r1} bx r1 - thumb_func_end sub_08086970 + thumb_func_end KeyInterCB_ReadButtons thumb_func_start GetDirectionForDpadKey GetDirectionForDpadKey: @ 0x080869CC @@ -272223,8 +272223,8 @@ _080869FC: bx r1 thumb_func_end GetDirectionForDpadKey - thumb_func_start sub_08086A00 -sub_08086A00: @ 0x08086A00 + thumb_func_start ResetPlayerHeldKeys +ResetPlayerHeldKeys: @ 0x08086A00 push {lr} movs r2, #0x11 adds r1, r0, #6 @@ -272236,10 +272236,10 @@ _08086A06: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08086A00 + thumb_func_end ResetPlayerHeldKeys - thumb_func_start sub_08086A14 -sub_08086A14: @ 0x08086A14 + thumb_func_start KeyInterCB_SelfIdle +KeyInterCB_SelfIdle: @ 0x08086A14 push {r4, lr} adds r4, r0, #0 bl sub_080987F4 @@ -272250,39 +272250,39 @@ sub_08086A14: @ 0x08086A14 movs r0, #0x11 b _08086A4A _08086A28: - bl sub_0800AFB0 + bl GetLinkRecvQueueLength cmp r0, #4 bls _08086A34 movs r0, #0x1b b _08086A4A _08086A34: - bl sub_08086FF4 + bl GetLinkSendQueueLength cmp r0, #4 bls _08086A40 movs r0, #0x1c b _08086A4A _08086A40: adds r0, r4, #0 - bl sub_08086970 + bl KeyInterCB_ReadButtons lsls r0, r0, #0x10 lsrs r0, r0, #0x10 _08086A4A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08086A14 + thumb_func_end KeyInterCB_SelfIdle thumb_func_start sub_08086A50 sub_08086A50: @ 0x08086A50 push {lr} - bl sub_080865C8 + bl CheckRfuKeepAliveTimer movs r0, #0x11 pop {r1} bx r1 thumb_func_end sub_08086A50 - thumb_func_start sub_08086A5C -sub_08086A5C: @ 0x08086A5C + thumb_func_start KeyInterCB_DeferToEventScript +KeyInterCB_DeferToEventScript: @ 0x08086A5C push {r4, lr} bl sub_080987F4 lsls r0, r0, #0x18 @@ -272292,7 +272292,7 @@ sub_08086A5C: @ 0x08086A5C beq _08086A74 movs r4, #0x1a ldr r0, _08086A7C - bl sub_080865B4 + bl SetKeyInterceptCallback _08086A74: adds r0, r4, #0 pop {r4} @@ -272300,19 +272300,19 @@ _08086A74: bx r1 .align 2, 0 _08086A7C: .4byte sub_08086A50 - thumb_func_end sub_08086A5C + thumb_func_end KeyInterCB_DeferToEventScript thumb_func_start sub_08086A80 sub_08086A80: @ 0x08086A80 push {r4, lr} - bl sub_0800AFB0 + bl GetLinkRecvQueueLength movs r4, #0x11 cmp r0, #2 bhi _08086A98 movs r4, #0x1a bl sub_080987E8 ldr r0, _08086AA0 - bl sub_080865B4 + bl SetKeyInterceptCallback _08086A98: adds r0, r4, #0 pop {r4} @@ -272322,17 +272322,17 @@ _08086A98: _08086AA0: .4byte sub_08086A50 thumb_func_end sub_08086A80 - thumb_func_start sub_08086AA4 -sub_08086AA4: @ 0x08086AA4 + thumb_func_start KeyInterCB_DeferToSendQueue +KeyInterCB_DeferToSendQueue: @ 0x08086AA4 push {r4, lr} - bl sub_08086FF4 + bl GetLinkSendQueueLength movs r4, #0x11 cmp r0, #2 bhi _08086ABC movs r4, #0x1a bl sub_080987E8 ldr r0, _08086AC4 - bl sub_080865B4 + bl SetKeyInterceptCallback _08086ABC: adds r0, r4, #0 pop {r4} @@ -272340,16 +272340,16 @@ _08086ABC: bx r1 .align 2, 0 _08086AC4: .4byte sub_08086A50 - thumb_func_end sub_08086AA4 + thumb_func_end KeyInterCB_DeferToSendQueue - thumb_func_start sub_08086AC8 -sub_08086AC8: @ 0x08086AC8 + thumb_func_start KeyInterCB_DoNothingAndKeepAlive +KeyInterCB_DoNothingAndKeepAlive: @ 0x08086AC8 push {lr} - bl sub_080865C8 + bl CheckRfuKeepAliveTimer movs r0, #0x11 pop {r1} bx r1 - thumb_func_end sub_08086AC8 + thumb_func_end KeyInterCB_DoNothingAndKeepAlive thumb_func_start sub_08086AD4 sub_08086AD4: @ 0x08086AD4 @@ -272366,15 +272366,15 @@ sub_08086AD4: @ 0x08086AD4 cmp r0, #0 beq _08086B08 ldr r0, _08086B00 - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0x1d b _08086B0A .align 2, 0 _08086AF8: .4byte gUnknown_3000E10 _08086AFC: .4byte gUnknown_3002360 -_08086B00: .4byte sub_08086AC8 +_08086B00: .4byte KeyInterCB_DoNothingAndKeepAlive _08086B04: - bl sub_080865C8 + bl CheckRfuKeepAliveTimer _08086B08: movs r0, #0x11 _08086B0A: @@ -272387,7 +272387,7 @@ _08086B0A: sub_08086B10: @ 0x08086B10 push {lr} ldr r0, _08086B20 - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0x16 pop {r1} bx r1 @@ -272401,24 +272401,24 @@ sub_08086B24: @ 0x08086B24 bx lr thumb_func_end sub_08086B24 - thumb_func_start sub_08086B28 -sub_08086B28: @ 0x08086B28 + thumb_func_start KeyInterCB_WaitForPlayersToExit +KeyInterCB_WaitForPlayersToExit: @ 0x08086B28 push {lr} ldr r1, _08086B54 adds r0, r0, r1 ldrb r0, [r0] cmp r0, #0x83 beq _08086B38 - bl sub_080865C8 + bl CheckRfuKeepAliveTimer _08086B38: movs r0, #0x83 - bl sub_0808660C + bl AreAllPlayersInTradingState cmp r0, #1 bne _08086B4E ldr r0, _08086B58 bl ScriptContext1_SetupScript ldr r0, _08086B5C - bl sub_080865B4 + bl SetKeyInterceptCallback _08086B4E: movs r0, #0x11 pop {r1} @@ -272427,19 +272427,19 @@ _08086B4E: _08086B54: .4byte gUnknown_3000E10 _08086B58: .4byte gUnknown_82471F2 _08086B5C: .4byte sub_08086B24 - thumb_func_end sub_08086B28 + thumb_func_end KeyInterCB_WaitForPlayersToExit - thumb_func_start sub_08086B60 -sub_08086B60: @ 0x08086B60 + thumb_func_start KeyInterCB_SendExitRoomKey +KeyInterCB_SendExitRoomKey: @ 0x08086B60 push {lr} ldr r0, _08086B70 - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0x17 pop {r1} bx r1 .align 2, 0 -_08086B70: .4byte sub_08086B28 - thumb_func_end sub_08086B60 +_08086B70: .4byte KeyInterCB_WaitForPlayersToExit + thumb_func_end KeyInterCB_SendExitRoomKey thumb_func_start sub_08086B74 sub_08086B74: @ 0x08086B74 @@ -272451,7 +272451,7 @@ sub_08086B74: @ 0x08086B74 sub_08086B78: @ 0x08086B78 push {lr} movs r0, #0x83 - bl sub_08086644 + bl IsAnyPlayerInTradingState cmp r0, #1 beq _08086BB4 ldr r0, _08086BB8 @@ -272487,10 +272487,10 @@ _08086BB8: .4byte gUnknown_3000E14 _08086BBC: .4byte sub_08086AD4 _08086BC0: .4byte gUnknown_3000E10 _08086BC4: .4byte gUnknown_3005B14 -_08086BC8: .4byte sub_08086AC8 +_08086BC8: .4byte KeyInterCB_DoNothingAndKeepAlive _08086BCC: movs r0, #0x82 - bl sub_0808660C + bl AreAllPlayersInTradingState cmp r0, #0 bne _08086BDA _08086BD6: @@ -272507,7 +272507,7 @@ _08086BDC: sub_08086BE0: @ 0x08086BE0 push {lr} movs r0, #0x83 - bl sub_08086644 + bl IsAnyPlayerInTradingState pop {r1} bx r1 thumb_func_end sub_08086BE0 @@ -272516,7 +272516,7 @@ sub_08086BE0: @ 0x08086BE0 sub_08086BEC: @ 0x08086BEC push {lr} ldr r0, _08086BFC - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0 pop {r1} bx r1 @@ -272528,31 +272528,31 @@ _08086BFC: .4byte sub_08086B10 sub_08086C00: @ 0x08086C00 push {lr} ldr r0, _08086C10 - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0 pop {r1} bx r1 .align 2, 0 -_08086C10: .4byte sub_08086A5C +_08086C10: .4byte KeyInterCB_DeferToEventScript thumb_func_end sub_08086C00 - thumb_func_start sub_08086C14 -sub_08086C14: @ 0x08086C14 + thumb_func_start QueueExitLinkRoomKey +QueueExitLinkRoomKey: @ 0x08086C14 push {lr} ldr r0, _08086C24 - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0 pop {r1} bx r1 .align 2, 0 -_08086C24: .4byte sub_08086B60 - thumb_func_end sub_08086C14 +_08086C24: .4byte KeyInterCB_SendExitRoomKey + thumb_func_end QueueExitLinkRoomKey thumb_func_start sub_08086C28 sub_08086C28: @ 0x08086C28 push {lr} ldr r0, _08086C38 - bl sub_080865B4 + bl SetKeyInterceptCallback movs r0, #0 pop {r1} bx r1 @@ -272650,8 +272650,8 @@ _08086CCE: .align 2, 0 thumb_func_end sub_08086CBC - thumb_func_start sub_08086CD4 -sub_08086CD4: @ 0x08086CD4 + thumb_func_start TryGetTileEventScript +TryGetTileEventScript: @ 0x08086CD4 push {lr} adds r1, r0, #0 ldrb r0, [r1, #2] @@ -272665,7 +272665,7 @@ _08086CE6: _08086CE8: pop {r1} bx r1 - thumb_func_end sub_08086CD4 + thumb_func_end TryGetTileEventScript thumb_func_start PlayerIsAtSouthExit PlayerIsAtSouthExit: @ 0x08086CEC @@ -272695,8 +272695,8 @@ _08086D12: bx r1 thumb_func_end PlayerIsAtSouthExit - thumb_func_start sub_08086D18 -sub_08086D18: @ 0x08086D18 + thumb_func_start TryInteractWithPlayer +TryInteractWithPlayer: @ 0x08086D18 push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -272747,7 +272747,7 @@ _08086D2C: movs r2, #0 ldrsh r0, [r0, r2] asrs r1, r1, #0x10 - bl sub_08087270 + bl GetLinkPlayerIdAt lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r2, r1, #0 @@ -272773,7 +272773,7 @@ _08086DAC: .4byte gUnknown_3000E10 _08086DB0: .4byte gUnknown_824717B _08086DB4: adds r0, r2, #0 - bl sub_080B3130 + bl GetLinkTrainerCardColor cmp r0, #0 bne _08086DC8 ldr r0, _08086DC4 @@ -272789,17 +272789,17 @@ _08086DD0: ldrb r1, [r4, #0xc] ldrb r2, [r4, #3] mov r0, sp - bl sub_0809BBA0 + bl GetInteractedLinkPlayerScript _08086DDA: add sp, #8 pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08086D18 + thumb_func_end TryInteractWithPlayer - thumb_func_start sub_08086DE4 -sub_08086DE4: @ 0x08086DE4 + thumb_func_start GetDirectionForEventScript +GetDirectionForEventScript: @ 0x08086DE4 push {lr} adds r1, r0, #0 ldr r0, _08086E30 @@ -272864,7 +272864,7 @@ _08086E6E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08086DE4 + thumb_func_end GetDirectionForEventScript thumb_func_start sub_08086E74 sub_08086E74: @ 0x08086E74 @@ -272875,16 +272875,16 @@ sub_08086E74: @ 0x08086E74 .align 2, 0 thumb_func_end sub_08086E74 - thumb_func_start sub_08086E80 -sub_08086E80: @ 0x08086E80 + thumb_func_start InitLinkRoomStartMenuScript +InitLinkRoomStartMenuScript: @ 0x08086E80 push {lr} movs r0, #6 bl sub_080A306C - bl sub_0809F374 + bl ShowStartMenu bl sub_080987DC pop {r0} bx r0 - thumb_func_end sub_08086E80 + thumb_func_end InitLinkRoomStartMenuScript thumb_func_start sub_08086E94 sub_08086E94: @ 0x08086E94 @@ -272901,8 +272901,8 @@ sub_08086E94: @ 0x08086E94 .align 2, 0 thumb_func_end sub_08086E94 - thumb_func_start sub_08086EB0 -sub_08086EB0: @ 0x08086EB0 + thumb_func_start CreateConfirmLeaveTradeRoomPrompt +CreateConfirmLeaveTradeRoomPrompt: @ 0x08086EB0 push {lr} movs r0, #6 bl sub_080A306C @@ -272913,7 +272913,7 @@ sub_08086EB0: @ 0x08086EB0 bx r0 .align 2, 0 _08086EC8: .4byte gUnknown_82471CE - thumb_func_end sub_08086EB0 + thumb_func_end CreateConfirmLeaveTradeRoomPrompt thumb_func_start sub_08086ECC sub_08086ECC: @ 0x08086ECC @@ -272945,13 +272945,13 @@ _08086EF8: .4byte gUnknown_82471E8 thumb_func_start sub_08086EFC sub_08086EFC: @ 0x08086EFC push {lr} - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 bne _08086F0A movs r0, #0 b _08086F24 _08086F0A: - bl sub_0800AFB0 + bl GetLinkRecvQueueLength cmp r0, #2 bls _08086F1C ldr r1, _08086F18 @@ -272975,13 +272975,13 @@ _08086F28: .4byte gUnknown_3000E18 thumb_func_start sub_08086F2C sub_08086F2C: @ 0x08086F2C push {lr} - bl sub_0800AFB0 + bl GetLinkRecvQueueLength cmp r0, #1 bls _08086F90 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 bne _08086F90 - bl sub_08009AD4 + bl IsSendingKeysToLink cmp r0, #1 bne _08086F90 ldr r0, _08086F7C @@ -273015,7 +273015,7 @@ _08086F78: .align 2, 0 _08086F7C: .4byte gUnknown_3000E14 _08086F80: .4byte sub_08086A80 -_08086F84: .4byte sub_08086A5C +_08086F84: .4byte KeyInterCB_DeferToEventScript _08086F88: .4byte gUnknown_3000E18 _08086F8C: .4byte gUnknown_2037C74 _08086F90: @@ -273029,13 +273029,13 @@ _08086F92: thumb_func_start sub_08086F98 sub_08086F98: @ 0x08086F98 push {lr} - bl sub_08086FF4 + bl GetLinkSendQueueLength cmp r0, #1 bls _08086FBC - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 bne _08086FBC - bl sub_08009AD4 + bl IsSendingKeysToLink cmp r0, #1 bne _08086FBC ldr r0, _08086FC0 @@ -273048,7 +273048,7 @@ _08086FBC: b _08086FCA .align 2, 0 _08086FC0: .4byte gUnknown_3000E14 -_08086FC4: .4byte sub_08086AA4 +_08086FC4: .4byte KeyInterCB_DeferToSendQueue _08086FC8: movs r0, #1 _08086FCA: @@ -273064,7 +273064,7 @@ sub_08086FD0: @ 0x08086FD0 ldrb r0, [r0] cmp r0, #0 bne _08086FEC - bl sub_08009AD4 + bl IsSendingKeysToLink cmp r0, #0 beq _08086FEC movs r0, #1 @@ -273079,8 +273079,8 @@ _08086FEE: .align 2, 0 thumb_func_end sub_08086FD0 - thumb_func_start sub_08086FF4 -sub_08086FF4: @ 0x08086FF4 + thumb_func_start GetLinkSendQueueLength +GetLinkSendQueueLength: @ 0x08086FF4 push {lr} ldr r0, _08087008 ldrb r0, [r0] @@ -273106,18 +273106,18 @@ _0808701C: .align 2, 0 _08087020: .4byte gUnknown_30050A0 _08087024: .4byte 0x000008D2 - thumb_func_end sub_08086FF4 + thumb_func_end GetLinkSendQueueLength - thumb_func_start sub_08087028 -sub_08087028: @ 0x08087028 + thumb_func_start ZeroLinkPlayerEventObject +ZeroLinkPlayerEventObject: @ 0x08087028 movs r1, #0 str r1, [r0] bx lr .align 2, 0 - thumb_func_end sub_08087028 + thumb_func_end ZeroLinkPlayerEventObject - thumb_func_start sub_08087030 -sub_08087030: @ 0x08087030 + thumb_func_start ClearLinkPlayerEventObjects +ClearLinkPlayerEventObjects: @ 0x08087030 push {lr} ldr r0, _08087040 movs r1, #0 @@ -273127,10 +273127,10 @@ sub_08087030: @ 0x08087030 bx r0 .align 2, 0 _08087040: .4byte gUnknown_2031FA8 - thumb_func_end sub_08087030 + thumb_func_end ClearLinkPlayerEventObjects - thumb_func_start sub_08087044 -sub_08087044: @ 0x08087044 + thumb_func_start ZeroEventObject +ZeroEventObject: @ 0x08087044 push {lr} movs r1, #0 movs r2, #0x24 @@ -273138,7 +273138,7 @@ sub_08087044: @ 0x08087044 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08087044 + thumb_func_end ZeroEventObject thumb_func_start sub_08087054 sub_08087054: @ 0x08087054 @@ -273164,7 +273164,7 @@ sub_08087054: @ 0x08087054 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 mov r8, r2 - bl sub_0808CE64 + bl GetFirstInactiveEventObjectId adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -273177,9 +273177,9 @@ sub_08087054: @ 0x08087054 ldr r0, _080870FC adds r5, r5, r0 adds r0, r4, #0 - bl sub_08087028 + bl ZeroLinkPlayerEventObject adds r0, r5, #0 - bl sub_08087044 + bl ZeroEventObject movs r2, #0 movs r1, #1 movs r0, #1 @@ -273212,7 +273212,7 @@ sub_08087054: @ 0x08087054 adds r0, r5, #0 mov r1, sb mov r2, sl - bl sub_08087100 + bl InitLinkPlayerEventObjectPos pop {r3, r4, r5} mov r8, r3 mov sb, r4 @@ -273225,8 +273225,8 @@ _080870F8: .4byte gUnknown_2031FA8 _080870FC: .4byte gUnknown_2036FF0 thumb_func_end sub_08087054 - thumb_func_start sub_08087100 -sub_08087100: @ 0x08087100 + thumb_func_start InitLinkPlayerEventObjectPos +InitLinkPlayerEventObjectPos: @ 0x08087100 push {r4, lr} adds r4, r0, #0 adds r0, r1, #0 @@ -273252,12 +273252,12 @@ sub_08087100: @ 0x08087100 adds r0, #8 strh r0, [r4, #0xc] adds r0, r4, #0 - bl sub_08096728 + bl EventObjectUpdateZCoord pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08087100 + thumb_func_end InitLinkPlayerEventObjectPos thumb_func_start sub_08087140 sub_08087140: @ 0x08087140 @@ -273429,8 +273429,8 @@ _08087268: .4byte gUnknown_2031FA8 _0808726C: .4byte gUnknown_2036FF0 thumb_func_end sub_08087248 - thumb_func_start sub_08087270 -sub_08087270: @ 0x08087270 + thumb_func_start GetLinkPlayerIdAt +GetLinkPlayerIdAt: @ 0x08087270 push {r4, r5, r6, lr} movs r2, #0 ldr r5, _080872B4 @@ -273481,10 +273481,10 @@ _080872C8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08087270 + thumb_func_end GetLinkPlayerIdAt - thumb_func_start sub_080872D0 -sub_080872D0: @ 0x080872D0 + thumb_func_start SetPlayerFacingDirection +SetPlayerFacingDirection: @ 0x080872D0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -273536,7 +273536,7 @@ _0808732C: .align 2, 0 _08087334: .4byte gUnknown_830FD4C _08087338: .4byte gUnknown_830FD14 - thumb_func_end sub_080872D0 + thumb_func_end SetPlayerFacingDirection thumb_func_start sub_0808733C sub_0808733C: @ 0x0808733C @@ -273588,8 +273588,8 @@ sub_08087380: @ 0x08087380 bx lr thumb_func_end sub_08087380 - thumb_func_start sub_08087384 -sub_08087384: @ 0x08087384 + thumb_func_start FacingHandler_DpadMovement +FacingHandler_DpadMovement: @ 0x08087384 push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 @@ -273597,7 +273597,7 @@ sub_08087384: @ 0x08087384 lsls r0, r2, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r5, #0x19] - bl sub_08087444 + bl FlipVerticalAndClearForced strb r0, [r5, #0x19] ldrb r1, [r5, #0x19] mov r6, sp @@ -273613,7 +273613,7 @@ sub_08087384: @ 0x08087384 ldrsh r2, [r2, r3] movs r4, #0 ldrsh r3, [r6, r4] - bl sub_080874A4 + bl LinkPlayerDetectCollision lsls r0, r0, #0x18 cmp r0, #0 bne _080873E2 @@ -273627,9 +273627,9 @@ sub_08087384: @ 0x08087384 movs r3, #0 ldrsh r2, [r6, r3] adds r0, r5, #0 - bl sub_0808E454 + bl ShiftEventObjectCoords adds r0, r5, #0 - bl sub_08096728 + bl EventObjectUpdateZCoord movs r0, #1 b _080873E4 _080873E2: @@ -273639,7 +273639,7 @@ _080873E4: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08087384 + thumb_func_end FacingHandler_DpadMovement thumb_func_start FacingHandler_ForcedFacingChange FacingHandler_ForcedFacingChange: @ 0x080873EC @@ -273648,7 +273648,7 @@ FacingHandler_ForcedFacingChange: @ 0x080873EC lsls r0, r2, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r4, #0x19] - bl sub_08087444 + bl FlipVerticalAndClearForced strb r0, [r4, #0x19] movs r0, #0 pop {r4} @@ -273656,16 +273656,16 @@ FacingHandler_ForcedFacingChange: @ 0x080873EC bx r1 thumb_func_end FacingHandler_ForcedFacingChange - thumb_func_start sub_08087404 -sub_08087404: @ 0x08087404 + thumb_func_start MovementStatusHandler_EnterFreeMode +MovementStatusHandler_EnterFreeMode: @ 0x08087404 movs r1, #0 strb r1, [r0, #3] bx lr .align 2, 0 - thumb_func_end sub_08087404 + thumb_func_end MovementStatusHandler_EnterFreeMode - thumb_func_start sub_0808740C -sub_0808740C: @ 0x0808740C + thumb_func_start MovementStatusHandler_TryAdvanceScript +MovementStatusHandler_TryAdvanceScript: @ 0x0808740C push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -273685,7 +273685,7 @@ sub_0808740C: @ 0x0808740C cmp r0, #0 bne _0808743C adds r0, r4, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords movs r0, #2 strb r0, [r6, #3] _0808743C: @@ -273693,10 +273693,10 @@ _0808743C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808740C + thumb_func_end MovementStatusHandler_TryAdvanceScript - thumb_func_start sub_08087444 -sub_08087444: @ 0x08087444 + thumb_func_start FlipVerticalAndClearForced +FlipVerticalAndClearForced: @ 0x08087444 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -273741,10 +273741,10 @@ _0808749E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08087444 + thumb_func_end FlipVerticalAndClearForced - thumb_func_start sub_080874A4 -sub_080874A4: @ 0x080874A4 + thumb_func_start LinkPlayerDetectCollision +LinkPlayerDetectCollision: @ 0x080874A4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -273807,7 +273807,7 @@ _0808750C: bls _080874C8 asrs r0, r3, #0x10 asrs r1, r5, #0x10 - bl sub_08087B14 + bl MapGridIsImpassableAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _08087522: @@ -273818,10 +273818,10 @@ _08087522: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080874A4 + thumb_func_end LinkPlayerDetectCollision - thumb_func_start sub_08087530 -sub_08087530: @ 0x08087530 + thumb_func_start CreateLinkPlayerSprite +CreateLinkPlayerSprite: @ 0x08087530 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -273883,7 +273883,7 @@ _080875A8: movs r2, #0 str r2, [sp] movs r3, #0 - bl sub_0808D6D8 + bl AddPseudoEventObject strb r0, [r4, #4] _080875BA: ldrb r1, [r4, #4] @@ -273910,12 +273910,12 @@ _080875DE: pop {r0} bx r0 .align 2, 0 -_080875E8: .4byte sub_080875F0 +_080875E8: .4byte SpriteCB_LinkPlayer _080875EC: .4byte gUnknown_20205AC - thumb_func_end sub_08087530 + thumb_func_end CreateLinkPlayerSprite - thumb_func_start sub_080875F0 -sub_080875F0: @ 0x080875F0 + thumb_func_start SpriteCB_LinkPlayer +SpriteCB_LinkPlayer: @ 0x080875F0 push {r4, r5, r6, lr} adds r5, r0, #0 movs r0, #0x2e @@ -273975,7 +273975,7 @@ _0808765C: _0808766E: adds r0, r5, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility ldrb r0, [r6] lsls r0, r0, #0x1d cmp r0, #0 @@ -274002,10 +274002,10 @@ _080876A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080875F0 + thumb_func_end SpriteCB_LinkPlayer - thumb_func_start sub_080876A8 -sub_080876A8: @ 0x080876A8 + thumb_func_start mapconnection_get_mapheader +mapconnection_get_mapheader: @ 0x080876A8 push {lr} ldrb r2, [r0, #8] ldrb r1, [r0, #9] @@ -274013,50 +274013,50 @@ sub_080876A8: @ 0x080876A8 bl Overworld_GetMapHeaderByGroupAndId pop {r1} bx r1 - thumb_func_end sub_080876A8 + thumb_func_end mapconnection_get_mapheader - thumb_func_start sub_080876B8 -sub_080876B8: @ 0x080876B8 + thumb_func_start InitMap +InitMap: @ 0x080876B8 push {r4, lr} ldr r4, _080876D4 adds r0, r4, #0 - bl sub_08087778 + bl InitMapLayoutData ldr r0, [r4, #4] - bl sub_080E9B6C + bl SetOccupiedSecretBaseEntranceMetatiles bl sub_080989C8 pop {r4} pop {r0} bx r0 .align 2, 0 _080876D4: .4byte gUnknown_2036FB8 - thumb_func_end sub_080876B8 + thumb_func_end InitMap - thumb_func_start sub_080876D8 -sub_080876D8: @ 0x080876D8 + thumb_func_start InitMapFromSavedGame +InitMapFromSavedGame: @ 0x080876D8 push {r4, lr} ldr r4, _08087708 adds r0, r4, #0 - bl sub_08087778 + bl InitMapLayoutData movs r0, #0 bl sub_080E9EC4 ldr r0, [r4, #4] - bl sub_080E9B6C + bl SetOccupiedSecretBaseEntranceMetatiles bl sub_08087E00 bl sub_080989C8 ldr r1, _0808770C ldr r0, [r1] ldr r1, [r1, #4] - bl sub_080ECBE4 + bl UpdateTVScreensOnMap pop {r4} pop {r0} bx r0 .align 2, 0 _08087708: .4byte gUnknown_2036FB8 _0808770C: .4byte gUnknown_3005B20 - thumb_func_end sub_080876D8 + thumb_func_end InitMapFromSavedGame - thumb_func_start sub_08087710 -sub_08087710: @ 0x08087710 + thumb_func_start InitBattlePyramidMap +InitBattlePyramidMap: @ 0x08087710 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -274071,7 +274071,7 @@ sub_08087710: @ 0x08087710 bl CpuFastSet adds r0, r5, #0 adds r1, r4, #0 - bl sub_081A9DF0 + bl GenerateBattlePyramidFloorLayout add sp, #4 pop {r4, r5} pop {r0} @@ -274080,10 +274080,10 @@ sub_08087710: @ 0x08087710 _0808773C: .4byte 0x03FF03FF _08087740: .4byte gUnknown_2031FB8 _08087744: .4byte 0x01001400 - thumb_func_end sub_08087710 + thumb_func_end InitBattlePyramidMap - thumb_func_start sub_08087748 -sub_08087748: @ 0x08087748 + thumb_func_start InitTrainerHillMap +InitTrainerHillMap: @ 0x08087748 push {r4, lr} sub sp, #4 ldr r0, _0808776C @@ -274103,10 +274103,10 @@ sub_08087748: @ 0x08087748 _0808776C: .4byte 0x03FF03FF _08087770: .4byte gUnknown_2031FB8 _08087774: .4byte 0x01001400 - thumb_func_end sub_08087748 + thumb_func_end InitTrainerHillMap - thumb_func_start sub_08087778 -sub_08087778: @ 0x08087778 + thumb_func_start InitMapLayoutData +InitMapLayoutData: @ 0x08087778 push {r4, r5, r6, lr} sub sp, #4 adds r6, r0, #0 @@ -274134,9 +274134,9 @@ sub_08087778: @ 0x08087778 ldr r0, [r5, #0xc] ldrh r1, [r5] ldrh r2, [r5, #4] - bl sub_080877D4 + bl InitBackupMapLayoutData adds r0, r6, #0 - bl sub_0808782C + bl InitBackupMapLayoutConnections _080877BA: add sp, #4 pop {r4, r5, r6} @@ -274147,10 +274147,10 @@ _080877C4: .4byte 0x03FF03FF _080877C8: .4byte gUnknown_2031FB8 _080877CC: .4byte 0x01001400 _080877D0: .4byte gUnknown_3005B20 - thumb_func_end sub_08087778 + thumb_func_end InitMapLayoutData - thumb_func_start sub_080877D4 -sub_080877D4: @ 0x080877D4 + thumb_func_start InitBackupMapLayoutData +InitBackupMapLayoutData: @ 0x080877D4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -274196,10 +274196,10 @@ _0808781C: bx r0 .align 2, 0 _08087828: .4byte gUnknown_3005B20 - thumb_func_end sub_080877D4 + thumb_func_end InitBackupMapLayoutData - thumb_func_start sub_0808782C -sub_0808782C: @ 0x0808782C + thumb_func_start InitBackupMapLayoutConnections +InitBackupMapLayoutConnections: @ 0x0808782C push {r4, r5, r6, r7, lr} adds r6, r0, #0 ldr r0, [r6, #0xc] @@ -274217,7 +274217,7 @@ sub_0808782C: @ 0x0808782C adds r7, r1, #0 _0808784A: adds r0, r5, #0 - bl sub_080876A8 + bl mapconnection_get_mapheader adds r1, r0, #0 ldr r2, [r5, #4] ldrb r0, [r5] @@ -274239,25 +274239,25 @@ _0808786C: b _080878A8 _08087876: adds r0, r6, #0 - bl sub_0808791C + bl FillSouthConnection ldrb r0, [r4] movs r1, #1 b _080878A4 _08087882: adds r0, r6, #0 - bl sub_08087984 + bl FillNorthConnection ldrb r0, [r4] movs r1, #2 b _080878A4 _0808788E: adds r0, r6, #0 - bl sub_080879E4 + bl FillWestConnection ldrb r0, [r4] movs r1, #4 b _080878A4 _0808789A: adds r0, r6, #0 - bl sub_08087A44 + bl FillEastConnection ldrb r0, [r4] movs r1, #8 _080878A4: @@ -274273,7 +274273,7 @@ _080878B0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808782C + thumb_func_end InitBackupMapLayoutConnections thumb_func_start sub_080878B8 sub_080878B8: @ 0x080878B8 @@ -274329,8 +274329,8 @@ _08087914: .4byte gUnknown_3005B20 _08087918: .4byte 0x001FFFFF thumb_func_end sub_080878B8 - thumb_func_start sub_0808791C -sub_0808791C: @ 0x0808791C + thumb_func_start FillSouthConnection +FillSouthConnection: @ 0x0808791C push {r4, r5, r6, r7, lr} sub sp, #0xc adds r3, r0, #0 @@ -274384,10 +274384,10 @@ _08087976: bx r0 .align 2, 0 _08087980: .4byte gUnknown_3005B20 - thumb_func_end sub_0808791C + thumb_func_end FillSouthConnection - thumb_func_start sub_08087984 -sub_08087984: @ 0x08087984 + thumb_func_start FillNorthConnection +FillNorthConnection: @ 0x08087984 push {r4, r5, r6, r7, lr} sub sp, #0xc adds r5, r1, #0 @@ -274438,10 +274438,10 @@ _080879D8: bx r0 .align 2, 0 _080879E0: .4byte gUnknown_3005B20 - thumb_func_end sub_08087984 + thumb_func_end FillNorthConnection - thumb_func_start sub_080879E4 -sub_080879E4: @ 0x080879E4 + thumb_func_start FillWestConnection +FillWestConnection: @ 0x080879E4 push {r4, r5, r6, r7, lr} sub sp, #0xc adds r5, r1, #0 @@ -274492,10 +274492,10 @@ _08087A38: bx r0 .align 2, 0 _08087A40: .4byte gUnknown_3005B20 - thumb_func_end sub_080879E4 + thumb_func_end FillWestConnection - thumb_func_start sub_08087A44 -sub_08087A44: @ 0x08087A44 + thumb_func_start FillEastConnection +FillEastConnection: @ 0x08087A44 push {r4, r5, r6, r7, lr} sub sp, #0xc adds r3, r0, #0 @@ -274548,10 +274548,10 @@ _08087A9C: bx r0 .align 2, 0 _08087AA4: .4byte gUnknown_3005B20 - thumb_func_end sub_08087A44 + thumb_func_end FillEastConnection - thumb_func_start sub_08087AA8 -sub_08087AA8: @ 0x08087AA8 + thumb_func_start MapGridGetZCoordAt +MapGridGetZCoordAt: @ 0x08087AA8 push {r4, lr} adds r2, r0, #0 adds r4, r1, #0 @@ -274609,10 +274609,10 @@ _08087B0E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08087AA8 + thumb_func_end MapGridGetZCoordAt - thumb_func_start sub_08087B14 -sub_08087B14: @ 0x08087B14 + thumb_func_start MapGridIsImpassableAt +MapGridIsImpassableAt: @ 0x08087B14 push {r4, lr} adds r2, r0, #0 adds r4, r1, #0 @@ -274673,10 +274673,10 @@ _08087B82: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08087B14 + thumb_func_end MapGridIsImpassableAt - thumb_func_start sub_08087B88 -sub_08087B88: @ 0x08087B88 + thumb_func_start MapGridGetMetatileIdAt +MapGridGetMetatileIdAt: @ 0x08087B88 push {r4, r5, r6, lr} adds r5, r0, #0 adds r6, r1, #0 @@ -274755,15 +274755,15 @@ _08087C14: bx r1 .align 2, 0 _08087C1C: .4byte gUnknown_2036FB8 - thumb_func_end sub_08087B88 + thumb_func_end MapGridGetMetatileIdAt thumb_func_start MapGridGetMetatileBehaviorAt MapGridGetMetatileBehaviorAt: @ 0x08087C20 push {lr} - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08087CD4 + bl GetBehaviorByMetatileId adds r1, r0, #0 movs r0, #0xff ands r0, r1 @@ -274774,10 +274774,10 @@ MapGridGetMetatileBehaviorAt: @ 0x08087C20 thumb_func_start MapGridGetMetatileLayerTypeAt MapGridGetMetatileLayerTypeAt: @ 0x08087C38 push {lr} - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08087CD4 + bl GetBehaviorByMetatileId adds r1, r0, #0 movs r0, #0xf0 lsls r0, r0, #8 @@ -274858,8 +274858,8 @@ _08087CC8: _08087CD0: .4byte gUnknown_3005B20 thumb_func_end MapGridSetMetatileEntryAt - thumb_func_start sub_08087CD4 -sub_08087CD4: @ 0x08087CD4 + thumb_func_start GetBehaviorByMetatileId +GetBehaviorByMetatileId: @ 0x08087CD4 push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -274901,7 +274901,7 @@ _08087D1A: .align 2, 0 _08087D20: .4byte gUnknown_2036FB8 _08087D24: .4byte 0xFFFFFC00 - thumb_func_end sub_08087CD4 + thumb_func_end GetBehaviorByMetatileId thumb_func_start save_serialize_map save_serialize_map: @ 0x08087D28 @@ -274967,8 +274967,8 @@ _08087D94: .4byte gUnknown_3005B20 _08087D98: .4byte gUnknown_2031FB8 thumb_func_end save_serialize_map - thumb_func_start sub_08087D9C -sub_08087D9C: @ 0x08087D9C + thumb_func_start SavedMapViewIsEmpty +SavedMapViewIsEmpty: @ 0x08087D9C push {r4, lr} movs r2, #0 movs r1, #0 @@ -275000,10 +275000,10 @@ _08087DD2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08087D9C + thumb_func_end SavedMapViewIsEmpty - thumb_func_start sub_08087DD8 -sub_08087DD8: @ 0x08087DD8 + thumb_func_start ClearSavedMapView +ClearSavedMapView: @ 0x08087DD8 push {lr} sub sp, #4 mov r1, sp @@ -275021,7 +275021,7 @@ sub_08087DD8: @ 0x08087DD8 .align 2, 0 _08087DF8: .4byte gUnknown_3005AEC _08087DFC: .4byte 0x01000100 - thumb_func_end sub_08087DD8 + thumb_func_end ClearSavedMapView thumb_func_start sub_08087E00 sub_08087E00: @ 0x08087E00 @@ -275035,7 +275035,7 @@ sub_08087E00: @ 0x08087E00 ldr r0, [r4] adds r7, r0, #0 adds r7, #0x34 - bl sub_08087D9C + bl SavedMapViewIsEmpty cmp r0, #0 bne _08087F10 ldr r0, _08087E4C @@ -275104,7 +275104,7 @@ _08087E84: lsrs r1, r3, #0x10 mov r2, sb str r3, [sp, #0xc] - bl sub_08088554 + bl SkipCopyingMetatileFromSavedMap lsls r0, r0, #0x18 ldr r3, [sp, #0xc] cmp r0, #0 @@ -275144,7 +275144,7 @@ _08087ED8: asrs r0, r4, #0x10 mov r2, sb asrs r1, r2, #0x10 - bl sub_080D3ADC + bl FixLongGrassMetatilesWindowTop _08087EE8: ldr r0, _08087F20 ldr r0, [r0] @@ -275154,7 +275154,7 @@ _08087EE8: bge _08087EFC asrs r0, r4, #0x10 asrs r1, r7, #0x10 - bl sub_080D3B58 + bl FixLongGrassMetatilesWindowBottom _08087EFC: movs r0, #0x80 lsls r0, r0, #9 @@ -275165,7 +275165,7 @@ _08087EFC: cmp r5, r0 blt _08087ED8 _08087F0C: - bl sub_08087DD8 + bl ClearSavedMapView _08087F10: add sp, #0x10 pop {r3, r4, r5} @@ -275286,7 +275286,7 @@ _08087FE0: cmp r1, ip blt _08087FAC _08087FE6: - bl sub_08087DD8 + bl ClearSavedMapView add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -275299,8 +275299,8 @@ _08087FE6: _08087FFC: .4byte gUnknown_2031FB8 thumb_func_end sub_08087F28 - thumb_func_start sub_08088000 -sub_08088000: @ 0x08088000 + thumb_func_start GetMapBorderIdAt +GetMapBorderIdAt: @ 0x08088000 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -275421,7 +275421,7 @@ _080880E6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08088000 + thumb_func_end GetMapBorderIdAt thumb_func_start GetPostCameraMoveMapBorderId GetPostCameraMoveMapBorderId: @ 0x080880EC @@ -275438,7 +275438,7 @@ GetPostCameraMoveMapBorderId: @ 0x080880EC adds r3, #7 adds r1, r1, r3 adds r0, r2, #0 - bl sub_08088000 + bl GetMapBorderIdAt pop {r4} pop {r1} bx r1 @@ -275446,8 +275446,8 @@ GetPostCameraMoveMapBorderId: @ 0x080880EC _08088110: .4byte gUnknown_3005AEC thumb_func_end GetPostCameraMoveMapBorderId - thumb_func_start sub_08088114 -sub_08088114: @ 0x08088114 + thumb_func_start CanCameraMoveInDirection +CanCameraMoveInDirection: @ 0x08088114 push {r4, r5, lr} ldr r1, _0808814C ldr r4, [r1] @@ -275467,7 +275467,7 @@ sub_08088114: @ 0x08088114 adds r0, #7 adds r1, r1, r0 adds r0, r3, #0 - bl sub_08088000 + bl GetMapBorderIdAt movs r1, #1 rsbs r1, r1, #0 cmp r0, r1 @@ -275483,7 +275483,7 @@ _08088156: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08088114 + thumb_func_end CanCameraMoveInDirection thumb_func_start sub_0808815C sub_0808815C: @ 0x0808815C @@ -275492,7 +275492,7 @@ sub_0808815C: @ 0x0808815C adds r4, r1, #0 adds r6, r2, #0 adds r7, r3, #0 - bl sub_080876A8 + bl mapconnection_get_mapheader adds r3, r0, #0 cmp r4, #2 beq _080881C4 @@ -275558,8 +275558,8 @@ _080881D6: _080881DC: .4byte gUnknown_3005AEC thumb_func_end sub_0808815C - thumb_func_start sub_080881E0 -sub_080881E0: @ 0x080881E0 + thumb_func_start CameraMove +CameraMove: @ 0x080881E0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -275595,7 +275595,7 @@ _08088220: .4byte gUnknown_2036FD4 _08088224: .4byte gUnknown_3005AEC _08088228: bl save_serialize_map - bl sub_081BE3C8 + bl ClearMirageTowerPulseBlendEffect ldr r1, _080882AC ldr r0, [r1] movs r2, #0 @@ -275616,7 +275616,7 @@ _08088228: bl sub_0808815C ldrb r0, [r4, #8] ldrb r1, [r4, #9] - bl sub_08084A00 + bl LoadMapFromCameraTransition ldr r1, _080882B0 ldrb r0, [r1] movs r1, #1 @@ -275658,7 +275658,7 @@ _08088296: .align 2, 0 _080882AC: .4byte gUnknown_3005AEC _080882B0: .4byte gUnknown_2036FD4 - thumb_func_end sub_080881E0 + thumb_func_end CameraMove thumb_func_start sub_080882B4 sub_080882B4: @ 0x080882B4 @@ -275723,7 +275723,7 @@ sub_0808830C: @ 0x0808830C lsrs r4, r0, #0x18 adds r6, r4, #0 adds r0, r5, #0 - bl sub_080876A8 + bl mapconnection_get_mapheader adds r2, r0, #0 cmp r4, #1 blt _08088364 @@ -275818,7 +275818,7 @@ sub_080883B0: @ 0x080883B0 adds r4, r0, #0 adds r5, r1, #0 adds r6, r2, #0 - bl sub_080876A8 + bl mapconnection_get_mapheader adds r1, r0, #0 ldrb r0, [r4] cmp r0, #1 @@ -275965,8 +275965,8 @@ sub_080884A0: @ 0x080884A0 _080884B8: .4byte gUnknown_3005AEC thumb_func_end sub_080884A0 - thumb_func_start sub_080884BC -sub_080884BC: @ 0x080884BC + thumb_func_start GetCameraFocusCoords +GetCameraFocusCoords: @ 0x080884BC ldr r2, _080884D0 ldr r3, [r2] ldrh r2, [r3] @@ -275978,10 +275978,10 @@ sub_080884BC: @ 0x080884BC bx lr .align 2, 0 _080884D0: .4byte gUnknown_3005AEC - thumb_func_end sub_080884BC + thumb_func_end GetCameraFocusCoords - thumb_func_start sub_080884D4 -sub_080884D4: @ 0x080884D4 + thumb_func_start SetPlayerCoords +SetPlayerCoords: @ 0x080884D4 ldr r2, _080884E0 ldr r2, [r2] strh r0, [r2] @@ -275989,10 +275989,10 @@ sub_080884D4: @ 0x080884D4 bx lr .align 2, 0 _080884E0: .4byte gUnknown_3005AEC - thumb_func_end sub_080884D4 + thumb_func_end SetPlayerCoords - thumb_func_start sub_080884E4 -sub_080884E4: @ 0x080884E4 + thumb_func_start GetCameraCoords +GetCameraCoords: @ 0x080884E4 ldr r2, _080884F4 ldr r3, [r2] ldrh r2, [r3] @@ -276002,7 +276002,7 @@ sub_080884E4: @ 0x080884E4 bx lr .align 2, 0 _080884F4: .4byte gUnknown_3005AEC - thumb_func_end sub_080884E4 + thumb_func_end GetCameraCoords thumb_func_start sub_080884F8 sub_080884F8: @ 0x080884F8 @@ -276056,8 +276056,8 @@ _0808854A: _08088550: .4byte 0x0000F3FF thumb_func_end sub_080884F8 - thumb_func_start sub_08088554 -sub_08088554: @ 0x08088554 + thumb_func_start SkipCopyingMetatileFromSavedMap +SkipCopyingMetatileFromSavedMap: @ 0x08088554 push {lr} adds r3, r0, #0 lsls r1, r1, #0x10 @@ -276096,7 +276096,7 @@ _08088592: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08088554 + thumb_func_end SkipCopyingMetatileFromSavedMap thumb_func_start sub_08088598 sub_08088598: @ 0x08088598 @@ -276128,7 +276128,7 @@ _080885C4: str r0, [sp] movs r0, #2 adds r3, r7, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _080885D4: add sp, #4 pop {r4, r5, r6, r7} @@ -276166,7 +276166,7 @@ _08088608: str r0, [sp] movs r0, #2 adds r3, r7, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap _08088618: add sp, #4 pop {r4, r5, r6, r7} @@ -276186,8 +276186,8 @@ sub_08088624: @ 0x08088624 .align 2, 0 thumb_func_end sub_08088624 - thumb_func_start sub_08088628 -sub_08088628: @ 0x08088628 + thumb_func_start apply_map_tileset_palette +apply_map_tileset_palette: @ 0x08088628 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -276210,7 +276210,7 @@ sub_08088628: @ 0x08088628 mov r0, sp adds r1, r5, #0 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r0, [r4, #8] adds r0, #2 adds r5, #1 @@ -276220,7 +276220,7 @@ sub_08088628: @ 0x08088628 lsls r2, r4, #0x10 lsrs r2, r2, #0x10 adds r1, r5, #0 - bl sub_080A1200 + bl LoadPalette lsls r4, r4, #0xf lsrs r4, r4, #0x10 adds r0, r5, #0 @@ -276234,7 +276234,7 @@ _0808867C: adds r0, #0xc0 adds r1, r5, #0 adds r2, r7, #0 - bl sub_080A1200 + bl LoadPalette lsrs r1, r6, #0x11 adds r0, r5, #0 bl sub_08088620 @@ -276242,7 +276242,7 @@ _0808867C: _08088696: ldr r0, [r4, #8] mov r1, r8 - bl sub_080A11BC + bl LoadCompressedPalette lsrs r1, r6, #0x11 mov r0, r8 bl sub_08088620 @@ -276254,10 +276254,10 @@ _080886A6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08088628 + thumb_func_end apply_map_tileset_palette - thumb_func_start sub_080886B4 -sub_080886B4: @ 0x080886B4 + thumb_func_start copy_map_tileset1_to_vram +copy_map_tileset1_to_vram: @ 0x080886B4 push {lr} ldr r0, [r0, #0x10] movs r1, #0x80 @@ -276267,10 +276267,10 @@ sub_080886B4: @ 0x080886B4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080886B4 + thumb_func_end copy_map_tileset1_to_vram - thumb_func_start sub_080886C8 -sub_080886C8: @ 0x080886C8 + thumb_func_start copy_map_tileset2_to_vram +copy_map_tileset2_to_vram: @ 0x080886C8 push {lr} ldr r0, [r0, #0x14] movs r2, #0x80 @@ -276280,10 +276280,10 @@ sub_080886C8: @ 0x080886C8 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080886C8 + thumb_func_end copy_map_tileset2_to_vram - thumb_func_start sub_080886DC -sub_080886DC: @ 0x080886DC + thumb_func_start copy_map_tileset2_to_vram_2 +copy_map_tileset2_to_vram_2: @ 0x080886DC push {lr} ldr r0, [r0, #0x14] movs r2, #0x80 @@ -276293,29 +276293,29 @@ sub_080886DC: @ 0x080886DC pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080886DC + thumb_func_end copy_map_tileset2_to_vram_2 - thumb_func_start sub_080886F0 -sub_080886F0: @ 0x080886F0 + thumb_func_start apply_map_tileset1_palette +apply_map_tileset1_palette: @ 0x080886F0 push {lr} ldr r0, [r0, #0x10] movs r1, #0 movs r2, #0xc0 - bl sub_08088628 + bl apply_map_tileset_palette pop {r0} bx r0 - thumb_func_end sub_080886F0 + thumb_func_end apply_map_tileset1_palette - thumb_func_start sub_08088700 -sub_08088700: @ 0x08088700 + thumb_func_start apply_map_tileset2_palette +apply_map_tileset2_palette: @ 0x08088700 push {lr} ldr r0, [r0, #0x14] movs r1, #0x60 movs r2, #0xe0 - bl sub_08088628 + bl apply_map_tileset_palette pop {r0} bx r0 - thumb_func_end sub_08088700 + thumb_func_end apply_map_tileset2_palette thumb_func_start copy_map_tileset1_tileset2_to_vram copy_map_tileset1_tileset2_to_vram: @ 0x08088710 @@ -276346,9 +276346,9 @@ apply_map_tileset1_tileset2_palette: @ 0x08088738 adds r4, r0, #0 cmp r4, #0 beq _0808874A - bl sub_080886F0 + bl apply_map_tileset1_palette adds r0, r4, #0 - bl sub_08088700 + bl apply_map_tileset2_palette _0808874A: pop {r4} pop {r0} @@ -276361,8 +276361,8 @@ sub_08088750: @ 0x08088750 bx lr thumb_func_end sub_08088750 - thumb_func_start sub_08088754 -sub_08088754: @ 0x08088754 + thumb_func_start MetatileBehavior_IsEncounterTile +MetatileBehavior_IsEncounterTile: @ 0x08088754 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -276383,7 +276383,7 @@ _08088772: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08088754 + thumb_func_end MetatileBehavior_IsEncounterTile thumb_func_start MetatileBehavior_IsJumpEast MetatileBehavior_IsJumpEast: @ 0x08088778 @@ -276671,8 +276671,8 @@ _080888E8: bx r1 thumb_func_end MetatileBehavior_IsDeepSouthWarp - thumb_func_start sub_080888EC -sub_080888EC: @ 0x080888EC + thumb_func_start MetatileBehavior_IsSurfableWaterOrUnderwater +MetatileBehavior_IsSurfableWaterOrUnderwater: @ 0x080888EC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -276693,7 +276693,7 @@ _0808890A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080888EC + thumb_func_end MetatileBehavior_IsSurfableWaterOrUnderwater thumb_func_start MetatileBehavior_IsEastArrowWarp MetatileBehavior_IsEastArrowWarp: @ 0x08088910 @@ -277350,8 +277350,8 @@ _08088C74: bx r1 thumb_func_end MetatileBehavior_IsSecretBasePoster - thumb_func_start sub_08088C78 -sub_08088C78: @ 0x08088C78 + thumb_func_start MetatileBehavior_IsNormal +MetatileBehavior_IsNormal: @ 0x08088C78 push {lr} lsls r0, r0, #0x18 cmp r0, #0 @@ -277364,7 +277364,7 @@ _08088C86: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08088C78 + thumb_func_end MetatileBehavior_IsNormal thumb_func_start MetatileBehavior_IsSecretBaseNorthWall MetatileBehavior_IsSecretBaseNorthWall: @ 0x08088C8C @@ -277765,12 +277765,12 @@ MetatileBehavior_IsLandWildEncounter: @ 0x08088E90 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _08088EB4 adds r0, r4, #0 - bl sub_08088754 + bl MetatileBehavior_IsEncounterTile lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -277791,13 +277791,13 @@ MetatileBehavior_IsWaterWildEncounter: @ 0x08088EBC lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08088EE2 adds r0, r4, #0 - bl sub_08088754 + bl MetatileBehavior_IsEncounterTile lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -277986,7 +277986,7 @@ MetatileBehavior_IsSurfableAndNotWaterfall: @ 0x08088FC4 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 beq _08088FE6 @@ -278953,8 +278953,8 @@ _080894B8: bx r1 thumb_func_end MetatileBehavior_IsTrainerHillTimer - thumb_func_start sub_080894BC -sub_080894BC: @ 0x080894BC + thumb_func_start move_tilemap_camera_to_upper_left_corner_ +move_tilemap_camera_to_upper_left_corner_: @ 0x080894BC movs r1, #0 strb r1, [r0, #2] strb r1, [r0, #3] @@ -278963,7 +278963,7 @@ sub_080894BC: @ 0x080894BC movs r1, #1 strb r1, [r0, #4] bx lr - thumb_func_end sub_080894BC + thumb_func_end move_tilemap_camera_to_upper_left_corner_ thumb_func_start tilemap_move_something tilemap_move_something: @ 0x080894CC @@ -278983,8 +278983,8 @@ tilemap_move_something: @ 0x080894CC bx lr thumb_func_end tilemap_move_something - thumb_func_start sub_080894E8 -sub_080894E8: @ 0x080894E8 + thumb_func_start coords8_add +coords8_add: @ 0x080894E8 ldrb r3, [r0] adds r3, r3, r1 strb r3, [r0] @@ -278993,21 +278993,21 @@ sub_080894E8: @ 0x080894E8 strb r1, [r0, #1] bx lr .align 2, 0 - thumb_func_end sub_080894E8 + thumb_func_end coords8_add - thumb_func_start sub_080894F8 -sub_080894F8: @ 0x080894F8 + thumb_func_start move_tilemap_camera_to_upper_left_corner +move_tilemap_camera_to_upper_left_corner: @ 0x080894F8 push {lr} ldr r0, _08089504 - bl sub_080894BC + bl move_tilemap_camera_to_upper_left_corner_ pop {r0} bx r0 .align 2, 0 _08089504: .4byte gUnknown_3000E20 - thumb_func_end sub_080894F8 + thumb_func_end move_tilemap_camera_to_upper_left_corner - thumb_func_start sub_08089508 -sub_08089508: @ 0x08089508 + thumb_func_start FieldUpdateBgTilemapScroll +FieldUpdateBgTilemapScroll: @ 0x08089508 push {r4, r5, lr} ldr r1, _08089560 ldr r0, _08089564 @@ -279050,7 +279050,7 @@ sub_08089508: @ 0x08089508 _08089560: .4byte gUnknown_3000E20 _08089564: .4byte gUnknown_3000E28 _08089568: .4byte gUnknown_3000E2A - thumb_func_end sub_08089508 + thumb_func_end FieldUpdateBgTilemapScroll thumb_func_start sub_0808956C sub_0808956C: @ 0x0808956C @@ -279424,7 +279424,7 @@ CurrentMapDrawMetatileAt: @ 0x08089804 adds r0, r6, #0 adds r1, r4, #0 adds r2, r5, #0 - bl sub_08089A10 + bl MapPosToBgTilemapOffset adds r1, r0, #0 cmp r1, #0 blt _08089830 @@ -279456,14 +279456,14 @@ DrawDoorMetatileAt: @ 0x08089840 adds r0, r6, #0 adds r1, r3, #0 adds r2, r4, #0 - bl sub_08089A10 + bl MapPosToBgTilemapOffset cmp r0, #0 blt _08089868 lsls r2, r0, #0x10 lsrs r2, r2, #0x10 movs r0, #1 adds r1, r5, #0 - bl sub_080898DC + bl DrawMetatile movs r0, #1 strb r0, [r6, #4] _08089868: @@ -279487,7 +279487,7 @@ DrawMetatileAt: @ 0x08089874 mov r8, r1 adds r0, r6, #0 adds r1, r7, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #0x80 @@ -279520,7 +279520,7 @@ _080898B8: lsls r1, r4, #4 adds r1, r5, r1 mov r2, r8 - bl sub_080898DC + bl DrawMetatile pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -279530,8 +279530,8 @@ _080898B8: _080898D8: .4byte 0xFFFFFE00 thumb_func_end DrawMetatileAt - thumb_func_start sub_080898DC -sub_080898DC: @ 0x080898DC + thumb_func_start DrawMetatile +DrawMetatile: @ 0x080898DC push {r4, lr} adds r4, r1, #0 lsls r2, r2, #0x10 @@ -279667,11 +279667,11 @@ _080899CA: strh r0, [r3] _080899E6: movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -279680,10 +279680,10 @@ _08089A00: .4byte gUnknown_3005B04 _08089A04: .4byte 0x00003014 _08089A08: .4byte gUnknown_3005AFC _08089A0C: .4byte gUnknown_3005B00 - thumb_func_end sub_080898DC + thumb_func_end DrawMetatile - thumb_func_start sub_08089A10 -sub_08089A10: @ 0x08089A10 + thumb_func_start MapPosToBgTilemapOffset +MapPosToBgTilemapOffset: @ 0x08089A10 push {r4, r5, lr} adds r4, r0, #0 ldr r0, _08089A40 @@ -279725,7 +279725,7 @@ _08089A52: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08089A10 + thumb_func_end MapPosToBgTilemapOffset thumb_func_start CameraUpdateCallback CameraUpdateCallback: @ 0x08089A58 @@ -279752,8 +279752,8 @@ _08089A78: _08089A7C: .4byte gUnknown_20205AC thumb_func_end CameraUpdateCallback - thumb_func_start sub_08089A80 -sub_08089A80: @ 0x08089A80 + thumb_func_start ResetCameraUpdateInfo +ResetCameraUpdateInfo: @ 0x08089A80 ldr r1, _08089A94 movs r0, #0 str r0, [r1, #8] @@ -279765,10 +279765,10 @@ sub_08089A80: @ 0x08089A80 bx lr .align 2, 0 _08089A94: .4byte gUnknown_3005B30 - thumb_func_end sub_08089A80 + thumb_func_end ResetCameraUpdateInfo - thumb_func_start sub_08089A98 -sub_08089A98: @ 0x08089A98 + thumb_func_start InitCameraUpdateCallback +InitCameraUpdateCallback: @ 0x08089A98 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -279784,7 +279784,7 @@ sub_08089A98: @ 0x08089A98 bl DestroySprite _08089AB4: adds r0, r5, #0 - bl sub_0808E6A4 + bl AddCameraObject lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r4, #4] @@ -279798,10 +279798,10 @@ _08089AB4: _08089ACC: .4byte gUnknown_3005B30 _08089AD0: .4byte gUnknown_20205AC _08089AD4: .4byte CameraUpdateCallback - thumb_func_end sub_08089A98 + thumb_func_end InitCameraUpdateCallback - thumb_func_start sub_08089AD8 -sub_08089AD8: @ 0x08089AD8 + thumb_func_start CameraUpdate +CameraUpdate: @ 0x08089AD8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -279893,14 +279893,14 @@ _08089B6C: _08089B7C: adds r0, r4, #0 adds r1, r5, #0 - bl sub_080881E0 + bl CameraMove adds r0, r4, #0 adds r1, r5, #0 bl UpdateEventObjectsForCameraUpdate adds r0, r4, #0 adds r1, r5, #0 bl RotatingGatePuzzleCameraUpdate - bl sub_080E122C + bl ResetBerryTreeSparkleFlags ldr r6, _08089BDC lsls r4, r4, #1 lsls r5, r5, #1 @@ -279916,7 +279916,7 @@ _08089BB2: ldr r0, _08089BDC adds r1, r7, #0 mov r2, r8 - bl sub_080894E8 + bl coords8_add ldr r1, _08089BE0 ldrh r0, [r1] subs r0, r0, r7 @@ -279936,14 +279936,14 @@ _08089BD8: .4byte gUnknown_3005B30 _08089BDC: .4byte gUnknown_3000E20 _08089BE0: .4byte gUnknown_3005B4C _08089BE4: .4byte gUnknown_3005B48 - thumb_func_end sub_08089AD8 + thumb_func_end CameraUpdate - thumb_func_start sub_08089BE8 -sub_08089BE8: @ 0x08089BE8 + thumb_func_start MoveCameraAndRedrawMap +MoveCameraAndRedrawMap: @ 0x08089BE8 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_080881E0 + bl CameraMove lsls r0, r4, #0x10 asrs r0, r0, #0x10 lsls r1, r5, #0x10 @@ -279966,7 +279966,7 @@ sub_08089BE8: @ 0x08089BE8 .align 2, 0 _08089C1C: .4byte gUnknown_3005B4C _08089C20: .4byte gUnknown_3005B48 - thumb_func_end sub_08089BE8 + thumb_func_end MoveCameraAndRedrawMap thumb_func_start sub_08089C24 sub_08089C24: @ 0x08089C24 @@ -279977,8 +279977,8 @@ sub_08089C24: @ 0x08089C24 _08089C2C: .4byte gUnknown_3000E30 thumb_func_end sub_08089C24 - thumb_func_start sub_08089C30 -sub_08089C30: @ 0x08089C30 + thumb_func_start SetCameraPanning +SetCameraPanning: @ 0x08089C30 ldr r2, _08089C40 strh r0, [r2] ldr r0, _08089C44 @@ -279990,7 +279990,7 @@ sub_08089C30: @ 0x08089C30 .align 2, 0 _08089C40: .4byte gUnknown_3000E28 _08089C44: .4byte gUnknown_3000E2A - thumb_func_end sub_08089C30 + thumb_func_end SetCameraPanning thumb_func_start InstallCameraPanAheadCallback InstallCameraPanAheadCallback: @ 0x08089C48 @@ -280009,14 +280009,14 @@ InstallCameraPanAheadCallback: @ 0x08089C48 bx lr .align 2, 0 _08089C64: .4byte gUnknown_3000E30 -_08089C68: .4byte sub_08089CC4 +_08089C68: .4byte CameraPanningCB_PanAhead _08089C6C: .4byte gUnknown_3000E2C _08089C70: .4byte gUnknown_3000E28 _08089C74: .4byte gUnknown_3000E2A thumb_func_end InstallCameraPanAheadCallback - thumb_func_start sub_08089C78 -sub_08089C78: @ 0x08089C78 + thumb_func_start UpdateCameraPanning +UpdateCameraPanning: @ 0x08089C78 push {lr} ldr r0, _08089CA8 ldr r0, [r0] @@ -280049,10 +280049,10 @@ _08089CB4: .4byte gUnknown_3000E28 _08089CB8: .4byte gUnknown_2021B3A _08089CBC: .4byte gUnknown_3005B48 _08089CC0: .4byte gUnknown_3000E2A - thumb_func_end sub_08089C78 + thumb_func_end UpdateCameraPanning - thumb_func_start sub_08089CC4 -sub_08089CC4: @ 0x08089CC4 + thumb_func_start CameraPanningCB_PanAhead +CameraPanningCB_PanAhead: @ 0x08089CC4 push {lr} ldr r0, _08089CD4 ldrb r0, [r0] @@ -280135,10 +280135,10 @@ _08089D5E: _08089D60: pop {r0} bx r0 - thumb_func_end sub_08089CC4 + thumb_func_end CameraPanningCB_PanAhead - thumb_func_start sub_08089D64 -sub_08089D64: @ 0x08089D64 + thumb_func_start CopyDoorTilesToVram +CopyDoorTilesToVram: @ 0x08089D64 push {lr} adds r2, r0, #0 ldrb r0, [r2, #3] @@ -280165,7 +280165,7 @@ _08089D92: bx r0 .align 2, 0 _08089D98: .4byte 0x06007F00 - thumb_func_end sub_08089D64 + thumb_func_end CopyDoorTilesToVram thumb_func_start door_build_blockdef door_build_blockdef: @ 0x08089D9C @@ -280321,8 +280321,8 @@ _08089EC6: bx r0 thumb_func_end DrawClosedDoorTiles - thumb_func_start sub_08089ECC -sub_08089ECC: @ 0x08089ECC + thumb_func_start DrawDoor +DrawDoor: @ 0x08089ECC push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -280356,7 +280356,7 @@ _08089F10: .4byte gUnknown_2037282 _08089F14: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08089D64 + bl CopyDoorTilesToVram ldr r3, [r4, #8] adds r0, r4, #0 adds r1, r6, #0 @@ -280382,7 +280382,7 @@ _08089F46: .align 2, 0 _08089F4C: .4byte gUnknown_2037280 _08089F50: .4byte gUnknown_2037282 - thumb_func_end sub_08089ECC + thumb_func_end DrawDoor thumb_func_start sub_08089F54 sub_08089F54: @ 0x08089F54 @@ -280403,7 +280403,7 @@ sub_08089F54: @ 0x08089F54 movs r0, #0xe ldrsh r3, [r4, r0] adds r0, r6, #0 - bl sub_08089ECC + bl DrawDoor _08089F7A: movs r2, #0xa ldrsh r1, [r4, r2] @@ -280441,8 +280441,8 @@ _08089FB0: .align 2, 0 thumb_func_end sub_08089F54 - thumb_func_start sub_08089FB8 -sub_08089FB8: @ 0x08089FB8 + thumb_func_start Task_AnimateDoor +Task_AnimateDoor: @ 0x08089FB8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -280463,14 +280463,14 @@ sub_08089FB8: @ 0x08089FB8 cmp r0, #0 bne _08089FE6 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08089FE6: pop {r4} pop {r0} bx r0 .align 2, 0 _08089FEC: .4byte gUnknown_3005B68 - thumb_func_end sub_08089FB8 + thumb_func_end Task_AnimateDoor thumb_func_start GetLastDoorFrame GetLastDoorFrame: @ 0x08089FF0 @@ -280514,8 +280514,8 @@ _0808A022: .align 2, 0 thumb_func_end GetDoorGraphics - thumb_func_start sub_0808A028 -sub_0808A028: @ 0x0808A028 + thumb_func_start StartDoorAnimationTask +StartDoorAnimationTask: @ 0x0808A028 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -280525,14 +280525,14 @@ sub_0808A028: @ 0x0808A028 mov r8, r3 ldr r4, _0808A074 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0808A07C adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -280553,7 +280553,7 @@ sub_0808A028: @ 0x0808A028 asrs r0, r0, #0x18 b _0808A080 .align 2, 0 -_0808A074: .4byte sub_08089FB8 +_0808A074: .4byte Task_AnimateDoor _0808A078: .4byte gUnknown_3005B68 _0808A07C: movs r0, #1 @@ -280565,16 +280565,16 @@ _0808A080: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A028 + thumb_func_end StartDoorAnimationTask - thumb_func_start sub_0808A08C -sub_0808A08C: @ 0x0808A08C + thumb_func_start DrawClosedDoor +DrawClosedDoor: @ 0x0808A08C push {lr} bl DrawClosedDoorTiles pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808A08C + thumb_func_end DrawClosedDoor thumb_func_start DrawOpenedDoor DrawOpenedDoor: @ 0x0808A098 @@ -280584,7 +280584,7 @@ DrawOpenedDoor: @ 0x0808A098 adds r6, r2, #0 adds r0, r5, #0 adds r1, r6, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -280600,7 +280600,7 @@ DrawOpenedDoor: @ 0x0808A098 adds r0, r4, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_08089ECC + bl DrawDoor _0808A0CE: pop {r4, r5, r6} pop {r0} @@ -280609,15 +280609,15 @@ _0808A0CE: _0808A0D4: .4byte gUnknown_846F3AC thumb_func_end DrawOpenedDoor - thumb_func_start sub_0808A0D8 -sub_0808A0D8: @ 0x0808A0D8 + thumb_func_start StartDoorOpenAnimation +StartDoorOpenAnimation: @ 0x0808A0D8 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 adds r6, r2, #0 adds r0, r5, #0 adds r1, r6, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -280645,7 +280645,7 @@ _0808A114: _0808A118: adds r2, r5, #0 adds r3, r6, #0 - bl sub_0808A028 + bl StartDoorAnimationTask lsls r0, r0, #0x18 asrs r0, r0, #0x18 _0808A124: @@ -280654,17 +280654,17 @@ _0808A124: bx r1 .align 2, 0 _0808A12C: .4byte gUnknown_846F3D4 - thumb_func_end sub_0808A0D8 + thumb_func_end StartDoorOpenAnimation - thumb_func_start sub_0808A130 -sub_0808A130: @ 0x0808A130 + thumb_func_start StartDoorCloseAnimation +StartDoorCloseAnimation: @ 0x0808A130 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 adds r6, r2, #0 adds r0, r5, #0 adds r1, r6, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -280675,7 +280675,7 @@ sub_0808A130: @ 0x0808A130 ldr r1, _0808A160 adds r2, r5, #0 adds r3, r6, #0 - bl sub_0808A028 + bl StartDoorAnimationTask lsls r0, r0, #0x18 asrs r0, r0, #0x18 b _0808A168 @@ -280689,7 +280689,7 @@ _0808A168: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A130 + thumb_func_end StartDoorCloseAnimation thumb_func_start cur_mapdata_get_door_x2_at cur_mapdata_get_door_x2_at: @ 0x0808A170 @@ -280697,7 +280697,7 @@ cur_mapdata_get_door_x2_at: @ 0x0808A170 adds r4, r0, #0 adds r0, r1, #0 adds r1, r2, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -280719,19 +280719,19 @@ _0808A198: .align 2, 0 thumb_func_end cur_mapdata_get_door_x2_at - thumb_func_start sub_0808A1A0 -sub_0808A1A0: @ 0x0808A1A0 + thumb_func_start unref_sub_808A83C +unref_sub_808A83C: @ 0x0808A1A0 push {lr} adds r3, r0, #0 adds r2, r1, #0 ldr r0, _0808A1B4 adds r1, r3, #0 - bl sub_0808A0D8 + bl StartDoorOpenAnimation pop {r0} bx r0 .align 2, 0 _0808A1B4: .4byte gUnknown_846F594 - thumb_func_end sub_0808A1A0 + thumb_func_end unref_sub_808A83C thumb_func_start FieldSetDoorOpened FieldSetDoorOpened: @ 0x0808A1B8 @@ -280772,7 +280772,7 @@ FieldSetDoorClosed: @ 0x0808A1E4 ldr r0, _0808A20C adds r1, r4, #0 adds r2, r5, #0 - bl sub_0808A08C + bl DrawClosedDoor _0808A206: pop {r4, r5} pop {r0} @@ -280781,8 +280781,8 @@ _0808A206: _0808A20C: .4byte gUnknown_846F594 thumb_func_end FieldSetDoorClosed - thumb_func_start sub_0808A210 -sub_0808A210: @ 0x0808A210 + thumb_func_start FieldAnimateDoorClose +FieldAnimateDoorClose: @ 0x0808A210 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -280796,7 +280796,7 @@ sub_0808A210: @ 0x0808A210 ldr r0, _0808A238 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0808A130 + bl StartDoorCloseAnimation lsls r0, r0, #0x18 asrs r0, r0, #0x18 b _0808A240 @@ -280810,10 +280810,10 @@ _0808A240: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A210 + thumb_func_end FieldAnimateDoorClose - thumb_func_start sub_0808A248 -sub_0808A248: @ 0x0808A248 + thumb_func_start FieldAnimateDoorOpen +FieldAnimateDoorOpen: @ 0x0808A248 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -280827,7 +280827,7 @@ sub_0808A248: @ 0x0808A248 ldr r0, _0808A270 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0808A0D8 + bl StartDoorOpenAnimation lsls r0, r0, #0x18 asrs r0, r0, #0x18 b _0808A278 @@ -280841,23 +280841,23 @@ _0808A278: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A248 + thumb_func_end FieldAnimateDoorOpen - thumb_func_start sub_0808A280 -sub_0808A280: @ 0x0808A280 + thumb_func_start FieldIsDoorAnimationRunning +FieldIsDoorAnimationRunning: @ 0x0808A280 push {lr} ldr r0, _0808A290 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A290: .4byte sub_08089FB8 - thumb_func_end sub_0808A280 +_0808A290: .4byte Task_AnimateDoor + thumb_func_end FieldIsDoorAnimationRunning - thumb_func_start sub_0808A294 -sub_0808A294: @ 0x0808A294 + thumb_func_start GetDoorSoundEffect +GetDoorSoundEffect: @ 0x0808A294 push {lr} adds r3, r0, #0 adds r2, r1, #0 @@ -280886,7 +280886,7 @@ _0808A2C2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A294 + thumb_func_end GetDoorSoundEffect thumb_func_start sub_0808A2C8 sub_0808A2C8: @ 0x0808A2C8 @@ -280916,8 +280916,8 @@ _0808A2F6: .align 2, 0 thumb_func_end sub_0808A2C8 - thumb_func_start sub_0808A2FC -sub_0808A2FC: @ 0x0808A2FC + thumb_func_start MovementType_Player +MovementType_Player: @ 0x0808A2FC push {lr} adds r1, r0, #0 movs r0, #0x2e @@ -280928,13 +280928,13 @@ sub_0808A2FC: @ 0x0808A2FC ldr r2, _0808A318 adds r0, r0, r2 ldr r2, _0808A31C - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 _0808A318: .4byte gUnknown_2036FF0 _0808A31C: .4byte sub_0808A320 - thumb_func_end sub_0808A2FC + thumb_func_end MovementType_Player thumb_func_start sub_0808A320 sub_0808A320: @ 0x0808A320 @@ -280942,8 +280942,8 @@ sub_0808A320: @ 0x0808A320 bx lr thumb_func_end sub_0808A320 - thumb_func_start sub_0808A324 -sub_0808A324: @ 0x0808A324 + thumb_func_start player_step +player_step: @ 0x0808A324 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -280971,21 +280971,21 @@ sub_0808A324: @ 0x0808A324 bl Bike_TryAcroBikeHistoryUpdate adds r0, r5, #0 mov r1, r8 - bl sub_0808A39C + bl TryInterruptEventObjectSpecialAnim lsls r0, r0, #0x18 cmp r0, #0 bne _0808A38A adds r0, r5, #0 bl npc_clear_strange_bits - bl sub_0808AD4C - bl sub_0808A478 + bl DoPlayerAvatarTransition + bl TryDoMetatileBehaviorForcedMovement lsls r0, r0, #0x18 cmp r0, #0 bne _0808A38A mov r0, r8 adds r1, r7, #0 adds r2, r6, #0 - bl sub_0808A424 + bl MovePlayerAvatarUsingKeypadInput bl PlayerAllowForcedMovementIfMovingSameDirection _0808A38A: pop {r3} @@ -280996,10 +280996,10 @@ _0808A38A: .align 2, 0 _0808A394: .4byte gUnknown_2037230 _0808A398: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808A324 + thumb_func_end player_step - thumb_func_start sub_0808A39C -sub_0808A39C: @ 0x0808A39C + thumb_func_start TryInterruptEventObjectSpecialAnim +TryInterruptEventObjectSpecialAnim: @ 0x0808A39C push {r4, r5, r6, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -281051,7 +281051,7 @@ _0808A3F8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A39C + thumb_func_end TryInterruptEventObjectSpecialAnim thumb_func_start npc_clear_strange_bits npc_clear_strange_bits: @ 0x0808A400 @@ -281075,8 +281075,8 @@ npc_clear_strange_bits: @ 0x0808A400 _0808A420: .4byte gUnknown_2037230 thumb_func_end npc_clear_strange_bits - thumb_func_start sub_0808A424 -sub_0808A424: @ 0x0808A424 + thumb_func_start MovePlayerAvatarUsingKeypadInput +MovePlayerAvatarUsingKeypadInput: @ 0x0808A424 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -281092,20 +281092,20 @@ sub_0808A424: @ 0x0808A424 beq _0808A44C adds r0, r3, #0 adds r1, r4, #0 - bl sub_081199B4 + bl MovePlayerOnBike b _0808A454 .align 2, 0 _0808A448: .4byte gUnknown_2037230 _0808A44C: adds r0, r3, #0 adds r1, r2, #0 - bl sub_0808A7CC + bl MovePlayerNotOnBike _0808A454: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808A424 + thumb_func_end MovePlayerAvatarUsingKeypadInput thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection PlayerAllowForcedMovementIfMovingSameDirection: @ 0x0808A45C @@ -281125,17 +281125,17 @@ _0808A46E: _0808A474: .4byte gUnknown_2037230 thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection - thumb_func_start sub_0808A478 -sub_0808A478: @ 0x0808A478 + thumb_func_start TryDoMetatileBehaviorForcedMovement +TryDoMetatileBehaviorForcedMovement: @ 0x0808A478 push {r4, lr} ldr r4, _0808A498 - bl sub_0808A49C + bl GetForcedMovementByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r0, r4 ldr r0, [r0] bl _call_via_r0 - thumb_func_end sub_0808A478 + thumb_func_end TryDoMetatileBehaviorForcedMovement thumb_func_start sub_0808A48C sub_0808A48C: @ 0x0808A48C @@ -281148,8 +281148,8 @@ sub_0808A48C: @ 0x0808A48C _0808A498: .4byte gUnknown_846F864 thumb_func_end sub_0808A48C - thumb_func_start sub_0808A49C -sub_0808A49C: @ 0x0808A49C + thumb_func_start GetForcedMovementByMetatileBehavior +GetForcedMovementByMetatileBehavior: @ 0x0808A49C push {r4, r5, r6, lr} ldr r3, _0808A4D8 ldrb r1, [r3] @@ -281196,10 +281196,10 @@ _0808A4F0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A49C + thumb_func_end GetForcedMovementByMetatileBehavior - thumb_func_start sub_0808A4F8 -sub_0808A4F8: @ 0x0808A4F8 + thumb_func_start ForcedMovement_None +ForcedMovement_None: @ 0x0808A4F8 push {r4, lr} ldr r4, _0808A53C ldrb r1, [r4] @@ -281236,10 +281236,10 @@ _0808A532: .align 2, 0 _0808A53C: .4byte gUnknown_2037230 _0808A540: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808A4F8 + thumb_func_end ForcedMovement_None - thumb_func_start sub_0808A544 -sub_0808A544: @ 0x0808A544 + thumb_func_start DoForcedMovement +DoForcedMovement: @ 0x0808A544 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -281250,7 +281250,7 @@ sub_0808A544: @ 0x0808A544 lsrs r5, r0, #0x18 ldr r6, _0808A584 adds r0, r5, #0 - bl sub_0808A920 + bl CheckForPlayerAvatarCollision lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r7, r4, #0 @@ -281264,7 +281264,7 @@ sub_0808A544: @ 0x0808A544 strb r0, [r6] cmp r4, #0 beq _0808A5A0 - bl sub_0808A4F8 + bl ForcedMovement_None cmp r4, #4 bhi _0808A588 movs r0, #0 @@ -281300,7 +281300,7 @@ _0808A5AC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A544 + thumb_func_end DoForcedMovement thumb_func_start DoForcedMovementInCurrentDirection DoForcedMovementInCurrentDirection: @ 0x0808A5BC @@ -281319,7 +281319,7 @@ DoForcedMovementInCurrentDirection: @ 0x0808A5BC strb r2, [r0, #1] ldrb r0, [r0, #0x18] lsrs r0, r0, #4 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -281339,120 +281339,120 @@ sub_0808A5F0: @ 0x0808A5F0 pop {r1} bx r1 .align 2, 0 -_0808A600: .4byte sub_0808B09C +_0808A600: .4byte PlayerGoSpeed2 thumb_func_end sub_0808A5F0 - thumb_func_start sub_0808A604 -sub_0808A604: @ 0x0808A604 + thumb_func_start ForcedMovement_WalkSouth +ForcedMovement_WalkSouth: @ 0x0808A604 push {lr} ldr r1, _0808A618 movs r0, #1 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A618: .4byte sub_0808B084 - thumb_func_end sub_0808A604 +_0808A618: .4byte PlayerGoSpeed1 + thumb_func_end ForcedMovement_WalkSouth - thumb_func_start sub_0808A61C -sub_0808A61C: @ 0x0808A61C + thumb_func_start ForcedMovement_WalkNorth +ForcedMovement_WalkNorth: @ 0x0808A61C push {lr} ldr r1, _0808A630 movs r0, #2 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A630: .4byte sub_0808B084 - thumb_func_end sub_0808A61C +_0808A630: .4byte PlayerGoSpeed1 + thumb_func_end ForcedMovement_WalkNorth - thumb_func_start sub_0808A634 -sub_0808A634: @ 0x0808A634 + thumb_func_start ForcedMovement_WalkWest +ForcedMovement_WalkWest: @ 0x0808A634 push {lr} ldr r1, _0808A648 movs r0, #3 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A648: .4byte sub_0808B084 - thumb_func_end sub_0808A634 +_0808A648: .4byte PlayerGoSpeed1 + thumb_func_end ForcedMovement_WalkWest - thumb_func_start sub_0808A64C -sub_0808A64C: @ 0x0808A64C + thumb_func_start ForcedMovement_WalkEast +ForcedMovement_WalkEast: @ 0x0808A64C push {lr} ldr r1, _0808A660 movs r0, #4 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A660: .4byte sub_0808B084 - thumb_func_end sub_0808A64C +_0808A660: .4byte PlayerGoSpeed1 + thumb_func_end ForcedMovement_WalkEast - thumb_func_start sub_0808A664 -sub_0808A664: @ 0x0808A664 + thumb_func_start ForcedMovement_PushedSouthByCurrent +ForcedMovement_PushedSouthByCurrent: @ 0x0808A664 push {lr} ldr r1, _0808A678 movs r0, #1 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A678: .4byte sub_0808B0B4 - thumb_func_end sub_0808A664 +_0808A678: .4byte pokemonanimfunc_49 + thumb_func_end ForcedMovement_PushedSouthByCurrent - thumb_func_start sub_0808A67C -sub_0808A67C: @ 0x0808A67C + thumb_func_start ForcedMovement_PushedNorthByCurrent +ForcedMovement_PushedNorthByCurrent: @ 0x0808A67C push {lr} ldr r1, _0808A690 movs r0, #2 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A690: .4byte sub_0808B0B4 - thumb_func_end sub_0808A67C +_0808A690: .4byte pokemonanimfunc_49 + thumb_func_end ForcedMovement_PushedNorthByCurrent - thumb_func_start sub_0808A694 -sub_0808A694: @ 0x0808A694 + thumb_func_start ForcedMovement_PushedWestByCurrent +ForcedMovement_PushedWestByCurrent: @ 0x0808A694 push {lr} ldr r1, _0808A6A8 movs r0, #3 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A6A8: .4byte sub_0808B0B4 - thumb_func_end sub_0808A694 +_0808A6A8: .4byte pokemonanimfunc_49 + thumb_func_end ForcedMovement_PushedWestByCurrent - thumb_func_start sub_0808A6AC -sub_0808A6AC: @ 0x0808A6AC + thumb_func_start ForcedMovement_PushedEastByCurrent +ForcedMovement_PushedEastByCurrent: @ 0x0808A6AC push {lr} ldr r1, _0808A6C0 movs r0, #4 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0808A6C0: .4byte sub_0808B0B4 - thumb_func_end sub_0808A6AC +_0808A6C0: .4byte pokemonanimfunc_49 + thumb_func_end ForcedMovement_PushedEastByCurrent thumb_func_start ForcedMovement_Slide ForcedMovement_Slide: @ 0x0808A6C4 @@ -281472,7 +281472,7 @@ ForcedMovement_Slide: @ 0x0808A6C4 movs r4, #2 orrs r3, r4 strb r3, [r2, #1] - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4} @@ -281483,8 +281483,8 @@ _0808A6F4: .4byte gUnknown_2037230 _0808A6F8: .4byte gUnknown_2036FF0 thumb_func_end ForcedMovement_Slide - thumb_func_start sub_0808A6FC -sub_0808A6FC: @ 0x0808A6FC + thumb_func_start ForcedMovement_SlideSouth +ForcedMovement_SlideSouth: @ 0x0808A6FC push {lr} ldr r1, _0808A710 movs r0, #1 @@ -281494,11 +281494,11 @@ sub_0808A6FC: @ 0x0808A6FC pop {r1} bx r1 .align 2, 0 -_0808A710: .4byte sub_0808B09C - thumb_func_end sub_0808A6FC +_0808A710: .4byte PlayerGoSpeed2 + thumb_func_end ForcedMovement_SlideSouth - thumb_func_start sub_0808A714 -sub_0808A714: @ 0x0808A714 + thumb_func_start ForcedMovement_SlideNorth +ForcedMovement_SlideNorth: @ 0x0808A714 push {lr} ldr r1, _0808A728 movs r0, #2 @@ -281508,11 +281508,11 @@ sub_0808A714: @ 0x0808A714 pop {r1} bx r1 .align 2, 0 -_0808A728: .4byte sub_0808B09C - thumb_func_end sub_0808A714 +_0808A728: .4byte PlayerGoSpeed2 + thumb_func_end ForcedMovement_SlideNorth - thumb_func_start sub_0808A72C -sub_0808A72C: @ 0x0808A72C + thumb_func_start ForcedMovement_SlideWest +ForcedMovement_SlideWest: @ 0x0808A72C push {lr} ldr r1, _0808A740 movs r0, #3 @@ -281522,11 +281522,11 @@ sub_0808A72C: @ 0x0808A72C pop {r1} bx r1 .align 2, 0 -_0808A740: .4byte sub_0808B09C - thumb_func_end sub_0808A72C +_0808A740: .4byte PlayerGoSpeed2 + thumb_func_end ForcedMovement_SlideWest - thumb_func_start sub_0808A744 -sub_0808A744: @ 0x0808A744 + thumb_func_start ForcedMovement_SlideEast +ForcedMovement_SlideEast: @ 0x0808A744 push {lr} ldr r1, _0808A758 movs r0, #4 @@ -281536,29 +281536,29 @@ sub_0808A744: @ 0x0808A744 pop {r1} bx r1 .align 2, 0 -_0808A758: .4byte sub_0808B09C - thumb_func_end sub_0808A744 +_0808A758: .4byte PlayerGoSpeed2 + thumb_func_end ForcedMovement_SlideEast - thumb_func_start sub_0808A75C -sub_0808A75C: @ 0x0808A75C + thumb_func_start ForcedMovement_0xBB +ForcedMovement_0xBB: @ 0x0808A75C push {lr} bl sub_0808BE3C movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0808A75C + thumb_func_end ForcedMovement_0xBB - thumb_func_start sub_0808A768 -sub_0808A768: @ 0x0808A768 + thumb_func_start ForcedMovement_0xBC +ForcedMovement_0xBC: @ 0x0808A768 push {lr} bl sub_0808BF14 movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0808A768 + thumb_func_end ForcedMovement_0xBC - thumb_func_start sub_0808A774 -sub_0808A774: @ 0x0808A774 + thumb_func_start ForcedMovement_MuddySlope +ForcedMovement_MuddySlope: @ 0x0808A774 push {r4, lr} ldr r0, _0808A7B8 ldrb r1, [r0, #5] @@ -281572,38 +281572,38 @@ sub_0808A774: @ 0x0808A774 ands r0, r1 cmp r0, #0x20 bne _0808A79A - bl sub_0811A988 + bl GetPlayerSpeed lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #3 bgt _0808A7C4 _0808A79A: movs r0, #0 - bl sub_0811A964 + bl Bike_UpdateBikeCounterSpeed ldrb r0, [r4, #1] movs r1, #2 orrs r0, r1 strb r0, [r4, #1] ldr r1, _0808A7C0 movs r0, #1 - bl sub_0808A544 + bl DoForcedMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0808A7C6 .align 2, 0 _0808A7B8: .4byte gUnknown_2037230 _0808A7BC: .4byte gUnknown_2036FF0 -_0808A7C0: .4byte sub_0808B09C +_0808A7C0: .4byte PlayerGoSpeed2 _0808A7C4: movs r0, #0 _0808A7C6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0808A774 + thumb_func_end ForcedMovement_MuddySlope - thumb_func_start sub_0808A7CC -sub_0808A7CC: @ 0x0808A7CC + thumb_func_start MovePlayerNotOnBike +MovePlayerNotOnBike: @ 0x0808A7CC push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -281613,7 +281613,7 @@ sub_0808A7CC: @ 0x0808A7CC lsrs r5, r5, #0x10 ldr r6, _0808A7F8 adds r0, r4, #0 - bl sub_0808A7FC + bl CheckMovementInputNotOnBike lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r0, r6 @@ -281622,7 +281622,7 @@ sub_0808A7CC: @ 0x0808A7CC adds r1, r5, #0 bl _call_via_r2 pop {r4, r5, r6} - thumb_func_end sub_0808A7CC + thumb_func_end MovePlayerNotOnBike thumb_func_start sub_0808A7F4 sub_0808A7F4: @ 0x0808A7F4 @@ -281632,8 +281632,8 @@ sub_0808A7F4: @ 0x0808A7F4 _0808A7F8: .4byte gUnknown_846F8B0 thumb_func_end sub_0808A7F4 - thumb_func_start sub_0808A7FC -sub_0808A7FC: @ 0x0808A7FC + thumb_func_start CheckMovementInputNotOnBike +CheckMovementInputNotOnBike: @ 0x0808A7FC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -281670,10 +281670,10 @@ _0808A836: bx r1 .align 2, 0 _0808A83C: .4byte gUnknown_2037230 - thumb_func_end sub_0808A7FC + thumb_func_end CheckMovementInputNotOnBike - thumb_func_start sub_0808A840 -sub_0808A840: @ 0x0808A840 + thumb_func_start PlayerNotOnBikeNotMoving +PlayerNotOnBikeNotMoving: @ 0x0808A840 push {lr} bl GetPlayerFacingDirection lsls r0, r0, #0x18 @@ -281682,28 +281682,28 @@ sub_0808A840: @ 0x0808A840 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808A840 + thumb_func_end PlayerNotOnBikeNotMoving - thumb_func_start sub_0808A854 -sub_0808A854: @ 0x0808A854 + thumb_func_start PlayerNotOnBikeTurningInPlace +PlayerNotOnBikeTurningInPlace: @ 0x0808A854 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0808B18C + bl PlayerTurnInPlace pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808A854 + thumb_func_end PlayerNotOnBikeTurningInPlace - thumb_func_start sub_0808A864 -sub_0808A864: @ 0x0808A864 + thumb_func_start PlayerNotOnBikeMoving +PlayerNotOnBikeMoving: @ 0x0808A864 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 lsls r1, r1, #0x10 lsrs r6, r1, #0x10 adds r0, r5, #0 - bl sub_0808A920 + bl CheckForPlayerAvatarCollision lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -281717,12 +281717,12 @@ _0808A888: cmp r4, #4 bne _0808A8A0 adds r0, r5, #0 - bl sub_0808AC88 + bl IsPlayerCollidingWithFarawayIslandMew lsls r0, r0, #0x18 cmp r0, #0 beq _0808A8A0 adds r0, r5, #0 - bl sub_0808B15C + bl PlayerNotOnBikeCollideWithFarawayIslandMew b _0808A91A _0808A8A0: subs r0, r4, #5 @@ -281731,7 +281731,7 @@ _0808A8A0: cmp r0, #3 bls _0808A91A adds r0, r5, #0 - bl sub_0808B138 + bl PlayerNotOnBikeCollide b _0808A91A _0808A8B2: ldr r4, _0808A8C8 @@ -281741,7 +281741,7 @@ _0808A8B2: cmp r0, #0 beq _0808A8CC adds r0, r5, #0 - bl sub_0808B09C + bl PlayerGoSpeed2 b _0808A91A .align 2, 0 _0808A8C8: .4byte gUnknown_2037230 @@ -281767,11 +281767,11 @@ _0808A8CC: lsls r0, r0, #2 adds r0, r0, r2 ldrb r0, [r0, #0x1e] - bl sub_0811AA2C + bl IsRunningDisallowed cmp r0, #0 bne _0808A914 adds r0, r5, #0 - bl sub_0808B0E4 + bl PlayerRun ldrb r1, [r4] movs r0, #0x80 orrs r0, r1 @@ -281781,15 +281781,15 @@ _0808A8CC: _0808A910: .4byte gUnknown_2036FF0 _0808A914: adds r0, r5, #0 - bl sub_0808B084 + bl PlayerGoSpeed1 _0808A91A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0808A864 + thumb_func_end PlayerNotOnBikeMoving - thumb_func_start sub_0808A920 -sub_0808A920: @ 0x0808A920 + thumb_func_start CheckForPlayerAvatarCollision +CheckForPlayerAvatarCollision: @ 0x0808A920 push {r4, r5, r6, lr} sub sp, #8 adds r6, r0, #0 @@ -281829,7 +281829,7 @@ sub_0808A920: @ 0x0808A920 str r0, [sp] adds r0, r4, #0 adds r3, r6, #0 - bl sub_0808A9F8 + bl CheckForEventObjectCollision lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #8 @@ -281839,7 +281839,7 @@ sub_0808A920: @ 0x0808A920 .align 2, 0 _0808A984: .4byte gUnknown_2037230 _0808A988: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808A920 + thumb_func_end CheckForPlayerAvatarCollision thumb_func_start sub_0808A98C sub_0808A98C: @ 0x0808A98C @@ -281894,8 +281894,8 @@ _0808A9F0: .4byte gUnknown_2037230 _0808A9F4: .4byte gUnknown_2036FF0 thumb_func_end sub_0808A98C - thumb_func_start sub_0808A9F8 -sub_0808A9F8: @ 0x0808A9F8 + thumb_func_start CheckForEventObjectCollision +CheckForEventObjectCollision: @ 0x0808A9F8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -281918,7 +281918,7 @@ sub_0808A9F8: @ 0x0808A9F8 adds r1, r5, #0 adds r2, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sp @@ -281943,7 +281943,7 @@ _0808AA48: asrs r7, r4, #0x10 adds r1, r7, #0 adds r2, r6, #0 - bl sub_0808AB78 + bl ShouldJumpLedge lsls r0, r0, #0x18 cmp r0, #0 beq _0808AA6C @@ -281975,7 +281975,7 @@ _0808AA88: adds r0, r6, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_080FC760 + bl CheckForRotatingGatePuzzleCollision cmp r0, #0 beq _0808AAA6 movs r0, #8 @@ -281985,7 +281985,7 @@ _0808AAA6: adds r1, r4, #0 mov r2, sl mov r3, sp - bl sub_0808AC48 + bl check_acro_bike_metatile _0808AAB2: mov r0, sp ldrb r0, [r0] @@ -281999,7 +281999,7 @@ _0808AAB6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808A9F8 + thumb_func_end CheckForEventObjectCollision thumb_func_start sub_0808AAC8 sub_0808AAC8: @ 0x0808AAC8 @@ -282017,7 +282017,7 @@ sub_0808AAC8: @ 0x0808AAC8 adds r1, r5, #0 adds r2, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sp @@ -282037,7 +282037,7 @@ _0808AB06: adds r1, r4, #0 adds r2, r7, #0 mov r3, sp - bl sub_0808AC48 + bl check_acro_bike_metatile _0808AB12: mov r0, sp ldrb r0, [r0] @@ -282068,7 +282068,7 @@ sub_0808AB20: @ 0x0808AB20 asrs r0, r5, #0x10 lsls r4, r4, #0x10 asrs r1, r4, #0x10 - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -282076,7 +282076,7 @@ sub_0808AB20: @ 0x0808AB20 lsrs r0, r5, #0x10 lsrs r1, r4, #0x10 movs r2, #3 - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x10 @@ -282095,8 +282095,8 @@ _0808AB72: bx r1 thumb_func_end sub_0808AB20 - thumb_func_start sub_0808AB78 -sub_0808AB78: @ 0x0808AB78 + thumb_func_start ShouldJumpLedge +ShouldJumpLedge: @ 0x0808AB78 push {lr} lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -282104,7 +282104,7 @@ sub_0808AB78: @ 0x0808AB78 asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_0809657C + bl GetLedgeJumpDirection lsls r0, r0, #0x18 cmp r0, #0 bne _0808AB94 @@ -282116,7 +282116,7 @@ _0808AB96: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808AB78 + thumb_func_end ShouldJumpLedge thumb_func_start sub_0808AB9C sub_0808AB9C: @ 0x0808AB9C @@ -282168,7 +282168,7 @@ sub_0808AB9C: @ 0x0808AB9C ldrsh r2, [r5, r0] adds r0, r4, #0 adds r3, r7, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _0808AC3C @@ -282186,7 +282186,7 @@ sub_0808AB9C: @ 0x0808AB9C bne _0808AC3C adds r0, r6, #0 adds r1, r7, #0 - bl sub_0808BC74 + bl StartStrengthAnim movs r0, #1 b _0808AC3E .align 2, 0 @@ -282202,8 +282202,8 @@ _0808AC3E: .align 2, 0 thumb_func_end sub_0808AB9C - thumb_func_start sub_0808AC48 -sub_0808AC48: @ 0x0808AC48 + thumb_func_start check_acro_bike_metatile +check_acro_bike_metatile: @ 0x0808AC48 push {r4, r5, r6, r7, lr} adds r6, r3, #0 lsls r2, r2, #0x18 @@ -282237,10 +282237,10 @@ _0808AC82: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0808AC48 + thumb_func_end check_acro_bike_metatile - thumb_func_start sub_0808AC88 -sub_0808AC88: @ 0x0808AC88 + thumb_func_start IsPlayerCollidingWithFarawayIslandMew +IsPlayerCollidingWithFarawayIslandMew: @ 0x0808AC88 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -282324,7 +282324,7 @@ _0808AD26: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808AC88 + thumb_func_end IsPlayerCollidingWithFarawayIslandMew thumb_func_start SetPlayerAvatarTransitionFlags SetPlayerAvatarTransitionFlags: @ 0x0808AD30 @@ -282335,15 +282335,15 @@ SetPlayerAvatarTransitionFlags: @ 0x0808AD30 ldrb r1, [r2, #1] orrs r0, r1 strb r0, [r2, #1] - bl sub_0808AD4C + bl DoPlayerAvatarTransition pop {r0} bx r0 .align 2, 0 _0808AD48: .4byte gUnknown_2037230 thumb_func_end SetPlayerAvatarTransitionFlags - thumb_func_start sub_0808AD4C -sub_0808AD4C: @ 0x0808AD4C + thumb_func_start DoPlayerAvatarTransition +DoPlayerAvatarTransition: @ 0x0808AD4C push {r4, r5, lr} ldr r0, _0808AD94 ldrb r4, [r0, #1] @@ -282385,7 +282385,7 @@ _0808AD8C: _0808AD94: .4byte gUnknown_2037230 _0808AD98: .4byte gUnknown_846F8D8 _0808AD9C: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808AD4C + thumb_func_end DoPlayerAvatarTransition thumb_func_start sub_0808ADA0 sub_0808ADA0: @ 0x0808ADA0 @@ -282393,8 +282393,8 @@ sub_0808ADA0: @ 0x0808ADA0 .align 2, 0 thumb_func_end sub_0808ADA0 - thumb_func_start sub_0808ADA4 -sub_0808ADA4: @ 0x0808ADA4 + thumb_func_start PlayerAvatarTransition_Normal +PlayerAvatarTransition_Normal: @ 0x0808ADA4 push {r4, lr} adds r4, r0, #0 movs r0, #0 @@ -282403,20 +282403,20 @@ sub_0808ADA4: @ 0x0808ADA4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #1 - bl sub_0808B878 + bl SetPlayerAvatarStateMask pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808ADA4 + thumb_func_end PlayerAvatarTransition_Normal - thumb_func_start sub_0808ADD0 -sub_0808ADD0: @ 0x0808ADD0 + thumb_func_start PlayerAvatarTransition_MachBike +PlayerAvatarTransition_MachBike: @ 0x0808ADD0 push {r4, lr} adds r4, r0, #0 movs r0, #1 @@ -282425,23 +282425,23 @@ sub_0808ADD0: @ 0x0808ADD0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #2 - bl sub_0808B878 + bl SetPlayerAvatarStateMask movs r0, #0 movs r1, #0 bl BikeClearState pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808ADD0 + thumb_func_end PlayerAvatarTransition_MachBike - thumb_func_start sub_0808AE04 -sub_0808AE04: @ 0x0808AE04 + thumb_func_start PlayerAvatarTransition_AcroBike +PlayerAvatarTransition_AcroBike: @ 0x0808AE04 push {r4, lr} adds r4, r0, #0 movs r0, #2 @@ -282450,24 +282450,24 @@ sub_0808AE04: @ 0x0808AE04 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #4 - bl sub_0808B878 + bl SetPlayerAvatarStateMask movs r0, #0 movs r1, #0 bl BikeClearState - bl sub_0811A9D8 + bl Bike_HandleBumpySlopeJump pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808AE04 + thumb_func_end PlayerAvatarTransition_AcroBike - thumb_func_start sub_0808AE3C -sub_0808AE3C: @ 0x0808AE3C + thumb_func_start PlayerAvatarTransition_Surfing +PlayerAvatarTransition_Surfing: @ 0x0808AE3C push {r4, lr} adds r4, r0, #0 movs r0, #3 @@ -282476,13 +282476,13 @@ sub_0808AE3C: @ 0x0808AE3C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #8 - bl sub_0808B878 + bl SetPlayerAvatarStateMask ldr r1, _0808AE90 movs r2, #0x10 ldrsh r0, [r4, r2] @@ -282494,7 +282494,7 @@ sub_0808AE3C: @ 0x0808AE3C ldrb r0, [r0, #5] str r0, [r1, #8] movs r0, #8 - bl sub_080B5270 + bl FieldEffectStart lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strb r0, [r4, #0x1a] @@ -282506,10 +282506,10 @@ sub_0808AE3C: @ 0x0808AE3C .align 2, 0 _0808AE90: .4byte gUnknown_20388A8 _0808AE94: .4byte gUnknown_2037230 - thumb_func_end sub_0808AE3C + thumb_func_end PlayerAvatarTransition_Surfing - thumb_func_start sub_0808AE98 -sub_0808AE98: @ 0x0808AE98 + thumb_func_start PlayerAvatarTransition_Underwater +PlayerAvatarTransition_Underwater: @ 0x0808AE98 push {r4, lr} adds r4, r0, #0 movs r0, #4 @@ -282518,23 +282518,23 @@ sub_0808AE98: @ 0x0808AE98 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #0x10 - bl sub_0808B878 + bl SetPlayerAvatarStateMask ldrb r0, [r4, #4] bl sub_0815573C strb r0, [r4, #0x1a] pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808AE98 + thumb_func_end PlayerAvatarTransition_Underwater - thumb_func_start sub_0808AECC -sub_0808AECC: @ 0x0808AECC + thumb_func_start PlayerAvatarTransition_ReturnToField +PlayerAvatarTransition_ReturnToField: @ 0x0808AECC ldr r2, _0808AED8 ldrb r1, [r2] movs r0, #0x20 @@ -282543,7 +282543,7 @@ sub_0808AECC: @ 0x0808AECC bx lr .align 2, 0 _0808AED8: .4byte gUnknown_2037230 - thumb_func_end sub_0808AECC + thumb_func_end PlayerAvatarTransition_ReturnToField thumb_func_start sub_0808AEDC sub_0808AEDC: @ 0x0808AEDC @@ -282559,7 +282559,7 @@ sub_0808AEDC: @ 0x0808AEDC lsls r0, r0, #0x18 cmp r0, #0 bne _0808AF0C - bl sub_0808AF20 + bl player_is_anim_in_certain_ranges lsls r0, r0, #0x18 cmp r0, #0 bne _0808AF1A @@ -282581,8 +282581,8 @@ _0808AF1A: bx r0 thumb_func_end sub_0808AEDC - thumb_func_start sub_0808AF20 -sub_0808AF20: @ 0x0808AF20 + thumb_func_start player_is_anim_in_certain_ranges +player_is_anim_in_certain_ranges: @ 0x0808AF20 push {lr} ldr r2, _0808AF6C ldr r0, _0808AF70 @@ -282630,12 +282630,12 @@ _0808AF76: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808AF20 + thumb_func_end player_is_anim_in_certain_ranges thumb_func_start sub_0808AF7C sub_0808AF7C: @ 0x0808AF7C push {lr} - bl sub_0808AF20 + bl player_is_anim_in_certain_ranges lsls r0, r0, #0x18 cmp r0, #0 beq _0808AF98 @@ -282750,8 +282750,8 @@ _0808B040: .4byte gUnknown_2037230 _0808B044: .4byte gUnknown_2036FF0 thumb_func_end sub_0808B020 - thumb_func_start sub_0808B048 -sub_0808B048: @ 0x0808B048 + thumb_func_start PlayerSetAnimId +PlayerSetAnimId: @ 0x0808B048 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -282771,7 +282771,7 @@ sub_0808B048: @ 0x0808B048 ldr r1, _0808B080 adds r0, r0, r1 adds r1, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement _0808B076: pop {r4, r5} pop {r0} @@ -282779,10 +282779,10 @@ _0808B076: .align 2, 0 _0808B07C: .4byte gUnknown_2037230 _0808B080: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808B048 + thumb_func_end PlayerSetAnimId - thumb_func_start sub_0808B084 -sub_0808B084: @ 0x0808B084 + thumb_func_start PlayerGoSpeed1 +PlayerGoSpeed1: @ 0x0808B084 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282790,13 +282790,13 @@ sub_0808B084: @ 0x0808B084 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B084 + thumb_func_end PlayerGoSpeed1 - thumb_func_start sub_0808B09C -sub_0808B09C: @ 0x0808B09C + thumb_func_start PlayerGoSpeed2 +PlayerGoSpeed2: @ 0x0808B09C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282804,13 +282804,13 @@ sub_0808B09C: @ 0x0808B09C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B09C + thumb_func_end PlayerGoSpeed2 - thumb_func_start sub_0808B0B4 -sub_0808B0B4: @ 0x0808B0B4 + thumb_func_start pokemonanimfunc_49 +pokemonanimfunc_49: @ 0x0808B0B4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282818,13 +282818,13 @@ sub_0808B0B4: @ 0x0808B0B4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B0B4 + thumb_func_end pokemonanimfunc_49 - thumb_func_start sub_0808B0CC -sub_0808B0CC: @ 0x0808B0CC + thumb_func_start PlayerGoSpeed4 +PlayerGoSpeed4: @ 0x0808B0CC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282832,13 +282832,13 @@ sub_0808B0CC: @ 0x0808B0CC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B0CC + thumb_func_end PlayerGoSpeed4 - thumb_func_start sub_0808B0E4 -sub_0808B0E4: @ 0x0808B0E4 + thumb_func_start PlayerRun +PlayerRun: @ 0x0808B0E4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282846,32 +282846,32 @@ sub_0808B0E4: @ 0x0808B0E4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B0E4 + thumb_func_end PlayerRun - thumb_func_start sub_0808B0FC -sub_0808B0FC: @ 0x0808B0FC + thumb_func_start PlayerOnBikeCollide +PlayerOnBikeCollide: @ 0x0808B0FC push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0808B350 + bl PlayCollisionSoundIfNotFacingWarp adds r0, r4, #0 bl sub_08092F08 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808B0FC + thumb_func_end PlayerOnBikeCollide - thumb_func_start sub_0808B120 -sub_0808B120: @ 0x0808B120 + thumb_func_start PlayerOnBikeCollideWithFarawayIslandMew +PlayerOnBikeCollideWithFarawayIslandMew: @ 0x0808B120 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282879,32 +282879,32 @@ sub_0808B120: @ 0x0808B120 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B120 + thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew - thumb_func_start sub_0808B138 -sub_0808B138: @ 0x0808B138 + thumb_func_start PlayerNotOnBikeCollide +PlayerNotOnBikeCollide: @ 0x0808B138 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0808B350 + bl PlayCollisionSoundIfNotFacingWarp adds r0, r4, #0 bl sub_08092EDC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808B138 + thumb_func_end PlayerNotOnBikeCollide - thumb_func_start sub_0808B15C -sub_0808B15C: @ 0x0808B15C + thumb_func_start PlayerNotOnBikeCollideWithFarawayIslandMew +PlayerNotOnBikeCollideWithFarawayIslandMew: @ 0x0808B15C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282912,10 +282912,10 @@ sub_0808B15C: @ 0x0808B15C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B15C + thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew thumb_func_start sub_0808B174 sub_0808B174: @ 0x0808B174 @@ -282926,13 +282926,13 @@ sub_0808B174: @ 0x0808B174 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 thumb_func_end sub_0808B174 - thumb_func_start sub_0808B18C -sub_0808B18C: @ 0x0808B18C + thumb_func_start PlayerTurnInPlace +PlayerTurnInPlace: @ 0x0808B18C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -282940,10 +282940,10 @@ sub_0808B18C: @ 0x0808B18C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B18C + thumb_func_end PlayerTurnInPlace thumb_func_start sub_0808B1A4 sub_0808B1A4: @ 0x0808B1A4 @@ -282958,7 +282958,7 @@ sub_0808B1A4: @ 0x0808B1A4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #8 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 @@ -282974,7 +282974,7 @@ sub_0808B1C8: @ 0x0808B1C8 cmp r0, #0 bne _0808B1FE _0808B1D6: - bl sub_0811A894 + bl IsMonValidSpecies lsls r0, r0, #0x18 cmp r0, #0 beq _0808B1FE @@ -283000,22 +283000,22 @@ _0808B204: .4byte gUnknown_2037230 _0808B208: .4byte gUnknown_2036FF0 thumb_func_end sub_0808B1C8 - thumb_func_start sub_0808B20C -sub_0808B20C: @ 0x0808B20C + thumb_func_start PlayerIdleWheelie +PlayerIdleWheelie: @ 0x0808B20C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08092FB8 + bl HallOfFame_PrintWelcomeText lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B20C + thumb_func_end PlayerIdleWheelie - thumb_func_start sub_0808B224 -sub_0808B224: @ 0x0808B224 + thumb_func_start PlayerStartWheelie +PlayerStartWheelie: @ 0x0808B224 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -283023,10 +283023,10 @@ sub_0808B224: @ 0x0808B224 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 - thumb_func_end sub_0808B224 + thumb_func_end PlayerStartWheelie thumb_func_start sub_0808B23C sub_0808B23C: @ 0x0808B23C @@ -283037,7 +283037,7 @@ sub_0808B23C: @ 0x0808B23C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 thumb_func_end sub_0808B23C @@ -283055,14 +283055,14 @@ sub_0808B254: @ 0x0808B254 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 thumb_func_end sub_0808B254 - thumb_func_start sub_0808B278 -sub_0808B278: @ 0x0808B278 + thumb_func_start PlayerMovingHoppingWheelie +PlayerMovingHoppingWheelie: @ 0x0808B278 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -283070,18 +283070,18 @@ sub_0808B278: @ 0x0808B278 movs r0, #0x22 bl sub_080A306C adds r0, r4, #0 - bl sub_08093068 + bl MovementType_FaceUpAndRight_callback lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808B278 + thumb_func_end PlayerMovingHoppingWheelie - thumb_func_start sub_0808B29C -sub_0808B29C: @ 0x0808B29C + thumb_func_start PlayerLedgeHoppingWheelie +PlayerLedgeHoppingWheelie: @ 0x0808B29C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -283093,14 +283093,14 @@ sub_0808B29C: @ 0x0808B29C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #8 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808B29C + thumb_func_end PlayerLedgeHoppingWheelie - thumb_func_start sub_0808B2C0 -sub_0808B2C0: @ 0x0808B2C0 + thumb_func_start PlayerAcroTurnJump +PlayerAcroTurnJump: @ 0x0808B2C0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -283112,14 +283112,14 @@ sub_0808B2C0: @ 0x0808B2C0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808B2C0 + thumb_func_end PlayerAcroTurnJump - thumb_func_start sub_0808B2E4 -sub_0808B2E4: @ 0x0808B2E4 + thumb_func_start PlayerStandingHoppingWheelie +PlayerStandingHoppingWheelie: @ 0x0808B2E4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -283131,11 +283131,11 @@ sub_0808B2E4: @ 0x0808B2E4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808B2E4 + thumb_func_end PlayerStandingHoppingWheelie thumb_func_start sub_0808B308 sub_0808B308: @ 0x0808B308 @@ -283146,7 +283146,7 @@ sub_0808B308: @ 0x0808B308 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 thumb_func_end sub_0808B308 @@ -283160,7 +283160,7 @@ sub_0808B320: @ 0x0808B320 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 thumb_func_end sub_0808B320 @@ -283174,13 +283174,13 @@ sub_0808B338: @ 0x0808B338 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId pop {r0} bx r0 thumb_func_end sub_0808B338 - thumb_func_start sub_0808B350 -sub_0808B350: @ 0x0808B350 + thumb_func_start PlayCollisionSoundIfNotFacingWarp +PlayCollisionSoundIfNotFacingWarp: @ 0x0808B350 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -283237,10 +283237,10 @@ _0808B3B8: _0808B3C0: .4byte gUnknown_2036FF0 _0808B3C4: .4byte gUnknown_2037230 _0808B3C8: .4byte gUnknown_846F8F8 - thumb_func_end sub_0808B350 + thumb_func_end PlayCollisionSoundIfNotFacingWarp - thumb_func_start sub_0808B3CC -sub_0808B3CC: @ 0x0808B3CC + thumb_func_start GetXYCoordsOneStepInFrontOfPlayer +GetXYCoordsOneStepInFrontOfPlayer: @ 0x0808B3CC push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -283272,7 +283272,7 @@ sub_0808B3CC: @ 0x0808B3CC .align 2, 0 _0808B408: .4byte gUnknown_2036FF0 _0808B40C: .4byte gUnknown_2037230 - thumb_func_end sub_0808B3CC + thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 0x0808B410 @@ -283301,8 +283301,8 @@ _0808B438: .4byte gUnknown_2036FF0 _0808B43C: .4byte gUnknown_2037230 thumb_func_end PlayerGetDestCoords - thumb_func_start sub_0808B440 -sub_0808B440: @ 0x0808B440 + thumb_func_start player_get_pos_including_state_based_drift +player_get_pos_including_state_based_drift: @ 0x0808B440 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -283436,7 +283436,7 @@ _0808B594: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808B440 + thumb_func_end player_get_pos_including_state_based_drift thumb_func_start GetPlayerFacingDirection GetPlayerFacingDirection: @ 0x0808B59C @@ -283515,8 +283515,8 @@ _0808B61C: .4byte gUnknown_2037230 _0808B620: .4byte gUnknown_2036FF0 thumb_func_end sub_0808B5F4 - thumb_func_start sub_0808B624 -sub_0808B624: @ 0x0808B624 + thumb_func_start TestPlayerAvatarFlags +TestPlayerAvatarFlags: @ 0x0808B624 ldr r1, _0808B630 ldrb r1, [r1] ands r1, r0 @@ -283524,7 +283524,7 @@ sub_0808B624: @ 0x0808B624 bx lr .align 2, 0 _0808B630: .4byte gUnknown_2037230 - thumb_func_end sub_0808B624 + thumb_func_end TestPlayerAvatarFlags thumb_func_start sub_0808B634 sub_0808B634: @ 0x0808B634 @@ -283535,19 +283535,19 @@ sub_0808B634: @ 0x0808B634 _0808B63C: .4byte gUnknown_2037230 thumb_func_end sub_0808B634 - thumb_func_start sub_0808B640 -sub_0808B640: @ 0x0808B640 + thumb_func_start GetPlayerAvatarObjectId +GetPlayerAvatarObjectId: @ 0x0808B640 ldr r0, _0808B648 ldrb r0, [r0, #4] bx lr .align 2, 0 _0808B648: .4byte gUnknown_2037230 - thumb_func_end sub_0808B640 + thumb_func_end GetPlayerAvatarObjectId thumb_func_start sub_0808B64C sub_0808B64C: @ 0x0808B64C push {lr} - bl sub_0808A4F8 + bl ForcedMovement_None pop {r0} bx r0 .align 2, 0 @@ -283571,13 +283571,13 @@ sub_0808B658: @ 0x0808B658 adds r0, r4, #0 bl SetEventObjectDirection movs r0, #6 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _0808B690 - bl sub_0811A9D8 + bl Bike_HandleBumpySlopeJump movs r0, #0 - bl sub_0811A964 + bl Bike_UpdateBikeCounterSpeed _0808B690: pop {r4} pop {r0} @@ -283717,11 +283717,11 @@ _0808B760: bx r1 thumb_func_end GetPlayerAvatarGenderByGraphicsId - thumb_func_start sub_0808B764 -sub_0808B764: @ 0x0808B764 + thumb_func_start PartyHasMonWithSurf +PartyHasMonWithSurf: @ 0x0808B764 push {r4, r5, lr} movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 bne _0808B7A8 @@ -283730,7 +283730,7 @@ sub_0808B764: @ 0x0808B764 _0808B776: adds r0, r4, #0 movs r1, #0x39 - bl sub_081B69FC + bl MonKnowsMove lsls r0, r0, #0x18 cmp r0, #0 beq _0808B788 @@ -283750,7 +283750,7 @@ _0808B78E: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0808B776 _0808B7A8: @@ -283761,7 +283761,7 @@ _0808B7AA: bx r1 .align 2, 0 _0808B7B0: .4byte gUnknown_2024190 - thumb_func_end sub_0808B764 + thumb_func_end PartyHasMonWithSurf thumb_func_start IsPlayerSurfingNorth IsPlayerSurfingNorth: @ 0x0808B7B4 @@ -283772,7 +283772,7 @@ IsPlayerSurfingNorth: @ 0x0808B7B4 cmp r0, #2 bne _0808B7D2 movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _0808B7D2 @@ -283785,8 +283785,8 @@ _0808B7D4: bx r1 thumb_func_end IsPlayerSurfingNorth - thumb_func_start sub_0808B7D8 -sub_0808B7D8: @ 0x0808B7D8 + thumb_func_start IsPlayerFacingSurfableFishableWater +IsPlayerFacingSurfableFishableWater: @ 0x0808B7D8 push {r4, r5, lr} sub sp, #4 ldr r0, _0808B850 @@ -283818,7 +283818,7 @@ sub_0808B7D8: @ 0x0808B7D8 lsls r3, r3, #0x1c lsrs r3, r3, #0x1c adds r0, r4, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -283853,10 +283853,10 @@ _0808B85A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808B7D8 + thumb_func_end IsPlayerFacingSurfableFishableWater - thumb_func_start sub_0808B864 -sub_0808B864: @ 0x0808B864 + thumb_func_start ClearPlayerAvatarInfo +ClearPlayerAvatarInfo: @ 0x0808B864 push {lr} ldr r0, _0808B874 movs r1, #0 @@ -283866,10 +283866,10 @@ sub_0808B864: @ 0x0808B864 bx r0 .align 2, 0 _0808B874: .4byte gUnknown_2037230 - thumb_func_end sub_0808B864 + thumb_func_end ClearPlayerAvatarInfo - thumb_func_start sub_0808B878 -sub_0808B878: @ 0x0808B878 + thumb_func_start SetPlayerAvatarStateMask +SetPlayerAvatarStateMask: @ 0x0808B878 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _0808B88C @@ -283881,10 +283881,10 @@ sub_0808B878: @ 0x0808B878 bx lr .align 2, 0 _0808B88C: .4byte gUnknown_2037230 - thumb_func_end sub_0808B878 + thumb_func_end SetPlayerAvatarStateMask - thumb_func_start sub_0808B890 -sub_0808B890: @ 0x0808B890 + thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId +GetPlayerAvatarStateTransitionByGraphicsId: @ 0x0808B890 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -283920,10 +283920,10 @@ _0808B8C8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808B890 + thumb_func_end GetPlayerAvatarStateTransitionByGraphicsId - thumb_func_start sub_0808B8D0 -sub_0808B8D0: @ 0x0808B8D0 + thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState +GetPlayerAvatarGraphicsIdByCurrentState: @ 0x0808B8D0 push {r4, r5, r6, lr} ldr r0, _0808B8F8 ldrb r5, [r0] @@ -283960,7 +283960,7 @@ _0808B90C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808B8D0 + thumb_func_end GetPlayerAvatarGraphicsIdByCurrentState thumb_func_start SetPlayerAvatarExtraStateTransition SetPlayerAvatarExtraStateTransition: @ 0x0808B914 @@ -283972,14 +283972,14 @@ SetPlayerAvatarExtraStateTransition: @ 0x0808B914 lsrs r4, r4, #0x18 ldr r5, _0808B940 ldrb r1, [r5, #7] - bl sub_0808B890 + bl GetPlayerAvatarStateTransitionByGraphicsId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 orrs r0, r4 ldrb r1, [r5, #1] orrs r0, r1 strb r0, [r5, #1] - bl sub_0808AD4C + bl DoPlayerAvatarTransition pop {r4, r5} pop {r0} bx r0 @@ -283987,8 +283987,8 @@ SetPlayerAvatarExtraStateTransition: @ 0x0808B914 _0808B940: .4byte gUnknown_2037230 thumb_func_end SetPlayerAvatarExtraStateTransition - thumb_func_start sub_0808B944 -sub_0808B944: @ 0x0808B944 + thumb_func_start InitPlayerAvatar +InitPlayerAvatar: @ 0x0808B944 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -284056,12 +284056,12 @@ sub_0808B944: @ 0x0808B944 movs r1, #1 orrs r0, r1 strb r0, [r4, #2] - bl sub_08154164 + bl CreateWarpArrowSprite strb r0, [r4, #0x1b] adds r0, r4, #0 mov r1, sb - bl sub_0808DEB4 - bl sub_0808B864 + bl EventObjectTurn + bl ClearPlayerAvatarInfo ldr r0, _0808BA08 strb r6, [r0, #2] strb r6, [r0, #3] @@ -284071,7 +284071,7 @@ sub_0808B944: @ 0x0808B944 mov r1, r8 strb r1, [r0, #7] movs r0, #0x21 - bl sub_0808B878 + bl SetPlayerAvatarStateMask add sp, #0x18 pop {r3, r4} mov r8, r3 @@ -284082,7 +284082,7 @@ sub_0808B944: @ 0x0808B944 .align 2, 0 _0808BA04: .4byte gUnknown_2036FF0 _0808BA08: .4byte gUnknown_2037230 - thumb_func_end sub_0808B944 + thumb_func_end InitPlayerAvatar thumb_func_start sub_0808BA0C sub_0808BA0C: @ 0x0808BA0C @@ -284106,7 +284106,7 @@ sub_0808BA0C: @ 0x0808BA0C orrs r0, r3 strb r0, [r1, #1] movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _0808BA64 @@ -284155,7 +284155,7 @@ sub_0808BA78: @ 0x0808BA78 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r5, #4] lsls r0, r1, #4 adds r0, r0, r1 @@ -284192,7 +284192,7 @@ sub_0808BAC0: @ 0x0808BAC0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r0, [r6, #4] lsls r4, r0, #4 adds r4, r4, r0 @@ -284236,7 +284236,7 @@ sub_0808BB18: @ 0x0808BB18 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r0, [r6, #4] lsls r4, r0, #4 adds r4, r4, r0 @@ -284288,7 +284288,7 @@ sub_0808BB8C: @ 0x0808BB8C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r0, [r6, #4] lsls r4, r0, #4 adds r4, r4, r0 @@ -284359,7 +284359,7 @@ _0808BC06: movs r1, #0 ldrsh r3, [r7, r1] adds r1, r6, #0 - bl sub_081541D4 + bl ShowWarpArrowSprite b _0808BC66 .align 2, 0 _0808BC48: .4byte gUnknown_846F940 @@ -284386,8 +284386,8 @@ _0808BC66: bx r0 thumb_func_end sub_0808BBE4 - thumb_func_start sub_0808BC74 -sub_0808BC74: @ 0x0808BC74 + thumb_func_start StartStrengthAnim +StartStrengthAnim: @ 0x0808BC74 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -284398,7 +284398,7 @@ sub_0808BC74: @ 0x0808BC74 ldr r6, _0808BCA8 adds r0, r6, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0808BCAC @@ -284413,12 +284413,12 @@ sub_0808BC74: @ 0x0808BC74 pop {r0} bx r0 .align 2, 0 -_0808BCA8: .4byte sub_0808BCB0 +_0808BCA8: .4byte Task_BumpBoulder _0808BCAC: .4byte gUnknown_3005B60 - thumb_func_end sub_0808BC74 + thumb_func_end StartStrengthAnim - thumb_func_start sub_0808BCB0 -sub_0808BCB0: @ 0x0808BCB0 + thumb_func_start Task_BumpBoulder +Task_BumpBoulder: @ 0x0808BCB0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -284460,7 +284460,7 @@ _0808BCF8: .4byte gUnknown_846F950 _0808BCFC: .4byte gUnknown_3005B60 _0808BD00: .4byte gUnknown_2036FF0 _0808BD04: .4byte gUnknown_2037230 - thumb_func_end sub_0808BCB0 + thumb_func_end Task_BumpBoulder thumb_func_start sub_0808BD08 sub_0808BD08: @ 0x0808BD08 @@ -284481,8 +284481,8 @@ sub_0808BD08: @ 0x0808BD08 _0808BD24: .4byte gUnknown_2037230 thumb_func_end sub_0808BD08 - thumb_func_start sub_0808BD28 -sub_0808BD28: @ 0x0808BD28 + thumb_func_start do_boulder_dust +do_boulder_dust: @ 0x0808BD28 push {r4, r5, r6, lr} adds r6, r0, #0 adds r5, r1, #0 @@ -284523,14 +284523,14 @@ _0808BD54: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrb r0, [r6, #0xc] bl sub_08092CCC adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldr r2, _0808BDE0 movs r1, #0x10 ldrsh r0, [r4, r1] @@ -284552,7 +284552,7 @@ _0808BD54: lsrs r0, r0, #0x1e str r0, [r2, #0xc] movs r0, #0xa - bl sub_080B5270 + bl FieldEffectStart movs r0, #0xd6 bl sub_080A306C ldrh r0, [r6, #8] @@ -284566,7 +284566,7 @@ _0808BDD6: .align 2, 0 _0808BDE0: .4byte gUnknown_20388A8 _0808BDE4: .4byte gUnknown_20205AC - thumb_func_end sub_0808BD28 + thumb_func_end do_boulder_dust thumb_func_start sub_0808BDE8 sub_0808BDE8: @ 0x0808BDE8 @@ -284592,10 +284592,10 @@ sub_0808BDE8: @ 0x0808BDE8 strb r0, [r1, #6] bl sub_080987E8 ldr r0, _0808BE38 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0808BE2A: movs r0, #0 pop {r4, r5} @@ -284603,7 +284603,7 @@ _0808BE2A: bx r1 .align 2, 0 _0808BE34: .4byte gUnknown_2037230 -_0808BE38: .4byte sub_0808BCB0 +_0808BE38: .4byte Task_BumpBoulder thumb_func_end sub_0808BDE8 thumb_func_start sub_0808BE3C @@ -284612,7 +284612,7 @@ sub_0808BE3C: @ 0x0808BE3C ldr r4, _0808BE58 adds r0, r4, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -284666,8 +284666,8 @@ _0808BEA0: .4byte gUnknown_2037230 _0808BEA4: .4byte gUnknown_2036FF0 thumb_func_end sub_0808BE8C - thumb_func_start sub_0808BEA8 -sub_0808BEA8: @ 0x0808BEA8 + thumb_func_start PlayerAvatar_DoSecretBaseMatJump +PlayerAvatar_DoSecretBaseMatJump: @ 0x0808BEA8 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -284689,7 +284689,7 @@ sub_0808BEA8: @ 0x0808BEA8 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r6, #0xa] adds r0, #1 strh r0, [r6, #0xa] @@ -284704,10 +284704,10 @@ sub_0808BEA8: @ 0x0808BEA8 orrs r0, r1 strb r0, [r5, #1] ldr r0, _0808BF10 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0808BF04: movs r0, #0 pop {r4, r5, r6} @@ -284716,7 +284716,7 @@ _0808BF04: .align 2, 0 _0808BF0C: .4byte gUnknown_2037230 _0808BF10: .4byte sub_0808BE5C - thumb_func_end sub_0808BEA8 + thumb_func_end PlayerAvatar_DoSecretBaseMatJump thumb_func_start sub_0808BF14 sub_0808BF14: @ 0x0808BF14 @@ -284724,7 +284724,7 @@ sub_0808BF14: @ 0x0808BF14 ldr r4, _0808BF30 adds r0, r4, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -284778,8 +284778,8 @@ _0808BF78: .4byte gUnknown_2037230 _0808BF7C: .4byte gUnknown_2036FF0 thumb_func_end sub_0808BF64 - thumb_func_start sub_0808BF80 -sub_0808BF80: @ 0x0808BF80 + thumb_func_start PlayerAvatar_SecretBaseMatSpinStep0 +PlayerAvatar_SecretBaseMatSpinStep0: @ 0x0808BF80 push {lr} ldrh r2, [r0, #8] adds r2, #1 @@ -284798,10 +284798,10 @@ sub_0808BF80: @ 0x0808BF80 bx r1 .align 2, 0 _0808BFA4: .4byte gUnknown_2037230 - thumb_func_end sub_0808BF80 + thumb_func_end PlayerAvatar_SecretBaseMatSpinStep0 - thumb_func_start sub_0808BFA8 -sub_0808BFA8: @ 0x0808BFA8 + thumb_func_start PlayerAvatar_SecretBaseMatSpinStep1 +PlayerAvatar_SecretBaseMatSpinStep1: @ 0x0808BFA8 push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 @@ -284826,7 +284826,7 @@ sub_0808BFA8: @ 0x0808BFA8 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrb r0, [r4, #0xa] cmp r6, r0 bne _0808BFEE @@ -284842,7 +284842,7 @@ _0808BFEE: cmp r0, #3 ble _0808C010 ldrb r0, [r4, #0xa] - bl sub_08093170 + bl GetOppositeDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -284858,10 +284858,10 @@ _0808C010: bx r1 .align 2, 0 _0808C01C: .4byte gUnknown_846F970 - thumb_func_end sub_0808BFA8 + thumb_func_end PlayerAvatar_SecretBaseMatSpinStep1 - thumb_func_start sub_0808C020 -sub_0808C020: @ 0x0808C020 + thumb_func_start PlayerAvatar_SecretBaseMatSpinStep2 +PlayerAvatar_SecretBaseMatSpinStep2: @ 0x0808C020 push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -284880,7 +284880,7 @@ sub_0808C020: @ 0x0808C020 add r0, sp ldrb r1, [r0] adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement movs r0, #1 strh r0, [r5, #8] _0808C050: @@ -284891,10 +284891,10 @@ _0808C050: bx r1 .align 2, 0 _0808C05C: .4byte gUnknown_846F974 - thumb_func_end sub_0808C020 + thumb_func_end PlayerAvatar_SecretBaseMatSpinStep2 - thumb_func_start sub_0808C060 -sub_0808C060: @ 0x0808C060 + thumb_func_start PlayerAvatar_SecretBaseMatSpinStep3 +PlayerAvatar_SecretBaseMatSpinStep3: @ 0x0808C060 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -284904,7 +284904,7 @@ sub_0808C060: @ 0x0808C060 cmp r0, #0 beq _0808C0A4 ldrb r0, [r4, #0xa] - bl sub_08093170 + bl GetOppositeDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_08092CCC @@ -284912,16 +284912,16 @@ sub_0808C060: @ 0x0808C060 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement bl sub_080987E8 ldr r1, _0808C0AC movs r0, #0 strb r0, [r1, #6] ldr r0, _0808C0B0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0808C0A4: movs r0, #0 pop {r4, r5} @@ -284930,7 +284930,7 @@ _0808C0A4: .align 2, 0 _0808C0AC: .4byte gUnknown_2037230 _0808C0B0: .4byte sub_0808BF34 - thumb_func_end sub_0808C060 + thumb_func_end PlayerAvatar_SecretBaseMatSpinStep3 thumb_func_start sub_0808C0B4 sub_0808C0B4: @ 0x0808C0B4 @@ -284939,8 +284939,8 @@ sub_0808C0B4: @ 0x0808C0B4 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 bl sub_080987DC - bl sub_08085168 - bl sub_08085200 + bl Overworld_ClearSavedMusic + bl Overworld_ChangeMusicToDefault ldr r2, _0808C100 ldrb r1, [r2] movs r0, #0xf7 @@ -284953,7 +284953,7 @@ sub_0808C0B4: @ 0x0808C0B4 ldr r5, _0808C104 adds r0, r5, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0808C108 @@ -284968,12 +284968,12 @@ sub_0808C0B4: @ 0x0808C0B4 bx r0 .align 2, 0 _0808C100: .4byte gUnknown_2037230 -_0808C104: .4byte sub_0808C10C +_0808C104: .4byte taskFF_0805D1D4 _0808C108: .4byte gUnknown_3005B60 thumb_func_end sub_0808C0B4 - thumb_func_start sub_0808C10C -sub_0808C10C: @ 0x0808C10C + thumb_func_start taskFF_0805D1D4 +taskFF_0805D1D4: @ 0x0808C10C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -285009,7 +285009,7 @@ _0808C138: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldr r0, _0808C174 str r0, [r4] _0808C160: @@ -285021,7 +285021,7 @@ _0808C168: .4byte gUnknown_2037230 _0808C16C: .4byte gUnknown_2036FF0 _0808C170: .4byte gUnknown_3005B60 _0808C174: .4byte sub_0808C178 - thumb_func_end sub_0808C10C + thumb_func_end taskFF_0805D1D4 thumb_func_start sub_0808C178 sub_0808C178: @ 0x0808C178 @@ -285046,7 +285046,7 @@ sub_0808C178: @ 0x0808C178 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r0, [r4, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -285055,7 +285055,7 @@ sub_0808C178: @ 0x0808C178 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement movs r0, #0 strb r0, [r6, #6] bl sub_080987E8 @@ -285067,7 +285067,7 @@ sub_0808C178: @ 0x0808C178 adds r0, r0, r1 bl DestroySprite adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0808C1DE: pop {r4, r5, r6} pop {r0} @@ -285078,8 +285078,8 @@ _0808C1E8: .4byte gUnknown_2036FF0 _0808C1EC: .4byte gUnknown_20205AC thumb_func_end sub_0808C178 - thumb_func_start sub_0808C1F0 -sub_0808C1F0: @ 0x0808C1F0 + thumb_func_start StartFishing +StartFishing: @ 0x0808C1F0 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -285087,7 +285087,7 @@ sub_0808C1F0: @ 0x0808C1F0 ldr r5, _0808C21C adds r0, r5, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0808C220 @@ -285103,7 +285103,7 @@ sub_0808C1F0: @ 0x0808C1F0 .align 2, 0 _0808C21C: .4byte sub_0808C224 _0808C220: .4byte gUnknown_3005B60 - thumb_func_end sub_0808C1F0 + thumb_func_end StartFishing thumb_func_start sub_0808C224 sub_0808C224: @ 0x0808C224 @@ -285154,8 +285154,8 @@ sub_0808C25C: @ 0x0808C25C _0808C278: .4byte gUnknown_2037230 thumb_func_end sub_0808C25C - thumb_func_start sub_0808C27C -sub_0808C27C: @ 0x0808C27C + thumb_func_start Fishing2 +Fishing2: @ 0x0808C27C push {r4, r5, r6, lr} sub sp, #0x10 adds r5, r0, #0 @@ -285222,13 +285222,13 @@ _0808C304: .4byte gUnknown_846F9BC _0808C308: .4byte gUnknown_846F9C2 _0808C30C: .4byte gUnknown_2036FF0 _0808C310: .4byte gUnknown_2037230 - thumb_func_end sub_0808C27C + thumb_func_end Fishing2 - thumb_func_start sub_0808C314 -sub_0808C314: @ 0x0808C314 + thumb_func_start Fishing3 +Fishing3: @ 0x0808C314 push {r4, lr} adds r4, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldrh r0, [r4, #0xa] adds r0, #1 strh r0, [r4, #0xa] @@ -285244,10 +285244,10 @@ _0808C330: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0808C314 + thumb_func_end Fishing3 - thumb_func_start sub_0808C338 -sub_0808C338: @ 0x0808C338 + thumb_func_start Fishing4 +Fishing4: @ 0x0808C338 push {r4, lr} adds r4, r0, #0 movs r0, #0 @@ -285285,7 +285285,7 @@ _0808C37C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0808C338 + thumb_func_end Fishing4 thumb_func_start sub_0808C384 sub_0808C384: @ 0x0808C384 @@ -285296,7 +285296,7 @@ sub_0808C384: @ 0x0808C384 add r0, sp, #0xc movs r2, #2 bl memcpy - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldrh r0, [r4, #0xa] adds r1, r0, #1 strh r1, [r4, #0xa] @@ -285372,16 +285372,16 @@ _0808C41A: .align 2, 0 thumb_func_end sub_0808C384 - thumb_func_start sub_0808C424 -sub_0808C424: @ 0x0808C424 + thumb_func_start Fishing6 +Fishing6: @ 0x0808C424 push {r4, r5, r6, lr} adds r5, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] movs r6, #0 - bl sub_080B4E54 + bl DoesCurrentMapHaveFishingMons lsls r0, r0, #0x18 cmp r0, #0 bne _0808C444 @@ -285392,11 +285392,11 @@ _0808C444: ldr r4, _0808C494 adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0808C47C adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x15 @@ -285456,7 +285456,7 @@ _0808C4C4: .align 2, 0 _0808C4CC: .4byte gUnknown_2037230 _0808C4D0: .4byte gUnknown_20205AC - thumb_func_end sub_0808C424 + thumb_func_end Fishing6 thumb_func_start sub_0808C4D4 sub_0808C4D4: @ 0x0808C4D4 @@ -285467,7 +285467,7 @@ sub_0808C4D4: @ 0x0808C4D4 add r0, sp, #0xc movs r2, #0xc bl memcpy - bl sub_0808C8E8 + bl AlignFishingAnimationFrames movs r0, #0x12 str r0, [sp] movs r4, #0 @@ -285491,8 +285491,8 @@ sub_0808C4D4: @ 0x0808C4D4 _0808C510: .4byte gUnknown_846F9CA thumb_func_end sub_0808C4D4 - thumb_func_start sub_0808C514 -sub_0808C514: @ 0x0808C514 + thumb_func_start Fishing8 +Fishing8: @ 0x0808C514 push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -285500,7 +285500,7 @@ sub_0808C514: @ 0x0808C514 mov r0, sp movs r2, #6 bl memcpy - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldrh r1, [r4, #0xa] adds r1, #1 strh r1, [r4, #0xa] @@ -285537,10 +285537,10 @@ _0808C55E: bx r1 .align 2, 0 _0808C568: .4byte gUnknown_3002360 - thumb_func_end sub_0808C514 + thumb_func_end Fishing8 - thumb_func_start sub_0808C56C -sub_0808C56C: @ 0x0808C56C + thumb_func_start Fishing9 +Fishing9: @ 0x0808C56C push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -285548,7 +285548,7 @@ sub_0808C56C: @ 0x0808C56C mov r0, sp movs r2, #0xc bl memcpy - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -285591,17 +285591,17 @@ _0808C5C6: bx r1 .align 2, 0 _0808C5D0: .4byte gUnknown_846F9DC - thumb_func_end sub_0808C56C + thumb_func_end Fishing9 - thumb_func_start sub_0808C5D4 -sub_0808C5D4: @ 0x0808C5D4 + thumb_func_start Fishing10 +Fishing10: @ 0x0808C5D4 push {r4, r5, lr} sub sp, #0x10 adds r4, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0808C614 movs r5, #0 str r5, [sp] @@ -285614,7 +285614,7 @@ sub_0808C5D4: @ 0x0808C5D4 movs r0, #0 movs r1, #1 movs r3, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -285626,10 +285626,10 @@ sub_0808C5D4: @ 0x0808C5D4 bx r1 .align 2, 0 _0808C614: .4byte gUnknown_846F9E8 - thumb_func_end sub_0808C5D4 + thumb_func_end Fishing10 - thumb_func_start sub_0808C618 -sub_0808C618: @ 0x0808C618 + thumb_func_start Fishing11 +Fishing11: @ 0x0808C618 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -285638,7 +285638,7 @@ sub_0808C618: @ 0x0808C618 ldrsh r0, [r5, r1] cmp r0, #0 bne _0808C62C - bl sub_0808C8E8 + bl AlignFishingAnimationFrames _0808C62C: bl sub_08004630 movs r1, #0xa @@ -285663,11 +285663,11 @@ _0808C62C: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn ldrb r1, [r7] movs r0, #8 ands r0, r1 @@ -285720,14 +285720,14 @@ _0808C6C8: ldrh r0, [r5, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080B4E8C + bl FishingWildEncounter movs r0, #1 bl sub_080EE470 ldr r0, _0808C700 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0808C6F0: movs r0, #0 pop {r3} @@ -285738,14 +285738,14 @@ _0808C6F0: .align 2, 0 _0808C6FC: .4byte gUnknown_2037230 _0808C700: .4byte sub_0808C224 - thumb_func_end sub_0808C618 + thumb_func_end Fishing11 - thumb_func_start sub_0808C704 -sub_0808C704: @ 0x0808C704 + thumb_func_start Fishing12 +Fishing12: @ 0x0808C704 push {r4, r5, lr} sub sp, #0x10 adds r5, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldr r0, _0808C768 ldrb r0, [r0, #4] lsls r4, r0, #4 @@ -285764,7 +285764,7 @@ sub_0808C704: @ 0x0808C704 bl StartSpriteAnim movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0808C770 movs r0, #0 str r0, [sp] @@ -285777,7 +285777,7 @@ sub_0808C704: @ 0x0808C704 movs r0, #0 movs r1, #1 movs r3, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0xd strh r0, [r5, #8] movs r0, #1 @@ -285789,14 +285789,14 @@ sub_0808C704: @ 0x0808C704 _0808C768: .4byte gUnknown_2037230 _0808C76C: .4byte gUnknown_20205AC _0808C770: .4byte gUnknown_846F9F7 - thumb_func_end sub_0808C704 + thumb_func_end Fishing12 - thumb_func_start sub_0808C774 -sub_0808C774: @ 0x0808C774 + thumb_func_start Fishing13 +Fishing13: @ 0x0808C774 push {r4, r5, lr} sub sp, #0x10 adds r5, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldr r0, _0808C7D8 ldrb r0, [r0, #4] lsls r4, r0, #4 @@ -285815,7 +285815,7 @@ sub_0808C774: @ 0x0808C774 bl StartSpriteAnim movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0808C7E0 movs r0, #0 str r0, [sp] @@ -285828,7 +285828,7 @@ sub_0808C774: @ 0x0808C774 movs r0, #0 movs r1, #1 movs r3, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -285841,13 +285841,13 @@ sub_0808C774: @ 0x0808C774 _0808C7D8: .4byte gUnknown_2037230 _0808C7DC: .4byte gUnknown_20205AC _0808C7E0: .4byte gUnknown_846FA03 - thumb_func_end sub_0808C774 + thumb_func_end Fishing13 thumb_func_start Fishing14 Fishing14: @ 0x0808C7E4 push {r4, lr} adds r4, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -285858,13 +285858,13 @@ Fishing14: @ 0x0808C7E4 .align 2, 0 thumb_func_end Fishing14 - thumb_func_start sub_0808C7FC -sub_0808C7FC: @ 0x0808C7FC + thumb_func_start Fishing15 +Fishing15: @ 0x0808C7FC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} adds r6, r0, #0 - bl sub_0808C8E8 + bl AlignFishingAnimationFrames ldr r7, _0808C890 ldr r5, _0808C894 ldrb r0, [r5, #4] @@ -285888,11 +285888,11 @@ sub_0808C7FC: @ 0x0808C7FC lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #0x18] lsrs r1, r1, #4 adds r0, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn ldrb r1, [r5] movs r0, #8 ands r0, r1 @@ -285935,10 +285935,10 @@ _0808C882: _0808C890: .4byte gUnknown_20205AC _0808C894: .4byte gUnknown_2037230 _0808C898: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808C7FC + thumb_func_end Fishing15 - thumb_func_start sub_0808C89C -sub_0808C89C: @ 0x0808C89C + thumb_func_start Fishing16 +Fishing16: @ 0x0808C89C push {lr} bl sub_08004630 movs r0, #0 @@ -285957,10 +285957,10 @@ sub_0808C89C: @ 0x0808C89C movs r0, #0 bl sub_080EE470 ldr r0, _0808C8E4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0808C8D8: movs r0, #0 pop {r1} @@ -285968,10 +285968,10 @@ _0808C8D8: .align 2, 0 _0808C8E0: .4byte gUnknown_2037230 _0808C8E4: .4byte sub_0808C224 - thumb_func_end sub_0808C89C + thumb_func_end Fishing16 - thumb_func_start sub_0808C8E8 -sub_0808C8E8: @ 0x0808C8E8 + thumb_func_start AlignFishingAnimationFrames +AlignFishingAnimationFrames: @ 0x0808C8E8 push {r4, r5, r6, r7, lr} ldr r0, _0808C9D4 ldrb r1, [r0, #4] @@ -285981,7 +285981,7 @@ sub_0808C8E8: @ 0x0808C8E8 ldr r1, _0808C9D8 adds r4, r0, r1 adds r0, r4, #0 - bl sub_08007358 + bl AnimateSprite movs r0, #0 strh r0, [r4, #0x24] strh r0, [r4, #0x26] @@ -286098,7 +286098,7 @@ _0808C9D4: .4byte gUnknown_2037230 _0808C9D8: .4byte gUnknown_20205AC _0808C9DC: .4byte 0x0000FFF8 _0808C9E0: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808C8E8 + thumb_func_end AlignFishingAnimationFrames thumb_func_start sub_0808C9E4 sub_0808C9E4: @ 0x0808C9E4 @@ -286189,7 +286189,7 @@ _0808CA5E: lsls r0, r0, #4 strh r0, [r5, #6] strh r6, [r7, #0x26] - bl sub_0808E84C + bl CameraObjectReset2 ldrb r0, [r4, #3] movs r1, #4 orrs r0, r1 @@ -286243,7 +286243,7 @@ _0808CABA: _0808CAF0: .4byte gUnknown_3005B48 _0808CAF4: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _0808CAFA: pop {r3} mov r8, r3 @@ -286258,7 +286258,7 @@ sub_0808CB04: @ 0x0808CB04 ldr r4, _0808CB20 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -286269,18 +286269,18 @@ sub_0808CB04: @ 0x0808CB04 _0808CB20: .4byte sub_0808CB6C thumb_func_end sub_0808CB04 - thumb_func_start sub_0808CB24 -sub_0808CB24: @ 0x0808CB24 + thumb_func_start RunOnLoadMapScript +RunOnLoadMapScript: @ 0x0808CB24 push {lr} ldr r0, _0808CB34 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _0808CB34: .4byte sub_0808CB6C - thumb_func_end sub_0808CB24 + thumb_func_end RunOnLoadMapScript thumb_func_start sub_0808CB38 sub_0808CB38: @ 0x0808CB38 @@ -286288,7 +286288,7 @@ sub_0808CB38: @ 0x0808CB38 ldr r4, _0808CB54 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -286303,7 +286303,7 @@ _0808CB54: .4byte sub_0808CA04 sub_0808CB58: @ 0x0808CB58 push {lr} ldr r0, _0808CB68 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -286398,7 +286398,7 @@ _0808CBCE: lsls r0, r0, #4 strh r0, [r5, #6] strh r6, [r7, #0x26] - bl sub_0808E84C + bl CameraObjectReset2 ldrb r0, [r4, #3] movs r2, #4 orrs r0, r2 @@ -286498,9 +286498,9 @@ _0808CCAA: adds r0, r7, #0 adds r0, #0x43 strb r1, [r0] - bl sub_0808E7FC + bl CameraObjectReset1 mov r0, r8 - bl sub_080A8964 + bl DestroyTask _0808CCEE: pop {r3, r4} mov r8, r3 @@ -286565,8 +286565,8 @@ _0808CD5A: bx r1 thumb_func_end sub_0808CCFC - thumb_func_start sub_0808CD60 -sub_0808CD60: @ 0x0808CD60 + thumb_func_start ClearEventObject +ClearEventObject: @ 0x0808CD60 push {r4, lr} adds r4, r0, #0 movs r1, #0 @@ -286582,7 +286582,7 @@ sub_0808CD60: @ 0x0808CD60 pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808CD60 + thumb_func_end ClearEventObject thumb_func_start ClearAllEventObjects ClearAllEventObjects: @ 0x0808CD80 @@ -286594,7 +286594,7 @@ _0808CD86: adds r0, r0, r4 lsls r0, r0, #2 adds r0, r0, r5 - bl sub_0808CD60 + bl ClearEventObject adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -286607,20 +286607,20 @@ _0808CD86: _0808CDA4: .4byte gUnknown_2036FF0 thumb_func_end ClearAllEventObjects - thumb_func_start sub_0808CDA8 -sub_0808CDA8: @ 0x0808CDA8 + thumb_func_start ResetEventObjects +ResetEventObjects: @ 0x0808CDA8 push {lr} - bl sub_08087030 + bl ClearLinkPlayerEventObjects bl ClearAllEventObjects - bl sub_0808B864 - bl sub_0808CDC0 + bl ClearPlayerAvatarInfo + bl CreateReflectionEffectSprites pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808CDA8 + thumb_func_end ResetEventObjects - thumb_func_start sub_0808CDC0 -sub_0808CDC0: @ 0x0808CDC0 + thumb_func_start CreateReflectionEffectSprites +CreateReflectionEffectSprites: @ 0x0808CDC0 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -286632,7 +286632,7 @@ sub_0808CDC0: @ 0x0808CDC0 movs r1, #0 movs r2, #0 movs r3, #0x1f - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0808CE60 @@ -286665,7 +286665,7 @@ sub_0808CDC0: @ 0x0808CDC0 movs r1, #0 movs r2, #0 movs r3, #0x1f - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -286696,10 +286696,10 @@ sub_0808CDC0: @ 0x0808CDC0 .align 2, 0 _0808CE5C: .4byte gUnknown_84DDE4C _0808CE60: .4byte gUnknown_20205AC - thumb_func_end sub_0808CDC0 + thumb_func_end CreateReflectionEffectSprites - thumb_func_start sub_0808CE64 -sub_0808CE64: @ 0x0808CE64 + thumb_func_start GetFirstInactiveEventObjectId +GetFirstInactiveEventObjectId: @ 0x0808CE64 push {lr} movs r1, #0 ldr r2, _0808CE70 @@ -286726,7 +286726,7 @@ _0808CE8E: adds r0, r1, #0 pop {r1} bx r1 - thumb_func_end sub_0808CE64 + thumb_func_end GetFirstInactiveEventObjectId thumb_func_start GetEventObjectIdByLocalIdAndMap GetEventObjectIdByLocalIdAndMap: @ 0x0808CE94 @@ -286739,10 +286739,10 @@ GetEventObjectIdByLocalIdAndMap: @ 0x0808CE94 lsrs r2, r2, #0x18 cmp r0, #0xfe bls _0808CEAC - bl sub_0808CF78 + bl GetEventObjectIdByLocalId b _0808CEB0 _0808CEAC: - bl sub_0808CF28 + bl GetEventObjectIdByLocalIdAndMapInternal _0808CEB0: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -286818,8 +286818,8 @@ _0808CF1C: _0808CF24: .4byte gUnknown_2036FF0 thumb_func_end GetEventObjectIdByXY - thumb_func_start sub_0808CF28 -sub_0808CF28: @ 0x0808CF28 + thumb_func_start GetEventObjectIdByLocalIdAndMapInternal +GetEventObjectIdByLocalIdAndMapInternal: @ 0x0808CF28 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -286863,10 +286863,10 @@ _0808CF70: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808CF28 + thumb_func_end GetEventObjectIdByLocalIdAndMapInternal - thumb_func_start sub_0808CF78 -sub_0808CF78: @ 0x0808CF78 + thumb_func_start GetEventObjectIdByLocalId +GetEventObjectIdByLocalId: @ 0x0808CF78 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -286900,7 +286900,7 @@ _0808CFAC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808CF78 + thumb_func_end GetEventObjectIdByLocalId thumb_func_start InitEventObjectStateFromTemplate InitEventObjectStateFromTemplate: @ 0x0808CFB4 @@ -286918,7 +286918,7 @@ InitEventObjectStateFromTemplate: @ 0x0808CFB4 adds r1, r6, #0 adds r2, r7, #0 mov r3, sp - bl sub_0808D180 + bl GetAvailableEventObjectId lsls r0, r0, #0x18 cmp r0, #0 beq _0808CFDE @@ -286933,7 +286933,7 @@ _0808CFDE: ldr r1, _0808D0E0 adds r4, r0, r1 adds r0, r4, #0 - bl sub_0808CD60 + bl ClearEventObject ldrh r3, [r5, #4] adds r3, #7 lsls r3, r3, #0x10 @@ -287009,7 +287009,7 @@ _0808CFDE: adds r0, r4, #0 bl SetEventObjectDirection adds r0, r4, #0 - bl sub_0808E04C + bl SetEventObjectDynamicGraphicsId ldr r1, _0808D0E8 ldrb r0, [r4, #6] adds r0, r0, r1 @@ -287060,8 +287060,8 @@ _0808D0E4: .4byte gUnknown_84DDA21 _0808D0E8: .4byte gUnknown_84DD9D0 thumb_func_end InitEventObjectStateFromTemplate - thumb_func_start sub_0808D0EC -sub_0808D0EC: @ 0x0808D0EC + thumb_func_start Unref_TryInitLocalEventObject +Unref_TryInitLocalEventObject: @ 0x0808D0EC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -287072,11 +287072,11 @@ sub_0808D0EC: @ 0x0808D0EC ldr r0, [r4, #4] cmp r0, #0 beq _0808D16E - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0808D118 - bl sub_081AA7B8 + bl GetNumBattlePyramidEventObjects lsls r0, r0, #0x18 lsrs r6, r0, #0x18 b _0808D13A @@ -287138,10 +287138,10 @@ _0808D170: bx r1 .align 2, 0 _0808D17C: .4byte gUnknown_3005AEC - thumb_func_end sub_0808D0EC + thumb_func_end Unref_TryInitLocalEventObject - thumb_func_start sub_0808D180 -sub_0808D180: @ 0x0808D180 + thumb_func_start GetAvailableEventObjectId +GetAvailableEventObjectId: @ 0x0808D180 push {r4, r5, r6, r7, lr} mov ip, r3 lsls r0, r0, #0x10 @@ -287229,7 +287229,7 @@ _0808D214: bx r1 .align 2, 0 _0808D21C: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808D180 + thumb_func_end GetAvailableEventObjectId thumb_func_start RemoveEventObject RemoveEventObject: @ 0x0808D220 @@ -287239,13 +287239,13 @@ RemoveEventObject: @ 0x0808D220 rsbs r1, r1, #0 ands r1, r2 strb r1, [r0] - bl sub_0808D27C + bl RemoveEventObjectInternal pop {r0} bx r0 thumb_func_end RemoveEventObject - thumb_func_start sub_0808D234 -sub_0808D234: @ 0x0808D234 + thumb_func_start RemoveEventObjectByLocalIdAndMap +RemoveEventObjectByLocalIdAndMap: @ 0x0808D234 push {lr} sub sp, #4 lsls r0, r0, #0x18 @@ -287279,15 +287279,15 @@ _0808D272: bx r0 .align 2, 0 _0808D278: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808D234 + thumb_func_end RemoveEventObjectByLocalIdAndMap - thumb_func_start sub_0808D27C -sub_0808D27C: @ 0x0808D27C + thumb_func_start RemoveEventObjectInternal +RemoveEventObjectInternal: @ 0x0808D27C push {r4, lr} sub sp, #8 adds r4, r0, #0 ldrb r0, [r4, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrh r2, [r0, #6] ldr r1, _0808D2C0 ldr r0, [sp, #4] @@ -287317,7 +287317,7 @@ sub_0808D27C: @ 0x0808D27C .align 2, 0 _0808D2C0: .4byte 0xFFFF0000 _0808D2C4: .4byte gUnknown_20205AC - thumb_func_end sub_0808D27C + thumb_func_end RemoveEventObjectInternal thumb_func_start RemoveAllEventObjectsExceptPlayer RemoveAllEventObjectsExceptPlayer: @ 0x0808D2C8 @@ -287348,8 +287348,8 @@ _0808D2F4: .4byte gUnknown_2037230 _0808D2F8: .4byte gUnknown_2036FF0 thumb_func_end RemoveAllEventObjectsExceptPlayer - thumb_func_start sub_0808D2FC -sub_0808D2FC: @ 0x0808D2FC + thumb_func_start TrySetupEventObjectSprite +TrySetupEventObjectSprite: @ 0x0808D2FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -287387,7 +287387,7 @@ _0808D338: ldr r1, _0808D360 adds r6, r0, r1 ldrb r0, [r6, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r7, r0, #0 ldrb r0, [r7, #0xc] lsls r0, r0, #0x1c @@ -287396,7 +287396,7 @@ _0808D338: bne _0808D364 ldrh r0, [r7, #2] movs r1, #0 - bl sub_0808E338 + bl LoadPlayerObjectReflectionPalette b _0808D386 .align 2, 0 _0808D360: .4byte gUnknown_2036FF0 @@ -287405,7 +287405,7 @@ _0808D364: bne _0808D372 ldrh r0, [r7, #2] movs r1, #0xa - bl sub_0808E3A8 + bl LoadSpecialObjectReflectionPalette b _0808D386 _0808D372: cmp r5, #0xf @@ -287434,7 +287434,7 @@ _0808D394: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -287563,10 +287563,10 @@ _0808D49C: bx r1 .align 2, 0 _0808D4AC: .4byte gUnknown_20205AC - thumb_func_end sub_0808D2FC + thumb_func_end TrySetupEventObjectSprite - thumb_func_start sub_0808D4B0 -sub_0808D4B0: @ 0x0808D4B0 + thumb_func_start TrySpawnEventObjectTemplate +TrySpawnEventObjectTemplate: @ 0x0808D4B0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -287591,7 +287591,7 @@ sub_0808D4B0: @ 0x0808D4B0 str r0, [sp, #0x20] mov r1, sb ldrb r0, [r1, #1] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r7, r0, #0 add r2, sp, #0x20 mov r0, sb @@ -287615,7 +287615,7 @@ sub_0808D4B0: @ 0x0808D4B0 add r1, sp, #8 adds r2, r6, #0 mov r3, r8 - bl sub_0808D2FC + bl TrySetupEventObjectSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r5, r2, #0 @@ -287650,7 +287650,7 @@ _0808D52C: lsls r0, r0, #2 adds r0, r0, r4 adds r1, r2, #0 - bl sub_0800858C + bl SetSubspriteTables _0808D560: adds r0, r5, #0 _0808D562: @@ -287664,7 +287664,7 @@ _0808D562: .align 2, 0 _0808D570: .4byte gUnknown_20205AC _0808D574: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808D4B0 + thumb_func_end TrySpawnEventObjectTemplate thumb_func_start SpawnSpecialEventObject SpawnSpecialEventObject: @ 0x0808D578 @@ -287687,7 +287687,7 @@ SpawnSpecialEventObject: @ 0x0808D578 ldrsh r0, [r4, r6] str r0, [sp] adds r0, r5, #0 - bl sub_0808D4B0 + bl TrySpawnEventObjectTemplate lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #8 @@ -287764,7 +287764,7 @@ TrySpawnEventObject: @ 0x0808D61C lsrs r6, r2, #0x18 adds r1, r7, #0 adds r2, r6, #0 - bl sub_0808EA98 + bl GetEventObjectTemplateByLocalIdAndMap adds r5, r0, #0 cmp r5, #0 beq _0808D662 @@ -287782,7 +287782,7 @@ TrySpawnEventObject: @ 0x0808D61C adds r0, r5, #0 adds r1, r7, #0 adds r2, r6, #0 - bl sub_0808D4B0 + bl TrySpawnEventObjectTemplate lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0808D664 @@ -287803,7 +287803,7 @@ MakeObjectTemplateFromEventObjectGraphicsInfo: @ 0x0808D66C adds r6, r3, #0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrh r1, [r0] strh r1, [r4] ldrh r1, [r0, #2] @@ -287857,8 +287857,8 @@ MakeObjectTemplateFromEventObjectTemplate: @ 0x0808D6C0 bx r0 thumb_func_end MakeObjectTemplateFromEventObjectTemplate - thumb_func_start sub_0808D6D8 -sub_0808D6D8: @ 0x0808D6D8 + thumb_func_start AddPseudoEventObject +AddPseudoEventObject: @ 0x0808D6D8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -287899,11 +287899,11 @@ _0808D71E: asrs r2, r2, #0x10 adds r0, r6, #0 mov r3, sb - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r6, #0 - bl sub_08000BF0 + bl Free cmp r5, #0x40 beq _0808D762 ldr r1, [sp] @@ -287915,7 +287915,7 @@ _0808D71E: ldr r0, _0808D778 adds r4, r4, r0 adds r0, r4, #0 - bl sub_0800858C + bl SetSubspriteTables adds r4, #0x42 ldrb r1, [r4] movs r0, #0x3f @@ -287935,10 +287935,10 @@ _0808D762: .align 2, 0 _0808D774: .4byte 0x0000FFFF _0808D778: .4byte gUnknown_20205AC - thumb_func_end sub_0808D6D8 + thumb_func_end AddPseudoEventObject - thumb_func_start sub_0808D77C -sub_0808D77C: @ 0x0808D77C + thumb_func_start sprite_new +sprite_new: @ 0x0808D77C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -287965,7 +287965,7 @@ sub_0808D77C: @ 0x0808D77C lsrs r4, r4, #0x18 mov sl, r4 adds r0, r5, #0 - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r4, r0, #0 ldr r1, _0808D87C add r3, sp, #0x1c @@ -287997,7 +287997,7 @@ sub_0808D77C: @ 0x0808D77C ldrsh r2, [r6, r0] mov r0, sp movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -288061,7 +288061,7 @@ _0808D854: ldrh r0, [r4, #2] lsls r1, r1, #0x1c lsrs r1, r1, #0x1c - bl sub_0808E3A8 + bl LoadSpecialObjectReflectionPalette b _0808D89C .align 2, 0 _0808D87C: .4byte UpdateEventObjectSpriteSubpriorityAndVisibility @@ -288082,7 +288082,7 @@ _0808D89C: cmp r1, #0 beq _0808D8B8 adds r0, r5, #0 - bl sub_0800858C + bl SetSubspriteTables adds r2, r5, #0 adds r2, #0x42 ldrb r0, [r2] @@ -288117,10 +288117,10 @@ _0808D8DC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808D77C + thumb_func_end sprite_new - thumb_func_start sub_0808D8F0 -sub_0808D8F0: @ 0x0808D8F0 + thumb_func_start TrySpawnEventObjects +TrySpawnEventObjects: @ 0x0808D8F0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -288154,11 +288154,11 @@ sub_0808D8F0: @ 0x0808D8F0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sl, r0 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0808D950 - bl sub_081AA7B8 + bl GetNumBattlePyramidEventObjects lsls r0, r0, #0x18 lsrs r6, r0, #0x18 b _0808D960 @@ -288236,7 +288236,7 @@ _0808D974: str r0, [sp] adds r0, r4, #0 asrs r3, r3, #0x10 - bl sub_0808D4B0 + bl TrySpawnEventObjectTemplate _0808D9DE: adds r0, r5, #1 lsls r0, r0, #0x18 @@ -288254,7 +288254,7 @@ _0808D9E8: bx r0 .align 2, 0 _0808D9F8: .4byte gUnknown_3005AEC - thumb_func_end sub_0808D8F0 + thumb_func_end TrySpawnEventObjects thumb_func_start RemoveEventObjectsOutsideView RemoveEventObjectsOutsideView: @ 0x0808D9FC @@ -288387,7 +288387,7 @@ sub_0808DADC: @ 0x0808DADC lsrs r4, r4, #0x10 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_0808B864 + bl ClearPlayerAvatarInfo movs r6, #0 ldr r7, _0808DB24 lsls r4, r4, #0x10 @@ -288411,7 +288411,7 @@ _0808DB10: lsrs r6, r0, #0x18 cmp r6, #0xf bls _0808DAF6 - bl sub_0808CDC0 + bl CreateReflectionEffectSprites pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -288463,7 +288463,7 @@ _0808DB5C: movs r0, #0 str r0, [sp, #0x20] ldrb r0, [r6, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r5, r0, #0 ldrh r2, [r5, #6] ldr r1, _0808DBC0 @@ -288490,7 +288490,7 @@ _0808DB5C: bne _0808DBC8 ldrh r0, [r5, #2] lsrs r1, r1, #0x1c - bl sub_0808E338 + bl LoadPlayerObjectReflectionPalette b _0808DBEE .align 2, 0 _0808DBB8: .4byte gUnknown_2031FA8 @@ -288503,7 +288503,7 @@ _0808DBC8: bne _0808DBD8 ldrh r0, [r5, #2] lsrs r1, r1, #0x1c - bl sub_0808E3A8 + bl LoadSpecialObjectReflectionPalette b _0808DBEE _0808DBD8: mov r0, r8 @@ -288525,7 +288525,7 @@ _0808DBEE: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 cmp r7, #0x40 @@ -288584,15 +288584,15 @@ _0808DBEE: bne _0808DC82 mov r0, sb adds r1, r7, #0 - bl sub_0808DD34 - bl sub_08154164 + bl SetPlayerAvatarEventObjectIdAndObjectId + bl CreateWarpArrowSprite strb r0, [r6, #0x1b] _0808DC82: ldr r1, [sp, #0x20] cmp r1, #0 beq _0808DC8E adds r0, r4, #0 - bl sub_0800858C + bl SetSubspriteTables _0808DC8E: mov r0, r8 lsls r2, r0, #4 @@ -288679,8 +288679,8 @@ sub_0808DCFC: @ 0x0808DCFC bx r0 thumb_func_end sub_0808DCFC - thumb_func_start sub_0808DD34 -sub_0808DD34: @ 0x0808DD34 + thumb_func_start SetPlayerAvatarEventObjectIdAndObjectId +SetPlayerAvatarEventObjectIdAndObjectId: @ 0x0808DD34 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -288704,10 +288704,10 @@ sub_0808DD34: @ 0x0808DD34 .align 2, 0 _0808DD60: .4byte gUnknown_2037230 _0808DD64: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808DD34 + thumb_func_end SetPlayerAvatarEventObjectIdAndObjectId - thumb_func_start sub_0808DD68 -sub_0808DD68: @ 0x0808DD68 + thumb_func_start EventObjectSetGraphicsId +EventObjectSetGraphicsId: @ 0x0808DD68 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -288716,7 +288716,7 @@ sub_0808DD68: @ 0x0808DD68 lsrs r1, r1, #0x18 mov r8, r1 mov r0, r8 - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r6, r0, #0 ldrb r1, [r7, #4] lsls r0, r1, #4 @@ -288731,7 +288731,7 @@ sub_0808DD68: @ 0x0808DD68 bne _0808DDA4 ldrh r0, [r6, #2] adds r1, r5, #0 - bl sub_0808E28C + bl PatchObjectPalette b _0808DDC6 .align 2, 0 _0808DDA0: .4byte gUnknown_20205AC @@ -288740,7 +288740,7 @@ _0808DDA4: bne _0808DDB2 ldrh r0, [r6, #2] lsrs r1, r1, #0x1c - bl sub_0808E3A8 + bl LoadSpecialObjectReflectionPalette b _0808DDC6 _0808DDB2: cmp r5, #0xf @@ -288831,7 +288831,7 @@ _0808DDC6: lsrs r0, r0, #7 cmp r0, #0 beq _0808DE68 - bl sub_0808E7FC + bl CameraObjectReset1 _0808DE68: pop {r3} mov r8, r3 @@ -288839,7 +288839,7 @@ _0808DE68: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808DD68 + thumb_func_end EventObjectSetGraphicsId thumb_func_start EventObjectSetGraphicsIdByLocalIdAndMap EventObjectSetGraphicsIdByLocalIdAndMap: @ 0x0808DE74 @@ -288866,7 +288866,7 @@ EventObjectSetGraphicsIdByLocalIdAndMap: @ 0x0808DE74 ldr r1, _0808DEB0 adds r0, r0, r1 adds r1, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId _0808DEA8: add sp, #4 pop {r4} @@ -288876,8 +288876,8 @@ _0808DEA8: _0808DEB0: .4byte gUnknown_2036FF0 thumb_func_end EventObjectSetGraphicsIdByLocalIdAndMap - thumb_func_start sub_0808DEB4 -sub_0808DEB4: @ 0x0808DEB4 + thumb_func_start EventObjectTurn +EventObjectTurn: @ 0x0808DEB4 push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x18 @@ -288915,7 +288915,7 @@ _0808DEFA: bx r0 .align 2, 0 _0808DF00: .4byte gUnknown_20205AC - thumb_func_end sub_0808DEB4 + thumb_func_end EventObjectTurn thumb_func_start EventObjectTurnByLocalIdAndMap EventObjectTurnByLocalIdAndMap: @ 0x0808DF04 @@ -288942,7 +288942,7 @@ EventObjectTurnByLocalIdAndMap: @ 0x0808DF04 ldr r1, _0808DF40 adds r0, r0, r1 adds r1, r4, #0 - bl sub_0808DEB4 + bl EventObjectTurn _0808DF38: add sp, #4 pop {r4} @@ -288963,15 +288963,15 @@ PlayerObjectTurn: @ 0x0808DF44 lsls r0, r0, #2 ldr r2, _0808DF60 adds r0, r0, r2 - bl sub_0808DEB4 + bl EventObjectTurn pop {r0} bx r0 .align 2, 0 _0808DF60: .4byte gUnknown_2036FF0 thumb_func_end PlayerObjectTurn - thumb_func_start sub_0808DF64 -sub_0808DF64: @ 0x0808DF64 + thumb_func_start get_berry_tree_graphics +get_berry_tree_graphics: @ 0x0808DF64 push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r7, r1, #0 @@ -289002,7 +289002,7 @@ sub_0808DF64: @ 0x0808DF64 ands r0, r1 strb r0, [r4] ldrb r0, [r5, #0x1d] - bl sub_080E0EF8 + bl GetBerryTypeByBerryTreeId subs r0, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -289020,7 +289020,7 @@ _0808DFB8: adds r0, r0, r6 ldrb r1, [r0] adds r0, r5, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldr r0, _0808DFFC adds r0, r4, r0 ldr r0, [r0] @@ -289047,10 +289047,10 @@ _0808DFF0: _0808DFF8: .4byte gUnknown_84E4D5C _0808DFFC: .4byte gUnknown_84E4C04 _0808E000: .4byte gUnknown_84E4CB0 - thumb_func_end sub_0808DF64 + thumb_func_end get_berry_tree_graphics - thumb_func_start sub_0808E004 -sub_0808E004: @ 0x0808E004 + thumb_func_start GetEventObjectGraphicsInfo +GetEventObjectGraphicsInfo: @ 0x0808E004 push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -289088,10 +289088,10 @@ _0808E042: bx r1 .align 2, 0 _0808E048: .4byte gUnknown_84DDA74 - thumb_func_end sub_0808E004 + thumb_func_end GetEventObjectGraphicsInfo - thumb_func_start sub_0808E04C -sub_0808E04C: @ 0x0808E04C + thumb_func_start SetEventObjectDynamicGraphicsId +SetEventObjectDynamicGraphicsId: @ 0x0808E04C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #5] @@ -289106,7 +289106,7 @@ _0808E062: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0808E04C + thumb_func_end SetEventObjectDynamicGraphicsId thumb_func_start npc_by_local_id_and_map_set_field_1_bit_x20 npc_by_local_id_and_map_set_field_1_bit_x20: @ 0x0808E068 @@ -289323,8 +289323,8 @@ _0808E1E8: .4byte gUnknown_2036FF0 _0808E1EC: .4byte gUnknown_20205AC thumb_func_end sub_0808E19C - thumb_func_start sub_0808E1F0 -sub_0808E1F0: @ 0x0808E1F0 + thumb_func_start UpdateShoalTideFlag +UpdateShoalTideFlag: @ 0x0808E1F0 push {lr} bl FreeAllSpritePalettes ldr r1, _0808E200 @@ -289334,14 +289334,14 @@ sub_0808E1F0: @ 0x0808E1F0 bx r0 .align 2, 0 _0808E200: .4byte gUnknown_30030BC - thumb_func_end sub_0808E1F0 + thumb_func_end UpdateShoalTideFlag thumb_func_start LoadEventObjectPalette LoadEventObjectPalette: @ 0x0808E204 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0808E2F0 + bl FindEventObjectPaletteIndexByTag lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r0, _0808E228 @@ -289395,7 +289395,7 @@ sub_0808E264: @ 0x0808E264 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -289414,15 +289414,15 @@ _0808E284: .align 2, 0 thumb_func_end sub_0808E264 - thumb_func_start sub_0808E28C -sub_0808E28C: @ 0x0808E28C + thumb_func_start PatchObjectPalette +PatchObjectPalette: @ 0x0808E28C push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0808E2F0 + bl FindEventObjectPaletteIndexByTag lsls r0, r0, #0x18 ldr r1, _0808E2C0 lsrs r0, r0, #0x15 @@ -289435,13 +289435,13 @@ sub_0808E28C: @ 0x0808E28C lsrs r4, r4, #0x10 adds r1, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 .align 2, 0 _0808E2C0: .4byte gUnknown_84E401C - thumb_func_end sub_0808E28C + thumb_func_end PatchObjectPalette thumb_func_start PatchObjectPaletteRange PatchObjectPaletteRange: @ 0x0808E2C4 @@ -289456,7 +289456,7 @@ PatchObjectPaletteRange: @ 0x0808E2C4 _0808E2D4: ldrh r0, [r5] adds r1, r4, #0 - bl sub_0808E28C + bl PatchObjectPalette adds r5, #2 adds r0, r4, #1 lsls r0, r0, #0x18 @@ -289470,8 +289470,8 @@ _0808E2E8: .align 2, 0 thumb_func_end PatchObjectPaletteRange - thumb_func_start sub_0808E2F0 -sub_0808E2F0: @ 0x0808E2F0 + thumb_func_start FindEventObjectPaletteIndexByTag +FindEventObjectPaletteIndexByTag: @ 0x0808E2F0 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -289510,10 +289510,10 @@ _0808E332: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0808E2F0 + thumb_func_end FindEventObjectPaletteIndexByTag - thumb_func_start sub_0808E338 -sub_0808E338: @ 0x0808E338 + thumb_func_start LoadPlayerObjectReflectionPalette +LoadPlayerObjectReflectionPalette: @ 0x0808E338 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -289521,7 +289521,7 @@ sub_0808E338: @ 0x0808E338 lsrs r5, r1, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_0808E28C + bl PatchObjectPalette movs r3, #0 ldr r1, _0808E380 ldrh r0, [r1] @@ -289546,7 +289546,7 @@ _0808E35C: adds r0, r0, r1 ldrh r0, [r0] ldrb r1, [r5] - bl sub_0808E28C + bl PatchObjectPalette b _0808E3A0 .align 2, 0 _0808E380: .4byte gUnknown_84E4154 @@ -289567,10 +289567,10 @@ _0808E3A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808E338 + thumb_func_end LoadPlayerObjectReflectionPalette - thumb_func_start sub_0808E3A8 -sub_0808E3A8: @ 0x0808E3A8 + thumb_func_start LoadSpecialObjectReflectionPalette +LoadSpecialObjectReflectionPalette: @ 0x0808E3A8 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -289580,7 +289580,7 @@ sub_0808E3A8: @ 0x0808E3A8 strh r4, [r0] adds r0, r4, #0 adds r1, r5, #0 - bl sub_0808E28C + bl PatchObjectPalette movs r3, #0 ldr r1, _0808E3F8 ldrh r0, [r1] @@ -289605,7 +289605,7 @@ _0808E3D0: adds r0, r0, r1 ldrh r0, [r0] ldrb r1, [r5] - bl sub_0808E28C + bl PatchObjectPalette b _0808E418 .align 2, 0 _0808E3F4: .4byte gUnknown_2037256 @@ -289627,7 +289627,7 @@ _0808E418: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808E3A8 + thumb_func_end LoadSpecialObjectReflectionPalette thumb_func_start sub_0808E420 sub_0808E420: @ 0x0808E420 @@ -289636,7 +289636,7 @@ sub_0808E420: @ 0x0808E420 lsrs r0, r0, #0x10 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_0808E28C + bl PatchObjectPalette pop {r0} bx r0 .align 2, 0 @@ -289662,8 +289662,8 @@ unref_sub_808EAC4: @ 0x0808E434 bx r0 thumb_func_end unref_sub_808EAC4 - thumb_func_start sub_0808E454 -sub_0808E454: @ 0x0808E454 + thumb_func_start ShiftEventObjectCoords +ShiftEventObjectCoords: @ 0x0808E454 ldrh r3, [r0, #0x10] strh r3, [r0, #0x14] ldrh r3, [r0, #0x12] @@ -289672,10 +289672,10 @@ sub_0808E454: @ 0x0808E454 strh r2, [r0, #0x12] bx lr .align 2, 0 - thumb_func_end sub_0808E454 + thumb_func_end ShiftEventObjectCoords - thumb_func_start sub_0808E464 -sub_0808E464: @ 0x0808E464 + thumb_func_start SetEventObjectCoords +SetEventObjectCoords: @ 0x0808E464 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 lsls r2, r2, #0x10 @@ -289686,7 +289686,7 @@ sub_0808E464: @ 0x0808E464 strh r2, [r0, #0x12] bx lr .align 2, 0 - thumb_func_end sub_0808E464 + thumb_func_end SetEventObjectCoords thumb_func_start MoveEventObjectToMapCoords MoveEventObjectToMapCoords: @ 0x0808E478 @@ -289707,7 +289707,7 @@ MoveEventObjectToMapCoords: @ 0x0808E478 ldr r1, _0808E514 adds r7, r0, r1 ldrb r0, [r6, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo mov r8, r0 lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -289716,7 +289716,7 @@ MoveEventObjectToMapCoords: @ 0x0808E478 adds r0, r6, #0 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0808E464 + bl SetEventObjectCoords movs r1, #0x10 ldrsh r0, [r6, r1] movs r2, #0x12 @@ -289757,7 +289757,7 @@ MoveEventObjectToMapCoords: @ 0x0808E478 lsrs r0, r0, #7 cmp r0, #0 beq _0808E50A - bl sub_0808E7FC + bl CameraObjectReset1 _0808E50A: pop {r3} mov r8, r3 @@ -289813,18 +289813,18 @@ _0808E560: _0808E568: .4byte gUnknown_2036FF0 thumb_func_end TryMoveEventObjectToMapCoords - thumb_func_start sub_0808E56C -sub_0808E56C: @ 0x0808E56C + thumb_func_start ShiftStillEventObjectCoords +ShiftStillEventObjectCoords: @ 0x0808E56C push {lr} movs r2, #0x10 ldrsh r1, [r0, r2] movs r3, #0x12 ldrsh r2, [r0, r3] - bl sub_0808E454 + bl ShiftEventObjectCoords pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808E56C + thumb_func_end ShiftStillEventObjectCoords thumb_func_start UpdateEventObjectCoordsForCameraUpdate UpdateEventObjectCoordsForCameraUpdate: @ 0x0808E580 @@ -289883,8 +289883,8 @@ _0808E5E0: .4byte gUnknown_2036FD4 _0808E5E4: .4byte gUnknown_2036FF0 thumb_func_end UpdateEventObjectCoordsForCameraUpdate - thumb_func_start sub_0808E5E8 -sub_0808E5E8: @ 0x0808E5E8 + thumb_func_start GetEventObjectIdByXYZ +GetEventObjectIdByXYZ: @ 0x0808E5E8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -289939,7 +289939,7 @@ _0808E644: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808E5E8 + thumb_func_end GetEventObjectIdByXYZ thumb_func_start EventObjectDoesZCoordMatch EventObjectDoesZCoordMatch: @ 0x0808E650 @@ -289983,15 +289983,15 @@ UpdateEventObjectsForCameraUpdate: @ 0x0808E678 asrs r5, r5, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_0808D8F0 + bl TrySpawnEventObjects bl RemoveEventObjectsOutsideView pop {r4, r5} pop {r0} bx r0 thumb_func_end UpdateEventObjectsForCameraUpdate - thumb_func_start sub_0808E6A4 -sub_0808E6A4: @ 0x0808E6A4 + thumb_func_start AddCameraObject +AddCameraObject: @ 0x0808E6A4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -290000,7 +290000,7 @@ sub_0808E6A4: @ 0x0808E6A4 movs r1, #0 movs r2, #0 movs r3, #4 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0808E6E4 @@ -290023,10 +290023,10 @@ sub_0808E6A4: @ 0x0808E6A4 .align 2, 0 _0808E6E0: .4byte gUnknown_846FA28 _0808E6E4: .4byte gUnknown_20205AC - thumb_func_end sub_0808E6A4 + thumb_func_end AddCameraObject - thumb_func_start sub_0808E6E8 -sub_0808E6E8: @ 0x0808E6E8 + thumb_func_start ObjectCB_CameraObject +ObjectCB_CameraObject: @ 0x0808E6E8 push {r4, r5, lr} sub sp, #0xc mov r2, sp @@ -290045,7 +290045,7 @@ sub_0808E6E8: @ 0x0808E6E8 bx r0 .align 2, 0 _0808E70C: .4byte gUnknown_846FA40 - thumb_func_end sub_0808E6E8 + thumb_func_end ObjectCB_CameraObject thumb_func_start CameraObject_0 CameraObject_0: @ 0x0808E710 @@ -290139,8 +290139,8 @@ CameraObject_2: @ 0x0808E784 _0808E7B0: .4byte gUnknown_20205AC thumb_func_end CameraObject_2 - thumb_func_start sub_0808E7B4 -sub_0808E7B4: @ 0x0808E7B4 + thumb_func_start FindCameraObject +FindCameraObject: @ 0x0808E7B4 push {r4, r5, lr} movs r3, #0 ldr r4, _0808E7E0 @@ -290166,7 +290166,7 @@ _0808E7BE: b _0808E7F4 .align 2, 0 _0808E7E0: .4byte gUnknown_20205AC -_0808E7E4: .4byte sub_0808E6E8 +_0808E7E4: .4byte ObjectCB_CameraObject _0808E7E8: adds r0, r3, #1 lsls r0, r0, #0x18 @@ -290179,12 +290179,12 @@ _0808E7F4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808E7B4 + thumb_func_end FindCameraObject - thumb_func_start sub_0808E7FC -sub_0808E7FC: @ 0x0808E7FC + thumb_func_start CameraObjectReset1 +CameraObjectReset1: @ 0x0808E7FC push {lr} - bl sub_0808E7B4 + bl FindCameraObject adds r2, r0, #0 cmp r2, #0 beq _0808E814 @@ -290196,18 +290196,18 @@ sub_0808E7FC: @ 0x0808E7FC _0808E814: pop {r0} bx r0 - thumb_func_end sub_0808E7FC + thumb_func_end CameraObjectReset1 thumb_func_start CameraObjectSetFollowedObjectId CameraObjectSetFollowedObjectId: @ 0x0808E818 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0808E7B4 + bl FindCameraObject cmp r0, #0 beq _0808E82C strh r4, [r0, #0x2e] - bl sub_0808E7FC + bl CameraObjectReset1 _0808E82C: pop {r4} pop {r0} @@ -290218,7 +290218,7 @@ _0808E82C: thumb_func_start CameraObjectGetFollowedObjectId CameraObjectGetFollowedObjectId: @ 0x0808E834 push {lr} - bl sub_0808E7B4 + bl FindCameraObject cmp r0, #0 beq _0808E846 ldrh r0, [r0, #0x2e] @@ -290232,19 +290232,19 @@ _0808E848: bx r1 thumb_func_end CameraObjectGetFollowedObjectId - thumb_func_start sub_0808E84C -sub_0808E84C: @ 0x0808E84C + thumb_func_start CameraObjectReset2 +CameraObjectReset2: @ 0x0808E84C push {lr} - bl sub_0808E7B4 + bl FindCameraObject movs r1, #2 strh r1, [r0, #0x30] pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0808E84C + thumb_func_end CameraObjectReset2 - thumb_func_start sub_0808E85C -sub_0808E85C: @ 0x0808E85C + thumb_func_start CopySprite +CopySprite: @ 0x0808E85C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -290296,10 +290296,10 @@ _0808E8B2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808E85C + thumb_func_end CopySprite - thumb_func_start sub_0808E8C0 -sub_0808E8C0: @ 0x0808E8C0 + thumb_func_start CreateCopySpriteAt +CreateCopySpriteAt: @ 0x0808E8C0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -290357,7 +290357,7 @@ _0808E926: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0808E8C0 + thumb_func_end CreateCopySpriteAt thumb_func_start SetEventObjectDirection SetEventObjectDirection: @ 0x0808E930 @@ -290407,7 +290407,7 @@ GetEventObjectScriptPointerByLocalIdAndMap: @ 0x0808E974 lsrs r1, r1, #0x18 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 - bl sub_0808EA98 + bl GetEventObjectTemplateByLocalIdAndMap ldr r0, [r0, #0x10] pop {r1} bx r1 @@ -290442,7 +290442,7 @@ GetEventObjectFlagIdByLocalIdAndMap: @ 0x0808E9B0 lsrs r1, r1, #0x18 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 - bl sub_0808EA98 + bl GetEventObjectTemplateByLocalIdAndMap ldrh r0, [r0, #0x14] pop {r1} bx r1 @@ -290553,8 +290553,8 @@ _0808EA7A: bx r1 thumb_func_end sub_0808EA44 - thumb_func_start sub_0808EA80 -sub_0808EA80: @ 0x0808EA80 + thumb_func_start EventObjectGetBerryTreeId +EventObjectGetBerryTreeId: @ 0x0808EA80 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0808EA94 @@ -290566,10 +290566,10 @@ sub_0808EA80: @ 0x0808EA80 bx lr .align 2, 0 _0808EA94: .4byte gUnknown_2036FF0 - thumb_func_end sub_0808EA80 + thumb_func_end EventObjectGetBerryTreeId - thumb_func_start sub_0808EA98 -sub_0808EA98: @ 0x0808EA98 + thumb_func_start GetEventObjectTemplateByLocalIdAndMap +GetEventObjectTemplateByLocalIdAndMap: @ 0x0808EA98 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -290610,7 +290610,7 @@ _0808EADC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808EA98 + thumb_func_end GetEventObjectTemplateByLocalIdAndMap thumb_func_start FindEventObjectTemplateByLocalId FindEventObjectTemplateByLocalId: @ 0x0808EAEC @@ -290648,8 +290648,8 @@ _0808EB1C: .align 2, 0 thumb_func_end FindEventObjectTemplateByLocalId - thumb_func_start sub_0808EB24 -sub_0808EB24: @ 0x0808EB24 + thumb_func_start GetBaseTemplateForEventObject +GetBaseTemplateForEventObject: @ 0x0808EB24 push {r4, r5, lr} adds r3, r0, #0 ldrb r0, [r3, #9] @@ -290696,13 +290696,13 @@ _0808EB72: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0808EB24 + thumb_func_end GetBaseTemplateForEventObject thumb_func_start OverrideTemplateCoordsForEventObject OverrideTemplateCoordsForEventObject: @ 0x0808EB78 push {r4, lr} adds r4, r0, #0 - bl sub_0808EB24 + bl GetBaseTemplateForEventObject adds r1, r0, #0 cmp r1, #0 beq _0808EB92 @@ -290722,7 +290722,7 @@ _0808EB92: OverrideEventObjectTemplateScript: @ 0x0808EB98 push {r4, lr} adds r4, r1, #0 - bl sub_0808EB24 + bl GetBaseTemplateForEventObject cmp r0, #0 beq _0808EBA6 str r4, [r0, #0x10] @@ -290737,7 +290737,7 @@ TryOverrideTemplateCoordsForEventObject: @ 0x0808EBAC push {r4, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 - bl sub_0808EB24 + bl GetBaseTemplateForEventObject cmp r0, #0 beq _0808EBBC strb r4, [r0, #9] @@ -290779,8 +290779,8 @@ _0808EBF2: _0808EBF8: .4byte gUnknown_2036FF0 thumb_func_end TryOverrideEventObjectTemplateCoords - thumb_func_start sub_0808EBFC -sub_0808EBFC: @ 0x0808EBFC + thumb_func_start OverrideSecretBaseDecorationSpriteScript +OverrideSecretBaseDecorationSpriteScript: @ 0x0808EBFC push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -290833,7 +290833,7 @@ _0808EC58: .align 2, 0 _0808EC60: .4byte gUnknown_2036FF0 _0808EC64: .4byte gUnknown_82465B9 - thumb_func_end sub_0808EBFC + thumb_func_end OverrideSecretBaseDecorationSpriteScript thumb_func_start sub_0808EC68 sub_0808EC68: @ 0x0808EC68 @@ -290841,7 +290841,7 @@ sub_0808EC68: @ 0x0808EC68 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0808E1F0 + bl UpdateShoalTideFlag ldr r1, _0808ECA0 ldr r2, _0808ECA4 adds r0, r2, #0 @@ -290885,8 +290885,8 @@ _0808ECC6: _0808ECCC: .4byte gUnknown_84E428C thumb_func_end sub_0808EC68 - thumb_func_start sub_0808ECD0 -sub_0808ECD0: @ 0x0808ECD0 + thumb_func_start GetObjectPaletteTag +GetObjectPaletteTag: @ 0x0808ECD0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -290952,7 +290952,7 @@ _0808ED3E: _0808ED44: .4byte gUnknown_84E41CC _0808ED48: .4byte 0x000011FF _0808ED4C: .4byte gUnknown_2037256 - thumb_func_end sub_0808ECD0 + thumb_func_end GetObjectPaletteTag thumb_func_start MovementType_None MovementType_None: @ 0x0808ED50 @@ -290966,7 +290966,7 @@ MovementType_None: @ 0x0808ED50 ldr r2, _0808ED6C adds r0, r0, r2 ldr r2, _0808ED70 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -290992,7 +290992,7 @@ MovementType_WanderAround: @ 0x0808ED78 ldr r2, _0808ED94 adds r0, r0, r2 ldr r2, _0808ED98 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -291023,8 +291023,8 @@ sub_0808EDB0: @ 0x0808EDB0 _0808EDB8: .4byte gUnknown_84E5B48 thumb_func_end sub_0808EDB0 - thumb_func_start sub_0808EDBC -sub_0808EDBC: @ 0x0808EDBC + thumb_func_start MovementType_WanderAround_Step0 +MovementType_WanderAround_Step0: @ 0x0808EDBC push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -291034,7 +291034,7 @@ sub_0808EDBC: @ 0x0808EDBC pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808EDBC + thumb_func_end MovementType_WanderAround_Step0 thumb_func_start MovementType_WanderAround_Step1 MovementType_WanderAround_Step1: @ 0x0808EDD0 @@ -291050,7 +291050,7 @@ MovementType_WanderAround_Step1: @ 0x0808EDD0 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -291060,11 +291060,11 @@ MovementType_WanderAround_Step1: @ 0x0808EDD0 .align 2, 0 thumb_func_end MovementType_WanderAround_Step1 - thumb_func_start sub_0808EDFC -sub_0808EDFC: @ 0x0808EDFC + thumb_func_start MovementType_WanderAround_Step2 +MovementType_WanderAround_Step2: @ 0x0808EDFC push {r4, r5, r6, lr} adds r6, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808EE30 @@ -291090,7 +291090,7 @@ _0808EE32: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0808EDFC + thumb_func_end MovementType_WanderAround_Step2 thumb_func_start MovementType_WanderAround_Step3 MovementType_WanderAround_Step3: @ 0x0808EE38 @@ -291113,8 +291113,8 @@ _0808EE52: bx r1 thumb_func_end MovementType_WanderAround_Step3 - thumb_func_start sub_0808EE58 -sub_0808EE58: @ 0x0808EE58 + thumb_func_start MovementType_WanderAround_Step4 +MovementType_WanderAround_Step4: @ 0x0808EE58 push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 @@ -291150,7 +291150,7 @@ _0808EE96: bx r1 .align 2, 0 _0808EEA0: .4byte gUnknown_84E5B64 - thumb_func_end sub_0808EE58 + thumb_func_end MovementType_WanderAround_Step4 thumb_func_start MovementType_WanderAround_Step5 MovementType_WanderAround_Step5: @ 0x0808EEA4 @@ -291165,7 +291165,7 @@ MovementType_WanderAround_Step5: @ 0x0808EEA4 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -291183,7 +291183,7 @@ MovementType_WanderAround_Step6: @ 0x0808EED4 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808EEF2 @@ -291202,13 +291202,13 @@ _0808EEF2: .align 2, 0 thumb_func_end MovementType_WanderAround_Step6 - thumb_func_start sub_0808EEFC -sub_0808EEFC: @ 0x0808EEFC + thumb_func_start EventObjectIsTrainerAndCloseToPlayer +EventObjectIsTrainerAndCloseToPlayer: @ 0x0808EEFC push {r4, r5, r6, r7, lr} sub sp, #4 adds r5, r0, #0 movs r0, #0x80 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _0808EF68 @@ -291268,7 +291268,7 @@ _0808EF6E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808EEFC + thumb_func_end EventObjectIsTrainerAndCloseToPlayer thumb_func_start GetVectorDirection GetVectorDirection: @ 0x0808EF78 @@ -291300,8 +291300,8 @@ _0808EFA0: bx r1 thumb_func_end GetVectorDirection - thumb_func_start sub_0808EFA8 -sub_0808EFA8: @ 0x0808EFA8 + thumb_func_start GetLimitedVectorDirection_SouthNorth +GetLimitedVectorDirection_SouthNorth: @ 0x0808EFA8 push {lr} movs r0, #1 lsls r1, r1, #0x10 @@ -291311,10 +291311,10 @@ sub_0808EFA8: @ 0x0808EFA8 _0808EFB4: pop {r1} bx r1 - thumb_func_end sub_0808EFA8 + thumb_func_end GetLimitedVectorDirection_SouthNorth - thumb_func_start sub_0808EFB8 -sub_0808EFB8: @ 0x0808EFB8 + thumb_func_start GetLimitedVectorDirection_WestEast +GetLimitedVectorDirection_WestEast: @ 0x0808EFB8 push {lr} movs r1, #4 lsls r0, r0, #0x10 @@ -291326,7 +291326,7 @@ _0808EFC4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808EFB8 + thumb_func_end GetLimitedVectorDirection_WestEast thumb_func_start GetLimitedVectorDirection_WestNorth GetLimitedVectorDirection_WestNorth: @ 0x0808EFCC @@ -291352,7 +291352,7 @@ GetLimitedVectorDirection_WestNorth: @ 0x0808EFCC adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFB8 + bl GetLimitedVectorDirection_WestEast lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -291365,7 +291365,7 @@ _0808F008: adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFA8 + bl GetLimitedVectorDirection_SouthNorth lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -291402,7 +291402,7 @@ GetLimitedVectorDirection_EastNorth: @ 0x0808F028 adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFB8 + bl GetLimitedVectorDirection_WestEast lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -291415,7 +291415,7 @@ _0808F064: adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFA8 + bl GetLimitedVectorDirection_SouthNorth lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -291452,7 +291452,7 @@ GetLimitedVectorDirection_WestSouth: @ 0x0808F084 adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFB8 + bl GetLimitedVectorDirection_WestEast lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -291465,7 +291465,7 @@ _0808F0C0: adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFA8 + bl GetLimitedVectorDirection_SouthNorth lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -291502,7 +291502,7 @@ GetLimitedVectorDirection_EastSouth: @ 0x0808F0E0 adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFB8 + bl GetLimitedVectorDirection_WestEast lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -291515,7 +291515,7 @@ _0808F11C: adds r1, r5, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_0808EFA8 + bl GetLimitedVectorDirection_SouthNorth lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -291552,7 +291552,7 @@ GetLimitedVectorDirection_SouthNorthWest: @ 0x0808F13C adds r1, r6, #0 adds r2, r5, #0 adds r3, r4, #0 - bl sub_0808EFA8 + bl GetLimitedVectorDirection_SouthNorth lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0808F172: @@ -291585,7 +291585,7 @@ GetLimitedVectorDirection_SouthNorthEast: @ 0x0808F178 adds r1, r6, #0 adds r2, r5, #0 adds r3, r4, #0 - bl sub_0808EFA8 + bl GetLimitedVectorDirection_SouthNorth lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0808F1AE: @@ -291618,7 +291618,7 @@ GetLimitedVectorDirection_NorthWestEast: @ 0x0808F1B4 adds r1, r6, #0 adds r2, r5, #0 adds r3, r4, #0 - bl sub_0808EFB8 + bl GetLimitedVectorDirection_WestEast lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0808F1EA: @@ -291651,7 +291651,7 @@ GetLimitedVectorDirection_SouthWestEast: @ 0x0808F1F0 adds r1, r6, #0 adds r2, r5, #0 adds r3, r4, #0 - bl sub_0808EFB8 + bl GetLimitedVectorDirection_WestEast lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0808F226: @@ -291660,14 +291660,14 @@ _0808F226: bx r1 thumb_func_end GetLimitedVectorDirection_SouthWestEast - thumb_func_start sub_0808F22C -sub_0808F22C: @ 0x0808F22C + thumb_func_start TryGetTrainerEncounterDirection +TryGetTrainerEncounterDirection: @ 0x0808F22C push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 lsls r1, r1, #0x18 lsrs r6, r1, #0x18 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 bne _0808F244 @@ -291731,7 +291731,7 @@ _0808F2A8: bx r1 .align 2, 0 _0808F2B0: .4byte gUnknown_84E5B68 - thumb_func_end sub_0808F22C + thumb_func_end TryGetTrainerEncounterDirection thumb_func_start MovementType_LookAround MovementType_LookAround: @ 0x0808F2B4 @@ -291745,7 +291745,7 @@ MovementType_LookAround: @ 0x0808F2B4 ldr r2, _0808F2D0 adds r0, r0, r2 ldr r2, _0808F2D4 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -291776,8 +291776,8 @@ sub_0808F2EC: @ 0x0808F2EC _0808F2F4: .4byte gUnknown_84E5B94 thumb_func_end sub_0808F2EC - thumb_func_start sub_0808F2F8 -sub_0808F2F8: @ 0x0808F2F8 + thumb_func_start MovementType_LookAround_Step0 +MovementType_LookAround_Step0: @ 0x0808F2F8 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -291787,7 +291787,7 @@ sub_0808F2F8: @ 0x0808F2F8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808F2F8 + thumb_func_end MovementType_LookAround_Step0 thumb_func_start MovementType_LookAround_Step1 MovementType_LookAround_Step1: @ 0x0808F30C @@ -291803,7 +291803,7 @@ MovementType_LookAround_Step1: @ 0x0808F30C lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -291813,12 +291813,12 @@ MovementType_LookAround_Step1: @ 0x0808F30C .align 2, 0 thumb_func_end MovementType_LookAround_Step1 - thumb_func_start sub_0808F338 -sub_0808F338: @ 0x0808F338 + thumb_func_start MovementType_LookAround_Step2 +MovementType_LookAround_Step2: @ 0x0808F338 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808F36E @@ -291846,7 +291846,7 @@ _0808F36E: bx r1 .align 2, 0 _0808F378: .4byte gUnknown_84E5B30 - thumb_func_end sub_0808F338 + thumb_func_end MovementType_LookAround_Step2 thumb_func_start MovementType_LookAround_Step3 MovementType_LookAround_Step3: @ 0x0808F37C @@ -291859,7 +291859,7 @@ MovementType_LookAround_Step3: @ 0x0808F37C cmp r0, #0 bne _0808F39A adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0808F3A2 @@ -291877,8 +291877,8 @@ _0808F3A4: .align 2, 0 thumb_func_end MovementType_LookAround_Step3 - thumb_func_start sub_0808F3AC -sub_0808F3AC: @ 0x0808F3AC + thumb_func_start MovementType_LookAround_Step4 +MovementType_LookAround_Step4: @ 0x0808F3AC push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -291889,7 +291889,7 @@ sub_0808F3AC: @ 0x0808F3AC bl memcpy adds r0, r4, #0 movs r1, #0 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -291911,7 +291911,7 @@ _0808F3DC: bx r1 .align 2, 0 _0808F3F0: .4byte gUnknown_84E5B64 - thumb_func_end sub_0808F3AC + thumb_func_end MovementType_LookAround_Step4 thumb_func_start MovementType_WanderUpAndDown MovementType_WanderUpAndDown: @ 0x0808F3F4 @@ -291925,7 +291925,7 @@ MovementType_WanderUpAndDown: @ 0x0808F3F4 ldr r2, _0808F410 adds r0, r0, r2 ldr r2, _0808F414 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -291956,8 +291956,8 @@ sub_0808F42C: @ 0x0808F42C _0808F434: .4byte gUnknown_84E5BA8 thumb_func_end sub_0808F42C - thumb_func_start sub_0808F438 -sub_0808F438: @ 0x0808F438 + thumb_func_start MovementType_WanderUpAndDown_Step0 +MovementType_WanderUpAndDown_Step0: @ 0x0808F438 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -291967,7 +291967,7 @@ sub_0808F438: @ 0x0808F438 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808F438 + thumb_func_end MovementType_WanderUpAndDown_Step0 thumb_func_start MovementType_WanderUpAndDown_Step1 MovementType_WanderUpAndDown_Step1: @ 0x0808F44C @@ -291983,7 +291983,7 @@ MovementType_WanderUpAndDown_Step1: @ 0x0808F44C lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -291993,11 +291993,11 @@ MovementType_WanderUpAndDown_Step1: @ 0x0808F44C .align 2, 0 thumb_func_end MovementType_WanderUpAndDown_Step1 - thumb_func_start sub_0808F478 -sub_0808F478: @ 0x0808F478 + thumb_func_start MovementType_WanderUpAndDown_Step2 +MovementType_WanderUpAndDown_Step2: @ 0x0808F478 push {r4, r5, r6, lr} adds r6, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808F4AC @@ -292023,7 +292023,7 @@ _0808F4AE: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0808F478 + thumb_func_end MovementType_WanderUpAndDown_Step2 thumb_func_start MovementType_WanderUpAndDown_Step3 MovementType_WanderUpAndDown_Step3: @ 0x0808F4B4 @@ -292046,8 +292046,8 @@ _0808F4CE: bx r1 thumb_func_end MovementType_WanderUpAndDown_Step3 - thumb_func_start sub_0808F4D4 -sub_0808F4D4: @ 0x0808F4D4 + thumb_func_start MovementType_WanderUpAndDown_Step4 +MovementType_WanderUpAndDown_Step4: @ 0x0808F4D4 push {r4, r5, r6, r7, lr} sub sp, #4 adds r5, r0, #0 @@ -292083,7 +292083,7 @@ _0808F512: bx r1 .align 2, 0 _0808F51C: .4byte gUnknown_84E5BC4 - thumb_func_end sub_0808F4D4 + thumb_func_end MovementType_WanderUpAndDown_Step4 thumb_func_start MovementType_WanderUpAndDown_Step5 MovementType_WanderUpAndDown_Step5: @ 0x0808F520 @@ -292098,7 +292098,7 @@ MovementType_WanderUpAndDown_Step5: @ 0x0808F520 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -292116,7 +292116,7 @@ MovementType_WanderUpAndDown_Step6: @ 0x0808F550 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808F56E @@ -292147,7 +292147,7 @@ MovementType_WanderLeftAndRight: @ 0x0808F578 ldr r2, _0808F594 adds r0, r0, r2 ldr r2, _0808F598 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -292178,8 +292178,8 @@ sub_0808F5B0: @ 0x0808F5B0 _0808F5B8: .4byte gUnknown_84E5BC8 thumb_func_end sub_0808F5B0 - thumb_func_start sub_0808F5BC -sub_0808F5BC: @ 0x0808F5BC + thumb_func_start MovementType_WanderLeftAndRight_Step0 +MovementType_WanderLeftAndRight_Step0: @ 0x0808F5BC push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -292189,7 +292189,7 @@ sub_0808F5BC: @ 0x0808F5BC pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808F5BC + thumb_func_end MovementType_WanderLeftAndRight_Step0 thumb_func_start MovementType_WanderLeftAndRight_Step1 MovementType_WanderLeftAndRight_Step1: @ 0x0808F5D0 @@ -292205,7 +292205,7 @@ MovementType_WanderLeftAndRight_Step1: @ 0x0808F5D0 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -292215,11 +292215,11 @@ MovementType_WanderLeftAndRight_Step1: @ 0x0808F5D0 .align 2, 0 thumb_func_end MovementType_WanderLeftAndRight_Step1 - thumb_func_start sub_0808F5FC -sub_0808F5FC: @ 0x0808F5FC + thumb_func_start MovementType_WanderLeftAndRight_Step2 +MovementType_WanderLeftAndRight_Step2: @ 0x0808F5FC push {r4, r5, r6, lr} adds r6, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808F630 @@ -292245,7 +292245,7 @@ _0808F632: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0808F5FC + thumb_func_end MovementType_WanderLeftAndRight_Step2 thumb_func_start MovementType_WanderLeftAndRight_Step3 MovementType_WanderLeftAndRight_Step3: @ 0x0808F638 @@ -292268,8 +292268,8 @@ _0808F652: bx r1 thumb_func_end MovementType_WanderLeftAndRight_Step3 - thumb_func_start sub_0808F658 -sub_0808F658: @ 0x0808F658 + thumb_func_start MovementType_WanderLeftAndRight_Step4 +MovementType_WanderLeftAndRight_Step4: @ 0x0808F658 push {r4, r5, r6, r7, lr} sub sp, #4 adds r5, r0, #0 @@ -292305,7 +292305,7 @@ _0808F696: bx r1 .align 2, 0 _0808F6A0: .4byte gUnknown_84E5BE4 - thumb_func_end sub_0808F658 + thumb_func_end MovementType_WanderLeftAndRight_Step4 thumb_func_start MovementType_WanderLeftAndRight_Step5 MovementType_WanderLeftAndRight_Step5: @ 0x0808F6A4 @@ -292320,7 +292320,7 @@ MovementType_WanderLeftAndRight_Step5: @ 0x0808F6A4 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -292338,7 +292338,7 @@ MovementType_WanderLeftAndRight_Step6: @ 0x0808F6D4 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808F6F2 @@ -292369,7 +292369,7 @@ MovementType_FaceDirection: @ 0x0808F6FC ldr r2, _0808F718 adds r0, r0, r2 ldr r2, _0808F71C - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -292415,7 +292415,7 @@ MovementType_FaceDirection_Step0: @ 0x0808F740 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -292427,7 +292427,7 @@ MovementType_FaceDirection_Step0: @ 0x0808F740 MovementType_FaceDirection_Step1: @ 0x0808F76C push {r4, lr} adds r4, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 bne _0808F77E @@ -292474,7 +292474,7 @@ MovementType_BerryTreeGrowth: @ 0x0808F79C bne _0808F7C8 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0808DF64 + bl get_berry_tree_graphics ldrh r1, [r4, #0x3c] movs r0, #1 orrs r0, r1 @@ -292483,7 +292483,7 @@ _0808F7C8: ldr r2, _0808F7DC adds r0, r5, #0 adds r1, r4, #0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r4, r5} pop {r0} bx r0 @@ -292515,8 +292515,8 @@ sub_0808F7F4: @ 0x0808F7F4 _0808F7FC: .4byte gUnknown_84E5BF4 thumb_func_end sub_0808F7F4 - thumb_func_start sub_0808F800 -sub_0808F800: @ 0x0808F800 + thumb_func_start MovementType_BerryTreeGrowth_Step0 +MovementType_BerryTreeGrowth_Step0: @ 0x0808F800 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -292563,7 +292563,7 @@ sub_0808F800: @ 0x0808F800 lsrs r0, r0, #0x1e str r0, [r1, #0xc] movs r0, #0x17 - bl sub_080B5270 + bl FieldEffectStart strb r7, [r6] _0808F866: movs r0, #0 @@ -292591,11 +292591,11 @@ _0808F870: bne _0808F8AC adds r0, r4, #0 adds r1, r5, #0 - bl sub_0808DF64 + bl get_berry_tree_graphics adds r0, r4, #0 adds r1, r5, #0 movs r2, #0x39 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] b _0808F8B2 @@ -292607,13 +292607,13 @@ _0808F8B2: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0808F800 + thumb_func_end MovementType_BerryTreeGrowth_Step0 thumb_func_start MovementType_BerryTreeGrowth_Step1 MovementType_BerryTreeGrowth_Step1: @ 0x0808F8B8 push {r4, lr} adds r4, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 bne _0808F8CA @@ -292630,8 +292630,8 @@ _0808F8D0: .align 2, 0 thumb_func_end MovementType_BerryTreeGrowth_Step1 - thumb_func_start sub_0808F8D8 -sub_0808F8D8: @ 0x0808F8D8 + thumb_func_start MovementType_BerryTreeGrowth_Step2 +MovementType_BerryTreeGrowth_Step2: @ 0x0808F8D8 push {r4, lr} ldrb r2, [r0] movs r3, #2 @@ -292662,14 +292662,14 @@ sub_0808F8D8: @ 0x0808F8D8 lsrs r0, r0, #0x1e str r0, [r3, #0xc] movs r0, #0x17 - bl sub_080B5270 + bl FieldEffectStart movs r0, #1 pop {r4} pop {r1} bx r1 .align 2, 0 _0808F920: .4byte gUnknown_20388A8 - thumb_func_end sub_0808F8D8 + thumb_func_end MovementType_BerryTreeGrowth_Step2 thumb_func_start MovementType_BerryTreeGrowth_Step3 MovementType_BerryTreeGrowth_Step3: @ 0x0808F924 @@ -292704,7 +292704,7 @@ MovementType_BerryTreeGrowth_Step3: @ 0x0808F924 _0808F95C: adds r0, r3, #0 adds r1, r4, #0 - bl sub_0808DF64 + bl get_berry_tree_graphics movs r0, #4 strh r0, [r4, #0x30] movs r0, #0 @@ -292772,7 +292772,7 @@ MovementType_FaceDownAndUp: @ 0x0808F9C0 ldr r2, _0808F9DC adds r0, r0, r2 ldr r2, _0808F9E0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -292803,8 +292803,8 @@ sub_0808F9F8: @ 0x0808F9F8 _0808FA00: .4byte gUnknown_84E5C08 thumb_func_end sub_0808F9F8 - thumb_func_start sub_0808FA04 -sub_0808FA04: @ 0x0808FA04 + thumb_func_start MovementType_FaceDownAndUp_Step0 +MovementType_FaceDownAndUp_Step0: @ 0x0808FA04 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -292814,7 +292814,7 @@ sub_0808FA04: @ 0x0808FA04 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808FA04 + thumb_func_end MovementType_FaceDownAndUp_Step0 thumb_func_start MovementType_FaceDownAndUp_Step1 MovementType_FaceDownAndUp_Step1: @ 0x0808FA18 @@ -292830,7 +292830,7 @@ MovementType_FaceDownAndUp_Step1: @ 0x0808FA18 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -292840,12 +292840,12 @@ MovementType_FaceDownAndUp_Step1: @ 0x0808FA18 .align 2, 0 thumb_func_end MovementType_FaceDownAndUp_Step1 - thumb_func_start sub_0808FA44 -sub_0808FA44: @ 0x0808FA44 + thumb_func_start MovementType_FaceDownAndUp_Step2 +MovementType_FaceDownAndUp_Step2: @ 0x0808FA44 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808FA7A @@ -292873,7 +292873,7 @@ _0808FA7A: bx r1 .align 2, 0 _0808FA84: .4byte gUnknown_84E5B30 - thumb_func_end sub_0808FA44 + thumb_func_end MovementType_FaceDownAndUp_Step2 thumb_func_start MovementType_FaceDownAndUp_Step3 MovementType_FaceDownAndUp_Step3: @ 0x0808FA88 @@ -292886,7 +292886,7 @@ MovementType_FaceDownAndUp_Step3: @ 0x0808FA88 cmp r0, #0 bne _0808FAA6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0808FAAE @@ -292904,8 +292904,8 @@ _0808FAB0: .align 2, 0 thumb_func_end MovementType_FaceDownAndUp_Step3 - thumb_func_start sub_0808FAB8 -sub_0808FAB8: @ 0x0808FAB8 + thumb_func_start MovementType_FaceDownAndUp_Step4 +MovementType_FaceDownAndUp_Step4: @ 0x0808FAB8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -292916,7 +292916,7 @@ sub_0808FAB8: @ 0x0808FAB8 bl memcpy adds r0, r4, #0 movs r1, #1 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -292938,7 +292938,7 @@ _0808FAE8: bx r1 .align 2, 0 _0808FAFC: .4byte gUnknown_84E5BC4 - thumb_func_end sub_0808FAB8 + thumb_func_end MovementType_FaceDownAndUp_Step4 thumb_func_start MovementType_FaceLeftAndRight MovementType_FaceLeftAndRight: @ 0x0808FB00 @@ -292952,7 +292952,7 @@ MovementType_FaceLeftAndRight: @ 0x0808FB00 ldr r2, _0808FB1C adds r0, r0, r2 ldr r2, _0808FB20 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -292983,8 +292983,8 @@ sub_0808FB38: @ 0x0808FB38 _0808FB40: .4byte gUnknown_84E5C1C thumb_func_end sub_0808FB38 - thumb_func_start sub_0808FB44 -sub_0808FB44: @ 0x0808FB44 + thumb_func_start MovementType_FaceLeftAndRight_Step0 +MovementType_FaceLeftAndRight_Step0: @ 0x0808FB44 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -292994,7 +292994,7 @@ sub_0808FB44: @ 0x0808FB44 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808FB44 + thumb_func_end MovementType_FaceLeftAndRight_Step0 thumb_func_start MovementType_FaceLeftAndRight_Step1 MovementType_FaceLeftAndRight_Step1: @ 0x0808FB58 @@ -293010,7 +293010,7 @@ MovementType_FaceLeftAndRight_Step1: @ 0x0808FB58 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -293020,12 +293020,12 @@ MovementType_FaceLeftAndRight_Step1: @ 0x0808FB58 .align 2, 0 thumb_func_end MovementType_FaceLeftAndRight_Step1 - thumb_func_start sub_0808FB84 -sub_0808FB84: @ 0x0808FB84 + thumb_func_start MovementType_FaceLeftAndRight_Step2 +MovementType_FaceLeftAndRight_Step2: @ 0x0808FB84 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808FBBA @@ -293053,7 +293053,7 @@ _0808FBBA: bx r1 .align 2, 0 _0808FBC4: .4byte gUnknown_84E5B30 - thumb_func_end sub_0808FB84 + thumb_func_end MovementType_FaceLeftAndRight_Step2 thumb_func_start MovementType_FaceLeftAndRight_Step3 MovementType_FaceLeftAndRight_Step3: @ 0x0808FBC8 @@ -293066,7 +293066,7 @@ MovementType_FaceLeftAndRight_Step3: @ 0x0808FBC8 cmp r0, #0 bne _0808FBE6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0808FBEE @@ -293084,8 +293084,8 @@ _0808FBF0: .align 2, 0 thumb_func_end MovementType_FaceLeftAndRight_Step3 - thumb_func_start sub_0808FBF8 -sub_0808FBF8: @ 0x0808FBF8 + thumb_func_start MovementType_FaceLeftAndRight_Step4 +MovementType_FaceLeftAndRight_Step4: @ 0x0808FBF8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -293096,7 +293096,7 @@ sub_0808FBF8: @ 0x0808FBF8 bl memcpy adds r0, r4, #0 movs r1, #2 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -293118,7 +293118,7 @@ _0808FC28: bx r1 .align 2, 0 _0808FC3C: .4byte gUnknown_84E5BE4 - thumb_func_end sub_0808FBF8 + thumb_func_end MovementType_FaceLeftAndRight_Step4 thumb_func_start MovementType_FaceUpAndLeft MovementType_FaceUpAndLeft: @ 0x0808FC40 @@ -293132,7 +293132,7 @@ MovementType_FaceUpAndLeft: @ 0x0808FC40 ldr r2, _0808FC5C adds r0, r0, r2 ldr r2, _0808FC60 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -293163,8 +293163,8 @@ sub_0808FC78: @ 0x0808FC78 _0808FC80: .4byte gUnknown_84E5C30 thumb_func_end sub_0808FC78 - thumb_func_start sub_0808FC84 -sub_0808FC84: @ 0x0808FC84 + thumb_func_start MovementType_FaceUpAndLeft_Step0 +MovementType_FaceUpAndLeft_Step0: @ 0x0808FC84 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -293174,7 +293174,7 @@ sub_0808FC84: @ 0x0808FC84 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808FC84 + thumb_func_end MovementType_FaceUpAndLeft_Step0 thumb_func_start MovementType_FaceUpAndLeft_Step1 MovementType_FaceUpAndLeft_Step1: @ 0x0808FC98 @@ -293190,7 +293190,7 @@ MovementType_FaceUpAndLeft_Step1: @ 0x0808FC98 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -293200,12 +293200,12 @@ MovementType_FaceUpAndLeft_Step1: @ 0x0808FC98 .align 2, 0 thumb_func_end MovementType_FaceUpAndLeft_Step1 - thumb_func_start sub_0808FCC4 -sub_0808FCC4: @ 0x0808FCC4 + thumb_func_start MovementType_FaceUpAndLeft_Step2 +MovementType_FaceUpAndLeft_Step2: @ 0x0808FCC4 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808FCFA @@ -293233,7 +293233,7 @@ _0808FCFA: bx r1 .align 2, 0 _0808FD04: .4byte gUnknown_84E5B40 - thumb_func_end sub_0808FCC4 + thumb_func_end MovementType_FaceUpAndLeft_Step2 thumb_func_start MovementType_FaceUpAndLeft_Step3 MovementType_FaceUpAndLeft_Step3: @ 0x0808FD08 @@ -293246,7 +293246,7 @@ MovementType_FaceUpAndLeft_Step3: @ 0x0808FD08 cmp r0, #0 bne _0808FD26 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0808FD2E @@ -293264,8 +293264,8 @@ _0808FD30: .align 2, 0 thumb_func_end MovementType_FaceUpAndLeft_Step3 - thumb_func_start sub_0808FD38 -sub_0808FD38: @ 0x0808FD38 + thumb_func_start MovementType_FaceUpAndLeft_Step4 +MovementType_FaceUpAndLeft_Step4: @ 0x0808FD38 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -293276,7 +293276,7 @@ sub_0808FD38: @ 0x0808FD38 bl memcpy adds r0, r4, #0 movs r1, #3 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -293298,7 +293298,7 @@ _0808FD68: bx r1 .align 2, 0 _0808FD7C: .4byte gUnknown_84E5C44 - thumb_func_end sub_0808FD38 + thumb_func_end MovementType_FaceUpAndLeft_Step4 thumb_func_start MovementType_FaceUpAndRight MovementType_FaceUpAndRight: @ 0x0808FD80 @@ -293312,7 +293312,7 @@ MovementType_FaceUpAndRight: @ 0x0808FD80 ldr r2, _0808FD9C adds r0, r0, r2 ldr r2, _0808FDA0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -293343,8 +293343,8 @@ sub_0808FDB8: @ 0x0808FDB8 _0808FDC0: .4byte gUnknown_84E5C48 thumb_func_end sub_0808FDB8 - thumb_func_start sub_0808FDC4 -sub_0808FDC4: @ 0x0808FDC4 + thumb_func_start MovementType_FaceUpAndRight_Step0 +MovementType_FaceUpAndRight_Step0: @ 0x0808FDC4 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -293354,7 +293354,7 @@ sub_0808FDC4: @ 0x0808FDC4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808FDC4 + thumb_func_end MovementType_FaceUpAndRight_Step0 thumb_func_start MovementType_FaceUpAndRight_Step1 MovementType_FaceUpAndRight_Step1: @ 0x0808FDD8 @@ -293370,7 +293370,7 @@ MovementType_FaceUpAndRight_Step1: @ 0x0808FDD8 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -293380,12 +293380,12 @@ MovementType_FaceUpAndRight_Step1: @ 0x0808FDD8 .align 2, 0 thumb_func_end MovementType_FaceUpAndRight_Step1 - thumb_func_start sub_0808FE04 -sub_0808FE04: @ 0x0808FE04 + thumb_func_start MovementType_FaceUpAndRight_Step2 +MovementType_FaceUpAndRight_Step2: @ 0x0808FE04 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808FE3A @@ -293413,7 +293413,7 @@ _0808FE3A: bx r1 .align 2, 0 _0808FE44: .4byte gUnknown_84E5B40 - thumb_func_end sub_0808FE04 + thumb_func_end MovementType_FaceUpAndRight_Step2 thumb_func_start MovementType_FaceUpAndRight_Step3 MovementType_FaceUpAndRight_Step3: @ 0x0808FE48 @@ -293426,7 +293426,7 @@ MovementType_FaceUpAndRight_Step3: @ 0x0808FE48 cmp r0, #0 bne _0808FE66 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0808FE6E @@ -293444,8 +293444,8 @@ _0808FE70: .align 2, 0 thumb_func_end MovementType_FaceUpAndRight_Step3 - thumb_func_start sub_0808FE78 -sub_0808FE78: @ 0x0808FE78 + thumb_func_start MovementType_FaceUpAndRight_Step4 +MovementType_FaceUpAndRight_Step4: @ 0x0808FE78 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -293456,7 +293456,7 @@ sub_0808FE78: @ 0x0808FE78 bl memcpy adds r0, r4, #0 movs r1, #4 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -293478,7 +293478,7 @@ _0808FEA8: bx r1 .align 2, 0 _0808FEBC: .4byte gUnknown_84E5C5C - thumb_func_end sub_0808FE78 + thumb_func_end MovementType_FaceUpAndRight_Step4 thumb_func_start MovementType_FaceDownAndLeft MovementType_FaceDownAndLeft: @ 0x0808FEC0 @@ -293492,7 +293492,7 @@ MovementType_FaceDownAndLeft: @ 0x0808FEC0 ldr r2, _0808FEDC adds r0, r0, r2 ldr r2, _0808FEE0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -293523,8 +293523,8 @@ sub_0808FEF8: @ 0x0808FEF8 _0808FF00: .4byte gUnknown_84E5C60 thumb_func_end sub_0808FEF8 - thumb_func_start sub_0808FF04 -sub_0808FF04: @ 0x0808FF04 + thumb_func_start MovementType_FaceDownAndLeft_Step0 +MovementType_FaceDownAndLeft_Step0: @ 0x0808FF04 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -293534,7 +293534,7 @@ sub_0808FF04: @ 0x0808FF04 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0808FF04 + thumb_func_end MovementType_FaceDownAndLeft_Step0 thumb_func_start MovementType_FaceDownAndLeft_Step1 MovementType_FaceDownAndLeft_Step1: @ 0x0808FF18 @@ -293550,7 +293550,7 @@ MovementType_FaceDownAndLeft_Step1: @ 0x0808FF18 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -293560,12 +293560,12 @@ MovementType_FaceDownAndLeft_Step1: @ 0x0808FF18 .align 2, 0 thumb_func_end MovementType_FaceDownAndLeft_Step1 - thumb_func_start sub_0808FF44 -sub_0808FF44: @ 0x0808FF44 + thumb_func_start MovementType_FaceDownAndLeft_Step2 +MovementType_FaceDownAndLeft_Step2: @ 0x0808FF44 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0808FF7A @@ -293593,7 +293593,7 @@ _0808FF7A: bx r1 .align 2, 0 _0808FF84: .4byte gUnknown_84E5B40 - thumb_func_end sub_0808FF44 + thumb_func_end MovementType_FaceDownAndLeft_Step2 thumb_func_start MovementType_FaceDownAndLeft_Step3 MovementType_FaceDownAndLeft_Step3: @ 0x0808FF88 @@ -293606,7 +293606,7 @@ MovementType_FaceDownAndLeft_Step3: @ 0x0808FF88 cmp r0, #0 bne _0808FFA6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0808FFAE @@ -293624,8 +293624,8 @@ _0808FFB0: .align 2, 0 thumb_func_end MovementType_FaceDownAndLeft_Step3 - thumb_func_start sub_0808FFB8 -sub_0808FFB8: @ 0x0808FFB8 + thumb_func_start MovementType_FaceDownAndLeft_Step4 +MovementType_FaceDownAndLeft_Step4: @ 0x0808FFB8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -293636,7 +293636,7 @@ sub_0808FFB8: @ 0x0808FFB8 bl memcpy adds r0, r4, #0 movs r1, #5 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -293658,7 +293658,7 @@ _0808FFE8: bx r1 .align 2, 0 _0808FFFC: .4byte gUnknown_84E5C74 - thumb_func_end sub_0808FFB8 + thumb_func_end MovementType_FaceDownAndLeft_Step4 thumb_func_start MovementType_FaceDownAndRight MovementType_FaceDownAndRight: @ 0x08090000 @@ -293672,7 +293672,7 @@ MovementType_FaceDownAndRight: @ 0x08090000 ldr r2, _0809001C adds r0, r0, r2 ldr r2, _08090020 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -293703,8 +293703,8 @@ sub_08090038: @ 0x08090038 _08090040: .4byte gUnknown_84E5C78 thumb_func_end sub_08090038 - thumb_func_start sub_08090044 -sub_08090044: @ 0x08090044 + thumb_func_start MovementType_FaceDownAndRight_Step0 +MovementType_FaceDownAndRight_Step0: @ 0x08090044 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -293714,7 +293714,7 @@ sub_08090044: @ 0x08090044 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08090044 + thumb_func_end MovementType_FaceDownAndRight_Step0 thumb_func_start MovementType_FaceDownAndRight_Step1 MovementType_FaceDownAndRight_Step1: @ 0x08090058 @@ -293730,7 +293730,7 @@ MovementType_FaceDownAndRight_Step1: @ 0x08090058 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -293740,12 +293740,12 @@ MovementType_FaceDownAndRight_Step1: @ 0x08090058 .align 2, 0 thumb_func_end MovementType_FaceDownAndRight_Step1 - thumb_func_start sub_08090084 -sub_08090084: @ 0x08090084 + thumb_func_start MovementType_FaceDownAndRight_Step2 +MovementType_FaceDownAndRight_Step2: @ 0x08090084 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080900BA @@ -293773,7 +293773,7 @@ _080900BA: bx r1 .align 2, 0 _080900C4: .4byte gUnknown_84E5B40 - thumb_func_end sub_08090084 + thumb_func_end MovementType_FaceDownAndRight_Step2 thumb_func_start MovementType_FaceDownAndRight_Step3 MovementType_FaceDownAndRight_Step3: @ 0x080900C8 @@ -293786,7 +293786,7 @@ MovementType_FaceDownAndRight_Step3: @ 0x080900C8 cmp r0, #0 bne _080900E6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _080900EE @@ -293804,8 +293804,8 @@ _080900F0: .align 2, 0 thumb_func_end MovementType_FaceDownAndRight_Step3 - thumb_func_start sub_080900F8 -sub_080900F8: @ 0x080900F8 + thumb_func_start MovementType_FaceDownAndRight_Step4 +MovementType_FaceDownAndRight_Step4: @ 0x080900F8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -293816,7 +293816,7 @@ sub_080900F8: @ 0x080900F8 bl memcpy adds r0, r4, #0 movs r1, #6 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -293838,7 +293838,7 @@ _08090128: bx r1 .align 2, 0 _0809013C: .4byte gUnknown_84E5C8C - thumb_func_end sub_080900F8 + thumb_func_end MovementType_FaceDownAndRight_Step4 thumb_func_start MovementType_FaceDownUpAndLeft MovementType_FaceDownUpAndLeft: @ 0x08090140 @@ -293852,7 +293852,7 @@ MovementType_FaceDownUpAndLeft: @ 0x08090140 ldr r2, _0809015C adds r0, r0, r2 ldr r2, _08090160 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -293883,8 +293883,8 @@ sub_08090178: @ 0x08090178 _08090180: .4byte gUnknown_84E5C90 thumb_func_end sub_08090178 - thumb_func_start sub_08090184 -sub_08090184: @ 0x08090184 + thumb_func_start MovementType_FaceDownUpAndLeft_Step0 +MovementType_FaceDownUpAndLeft_Step0: @ 0x08090184 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -293894,7 +293894,7 @@ sub_08090184: @ 0x08090184 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08090184 + thumb_func_end MovementType_FaceDownUpAndLeft_Step0 thumb_func_start MovementType_FaceDownUpAndLeft_Step1 MovementType_FaceDownUpAndLeft_Step1: @ 0x08090198 @@ -293910,7 +293910,7 @@ MovementType_FaceDownUpAndLeft_Step1: @ 0x08090198 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -293920,12 +293920,12 @@ MovementType_FaceDownUpAndLeft_Step1: @ 0x08090198 .align 2, 0 thumb_func_end MovementType_FaceDownUpAndLeft_Step1 - thumb_func_start sub_080901C4 -sub_080901C4: @ 0x080901C4 + thumb_func_start MovementType_FaceDownUpAndLeft_Step2 +MovementType_FaceDownUpAndLeft_Step2: @ 0x080901C4 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080901FA @@ -293953,7 +293953,7 @@ _080901FA: bx r1 .align 2, 0 _08090204: .4byte gUnknown_84E5B40 - thumb_func_end sub_080901C4 + thumb_func_end MovementType_FaceDownUpAndLeft_Step2 thumb_func_start MovementType_FaceDownUpAndLeft_Step3 MovementType_FaceDownUpAndLeft_Step3: @ 0x08090208 @@ -293966,7 +293966,7 @@ MovementType_FaceDownUpAndLeft_Step3: @ 0x08090208 cmp r0, #0 bne _08090226 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0809022E @@ -293984,8 +293984,8 @@ _08090230: .align 2, 0 thumb_func_end MovementType_FaceDownUpAndLeft_Step3 - thumb_func_start sub_08090238 -sub_08090238: @ 0x08090238 + thumb_func_start MovementType_FaceDownUpAndLeft_Step4 +MovementType_FaceDownUpAndLeft_Step4: @ 0x08090238 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -293996,7 +293996,7 @@ sub_08090238: @ 0x08090238 bl memcpy adds r0, r4, #0 movs r1, #7 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -294018,7 +294018,7 @@ _08090268: bx r1 .align 2, 0 _0809027C: .4byte gUnknown_84E5CA4 - thumb_func_end sub_08090238 + thumb_func_end MovementType_FaceDownUpAndLeft_Step4 thumb_func_start MovementType_FaceDownUpAndRight MovementType_FaceDownUpAndRight: @ 0x08090280 @@ -294032,7 +294032,7 @@ MovementType_FaceDownUpAndRight: @ 0x08090280 ldr r2, _0809029C adds r0, r0, r2 ldr r2, _080902A0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -294063,8 +294063,8 @@ sub_080902B8: @ 0x080902B8 _080902C0: .4byte gUnknown_84E5CA8 thumb_func_end sub_080902B8 - thumb_func_start sub_080902C4 -sub_080902C4: @ 0x080902C4 + thumb_func_start MovementType_FaceDownUpAndRight_Step0 +MovementType_FaceDownUpAndRight_Step0: @ 0x080902C4 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -294074,7 +294074,7 @@ sub_080902C4: @ 0x080902C4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080902C4 + thumb_func_end MovementType_FaceDownUpAndRight_Step0 thumb_func_start MovementType_FaceDownUpAndRight_Step1 MovementType_FaceDownUpAndRight_Step1: @ 0x080902D8 @@ -294090,7 +294090,7 @@ MovementType_FaceDownUpAndRight_Step1: @ 0x080902D8 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -294100,12 +294100,12 @@ MovementType_FaceDownUpAndRight_Step1: @ 0x080902D8 .align 2, 0 thumb_func_end MovementType_FaceDownUpAndRight_Step1 - thumb_func_start sub_08090304 -sub_08090304: @ 0x08090304 + thumb_func_start MovementType_FaceDownUpAndRight_Step2 +MovementType_FaceDownUpAndRight_Step2: @ 0x08090304 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0809033A @@ -294133,7 +294133,7 @@ _0809033A: bx r1 .align 2, 0 _08090344: .4byte gUnknown_84E5B40 - thumb_func_end sub_08090304 + thumb_func_end MovementType_FaceDownUpAndRight_Step2 thumb_func_start MovementType_FaceDownUpAndRight_Step3 MovementType_FaceDownUpAndRight_Step3: @ 0x08090348 @@ -294146,7 +294146,7 @@ MovementType_FaceDownUpAndRight_Step3: @ 0x08090348 cmp r0, #0 bne _08090366 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _0809036E @@ -294164,8 +294164,8 @@ _08090370: .align 2, 0 thumb_func_end MovementType_FaceDownUpAndRight_Step3 - thumb_func_start sub_08090378 -sub_08090378: @ 0x08090378 + thumb_func_start MovementType_FaceDownUpAndRight_Step4 +MovementType_FaceDownUpAndRight_Step4: @ 0x08090378 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -294176,7 +294176,7 @@ sub_08090378: @ 0x08090378 bl memcpy adds r0, r4, #0 movs r1, #8 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -294198,7 +294198,7 @@ _080903A8: bx r1 .align 2, 0 _080903BC: .4byte gUnknown_84E5CBC - thumb_func_end sub_08090378 + thumb_func_end MovementType_FaceDownUpAndRight_Step4 thumb_func_start MovementType_FaceUpRightAndLeft MovementType_FaceUpRightAndLeft: @ 0x080903C0 @@ -294212,7 +294212,7 @@ MovementType_FaceUpRightAndLeft: @ 0x080903C0 ldr r2, _080903DC adds r0, r0, r2 ldr r2, _080903E0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -294243,8 +294243,8 @@ sub_080903F8: @ 0x080903F8 _08090400: .4byte gUnknown_84E5CC0 thumb_func_end sub_080903F8 - thumb_func_start sub_08090404 -sub_08090404: @ 0x08090404 + thumb_func_start MovementType_FaceUpLeftAndRight_Step0 +MovementType_FaceUpLeftAndRight_Step0: @ 0x08090404 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -294254,7 +294254,7 @@ sub_08090404: @ 0x08090404 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08090404 + thumb_func_end MovementType_FaceUpLeftAndRight_Step0 thumb_func_start MovementType_FaceUpLeftAndRight_Step1 MovementType_FaceUpLeftAndRight_Step1: @ 0x08090418 @@ -294270,7 +294270,7 @@ MovementType_FaceUpLeftAndRight_Step1: @ 0x08090418 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -294280,12 +294280,12 @@ MovementType_FaceUpLeftAndRight_Step1: @ 0x08090418 .align 2, 0 thumb_func_end MovementType_FaceUpLeftAndRight_Step1 - thumb_func_start sub_08090444 -sub_08090444: @ 0x08090444 + thumb_func_start MovementType_FaceUpLeftAndRight_Step2 +MovementType_FaceUpLeftAndRight_Step2: @ 0x08090444 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0809047A @@ -294313,7 +294313,7 @@ _0809047A: bx r1 .align 2, 0 _08090484: .4byte gUnknown_84E5B40 - thumb_func_end sub_08090444 + thumb_func_end MovementType_FaceUpLeftAndRight_Step2 thumb_func_start MovementType_FaceUpLeftAndRight_Step3 MovementType_FaceUpLeftAndRight_Step3: @ 0x08090488 @@ -294326,7 +294326,7 @@ MovementType_FaceUpLeftAndRight_Step3: @ 0x08090488 cmp r0, #0 bne _080904A6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _080904AE @@ -294344,8 +294344,8 @@ _080904B0: .align 2, 0 thumb_func_end MovementType_FaceUpLeftAndRight_Step3 - thumb_func_start sub_080904B8 -sub_080904B8: @ 0x080904B8 + thumb_func_start MovementType_FaceUpLeftAndRight_Step4 +MovementType_FaceUpLeftAndRight_Step4: @ 0x080904B8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -294356,7 +294356,7 @@ sub_080904B8: @ 0x080904B8 bl memcpy adds r0, r4, #0 movs r1, #9 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -294378,7 +294378,7 @@ _080904E8: bx r1 .align 2, 0 _080904FC: .4byte gUnknown_84E5CD4 - thumb_func_end sub_080904B8 + thumb_func_end MovementType_FaceUpLeftAndRight_Step4 thumb_func_start MovementType_FaceDownRightAndLeft MovementType_FaceDownRightAndLeft: @ 0x08090500 @@ -294392,7 +294392,7 @@ MovementType_FaceDownRightAndLeft: @ 0x08090500 ldr r2, _0809051C adds r0, r0, r2 ldr r2, _08090520 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -294423,8 +294423,8 @@ sub_08090538: @ 0x08090538 _08090540: .4byte gUnknown_84E5CD8 thumb_func_end sub_08090538 - thumb_func_start sub_08090544 -sub_08090544: @ 0x08090544 + thumb_func_start MovementType_FaceDownLeftAndRight_Step0 +MovementType_FaceDownLeftAndRight_Step0: @ 0x08090544 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -294434,7 +294434,7 @@ sub_08090544: @ 0x08090544 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08090544 + thumb_func_end MovementType_FaceDownLeftAndRight_Step0 thumb_func_start MovementType_FaceDownLeftAndRight_Step1 MovementType_FaceDownLeftAndRight_Step1: @ 0x08090558 @@ -294450,7 +294450,7 @@ MovementType_FaceDownLeftAndRight_Step1: @ 0x08090558 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #2 strh r0, [r5, #0x30] movs r0, #1 @@ -294460,12 +294460,12 @@ MovementType_FaceDownLeftAndRight_Step1: @ 0x08090558 .align 2, 0 thumb_func_end MovementType_FaceDownLeftAndRight_Step1 - thumb_func_start sub_08090584 -sub_08090584: @ 0x08090584 + thumb_func_start MovementType_FaceDownLeftAndRight_Step2 +MovementType_FaceDownLeftAndRight_Step2: @ 0x08090584 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080905BA @@ -294493,7 +294493,7 @@ _080905BA: bx r1 .align 2, 0 _080905C4: .4byte gUnknown_84E5B40 - thumb_func_end sub_08090584 + thumb_func_end MovementType_FaceDownLeftAndRight_Step2 thumb_func_start MovementType_FaceDownLeftAndRight_Step3 MovementType_FaceDownLeftAndRight_Step3: @ 0x080905C8 @@ -294506,7 +294506,7 @@ MovementType_FaceDownLeftAndRight_Step3: @ 0x080905C8 cmp r0, #0 bne _080905E6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _080905EE @@ -294524,8 +294524,8 @@ _080905F0: .align 2, 0 thumb_func_end MovementType_FaceDownLeftAndRight_Step3 - thumb_func_start sub_080905F8 -sub_080905F8: @ 0x080905F8 + thumb_func_start MovementType_FaceDownLeftAndRight_Step4 +MovementType_FaceDownLeftAndRight_Step4: @ 0x080905F8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -294536,7 +294536,7 @@ sub_080905F8: @ 0x080905F8 bl memcpy adds r0, r4, #0 movs r1, #0xa - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -294558,7 +294558,7 @@ _08090628: bx r1 .align 2, 0 _0809063C: .4byte gUnknown_84E5CEC - thumb_func_end sub_080905F8 + thumb_func_end MovementType_FaceDownLeftAndRight_Step4 thumb_func_start MovementType_RotateCounterclockwise MovementType_RotateCounterclockwise: @ 0x08090640 @@ -294572,7 +294572,7 @@ MovementType_RotateCounterclockwise: @ 0x08090640 ldr r2, _0809065C adds r0, r0, r2 ldr r2, _08090660 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -294618,7 +294618,7 @@ MovementType_RotateCounterclockwise_Step0: @ 0x08090684 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -294630,7 +294630,7 @@ MovementType_RotateCounterclockwise_Step0: @ 0x08090684 MovementType_RotateCounterclockwise_Step1: @ 0x080906B0 push {r4, lr} adds r4, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080906CA @@ -294658,7 +294658,7 @@ MovementType_RotateCounterclockwise_Step2: @ 0x080906D4 cmp r0, #0 bne _080906F2 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _080906F6 @@ -294673,8 +294673,8 @@ _080906F6: .align 2, 0 thumb_func_end MovementType_RotateCounterclockwise_Step2 - thumb_func_start sub_08090700 -sub_08090700: @ 0x08090700 + thumb_func_start MovementType_RotateCounterclockwise_Step3 +MovementType_RotateCounterclockwise_Step3: @ 0x08090700 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -294685,7 +294685,7 @@ sub_08090700: @ 0x08090700 bl memcpy adds r0, r4, #0 movs r1, #0 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -294707,7 +294707,7 @@ _0809072C: bx r1 .align 2, 0 _08090740: .4byte gUnknown_84E5D00 - thumb_func_end sub_08090700 + thumb_func_end MovementType_RotateCounterclockwise_Step3 thumb_func_start MovementType_RotateClockwise MovementType_RotateClockwise: @ 0x08090744 @@ -294721,7 +294721,7 @@ MovementType_RotateClockwise: @ 0x08090744 ldr r2, _08090760 adds r0, r0, r2 ldr r2, _08090764 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -294767,7 +294767,7 @@ MovementType_RotateClockwise_Step0: @ 0x08090788 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -294779,7 +294779,7 @@ MovementType_RotateClockwise_Step0: @ 0x08090788 MovementType_RotateClockwise_Step1: @ 0x080907B4 push {r4, lr} adds r4, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080907CE @@ -294807,7 +294807,7 @@ MovementType_RotateClockwise_Step2: @ 0x080907D8 cmp r0, #0 bne _080907F6 adds r0, r4, #0 - bl sub_0808EEFC + bl EventObjectIsTrainerAndCloseToPlayer lsls r0, r0, #0x18 cmp r0, #0 beq _080907FA @@ -294822,8 +294822,8 @@ _080907FA: .align 2, 0 thumb_func_end MovementType_RotateClockwise_Step2 - thumb_func_start sub_08090804 -sub_08090804: @ 0x08090804 + thumb_func_start MovementType_RotateClockwise_Step3 +MovementType_RotateClockwise_Step3: @ 0x08090804 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -294834,7 +294834,7 @@ sub_08090804: @ 0x08090804 bl memcpy adds r0, r4, #0 movs r1, #0 - bl sub_0808F22C + bl TryGetTrainerEncounterDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -294856,7 +294856,7 @@ _08090830: bx r1 .align 2, 0 _08090844: .4byte gUnknown_84E5D18 - thumb_func_end sub_08090804 + thumb_func_end MovementType_RotateClockwise_Step3 thumb_func_start MovementType_WalkBackAndForth MovementType_WalkBackAndForth: @ 0x08090848 @@ -294870,7 +294870,7 @@ MovementType_WalkBackAndForth: @ 0x08090848 ldr r2, _08090864 adds r0, r0, r2 ldr r2, _08090868 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -294901,8 +294901,8 @@ sub_08090880: @ 0x08090880 _08090888: .4byte gUnknown_84E5D20 thumb_func_end sub_08090880 - thumb_func_start sub_0809088C -sub_0809088C: @ 0x0809088C + thumb_func_start MovementType_WalkBackAndForth_Step0 +MovementType_WalkBackAndForth_Step0: @ 0x0809088C push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -294912,7 +294912,7 @@ sub_0809088C: @ 0x0809088C pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809088C + thumb_func_end MovementType_WalkBackAndForth_Step0 thumb_func_start MovementType_WalkBackAndForth_Step1 MovementType_WalkBackAndForth_Step1: @ 0x080908A0 @@ -294929,7 +294929,7 @@ MovementType_WalkBackAndForth_Step1: @ 0x080908A0 cmp r0, #0 beq _080908C2 adds r0, r1, #0 - bl sub_08093170 + bl GetOppositeDirection lsls r0, r0, #0x18 lsrs r1, r0, #0x18 _080908C2: @@ -294963,7 +294963,7 @@ MovementType_WalkBackAndForth_Step2: @ 0x080908D8 strb r0, [r2] ldrb r0, [r4, #0x18] lsrs r0, r0, #4 - bl sub_08093170 + bl GetOppositeDirection adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -294990,7 +294990,7 @@ _08090908: strb r0, [r1] ldrb r0, [r4, #0x18] lsrs r0, r0, #4 - bl sub_08093170 + bl GetOppositeDirection adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -295020,7 +295020,7 @@ _08090970: adds r0, r4, #0 adds r1, r7, #0 adds r2, r6, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -295039,7 +295039,7 @@ MovementType_WalkBackAndForth_Step3: @ 0x08090990 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080909AE @@ -295058,8 +295058,8 @@ _080909AE: .align 2, 0 thumb_func_end MovementType_WalkBackAndForth_Step3 - thumb_func_start sub_080909B8 -sub_080909B8: @ 0x080909B8 + thumb_func_start MovementType_WalkSequence_Step0 +MovementType_WalkSequence_Step0: @ 0x080909B8 push {r4, lr} adds r4, r1, #0 bl ClearEventObjectMovement @@ -295069,7 +295069,7 @@ sub_080909B8: @ 0x080909B8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080909B8 + thumb_func_end MovementType_WalkSequence_Step0 thumb_func_start MoveNextDirectionInSequence MoveNextDirectionInSequence: @ 0x080909CC @@ -295143,7 +295143,7 @@ _08090A5A: adds r0, r4, #0 mov r1, r8 adds r2, r6, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -295165,7 +295165,7 @@ MovementType_WalkSequence_Step2: @ 0x08090A80 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _08090A9E @@ -295196,7 +295196,7 @@ MovementType_WalkSequenceUpRightLeftDown: @ 0x08090AA8 ldr r2, _08090AC4 adds r0, r0, r2 ldr r2, _08090AC8 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295227,8 +295227,8 @@ sub_08090AE0: @ 0x08090AE0 _08090AE8: .4byte gUnknown_84E5D30 thumb_func_end sub_08090AE0 - thumb_func_start sub_08090AEC -sub_08090AEC: @ 0x08090AEC + thumb_func_start MovementType_WalkSequenceUpRightLeftDown_Step1 +MovementType_WalkSequenceUpRightLeftDown_Step1: @ 0x08090AEC push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295263,7 +295263,7 @@ _08090B18: bx r1 .align 2, 0 _08090B30: .4byte gUnknown_84E5D3C - thumb_func_end sub_08090AEC + thumb_func_end MovementType_WalkSequenceUpRightLeftDown_Step1 thumb_func_start MovementType_WalkSequenceRightLeftDownUp MovementType_WalkSequenceRightLeftDownUp: @ 0x08090B34 @@ -295277,7 +295277,7 @@ MovementType_WalkSequenceRightLeftDownUp: @ 0x08090B34 ldr r2, _08090B50 adds r0, r0, r2 ldr r2, _08090B54 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295308,8 +295308,8 @@ sub_08090B6C: @ 0x08090B6C _08090B74: .4byte gUnknown_84E5D40 thumb_func_end sub_08090B6C - thumb_func_start sub_08090B78 -sub_08090B78: @ 0x08090B78 + thumb_func_start MovementType_WalkSequenceRightLeftDownUp_Step1 +MovementType_WalkSequenceRightLeftDownUp_Step1: @ 0x08090B78 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295344,7 +295344,7 @@ _08090BA4: bx r1 .align 2, 0 _08090BBC: .4byte gUnknown_84E5D4C - thumb_func_end sub_08090B78 + thumb_func_end MovementType_WalkSequenceRightLeftDownUp_Step1 thumb_func_start MovementType_WalkSequenceDownUpRightLeft MovementType_WalkSequenceDownUpRightLeft: @ 0x08090BC0 @@ -295358,7 +295358,7 @@ MovementType_WalkSequenceDownUpRightLeft: @ 0x08090BC0 ldr r2, _08090BDC adds r0, r0, r2 ldr r2, _08090BE0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295389,8 +295389,8 @@ sub_08090BF8: @ 0x08090BF8 _08090C00: .4byte gUnknown_84E5D50 thumb_func_end sub_08090BF8 - thumb_func_start sub_08090C04 -sub_08090C04: @ 0x08090C04 + thumb_func_start MovementType_WalkSequenceDownUpRightLeft_Step1 +MovementType_WalkSequenceDownUpRightLeft_Step1: @ 0x08090C04 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295425,7 +295425,7 @@ _08090C30: bx r1 .align 2, 0 _08090C48: .4byte gUnknown_84E5D5C - thumb_func_end sub_08090C04 + thumb_func_end MovementType_WalkSequenceDownUpRightLeft_Step1 thumb_func_start MovementType_WalkSequenceLeftDownUpRight MovementType_WalkSequenceLeftDownUpRight: @ 0x08090C4C @@ -295439,7 +295439,7 @@ MovementType_WalkSequenceLeftDownUpRight: @ 0x08090C4C ldr r2, _08090C68 adds r0, r0, r2 ldr r2, _08090C6C - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295470,8 +295470,8 @@ sub_08090C84: @ 0x08090C84 _08090C8C: .4byte gUnknown_84E5D60 thumb_func_end sub_08090C84 - thumb_func_start sub_08090C90 -sub_08090C90: @ 0x08090C90 + thumb_func_start MovementType_WalkSequenceLeftDownUpRight_Step1 +MovementType_WalkSequenceLeftDownUpRight_Step1: @ 0x08090C90 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295506,7 +295506,7 @@ _08090CBC: bx r1 .align 2, 0 _08090CD4: .4byte gUnknown_84E5D6C - thumb_func_end sub_08090C90 + thumb_func_end MovementType_WalkSequenceLeftDownUpRight_Step1 thumb_func_start MovementType_WalkSequenceUpLeftRightDown MovementType_WalkSequenceUpLeftRightDown: @ 0x08090CD8 @@ -295520,7 +295520,7 @@ MovementType_WalkSequenceUpLeftRightDown: @ 0x08090CD8 ldr r2, _08090CF4 adds r0, r0, r2 ldr r2, _08090CF8 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295551,8 +295551,8 @@ sub_08090D10: @ 0x08090D10 _08090D18: .4byte gUnknown_84E5D70 thumb_func_end sub_08090D10 - thumb_func_start sub_08090D1C -sub_08090D1C: @ 0x08090D1C + thumb_func_start MovementType_WalkSequenceUpLeftRightDown_Step1 +MovementType_WalkSequenceUpLeftRightDown_Step1: @ 0x08090D1C push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295587,7 +295587,7 @@ _08090D48: bx r1 .align 2, 0 _08090D60: .4byte gUnknown_84E5D7C - thumb_func_end sub_08090D1C + thumb_func_end MovementType_WalkSequenceUpLeftRightDown_Step1 thumb_func_start MovementType_WalkSequenceLeftRightDownUp MovementType_WalkSequenceLeftRightDownUp: @ 0x08090D64 @@ -295601,7 +295601,7 @@ MovementType_WalkSequenceLeftRightDownUp: @ 0x08090D64 ldr r2, _08090D80 adds r0, r0, r2 ldr r2, _08090D84 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295632,8 +295632,8 @@ sub_08090D9C: @ 0x08090D9C _08090DA4: .4byte gUnknown_84E5D80 thumb_func_end sub_08090D9C - thumb_func_start sub_08090DA8 -sub_08090DA8: @ 0x08090DA8 + thumb_func_start MovementType_WalkSequenceLeftRightDownUp_Step1 +MovementType_WalkSequenceLeftRightDownUp_Step1: @ 0x08090DA8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295668,7 +295668,7 @@ _08090DD4: bx r1 .align 2, 0 _08090DEC: .4byte gUnknown_84E5D8C - thumb_func_end sub_08090DA8 + thumb_func_end MovementType_WalkSequenceLeftRightDownUp_Step1 thumb_func_start MovementType_WalkSequenceDownUpLeftRight MovementType_WalkSequenceDownUpLeftRight: @ 0x08090DF0 @@ -295682,7 +295682,7 @@ MovementType_WalkSequenceDownUpLeftRight: @ 0x08090DF0 ldr r2, _08090E0C adds r0, r0, r2 ldr r2, _08090E10 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295713,8 +295713,8 @@ sub_08090E28: @ 0x08090E28 _08090E30: .4byte gUnknown_84E5D90 thumb_func_end sub_08090E28 - thumb_func_start sub_08090E34 -sub_08090E34: @ 0x08090E34 + thumb_func_start MovementType_WalkSequenceDownUpLeftRight_Step1 +MovementType_WalkSequenceDownUpLeftRight_Step1: @ 0x08090E34 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295749,7 +295749,7 @@ _08090E60: bx r1 .align 2, 0 _08090E78: .4byte gUnknown_84E5B64 - thumb_func_end sub_08090E34 + thumb_func_end MovementType_WalkSequenceDownUpLeftRight_Step1 thumb_func_start MovementType_WalkSequenceRightDownUpLeft MovementType_WalkSequenceRightDownUpLeft: @ 0x08090E7C @@ -295763,7 +295763,7 @@ MovementType_WalkSequenceRightDownUpLeft: @ 0x08090E7C ldr r2, _08090E98 adds r0, r0, r2 ldr r2, _08090E9C - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295794,8 +295794,8 @@ sub_08090EB4: @ 0x08090EB4 _08090EBC: .4byte gUnknown_84E5D9C thumb_func_end sub_08090EB4 - thumb_func_start sub_08090EC0 -sub_08090EC0: @ 0x08090EC0 + thumb_func_start MovementType_WalkSequenceRightDownUpLeft_Step1 +MovementType_WalkSequenceRightDownUpLeft_Step1: @ 0x08090EC0 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295830,7 +295830,7 @@ _08090EEC: bx r1 .align 2, 0 _08090F04: .4byte gUnknown_84E5DA8 - thumb_func_end sub_08090EC0 + thumb_func_end MovementType_WalkSequenceRightDownUpLeft_Step1 thumb_func_start MovementType_WalkSequenceLeftUpDownRight MovementType_WalkSequenceLeftUpDownRight: @ 0x08090F08 @@ -295844,7 +295844,7 @@ MovementType_WalkSequenceLeftUpDownRight: @ 0x08090F08 ldr r2, _08090F24 adds r0, r0, r2 ldr r2, _08090F28 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295875,8 +295875,8 @@ sub_08090F40: @ 0x08090F40 _08090F48: .4byte gUnknown_84E5DAC thumb_func_end sub_08090F40 - thumb_func_start sub_08090F4C -sub_08090F4C: @ 0x08090F4C + thumb_func_start MovementType_WalkSequenceLeftUpDownRight_Step1 +MovementType_WalkSequenceLeftUpDownRight_Step1: @ 0x08090F4C push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295911,7 +295911,7 @@ _08090F78: bx r1 .align 2, 0 _08090F90: .4byte gUnknown_84E5DB8 - thumb_func_end sub_08090F4C + thumb_func_end MovementType_WalkSequenceLeftUpDownRight_Step1 thumb_func_start MovementType_WalkSequenceUpDownRightLeft MovementType_WalkSequenceUpDownRightLeft: @ 0x08090F94 @@ -295925,7 +295925,7 @@ MovementType_WalkSequenceUpDownRightLeft: @ 0x08090F94 ldr r2, _08090FB0 adds r0, r0, r2 ldr r2, _08090FB4 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -295956,8 +295956,8 @@ sub_08090FCC: @ 0x08090FCC _08090FD4: .4byte gUnknown_84E5DBC thumb_func_end sub_08090FCC - thumb_func_start sub_08090FD8 -sub_08090FD8: @ 0x08090FD8 + thumb_func_start MovementType_WalkSequenceUpDownRightLeft_Step1 +MovementType_WalkSequenceUpDownRightLeft_Step1: @ 0x08090FD8 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -295992,7 +295992,7 @@ _08091004: bx r1 .align 2, 0 _0809101C: .4byte gUnknown_84E5DC8 - thumb_func_end sub_08090FD8 + thumb_func_end MovementType_WalkSequenceUpDownRightLeft_Step1 thumb_func_start MovementType_WalkSequenceRightLeftUpDown MovementType_WalkSequenceRightLeftUpDown: @ 0x08091020 @@ -296006,7 +296006,7 @@ MovementType_WalkSequenceRightLeftUpDown: @ 0x08091020 ldr r2, _0809103C adds r0, r0, r2 ldr r2, _08091040 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296037,8 +296037,8 @@ sub_08091058: @ 0x08091058 _08091060: .4byte gUnknown_84E5DCC thumb_func_end sub_08091058 - thumb_func_start sub_08091064 -sub_08091064: @ 0x08091064 + thumb_func_start MovementType_WalkSequenceRightLeftUpDown_Step1 +MovementType_WalkSequenceRightLeftUpDown_Step1: @ 0x08091064 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296073,7 +296073,7 @@ _08091090: bx r1 .align 2, 0 _080910A8: .4byte gUnknown_84E5DD8 - thumb_func_end sub_08091064 + thumb_func_end MovementType_WalkSequenceRightLeftUpDown_Step1 thumb_func_start MovementType_WalkSequenceDownRightLeftUp MovementType_WalkSequenceDownRightLeftUp: @ 0x080910AC @@ -296087,7 +296087,7 @@ MovementType_WalkSequenceDownRightLeftUp: @ 0x080910AC ldr r2, _080910C8 adds r0, r0, r2 ldr r2, _080910CC - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296118,8 +296118,8 @@ sub_080910E4: @ 0x080910E4 _080910EC: .4byte gUnknown_84E5DDC thumb_func_end sub_080910E4 - thumb_func_start sub_080910F0 -sub_080910F0: @ 0x080910F0 + thumb_func_start MovementType_WalkSequenceDownRightLeftUp_Step1 +MovementType_WalkSequenceDownRightLeftUp_Step1: @ 0x080910F0 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296154,7 +296154,7 @@ _0809111C: bx r1 .align 2, 0 _08091134: .4byte gUnknown_84E5DE8 - thumb_func_end sub_080910F0 + thumb_func_end MovementType_WalkSequenceDownRightLeftUp_Step1 thumb_func_start MovementType_WalkSequenceRightUpDownLeft MovementType_WalkSequenceRightUpDownLeft: @ 0x08091138 @@ -296168,7 +296168,7 @@ MovementType_WalkSequenceRightUpDownLeft: @ 0x08091138 ldr r2, _08091154 adds r0, r0, r2 ldr r2, _08091158 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296199,8 +296199,8 @@ sub_08091170: @ 0x08091170 _08091178: .4byte gUnknown_84E5DEC thumb_func_end sub_08091170 - thumb_func_start sub_0809117C -sub_0809117C: @ 0x0809117C + thumb_func_start MovementType_WalkSequenceRightUpDownLeft_Step1 +MovementType_WalkSequenceRightUpDownLeft_Step1: @ 0x0809117C push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296235,7 +296235,7 @@ _080911A8: bx r1 .align 2, 0 _080911C0: .4byte gUnknown_84E5DF8 - thumb_func_end sub_0809117C + thumb_func_end MovementType_WalkSequenceRightUpDownLeft_Step1 thumb_func_start MovementType_WalkSequenceUpDownLeftRight MovementType_WalkSequenceUpDownLeftRight: @ 0x080911C4 @@ -296249,7 +296249,7 @@ MovementType_WalkSequenceUpDownLeftRight: @ 0x080911C4 ldr r2, _080911E0 adds r0, r0, r2 ldr r2, _080911E4 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296280,8 +296280,8 @@ sub_080911FC: @ 0x080911FC _08091204: .4byte gUnknown_84E5DFC thumb_func_end sub_080911FC - thumb_func_start sub_08091208 -sub_08091208: @ 0x08091208 + thumb_func_start MovementType_WalkSequenceUpDownLeftRight_Step1 +MovementType_WalkSequenceUpDownLeftRight_Step1: @ 0x08091208 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296316,7 +296316,7 @@ _08091234: bx r1 .align 2, 0 _0809124C: .4byte gUnknown_84E5E08 - thumb_func_end sub_08091208 + thumb_func_end MovementType_WalkSequenceUpDownLeftRight_Step1 thumb_func_start MovementType_WalkSequenceLeftRightUpDown MovementType_WalkSequenceLeftRightUpDown: @ 0x08091250 @@ -296330,7 +296330,7 @@ MovementType_WalkSequenceLeftRightUpDown: @ 0x08091250 ldr r2, _0809126C adds r0, r0, r2 ldr r2, _08091270 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296361,8 +296361,8 @@ sub_08091288: @ 0x08091288 _08091290: .4byte gUnknown_84E5E0C thumb_func_end sub_08091288 - thumb_func_start sub_08091294 -sub_08091294: @ 0x08091294 + thumb_func_start MovementType_WalkSequenceLeftRightUpDown_Step1 +MovementType_WalkSequenceLeftRightUpDown_Step1: @ 0x08091294 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296397,7 +296397,7 @@ _080912C0: bx r1 .align 2, 0 _080912D8: .4byte gUnknown_84E5E18 - thumb_func_end sub_08091294 + thumb_func_end MovementType_WalkSequenceLeftRightUpDown_Step1 thumb_func_start MovementType_WalkSequenceDownLeftRightUp MovementType_WalkSequenceDownLeftRightUp: @ 0x080912DC @@ -296411,7 +296411,7 @@ MovementType_WalkSequenceDownLeftRightUp: @ 0x080912DC ldr r2, _080912F8 adds r0, r0, r2 ldr r2, _080912FC - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296442,8 +296442,8 @@ sub_08091314: @ 0x08091314 _0809131C: .4byte gUnknown_84E5E1C thumb_func_end sub_08091314 - thumb_func_start sub_08091320 -sub_08091320: @ 0x08091320 + thumb_func_start MovementType_WalkSequenceDownLeftRightUp_Step1 +MovementType_WalkSequenceDownLeftRightUp_Step1: @ 0x08091320 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296478,7 +296478,7 @@ _0809134C: bx r1 .align 2, 0 _08091364: .4byte gUnknown_84E5E28 - thumb_func_end sub_08091320 + thumb_func_end MovementType_WalkSequenceDownLeftRightUp_Step1 thumb_func_start MovementType_WalkSequenceUpLeftDownRight MovementType_WalkSequenceUpLeftDownRight: @ 0x08091368 @@ -296492,7 +296492,7 @@ MovementType_WalkSequenceUpLeftDownRight: @ 0x08091368 ldr r2, _08091384 adds r0, r0, r2 ldr r2, _08091388 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296523,8 +296523,8 @@ sub_080913A0: @ 0x080913A0 _080913A8: .4byte gUnknown_84E5E2C thumb_func_end sub_080913A0 - thumb_func_start sub_080913AC -sub_080913AC: @ 0x080913AC + thumb_func_start MovementType_WalkSequenceUpLeftDownRight_Step1 +MovementType_WalkSequenceUpLeftDownRight_Step1: @ 0x080913AC push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296559,7 +296559,7 @@ _080913D8: bx r1 .align 2, 0 _080913F0: .4byte gUnknown_84E5E38 - thumb_func_end sub_080913AC + thumb_func_end MovementType_WalkSequenceUpLeftDownRight_Step1 thumb_func_start MovementType_WalkSequenceDownRightUpLeft MovementType_WalkSequenceDownRightUpLeft: @ 0x080913F4 @@ -296573,7 +296573,7 @@ MovementType_WalkSequenceDownRightUpLeft: @ 0x080913F4 ldr r2, _08091410 adds r0, r0, r2 ldr r2, _08091414 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296604,8 +296604,8 @@ sub_0809142C: @ 0x0809142C _08091434: .4byte gUnknown_84E5E3C thumb_func_end sub_0809142C - thumb_func_start sub_08091438 -sub_08091438: @ 0x08091438 + thumb_func_start MovementType_WalkSequenceDownRightUpLeft_Step1 +MovementType_WalkSequenceDownRightUpLeft_Step1: @ 0x08091438 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296640,7 +296640,7 @@ _08091464: bx r1 .align 2, 0 _0809147C: .4byte gUnknown_84E5E48 - thumb_func_end sub_08091438 + thumb_func_end MovementType_WalkSequenceDownRightUpLeft_Step1 thumb_func_start MovementType_WalkSequenceLeftDownRightUp MovementType_WalkSequenceLeftDownRightUp: @ 0x08091480 @@ -296654,7 +296654,7 @@ MovementType_WalkSequenceLeftDownRightUp: @ 0x08091480 ldr r2, _0809149C adds r0, r0, r2 ldr r2, _080914A0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296685,8 +296685,8 @@ sub_080914B8: @ 0x080914B8 _080914C0: .4byte gUnknown_84E5E4C thumb_func_end sub_080914B8 - thumb_func_start sub_080914C4 -sub_080914C4: @ 0x080914C4 + thumb_func_start MovementType_WalkSequenceLeftDownRightUp_Step1 +MovementType_WalkSequenceLeftDownRightUp_Step1: @ 0x080914C4 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296721,7 +296721,7 @@ _080914F0: bx r1 .align 2, 0 _08091508: .4byte gUnknown_84E5E58 - thumb_func_end sub_080914C4 + thumb_func_end MovementType_WalkSequenceLeftDownRightUp_Step1 thumb_func_start MovementType_WalkSequenceRightUpLeftDown MovementType_WalkSequenceRightUpLeftDown: @ 0x0809150C @@ -296735,7 +296735,7 @@ MovementType_WalkSequenceRightUpLeftDown: @ 0x0809150C ldr r2, _08091528 adds r0, r0, r2 ldr r2, _0809152C - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296766,8 +296766,8 @@ sub_08091544: @ 0x08091544 _0809154C: .4byte gUnknown_84E5E5C thumb_func_end sub_08091544 - thumb_func_start sub_08091550 -sub_08091550: @ 0x08091550 + thumb_func_start MovementType_WalkSequenceRightUpLeftDown_Step1 +MovementType_WalkSequenceRightUpLeftDown_Step1: @ 0x08091550 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296802,7 +296802,7 @@ _0809157C: bx r1 .align 2, 0 _08091594: .4byte gUnknown_84E5E68 - thumb_func_end sub_08091550 + thumb_func_end MovementType_WalkSequenceRightUpLeftDown_Step1 thumb_func_start MovementType_WalkSequenceUpRightDownLeft MovementType_WalkSequenceUpRightDownLeft: @ 0x08091598 @@ -296816,7 +296816,7 @@ MovementType_WalkSequenceUpRightDownLeft: @ 0x08091598 ldr r2, _080915B4 adds r0, r0, r2 ldr r2, _080915B8 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296847,8 +296847,8 @@ sub_080915D0: @ 0x080915D0 _080915D8: .4byte gUnknown_84E5E6C thumb_func_end sub_080915D0 - thumb_func_start sub_080915DC -sub_080915DC: @ 0x080915DC + thumb_func_start MovementType_WalkSequenceUpRightDownLeft_Step1 +MovementType_WalkSequenceUpRightDownLeft_Step1: @ 0x080915DC push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296883,7 +296883,7 @@ _08091608: bx r1 .align 2, 0 _08091620: .4byte gUnknown_84E5E78 - thumb_func_end sub_080915DC + thumb_func_end MovementType_WalkSequenceUpRightDownLeft_Step1 thumb_func_start MovementType_WalkSequenceDownLeftUpRight MovementType_WalkSequenceDownLeftUpRight: @ 0x08091624 @@ -296897,7 +296897,7 @@ MovementType_WalkSequenceDownLeftUpRight: @ 0x08091624 ldr r2, _08091640 adds r0, r0, r2 ldr r2, _08091644 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -296928,8 +296928,8 @@ sub_0809165C: @ 0x0809165C _08091664: .4byte gUnknown_84E5E7C thumb_func_end sub_0809165C - thumb_func_start sub_08091668 -sub_08091668: @ 0x08091668 + thumb_func_start MovementType_WalkSequenceDownLeftUpRight_Step1 +MovementType_WalkSequenceDownLeftUpRight_Step1: @ 0x08091668 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -296964,7 +296964,7 @@ _08091694: bx r1 .align 2, 0 _080916AC: .4byte gUnknown_84E5E88 - thumb_func_end sub_08091668 + thumb_func_end MovementType_WalkSequenceDownLeftUpRight_Step1 thumb_func_start MovementType_WalkSequenceLeftUpRightDown MovementType_WalkSequenceLeftUpRightDown: @ 0x080916B0 @@ -296978,7 +296978,7 @@ MovementType_WalkSequenceLeftUpRightDown: @ 0x080916B0 ldr r2, _080916CC adds r0, r0, r2 ldr r2, _080916D0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -297009,8 +297009,8 @@ sub_080916E8: @ 0x080916E8 _080916F0: .4byte gUnknown_84E5E8C thumb_func_end sub_080916E8 - thumb_func_start sub_080916F4 -sub_080916F4: @ 0x080916F4 + thumb_func_start MovementType_WalkSequenceLeftUpRightDown_Step1 +MovementType_WalkSequenceLeftUpRightDown_Step1: @ 0x080916F4 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -297045,7 +297045,7 @@ _08091720: bx r1 .align 2, 0 _08091738: .4byte gUnknown_84E5E98 - thumb_func_end sub_080916F4 + thumb_func_end MovementType_WalkSequenceLeftUpRightDown_Step1 thumb_func_start MovementType_WalkSequenceRightDownLeftUp MovementType_WalkSequenceRightDownLeftUp: @ 0x0809173C @@ -297059,7 +297059,7 @@ MovementType_WalkSequenceRightDownLeftUp: @ 0x0809173C ldr r2, _08091758 adds r0, r0, r2 ldr r2, _0809175C - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -297090,8 +297090,8 @@ sub_08091774: @ 0x08091774 _0809177C: .4byte gUnknown_84E5E9C thumb_func_end sub_08091774 - thumb_func_start sub_08091780 -sub_08091780: @ 0x08091780 + thumb_func_start MovementType_WalkSequenceRightDownLeftUp_Step1 +MovementType_WalkSequenceRightDownLeftUp_Step1: @ 0x08091780 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -297126,7 +297126,7 @@ _080917AC: bx r1 .align 2, 0 _080917C4: .4byte gUnknown_84E5EA8 - thumb_func_end sub_08091780 + thumb_func_end MovementType_WalkSequenceRightDownLeftUp_Step1 thumb_func_start MovementType_CopyPlayer MovementType_CopyPlayer: @ 0x080917C8 @@ -297140,7 +297140,7 @@ MovementType_CopyPlayer: @ 0x080917C8 ldr r2, _080917E4 adds r0, r0, r2 ldr r2, _080917E8 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -297171,8 +297171,8 @@ sub_08091800: @ 0x08091800 _08091808: .4byte gUnknown_84E5EAC thumb_func_end sub_08091800 - thumb_func_start sub_0809180C -sub_0809180C: @ 0x0809180C + thumb_func_start MovementType_CopyPlayer_Step0 +MovementType_CopyPlayer_Step0: @ 0x0809180C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -297190,7 +297190,7 @@ _08091824: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809180C + thumb_func_end MovementType_CopyPlayer_Step0 thumb_func_start sub_08091830 sub_08091830: @ 0x08091830 @@ -297247,7 +297247,7 @@ MovementType_CopyPlayer_Step2: @ 0x08091890 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _080918AE @@ -297293,7 +297293,7 @@ CopyablePlayerMovement_FaceDirection: @ 0x080918BC lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -297308,8 +297308,8 @@ CopyablePlayerMovement_FaceDirection: @ 0x080918BC _08091900: .4byte gUnknown_84DDA21 thumb_func_end CopyablePlayerMovement_FaceDirection - thumb_func_start sub_08091904 -sub_08091904: @ 0x08091904 + thumb_func_start CopyablePlayerMovement_GoSpeed0 +CopyablePlayerMovement_GoSpeed0: @ 0x08091904 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -297320,11 +297320,11 @@ sub_08091904: @ 0x08091904 lsls r2, r2, #0x18 lsrs r5, r2, #0x18 adds r6, r5, #0 - bl sub_081D4068 + bl EventObjectIsFarawayIslandMew lsls r0, r0, #0x18 cmp r0, #0 beq _0809196C - bl sub_081D38FC + bl GetMewMoveDirection adds r5, r0, #0 cmp r5, #0 bne _08091982 @@ -297352,7 +297352,7 @@ sub_08091904: @ 0x08091904 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement b _080919F4 .align 2, 0 _08091968: .4byte gUnknown_84DDA21 @@ -297382,7 +297382,7 @@ _08091982: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement mov r0, sp movs r2, #0 ldrsh r1, [r0, r2] @@ -297390,7 +297390,7 @@ _08091982: ldrsh r2, [r6, r0] adds r0, r4, #0 adds r3, r5, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _080919E0 @@ -297417,7 +297417,7 @@ _080919E0: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement _080919F4: ldrb r0, [r4] movs r1, #2 @@ -297434,10 +297434,10 @@ _080919F4: bx r1 .align 2, 0 _08091A10: .4byte gUnknown_84DDA21 - thumb_func_end sub_08091904 + thumb_func_end CopyablePlayerMovement_GoSpeed0 - thumb_func_start sub_08091A14 -sub_08091A14: @ 0x08091A14 + thumb_func_start CopyablePlayerMovement_GoSpeed1 +CopyablePlayerMovement_GoSpeed1: @ 0x08091A14 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -297471,7 +297471,7 @@ sub_08091A14: @ 0x08091A14 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement mov r0, sp movs r2, #0 ldrsh r1, [r0, r2] @@ -297479,7 +297479,7 @@ sub_08091A14: @ 0x08091A14 ldrsh r2, [r5, r0] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _08091A9A @@ -297506,7 +297506,7 @@ _08091A9A: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement _08091AAE: ldrb r0, [r4] movs r1, #2 @@ -297523,10 +297523,10 @@ _08091AAE: bx r1 .align 2, 0 _08091AC8: .4byte gUnknown_84DDA21 - thumb_func_end sub_08091A14 + thumb_func_end CopyablePlayerMovement_GoSpeed1 - thumb_func_start sub_08091ACC -sub_08091ACC: @ 0x08091ACC + thumb_func_start CopyablePlayerMovement_GoSpeed2 +CopyablePlayerMovement_GoSpeed2: @ 0x08091ACC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -297560,7 +297560,7 @@ sub_08091ACC: @ 0x08091ACC lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement mov r0, sp movs r2, #0 ldrsh r1, [r0, r2] @@ -297568,7 +297568,7 @@ sub_08091ACC: @ 0x08091ACC ldrsh r2, [r5, r0] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _08091B52 @@ -297595,7 +297595,7 @@ _08091B52: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement _08091B66: ldrb r0, [r4] movs r1, #2 @@ -297612,10 +297612,10 @@ _08091B66: bx r1 .align 2, 0 _08091B80: .4byte gUnknown_84DDA21 - thumb_func_end sub_08091ACC + thumb_func_end CopyablePlayerMovement_GoSpeed2 - thumb_func_start sub_08091B84 -sub_08091B84: @ 0x08091B84 + thumb_func_start CopyablePlayerMovement_Slide +CopyablePlayerMovement_Slide: @ 0x08091B84 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -297649,7 +297649,7 @@ sub_08091B84: @ 0x08091B84 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement mov r0, sp movs r2, #0 ldrsh r1, [r0, r2] @@ -297657,7 +297657,7 @@ sub_08091B84: @ 0x08091B84 ldrsh r2, [r5, r0] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _08091C0A @@ -297684,7 +297684,7 @@ _08091C0A: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement _08091C1E: ldrb r0, [r4] movs r1, #2 @@ -297701,7 +297701,7 @@ _08091C1E: bx r1 .align 2, 0 _08091C38: .4byte gUnknown_84DDA21 - thumb_func_end sub_08091B84 + thumb_func_end CopyablePlayerMovement_Slide thumb_func_start cph_IM_DIFFERENT cph_IM_DIFFERENT: @ 0x08091C3C @@ -297724,7 +297724,7 @@ cph_IM_DIFFERENT: @ 0x08091C3C lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4] movs r1, #2 orrs r0, r1 @@ -297739,8 +297739,8 @@ cph_IM_DIFFERENT: @ 0x08091C3C _08091C80: .4byte gUnknown_84DDA21 thumb_func_end cph_IM_DIFFERENT - thumb_func_start sub_08091C84 -sub_08091C84: @ 0x08091C84 + thumb_func_start CopyablePlayerMovement_GoSpeed4 +CopyablePlayerMovement_GoSpeed4: @ 0x08091C84 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -297774,7 +297774,7 @@ sub_08091C84: @ 0x08091C84 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement mov r0, sp movs r2, #0 ldrsh r1, [r0, r2] @@ -297782,7 +297782,7 @@ sub_08091C84: @ 0x08091C84 ldrsh r2, [r5, r0] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _08091D0A @@ -297809,7 +297809,7 @@ _08091D0A: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement _08091D1E: ldrb r0, [r4] movs r1, #2 @@ -297826,10 +297826,10 @@ _08091D1E: bx r1 .align 2, 0 _08091D38: .4byte gUnknown_84DDA21 - thumb_func_end sub_08091C84 + thumb_func_end CopyablePlayerMovement_GoSpeed4 - thumb_func_start sub_08091D3C -sub_08091D3C: @ 0x08091D3C + thumb_func_start CopyablePlayerMovement_Jump +CopyablePlayerMovement_Jump: @ 0x08091D3C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -297870,7 +297870,7 @@ sub_08091D3C: @ 0x08091D3C lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement add r0, sp, #4 movs r2, #0 ldrsh r1, [r0, r2] @@ -297878,7 +297878,7 @@ sub_08091D3C: @ 0x08091D3C ldrsh r2, [r5, r0] adds r0, r4, #0 adds r3, r6, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 cmp r0, #0 bne _08091DD0 @@ -297905,7 +297905,7 @@ _08091DD0: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r7, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement _08091DE4: ldrb r0, [r4] movs r1, #2 @@ -297922,7 +297922,7 @@ _08091DE4: bx r1 .align 2, 0 _08091E00: .4byte gUnknown_84DDA21 - thumb_func_end sub_08091D3C + thumb_func_end CopyablePlayerMovement_Jump thumb_func_start MovementType_CopyPlayerInGrass MovementType_CopyPlayerInGrass: @ 0x08091E04 @@ -297936,7 +297936,7 @@ MovementType_CopyPlayerInGrass: @ 0x08091E04 ldr r2, _08091E20 adds r0, r0, r2 ldr r2, _08091E24 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -297967,8 +297967,8 @@ sub_08091E3C: @ 0x08091E3C _08091E44: .4byte gUnknown_84E5EE4 thumb_func_end sub_08091E3C - thumb_func_start sub_08091E48 -sub_08091E48: @ 0x08091E48 + thumb_func_start MovementType_CopyPlayerInGrass_Step1 +MovementType_CopyPlayerInGrass_Step1: @ 0x08091E48 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 @@ -298016,10 +298016,10 @@ _08091E9C: .align 2, 0 _08091EA4: .4byte gUnknown_84E5EB8 _08091EA8: .4byte MetatileBehavior_IsPokeGrass - thumb_func_end sub_08091E48 + thumb_func_end MovementType_CopyPlayerInGrass_Step1 - thumb_func_start sub_08091EAC -sub_08091EAC: @ 0x08091EAC + thumb_func_start MovementType_TreeDisguise +MovementType_TreeDisguise: @ 0x08091EAC push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0x2e @@ -298048,7 +298048,7 @@ _08091ED4: adds r0, r4, #0 bl EventObjectGetLocalIdAndMap movs r0, #0x1c - bl sub_080B5270 + bl FieldEffectStart strb r0, [r4, #0x1a] movs r0, #1 strb r0, [r6] @@ -298065,27 +298065,27 @@ _08091EF4: adds r0, r0, r1 ldr r2, _08091F18 adds r1, r5, #0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08091F10: .4byte gUnknown_2036FF0 _08091F14: .4byte gUnknown_20388A8 -_08091F18: .4byte sub_08091F1C - thumb_func_end sub_08091EAC +_08091F18: .4byte MovementType_Disguise_Callback + thumb_func_end MovementType_TreeDisguise - thumb_func_start sub_08091F1C -sub_08091F1C: @ 0x08091F1C + thumb_func_start MovementType_Disguise_Callback +MovementType_Disguise_Callback: @ 0x08091F1C push {lr} bl ClearEventObjectMovement movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08091F1C + thumb_func_end MovementType_Disguise_Callback - thumb_func_start sub_08091F28 -sub_08091F28: @ 0x08091F28 + thumb_func_start MovementType_MountainDisguise +MovementType_MountainDisguise: @ 0x08091F28 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0x2e @@ -298114,7 +298114,7 @@ _08091F50: adds r0, r4, #0 bl EventObjectGetLocalIdAndMap movs r0, #0x1d - bl sub_080B5270 + bl FieldEffectStart strb r0, [r4, #0x1a] movs r0, #1 strb r0, [r6] @@ -298131,15 +298131,15 @@ _08091F70: adds r0, r0, r1 ldr r2, _08091F94 adds r1, r5, #0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08091F8C: .4byte gUnknown_2036FF0 _08091F90: .4byte gUnknown_20388A8 -_08091F94: .4byte sub_08091F1C - thumb_func_end sub_08091F28 +_08091F94: .4byte MovementType_Disguise_Callback + thumb_func_end MovementType_MountainDisguise thumb_func_start MovementType_Hidden MovementType_Hidden: @ 0x08091F98 @@ -298184,7 +298184,7 @@ _08091FD8: adds r0, r0, r4 ldr r2, _08091FF8 adds r1, r3, #0 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r4} pop {r0} bx r0 @@ -298216,20 +298216,20 @@ sub_08092010: @ 0x08092010 _08092018: .4byte gUnknown_84E5EF0 thumb_func_end sub_08092010 - thumb_func_start sub_0809201C -sub_0809201C: @ 0x0809201C + thumb_func_start MovementType_Hidden_Step0 +MovementType_Hidden_Step0: @ 0x0809201C push {lr} bl ClearEventObjectMovement movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809201C + thumb_func_end MovementType_Hidden_Step0 thumb_func_start MovementType_MoveInPlace_Step1 MovementType_MoveInPlace_Step1: @ 0x08092028 push {r4, lr} adds r4, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 beq _0809203A @@ -298255,7 +298255,7 @@ MovementType_WalkInPlace: @ 0x08092044 ldr r2, _08092060 adds r0, r0, r2 ldr r2, _08092064 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -298301,7 +298301,7 @@ MovementType_WalkInPlace_Step0: @ 0x08092088 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -298321,7 +298321,7 @@ MovementType_WalkSlowlyInPlace: @ 0x080920B4 ldr r2, _080920D0 adds r0, r0, r2 ldr r2, _080920D4 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -298367,7 +298367,7 @@ MovementType_WalkSlowlyInPlace_Step0: @ 0x080920F8 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -298387,7 +298387,7 @@ MovementType_JogInPlace: @ 0x08092124 ldr r2, _08092140 adds r0, r0, r2 ldr r2, _08092144 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -298433,7 +298433,7 @@ MovementType_JogInPlace_Step0: @ 0x08092168 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -298453,7 +298453,7 @@ MovementType_RunInPlace: @ 0x08092194 ldr r2, _080921B0 adds r0, r0, r2 ldr r2, _080921B4 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -298499,7 +298499,7 @@ MovementType_RunInPlace_Step0: @ 0x080921D8 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement movs r0, #1 strh r0, [r5, #0x30] pop {r4, r5} @@ -298519,7 +298519,7 @@ MovementType_Invisible: @ 0x08092204 ldr r2, _08092220 adds r0, r0, r2 ldr r2, _08092224 - bl sub_08092C30 + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .align 2, 0 @@ -298565,7 +298565,7 @@ MovementType_Invisible_Step0: @ 0x08092248 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08093274 + bl EventObjectSetSingleMovement ldrb r0, [r4, #1] movs r1, #0x20 orrs r0, r1 @@ -298581,7 +298581,7 @@ MovementType_Invisible_Step0: @ 0x08092248 MovementType_Invisible_Step1: @ 0x0809227C push {r4, lr} adds r4, r1, #0 - bl sub_08093234 + bl EventObjectExecSingleMovementAction lsls r0, r0, #0x18 cmp r0, #0 bne _0809228E @@ -298836,8 +298836,8 @@ _080923DC: bx r1 thumb_func_end sub_080923BC - thumb_func_start sub_080923E0 -sub_080923E0: @ 0x080923E0 + thumb_func_start npc_apply_anim_looping +npc_apply_anim_looping: @ 0x080923E0 push {r4, lr} adds r4, r1, #0 lsls r2, r2, #0x18 @@ -298876,10 +298876,10 @@ _08092422: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080923E0 + thumb_func_end npc_apply_anim_looping - thumb_func_start sub_08092428 -sub_08092428: @ 0x08092428 + thumb_func_start obj_npc_animation_step +obj_npc_animation_step: @ 0x08092428 push {r4, lr} adds r4, r1, #0 lsls r2, r2, #0x18 @@ -298912,7 +298912,7 @@ _08092460: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08092428 + thumb_func_end obj_npc_animation_step thumb_func_start GetDirectionToFace GetDirectionToFace: @ 0x08092468 @@ -299026,7 +299026,7 @@ GetCollisionInDirection: @ 0x080924F8 ldrsh r2, [r4, r0] adds r0, r6, #0 adds r3, r5, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #4 @@ -299035,8 +299035,8 @@ GetCollisionInDirection: @ 0x080924F8 bx r1 thumb_func_end GetCollisionInDirection - thumb_func_start sub_08092538 -sub_08092538: @ 0x08092538 + thumb_func_start GetCollisionAtCoords +GetCollisionAtCoords: @ 0x08092538 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -299066,13 +299066,13 @@ sub_08092538: @ 0x08092538 _0809256E: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B14 + bl MapGridIsImpassableAt lsls r0, r0, #0x18 cmp r0, #0 bne _080925B0 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08088000 + bl GetMapBorderIdAt movs r1, #1 rsbs r1, r1, #0 cmp r0, r1 @@ -299090,7 +299090,7 @@ _0809256E: cmp r0, #0 beq _080925B4 mov r0, r8 - bl sub_08088114 + bl CanCameraMoveInDirection cmp r0, #0 bne _080925B4 _080925B0: @@ -299108,7 +299108,7 @@ _080925B4: asrs r4, r1, #0x10 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08096634 + bl IsZCoordMismatchAt lsls r0, r0, #0x18 cmp r0, #0 beq _080925D8 @@ -299118,7 +299118,7 @@ _080925D8: adds r0, r6, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08092790 + bl DoesObjectCollideWithObjectAt lsls r0, r0, #0x18 cmp r0, #0 bne _080925EC @@ -299134,10 +299134,10 @@ _080925EE: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08092538 + thumb_func_end GetCollisionAtCoords - thumb_func_start sub_080925FC -sub_080925FC: @ 0x080925FC + thumb_func_start GetCollisionFlagsAtCoords +GetCollisionFlagsAtCoords: @ 0x080925FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -299166,13 +299166,13 @@ sub_080925FC: @ 0x080925FC lsrs r4, r1, #0x1f adds r0, r6, #0 adds r1, r5, #0 - bl sub_08087B14 + bl MapGridIsImpassableAt lsls r0, r0, #0x18 cmp r0, #0 bne _08092674 adds r0, r6, #0 adds r1, r5, #0 - bl sub_08088000 + bl GetMapBorderIdAt movs r1, #1 rsbs r1, r1, #0 cmp r0, r1 @@ -299190,7 +299190,7 @@ sub_080925FC: @ 0x080925FC cmp r0, #0 beq _08092678 mov r0, r8 - bl sub_08088114 + bl CanCameraMoveInDirection cmp r0, #0 bne _08092678 _08092674: @@ -299208,7 +299208,7 @@ _08092678: asrs r5, r1, #0x10 adds r1, r6, #0 adds r2, r5, #0 - bl sub_08096634 + bl IsZCoordMismatchAt lsls r0, r0, #0x18 cmp r0, #0 beq _080926A0 @@ -299220,7 +299220,7 @@ _080926A0: adds r0, r7, #0 adds r1, r6, #0 adds r2, r5, #0 - bl sub_08092790 + bl DoesObjectCollideWithObjectAt lsls r0, r0, #0x18 cmp r0, #0 beq _080926B8 @@ -299237,7 +299237,7 @@ _080926B8: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080925FC + thumb_func_end GetCollisionFlagsAtCoords thumb_func_start IsCoordOutsideEventObjectMovementRange IsCoordOutsideEventObjectMovementRange: @ 0x080926C8 @@ -299349,8 +299349,8 @@ _0809278A: bx r1 thumb_func_end sub_08092738 - thumb_func_start sub_08092790 -sub_08092790: @ 0x08092790 + thumb_func_start DoesObjectCollideWithObjectAt +DoesObjectCollideWithObjectAt: @ 0x08092790 push {r4, r5, r6, r7, lr} adds r6, r0, #0 lsls r1, r1, #0x10 @@ -299416,10 +299416,10 @@ _08092804: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08092790 + thumb_func_end DoesObjectCollideWithObjectAt - thumb_func_start sub_0809280C -sub_0809280C: @ 0x0809280C + thumb_func_start IsBerryTreeSparkling +IsBerryTreeSparkling: @ 0x0809280C push {lr} sub sp, #4 lsls r0, r0, #0x18 @@ -299462,7 +299462,7 @@ _0809285A: add sp, #4 pop {r1} bx r1 - thumb_func_end sub_0809280C + thumb_func_end IsBerryTreeSparkling thumb_func_start sub_08092860 sub_08092860: @ 0x08092860 @@ -299872,8 +299872,8 @@ _08092B2C: bx r1 thumb_func_end EventObjectIsHeldMovementActive - thumb_func_start sub_08092B30 -sub_08092B30: @ 0x08092B30 + thumb_func_start EventObjectSetHeldMovement +EventObjectSetHeldMovement: @ 0x08092B30 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -299909,7 +299909,7 @@ _08092B72: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08092B30 + thumb_func_end EventObjectSetHeldMovement thumb_func_start EventObjectForceSetHeldMovement EventObjectForceSetHeldMovement: @ 0x08092B78 @@ -299920,7 +299920,7 @@ EventObjectForceSetHeldMovement: @ 0x08092B78 bl EventObjectClearHeldMovementIfActive adds r0, r5, #0 adds r1, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement pop {r4, r5} pop {r0} bx r0 @@ -300028,8 +300028,8 @@ _08092C2A: .align 2, 0 thumb_func_end EventObjectGetHeldMovementActionId - thumb_func_start sub_08092C30 -sub_08092C30: @ 0x08092C30 + thumb_func_start UpdateEventObjectCurrentMovement +UpdateEventObjectCurrentMovement: @ 0x08092C30 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -300045,7 +300045,7 @@ sub_08092C30: @ 0x08092C30 beq _08092C5A adds r0, r4, #0 adds r1, r5, #0 - bl sub_080931FC + bl EventObjectExecHeldMovementAction b _08092C70 _08092C5A: ldrb r0, [r4, #1] @@ -300079,7 +300079,7 @@ _08092C70: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08092C30 + thumb_func_end UpdateEventObjectCurrentMovement thumb_func_start sub_08092CA0 sub_08092CA0: @ 0x08092CA0 @@ -300512,7 +300512,7 @@ EventObjectFaceOppositeDirection: @ 0x08092F8C adds r4, r0, #0 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_08093170 + bl GetOppositeDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_08092CA0 @@ -300520,7 +300520,7 @@ EventObjectFaceOppositeDirection: @ 0x08092F8C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4} @@ -300529,8 +300529,8 @@ EventObjectFaceOppositeDirection: @ 0x08092F8C .align 2, 0 thumb_func_end EventObjectFaceOppositeDirection - thumb_func_start sub_08092FB8 -sub_08092FB8: @ 0x08092FB8 + thumb_func_start HallOfFame_PrintWelcomeText +HallOfFame_PrintWelcomeText: @ 0x08092FB8 push {r4, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -300552,7 +300552,7 @@ _08092FD0: bx r1 .align 2, 0 _08092FE0: .4byte gUnknown_84E6049 - thumb_func_end sub_08092FB8 + thumb_func_end HallOfFame_PrintWelcomeText thumb_func_start sub_08092FE4 sub_08092FE4: @ 0x08092FE4 @@ -300629,8 +300629,8 @@ _08093054: _08093064: .4byte gUnknown_84E6058 thumb_func_end sub_0809303C - thumb_func_start sub_08093068 -sub_08093068: @ 0x08093068 + thumb_func_start MovementType_FaceUpAndRight_callback +MovementType_FaceUpAndRight_callback: @ 0x08093068 push {r4, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -300652,7 +300652,7 @@ _08093080: bx r1 .align 2, 0 _08093090: .4byte gUnknown_84E605D - thumb_func_end sub_08093068 + thumb_func_end MovementType_FaceUpAndRight_callback thumb_func_start sub_08093094 sub_08093094: @ 0x08093094 @@ -300779,8 +300779,8 @@ _0809315C: _0809316C: .4byte gUnknown_84E6076 thumb_func_end sub_08093144 - thumb_func_start sub_08093170 -sub_08093170: @ 0x08093170 + thumb_func_start GetOppositeDirection +GetOppositeDirection: @ 0x08093170 push {r4, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -300808,7 +300808,7 @@ _0809319A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08093170 + thumb_func_end GetOppositeDirection thumb_func_start zffu_offset_calc zffu_offset_calc: @ 0x080931A4 @@ -300864,8 +300864,8 @@ _080931F2: _080931F8: .4byte gUnknown_84E6093 thumb_func_end state_to_direction - thumb_func_start sub_080931FC -sub_080931FC: @ 0x080931FC + thumb_func_start EventObjectExecHeldMovementAction +EventObjectExecHeldMovementAction: @ 0x080931FC push {r4, lr} adds r4, r0, #0 ldr r2, _08093230 @@ -300881,7 +300881,7 @@ sub_080931FC: @ 0x080931FC adds r0, r4, #0 bl _call_via_r2 lsls r0, r0, #0x18 - thumb_func_end sub_080931FC + thumb_func_end EventObjectExecHeldMovementAction thumb_func_start sub_0809321C sub_0809321C: @ 0x0809321C @@ -300899,8 +300899,8 @@ _08093228: _08093230: .4byte gUnknown_84E60A4 thumb_func_end sub_0809321C - thumb_func_start sub_08093234 -sub_08093234: @ 0x08093234 + thumb_func_start EventObjectExecSingleMovementAction +EventObjectExecSingleMovementAction: @ 0x08093234 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -300918,7 +300918,7 @@ sub_08093234: @ 0x08093234 adds r1, r5, #0 bl _call_via_r2 lsls r0, r0, #0x18 - thumb_func_end sub_08093234 + thumb_func_end EventObjectExecSingleMovementAction thumb_func_start sub_08093258 sub_08093258: @ 0x08093258 @@ -300940,13 +300940,13 @@ _0809326E: bx r1 thumb_func_end sub_08093258 - thumb_func_start sub_08093274 -sub_08093274: @ 0x08093274 + thumb_func_start EventObjectSetSingleMovement +EventObjectSetSingleMovement: @ 0x08093274 movs r3, #0 strb r2, [r0, #0x1c] strh r3, [r1, #0x32] bx lr - thumb_func_end sub_08093274 + thumb_func_end EventObjectSetSingleMovement thumb_func_start FaceDirection FaceDirection: @ 0x0809327C @@ -300957,7 +300957,7 @@ FaceDirection: @ 0x0809327C lsrs r1, r1, #0x18 bl SetEventObjectDirection adds r0, r4, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords ldrb r0, [r4, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -300967,7 +300967,7 @@ FaceDirection: @ 0x0809327C lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08092428 + bl obj_npc_animation_step adds r2, r5, #0 adds r2, #0x2c ldrb r0, [r2] @@ -300982,8 +300982,8 @@ FaceDirection: @ 0x0809327C .align 2, 0 thumb_func_end FaceDirection - thumb_func_start sub_080932C0 -sub_080932C0: @ 0x080932C0 + thumb_func_start MovementAction_FaceDown_Step0 +MovementAction_FaceDown_Step0: @ 0x080932C0 push {lr} movs r2, #1 bl FaceDirection @@ -300991,10 +300991,10 @@ sub_080932C0: @ 0x080932C0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080932C0 + thumb_func_end MovementAction_FaceDown_Step0 - thumb_func_start sub_080932D0 -sub_080932D0: @ 0x080932D0 + thumb_func_start MovementAction_FaceUp_Step0 +MovementAction_FaceUp_Step0: @ 0x080932D0 push {lr} movs r2, #2 bl FaceDirection @@ -301002,10 +301002,10 @@ sub_080932D0: @ 0x080932D0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080932D0 + thumb_func_end MovementAction_FaceUp_Step0 - thumb_func_start sub_080932E0 -sub_080932E0: @ 0x080932E0 + thumb_func_start MovementAction_FaceLeft_Step0 +MovementAction_FaceLeft_Step0: @ 0x080932E0 push {lr} movs r2, #3 bl FaceDirection @@ -301013,10 +301013,10 @@ sub_080932E0: @ 0x080932E0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080932E0 + thumb_func_end MovementAction_FaceLeft_Step0 - thumb_func_start sub_080932F0 -sub_080932F0: @ 0x080932F0 + thumb_func_start MovementAction_FaceRight_Step0 +MovementAction_FaceRight_Step0: @ 0x080932F0 push {lr} movs r2, #4 bl FaceDirection @@ -301024,10 +301024,10 @@ sub_080932F0: @ 0x080932F0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080932F0 + thumb_func_end MovementAction_FaceRight_Step0 - thumb_func_start sub_08093300 -sub_08093300: @ 0x08093300 + thumb_func_start npc_apply_direction +npc_apply_direction: @ 0x08093300 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -301060,11 +301060,11 @@ sub_08093300: @ 0x08093300 movs r0, #0 ldrsh r2, [r5, r0] adds r0, r7, #0 - bl sub_0808E454 + bl ShiftEventObjectCoords mov r0, r8 adds r1, r4, #0 adds r2, r6, #0 - bl sub_08096FD0 + bl oamt_npc_ministep_reset mov r4, r8 adds r4, #0x2c ldrb r1, [r4] @@ -301077,7 +301077,7 @@ sub_08093300: @ 0x08093300 cmp r0, #0 beq _0809337E adds r0, r7, #0 - bl sub_08097900 + bl FindLockedEventObjectIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x10 @@ -301102,10 +301102,10 @@ _0809337E: bx r0 .align 2, 0 _08093398: .4byte gUnknown_2037258 - thumb_func_end sub_08093300 + thumb_func_end npc_apply_direction - thumb_func_start sub_0809339C -sub_0809339C: @ 0x0809339C + thumb_func_start do_go_anim +do_go_anim: @ 0x0809339C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -301126,7 +301126,7 @@ sub_0809339C: @ 0x0809339C adds r0, r5, #0 mov r1, r8 adds r3, r4, #0 - bl sub_08093300 + bl npc_apply_direction lsls r4, r4, #2 mov r7, sp adds r1, r7, r4 @@ -301140,7 +301140,7 @@ sub_0809339C: @ 0x0809339C lsrs r2, r2, #0x18 adds r0, r5, #0 mov r1, r8 - bl sub_080923E0 + bl npc_apply_anim_looping add sp, #0x14 pop {r3} mov r8, r3 @@ -301149,7 +301149,7 @@ sub_0809339C: @ 0x0809339C bx r0 .align 2, 0 _080933F4: .4byte gUnknown_84E633C - thumb_func_end sub_0809339C + thumb_func_end do_go_anim thumb_func_start StartRunningAnim StartRunningAnim: @ 0x080933F8 @@ -301159,7 +301159,7 @@ StartRunningAnim: @ 0x080933F8 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 movs r3, #1 - bl sub_08093300 + bl npc_apply_direction ldrb r0, [r4, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -301169,7 +301169,7 @@ StartRunningAnim: @ 0x080933F8 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080923E0 + bl npc_apply_anim_looping pop {r4, r5} pop {r0} bx r0 @@ -301182,7 +301182,7 @@ npc_obj_ministep_stop_on_arrival: @ 0x08093428 adds r4, r0, #0 adds r5, r1, #0 adds r0, r5, #0 - bl sub_08096FE4 + bl obj_npc_ministep lsls r0, r0, #0x18 cmp r0, #0 bne _0809343E @@ -301190,7 +301190,7 @@ npc_obj_ministep_stop_on_arrival: @ 0x08093428 b _0809345A _0809343E: adds r0, r4, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords ldrb r0, [r4] movs r1, #8 orrs r0, r1 @@ -301238,7 +301238,7 @@ sub_08093460: @ 0x08093460 movs r0, #0 ldrsh r2, [r4, r0] adds r0, r6, #0 - bl sub_0808E454 + bl ShiftEventObjectCoords mov r0, r8 adds r1, r5, #0 bl sub_0809704C @@ -301281,7 +301281,7 @@ sub_080934D0: @ 0x080934D0 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080923E0 + bl npc_apply_anim_looping pop {r4, r5} pop {r0} bx r0 @@ -301301,7 +301301,7 @@ an_walk_any_2: @ 0x080934FC b _0809352E _08093512: adds r0, r4, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords ldrb r0, [r4] movs r1, #8 orrs r0, r1 @@ -301638,7 +301638,7 @@ MovementAction_WalkNormalDiagonalUpLeft_Step0: @ 0x08093734 adds r5, r1, #0 movs r2, #7 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalDiagonalUpLeft_Step1 @@ -301677,7 +301677,7 @@ MovementAction_WalkNormalDiagonalUpRight_Step0: @ 0x08093774 adds r5, r1, #0 movs r2, #8 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalDiagonalUpRight_Step1 @@ -301716,7 +301716,7 @@ MovementAction_WalkNormalDiagonalDownLeft_Step0: @ 0x080937B4 adds r5, r1, #0 movs r2, #5 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalDiagonalDownLeft_Step1 @@ -301755,7 +301755,7 @@ MovementAction_WalkNormalDiagonalDownRight_Step0: @ 0x080937F4 adds r5, r1, #0 movs r2, #6 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalDiagonalDownRight_Step1 @@ -301794,7 +301794,7 @@ MovementAction_WalkNormalDown_Step0: @ 0x08093834 adds r5, r1, #0 movs r2, #1 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalDown_Step1 @@ -301833,7 +301833,7 @@ MovementAction_WalkNormalUp_Step0: @ 0x08093874 adds r5, r1, #0 movs r2, #2 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalUp_Step1 @@ -301872,7 +301872,7 @@ MovementAction_WalkNormalLeft_Step0: @ 0x080938B4 adds r5, r1, #0 movs r2, #3 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalLeft_Step1 @@ -301911,7 +301911,7 @@ MovementAction_WalkNormalRight_Step0: @ 0x080938F4 adds r5, r1, #0 movs r2, #4 movs r3, #0 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkNormalRight_Step1 @@ -302000,7 +302000,7 @@ sub_08093934: @ 0x08093934 lsls r2, r2, #0x10 asrs r2, r2, #0x10 adds r0, r7, #0 - bl sub_0808E454 + bl ShiftEventObjectCoords mov r0, sl adds r1, r4, #0 mov r2, r8 @@ -302036,8 +302036,8 @@ sub_08093934: @ 0x08093934 _080939EC: .4byte gUnknown_84E6410 thumb_func_end sub_08093934 - thumb_func_start sub_080939F0 -sub_080939F0: @ 0x080939F0 + thumb_func_start maybe_shadow_1 +maybe_shadow_1: @ 0x080939F0 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -302061,14 +302061,14 @@ sub_080939F0: @ 0x080939F0 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080923E0 + bl npc_apply_anim_looping adds r0, r4, #0 bl DoShadowFieldEffect add sp, #4 pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080939F0 + thumb_func_end maybe_shadow_1 thumb_func_start sub_08093A34 sub_08093A34: @ 0x08093A34 @@ -302129,7 +302129,7 @@ sub_08093A34: @ 0x08093A34 lsls r2, r2, #0x10 asrs r2, r2, #0x10 adds r0, r6, #0 - bl sub_0808E454 + bl ShiftEventObjectCoords ldrb r0, [r6] movs r1, #4 orrs r0, r1 @@ -302144,7 +302144,7 @@ _08093AC4: cmp r1, #0xff bne _08093AE8 adds r0, r6, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords ldrb r0, [r6] movs r1, #8 orrs r0, r1 @@ -302245,7 +302245,7 @@ sub_08093B50: @ 0x08093B50 _08093B6A: ldrb r0, [r4, #0x18] lsrs r0, r0, #4 - bl sub_08093170 + bl GetOppositeDirection adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -302260,7 +302260,7 @@ _08093B6A: lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08092428 + bl obj_npc_animation_step _08093B96: movs r0, #0 _08093B98: @@ -302281,7 +302281,7 @@ MovementAction_Jump2Down_Step0: @ 0x08093BA0 adds r0, r4, #0 movs r2, #1 movs r3, #2 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_Jump2Down_Step1 @@ -302332,7 +302332,7 @@ MovementAction_Jump2Up_Step0: @ 0x08093BF8 adds r0, r4, #0 movs r2, #2 movs r3, #2 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_Jump2Up_Step1 @@ -302383,7 +302383,7 @@ MovementAction_Jump2Left_Step0: @ 0x08093C50 adds r0, r4, #0 movs r2, #3 movs r3, #2 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_Jump2Left_Step1 @@ -302434,7 +302434,7 @@ MovementAction_Jump2Right_Step0: @ 0x08093CA8 adds r0, r4, #0 movs r2, #4 movs r3, #2 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_Jump2Right_Step1 @@ -302599,7 +302599,7 @@ MovementAction_WalkFastDown_Step0: @ 0x08093DC4 adds r5, r1, #0 movs r2, #1 movs r3, #1 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastDown_Step1 @@ -302638,7 +302638,7 @@ MovementAction_WalkFastUp_Step0: @ 0x08093E04 adds r5, r1, #0 movs r2, #2 movs r3, #1 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastUp_Step1 @@ -302677,7 +302677,7 @@ MovementAction_WalkFastLeft_Step0: @ 0x08093E44 adds r5, r1, #0 movs r2, #3 movs r3, #1 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastLeft_Step1 @@ -302716,7 +302716,7 @@ MovementAction_WalkFastRight_Step0: @ 0x08093E84 adds r5, r1, #0 movs r2, #4 movs r3, #1 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastRight_Step1 @@ -302768,7 +302768,7 @@ sub_08093EC4: @ 0x08093EC4 mov r0, r8 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080923E0 + bl npc_apply_anim_looping adds r2, r6, #0 adds r2, #0x2c ldrb r1, [r2] @@ -303317,7 +303317,7 @@ MovementAction_RideWaterCurrentDown_Step0: @ 0x080942F0 adds r5, r1, #0 movs r2, #1 movs r3, #2 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_RideWaterCurrentDown_Step1 @@ -303356,7 +303356,7 @@ MovementAction_RideWaterCurrentUp_Step0: @ 0x08094330 adds r5, r1, #0 movs r2, #2 movs r3, #2 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_RideWaterCurrentUp_Step1 @@ -303395,7 +303395,7 @@ MovementAction_RideWaterCurrentLeft_Step0: @ 0x08094370 adds r5, r1, #0 movs r2, #3 movs r3, #2 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_RideWaterCurrentLeft_Step1 @@ -303434,7 +303434,7 @@ MovementAction_RideWaterCurrentRight_Step0: @ 0x080943B0 adds r5, r1, #0 movs r2, #4 movs r3, #2 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_RideWaterCurrentRight_Step1 @@ -303473,7 +303473,7 @@ MovementAction_WalkFastestDown_Step0: @ 0x080943F0 adds r5, r1, #0 movs r2, #1 movs r3, #3 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastestDown_Step1 @@ -303512,7 +303512,7 @@ MovementAction_WalkFastestUp_Step0: @ 0x08094430 adds r5, r1, #0 movs r2, #2 movs r3, #3 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastestUp_Step1 @@ -303551,7 +303551,7 @@ MovementAction_WalkFastestLeft_Step0: @ 0x08094470 adds r5, r1, #0 movs r2, #3 movs r3, #3 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastestLeft_Step1 @@ -303590,7 +303590,7 @@ MovementAction_WalkFastestRight_Step0: @ 0x080944B0 adds r5, r1, #0 movs r2, #4 movs r3, #3 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_WalkFastestRight_Step1 @@ -303629,7 +303629,7 @@ MovementAction_SlideDown_Step0: @ 0x080944F0 adds r5, r1, #0 movs r2, #1 movs r3, #4 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_SlideDown_Step1 @@ -303668,7 +303668,7 @@ MovementAction_SlideUp_Step0: @ 0x08094530 adds r5, r1, #0 movs r2, #2 movs r3, #4 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_SlideUp_Step1 @@ -303707,7 +303707,7 @@ MovementAction_SlideLeft_Step0: @ 0x08094570 adds r5, r1, #0 movs r2, #3 movs r3, #4 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_SlideLeft_Step1 @@ -303746,7 +303746,7 @@ MovementAction_SlideRight_Step0: @ 0x080945B0 adds r5, r1, #0 movs r2, #4 movs r3, #4 - bl sub_0809339C + bl do_go_anim adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_SlideRight_Step1 @@ -303947,7 +303947,7 @@ StartSpriteAnimInDirection: @ 0x080946F0 lsrs r1, r1, #0x18 adds r0, r5, #0 movs r2, #0 - bl sub_08097304 + bl SetAndStartSpriteAnim adds r0, r6, #0 adds r1, r4, #0 bl SetEventObjectDirection @@ -304272,7 +304272,7 @@ MovementAction_FaceAwayPlayer_Step0: @ 0x08094904 bl GetDirectionToFace lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08093170 + bl GetOppositeDirection adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -304290,8 +304290,8 @@ _08094956: _08094964: .4byte gUnknown_2036FF0 thumb_func_end MovementAction_FaceAwayPlayer_Step0 - thumb_func_start sub_08094968 -sub_08094968: @ 0x08094968 + thumb_func_start MovementAction_LockFacingDirection_Step0 +MovementAction_LockFacingDirection_Step0: @ 0x08094968 ldrb r2, [r0, #1] movs r3, #2 orrs r2, r3 @@ -304300,10 +304300,10 @@ sub_08094968: @ 0x08094968 strh r0, [r1, #0x32] bx lr .align 2, 0 - thumb_func_end sub_08094968 + thumb_func_end MovementAction_LockFacingDirection_Step0 - thumb_func_start sub_08094978 -sub_08094978: @ 0x08094978 + thumb_func_start MovementAction_UnlockFacingDirection_Step0 +MovementAction_UnlockFacingDirection_Step0: @ 0x08094978 ldrb r3, [r0, #1] movs r2, #3 rsbs r2, r2, #0 @@ -304312,7 +304312,7 @@ sub_08094978: @ 0x08094978 movs r0, #1 strh r0, [r1, #0x32] bx lr - thumb_func_end sub_08094978 + thumb_func_end MovementAction_UnlockFacingDirection_Step0 thumb_func_start MovementAction_JumpDown_Step0 MovementAction_JumpDown_Step0: @ 0x08094988 @@ -304325,7 +304325,7 @@ MovementAction_JumpDown_Step0: @ 0x08094988 adds r0, r4, #0 movs r2, #1 movs r3, #1 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpDown_Step1 @@ -304376,7 +304376,7 @@ MovementAction_JumpUp_Step0: @ 0x080949E0 adds r0, r4, #0 movs r2, #2 movs r3, #1 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpUp_Step1 @@ -304427,7 +304427,7 @@ MovementAction_JumpLeft_Step0: @ 0x08094A38 adds r0, r4, #0 movs r2, #3 movs r3, #1 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpLeft_Step1 @@ -304478,7 +304478,7 @@ MovementAction_JumpRight_Step0: @ 0x08094A90 adds r0, r4, #0 movs r2, #4 movs r3, #1 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpRight_Step1 @@ -304529,7 +304529,7 @@ MovementAction_JumpInPlaceDown_Step0: @ 0x08094AE8 adds r0, r4, #0 movs r2, #1 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceDown_Step1 @@ -304580,7 +304580,7 @@ MovementAction_JumpInPlaceUp_Step0: @ 0x08094B40 adds r0, r4, #0 movs r2, #2 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceUp_Step1 @@ -304631,7 +304631,7 @@ MovementAction_JumpInPlaceLeft_Step0: @ 0x08094B98 adds r0, r4, #0 movs r2, #3 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceLeft_Step1 @@ -304682,7 +304682,7 @@ MovementAction_JumpInPlaceRight_Step0: @ 0x08094BF0 adds r0, r4, #0 movs r2, #4 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceRight_Step1 @@ -304733,7 +304733,7 @@ MovementAction_JumpInPlaceDownUp_Step0: @ 0x08094C48 adds r0, r4, #0 movs r2, #1 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceDownUp_Step1 @@ -304784,7 +304784,7 @@ MovementAction_JumpInPlaceUpDown_Step0: @ 0x08094CA0 adds r0, r4, #0 movs r2, #2 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceUpDown_Step1 @@ -304835,7 +304835,7 @@ MovementAction_JumpInPlaceLeftRight_Step0: @ 0x08094CF8 adds r0, r4, #0 movs r2, #3 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceLeftRight_Step1 @@ -304886,7 +304886,7 @@ MovementAction_JumpInPlaceRightLeft_Step0: @ 0x08094D50 adds r0, r4, #0 movs r2, #4 movs r3, #0 - bl sub_080939F0 + bl maybe_shadow_1 adds r0, r4, #0 adds r1, r5, #0 bl MovementAction_JumpInPlaceRightLeft_Step1 @@ -304941,8 +304941,8 @@ MovementAction_FaceOriginalDirection_Step0: @ 0x08094DA8 _08094DBC: .4byte gUnknown_84DDA21 thumb_func_end MovementAction_FaceOriginalDirection_Step0 - thumb_func_start sub_08094DC0 -sub_08094DC0: @ 0x08094DC0 + thumb_func_start MovementAction_NurseJoyBowDown_Step0 +MovementAction_NurseJoyBowDown_Step0: @ 0x08094DC0 push {lr} movs r2, #1 movs r3, #0x14 @@ -304950,10 +304950,10 @@ sub_08094DC0: @ 0x08094DC0 movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08094DC0 + thumb_func_end MovementAction_NurseJoyBowDown_Step0 - thumb_func_start sub_08094DD0 -sub_08094DD0: @ 0x08094DD0 + thumb_func_start MovementAction_EnableJumpLandingGroundEffect_Step0 +MovementAction_EnableJumpLandingGroundEffect_Step0: @ 0x08094DD0 ldrb r3, [r0, #3] movs r2, #3 rsbs r2, r2, #0 @@ -304962,10 +304962,10 @@ sub_08094DD0: @ 0x08094DD0 movs r0, #1 strh r0, [r1, #0x32] bx lr - thumb_func_end sub_08094DD0 + thumb_func_end MovementAction_EnableJumpLandingGroundEffect_Step0 - thumb_func_start sub_08094DE0 -sub_08094DE0: @ 0x08094DE0 + thumb_func_start MovementAction_DisableJumpLandingGroundEffect_Step0 +MovementAction_DisableJumpLandingGroundEffect_Step0: @ 0x08094DE0 ldrb r2, [r0, #3] movs r3, #2 orrs r2, r3 @@ -304974,10 +304974,10 @@ sub_08094DE0: @ 0x08094DE0 strh r0, [r1, #0x32] bx lr .align 2, 0 - thumb_func_end sub_08094DE0 + thumb_func_end MovementAction_DisableJumpLandingGroundEffect_Step0 - thumb_func_start sub_08094DF0 -sub_08094DF0: @ 0x08094DF0 + thumb_func_start MovementAction_DisableAnimation_Step0 +MovementAction_DisableAnimation_Step0: @ 0x08094DF0 ldrb r2, [r0, #1] movs r3, #0x10 orrs r2, r3 @@ -304986,7 +304986,7 @@ sub_08094DF0: @ 0x08094DF0 strh r0, [r1, #0x32] bx lr .align 2, 0 - thumb_func_end sub_08094DF0 + thumb_func_end MovementAction_DisableAnimation_Step0 thumb_func_start MovementAction_RestoreAnimation_Step0 MovementAction_RestoreAnimation_Step0: @ 0x08094E00 @@ -304994,7 +304994,7 @@ MovementAction_RestoreAnimation_Step0: @ 0x08094E00 adds r4, r0, #0 adds r5, r1, #0 ldrb r0, [r4, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrb r1, [r0, #0xc] lsls r1, r1, #0x19 lsrs r1, r1, #0x1f @@ -305013,8 +305013,8 @@ MovementAction_RestoreAnimation_Step0: @ 0x08094E00 .align 2, 0 thumb_func_end MovementAction_RestoreAnimation_Step0 - thumb_func_start sub_08094E2C -sub_08094E2C: @ 0x08094E2C + thumb_func_start MovementAction_SetInvisible_Step0 +MovementAction_SetInvisible_Step0: @ 0x08094E2C ldrb r2, [r0, #1] movs r3, #0x20 orrs r2, r3 @@ -305023,10 +305023,10 @@ sub_08094E2C: @ 0x08094E2C strh r0, [r1, #0x32] bx lr .align 2, 0 - thumb_func_end sub_08094E2C + thumb_func_end MovementAction_SetInvisible_Step0 - thumb_func_start sub_08094E3C -sub_08094E3C: @ 0x08094E3C + thumb_func_start MovementAction_SetVisible_Step0 +MovementAction_SetVisible_Step0: @ 0x08094E3C ldrb r3, [r0, #1] movs r2, #0x21 rsbs r2, r2, #0 @@ -305035,10 +305035,10 @@ sub_08094E3C: @ 0x08094E3C movs r0, #1 strh r0, [r1, #0x32] bx lr - thumb_func_end sub_08094E3C + thumb_func_end MovementAction_SetVisible_Step0 - thumb_func_start sub_08094E4C -sub_08094E4C: @ 0x08094E4C + thumb_func_start MovementAction_EmoteExclamationMark_Step0 +MovementAction_EmoteExclamationMark_Step0: @ 0x08094E4C push {r4, lr} adds r4, r1, #0 ldr r1, _08094E6C @@ -305047,7 +305047,7 @@ sub_08094E4C: @ 0x08094E4C adds r3, #8 bl EventObjectGetLocalIdAndMap movs r0, #0 - bl sub_080B5270 + bl FieldEffectStart movs r0, #1 strh r0, [r4, #0x32] pop {r4} @@ -305055,10 +305055,10 @@ sub_08094E4C: @ 0x08094E4C bx r1 .align 2, 0 _08094E6C: .4byte gUnknown_20388A8 - thumb_func_end sub_08094E4C + thumb_func_end MovementAction_EmoteExclamationMark_Step0 - thumb_func_start sub_08094E70 -sub_08094E70: @ 0x08094E70 + thumb_func_start MovementAction_EmoteQuestionMark_Step0 +MovementAction_EmoteQuestionMark_Step0: @ 0x08094E70 push {r4, lr} adds r4, r1, #0 ldr r1, _08094E90 @@ -305067,7 +305067,7 @@ sub_08094E70: @ 0x08094E70 adds r3, #8 bl EventObjectGetLocalIdAndMap movs r0, #0x21 - bl sub_080B5270 + bl FieldEffectStart movs r0, #1 strh r0, [r4, #0x32] pop {r4} @@ -305075,10 +305075,10 @@ sub_08094E70: @ 0x08094E70 bx r1 .align 2, 0 _08094E90: .4byte gUnknown_20388A8 - thumb_func_end sub_08094E70 + thumb_func_end MovementAction_EmoteQuestionMark_Step0 - thumb_func_start sub_08094E94 -sub_08094E94: @ 0x08094E94 + thumb_func_start MovementAction_EmoteHeart_Step0 +MovementAction_EmoteHeart_Step0: @ 0x08094E94 push {r4, lr} adds r4, r1, #0 ldr r1, _08094EB4 @@ -305087,7 +305087,7 @@ sub_08094E94: @ 0x08094E94 adds r3, #8 bl EventObjectGetLocalIdAndMap movs r0, #0x2e - bl sub_080B5270 + bl FieldEffectStart movs r0, #1 strh r0, [r4, #0x32] pop {r4} @@ -305095,10 +305095,10 @@ sub_08094E94: @ 0x08094E94 bx r1 .align 2, 0 _08094EB4: .4byte gUnknown_20388A8 - thumb_func_end sub_08094E94 + thumb_func_end MovementAction_EmoteHeart_Step0 - thumb_func_start sub_08094EB8 -sub_08094EB8: @ 0x08094EB8 + thumb_func_start MovementAction_RevealTrainer_Step0 +MovementAction_RevealTrainer_Step0: @ 0x08094EB8 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -305121,7 +305121,7 @@ _08094ECE: strh r0, [r5, #0x32] adds r0, r4, #0 adds r1, r5, #0 - bl sub_08094EFC + bl MovementAction_RevealTrainer_Step1 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08094EF6 @@ -305133,10 +305133,10 @@ _08094EF6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08094EB8 + thumb_func_end MovementAction_RevealTrainer_Step0 - thumb_func_start sub_08094EFC -sub_08094EFC: @ 0x08094EFC + thumb_func_start MovementAction_RevealTrainer_Step1 +MovementAction_RevealTrainer_Step1: @ 0x08094EFC push {r4, lr} adds r4, r1, #0 bl sub_08155CDC @@ -305154,7 +305154,7 @@ _08094F14: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08094EFC + thumb_func_end MovementAction_RevealTrainer_Step1 thumb_func_start MovementAction_RockSmashBreak_Step0 MovementAction_RockSmashBreak_Step0: @ 0x08094F1C @@ -305163,7 +305163,7 @@ MovementAction_RockSmashBreak_Step0: @ 0x08094F1C adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_08097304 + bl SetAndStartSpriteAnim movs r0, #1 strh r0, [r4, #0x32] movs r0, #0 @@ -305235,7 +305235,7 @@ MovementAction_CutTree_Step0: @ 0x08094F98 adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_08097304 + bl SetAndStartSpriteAnim movs r0, #1 strh r0, [r4, #0x32] movs r0, #0 @@ -305300,8 +305300,8 @@ _0809500A: .align 2, 0 thumb_func_end MovementAction_CutTree_Step2 - thumb_func_start sub_08095014 -sub_08095014: @ 0x08095014 + thumb_func_start MovementAction_SetFixedPriority_Step0 +MovementAction_SetFixedPriority_Step0: @ 0x08095014 ldrb r2, [r0, #3] movs r3, #4 orrs r2, r3 @@ -305310,10 +305310,10 @@ sub_08095014: @ 0x08095014 strh r0, [r1, #0x32] bx lr .align 2, 0 - thumb_func_end sub_08095014 + thumb_func_end MovementAction_SetFixedPriority_Step0 - thumb_func_start sub_08095024 -sub_08095024: @ 0x08095024 + thumb_func_start MovementAction_ClearFixedPriority_Step0 +MovementAction_ClearFixedPriority_Step0: @ 0x08095024 ldrb r3, [r0, #3] movs r2, #5 rsbs r2, r2, #0 @@ -305322,10 +305322,10 @@ sub_08095024: @ 0x08095024 movs r0, #1 strh r0, [r1, #0x32] bx lr - thumb_func_end sub_08095024 + thumb_func_end MovementAction_ClearFixedPriority_Step0 - thumb_func_start sub_08095034 -sub_08095034: @ 0x08095034 + thumb_func_start MovementAction_InitAffineAnim_Step0 +MovementAction_InitAffineAnim_Step0: @ 0x08095034 push {r4, lr} adds r4, r1, #0 ldrb r0, [r4, #1] @@ -305349,10 +305349,10 @@ sub_08095034: @ 0x08095034 pop {r4} pop {r1} bx r1 - thumb_func_end sub_08095034 + thumb_func_end MovementAction_InitAffineAnim_Step0 - thumb_func_start sub_08095064 -sub_08095064: @ 0x08095064 + thumb_func_start MovementAction_ClearAffineAnim_Step0 +MovementAction_ClearAffineAnim_Step0: @ 0x08095064 push {r4, lr} adds r4, r1, #0 ldrb r0, [r4, #3] @@ -305375,20 +305375,20 @@ sub_08095064: @ 0x08095064 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095064 + thumb_func_end MovementAction_ClearAffineAnim_Step0 - thumb_func_start sub_08095094 -sub_08095094: @ 0x08095094 + thumb_func_start MovementAction_Unknown1_Step0 +MovementAction_Unknown1_Step0: @ 0x08095094 ldrb r1, [r0, #3] movs r2, #8 orrs r1, r2 strb r1, [r0, #3] movs r0, #1 bx lr - thumb_func_end sub_08095094 + thumb_func_end MovementAction_Unknown1_Step0 - thumb_func_start sub_080950A0 -sub_080950A0: @ 0x080950A0 + thumb_func_start MovementAction_Unknown2_Step0 +MovementAction_Unknown2_Step0: @ 0x080950A0 ldrb r2, [r0, #3] movs r1, #9 rsbs r1, r1, #0 @@ -305397,10 +305397,10 @@ sub_080950A0: @ 0x080950A0 movs r0, #1 bx lr .align 2, 0 - thumb_func_end sub_080950A0 + thumb_func_end MovementAction_Unknown2_Step0 - thumb_func_start sub_080950B0 -sub_080950B0: @ 0x080950B0 + thumb_func_start MovementAction_WalkDownStartAffine_Step0 +MovementAction_WalkDownStartAffine_Step0: @ 0x080950B0 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -305424,7 +305424,7 @@ sub_080950B0: @ 0x080950B0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080950B0 + thumb_func_end MovementAction_WalkDownStartAffine_Step0 thumb_func_start MovementAction_WalkDownStartAffine_Step1 MovementAction_WalkDownStartAffine_Step1: @ 0x080950E4 @@ -305453,8 +305453,8 @@ _08095108: .align 2, 0 thumb_func_end MovementAction_WalkDownStartAffine_Step1 - thumb_func_start sub_08095110 -sub_08095110: @ 0x08095110 + thumb_func_start MovementAction_WalkDownAffine_Step0 +MovementAction_WalkDownAffine_Step0: @ 0x08095110 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -305478,7 +305478,7 @@ sub_08095110: @ 0x08095110 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095110 + thumb_func_end MovementAction_WalkDownAffine_Step0 thumb_func_start MovementAction_WalkDownAffine_Step1 MovementAction_WalkDownAffine_Step1: @ 0x08095144 @@ -305507,14 +305507,14 @@ _08095168: .align 2, 0 thumb_func_end MovementAction_WalkDownAffine_Step1 - thumb_func_start sub_08095170 -sub_08095170: @ 0x08095170 + thumb_func_start MovementAction_WalkLeftAffine_Step0 +MovementAction_WalkLeftAffine_Step0: @ 0x08095170 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 movs r2, #3 movs r3, #1 - bl sub_0809339C + bl do_go_anim adds r2, r4, #0 adds r2, #0x2c ldrb r1, [r2] @@ -305532,7 +305532,7 @@ sub_08095170: @ 0x08095170 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08095170 + thumb_func_end MovementAction_WalkLeftAffine_Step0 thumb_func_start MovementAction_WalkLeftAffine_Step1 MovementAction_WalkLeftAffine_Step1: @ 0x080951A4 @@ -305561,14 +305561,14 @@ _080951C8: .align 2, 0 thumb_func_end MovementAction_WalkLeftAffine_Step1 - thumb_func_start sub_080951D0 -sub_080951D0: @ 0x080951D0 + thumb_func_start MovementAction_WalkRightAffine_Step0 +MovementAction_WalkRightAffine_Step0: @ 0x080951D0 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 movs r2, #4 movs r3, #1 - bl sub_0809339C + bl do_go_anim adds r2, r4, #0 adds r2, #0x2c ldrb r1, [r2] @@ -305586,7 +305586,7 @@ sub_080951D0: @ 0x080951D0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080951D0 + thumb_func_end MovementAction_WalkRightAffine_Step0 thumb_func_start MovementAction_WalkRightAffine_Step1 MovementAction_WalkRightAffine_Step1: @ 0x08095204 @@ -305625,7 +305625,7 @@ sub_08095230: @ 0x08095230 adds r1, r4, #0 bl SetEventObjectDirection adds r0, r5, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords adds r0, r4, #0 bl sub_0809236C adds r2, r0, #0 @@ -305633,7 +305633,7 @@ sub_08095230: @ 0x08095230 lsrs r2, r2, #0x18 adds r0, r5, #0 adds r1, r6, #0 - bl sub_08092428 + bl obj_npc_animation_step adds r2, r6, #0 adds r2, #0x2c ldrb r0, [r2] @@ -305647,8 +305647,8 @@ sub_08095230: @ 0x08095230 bx r0 thumb_func_end sub_08095230 - thumb_func_start sub_08095270 -sub_08095270: @ 0x08095270 + thumb_func_start MovementAction_AcroWheelieFaceDown_Step0 +MovementAction_AcroWheelieFaceDown_Step0: @ 0x08095270 push {lr} movs r2, #1 bl sub_08095230 @@ -305656,10 +305656,10 @@ sub_08095270: @ 0x08095270 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095270 + thumb_func_end MovementAction_AcroWheelieFaceDown_Step0 - thumb_func_start sub_08095280 -sub_08095280: @ 0x08095280 + thumb_func_start MovementAction_AcroWheelieFaceUp_Step0 +MovementAction_AcroWheelieFaceUp_Step0: @ 0x08095280 push {lr} movs r2, #2 bl sub_08095230 @@ -305667,10 +305667,10 @@ sub_08095280: @ 0x08095280 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095280 + thumb_func_end MovementAction_AcroWheelieFaceUp_Step0 - thumb_func_start sub_08095290 -sub_08095290: @ 0x08095290 + thumb_func_start MovementAction_AcroWheelieFaceLeft_Step0 +MovementAction_AcroWheelieFaceLeft_Step0: @ 0x08095290 push {lr} movs r2, #3 bl sub_08095230 @@ -305678,10 +305678,10 @@ sub_08095290: @ 0x08095290 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095290 + thumb_func_end MovementAction_AcroWheelieFaceLeft_Step0 - thumb_func_start sub_080952A0 -sub_080952A0: @ 0x080952A0 + thumb_func_start MovementAction_AcroWheelieFaceRight_Step0 +MovementAction_AcroWheelieFaceRight_Step0: @ 0x080952A0 push {lr} movs r2, #4 bl sub_08095230 @@ -305689,7 +305689,7 @@ sub_080952A0: @ 0x080952A0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080952A0 + thumb_func_end MovementAction_AcroWheelieFaceRight_Step0 thumb_func_start MovementAction_AcroPopWheelieDown_Step0 MovementAction_AcroPopWheelieDown_Step0: @ 0x080952B0 @@ -305962,7 +305962,7 @@ sub_0809547C: @ 0x0809547C b _080954AE _08095492: adds r0, r4, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords ldrb r0, [r4] movs r1, #8 orrs r0, r1 @@ -306790,7 +306790,7 @@ sub_08095A38: @ 0x08095A38 lsrs r2, r2, #0x18 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08093300 + bl npc_apply_direction ldrb r0, [r5, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -306974,7 +306974,7 @@ sub_08095B70: @ 0x08095B70 lsrs r2, r2, #0x18 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08093300 + bl npc_apply_direction ldrb r0, [r4, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -306984,7 +306984,7 @@ sub_08095B70: @ 0x08095B70 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080923E0 + bl npc_apply_anim_looping pop {r4, r5} pop {r0} bx r0 @@ -307155,7 +307155,7 @@ sub_08095CA0: @ 0x08095CA0 lsrs r2, r2, #0x18 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08093300 + bl npc_apply_direction ldrb r0, [r5, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -307330,25 +307330,25 @@ _08095DD0: .align 2, 0 thumb_func_end MovementAction_AcroEndWheelieMoveRight_Step1 - thumb_func_start sub_08095DD8 -sub_08095DD8: @ 0x08095DD8 + thumb_func_start MovementAction_Levitate_Step0 +MovementAction_Levitate_Step0: @ 0x08095DD8 push {r4, lr} adds r4, r1, #0 - bl sub_0809792C + bl CreateLevitateMovementTask movs r0, #1 strh r0, [r4, #0x32] pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095DD8 + thumb_func_end MovementAction_Levitate_Step0 - thumb_func_start sub_08095DEC -sub_08095DEC: @ 0x08095DEC + thumb_func_start MovementAction_StopLevitate_Step0 +MovementAction_StopLevitate_Step0: @ 0x08095DEC push {r4, lr} adds r4, r1, #0 ldrb r0, [r0, #0x1b] - bl sub_080979CC + bl DestroyExtraMovementTask movs r0, #0 strh r0, [r4, #0x26] movs r0, #1 @@ -307356,10 +307356,10 @@ sub_08095DEC: @ 0x08095DEC pop {r4} pop {r1} bx r1 - thumb_func_end sub_08095DEC + thumb_func_end MovementAction_StopLevitate_Step0 - thumb_func_start sub_08095E04 -sub_08095E04: @ 0x08095E04 + thumb_func_start MovementAction_DestroyExtraTaskIfAtTop_Step0 +MovementAction_DestroyExtraTaskIfAtTop_Step0: @ 0x08095E04 push {r4, lr} adds r2, r0, #0 adds r4, r1, #0 @@ -307371,7 +307371,7 @@ sub_08095E04: @ 0x08095E04 b _08095E20 _08095E16: ldrb r0, [r2, #0x1b] - bl sub_080979CC + bl DestroyExtraMovementTask movs r0, #1 strh r0, [r4, #0x32] _08095E20: @@ -307379,7 +307379,7 @@ _08095E20: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08095E04 + thumb_func_end MovementAction_DestroyExtraTaskIfAtTop_Step0 thumb_func_start sub_08095E28 sub_08095E28: @ 0x08095E28 @@ -307387,8 +307387,8 @@ sub_08095E28: @ 0x08095E28 bx lr thumb_func_end sub_08095E28 - thumb_func_start sub_08095E2C -sub_08095E2C: @ 0x08095E2C + thumb_func_start MovementAction_PauseSpriteAnim +MovementAction_PauseSpriteAnim: @ 0x08095E2C adds r1, #0x2c ldrb r0, [r1] movs r2, #0x40 @@ -307397,7 +307397,7 @@ sub_08095E2C: @ 0x08095E2C movs r0, #1 bx lr .align 2, 0 - thumb_func_end sub_08095E2C + thumb_func_end MovementAction_PauseSpriteAnim thumb_func_start UpdateEventObjectSpriteAnimPause UpdateEventObjectSpriteAnimPause: @ 0x08095E3C @@ -307472,7 +307472,7 @@ sub_08095EA0: @ 0x08095EA0 ands r0, r1 strb r0, [r5, #1] ldrb r0, [r5, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r6, r0, #0 adds r0, r4, #0 adds r0, #0x3e @@ -307611,28 +307611,28 @@ GetAllGroundEffectFlags_OnSpawn: @ 0x08095FA8 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08096098 + bl EventObjectUpdateMetatileBehaviors adds r0, r4, #0 adds r1, r5, #0 - bl sub_080960C0 + bl GetGroundEffectFlags_Reflection adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809611C + bl GetGroundEffectFlags_TallGrassOnSpawn adds r0, r4, #0 adds r1, r5, #0 bl sub_0809615C adds r0, r4, #0 adds r1, r5, #0 - bl sub_080961DC + bl GetGroundEffectFlags_SandHeap adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809622C + bl GetGroundEffectFlags_ShallowFlowingWater adds r0, r4, #0 adds r1, r5, #0 - bl sub_080962E0 + bl GetGroundEffectFlags_ShortGrass adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096330 + bl GetGroundEffectFlags_HotSprings pop {r4, r5} pop {r0} bx r0 @@ -307643,34 +307643,34 @@ GetAllGroundEffectFlags_OnBeginStep: @ 0x08095FF0 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08096098 + bl EventObjectUpdateMetatileBehaviors adds r0, r4, #0 adds r1, r5, #0 - bl sub_080960C0 + bl GetGroundEffectFlags_Reflection adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809613C + bl GetGroundEffectFlags_LongGrassOnSpawn adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809617C + bl GetGroundEffectFlags_LongGrassOnBeginStep adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809619C + bl GetGroundEffectFlags_Tracks adds r0, r4, #0 adds r1, r5, #0 - bl sub_080961DC + bl GetGroundEffectFlags_SandHeap adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809622C + bl GetGroundEffectFlags_ShallowFlowingWater adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096290 + bl GetGroundEffectFlags_Puddle adds r0, r4, #0 adds r1, r5, #0 - bl sub_080962E0 + bl GetGroundEffectFlags_ShortGrass adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096330 + bl GetGroundEffectFlags_HotSprings pop {r4, r5} pop {r0} bx r0 @@ -307681,38 +307681,38 @@ GetAllGroundEffectFlags_OnFinishStep: @ 0x08096048 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_08096098 + bl EventObjectUpdateMetatileBehaviors adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809622C + bl GetGroundEffectFlags_ShallowFlowingWater adds r0, r4, #0 adds r1, r5, #0 - bl sub_080961DC + bl GetGroundEffectFlags_SandHeap adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096290 + bl GetGroundEffectFlags_Puddle adds r0, r4, #0 adds r1, r5, #0 bl sub_080962C0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080962E0 + bl GetGroundEffectFlags_ShortGrass adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096330 + bl GetGroundEffectFlags_HotSprings adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096380 + bl GetGroundEffectFlags_Seaweed adds r0, r4, #0 adds r1, r5, #0 - bl sub_080963A0 + bl GetGroundEffectFlags_JumpLanding pop {r4, r5} pop {r0} bx r0 thumb_func_end GetAllGroundEffectFlags_OnFinishStep - thumb_func_start sub_08096098 -sub_08096098: @ 0x08096098 + thumb_func_start EventObjectUpdateMetatileBehaviors +EventObjectUpdateMetatileBehaviors: @ 0x08096098 push {r4, lr} adds r4, r0, #0 movs r1, #0x14 @@ -307731,10 +307731,10 @@ sub_08096098: @ 0x08096098 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096098 + thumb_func_end EventObjectUpdateMetatileBehaviors - thumb_func_start sub_080960C0 -sub_080960C0: @ 0x080960C0 + thumb_func_start GetGroundEffectFlags_Reflection +GetGroundEffectFlags_Reflection: @ 0x080960C0 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -307745,7 +307745,7 @@ sub_080960C0: @ 0x080960C0 str r0, [sp] str r1, [sp, #4] adds r0, r4, #0 - bl sub_080963FC + bl EventObjectCheckForReflectiveSurface lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -307782,10 +307782,10 @@ _08096112: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080960C0 + thumb_func_end GetGroundEffectFlags_Reflection - thumb_func_start sub_0809611C -sub_0809611C: @ 0x0809611C + thumb_func_start GetGroundEffectFlags_TallGrassOnSpawn +GetGroundEffectFlags_TallGrassOnSpawn: @ 0x0809611C push {r4, lr} adds r4, r1, #0 ldrb r0, [r0, #0x1e] @@ -307802,10 +307802,10 @@ _08096134: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809611C + thumb_func_end GetGroundEffectFlags_TallGrassOnSpawn - thumb_func_start sub_0809613C -sub_0809613C: @ 0x0809613C + thumb_func_start GetGroundEffectFlags_LongGrassOnSpawn +GetGroundEffectFlags_LongGrassOnSpawn: @ 0x0809613C push {r4, lr} adds r4, r1, #0 ldrb r0, [r0, #0x1e] @@ -307822,7 +307822,7 @@ _08096154: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809613C + thumb_func_end GetGroundEffectFlags_LongGrassOnSpawn thumb_func_start sub_0809615C sub_0809615C: @ 0x0809615C @@ -307844,8 +307844,8 @@ _08096174: .align 2, 0 thumb_func_end sub_0809615C - thumb_func_start sub_0809617C -sub_0809617C: @ 0x0809617C + thumb_func_start GetGroundEffectFlags_LongGrassOnBeginStep +GetGroundEffectFlags_LongGrassOnBeginStep: @ 0x0809617C push {r4, lr} adds r4, r1, #0 ldrb r0, [r0, #0x1e] @@ -307862,10 +307862,10 @@ _08096194: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809617C + thumb_func_end GetGroundEffectFlags_LongGrassOnBeginStep - thumb_func_start sub_0809619C -sub_0809619C: @ 0x0809619C + thumb_func_start GetGroundEffectFlags_Tracks +GetGroundEffectFlags_Tracks: @ 0x0809619C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -307899,10 +307899,10 @@ _080961D6: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0809619C + thumb_func_end GetGroundEffectFlags_Tracks - thumb_func_start sub_080961DC -sub_080961DC: @ 0x080961DC + thumb_func_start GetGroundEffectFlags_SandHeap +GetGroundEffectFlags_SandHeap: @ 0x080961DC push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -307943,10 +307943,10 @@ _08096224: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080961DC + thumb_func_end GetGroundEffectFlags_SandHeap - thumb_func_start sub_0809622C -sub_0809622C: @ 0x0809622C + thumb_func_start GetGroundEffectFlags_ShallowFlowingWater +GetGroundEffectFlags_ShallowFlowingWater: @ 0x0809622C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -307997,10 +307997,10 @@ _0809628A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0809622C + thumb_func_end GetGroundEffectFlags_ShallowFlowingWater - thumb_func_start sub_08096290 -sub_08096290: @ 0x08096290 + thumb_func_start GetGroundEffectFlags_Puddle +GetGroundEffectFlags_Puddle: @ 0x08096290 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -308024,7 +308024,7 @@ _080962B8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096290 + thumb_func_end GetGroundEffectFlags_Puddle thumb_func_start sub_080962C0 sub_080962C0: @ 0x080962C0 @@ -308046,8 +308046,8 @@ _080962DA: bx r0 thumb_func_end sub_080962C0 - thumb_func_start sub_080962E0 -sub_080962E0: @ 0x080962E0 + thumb_func_start GetGroundEffectFlags_ShortGrass +GetGroundEffectFlags_ShortGrass: @ 0x080962E0 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -308088,10 +308088,10 @@ _08096328: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080962E0 + thumb_func_end GetGroundEffectFlags_ShortGrass - thumb_func_start sub_08096330 -sub_08096330: @ 0x08096330 + thumb_func_start GetGroundEffectFlags_HotSprings +GetGroundEffectFlags_HotSprings: @ 0x08096330 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -308132,10 +308132,10 @@ _08096378: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096330 + thumb_func_end GetGroundEffectFlags_HotSprings - thumb_func_start sub_08096380 -sub_08096380: @ 0x08096380 + thumb_func_start GetGroundEffectFlags_Seaweed +GetGroundEffectFlags_Seaweed: @ 0x08096380 push {r4, lr} adds r4, r1, #0 ldrb r0, [r0, #0x1e] @@ -308152,10 +308152,10 @@ _0809639A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08096380 + thumb_func_end GetGroundEffectFlags_Seaweed - thumb_func_start sub_080963A0 -sub_080963A0: @ 0x080963A0 + thumb_func_start GetGroundEffectFlags_JumpLanding +GetGroundEffectFlags_JumpLanding: @ 0x080963A0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -308202,10 +308202,10 @@ _080963F2: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080963A0 + thumb_func_end GetGroundEffectFlags_JumpLanding - thumb_func_start sub_080963FC -sub_080963FC: @ 0x080963FC + thumb_func_start EventObjectCheckForReflectiveSurface +EventObjectCheckForReflectiveSurface: @ 0x080963FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -308214,7 +308214,7 @@ sub_080963FC: @ 0x080963FC sub sp, #8 adds r5, r0, #0 ldrb r0, [r5, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo movs r2, #8 ldrsh r1, [r0, r2] adds r1, #8 @@ -308247,7 +308247,7 @@ _08096436: bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0809654C + bl GetReflectionTypeByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r4 @@ -308262,7 +308262,7 @@ _08096436: bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0809654C + bl GetReflectionTypeByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -308290,7 +308290,7 @@ _08096490: bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0809654C + bl GetReflectionTypeByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -308305,7 +308305,7 @@ _08096490: bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0809654C + bl GetReflectionTypeByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -308320,7 +308320,7 @@ _08096490: bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0809654C + bl GetReflectionTypeByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -308335,7 +308335,7 @@ _08096490: bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0809654C + bl GetReflectionTypeByMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -308367,10 +308367,10 @@ _0809653A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080963FC + thumb_func_end EventObjectCheckForReflectiveSurface - thumb_func_start sub_0809654C -sub_0809654C: @ 0x0809654C + thumb_func_start GetReflectionTypeByMetatileBehavior +GetReflectionTypeByMetatileBehavior: @ 0x0809654C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -308396,10 +308396,10 @@ _08096574: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809654C + thumb_func_end GetReflectionTypeByMetatileBehavior - thumb_func_start sub_0809657C -sub_0809657C: @ 0x0809657C + thumb_func_start GetLedgeJumpDirection +GetLedgeJumpDirection: @ 0x0809657C push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -308447,10 +308447,10 @@ _080965D2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809657C + thumb_func_end GetLedgeJumpDirection - thumb_func_start sub_080965D8 -sub_080965D8: @ 0x080965D8 + thumb_func_start SetEventObjectSpriteOamTableForLongGrass +SetEventObjectSpriteOamTableForLongGrass: @ 0x080965D8 push {r4, r5, r6, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -308495,10 +308495,10 @@ _0809662C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080965D8 + thumb_func_end SetEventObjectSpriteOamTableForLongGrass - thumb_func_start sub_08096634 -sub_08096634: @ 0x08096634 + thumb_func_start IsZCoordMismatchAt +IsZCoordMismatchAt: @ 0x08096634 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -308512,7 +308512,7 @@ sub_08096634: @ 0x08096634 asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -308531,7 +308531,7 @@ _08096668: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08096634 + thumb_func_end IsZCoordMismatchAt thumb_func_start UpdateEventObjectZCoordAndPriority UpdateEventObjectZCoordAndPriority: @ 0x08096670 @@ -308543,7 +308543,7 @@ UpdateEventObjectZCoordAndPriority: @ 0x08096670 cmp r0, #0 blt _080966BE adds r0, r4, #0 - bl sub_08096728 + bl EventObjectUpdateZCoord ldr r1, _080966C4 ldrb r2, [r4, #0xb] lsls r2, r2, #0x18 @@ -308635,22 +308635,22 @@ sub_08096718: @ 0x08096718 _08096724: .4byte gUnknown_84E6A88 thumb_func_end sub_08096718 - thumb_func_start sub_08096728 -sub_08096728: @ 0x08096728 + thumb_func_start EventObjectUpdateZCoord +EventObjectUpdateZCoord: @ 0x08096728 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x10 ldrsh r0, [r4, r1] movs r2, #0x12 ldrsh r1, [r4, r2] - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r1, #0x14 ldrsh r0, [r4, r1] movs r2, #0x16 ldrsh r1, [r4, r2] - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, #0xf @@ -308678,7 +308678,7 @@ _08096776: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08096728 + thumb_func_end EventObjectUpdateZCoord thumb_func_start SetObjectSubpriorityByZCoord SetObjectSubpriorityByZCoord: @ 0x0809677C @@ -308760,8 +308760,8 @@ _080967FC: bx r1 thumb_func_end AreZCoordsCompatible - thumb_func_start sub_08096800 -sub_08096800: @ 0x08096800 + thumb_func_start GroundEffect_SpawnOnTallGrass +GroundEffect_SpawnOnTallGrass: @ 0x08096800 push {lr} ldr r3, _08096844 movs r2, #0x10 @@ -308792,16 +308792,16 @@ sub_08096800: @ 0x08096800 movs r0, #1 str r0, [r3, #0x1c] movs r0, #4 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _08096844: .4byte gUnknown_20388A8 _08096848: .4byte gUnknown_3005AEC - thumb_func_end sub_08096800 + thumb_func_end GroundEffect_SpawnOnTallGrass - thumb_func_start sub_0809684C -sub_0809684C: @ 0x0809684C + thumb_func_start GroundEffect_StepOnTallGrass +GroundEffect_StepOnTallGrass: @ 0x0809684C push {lr} ldr r3, _08096890 movs r2, #0x10 @@ -308832,16 +308832,16 @@ sub_0809684C: @ 0x0809684C movs r0, #0 str r0, [r3, #0x1c] movs r0, #4 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _08096890: .4byte gUnknown_20388A8 _08096894: .4byte gUnknown_3005AEC - thumb_func_end sub_0809684C + thumb_func_end GroundEffect_StepOnTallGrass - thumb_func_start sub_08096898 -sub_08096898: @ 0x08096898 + thumb_func_start GroundEffect_SpawnOnLongGrass +GroundEffect_SpawnOnLongGrass: @ 0x08096898 push {lr} ldr r3, _080968DC movs r2, #0x10 @@ -308872,16 +308872,16 @@ sub_08096898: @ 0x08096898 movs r0, #1 str r0, [r3, #0x1c] movs r0, #0x11 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _080968DC: .4byte gUnknown_20388A8 _080968E0: .4byte gUnknown_3005AEC - thumb_func_end sub_08096898 + thumb_func_end GroundEffect_SpawnOnLongGrass - thumb_func_start sub_080968E4 -sub_080968E4: @ 0x080968E4 + thumb_func_start GroundEffect_StepOnLongGrass +GroundEffect_StepOnLongGrass: @ 0x080968E4 push {lr} ldr r3, _08096928 movs r2, #0x10 @@ -308912,34 +308912,34 @@ sub_080968E4: @ 0x080968E4 movs r0, #0 str r0, [r3, #0x1c] movs r0, #0x11 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _08096928: .4byte gUnknown_20388A8 _0809692C: .4byte gUnknown_3005AEC - thumb_func_end sub_080968E4 + thumb_func_end GroundEffect_StepOnLongGrass - thumb_func_start sub_08096930 -sub_08096930: @ 0x08096930 + thumb_func_start GroundEffect_WaterReflection +GroundEffect_WaterReflection: @ 0x08096930 push {lr} movs r2, #0 - bl sub_08153E10 + bl SetUpReflection pop {r0} bx r0 - thumb_func_end sub_08096930 + thumb_func_end GroundEffect_WaterReflection - thumb_func_start sub_0809693C -sub_0809693C: @ 0x0809693C + thumb_func_start GroundEffect_IceReflection +GroundEffect_IceReflection: @ 0x0809693C push {lr} movs r2, #1 - bl sub_08153E10 + bl SetUpReflection pop {r0} bx r0 - thumb_func_end sub_0809693C + thumb_func_end GroundEffect_IceReflection - thumb_func_start sub_08096948 -sub_08096948: @ 0x08096948 + thumb_func_start GroundEffect_FlowingWater +GroundEffect_FlowingWater: @ 0x08096948 push {lr} adds r1, r0, #0 movs r0, #0x22 @@ -308947,15 +308947,15 @@ sub_08096948: @ 0x08096948 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096948 + thumb_func_end GroundEffect_FlowingWater - thumb_func_start sub_08096958 -sub_08096958: @ 0x08096958 + thumb_func_start GroundEffect_SandTracks +GroundEffect_SandTracks: @ 0x08096958 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 ldrb r0, [r4, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldr r1, _08096980 ldrb r0, [r0, #0xd] lsls r0, r0, #2 @@ -308970,7 +308970,7 @@ sub_08096958: @ 0x08096958 bx r0 .align 2, 0 _08096980: .4byte gUnknown_84E6AA8 - thumb_func_end sub_08096958 + thumb_func_end GroundEffect_SandTracks thumb_func_start sub_08096984 sub_08096984: @ 0x08096984 @@ -308978,7 +308978,7 @@ sub_08096984: @ 0x08096984 adds r4, r0, #0 adds r5, r1, #0 ldrb r0, [r4, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldr r1, _080969AC ldrb r0, [r0, #0xd] lsls r0, r0, #2 @@ -309001,8 +309001,8 @@ sub_080969B0: @ 0x080969B0 .align 2, 0 thumb_func_end sub_080969B0 - thumb_func_start sub_080969B4 -sub_080969B4: @ 0x080969B4 + thumb_func_start DoTracksGroundEffect_Footprints +DoTracksGroundEffect_Footprints: @ 0x080969B4 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -309031,7 +309031,7 @@ sub_080969B4: @ 0x080969B4 mov r1, sp adds r0, r1, r4 ldrb r0, [r0] - bl sub_080B5270 + bl FieldEffectStart add sp, #4 pop {r4, r5} pop {r0} @@ -309039,10 +309039,10 @@ sub_080969B4: @ 0x080969B4 .align 2, 0 _080969FC: .4byte gUnknown_84E6AB4 _08096A00: .4byte gUnknown_20388A8 - thumb_func_end sub_080969B4 + thumb_func_end DoTracksGroundEffect_Footprints - thumb_func_start sub_08096A04 -sub_08096A04: @ 0x08096A04 + thumb_func_start DoTracksGroundEffect_BikeTireTracks +DoTracksGroundEffect_BikeTireTracks: @ 0x08096A04 push {r4, lr} adds r4, r0, #0 ldr r1, [r4, #0x10] @@ -309074,7 +309074,7 @@ sub_08096A04: @ 0x08096A04 ldrb r0, [r1] str r0, [r2, #0x10] movs r0, #0x23 - bl sub_080B5270 + bl FieldEffectStart _08096A46: pop {r4} pop {r0} @@ -309082,19 +309082,19 @@ _08096A46: .align 2, 0 _08096A4C: .4byte gUnknown_20388A8 _08096A50: .4byte gUnknown_84E6AB8 - thumb_func_end sub_08096A04 + thumb_func_end DoTracksGroundEffect_BikeTireTracks thumb_func_start sub_08096A54 sub_08096A54: @ 0x08096A54 push {lr} - bl sub_0809779C + bl DoRippleFieldEffect pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08096A54 - thumb_func_start sub_08096A60 -sub_08096A60: @ 0x08096A60 + thumb_func_start GroundEffect_StepOnPuddle +GroundEffect_StepOnPuddle: @ 0x08096A60 push {lr} adds r1, r0, #0 movs r0, #0xf @@ -309102,10 +309102,10 @@ sub_08096A60: @ 0x08096A60 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096A60 + thumb_func_end GroundEffect_StepOnPuddle - thumb_func_start sub_08096A70 -sub_08096A70: @ 0x08096A70 + thumb_func_start GroundEffect_SandHeap +GroundEffect_SandHeap: @ 0x08096A70 push {lr} adds r1, r0, #0 movs r0, #0x27 @@ -309113,10 +309113,10 @@ sub_08096A70: @ 0x08096A70 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096A70 + thumb_func_end GroundEffect_SandHeap - thumb_func_start sub_08096A80 -sub_08096A80: @ 0x08096A80 + thumb_func_start GroundEffect_JumpOnTallGrass +GroundEffect_JumpOnTallGrass: @ 0x08096A80 push {r4, r5, r6, r7, lr} sub sp, #4 adds r5, r0, #0 @@ -309134,7 +309134,7 @@ sub_08096A80: @ 0x08096A80 movs r0, #2 str r0, [r1, #0xc] movs r0, #0xc - bl sub_080B5270 + bl FieldEffectStart ldrb r0, [r5, #8] ldrb r1, [r5, #9] ldrb r2, [r5, #0xa] @@ -309143,14 +309143,14 @@ sub_08096A80: @ 0x08096A80 movs r7, #0x12 ldrsh r4, [r5, r7] str r4, [sp] - bl sub_08154604 + bl FindTallGrassFieldEffectSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 bne _08096ACA adds r0, r5, #0 adds r1, r6, #0 - bl sub_08096800 + bl GroundEffect_SpawnOnTallGrass _08096ACA: add sp, #4 pop {r4, r5, r6, r7} @@ -309158,10 +309158,10 @@ _08096ACA: bx r0 .align 2, 0 _08096AD4: .4byte gUnknown_20388A8 - thumb_func_end sub_08096A80 + thumb_func_end GroundEffect_JumpOnTallGrass - thumb_func_start sub_08096AD8 -sub_08096AD8: @ 0x08096AD8 + thumb_func_start GroundEffect_JumpOnLongGrass +GroundEffect_JumpOnLongGrass: @ 0x08096AD8 push {lr} ldr r2, _08096AFC movs r3, #0x10 @@ -309176,15 +309176,15 @@ sub_08096AD8: @ 0x08096AD8 movs r0, #2 str r0, [r2, #0xc] movs r0, #0x12 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _08096AFC: .4byte gUnknown_20388A8 - thumb_func_end sub_08096AD8 + thumb_func_end GroundEffect_JumpOnLongGrass - thumb_func_start sub_08096B00 -sub_08096B00: @ 0x08096B00 + thumb_func_start GroundEffect_JumpOnShallowWater +GroundEffect_JumpOnShallowWater: @ 0x08096B00 push {r4, lr} ldr r3, _08096B2C movs r4, #0x10 @@ -309201,16 +309201,16 @@ sub_08096B00: @ 0x08096B00 lsrs r0, r0, #0x1e str r0, [r3, #0xc] movs r0, #0x10 - bl sub_080B5270 + bl FieldEffectStart pop {r4} pop {r0} bx r0 .align 2, 0 _08096B2C: .4byte gUnknown_20388A8 - thumb_func_end sub_08096B00 + thumb_func_end GroundEffect_JumpOnShallowWater - thumb_func_start sub_08096B30 -sub_08096B30: @ 0x08096B30 + thumb_func_start GroundEffect_JumpOnWater +GroundEffect_JumpOnWater: @ 0x08096B30 push {r4, lr} ldr r3, _08096B5C movs r4, #0x10 @@ -309227,16 +309227,16 @@ sub_08096B30: @ 0x08096B30 lsrs r0, r0, #0x1e str r0, [r3, #0xc] movs r0, #0xe - bl sub_080B5270 + bl FieldEffectStart pop {r4} pop {r0} bx r0 .align 2, 0 _08096B5C: .4byte gUnknown_20388A8 - thumb_func_end sub_08096B30 + thumb_func_end GroundEffect_JumpOnWater - thumb_func_start sub_08096B60 -sub_08096B60: @ 0x08096B60 + thumb_func_start GroundEffect_JumpLandingDust +GroundEffect_JumpLandingDust: @ 0x08096B60 push {r4, lr} ldr r3, _08096B8C movs r4, #0x10 @@ -309253,16 +309253,16 @@ sub_08096B60: @ 0x08096B60 lsrs r0, r0, #0x1e str r0, [r3, #0xc] movs r0, #0xa - bl sub_080B5270 + bl FieldEffectStart pop {r4} pop {r0} bx r0 .align 2, 0 _08096B8C: .4byte gUnknown_20388A8 - thumb_func_end sub_08096B60 + thumb_func_end GroundEffect_JumpLandingDust - thumb_func_start sub_08096B90 -sub_08096B90: @ 0x08096B90 + thumb_func_start GroundEffect_ShortGrass +GroundEffect_ShortGrass: @ 0x08096B90 push {lr} adds r1, r0, #0 movs r0, #0x29 @@ -309270,10 +309270,10 @@ sub_08096B90: @ 0x08096B90 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096B90 + thumb_func_end GroundEffect_ShortGrass - thumb_func_start sub_08096BA0 -sub_08096BA0: @ 0x08096BA0 + thumb_func_start GroundEffect_HotSprings +GroundEffect_HotSprings: @ 0x08096BA0 push {lr} adds r1, r0, #0 movs r0, #0x2a @@ -309281,10 +309281,10 @@ sub_08096BA0: @ 0x08096BA0 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08096BA0 + thumb_func_end GroundEffect_HotSprings - thumb_func_start sub_08096BB0 -sub_08096BB0: @ 0x08096BB0 + thumb_func_start GroundEffect_Seaweed +GroundEffect_Seaweed: @ 0x08096BB0 push {lr} ldr r2, _08096BCC movs r3, #0x10 @@ -309294,22 +309294,22 @@ sub_08096BB0: @ 0x08096BB0 ldrsh r0, [r0, r1] str r0, [r2, #4] movs r0, #0x35 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _08096BCC: .4byte gUnknown_20388A8 - thumb_func_end sub_08096BB0 + thumb_func_end GroundEffect_Seaweed - thumb_func_start sub_08096BD0 -sub_08096BD0: @ 0x08096BD0 + thumb_func_start DoFlaggedGroundEffects +DoFlaggedGroundEffects: @ 0x08096BD0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} adds r6, r0, #0 adds r7, r1, #0 adds r5, r2, #0 - bl sub_081D4068 + bl EventObjectIsFarawayIslandMew lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -309349,7 +309349,7 @@ _08096C1C: bx r0 .align 2, 0 _08096C28: .4byte gUnknown_84E6AC8 - thumb_func_end sub_08096BD0 + thumb_func_end DoFlaggedGroundEffects thumb_func_start filters_out_some_ground_effects filters_out_some_ground_effects: @ 0x08096C2C @@ -309421,11 +309421,11 @@ DoGroundEffects_OnSpawn: @ 0x08096C80 bl GetAllGroundEffectFlags_OnSpawn adds r0, r4, #0 adds r1, r5, #0 - bl sub_080965D8 + bl SetEventObjectSpriteOamTableForLongGrass ldr r2, [sp] adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096BD0 + bl DoFlaggedGroundEffects ldrb r1, [r4] movs r0, #5 rsbs r0, r0, #0 @@ -309460,14 +309460,14 @@ DoGroundEffects_OnBeginStep: @ 0x08096CCC bl GetAllGroundEffectFlags_OnBeginStep adds r0, r4, #0 adds r1, r5, #0 - bl sub_080965D8 + bl SetEventObjectSpriteOamTableForLongGrass adds r0, r4, #0 mov r1, sp bl filters_out_some_ground_effects ldr r2, [sp] adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096BD0 + bl DoFlaggedGroundEffects ldrb r1, [r4] movs r0, #5 rsbs r0, r0, #0 @@ -309502,14 +309502,14 @@ DoGroundEffects_OnFinishStep: @ 0x08096D20 bl GetAllGroundEffectFlags_OnFinishStep adds r0, r4, #0 adds r1, r5, #0 - bl sub_080965D8 + bl SetEventObjectSpriteOamTableForLongGrass adds r0, r4, #0 mov r1, sp bl FilterOutStepOnPuddleGroundEffectIfJumping ldr r2, [sp] adds r0, r4, #0 adds r1, r5, #0 - bl sub_08096BD0 + bl DoFlaggedGroundEffects ldrb r1, [r4] movs r0, #9 rsbs r0, r0, #0 @@ -309525,8 +309525,8 @@ _08096D6C: bx r0 thumb_func_end DoGroundEffects_OnFinishStep - thumb_func_start sub_08096D74 -sub_08096D74: @ 0x08096D74 + thumb_func_start FreezeEventObject +FreezeEventObject: @ 0x08096D74 push {r4, r5, lr} adds r5, r0, #0 ldrh r1, [r5] @@ -309600,7 +309600,7 @@ _08096DFE: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08096D74 + thumb_func_end FreezeEventObject thumb_func_start FreezeEventObjects FreezeEventObjects: @ 0x08096E04 @@ -309621,7 +309621,7 @@ _08096E0A: cmp r4, r0 beq _08096E28 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject _08096E28: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -309659,7 +309659,7 @@ _08096E4A: cmp r4, r0 beq _08096E6C adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject _08096E6C: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -309863,8 +309863,8 @@ Step8: @ 0x08096FAC _08096FCC: .4byte gUnknown_84E5FD0 thumb_func_end Step8 - thumb_func_start sub_08096FD0 -sub_08096FD0: @ 0x08096FD0 + thumb_func_start oamt_npc_ministep_reset +oamt_npc_ministep_reset: @ 0x08096FD0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 lsls r2, r2, #0x18 @@ -309875,10 +309875,10 @@ sub_08096FD0: @ 0x08096FD0 strh r3, [r0, #0x38] bx lr .align 2, 0 - thumb_func_end sub_08096FD0 + thumb_func_end oamt_npc_ministep_reset - thumb_func_start sub_08096FE4 -sub_08096FE4: @ 0x08096FE4 + thumb_func_start obj_npc_ministep +obj_npc_ministep: @ 0x08096FE4 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0809703C @@ -309930,7 +309930,7 @@ _08097046: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08096FE4 + thumb_func_end obj_npc_ministep thumb_func_start sub_0809704C sub_0809704C: @ 0x0809704C @@ -310330,8 +310330,8 @@ _08097300: bx r1 thumb_func_end WaitForMovementDelay - thumb_func_start sub_08097304 -sub_08097304: @ 0x08097304 + thumb_func_start SetAndStartSpriteAnim +SetAndStartSpriteAnim: @ 0x08097304 push {r4, lr} lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -310351,7 +310351,7 @@ sub_08097304: @ 0x08097304 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08097304 + thumb_func_end SetAndStartSpriteAnim thumb_func_start SpriteAnimEnded SpriteAnimEnded: @ 0x0809732C @@ -310371,8 +310371,8 @@ _08097340: bx r1 thumb_func_end SpriteAnimEnded - thumb_func_start sub_08097344 -sub_08097344: @ 0x08097344 + thumb_func_start UpdateEventObjectSpriteVisibility +UpdateEventObjectSpriteVisibility: @ 0x08097344 push {r4, r5, r6, lr} mov ip, r0 lsls r1, r1, #0x18 @@ -310500,7 +310500,7 @@ _08097432: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08097344 + thumb_func_end UpdateEventObjectSpriteVisibility thumb_func_start UpdateEventObjectSpriteSubpriorityAndVisibility UpdateEventObjectSpriteSubpriorityAndVisibility: @ 0x08097438 @@ -310517,7 +310517,7 @@ UpdateEventObjectSpriteSubpriorityAndVisibility: @ 0x08097438 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility pop {r4} pop {r0} bx r0 @@ -310649,7 +310649,7 @@ sub_08097524: @ 0x08097524 ldr r1, _08097588 adds r4, r0, r1 adds r0, r5, #0 - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrh r3, [r4, #4] lsls r3, r3, #0x16 ldr r1, [r0, #0x10] @@ -310686,7 +310686,7 @@ _08097588: .4byte gUnknown_20205AC _0809758C: .4byte 0xFFFFFC00 _08097590: adds r0, r4, #0 - bl sub_0800858C + bl SetSubspriteTables adds r2, r4, #0 adds r2, #0x42 ldrb r0, [r2] @@ -310963,7 +310963,7 @@ sub_08097758: @ 0x08097758 adds r3, #8 bl EventObjectGetLocalIdAndMap adds r0, r4, #0 - bl sub_080B5270 + bl FieldEffectStart pop {r4} pop {r1} bx r1 @@ -310989,12 +310989,12 @@ _08097798: bx r0 thumb_func_end DoShadowFieldEffect - thumb_func_start sub_0809779C -sub_0809779C: @ 0x0809779C + thumb_func_start DoRippleFieldEffect +DoRippleFieldEffect: @ 0x0809779C push {r4, lr} adds r4, r1, #0 ldrb r0, [r0, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldr r2, _080977D4 movs r3, #0x20 ldrsh r1, [r4, r3] @@ -311012,16 +311012,16 @@ sub_0809779C: @ 0x0809779C movs r0, #3 str r0, [r2, #0xc] movs r0, #5 - bl sub_080B5270 + bl FieldEffectStart pop {r4} pop {r0} bx r0 .align 2, 0 _080977D4: .4byte gUnknown_20388A8 - thumb_func_end sub_0809779C + thumb_func_end DoRippleFieldEffect - thumb_func_start sub_080977D8 -sub_080977D8: @ 0x080977D8 + thumb_func_start MovementAction_StoreAndLockAnim_Step0 +MovementAction_StoreAndLockAnim_Step0: @ 0x080977D8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -311035,7 +311035,7 @@ sub_080977D8: @ 0x080977D8 cmp r1, #0 bne _08097808 movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] ldrb r1, [r4, #8] strb r1, [r0] @@ -311109,10 +311109,10 @@ _08097868: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080977D8 + thumb_func_end MovementAction_StoreAndLockAnim_Step0 - thumb_func_start sub_08097878 -sub_08097878: @ 0x08097878 + thumb_func_start MovementAction_FreeAndUnlockAnim_Step0 +MovementAction_FreeAndUnlockAnim_Step0: @ 0x08097878 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -311126,7 +311126,7 @@ sub_08097878: @ 0x08097878 beq _080978F0 movs r7, #0 adds r0, r6, #0 - bl sub_08097900 + bl FindLockedEventObjectIndex lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x10 @@ -311145,13 +311145,13 @@ _080978B0: ldrb r4, [r0, #0x10] cmp r4, #0 bne _080978BE - bl sub_08000BF0 + bl Free str r4, [r5] _080978BE: cmp r7, #1 bne _080978F0 ldrb r0, [r6, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrb r1, [r0, #0xc] lsls r1, r1, #0x19 lsrs r1, r1, #0x1f @@ -311181,10 +311181,10 @@ _080978F0: bx r1 .align 2, 0 _080978FC: .4byte gUnknown_2037258 - thumb_func_end sub_08097878 + thumb_func_end MovementAction_FreeAndUnlockAnim_Step0 - thumb_func_start sub_08097900 -sub_08097900: @ 0x08097900 + thumb_func_start FindLockedEventObjectIndex +FindLockedEventObjectIndex: @ 0x08097900 push {lr} movs r2, #0 ldr r1, _08097918 @@ -311209,15 +311209,15 @@ _0809791C: _08097928: pop {r1} bx r1 - thumb_func_end sub_08097900 + thumb_func_end FindLockedEventObjectIndex - thumb_func_start sub_0809792C -sub_0809792C: @ 0x0809792C + thumb_func_start CreateLevitateMovementTask +CreateLevitateMovementTask: @ 0x0809792C push {r4, r5, r6, lr} adds r6, r0, #0 ldr r0, _08097960 movs r1, #0xff - bl sub_080A8878 + bl CreateTask adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -311229,7 +311229,7 @@ sub_0809792C: @ 0x0809792C adds r0, r4, #0 adds r0, #8 adds r1, r6, #0 - bl sub_0806F100 + bl StoreWordInTwoHalfwords strb r5, [r6, #0x1b] ldr r0, _08097968 strh r0, [r4, #0xe] @@ -311237,13 +311237,13 @@ sub_0809792C: @ 0x0809792C pop {r0} bx r0 .align 2, 0 -_08097960: .4byte sub_0809796C +_08097960: .4byte ApplyLevitateMovement _08097964: .4byte gUnknown_3005B60 _08097968: .4byte 0x0000FFFF - thumb_func_end sub_0809792C + thumb_func_end CreateLevitateMovementTask - thumb_func_start sub_0809796C -sub_0809796C: @ 0x0809796C + thumb_func_start ApplyLevitateMovement +ApplyLevitateMovement: @ 0x0809796C push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -311256,7 +311256,7 @@ sub_0809796C: @ 0x0809796C adds r0, r4, #0 adds r0, #8 mov r1, sp - bl sub_0806F108 + bl LoadWordFromTwoHalfwords ldr r0, [sp] ldrb r1, [r0, #4] lsls r0, r1, #4 @@ -311292,10 +311292,10 @@ _080979B8: .align 2, 0 _080979C4: .4byte gUnknown_3005B60 _080979C8: .4byte gUnknown_20205AC - thumb_func_end sub_0809796C + thumb_func_end ApplyLevitateMovement - thumb_func_start sub_080979CC -sub_080979CC: @ 0x080979CC + thumb_func_start DestroyExtraMovementTask +DestroyExtraMovementTask: @ 0x080979CC push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -311308,16 +311308,16 @@ sub_080979CC: @ 0x080979CC adds r0, r0, r1 adds r0, #8 mov r1, sp - bl sub_0806F108 + bl LoadWordFromTwoHalfwords adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask add sp, #4 pop {r4} pop {r0} bx r0 .align 2, 0 _080979F8: .4byte gUnknown_3005B60 - thumb_func_end sub_080979CC + thumb_func_end DestroyExtraMovementTask thumb_func_start sub_080979FC sub_080979FC: @ 0x080979FC @@ -311346,7 +311346,7 @@ _08097A0A: cmp r4, r0 beq _08097A30 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject _08097A30: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -311361,8 +311361,8 @@ _08097A40: .4byte gUnknown_2036FF0 _08097A44: .4byte gUnknown_2037230 thumb_func_end sub_080979FC - thumb_func_start sub_08097A48 -sub_08097A48: @ 0x08097A48 + thumb_func_start MovementAction_FlyUp_Step0 +MovementAction_FlyUp_Step0: @ 0x08097A48 movs r0, #0 strh r0, [r1, #0x26] ldrh r0, [r1, #0x32] @@ -311371,7 +311371,7 @@ sub_08097A48: @ 0x08097A48 movs r0, #0 bx lr .align 2, 0 - thumb_func_end sub_08097A48 + thumb_func_end MovementAction_FlyUp_Step0 thumb_func_start MovementAction_FlyUp_Step1 MovementAction_FlyUp_Step1: @ 0x08097A58 @@ -311396,8 +311396,8 @@ _08097A74: .align 2, 0 thumb_func_end MovementAction_FlyUp_Step1 - thumb_func_start sub_08097A7C -sub_08097A7C: @ 0x08097A7C + thumb_func_start MovementAction_FlyDown_Step0 +MovementAction_FlyDown_Step0: @ 0x08097A7C ldr r0, _08097A8C strh r0, [r1, #0x26] ldrh r0, [r1, #0x32] @@ -311407,7 +311407,7 @@ sub_08097A7C: @ 0x08097A7C bx lr .align 2, 0 _08097A8C: .4byte 0x0000FF60 - thumb_func_end sub_08097A7C + thumb_func_end MovementAction_FlyDown_Step0 thumb_func_start MovementAction_FlyDown_Step1 MovementAction_FlyDown_Step1: @ 0x08097A90 @@ -311496,7 +311496,7 @@ _08097B18: strh r0, [r4, #8] b _08097B38 _08097B20: - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -311505,7 +311505,7 @@ _08097B20: movs r0, #0 strb r0, [r1] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08097B38: pop {r4, r5} pop {r0} @@ -311514,37 +311514,37 @@ _08097B38: _08097B40: .4byte gUnknown_203725C thumb_func_end sub_08097ADC - thumb_func_start sub_08097B44 -sub_08097B44: @ 0x08097B44 + thumb_func_start task_add_textbox +task_add_textbox: @ 0x08097B44 push {lr} ldr r0, _08097B54 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _08097B54: .4byte sub_08097ADC - thumb_func_end sub_08097B44 + thumb_func_end task_add_textbox - thumb_func_start sub_08097B58 -sub_08097B58: @ 0x08097B58 + thumb_func_start task_del_textbox +task_del_textbox: @ 0x08097B58 push {lr} ldr r0, _08097B70 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _08097B6C - bl sub_080A8964 + bl DestroyTask _08097B6C: pop {r0} bx r0 .align 2, 0 _08097B70: .4byte sub_08097ADC - thumb_func_end sub_08097B58 + thumb_func_end task_del_textbox - thumb_func_start sub_08097B74 -sub_08097B74: @ 0x08097B74 + thumb_func_start ShowFieldMessage +ShowFieldMessage: @ 0x08097B74 push {r4, lr} adds r1, r0, #0 ldr r4, _08097B90 @@ -311553,7 +311553,7 @@ sub_08097B74: @ 0x08097B74 bne _08097B94 adds r0, r1, #0 movs r1, #1 - bl sub_08097C64 + bl textbox_fdecode_auto_and_task_add movs r0, #2 strb r0, [r4] movs r0, #1 @@ -311566,7 +311566,7 @@ _08097B96: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08097B74 + thumb_func_end ShowFieldMessage thumb_func_start sub_08097B9C sub_08097B9C: @ 0x08097B9C @@ -311580,7 +311580,7 @@ sub_08097B9C: @ 0x08097B9C ldr r0, _08097BBC strb r1, [r0] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08097BB6: pop {r4} pop {r0} @@ -311599,12 +311599,12 @@ sub_08097BC0: @ 0x08097BC0 bne _08097BF8 ldr r0, _08097BF0 adds r1, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08097BF4 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r0, r4, #0 - bl sub_08195C80 + bl StartMatchCallFromScript movs r0, #2 strb r0, [r5] movs r0, #1 @@ -311621,8 +311621,8 @@ _08097BFA: bx r1 thumb_func_end sub_08097BC0 - thumb_func_start sub_08097C00 -sub_08097C00: @ 0x08097C00 + thumb_func_start ShowFieldAutoScrollMessage +ShowFieldAutoScrollMessage: @ 0x08097C00 push {lr} adds r1, r0, #0 ldr r2, _08097C1C @@ -311633,7 +311633,7 @@ sub_08097C00: @ 0x08097C00 strb r0, [r2] adds r0, r1, #0 movs r1, #0 - bl sub_08097C64 + bl textbox_fdecode_auto_and_task_add movs r0, #1 b _08097C22 .align 2, 0 @@ -311644,7 +311644,7 @@ _08097C22: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08097C00 + thumb_func_end ShowFieldAutoScrollMessage thumb_func_start sub_08097C28 sub_08097C28: @ 0x08097C28 @@ -311653,7 +311653,7 @@ sub_08097C28: @ 0x08097C28 movs r1, #3 strb r1, [r2] movs r1, #1 - bl sub_08097C64 + bl textbox_fdecode_auto_and_task_add movs r0, #1 pop {r1} bx r1 @@ -311683,40 +311683,40 @@ _08097C5E: .align 2, 0 thumb_func_end sub_08097C40 - thumb_func_start sub_08097C64 -sub_08097C64: @ 0x08097C64 + thumb_func_start textbox_fdecode_auto_and_task_add +textbox_fdecode_auto_and_task_add: @ 0x08097C64 push {r4, lr} adds r2, r0, #0 adds r4, r1, #0 ldr r0, _08097C88 adds r1, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_08196EB8 - bl sub_08097B44 + bl AddTextPrinterForMessage + bl task_add_textbox pop {r4} pop {r0} bx r0 .align 2, 0 _08097C88: .4byte gUnknown_2021C7C - thumb_func_end sub_08097C64 + thumb_func_end textbox_fdecode_auto_and_task_add thumb_func_start sub_08097C8C sub_08097C8C: @ 0x08097C8C push {lr} movs r0, #1 - bl sub_08196EB8 - bl sub_08097B44 + bl AddTextPrinterForMessage + bl task_add_textbox pop {r0} bx r0 thumb_func_end sub_08097C8C - thumb_func_start sub_08097C9C -sub_08097C9C: @ 0x08097C9C + thumb_func_start HideFieldMessageBox +HideFieldMessageBox: @ 0x08097C9C push {lr} - bl sub_08097B58 + bl task_del_textbox movs r0, #0 movs r1, #1 bl sub_08197028 @@ -311727,7 +311727,7 @@ sub_08097C9C: @ 0x08097C9C bx r0 .align 2, 0 _08097CB4: .4byte gUnknown_203725C - thumb_func_end sub_08097C9C + thumb_func_end HideFieldMessageBox thumb_func_start sub_08097CB8 sub_08097CB8: @ 0x08097CB8 @@ -311760,7 +311760,7 @@ _08097CDA: thumb_func_start sub_08097CE0 sub_08097CE0: @ 0x08097CE0 push {lr} - bl sub_08097B58 + bl task_del_textbox movs r0, #0 movs r1, #1 bl sub_08196FF0 @@ -311776,7 +311776,7 @@ _08097CF8: .4byte gUnknown_203725C thumb_func_start sub_08097CFC sub_08097CFC: @ 0x08097CFC push {lr} - bl sub_08097B58 + bl task_del_textbox ldr r1, _08097D0C movs r0, #0 strb r0, [r1] @@ -311786,8 +311786,8 @@ sub_08097CFC: @ 0x08097CFC _08097D0C: .4byte gUnknown_203725C thumb_func_end sub_08097CFC - thumb_func_start sub_08097D10 -sub_08097D10: @ 0x08097D10 + thumb_func_start walkrun_is_standing_still +walkrun_is_standing_still: @ 0x08097D10 push {lr} ldr r0, _08097D20 ldrb r0, [r0, #3] @@ -311803,20 +311803,20 @@ _08097D26: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08097D10 + thumb_func_end walkrun_is_standing_still thumb_func_start sub_08097D2C sub_08097D2C: @ 0x08097D2C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08097D10 + bl walkrun_is_standing_still lsls r0, r0, #0x18 cmp r0, #0 beq _08097D46 bl sub_0808B1C8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08097D46: pop {r4} pop {r0} @@ -311827,7 +311827,7 @@ _08097D46: sub_08097D4C: @ 0x08097D4C push {lr} ldr r0, _08097D64 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _08097D68 @@ -311844,18 +311844,18 @@ _08097D6A: .align 2, 0 thumb_func_end sub_08097D4C - thumb_func_start sub_08097D70 -sub_08097D70: @ 0x08097D70 + thumb_func_start ScriptFreezeEventObjects +ScriptFreezeEventObjects: @ 0x08097D70 push {lr} bl FreezeEventObjects ldr r0, _08097D84 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _08097D84: .4byte sub_08097D2C - thumb_func_end sub_08097D70 + thumb_func_end ScriptFreezeEventObjects thumb_func_start sub_08097D88 sub_08097D88: @ 0x08097D88 @@ -311871,7 +311871,7 @@ sub_08097D88: @ 0x08097D88 ldrsh r0, [r5, r1] cmp r0, #0 bne _08097DB2 - bl sub_08097D10 + bl walkrun_is_standing_still lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #1 @@ -311895,7 +311895,7 @@ _08097DB2: cmp r0, #0 blt _08097DDA adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject movs r0, #1 strh r0, [r5, #0xa] _08097DDA: @@ -311908,7 +311908,7 @@ _08097DDA: cmp r0, #0 beq _08097DF0 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08097DF0: pop {r4, r5, r6} pop {r0} @@ -311923,7 +311923,7 @@ _08097E00: .4byte gUnknown_3005B50 sub_08097E04: @ 0x08097E04 push {lr} ldr r0, _08097E1C - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _08097E20 @@ -311940,15 +311940,15 @@ _08097E22: .align 2, 0 thumb_func_end sub_08097E04 - thumb_func_start sub_08097E28 -sub_08097E28: @ 0x08097E28 + thumb_func_start LockSelectedEventObject +LockSelectedEventObject: @ 0x08097E28 push {r4, r5, lr} ldr r4, _08097E6C ldrb r0, [r4] bl FreezeEventObjectsExceptOne ldr r0, _08097E70 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r2, _08097E74 @@ -311962,7 +311962,7 @@ sub_08097E28: @ 0x08097E28 cmp r0, #0 blt _08097E66 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject ldr r0, _08097E78 lsls r1, r5, #2 adds r1, r1, r5 @@ -311979,10 +311979,10 @@ _08097E6C: .4byte gUnknown_3005B50 _08097E70: .4byte sub_08097D88 _08097E74: .4byte gUnknown_2036FF0 _08097E78: .4byte gUnknown_3005B60 - thumb_func_end sub_08097E28 + thumb_func_end LockSelectedEventObject - thumb_func_start sub_08097E7C -sub_08097E7C: @ 0x08097E7C + thumb_func_start ScriptUnfreezeEventObjects +ScriptUnfreezeEventObjects: @ 0x08097E7C push {lr} movs r0, #0xff movs r1, #0 @@ -312003,7 +312003,7 @@ sub_08097E7C: @ 0x08097E7C bx r0 .align 2, 0 _08097EA8: .4byte gUnknown_2036FF0 - thumb_func_end sub_08097E7C + thumb_func_end ScriptUnfreezeEventObjects thumb_func_start sub_08097EAC sub_08097EAC: @ 0x08097EAC @@ -312098,7 +312098,7 @@ sub_08097F44: @ 0x08097F44 ldrsh r0, [r5, r1] cmp r0, #0 bne _08097F70 - bl sub_08097D10 + bl walkrun_is_standing_still lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #1 @@ -312120,7 +312120,7 @@ _08097F70: cmp r0, #0 blt _08097F94 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject movs r0, #1 strh r0, [r5, #0xa] _08097F94: @@ -312133,7 +312133,7 @@ _08097F94: cmp r0, #0 beq _08097FAA adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _08097FAA: pop {r4, r5, r6, r7} pop {r0} @@ -312150,7 +312150,7 @@ sub_08097FB8: @ 0x08097FB8 mov r6, r8 push {r6, r7} movs r0, #0 - bl sub_080B3F38 + bl GetChosenApproachingTrainerEventObjectId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _08098058 @@ -312158,7 +312158,7 @@ sub_08097FB8: @ 0x08097FB8 cmp r0, #2 bne _08098068 movs r0, #1 - bl sub_080B3F38 + bl GetChosenApproachingTrainerEventObjectId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r5, r0, #0 @@ -312168,7 +312168,7 @@ sub_08097FB8: @ 0x08097FB8 ldr r7, _0809805C adds r0, r7, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _08098060 @@ -312190,13 +312190,13 @@ sub_08097FB8: @ 0x08097FB8 cmp r0, #0 blt _08098022 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject movs r0, #1 strh r0, [r6, #0xa] _08098022: adds r0, r7, #0 movs r1, #0x51 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r2, #2 @@ -312215,7 +312215,7 @@ _08098022: cmp r0, #0 blt _080980A2 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject movs r0, #1 strh r0, [r4, #0xa] b _080980A2 @@ -312229,7 +312229,7 @@ _08098068: bl FreezeEventObjectsExceptOne ldr r0, _080980B0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080980B4 @@ -312248,7 +312248,7 @@ _08098068: cmp r0, #0 blt _080980A2 adds r0, r1, #0 - bl sub_08096D74 + bl FreezeEventObject movs r0, #1 strh r0, [r5, #0xa] _080980A2: @@ -312268,7 +312268,7 @@ _080980B8: .4byte gUnknown_2036FF0 sub_080980BC: @ 0x080980BC push {lr} ldr r0, _080980D4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080980D8 @@ -312285,8 +312285,8 @@ _080980DA: .align 2, 0 thumb_func_end sub_080980BC - thumb_func_start sub_080980E0 -sub_080980E0: @ 0x080980E0 + thumb_func_start GetWindowFrameTilesPal +GetWindowFrameTilesPal: @ 0x080980E0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -312305,10 +312305,10 @@ _080980FA: bx r1 .align 2, 0 _08098100: .4byte gUnknown_84E8860 - thumb_func_end sub_080980E0 + thumb_func_end GetWindowFrameTilesPal - thumb_func_start sub_08098104 -sub_08098104: @ 0x08098104 + thumb_func_start LoadMessageBoxGfx +LoadMessageBoxGfx: @ 0x08098104 push {r4, r5, lr} adds r4, r1, #0 adds r5, r2, #0 @@ -312319,7 +312319,7 @@ sub_08098104: @ 0x08098104 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08098140 @@ -312330,13 +312330,13 @@ sub_08098104: @ 0x08098104 bl sub_080985EC adds r1, r5, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08098140: .4byte gUnknown_84E85E0 - thumb_func_end sub_08098104 + thumb_func_end LoadMessageBoxGfx thumb_func_start LoadUserWindowBorderGfx_ LoadUserWindowBorderGfx_: @ 0x08098144 @@ -312353,8 +312353,8 @@ LoadUserWindowBorderGfx_: @ 0x08098144 .align 2, 0 thumb_func_end LoadUserWindowBorderGfx_ - thumb_func_start sub_0809815C -sub_0809815C: @ 0x0809815C + thumb_func_start LoadWindowGfx +LoadWindowGfx: @ 0x0809815C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -312372,7 +312372,7 @@ sub_0809815C: @ 0x0809815C lsrs r1, r1, #0x18 mov r8, r1 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _080981B0 @@ -312388,7 +312388,7 @@ sub_0809815C: @ 0x0809815C ldr r0, [r4] mov r1, r8 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -312396,7 +312396,7 @@ sub_0809815C: @ 0x0809815C bx r0 .align 2, 0 _080981B0: .4byte gUnknown_84E8860 - thumb_func_end sub_0809815C + thumb_func_end LoadWindowGfx thumb_func_start LoadUserWindowBorderGfx LoadUserWindowBorderGfx: @ 0x080981B4 @@ -312414,7 +312414,7 @@ LoadUserWindowBorderGfx: @ 0x080981B4 ldrb r1, [r1, #0x14] lsrs r1, r1, #3 adds r2, r4, #0 - bl sub_0809815C + bl LoadWindowGfx pop {r4} pop {r0} bx r0 @@ -312422,8 +312422,8 @@ LoadUserWindowBorderGfx: @ 0x080981B4 _080981DC: .4byte gUnknown_3005AF0 thumb_func_end LoadUserWindowBorderGfx - thumb_func_start sub_080981E0 -sub_080981E0: @ 0x080981E0 + thumb_func_start DrawTextBorderOuter +DrawTextBorderOuter: @ 0x080981E0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -312441,25 +312441,25 @@ sub_080981E0: @ 0x080981E0 str r2, [sp, #0xc] adds r0, r4, #0 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r4, #0 movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r4, #0 movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute adds r6, r0, #0 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 adds r0, r4, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute mov sb, r0 mov r2, sb lsls r2, r2, #0x10 @@ -312467,7 +312467,7 @@ sub_080981E0: @ 0x080981E0 mov sb, r2 adds r0, r4, #0 movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x10] @@ -312607,10 +312607,10 @@ sub_080981E0: @ 0x080981E0 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080981E0 + thumb_func_end DrawTextBorderOuter - thumb_func_start sub_08098368 -sub_08098368: @ 0x08098368 + thumb_func_start DrawTextBorderInner +DrawTextBorderInner: @ 0x08098368 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -312630,31 +312630,31 @@ sub_08098368: @ 0x08098368 mov sl, r2 adds r0, r4, #0 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r4, #0 movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r4, #0 movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute adds r6, r0, #0 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 adds r0, r4, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0xc] @@ -312804,10 +312804,10 @@ sub_08098368: @ 0x08098368 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08098368 + thumb_func_end DrawTextBorderInner - thumb_func_start sub_08098504 -sub_08098504: @ 0x08098504 + thumb_func_start rbox_fill_rectangle +rbox_fill_rectangle: @ 0x08098504 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -312818,14 +312818,14 @@ sub_08098504: @ 0x08098504 lsrs r6, r6, #0x18 adds r0, r6, #0 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute mov sb, r0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 adds r0, r6, #0 movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute mov r8, r0 mov r1, r8 lsls r1, r1, #0x10 @@ -312833,19 +312833,19 @@ sub_08098504: @ 0x08098504 mov r8, r1 adds r0, r6, #0 movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r6, #0 movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute movs r1, #1 rsbs r1, r1, #0 add r8, r1 @@ -312880,10 +312880,10 @@ sub_08098504: @ 0x08098504 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08098504 + thumb_func_end rbox_fill_rectangle - thumb_func_start sub_080985A0 -sub_080985A0: @ 0x080985A0 + thumb_func_start stdpal_get +stdpal_get: @ 0x080985A0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -312924,7 +312924,7 @@ _080985DE: bx r1 .align 2, 0 _080985E8: .4byte gUnknown_84E87A0 - thumb_func_end sub_080985A0 + thumb_func_end stdpal_get thumb_func_start sub_080985EC sub_080985EC: @ 0x080985EC @@ -312959,11 +312959,11 @@ sub_080985F4: @ 0x080985F4 ldr r0, [r5] ldrb r0, [r0, #0x14] lsrs r0, r0, #3 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r0, [r0, #4] adds r1, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4, r5} pop {r0} bx r0 @@ -313008,34 +313008,34 @@ _0809866E: .align 2, 0 thumb_func_end InitScriptContext - thumb_func_start sub_0809867C -sub_0809867C: @ 0x0809867C + thumb_func_start SetupBytecodeScript +SetupBytecodeScript: @ 0x0809867C str r1, [r0, #8] movs r1, #1 strb r1, [r0, #1] movs r0, #1 bx lr .align 2, 0 - thumb_func_end sub_0809867C + thumb_func_end SetupBytecodeScript - thumb_func_start sub_08098688 -sub_08098688: @ 0x08098688 + thumb_func_start SetupNativeScript +SetupNativeScript: @ 0x08098688 movs r2, #2 strb r2, [r0, #1] str r1, [r0, #4] bx lr - thumb_func_end sub_08098688 + thumb_func_end SetupNativeScript - thumb_func_start sub_08098690 -sub_08098690: @ 0x08098690 + thumb_func_start StopScript +StopScript: @ 0x08098690 movs r1, #0 strb r1, [r0, #1] str r1, [r0, #8] bx lr - thumb_func_end sub_08098690 + thumb_func_end StopScript - thumb_func_start sub_08098698 -sub_08098698: @ 0x08098698 + thumb_func_start RunScriptCommand +RunScriptCommand: @ 0x08098698 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #1] @@ -313113,7 +313113,7 @@ _08098718: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08098698 + thumb_func_end RunScriptCommand thumb_func_start ScriptPush ScriptPush: @ 0x08098720 @@ -313184,8 +313184,8 @@ ScriptCall: @ 0x08098770 bx r0 thumb_func_end ScriptCall - thumb_func_start sub_08098784 -sub_08098784: @ 0x08098784 + thumb_func_start ScriptReturn +ScriptReturn: @ 0x08098784 push {r4, lr} adds r4, r0, #0 bl ScriptPop @@ -313193,7 +313193,7 @@ sub_08098784: @ 0x08098784 pop {r4} pop {r0} bx r0 - thumb_func_end sub_08098784 + thumb_func_end ScriptReturn thumb_func_start ScriptReadHalfword ScriptReadHalfword: @ 0x08098794 @@ -313317,7 +313317,7 @@ ScriptContext2_RunScript: @ 0x08098844 beq _08098878 bl sub_080987DC ldr r0, _0809886C - bl sub_08098698 + bl RunScriptCommand lsls r0, r0, #0x18 cmp r0, #0 beq _08098870 @@ -313349,7 +313349,7 @@ ScriptContext1_SetupScript: @ 0x08098880 bl InitScriptContext adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809867C + bl SetupBytecodeScript bl sub_080987DC ldr r1, _080988B4 movs r0, #0 @@ -313374,8 +313374,8 @@ sub_080988B8: @ 0x080988B8 _080988C0: .4byte gUnknown_3000E38 thumb_func_end sub_080988B8 - thumb_func_start sub_080988C4 -sub_080988C4: @ 0x080988C4 + thumb_func_start EnableBothScriptContexts +EnableBothScriptContexts: @ 0x080988C4 push {lr} ldr r1, _080988D4 movs r0, #0 @@ -313385,7 +313385,7 @@ sub_080988C4: @ 0x080988C4 bx r0 .align 2, 0 _080988D4: .4byte gUnknown_3000E38 - thumb_func_end sub_080988C4 + thumb_func_end EnableBothScriptContexts thumb_func_start ScriptContext2_RunNewScript ScriptContext2_RunNewScript: @ 0x080988D8 @@ -313398,10 +313398,10 @@ ScriptContext2_RunNewScript: @ 0x080988D8 bl InitScriptContext adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809867C + bl SetupBytecodeScript _080988F0: ldr r0, _08098904 - bl sub_08098698 + bl RunScriptCommand lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -313415,8 +313415,8 @@ _08098908: .4byte gUnknown_81DABAC _0809890C: .4byte gUnknown_81DAF30 thumb_func_end ScriptContext2_RunNewScript - thumb_func_start sub_08098910 -sub_08098910: @ 0x08098910 + thumb_func_start MapHeaderGetScriptTable +MapHeaderGetScriptTable: @ 0x08098910 push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -313454,14 +313454,14 @@ _0809894A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08098910 + thumb_func_end MapHeaderGetScriptTable thumb_func_start MapHeaderRunScriptType MapHeaderRunScriptType: @ 0x08098950 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08098910 + bl MapHeaderGetScriptTable cmp r0, #0 beq _08098962 bl ScriptContext2_RunNewScript @@ -313471,12 +313471,12 @@ _08098962: .align 2, 0 thumb_func_end MapHeaderRunScriptType - thumb_func_start sub_08098968 -sub_08098968: @ 0x08098968 + thumb_func_start MapHeaderCheckScriptTable +MapHeaderCheckScriptTable: @ 0x08098968 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08098910 + bl MapHeaderGetScriptTable adds r6, r0, #0 cmp r6, #0 beq _08098984 @@ -313523,7 +313523,7 @@ _080989C2: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08098968 + thumb_func_end MapHeaderCheckScriptTable thumb_func_start sub_080989C8 sub_080989C8: @ 0x080989C8 @@ -313534,47 +313534,47 @@ sub_080989C8: @ 0x080989C8 bx r0 thumb_func_end sub_080989C8 - thumb_func_start sub_080989D4 -sub_080989D4: @ 0x080989D4 + thumb_func_start RunOnTransitionMapScript +RunOnTransitionMapScript: @ 0x080989D4 push {lr} movs r0, #3 bl MapHeaderRunScriptType pop {r0} bx r0 - thumb_func_end sub_080989D4 + thumb_func_end RunOnTransitionMapScript - thumb_func_start sub_080989E0 -sub_080989E0: @ 0x080989E0 + thumb_func_start RunOnResumeMapScript +RunOnResumeMapScript: @ 0x080989E0 push {lr} movs r0, #5 bl MapHeaderRunScriptType pop {r0} bx r0 - thumb_func_end sub_080989E0 + thumb_func_end RunOnResumeMapScript - thumb_func_start sub_080989EC -sub_080989EC: @ 0x080989EC + thumb_func_start RunOnReturnToFieldMapScript +RunOnReturnToFieldMapScript: @ 0x080989EC push {lr} movs r0, #7 bl MapHeaderRunScriptType pop {r0} bx r0 - thumb_func_end sub_080989EC + thumb_func_end RunOnReturnToFieldMapScript - thumb_func_start sub_080989F8 -sub_080989F8: @ 0x080989F8 + thumb_func_start RunOnDiveWarpMapScript +RunOnDiveWarpMapScript: @ 0x080989F8 push {lr} movs r0, #6 bl MapHeaderRunScriptType pop {r0} bx r0 - thumb_func_end sub_080989F8 + thumb_func_end RunOnDiveWarpMapScript thumb_func_start TryRunOnFrameMapScript TryRunOnFrameMapScript: @ 0x08098A04 push {lr} movs r0, #2 - bl sub_08098968 + bl MapHeaderCheckScriptTable cmp r0, #0 beq _08098A18 bl ScriptContext1_SetupScript @@ -313592,7 +313592,7 @@ _08098A1A: TryRunOnWarpIntoMapScript: @ 0x08098A20 push {lr} movs r0, #4 - bl sub_08098968 + bl MapHeaderCheckScriptTable cmp r0, #0 beq _08098A30 bl ScriptContext2_RunNewScript @@ -313601,8 +313601,8 @@ _08098A30: bx r0 thumb_func_end TryRunOnWarpIntoMapScript - thumb_func_start sub_08098A34 -sub_08098A34: @ 0x08098A34 + thumb_func_start CalculateRamScriptChecksum +CalculateRamScriptChecksum: @ 0x08098A34 push {lr} ldr r0, _08098A50 ldr r0, [r0] @@ -313618,7 +313618,7 @@ sub_08098A34: @ 0x08098A34 .align 2, 0 _08098A50: .4byte gUnknown_3005AEC _08098A54: .4byte 0x0000372C - thumb_func_end sub_08098A34 + thumb_func_end CalculateRamScriptChecksum thumb_func_start sub_08098A58 sub_08098A58: @ 0x08098A58 @@ -313642,8 +313642,8 @@ _08098A7C: .4byte 0x00003728 _08098A80: .4byte 0x050000FB thumb_func_end sub_08098A58 - thumb_func_start sub_08098A84 -sub_08098A84: @ 0x08098A84 + thumb_func_start InitRamScript +InitRamScript: @ 0x08098A84 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -313682,7 +313682,7 @@ sub_08098A84: @ 0x08098A84 ldr r1, [sp] mov r2, r8 bl memcpy - bl sub_08098A34 + bl CalculateRamScriptChecksum mov r2, sl ldr r1, [r2] ldr r2, _08098AF8 @@ -313708,10 +313708,10 @@ _08098AFE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08098A84 + thumb_func_end InitRamScript - thumb_func_start sub_08098B10 -sub_08098B10: @ 0x08098B10 + thumb_func_start GetRamScript +GetRamScript: @ 0x08098B10 push {r4, r5, r6, r7, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -313739,7 +313739,7 @@ sub_08098B10: @ 0x08098B10 ldrb r0, [r2, #3] cmp r0, r3 bne _08098B78 - bl sub_08098A34 + bl CalculateRamScriptChecksum ldr r1, [r6] ldr r2, _08098B6C adds r1, r1, r2 @@ -313764,10 +313764,10 @@ _08098B7A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08098B10 + thumb_func_end GetRamScript - thumb_func_start sub_08098B80 -sub_08098B80: @ 0x08098B80 + thumb_func_start ValidateSavedRamScript +ValidateSavedRamScript: @ 0x08098B80 push {r4, lr} ldr r4, _08098BB8 ldr r0, [r4] @@ -313785,7 +313785,7 @@ sub_08098B80: @ 0x08098B80 ldrb r0, [r1, #3] cmp r0, #0xff bne _08098BC4 - bl sub_08098A34 + bl CalculateRamScriptChecksum ldr r1, [r4] ldr r2, _08098BC0 adds r1, r1, r2 @@ -313804,16 +313804,16 @@ _08098BC6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08098B80 + thumb_func_end ValidateSavedRamScript - thumb_func_start sub_08098BCC -sub_08098BCC: @ 0x08098BCC + thumb_func_start GetSavedRamScriptIfValid +GetSavedRamScriptIfValid: @ 0x08098BCC push {r4, r5, r6, lr} ldr r6, _08098C0C ldr r5, [r6] ldr r0, _08098C10 adds r4, r5, r0 - bl sub_0801AD40 + bl CreateSetStatusSprite cmp r0, #0 beq _08098C20 ldrb r0, [r4] @@ -313828,7 +313828,7 @@ sub_08098BCC: @ 0x08098BCC ldrb r0, [r4, #3] cmp r0, #0xff bne _08098C20 - bl sub_08098A34 + bl CalculateRamScriptChecksum ldr r1, [r6] ldr r2, _08098C14 adds r1, r1, r2 @@ -313851,7 +313851,7 @@ _08098C22: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08098BCC + thumb_func_end GetSavedRamScriptIfValid thumb_func_start InitRamScript_NoEventObject InitRamScript_NoEventObject: @ 0x08098C28 @@ -313870,7 +313870,7 @@ _08098C3A: adds r0, r2, #0 movs r2, #0xff movs r3, #0xff - bl sub_08098A84 + bl InitRamScript add sp, #4 pop {r0} bx r0 @@ -313890,14 +313890,14 @@ sub_08098C58: @ 0x08098C58 bx lr thumb_func_end sub_08098C58 - thumb_func_start sub_08098C5C -sub_08098C5C: @ 0x08098C5C + thumb_func_start ScrCmd_end +ScrCmd_end: @ 0x08098C5C push {lr} - bl sub_08098690 + bl StopScript movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08098C5C + thumb_func_end ScrCmd_end thumb_func_start ScrCmd_gotonative ScrCmd_gotonative: @ 0x08098C68 @@ -313906,15 +313906,15 @@ ScrCmd_gotonative: @ 0x08098C68 bl ScriptReadWord adds r1, r0, #0 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} bx r1 thumb_func_end ScrCmd_gotonative - thumb_func_start sub_08098C80 -sub_08098C80: @ 0x08098C80 + thumb_func_start ScrCmd_special +ScrCmd_special: @ 0x08098C80 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -313923,7 +313923,7 @@ sub_08098C80: @ 0x08098C80 adds r0, r0, r1 ldr r0, [r0] bl _call_via_r0 - thumb_func_end sub_08098C80 + thumb_func_end ScrCmd_special thumb_func_start sub_08098C94 sub_08098C94: @ 0x08098C94 @@ -313934,14 +313934,14 @@ sub_08098C94: @ 0x08098C94 _08098C9C: .4byte gUnknown_81DAF8C thumb_func_end sub_08098C94 - thumb_func_start sub_08098CA0 -sub_08098CA0: @ 0x08098CA0 + thumb_func_start ScrCmd_specialvar +ScrCmd_specialvar: @ 0x08098CA0 push {r4, r5, r6, lr} adds r5, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r6, r0, #0 ldr r4, _08098CD0 adds r0, r5, #0 @@ -313952,7 +313952,7 @@ sub_08098CA0: @ 0x08098CA0 ldr r0, [r0] bl _call_via_r0 strh r0, [r6] - thumb_func_end sub_08098CA0 + thumb_func_end ScrCmd_specialvar thumb_func_start sub_08098CC8 sub_08098CC8: @ 0x08098CC8 @@ -313978,14 +313978,14 @@ sub_08098CE0: @ 0x08098CE0 bx r1 thumb_func_end sub_08098CE0 - thumb_func_start sub_08098CE4 -sub_08098CE4: @ 0x08098CE4 + thumb_func_start ScrCmd_waitstate +ScrCmd_waitstate: @ 0x08098CE4 push {lr} bl sub_080988B8 movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_08098CE4 + thumb_func_end ScrCmd_waitstate thumb_func_start ScrCmd_goto ScrCmd_goto: @ 0x08098CF0 @@ -314001,14 +314001,14 @@ ScrCmd_goto: @ 0x08098CF0 bx r1 thumb_func_end ScrCmd_goto - thumb_func_start sub_08098D08 -sub_08098D08: @ 0x08098D08 + thumb_func_start ScrCmd_return +ScrCmd_return: @ 0x08098D08 push {lr} - bl sub_08098784 + bl ScriptReturn movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08098D08 + thumb_func_end ScrCmd_return thumb_func_start ScrCmd_call ScrCmd_call: @ 0x08098D14 @@ -314345,8 +314345,8 @@ _08098F80: .4byte gUnknown_81DB7BC _08098F84: .4byte gUnknown_81DB7E8 thumb_func_end ScrCmd_callstd_if - thumb_func_start sub_08098F88 -sub_08098F88: @ 0x08098F88 + thumb_func_start ScrCmd_returnram +ScrCmd_returnram: @ 0x08098F88 push {lr} ldr r1, _08098F98 ldr r1, [r1] @@ -314356,7 +314356,7 @@ sub_08098F88: @ 0x08098F88 bx r1 .align 2, 0 _08098F98: .4byte gUnknown_2037260 - thumb_func_end sub_08098F88 + thumb_func_end ScrCmd_returnram thumb_func_start ScrCmd_killscript ScrCmd_killscript: @ 0x08098F9C @@ -314364,7 +314364,7 @@ ScrCmd_killscript: @ 0x08098F9C adds r4, r0, #0 bl sub_08098A58 adds r0, r4, #0 - bl sub_08098690 + bl StopScript movs r0, #1 pop {r4} pop {r1} @@ -314372,20 +314372,20 @@ ScrCmd_killscript: @ 0x08098F9C .align 2, 0 thumb_func_end ScrCmd_killscript - thumb_func_start sub_08098FB4 -sub_08098FB4: @ 0x08098FB4 + thumb_func_start ScrCmd_setmysteryeventstatus +ScrCmd_setmysteryeventstatus: @ 0x08098FB4 push {lr} ldr r1, [r0, #8] ldrb r2, [r1] adds r1, #1 str r1, [r0, #8] adds r0, r2, #0 - bl sub_08153800 + bl SetMysteryEventScriptStatus movs r0, #0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08098FB4 + thumb_func_end ScrCmd_setmysteryeventstatus thumb_func_start ScrCmd_loadword ScrCmd_loadword: @ 0x08098FCC @@ -314519,14 +314519,14 @@ ScrCmd_copybyte: @ 0x0809908C bx r1 thumb_func_end ScrCmd_copybyte - thumb_func_start sub_080990A8 -sub_080990A8: @ 0x080990A8 + thumb_func_start ScrCmd_setvar +ScrCmd_setvar: @ 0x080990A8 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r4, r0, #0 adds r0, r5, #0 bl ScriptReadHalfword @@ -314536,38 +314536,38 @@ sub_080990A8: @ 0x080990A8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080990A8 + thumb_func_end ScrCmd_setvar - thumb_func_start sub_080990CC -sub_080990CC: @ 0x080990CC + thumb_func_start ScrCmd_copyvar +ScrCmd_copyvar: @ 0x080990CC push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 adds r0, r4, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer ldrh r0, [r0] strh r0, [r5] movs r0, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080990CC + thumb_func_end ScrCmd_copyvar - thumb_func_start sub_080990F8 -sub_080990F8: @ 0x080990F8 + thumb_func_start ScrCmd_setorcopyvar +ScrCmd_setorcopyvar: @ 0x080990F8 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 adds r0, r4, #0 bl ScriptReadHalfword @@ -314580,7 +314580,7 @@ sub_080990F8: @ 0x080990F8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080990F8 + thumb_func_end ScrCmd_setorcopyvar thumb_func_start compare_012 compare_012: @ 0x08099124 @@ -314740,14 +314740,14 @@ ScrCmd_compare_addr_to_addr: @ 0x08099214 .align 2, 0 thumb_func_end ScrCmd_compare_addr_to_addr - thumb_func_start sub_08099238 -sub_08099238: @ 0x08099238 + thumb_func_start ScrCmd_compare_var_to_value +ScrCmd_compare_var_to_value: @ 0x08099238 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer ldrh r5, [r0] adds r0, r4, #0 bl ScriptReadHalfword @@ -314762,22 +314762,22 @@ sub_08099238: @ 0x08099238 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099238 + thumb_func_end ScrCmd_compare_var_to_value - thumb_func_start sub_08099268 -sub_08099268: @ 0x08099268 + thumb_func_start ScrCmd_compare_var_to_var +ScrCmd_compare_var_to_var: @ 0x08099268 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 adds r0, r4, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer ldrh r2, [r5] ldrh r1, [r0] adds r0, r2, #0 @@ -314787,16 +314787,16 @@ sub_08099268: @ 0x08099268 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08099268 + thumb_func_end ScrCmd_compare_var_to_var - thumb_func_start sub_0809929C -sub_0809929C: @ 0x0809929C + thumb_func_start ScrCmd_addvar +ScrCmd_addvar: @ 0x0809929C push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r4, r0, #0 adds r0, r5, #0 bl ScriptReadHalfword @@ -314808,16 +314808,16 @@ sub_0809929C: @ 0x0809929C pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809929C + thumb_func_end ScrCmd_addvar - thumb_func_start sub_080992C4 -sub_080992C4: @ 0x080992C4 + thumb_func_start ScrCmd_subvar +ScrCmd_subvar: @ 0x080992C4 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 adds r0, r4, #0 bl ScriptReadHalfword @@ -314832,10 +314832,10 @@ sub_080992C4: @ 0x080992C4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080992C4 + thumb_func_end ScrCmd_subvar - thumb_func_start sub_080992F4 -sub_080992F4: @ 0x080992F4 + thumb_func_start ScrCmd_random +ScrCmd_random: @ 0x080992F4 push {r4, r5, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -314857,10 +314857,10 @@ sub_080992F4: @ 0x080992F4 bx r1 .align 2, 0 _08099324: .4byte gUnknown_2037290 - thumb_func_end sub_080992F4 + thumb_func_end ScrCmd_random - thumb_func_start sub_08099328 -sub_08099328: @ 0x08099328 + thumb_func_start ScrCmd_giveitem +ScrCmd_giveitem: @ 0x08099328 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -314880,7 +314880,7 @@ sub_08099328: @ 0x08099328 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -314890,10 +314890,10 @@ sub_08099328: @ 0x08099328 bx r1 .align 2, 0 _08099368: .4byte gUnknown_2037290 - thumb_func_end sub_08099328 + thumb_func_end ScrCmd_giveitem - thumb_func_start sub_0809936C -sub_0809936C: @ 0x0809936C + thumb_func_start ScrCmd_takeitem +ScrCmd_takeitem: @ 0x0809936C push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -314913,7 +314913,7 @@ sub_0809936C: @ 0x0809936C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D62BC + bl RemoveBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -314923,10 +314923,10 @@ sub_0809936C: @ 0x0809936C bx r1 .align 2, 0 _080993AC: .4byte gUnknown_2037290 - thumb_func_end sub_0809936C + thumb_func_end ScrCmd_takeitem - thumb_func_start sub_080993B0 -sub_080993B0: @ 0x080993B0 + thumb_func_start ScrCmd_checkitemspace +ScrCmd_checkitemspace: @ 0x080993B0 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -314946,7 +314946,7 @@ sub_080993B0: @ 0x080993B0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D6018 + bl CheckBagHasSpace lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -314956,10 +314956,10 @@ sub_080993B0: @ 0x080993B0 bx r1 .align 2, 0 _080993F0: .4byte gUnknown_2037290 - thumb_func_end sub_080993B0 + thumb_func_end ScrCmd_checkitemspace - thumb_func_start sub_080993F4 -sub_080993F4: @ 0x080993F4 + thumb_func_start ScrCmd_checkitem +ScrCmd_checkitem: @ 0x080993F4 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -314979,7 +314979,7 @@ sub_080993F4: @ 0x080993F4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -314989,10 +314989,10 @@ sub_080993F4: @ 0x080993F4 bx r1 .align 2, 0 _08099434: .4byte gUnknown_2037290 - thumb_func_end sub_080993F4 + thumb_func_end ScrCmd_checkitem - thumb_func_start sub_08099438 -sub_08099438: @ 0x08099438 + thumb_func_start ScrCmd_checkitemtype +ScrCmd_checkitemtype: @ 0x08099438 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315001,7 +315001,7 @@ sub_08099438: @ 0x08099438 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _08099460 - bl sub_080D6480 + bl GetPocketByItemId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -315011,10 +315011,10 @@ sub_08099438: @ 0x08099438 bx r1 .align 2, 0 _08099460: .4byte gUnknown_2037290 - thumb_func_end sub_08099438 + thumb_func_end ScrCmd_checkitemtype - thumb_func_start sub_08099464 -sub_08099464: @ 0x08099464 + thumb_func_start ScrCmd_givepcitem +ScrCmd_givepcitem: @ 0x08099464 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -315034,7 +315034,7 @@ sub_08099464: @ 0x08099464 lsrs r1, r1, #0x10 ldr r5, _080994A4 adds r0, r4, #0 - bl sub_080D6588 + bl AddPCItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -315044,10 +315044,10 @@ sub_08099464: @ 0x08099464 bx r1 .align 2, 0 _080994A4: .4byte gUnknown_2037290 - thumb_func_end sub_08099464 + thumb_func_end ScrCmd_givepcitem - thumb_func_start sub_080994A8 -sub_080994A8: @ 0x080994A8 + thumb_func_start ScrCmd_checkpcitem +ScrCmd_checkpcitem: @ 0x080994A8 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -315067,7 +315067,7 @@ sub_080994A8: @ 0x080994A8 lsrs r1, r1, #0x10 ldr r5, _080994E8 adds r0, r4, #0 - bl sub_080D6534 + bl CheckPCHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -315077,10 +315077,10 @@ sub_080994A8: @ 0x080994A8 bx r1 .align 2, 0 _080994E8: .4byte gUnknown_2037290 - thumb_func_end sub_080994A8 + thumb_func_end ScrCmd_checkpcitem - thumb_func_start sub_080994EC -sub_080994EC: @ 0x080994EC + thumb_func_start ScrCmd_givedecoration +ScrCmd_givedecoration: @ 0x080994EC push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315099,10 +315099,10 @@ sub_080994EC: @ 0x080994EC bx r1 .align 2, 0 _08099514: .4byte gUnknown_2037290 - thumb_func_end sub_080994EC + thumb_func_end ScrCmd_givedecoration - thumb_func_start sub_08099518 -sub_08099518: @ 0x08099518 + thumb_func_start ScrCmd_takedecoration +ScrCmd_takedecoration: @ 0x08099518 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315111,7 +315111,7 @@ sub_08099518: @ 0x08099518 ldr r4, _08099540 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081618EC + bl DecorationRemove lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r4] @@ -315121,10 +315121,10 @@ sub_08099518: @ 0x08099518 bx r1 .align 2, 0 _08099540: .4byte gUnknown_2037290 - thumb_func_end sub_08099518 + thumb_func_end ScrCmd_takedecoration - thumb_func_start sub_08099544 -sub_08099544: @ 0x08099544 + thumb_func_start ScrCmd_checkdecorspace +ScrCmd_checkdecorspace: @ 0x08099544 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315143,10 +315143,10 @@ sub_08099544: @ 0x08099544 bx r1 .align 2, 0 _0809956C: .4byte gUnknown_2037290 - thumb_func_end sub_08099544 + thumb_func_end ScrCmd_checkdecorspace - thumb_func_start sub_08099570 -sub_08099570: @ 0x08099570 + thumb_func_start ScrCmd_checkdecor +ScrCmd_checkdecor: @ 0x08099570 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315165,10 +315165,10 @@ sub_08099570: @ 0x08099570 bx r1 .align 2, 0 _08099598: .4byte gUnknown_2037290 - thumb_func_end sub_08099570 + thumb_func_end ScrCmd_checkdecor - thumb_func_start sub_0809959C -sub_0809959C: @ 0x0809959C + thumb_func_start ScrCmd_setflag +ScrCmd_setflag: @ 0x0809959C push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315177,10 +315177,10 @@ sub_0809959C: @ 0x0809959C movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809959C + thumb_func_end ScrCmd_setflag - thumb_func_start sub_080995B0 -sub_080995B0: @ 0x080995B0 + thumb_func_start ScrCmd_clearflag +ScrCmd_clearflag: @ 0x080995B0 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315189,10 +315189,10 @@ sub_080995B0: @ 0x080995B0 movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_080995B0 + thumb_func_end ScrCmd_clearflag - thumb_func_start sub_080995C4 -sub_080995C4: @ 0x080995C4 + thumb_func_start ScrCmd_checkflag +ScrCmd_checkflag: @ 0x080995C4 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -315205,7 +315205,7 @@ sub_080995C4: @ 0x080995C4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080995C4 + thumb_func_end ScrCmd_checkflag thumb_func_start ScrCmd_incrementgamestat ScrCmd_incrementgamestat: @ 0x080995E0 @@ -315222,8 +315222,8 @@ ScrCmd_incrementgamestat: @ 0x080995E0 .align 2, 0 thumb_func_end ScrCmd_incrementgamestat - thumb_func_start sub_080995F8 -sub_080995F8: @ 0x080995F8 + thumb_func_start ScrCmd_animateflash +ScrCmd_animateflash: @ 0x080995F8 push {lr} ldr r1, [r0, #8] ldrb r2, [r1] @@ -315236,10 +315236,10 @@ sub_080995F8: @ 0x080995F8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080995F8 + thumb_func_end ScrCmd_animateflash - thumb_func_start sub_08099614 -sub_08099614: @ 0x08099614 + thumb_func_start ScrCmd_setflashradius +ScrCmd_setflashradius: @ 0x08099614 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315251,10 +315251,10 @@ sub_08099614: @ 0x08099614 movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099614 + thumb_func_end ScrCmd_setflashradius - thumb_func_start sub_08099630 -sub_08099630: @ 0x08099630 + thumb_func_start IsPaletteNotActive +IsPaletteNotActive: @ 0x08099630 push {lr} ldr r0, _08099644 ldrb r1, [r0, #7] @@ -315272,10 +315272,10 @@ _0809964A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099630 + thumb_func_end IsPaletteNotActive - thumb_func_start sub_08099650 -sub_08099650: @ 0x08099650 + thumb_func_start ScrCmd_fadescreen +ScrCmd_fadescreen: @ 0x08099650 push {r4, lr} adds r4, r0, #0 ldr r1, [r4, #8] @@ -315283,20 +315283,20 @@ sub_08099650: @ 0x08099650 adds r1, #1 str r1, [r4, #8] movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _08099674 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} bx r1 .align 2, 0 -_08099674: .4byte sub_08099630 - thumb_func_end sub_08099650 +_08099674: .4byte IsPaletteNotActive + thumb_func_end ScrCmd_fadescreen - thumb_func_start sub_08099678 -sub_08099678: @ 0x08099678 + thumb_func_start ScrCmd_fadescreenspeed +ScrCmd_fadescreenspeed: @ 0x08099678 push {r4, lr} adds r4, r0, #0 ldr r2, [r4, #8] @@ -315308,20 +315308,20 @@ sub_08099678: @ 0x08099678 str r2, [r4, #8] lsls r1, r1, #0x18 asrs r1, r1, #0x18 - bl sub_080AB5CC + bl FadeScreen ldr r1, _080996A4 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} bx r1 .align 2, 0 -_080996A4: .4byte sub_08099630 - thumb_func_end sub_08099678 +_080996A4: .4byte IsPaletteNotActive + thumb_func_end ScrCmd_fadescreenspeed - thumb_func_start sub_080996A8 -sub_080996A8: @ 0x080996A8 + thumb_func_start ScrCmd_fadescreenswapbuffers +ScrCmd_fadescreenswapbuffers: @ 0x080996A8 push {r4, r5, lr} adds r5, r0, #0 ldr r0, [r5, #8] @@ -315345,7 +315345,7 @@ _080996C6: bl CpuSet adds r0, r4, #0 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen b _080996FA .align 2, 0 _080996DC: .4byte gUnknown_20373B4 @@ -315358,11 +315358,11 @@ _080996E8: bl CpuSet adds r0, r4, #0 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen _080996FA: ldr r1, _08099718 adds r0, r5, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4, r5} pop {r1} @@ -315371,11 +315371,11 @@ _080996FA: _0809970C: .4byte gUnknown_2037C88 _08099710: .4byte gUnknown_20373B4 _08099714: .4byte 0x04000100 -_08099718: .4byte sub_08099630 - thumb_func_end sub_080996A8 +_08099718: .4byte IsPaletteNotActive + thumb_func_end ScrCmd_fadescreenswapbuffers - thumb_func_start sub_0809971C -sub_0809971C: @ 0x0809971C + thumb_func_start RunPauseTimer +RunPauseTimer: @ 0x0809971C push {lr} ldr r1, _08099730 ldrh r0, [r1] @@ -315394,7 +315394,7 @@ _08099736: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809971C + thumb_func_end RunPauseTimer thumb_func_start ScrCmd_delay ScrCmd_delay: @ 0x0809973C @@ -315405,18 +315405,18 @@ ScrCmd_delay: @ 0x0809973C strh r0, [r1] ldr r1, _0809975C adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} bx r1 .align 2, 0 _08099758: .4byte gUnknown_2037268 -_0809975C: .4byte sub_0809971C +_0809975C: .4byte RunPauseTimer thumb_func_end ScrCmd_delay - thumb_func_start sub_08099760 -sub_08099760: @ 0x08099760 + thumb_func_start ScrCmd_initclock +ScrCmd_initclock: @ 0x08099760 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -315440,19 +315440,19 @@ sub_08099760: @ 0x08099760 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08099760 + thumb_func_end ScrCmd_initclock - thumb_func_start sub_08099798 -sub_08099798: @ 0x08099798 + thumb_func_start ScrCmd_dotimebasedevents +ScrCmd_dotimebasedevents: @ 0x08099798 push {lr} - bl sub_0809E088 + bl DoTimeBasedEvents movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099798 + thumb_func_end ScrCmd_dotimebasedevents - thumb_func_start sub_080997A4 -sub_080997A4: @ 0x080997A4 + thumb_func_start ScrCmd_gettime +ScrCmd_gettime: @ 0x080997A4 push {lr} bl RtcCalcLocalTime ldr r2, _080997CC @@ -315476,10 +315476,10 @@ _080997CC: .4byte gUnknown_2037278 _080997D0: .4byte gUnknown_3005A50 _080997D4: .4byte gUnknown_203727A _080997D8: .4byte gUnknown_203727C - thumb_func_end sub_080997A4 + thumb_func_end ScrCmd_gettime - thumb_func_start sub_080997DC -sub_080997DC: @ 0x080997DC + thumb_func_start ScrCmd_setweather +ScrCmd_setweather: @ 0x080997DC push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315491,7 +315491,7 @@ sub_080997DC: @ 0x080997DC movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_080997DC + thumb_func_end ScrCmd_setweather thumb_func_start sub_080997F8 sub_080997F8: @ 0x080997F8 @@ -315505,29 +315505,29 @@ sub_080997F8: @ 0x080997F8 thumb_func_start sub_08099804 sub_08099804: @ 0x08099804 push {lr} - bl sub_080AE71C + bl DoCurrentWeather movs r0, #0 pop {r1} bx r1 thumb_func_end sub_08099804 - thumb_func_start sub_08099810 -sub_08099810: @ 0x08099810 + thumb_func_start ScrCmd_setstepcallback +ScrCmd_setstepcallback: @ 0x08099810 push {lr} ldr r1, [r0, #8] ldrb r2, [r1] adds r1, #1 str r1, [r0, #8] adds r0, r2, #0 - bl sub_0809D280 + bl ActivatePerStepCallback movs r0, #0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099810 + thumb_func_end ScrCmd_setstepcallback - thumb_func_start sub_08099828 -sub_08099828: @ 0x08099828 + thumb_func_start ScrCmd_setmaplayoutindex +ScrCmd_setmaplayoutindex: @ 0x08099828 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -315535,14 +315535,14 @@ sub_08099828: @ 0x08099828 bl VarGet lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08084E8C + bl SetCurrentMapLayout movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099828 + thumb_func_end ScrCmd_setmaplayoutindex - thumb_func_start sub_08099844 -sub_08099844: @ 0x08099844 + thumb_func_start ScrCmd_warp +ScrCmd_warp: @ 0x08099844 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -315593,8 +315593,8 @@ sub_08099844: @ 0x08099844 adds r2, r6, #0 adds r3, r4, #0 bl SetWarpDestination - bl sub_080AF030 - bl sub_08084BD0 + bl DoWarp + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -315604,10 +315604,10 @@ sub_08099844: @ 0x08099844 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099844 + thumb_func_end ScrCmd_warp - thumb_func_start sub_080998CC -sub_080998CC: @ 0x080998CC + thumb_func_start ScrCmd_warpsilent +ScrCmd_warpsilent: @ 0x080998CC push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -315658,8 +315658,8 @@ sub_080998CC: @ 0x080998CC adds r2, r6, #0 adds r3, r4, #0 bl SetWarpDestination - bl sub_080AF068 - bl sub_08084BD0 + bl DoDiveWarp + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -315669,7 +315669,7 @@ sub_080998CC: @ 0x080998CC pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080998CC + thumb_func_end ScrCmd_warpsilent thumb_func_start sub_08099954 sub_08099954: @ 0x08099954 @@ -315723,8 +315723,8 @@ sub_08099954: @ 0x08099954 adds r2, r6, #0 adds r3, r4, #0 bl SetWarpDestination - bl sub_080AF0CC - bl sub_08084BD0 + bl DoDoorWarp + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -315736,8 +315736,8 @@ sub_08099954: @ 0x08099954 .align 2, 0 thumb_func_end sub_08099954 - thumb_func_start sub_080999DC -sub_080999DC: @ 0x080999DC + thumb_func_start ScrCmd_warphole +ScrCmd_warphole: @ 0x080999DC push {r4, r5, r6, lr} sub sp, #8 ldr r1, [r0, #8] @@ -315765,7 +315765,7 @@ sub_080999DC: @ 0x080999DC subs r1, #7 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_08084824 + bl SetWarpDestinationToFixedHoleWarp b _08099A3E _08099A1A: lsls r0, r6, #0x18 @@ -315786,17 +315786,17 @@ _08099A1A: str r4, [sp] bl SetWarpDestination _08099A3E: - bl sub_080AF0F0 - bl sub_08084BD0 + bl DoFallWarp + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #8 pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080999DC + thumb_func_end ScrCmd_warphole - thumb_func_start sub_08099A50 -sub_08099A50: @ 0x08099A50 + thumb_func_start ScrCmd_warpteleport +ScrCmd_warpteleport: @ 0x08099A50 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -315848,7 +315848,7 @@ sub_08099A50: @ 0x08099A50 adds r3, r4, #0 bl SetWarpDestination bl sub_080AF144 - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -315858,7 +315858,7 @@ sub_08099A50: @ 0x08099A50 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099A50 + thumb_func_end ScrCmd_warpteleport thumb_func_start sub_08099AD8 sub_08099AD8: @ 0x08099AD8 @@ -315913,7 +315913,7 @@ sub_08099AD8: @ 0x08099AD8 adds r3, r4, #0 bl SetWarpDestination bl sub_080AF178 - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -315925,8 +315925,8 @@ sub_08099AD8: @ 0x08099AD8 .align 2, 0 thumb_func_end sub_08099AD8 - thumb_func_start sub_08099B60 -sub_08099B60: @ 0x08099B60 + thumb_func_start ScrCmd_setwarp +ScrCmd_setwarp: @ 0x08099B60 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -315986,10 +315986,10 @@ sub_08099B60: @ 0x08099B60 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099B60 + thumb_func_end ScrCmd_setwarp - thumb_func_start sub_08099BE0 -sub_08099BE0: @ 0x08099BE0 + thumb_func_start ScrCmd_setdynamicwarp +ScrCmd_setdynamicwarp: @ 0x08099BE0 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -316051,10 +316051,10 @@ sub_08099BE0: @ 0x08099BE0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099BE0 + thumb_func_end ScrCmd_setdynamicwarp - thumb_func_start sub_08099C64 -sub_08099C64: @ 0x08099C64 + thumb_func_start ScrCmd_setdivewarp +ScrCmd_setdivewarp: @ 0x08099C64 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -316114,10 +316114,10 @@ sub_08099C64: @ 0x08099C64 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099C64 + thumb_func_end ScrCmd_setdivewarp - thumb_func_start sub_08099CE4 -sub_08099CE4: @ 0x08099CE4 + thumb_func_start ScrCmd_setholewarp +ScrCmd_setholewarp: @ 0x08099CE4 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -316177,10 +316177,10 @@ sub_08099CE4: @ 0x08099CE4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099CE4 + thumb_func_end ScrCmd_setholewarp - thumb_func_start sub_08099D64 -sub_08099D64: @ 0x08099D64 + thumb_func_start ScrCmd_setescapewarp +ScrCmd_setescapewarp: @ 0x08099D64 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -316240,22 +316240,22 @@ sub_08099D64: @ 0x08099D64 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099D64 + thumb_func_end ScrCmd_setescapewarp - thumb_func_start sub_08099DE4 -sub_08099DE4: @ 0x08099DE4 + thumb_func_start ScrCmd_getplayerxy +ScrCmd_getplayerxy: @ 0x08099DE4 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 adds r0, r4, #0 bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer ldr r2, _08099E1C ldr r1, [r2] ldrh r1, [r1] @@ -316269,10 +316269,10 @@ sub_08099DE4: @ 0x08099DE4 bx r1 .align 2, 0 _08099E1C: .4byte gUnknown_3005AEC - thumb_func_end sub_08099DE4 + thumb_func_end ScrCmd_getplayerxy - thumb_func_start sub_08099E20 -sub_08099E20: @ 0x08099E20 + thumb_func_start ScrCmd_getpartysize +ScrCmd_getpartysize: @ 0x08099E20 push {r4, lr} ldr r4, _08099E38 bl sub_0806B004 @@ -316285,10 +316285,10 @@ sub_08099E20: @ 0x08099E20 bx r1 .align 2, 0 _08099E38: .4byte gUnknown_2037290 - thumb_func_end sub_08099E20 + thumb_func_end ScrCmd_getpartysize - thumb_func_start sub_08099E3C -sub_08099E3C: @ 0x08099E3C + thumb_func_start ScrCmd_playse +ScrCmd_playse: @ 0x08099E3C push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -316297,12 +316297,12 @@ sub_08099E3C: @ 0x08099E3C movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099E3C + thumb_func_end ScrCmd_playse - thumb_func_start sub_08099E50 -sub_08099E50: @ 0x08099E50 + thumb_func_start WaitForSoundEffectFinish +WaitForSoundEffectFinish: @ 0x08099E50 push {lr} - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _08099E60 @@ -316314,57 +316314,57 @@ _08099E62: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099E50 + thumb_func_end WaitForSoundEffectFinish - thumb_func_start sub_08099E68 -sub_08099E68: @ 0x08099E68 + thumb_func_start ScrCmd_waitse +ScrCmd_waitse: @ 0x08099E68 push {lr} ldr r1, _08099E78 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r1} bx r1 .align 2, 0 -_08099E78: .4byte sub_08099E50 - thumb_func_end sub_08099E68 +_08099E78: .4byte WaitForSoundEffectFinish + thumb_func_end ScrCmd_waitse - thumb_func_start sub_08099E7C -sub_08099E7C: @ 0x08099E7C + thumb_func_start ScrCmd_playfanfare +ScrCmd_playfanfare: @ 0x08099E7C push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A29AC + bl PlayFanfare movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099E7C + thumb_func_end ScrCmd_playfanfare - thumb_func_start sub_08099E90 -sub_08099E90: @ 0x08099E90 + thumb_func_start WaitForFanfareFinish +WaitForFanfareFinish: @ 0x08099E90 push {lr} - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099E90 + thumb_func_end WaitForFanfareFinish - thumb_func_start sub_08099EA0 -sub_08099EA0: @ 0x08099EA0 + thumb_func_start ScrCmd_waitfanfare +ScrCmd_waitfanfare: @ 0x08099EA0 push {lr} ldr r1, _08099EB0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r1} bx r1 .align 2, 0 -_08099EB0: .4byte sub_08099E90 - thumb_func_end sub_08099EA0 +_08099EB0: .4byte WaitForFanfareFinish + thumb_func_end ScrCmd_waitfanfare - thumb_func_start sub_08099EB4 -sub_08099EB4: @ 0x08099EB4 + thumb_func_start ScrCmd_playbgm +ScrCmd_playbgm: @ 0x08099EB4 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316378,52 +316378,52 @@ sub_08099EB4: @ 0x08099EB4 cmp r1, #1 bne _08099ED4 adds r0, r2, #0 - bl sub_0808515C + bl Overworld_SetSavedMusic _08099ED4: adds r0, r5, #0 - bl sub_080A27D8 + bl PlayNewMapMusic movs r0, #0 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08099EB4 + thumb_func_end ScrCmd_playbgm - thumb_func_start sub_08099EE4 -sub_08099EE4: @ 0x08099EE4 + thumb_func_start ScrCmd_savebgm +ScrCmd_savebgm: @ 0x08099EE4 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0808515C + bl Overworld_SetSavedMusic movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099EE4 + thumb_func_end ScrCmd_savebgm - thumb_func_start sub_08099EF8 -sub_08099EF8: @ 0x08099EF8 + thumb_func_start ScrCmd_fadedefaultbgm +ScrCmd_fadedefaultbgm: @ 0x08099EF8 push {lr} - bl sub_08085200 + bl Overworld_ChangeMusicToDefault movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099EF8 + thumb_func_end ScrCmd_fadedefaultbgm - thumb_func_start sub_08099F04 -sub_08099F04: @ 0x08099F04 + thumb_func_start ScrCmd_fadenewbgm +ScrCmd_fadenewbgm: @ 0x08099F04 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0808522C + bl GetTruckCameraBobbingY movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099F04 + thumb_func_end ScrCmd_fadenewbgm - thumb_func_start sub_08099F18 -sub_08099F18: @ 0x08099F18 + thumb_func_start ScrCmd_fadeoutbgm +ScrCmd_fadeoutbgm: @ 0x08099F18 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #8] @@ -316434,25 +316434,25 @@ sub_08099F18: @ 0x08099F18 beq _08099F32 lsls r0, r1, #0x1a lsrs r0, r0, #0x18 - bl sub_080A2AB0 + bl PlayBattleBGM b _08099F38 _08099F32: movs r0, #4 - bl sub_080A2AB0 + bl PlayBattleBGM _08099F38: ldr r1, _08099F48 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} bx r1 .align 2, 0 -_08099F48: .4byte sub_080A2AC8 - thumb_func_end sub_08099F18 +_08099F48: .4byte IsBGMPausedOrStopped + thumb_func_end ScrCmd_fadeoutbgm - thumb_func_start sub_08099F4C -sub_08099F4C: @ 0x08099F4C + thumb_func_start ScrCmd_fadeinbgm +ScrCmd_fadeinbgm: @ 0x08099F4C push {lr} ldr r1, [r0, #8] ldrb r2, [r1] @@ -316471,10 +316471,10 @@ _08099F6A: movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_08099F4C + thumb_func_end ScrCmd_fadeinbgm - thumb_func_start sub_08099F70 -sub_08099F70: @ 0x08099F70 + thumb_func_start ScrCmd_setobjectpriority +ScrCmd_setobjectpriority: @ 0x08099F70 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -316493,7 +316493,7 @@ sub_08099F70: @ 0x08099F70 ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript ldr r0, _08099FB0 strh r4, [r0] movs r0, #0 @@ -316503,10 +316503,10 @@ sub_08099F70: @ 0x08099F70 .align 2, 0 _08099FAC: .4byte gUnknown_3005AEC _08099FB0: .4byte gUnknown_203726A - thumb_func_end sub_08099F70 + thumb_func_end ScrCmd_setobjectpriority - thumb_func_start sub_08099FB4 -sub_08099FB4: @ 0x08099FB4 + thumb_func_start ScrCmd_applymovement_at +ScrCmd_applymovement_at: @ 0x08099FB4 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -316528,7 +316528,7 @@ sub_08099FB4: @ 0x08099FB4 str r0, [r5, #8] lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript ldr r0, _08099FF4 strh r4, [r0] movs r0, #0 @@ -316537,10 +316537,10 @@ sub_08099FB4: @ 0x08099FB4 bx r1 .align 2, 0 _08099FF4: .4byte gUnknown_203726A - thumb_func_end sub_08099FB4 + thumb_func_end ScrCmd_applymovement_at - thumb_func_start sub_08099FF8 -sub_08099FF8: @ 0x08099FF8 + thumb_func_start WaitForMovementFinish +WaitForMovementFinish: @ 0x08099FF8 push {lr} ldr r0, _0809A014 ldrb r0, [r0] @@ -316548,7 +316548,7 @@ sub_08099FF8: @ 0x08099FF8 ldrb r1, [r1] ldr r2, _0809A01C ldrb r2, [r2] - bl sub_080D2BE0 + bl ScriptMovement_IsObjectMovementFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -316557,10 +316557,10 @@ sub_08099FF8: @ 0x08099FF8 _0809A014: .4byte gUnknown_203726A _0809A018: .4byte gUnknown_203726E _0809A01C: .4byte gUnknown_203726C - thumb_func_end sub_08099FF8 + thumb_func_end WaitForMovementFinish - thumb_func_start sub_0809A020 -sub_0809A020: @ 0x0809A020 + thumb_func_start ScrCmd_waitmovement +ScrCmd_waitmovement: @ 0x0809A020 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316586,7 +316586,7 @@ _0809A03C: strh r0, [r1] ldr r1, _0809A070 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} @@ -316596,11 +316596,11 @@ _0809A060: .4byte gUnknown_203726A _0809A064: .4byte gUnknown_203726C _0809A068: .4byte gUnknown_3005AEC _0809A06C: .4byte gUnknown_203726E -_0809A070: .4byte sub_08099FF8 - thumb_func_end sub_0809A020 +_0809A070: .4byte WaitForMovementFinish + thumb_func_end ScrCmd_waitmovement - thumb_func_start sub_0809A074 -sub_0809A074: @ 0x0809A074 + thumb_func_start ScrCmd_waitmovement_at +ScrCmd_waitmovement_at: @ 0x0809A074 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316627,7 +316627,7 @@ _0809A090: strh r1, [r0] ldr r1, _0809A0C4 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} @@ -316636,8 +316636,8 @@ _0809A090: _0809A0B8: .4byte gUnknown_203726A _0809A0BC: .4byte gUnknown_203726C _0809A0C0: .4byte gUnknown_203726E -_0809A0C4: .4byte sub_08099FF8 - thumb_func_end sub_0809A074 +_0809A0C4: .4byte WaitForMovementFinish + thumb_func_end ScrCmd_waitmovement_at thumb_func_start sub_0809A0C8 sub_0809A0C8: @ 0x0809A0C8 @@ -316652,7 +316652,7 @@ sub_0809A0C8: @ 0x0809A0C8 ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap movs r0, #0 pop {r1} bx r1 @@ -316660,8 +316660,8 @@ sub_0809A0C8: @ 0x0809A0C8 _0809A0EC: .4byte gUnknown_3005AEC thumb_func_end sub_0809A0C8 - thumb_func_start sub_0809A0F0 -sub_0809A0F0: @ 0x0809A0F0 + thumb_func_start ScrCmd_removeobject_at +ScrCmd_removeobject_at: @ 0x0809A0F0 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316677,16 +316677,16 @@ sub_0809A0F0: @ 0x0809A0F0 str r3, [r4, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap movs r0, #0 pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A0F0 + thumb_func_end ScrCmd_removeobject_at - thumb_func_start sub_0809A120 -sub_0809A120: @ 0x0809A120 + thumb_func_start ScrCmd_addobject +ScrCmd_addobject: @ 0x0809A120 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -316704,10 +316704,10 @@ sub_0809A120: @ 0x0809A120 bx r1 .align 2, 0 _0809A144: .4byte gUnknown_3005AEC - thumb_func_end sub_0809A120 + thumb_func_end ScrCmd_addobject - thumb_func_start sub_0809A148 -sub_0809A148: @ 0x0809A148 + thumb_func_start ScrCmd_addobject_at +ScrCmd_addobject_at: @ 0x0809A148 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316729,10 +316729,10 @@ sub_0809A148: @ 0x0809A148 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A148 + thumb_func_end ScrCmd_addobject_at - thumb_func_start sub_0809A178 -sub_0809A178: @ 0x0809A178 + thumb_func_start ScrCmd_setobjectxy +ScrCmd_setobjectxy: @ 0x0809A178 push {r4, r5, r6, lr} sub sp, #4 adds r6, r0, #0 @@ -316777,10 +316777,10 @@ sub_0809A178: @ 0x0809A178 bx r1 .align 2, 0 _0809A1DC: .4byte gUnknown_3005AEC - thumb_func_end sub_0809A178 + thumb_func_end ScrCmd_setobjectxy - thumb_func_start sub_0809A1E0 -sub_0809A1E0: @ 0x0809A1E0 + thumb_func_start ScrCmd_setobjectxyperm +ScrCmd_setobjectxyperm: @ 0x0809A1E0 push {r4, r5, r6, lr} adds r6, r0, #0 bl ScriptReadHalfword @@ -316812,16 +316812,16 @@ sub_0809A1E0: @ 0x0809A1E0 asrs r2, r2, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08084298 + bl Overworld_SetEventObjTemplateCoords movs r0, #0 pop {r4, r5, r6} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A1E0 + thumb_func_end ScrCmd_setobjectxyperm - thumb_func_start sub_0809A238 -sub_0809A238: @ 0x0809A238 + thumb_func_start ScrCmd_moveobjectoffscreen +ScrCmd_moveobjectoffscreen: @ 0x0809A238 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -316839,10 +316839,10 @@ sub_0809A238: @ 0x0809A238 bx r1 .align 2, 0 _0809A25C: .4byte gUnknown_3005AEC - thumb_func_end sub_0809A238 + thumb_func_end ScrCmd_moveobjectoffscreen - thumb_func_start sub_0809A260 -sub_0809A260: @ 0x0809A260 + thumb_func_start ScrCmd_showobject_at +ScrCmd_showobject_at: @ 0x0809A260 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316864,10 +316864,10 @@ sub_0809A260: @ 0x0809A260 pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809A260 + thumb_func_end ScrCmd_showobject_at - thumb_func_start sub_0809A290 -sub_0809A290: @ 0x0809A290 + thumb_func_start ScrCmd_hideobject_at +ScrCmd_hideobject_at: @ 0x0809A290 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316889,7 +316889,7 @@ sub_0809A290: @ 0x0809A290 pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809A290 + thumb_func_end ScrCmd_hideobject_at thumb_func_start sub_0809A2C0 sub_0809A2C0: @ 0x0809A2C0 @@ -316922,8 +316922,8 @@ sub_0809A2C0: @ 0x0809A2C0 .align 2, 0 thumb_func_end sub_0809A2C0 - thumb_func_start sub_0809A2FC -sub_0809A2FC: @ 0x0809A2FC + thumb_func_start ScrCmd_resetobjectpriority +ScrCmd_resetobjectpriority: @ 0x0809A2FC push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -316945,10 +316945,10 @@ sub_0809A2FC: @ 0x0809A2FC pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A2FC + thumb_func_end ScrCmd_resetobjectpriority - thumb_func_start sub_0809A32C -sub_0809A32C: @ 0x0809A32C + thumb_func_start ScrCmd_faceplayer +ScrCmd_faceplayer: @ 0x0809A32C push {r4, lr} ldr r2, _0809A35C ldr r0, _0809A360 @@ -316975,10 +316975,10 @@ _0809A354: .align 2, 0 _0809A35C: .4byte gUnknown_2036FF0 _0809A360: .4byte gUnknown_3005B50 - thumb_func_end sub_0809A32C + thumb_func_end ScrCmd_faceplayer - thumb_func_start sub_0809A364 -sub_0809A364: @ 0x0809A364 + thumb_func_start ScrCmd_turnobject +ScrCmd_turnobject: @ 0x0809A364 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -317002,10 +317002,10 @@ sub_0809A364: @ 0x0809A364 bx r1 .align 2, 0 _0809A394: .4byte gUnknown_3005AEC - thumb_func_end sub_0809A364 + thumb_func_end ScrCmd_turnobject - thumb_func_start sub_0809A398 -sub_0809A398: @ 0x0809A398 + thumb_func_start ScrCmd_setobjectmovementtype +ScrCmd_setobjectmovementtype: @ 0x0809A398 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -317018,15 +317018,15 @@ sub_0809A398: @ 0x0809A398 str r2, [r4, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080842D4 + bl Overworld_SetEventObjTemplateMovementType movs r0, #0 pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809A398 + thumb_func_end ScrCmd_setobjectmovementtype - thumb_func_start sub_0809A3C0 -sub_0809A3C0: @ 0x0809A3C0 + thumb_func_start ScrCmd_createvobject +ScrCmd_createvobject: @ 0x0809A3C0 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -317070,7 +317070,7 @@ sub_0809A3C0: @ 0x0809A3C0 mov r0, r8 adds r1, r6, #0 adds r2, r4, #0 - bl sub_0808D77C + bl sprite_new movs r0, #0 add sp, #8 pop {r3} @@ -317078,10 +317078,10 @@ sub_0809A3C0: @ 0x0809A3C0 pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0809A3C0 + thumb_func_end ScrCmd_createvobject - thumb_func_start sub_0809A430 -sub_0809A430: @ 0x0809A430 + thumb_func_start ScrCmd_turnvobject +ScrCmd_turnvobject: @ 0x0809A430 push {lr} ldr r2, [r0, #8] ldrb r3, [r2] @@ -317095,19 +317095,19 @@ sub_0809A430: @ 0x0809A430 movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809A430 + thumb_func_end ScrCmd_turnvobject - thumb_func_start sub_0809A44C -sub_0809A44C: @ 0x0809A44C + thumb_func_start ScrCmd_lockall +ScrCmd_lockall: @ 0x0809A44C push {r4, lr} adds r4, r0, #0 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 bne _0809A46C - bl sub_08097D70 + bl ScriptFreezeEventObjects ldr r1, _0809A468 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 b _0809A46E .align 2, 0 @@ -317118,13 +317118,13 @@ _0809A46E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809A44C + thumb_func_end ScrCmd_lockall - thumb_func_start sub_0809A474 -sub_0809A474: @ 0x0809A474 + thumb_func_start ScrCmd_lock +ScrCmd_lock: @ 0x0809A474 push {r4, lr} adds r4, r0, #0 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 beq _0809A484 movs r0, #0 @@ -317141,20 +317141,20 @@ _0809A484: lsls r0, r0, #0x1f cmp r0, #0 beq _0809A4B4 - bl sub_08097E28 + bl LockSelectedEventObject ldr r1, _0809A4B0 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript b _0809A4C0 .align 2, 0 _0809A4A8: .4byte gUnknown_2036FF0 _0809A4AC: .4byte gUnknown_3005B50 _0809A4B0: .4byte sub_08097E04 _0809A4B4: - bl sub_08097D70 + bl ScriptFreezeEventObjects ldr r1, _0809A4C8 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript _0809A4C0: movs r0, #1 _0809A4C2: @@ -317163,12 +317163,12 @@ _0809A4C2: bx r1 .align 2, 0 _0809A4C8: .4byte sub_08097D4C - thumb_func_end sub_0809A474 + thumb_func_end ScrCmd_lock - thumb_func_start sub_0809A4CC -sub_0809A4CC: @ 0x0809A4CC + thumb_func_start ScrCmd_releaseall +ScrCmd_releaseall: @ 0x0809A4CC push {lr} - bl sub_08097C9C + bl HideFieldMessageBox movs r0, #0xff movs r1, #0 movs r2, #0 @@ -317189,12 +317189,12 @@ sub_0809A4CC: @ 0x0809A4CC bx r1 .align 2, 0 _0809A500: .4byte gUnknown_2036FF0 - thumb_func_end sub_0809A4CC + thumb_func_end ScrCmd_releaseall - thumb_func_start sub_0809A504 -sub_0809A504: @ 0x0809A504 + thumb_func_start ScrCmd_release +ScrCmd_release: @ 0x0809A504 push {r4, lr} - bl sub_08097C9C + bl HideFieldMessageBox ldr r4, _0809A554 ldr r0, _0809A558 ldrb r1, [r0] @@ -317230,7 +317230,7 @@ _0809A526: .align 2, 0 _0809A554: .4byte gUnknown_2036FF0 _0809A558: .4byte gUnknown_3005B50 - thumb_func_end sub_0809A504 + thumb_func_end ScrCmd_release thumb_func_start ScrCmd_message ScrCmd_message: @ 0x0809A55C @@ -317241,7 +317241,7 @@ ScrCmd_message: @ 0x0809A55C bne _0809A56A ldr r0, [r4, #0x64] _0809A56A: - bl sub_08097B74 + bl ShowFieldMessage movs r0, #0 pop {r4} pop {r1} @@ -317284,7 +317284,7 @@ _0809A5A4: orrs r0, r1 strb r0, [r2] adds r0, r3, #0 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage movs r0, #0 pop {r4} pop {r1} @@ -317293,8 +317293,8 @@ _0809A5A4: _0809A5C0: .4byte gUnknown_30030B4 thumb_func_end ScrCmd_messageautoscroll - thumb_func_start sub_0809A5C4 -sub_0809A5C4: @ 0x0809A5C4 + thumb_func_start ScrCmd_cmdDB +ScrCmd_cmdDB: @ 0x0809A5C4 push {r4, r5, lr} sub sp, #0xc adds r5, r0, #0 @@ -317322,31 +317322,31 @@ _0809A5D6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809A5C4 + thumb_func_end ScrCmd_cmdDB - thumb_func_start sub_0809A600 -sub_0809A600: @ 0x0809A600 + thumb_func_start ScrCmd_waitmessage +ScrCmd_waitmessage: @ 0x0809A600 push {lr} ldr r1, _0809A610 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r1} bx r1 .align 2, 0 _0809A610: .4byte sub_08097CC4 - thumb_func_end sub_0809A600 + thumb_func_end ScrCmd_waitmessage - thumb_func_start sub_0809A614 -sub_0809A614: @ 0x0809A614 + thumb_func_start ScrCmd_closemessage +ScrCmd_closemessage: @ 0x0809A614 push {lr} - bl sub_08097C9C + bl HideFieldMessageBox movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809A614 + thumb_func_end ScrCmd_closemessage - thumb_func_start sub_0809A620 -sub_0809A620: @ 0x0809A620 + thumb_func_start WaitForAorBPress +WaitForAorBPress: @ 0x0809A620 push {lr} ldr r0, _0809A63C ldrh r1, [r0, #0x2e] @@ -317368,22 +317368,22 @@ _0809A642: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A620 + thumb_func_end WaitForAorBPress - thumb_func_start sub_0809A648 -sub_0809A648: @ 0x0809A648 + thumb_func_start ScrCmd_waitbuttonpress +ScrCmd_waitbuttonpress: @ 0x0809A648 push {lr} ldr r1, _0809A658 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r1} bx r1 .align 2, 0 -_0809A658: .4byte sub_0809A620 - thumb_func_end sub_0809A648 +_0809A658: .4byte WaitForAorBPress + thumb_func_end ScrCmd_waitbuttonpress - thumb_func_start sub_0809A65C -sub_0809A65C: @ 0x0809A65C + thumb_func_start ScrCmd_yesnobox +ScrCmd_yesnobox: @ 0x0809A65C push {lr} ldr r2, [r0, #8] ldrb r3, [r2] @@ -317393,7 +317393,7 @@ sub_0809A65C: @ 0x0809A65C adds r2, #1 str r2, [r0, #8] adds r0, r3, #0 - bl sub_080E1618 + bl ScriptMenu_YesNo lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -317406,10 +317406,10 @@ _0809A67E: _0809A684: pop {r1} bx r1 - thumb_func_end sub_0809A65C + thumb_func_end ScrCmd_yesnobox - thumb_func_start sub_0809A688 -sub_0809A688: @ 0x0809A688 + thumb_func_start ScrCmd_multichoice +ScrCmd_multichoice: @ 0x0809A688 push {r4, r5, lr} ldr r2, [r0, #8] ldrb r5, [r2] @@ -317425,7 +317425,7 @@ sub_0809A688: @ 0x0809A688 adds r4, #1 str r4, [r0, #8] adds r0, r5, #0 - bl sub_080E12C8 + bl ScriptMenu_Multichoice lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -317440,7 +317440,7 @@ _0809A6BC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A688 + thumb_func_end ScrCmd_multichoice thumb_func_start sub_0809A6C4 sub_0809A6C4: @ 0x0809A6C4 @@ -317467,7 +317467,7 @@ sub_0809A6C4: @ 0x0809A6C4 str r4, [r0, #8] str r6, [sp] mov r0, r8 - bl sub_080E1318 + bl ScriptMenu_MultichoiceWithDefault lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -317492,8 +317492,8 @@ sub_0809A714: @ 0x0809A714 bx lr thumb_func_end sub_0809A714 - thumb_func_start sub_0809A718 -sub_0809A718: @ 0x0809A718 + thumb_func_start ScrCmd_multichoicegrid +ScrCmd_multichoicegrid: @ 0x0809A718 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -317534,7 +317534,7 @@ _0809A75C: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0809A718 + thumb_func_end ScrCmd_multichoicegrid thumb_func_start sub_0809A768 sub_0809A768: @ 0x0809A768 @@ -317573,7 +317573,7 @@ sub_0809A780: @ 0x0809A780 ldrb r2, [r3] adds r3, #1 str r3, [r4, #8] - bl sub_080E1DF4 + bl ScriptMenu_ShowPokemonPic movs r0, #0 pop {r4} pop {r1} @@ -317581,16 +317581,16 @@ sub_0809A780: @ 0x0809A780 .align 2, 0 thumb_func_end sub_0809A780 - thumb_func_start sub_0809A7B0 -sub_0809A7B0: @ 0x0809A7B0 + thumb_func_start ScrCmd_hidemonpic +ScrCmd_hidemonpic: @ 0x0809A7B0 push {r4, lr} adds r4, r0, #0 - bl sub_080E1EB8 + bl ScriptMenu_GetPicboxWaitFunc adds r1, r0, #0 cmp r1, #0 beq _0809A7C8 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 b _0809A7CA _0809A7C8: @@ -317599,10 +317599,10 @@ _0809A7CA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809A7B0 + thumb_func_end ScrCmd_hidemonpic - thumb_func_start sub_0809A7D0 -sub_0809A7D0: @ 0x0809A7D0 + thumb_func_start ScrCmd_showcontestwinner +ScrCmd_showcontestwinner: @ 0x0809A7D0 push {lr} ldr r1, [r0, #8] ldrb r2, [r1] @@ -317613,13 +317613,13 @@ sub_0809A7D0: @ 0x0809A7D0 adds r0, r2, #0 bl sub_0812FDE0 _0809A7E4: - bl sub_080F936C + bl ShowContestWinner bl sub_080988B8 movs r0, #1 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809A7D0 + thumb_func_end ScrCmd_showcontestwinner thumb_func_start sub_0809A7F4 sub_0809A7F4: @ 0x0809A7F4 @@ -317643,7 +317643,7 @@ sub_0809A7F4: @ 0x0809A7F4 ldr r7, _0809A8DC adds r1, #6 adds r0, r7, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r2, sb adds r2, #1 lsls r2, r2, #0x18 @@ -317692,7 +317692,7 @@ sub_0809A7F4: @ 0x0809A7F4 str r1, [sp, #0x1c] ldr r4, _0809A8E0 add r0, sp, #0x18 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0x85 @@ -317703,10 +317703,10 @@ sub_0809A7F4: @ 0x0809A7F4 movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] str r6, [sp] movs r1, #0xff @@ -317719,7 +317719,7 @@ sub_0809A7F4: @ 0x0809A7F4 bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 add sp, #0x20 pop {r3, r4, r5} @@ -317743,20 +317743,20 @@ sub_0809A8E4: @ 0x0809A8E4 bx r1 thumb_func_end sub_0809A8E4 - thumb_func_start sub_0809A8F0 -sub_0809A8F0: @ 0x0809A8F0 + thumb_func_start ScrCmd_vmessage +ScrCmd_vmessage: @ 0x0809A8F0 push {lr} bl ScriptReadWord ldr r1, _0809A908 ldr r1, [r1] subs r0, r0, r1 - bl sub_08097B74 + bl ShowFieldMessage movs r0, #0 pop {r1} bx r1 .align 2, 0 _0809A908: .4byte gUnknown_2037264 - thumb_func_end sub_0809A8F0 + thumb_func_end ScrCmd_vmessage thumb_func_start sub_0809A90C sub_0809A90C: @ 0x0809A90C @@ -317791,8 +317791,8 @@ _0809A948: .4byte gUnknown_84E8918 _0809A94C: .4byte gUnknown_82EA31C thumb_func_end sub_0809A90C - thumb_func_start sub_0809A950 -sub_0809A950: @ 0x0809A950 + thumb_func_start ScrCmd_bufferleadmonspeciesname +ScrCmd_bufferleadmonspeciesname: @ 0x0809A950 push {r4, lr} ldr r1, [r0, #8] ldrb r2, [r1] @@ -317802,7 +317802,7 @@ sub_0809A950: @ 0x0809A950 lsls r2, r2, #2 adds r2, r2, r0 ldr r4, [r2] - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -317811,7 +317811,7 @@ sub_0809A950: @ 0x0809A950 adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r0, #1 adds r1, r1, r0 lsls r1, r1, #1 @@ -317827,10 +317827,10 @@ sub_0809A950: @ 0x0809A950 _0809A994: .4byte gUnknown_84E8918 _0809A998: .4byte gUnknown_2024190 _0809A99C: .4byte gUnknown_82EA31C - thumb_func_end sub_0809A950 + thumb_func_end ScrCmd_bufferleadmonspeciesname - thumb_func_start sub_0809A9A0 -sub_0809A9A0: @ 0x0809A9A0 + thumb_func_start ScrCmd_bufferpartymonnick +ScrCmd_bufferpartymonnick: @ 0x0809A9A0 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -317852,9 +317852,9 @@ sub_0809A9A0: @ 0x0809A9A0 ldr r4, [r4] movs r1, #2 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 movs r0, #0 pop {r4} pop {r1} @@ -317862,10 +317862,10 @@ sub_0809A9A0: @ 0x0809A9A0 .align 2, 0 _0809A9E0: .4byte gUnknown_2024190 _0809A9E4: .4byte gUnknown_84E8918 - thumb_func_end sub_0809A9A0 + thumb_func_end ScrCmd_bufferpartymonnick - thumb_func_start sub_0809A9E8 -sub_0809A9E8: @ 0x0809A9E8 + thumb_func_start ScrCmd_bufferitemname +ScrCmd_bufferitemname: @ 0x0809A9E8 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -317888,7 +317888,7 @@ sub_0809A9E8: @ 0x0809A9E8 bx r1 .align 2, 0 _0809AA18: .4byte gUnknown_84E8918 - thumb_func_end sub_0809A9E8 + thumb_func_end ScrCmd_bufferitemname thumb_func_start sub_0809AA1C sub_0809AA1C: @ 0x0809AA1C @@ -317923,8 +317923,8 @@ _0809AA58: .4byte gUnknown_84E8918 _0809AA5C: .4byte gUnknown_8580CD1 thumb_func_end sub_0809AA1C - thumb_func_start sub_0809AA60 -sub_0809AA60: @ 0x0809AA60 + thumb_func_start ScrCmd_bufferdecorationname +ScrCmd_bufferdecorationname: @ 0x0809AA60 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -317951,10 +317951,10 @@ sub_0809AA60: @ 0x0809AA60 .align 2, 0 _0809AA94: .4byte gUnknown_84E8918 _0809AA98: .4byte gUnknown_82EACC4 - thumb_func_end sub_0809AA60 + thumb_func_end ScrCmd_bufferdecorationname - thumb_func_start sub_0809AA9C -sub_0809AA9C: @ 0x0809AA9C + thumb_func_start ScrCmd_buffernumberstring +ScrCmd_buffernumberstring: @ 0x0809AA9C push {r4, r5, lr} ldr r1, [r0, #8] ldrb r5, [r1] @@ -317968,7 +317968,7 @@ sub_0809AA9C: @ 0x0809AA9C lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r4, #0 - bl sub_080EFE74 + bl CountDigits adds r3, r0, #0 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 @@ -317985,10 +317985,10 @@ sub_0809AA9C: @ 0x0809AA9C bx r1 .align 2, 0 _0809AADC: .4byte gUnknown_84E8918 - thumb_func_end sub_0809AA9C + thumb_func_end ScrCmd_buffernumberstring - thumb_func_start sub_0809AAE0 -sub_0809AAE0: @ 0x0809AAE0 + thumb_func_start ScrCmd_bufferstdstring +ScrCmd_bufferstdstring: @ 0x0809AAE0 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -318016,10 +318016,10 @@ sub_0809AAE0: @ 0x0809AAE0 .align 2, 0 _0809AB18: .4byte gUnknown_84E8918 _0809AB1C: .4byte gUnknown_85645A0 - thumb_func_end sub_0809AAE0 + thumb_func_end ScrCmd_bufferstdstring - thumb_func_start sub_0809AB20 -sub_0809AB20: @ 0x0809AB20 + thumb_func_start ScrCmd_bufferstring +ScrCmd_bufferstring: @ 0x0809AB20 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -318038,10 +318038,10 @@ sub_0809AB20: @ 0x0809AB20 bx r1 .align 2, 0 _0809AB44: .4byte gUnknown_84E8918 - thumb_func_end sub_0809AB20 + thumb_func_end ScrCmd_bufferstring - thumb_func_start sub_0809AB48 -sub_0809AB48: @ 0x0809AB48 + thumb_func_start ScrCmd_vloadword +ScrCmd_vloadword: @ 0x0809AB48 push {lr} bl ScriptReadWord adds r1, r0, #0 @@ -318049,17 +318049,17 @@ sub_0809AB48: @ 0x0809AB48 ldr r0, [r0] subs r1, r1, r0 ldr r0, _0809AB68 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 pop {r1} bx r1 .align 2, 0 _0809AB64: .4byte gUnknown_2037264 _0809AB68: .4byte gUnknown_2021C7C - thumb_func_end sub_0809AB48 + thumb_func_end ScrCmd_vloadword - thumb_func_start sub_0809AB6C -sub_0809AB6C: @ 0x0809AB6C + thumb_func_start ScrCmd_vbufferstring +ScrCmd_vbufferstring: @ 0x0809AB6C push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -318082,10 +318082,10 @@ sub_0809AB6C: @ 0x0809AB6C .align 2, 0 _0809AB98: .4byte gUnknown_2037264 _0809AB9C: .4byte gUnknown_84E8918 - thumb_func_end sub_0809AB6C + thumb_func_end ScrCmd_vbufferstring - thumb_func_start sub_0809ABA0 -sub_0809ABA0: @ 0x0809ABA0 + thumb_func_start ScrCmd_bufferboxname +ScrCmd_bufferboxname: @ 0x0809ABA0 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -318111,10 +318111,10 @@ sub_0809ABA0: @ 0x0809ABA0 bx r1 .align 2, 0 _0809ABD8: .4byte gUnknown_84E8918 - thumb_func_end sub_0809ABA0 + thumb_func_end ScrCmd_bufferboxname - thumb_func_start sub_0809ABDC -sub_0809ABDC: @ 0x0809ABDC + thumb_func_start ScrCmd_givemon +ScrCmd_givemon: @ 0x0809ABDC push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -318157,7 +318157,7 @@ sub_0809ABDC: @ 0x0809ABDC mov r1, sb adds r2, r5, #0 mov r3, r8 - bl sub_080F9AD4 + bl ScriptGiveMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -318171,7 +318171,7 @@ sub_0809ABDC: @ 0x0809ABDC bx r1 .align 2, 0 _0809AC58: .4byte gUnknown_2037290 - thumb_func_end sub_0809ABDC + thumb_func_end ScrCmd_givemon thumb_func_start sub_0809AC5C sub_0809AC5C: @ 0x0809AC5C @@ -318183,7 +318183,7 @@ sub_0809AC5C: @ 0x0809AC5C lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _0809AC84 - bl sub_080F9B58 + bl ScriptGiveEgg lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -318195,8 +318195,8 @@ sub_0809AC5C: @ 0x0809AC5C _0809AC84: .4byte gUnknown_2037290 thumb_func_end sub_0809AC5C - thumb_func_start sub_0809AC88 -sub_0809AC88: @ 0x0809AC88 + thumb_func_start ScrCmd_setmonmove +ScrCmd_setmonmove: @ 0x0809AC88 push {r4, r5, lr} ldr r1, [r0, #8] ldrb r5, [r1] @@ -318211,16 +318211,16 @@ sub_0809AC88: @ 0x0809AC88 lsrs r1, r1, #0x10 adds r0, r5, #0 adds r2, r4, #0 - bl sub_080F9C90 + bl ScriptSetMonMoveSlot movs r0, #0 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809AC88 + thumb_func_end ScrCmd_setmonmove - thumb_func_start sub_0809ACB4 -sub_0809ACB4: @ 0x0809ACB4 + thumb_func_start ScrCmd_checkpartymove +ScrCmd_checkpartymove: @ 0x0809ACB4 push {r4, r5, r6, r7, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318235,12 +318235,12 @@ _0809ACC8: .4byte gUnknown_2037290 _0809ACCC: adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0809ACFC adds r0, r4, #0 adds r1, r7, #0 - bl sub_081B69FC + bl MonKnowsMove lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -318268,7 +318268,7 @@ _0809AD02: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, #0 @@ -318280,7 +318280,7 @@ _0809AD22: bx r1 .align 2, 0 _0809AD2C: .4byte gUnknown_2024190 - thumb_func_end sub_0809ACB4 + thumb_func_end ScrCmd_checkpartymove thumb_func_start sub_0809AD30 sub_0809AD30: @ 0x0809AD30 @@ -318338,8 +318338,8 @@ _0809AD8A: _0809AD94: .4byte gUnknown_3005AEC thumb_func_end sub_0809AD64 - thumb_func_start sub_0809AD98 -sub_0809AD98: @ 0x0809AD98 + thumb_func_start ScrCmd_checkmoney +ScrCmd_checkmoney: @ 0x0809AD98 push {r4, lr} adds r4, r0, #0 bl ScriptReadWord @@ -318369,10 +318369,10 @@ _0809ADC6: .align 2, 0 _0809ADD0: .4byte gUnknown_2037290 _0809ADD4: .4byte gUnknown_3005AEC - thumb_func_end sub_0809AD98 + thumb_func_end ScrCmd_checkmoney - thumb_func_start sub_0809ADD8 -sub_0809ADD8: @ 0x0809ADD8 + thumb_func_start ScrCmd_showmoneybox +ScrCmd_showmoneybox: @ 0x0809ADD8 push {r4, r5, lr} ldr r1, [r0, #8] ldrb r5, [r1] @@ -318394,7 +318394,7 @@ sub_0809ADD8: @ 0x0809ADD8 bl sub_080E4908 adds r1, r5, #0 adds r2, r4, #0 - bl sub_080E4AC8 + bl DrawMoneyBox _0809AE08: movs r0, #0 pop {r4, r5} @@ -318402,19 +318402,19 @@ _0809AE08: bx r1 .align 2, 0 _0809AE10: .4byte gUnknown_3005AEC - thumb_func_end sub_0809ADD8 + thumb_func_end ScrCmd_showmoneybox thumb_func_start sub_0809AE14 sub_0809AE14: @ 0x0809AE14 push {lr} - bl sub_080E4B60 + bl HideMoneyBox movs r0, #0 pop {r1} bx r1 thumb_func_end sub_0809AE14 - thumb_func_start sub_0809AE20 -sub_0809AE20: @ 0x0809AE20 + thumb_func_start ScrCmd_updatemoneybox +ScrCmd_updatemoneybox: @ 0x0809AE20 push {lr} ldr r1, [r0, #8] adds r1, #1 @@ -318431,17 +318431,17 @@ sub_0809AE20: @ 0x0809AE20 lsls r1, r1, #3 adds r0, r0, r1 bl sub_080E4908 - bl sub_080E4AB0 + bl ChangeAmountInMoneyBox _0809AE46: movs r0, #0 pop {r1} bx r1 .align 2, 0 _0809AE4C: .4byte gUnknown_3005AEC - thumb_func_end sub_0809AE20 + thumb_func_end ScrCmd_updatemoneybox - thumb_func_start sub_0809AE50 -sub_0809AE50: @ 0x0809AE50 + thumb_func_start ScrCmd_showcoinsbox +ScrCmd_showcoinsbox: @ 0x0809AE50 push {r4, r5, lr} ldr r1, [r0, #8] ldrb r5, [r1] @@ -318460,23 +318460,23 @@ sub_0809AE50: @ 0x0809AE50 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809AE50 + thumb_func_end ScrCmd_showcoinsbox - thumb_func_start sub_0809AE78 -sub_0809AE78: @ 0x0809AE78 + thumb_func_start ScrCmd_hidecoinsbox +ScrCmd_hidecoinsbox: @ 0x0809AE78 push {lr} ldr r1, [r0, #8] adds r1, #2 str r1, [r0, #8] - bl sub_08145CD4 + bl HideCoinsWindow movs r0, #0 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809AE78 + thumb_func_end ScrCmd_hidecoinsbox - thumb_func_start sub_0809AE8C -sub_0809AE8C: @ 0x0809AE8C + thumb_func_start ScrCmd_updatecoinsbox +ScrCmd_updatecoinsbox: @ 0x0809AE8C push {lr} ldr r1, [r0, #8] adds r1, #2 @@ -318489,35 +318489,35 @@ sub_0809AE8C: @ 0x0809AE8C pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809AE8C + thumb_func_end ScrCmd_updatecoinsbox - thumb_func_start sub_0809AEA8 -sub_0809AEA8: @ 0x0809AEA8 + thumb_func_start ScrCmd_trainerbattle +ScrCmd_trainerbattle: @ 0x0809AEA8 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #8] - bl sub_080B0D1C + bl BattleSetup_ConfigureTrainerBattle str r0, [r4, #8] movs r0, #0 pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809AEA8 + thumb_func_end ScrCmd_trainerbattle - thumb_func_start sub_0809AEBC -sub_0809AEBC: @ 0x0809AEBC + thumb_func_start ScrCmd_dotrainerbattle +ScrCmd_dotrainerbattle: @ 0x0809AEBC push {lr} - bl sub_080B10CC + bl BattleSetup_StartTrainerBattle movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0809AEBC + thumb_func_end ScrCmd_dotrainerbattle thumb_func_start sub_0809AEC8 sub_0809AEC8: @ 0x0809AEC8 push {r4, lr} adds r4, r0, #0 - bl sub_080B13E4 + bl BattleSetup_GetScriptAddrAfterBattle str r0, [r4, #8] movs r0, #0 pop {r4} @@ -318530,7 +318530,7 @@ sub_0809AEC8: @ 0x0809AEC8 sub_0809AEDC: @ 0x0809AEDC push {r4, lr} adds r4, r0, #0 - bl sub_080B13FC + bl BattleSetup_GetTrainerPostBattleScript str r0, [r4, #8] movs r0, #0 pop {r4} @@ -318539,8 +318539,8 @@ sub_0809AEDC: @ 0x0809AEDC .align 2, 0 thumb_func_end sub_0809AEDC - thumb_func_start sub_0809AEF0 -sub_0809AEF0: @ 0x0809AEF0 + thumb_func_start ScrCmd_checktrainerflag +ScrCmd_checktrainerflag: @ 0x0809AEF0 push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -318549,17 +318549,17 @@ sub_0809AEF0: @ 0x0809AEF0 bl VarGet lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080B108C + bl HasTrainerBeenFought strb r0, [r4, #2] movs r0, #0 pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809AEF0 + thumb_func_end ScrCmd_checktrainerflag - thumb_func_start sub_0809AF14 -sub_0809AF14: @ 0x0809AF14 + thumb_func_start ScrCmd_settrainerflag +ScrCmd_settrainerflag: @ 0x0809AF14 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318571,10 +318571,10 @@ sub_0809AF14: @ 0x0809AF14 movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809AF14 + thumb_func_end ScrCmd_settrainerflag - thumb_func_start sub_0809AF30 -sub_0809AF30: @ 0x0809AF30 + thumb_func_start HideSaveInfoWindow +HideSaveInfoWindow: @ 0x0809AF30 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318586,10 +318586,10 @@ sub_0809AF30: @ 0x0809AF30 movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809AF30 + thumb_func_end HideSaveInfoWindow - thumb_func_start sub_0809AF4C -sub_0809AF4C: @ 0x0809AF4C + thumb_func_start ScrCmd_setwildbattle +ScrCmd_setwildbattle: @ 0x0809AF4C push {r4, r5, r6, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -318607,29 +318607,29 @@ sub_0809AF4C: @ 0x0809AF4C lsrs r2, r2, #0x10 adds r0, r5, #0 adds r1, r6, #0 - bl sub_080F9C30 + bl CreateScriptedWildMon movs r0, #0 pop {r4, r5, r6} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809AF4C + thumb_func_end ScrCmd_setwildbattle - thumb_func_start sub_0809AF80 -sub_0809AF80: @ 0x0809AF80 + thumb_func_start ScrCmd_dowildbattle +ScrCmd_dowildbattle: @ 0x0809AF80 push {lr} - bl sub_080B01A4 + bl BattleSetup_StartScriptedWildBattle bl sub_080988B8 movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0809AF80 + thumb_func_end ScrCmd_dowildbattle thumb_func_start sub_0809AF90 sub_0809AF90: @ 0x0809AF90 push {lr} bl ScriptReadWord - bl sub_080E07D0 + bl CreatePokemartMenu bl sub_080988B8 movs r0, #1 pop {r1} @@ -318640,7 +318640,7 @@ sub_0809AF90: @ 0x0809AF90 sub_0809AFA4: @ 0x0809AFA4 push {lr} bl ScriptReadWord - bl sub_080E07F4 + bl CreateDecorationShop1Menu bl sub_080988B8 movs r0, #1 pop {r1} @@ -318651,15 +318651,15 @@ sub_0809AFA4: @ 0x0809AFA4 sub_0809AFB8: @ 0x0809AFB8 push {lr} bl ScriptReadWord - bl sub_080E0814 + bl CreateDecorationShop2Menu bl sub_080988B8 movs r0, #1 pop {r1} bx r1 thumb_func_end sub_0809AFB8 - thumb_func_start sub_0809AFCC -sub_0809AFCC: @ 0x0809AFCC + thumb_func_start ScrCmd_playslotmachine +ScrCmd_playslotmachine: @ 0x0809AFCC push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318668,17 +318668,17 @@ sub_0809AFCC: @ 0x0809AFCC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0809AFF0 - bl sub_0812A550 + bl PlaySlotMachine bl sub_080988B8 movs r0, #1 pop {r1} bx r1 .align 2, 0 -_0809AFF0: .4byte sub_08085B34 - thumb_func_end sub_0809AFCC +_0809AFF0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end ScrCmd_playslotmachine - thumb_func_start sub_0809AFF4 -sub_0809AFF4: @ 0x0809AFF4 + thumb_func_start ScrCmd_setberrytree +ScrCmd_setberrytree: @ 0x0809AFF4 push {r4, r5, lr} ldr r1, [r0, #8] ldrb r5, [r1] @@ -318696,23 +318696,23 @@ sub_0809AFF4: @ 0x0809AFF4 movs r1, #0 adds r2, r4, #0 movs r3, #0 - bl sub_080E0E68 + bl PlantBerryTree b _0809B028 _0809B01C: adds r0, r5, #0 adds r1, r3, #0 adds r2, r4, #0 movs r3, #0 - bl sub_080E0E68 + bl PlantBerryTree _0809B028: movs r0, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809AFF4 + thumb_func_end ScrCmd_setberrytree - thumb_func_start sub_0809B030 -sub_0809B030: @ 0x0809B030 + thumb_func_start ScrCmd_getpricereduction +ScrCmd_getpricereduction: @ 0x0809B030 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318721,7 +318721,7 @@ sub_0809B030: @ 0x0809B030 ldr r4, _0809B058 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080EFB3C + bl GetPriceReduction lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -318731,7 +318731,7 @@ sub_0809B030: @ 0x0809B030 bx r1 .align 2, 0 _0809B058: .4byte gUnknown_2037290 - thumb_func_end sub_0809B030 + thumb_func_end ScrCmd_getpricereduction thumb_func_start sub_0809B05C sub_0809B05C: @ 0x0809B05C @@ -318746,22 +318746,22 @@ sub_0809B05C: @ 0x0809B05C thumb_func_start sub_0809B06C sub_0809B06C: @ 0x0809B06C push {lr} - bl sub_080F8C90 + bl WarpIntoSecretBase bl sub_080988B8 movs r0, #1 pop {r1} bx r1 thumb_func_end sub_0809B06C - thumb_func_start sub_0809B07C -sub_0809B07C: @ 0x0809B07C + thumb_func_start IsPokerusInParty +IsPokerusInParty: @ 0x0809B07C push {lr} bl sub_080F8D08 bl sub_080988B8 movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0809B07C + thumb_func_end IsPokerusInParty thumb_func_start sub_0809B08C sub_0809B08C: @ 0x0809B08C @@ -318777,8 +318777,8 @@ sub_0809B08C: @ 0x0809B08C _0809B0A0: .4byte gUnknown_2039BCC thumb_func_end sub_0809B08C - thumb_func_start sub_0809B0A4 -sub_0809B0A4: @ 0x0809B0A4 + thumb_func_start ScrCmd_dofieldeffect +ScrCmd_dofieldeffect: @ 0x0809B0A4 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318790,16 +318790,16 @@ sub_0809B0A4: @ 0x0809B0A4 strh r0, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080B5270 + bl FieldEffectStart movs r0, #0 pop {r1} bx r1 .align 2, 0 _0809B0C8: .4byte gUnknown_2037270 - thumb_func_end sub_0809B0A4 + thumb_func_end ScrCmd_dofieldeffect - thumb_func_start sub_0809B0CC -sub_0809B0CC: @ 0x0809B0CC + thumb_func_start ScrCmd_setfieldeffectarg +ScrCmd_setfieldeffectarg: @ 0x0809B0CC push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -318821,10 +318821,10 @@ sub_0809B0CC: @ 0x0809B0CC bx r1 .align 2, 0 _0809B0F8: .4byte gUnknown_20388A8 - thumb_func_end sub_0809B0CC + thumb_func_end ScrCmd_setfieldeffectarg - thumb_func_start sub_0809B0FC -sub_0809B0FC: @ 0x0809B0FC + thumb_func_start WaitForFieldEffectFinish +WaitForFieldEffectFinish: @ 0x0809B0FC push {lr} ldr r0, _0809B110 ldrb r0, [r0] @@ -318842,10 +318842,10 @@ _0809B116: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B0FC + thumb_func_end WaitForFieldEffectFinish - thumb_func_start sub_0809B11C -sub_0809B11C: @ 0x0809B11C + thumb_func_start ScrCmd_waitfieldeffect +ScrCmd_waitfieldeffect: @ 0x0809B11C push {r4, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -318856,18 +318856,18 @@ sub_0809B11C: @ 0x0809B11C strh r0, [r1] ldr r1, _0809B144 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r4} pop {r1} bx r1 .align 2, 0 _0809B140: .4byte gUnknown_2037270 -_0809B144: .4byte sub_0809B0FC - thumb_func_end sub_0809B11C +_0809B144: .4byte WaitForFieldEffectFinish + thumb_func_end ScrCmd_waitfieldeffect - thumb_func_start sub_0809B148 -sub_0809B148: @ 0x0809B148 + thumb_func_start ScrCmd_setrespawn +ScrCmd_setrespawn: @ 0x0809B148 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -318875,14 +318875,14 @@ sub_0809B148: @ 0x0809B148 bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08084684 + bl SetLastHealLocationWarp movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809B148 + thumb_func_end ScrCmd_setrespawn - thumb_func_start sub_0809B164 -sub_0809B164: @ 0x0809B164 + thumb_func_start ScrCmd_checkplayergender +ScrCmd_checkplayergender: @ 0x0809B164 ldr r1, _0809B174 ldr r0, _0809B178 ldr r0, [r0] @@ -318893,10 +318893,10 @@ sub_0809B164: @ 0x0809B164 .align 2, 0 _0809B174: .4byte gUnknown_2037290 _0809B178: .4byte gUnknown_3005AF0 - thumb_func_end sub_0809B164 + thumb_func_end ScrCmd_checkplayergender - thumb_func_start sub_0809B17C -sub_0809B17C: @ 0x0809B17C + thumb_func_start ScrCmd_playmoncry +ScrCmd_playmoncry: @ 0x0809B17C push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -318915,27 +318915,27 @@ sub_0809B17C: @ 0x0809B17C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080A2CCC + bl PlayCry5 movs r0, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809B17C + thumb_func_end ScrCmd_playmoncry thumb_func_start sub_0809B1B4 sub_0809B1B4: @ 0x0809B1B4 push {lr} ldr r1, _0809B1C4 - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r1} bx r1 .align 2, 0 -_0809B1C4: .4byte sub_080A2F40 +_0809B1C4: .4byte IsCryFinished thumb_func_end sub_0809B1B4 - thumb_func_start sub_0809B1C8 -sub_0809B1C8: @ 0x0809B1C8 + thumb_func_start ScrCmd_setmetatile +ScrCmd_setmetatile: @ 0x0809B1C8 push {r4, r5, r6, r7, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -318992,10 +318992,10 @@ _0809B23E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B1C8 + thumb_func_end ScrCmd_setmetatile - thumb_func_start sub_0809B248 -sub_0809B248: @ 0x0809B248 + thumb_func_start ScrCmd_opendoor +ScrCmd_opendoor: @ 0x0809B248 push {r4, r5, lr} adds r4, r0, #0 bl ScriptReadHalfword @@ -319021,22 +319021,22 @@ sub_0809B248: @ 0x0809B248 lsrs r4, r4, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0808A294 + bl GetDoorSoundEffect lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_080A306C adds r0, r5, #0 adds r1, r4, #0 - bl sub_0808A248 + bl FieldAnimateDoorOpen movs r0, #0 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B248 + thumb_func_end ScrCmd_opendoor - thumb_func_start sub_0809B2A0 -sub_0809B2A0: @ 0x0809B2A0 + thumb_func_start ScrCmd_closedoor +ScrCmd_closedoor: @ 0x0809B2A0 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -319061,17 +319061,17 @@ sub_0809B2A0: @ 0x0809B2A0 adds r1, r1, r0 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0808A210 + bl FieldAnimateDoorClose movs r0, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809B2A0 + thumb_func_end ScrCmd_closedoor - thumb_func_start sub_0809B2E4 -sub_0809B2E4: @ 0x0809B2E4 + thumb_func_start IsDoorAnimationStopped +IsDoorAnimationStopped: @ 0x0809B2E4 push {lr} - bl sub_0808A280 + bl FieldIsDoorAnimationRunning lsls r0, r0, #0x18 cmp r0, #0 beq _0809B2F4 @@ -319083,22 +319083,22 @@ _0809B2F6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B2E4 + thumb_func_end IsDoorAnimationStopped thumb_func_start sub_0809B2FC sub_0809B2FC: @ 0x0809B2FC push {lr} ldr r1, _0809B30C - bl sub_08098688 + bl SetupNativeScript movs r0, #1 pop {r1} bx r1 .align 2, 0 -_0809B30C: .4byte sub_0809B2E4 +_0809B30C: .4byte IsDoorAnimationStopped thumb_func_end sub_0809B2FC - thumb_func_start sub_0809B310 -sub_0809B310: @ 0x0809B310 + thumb_func_start ScrCmd_setdooropen +ScrCmd_setdooropen: @ 0x0809B310 push {r4, r5, lr} adds r5, r0, #0 bl ScriptReadHalfword @@ -319128,7 +319128,7 @@ sub_0809B310: @ 0x0809B310 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809B310 + thumb_func_end ScrCmd_setdooropen thumb_func_start sub_0809B354 sub_0809B354: @ 0x0809B354 @@ -319163,8 +319163,8 @@ sub_0809B354: @ 0x0809B354 bx r1 thumb_func_end sub_0809B354 - thumb_func_start sub_0809B398 -sub_0809B398: @ 0x0809B398 + thumb_func_start ScrCmd_addelevmenuitem +ScrCmd_addelevmenuitem: @ 0x0809B398 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #8] @@ -319189,7 +319189,7 @@ sub_0809B398: @ 0x0809B398 pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809B398 + thumb_func_end ScrCmd_addelevmenuitem thumb_func_start sub_0809B3D4 sub_0809B3D4: @ 0x0809B3D4 @@ -319197,13 +319197,13 @@ sub_0809B3D4: @ 0x0809B3D4 bx lr thumb_func_end sub_0809B3D4 - thumb_func_start sub_0809B3D8 -sub_0809B3D8: @ 0x0809B3D8 + thumb_func_start ScrCmd_checkcoins +ScrCmd_checkcoins: @ 0x0809B3D8 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0809CF20 + bl GetVarPointer adds r4, r0, #0 bl GetCoins strh r0, [r4] @@ -319212,10 +319212,10 @@ sub_0809B3D8: @ 0x0809B3D8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B3D8 + thumb_func_end ScrCmd_checkcoins - thumb_func_start sub_0809B3F8 -sub_0809B3F8: @ 0x0809B3F8 + thumb_func_start ScrCmd_givecoins +ScrCmd_givecoins: @ 0x0809B3F8 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -319243,10 +319243,10 @@ _0809B424: bx r1 .align 2, 0 _0809B42C: .4byte gUnknown_2037290 - thumb_func_end sub_0809B3F8 + thumb_func_end ScrCmd_givecoins - thumb_func_start sub_0809B430 -sub_0809B430: @ 0x0809B430 + thumb_func_start ScrCmd_takecoins +ScrCmd_takecoins: @ 0x0809B430 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -319274,7 +319274,7 @@ _0809B45C: bx r1 .align 2, 0 _0809B464: .4byte gUnknown_2037290 - thumb_func_end sub_0809B430 + thumb_func_end ScrCmd_takecoins thumb_func_start sub_0809B468 sub_0809B468: @ 0x0809B468 @@ -319285,7 +319285,7 @@ sub_0809B468: @ 0x0809B468 bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081A8720 + bl MossdeepGym_MoveEvents ldr r1, _0809B488 strh r0, [r1] movs r0, #0 @@ -319298,14 +319298,14 @@ _0809B488: .4byte gUnknown_203726A thumb_func_start sub_0809B48C sub_0809B48C: @ 0x0809B48C push {lr} - bl sub_081A8878 + bl MossdeepGym_TurnEvents movs r0, #0 pop {r1} bx r1 thumb_func_end sub_0809B48C - thumb_func_start sub_0809B498 -sub_0809B498: @ 0x0809B498 + thumb_func_start ScrCmd_mossdeepgym3 +ScrCmd_mossdeepgym3: @ 0x0809B498 push {lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -319313,25 +319313,25 @@ sub_0809B498: @ 0x0809B498 bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081A86B4 + bl InitMossdeepGymTiles movs r0, #0 pop {r1} bx r1 - thumb_func_end sub_0809B498 + thumb_func_end ScrCmd_mossdeepgym3 thumb_func_start sub_0809B4B4 sub_0809B4B4: @ 0x0809B4B4 push {lr} - bl sub_081A86DC + bl FinishMossdeepGymTiles movs r0, #0 pop {r1} bx r1 thumb_func_end sub_0809B4B4 - thumb_func_start sub_0809B4C0 -sub_0809B4C0: @ 0x0809B4C0 + thumb_func_start ScrCmd_cmdD8 +ScrCmd_cmdD8: @ 0x0809B4C0 push {lr} - bl sub_080B3F14 + bl GetCurrentApproachingTrainerEventObjectId ldr r1, _0809B4D0 strb r0, [r1] movs r0, #0 @@ -319339,13 +319339,13 @@ sub_0809B4C0: @ 0x0809B4C0 bx r1 .align 2, 0 _0809B4D0: .4byte gUnknown_3005B50 - thumb_func_end sub_0809B4C0 + thumb_func_end ScrCmd_cmdD8 - thumb_func_start sub_0809B4D4 -sub_0809B4D4: @ 0x0809B4D4 + thumb_func_start ScrCmd_cmdD9 +ScrCmd_cmdD9: @ 0x0809B4D4 push {r4, lr} adds r4, r0, #0 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 beq _0809B4E4 movs r0, #0 @@ -319365,7 +319365,7 @@ _0809B4E4: bl sub_08097FB8 ldr r1, _0809B518 adds r0, r4, #0 - bl sub_08098688 + bl SetupNativeScript _0809B506: movs r0, #1 _0809B508: @@ -319376,10 +319376,10 @@ _0809B508: _0809B510: .4byte gUnknown_2036FF0 _0809B514: .4byte gUnknown_3005B50 _0809B518: .4byte sub_080980BC - thumb_func_end sub_0809B4D4 + thumb_func_end ScrCmd_cmdD9 - thumb_func_start sub_0809B51C -sub_0809B51C: @ 0x0809B51C + thumb_func_start ScrCmd_setmonobedient +ScrCmd_setmonobedient: @ 0x0809B51C push {lr} sub sp, #4 movs r2, #1 @@ -319397,17 +319397,17 @@ sub_0809B51C: @ 0x0809B51C adds r0, r0, r1 movs r1, #0x50 mov r2, sp - bl sub_0806A774 + bl SetMonData movs r0, #0 add sp, #4 pop {r1} bx r1 .align 2, 0 _0809B550: .4byte gUnknown_2024190 - thumb_func_end sub_0809B51C + thumb_func_end ScrCmd_setmonobedient - thumb_func_start sub_0809B554 -sub_0809B554: @ 0x0809B554 + thumb_func_start ScrCmd_checkmonobedience +ScrCmd_checkmonobedience: @ 0x0809B554 push {r4, lr} bl ScriptReadHalfword lsls r0, r0, #0x10 @@ -319422,7 +319422,7 @@ sub_0809B554: @ 0x0809B554 adds r0, r0, r1 movs r1, #0x50 movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4] movs r0, #0 pop {r4} @@ -319431,13 +319431,13 @@ sub_0809B554: @ 0x0809B554 .align 2, 0 _0809B584: .4byte gUnknown_2037290 _0809B588: .4byte gUnknown_2024190 - thumb_func_end sub_0809B554 + thumb_func_end ScrCmd_checkmonobedience - thumb_func_start sub_0809B58C -sub_0809B58C: @ 0x0809B58C + thumb_func_start ScrCmd_gotoram +ScrCmd_gotoram: @ 0x0809B58C push {r4, lr} adds r4, r0, #0 - bl sub_08098BCC + bl GetSavedRamScriptIfValid adds r2, r0, #0 cmp r2, #0 beq _0809B5A8 @@ -319454,10 +319454,10 @@ _0809B5A8: bx r1 .align 2, 0 _0809B5B0: .4byte gUnknown_2037260 - thumb_func_end sub_0809B58C + thumb_func_end ScrCmd_gotoram - thumb_func_start sub_0809B5B4 -sub_0809B5B4: @ 0x0809B5B4 + thumb_func_start ScrCmd_warpD1 +ScrCmd_warpD1: @ 0x0809B5B4 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -319513,7 +319513,7 @@ sub_0809B5B4: @ 0x0809B5B4 lsrs r0, r0, #0x18 bl sub_0808C9E4 bl sub_080AFB40 - bl sub_08084BD0 + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -319523,10 +319523,10 @@ sub_0809B5B4: @ 0x0809B5B4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B5B4 + thumb_func_end ScrCmd_warpD1 - thumb_func_start sub_0809B648 -sub_0809B648: @ 0x0809B648 + thumb_func_start ScrCmd_setmonmetlocation +ScrCmd_setmonmetlocation: @ 0x0809B648 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -319550,7 +319550,7 @@ sub_0809B648: @ 0x0809B648 adds r0, r0, r1 movs r1, #0x23 mov r2, sp - bl sub_0806A774 + bl SetMonData _0809B67E: movs r0, #0 add sp, #4 @@ -319559,7 +319559,7 @@ _0809B67E: bx r1 .align 2, 0 _0809B688: .4byte gUnknown_2024190 - thumb_func_end sub_0809B648 + thumb_func_end ScrCmd_setmonmetlocation thumb_func_start sub_0809B68C sub_0809B68C: @ 0x0809B68C @@ -319569,7 +319569,7 @@ sub_0809B68C: @ 0x0809B68C movs r1, #1 bl sub_08197060 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -319577,8 +319577,8 @@ sub_0809B68C: @ 0x0809B68C _0809B6A4: .4byte gUnknown_3000F30 thumb_func_end sub_0809B68C - thumb_func_start sub_0809B6A8 -sub_0809B6A8: @ 0x0809B6A8 + thumb_func_start ScrCmd_buffertrainerclassname +ScrCmd_buffertrainerclassname: @ 0x0809B6A8 push {r4, lr} ldr r1, [r0, #8] ldrb r4, [r1] @@ -319604,7 +319604,7 @@ sub_0809B6A8: @ 0x0809B6A8 bx r1 .align 2, 0 _0809B6E0: .4byte gUnknown_84E8918 - thumb_func_end sub_0809B6A8 + thumb_func_end ScrCmd_buffertrainerclassname thumb_func_start sub_0809B6E4 sub_0809B6E4: @ 0x0809B6E4 @@ -319644,8 +319644,8 @@ sub_0809B720: @ 0x0809B720 _0809B728: .4byte gUnknown_203726A thumb_func_end sub_0809B720 - thumb_func_start sub_0809B72C -sub_0809B72C: @ 0x0809B72C + thumb_func_start ScrCmd_warpE0 +ScrCmd_warpE0: @ 0x0809B72C push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -319696,8 +319696,8 @@ sub_0809B72C: @ 0x0809B72C adds r2, r6, #0 adds r3, r4, #0 bl SetWarpDestination - bl sub_080AF098 - bl sub_08084BD0 + bl ScrCmd_pokemartdecoration2 + bl ResetInitialPlayerAvatarState movs r0, #1 add sp, #4 pop {r3, r4} @@ -319707,7 +319707,7 @@ sub_0809B72C: @ 0x0809B72C pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B72C + thumb_func_end ScrCmd_warpE0 thumb_func_start FieldClearPlayerInput FieldClearPlayerInput: @ 0x0809B7B4 @@ -319735,8 +319735,8 @@ FieldClearPlayerInput: @ 0x0809B7B4 bx r0 thumb_func_end FieldClearPlayerInput - thumb_func_start sub_0809B7E0 -sub_0809B7E0: @ 0x0809B7E0 + thumb_func_start FieldGetPlayerInput +FieldGetPlayerInput: @ 0x0809B7E0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -319751,7 +319751,7 @@ sub_0809B7E0: @ 0x0809B7E0 ldrb r6, [r0, #3] ldrb r0, [r0, #2] mov sb, r0 - bl sub_0809BAA8 + bl GetPlayerCurMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl MetatileBehavior_IsForcedMovementTile @@ -319765,7 +319765,7 @@ _0809B814: cmp r6, #0 bne _0809B87A _0809B818: - bl sub_0811A988 + bl GetPlayerSpeed lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #4 @@ -319881,10 +319881,10 @@ _0809B8DE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809B7E0 + thumb_func_end FieldGetPlayerInput - thumb_func_start sub_0809B8EC -sub_0809B8EC: @ 0x0809B8EC + thumb_func_start ProcessPlayerFieldInput +ProcessPlayerFieldInput: @ 0x0809B8EC push {r4, r5, r6, lr} sub sp, #8 adds r5, r0, #0 @@ -319898,7 +319898,7 @@ sub_0809B8EC: @ 0x0809B8EC lsrs r6, r0, #0x18 mov r4, sp mov r0, sp - bl sub_0809BA54 + bl GetPlayerPosition mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -319907,7 +319907,7 @@ sub_0809B8EC: @ 0x0809B8EC bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_080B3340 + bl CheckForTrainersWantingBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -319922,7 +319922,7 @@ sub_0809B8EC: @ 0x0809B8EC ands r0, r1 cmp r0, #0 beq _0809B948 - bl sub_0809C174 + bl TrySetupDiveEmergeScript cmp r0, #1 beq _0809BA26 _0809B948: @@ -319933,11 +319933,11 @@ _0809B948: beq _0809B96E movs r0, #5 bl IncrementGameStat - bl sub_0813B1BC + bl IncrementBirthIslandRockStepCount mov r0, sp adds r1, r4, #0 adds r2, r6, #0 - bl sub_0809C1B4 + bl TryStartStepBasedScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -319949,7 +319949,7 @@ _0809B96E: cmp r0, #0 beq _0809B986 adds r0, r4, #0 - bl sub_0809C4C0 + bl CheckStandardWildEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -319966,7 +319966,7 @@ _0809B986: mov r0, sp adds r1, r4, #0 adds r2, r6, #0 - bl sub_0809C510 + bl TryArrowWarp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -319974,7 +319974,7 @@ _0809B986: _0809B9A8: mov r4, sp mov r0, sp - bl sub_0809BA6C + bl GetInFrontOfPlayerPosition mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -319991,7 +319991,7 @@ _0809B9A8: mov r0, sp adds r1, r4, #0 adds r2, r6, #0 - bl sub_0809BAD4 + bl TryStartInteractionScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -320008,7 +320008,7 @@ _0809B9DE: mov r0, sp adds r1, r4, #0 adds r2, r6, #0 - bl sub_0809C850 + bl TryDoorWarp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -320030,7 +320030,7 @@ _0809BA12: beq _0809BA34 movs r0, #6 bl sub_080A306C - bl sub_0809F374 + bl ShowStartMenu _0809BA26: movs r0, #1 b _0809BA4A @@ -320042,7 +320042,7 @@ _0809BA34: ands r0, r1 cmp r0, #0 beq _0809BA48 - bl sub_081AD318 + bl UseRegisteredKeyItemOnField lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -320055,10 +320055,10 @@ _0809BA4A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809B8EC + thumb_func_end ProcessPlayerFieldInput - thumb_func_start sub_0809BA54 -sub_0809BA54: @ 0x0809BA54 + thumb_func_start GetPlayerPosition +GetPlayerPosition: @ 0x0809BA54 push {r4, lr} adds r4, r0, #0 adds r1, r4, #2 @@ -320069,15 +320069,15 @@ sub_0809BA54: @ 0x0809BA54 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809BA54 + thumb_func_end GetPlayerPosition - thumb_func_start sub_0809BA6C -sub_0809BA6C: @ 0x0809BA6C + thumb_func_start GetInFrontOfPlayerPosition +GetInFrontOfPlayerPosition: @ 0x0809BA6C push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 adds r1, r5, #2 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r4, sp adds r4, #2 mov r0, sp @@ -320088,7 +320088,7 @@ sub_0809BA6C: @ 0x0809BA6C ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -320100,10 +320100,10 @@ _0809BA9E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0809BA6C + thumb_func_end GetInFrontOfPlayerPosition - thumb_func_start sub_0809BAA8 -sub_0809BAA8: @ 0x0809BAA8 + thumb_func_start GetPlayerCurMetatileBehavior +GetPlayerCurMetatileBehavior: @ 0x0809BAA8 push {r4, lr} sub sp, #4 mov r4, sp @@ -320124,10 +320124,10 @@ sub_0809BAA8: @ 0x0809BAA8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809BAA8 + thumb_func_end GetPlayerCurMetatileBehavior - thumb_func_start sub_0809BAD4 -sub_0809BAD4: @ 0x0809BAD4 + thumb_func_start TryStartInteractionScript +TryStartInteractionScript: @ 0x0809BAD4 push {r4, lr} lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -320179,7 +320179,7 @@ _0809BB38: .4byte gUnknown_821D478 _0809BB3C: .4byte gUnknown_82465B5 _0809BB40: .4byte gUnknown_82465B9 _0809BB44: .4byte gUnknown_8242E1E - thumb_func_end sub_0809BAD4 + thumb_func_end TryStartInteractionScript thumb_func_start GetInteractionScript GetInteractionScript: @ 0x0809BB48 @@ -320195,25 +320195,25 @@ GetInteractionScript: @ 0x0809BB48 adds r7, r4, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_0809BC5C + bl GetInteractedEventObjectScript cmp r0, #0 bne _0809BB94 adds r0, r6, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_0809BD30 + bl GetInteractedBackgroundEventScript cmp r0, #0 bne _0809BB94 adds r0, r6, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_0809BE10 + bl GetInteractedMetatileScript cmp r0, #0 bne _0809BB94 adds r0, r6, #0 mov r1, r8 adds r2, r7, #0 - bl sub_0809C0C4 + bl GetInteractedWaterScript cmp r0, #0 bne _0809BB94 movs r0, #0 @@ -320226,8 +320226,8 @@ _0809BB94: .align 2, 0 thumb_func_end GetInteractionScript - thumb_func_start sub_0809BBA0 -sub_0809BBA0: @ 0x0809BBA0 + thumb_func_start GetInteractedLinkPlayerScript +GetInteractedLinkPlayerScript: @ 0x0809BBA0 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r2, r2, #0x18 @@ -320264,7 +320264,7 @@ _0809BBC8: lsrs r1, r1, #0x10 _0809BBE6: ldrb r2, [r4, #4] - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x10 @@ -320320,10 +320320,10 @@ _0809BC4C: .4byte gUnknown_2031FA8 _0809BC50: .4byte gUnknown_3005B50 _0809BC54: .4byte gUnknown_2037292 _0809BC58: .4byte gUnknown_2037294 - thumb_func_end sub_0809BBA0 + thumb_func_end GetInteractedLinkPlayerScript - thumb_func_start sub_0809BC5C -sub_0809BC5C: @ 0x0809BC5C + thumb_func_start GetInteractedEventObjectScript +GetInteractedEventObjectScript: @ 0x0809BC5C push {r4, r5, r6, r7, lr} adds r5, r0, #0 lsls r1, r1, #0x18 @@ -320333,7 +320333,7 @@ sub_0809BC5C: @ 0x0809BC5C ldrh r0, [r5] ldrh r1, [r5, #2] ldrb r2, [r5, #4] - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x10 @@ -320370,7 +320370,7 @@ _0809BC8C: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 ldrb r2, [r5, #4] - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x10 @@ -320417,7 +320417,7 @@ _0809BD1A: adds r1, r0, #0 ldr r0, _0809BD2C ldrb r0, [r0] - bl sub_08098B10 + bl GetRamScript adds r1, r0, #0 _0809BD26: pop {r4, r5, r6, r7} @@ -320425,10 +320425,10 @@ _0809BD26: bx r1 .align 2, 0 _0809BD2C: .4byte gUnknown_2037292 - thumb_func_end sub_0809BC5C + thumb_func_end GetInteractedEventObjectScript - thumb_func_start sub_0809BD30 -sub_0809BD30: @ 0x0809BD30 + thumb_func_start GetInteractedBackgroundEventScript +GetInteractedBackgroundEventScript: @ 0x0809BD30 push {r4, r5, lr} lsls r2, r2, #0x18 lsrs r5, r2, #0x18 @@ -320519,7 +320519,7 @@ _0809BDE8: bne _0809BDA4 ldr r0, _0809BE00 strh r2, [r0] - bl sub_080EA320 + bl TrySetCurSecretBase lsls r0, r0, #0x18 cmp r0, #0 beq _0809BDA4 @@ -320534,10 +320534,10 @@ _0809BE0A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809BD30 + thumb_func_end GetInteractedBackgroundEventScript - thumb_func_start sub_0809BE10 -sub_0809BE10: @ 0x0809BE10 + thumb_func_start GetInteractedMetatileScript +GetInteractedMetatileScript: @ 0x0809BE10 push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x18 @@ -320771,7 +320771,7 @@ _0809BFF4: ldrsh r0, [r6, r1] movs r2, #2 ldrsh r1, [r6, r2] - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -320835,7 +320835,7 @@ _0809C080: lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C094 - bl sub_080EC580 + bl SetSecretBaseSecretsTvFlags_LargeDecorationSpot b _0809C0BA _0809C094: adds r0, r5, #0 @@ -320844,7 +320844,7 @@ _0809C094: lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C0BA - bl sub_080EC6C8 + bl SetSecretBaseSecretsTvFlags_SmallDecorationSpot b _0809C0BA _0809C0A8: adds r0, r5, #0 @@ -320853,7 +320853,7 @@ _0809C0A8: lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C0BA - bl sub_080EC038 + bl SetSecretBaseSecretsTvFlags_Poster _0809C0BA: movs r0, #0 _0809C0BC: @@ -320861,10 +320861,10 @@ _0809C0BC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809BE10 + thumb_func_end GetInteractedMetatileScript - thumb_func_start sub_0809C0C4 -sub_0809C0C4: @ 0x0809C0C4 + thumb_func_start GetInteractedWaterScript +GetInteractedWaterScript: @ 0x0809C0C4 push {r4, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 @@ -320874,12 +320874,12 @@ sub_0809C0C4: @ 0x0809C0C4 lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C0FC - bl sub_0808B764 + bl PartyHasMonWithSurf lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C0FC - bl sub_0808B7D8 + bl IsPlayerFacingSurfableFishableWater lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -320923,7 +320923,7 @@ _0809C13A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809C0C4 + thumb_func_end GetInteractedWaterScript thumb_func_start sub_0809C140 sub_0809C140: @ 0x0809C140 @@ -320933,7 +320933,7 @@ sub_0809C140: @ 0x0809C140 lsls r0, r0, #0x18 cmp r0, #0 beq _0809C16C - bl sub_0809CAC0 + bl TrySetDiveWarp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -320953,8 +320953,8 @@ _0809C16E: .align 2, 0 thumb_func_end sub_0809C140 - thumb_func_start sub_0809C174 -sub_0809C174: @ 0x0809C174 + thumb_func_start TrySetupDiveEmergeScript +TrySetupDiveEmergeScript: @ 0x0809C174 push {lr} ldr r0, _0809C1A0 bl FlagGet @@ -320965,7 +320965,7 @@ sub_0809C174: @ 0x0809C174 ldrb r0, [r0, #0x17] cmp r0, #5 bne _0809C1AC - bl sub_0809CAC0 + bl TrySetDiveWarp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -320984,40 +320984,40 @@ _0809C1AE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C174 + thumb_func_end TrySetupDiveEmergeScript - thumb_func_start sub_0809C1B4 -sub_0809C1B4: @ 0x0809C1B4 + thumb_func_start TryStartStepBasedScript +TryStartStepBasedScript: @ 0x0809C1B4 push {r4, r5, r6, lr} adds r5, r0, #0 lsls r1, r1, #0x10 lsrs r4, r1, #0x10 adds r6, r4, #0 - bl sub_0809C210 + bl TryStartCoordEventScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0809C206 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0809C574 + bl TryStartWarpEventScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0809C206 adds r0, r4, #0 - bl sub_0809C244 + bl TryStartMiscWalkingScripts lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0809C206 adds r0, r6, #0 - bl sub_0809C2CC + bl TryStartStepCountScript lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0809C206 - bl sub_080B4FC8 + bl UpdateRepelCounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -321031,10 +321031,10 @@ _0809C208: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C1B4 + thumb_func_end TryStartStepBasedScript - thumb_func_start sub_0809C210 -sub_0809C210: @ 0x0809C210 + thumb_func_start TryStartCoordEventScript +TryStartCoordEventScript: @ 0x0809C210 push {r4, lr} ldr r4, _0809C238 ldrh r1, [r0] @@ -321061,10 +321061,10 @@ _0809C23E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809C210 + thumb_func_end TryStartCoordEventScript - thumb_func_start sub_0809C244 -sub_0809C244: @ 0x0809C244 + thumb_func_start TryStartMiscWalkingScripts +TryStartMiscWalkingScripts: @ 0x0809C244 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -321098,7 +321098,7 @@ _0809C27C: lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C290 - bl sub_080FB240 + bl DoSecretBaseGlitterMatSparkle b _0809C2C0 _0809C290: adds r0, r4, #0 @@ -321117,10 +321117,10 @@ _0809C290: ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 asrs r0, r0, #0x10 - bl sub_080FB1E0 + bl PlaySecretBaseMusicNoteMatSound _0809C2C0: movs r0, #0 _0809C2C2: @@ -321129,10 +321129,10 @@ _0809C2C2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C244 + thumb_func_end TryStartMiscWalkingScripts - thumb_func_start sub_0809C2CC -sub_0809C2CC: @ 0x0809C2CC + thumb_func_start TryStartStepCountScript +TryStartStepCountScript: @ 0x0809C2CC push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -321141,9 +321141,9 @@ sub_0809C2CC: @ 0x0809C2CC bne _0809C2DC b _0809C3FC _0809C2DC: - bl sub_080B1A48 - bl sub_0809C41C - bl sub_081D4018 + bl IncrementRematchStepCounter + bl UpdateHappinessStepCounter + bl UpdateFarawayIslandStepCounter ldr r0, _0809C318 ldrb r1, [r0] movs r0, #0x40 @@ -321156,7 +321156,7 @@ _0809C2DC: lsls r0, r0, #0x18 cmp r0, #0 bne _0809C3D0 - bl sub_0809C46C + bl UpdatePoisonStepCounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -321180,7 +321180,7 @@ _0809C320: .align 2, 0 _0809C338: .4byte gUnknown_8257A89 _0809C33C: - bl sub_0813B3E8 + bl UnusualWeatherHasExpired lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -321191,7 +321191,7 @@ _0809C33C: .align 2, 0 _0809C350: .4byte gUnknown_8244749 _0809C354: - bl sub_081798BC + bl ShouldDoBrailleRegicePuzzle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -321211,7 +321211,7 @@ _0809C36C: .align 2, 0 _0809C37C: .4byte gUnknown_81DDDF3 _0809C380: - bl sub_08138190 + bl ShouldDoWinonaCall cmp r0, #1 bne _0809C394 ldr r0, _0809C390 @@ -321220,7 +321220,7 @@ _0809C380: .align 2, 0 _0809C390: .4byte gUnknown_81ED2AD _0809C394: - bl sub_081381D8 + bl ShouldDoScottCall cmp r0, #1 bne _0809C3A8 ldr r0, _0809C3A4 @@ -321229,7 +321229,7 @@ _0809C394: .align 2, 0 _0809C3A4: .4byte gUnknown_81F1A71 _0809C3A8: - bl sub_08138220 + bl ShouldDoRoxanneCall cmp r0, #1 bne _0809C3BC ldr r0, _0809C3B8 @@ -321238,7 +321238,7 @@ _0809C3A8: .align 2, 0 _0809C3B8: .4byte gUnknown_8202410 _0809C3BC: - bl sub_08138268 + bl c2_mystery_gift cmp r0, #1 bne _0809C3D0 ldr r0, _0809C3CC @@ -321247,13 +321247,13 @@ _0809C3BC: .align 2, 0 _0809C3CC: .4byte gUnknown_820DA9F _0809C3D0: - bl sub_080FC9BC + bl SafariZoneTakeStep lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0809C400 movs r0, #1 - bl sub_08138030 + bl CountSSTidalStep cmp r0, #1 bne _0809C3F4 ldr r0, _0809C3F0 @@ -321262,7 +321262,7 @@ _0809C3D0: .align 2, 0 _0809C3F0: .4byte gUnknown_821DEC7 _0809C3F4: - bl sub_08195C34 + bl TryStartMatchCall cmp r0, #0 bne _0809C400 _0809C3FC: @@ -321274,10 +321274,10 @@ _0809C402: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809C2CC + thumb_func_end TryStartStepCountScript - thumb_func_start sub_0809C408 -sub_0809C408: @ 0x0809C408 + thumb_func_start Unref_ClearHappinessStepCounter +Unref_ClearHappinessStepCounter: @ 0x0809C408 push {lr} ldr r0, _0809C418 movs r1, #0 @@ -321286,13 +321286,13 @@ sub_0809C408: @ 0x0809C408 bx r0 .align 2, 0 _0809C418: .4byte 0x0000402A - thumb_func_end sub_0809C408 + thumb_func_end Unref_ClearHappinessStepCounter - thumb_func_start sub_0809C41C -sub_0809C41C: @ 0x0809C41C + thumb_func_start UpdateHappinessStepCounter +UpdateHappinessStepCounter: @ 0x0809C41C push {r4, r5, lr} ldr r0, _0809C450 - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -321307,7 +321307,7 @@ sub_0809C41C: @ 0x0809C41C _0809C43A: adds r0, r5, #0 movs r1, #5 - bl sub_0806D3CC + bl AdjustFriendship adds r5, #0x64 subs r4, #1 cmp r4, #0 @@ -321319,10 +321319,10 @@ _0809C44A: .align 2, 0 _0809C450: .4byte 0x0000402A _0809C454: .4byte gUnknown_2024190 - thumb_func_end sub_0809C41C + thumb_func_end UpdateHappinessStepCounter - thumb_func_start sub_0809C458 -sub_0809C458: @ 0x0809C458 + thumb_func_start ClearPoisonStepCounter +ClearPoisonStepCounter: @ 0x0809C458 push {lr} ldr r0, _0809C468 movs r1, #0 @@ -321331,17 +321331,17 @@ sub_0809C458: @ 0x0809C458 bx r0 .align 2, 0 _0809C468: .4byte 0x0000402B - thumb_func_end sub_0809C458 + thumb_func_end ClearPoisonStepCounter - thumb_func_start sub_0809C46C -sub_0809C46C: @ 0x0809C46C + thumb_func_start UpdatePoisonStepCounter +UpdatePoisonStepCounter: @ 0x0809C46C push {lr} ldr r0, _0809C4A4 ldrb r0, [r0, #0x17] cmp r0, #9 beq _0809C4AC ldr r0, _0809C4A8 - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -321351,7 +321351,7 @@ sub_0809C46C: @ 0x0809C46C strh r1, [r0] cmp r1, #0 bne _0809C4AC - bl sub_080F9FD4 + bl DoPoisonFieldEffect cmp r0, #1 beq _0809C4AC cmp r0, #1 @@ -321369,7 +321369,7 @@ _0809C4AE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C46C + thumb_func_end UpdatePoisonStepCounter thumb_func_start sub_0809C4B4 sub_0809C4B4: @ 0x0809C4B4 @@ -321381,8 +321381,8 @@ sub_0809C4B4: @ 0x0809C4B4 _0809C4BC: .4byte gUnknown_2037274 thumb_func_end sub_0809C4B4 - thumb_func_start sub_0809C4C0 -sub_0809C4C0: @ 0x0809C4C0 + thumb_func_start CheckStandardWildEncounter +CheckStandardWildEncounter: @ 0x0809C4C0 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -321404,7 +321404,7 @@ _0809C4E4: ldr r5, _0809C4FC ldrh r1, [r5] adds r0, r4, #0 - bl sub_080B49E0 + bl StandardWildEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -321424,10 +321424,10 @@ _0809C508: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C4C0 + thumb_func_end CheckStandardWildEncounter - thumb_func_start sub_0809C510 -sub_0809C510: @ 0x0809C510 + thumb_func_start TryArrowWarp +TryArrowWarp: @ 0x0809C510 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -321457,12 +321457,12 @@ sub_0809C510: @ 0x0809C510 rsbs r0, r0, #0 cmp r4, r0 beq _0809C568 - bl sub_08084BE0 + bl StoreInitialPlayerAvatarState mov r0, r8 adds r1, r4, #0 adds r2, r7, #0 - bl sub_0809C788 - bl sub_080AF030 + bl SetupWarp + bl DoWarp movs r0, #1 b _0809C56A .align 2, 0 @@ -321475,10 +321475,10 @@ _0809C56A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0809C510 + thumb_func_end TryArrowWarp - thumb_func_start sub_0809C574 -sub_0809C574: @ 0x0809C574 + thumb_func_start TryStartWarpEventScript +TryStartWarpEventScript: @ 0x0809C574 push {r4, r5, r6, r7, lr} adds r6, r0, #0 lsls r1, r1, #0x10 @@ -321494,16 +321494,16 @@ sub_0809C574: @ 0x0809C574 cmp r4, r0 beq _0809C662 adds r0, r5, #0 - bl sub_0809C66C + bl IsWarpMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C662 - bl sub_08084BE0 + bl StoreInitialPlayerAvatarState adds r0, r7, #0 adds r1, r4, #0 adds r2, r6, #0 - bl sub_0809C788 + bl SetupWarp lsls r0, r5, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 @@ -321582,7 +321582,7 @@ _0809C644: movs r0, #1 b _0809C664 _0809C65A: - bl sub_080AF030 + bl DoWarp movs r0, #1 b _0809C664 _0809C662: @@ -321592,10 +321592,10 @@ _0809C664: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C574 + thumb_func_end TryStartWarpEventScript - thumb_func_start sub_0809C66C -sub_0809C66C: @ 0x0809C66C + thumb_func_start IsWarpMetatileBehavior +IsWarpMetatileBehavior: @ 0x0809C66C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -321668,7 +321668,7 @@ _0809C704: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C66C + thumb_func_end IsWarpMetatileBehavior thumb_func_start sub_0809C70C sub_0809C70C: @ 0x0809C70C @@ -321743,13 +321743,13 @@ GetWarpEventAtMapPosition: @ 0x0809C764 .align 2, 0 thumb_func_end GetWarpEventAtMapPosition - thumb_func_start sub_0809C788 -sub_0809C788: @ 0x0809C788 + thumb_func_start SetupWarp +SetupWarp: @ 0x0809C788 push {r4, r5, r6, r7, lr} adds r7, r2, #0 lsls r1, r1, #0x18 lsrs r4, r1, #0x18 - bl sub_081D5A38 + bl GetCurrentTrainerHillMapId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r6, r5, #0 @@ -321795,7 +321795,7 @@ _0809C7E6: cmp r0, #0x7f bne _0809C7F8 ldrb r0, [r5, #5] - bl sub_0808461C + bl SetWarpDestinationToDynamicWarp b _0809C846 .align 2, 0 _0809C7F4: .4byte gUnknown_2036FB8 @@ -321841,10 +321841,10 @@ _0809C846: bx r0 .align 2, 0 _0809C84C: .4byte gUnknown_3005AEC - thumb_func_end sub_0809C788 + thumb_func_end SetupWarp - thumb_func_start sub_0809C850 -sub_0809C850: @ 0x0809C850 + thumb_func_start TryDoorWarp +TryDoorWarp: @ 0x0809C850 push {r4, r5, r6, r7, lr} adds r5, r0, #0 lsls r1, r1, #0x10 @@ -321865,7 +321865,7 @@ sub_0809C850: @ 0x0809C850 ldr r0, _0809C884 ldr r1, [r0, #4] adds r0, r5, #0 - bl sub_080EA308 + bl FldEffPoison_Start movs r0, #1 b _0809C8D6 .align 2, 0 @@ -321888,17 +321888,17 @@ _0809C888: cmp r4, r0 beq _0809C8D4 adds r0, r7, #0 - bl sub_0809C66C + bl IsWarpMetatileBehavior lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _0809C8D4 - bl sub_08084BE0 + bl StoreInitialPlayerAvatarState adds r0, r6, #0 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0809C788 - bl sub_080AF0CC + bl SetupWarp + bl DoDoorWarp movs r0, #1 b _0809C8D6 .align 2, 0 @@ -321909,7 +321909,7 @@ _0809C8D6: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0809C850 + thumb_func_end TryDoorWarp thumb_func_start GetWarpEventAtPosition GetWarpEventAtPosition: @ 0x0809C8DC @@ -321956,8 +321956,8 @@ _0809C91E: bx r1 thumb_func_end GetWarpEventAtPosition - thumb_func_start sub_0809C924 -sub_0809C924: @ 0x0809C924 + thumb_func_start TryRunCoordEventScript +TryRunCoordEventScript: @ 0x0809C924 push {r4, lr} adds r4, r0, #0 cmp r4, #0 @@ -321966,7 +321966,7 @@ sub_0809C924: @ 0x0809C924 cmp r1, #0 bne _0809C93A ldrb r0, [r4, #6] - bl sub_0809D130 + bl DoCoordEventWeather b _0809C95A _0809C93A: ldrh r0, [r4, #6] @@ -321991,7 +321991,7 @@ _0809C95C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809C924 + thumb_func_end TryRunCoordEventScript thumb_func_start GetCoordEventScriptAtPosition GetCoordEventScriptAtPosition: @ 0x0809C964 @@ -322031,7 +322031,7 @@ _0809C990: bne _0809C9B0 _0809C9A6: adds r0, r5, #0 - bl sub_0809C924 + bl TryRunCoordEventScript cmp r0, #0 bne _0809C9BC _0809C9B0: @@ -322124,8 +322124,8 @@ _0809CA3C: .align 2, 0 thumb_func_end GetBackgroundEventAtPosition - thumb_func_start sub_0809CA44 -sub_0809CA44: @ 0x0809CA44 + thumb_func_start dive_warp +dive_warp: @ 0x0809CA44 push {r4, r5, lr} adds r4, r0, #0 lsls r1, r1, #0x10 @@ -322173,8 +322173,8 @@ _0809CAA0: lsls r0, r0, #0x18 cmp r0, #0 beq _0809CAB8 - bl sub_08084BE0 - bl sub_080AF068 + bl StoreInitialPlayerAvatarState + bl DoDiveWarp movs r0, #0xe9 bl sub_080A306C movs r0, #1 @@ -322185,10 +322185,10 @@ _0809CABA: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809CA44 + thumb_func_end dive_warp - thumb_func_start sub_0809CAC0 -sub_0809CAC0: @ 0x0809CAC0 + thumb_func_start TrySetDiveWarp +TrySetDiveWarp: @ 0x0809CAC0 push {r4, r5, lr} sub sp, #4 mov r4, sp @@ -322262,10 +322262,10 @@ _0809CB4E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809CAC0 + thumb_func_end TrySetDiveWarp - thumb_func_start sub_0809CB58 -sub_0809CB58: @ 0x0809CB58 + thumb_func_start GetEventObjectScriptPointerPlayerFacing +GetEventObjectScriptPointerPlayerFacing: @ 0x0809CB58 push {r4, r5, lr} sub sp, #8 bl GetPlayerMovementDirection @@ -322274,7 +322274,7 @@ sub_0809CB58: @ 0x0809CB58 lsrs r4, r4, #0x18 mov r5, sp mov r0, sp - bl sub_0809BA6C + bl GetInFrontOfPlayerPosition mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -322286,22 +322286,22 @@ sub_0809CB58: @ 0x0809CB58 lsrs r1, r1, #0x18 mov r0, sp adds r2, r4, #0 - bl sub_0809BC5C + bl GetInteractedEventObjectScript add sp, #8 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809CB58 + thumb_func_end GetEventObjectScriptPointerPlayerFacing - thumb_func_start sub_0809CB94 -sub_0809CB94: @ 0x0809CB94 + thumb_func_start SetCableClubWarp +SetCableClubWarp: @ 0x0809CB94 push {r4, lr} sub sp, #8 bl GetPlayerMovementDirection mov r4, sp mov r0, sp - bl sub_0809BA54 + bl GetPlayerPosition mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -322317,7 +322317,7 @@ sub_0809CB94: @ 0x0809CB94 asrs r1, r1, #0x18 adds r0, r4, #0 mov r2, sp - bl sub_0809C788 + bl SetupWarp movs r0, #0 add sp, #8 pop {r4} @@ -322325,10 +322325,10 @@ sub_0809CB94: @ 0x0809CB94 bx r1 .align 2, 0 _0809CBD4: .4byte gUnknown_2036FB8 - thumb_func_end sub_0809CB94 + thumb_func_end SetCableClubWarp - thumb_func_start sub_0809CBD8 -sub_0809CBD8: @ 0x0809CBD8 + thumb_func_start InitEventData +InitEventData: @ 0x0809CBD8 push {r4, lr} ldr r4, _0809CC0C ldr r0, [r4] @@ -322357,10 +322357,10 @@ _0809CC0C: .4byte gUnknown_3005AEC _0809CC10: .4byte 0x00001270 _0809CC14: .4byte 0x0000139C _0809CC18: .4byte gUnknown_203729C - thumb_func_end sub_0809CBD8 + thumb_func_end InitEventData - thumb_func_start sub_0809CC1C -sub_0809CC1C: @ 0x0809CC1C + thumb_func_start ClearTempFieldEventData +ClearTempFieldEventData: @ 0x0809CC1C push {lr} ldr r0, _0809CC5C ldr r0, [r0] @@ -322394,10 +322394,10 @@ _0809CC68: .4byte 0x000008AD _0809CC6C: .4byte 0x000008AE _0809CC70: .4byte 0x00000889 _0809CC74: .4byte 0x000008C1 - thumb_func_end sub_0809CC1C + thumb_func_end ClearTempFieldEventData - thumb_func_start sub_0809CC78 -sub_0809CC78: @ 0x0809CC78 + thumb_func_start ClearDailyFlags +ClearDailyFlags: @ 0x0809CC78 push {lr} ldr r0, _0809CC90 ldr r0, [r0] @@ -322411,13 +322411,13 @@ sub_0809CC78: @ 0x0809CC78 .align 2, 0 _0809CC90: .4byte gUnknown_3005AEC _0809CC94: .4byte 0x00001394 - thumb_func_end sub_0809CC78 + thumb_func_end ClearDailyFlags thumb_func_start DisableNationalPokedex DisableNationalPokedex: @ 0x0809CC98 push {lr} ldr r0, _0809CCB4 - bl sub_0809CF20 + bl GetVarPointer ldr r1, _0809CCB8 ldr r2, [r1] movs r1, #0 @@ -322433,11 +322433,11 @@ _0809CCB8: .4byte gUnknown_3005AF0 _0809CCBC: .4byte 0x00000896 thumb_func_end DisableNationalPokedex - thumb_func_start sub_0809CCC0 -sub_0809CCC0: @ 0x0809CCC0 + thumb_func_start EnableNationalPokedex +EnableNationalPokedex: @ 0x0809CCC0 push {r4, r5, lr} ldr r0, _0809CCF4 - bl sub_0809CF20 + bl GetVarPointer ldr r4, _0809CCF8 ldr r2, [r4] movs r5, #0 @@ -322453,7 +322453,7 @@ sub_0809CCC0: @ 0x0809CCC0 strb r0, [r1, #0x19] ldr r0, [r4] strb r5, [r0, #0x18] - bl sub_080BAA94 + bl ResetPokedexScrollPositions pop {r4, r5} pop {r0} bx r0 @@ -322462,10 +322462,10 @@ _0809CCF4: .4byte 0x00004046 _0809CCF8: .4byte gUnknown_3005AF0 _0809CCFC: .4byte 0x00000302 _0809CD00: .4byte 0x00000896 - thumb_func_end sub_0809CCC0 + thumb_func_end EnableNationalPokedex - thumb_func_start sub_0809CD04 -sub_0809CD04: @ 0x0809CD04 + thumb_func_start IsNationalPokedexEnabled +IsNationalPokedexEnabled: @ 0x0809CD04 push {lr} ldr r0, _0809CD30 ldr r0, [r0] @@ -322496,10 +322496,10 @@ _0809CD42: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809CD04 + thumb_func_end IsNationalPokedexEnabled - thumb_func_start sub_0809CD48 -sub_0809CD48: @ 0x0809CD48 + thumb_func_start DisableMysteryEvent +DisableMysteryEvent: @ 0x0809CD48 push {lr} ldr r0, _0809CD54 bl FlagClear @@ -322507,10 +322507,10 @@ sub_0809CD48: @ 0x0809CD48 bx r0 .align 2, 0 _0809CD54: .4byte 0x000008AC - thumb_func_end sub_0809CD48 + thumb_func_end DisableMysteryEvent - thumb_func_start sub_0809CD58 -sub_0809CD58: @ 0x0809CD58 + thumb_func_start EnableMysteryEvent +EnableMysteryEvent: @ 0x0809CD58 push {lr} ldr r0, _0809CD64 bl FlagSet @@ -322518,10 +322518,10 @@ sub_0809CD58: @ 0x0809CD58 bx r0 .align 2, 0 _0809CD64: .4byte 0x000008AC - thumb_func_end sub_0809CD58 + thumb_func_end EnableMysteryEvent - thumb_func_start sub_0809CD68 -sub_0809CD68: @ 0x0809CD68 + thumb_func_start IsMysteryEventEnabled +IsMysteryEventEnabled: @ 0x0809CD68 push {lr} ldr r0, _0809CD78 bl FlagGet @@ -322531,10 +322531,10 @@ sub_0809CD68: @ 0x0809CD68 bx r1 .align 2, 0 _0809CD78: .4byte 0x000008AC - thumb_func_end sub_0809CD68 + thumb_func_end IsMysteryEventEnabled - thumb_func_start sub_0809CD7C -sub_0809CD7C: @ 0x0809CD7C + thumb_func_start DisableMysteryGift +DisableMysteryGift: @ 0x0809CD7C push {lr} ldr r0, _0809CD88 bl FlagClear @@ -322542,10 +322542,10 @@ sub_0809CD7C: @ 0x0809CD7C bx r0 .align 2, 0 _0809CD88: .4byte 0x000008DB - thumb_func_end sub_0809CD7C + thumb_func_end DisableMysteryGift - thumb_func_start sub_0809CD8C -sub_0809CD8C: @ 0x0809CD8C + thumb_func_start EnableMysteryGift +EnableMysteryGift: @ 0x0809CD8C push {lr} ldr r0, _0809CD98 bl FlagSet @@ -322553,10 +322553,10 @@ sub_0809CD8C: @ 0x0809CD8C bx r0 .align 2, 0 _0809CD98: .4byte 0x000008DB - thumb_func_end sub_0809CD8C + thumb_func_end EnableMysteryGift - thumb_func_start sub_0809CD9C -sub_0809CD9C: @ 0x0809CD9C + thumb_func_start IsMysteryGiftEnabled +IsMysteryGiftEnabled: @ 0x0809CD9C push {lr} ldr r0, _0809CDAC bl FlagGet @@ -322566,7 +322566,7 @@ sub_0809CD9C: @ 0x0809CD9C bx r1 .align 2, 0 _0809CDAC: .4byte 0x000008DB - thumb_func_end sub_0809CD9C + thumb_func_end IsMysteryGiftEnabled thumb_func_start sub_0809CDB0 sub_0809CDB0: @ 0x0809CDB0 @@ -322723,8 +322723,8 @@ _0809CF1A: .align 2, 0 thumb_func_end CanResetRTC - thumb_func_start sub_0809CF20 -sub_0809CF20: @ 0x0809CF20 + thumb_func_start GetVarPointer +GetVarPointer: @ 0x0809CF20 push {lr} lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -322763,7 +322763,7 @@ _0809CF60: .align 2, 0 _0809CF64: .4byte gUnknown_3005AEC _0809CF68: .4byte 0xFFFF939C - thumb_func_end sub_0809CF20 + thumb_func_end GetVarPointer thumb_func_start VarGet VarGet: @ 0x0809CF6C @@ -322771,7 +322771,7 @@ VarGet: @ 0x0809CF6C lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0809CF20 + bl GetVarPointer cmp r0, #0 beq _0809CF80 ldrh r0, [r0] @@ -322791,7 +322791,7 @@ VarSet: @ 0x0809CF88 lsrs r0, r0, #0x10 lsls r1, r1, #0x10 lsrs r4, r1, #0x10 - bl sub_0809CF20 + bl GetVarPointer cmp r0, #0 beq _0809CFA0 strh r4, [r0] @@ -322822,8 +322822,8 @@ VarGetEventObjectGraphicsId: @ 0x0809CFA8 _0809CFC0: .4byte 0x40100000 thumb_func_end VarGetEventObjectGraphicsId - thumb_func_start sub_0809CFC4 -sub_0809CFC4: @ 0x0809CFC4 + thumb_func_start GetFlagPointer +GetFlagPointer: @ 0x0809CFC4 push {lr} lsls r1, r0, #0x10 lsrs r2, r1, #0x10 @@ -322865,7 +322865,7 @@ _0809D006: _0809D00C: .4byte 0xFFFFC000 _0809D010: .4byte 0xFFFFC007 _0809D014: .4byte gUnknown_203729C - thumb_func_end sub_0809CFC4 + thumb_func_end GetFlagPointer thumb_func_start FlagSet FlagSet: @ 0x0809D018 @@ -322873,7 +322873,7 @@ FlagSet: @ 0x0809D018 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0809CFC4 + bl GetFlagPointer adds r2, r0, #0 cmp r2, #0 beq _0809D038 @@ -322897,7 +322897,7 @@ FlagClear: @ 0x0809D040 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0809CFC4 + bl GetFlagPointer adds r2, r0, #0 cmp r2, #0 beq _0809D060 @@ -322921,7 +322921,7 @@ FlagGet: @ 0x0809D068 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0809CFC4 + bl GetFlagPointer cmp r0, #0 beq _0809D08C ldrb r0, [r0] @@ -322951,14 +322951,14 @@ sub_0809D094: @ 0x0809D094 bx r0 thumb_func_end sub_0809D094 - thumb_func_start sub_0809D0A0 -sub_0809D0A0: @ 0x0809D0A0 + thumb_func_start CoordEventWeather_Sunny +CoordEventWeather_Sunny: @ 0x0809D0A0 push {lr} movs r0, #2 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D0A0 + thumb_func_end CoordEventWeather_Sunny thumb_func_start sub_0809D0AC sub_0809D0AC: @ 0x0809D0AC @@ -322978,89 +322978,89 @@ sub_0809D0B8: @ 0x0809D0B8 bx r0 thumb_func_end sub_0809D0B8 - thumb_func_start sub_0809D0C4 -sub_0809D0C4: @ 0x0809D0C4 + thumb_func_start CoordEventWeather_Thunderstorm +CoordEventWeather_Thunderstorm: @ 0x0809D0C4 push {lr} movs r0, #5 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D0C4 + thumb_func_end CoordEventWeather_Thunderstorm - thumb_func_start sub_0809D0D0 -sub_0809D0D0: @ 0x0809D0D0 + thumb_func_start CoordEventWeather_LightRain +CoordEventWeather_LightRain: @ 0x0809D0D0 push {lr} movs r0, #6 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D0D0 + thumb_func_end CoordEventWeather_LightRain - thumb_func_start sub_0809D0DC -sub_0809D0DC: @ 0x0809D0DC + thumb_func_start CoordEventWeather_Snow +CoordEventWeather_Snow: @ 0x0809D0DC push {lr} movs r0, #9 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D0DC + thumb_func_end CoordEventWeather_Snow - thumb_func_start sub_0809D0E8 -sub_0809D0E8: @ 0x0809D0E8 + thumb_func_start CoordEventWeather_Ash +CoordEventWeather_Ash: @ 0x0809D0E8 push {lr} movs r0, #7 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D0E8 + thumb_func_end CoordEventWeather_Ash - thumb_func_start sub_0809D0F4 -sub_0809D0F4: @ 0x0809D0F4 + thumb_func_start CoordEventWeather_Fog +CoordEventWeather_Fog: @ 0x0809D0F4 push {lr} movs r0, #8 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D0F4 + thumb_func_end CoordEventWeather_Fog - thumb_func_start sub_0809D100 -sub_0809D100: @ 0x0809D100 + thumb_func_start CoordEventWeather_DiagonalFog +CoordEventWeather_DiagonalFog: @ 0x0809D100 push {lr} movs r0, #0xb bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D100 + thumb_func_end CoordEventWeather_DiagonalFog - thumb_func_start sub_0809D10C -sub_0809D10C: @ 0x0809D10C + thumb_func_start CoordEventWeather_Drought +CoordEventWeather_Drought: @ 0x0809D10C push {lr} movs r0, #0xc bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D10C + thumb_func_end CoordEventWeather_Drought - thumb_func_start sub_0809D118 -sub_0809D118: @ 0x0809D118 + thumb_func_start CoordEventWeather_Route119Cycle +CoordEventWeather_Route119Cycle: @ 0x0809D118 push {lr} movs r0, #0x14 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D118 + thumb_func_end CoordEventWeather_Route119Cycle - thumb_func_start sub_0809D124 -sub_0809D124: @ 0x0809D124 + thumb_func_start CoordEventWeather_Route123Cycle +CoordEventWeather_Route123Cycle: @ 0x0809D124 push {lr} movs r0, #0x15 bl SetWeather pop {r0} bx r0 - thumb_func_end sub_0809D124 + thumb_func_end CoordEventWeather_Route123Cycle - thumb_func_start sub_0809D130 -sub_0809D130: @ 0x0809D130 + thumb_func_start DoCoordEventWeather +DoCoordEventWeather: @ 0x0809D130 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -323089,10 +323089,10 @@ _0809D15E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0809D130 + thumb_func_end DoCoordEventWeather - thumb_func_start sub_0809D164 -sub_0809D164: @ 0x0809D164 + thumb_func_start Task_RunPerStepCallback +Task_RunPerStepCallback: @ 0x0809D164 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -323113,10 +323113,10 @@ sub_0809D164: @ 0x0809D164 .align 2, 0 _0809D188: .4byte gUnknown_3005B60 _0809D18C: .4byte gUnknown_84E898C - thumb_func_end sub_0809D164 + thumb_func_end Task_RunPerStepCallback - thumb_func_start sub_0809D190 -sub_0809D190: @ 0x0809D190 + thumb_func_start RunTimeBasedEvents +RunTimeBasedEvents: @ 0x0809D190 push {r4, lr} adds r4, r0, #0 movs r1, #0 @@ -323134,7 +323134,7 @@ _0809D1A2: ands r0, r1 cmp r0, #0 beq _0809D1D4 - bl sub_0809E088 + bl DoTimeBasedEvents ldrh r0, [r4] adds r0, #1 b _0809D1D2 @@ -323158,10 +323158,10 @@ _0809D1D4: bx r0 .align 2, 0 _0809D1DC: .4byte gUnknown_3002360 - thumb_func_end sub_0809D190 + thumb_func_end RunTimeBasedEvents - thumb_func_start sub_0809D1E0 -sub_0809D1E0: @ 0x0809D1E0 + thumb_func_start Task_RunTimeBasedEvents +Task_RunTimeBasedEvents: @ 0x0809D1E0 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -323175,31 +323175,31 @@ sub_0809D1E0: @ 0x0809D1E0 cmp r0, #0 bne _0809D208 adds r0, r4, #0 - bl sub_0809D190 + bl RunTimeBasedEvents adds r0, r4, #2 adds r1, r4, #4 - bl sub_080853A4 + bl UpdateAmbientCry _0809D208: pop {r4} pop {r0} bx r0 .align 2, 0 _0809D210: .4byte gUnknown_3005B68 - thumb_func_end sub_0809D1E0 + thumb_func_end Task_RunTimeBasedEvents - thumb_func_start sub_0809D214 -sub_0809D214: @ 0x0809D214 + thumb_func_start SetUpFieldTasks +SetUpFieldTasks: @ 0x0809D214 push {r4, r5, lr} ldr r5, _0809D270 adds r0, r5, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 bne _0809D23E adds r0, r5, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0809D274 @@ -323211,41 +323211,41 @@ sub_0809D214: @ 0x0809D214 _0809D23E: ldr r4, _0809D278 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0809D254 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask _0809D254: ldr r4, _0809D27C adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0809D26A adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask _0809D26A: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0809D270: .4byte sub_0809D164 +_0809D270: .4byte Task_RunPerStepCallback _0809D274: .4byte gUnknown_3005B60 -_0809D278: .4byte sub_0809DF10 -_0809D27C: .4byte sub_0809D1E0 - thumb_func_end sub_0809D214 +_0809D278: .4byte Task_MuddySlope +_0809D27C: .4byte Task_RunTimeBasedEvents + thumb_func_end SetUpFieldTasks - thumb_func_start sub_0809D280 -sub_0809D280: @ 0x0809D280 + thumb_func_start ActivatePerStepCallback +ActivatePerStepCallback: @ 0x0809D280 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _0809D2B8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0xff @@ -323269,7 +323269,7 @@ _0809D2A4: strh r0, [r1] b _0809D2C2 .align 2, 0 -_0809D2B8: .4byte sub_0809D164 +_0809D2B8: .4byte Task_RunPerStepCallback _0809D2BC: .4byte gUnknown_3005B68 _0809D2C0: strh r4, [r1] @@ -323277,17 +323277,17 @@ _0809D2C2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0809D280 + thumb_func_end ActivatePerStepCallback - thumb_func_start sub_0809D2C8 -sub_0809D2C8: @ 0x0809D2C8 + thumb_func_start ResetFieldTasksArgs +ResetFieldTasksArgs: @ 0x0809D2C8 push {lr} ldr r0, _0809D2F8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r0, _0809D2FC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0xff @@ -323304,10 +323304,10 @@ _0809D2F2: pop {r0} bx r0 .align 2, 0 -_0809D2F8: .4byte sub_0809D164 -_0809D2FC: .4byte sub_0809D1E0 +_0809D2F8: .4byte Task_RunPerStepCallback +_0809D2FC: .4byte Task_RunTimeBasedEvents _0809D300: .4byte gUnknown_3005B68 - thumb_func_end sub_0809D2C8 + thumb_func_end ResetFieldTasksArgs thumb_func_start sub_0809D304 sub_0809D304: @ 0x0809D304 @@ -323315,8 +323315,8 @@ sub_0809D304: @ 0x0809D304 .align 2, 0 thumb_func_end sub_0809D304 - thumb_func_start sub_0809D308 -sub_0809D308: @ 0x0809D308 + thumb_func_start GetPacifidlogBridgeMetatileOffsets +GetPacifidlogBridgeMetatileOffsets: @ 0x0809D308 push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x18 @@ -323362,10 +323362,10 @@ _0809D358: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809D308 + thumb_func_end GetPacifidlogBridgeMetatileOffsets - thumb_func_start sub_0809D360 -sub_0809D360: @ 0x0809D360 + thumb_func_start SetPacifidlogBridgeMetatiles +SetPacifidlogBridgeMetatiles: @ 0x0809D360 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -323382,7 +323382,7 @@ sub_0809D360: @ 0x0809D360 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_0809D308 + bl GetPacifidlogBridgeMetatileOffsets adds r4, r0, #0 adds r5, r4, #0 cmp r4, #0 @@ -323430,7 +323430,7 @@ _0809D3DE: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0809D360 + thumb_func_end SetPacifidlogBridgeMetatiles thumb_func_start UpdateHalfSubmergedBridgeMetatiles UpdateHalfSubmergedBridgeMetatiles: @ 0x0809D3E8 @@ -323445,7 +323445,7 @@ UpdateHalfSubmergedBridgeMetatiles: @ 0x0809D3E8 asrs r5, r5, #0x10 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0809D360 + bl SetPacifidlogBridgeMetatiles pop {r4, r5} pop {r0} bx r0 @@ -323466,7 +323466,7 @@ UpdateFullySubmergedBridgeMetatiles: @ 0x0809D40C asrs r5, r5, #0x10 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0809D360 + bl SetPacifidlogBridgeMetatiles pop {r4, r5} pop {r0} bx r0 @@ -323487,7 +323487,7 @@ UpdateFloatingBridgeMetatiles: @ 0x0809D430 asrs r5, r5, #0x10 adds r1, r4, #0 adds r2, r5, #0 - bl sub_0809D360 + bl SetPacifidlogBridgeMetatiles pop {r4, r5} pop {r0} bx r0 @@ -323495,8 +323495,8 @@ UpdateFloatingBridgeMetatiles: @ 0x0809D430 _0809D450: .4byte gUnknown_84E89EC thumb_func_end UpdateFloatingBridgeMetatiles - thumb_func_start sub_0809D454 -sub_0809D454: @ 0x0809D454 + thumb_func_start StandingOnNewPacifidlogBridge +StandingOnNewPacifidlogBridge: @ 0x0809D454 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -323576,10 +323576,10 @@ _0809D4E0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809D454 + thumb_func_end StandingOnNewPacifidlogBridge - thumb_func_start sub_0809D4F0 -sub_0809D4F0: @ 0x0809D4F0 + thumb_func_start StandingOnSamePacifidlogBridge +StandingOnSamePacifidlogBridge: @ 0x0809D4F0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -323659,10 +323659,10 @@ _0809D57C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809D4F0 + thumb_func_end StandingOnSamePacifidlogBridge - thumb_func_start sub_0809D58C -sub_0809D58C: @ 0x0809D58C + thumb_func_start PacifidlogBridgePerStepCallback +PacifidlogBridgePerStepCallback: @ 0x0809D58C push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -323731,7 +323731,7 @@ _0809D600: ldrsh r2, [r4, r3] movs r5, #6 ldrsh r3, [r4, r5] - bl sub_0809D454 + bl StandingOnNewPacifidlogBridge cmp r0, #0 beq _0809D648 movs r7, #4 @@ -323772,7 +323772,7 @@ _0809D652: ldrsh r2, [r4, r3] movs r7, #6 ldrsh r3, [r4, r7] - bl sub_0809D4F0 + bl StandingOnSamePacifidlogBridge cmp r0, #0 beq _0809D686 mov r0, sp @@ -323846,10 +323846,10 @@ _0809D6F6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809D58C + thumb_func_end PacifidlogBridgePerStepCallback - thumb_func_start sub_0809D700 -sub_0809D700: @ 0x0809D700 + thumb_func_start SetLoweredForetreeBridgeMetatile +SetLoweredForetreeBridgeMetatile: @ 0x0809D700 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -323868,7 +323868,7 @@ sub_0809D700: @ 0x0809D700 asrs r5, r0, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 ldr r0, _0809D73C cmp r1, r0 @@ -323898,10 +323898,10 @@ _0809D75A: bx r0 .align 2, 0 _0809D760: .4byte 0x00000257 - thumb_func_end sub_0809D700 + thumb_func_end SetLoweredForetreeBridgeMetatile - thumb_func_start sub_0809D764 -sub_0809D764: @ 0x0809D764 + thumb_func_start SetNormalFortreeBridgeMetatile +SetNormalFortreeBridgeMetatile: @ 0x0809D764 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -323920,7 +323920,7 @@ sub_0809D764: @ 0x0809D764 asrs r5, r0, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 ldr r0, _0809D7A0 cmp r1, r0 @@ -323950,10 +323950,10 @@ _0809D7BE: bx r0 .align 2, 0 _0809D7C4: .4byte 0x00000256 - thumb_func_end sub_0809D764 + thumb_func_end SetNormalFortreeBridgeMetatile - thumb_func_start sub_0809D7C8 -sub_0809D7C8: @ 0x0809D7C8 + thumb_func_start FortreeBridgePerStepCallback +FortreeBridgePerStepCallback: @ 0x0809D7C8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -324017,7 +324017,7 @@ _0809D83A: mov r2, sb movs r3, #0 ldrsh r1, [r2, r3] - bl sub_0809D700 + bl SetLoweredForetreeBridgeMetatile mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -324099,7 +324099,7 @@ _0809D8E0: asrs r5, r5, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809D764 + bl SetNormalFortreeBridgeMetatile adds r0, r4, #0 adds r1, r5, #0 bl CurrentMapDrawMetatileAt @@ -324109,7 +324109,7 @@ _0809D8E0: mov r2, sb movs r3, #0 ldrsh r1, [r2, r3] - bl sub_0809D700 + bl SetLoweredForetreeBridgeMetatile mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -324184,13 +324184,13 @@ _0809D99E: asrs r4, r4, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0809D700 + bl SetLoweredForetreeBridgeMetatile adds r0, r5, #0 adds r1, r4, #0 bl CurrentMapDrawMetatileAt adds r0, r5, #0 adds r1, r4, #0 - bl sub_0809D764 + bl SetNormalFortreeBridgeMetatile _0809D9C2: movs r2, #0xc ldrsh r0, [r6, r2] @@ -324209,10 +324209,10 @@ _0809D9CE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809D7C8 + thumb_func_end FortreeBridgePerStepCallback - thumb_func_start sub_0809D9E0 -sub_0809D9E0: @ 0x0809D9E0 + thumb_func_start CoordInIcePuzzleRegion +CoordInIcePuzzleRegion: @ 0x0809D9E0 push {lr} lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -324247,7 +324247,7 @@ _0809DA1E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809D9E0 + thumb_func_end CoordInIcePuzzleRegion thumb_func_start MarkIcePuzzleCoordVisited MarkIcePuzzleCoordVisited: @ 0x0809DA24 @@ -324258,14 +324258,14 @@ MarkIcePuzzleCoordVisited: @ 0x0809DA24 asrs r4, r1, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0809D9E0 + bl CoordInIcePuzzleRegion cmp r0, #0 beq _0809DA52 ldr r1, _0809DA58 lsls r0, r4, #1 adds r0, r0, r1 ldrh r0, [r0] - bl sub_0809CF20 + bl GetVarPointer subs r2, r5, #3 movs r1, #1 lsls r1, r2 @@ -324280,8 +324280,8 @@ _0809DA52: _0809DA58: .4byte gUnknown_84E8A0C thumb_func_end MarkIcePuzzleCoordVisited - thumb_func_start sub_0809DA5C -sub_0809DA5C: @ 0x0809DA5C + thumb_func_start IsIcePuzzleCoordVisited +IsIcePuzzleCoordVisited: @ 0x0809DA5C push {r4, r5, lr} lsls r0, r0, #0x10 asrs r5, r0, #0x10 @@ -324289,7 +324289,7 @@ sub_0809DA5C: @ 0x0809DA5C asrs r4, r1, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0809D9E0 + bl CoordInIcePuzzleRegion cmp r0, #0 beq _0809DA8E ldr r1, _0809DA94 @@ -324316,10 +324316,10 @@ _0809DA9A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0809DA5C + thumb_func_end IsIcePuzzleCoordVisited - thumb_func_start sub_0809DAA0 -sub_0809DAA0: @ 0x0809DAA0 + thumb_func_start SetSootopolisGymCrackedIceMetatiles +SetSootopolisGymCrackedIceMetatiles: @ 0x0809DAA0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -324343,7 +324343,7 @@ _0809DAC4: lsls r1, r4, #0x10 asrs r1, r1, #0x10 asrs r0, r6, #0x10 - bl sub_0809DA5C + bl IsIcePuzzleCoordVisited cmp r0, #1 bne _0809DADC adds r1, r4, #7 @@ -324368,10 +324368,10 @@ _0809DAE8: .align 2, 0 _0809DAF4: .4byte gUnknown_2036FB8 _0809DAF8: .4byte 0x0000020E - thumb_func_end sub_0809DAA0 + thumb_func_end SetSootopolisGymCrackedIceMetatiles - thumb_func_start sub_0809DAFC -sub_0809DAFC: @ 0x0809DAFC + thumb_func_start SootopolisGymIcePerStepCallback +SootopolisGymIcePerStepCallback: @ 0x0809DAFC push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -324447,7 +324447,7 @@ _0809DB72: lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r0, _0809DBB4 - bl sub_0809CF20 + bl GetVarPointer adds r6, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -324570,10 +324570,10 @@ _0809DC7E: bx r0 .align 2, 0 _0809DC88: .4byte 0x00000206 - thumb_func_end sub_0809DAFC + thumb_func_end SootopolisGymIcePerStepCallback - thumb_func_start sub_0809DC8C -sub_0809DC8C: @ 0x0809DC8C + thumb_func_start AshGrassPerStepCallback +AshGrassPerStepCallback: @ 0x0809DC8C push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -324623,7 +324623,7 @@ _0809DCC6: ldrsh r0, [r0, r3] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _0809DD14 cmp r0, r1 bne _0809DD1C @@ -324634,7 +324634,7 @@ _0809DCC6: ldrsh r1, [r4, r2] ldr r2, _0809DD18 movs r3, #4 - bl sub_081552DC + bl StartAshFieldEffect b _0809DD2E .align 2, 0 _0809DD10: .4byte gUnknown_3005B68 @@ -324648,17 +324648,17 @@ _0809DD1C: ldrsh r1, [r4, r2] ldr r2, _0809DD5C movs r3, #4 - bl sub_081552DC + bl StartAshFieldEffect _0809DD2E: movs r0, #0x87 lsls r0, r0, #1 movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 cmp r0, #0 beq _0809DD52 ldr r0, _0809DD60 - bl sub_0809CF20 + bl GetVarPointer adds r2, r0, #0 ldrh r1, [r2] ldr r0, _0809DD64 @@ -324675,10 +324675,10 @@ _0809DD52: _0809DD5C: .4byte 0x00000206 _0809DD60: .4byte 0x00004048 _0809DD64: .4byte 0x0000270E - thumb_func_end sub_0809DC8C + thumb_func_end AshGrassPerStepCallback - thumb_func_start sub_0809DD68 -sub_0809DD68: @ 0x0809DD68 + thumb_func_start SetCrackedFloorHoleMetatile +SetCrackedFloorHoleMetatile: @ 0x0809DD68 push {r4, r5, lr} lsls r0, r0, #0x10 asrs r5, r0, #0x10 @@ -324686,7 +324686,7 @@ sub_0809DD68: @ 0x0809DD68 asrs r4, r1, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _0809DD9C ldr r2, _0809DDA0 cmp r0, r1 @@ -324705,7 +324705,7 @@ _0809DD84: .align 2, 0 _0809DD9C: .4byte 0x0000022F _0809DDA0: .4byte 0x00000237 - thumb_func_end sub_0809DD68 + thumb_func_end SetCrackedFloorHoleMetatile thumb_func_start sub_0809DDA4 sub_0809DDA4: @ 0x0809DDA4 @@ -324746,7 +324746,7 @@ sub_0809DDA4: @ 0x0809DDA4 ldrsh r0, [r5, r1] movs r2, #0xc ldrsh r1, [r5, r2] - bl sub_0809DD68 + bl SetCrackedFloorHoleMetatile _0809DDF6: ldrh r1, [r5, #0xe] movs r3, #0xe @@ -324762,7 +324762,7 @@ _0809DDF6: ldrsh r0, [r5, r1] movs r2, #0x12 ldrsh r1, [r5, r2] - bl sub_0809DD68 + bl SetCrackedFloorHoleMetatile _0809DE16: lsls r0, r6, #0x18 lsrs r6, r0, #0x18 @@ -324799,7 +324799,7 @@ _0809DE4A: lsls r0, r0, #0x18 cmp r0, #0 beq _0809DEAA - bl sub_0811A988 + bl GetPlayerSpeed lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #4 @@ -324843,8 +324843,8 @@ _0809DEAA: .align 2, 0 thumb_func_end sub_0809DDA4 - thumb_func_start sub_0809DEB4 -sub_0809DEB4: @ 0x0809DEB4 + thumb_func_start SetMuddySlopeMetatile +SetMuddySlopeMetatile: @ 0x0809DEB4 push {r4, r5, lr} adds r3, r0, #0 lsls r1, r1, #0x10 @@ -324891,10 +324891,10 @@ _0809DEE4: bx r0 .align 2, 0 _0809DF0C: .4byte gUnknown_84E8A40 - thumb_func_end sub_0809DEB4 + thumb_func_end SetMuddySlopeMetatile - thumb_func_start sub_0809DF10 -sub_0809DF10: @ 0x0809DF10 + thumb_func_start Task_MuddySlope +Task_MuddySlope: @ 0x0809DF10 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -325047,7 +325047,7 @@ _0809E016: movs r3, #4 ldrsh r2, [r4, r3] adds r0, r5, #0 - bl sub_0809DEB4 + bl SetMuddySlopeMetatile _0809E03A: adds r4, #6 adds r5, #6 @@ -325060,10 +325060,10 @@ _0809E03A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0809DF10 + thumb_func_end Task_MuddySlope - thumb_func_start sub_0809E050 -sub_0809E050: @ 0x0809E050 + thumb_func_start InitTimeBasedEvents +InitTimeBasedEvents: @ 0x0809E050 push {lr} ldr r0, _0809E078 bl FlagSet @@ -325086,10 +325086,10 @@ _0809E078: .4byte 0x00000895 _0809E07C: .4byte gUnknown_3005AF0 _0809E080: .4byte gUnknown_3005A50 _0809E084: .4byte 0x00004040 - thumb_func_end sub_0809E050 + thumb_func_end InitTimeBasedEvents - thumb_func_start sub_0809E088 -sub_0809E088: @ 0x0809E088 + thumb_func_start DoTimeBasedEvents +DoTimeBasedEvents: @ 0x0809E088 push {r4, lr} ldr r0, _0809E0B8 bl FlagGet @@ -325103,9 +325103,9 @@ sub_0809E088: @ 0x0809E088 bl RtcCalcLocalTime ldr r4, _0809E0BC adds r0, r4, #0 - bl sub_0809E0C0 + bl UpdatePerDay adds r0, r4, #0 - bl sub_0809E130 + bl UpdatePerMinute _0809E0B2: pop {r4} pop {r0} @@ -325113,14 +325113,14 @@ _0809E0B2: .align 2, 0 _0809E0B8: .4byte 0x00000895 _0809E0BC: .4byte gUnknown_3005A50 - thumb_func_end sub_0809E088 + thumb_func_end DoTimeBasedEvents - thumb_func_start sub_0809E0C0 -sub_0809E0C0: @ 0x0809E0C0 + thumb_func_start UpdatePerDay +UpdatePerDay: @ 0x0809E0C0 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r0, _0809E12C - bl sub_0809CF20 + bl GetVarPointer adds r6, r0, #0 ldrh r0, [r6] movs r2, #0 @@ -325133,27 +325133,27 @@ sub_0809E0C0: @ 0x0809E0C0 subs r4, r4, r0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_0809CC78 + bl ClearDailyFlags adds r0, r4, #0 - bl sub_0812258C + bl UpdateDewfordTrendPerDay adds r0, r4, #0 - bl sub_080EE3A8 + bl UpdateTVShowsPerDay adds r0, r4, #0 bl UpdateWeatherPerDay adds r0, r4, #0 - bl sub_0806D8D8 + bl UpdatePartyPokerusTime adds r0, r4, #0 bl UpdateMirageRnd adds r0, r4, #0 - bl sub_08137A90 + bl UpdateBirchState adds r0, r4, #0 bl sub_08139F30 adds r0, r4, #0 - bl sub_0813A7FC + bl UpdateFrontierGambler adds r0, r4, #0 bl sub_081394CC adds r0, r4, #0 - bl sub_08177410 + bl SetRandomLotteryNumber ldrh r0, [r5] strh r0, [r6] _0809E126: @@ -325162,10 +325162,10 @@ _0809E126: bx r0 .align 2, 0 _0809E12C: .4byte 0x00004040 - thumb_func_end sub_0809E0C0 + thumb_func_end UpdatePerDay - thumb_func_start sub_0809E130 -sub_0809E130: @ 0x0809E130 + thumb_func_start UpdatePerMinute +UpdatePerMinute: @ 0x0809E130 push {r4, r5, r6, lr} sub sp, #8 adds r5, r0, #0 @@ -325197,7 +325197,7 @@ sub_0809E130: @ 0x0809E130 beq _0809E180 cmp r0, #0 blt _0809E180 - bl sub_080E0DBC + bl BerryTreeTimeUpdate ldr r2, [r6] adds r2, #0xa0 ldr r0, [r5] @@ -325211,38 +325211,38 @@ _0809E180: bx r0 .align 2, 0 _0809E188: .4byte gUnknown_3005AF0 - thumb_func_end sub_0809E130 + thumb_func_end UpdatePerMinute - thumb_func_start sub_0809E18C -sub_0809E18C: @ 0x0809E18C + thumb_func_start ReturnFromStartWallClock +ReturnFromStartWallClock: @ 0x0809E18C push {lr} - bl sub_0809E050 + bl InitTimeBasedEvents ldr r0, _0809E19C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_0809E19C: .4byte sub_08085B34 - thumb_func_end sub_0809E18C +_0809E19C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end ReturnFromStartWallClock thumb_func_start sub_0809E1A0 sub_0809E1A0: @ 0x0809E1A0 push {lr} ldr r0, _0809E1B4 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0809E1B8 ldr r0, _0809E1BC str r0, [r1, #8] pop {r0} bx r0 .align 2, 0 -_0809E1B4: .4byte sub_08134A3C +_0809E1B4: .4byte CB2_StartWallClock _0809E1B8: .4byte gUnknown_3002360 -_0809E1BC: .4byte sub_0809E18C +_0809E1BC: .4byte ReturnFromStartWallClock thumb_func_end sub_0809E1A0 - thumb_func_start sub_0809E1C0 -sub_0809E1C0: @ 0x0809E1C0 + thumb_func_start SpriteCB_ResetRtcCursor0 +SpriteCB_ResetRtcCursor0: @ 0x0809E1C0 push {lr} adds r3, r0, #0 ldr r2, _0809E1F0 @@ -325386,10 +325386,10 @@ _0809E2D6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809E1C0 + thumb_func_end SpriteCB_ResetRtcCursor0 - thumb_func_start sub_0809E2DC -sub_0809E2DC: @ 0x0809E2DC + thumb_func_start SpriteCB_ResetRtcCursor1 +SpriteCB_ResetRtcCursor1: @ 0x0809E2DC push {lr} adds r3, r0, #0 ldr r2, _0809E30C @@ -325519,10 +325519,10 @@ _0809E3D6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809E2DC + thumb_func_end SpriteCB_ResetRtcCursor1 - thumb_func_start sub_0809E3DC -sub_0809E3DC: @ 0x0809E3DC + thumb_func_start CreateCursor +CreateCursor: @ 0x0809E3DC push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -325536,7 +325536,7 @@ sub_0809E3DC: @ 0x0809E3DC movs r1, #0x40 movs r2, #0x44 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r6, _0809E454 @@ -325556,7 +325556,7 @@ sub_0809E3DC: @ 0x0809E3DC movs r1, #0x40 movs r2, #0x44 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -325579,10 +325579,10 @@ sub_0809E3DC: @ 0x0809E3DC _0809E44C: .4byte gUnknown_84E8B14 _0809E450: .4byte gUnknown_84E8B40 _0809E454: .4byte gUnknown_20205AC -_0809E458: .4byte sub_0809E1C0 +_0809E458: .4byte SpriteCB_ResetRtcCursor0 _0809E45C: .4byte 0x0000FFFF -_0809E460: .4byte sub_0809E2DC - thumb_func_end sub_0809E3DC +_0809E460: .4byte SpriteCB_ResetRtcCursor1 + thumb_func_end CreateCursor thumb_func_start sub_0809E464 sub_0809E464: @ 0x0809E464 @@ -325596,8 +325596,8 @@ sub_0809E464: @ 0x0809E464 _0809E474: .4byte gUnknown_84E8B14 thumb_func_end sub_0809E464 - thumb_func_start sub_0809E478 -sub_0809E478: @ 0x0809E478 + thumb_func_start HideChooseTimeWindow +HideChooseTimeWindow: @ 0x0809E478 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -325606,17 +325606,17 @@ sub_0809E478: @ 0x0809E478 movs r1, #0 bl sub_08198134 adds r0, r4, #0 - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809E478 + thumb_func_end HideChooseTimeWindow - thumb_func_start sub_0809E49C -sub_0809E49C: @ 0x0809E49C + thumb_func_start PrintTime +PrintTime: @ 0x0809E49C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -325722,10 +325722,10 @@ _0809E57C: .4byte gUnknown_2021C7C _0809E580: .4byte gUnknown_2021C40 _0809E584: .4byte gUnknown_84E8A6C _0809E588: .4byte gUnknown_84E8A6F - thumb_func_end sub_0809E49C + thumb_func_end PrintTime - thumb_func_start sub_0809E58C -sub_0809E58C: @ 0x0809E58C + thumb_func_start ShowChooseTimeWindow +ShowChooseTimeWindow: @ 0x0809E58C push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -325756,7 +325756,7 @@ sub_0809E58C: @ 0x0809E58C adds r0, r4, #0 movs r1, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette str r5, [sp] str r6, [sp, #4] mov r0, r8 @@ -325765,7 +325765,7 @@ sub_0809E58C: @ 0x0809E58C movs r1, #0 movs r2, #2 mov r3, sb - bl sub_0809E49C + bl PrintTime ldr r2, _0809E60C movs r0, #2 str r0, [sp] @@ -325777,7 +325777,7 @@ sub_0809E58C: @ 0x0809E58C movs r3, #0x80 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r3, r4} mov r8, r3 @@ -325787,7 +325787,7 @@ sub_0809E58C: @ 0x0809E58C bx r0 .align 2, 0 _0809E60C: .4byte gUnknown_84E8A71 - thumb_func_end sub_0809E58C + thumb_func_end ShowChooseTimeWindow thumb_func_start MoveTimeUpDown MoveTimeUpDown: @ 0x0809E610 @@ -325880,7 +325880,7 @@ Task_ResetRtc_2: @ 0x0809E690 ldr r5, _0809E6B8 adds r0, r4, r5 ldrb r0, [r0, #0x10] - bl sub_0809E478 + bl HideChooseTimeWindow bl sub_0809E464 subs r5, #8 adds r4, r4, r5 @@ -325894,8 +325894,8 @@ _0809E6B8: .4byte gUnknown_3005B68 _0809E6BC: .4byte Task_ResetRtc_3 thumb_func_end Task_ResetRtc_2 - thumb_func_start sub_0809E6C0 -sub_0809E6C0: @ 0x0809E6C0 + thumb_func_start Task_ResetRtc_1 +Task_ResetRtc_1: @ 0x0809E6C0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -326019,10 +326019,10 @@ _0809E78C: str r1, [sp, #8] movs r1, #0 movs r2, #2 - bl sub_0809E49C + bl PrintTime ldrb r0, [r5, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _0809E7CC: add sp, #0xc pop {r3} @@ -326030,10 +326030,10 @@ _0809E7CC: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0809E6C0 + thumb_func_end Task_ResetRtc_1 - thumb_func_start sub_0809E7D8 -sub_0809E7D8: @ 0x0809E7D8 + thumb_func_start Task_ResetRtc_0 +Task_ResetRtc_0: @ 0x0809E7D8 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -326064,7 +326064,7 @@ sub_0809E7D8: @ 0x0809E7D8 ldrsb r0, [r1, r0] strh r0, [r5, #0xc] ldr r0, _0809E858 - bl sub_08003250 + bl AddWindow strh r0, [r5, #0x10] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -326073,9 +326073,9 @@ sub_0809E7D8: @ 0x0809E7D8 ldrb r3, [r5, #0xa] ldrb r4, [r5, #0xc] str r4, [sp] - bl sub_0809E58C + bl ShowChooseTimeWindow mov r0, r8 - bl sub_0809E3DC + bl CreateCursor movs r0, #2 strh r0, [r5, #4] movs r0, #8 @@ -326095,18 +326095,18 @@ sub_0809E7D8: @ 0x0809E7D8 _0809E850: .4byte gUnknown_3005B68 _0809E854: .4byte gUnknown_3005A50 _0809E858: .4byte gUnknown_84E8A64 -_0809E85C: .4byte sub_0809E6C0 - thumb_func_end sub_0809E7D8 +_0809E85C: .4byte Task_ResetRtc_1 + thumb_func_end Task_ResetRtc_0 - thumb_func_start sub_0809E860 -sub_0809E860: @ 0x0809E860 + thumb_func_start CB2_InitResetRtcScreen +CB2_InitResetRtcScreen: @ 0x0809E860 push {r4, r5, r6, r7, lr} sub sp, #4 movs r0, #0 movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r2, #0xa0 lsls r2, r2, #0x13 mov r1, sp @@ -326154,20 +326154,20 @@ _0809E8A2: movs r0, #0 movs r1, #0x80 bl ResetOamRange - bl sub_08006EA0 - bl sub_080B9710 - bl sub_080B9750 + bl LoadOam + bl ScanlineEffect_Stop + bl ScanlineEffect_Clear bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl ResetPaletteFade bl sub_0809E920 ldr r0, _0809E914 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0809E918 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _0809E91C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -326177,9 +326177,9 @@ _0809E908: .4byte 0x040000D4 _0809E90C: .4byte 0x81000200 _0809E910: .4byte 0x81000800 _0809E914: .4byte sub_0809E984 -_0809E918: .4byte sub_0809E968 -_0809E91C: .4byte sub_0809EAD8 - thumb_func_end sub_0809E860 +_0809E918: .4byte CB2_ResetRtcScreen +_0809E91C: .4byte Task_ResetRtcScreen + thumb_func_end CB2_InitResetRtcScreen thumb_func_start sub_0809E920 sub_0809E920: @ 0x0809E920 @@ -326192,15 +326192,15 @@ sub_0809E920: @ 0x0809E920 movs r2, #1 bl InitBgsFromTemplates movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r0, _0809E964 - bl sub_08003090 + bl InitWindows bl sub_08004480 bl sub_08196F98 pop {r0} @@ -326210,32 +326210,32 @@ _0809E960: .4byte gUnknown_84E8A48 _0809E964: .4byte gUnknown_84E8A4C thumb_func_end sub_0809E920 - thumb_func_start sub_0809E968 -sub_0809E968: @ 0x0809E968 + thumb_func_start CB2_ResetRtcScreen +CB2_ResetRtcScreen: @ 0x0809E968 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809E968 + thumb_func_end CB2_ResetRtcScreen thumb_func_start sub_0809E984 sub_0809E984: @ 0x0809E984 push {lr} - bl sub_08007144 - bl sub_08006EA0 + bl ProcessSpriteCopyRequests + bl LoadOam bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0809E984 - thumb_func_start sub_0809E998 -sub_0809E998: @ 0x0809E998 + thumb_func_start ShowMessage +ShowMessage: @ 0x0809E998 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -326244,7 +326244,7 @@ sub_0809E998: @ 0x0809E998 movs r0, #1 movs r1, #0 movs r3, #0xf - bl sub_08197924 + bl DrawDialogFrameWithCustomTileAndPalette movs r0, #2 str r0, [sp] movs r0, #0 @@ -326256,15 +326256,15 @@ sub_0809E998: @ 0x0809E998 movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r4} pop {r0} bx r0 - thumb_func_end sub_0809E998 + thumb_func_end ShowMessage - thumb_func_start sub_0809E9D0 -sub_0809E9D0: @ 0x0809E9D0 + thumb_func_start Task_ShowResetRtcPrompt +Task_ShowResetRtcPrompt: @ 0x0809E9D0 push {r4, r5, r6, r7, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -326289,7 +326289,7 @@ _0809E9F4: movs r0, #0 movs r1, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _0809EAA4 movs r0, #2 str r0, [sp] @@ -326311,7 +326311,7 @@ _0809E9F4: movs r0, #0 movs r1, #0 movs r2, #0x12 - bl sub_0809E49C + bl PrintTime ldr r2, _0809EAAC movs r0, #0x22 str r0, [sp] @@ -326340,14 +326340,14 @@ _0809E9F4: movs r0, #0 movs r1, #0 movs r2, #0x32 - bl sub_0809E49C + bl PrintTime ldr r0, _0809EAB4 - bl sub_0809E998 + bl ShowMessage movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrh r0, [r6] adds r0, #1 strh r0, [r6] @@ -326359,8 +326359,8 @@ _0809EA8A: cmp r0, #0 beq _0809EABC adds r0, r7, #0 - bl sub_080A8964 - bl sub_080008F4 + bl DestroyTask + bl DoSoftReset b _0809EAD0 .align 2, 0 _0809EAA4: .4byte gUnknown_85CBEE9 @@ -326377,16 +326377,16 @@ _0809EABC: movs r0, #5 bl sub_080A306C adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask _0809EAD0: add sp, #0xc pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0809E9D0 + thumb_func_end Task_ShowResetRtcPrompt - thumb_func_start sub_0809EAD8 -sub_0809EAD8: @ 0x0809EAD8 + thumb_func_start Task_ResetRtcScreen +Task_ResetRtcScreen: @ 0x0809EAD8 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -326426,7 +326426,7 @@ _0809EB24: movs r1, #1 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 strh r0, [r5] b _0809ECDC @@ -326449,7 +326449,7 @@ _0809EB4E: bne _0809EB74 _0809EB5A: ldr r0, _0809EB70 - bl sub_0809E998 + bl ShowMessage movs r0, #5 strh r0, [r5] b _0809ECDC @@ -326461,13 +326461,13 @@ _0809EB74: bl RtcCalcLocalTime ldr r0, _0809EB88 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #2] b _0809EC0C .align 2, 0 -_0809EB88: .4byte sub_0809E9D0 +_0809EB88: .4byte Task_ShowResetRtcPrompt _0809EB8C: ldr r2, _0809EBD4 movs r0, #2 @@ -326485,7 +326485,7 @@ _0809EBA2: movs r1, #0 bl sub_08198134 ldr r0, _0809EBD8 - bl sub_0809E998 + bl ShowMessage ldr r2, _0809EBDC ldr r0, _0809EBE0 ldr r0, [r0] @@ -326496,7 +326496,7 @@ _0809EBA2: str r1, [r2, #4] ldr r0, _0809EBE4 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #2] @@ -326508,7 +326508,7 @@ _0809EBD4: .4byte gUnknown_3005B60 _0809EBD8: .4byte gUnknown_85CBF09 _0809EBDC: .4byte gUnknown_3005A50 _0809EBE0: .4byte gUnknown_3005AF0 -_0809EBE4: .4byte sub_0809E7D8 +_0809EBE4: .4byte Task_ResetRtc_0 _0809EBE8: ldr r2, _0809EC14 movs r0, #2 @@ -326526,7 +326526,7 @@ _0809EBE8: cmp r0, #0 bne _0809EC18 ldrb r0, [r5, #2] - bl sub_080A8964 + bl DestroyTask _0809EC0C: movs r0, #2 strh r0, [r5] @@ -326535,8 +326535,8 @@ _0809EC0C: _0809EC14: .4byte gUnknown_3005B60 _0809EC18: ldrb r0, [r5, #2] - bl sub_080A8964 - bl sub_0802F05C + bl DestroyTask + bl RtcReset ldr r4, _0809EC60 movs r1, #0 ldrsh r0, [r4, r1] @@ -326559,7 +326559,7 @@ _0809EC18: bl VarSet bl DisableResetRTC ldr r0, _0809EC6C - bl sub_0809E998 + bl ShowMessage movs r0, #4 strh r0, [r5] b _0809ECDC @@ -326570,13 +326570,13 @@ _0809EC68: .4byte 0x00004040 _0809EC6C: .4byte gUnknown_85CBF1C _0809EC70: movs r0, #0 - bl sub_08153274 + bl TrySavingData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _0809EC90 ldr r0, _0809EC8C - bl sub_0809E998 + bl ShowMessage movs r0, #0x49 bl sub_080A306C b _0809EC9C @@ -326584,7 +326584,7 @@ _0809EC70: _0809EC8C: .4byte gUnknown_85CBF43 _0809EC90: ldr r0, _0809ECE4 - bl sub_0809E998 + bl ShowMessage movs r0, #0x16 bl sub_080A306C _0809EC9C: @@ -326604,7 +326604,7 @@ _0809ECA0: movs r1, #1 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #6 strh r0, [r5] _0809ECC2: @@ -326615,9 +326615,9 @@ _0809ECC2: cmp r0, #0 bne _0809ECDC adds r0, r4, #0 - bl sub_080A8964 - bl sub_080034D4 - bl sub_080008F4 + bl DestroyTask + bl FreeAllWindowBuffers + bl DoSoftReset _0809ECDC: add sp, #4 pop {r4, r5} @@ -326628,7 +326628,7 @@ _0809ECE4: .4byte gUnknown_85CBF52 _0809ECE8: .4byte gUnknown_3002360 _0809ECEC: .4byte 0x0000FFFF _0809ECF0: .4byte gUnknown_2037C74 - thumb_func_end sub_0809EAD8 + thumb_func_end Task_ResetRtcScreen thumb_func_start SetDexPokemonPokenavFlags SetDexPokemonPokenavFlags: @ 0x0809ECF4 @@ -326647,13 +326647,13 @@ _0809ED10: .4byte 0x00000861 _0809ED14: .4byte 0x00000862 thumb_func_end SetDexPokemonPokenavFlags - thumb_func_start sub_0809ED18 -sub_0809ED18: @ 0x0809ED18 + thumb_func_start BuildStartMenuActions +BuildStartMenuActions: @ 0x0809ED18 push {lr} ldr r0, _0809ED30 movs r1, #0 strb r1, [r0] - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 bne _0809ED34 bl BuildLinkModeStartMenu @@ -326680,14 +326680,14 @@ _0809ED50: bl BuildBattlePikeStartMenu b _0809ED84 _0809ED60: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0809ED70 bl BuildBattlePyramidStartMenu b _0809ED84 _0809ED70: - bl sub_081399C0 + bl InMultiBattleRoom lsls r0, r0, #0x18 cmp r0, #0 beq _0809ED80 @@ -326698,23 +326698,23 @@ _0809ED80: _0809ED84: pop {r0} bx r0 - thumb_func_end sub_0809ED18 + thumb_func_end BuildStartMenuActions - thumb_func_start sub_0809ED88 -sub_0809ED88: @ 0x0809ED88 + thumb_func_start AddStartMenuAction +AddStartMenuAction: @ 0x0809ED88 push {lr} adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 ldr r0, _0809ED9C ldr r1, _0809EDA0 - bl sub_080A020C + bl AppendToList pop {r0} bx r0 .align 2, 0 _0809ED9C: .4byte gUnknown_20372B0 _0809EDA0: .4byte gUnknown_20372AF - thumb_func_end sub_0809ED88 + thumb_func_end AddStartMenuAction thumb_func_start BuildNormalStartMenu BuildNormalStartMenu: @ 0x0809EDA4 @@ -326726,7 +326726,7 @@ BuildNormalStartMenu: @ 0x0809EDA4 cmp r0, #1 bne _0809EDBA movs r0, #0 - bl sub_0809ED88 + bl AddStartMenuAction _0809EDBA: movs r0, #0x86 lsls r0, r0, #4 @@ -326736,10 +326736,10 @@ _0809EDBA: cmp r0, #1 bne _0809EDD0 movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction _0809EDD0: movs r0, #2 - bl sub_0809ED88 + bl AddStartMenuAction ldr r0, _0809EE0C bl FlagGet lsls r0, r0, #0x18 @@ -326747,16 +326747,16 @@ _0809EDD0: cmp r0, #1 bne _0809EDEA movs r0, #3 - bl sub_0809ED88 + bl AddStartMenuAction _0809EDEA: movs r0, #4 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #5 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 .align 2, 0 @@ -326768,19 +326768,19 @@ _0809EE0C: .4byte 0x00000862 BuildSafariZoneStartMenu: @ 0x0809EE10 push {lr} movs r0, #8 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #0 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #2 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #4 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 thumb_func_end BuildSafariZoneStartMenu @@ -326789,9 +326789,9 @@ BuildSafariZoneStartMenu: @ 0x0809EE10 BuildLinkModeStartMenu: @ 0x0809EE40 push {lr} movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #2 - bl sub_0809ED88 + bl AddStartMenuAction ldr r0, _0809EE78 bl FlagGet lsls r0, r0, #0x18 @@ -326799,14 +326799,14 @@ BuildLinkModeStartMenu: @ 0x0809EE40 cmp r0, #1 bne _0809EE62 movs r0, #3 - bl sub_0809ED88 + bl AddStartMenuAction _0809EE62: movs r0, #9 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 .align 2, 0 @@ -326817,9 +326817,9 @@ _0809EE78: .4byte 0x00000862 BuildUnionRoomStartMenu: @ 0x0809EE7C push {lr} movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #2 - bl sub_0809ED88 + bl AddStartMenuAction ldr r0, _0809EEB4 bl FlagGet lsls r0, r0, #0x18 @@ -326827,14 +326827,14 @@ BuildUnionRoomStartMenu: @ 0x0809EE7C cmp r0, #1 bne _0809EE9E movs r0, #3 - bl sub_0809ED88 + bl AddStartMenuAction _0809EE9E: movs r0, #4 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 .align 2, 0 @@ -326845,15 +326845,15 @@ _0809EEB4: .4byte 0x00000862 BuildBattlePikeStartMenu: @ 0x0809EEB8 push {lr} movs r0, #0 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #4 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 thumb_func_end BuildBattlePikeStartMenu @@ -326862,19 +326862,19 @@ BuildBattlePikeStartMenu: @ 0x0809EEB8 BuildBattlePyramidStartMenu: @ 0x0809EEDC push {lr} movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #0xc - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #4 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #0xa - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #0xb - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 thumb_func_end BuildBattlePyramidStartMenu @@ -326883,28 +326883,28 @@ BuildBattlePyramidStartMenu: @ 0x0809EEDC BuildMultiBattleRoomStartMenu: @ 0x0809EF0C push {lr} movs r0, #1 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #4 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #6 - bl sub_0809ED88 + bl AddStartMenuAction movs r0, #7 - bl sub_0809ED88 + bl AddStartMenuAction pop {r0} bx r0 .align 2, 0 thumb_func_end BuildMultiBattleRoomStartMenu - thumb_func_start sub_0809EF2C -sub_0809EF2C: @ 0x0809EF2C + thumb_func_start ShowSafariBallsWindow +ShowSafariBallsWindow: @ 0x0809EF2C push {r4, r5, lr} sub sp, #0xc ldr r4, _0809EF88 ldr r0, _0809EF8C - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 @@ -326917,7 +326917,7 @@ sub_0809EF2C: @ 0x0809EF2C ldr r5, _0809EF98 ldr r1, _0809EF9C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r4] movs r1, #2 str r1, [sp] @@ -326931,7 +326931,7 @@ sub_0809EF2C: @ 0x0809EF2C bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -326943,10 +326943,10 @@ _0809EF90: .4byte gUnknown_2021C40 _0809EF94: .4byte gUnknown_2039D18 _0809EF98: .4byte gUnknown_2021C7C _0809EF9C: .4byte gUnknown_84E8B84 - thumb_func_end sub_0809EF2C + thumb_func_end ShowSafariBallsWindow - thumb_func_start sub_0809EFA0 -sub_0809EFA0: @ 0x0809EFA0 + thumb_func_start ShowPyramidFloorWindow +ShowPyramidFloorWindow: @ 0x0809EFA0 push {r4, r5, lr} sub sp, #0xc ldr r0, _0809EFB8 @@ -326968,11 +326968,11 @@ _0809EFC8: ldr r4, _0809F02C ldr r0, _0809F030 _0809EFCC: - bl sub_08003250 + bl AddWindow strb r0, [r4] ldr r4, _0809F02C ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 @@ -326990,7 +326990,7 @@ _0809EFCC: ldr r5, _0809F044 ldr r1, _0809F048 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r4] movs r1, #2 str r1, [sp] @@ -327004,7 +327004,7 @@ _0809EFCC: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -327018,10 +327018,10 @@ _0809F03C: .4byte gUnknown_3005AF0 _0809F040: .4byte 0x00000CB2 _0809F044: .4byte gUnknown_2021C7C _0809F048: .4byte gUnknown_84E8B9C - thumb_func_end sub_0809EFA0 + thumb_func_end ShowPyramidFloorWindow - thumb_func_start sub_0809F04C -sub_0809F04C: @ 0x0809F04C + thumb_func_start RemoveExtraStartMenuWindows +RemoveExtraStartMenuWindows: @ 0x0809F04C push {r4, lr} bl sub_080FC910 cmp r0, #0 @@ -327032,11 +327032,11 @@ sub_0809F04C: @ 0x0809F04C bl sub_08198134 ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow _0809F06E: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0809F088 @@ -327045,7 +327045,7 @@ _0809F06E: movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow _0809F088: pop {r4} pop {r0} @@ -327053,10 +327053,10 @@ _0809F088: .align 2, 0 _0809F090: .4byte gUnknown_20372AC _0809F094: .4byte gUnknown_20372AD - thumb_func_end sub_0809F04C + thumb_func_end RemoveExtraStartMenuWindows - thumb_func_start sub_0809F098 -sub_0809F098: @ 0x0809F098 + thumb_func_start PrintStartMenuActions +PrintStartMenuActions: @ 0x0809F098 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -327097,19 +327097,19 @@ _0809F0B2: lsls r3, r3, #0x10 lsrs r3, r3, #0x10 movs r2, #8 - bl sub_08199CBC + bl PrintPlayerNameOnWindow b _0809F130 .align 2, 0 _0809F0F0: .4byte gUnknown_84E8C2C _0809F0F4: .4byte gUnknown_2021C7C _0809F0F8: .4byte gUnknown_20372B0 -_0809F0FC: .4byte sub_0809F564 +_0809F0FC: .4byte StartMenuPlayerNameCallback _0809F100: mov r1, sb adds r0, r3, r1 ldr r1, [r0] mov r0, sl - bl sub_08008BCC + bl StringExpandPlaceholders bl sub_0819780C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -327159,10 +327159,10 @@ _0809F15A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F098 + thumb_func_end PrintStartMenuActions - thumb_func_start sub_0809F16C -sub_0809F16C: @ 0x0809F16C + thumb_func_start InitStartMenuStep +InitStartMenuStep: @ 0x0809F16C push {r4, lr} sub sp, #0xc ldr r0, _0809F188 @@ -327192,7 +327192,7 @@ _0809F1A8: strb r0, [r2] b _0809F264 _0809F1B0: - bl sub_0809ED18 + bl BuildStartMenuActions ldr r1, _0809F1B8 b _0809F218 .align 2, 0 @@ -327217,13 +327217,13 @@ _0809F1E4: bl sub_080FC910 cmp r0, #0 beq _0809F1F0 - bl sub_0809EF2C + bl ShowSafariBallsWindow _0809F1F0: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0809F1FE - bl sub_0809EFA0 + bl ShowPyramidFloorWindow _0809F1FE: ldr r1, _0809F204 b _0809F218 @@ -327233,7 +327233,7 @@ _0809F208: ldr r4, _0809F220 adds r0, r4, #0 movs r1, #2 - bl sub_0809F098 + bl PrintStartMenuActions cmp r0, #0 beq _0809F264 subs r1, r4, #1 @@ -327265,7 +327265,7 @@ _0809F224: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 b _0809F266 .align 2, 0 @@ -327279,7 +327279,7 @@ _0809F266: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F16C + thumb_func_end InitStartMenuStep thumb_func_start InitStartMenu InitStartMenu: @ 0x0809F270 @@ -327289,7 +327289,7 @@ InitStartMenu: @ 0x0809F270 strb r0, [r1] strb r0, [r1, #1] _0809F27A: - bl sub_0809F16C + bl InitStartMenuStep cmp r0, #0 beq _0809F27A pop {r0} @@ -327298,12 +327298,12 @@ _0809F27A: _0809F288: .4byte gUnknown_20372B9 thumb_func_end InitStartMenu - thumb_func_start sub_0809F28C -sub_0809F28C: @ 0x0809F28C + thumb_func_start StartMenuTask +StartMenuTask: @ 0x0809F28C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0809F16C + bl InitStartMenuStep cmp r0, #1 bne _0809F2A0 adds r0, r4, #0 @@ -327313,10 +327313,10 @@ _0809F2A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0809F28C + thumb_func_end StartMenuTask - thumb_func_start sub_0809F2A8 -sub_0809F2A8: @ 0x0809F2A8 + thumb_func_start CreateStartMenuTask +CreateStartMenuTask: @ 0x0809F2A8 push {r4, r5, lr} adds r5, r0, #0 ldr r1, _0809F2D0 @@ -327326,7 +327326,7 @@ sub_0809F2A8: @ 0x0809F2A8 ldr r4, _0809F2D4 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -327337,13 +327337,13 @@ sub_0809F2A8: @ 0x0809F2A8 bx r0 .align 2, 0 _0809F2D0: .4byte gUnknown_20372B9 -_0809F2D4: .4byte sub_0809F28C - thumb_func_end sub_0809F2A8 +_0809F2D4: .4byte StartMenuTask + thumb_func_end CreateStartMenuTask thumb_func_start sub_0809F2D8 sub_0809F2D8: @ 0x0809F2D8 push {lr} - bl sub_0809F16C + bl InitStartMenuStep cmp r0, #0 beq _0809F2EA bl sub_080AEF84 @@ -327395,7 +327395,7 @@ _0809F330: bl InUnionRoom cmp r0, #1 bne _0809F33C - bl sub_08016398 + bl var_800D_set_xB _0809F33C: ldr r1, _0809F34C ldr r0, _0809F350 @@ -327406,7 +327406,7 @@ _0809F33C: b _0809F36A .align 2, 0 _0809F34C: .4byte gUnknown_3005B54 -_0809F350: .4byte sub_0809F39C +_0809F350: .4byte HandleStartMenuInput _0809F354: ldr r0, _0809F370 ldr r0, [r0] @@ -327416,7 +327416,7 @@ _0809F354: cmp r0, #1 bne _0809F36A adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0809F36A: pop {r4, r5} pop {r0} @@ -327425,10 +327425,10 @@ _0809F36A: _0809F370: .4byte gUnknown_3005B54 thumb_func_end sub_0809F30C - thumb_func_start sub_0809F374 -sub_0809F374: @ 0x0809F374 + thumb_func_start ShowStartMenu +ShowStartMenu: @ 0x0809F374 push {lr} - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 bne _0809F38A bl FreezeEventObjects @@ -327436,16 +327436,16 @@ sub_0809F374: @ 0x0809F374 bl sub_0808B658 _0809F38A: ldr r0, _0809F398 - bl sub_0809F2A8 + bl CreateStartMenuTask bl sub_080987DC pop {r0} bx r0 .align 2, 0 _0809F398: .4byte sub_0809F30C - thumb_func_end sub_0809F374 + thumb_func_end ShowStartMenu - thumb_func_start sub_0809F39C -sub_0809F39C: @ 0x0809F39C + thumb_func_start HandleStartMenuInput +HandleStartMenuInput: @ 0x0809F39C push {r4, lr} ldr r4, _0809F448 ldrh r1, [r4, #0x2e] @@ -327457,7 +327457,7 @@ sub_0809F39C: @ 0x0809F39C bl sub_080A306C movs r0, #1 rsbs r0, r0, #0 - bl sub_081985E8 + bl Menu_MoveCursor ldr r1, _0809F44C strb r0, [r1] _0809F3BC: @@ -327469,7 +327469,7 @@ _0809F3BC: movs r0, #5 bl sub_080A306C movs r0, #1 - bl sub_081985E8 + bl Menu_MoveCursor ldr r1, _0809F44C strb r0, [r1] _0809F3D6: @@ -327525,19 +327525,19 @@ _0809F40C: beq _0809F478 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen b _0809F478 .align 2, 0 _0809F448: .4byte gUnknown_3002360 _0809F44C: .4byte gUnknown_20372AE _0809F450: .4byte gUnknown_84E8C2C _0809F454: .4byte gUnknown_20372B0 -_0809F458: .4byte sub_0809F48C +_0809F458: .4byte StartMenuPokedexCallback _0809F45C: .4byte gUnknown_3005B54 -_0809F460: .4byte sub_0809F5D4 -_0809F464: .4byte sub_0809F63C -_0809F468: .4byte sub_0809F64C -_0809F46C: .4byte sub_0809F698 +_0809F460: .4byte StartMenuSaveCallback +_0809F464: .4byte StartMenuExitCallback +_0809F468: .4byte StartMenuSafariZoneRetireCallback +_0809F46C: .4byte StartMenuBattlePyramidRetireCallback _0809F470: movs r0, #0xa ands r0, r1 @@ -327547,17 +327547,17 @@ _0809F478: movs r0, #0 b _0809F486 _0809F47C: - bl sub_0809F04C - bl sub_080A01FC + bl RemoveExtraStartMenuWindows + bl HideStartMenu movs r0, #1 _0809F486: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0809F39C + thumb_func_end HandleStartMenuInput - thumb_func_start sub_0809F48C -sub_0809F48C: @ 0x0809F48C + thumb_func_start StartMenuPokedexCallback +StartMenuPokedexCallback: @ 0x0809F48C push {lr} ldr r0, _0809F4A0 ldrb r1, [r0, #7] @@ -327572,21 +327572,21 @@ _0809F4A0: .4byte gUnknown_2037C74 _0809F4A4: movs r0, #0x29 bl IncrementGameStat - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F4C4 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 _0809F4BE: pop {r1} bx r1 .align 2, 0 -_0809F4C4: .4byte sub_080BAC70 - thumb_func_end sub_0809F48C +_0809F4C4: .4byte CB2_Pokedex + thumb_func_end StartMenuPokedexCallback - thumb_func_start sub_0809F4C8 -sub_0809F4C8: @ 0x0809F4C8 + thumb_func_start StartMenuPokemonCallback +StartMenuPokemonCallback: @ 0x0809F4C8 push {lr} ldr r0, _0809F4DC ldrb r1, [r0, #7] @@ -327599,18 +327599,18 @@ sub_0809F4C8: @ 0x0809F4C8 .align 2, 0 _0809F4DC: .4byte gUnknown_2037C74 _0809F4E0: - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F4F8 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 _0809F4F4: pop {r1} bx r1 .align 2, 0 -_0809F4F8: .4byte sub_081B7BD4 - thumb_func_end sub_0809F4C8 +_0809F4F8: .4byte CB2_PartyMenuFromStartMenu + thumb_func_end StartMenuPokemonCallback thumb_func_start sub_0809F4FC sub_0809F4FC: @ 0x0809F4FC @@ -327626,17 +327626,17 @@ sub_0809F4FC: @ 0x0809F4FC .align 2, 0 _0809F510: .4byte gUnknown_2037C74 _0809F514: - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F52C - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 _0809F528: pop {r1} bx r1 .align 2, 0 -_0809F52C: .4byte sub_081AA914 +_0809F52C: .4byte CB2_BagMenuFromStartMenu thumb_func_end sub_0809F4FC thumb_func_start sub_0809F530 @@ -327653,11 +327653,11 @@ sub_0809F530: @ 0x0809F530 .align 2, 0 _0809F544: .4byte gUnknown_2037C74 _0809F548: - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F560 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 _0809F55C: pop {r1} @@ -327666,8 +327666,8 @@ _0809F55C: _0809F560: .4byte sub_081C6A10 thumb_func_end sub_0809F530 - thumb_func_start sub_0809F564 -sub_0809F564: @ 0x0809F564 + thumb_func_start StartMenuPlayerNameCallback +StartMenuPlayerNameCallback: @ 0x0809F564 push {lr} ldr r0, _0809F598 ldrb r1, [r0, #7] @@ -327675,10 +327675,10 @@ sub_0809F564: @ 0x0809F564 ands r0, r1 cmp r0, #0 bne _0809F5CC - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C - bl sub_080856F4 + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps + bl IsUpdateLinkStateCBActive cmp r0, #0 bne _0809F58E bl InUnionRoom @@ -327690,7 +327690,7 @@ _0809F58E: b _0809F5C2 .align 2, 0 _0809F598: .4byte gUnknown_2037C74 -_0809F59C: .4byte sub_08085AFC +_0809F59C: .4byte CB2_ReturnToFieldWithOpenMenu _0809F5A0: ldr r0, _0809F5B4 bl FlagGet @@ -327698,11 +327698,11 @@ _0809F5A0: cmp r0, #0 beq _0809F5BC ldr r0, _0809F5B8 - bl sub_080C4AC0 + bl ShowFrontierPass b _0809F5C2 .align 2, 0 _0809F5B4: .4byte 0x000008D2 -_0809F5B8: .4byte sub_08085AFC +_0809F5B8: .4byte CB2_ReturnToFieldWithOpenMenu _0809F5BC: ldr r0, _0809F5C8 bl sub_080C4710 @@ -327710,23 +327710,23 @@ _0809F5C2: movs r0, #1 b _0809F5CE .align 2, 0 -_0809F5C8: .4byte sub_08085AFC +_0809F5C8: .4byte CB2_ReturnToFieldWithOpenMenu _0809F5CC: movs r0, #0 _0809F5CE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F564 + thumb_func_end StartMenuPlayerNameCallback - thumb_func_start sub_0809F5D4 -sub_0809F5D4: @ 0x0809F5D4 + thumb_func_start StartMenuSaveCallback +StartMenuSaveCallback: @ 0x0809F5D4 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0809F5E4 - bl sub_0809F04C + bl RemoveExtraStartMenuWindows _0809F5E4: ldr r1, _0809F5F0 ldr r0, _0809F5F4 @@ -327736,11 +327736,11 @@ _0809F5E4: bx r1 .align 2, 0 _0809F5F0: .4byte gUnknown_3005B54 -_0809F5F4: .4byte sub_0809F700 - thumb_func_end sub_0809F5D4 +_0809F5F4: .4byte SaveStartCallback + thumb_func_end StartMenuSaveCallback - thumb_func_start sub_0809F5F8 -sub_0809F5F8: @ 0x0809F5F8 + thumb_func_start StartMenuOptionCallback +StartMenuOptionCallback: @ 0x0809F5F8 push {lr} ldr r0, _0809F60C ldrb r1, [r0, #7] @@ -327753,11 +327753,11 @@ sub_0809F5F8: @ 0x0809F5F8 .align 2, 0 _0809F60C: .4byte gUnknown_2037C74 _0809F610: - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F630 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0809F634 ldr r0, _0809F638 str r0, [r1, #8] @@ -327766,31 +327766,31 @@ _0809F62A: pop {r1} bx r1 .align 2, 0 -_0809F630: .4byte sub_080B9C34 +_0809F630: .4byte CB2_InitOptionMenu _0809F634: .4byte gUnknown_3002360 -_0809F638: .4byte sub_08085AFC - thumb_func_end sub_0809F5F8 +_0809F638: .4byte CB2_ReturnToFieldWithOpenMenu + thumb_func_end StartMenuOptionCallback - thumb_func_start sub_0809F63C -sub_0809F63C: @ 0x0809F63C + thumb_func_start StartMenuExitCallback +StartMenuExitCallback: @ 0x0809F63C push {lr} - bl sub_0809F04C - bl sub_080A01FC + bl RemoveExtraStartMenuWindows + bl HideStartMenu movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0809F63C + thumb_func_end StartMenuExitCallback - thumb_func_start sub_0809F64C -sub_0809F64C: @ 0x0809F64C + thumb_func_start StartMenuSafariZoneRetireCallback +StartMenuSafariZoneRetireCallback: @ 0x0809F64C push {lr} - bl sub_0809F04C - bl sub_080A01FC + bl RemoveExtraStartMenuWindows + bl HideStartMenu bl sub_080FC9F0 movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0809F64C + thumb_func_end StartMenuSafariZoneRetireCallback thumb_func_start sub_0809F660 sub_0809F660: @ 0x0809F660 @@ -327806,23 +327806,23 @@ sub_0809F660: @ 0x0809F660 .align 2, 0 _0809F674: .4byte gUnknown_2037C74 _0809F678: - bl sub_080ABC74 - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F690 ldrb r0, [r0] ldr r1, _0809F694 - bl sub_080C4798 + bl ShowTrainerCardInLink movs r0, #1 _0809F68C: pop {r1} bx r1 .align 2, 0 _0809F690: .4byte gUnknown_3005B14 -_0809F694: .4byte sub_08085AFC +_0809F694: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_0809F660 - thumb_func_start sub_0809F698 -sub_0809F698: @ 0x0809F698 + thumb_func_start StartMenuBattlePyramidRetireCallback +StartMenuBattlePyramidRetireCallback: @ 0x0809F698 ldr r1, _0809F6A4 ldr r0, _0809F6A8 str r0, [r1] @@ -327830,27 +327830,27 @@ sub_0809F698: @ 0x0809F698 bx lr .align 2, 0 _0809F6A4: .4byte gUnknown_3005B54 -_0809F6A8: .4byte sub_0809F774 - thumb_func_end sub_0809F698 +_0809F6A8: .4byte BattlePyramidRetireStartCallback + thumb_func_end StartMenuBattlePyramidRetireCallback - thumb_func_start sub_0809F6AC -sub_0809F6AC: @ 0x0809F6AC + thumb_func_start CableCarMainCallback_Run +CableCarMainCallback_Run: @ 0x0809F6AC push {lr} movs r0, #0 movs r1, #0 bl sub_08197EBC - bl sub_08097E7C + bl ScriptUnfreezeEventObjects ldr r0, _0809F6C8 - bl sub_0809F2A8 + bl CreateStartMenuTask bl sub_080987DC pop {r0} bx r0 .align 2, 0 _0809F6C8: .4byte sub_0809F30C - thumb_func_end sub_0809F6AC + thumb_func_end CableCarMainCallback_Run - thumb_func_start sub_0809F6CC -sub_0809F6CC: @ 0x0809F6CC + thumb_func_start StartMenuBattlePyramidBagCallback +StartMenuBattlePyramidBagCallback: @ 0x0809F6CC push {lr} ldr r0, _0809F6E0 ldrb r1, [r0, #7] @@ -327863,23 +327863,23 @@ sub_0809F6CC: @ 0x0809F6CC .align 2, 0 _0809F6E0: .4byte gUnknown_2037C74 _0809F6E4: - bl sub_080ABC74 - bl sub_0809F04C - bl sub_0808569C + bl PlayRainStoppingSoundEffect + bl RemoveExtraStartMenuWindows + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0809F6FC - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 _0809F6F8: pop {r1} bx r1 .align 2, 0 -_0809F6FC: .4byte sub_081C4704 - thumb_func_end sub_0809F6CC +_0809F6FC: .4byte CB2_PyramidBagMenuFromStartMenu + thumb_func_end StartMenuBattlePyramidBagCallback - thumb_func_start sub_0809F700 -sub_0809F700: @ 0x0809F700 + thumb_func_start SaveStartCallback +SaveStartCallback: @ 0x0809F700 push {lr} - bl sub_0809F800 + bl InitSave ldr r1, _0809F714 ldr r0, _0809F718 str r0, [r1] @@ -327888,11 +327888,11 @@ sub_0809F700: @ 0x0809F700 bx r1 .align 2, 0 _0809F714: .4byte gUnknown_3005B54 -_0809F718: .4byte sub_0809F71C - thumb_func_end sub_0809F700 +_0809F718: .4byte SaveCallback + thumb_func_end SaveStartCallback - thumb_func_start sub_0809F71C -sub_0809F71C: @ 0x0809F71C + thumb_func_start SaveCallback +SaveCallback: @ 0x0809F71C push {lr} bl sub_0809F824 lsls r0, r0, #0x18 @@ -327917,14 +327917,14 @@ _0809F738: b _0809F76C .align 2, 0 _0809F74C: .4byte gUnknown_3005B54 -_0809F750: .4byte sub_0809F39C +_0809F750: .4byte HandleStartMenuInput _0809F754: movs r0, #0 movs r1, #1 bl sub_08197EBC - bl sub_08097E7C + bl ScriptUnfreezeEventObjects bl sub_080987E8 - bl sub_081A9C40 + bl SoftResetInBattlePyramid movs r0, #1 b _0809F76E _0809F76C: @@ -327933,12 +327933,12 @@ _0809F76E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F71C + thumb_func_end SaveCallback - thumb_func_start sub_0809F774 -sub_0809F774: @ 0x0809F774 + thumb_func_start BattlePyramidRetireStartCallback +BattlePyramidRetireStartCallback: @ 0x0809F774 push {lr} - bl sub_0809FC18 + bl InitBattlePyramidRetire ldr r1, _0809F788 ldr r0, _0809F78C str r0, [r1] @@ -327947,11 +327947,11 @@ sub_0809F774: @ 0x0809F774 bx r1 .align 2, 0 _0809F788: .4byte gUnknown_3005B54 -_0809F78C: .4byte sub_0809F7AC - thumb_func_end sub_0809F774 +_0809F78C: .4byte BattlePyramidRetireCallback + thumb_func_end BattlePyramidRetireStartCallback - thumb_func_start sub_0809F790 -sub_0809F790: @ 0x0809F790 + thumb_func_start BattlePyramidRetireReturnCallback +BattlePyramidRetireReturnCallback: @ 0x0809F790 push {lr} bl InitStartMenu ldr r1, _0809F7A4 @@ -327962,11 +327962,11 @@ sub_0809F790: @ 0x0809F790 bx r1 .align 2, 0 _0809F7A4: .4byte gUnknown_3005B54 -_0809F7A8: .4byte sub_0809F39C - thumb_func_end sub_0809F790 +_0809F7A8: .4byte HandleStartMenuInput + thumb_func_end BattlePyramidRetireReturnCallback - thumb_func_start sub_0809F7AC -sub_0809F7AC: @ 0x0809F7AC + thumb_func_start BattlePyramidRetireCallback +BattlePyramidRetireCallback: @ 0x0809F7AC push {lr} bl sub_0809F824 lsls r0, r0, #0x18 @@ -327979,19 +327979,19 @@ sub_0809F7AC: @ 0x0809F7AC beq _0809F7D8 b _0809F7F8 _0809F7C4: - bl sub_0809F04C + bl RemoveExtraStartMenuWindows ldr r1, _0809F7D0 ldr r0, _0809F7D4 str r0, [r1] b _0809F7F8 .align 2, 0 _0809F7D0: .4byte gUnknown_3005B54 -_0809F7D4: .4byte sub_0809F790 +_0809F7D4: .4byte BattlePyramidRetireReturnCallback _0809F7D8: movs r0, #0 movs r1, #1 bl sub_08197EBC - bl sub_08097E7C + bl ScriptUnfreezeEventObjects bl sub_080987E8 ldr r0, _0809F7F4 bl ScriptContext1_SetupScript @@ -328005,10 +328005,10 @@ _0809F7FA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F7AC + thumb_func_end BattlePyramidRetireCallback - thumb_func_start sub_0809F800 -sub_0809F800: @ 0x0809F800 + thumb_func_start InitSave +InitSave: @ 0x0809F800 push {lr} bl save_serialize_map ldr r1, _0809F818 @@ -328021,14 +328021,14 @@ sub_0809F800: @ 0x0809F800 bx r0 .align 2, 0 _0809F818: .4byte gUnknown_20372BC -_0809F81C: .4byte sub_0809F978 +_0809F81C: .4byte SaveConfirmSaveCallback _0809F820: .4byte gUnknown_20372C1 - thumb_func_end sub_0809F800 + thumb_func_end InitSave thumb_func_start sub_0809F824 sub_0809F824: @ 0x0809F824 push {lr} - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -328053,32 +328053,32 @@ _0809F852: .align 2, 0 thumb_func_end sub_0809F824 - thumb_func_start sub_0809F858 -sub_0809F858: @ 0x0809F858 + thumb_func_start SaveGame +SaveGame: @ 0x0809F858 push {lr} - bl sub_0809F800 + bl InitSave ldr r0, _0809F86C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_0809F86C: .4byte sub_0809F8A8 - thumb_func_end sub_0809F858 +_0809F86C: .4byte SaveGameTask + thumb_func_end SaveGame - thumb_func_start sub_0809F870 -sub_0809F870: @ 0x0809F870 + thumb_func_start ShowSaveMessage +ShowSaveMessage: @ 0x0809F870 push {r4, lr} adds r2, r0, #0 adds r4, r1, #0 ldr r0, _0809F89C adds r1, r2, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 movs r1, #1 bl sub_08197650 movs r0, #1 - bl sub_08196F04 + bl AddTextPrinterForMessage_2 ldr r1, _0809F8A0 movs r0, #1 strb r0, [r1] @@ -328091,10 +328091,10 @@ sub_0809F870: @ 0x0809F870 _0809F89C: .4byte gUnknown_2021C7C _0809F8A0: .4byte gUnknown_20372C1 _0809F8A4: .4byte gUnknown_20372BC - thumb_func_end sub_0809F870 + thumb_func_end ShowSaveMessage - thumb_func_start sub_0809F8A8 -sub_0809F8A8: @ 0x0809F8A8 + thumb_func_start SaveGameTask +SaveGameTask: @ 0x0809F8A8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -328122,15 +328122,15 @@ _0809F8D4: strh r1, [r0] _0809F8D8: adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _0809F8E2: pop {r4} pop {r0} bx r0 .align 2, 0 _0809F8E8: .4byte gUnknown_2037290 - thumb_func_end sub_0809F8A8 + thumb_func_end SaveGameTask thumb_func_start sub_0809F8EC sub_0809F8EC: @ 0x0809F8EC @@ -328152,18 +328152,18 @@ sub_0809F8FC: @ 0x0809F8FC .align 2, 0 thumb_func_end sub_0809F8FC - thumb_func_start sub_0809F908 -sub_0809F908: @ 0x0809F908 + thumb_func_start SaveStartTimer +SaveStartTimer: @ 0x0809F908 ldr r1, _0809F910 movs r0, #0x3c strb r0, [r1] bx lr .align 2, 0 _0809F910: .4byte gUnknown_20372C0 - thumb_func_end sub_0809F908 + thumb_func_end SaveStartTimer - thumb_func_start sub_0809F914 -sub_0809F914: @ 0x0809F914 + thumb_func_start SaveSuccesTimer +SaveSuccesTimer: @ 0x0809F914 push {lr} ldr r1, _0809F934 ldrb r0, [r1] @@ -328191,10 +328191,10 @@ _0809F942: _0809F944: pop {r1} bx r1 - thumb_func_end sub_0809F914 + thumb_func_end SaveSuccesTimer - thumb_func_start sub_0809F948 -sub_0809F948: @ 0x0809F948 + thumb_func_start SaveErrorTimer +SaveErrorTimer: @ 0x0809F948 push {lr} ldr r1, _0809F964 ldrb r0, [r1] @@ -328220,10 +328220,10 @@ _0809F972: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F948 + thumb_func_end SaveErrorTimer - thumb_func_start sub_0809F978 -sub_0809F978: @ 0x0809F978 + thumb_func_start SaveConfirmSaveCallback +SaveConfirmSaveCallback: @ 0x0809F978 push {lr} bl sub_0819780C lsls r0, r0, #0x18 @@ -328231,14 +328231,14 @@ sub_0809F978: @ 0x0809F978 movs r1, #0 bl sub_08197060 bl sub_08197818 - bl sub_0809FF8C - bl sub_081A9BB8 + bl ShowSaveInfoWindow + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _0809F9AC ldr r0, _0809F9A4 ldr r1, _0809F9A8 - bl sub_0809F870 + bl ShowSaveMessage b _0809F9B4 .align 2, 0 _0809F9A4: .4byte gUnknown_822D762 @@ -328246,7 +328246,7 @@ _0809F9A8: .4byte sub_0809F9C4 _0809F9AC: ldr r0, _0809F9BC ldr r1, _0809F9C0 - bl sub_0809F870 + bl ShowSaveMessage _0809F9B4: movs r0, #0 pop {r1} @@ -328254,7 +328254,7 @@ _0809F9B4: .align 2, 0 _0809F9BC: .4byte gUnknown_8276F58 _0809F9C0: .4byte sub_0809F9C4 - thumb_func_end sub_0809F978 + thumb_func_end SaveConfirmSaveCallback thumb_func_start sub_0809F9C4 sub_0809F9C4: @ 0x0809F9C4 @@ -328268,11 +328268,11 @@ sub_0809F9C4: @ 0x0809F9C4 bx r1 .align 2, 0 _0809F9D8: .4byte gUnknown_20372BC -_0809F9DC: .4byte sub_0809F9E0 +_0809F9DC: .4byte SaveConfirmInputCallback thumb_func_end sub_0809F9C4 - thumb_func_start sub_0809F9E0 -sub_0809F9E0: @ 0x0809F9E0 + thumb_func_start SaveConfirmInputCallback +SaveConfirmInputCallback: @ 0x0809F9E0 push {lr} bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, r0, #0x18 @@ -328311,7 +328311,7 @@ _0809FA16: _0809FA20: .4byte gUnknown_3005F50 _0809FA24: .4byte gUnknown_2031F74 _0809FA28: .4byte gUnknown_20372BC -_0809FA2C: .4byte sub_0809FA54 +_0809FA2C: .4byte SaveFileExistsCallback _0809FA30: ldr r1, _0809FA38 ldr r0, _0809FA3C @@ -328319,7 +328319,7 @@ _0809FA30: b _0809FA4C .align 2, 0 _0809FA38: .4byte gUnknown_20372BC -_0809FA3C: .4byte sub_0809FB0C +_0809FA3C: .4byte SaveSavingMessageCallback _0809FA40: bl sub_0809F8FC bl sub_0809F8EC @@ -328331,10 +328331,10 @@ _0809FA4E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809F9E0 + thumb_func_end SaveConfirmInputCallback - thumb_func_start sub_0809FA54 -sub_0809FA54: @ 0x0809FA54 + thumb_func_start SaveFileExistsCallback +SaveFileExistsCallback: @ 0x0809FA54 push {lr} ldr r0, _0809FA68 ldrb r0, [r0] @@ -328342,7 +328342,7 @@ sub_0809FA54: @ 0x0809FA54 bne _0809FA74 ldr r0, _0809FA6C ldr r1, _0809FA70 - bl sub_0809F870 + bl ShowSaveMessage b _0809FA7C .align 2, 0 _0809FA68: .4byte gUnknown_2031F74 @@ -328351,7 +328351,7 @@ _0809FA70: .4byte sub_0809FA8C _0809FA74: ldr r0, _0809FA84 ldr r1, _0809FA88 - bl sub_0809F870 + bl ShowSaveMessage _0809FA7C: movs r0, #0 pop {r1} @@ -328359,7 +328359,7 @@ _0809FA7C: .align 2, 0 _0809FA84: .4byte gUnknown_8276F77 _0809FA88: .4byte sub_0809FAA8 - thumb_func_end sub_0809FA54 + thumb_func_end SaveFileExistsCallback thumb_func_start sub_0809FA8C sub_0809FA8C: @ 0x0809FA8C @@ -328374,7 +328374,7 @@ sub_0809FA8C: @ 0x0809FA8C bx r1 .align 2, 0 _0809FAA0: .4byte gUnknown_20372BC -_0809FAA4: .4byte sub_0809FAC4 +_0809FAA4: .4byte SaveOverwriteInputCallback thumb_func_end sub_0809FA8C thumb_func_start sub_0809FAA8 @@ -328389,11 +328389,11 @@ sub_0809FAA8: @ 0x0809FAA8 bx r1 .align 2, 0 _0809FABC: .4byte gUnknown_20372BC -_0809FAC0: .4byte sub_0809FAC4 +_0809FAC0: .4byte SaveOverwriteInputCallback thumb_func_end sub_0809FAA8 - thumb_func_start sub_0809FAC4 -sub_0809FAC4: @ 0x0809FAC4 + thumb_func_start SaveOverwriteInputCallback +SaveOverwriteInputCallback: @ 0x0809FAC4 push {lr} bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, r0, #0x18 @@ -328418,7 +328418,7 @@ _0809FAE6: b _0809FB04 .align 2, 0 _0809FAF0: .4byte gUnknown_20372BC -_0809FAF4: .4byte sub_0809FB0C +_0809FAF4: .4byte SaveSavingMessageCallback _0809FAF8: bl sub_0809F8FC bl sub_0809F8EC @@ -328430,24 +328430,24 @@ _0809FB06: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0809FAC4 + thumb_func_end SaveOverwriteInputCallback - thumb_func_start sub_0809FB0C -sub_0809FB0C: @ 0x0809FB0C + thumb_func_start SaveSavingMessageCallback +SaveSavingMessageCallback: @ 0x0809FB0C push {lr} ldr r0, _0809FB1C ldr r1, _0809FB20 - bl sub_0809F870 + bl ShowSaveMessage movs r0, #0 pop {r1} bx r1 .align 2, 0 _0809FB1C: .4byte gUnknown_8276F97 -_0809FB20: .4byte sub_0809FB24 - thumb_func_end sub_0809FB0C +_0809FB20: .4byte SaveDoSaveCallback + thumb_func_end SaveSavingMessageCallback - thumb_func_start sub_0809FB24 -sub_0809FB24: @ 0x0809FB24 + thumb_func_start SaveDoSaveCallback +SaveDoSaveCallback: @ 0x0809FB24 push {r4, lr} movs r0, #0 bl IncrementGameStat @@ -328457,7 +328457,7 @@ sub_0809FB24: @ 0x0809FB24 cmp r0, #1 bne _0809FB4C movs r0, #4 - bl sub_08153274 + bl TrySavingData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r0, #0 @@ -328467,7 +328467,7 @@ sub_0809FB24: @ 0x0809FB24 _0809FB48: .4byte gUnknown_2031F74 _0809FB4C: movs r0, #0 - bl sub_08153274 + bl TrySavingData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 _0809FB56: @@ -328475,7 +328475,7 @@ _0809FB56: bne _0809FB6C ldr r0, _0809FB64 ldr r1, _0809FB68 - bl sub_0809F870 + bl ShowSaveMessage b _0809FB74 .align 2, 0 _0809FB64: .4byte gUnknown_8276FBB @@ -328483,17 +328483,17 @@ _0809FB68: .4byte sub_0809FB88 _0809FB6C: ldr r0, _0809FB80 ldr r1, _0809FB84 - bl sub_0809F870 + bl ShowSaveMessage _0809FB74: - bl sub_0809F908 + bl SaveStartTimer movs r0, #0 pop {r4} pop {r1} bx r1 .align 2, 0 _0809FB80: .4byte gUnknown_8277048 -_0809FB84: .4byte sub_0809FBD4 - thumb_func_end sub_0809FB24 +_0809FB84: .4byte SaveErrorCallback + thumb_func_end SaveDoSaveCallback thumb_func_start sub_0809FB88 sub_0809FB88: @ 0x0809FB88 @@ -328514,17 +328514,17 @@ _0809FBA2: bx r1 .align 2, 0 _0809FBA8: .4byte gUnknown_20372BC -_0809FBAC: .4byte sub_0809FBB0 +_0809FBAC: .4byte SaveReturnSuccessCallback thumb_func_end sub_0809FB88 - thumb_func_start sub_0809FBB0 -sub_0809FBB0: @ 0x0809FBB0 + thumb_func_start SaveReturnSuccessCallback +SaveReturnSuccessCallback: @ 0x0809FBB0 push {lr} - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0809FBCE - bl sub_0809F914 + bl SaveSuccesTimer lsls r0, r0, #0x18 cmp r0, #0 beq _0809FBCE @@ -328536,10 +328536,10 @@ _0809FBCE: _0809FBD0: pop {r1} bx r1 - thumb_func_end sub_0809FBB0 + thumb_func_end SaveReturnSuccessCallback - thumb_func_start sub_0809FBD4 -sub_0809FBD4: @ 0x0809FBD4 + thumb_func_start SaveErrorCallback +SaveErrorCallback: @ 0x0809FBD4 push {lr} movs r0, #0 bl sub_080046A8 @@ -328558,12 +328558,12 @@ _0809FBEE: .align 2, 0 _0809FBF4: .4byte gUnknown_20372BC _0809FBF8: .4byte SaveReturnErrorCallback - thumb_func_end sub_0809FBD4 + thumb_func_end SaveErrorCallback thumb_func_start SaveReturnErrorCallback SaveReturnErrorCallback: @ 0x0809FBFC push {lr} - bl sub_0809F948 + bl SaveErrorTimer lsls r0, r0, #0x18 cmp r0, #0 beq _0809FC10 @@ -328578,8 +328578,8 @@ _0809FC12: .align 2, 0 thumb_func_end SaveReturnErrorCallback - thumb_func_start sub_0809FC18 -sub_0809FC18: @ 0x0809FC18 + thumb_func_start InitBattlePyramidRetire +InitBattlePyramidRetire: @ 0x0809FC18 ldr r1, _0809FC28 ldr r0, _0809FC2C str r0, [r1] @@ -328589,12 +328589,12 @@ sub_0809FC18: @ 0x0809FC18 bx lr .align 2, 0 _0809FC28: .4byte gUnknown_20372BC -_0809FC2C: .4byte sub_0809FC34 +_0809FC2C: .4byte BattlePyramidConfirmRetireCallback _0809FC30: .4byte gUnknown_20372C1 - thumb_func_end sub_0809FC18 + thumb_func_end InitBattlePyramidRetire - thumb_func_start sub_0809FC34 -sub_0809FC34: @ 0x0809FC34 + thumb_func_start BattlePyramidConfirmRetireCallback +BattlePyramidConfirmRetireCallback: @ 0x0809FC34 push {lr} bl sub_0819780C lsls r0, r0, #0x18 @@ -328604,14 +328604,14 @@ sub_0809FC34: @ 0x0809FC34 bl sub_08197818 ldr r0, _0809FC58 ldr r1, _0809FC5C - bl sub_0809F870 + bl ShowSaveMessage movs r0, #0 pop {r1} bx r1 .align 2, 0 _0809FC58: .4byte gUnknown_822D78F _0809FC5C: .4byte sub_0809FC60 - thumb_func_end sub_0809FC34 + thumb_func_end BattlePyramidConfirmRetireCallback thumb_func_start sub_0809FC60 sub_0809FC60: @ 0x0809FC60 @@ -328626,11 +328626,11 @@ sub_0809FC60: @ 0x0809FC60 bx r1 .align 2, 0 _0809FC74: .4byte gUnknown_20372BC -_0809FC78: .4byte sub_0809FC7C +_0809FC78: .4byte BattlePyramidRetireInputCallback thumb_func_end sub_0809FC60 - thumb_func_start sub_0809FC7C -sub_0809FC7C: @ 0x0809FC7C + thumb_func_start BattlePyramidRetireInputCallback +BattlePyramidRetireInputCallback: @ 0x0809FC7C push {lr} bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, r0, #0x18 @@ -328660,7 +328660,7 @@ _0809FCAA: _0809FCAC: pop {r1} bx r1 - thumb_func_end sub_0809FC7C + thumb_func_end BattlePyramidRetireInputCallback thumb_func_start sub_0809FCB0 sub_0809FCB0: @ 0x0809FCB0 @@ -328701,8 +328701,8 @@ _0809FCF0: movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 + bl SetVBlankCallback + bl ScanlineEffect_Stop movs r2, #0xa0 lsls r2, r2, #0x13 mov r1, sp @@ -328754,9 +328754,9 @@ _0809FD60: .4byte 0x81000200 _0809FD64: .4byte 0x81000800 _0809FD68: bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl ResetPaletteFade - bl sub_080B9750 + bl ScanlineEffect_Clear b _0809FDD4 _0809FD7A: movs r0, #0 @@ -328766,27 +328766,27 @@ _0809FD7A: movs r2, #1 bl InitBgsFromTemplates ldr r0, _0809FDA8 - bl sub_08003090 + bl InitWindows movs r0, #0 movs r1, #8 movs r2, #0xe0 bl LoadUserWindowBorderGfx_ movs r0, #0xf0 - bl sub_08197694 + bl Menu_LoadStdPalAt b _0809FDD4 .align 2, 0 _0809FDA4: .4byte gUnknown_84E8C94 _0809FDA8: .4byte gUnknown_84E8C98 _0809FDAC: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _0809FDCC - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 bl EnableInterrupts b _0809FDD4 @@ -328820,9 +328820,9 @@ sub_0809FDEC: @ 0x0809FDEC beq _0809FE06 ldr r0, _0809FE10 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask ldr r0, _0809FE14 - bl sub_08000540 + bl SetMainCallback2 _0809FE06: pop {r0} bx r0 @@ -328835,8 +328835,8 @@ _0809FE14: .4byte sub_0809FE18 thumb_func_start sub_0809FE18 sub_0809FE18: @ 0x0809FE18 push {lr} - bl sub_080A89D4 - bl sub_080A12E4 + bl RunTasks + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -328887,7 +328887,7 @@ _0809FE68: @ jump table _0809FE84: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0809FEEC movs r4, #0 str r4, [sp] @@ -328900,23 +328900,23 @@ _0809FE84: movs r0, #0 movs r1, #1 movs r3, #0xff - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #8 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 rsbs r0, r0, #0 str r4, [sp] movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0809FEF0 ldrb r0, [r0] cmp r0, #0 @@ -328944,12 +328944,12 @@ _0809FEF8: .align 2, 0 _0809FF04: .4byte gUnknown_30027A0 _0809FF08: - bl sub_08076764 + bl SetContinueGameWarpStatusToDynamicWarp bl sub_0815336C movs r0, #2 b _0809FF7E _0809FF14: - bl sub_081533B0 + bl CheckSaveFile lsls r0, r0, #0x18 cmp r0, #0 beq _0809FF80 @@ -328969,30 +328969,30 @@ _0809FF34: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #4 b _0809FF7E _0809FF48: - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0809FF5C ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _0809FF80 .align 2, 0 _0809FF5C: .4byte gUnknown_3002360 _0809FF60: ldr r0, _0809FF6C movs r1, #5 - bl sub_080A8878 + bl CreateTask movs r0, #6 b _0809FF7E .align 2, 0 _0809FF6C: .4byte sub_081535C4 _0809FF70: ldr r0, _0809FF88 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _0809FF80 @@ -329008,8 +329008,8 @@ _0809FF80: _0809FF88: .4byte sub_081535C4 thumb_func_end sub_0809FE28 - thumb_func_start sub_0809FF8C -sub_0809FF8C: @ 0x0809FF8C + thumb_func_start ShowSaveInfoWindow +ShowSaveInfoWindow: @ 0x0809FF8C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -329040,7 +329040,7 @@ sub_0809FF8C: @ 0x0809FF8C _0809FFC4: ldr r6, _080A0100 add r0, sp, #0xc - bl sub_08003250 + bl AddWindow strb r0, [r6] ldrb r0, [r6] movs r1, #0 @@ -329092,7 +329092,7 @@ _0809FFE8: adds r1, r5, #0 movs r2, #0x48 movs r3, #0x10 - bl sub_08199CBC + bl PrintPlayerNameOnWindow movs r4, #0x1e ldrb r0, [r6] ldr r2, _080A0110 @@ -329200,7 +329200,7 @@ _080A0130: ldr r0, _080A014C ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -329211,7 +329211,7 @@ _080A0130: bx r0 .align 2, 0 _080A014C: .4byte gUnknown_20372C2 - thumb_func_end sub_0809FF8C + thumb_func_end ShowSaveInfoWindow thumb_func_start sub_080A0150 sub_080A0150: @ 0x080A0150 @@ -329221,7 +329221,7 @@ sub_080A0150: @ 0x080A0150 movs r1, #0 bl sub_08197060 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -329235,13 +329235,13 @@ sub_080A016C: @ 0x080A016C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080A0190 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080A0188 adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080A0188: pop {r4} pop {r0} @@ -329255,7 +329255,7 @@ sub_080A0194: @ 0x080A0194 push {r4, r5, lr} ldr r0, _080A01D0 movs r1, #5 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -329268,7 +329268,7 @@ sub_080A0194: @ 0x080A0194 strh r1, [r0, #0xc] ldr r0, _080A01D8 movs r1, #6 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -329285,8 +329285,8 @@ _080A01D4: .4byte gUnknown_3005B60 _080A01D8: .4byte sub_080A016C thumb_func_end sub_080A0194 - thumb_func_start sub_080A01DC -sub_080A01DC: @ 0x080A01DC + thumb_func_start HideStartMenuWindow +HideStartMenuWindow: @ 0x080A01DC push {lr} bl sub_0819780C lsls r0, r0, #0x18 @@ -329294,24 +329294,24 @@ sub_080A01DC: @ 0x080A01DC movs r1, #1 bl sub_08197060 bl sub_08197818 - bl sub_08097E7C + bl ScriptUnfreezeEventObjects bl sub_080987E8 pop {r0} bx r0 - thumb_func_end sub_080A01DC + thumb_func_end HideStartMenuWindow - thumb_func_start sub_080A01FC -sub_080A01FC: @ 0x080A01FC + thumb_func_start HideStartMenu +HideStartMenu: @ 0x080A01FC push {lr} movs r0, #5 bl sub_080A306C - bl sub_080A01DC + bl HideStartMenuWindow pop {r0} bx r0 - thumb_func_end sub_080A01FC + thumb_func_end HideStartMenu - thumb_func_start sub_080A020C -sub_080A020C: @ 0x080A020C + thumb_func_start AppendToList +AppendToList: @ 0x080A020C ldrb r3, [r1] adds r0, r0, r3 strb r2, [r0] @@ -329320,10 +329320,10 @@ sub_080A020C: @ 0x080A020C strb r0, [r1] bx lr .align 2, 0 - thumb_func_end sub_080A020C + thumb_func_end AppendToList - thumb_func_start sub_080A021C -sub_080A021C: @ 0x080A021C + thumb_func_start ResetTilesetAnimBuffer +ResetTilesetAnimBuffer: @ 0x080A021C push {lr} sub sp, #4 ldr r1, _080A023C @@ -329342,7 +329342,7 @@ sub_080A021C: @ 0x080A021C _080A023C: .4byte gUnknown_3000F34 _080A0240: .4byte gUnknown_20372C4 _080A0244: .4byte 0x0500003C - thumb_func_end sub_080A021C + thumb_func_end ResetTilesetAnimBuffer thumb_func_start AppendTilesetAnimToBuffer AppendTilesetAnimToBuffer: @ 0x080A0248 @@ -329427,30 +329427,30 @@ _080A02D8: .4byte 0x040000D4 _080A02DC: .4byte gUnknown_20372C4 thumb_func_end TransferTilesetAnimsBuffer - thumb_func_start sub_080A02E0 -sub_080A02E0: @ 0x080A02E0 + thumb_func_start InitTilesetAnimations +InitTilesetAnimations: @ 0x080A02E0 push {lr} - bl sub_080A021C - bl sub_080A0370 - bl sub_080A03AC + bl ResetTilesetAnimBuffer + bl _InitPrimaryTilesetAnimation + bl _InitSecondaryTilesetAnimation pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A02E0 + thumb_func_end InitTilesetAnimations - thumb_func_start sub_080A02F4 -sub_080A02F4: @ 0x080A02F4 + thumb_func_start InitSecondaryTilesetAnimation +InitSecondaryTilesetAnimation: @ 0x080A02F4 push {lr} - bl sub_080A03AC + bl _InitSecondaryTilesetAnimation pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A02F4 + thumb_func_end InitSecondaryTilesetAnimation - thumb_func_start sub_080A0300 -sub_080A0300: @ 0x080A0300 + thumb_func_start UpdateTilesetAnimations +UpdateTilesetAnimations: @ 0x080A0300 push {r4, lr} - bl sub_080A021C + bl ResetTilesetAnimBuffer ldr r2, _080A0358 ldrh r0, [r2] adds r0, #1 @@ -329501,10 +329501,10 @@ _080A0360: .4byte gUnknown_3000F3A _080A0364: .4byte gUnknown_3000F3C _080A0368: .4byte gUnknown_3000F40 _080A036C: .4byte gUnknown_3000F44 - thumb_func_end sub_080A0300 + thumb_func_end UpdateTilesetAnimations - thumb_func_start sub_080A0370 -sub_080A0370: @ 0x080A0370 + thumb_func_start _InitPrimaryTilesetAnimation +_InitPrimaryTilesetAnimation: @ 0x080A0370 push {lr} ldr r0, _080A039C movs r1, #0 @@ -329531,10 +329531,10 @@ _080A039C: .4byte gUnknown_3000F36 _080A03A0: .4byte gUnknown_3000F38 _080A03A4: .4byte gUnknown_3000F40 _080A03A8: .4byte gUnknown_2036FB8 - thumb_func_end sub_080A0370 + thumb_func_end _InitPrimaryTilesetAnimation - thumb_func_start sub_080A03AC -sub_080A03AC: @ 0x080A03AC + thumb_func_start _InitSecondaryTilesetAnimation +_InitSecondaryTilesetAnimation: @ 0x080A03AC push {lr} ldr r0, _080A03D8 movs r1, #0 @@ -329561,7 +329561,7 @@ _080A03D8: .4byte gUnknown_3000F3A _080A03DC: .4byte gUnknown_3000F3C _080A03E0: .4byte gUnknown_3000F44 _080A03E4: .4byte gUnknown_2036FB8 - thumb_func_end sub_080A03AC + thumb_func_end _InitSecondaryTilesetAnimation thumb_func_start sub_080A03E8 sub_080A03E8: @ 0x080A03E8 @@ -330330,49 +330330,49 @@ TilesetAnim_Mauville: @ 0x080A09B0 bne _080A09C8 lsrs r0, r4, #0x13 movs r1, #0 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A09C8: cmp r5, #1 bne _080A09D4 lsrs r0, r4, #0x13 movs r1, #1 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A09D4: cmp r5, #2 bne _080A09E0 lsrs r0, r4, #0x13 movs r1, #2 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A09E0: cmp r5, #3 bne _080A09EC lsrs r0, r4, #0x13 movs r1, #3 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A09EC: cmp r5, #4 bne _080A09F8 lsrs r0, r4, #0x13 movs r1, #4 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A09F8: cmp r5, #5 bne _080A0A04 lsrs r0, r4, #0x13 movs r1, #5 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A0A04: cmp r5, #6 bne _080A0A10 lsrs r0, r4, #0x13 movs r1, #6 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A0A10: cmp r5, #7 bne _080A0A1C lsrs r0, r4, #0x13 movs r1, #7 - bl sub_080A0C5C + bl QueueAnimTiles_Mauville_Flowers _080A0A1C: pop {r4, r5} pop {r0} @@ -330702,8 +330702,8 @@ _080A0C54: .4byte gUnknown_84ED510 _080A0C58: .4byte 0x06007E00 thumb_func_end QueueAnimTiles_Pacifidlog_WaterCurrents - thumb_func_start sub_080A0C5C -sub_080A0C5C: @ 0x080A0C5C + thumb_func_start QueueAnimTiles_Mauville_Flowers +QueueAnimTiles_Mauville_Flowers: @ 0x080A0C5C push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -330773,7 +330773,7 @@ _080A0CEC: .4byte gUnknown_84EDAF0 _080A0CF0: .4byte gUnknown_84EDA50 _080A0CF4: .4byte gUnknown_84EDB00 _080A0CF8: .4byte gUnknown_84EDA70 - thumb_func_end sub_080A0C5C + thumb_func_end QueueAnimTiles_Mauville_Flowers thumb_func_start QueueAnimTiles_Rustboro_WindyWater QueueAnimTiles_Rustboro_WindyWater: @ 0x080A0CFC @@ -331010,7 +331010,7 @@ TilesetAnim_SootopolisGym: @ 0x080A0EA0 cmp r0, #0 bne _080A0EB4 lsrs r0, r1, #0x13 - bl sub_080A0F78 + bl QueueAnimTiles_SootopolisGym_Waterfalls _080A0EB4: pop {r0} bx r0 @@ -331069,7 +331069,7 @@ TilesetAnim_BattlePyramid: @ 0x080A0EFC bne _080A0F18 lsrs r4, r4, #0x13 adds r0, r4, #0 - bl sub_080A1088 + bl QueueAnimTiles_BattlePyramid_Torch adds r0, r4, #0 bl sub_080A10B4 _080A0F18: @@ -331089,7 +331089,7 @@ TilesetAnim_BattleDome: @ 0x080A0F20 cmp r0, #0 bne _080A0F34 lsrs r0, r1, #0x12 - bl sub_080A10E0 + bl BlendAnimPalette_BattleDome_FloorLights _080A0F34: pop {r0} bx r0 @@ -331105,7 +331105,7 @@ TilesetAnim_BattleDome2: @ 0x080A0F38 cmp r0, #0 bne _080A0F4C lsrs r0, r1, #0x12 - bl sub_080A114C + bl BlendAnimPalette_BattleDome_FloorLightsNoBlend _080A0F4C: pop {r0} bx r0 @@ -331132,8 +331132,8 @@ _080A0F70: .4byte gUnknown_84EF548 _080A0F74: .4byte 0x06003E00 thumb_func_end QueueAnimTiles_Building_TVTurnedOn - thumb_func_start sub_080A0F78 -sub_080A0F78: @ 0x080A0F78 + thumb_func_start QueueAnimTiles_SootopolisGym_Waterfalls +QueueAnimTiles_SootopolisGym_Waterfalls: @ 0x080A0F78 push {r4, lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -331164,7 +331164,7 @@ _080A0FB0: .4byte gUnknown_84F0150 _080A0FB4: .4byte 0x06007E00 _080A0FB8: .4byte gUnknown_84F015C _080A0FBC: .4byte 0x06007A00 - thumb_func_end sub_080A0F78 + thumb_func_end QueueAnimTiles_SootopolisGym_Waterfalls thumb_func_start QueueAnimTiles_EliteFour_WallLights QueueAnimTiles_EliteFour_WallLights: @ 0x080A0FC0 @@ -331274,8 +331274,8 @@ _080A1080: .4byte gUnknown_84F89D0 _080A1084: .4byte 0x06005E00 thumb_func_end QueueAnimTiles_Sootopolis_StormyWater - thumb_func_start sub_080A1088 -sub_080A1088: @ 0x080A1088 + thumb_func_start QueueAnimTiles_BattlePyramid_Torch +QueueAnimTiles_BattlePyramid_Torch: @ 0x080A1088 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -331295,7 +331295,7 @@ sub_080A1088: @ 0x080A1088 .align 2, 0 _080A10AC: .4byte gUnknown_84FCF70 _080A10B0: .4byte 0x060052E0 - thumb_func_end sub_080A1088 + thumb_func_end QueueAnimTiles_BattlePyramid_Torch thumb_func_start sub_080A10B4 sub_080A10B4: @ 0x080A10B4 @@ -331320,8 +331320,8 @@ _080A10D8: .4byte gUnknown_84FCF7C _080A10DC: .4byte 0x060050E0 thumb_func_end sub_080A10B4 - thumb_func_start sub_080A10E0 -sub_080A10E0: @ 0x080A10E0 + thumb_func_start BlendAnimPalette_BattleDome_FloorLights +BlendAnimPalette_BattleDome_FloorLights: @ 0x080A10E0 push {lr} lsls r0, r0, #0x10 ldr r2, _080A1130 @@ -331345,7 +331345,7 @@ sub_080A10E0: @ 0x080A10E0 movs r1, #0x10 bl BlendPalette ldr r0, _080A113C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -331363,14 +331363,14 @@ _080A112A: _080A1130: .4byte gUnknown_84FCF88 _080A1134: .4byte gUnknown_20374B4 _080A1138: .4byte gUnknown_2037C74 -_080A113C: .4byte sub_08149EBC +_080A113C: .4byte Phase2Task_Magma _080A1140: .4byte gUnknown_3000F44 _080A1144: .4byte TilesetAnim_BattleDome2 _080A1148: .4byte gUnknown_3000F3C - thumb_func_end sub_080A10E0 + thumb_func_end BlendAnimPalette_BattleDome_FloorLights - thumb_func_start sub_080A114C -sub_080A114C: @ 0x080A114C + thumb_func_start BlendAnimPalette_BattleDome_FloorLightsNoBlend +BlendAnimPalette_BattleDome_FloorLightsNoBlend: @ 0x080A114C push {lr} lsls r0, r0, #0x10 ldr r2, _080A11A4 @@ -331384,7 +331384,7 @@ sub_080A114C: @ 0x080A114C movs r2, #0x10 bl CpuSet ldr r0, _080A11AC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -331415,14 +331415,14 @@ _080A119E: .align 2, 0 _080A11A4: .4byte gUnknown_84FCF88 _080A11A8: .4byte gUnknown_20374B4 -_080A11AC: .4byte sub_08149EBC +_080A11AC: .4byte Phase2Task_Magma _080A11B0: .4byte gUnknown_2037C74 _080A11B4: .4byte gUnknown_3000F3C _080A11B8: .4byte gUnknown_3000F44 - thumb_func_end sub_080A114C + thumb_func_end BlendAnimPalette_BattleDome_FloorLightsNoBlend - thumb_func_start sub_080A11BC -sub_080A11BC: @ 0x080A11BC + thumb_func_start LoadCompressedPalette +LoadCompressedPalette: @ 0x080A11BC push {r4, r5, r6, lr} adds r4, r1, #0 adds r5, r2, #0 @@ -331452,10 +331452,10 @@ sub_080A11BC: @ 0x080A11BC _080A11F4: .4byte gUnknown_2037C88 _080A11F8: .4byte gUnknown_20373B4 _080A11FC: .4byte gUnknown_20377B4 - thumb_func_end sub_080A11BC + thumb_func_end LoadCompressedPalette - thumb_func_start sub_080A1200 -sub_080A1200: @ 0x080A1200 + thumb_func_start LoadPalette +LoadPalette: @ 0x080A1200 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -331480,10 +331480,10 @@ sub_080A1200: @ 0x080A1200 .align 2, 0 _080A1230: .4byte gUnknown_20373B4 _080A1234: .4byte gUnknown_20377B4 - thumb_func_end sub_080A1200 + thumb_func_end LoadPalette - thumb_func_start sub_080A1238 -sub_080A1238: @ 0x080A1238 + thumb_func_start FillPalette +FillPalette: @ 0x080A1238 push {r4, r5, r6, lr} sub sp, #4 adds r6, r0, #0 @@ -331520,7 +331520,7 @@ sub_080A1238: @ 0x080A1238 .align 2, 0 _080A1280: .4byte gUnknown_20373B4 _080A1284: .4byte gUnknown_20377B4 - thumb_func_end sub_080A1238 + thumb_func_end FillPalette thumb_func_start TransferPlttBuffer TransferPlttBuffer: @ 0x080A1288 @@ -331555,7 +331555,7 @@ TransferPlttBuffer: @ 0x080A1288 ands r0, r1 cmp r0, #0 beq _080A12CA - bl sub_080A2230 + bl UpdateBlendRegisters _080A12CA: pop {r4, r5} pop {r0} @@ -331568,8 +331568,8 @@ _080A12DC: .4byte 0x80000200 _080A12E0: .4byte gUnknown_2037C84 thumb_func_end TransferPlttBuffer - thumb_func_start sub_080A12E4 -sub_080A12E4: @ 0x080A12E4 + thumb_func_start UpdatePaletteFade +UpdatePaletteFade: @ 0x080A12E4 push {lr} ldr r0, _080A12F4 ldr r0, [r0] @@ -331586,7 +331586,7 @@ _080A12F8: ands r1, r0 cmp r1, #0 bne _080A1310 - bl sub_080A19A0 + bl UpdateNormalPaletteFade b _080A131E .align 2, 0 _080A130C: .4byte gUnknown_2037C74 @@ -331596,7 +331596,7 @@ _080A1310: bl sub_080A1D00 b _080A131E _080A131A: - bl sub_080A2114 + bl UpdateHardwarePaletteFade _080A131E: lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -331613,7 +331613,7 @@ _080A1330: .align 2, 0 _080A1334: .4byte gUnknown_2037C84 _080A1338: .4byte gUnknown_2037C74 - thumb_func_end sub_080A12E4 + thumb_func_end UpdatePaletteFade thumb_func_start ResetPaletteFade ResetPaletteFade: @ 0x080A133C @@ -331668,8 +331668,8 @@ _080A1394: .4byte gUnknown_20377B4 _080A1398: .4byte 0x000001FF thumb_func_end ReadPlttIntoBuffers - thumb_func_start sub_080A139C -sub_080A139C: @ 0x080A139C + thumb_func_start BeginNormalPaletteFade +BeginNormalPaletteFade: @ 0x080A139C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -331783,7 +331783,7 @@ _080A1478: orrs r3, r0 _080A147C: strb r3, [r5, #8] - bl sub_080A12E4 + bl UpdatePaletteFade ldr r4, _080A14D4 ldrb r1, [r4, #8] lsrs r5, r1, #7 @@ -331808,7 +331808,7 @@ _080A147C: ands r0, r1 cmp r0, #0 beq _080A14B8 - bl sub_080A2230 + bl UpdateBlendRegisters _080A14B8: ldr r2, _080A14D4 lsls r3, r5, #7 @@ -331829,7 +331829,7 @@ _080A14D4: .4byte gUnknown_2037C74 _080A14D8: .4byte gUnknown_20377B4 _080A14DC: .4byte 0x04000100 _080A14E0: .4byte gUnknown_2037C84 - thumb_func_end sub_080A139C + thumb_func_end BeginNormalPaletteFade thumb_func_start unref_sub_80A1C1C unref_sub_80A1C1C: @ 0x080A14E4 @@ -331858,7 +331858,7 @@ unref_sub_80A1C1C: @ 0x080A14E4 adds r1, r4, #0 adds r2, r6, #0 ldr r3, [sp, #4] - bl sub_080A139C + bl BeginNormalPaletteFade lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #8 @@ -331869,8 +331869,8 @@ unref_sub_80A1C1C: @ 0x080A14E4 bx r1 thumb_func_end unref_sub_80A1C1C - thumb_func_start sub_080A152C -sub_080A152C: @ 0x080A152C + thumb_func_start unref_sub_80A1C64 +unref_sub_80A1C64: @ 0x080A152C push {r4, r5, r6, r7, lr} adds r6, r1, #0 lsls r0, r0, #0x18 @@ -331912,7 +331912,7 @@ _080A1572: bne _080A1588 adds r0, r4, #0 adds r1, r6, #0 - bl sub_080A15A4 + bl unused_sub_80A1CDC b _080A158C .align 2, 0 _080A1584: .4byte gUnknown_2037BB4 @@ -331922,7 +331922,7 @@ _080A1588: _080A158C: adds r0, r4, #0 adds r1, r6, #0 - bl sub_080A1708 + bl unused_sub_80A1E40 _080A1594: adds r0, r5, #1 lsls r0, r0, #0x18 @@ -331932,10 +331932,10 @@ _080A1594: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080A152C + thumb_func_end unref_sub_80A1C64 - thumb_func_start sub_080A15A4 -sub_080A15A4: @ 0x080A15A4 + thumb_func_start unused_sub_80A1CDC +unused_sub_80A1CDC: @ 0x080A15A4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -332114,10 +332114,10 @@ _080A16F8: .4byte gUnknown_20377B4 _080A16FC: .4byte 0x000003FF _080A1700: .4byte 0xFFE007FF _080A1704: .4byte 0xFFFFF01F - thumb_func_end sub_080A15A4 + thumb_func_end unused_sub_80A1CDC - thumb_func_start sub_080A1708 -sub_080A1708: @ 0x080A1708 + thumb_func_start unused_sub_80A1E40 +unused_sub_80A1E40: @ 0x080A1708 push {r4, r5, r6, lr} adds r4, r0, #0 ldr r3, _080A1760 @@ -332215,7 +332215,7 @@ _080A17BC: bx r0 .align 2, 0 _080A17C4: .4byte gUnknown_20377B4 - thumb_func_end sub_080A1708 + thumb_func_end unused_sub_80A1E40 thumb_func_start unused_sub_80A1F00 unused_sub_80A1F00: @ 0x080A17C8 @@ -332271,7 +332271,7 @@ ResetPaletteStructByUid: @ 0x080A1820 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A196C + bl GetPaletteNumByUid lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x10 @@ -332394,7 +332394,7 @@ unref_sub_80A2048: @ 0x080A1910 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A196C + bl GetPaletteNumByUid lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x10 @@ -332420,7 +332420,7 @@ unref_sub_80A2074: @ 0x080A193C push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080A196C + bl GetPaletteNumByUid lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x10 @@ -332442,8 +332442,8 @@ _080A1962: _080A1968: .4byte gUnknown_2037BB4 thumb_func_end unref_sub_80A2074 - thumb_func_start sub_080A196C -sub_080A196C: @ 0x080A196C + thumb_func_start GetPaletteNumByUid +GetPaletteNumByUid: @ 0x080A196C push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -332472,10 +332472,10 @@ _080A1990: _080A199C: pop {r1} bx r1 - thumb_func_end sub_080A196C + thumb_func_end GetPaletteNumByUid - thumb_func_start sub_080A19A0 -sub_080A19A0: @ 0x080A19A0 + thumb_func_start UpdateNormalPaletteFade +UpdateNormalPaletteFade: @ 0x080A19A0 push {r4, r5, r6, r7, lr} ldr r4, _080A19B4 ldrb r1, [r4, #7] @@ -332488,7 +332488,7 @@ sub_080A19A0: @ 0x080A19A0 .align 2, 0 _080A19B4: .4byte gUnknown_2037C74 _080A19B8: - bl sub_080A2284 + bl IsSoftwarePaletteFadeFinishing lsls r0, r0, #0x18 cmp r0, #0 beq _080A19C6 @@ -332646,7 +332646,7 @@ _080A1AD4: bx r1 .align 2, 0 _080A1ADC: .4byte 0xFFFFF83F - thumb_func_end sub_080A19A0 + thumb_func_end UpdateNormalPaletteFade thumb_func_start InvertPlttBuffer InvertPlttBuffer: @ 0x080A1AE0 @@ -332871,15 +332871,15 @@ BeginFastPaletteFade: @ 0x080A1C58 movs r2, #0x10 orrs r1, r2 strb r1, [r3, #0xa] - bl sub_080A1C7C + bl BeginFastPaletteFadeInternal pop {r0} bx r0 .align 2, 0 _080A1C78: .4byte gUnknown_2037C74 thumb_func_end BeginFastPaletteFade - thumb_func_start sub_080A1C7C -sub_080A1C7C: @ 0x080A1C7C + thumb_func_start BeginFastPaletteFadeInternal +BeginFastPaletteFadeInternal: @ 0x080A1C7C push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -332932,7 +332932,7 @@ _080A1CCE: ldr r2, _080A1CF8 bl CpuSet _080A1CE4: - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #4 pop {r4} pop {r0} @@ -332942,7 +332942,7 @@ _080A1CF0: .4byte gUnknown_2037C74 _080A1CF4: .4byte gUnknown_20377B4 _080A1CF8: .4byte 0x01000200 _080A1CFC: .4byte 0x00007FFF - thumb_func_end sub_080A1C7C + thumb_func_end BeginFastPaletteFadeInternal thumb_func_start sub_080A1D00 sub_080A1D00: @ 0x080A1D00 @@ -332963,7 +332963,7 @@ sub_080A1D00: @ 0x080A1D00 .align 2, 0 _080A1D1C: .4byte gUnknown_2037C74 _080A1D20: - bl sub_080A2284 + bl IsSoftwarePaletteFadeFinishing lsls r0, r0, #0x18 cmp r0, #0 beq _080A1D2E @@ -333410,8 +333410,8 @@ _080A2070: .4byte 0x05000100 _080A2074: .4byte gUnknown_2037C74 thumb_func_end sub_080A1D00 - thumb_func_start sub_080A2078 -sub_080A2078: @ 0x080A2078 + thumb_func_start BeginHardwarePaletteFade +BeginHardwarePaletteFade: @ 0x080A2078 push {r4, r5, r6, r7, lr} ldr r5, [sp, #0x14] lsls r0, r0, #0x18 @@ -333490,10 +333490,10 @@ _080A210C: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080A2078 + thumb_func_end BeginHardwarePaletteFade - thumb_func_start sub_080A2114 -sub_080A2114: @ 0x080A2114 + thumb_func_start UpdateHardwarePaletteFade +UpdateHardwarePaletteFade: @ 0x080A2114 push {r4, r5, r6, r7, lr} ldr r2, _080A2128 ldrb r1, [r2, #7] @@ -333642,10 +333642,10 @@ _080A2224: bx r1 .align 2, 0 _080A222C: .4byte 0xFFFFF83F - thumb_func_end sub_080A2114 + thumb_func_end UpdateHardwarePaletteFade - thumb_func_start sub_080A2230 -sub_080A2230: @ 0x080A2230 + thumb_func_start UpdateBlendRegisters +UpdateBlendRegisters: @ 0x080A2230 push {r4, lr} ldr r4, _080A227C ldrh r1, [r4] @@ -333685,10 +333685,10 @@ _080A2274: .align 2, 0 _080A227C: .4byte gUnknown_2037C74 _080A2280: .4byte 0xFFFFF83F - thumb_func_end sub_080A2230 + thumb_func_end UpdateBlendRegisters - thumb_func_start sub_080A2284 -sub_080A2284: @ 0x080A2284 + thumb_func_start IsSoftwarePaletteFadeFinishing +IsSoftwarePaletteFadeFinishing: @ 0x080A2284 push {r4, lr} ldr r3, _080A22BC ldrb r4, [r3, #0xa] @@ -333742,10 +333742,10 @@ _080A22E2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080A2284 + thumb_func_end IsSoftwarePaletteFadeFinishing - thumb_func_start sub_080A22E8 -sub_080A22E8: @ 0x080A22E8 + thumb_func_start BlendPalettes +BlendPalettes: @ 0x080A22E8 push {r4, r5, r6, r7, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -333778,7 +333778,7 @@ _080A231C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A22E8 + thumb_func_end BlendPalettes thumb_func_start BlendPalettesUnfaded BlendPalettesUnfaded: @ 0x080A2324 @@ -333795,7 +333795,7 @@ BlendPalettesUnfaded: @ 0x080A2324 ldr r4, _080A2354 str r4, [r3, #8] ldr r3, [r3, #8] - bl sub_080A22E8 + bl BlendPalettes pop {r4, r5} pop {r0} bx r0 @@ -334079,7 +334079,7 @@ sub_080A250C: @ 0x080A250C lsrs r5, r5, #0x18 mov r8, r5 ldr r0, _080A2564 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r1, _080A2568 @@ -334185,10 +334185,10 @@ sub_080A25FC: @ 0x080A25FC push {lr} b _080A2604 _080A2600: - bl sub_080A8964 + bl DestroyTask _080A2604: ldr r0, _080A2618 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -334227,7 +334227,7 @@ sub_080A261C: @ 0x080A261C ldrb r1, [r4] ldrh r2, [r4, #0xe] adds r0, r3, #0 - bl sub_080A22E8 + bl BlendPalettes ldrh r1, [r4] movs r6, #0 ldrsh r0, [r4, r6] @@ -334237,7 +334237,7 @@ sub_080A261C: @ 0x080A261C cmp r0, r2 bne _080A2674 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080A2694 .align 2, 0 _080A2670: .4byte gUnknown_3005B68 @@ -334267,8 +334267,8 @@ _080A2694: .align 2, 0 thumb_func_end sub_080A261C - thumb_func_start sub_080A269C -sub_080A269C: @ 0x080A269C + thumb_func_start InitMapMusic +InitMapMusic: @ 0x080A269C push {lr} ldr r1, _080A26AC movs r0, #0 @@ -334278,10 +334278,10 @@ sub_080A269C: @ 0x080A269C bx r0 .align 2, 0 _080A26AC: .4byte gUnknown_3005B58 - thumb_func_end sub_080A269C + thumb_func_end InitMapMusic - thumb_func_start sub_080A26B0 -sub_080A26B0: @ 0x080A26B0 + thumb_func_start MapMusicMain +MapMusicMain: @ 0x080A26B0 push {r4, r5, lr} ldr r0, _080A26C8 ldrb r1, [r0] @@ -334310,12 +334310,12 @@ _080A26F0: strb r0, [r2] ldr r0, _080A2700 ldrh r0, [r0] - bl sub_080A3040 + bl PlayBGM b _080A2792 .align 2, 0 _080A2700: .4byte gUnknown_3000F48 _080A2704: - bl sub_080A2B20 + bl IsBGMStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080A2792 @@ -334329,11 +334329,11 @@ _080A2704: _080A271C: .4byte gUnknown_3000F4A _080A2720: .4byte gUnknown_3000F4C _080A2724: - bl sub_080A2B20 + bl IsBGMStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080A2792 - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _080A2792 @@ -334347,18 +334347,18 @@ _080A2724: movs r0, #2 strb r0, [r1] ldrh r0, [r2] - bl sub_080A3040 + bl PlayBGM b _080A2792 .align 2, 0 _080A2754: .4byte gUnknown_3000F48 _080A2758: .4byte gUnknown_3000F4A _080A275C: .4byte gUnknown_3000F4C _080A2760: - bl sub_080A2B20 + bl IsBGMStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080A2792 - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _080A2792 @@ -334366,7 +334366,7 @@ _080A2760: ldrh r0, [r4] ldr r5, _080A279C ldrb r1, [r5] - bl sub_080A2A5C + bl FadeInNewBGM ldr r1, _080A27A0 ldrh r0, [r4] strh r0, [r1] @@ -334385,7 +334385,7 @@ _080A2798: .4byte gUnknown_3000F4A _080A279C: .4byte gUnknown_3000F4D _080A27A0: .4byte gUnknown_3000F48 _080A27A4: .4byte gUnknown_3000F4C - thumb_func_end sub_080A26B0 + thumb_func_end MapMusicMain thumb_func_start ResetMapMusic ResetMapMusic: @ 0x080A27A8 @@ -334415,8 +334415,8 @@ sub_080A27CC: @ 0x080A27CC _080A27D4: .4byte gUnknown_3000F48 thumb_func_end sub_080A27CC - thumb_func_start sub_080A27D8 -sub_080A27D8: @ 0x080A27D8 + thumb_func_start PlayNewMapMusic +PlayNewMapMusic: @ 0x080A27D8 ldr r1, _080A27EC strh r0, [r1] ldr r1, _080A27F0 @@ -334430,10 +334430,10 @@ sub_080A27D8: @ 0x080A27D8 _080A27EC: .4byte gUnknown_3000F48 _080A27F0: .4byte gUnknown_3000F4A _080A27F4: .4byte gUnknown_3000F4C - thumb_func_end sub_080A27D8 + thumb_func_end PlayNewMapMusic - thumb_func_start sub_080A27F8 -sub_080A27F8: @ 0x080A27F8 + thumb_func_start StopMapMusic +StopMapMusic: @ 0x080A27F8 ldr r0, _080A280C movs r1, #0 strh r1, [r0] @@ -334447,7 +334447,7 @@ sub_080A27F8: @ 0x080A27F8 _080A280C: .4byte gUnknown_3000F48 _080A2810: .4byte gUnknown_3000F4A _080A2814: .4byte gUnknown_3000F4C - thumb_func_end sub_080A27F8 + thumb_func_end StopMapMusic thumb_func_start FadeOutMapMusic FadeOutMapMusic: @ 0x080A2818 @@ -334547,7 +334547,7 @@ FadeInNewMapMusic: @ 0x080A28C8 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080A2A5C + bl FadeInNewBGM ldr r0, _080A28F4 strh r4, [r0] ldr r0, _080A28F8 @@ -334591,8 +334591,8 @@ _080A2922: .align 2, 0 thumb_func_end IsNotWaitingForBGMStop - thumb_func_start sub_080A2928 -sub_080A2928: @ 0x080A2928 + thumb_func_start PlayFanfareByFanfareNum +PlayFanfareByFanfareNum: @ 0x080A2928 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -334614,10 +334614,10 @@ sub_080A2928: @ 0x080A2928 _080A2950: .4byte gUnknown_30074D0 _080A2954: .4byte gUnknown_84FCFC8 _080A2958: .4byte gUnknown_3000F4E - thumb_func_end sub_080A2928 + thumb_func_end PlayFanfareByFanfareNum - thumb_func_start sub_080A295C -sub_080A295C: @ 0x080A295C + thumb_func_start WaitFanfare +WaitFanfare: @ 0x080A295C push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -334647,10 +334647,10 @@ _080A298E: _080A2990: pop {r1} bx r1 - thumb_func_end sub_080A295C + thumb_func_end WaitFanfare - thumb_func_start sub_080A2994 -sub_080A2994: @ 0x080A2994 + thumb_func_start StopFanfareByFanfareNum +StopFanfareByFanfareNum: @ 0x080A2994 push {lr} lsls r0, r0, #0x18 ldr r1, _080A29A8 @@ -334662,10 +334662,10 @@ sub_080A2994: @ 0x080A2994 bx r0 .align 2, 0 _080A29A8: .4byte gUnknown_84FCFC8 - thumb_func_end sub_080A2994 + thumb_func_end StopFanfareByFanfareNum - thumb_func_start sub_080A29AC -sub_080A29AC: @ 0x080A29AC + thumb_func_start PlayFanfare +PlayFanfare: @ 0x080A29AC push {lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -334677,7 +334677,7 @@ _080A29B6: bne _080A29D0 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080A2928 + bl PlayFanfareByFanfareNum bl CreateFanfareTask b _080A29E2 .align 2, 0 @@ -334688,19 +334688,19 @@ _080A29D0: cmp r1, #0x11 bls _080A29B6 movs r0, #0 - bl sub_080A2928 + bl PlayFanfareByFanfareNum bl CreateFanfareTask _080A29E2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A29AC + thumb_func_end PlayFanfare - thumb_func_start sub_080A29E8 -sub_080A29E8: @ 0x080A29E8 + thumb_func_start IsFanfareTaskInactive +IsFanfareTaskInactive: @ 0x080A29E8 push {lr} ldr r0, _080A29FC - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -334708,17 +334708,17 @@ sub_080A29E8: @ 0x080A29E8 movs r0, #1 b _080A2A02 .align 2, 0 -_080A29FC: .4byte sub_080A2A08 +_080A29FC: .4byte Task_Fanfare _080A2A00: movs r0, #0 _080A2A02: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A29E8 + thumb_func_end IsFanfareTaskInactive - thumb_func_start sub_080A2A08 -sub_080A2A08: @ 0x080A2A08 + thumb_func_start Task_Fanfare +Task_Fanfare: @ 0x080A2A08 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -334735,38 +334735,38 @@ _080A2A20: ldr r0, _080A2A34 bl m4aMPlayContinue adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080A2A2C: pop {r4} pop {r0} bx r0 .align 2, 0 _080A2A34: .4byte gUnknown_30074D0 - thumb_func_end sub_080A2A08 + thumb_func_end Task_Fanfare thumb_func_start CreateFanfareTask CreateFanfareTask: @ 0x080A2A38 push {r4, lr} ldr r4, _080A2A58 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080A2A52 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask _080A2A52: pop {r4} pop {r0} bx r0 .align 2, 0 -_080A2A58: .4byte sub_080A2A08 +_080A2A58: .4byte Task_Fanfare thumb_func_end CreateFanfareTask - thumb_func_start sub_080A2A5C -sub_080A2A5C: @ 0x080A2A5C + thumb_func_start FadeInNewBGM +FadeInNewBGM: @ 0x080A2A5C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -334804,10 +334804,10 @@ _080A2A78: _080A2AA4: .4byte gUnknown_3005B58 _080A2AA8: .4byte 0x0000FFFF _080A2AAC: .4byte gUnknown_30074D0 - thumb_func_end sub_080A2A5C + thumb_func_end FadeInNewBGM - thumb_func_start sub_080A2AB0 -sub_080A2AB0: @ 0x080A2AB0 + thumb_func_start PlayBattleBGM +PlayBattleBGM: @ 0x080A2AB0 push {lr} adds r1, r0, #0 lsls r1, r1, #0x18 @@ -334818,10 +334818,10 @@ sub_080A2AB0: @ 0x080A2AB0 bx r0 .align 2, 0 _080A2AC4: .4byte gUnknown_30074D0 - thumb_func_end sub_080A2AB0 + thumb_func_end PlayBattleBGM - thumb_func_start sub_080A2AC8 -sub_080A2AC8: @ 0x080A2AC8 + thumb_func_start IsBGMPausedOrStopped +IsBGMPausedOrStopped: @ 0x080A2AC8 push {lr} ldr r0, _080A2AE0 ldr r1, [r0, #4] @@ -334842,7 +334842,7 @@ _080A2AEA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A2AC8 + thumb_func_end IsBGMPausedOrStopped thumb_func_start sub_080A2AF0 sub_080A2AF0: @ 0x080A2AF0 @@ -334872,8 +334872,8 @@ sub_080A2B08: @ 0x080A2B08 _080A2B1C: .4byte gUnknown_30074D0 thumb_func_end sub_080A2B08 - thumb_func_start sub_080A2B20 -sub_080A2B20: @ 0x080A2B20 + thumb_func_start IsBGMStopped +IsBGMStopped: @ 0x080A2B20 push {lr} ldr r0, _080A2B30 ldrh r0, [r0, #4] @@ -334889,10 +334889,10 @@ _080A2B36: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A2B20 + thumb_func_end IsBGMStopped - thumb_func_start sub_080A2B3C -sub_080A2B3C: @ 0x080A2B3C + thumb_func_start PlayCry1 +PlayCry1: @ 0x080A2B3C push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -334913,7 +334913,7 @@ sub_080A2B3C: @ 0x080A2B3C adds r1, r4, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal ldr r1, _080A2B84 movs r0, #2 strb r0, [r1] @@ -334926,7 +334926,7 @@ sub_080A2B3C: @ 0x080A2B3C _080A2B7C: .4byte gUnknown_30074D0 _080A2B80: .4byte 0x0000FFFF _080A2B84: .4byte gUnknown_203808C - thumb_func_end sub_080A2B3C + thumb_func_end PlayCry1 thumb_func_start PlayCry2 PlayCry2: @ 0x080A2B88 @@ -334942,15 +334942,15 @@ PlayCry2: @ 0x080A2B88 asrs r2, r2, #0x18 movs r4, #0 str r4, [sp] - bl sub_080A2D14 + bl PlayCryInternal add sp, #4 pop {r4} pop {r0} bx r0 thumb_func_end PlayCry2 - thumb_func_start sub_080A2BAC -sub_080A2BAC: @ 0x080A2BAC + thumb_func_start PlayCry3 +PlayCry3: @ 0x080A2BAC push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -334967,7 +334967,7 @@ sub_080A2BAC: @ 0x080A2BAC adds r0, r6, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal b _080A2BF6 _080A2BD2: ldr r0, _080A2C00 @@ -334980,7 +334980,7 @@ _080A2BD2: adds r0, r6, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal ldr r1, _080A2C08 movs r0, #2 strb r0, [r1] @@ -334994,10 +334994,10 @@ _080A2BF6: _080A2C00: .4byte gUnknown_30074D0 _080A2C04: .4byte 0x0000FFFF _080A2C08: .4byte gUnknown_203808C - thumb_func_end sub_080A2BAC + thumb_func_end PlayCry3 - thumb_func_start sub_080A2C0C -sub_080A2C0C: @ 0x080A2C0C + thumb_func_start PlayCry4 +PlayCry4: @ 0x080A2C0C push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -335016,7 +335016,7 @@ sub_080A2C0C: @ 0x080A2C0C str r2, [sp] movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal b _080A2C5C _080A2C36: ldr r0, _080A2C64 @@ -335036,7 +335036,7 @@ _080A2C4C: adds r0, r6, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal _080A2C5C: add sp, #4 pop {r4, r5, r6} @@ -335046,10 +335046,10 @@ _080A2C5C: _080A2C64: .4byte gUnknown_2022C90 _080A2C68: .4byte gUnknown_30074D0 _080A2C6C: .4byte 0x0000FFFF - thumb_func_end sub_080A2C0C + thumb_func_end PlayCry4 - thumb_func_start sub_080A2C70 -sub_080A2C70: @ 0x080A2C70 + thumb_func_start PlayCry6 +PlayCry6: @ 0x080A2C70 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -335066,7 +335066,7 @@ sub_080A2C70: @ 0x080A2C70 adds r0, r6, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal b _080A2CB6 _080A2C96: ldr r0, _080A2CC0 @@ -335079,7 +335079,7 @@ _080A2C96: adds r0, r6, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal ldr r1, _080A2CC8 movs r0, #2 strb r0, [r1] @@ -335092,10 +335092,10 @@ _080A2CB6: _080A2CC0: .4byte gUnknown_30074D0 _080A2CC4: .4byte 0x0000FFFF _080A2CC8: .4byte gUnknown_203808C - thumb_func_end sub_080A2C70 + thumb_func_end PlayCry6 - thumb_func_start sub_080A2CCC -sub_080A2CCC: @ 0x080A2CCC + thumb_func_start PlayCry5 +PlayCry5: @ 0x080A2CCC push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -335113,7 +335113,7 @@ sub_080A2CCC: @ 0x080A2CCC movs r1, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal ldr r1, _080A2D10 movs r0, #2 strb r0, [r1] @@ -335126,10 +335126,10 @@ sub_080A2CCC: @ 0x080A2CCC _080A2D08: .4byte gUnknown_30074D0 _080A2D0C: .4byte 0x0000FFFF _080A2D10: .4byte gUnknown_203808C - thumb_func_end sub_080A2CCC + thumb_func_end PlayCry5 - thumb_func_start sub_080A2D14 -sub_080A2D14: @ 0x080A2D14 + thumb_func_start PlayCryInternal +PlayCryInternal: @ 0x080A2D14 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -335286,7 +335286,7 @@ _080A2E2A: ldr r0, [sp] bl SetPokemonCryPriority adds r0, r7, #0 - bl sub_0806CFD4 + bl SpeciesToCryId adds r7, r0, #0 movs r1, #0x7f ands r1, r7 @@ -335399,29 +335399,29 @@ _080A2F26: .align 2, 0 _080A2F38: .4byte gUnknown_8626A14 _080A2F3C: .4byte gUnknown_2038088 - thumb_func_end sub_080A2D14 + thumb_func_end PlayCryInternal - thumb_func_start sub_080A2F40 -sub_080A2F40: @ 0x080A2F40 + thumb_func_start IsCryFinished +IsCryFinished: @ 0x080A2F40 push {lr} ldr r0, _080A2F58 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080A2F5C - bl sub_08000964 + bl GetRivalSonDaughterString movs r0, #1 b _080A2F5E .align 2, 0 -_080A2F58: .4byte sub_080A2FD4 +_080A2F58: .4byte Task_DuckBGMForPokemonCry _080A2F5C: movs r0, #0 _080A2F5E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A2F40 + thumb_func_end IsCryFinished thumb_func_start sub_080A2F64 sub_080A2F64: @ 0x080A2F64 @@ -335429,7 +335429,7 @@ sub_080A2F64: @ 0x080A2F64 ldr r0, _080A2F78 ldr r0, [r0] bl m4aMPlayStop - bl sub_08000964 + bl GetRivalSonDaughterString pop {r0} bx r0 .align 2, 0 @@ -335448,15 +335448,15 @@ sub_080A2F7C: @ 0x080A2F7C _080A2F8C: .4byte gUnknown_2038088 thumb_func_end sub_080A2F7C - thumb_func_start sub_080A2F90 -sub_080A2F90: @ 0x080A2F90 + thumb_func_start IsCryPlayingOrClearCrySongs +IsCryPlayingOrClearCrySongs: @ 0x080A2F90 push {lr} ldr r0, _080A2FA8 ldr r0, [r0] bl IsPokemonCryPlaying cmp r0, #0 bne _080A2FAC - bl sub_08000964 + bl GetRivalSonDaughterString movs r0, #0 b _080A2FAE .align 2, 0 @@ -335467,10 +335467,10 @@ _080A2FAE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A2F90 + thumb_func_end IsCryPlayingOrClearCrySongs - thumb_func_start sub_080A2FB4 -sub_080A2FB4: @ 0x080A2FB4 + thumb_func_start IsCryPlaying +IsCryPlaying: @ 0x080A2FB4 push {lr} ldr r0, _080A2FC8 ldr r0, [r0] @@ -335487,10 +335487,10 @@ _080A2FCE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A2FB4 + thumb_func_end IsCryPlaying - thumb_func_start sub_080A2FD4 -sub_080A2FD4: @ 0x080A2FD4 + thumb_func_start Task_DuckBGMForPokemonCry +Task_DuckBGMForPokemonCry: @ 0x080A2FD4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -335515,7 +335515,7 @@ _080A2FEC: lsls r2, r2, #1 bl m4aMPlayVolumeControl adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080A300A: pop {r4} pop {r0} @@ -335524,31 +335524,31 @@ _080A300A: _080A3010: .4byte gUnknown_2038088 _080A3014: .4byte gUnknown_30074D0 _080A3018: .4byte 0x0000FFFF - thumb_func_end sub_080A2FD4 + thumb_func_end Task_DuckBGMForPokemonCry thumb_func_start RestoreBGMVolumeAfterPokemonCry RestoreBGMVolumeAfterPokemonCry: @ 0x080A301C push {r4, lr} ldr r4, _080A303C adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080A3036 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask _080A3036: pop {r4} pop {r0} bx r0 .align 2, 0 -_080A303C: .4byte sub_080A2FD4 +_080A303C: .4byte Task_DuckBGMForPokemonCry thumb_func_end RestoreBGMVolumeAfterPokemonCry - thumb_func_start sub_080A3040 -sub_080A3040: @ 0x080A3040 + thumb_func_start PlayBGM +PlayBGM: @ 0x080A3040 push {lr} lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -335570,7 +335570,7 @@ _080A3058: .align 2, 0 _080A3064: .4byte gUnknown_3005B58 _080A3068: .4byte 0x0000FFFF - thumb_func_end sub_080A3040 + thumb_func_end PlayBGM thumb_func_start sub_080A306C sub_080A306C: @ 0x080A306C @@ -335583,8 +335583,8 @@ sub_080A306C: @ 0x080A306C .align 2, 0 thumb_func_end sub_080A306C - thumb_func_start sub_080A307C -sub_080A307C: @ 0x080A307C + thumb_func_start PlaySE12WithPanning +PlaySE12WithPanning: @ 0x080A307C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -335620,7 +335620,7 @@ sub_080A307C: @ 0x080A307C _080A30C4: .4byte gUnknown_3007510 _080A30C8: .4byte gUnknown_3007550 _080A30CC: .4byte 0x0000FFFF - thumb_func_end sub_080A307C + thumb_func_end PlaySE12WithPanning thumb_func_start sub_080A30D0 sub_080A30D0: @ 0x080A30D0 @@ -335674,8 +335674,8 @@ _080A3130: .4byte gUnknown_3007550 _080A3134: .4byte 0x0000FFFF thumb_func_end sub_080A3104 - thumb_func_start sub_080A3138 -sub_080A3138: @ 0x080A3138 + thumb_func_start SE12PanpotControl +SE12PanpotControl: @ 0x080A3138 push {r4, r5, lr} adds r4, r0, #0 ldr r0, _080A315C @@ -335696,10 +335696,10 @@ sub_080A3138: @ 0x080A3138 _080A315C: .4byte gUnknown_3007510 _080A3160: .4byte 0x0000FFFF _080A3164: .4byte gUnknown_3007550 - thumb_func_end sub_080A3138 + thumb_func_end SE12PanpotControl - thumb_func_start sub_080A3168 -sub_080A3168: @ 0x080A3168 + thumb_func_start IsSEPlaying +IsSEPlaying: @ 0x080A3168 push {lr} ldr r0, _080A3198 ldr r1, [r0, #4] @@ -335736,7 +335736,7 @@ _080A31A6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A3168 + thumb_func_end IsSEPlaying thumb_func_start sub_080A31AC sub_080A31AC: @ 0x080A31AC @@ -335901,7 +335901,7 @@ DoMoveAnim: @ 0x080A32D8 strb r0, [r2] ldr r0, _080A330C movs r2, #1 - bl sub_080A3310 + bl LaunchBattleAnimation pop {r0} bx r0 .align 2, 0 @@ -335912,8 +335912,8 @@ _080A3308: .4byte gUnknown_2023EB0 _080A330C: .4byte gUnknown_82772F8 thumb_func_end DoMoveAnim - thumb_func_start sub_080A3310 -sub_080A3310: @ 0x080A3310 + thumb_func_start LaunchBattleAnimation +LaunchBattleAnimation: @ 0x080A3310 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -335927,7 +335927,7 @@ sub_080A3310: @ 0x080A3310 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 mov sb, r2 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A33B0 @@ -335944,7 +335944,7 @@ sub_080A3310: @ 0x080A3310 _080A334C: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A3370 @@ -335963,7 +335963,7 @@ _080A3370: _080A3376: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r6, #2 adds r5, #2 @@ -335983,7 +335983,7 @@ _080A339C: .4byte gUnknown_20380D4 _080A33A0: .4byte gUnknown_20380D0 _080A33A4: .4byte gUnknown_203809D _080A33A8: .4byte gUnknown_2038098 -_080A33AC: .4byte sub_080A35AC +_080A33AC: .4byte RunAnimScriptCommand _080A33B0: ldr r3, _080A33E4 ldr r5, _080A33E8 @@ -336017,7 +336017,7 @@ _080A33E4: .4byte gUnknown_20380D4 _080A33E8: .4byte gUnknown_20380D0 _080A33EC: .4byte gUnknown_203809D _080A33F0: .4byte gUnknown_2038098 -_080A33F4: .4byte sub_080A35AC +_080A33F4: .4byte RunAnimScriptCommand _080A33F8: .4byte gUnknown_2039BD4 _080A33FC: .4byte gUnknown_20380D8 _080A3400: @@ -336114,10 +336114,10 @@ _080A34B4: .4byte gUnknown_2022AD8 _080A34B8: .4byte gUnknown_2022ADA _080A34BC: .4byte gUnknown_2022ADC _080A34C0: .4byte gUnknown_2022ADE - thumb_func_end sub_080A3310 + thumb_func_end LaunchBattleAnimation - thumb_func_start sub_080A34C4 -sub_080A34C4: @ 0x080A34C4 + thumb_func_start DestroyAnimSprite +DestroyAnimSprite: @ 0x080A34C4 push {r4, lr} adds r4, r0, #0 bl FreeSpriteOamMatrix @@ -336132,14 +336132,14 @@ sub_080A34C4: @ 0x080A34C4 bx r0 .align 2, 0 _080A34E0: .4byte gUnknown_203809E - thumb_func_end sub_080A34C4 + thumb_func_end DestroyAnimSprite thumb_func_start DestroyAnimVisualTask DestroyAnimVisualTask: @ 0x080A34E4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldr r1, _080A34FC ldrb r0, [r1] subs r0, #1 @@ -336155,7 +336155,7 @@ DestroyAnimSoundTask: @ 0x080A3500 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldr r1, _080A3518 ldrb r0, [r1] subs r0, #1 @@ -336166,8 +336166,8 @@ DestroyAnimSoundTask: @ 0x080A3500 _080A3518: .4byte gUnknown_203809F thumb_func_end DestroyAnimSoundTask - thumb_func_start sub_080A351C -sub_080A351C: @ 0x080A351C + thumb_func_start AddSpriteIndex +AddSpriteIndex: @ 0x080A351C push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -336193,10 +336193,10 @@ _080A3544: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A351C + thumb_func_end AddSpriteIndex - thumb_func_start sub_080A354C -sub_080A354C: @ 0x080A354C + thumb_func_start ClearSpriteIndex +ClearSpriteIndex: @ 0x080A354C push {r4, lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -336224,10 +336224,10 @@ _080A3578: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A354C + thumb_func_end ClearSpriteIndex - thumb_func_start sub_080A3580 -sub_080A3580: @ 0x080A3580 + thumb_func_start WaitAnimFrameCount +WaitAnimFrameCount: @ 0x080A3580 push {lr} ldr r2, _080A3598 ldrb r1, [r2] @@ -336243,17 +336243,17 @@ sub_080A3580: @ 0x080A3580 .align 2, 0 _080A3598: .4byte gUnknown_203809C _080A359C: .4byte gUnknown_2038098 -_080A35A0: .4byte sub_080A35AC +_080A35A0: .4byte RunAnimScriptCommand _080A35A4: subs r0, r1, #1 _080A35A6: strb r0, [r2] pop {r0} bx r0 - thumb_func_end sub_080A3580 + thumb_func_end WaitAnimFrameCount - thumb_func_start sub_080A35AC -sub_080A35AC: @ 0x080A35AC + thumb_func_start RunAnimScriptCommand +RunAnimScriptCommand: @ 0x080A35AC push {r4, lr} ldr r4, _080A35DC _080A35B0: @@ -336264,7 +336264,7 @@ _080A35B0: adds r0, r0, r4 ldr r0, [r0] bl _call_via_r0 - thumb_func_end sub_080A35AC + thumb_func_end RunAnimScriptCommand thumb_func_start sub_080A35C0 sub_080A35C0: @ 0x080A35C0 @@ -336289,8 +336289,8 @@ _080A35E4: .4byte gUnknown_203809C _080A35E8: .4byte gUnknown_203809D thumb_func_end sub_080A35C0 - thumb_func_start sub_080A35EC -sub_080A35EC: @ 0x080A35EC + thumb_func_start ScriptCmd_loadspritegfx +ScriptCmd_loadspritegfx: @ 0x080A35EC push {r4, r5, r6, lr} ldr r6, _080A3638 ldr r0, [r6] @@ -336303,11 +336303,11 @@ sub_080A35EC: @ 0x080A35EC lsls r5, r4, #3 ldr r0, _080A363C adds r0, r5, r0 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _080A3640 adds r5, r5, r0 adds r0, r5, #0 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap ldr r0, [r6] adds r0, #2 str r0, [r6] @@ -336316,7 +336316,7 @@ sub_080A35EC: @ 0x080A35EC lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r4, #0 - bl sub_080A351C + bl AddSpriteIndex ldr r1, _080A3648 movs r0, #1 strb r0, [r1] @@ -336333,11 +336333,11 @@ _080A3640: .4byte gUnknown_84EA2D8 _080A3644: .4byte 0xFFFFD8F0 _080A3648: .4byte gUnknown_203809C _080A364C: .4byte gUnknown_2038098 -_080A3650: .4byte sub_080A3580 - thumb_func_end sub_080A35EC +_080A3650: .4byte WaitAnimFrameCount + thumb_func_end ScriptCmd_loadspritegfx - thumb_func_start sub_080A3654 -sub_080A3654: @ 0x080A3654 + thumb_func_start ScriptCmd_unloadspritegfx +ScriptCmd_unloadspritegfx: @ 0x080A3654 push {r4, r5, r6, lr} ldr r6, _080A3694 ldr r0, [r6] @@ -336363,7 +336363,7 @@ sub_080A3654: @ 0x080A3654 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r4, #0 - bl sub_080A354C + bl ClearSpriteIndex pop {r4, r5, r6} pop {r0} bx r0 @@ -336371,10 +336371,10 @@ sub_080A3654: @ 0x080A3654 _080A3694: .4byte gUnknown_2038090 _080A3698: .4byte gUnknown_84FD250 _080A369C: .4byte 0xFFFFD8F0 - thumb_func_end sub_080A3654 + thumb_func_end ScriptCmd_unloadspritegfx - thumb_func_start sub_080A36A0 -sub_080A36A0: @ 0x080A36A0 + thumb_func_start ScriptCmd_createsprite +ScriptCmd_createsprite: @ 0x080A36A0 push {r4, r5, r6, r7, lr} ldr r5, _080A3708 ldr r1, [r5] @@ -336471,13 +336471,13 @@ _080A3750: ldr r5, _080A378C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -336485,7 +336485,7 @@ _080A3750: lsrs r3, r3, #0x18 adds r0, r7, #0 adds r1, r4, #0 - bl sub_08006D6C + bl CreateSpriteAndAnimate ldr r1, _080A3790 ldrb r0, [r1] adds r0, #1 @@ -336497,10 +336497,10 @@ _080A3750: _080A3788: .4byte gUnknown_20380D6 _080A378C: .4byte gUnknown_20380D7 _080A3790: .4byte gUnknown_203809E - thumb_func_end sub_080A36A0 + thumb_func_end ScriptCmd_createsprite - thumb_func_start sub_080A3794 -sub_080A3794: @ 0x080A3794 + thumb_func_start ScriptCmd_createvisualtask +ScriptCmd_createvisualtask: @ 0x080A3794 push {r4, r5, r6, r7, lr} ldr r4, _080A3804 ldr r1, [r4] @@ -336545,7 +336545,7 @@ _080A37CC: _080A37E4: adds r0, r6, #0 adds r1, r7, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r6 @@ -336560,7 +336560,7 @@ _080A37E4: _080A3804: .4byte gUnknown_2038090 _080A3808: .4byte gUnknown_20380BE _080A380C: .4byte gUnknown_203809E - thumb_func_end sub_080A3794 + thumb_func_end ScriptCmd_createvisualtask thumb_func_start ScriptCmd_delay ScriptCmd_delay: @ 0x080A3810 @@ -336592,7 +336592,7 @@ _080A382E: _080A3840: .4byte gUnknown_2038090 _080A3844: .4byte gUnknown_203809C _080A3848: .4byte gUnknown_2038098 -_080A384C: .4byte sub_080A3580 +_080A384C: .4byte WaitAnimFrameCount thumb_func_end ScriptCmd_delay thumb_func_start sub_080A3850 @@ -336669,7 +336669,7 @@ _080A38C0: .4byte gUnknown_203809F _080A38C4: .4byte gUnknown_20380D0 _080A38C8: .4byte gUnknown_20380CE _080A38CC: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _080A3904 @@ -336732,7 +336732,7 @@ _080A3936: movs r2, #0x80 lsls r2, r2, #1 bl m4aMPlayVolumeControl - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A3964 @@ -336825,7 +336825,7 @@ _080A3A0C: .4byte gUnknown_20205AC _080A3A10: ldr r0, _080A3A4C movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 mov r1, r8 @@ -336853,7 +336853,7 @@ _080A3A10: ldr r0, _080A3A54 b _080A3A60 .align 2, 0 -_080A3A4C: .4byte sub_080A40A0 +_080A3A4C: .4byte task_pA_ma0A_obj_to_bg_pal _080A3A50: .4byte gUnknown_2022ACC _080A3A54: .4byte gUnknown_2022ACE _080A3A58: @@ -336893,8 +336893,8 @@ _080A3A98: .4byte gUnknown_3005B60 _080A3A9C: .4byte gUnknown_20380D0 thumb_func_end sub_080A39BC - thumb_func_start sub_080A3AA0 -sub_080A3AA0: @ 0x080A3AA0 + thumb_func_start ScriptCmd_monbg +ScriptCmd_monbg: @ 0x080A3AA0 push {r4, r5, lr} ldr r1, _080A3AB8 ldr r2, [r1] @@ -336915,7 +336915,7 @@ _080A3AC0: _080A3AC2: ldrb r4, [r0] adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A3B2E @@ -336928,7 +336928,7 @@ _080A3AC2: lsrs r0, r0, #0x18 cmp r0, #1 bls _080A3AEE - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A3AF8 @@ -336943,10 +336943,10 @@ _080A3AFA: adds r0, r4, #0 adds r1, r5, #0 movs r2, #0 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG ldr r0, _080A3B60 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080A3B64 @@ -336968,7 +336968,7 @@ _080A3B2E: movs r0, #2 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A3BA0 @@ -336981,7 +336981,7 @@ _080A3B2E: lsrs r0, r0, #0x18 cmp r0, #1 bls _080A3B5C - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A3B6C @@ -336998,10 +336998,10 @@ _080A3B6E: adds r0, r4, #0 adds r1, r5, #0 movs r2, #0 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG ldr r0, _080A3BBC movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080A3BC0 @@ -337039,16 +337039,16 @@ _080A3BC4: .4byte gUnknown_3005B60 _080A3BC8: .4byte gUnknown_2038090 _080A3BCC: .4byte gUnknown_203809C _080A3BD0: .4byte gUnknown_2038098 -_080A3BD4: .4byte sub_080A3580 - thumb_func_end sub_080A3AA0 +_080A3BD4: .4byte WaitAnimFrameCount + thumb_func_end ScriptCmd_monbg - thumb_func_start sub_080A3BD8 -sub_080A3BD8: @ 0x080A3BD8 + thumb_func_start IsBattlerSpriteVisible +IsBattlerSpriteVisible: @ 0x080A3BD8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A3BF8 @@ -337061,11 +337061,11 @@ sub_080A3BD8: @ 0x080A3BD8 _080A3BF4: .4byte gUnknown_20380D6 _080A3BF8: adds r0, r4, #0 - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _080A3C4C - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A3C3C @@ -337105,10 +337105,10 @@ _080A3C4E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080A3BD8 + thumb_func_end IsBattlerSpriteVisible - thumb_func_start sub_080A3C54 -sub_080A3C54: @ 0x080A3C54 + thumb_func_start MoveBattlerSpriteToBG +MoveBattlerSpriteToBG: @ 0x080A3C54 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -337125,7 +337125,7 @@ sub_080A3C54: @ 0x080A3C54 beq _080A3C72 b _080A3E26 _080A3C72: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -337178,15 +337178,15 @@ _080A3CC0: movs r0, #1 movs r1, #4 movs r2, #2 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _080A3DD0 adds r0, r6, r0 ldrb r4, [r0] @@ -337202,7 +337202,7 @@ _080A3CC0: rsbs r0, r0, #0 adds r0, #0x20 strh r0, [r5] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A3D42 @@ -337261,7 +337261,7 @@ _080A3D78: lsls r1, r1, #4 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette add r0, sp, #0x10 ldrb r1, [r0, #8] lsls r1, r1, #5 @@ -337271,7 +337271,7 @@ _080A3D78: ldr r2, _080A3DE8 adds r0, r4, #0 bl CpuSet - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A3DEC @@ -337309,7 +337309,7 @@ _080A3DF6: movs r1, #0 movs r2, #0 bl sub_0811980C - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A3E20 @@ -337354,15 +337354,15 @@ _080A3E26: movs r0, #2 movs r1, #4 movs r2, #2 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #2 movs r1, #0 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _080A3F4C adds r2, r5, r0 ldrb r4, [r2] @@ -337411,7 +337411,7 @@ _080A3ED6: adds r0, r4, #0 movs r1, #0x90 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080A3F60 ldr r2, _080A3F64 adds r0, r4, #0 @@ -337457,7 +337457,7 @@ _080A3F58: .4byte gUnknown_2022AD2 _080A3F5C: .4byte gUnknown_20375B4 _080A3F60: .4byte 0x05000120 _080A3F64: .4byte 0x04000008 - thumb_func_end sub_080A3C54 + thumb_func_end MoveBattlerSpriteToBG thumb_func_start sub_080A3F68 sub_080A3F68: @ 0x080A3F68 @@ -337593,7 +337593,7 @@ sub_080A4044: @ 0x080A4044 bl sub_080A63F8 cmp r4, #0 beq _080A4064 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -337627,8 +337627,8 @@ _080A4098: .4byte gUnknown_2022AD0 _080A409C: .4byte gUnknown_2022AD2 thumb_func_end sub_080A4044 - thumb_func_start sub_080A40A0 -sub_080A40A0: @ 0x080A40A0 + thumb_func_start task_pA_ma0A_obj_to_bg_pal +task_pA_ma0A_obj_to_bg_pal: @ 0x080A40A0 push {r4, r5, r6, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -337726,10 +337726,10 @@ _080A4168: .4byte gUnknown_2022AD0 _080A416C: .4byte gUnknown_2022AD2 _080A4170: .4byte gUnknown_20379B4 _080A4174: .4byte 0x04000008 - thumb_func_end sub_080A40A0 + thumb_func_end task_pA_ma0A_obj_to_bg_pal - thumb_func_start sub_080A4178 -sub_080A4178: @ 0x080A4178 + thumb_func_start ScriptCmd_clearmonbg +ScriptCmd_clearmonbg: @ 0x080A4178 push {r4, r5, lr} ldr r0, _080A418C ldr r2, [r0] @@ -337813,7 +337813,7 @@ _080A4210: _080A4212: ldr r0, _080A423C movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A4240 @@ -337834,7 +337834,7 @@ _080A4212: _080A423C: .4byte sub_080A4248 _080A4240: .4byte gUnknown_3005B60 _080A4244: .4byte gUnknown_2038090 - thumb_func_end sub_080A4178 + thumb_func_end ScriptCmd_clearmonbg thumb_func_start sub_080A4248 sub_080A4248: @ 0x080A4248 @@ -337862,7 +337862,7 @@ sub_080A4248: @ 0x080A4248 lsrs r0, r0, #0x18 cmp r0, #1 bls _080A4284 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A428C @@ -337881,7 +337881,7 @@ _080A428E: adds r0, r4, #0 bl sub_080A4044 ldrb r0, [r6] - bl sub_080A8964 + bl DestroyTask movs r0, #0xff strb r0, [r6] _080A42A6: @@ -337899,12 +337899,12 @@ _080A42A6: adds r0, r4, #0 bl sub_080A4044 ldrb r0, [r6, #1] - bl sub_080A8964 + bl DestroyTask movs r0, #0xff strb r0, [r6, #1] _080A42CC: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080A42D2: pop {r4, r5, r6} pop {r0} @@ -337914,8 +337914,8 @@ _080A42D8: .4byte gUnknown_20380D0 _080A42DC: .4byte gUnknown_3005B60 thumb_func_end sub_080A4248 - thumb_func_start sub_080A42E0 -sub_080A42E0: @ 0x080A42E0 + thumb_func_start ScriptCmd_monbg_22 +ScriptCmd_monbg_22: @ 0x080A42E0 push {r4, r5, lr} ldr r0, _080A42F4 ldr r2, [r0] @@ -337948,7 +337948,7 @@ _080A4310: _080A4312: ldrb r4, [r0] adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A4352 @@ -337961,7 +337961,7 @@ _080A4312: lsrs r0, r0, #0x18 cmp r0, #1 bls _080A433E - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A4348 @@ -337975,14 +337975,14 @@ _080A4348: _080A434A: adds r0, r4, #0 movs r2, #0 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG _080A4352: movs r0, #2 eors r4, r0 cmp r5, #1 bls _080A4392 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A4392 @@ -337995,7 +337995,7 @@ _080A4352: lsrs r0, r0, #0x18 cmp r0, #1 bls _080A4384 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A4388 @@ -338007,7 +338007,7 @@ _080A4388: _080A438A: adds r0, r4, #0 movs r2, #0 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG _080A4392: ldr r1, _080A43A0 ldr r0, [r1] @@ -338018,10 +338018,10 @@ _080A4392: bx r0 .align 2, 0 _080A43A0: .4byte gUnknown_2038090 - thumb_func_end sub_080A42E0 + thumb_func_end ScriptCmd_monbg_22 - thumb_func_start sub_080A43A4 -sub_080A43A4: @ 0x080A43A4 + thumb_func_start ScriptCmd_clearmonbg_23 +ScriptCmd_clearmonbg_23: @ 0x080A43A4 push {r4, r5, r6, lr} ldr r0, _080A43B8 ldr r2, [r0] @@ -338054,7 +338054,7 @@ _080A43D4: _080A43D6: ldrb r6, [r0] adds r0, r6, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A4400 @@ -338079,7 +338079,7 @@ _080A4400: adds r4, r6, #0 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A4440 @@ -338107,7 +338107,7 @@ _080A4440: _080A4442: ldr r0, _080A446C movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A4470 @@ -338128,7 +338128,7 @@ _080A4442: _080A446C: .4byte sub_080A4478 _080A4470: .4byte gUnknown_3005B60 _080A4474: .4byte gUnknown_2038090 - thumb_func_end sub_080A43A4 + thumb_func_end ScriptCmd_clearmonbg_23 thumb_func_start sub_080A4478 sub_080A4478: @ 0x080A4478 @@ -338157,7 +338157,7 @@ sub_080A4478: @ 0x080A4478 lsrs r0, r0, #0x18 cmp r0, #1 bls _080A44B6 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A44C0 @@ -338170,7 +338170,7 @@ _080A44C0: movs r5, #1 _080A44C2: adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A44D4 @@ -338189,7 +338189,7 @@ _080A44D4: movs r0, #2 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A4500 @@ -338199,7 +338199,7 @@ _080A44D4: bl sub_080A4044 _080A4500: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080A4506: pop {r4, r5, r6} pop {r0} @@ -338208,8 +338208,8 @@ _080A4506: _080A450C: .4byte gUnknown_3005B60 thumb_func_end sub_080A4478 - thumb_func_start sub_080A4510 -sub_080A4510: @ 0x080A4510 + thumb_func_start ScriptCmd_setalpha +ScriptCmd_setalpha: @ 0x080A4510 push {r4, r5, lr} ldr r2, _080A4544 ldr r0, [r2] @@ -338235,10 +338235,10 @@ sub_080A4510: @ 0x080A4510 bx r0 .align 2, 0 _080A4544: .4byte gUnknown_2038090 - thumb_func_end sub_080A4510 + thumb_func_end ScriptCmd_setalpha - thumb_func_start sub_080A4548 -sub_080A4548: @ 0x080A4548 + thumb_func_start ScriptCmd_setbldcnt +ScriptCmd_setbldcnt: @ 0x080A4548 push {lr} ldr r3, _080A456C ldr r0, [r3] @@ -338258,10 +338258,10 @@ sub_080A4548: @ 0x080A4548 bx r0 .align 2, 0 _080A456C: .4byte gUnknown_2038090 - thumb_func_end sub_080A4548 + thumb_func_end ScriptCmd_setbldcnt - thumb_func_start sub_080A4570 -sub_080A4570: @ 0x080A4570 + thumb_func_start ScriptCmd_blendoff +ScriptCmd_blendoff: @ 0x080A4570 push {lr} ldr r1, _080A4590 ldr r0, [r1] @@ -338277,7 +338277,7 @@ sub_080A4570: @ 0x080A4570 bx r0 .align 2, 0 _080A4590: .4byte gUnknown_2038090 - thumb_func_end sub_080A4570 + thumb_func_end ScriptCmd_blendoff thumb_func_start ScriptCmd_call ScriptCmd_call: @ 0x080A4594 @@ -338308,8 +338308,8 @@ _080A45C0: .4byte gUnknown_2038090 _080A45C4: .4byte gUnknown_2038094 thumb_func_end ScriptCmd_call - thumb_func_start sub_080A45C8 -sub_080A45C8: @ 0x080A45C8 + thumb_func_start ScriptCmd_return +ScriptCmd_return: @ 0x080A45C8 ldr r0, _080A45D4 ldr r1, _080A45D8 ldr r1, [r1] @@ -338318,7 +338318,7 @@ sub_080A45C8: @ 0x080A45C8 .align 2, 0 _080A45D4: .4byte gUnknown_2038090 _080A45D8: .4byte gUnknown_2038094 - thumb_func_end sub_080A45C8 + thumb_func_end ScriptCmd_return thumb_func_start ScriptCmd_setarg ScriptCmd_setarg: @ 0x080A45DC @@ -338383,8 +338383,8 @@ _080A4648: .4byte gUnknown_2038090 _080A464C: .4byte gUnknown_20380D2 thumb_func_end ScriptCmd_choosetwoturnanim - thumb_func_start sub_080A4650 -sub_080A4650: @ 0x080A4650 + thumb_func_start ScriptCmd_jumpifmoveturn +ScriptCmd_jumpifmoveturn: @ 0x080A4650 push {r4, r5, lr} ldr r5, _080A4680 ldr r4, [r5] @@ -338420,7 +338420,7 @@ _080A468C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A4650 + thumb_func_end ScriptCmd_jumpifmoveturn thumb_func_start ScriptCmd_goto ScriptCmd_goto: @ 0x080A4694 @@ -338444,8 +338444,8 @@ ScriptCmd_goto: @ 0x080A4694 _080A46B4: .4byte gUnknown_2038090 thumb_func_end ScriptCmd_goto - thumb_func_start sub_080A46B8 -sub_080A46B8: @ 0x080A46B8 + thumb_func_start IsContest +IsContest: @ 0x080A46B8 push {lr} ldr r0, _080A46D0 ldr r1, _080A46D4 @@ -338466,7 +338466,7 @@ _080A46DA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A46B8 + thumb_func_end IsContest thumb_func_start ScriptCmd_fadetobg ScriptCmd_fadetobg: @ 0x080A46E0 @@ -338480,7 +338480,7 @@ ScriptCmd_fadetobg: @ 0x080A46E0 str r0, [r1] ldr r0, _080A4718 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A471C @@ -338497,13 +338497,13 @@ ScriptCmd_fadetobg: @ 0x080A46E0 bx r0 .align 2, 0 _080A4714: .4byte gUnknown_2038090 -_080A4718: .4byte sub_080A47BC +_080A4718: .4byte Task_FadeToBg _080A471C: .4byte gUnknown_3005B60 _080A4720: .4byte gUnknown_20380D3 thumb_func_end ScriptCmd_fadetobg - thumb_func_start sub_080A4724 -sub_080A4724: @ 0x080A4724 + thumb_func_start ScriptCmd_fadetobgfromset +ScriptCmd_fadetobgfromset: @ 0x080A4724 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -338519,11 +338519,11 @@ sub_080A4724: @ 0x080A4724 str r1, [r2] ldr r0, _080A4768 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A4770 @@ -338536,12 +338536,12 @@ sub_080A4724: @ 0x080A4724 b _080A47A2 .align 2, 0 _080A4764: .4byte gUnknown_2038090 -_080A4768: .4byte sub_080A47BC +_080A4768: .4byte Task_FadeToBg _080A476C: .4byte gUnknown_3005B60 _080A4770: ldr r0, _080A478C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A4794 @@ -338575,10 +338575,10 @@ _080A47A2: .align 2, 0 _080A47B4: .4byte gUnknown_3005B60 _080A47B8: .4byte gUnknown_20380D3 - thumb_func_end sub_080A4724 + thumb_func_end ScriptCmd_fadetobgfromset - thumb_func_start sub_080A47BC -sub_080A47BC: @ 0x080A47BC + thumb_func_start Task_FadeToBg +Task_FadeToBg: @ 0x080A47BC push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -338599,7 +338599,7 @@ sub_080A47BC: @ 0x080A47BC movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A2078 + bl BeginHardwarePaletteFade ldrh r0, [r4, #0x1c] adds r0, #1 strh r0, [r4, #0x1c] @@ -338634,11 +338634,11 @@ _080A4818: rsbs r0, r0, #0 cmp r1, r0 bne _080A4830 - bl sub_080A4958 + bl LoadDefaultBg b _080A4836 _080A4830: lsrs r0, r2, #0x10 - bl sub_080A4890 + bl LoadMoveBg _080A4836: movs r0, #1 str r0, [sp] @@ -338646,7 +338646,7 @@ _080A4836: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A2078 + bl BeginHardwarePaletteFade ldr r1, _080A4858 lsls r0, r5, #2 adds r0, r0, r5 @@ -338675,7 +338675,7 @@ _080A485C: cmp r0, #3 bne _080A4884 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080A488C strb r4, [r0] _080A4884: @@ -338685,14 +338685,14 @@ _080A4884: bx r0 .align 2, 0 _080A488C: .4byte gUnknown_20380D3 - thumb_func_end sub_080A47BC + thumb_func_end Task_FadeToBg - thumb_func_start sub_080A4890 -sub_080A4890: @ 0x080A4890 + thumb_func_start LoadMoveBg +LoadMoveBg: @ 0x080A4890 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r7, r0, #0x10 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A4918 @@ -338735,7 +338735,7 @@ sub_080A4890: @ 0x080A4890 lsrs r1, r1, #0x14 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _080A4946 .align 2, 0 _080A4900: .4byte gUnknown_84FE460 @@ -338764,7 +338764,7 @@ _080A4918: ldr r0, [r4] movs r1, #0x20 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette _080A4946: pop {r4, r5, r6, r7} pop {r0} @@ -338773,24 +338773,24 @@ _080A4946: _080A494C: .4byte gUnknown_84FE460 _080A4950: .4byte 0x0600D000 _080A4954: .4byte 0x06008000 - thumb_func_end sub_080A4890 + thumb_func_end LoadMoveBg - thumb_func_start sub_080A4958 -sub_080A4958: @ 0x080A4958 + thumb_func_start LoadDefaultBg +LoadDefaultBg: @ 0x080A4958 push {lr} - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A496A - bl sub_080D6F50 + bl LoadContestBgAfterMoveAnim b _080A496E _080A496A: - bl sub_080355C8 + bl DrawMainBattleBackground _080A496E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A4958 + thumb_func_end LoadDefaultBg thumb_func_start ScriptCmd_restorebg ScriptCmd_restorebg: @ 0x080A4974 @@ -338801,7 +338801,7 @@ ScriptCmd_restorebg: @ 0x080A4974 str r0, [r1] ldr r0, _080A49A8 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A49AC @@ -338818,14 +338818,14 @@ ScriptCmd_restorebg: @ 0x080A4974 bx r0 .align 2, 0 _080A49A4: .4byte gUnknown_2038090 -_080A49A8: .4byte sub_080A47BC +_080A49A8: .4byte Task_FadeToBg _080A49AC: .4byte gUnknown_3005B60 _080A49B0: .4byte 0x0000FFFF _080A49B4: .4byte gUnknown_20380D3 thumb_func_end ScriptCmd_restorebg - thumb_func_start sub_080A49B8 -sub_080A49B8: @ 0x080A49B8 + thumb_func_start ScriptCmd_waitbgfadeout +ScriptCmd_waitbgfadeout: @ 0x080A49B8 push {lr} ldr r0, _080A49D0 ldrb r0, [r0] @@ -338851,7 +338851,7 @@ _080A49E0: bx r0 .align 2, 0 _080A49E8: .4byte gUnknown_203809C - thumb_func_end sub_080A49B8 + thumb_func_end ScriptCmd_waitbgfadeout thumb_func_start sub_080A49EC sub_080A49EC: @ 0x080A49EC @@ -338890,7 +338890,7 @@ ScriptCmd_changebg: @ 0x080A4A20 adds r0, r1, #1 str r0, [r4] ldrb r0, [r1, #1] - bl sub_080A4890 + bl LoadMoveBg ldr r0, [r4] adds r0, #1 str r0, [r4] @@ -338901,12 +338901,12 @@ ScriptCmd_changebg: @ 0x080A4A20 _080A4A3C: .4byte gUnknown_2038090 thumb_func_end ScriptCmd_changebg - thumb_func_start sub_080A4A40 -sub_080A4A40: @ 0x080A4A40 + thumb_func_start BattleAnimAdjustPanning +BattleAnimAdjustPanning: @ 0x080A4A40 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A4A88 @@ -338925,7 +338925,7 @@ sub_080A4A40: @ 0x080A4A40 cmp r0, #0 beq _080A4A88 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r4, #0xc0 cmp r0, #0 @@ -338936,7 +338936,7 @@ sub_080A4A40: @ 0x080A4A40 _080A4A80: .4byte gUnknown_2024174 _080A4A84: .4byte gUnknown_20380D6 _080A4A88: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A4AB0 @@ -338957,13 +338957,13 @@ _080A4AAC: .4byte gUnknown_20380D7 _080A4AB0: ldr r0, _080A4AD8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A4AEE ldr r0, _080A4ADC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A4B1A @@ -338987,7 +338987,7 @@ _080A4AE0: _080A4AEE: ldr r0, _080A4B10 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -339029,14 +339029,14 @@ _080A4B34: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A4A40 + thumb_func_end BattleAnimAdjustPanning - thumb_func_start sub_080A4B40 -sub_080A4B40: @ 0x080A4B40 + thumb_func_start BattleAnimAdjustPanning2 +BattleAnimAdjustPanning2: @ 0x080A4B40 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A4B88 @@ -339055,7 +339055,7 @@ sub_080A4B40: @ 0x080A4B40 cmp r0, #0 beq _080A4B88 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r4, #0xc0 cmp r0, #0 @@ -339068,11 +339068,11 @@ _080A4B84: .4byte gUnknown_20380D6 _080A4B88: ldr r0, _080A4BB0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A4BA0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A4BA6 @@ -339088,7 +339088,7 @@ _080A4BA6: bx r1 .align 2, 0 _080A4BB0: .4byte gUnknown_20380D6 - thumb_func_end sub_080A4B40 + thumb_func_end BattleAnimAdjustPanning2 thumb_func_start KeepPanInRange KeepPanInRange: @ 0x080A4BB4 @@ -339169,12 +339169,12 @@ ScriptCmd_playsewithpan: @ 0x080A4C1C orrs r4, r0 movs r0, #2 ldrsb r0, [r1, r0] - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r0, [r5] adds r0, #3 str r0, [r5] @@ -339194,10 +339194,10 @@ ScriptCmd_setpan: @ 0x080A4C54 str r0, [r4] movs r0, #1 ldrsb r0, [r1, r0] - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_080A3138 + bl SE12PanpotControl ldr r0, [r4] adds r0, #1 str r0, [r4] @@ -339233,14 +339233,14 @@ ScriptCmd_panse_1B: @ 0x080A4C80 ldrb r7, [r1, #5] movs r0, #2 ldrsb r0, [r1, r0] - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 lsls r4, r4, #0x18 asrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning mov r8, r0 lsls r5, r5, #0x18 asrs r5, r5, #0x18 @@ -339259,7 +339259,7 @@ ScriptCmd_panse_1B: @ 0x080A4C80 lsrs r4, r4, #0x18 ldr r0, _080A4D34 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A4D38 @@ -339277,7 +339277,7 @@ ScriptCmd_panse_1B: @ 0x080A4C80 strh r5, [r1, #0x10] mov r0, sb adds r1, r5, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r1, _080A4D3C ldrb r0, [r1] adds r0, #1 @@ -339295,13 +339295,13 @@ ScriptCmd_panse_1B: @ 0x080A4C80 bx r0 .align 2, 0 _080A4D30: .4byte gUnknown_2038090 -_080A4D34: .4byte sub_080A4D40 +_080A4D34: .4byte Task_PanFromInitialToTarget _080A4D38: .4byte gUnknown_3005B60 _080A4D3C: .4byte gUnknown_203809F thumb_func_end ScriptCmd_panse_1B - thumb_func_start sub_080A4D40 -sub_080A4D40: @ 0x080A4D40 + thumb_func_start Task_PanFromInitialToTarget +Task_PanFromInitialToTarget: @ 0x080A4D40 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -339361,7 +339361,7 @@ _080A4DA8: _080A4DAC: lsrs r4, r2, #0x10 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _080A4DCC ldrb r0, [r1] subs r0, #1 @@ -339369,14 +339369,14 @@ _080A4DAC: _080A4DBC: lsls r0, r4, #0x18 asrs r0, r0, #0x18 - bl sub_080A3138 + bl SE12PanpotControl _080A4DC4: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _080A4DCC: .4byte gUnknown_203809F - thumb_func_end sub_080A4D40 + thumb_func_end Task_PanFromInitialToTarget thumb_func_start ScriptCmd_panse_26 ScriptCmd_panse_26: @ 0x080A4DD0 @@ -339405,7 +339405,7 @@ ScriptCmd_panse_26: @ 0x080A4DD0 mov sl, r1 ldr r0, _080A4E58 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A4E5C @@ -339427,7 +339427,7 @@ ScriptCmd_panse_26: @ 0x080A4DD0 strh r4, [r1, #0x10] mov r0, r8 adds r1, r4, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r1, _080A4E60 ldrb r0, [r1] adds r0, #1 @@ -339445,7 +339445,7 @@ ScriptCmd_panse_26: @ 0x080A4DD0 bx r0 .align 2, 0 _080A4E54: .4byte gUnknown_2038090 -_080A4E58: .4byte sub_080A4D40 +_080A4E58: .4byte Task_PanFromInitialToTarget _080A4E5C: .4byte gUnknown_3005B60 _080A4E60: .4byte gUnknown_203809F thumb_func_end ScriptCmd_panse_26 @@ -339476,14 +339476,14 @@ ScriptCmd_panse_27: @ 0x080A4E64 ldrb r7, [r1, #5] movs r0, #2 ldrsb r0, [r1, r0] - bl sub_080A4B40 + bl BattleAnimAdjustPanning2 adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 lsls r4, r4, #0x18 asrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080A4B40 + bl BattleAnimAdjustPanning2 adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -339492,13 +339492,13 @@ ScriptCmd_panse_27: @ 0x080A4E64 asrs r1, r1, #0x18 mov r8, r1 mov r0, r8 - bl sub_080A4B40 + bl BattleAnimAdjustPanning2 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080A4F18 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A4F1C @@ -339519,7 +339519,7 @@ ScriptCmd_panse_27: @ 0x080A4E64 strh r6, [r1, #0x10] mov r0, sb adds r1, r6, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r1, _080A4F20 ldrb r0, [r1] adds r0, #1 @@ -339537,13 +339537,13 @@ ScriptCmd_panse_27: @ 0x080A4E64 bx r0 .align 2, 0 _080A4F14: .4byte gUnknown_2038090 -_080A4F18: .4byte sub_080A4D40 +_080A4F18: .4byte Task_PanFromInitialToTarget _080A4F1C: .4byte gUnknown_3005B60 _080A4F20: .4byte gUnknown_203809F thumb_func_end ScriptCmd_panse_27 - thumb_func_start sub_080A4F24 -sub_080A4F24: @ 0x080A4F24 + thumb_func_start ScriptCmd_loopsewithpan +ScriptCmd_loopsewithpan: @ 0x080A4F24 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -339562,13 +339562,13 @@ sub_080A4F24: @ 0x080A4F24 mov sb, r2 movs r0, #2 ldrsb r0, [r1, r0] - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080A4FA0 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A4FA4 @@ -339606,7 +339606,7 @@ _080A4F9C: .4byte gUnknown_2038090 _080A4FA0: .4byte Task_LoopAndPlaySE _080A4FA4: .4byte gUnknown_3005B60 _080A4FA8: .4byte gUnknown_203809F - thumb_func_end sub_080A4F24 + thumb_func_end ScriptCmd_loopsewithpan thumb_func_start Task_LoopAndPlaySE Task_LoopAndPlaySE: @ 0x080A4FAC @@ -339638,11 +339638,11 @@ Task_LoopAndPlaySE: @ 0x080A4FAC lsrs r4, r4, #0x18 lsls r1, r1, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C + bl PlaySE12WithPanning cmp r4, #0 bne _080A4FFA adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _080A5004 ldrb r0, [r1] subs r0, #1 @@ -339673,13 +339673,13 @@ ScriptCmd_waitplaysewithpan: @ 0x080A5008 mov r8, r0 movs r0, #2 ldrsb r0, [r1, r0] - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080A5070 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A5074 @@ -339731,9 +339731,9 @@ Task_WaitAndPlaySE: @ 0x080A507C ldrh r0, [r2, #8] movs r1, #0xa ldrsb r1, [r2, r1] - bl sub_080A307C + bl PlaySE12WithPanning adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _080A50BC ldrb r0, [r1] subs r0, #1 @@ -339747,8 +339747,8 @@ _080A50B8: .4byte gUnknown_3005B60 _080A50BC: .4byte gUnknown_203809F thumb_func_end Task_WaitAndPlaySE - thumb_func_start sub_080A50C0 -sub_080A50C0: @ 0x080A50C0 + thumb_func_start ScriptCmd_createsoundtask +ScriptCmd_createsoundtask: @ 0x080A50C0 push {r4, r5, r6, lr} ldr r4, _080A5128 ldr r1, [r4] @@ -339790,7 +339790,7 @@ _080A50F2: _080A510A: adds r0, r6, #0 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r6 @@ -339805,16 +339805,16 @@ _080A510A: _080A5128: .4byte gUnknown_2038090 _080A512C: .4byte gUnknown_20380BE _080A5130: .4byte gUnknown_203809F - thumb_func_end sub_080A50C0 + thumb_func_end ScriptCmd_createsoundtask - thumb_func_start sub_080A5134 -sub_080A5134: @ 0x080A5134 + thumb_func_start ScriptCmd_waitsound +ScriptCmd_waitsound: @ 0x080A5134 push {r4, r5, lr} ldr r0, _080A516C ldrb r5, [r0] cmp r5, #0 bne _080A517C - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -339868,10 +339868,10 @@ _080A51A6: _080A51AC: .4byte gUnknown_20380CE _080A51B0: .4byte gUnknown_2038090 _080A51B4: .4byte gUnknown_203809C - thumb_func_end sub_080A5134 + thumb_func_end ScriptCmd_waitsound - thumb_func_start sub_080A51B8 -sub_080A51B8: @ 0x080A51B8 + thumb_func_start ScriptCmd_jumpargeq +ScriptCmd_jumpargeq: @ 0x080A51B8 push {r4, r5, r6, lr} ldr r5, _080A51F8 ldr r4, [r5] @@ -339914,16 +339914,16 @@ _080A5206: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080A51B8 + thumb_func_end ScriptCmd_jumpargeq - thumb_func_start sub_080A520C -sub_080A520C: @ 0x080A520C + thumb_func_start ScriptCmd_jumpifcontest +ScriptCmd_jumpifcontest: @ 0x080A520C push {r4, lr} ldr r4, _080A523C ldr r0, [r4] adds r0, #1 str r0, [r4] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A5240 @@ -339950,10 +339950,10 @@ _080A5246: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A520C + thumb_func_end ScriptCmd_jumpifcontest - thumb_func_start sub_080A524C -sub_080A524C: @ 0x080A524C + thumb_func_start ScriptCmd_monbgprio_28 +ScriptCmd_monbgprio_28: @ 0x080A524C push {r4, lr} ldr r0, _080A5260 ldr r1, [r0] @@ -339974,7 +339974,7 @@ _080A526A: bl sub_080A630C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A529A @@ -339986,47 +339986,47 @@ _080A5286: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #2 movs r1, #4 movs r2, #2 - bl sub_0811887C + bl SetAnimBgAttribute _080A529A: pop {r4} pop {r0} bx r0 .align 2, 0 _080A52A0: .4byte gUnknown_20380D6 - thumb_func_end sub_080A524C + thumb_func_end ScriptCmd_monbgprio_28 - thumb_func_start sub_080A52A4 -sub_080A52A4: @ 0x080A52A4 + thumb_func_start ScriptCmd_monbgprio_29 +ScriptCmd_monbgprio_29: @ 0x080A52A4 push {lr} ldr r0, _080A52D0 ldr r1, [r0] adds r1, #1 str r1, [r0] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A52CC movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #2 movs r1, #4 movs r2, #2 - bl sub_0811887C + bl SetAnimBgAttribute _080A52CC: pop {r0} bx r0 .align 2, 0 _080A52D0: .4byte gUnknown_2038090 - thumb_func_end sub_080A52A4 + thumb_func_end ScriptCmd_monbgprio_29 - thumb_func_start sub_080A52D4 -sub_080A52D4: @ 0x080A52D4 + thumb_func_start ScriptCmd_monbgprio_2A +ScriptCmd_monbgprio_2A: @ 0x080A52D4 push {r4, r5, r6, r7, lr} ldr r1, _080A5304 ldr r0, [r1] @@ -340035,11 +340035,11 @@ sub_080A52D4: @ 0x080A52D4 str r0, [r1] ldr r7, _080A5308 ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r5, _080A530C ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -340058,7 +340058,7 @@ _080A5312: bl sub_080A630C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A5340 @@ -340070,17 +340070,17 @@ _080A532C: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #2 movs r1, #4 movs r2, #2 - bl sub_0811887C + bl SetAnimBgAttribute _080A5340: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A52D4 + thumb_func_end ScriptCmd_monbgprio_2A thumb_func_start ScriptCmd_invisible ScriptCmd_invisible: @ 0x080A5348 @@ -340088,7 +340088,7 @@ ScriptCmd_invisible: @ 0x080A5348 ldr r4, _080A537C ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -340121,7 +340121,7 @@ ScriptCmd_visible: @ 0x080A5384 ldr r4, _080A53BC ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -340149,29 +340149,29 @@ _080A53BC: .4byte gUnknown_2038090 _080A53C0: .4byte gUnknown_20205AC thumb_func_end ScriptCmd_visible - thumb_func_start sub_080A53C4 -sub_080A53C4: @ 0x080A53C4 + thumb_func_start ScriptCmd_doublebattle_2D +ScriptCmd_doublebattle_2D: @ 0x080A53C4 push {r4, r5, r6, r7, lr} ldr r1, _080A5410 ldr r0, [r1] ldrb r7, [r0, #1] adds r0, #2 str r0, [r1] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A546E - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080A546E ldr r6, _080A5414 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r5, _080A5418 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -340195,7 +340195,7 @@ _080A541C: lsrs r4, r0, #0x18 movs r0, #1 _080A5428: - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -340233,31 +340233,31 @@ _080A546E: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080A53C4 + thumb_func_end ScriptCmd_doublebattle_2D - thumb_func_start sub_080A5474 -sub_080A5474: @ 0x080A5474 + thumb_func_start ScriptCmd_doublebattle_2E +ScriptCmd_doublebattle_2E: @ 0x080A5474 push {r4, r5, r6, r7, lr} ldr r1, _080A54C0 ldr r0, [r1] ldrb r7, [r0, #1] adds r0, #2 str r0, [r1] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A5500 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080A5500 ldr r6, _080A54C4 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r5, _080A54C8 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -340281,7 +340281,7 @@ _080A54CC: lsrs r4, r0, #0x18 movs r0, #1 _080A54D8: - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -340306,7 +340306,7 @@ _080A5500: bx r0 .align 2, 0 _080A5508: .4byte gUnknown_20205AC - thumb_func_end sub_080A5474 + thumb_func_end ScriptCmd_doublebattle_2E thumb_func_start sub_080A550C sub_080A550C: @ 0x080A550C @@ -340327,14 +340327,14 @@ _080A552C: .4byte gUnknown_3007550 _080A5530: .4byte gUnknown_2038090 thumb_func_end sub_080A550C - thumb_func_start sub_080A5534 -sub_080A5534: @ 0x080A5534 + thumb_func_start GetBattlerSpriteCoord +GetBattlerSpriteCoord: @ 0x080A5534 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 lsls r1, r1, #0x18 lsrs r4, r1, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A5552 @@ -340396,7 +340396,7 @@ _080A55A0: _080A55C0: .4byte gUnknown_84FE664 _080A55C4: .4byte gUnknown_2022C90 _080A55C8: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A55F0 @@ -340417,7 +340417,7 @@ _080A55EC: b _080A5662 _080A55F0: adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A5628 @@ -340460,7 +340460,7 @@ _080A5628: _080A5646: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 b _080A5662 @@ -340488,21 +340488,21 @@ _080A5678: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A5534 + thumb_func_end GetBattlerSpriteCoord - thumb_func_start sub_080A5680 -sub_080A5680: @ 0x080A5680 + thumb_func_start GetBattlerYDelta +GetBattlerYDelta: @ 0x080A5680 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A56A2 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A56A2 @@ -340510,7 +340510,7 @@ sub_080A5680: @ 0x080A5680 _080A56A2: cmp r5, #0xc9 bne _080A5758 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A56CC @@ -340547,7 +340547,7 @@ _080A56CC: ldr r1, _080A5700 adds r0, r0, r1 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 b _080A570A .align 2, 0 @@ -340647,7 +340647,7 @@ _080A5790: ldr r1, _080A57C8 adds r0, r0, r1 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 b _080A57D2 .align 2, 0 @@ -340737,10 +340737,10 @@ _080A585C: bx r1 .align 2, 0 _080A5864: .4byte gUnknown_82D45C8 - thumb_func_end sub_080A5680 + thumb_func_end GetBattlerYDelta - thumb_func_start sub_080A5868 -sub_080A5868: @ 0x080A5868 + thumb_func_start GetBattlerElevation +GetBattlerElevation: @ 0x080A5868 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -340749,12 +340749,12 @@ sub_080A5868: @ 0x080A5868 adds r7, r4, #0 movs r5, #0 adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080A58C6 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A58C6 @@ -340793,7 +340793,7 @@ _080A58C6: bx r1 .align 2, 0 _080A58D0: .4byte gUnknown_82D965C - thumb_func_end sub_080A5868 + thumb_func_end GetBattlerElevation thumb_func_start GetBattlerSpriteFinal_Y GetBattlerSpriteFinal_Y: @ 0x080A58D4 @@ -340805,30 +340805,30 @@ GetBattlerSpriteFinal_Y: @ 0x080A58D4 lsls r2, r2, #0x18 lsrs r7, r2, #0x18 adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A58F8 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A5906 _080A58F8: adds r0, r6, #0 adds r1, r5, #0 - bl sub_080A5680 + bl GetBattlerYDelta lsls r0, r0, #0x18 lsrs r4, r0, #0x18 b _080A5924 _080A5906: adds r0, r6, #0 adds r1, r5, #0 - bl sub_080A5680 + bl GetBattlerYDelta lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r6, #0 adds r1, r5, #0 - bl sub_080A5868 + bl GetBattlerElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, r4, r0 @@ -340854,7 +340854,7 @@ _080A5924: cmp r7, #0 beq _080A5964 adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A595E @@ -340876,8 +340876,8 @@ _080A596C: .4byte gUnknown_84FE664 _080A5970: .4byte gUnknown_2022C90 thumb_func_end GetBattlerSpriteFinal_Y - thumb_func_start sub_080A5974 -sub_080A5974: @ 0x080A5974 + thumb_func_start GetBattlerSpriteCoord2 +GetBattlerSpriteCoord2: @ 0x080A5974 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -340889,7 +340889,7 @@ sub_080A5974: @ 0x080A5974 lsrs r1, r1, #0x18 cmp r1, #1 bhi _080A59EE - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A59B0 @@ -340942,14 +340942,14 @@ _080A59E4: _080A59EE: adds r0, r4, #0 adds r1, r5, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord _080A59F6: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080A5974 + thumb_func_end GetBattlerSpriteCoord2 thumb_func_start GetBattlerSpriteDefault_Y GetBattlerSpriteDefault_Y: @ 0x080A5A00 @@ -340957,7 +340957,7 @@ GetBattlerSpriteDefault_Y: @ 0x080A5A00 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #4 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -340970,13 +340970,13 @@ GetSubstituteSpriteDefault_Y: @ 0x080A5A14 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A5A38 adds r0, r4, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r1, #0x80 @@ -340985,7 +340985,7 @@ GetSubstituteSpriteDefault_Y: @ 0x080A5A14 _080A5A38: adds r0, r4, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r1, #0x88 @@ -341001,22 +341001,22 @@ _080A5A48: .align 2, 0 thumb_func_end GetSubstituteSpriteDefault_Y - thumb_func_start sub_080A5A58 -sub_080A5A58: @ 0x080A5A58 + thumb_func_start GetBattlerYCoordWithElevation +GetBattlerYCoordWithElevation: @ 0x080A5A58 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A5B00 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A5AAC @@ -341059,7 +341059,7 @@ _080A5AAC: _080A5ACA: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 b _080A5AE6 @@ -341071,13 +341071,13 @@ _080A5AE4: ldrh r4, [r1, #2] _080A5AE6: adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A5B00 adds r0, r5, #0 adds r1, r4, #0 - bl sub_080A5868 + bl GetBattlerElevation subs r0, r6, r0 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -341086,10 +341086,10 @@ _080A5B00: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080A5A58 + thumb_func_end GetBattlerYCoordWithElevation - thumb_func_start sub_080A5B08 -sub_080A5B08: @ 0x080A5B08 + thumb_func_start GetAnimBattlerSpriteId +GetAnimBattlerSpriteId: @ 0x080A5B08 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -341098,7 +341098,7 @@ sub_080A5B08: @ 0x080A5B08 bne _080A5B30 ldr r4, _080A5B28 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _080A5B7E @@ -341113,7 +341113,7 @@ _080A5B30: bne _080A5B50 ldr r4, _080A5B48 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _080A5B7E @@ -341130,7 +341130,7 @@ _080A5B50: ldrb r0, [r5] movs r4, #2 eors r0, r4 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A5B7E @@ -341142,7 +341142,7 @@ _080A5B6C: ldrb r0, [r5] movs r4, #2 eors r0, r4 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _080A5B88 @@ -341164,18 +341164,18 @@ _080A5B92: bx r1 .align 2, 0 _080A5B98: .4byte gUnknown_2023E88 - thumb_func_end sub_080A5B08 + thumb_func_end GetAnimBattlerSpriteId - thumb_func_start sub_080A5B9C -sub_080A5B9C: @ 0x080A5B9C + thumb_func_start StoreSpriteCallbackInData6 +StoreSpriteCallbackInData6: @ 0x080A5B9C strh r1, [r0, #0x3a] lsrs r1, r1, #0x10 strh r1, [r0, #0x3c] bx lr - thumb_func_end sub_080A5B9C + thumb_func_end StoreSpriteCallbackInData6 - thumb_func_start sub_080A5BA4 -sub_080A5BA4: @ 0x080A5BA4 + thumb_func_start SetCallbackToStoredInData6 +SetCallbackToStoredInData6: @ 0x080A5BA4 ldrh r2, [r0, #0x3a] movs r3, #0x3c ldrsh r1, [r0, r3] @@ -341184,10 +341184,10 @@ sub_080A5BA4: @ 0x080A5BA4 str r2, [r0, #0x1c] bx lr .align 2, 0 - thumb_func_end sub_080A5BA4 + thumb_func_end SetCallbackToStoredInData6 - thumb_func_start sub_080A5BB4 -sub_080A5BB4: @ 0x080A5BB4 + thumb_func_start TranslateSpriteInCircleOverDuration +TranslateSpriteInCircleOverDuration: @ 0x080A5BB4 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -341233,15 +341233,15 @@ _080A5C00: b _080A5C0E _080A5C08: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5C0E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A5BB4 + thumb_func_end TranslateSpriteInCircleOverDuration - thumb_func_start sub_080A5C14 -sub_080A5C14: @ 0x080A5C14 + thumb_func_start TranslateSpriteInGrowingCircleOverDuration +TranslateSpriteInGrowingCircleOverDuration: @ 0x080A5C14 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -341301,12 +341301,12 @@ _080A5C7C: b _080A5C8A _080A5C84: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5C8A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A5C14 + thumb_func_end TranslateSpriteInGrowingCircleOverDuration thumb_func_start sub_080A5C90 sub_080A5C90: @ 0x080A5C90 @@ -341377,15 +341377,15 @@ _080A5D04: b _080A5D12 _080A5D0C: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5D12: pop {r4} pop {r0} bx r0 thumb_func_end sub_080A5C90 - thumb_func_start sub_080A5D18 -sub_080A5D18: @ 0x080A5D18 + thumb_func_start TranslateSpriteInEllipseOverDuration +TranslateSpriteInEllipseOverDuration: @ 0x080A5D18 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -341431,12 +341431,12 @@ _080A5D64: b _080A5D72 _080A5D6C: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5D72: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A5D18 + thumb_func_end TranslateSpriteInEllipseOverDuration thumb_func_start WaitAnimForDuration WaitAnimForDuration: @ 0x080A5D78 @@ -341452,7 +341452,7 @@ WaitAnimForDuration: @ 0x080A5D78 b _080A5D92 _080A5D8C: adds r0, r1, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5D92: pop {r0} bx r0 @@ -341541,7 +341541,7 @@ TranslateSpriteLinear: @ 0x080A5E04 b _080A5E2E _080A5E28: adds r0, r1, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5E2E: pop {r0} bx r0 @@ -341576,15 +341576,15 @@ TranslateSpriteLinearFixedPoint: @ 0x080A5E34 b _080A5E6A _080A5E64: adds r0, r2, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5E6A: pop {r0} bx r0 .align 2, 0 thumb_func_end TranslateSpriteLinearFixedPoint - thumb_func_start sub_080A5E70 -sub_080A5E70: @ 0x080A5E70 + thumb_func_start TranslateSpriteLinearFixedPointIconFrame +TranslateSpriteLinearFixedPointIconFrame: @ 0x080A5E70 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x2e] @@ -341611,15 +341611,15 @@ sub_080A5E70: @ 0x080A5E70 b _080A5EA6 _080A5EA0: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5EA6: adds r0, r4, #0 - bl sub_080D297C + bl UpdateMonIconFrame pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A5E70 + thumb_func_end TranslateSpriteLinearFixedPointIconFrame thumb_func_start sub_080A5EB4 sub_080A5EB4: @ 0x080A5EB4 @@ -341636,13 +341636,13 @@ sub_080A5EB4: @ 0x080A5EB4 ldr r5, _080A5EF0 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] @@ -341656,8 +341656,8 @@ _080A5EF0: .4byte gUnknown_20380D7 _080A5EF4: .4byte sub_080A5D98 thumb_func_end sub_080A5EB4 - thumb_func_start sub_080A5EF8 -sub_080A5EF8: @ 0x080A5EF8 + thumb_func_start TranslateMonSpriteLinear +TranslateMonSpriteLinear: @ 0x080A5EF8 push {r4, lr} adds r3, r0, #0 ldrh r1, [r3, #0x2e] @@ -341693,15 +341693,15 @@ sub_080A5EF8: @ 0x080A5EF8 _080A5F38: .4byte gUnknown_20205AC _080A5F3C: adds r0, r3, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5F42: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A5EF8 + thumb_func_end TranslateMonSpriteLinear - thumb_func_start sub_080A5F48 -sub_080A5F48: @ 0x080A5F48 + thumb_func_start TranslateMonSpriteLinearFixedPoint +TranslateMonSpriteLinearFixedPoint: @ 0x080A5F48 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x2e] @@ -341744,15 +341744,15 @@ sub_080A5F48: @ 0x080A5F48 _080A5F94: .4byte gUnknown_20205AC _080A5F98: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A5F9E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A5F48 + thumb_func_end TranslateMonSpriteLinearFixedPoint - thumb_func_start sub_080A5FA4 -sub_080A5FA4: @ 0x080A5FA4 + thumb_func_start TranslateSpriteLinearAndFlicker +TranslateSpriteLinearAndFlicker: @ 0x080A5FA4 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x2e] @@ -341803,25 +341803,25 @@ sub_080A5FA4: @ 0x080A5FA4 b _080A600C _080A6006: adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A600C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A5FA4 + thumb_func_end TranslateSpriteLinearAndFlicker - thumb_func_start sub_080A6014 -sub_080A6014: @ 0x080A6014 + thumb_func_start DestroySpriteAndMatrix +DestroySpriteAndMatrix: @ 0x080A6014 push {r4, lr} adds r4, r0, #0 bl FreeSpriteOamMatrix adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A6014 + thumb_func_end DestroySpriteAndMatrix thumb_func_start sub_080A6028 sub_080A6028: @ 0x080A6028 @@ -341838,13 +341838,13 @@ sub_080A6028: @ 0x080A6028 ldr r5, _080A6064 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] @@ -341865,7 +341865,7 @@ sub_080A606C: @ 0x080A606C ldrh r0, [r4, #0x38] bl ResetPaletteStructByUid adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix pop {r4} pop {r0} bx r0 @@ -341883,7 +341883,7 @@ RunStoredCallbackWhenAffineAnimEnds: @ 0x080A6084 cmp r0, #0 beq _080A609A adds r0, r2, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A609A: pop {r0} bx r0 @@ -341901,7 +341901,7 @@ RunStoredCallbackWhenAnimEnds: @ 0x080A60A0 cmp r0, #0 beq _080A60B6 adds r0, r2, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A60B6: pop {r0} bx r0 @@ -341919,14 +341919,14 @@ sub_080A60BC: @ 0x080A60BC movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 thumb_func_end sub_080A60BC - thumb_func_start sub_080A60DC -sub_080A60DC: @ 0x080A60DC + thumb_func_start DestroyAnimVisualTaskAndDisableBlend +DestroyAnimVisualTaskAndDisableBlend: @ 0x080A60DC push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -341942,7 +341942,7 @@ sub_080A60DC: @ 0x080A60DC pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A60DC + thumb_func_end DestroyAnimVisualTaskAndDisableBlend thumb_func_start SetSpriteCoordsToAnimAttackerCoords SetSpriteCoordsToAnimAttackerCoords: @ 0x080A6100 @@ -341951,13 +341951,13 @@ SetSpriteCoordsToAnimAttackerCoords: @ 0x080A6100 ldr r4, _080A6128 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -341968,8 +341968,8 @@ SetSpriteCoordsToAnimAttackerCoords: @ 0x080A6100 _080A6128: .4byte gUnknown_20380D6 thumb_func_end SetSpriteCoordsToAnimAttackerCoords - thumb_func_start sub_080A612C -sub_080A612C: @ 0x080A612C + thumb_func_start SetAnimSpriteInitialXOffset +SetAnimSpriteInitialXOffset: @ 0x080A612C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -341980,13 +341980,13 @@ sub_080A612C: @ 0x080A612C ldr r7, _080A6164 ldrb r0, [r7] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _080A6168 ldrb r0, [r0] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -342000,7 +342000,7 @@ _080A6164: .4byte gUnknown_20380D6 _080A6168: .4byte gUnknown_20380D7 _080A616C: ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A6184 @@ -342026,10 +342026,10 @@ _080A6190: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A612C + thumb_func_end SetAnimSpriteInitialXOffset - thumb_func_start sub_080A619C -sub_080A619C: @ 0x080A619C + thumb_func_start InitAnimArcTranslation +InitAnimArcTranslation: @ 0x080A619C push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x20] @@ -342038,7 +342038,7 @@ sub_080A619C: @ 0x080A619C ldrh r0, [r4, #0x22] strh r0, [r4, #0x34] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation movs r0, #0x2e ldrsh r1, [r4, r0] movs r0, #0x80 @@ -342050,10 +342050,10 @@ sub_080A619C: @ 0x080A619C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A619C + thumb_func_end InitAnimArcTranslation - thumb_func_start sub_080A61C8 -sub_080A61C8: @ 0x080A61C8 + thumb_func_start TranslateAnimHorizontalArc +TranslateAnimHorizontalArc: @ 0x080A61C8 push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -342080,10 +342080,10 @@ _080A61F6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080A61C8 + thumb_func_end TranslateAnimHorizontalArc - thumb_func_start sub_080A61FC -sub_080A61FC: @ 0x080A61FC + thumb_func_start TranslateAnimVerticalArc +TranslateAnimVerticalArc: @ 0x080A61FC push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -342110,7 +342110,7 @@ _080A622A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080A61FC + thumb_func_end TranslateAnimVerticalArc thumb_func_start SetSpritePrimaryCoordsFromSecondaryCoords SetSpritePrimaryCoordsFromSecondaryCoords: @ 0x080A6230 @@ -342138,13 +342138,13 @@ InitSpritePosToAnimTarget: @ 0x080A6248 ldr r4, _080A628C ldrb r0, [r4] movs r1, #0 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -342153,7 +342153,7 @@ _080A6270: movs r0, #0 ldrsh r1, [r4, r0] adds r0, r5, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r4, #2] ldrh r1, [r5, #0x22] adds r0, r0, r1 @@ -342166,8 +342166,8 @@ _080A628C: .4byte gUnknown_20380D7 _080A6290: .4byte gUnknown_20380BE thumb_func_end InitSpritePosToAnimTarget - thumb_func_start sub_080A6294 -sub_080A6294: @ 0x080A6294 + thumb_func_start InitSpritePosToAnimAttacker +InitSpritePosToAnimAttacker: @ 0x080A6294 push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x18 @@ -342176,7 +342176,7 @@ sub_080A6294: @ 0x080A6294 ldr r4, _080A62B4 ldrb r0, [r4] movs r1, #0 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] @@ -342189,14 +342189,14 @@ _080A62B8: ldr r4, _080A62F0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 _080A62CC: - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -342204,7 +342204,7 @@ _080A62CC: movs r0, #0 ldrsh r1, [r4, r0] adds r0, r5, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r4, #2] ldrh r1, [r5, #0x22] adds r0, r0, r1 @@ -342215,10 +342215,10 @@ _080A62CC: .align 2, 0 _080A62F0: .4byte gUnknown_20380D6 _080A62F4: .4byte gUnknown_20380BE - thumb_func_end sub_080A6294 + thumb_func_end InitSpritePosToAnimAttacker - thumb_func_start sub_080A62F8 -sub_080A62F8: @ 0x080A62F8 + thumb_func_start GetBattlerSide +GetBattlerSide: @ 0x080A62F8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080A6308 @@ -342229,7 +342229,7 @@ sub_080A62F8: @ 0x080A62F8 bx lr .align 2, 0 _080A6308: .4byte gUnknown_2023D1A - thumb_func_end sub_080A62F8 + thumb_func_end GetBattlerSide thumb_func_start sub_080A630C sub_080A630C: @ 0x080A630C @@ -342277,13 +342277,13 @@ _080A6350: .4byte gUnknown_2023D10 _080A6354: .4byte gUnknown_2023D1A thumb_func_end GetBattlerAtPosition - thumb_func_start sub_080A6358 -sub_080A6358: @ 0x080A6358 + thumb_func_start IsBattlerSpritePresent +IsBattlerSpritePresent: @ 0x080A6358 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A6384 @@ -342306,7 +342306,7 @@ _080A6384: cmp r0, #0xff beq _080A63E0 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A63B8 @@ -342333,7 +342333,7 @@ _080A63B8: _080A63C6: adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080A63E0 _080A63D2: @@ -342348,10 +342348,10 @@ _080A63E2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080A6358 + thumb_func_end IsBattlerSpritePresent - thumb_func_start sub_080A63E8 -sub_080A63E8: @ 0x080A63E8 + thumb_func_start IsDoubleBattle +IsDoubleBattle: @ 0x080A63E8 ldr r0, _080A63F4 ldr r0, [r0] movs r1, #1 @@ -342359,13 +342359,13 @@ sub_080A63E8: @ 0x080A63E8 bx lr .align 2, 0 _080A63F4: .4byte gUnknown_2022C90 - thumb_func_end sub_080A63E8 + thumb_func_end IsDoubleBattle thumb_func_start sub_080A63F8 sub_080A63F8: @ 0x080A63F8 push {r4, lr} adds r4, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -342415,7 +342415,7 @@ sub_080A6458: @ 0x080A6458 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -342477,7 +342477,7 @@ sub_080A64C4: @ 0x080A64C4 ldr r0, _080A64F4 ldr r0, [r0] str r0, [r4, #4] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -342561,7 +342561,7 @@ sub_080A6530: @ 0x080A6530 bl FillBgTilemapBufferRect add r0, sp, #0xc ldrb r0, [r0, #9] - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0x20 pop {r0} bx r0 @@ -342569,8 +342569,8 @@ sub_080A6530: @ 0x080A6530 _080A6584: .4byte 0x05000800 thumb_func_end sub_080A6530 - thumb_func_start sub_080A6588 -sub_080A6588: @ 0x080A6588 + thumb_func_start AnimLoadCompressedBgGfx +AnimLoadCompressedBgGfx: @ 0x080A6588 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -342607,10 +342607,10 @@ sub_080A6588: @ 0x080A6588 .align 2, 0 _080A65D0: .4byte gUnknown_2022D00 _080A65D4: .4byte 0x05000800 - thumb_func_end sub_080A6588 + thumb_func_end AnimLoadCompressedBgGfx - thumb_func_start sub_080A65D8 -sub_080A65D8: @ 0x080A65D8 + thumb_func_start InitAnimBgTilemapBuffer +InitAnimBgTilemapBuffer: @ 0x080A65D8 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -342632,26 +342632,26 @@ sub_080A65D8: @ 0x080A65D8 adds r1, r5, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer add sp, #0xc pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080A65D8 + thumb_func_end InitAnimBgTilemapBuffer - thumb_func_start sub_080A6610 -sub_080A6610: @ 0x080A6610 + thumb_func_start AnimLoadCompressedBgTilemap +AnimLoadCompressedBgTilemap: @ 0x080A6610 push {r4, lr} adds r4, r0, #0 - bl sub_080A65D8 + bl InitAnimBgTilemapBuffer lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A6610 + thumb_func_end AnimLoadCompressedBgTilemap thumb_func_start sub_080A6628 sub_080A6628: @ 0x080A6628 @@ -342659,8 +342659,8 @@ sub_080A6628: @ 0x080A6628 adds r4, r0, #0 adds r5, r2, #0 ldrb r0, [r4, #9] - bl sub_080A65D8 - bl sub_080A46B8 + bl InitAnimBgTilemapBuffer + bl IsContest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -342673,7 +342673,7 @@ sub_080A6628: @ 0x080A6628 bl sub_080A3FE8 _080A664E: ldrb r0, [r4, #9] - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5} pop {r0} bx r0 @@ -342683,7 +342683,7 @@ _080A664E: thumb_func_start sub_080A665C sub_080A665C: @ 0x080A665C push {lr} - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A666C @@ -342703,7 +342703,7 @@ sub_080A6674: @ 0x080A6674 lsls r0, r0, #0x18 cmp r0, #0 beq _080A6686 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A669C @@ -342711,21 +342711,21 @@ _080A6686: movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #3 movs r1, #1 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute b _080A66B0 _080A669C: movs r0, #3 movs r1, #0 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #3 movs r1, #1 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _080A66B0: pop {r0} bx r0 @@ -342740,7 +342740,7 @@ sub_080A66B4: @ 0x080A66B4 ldrh r0, [r4, #0x22] strh r0, [r4, #0x34] adds r0, r4, #0 - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation ldr r1, _080A66D8 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -342749,11 +342749,11 @@ sub_080A66B4: @ 0x080A66B4 pop {r0} bx r0 .align 2, 0 -_080A66D8: .4byte sub_080A5E70 +_080A66D8: .4byte TranslateSpriteLinearFixedPointIconFrame thumb_func_end sub_080A66B4 - thumb_func_start sub_080A66DC -sub_080A66DC: @ 0x080A66DC + thumb_func_start InitSpriteDataForLinearTranslation +InitSpriteDataForLinearTranslation: @ 0x080A66DC push {r4, r5, r6, lr} adds r5, r0, #0 ldrh r0, [r5, #0x32] @@ -342784,10 +342784,10 @@ sub_080A66DC: @ 0x080A66DC pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A66DC + thumb_func_end InitSpriteDataForLinearTranslation - thumb_func_start sub_080A671C -sub_080A671C: @ 0x080A671C + thumb_func_start InitAnimLinearTranslation +InitAnimLinearTranslation: @ 0x080A671C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -342867,7 +342867,7 @@ _080A6798: bx r0 .align 2, 0 _080A67B0: .4byte 0x0000FFFE - thumb_func_end sub_080A671C + thumb_func_end InitAnimLinearTranslation thumb_func_start sub_080A67B4 sub_080A67B4: @ 0x080A67B4 @@ -342878,7 +342878,7 @@ sub_080A67B4: @ 0x080A67B4 ldrh r0, [r4, #0x22] strh r0, [r4, #0x34] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r1, _080A67D8 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -342899,7 +342899,7 @@ sub_080A67DC: @ 0x080A67DC ldrh r0, [r4, #0x22] strh r0, [r4, #0x34] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r1, _080A6800 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -342976,7 +342976,7 @@ sub_080A6860: @ 0x080A6860 cmp r0, #0 beq _080A6874 adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A6874: pop {r4} pop {r0} @@ -342995,7 +342995,7 @@ sub_080A687C: @ 0x080A687C cmp r0, #0 beq _080A6896 adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A6896: pop {r4} pop {r0} @@ -343021,7 +343021,7 @@ _080A68B0: bl __divsi3 strh r0, [r4, #0x2e] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation pop {r4} pop {r0} bx r0 @@ -343048,8 +343048,8 @@ sub_080A68C8: @ 0x080A68C8 _080A68EC: .4byte sub_080A6860 thumb_func_end sub_080A68C8 - thumb_func_start sub_080A68F0 -sub_080A68F0: @ 0x080A68F0 + thumb_func_start InitAnimFastLinearTranslation +InitAnimFastLinearTranslation: @ 0x080A68F0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -343129,7 +343129,7 @@ _080A696C: bx r0 .align 2, 0 _080A6984: .4byte 0x0000FFFE - thumb_func_end sub_080A68F0 + thumb_func_end InitAnimFastLinearTranslation thumb_func_start sub_080A6988 sub_080A6988: @ 0x080A6988 @@ -343140,7 +343140,7 @@ sub_080A6988: @ 0x080A6988 ldrh r0, [r4, #0x22] strh r0, [r4, #0x34] adds r0, r4, #0 - bl sub_080A68F0 + bl InitAnimFastLinearTranslation ldr r1, _080A69AC str r1, [r4, #0x1c] adds r0, r4, #0 @@ -343217,7 +343217,7 @@ sub_080A6A0C: @ 0x080A6A0C cmp r0, #0 beq _080A6A20 adds r0, r4, #0 - bl sub_080A5BA4 + bl SetCallbackToStoredInData6 _080A6A20: pop {r4} pop {r0} @@ -343225,8 +343225,8 @@ _080A6A20: .align 2, 0 thumb_func_end sub_080A6A0C - thumb_func_start sub_080A6A28 -sub_080A6A28: @ 0x080A6A28 + thumb_func_start InitAnimFastLinearTranslationWithSpeed +InitAnimFastLinearTranslationWithSpeed: @ 0x080A6A28 push {r4, lr} adds r4, r0, #0 movs r0, #0x32 @@ -343244,11 +343244,11 @@ _080A6A3C: bl __divsi3 strh r0, [r4, #0x2e] adds r0, r4, #0 - bl sub_080A68F0 + bl InitAnimFastLinearTranslation pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A6A28 + thumb_func_end InitAnimFastLinearTranslationWithSpeed thumb_func_start sub_080A6A54 sub_080A6A54: @ 0x080A6A54 @@ -343259,7 +343259,7 @@ sub_080A6A54: @ 0x080A6A54 ldrh r0, [r4, #0x22] strh r0, [r4, #0x34] adds r0, r4, #0 - bl sub_080A6A28 + bl InitAnimFastLinearTranslationWithSpeed ldr r1, _080A6A78 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -343271,8 +343271,8 @@ sub_080A6A54: @ 0x080A6A54 _080A6A78: .4byte sub_080A6A0C thumb_func_end sub_080A6A54 - thumb_func_start sub_080A6A7C -sub_080A6A7C: @ 0x080A6A7C + thumb_func_start SetSpriteRotScale +SetSpriteRotScale: @ 0x080A6A7C push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -343336,18 +343336,18 @@ _080A6AB8: _080A6AF4: .4byte 0xFFFF0000 _080A6AF8: .4byte gUnknown_20205AC _080A6AFC: .4byte gUnknown_2021B3C - thumb_func_end sub_080A6A7C + thumb_func_end SetSpriteRotScale thumb_func_start sub_080A6B00 sub_080A6B00: @ 0x080A6B00 push {r4, lr} - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A6B30 ldr r4, _080A6B2C movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -343370,8 +343370,8 @@ _080A6B32: bx r1 thumb_func_end sub_080A6B00 - thumb_func_start sub_080A6B38 -sub_080A6B38: @ 0x080A6B38 + thumb_func_start PrepareBattlerSpriteForRotScale +PrepareBattlerSpriteForRotScale: @ 0x080A6B38 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -343388,12 +343388,12 @@ sub_080A6B38: @ 0x080A6B38 ldrh r0, [r4, #0x2e] lsls r0, r0, #0x18 lsrs r7, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A6B6E adds r0, r7, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A6B7C @@ -343427,7 +343427,7 @@ _080A6B7C: movs r1, #0x80 orrs r0, r1 strb r0, [r2] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A6BDA @@ -343475,10 +343475,10 @@ _080A6BDA: .align 2, 0 _080A6C04: .4byte gUnknown_20205AC _080A6C08: .4byte gUnknown_2024174 - thumb_func_end sub_080A6B38 + thumb_func_end PrepareBattlerSpriteForRotScale - thumb_func_start sub_080A6C0C -sub_080A6C0C: @ 0x080A6C0C + thumb_func_start ResetSpriteRotScale +ResetSpriteRotScale: @ 0x080A6C0C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -343488,7 +343488,7 @@ sub_080A6C0C: @ 0x080A6C0C adds r0, r4, #0 adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldr r1, _080A6C64 lsls r0, r4, #4 adds r0, r0, r4 @@ -343522,7 +343522,7 @@ sub_080A6C0C: @ 0x080A6C0C bx r0 .align 2, 0 _080A6C64: .4byte gUnknown_20205AC - thumb_func_end sub_080A6C0C + thumb_func_end ResetSpriteRotScale thumb_func_start SetBattlerSpriteYOffsetFromRotation SetBattlerSpriteYOffsetFromRotation: @ 0x080A6C68 @@ -343559,8 +343559,8 @@ _080A6CA0: .4byte gUnknown_20205AC _080A6CA4: .4byte gUnknown_2021B3C thumb_func_end SetBattlerSpriteYOffsetFromRotation - thumb_func_start sub_080A6CA8 -sub_080A6CA8: @ 0x080A6CA8 + thumb_func_start TrySetSpriteRotScale +TrySetSpriteRotScale: @ 0x080A6CA8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -343653,7 +343653,7 @@ _080A6D4E: .align 2, 0 _080A6D5C: .4byte 0xFFFF0000 _080A6D60: .4byte gUnknown_2021B3C - thumb_func_end sub_080A6CA8 + thumb_func_end TrySetSpriteRotScale thumb_func_start sub_080A6D64 sub_080A6D64: @ 0x080A6D64 @@ -343667,7 +343667,7 @@ sub_080A6D64: @ 0x080A6D64 adds r0, r4, #0 movs r1, #1 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale adds r2, r4, #0 adds r2, #0x2c ldrb r1, [r2] @@ -343689,8 +343689,8 @@ sub_080A6D64: @ 0x080A6D64 .align 2, 0 thumb_func_end sub_080A6D64 - thumb_func_start sub_080A6DA4 -sub_080A6DA4: @ 0x080A6DA4 + thumb_func_start ArcTan2_ +ArcTan2_: @ 0x080A6DA4 push {lr} lsls r0, r0, #0x10 asrs r0, r0, #0x10 @@ -343702,7 +343702,7 @@ sub_080A6DA4: @ 0x080A6DA4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A6DA4 + thumb_func_end ArcTan2_ thumb_func_start ArcTan2Neg ArcTan2Neg: @ 0x080A6DBC @@ -343711,7 +343711,7 @@ ArcTan2Neg: @ 0x080A6DBC asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_080A6DA4 + bl ArcTan2_ lsls r0, r0, #0x10 rsbs r0, r0, #0 lsrs r0, r0, #0x10 @@ -343719,8 +343719,8 @@ ArcTan2Neg: @ 0x080A6DBC bx r1 thumb_func_end ArcTan2Neg - thumb_func_start sub_080A6DD4 -sub_080A6DD4: @ 0x080A6DD4 + thumb_func_start SetGreyscaleOrOriginalPalette +SetGreyscaleOrOriginalPalette: @ 0x080A6DD4 push {r4, r5, r6, r7, lr} lsls r1, r1, #0x18 lsls r0, r0, #0x14 @@ -343797,7 +343797,7 @@ _080A6E60: _080A6E68: .4byte gUnknown_20373B4 _080A6E6C: .4byte gUnknown_20377B4 _080A6E70: .4byte 0x04000008 - thumb_func_end sub_080A6DD4 + thumb_func_end SetGreyscaleOrOriginalPalette thumb_func_start sub_080A6E74 sub_080A6E74: @ 0x080A6E74 @@ -343831,7 +343831,7 @@ sub_080A6E74: @ 0x080A6E74 movs r4, #0 cmp r0, #0 beq _080A6ECA - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A6EBE @@ -343872,7 +343872,7 @@ _080A6EF0: ldrb r0, [r6] movs r5, #2 eors r0, r5 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A6F16 @@ -343891,7 +343891,7 @@ _080A6F16: ldrb r0, [r6] movs r5, #2 eors r0, r5 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A6F3C @@ -343906,7 +343906,7 @@ _080A6F3C: ldr r0, [sp] cmp r0, #0 beq _080A6F62 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A6F5C @@ -343925,7 +343925,7 @@ _080A6F62: ldr r0, [sp, #4] cmp r0, #0 beq _080A6F78 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A6F78 @@ -343960,7 +343960,7 @@ sub_080A6F8C: @ 0x080A6F8C lsrs r3, r3, #0x18 mov r8, r3 movs r4, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A6FBA @@ -343976,7 +343976,7 @@ _080A6FBA: bl GetBattlerAtPosition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A6FE2 @@ -343994,7 +343994,7 @@ _080A6FE2: bl GetBattlerAtPosition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A700E @@ -344014,7 +344014,7 @@ _080A700E: bl GetBattlerAtPosition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A703A @@ -344035,7 +344035,7 @@ _080A703A: bl GetBattlerAtPosition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A7068 @@ -344065,8 +344065,8 @@ sub_080A7074: @ 0x080A7074 .align 2, 0 thumb_func_end sub_080A7074 - thumb_func_start sub_080A707C -sub_080A707C: @ 0x080A707C + thumb_func_start GetBattlerAtPosition_ +GetBattlerAtPosition_: @ 0x080A707C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -344076,7 +344076,7 @@ sub_080A707C: @ 0x080A707C pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A707C + thumb_func_end GetBattlerAtPosition_ thumb_func_start sub_080A7090 sub_080A7090: @ 0x080A7090 @@ -344099,7 +344099,7 @@ _080A70AA: cmp r0, #0 bne _080A70C0 adds r0, r4, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _080A70C6 .align 2, 0 _080A70BC: .4byte gUnknown_20380BE @@ -344120,7 +344120,7 @@ _080A70CE: cmp r0, #0 beq _080A70E2 adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _080A70E2: pop {r4} pop {r0} @@ -344149,10 +344149,10 @@ _080A7100: movs r7, #3 _080A710A: adds r0, r5, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _080A7164 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A7124 @@ -344165,7 +344165,7 @@ _080A7124: ldr r4, _080A7168 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #4] @@ -344173,7 +344173,7 @@ _080A7124: strh r0, [r5, #0x32] ldrb r0, [r4] adds r1, r7, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #6] @@ -344183,7 +344183,7 @@ _080A7124: str r0, [r5, #0x1c] ldr r1, _080A7170 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -344192,7 +344192,7 @@ _080A7160: .4byte gUnknown_20380BE _080A7164: .4byte gUnknown_20380D6 _080A7168: .4byte gUnknown_20380D7 _080A716C: .4byte sub_080A67B4 -_080A7170: .4byte sub_080A34C4 +_080A7170: .4byte DestroyAnimSprite thumb_func_end TranslateAnimSpriteToTargetMonLocation thumb_func_start sub_080A7174 @@ -344200,10 +344200,10 @@ sub_080A7174: @ 0x080A7174 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _080A71D4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A7194 @@ -344218,7 +344218,7 @@ _080A7194: ldr r5, _080A71DC ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -344226,7 +344226,7 @@ _080A7194: strh r0, [r6, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #6] @@ -344235,7 +344235,7 @@ _080A7194: ldrh r0, [r4, #0xa] strh r0, [r6, #0x38] adds r0, r6, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _080A71E0 str r0, [r6, #0x1c] pop {r4, r5, r6} @@ -344252,12 +344252,12 @@ _080A71E0: .4byte sub_080A71E4 sub_080A71E4: @ 0x080A71E4 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _080A71F8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080A71F8: pop {r4} pop {r0} @@ -344289,7 +344289,7 @@ _080A721C: bne _080A7234 adds r0, r5, #0 adds r1, r4, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _080A7230 b _080A723E .align 2, 0 @@ -344303,7 +344303,7 @@ _080A723E: ldrb r6, [r0] ldr r0, _080A72A0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A7256 @@ -344320,7 +344320,7 @@ _080A7256: strh r0, [r5, #0x2e] adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r2, [r4, #4] @@ -344328,7 +344328,7 @@ _080A7256: strh r0, [r5, #0x32] adds r0, r6, #0 adds r1, r7, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #6] @@ -344338,7 +344338,7 @@ _080A7256: str r0, [r5, #0x1c] ldr r1, _080A72AC adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -344347,15 +344347,15 @@ _080A729C: .4byte gUnknown_20380D7 _080A72A0: .4byte gUnknown_20380D6 _080A72A4: .4byte gUnknown_20380BE _080A72A8: .4byte sub_080A67B4 -_080A72AC: .4byte sub_080A34C4 +_080A72AC: .4byte DestroyAnimSprite thumb_func_end sub_080A7200 - thumb_func_start sub_080A72B0 -sub_080A72B0: @ 0x080A72B0 + thumb_func_start CloneBattlerSpriteWithBlend +CloneBattlerSpriteWithBlend: @ 0x080A72B0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0xff @@ -344411,10 +344411,10 @@ _080A731E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080A72B0 + thumb_func_end CloneBattlerSpriteWithBlend - thumb_func_start sub_080A7324 -sub_080A7324: @ 0x080A7324 + thumb_func_start obj_delete_but_dont_free_vram +obj_delete_but_dont_free_vram: @ 0x080A7324 push {lr} adds r3, r0, #0 adds r3, #0x3f @@ -344426,7 +344426,7 @@ sub_080A7324: @ 0x080A7324 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A7324 + thumb_func_end obj_delete_but_dont_free_vram thumb_func_start sub_080A733C sub_080A733C: @ 0x080A733C @@ -344582,14 +344582,14 @@ _080A7458: .align 2, 0 thumb_func_end sub_080A73C4 - thumb_func_start sub_080A7460 -sub_080A7460: @ 0x080A7460 + thumb_func_start AnimTask_BlendMonInAndOut +AnimTask_BlendMonInAndOut: @ 0x080A7460 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080A7480 ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0xff @@ -344626,7 +344626,7 @@ _080A74AA: _080A74B0: .4byte gUnknown_3005B60 _080A74B4: .4byte gUnknown_20205AC _080A74B8: .4byte 0x00000101 - thumb_func_end sub_080A7460 + thumb_func_end AnimTask_BlendMonInAndOut thumb_func_start AnimTask_BlendMonInAndOutSetup AnimTask_BlendMonInAndOutSetup: @ 0x080A74BC @@ -344648,11 +344648,11 @@ AnimTask_BlendMonInAndOutSetup: @ 0x080A74BC bx lr .align 2, 0 _080A74DC: .4byte gUnknown_20380BE -_080A74E0: .4byte sub_080A74E4 +_080A74E0: .4byte AnimTask_BlendMonInAndOutStep thumb_func_end AnimTask_BlendMonInAndOutSetup - thumb_func_start sub_080A74E4 -sub_080A74E4: @ 0x080A74E4 + thumb_func_start AnimTask_BlendMonInAndOutStep +AnimTask_BlendMonInAndOutStep: @ 0x080A74E4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -344728,7 +344728,7 @@ _080A7574: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A74E4 + thumb_func_end AnimTask_BlendMonInAndOutStep thumb_func_start sub_080A757C sub_080A757C: @ 0x080A757C @@ -344737,7 +344737,7 @@ sub_080A757C: @ 0x080A757C lsrs r4, r0, #0x18 ldr r0, _080A759C ldrh r0, [r0] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -344788,17 +344788,17 @@ PrepareAffineAnimInTaskData: @ 0x080A75C4 adds r0, #0x22 adds r3, #0x24 adds r1, r3, #0 - bl sub_080A7910 + bl StorePointerInVars adds r0, r4, #0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale pop {r4} pop {r0} bx r0 thumb_func_end PrepareAffineAnimInTaskData - thumb_func_start sub_080A75FC -sub_080A75FC: @ 0x080A75FC + thumb_func_start RunAffineAnimFromTaskData +RunAffineAnimFromTaskData: @ 0x080A75FC push {r4, r5, r6, lr} adds r4, r0, #0 ldr r5, _080A769C @@ -344806,7 +344806,7 @@ sub_080A75FC: @ 0x080A75FC ldrsh r0, [r4, r1] movs r2, #0x24 ldrsh r1, [r4, r2] - bl sub_080A7918 + bl LoadPointerFromVars movs r3, #0x16 ldrsh r1, [r4, r3] lsls r1, r1, #3 @@ -344859,11 +344859,11 @@ _080A764A: movs r3, #0x1e ldrsh r2, [r4, r3] ldrh r3, [r4, #0x20] - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale ldrh r0, [r4, #0x18] adds r0, #1 strh r0, [r4, #0x18] @@ -344945,7 +344945,7 @@ _080A7704: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale movs r0, #0 b _080A772C .align 2, 0 @@ -344959,16 +344959,16 @@ _080A772C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A75FC + thumb_func_end RunAffineAnimFromTaskData - thumb_func_start sub_080A7734 -sub_080A7734: @ 0x080A7734 + thumb_func_start SetBattlerSpriteYOffsetFromYScale +SetBattlerSpriteYOffsetFromYScale: @ 0x080A7734 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080A77E0 + bl GetBattlerYDeltaFromSpriteId lsls r0, r0, #0x10 lsrs r0, r0, #0xf movs r1, #0x40 @@ -345003,10 +345003,10 @@ _080A7770: .align 2, 0 _080A7780: .4byte gUnknown_20205AC _080A7784: .4byte gUnknown_2021B3C - thumb_func_end sub_080A7734 + thumb_func_end SetBattlerSpriteYOffsetFromYScale - thumb_func_start sub_080A7788 -sub_080A7788: @ 0x080A7788 + thumb_func_start SetBattlerSpriteYOffsetFromOtherYScale +SetBattlerSpriteYOffsetFromOtherYScale: @ 0x080A7788 push {r4, r5, lr} adds r4, r0, #0 adds r0, r1, #0 @@ -345014,7 +345014,7 @@ sub_080A7788: @ 0x080A7788 lsrs r4, r4, #0x18 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A77E0 + bl GetBattlerYDeltaFromSpriteId lsls r0, r0, #0x10 lsrs r0, r0, #0xf movs r1, #0x40 @@ -345049,10 +345049,10 @@ _080A77C8: .align 2, 0 _080A77D8: .4byte gUnknown_20205AC _080A77DC: .4byte gUnknown_2021B3C - thumb_func_end sub_080A7788 + thumb_func_end SetBattlerSpriteYOffsetFromOtherYScale - thumb_func_start sub_080A77E0 -sub_080A77E0: @ 0x080A77E0 + thumb_func_start GetBattlerYDeltaFromSpriteId +GetBattlerYDeltaFromSpriteId: @ 0x080A77E0 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -345076,7 +345076,7 @@ _080A7800: beq _080A780A b _080A78FC _080A780A: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A7840 @@ -345099,7 +345099,7 @@ _080A783C: .4byte gUnknown_82D5A68 _080A7840: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A78A0 @@ -345120,7 +345120,7 @@ _080A7840: ldr r1, _080A7884 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r2, r0, #0x10 b _080A788A @@ -345160,7 +345160,7 @@ _080A78A0: ldr r1, _080A78D4 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r2, r0, #0x10 b _080A78DA @@ -345203,25 +345203,25 @@ _080A790A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080A77E0 + thumb_func_end GetBattlerYDeltaFromSpriteId - thumb_func_start sub_080A7910 -sub_080A7910: @ 0x080A7910 + thumb_func_start StorePointerInVars +StorePointerInVars: @ 0x080A7910 strh r2, [r0] asrs r2, r2, #0x10 strh r2, [r1] bx lr - thumb_func_end sub_080A7910 + thumb_func_end StorePointerInVars - thumb_func_start sub_080A7918 -sub_080A7918: @ 0x080A7918 + thumb_func_start LoadPointerFromVars +LoadPointerFromVars: @ 0x080A7918 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 lsls r1, r1, #0x10 orrs r0, r1 bx lr .align 2, 0 - thumb_func_end sub_080A7918 + thumb_func_end LoadPointerFromVars thumb_func_start sub_080A7924 sub_080A7924: @ 0x080A7924 @@ -345318,7 +345318,7 @@ _080A79C2: movs r3, #0x1c ldrsh r2, [r4, r3] movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale movs r0, #0x18 ldrsh r3, [r4, r0] cmp r3, #0 @@ -345326,7 +345326,7 @@ _080A79C2: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale b _080A79FC _080A79EC: ldr r2, _080A7A04 @@ -345386,7 +345386,7 @@ sub_080A7A3C: @ 0x080A7A3C adds r7, r4, #0 ldr r6, _080A7B30 ldrb r0, [r6] - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A7A7C @@ -345413,7 +345413,7 @@ _080A7A7C: ldr r0, _080A7B3C mov r8, r0 ldrb r0, [r0] - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A7AB4 @@ -345441,7 +345441,7 @@ _080A7AB4: ldrb r0, [r6] movs r5, #2 eors r0, r5 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A7AEC @@ -345469,7 +345469,7 @@ _080A7AEC: mov r1, r8 ldrb r0, [r1] eors r0, r5 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A7B24 @@ -345519,7 +345519,7 @@ _080A7B4E: lsls r0, r5, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080A7B90 @@ -345568,7 +345568,7 @@ GetBattlerSpriteSubpriority: @ 0x080A7BAC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A7BC8 @@ -345603,15 +345603,15 @@ _080A7BE8: .align 2, 0 thumb_func_end GetBattlerSpriteSubpriority - thumb_func_start sub_080A7BF0 -sub_080A7BF0: @ 0x080A7BF0 + thumb_func_start GetBattlerSpriteBGPriority +GetBattlerSpriteBGPriority: @ 0x080A7BF0 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_080A630C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A7C0C @@ -345629,7 +345629,7 @@ _080A7C18: movs r0, #1 _080A7C1A: movs r1, #4 - bl sub_08118990 + bl GetAnimBgAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _080A7C24: @@ -345637,14 +345637,14 @@ _080A7C24: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A7BF0 + thumb_func_end GetBattlerSpriteBGPriority thumb_func_start GetBattlerSpriteBGPriorityRank GetBattlerSpriteBGPriorityRank: @ 0x080A7C2C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A7C52 @@ -345699,7 +345699,7 @@ sub_080A7C5C: @ 0x080A7C5C lsls r0, r7, #3 ldr r1, _080A7D3C adds r0, r0, r1 - bl sub_08008210 + bl LoadSpriteSheet lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0xc] @@ -345724,7 +345724,7 @@ sub_080A7C5C: @ 0x080A7C5C bne _080A7CDA movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] movs r2, #0xbe lsls r2, r2, #1 @@ -345737,14 +345737,14 @@ _080A7CDA: adds r0, r6, #0 ldr r1, [sp, #0x3c] mov r2, r8 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality lsls r1, r5, #0x14 movs r2, #0x80 lsls r2, r2, #0x11 adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r3, [sp, #0x44] cmp r3, #1 beq _080A7D26 @@ -345807,14 +345807,14 @@ _080A7D78: adds r0, r6, #0 ldr r1, [sp, #0x3c] mov r2, r8 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality lsls r1, r5, #0x14 movs r3, #0x80 lsls r3, r3, #0x11 adds r1, r1, r3 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, [sp, #0x44] cmp r0, #1 beq _080A7DBE @@ -345851,7 +345851,7 @@ _080A7DD2: str r2, [sp] adds r2, r6, #0 mov r3, r8 - bl sub_080349D4 + bl LoadSpecialPokePic_DontHandleDeoxys b _080A7E08 .align 2, 0 _080A7DE0: .4byte gUnknown_2024174 @@ -345889,7 +345889,7 @@ _080A7E08: ldr r0, [r5] adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] adds r0, r0, r4 movs r1, #0 @@ -345932,10 +345932,10 @@ _080A7E7A: lsls r2, r2, #0x10 asrs r2, r2, #0x10 ldr r3, [sp, #8] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A7EB6 @@ -345968,17 +345968,17 @@ _080A7ED0: .4byte gUnknown_20205AC _080A7ED4: .4byte gUnknown_82D2F50 thumb_func_end sub_080A7C5C - thumb_func_start sub_080A7ED8 -sub_080A7ED8: @ 0x080A7ED8 + thumb_func_start DestroySpriteAndFreeResources_ +DestroySpriteAndFreeResources_: @ 0x080A7ED8 push {lr} bl DestroySpriteAndFreeResources pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A7ED8 + thumb_func_end DestroySpriteAndFreeResources_ - thumb_func_start sub_080A7EE4 -sub_080A7EE4: @ 0x080A7EE4 + thumb_func_start GetBattlerSpriteCoordAttr +GetBattlerSpriteCoordAttr: @ 0x080A7EE4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -345989,7 +345989,7 @@ sub_080A7EE4: @ 0x080A7EE4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov sb, r1 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A7F8C @@ -346067,7 +346067,7 @@ _080A7F84: .4byte 0x00000181 _080A7F88: .4byte gUnknown_82D5A68 _080A7F8C: mov r0, r8 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A8058 @@ -346090,14 +346090,14 @@ _080A7F8C: ldr r5, _080A7FE0 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldrh r0, [r4] muls r0, r6, r0 adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 b _080A7FEC .align 2, 0 @@ -346187,14 +346187,14 @@ _080A8058: ldr r5, _080A80A0 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldrh r0, [r4] muls r0, r6, r0 adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 b _080A80AC .align 2, 0 @@ -346310,7 +346310,7 @@ _080A816E: _080A8176: mov r0, r8 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r4] @@ -346319,7 +346319,7 @@ _080A8176: _080A8188: mov r0, r8 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r4] @@ -346328,7 +346328,7 @@ _080A8188: _080A819A: mov r0, r8 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrb r2, [r4] @@ -346341,7 +346341,7 @@ _080A81AC: _080A81B2: mov r0, r8 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrb r2, [r4] @@ -346354,7 +346354,7 @@ _080A81C4: _080A81CA: mov r0, r8 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x1f @@ -346370,7 +346370,7 @@ _080A81E0: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080A7EE4 + thumb_func_end GetBattlerSpriteCoordAttr thumb_func_start SetAverageBattlerPositions SetAverageBattlerPositions: @ 0x080A81EC @@ -346395,20 +346395,20 @@ _080A820A: _080A820E: adds r0, r4, #0 adds r1, r5, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 adds r0, r4, #0 adds r1, r6, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r7, r0, #0x18 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080A8260 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080A8260 @@ -346416,12 +346416,12 @@ _080A820E: eors r4, r0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 adds r1, r6, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r3, r0, #0x18 mov r0, r8 @@ -346468,7 +346468,7 @@ sub_080A8290: @ 0x080A8290 lsrs r6, r6, #0x18 ldr r0, _080A8328 mov sl, r0 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -346544,7 +346544,7 @@ sub_080A8334: @ 0x080A8334 bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _080A836C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A8374 @@ -346588,7 +346588,7 @@ _080A837E: strh r0, [r4, #0x38] ldr r1, _080A83AC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080A83B0 str r0, [r4, #0x1c] pop {r4} @@ -346596,8 +346596,8 @@ _080A837E: bx r0 .align 2, 0 _080A83A8: .4byte gUnknown_20380BE -_080A83AC: .4byte sub_080A6014 -_080A83B0: .4byte sub_080A5FA4 +_080A83AC: .4byte DestroySpriteAndMatrix +_080A83B0: .4byte TranslateSpriteLinearAndFlicker thumb_func_end sub_080A8334 thumb_func_start sub_080A83B4 @@ -346606,7 +346606,7 @@ sub_080A83B4: @ 0x080A83B4 adds r4, r0, #0 ldr r0, _080A83DC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A83E4 @@ -346648,7 +346648,7 @@ _080A83EE: bl StartSpriteAnim ldr r1, _080A8424 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080A8428 str r0, [r4, #0x1c] pop {r4} @@ -346656,8 +346656,8 @@ _080A83EE: bx r0 .align 2, 0 _080A8420: .4byte gUnknown_20380BE -_080A8424: .4byte sub_080A6014 -_080A8428: .4byte sub_080A5FA4 +_080A8424: .4byte DestroySpriteAndMatrix +_080A8428: .4byte TranslateSpriteLinearAndFlicker thumb_func_end sub_080A83B4 thumb_func_start sub_080A842C @@ -346667,7 +346667,7 @@ sub_080A842C: @ 0x080A842C bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _080A8450 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A8458 @@ -346696,14 +346696,14 @@ _080A8464: str r0, [r4, #0x1c] ldr r1, _080A8488 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _080A8480: .4byte gUnknown_20380BE _080A8484: .4byte RunStoredCallbackWhenAnimEnds -_080A8488: .4byte sub_080A34C4 +_080A8488: .4byte DestroyAnimSprite thumb_func_end sub_080A842C thumb_func_start sub_080A848C @@ -346717,14 +346717,14 @@ sub_080A848C: @ 0x080A848C ldr r0, _080A8520 adds r5, r1, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r6, #0 strh r0, [r5, #8] ldr r7, _080A8524 ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r1, #8 cmp r0, #0 @@ -346930,7 +346930,7 @@ sub_080A8640: @ 0x080A8640 lsrs r1, r1, #0x18 mov r8, r1 movs r0, #0 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend lsls r0, r0, #0x10 lsrs r7, r0, #0x10 asrs r0, r0, #0x10 @@ -347009,7 +347009,7 @@ sub_080A86C4: @ 0x080A86C4 subs r1, #1 strh r1, [r0, #0x12] adds r0, r3, #0 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram _080A86EE: pop {r0} bx r0 @@ -347024,18 +347024,18 @@ sub_080A86F8: @ 0x080A86F8 ldr r4, _080A872C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A8730 @@ -347101,7 +347101,7 @@ _080A878C: cmp r0, r1 bge _080A87A4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080A87A4: pop {r4, r5} pop {r0} @@ -347126,7 +347126,7 @@ sub_080A87AC: @ 0x080A87AC strh r0, [r4, #0x36] ldr r0, _080A87E8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A87EC @@ -347155,17 +347155,17 @@ _080A87FA: str r0, [r4, #0x1c] ldr r1, _080A8814 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080A8810: .4byte sub_080A67B4 -_080A8814: .4byte sub_080A34C4 +_080A8814: .4byte DestroyAnimSprite thumb_func_end sub_080A87AC - thumb_func_start sub_080A8818 -sub_080A8818: @ 0x080A8818 + thumb_func_start ResetTasks +ResetTasks: @ 0x080A8818 push {r4, r5, r6, r7, lr} movs r4, #0 ldr r6, _080A886C @@ -347211,10 +347211,10 @@ _080A8822: _080A886C: .4byte gUnknown_3005B60 _080A8870: .4byte sub_080A8A40 _080A8874: .4byte 0x0000025E - thumb_func_end sub_080A8818 + thumb_func_end ResetTasks - thumb_func_start sub_080A8878 -sub_080A8878: @ 0x080A8878 + thumb_func_start CreateTask +CreateTask: @ 0x080A8878 push {r4, r5, r6, r7, lr} adds r2, r0, #0 lsls r1, r1, #0x18 @@ -347232,7 +347232,7 @@ _080A8884: str r2, [r4] strb r1, [r4, #7] adds r0, r6, #0 - bl sub_080A88CC + bl InsertTask adds r0, r7, #0 adds r0, #8 adds r0, r5, r0 @@ -347257,10 +347257,10 @@ _080A88C4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A8878 + thumb_func_end CreateTask - thumb_func_start sub_080A88CC -sub_080A88CC: @ 0x080A88CC + thumb_func_start InsertTask +InsertTask: @ 0x080A88CC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -347341,10 +347341,10 @@ _080A8958: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A88CC + thumb_func_end InsertTask - thumb_func_start sub_080A8964 -sub_080A8964: @ 0x080A8964 + thumb_func_start DestroyTask +DestroyTask: @ 0x080A8964 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -347404,10 +347404,10 @@ _080A89CE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080A8964 + thumb_func_end DestroyTask - thumb_func_start sub_080A89D4 -sub_080A89D4: @ 0x080A89D4 + thumb_func_start RunTasks +RunTasks: @ 0x080A89D4 push {r4, r5, lr} bl FindFirstActiveTask lsls r0, r0, #0x18 @@ -347431,7 +347431,7 @@ _080A89F8: bx r0 .align 2, 0 _080A8A00: .4byte gUnknown_3005B60 - thumb_func_end sub_080A89D4 + thumb_func_end RunTasks thumb_func_start FindFirstActiveTask FindFirstActiveTask: @ 0x080A8A04 @@ -347533,8 +347533,8 @@ SwitchTaskToFollowupFunc: @ 0x080A8A78 _080A8AA8: .4byte gUnknown_3005B60 thumb_func_end SwitchTaskToFollowupFunc - thumb_func_start sub_080A8AAC -sub_080A8AAC: @ 0x080A8AAC + thumb_func_start FuncIsActiveTask +FuncIsActiveTask: @ 0x080A8AAC push {r4, lr} adds r3, r0, #0 movs r2, #0 @@ -347566,10 +347566,10 @@ _080A8ADC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A8AAC + thumb_func_end FuncIsActiveTask - thumb_func_start sub_080A8AE4 -sub_080A8AE4: @ 0x080A8AE4 + thumb_func_start FindTaskIdByFunc +FindTaskIdByFunc: @ 0x080A8AE4 push {lr} adds r3, r0, #0 movs r2, #0 @@ -347596,7 +347596,7 @@ _080A8B0E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080A8AE4 + thumb_func_end FindTaskIdByFunc thumb_func_start GetTaskCount GetTaskCount: @ 0x080A8B14 @@ -347704,8 +347704,8 @@ sub_080A8BBC: @ 0x080A8BBC .align 2, 0 thumb_func_end sub_080A8BBC - thumb_func_start sub_080A8BC0 -sub_080A8BC0: @ 0x080A8BC0 + thumb_func_start ReshowBattleScreenAfterMenu +ReshowBattleScreenAfterMenu: @ 0x080A8BC0 push {lr} ldr r2, _080A8BF8 ldrb r0, [r2, #8] @@ -347713,9 +347713,9 @@ sub_080A8BC0: @ 0x080A8BC0 orrs r0, r1 strb r0, [r2, #8] movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x4c movs r1, #0 bl SetGpuReg @@ -347727,17 +347727,17 @@ sub_080A8BC0: @ 0x080A8BC0 adds r0, #0x22 strb r1, [r0] ldr r0, _080A8C00 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080A8BF8: .4byte gUnknown_2037C74 _080A8BFC: .4byte gUnknown_2024118 -_080A8C00: .4byte sub_080A8C04 - thumb_func_end sub_080A8BC0 +_080A8C00: .4byte CB2_ReshowBattleScreenAfterMenu + thumb_func_end ReshowBattleScreenAfterMenu - thumb_func_start sub_080A8C04 -sub_080A8C04: @ 0x080A8C04 + thumb_func_start CB2_ReshowBattleScreenAfterMenu +CB2_ReshowBattleScreenAfterMenu: @ 0x080A8C04 push {r4, r5, r6, r7, lr} sub sp, #8 ldr r0, _080A8C20 @@ -347777,24 +347777,24 @@ _080A8C28: @ jump table .4byte _080A8DB8 @ case 18 .4byte _080A8DC0 @ case 19 _080A8C78: - bl sub_080B9750 - bl sub_080354B0 + bl ScanlineEffect_Clear + bl BattleInitBgsAndWindows movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl ResetPaletteFade ldr r0, _080A8CD4 movs r1, #0 @@ -347849,14 +347849,14 @@ _080A8D18: .align 2, 0 _080A8D24: .4byte gUnknown_30030BC _080A8D28: - bl sub_0805DF6C + bl ClearSpritesHealthboxAnimData b _080A8E9A _080A8D2E: ldr r5, _080A8D48 adds r4, r5, #0 adds r4, #0x22 ldrb r0, [r4] - bl sub_0805DCA8 + bl BattleLoadAllHealthBoxesGfx lsls r0, r0, #0x18 cmp r0, #0 beq _080A8D4C @@ -347883,7 +347883,7 @@ _080A8D5E: _080A8D62: movs r0, #3 _080A8D64: - bl sub_080A8EDC + bl LoadBattlerSpriteGfx lsls r0, r0, #0x18 cmp r0, #0 beq _080A8D70 @@ -347900,38 +347900,38 @@ _080A8D72: _080A8D7C: .4byte gUnknown_2024118 _080A8D80: movs r0, #0 - bl sub_080A8FD0 + bl CreateBattlerSprite b _080A8E9A _080A8D88: movs r0, #1 - bl sub_080A8FD0 + bl CreateBattlerSprite b _080A8E9A _080A8D90: movs r0, #2 - bl sub_080A8FD0 + bl CreateBattlerSprite b _080A8E9A _080A8D98: movs r0, #3 - bl sub_080A8FD0 + bl CreateBattlerSprite b _080A8E9A _080A8DA0: movs r0, #0 - bl sub_080A93A4 + bl CreateHealthboxSprite b _080A8E9A _080A8DA8: movs r0, #1 - bl sub_080A93A4 + bl CreateHealthboxSprite b _080A8E9A _080A8DB0: movs r0, #2 - bl sub_080A93A4 + bl CreateHealthboxSprite b _080A8E9A _080A8DB8: movs r0, #3 - bl sub_080A93A4 + bl CreateHealthboxSprite b _080A8E9A _080A8DC0: - bl sub_0805E8A0 + bl LoadAndCreateEnemyShadowSprites movs r0, #1 bl GetBattlerAtPosition adds r4, r0, #0 @@ -347946,13 +347946,13 @@ _080A8DC0: ldr r5, _080A8E58 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 - bl sub_080A63E8 + bl SetBattlerShadowSpriteCallback + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _080A8E24 @@ -347967,12 +347967,12 @@ _080A8DC0: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback _080A8E24: ldr r1, _080A8E5C ldr r0, _080A8E60 @@ -347980,7 +347980,7 @@ _080A8E24: adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt ldr r0, _080A8E64 ldrb r0, [r0] cmp r0, #0 @@ -347989,10 +347989,10 @@ _080A8E24: ldrb r0, [r0] cmp r0, #0 beq _080A8E9A - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite b _080A8E9A .align 2, 0 _080A8E54: .4byte gUnknown_2023D12 @@ -348003,7 +348003,7 @@ _080A8E64: .4byte gUnknown_300319C _080A8E68: .4byte gUnknown_30031C4 _080A8E6C: ldr r0, _080A8EAC - bl sub_080006F0 + bl SetVBlankCallback bl sub_080A8EBC movs r0, #1 str r0, [sp] @@ -348011,14 +348011,14 @@ _080A8E6C: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A2078 + bl BeginHardwarePaletteFade ldr r2, _080A8EB0 ldrb r1, [r2, #8] movs r0, #0x7f ands r0, r1 strb r0, [r2, #8] ldr r0, _080A8EB4 - bl sub_08000540 + bl SetMainCallback2 bl sub_0805EB30 _080A8E9A: ldr r1, _080A8EB8 @@ -348031,11 +348031,11 @@ _080A8E9A: pop {r0} bx r0 .align 2, 0 -_080A8EAC: .4byte sub_080386DC +_080A8EAC: .4byte VBlankCB_Battle _080A8EB0: .4byte gUnknown_2037C74 -_080A8EB4: .4byte sub_080380FC +_080A8EB4: .4byte BattleMainCB2 _080A8EB8: .4byte gUnknown_2024118 - thumb_func_end sub_080A8C04 + thumb_func_end CB2_ReshowBattleScreenAfterMenu thumb_func_start sub_080A8EBC sub_080A8EBC: @ 0x080A8EBC @@ -348056,8 +348056,8 @@ _080A8ED4: .4byte 0x0400000A _080A8ED8: .4byte 0x0400000C thumb_func_end sub_080A8EBC - thumb_func_start sub_080A8EDC -sub_080A8EDC: @ 0x080A8EDC + thumb_func_start LoadBattlerSpriteGfx +LoadBattlerSpriteGfx: @ 0x080A8EDC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -348066,7 +348066,7 @@ sub_080A8EDC: @ 0x080A8EDC cmp r4, r0 bhs _080A8FC4 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A8F3E @@ -348089,7 +348089,7 @@ sub_080A8EDC: @ 0x080A8EDC ldr r1, _080A8F30 adds r0, r0, r1 adds r1, r4, #0 - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx b _080A8FBC .align 2, 0 _080A8F24: .4byte gUnknown_2023D10 @@ -348129,7 +348129,7 @@ _080A8F60: movs r0, #6 _080A8F72: movs r1, #0 - bl sub_0805DBA0 + bl DecompressTrainerBackPic b _080A8FBC _080A8F7A: ldr r0, _080A8FA8 @@ -348151,7 +348151,7 @@ _080A8F7A: ldr r1, _080A8FB0 adds r0, r0, r1 adds r1, r4, #0 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx b _080A8FBC .align 2, 0 _080A8FA8: .4byte gUnknown_2024174 @@ -348173,10 +348173,10 @@ _080A8FC4: bx r1 .align 2, 0 _080A8FCC: .4byte gUnknown_2024118 - thumb_func_end sub_080A8EDC + thumb_func_end LoadBattlerSpriteGfx - thumb_func_start sub_080A8FD0 -sub_080A8FD0: @ 0x080A8FD0 + thumb_func_start CreateBattlerSprite +CreateBattlerSprite: @ 0x080A8FD0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -348216,7 +348216,7 @@ _080A9016: lsrs r0, r0, #0x18 mov r8, r0 adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080A902A @@ -348235,7 +348235,7 @@ _080A902A: mov sb, r1 add r0, sb movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080A904E b _080A9368 @@ -348246,7 +348246,7 @@ _080A904E: adds r0, r2, #0 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -348256,11 +348256,11 @@ _080A904E: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r5, _080A911C adds r0, r7, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -348272,7 +348272,7 @@ _080A904E: adds r0, r5, #0 adds r1, r4, #0 mov r2, r8 - bl sub_08006B0C + bl CreateSprite ldr r1, _080A9120 adds r4, r7, r1 strb r0, [r4] @@ -348309,7 +348309,7 @@ _080A904E: adds r0, r1, #0 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldrb r2, [r4] lsls r1, r2, #4 adds r1, r1, r2 @@ -348358,7 +348358,7 @@ _080A9134: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _080A9190 ldr r1, _080A9194 ldr r0, [r5] @@ -348400,7 +348400,7 @@ _080A9198: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #6 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r5, _080A921C ldr r0, _080A9220 ldrb r0, [r0, #0x18] @@ -348420,7 +348420,7 @@ _080A9198: _080A91DC: movs r1, #0x50 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r3, _080A9224 strb r0, [r3] ldr r4, _080A9228 @@ -348469,7 +348469,7 @@ _080A9230: mov sb, r2 add r0, sb movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080A9254 b _080A9368 @@ -348480,7 +348480,7 @@ _080A9254: adds r0, r1, #0 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -348490,11 +348490,11 @@ _080A9254: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r5, _080A9380 adds r0, r7, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -348506,7 +348506,7 @@ _080A9254: adds r0, r5, #0 adds r1, r4, #0 mov r2, r8 - bl sub_08006B0C + bl CreateSprite ldr r1, _080A9384 adds r4, r7, r1 strb r0, [r4] @@ -348543,7 +348543,7 @@ _080A9254: adds r0, r2, #0 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldrb r2, [r4] lsls r1, r2, #4 adds r1, r1, r2 @@ -348627,10 +348627,10 @@ _080A9394: .4byte gUnknown_2024174 _080A9398: .4byte 0x00000181 _080A939C: .4byte gUnknown_82DD33C _080A93A0: .4byte 0x00000604 - thumb_func_end sub_080A8FD0 + thumb_func_end CreateBattlerSprite - thumb_func_start sub_080A93A4 -sub_080A93A4: @ 0x080A93A4 + thumb_func_start CreateHealthboxSprite +CreateHealthboxSprite: @ 0x080A93A4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -348648,7 +348648,7 @@ _080A93B4: beq _080A93D4 cmp r5, #0 bne _080A93D4 - bl sub_08072214 + bl CreateSafariPlayerHealthboxSprites b _080A93EC .align 2, 0 _080A93CC: .4byte gUnknown_2023D10 @@ -348665,7 +348665,7 @@ _080A93D4: b _080A9526 _080A93E6: adds r0, r5, #0 - bl sub_08071EEC + bl CreateBattlerHealthboxSprites _080A93EC: lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -348673,11 +348673,11 @@ _080A93EC: adds r4, r5, r0 strb r6, [r4] adds r0, r5, #0 - bl sub_08072528 + bl InitBattlerHealthboxCoords adds r0, r6, #0 bl SetHealthboxSpriteVisible adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A9434 @@ -348691,7 +348691,7 @@ _080A93EC: ldr r2, _080A9430 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute b _080A9480 .align 2, 0 _080A9428: .4byte gUnknown_3005AD0 @@ -348714,7 +348714,7 @@ _080A9434: ldr r2, _080A9464 adds r1, r1, r2 movs r2, #0xa - bl sub_080743F0 + bl UpdateHealthboxAttribute b _080A9480 .align 2, 0 _080A945C: .4byte gUnknown_2022C90 @@ -348731,7 +348731,7 @@ _080A9468: ldr r2, _080A94B0 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute _080A9480: adds r0, r5, #0 bl sub_080A630C @@ -348764,7 +348764,7 @@ _080A94B8: bl sub_08072494 _080A94C4: adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080A94FC @@ -348776,7 +348776,7 @@ _080A94C4: ldr r1, _080A94F8 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080A9526 adds r0, r6, #0 @@ -348801,7 +348801,7 @@ _080A94FC: ldr r1, _080A9534 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080A9526 adds r0, r6, #0 @@ -348814,7 +348814,7 @@ _080A9526: _080A952C: .4byte gUnknown_2022C90 _080A9530: .4byte gUnknown_2023D12 _080A9534: .4byte gUnknown_2024190 - thumb_func_end sub_080A93A4 + thumb_func_end CreateHealthboxSprite thumb_func_start sub_080A9538 sub_080A9538: @ 0x080A9538 @@ -348832,14 +348832,14 @@ sub_080A9538: @ 0x080A9538 ldrb r6, [r0] ldr r0, _080A95E0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldr r0, _080A95E4 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _080A95E8 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap ldr r1, _080A95EC mov r2, r8 lsls r0, r2, #2 @@ -348866,7 +348866,7 @@ _080A958C: asrs r2, r2, #0x10 ldr r0, _080A95F4 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r4, #4 @@ -348925,7 +348925,7 @@ _080A960A: asrs r2, r2, #0x10 ldr r0, _080A9678 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r4, #4 @@ -349040,7 +349040,7 @@ _080A96D8: cmp r0, #2 bne _080A9706 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080A9706 _080A9702: adds r0, r1, #1 @@ -349156,7 +349156,7 @@ sub_080A97BC: @ 0x080A97BC ldr r4, _080A986C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 ldr r1, _080A9870 @@ -349164,13 +349164,13 @@ sub_080A97BC: @ 0x080A97BC lsrs r5, r0, #0x10 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 ldr r1, _080A9874 adds r0, r0, r1 lsrs r4, r0, #0x10 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _080A97FA @@ -349193,7 +349193,7 @@ _080A97FA: lsls r2, r4, #0x10 asrs r2, r2, #0x10 movs r3, #4 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080A9880 @@ -349219,7 +349219,7 @@ _080A9844: ldr r1, _080A9888 adds r0, r0, r1 ldr r1, _080A988C - bl sub_0800858C + bl SetSubspriteTables ldr r1, _080A9890 lsls r0, r6, #2 adds r0, r0, r6 @@ -349295,7 +349295,7 @@ sub_080A98E8: @ 0x080A98E8 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080A9980 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080A9984 @@ -349470,8 +349470,8 @@ _080A9A4E: bx r0 thumb_func_end sub_080A99EC - thumb_func_start sub_080A9A54 -sub_080A9A54: @ 0x080A9A54 + thumb_func_start AnimTask_StatsChange +AnimTask_StatsChange: @ 0x080A9A54 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -349704,7 +349704,7 @@ _080A9C1A: _080A9C20: .4byte gUnknown_20380BE _080A9C24: .4byte gUnknown_3005B60 _080A9C28: .4byte sub_08117704 - thumb_func_end sub_080A9A54 + thumb_func_end AnimTask_StatsChange thumb_func_start LaunchStatusAnimation LaunchStatusAnimation: @ 0x080A9C2C @@ -349720,10 +349720,10 @@ LaunchStatusAnimation: @ 0x080A9C2C strb r4, [r0] ldr r0, _080A9C70 movs r2, #0 - bl sub_080A3310 + bl LaunchBattleAnimation ldr r0, _080A9C74 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080A9C78 @@ -349779,7 +349779,7 @@ sub_080A9C8C: @ 0x080A9C8C ands r0, r2 strb r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080A9CBE: pop {r4} pop {r0} @@ -349791,8 +349791,8 @@ _080A9CCC: .4byte gUnknown_2024174 _080A9CD0: .4byte gUnknown_3005B60 thumb_func_end sub_080A9C8C - thumb_func_start sub_080A9CD4 -sub_080A9CD4: @ 0x080A9CD4 + thumb_func_start SpriteCB_VersionBannerLeft +SpriteCB_VersionBannerLeft: @ 0x080A9CD4 push {lr} adds r3, r0, #0 ldr r2, _080A9D00 @@ -349846,10 +349846,10 @@ _080A9D32: bx r0 .align 2, 0 _080A9D38: .4byte gUnknown_851AC0C - thumb_func_end sub_080A9CD4 + thumb_func_end SpriteCB_VersionBannerLeft - thumb_func_start sub_080A9D3C -sub_080A9D3C: @ 0x080A9D3C + thumb_func_start SpriteCB_VersionBannerRight +SpriteCB_VersionBannerRight: @ 0x080A9D3C push {lr} adds r3, r0, #0 ldr r2, _080A9D64 @@ -349885,7 +349885,7 @@ _080A9D76: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A9D3C + thumb_func_end SpriteCB_VersionBannerRight thumb_func_start SpriteCB_PressStartCopyrightBanner SpriteCB_PressStartCopyrightBanner: @ 0x080A9D7C @@ -349921,8 +349921,8 @@ _080A9DB0: bx r0 thumb_func_end SpriteCB_PressStartCopyrightBanner - thumb_func_start sub_080A9DB4 -sub_080A9DB4: @ 0x080A9DB4 + thumb_func_start CreatePressStartBanner +CreatePressStartBanner: @ 0x080A9DB4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 ldr r2, _080A9E04 @@ -349937,7 +349937,7 @@ _080A9DC2: adds r1, r5, #0 asrs r2, r7, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -349965,10 +349965,10 @@ _080A9DC2: _080A9E04: .4byte 0xFFC00000 _080A9E08: .4byte gUnknown_851AD74 _080A9E0C: .4byte gUnknown_20205AC - thumb_func_end sub_080A9DB4 + thumb_func_end CreatePressStartBanner - thumb_func_start sub_080A9E10 -sub_080A9E10: @ 0x080A9E10 + thumb_func_start CreateCopyrightBanner +CreateCopyrightBanner: @ 0x080A9E10 push {r4, r5, r6, lr} lsls r0, r0, #0x10 ldr r2, _080A9E60 @@ -349983,7 +349983,7 @@ _080A9E1E: adds r1, r4, #0 asrs r2, r6, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -350011,10 +350011,10 @@ _080A9E1E: _080A9E60: .4byte 0xFFC00000 _080A9E64: .4byte gUnknown_851AD74 _080A9E68: .4byte gUnknown_20205AC - thumb_func_end sub_080A9E10 + thumb_func_end CreateCopyrightBanner - thumb_func_start sub_080A9E6C -sub_080A9E6C: @ 0x080A9E6C + thumb_func_start SpriteCB_PokemonLogoShine +SpriteCB_PokemonLogoShine: @ 0x080A9E6C push {r4, lr} adds r3, r0, #0 ldrh r2, [r3, #0x20] @@ -350107,10 +350107,10 @@ _080A9F10: bx r0 .align 2, 0 _080A9F18: .4byte gUnknown_20377B4 - thumb_func_end sub_080A9E6C + thumb_func_end SpriteCB_PokemonLogoShine - thumb_func_start sub_080A9F1C -sub_080A9F1C: @ 0x080A9F1C + thumb_func_start SpriteCB_PokemonLogoShine2 +SpriteCB_PokemonLogoShine2: @ 0x080A9F1C push {lr} adds r2, r0, #0 ldrh r3, [r2, #0x20] @@ -350132,10 +350132,10 @@ _080A9F3E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080A9F1C + thumb_func_end SpriteCB_PokemonLogoShine2 - thumb_func_start sub_080A9F44 -sub_080A9F44: @ 0x080A9F44 + thumb_func_start StartPokemonLogoShine +StartPokemonLogoShine: @ 0x080A9F44 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -350158,7 +350158,7 @@ _080A9F64: movs r1, #0 movs r2, #0x44 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080A9F94 @@ -350184,7 +350184,7 @@ _080A9F98: movs r1, #0 movs r2, #0x44 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r6, _080AA040 @@ -350212,7 +350212,7 @@ _080A9F98: movs r1, #0 movs r2, #0x44 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r1, r2, #4 @@ -350236,7 +350236,7 @@ _080A9F98: mov r0, sb movs r2, #0x44 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r2, #4 @@ -350262,15 +350262,15 @@ _080AA02E: .align 2, 0 _080AA03C: .4byte gUnknown_851ADC0 _080AA040: .4byte gUnknown_20205AC -_080AA044: .4byte sub_080A9F1C - thumb_func_end sub_080A9F44 +_080AA044: .4byte SpriteCB_PokemonLogoShine2 + thumb_func_end StartPokemonLogoShine - thumb_func_start sub_080AA048 -sub_080AA048: @ 0x080AA048 + thumb_func_start StopCryAndClearCrySongs +StopCryAndClearCrySongs: @ 0x080AA048 push {lr} - bl sub_080B9800 - bl sub_08006EA0 - bl sub_08007144 + bl ScanlineEffect_InitHBlankDmaTransfer + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer ldr r0, _080AA068 ldrh r1, [r0] @@ -350280,7 +350280,7 @@ sub_080AA048: @ 0x080AA048 bx r0 .align 2, 0 _080AA068: .4byte gUnknown_2022ACE - thumb_func_end sub_080AA048 + thumb_func_end StopCryAndClearCrySongs thumb_func_start sub_080AA06C sub_080AA06C: @ 0x080AA06C @@ -350310,7 +350310,7 @@ _080AA090: @ jump table .4byte _080AA3C4 @ case 5 _080AA0A8: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -350415,7 +350415,7 @@ _080AA18C: adds r0, r4, #0 movs r1, #0 adds r2, r5, #0 - bl sub_080A1200 + bl LoadPalette ldr r0, _080AA234 ldr r1, _080AA238 bl LZ77UnCompVram @@ -350426,31 +350426,31 @@ _080AA18C: adds r0, #0xa0 movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080AA244 ldr r1, _080AA248 bl LZ77UnCompVram ldr r0, _080AA24C ldr r1, _080AA250 bl LZ77UnCompVram - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes ldr r1, _080AA254 movs r0, #9 strb r0, [r1] ldr r0, _080AA258 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080AA25C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080AA260 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r1, #0x80 lsls r1, r1, #1 adds r0, r4, #0 adds r2, r5, #0 - bl sub_080A1200 + bl LoadPalette ldr r0, _080AA264 bl LoadSpritePalette ldr r0, _080AA268 @@ -350482,7 +350482,7 @@ _080AA268: .4byte gUnknown_3002360 _080AA26C: ldr r0, _080AA2A4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080AA2A8 @@ -350519,9 +350519,9 @@ _080AA2B4: movs r1, #1 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080AA2E0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080AA2E4 movs r2, #0x87 lsls r2, r2, #3 @@ -350531,7 +350531,7 @@ _080AA2B4: b _080AA3F2 .align 2, 0 _080AA2DC: .4byte 0x0000FFFF -_080AA2E0: .4byte sub_080AA048 +_080AA2E0: .4byte StopCryAndClearCrySongs _080AA2E4: .4byte gUnknown_3002360 _080AA2E8: movs r2, #0x80 @@ -350539,7 +350539,7 @@ _080AA2E8: movs r0, #0x78 movs r1, #0x50 movs r3, #0 - bl sub_0816F08C + bl PanFadeAndZoomScreen movs r1, #0xf0 lsls r1, r1, #8 movs r0, #0x28 @@ -350616,13 +350616,13 @@ _080AA3B8: .4byte 0x0000B441 _080AA3BC: .4byte 0x0000019D _080AA3C0: .4byte gUnknown_3002360 _080AA3C4: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 bne _080AA3F2 movs r0, #0 - bl sub_080A9F44 + bl StartPokemonLogoShine str r4, [sp] movs r0, #4 str r0, [sp, #4] @@ -350632,9 +350632,9 @@ _080AA3C4: movs r1, #0xa0 movs r2, #4 movs r3, #4 - bl sub_080B9ADC + bl ScanlineEffect_InitWave ldr r0, _080AA3FC - bl sub_08000540 + bl SetMainCallback2 _080AA3F2: add sp, #0x14 pop {r4, r5} @@ -350647,10 +350647,10 @@ _080AA3FC: .4byte sub_080AA400 thumb_func_start sub_080AA400 sub_080AA400: @ 0x080AA400 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -350699,7 +350699,7 @@ _080AA450: cmp r0, #0xb0 bne _080AA474 movs r0, #1 - bl sub_080A9F44 + bl StartPokemonLogoShine b _080AA47E .align 2, 0 _080AA46C: .4byte gUnknown_3002360 @@ -350708,7 +350708,7 @@ _080AA474: cmp r0, #0x40 bne _080AA47E movs r0, #2 - bl sub_080A9F44 + bl StartPokemonLogoShine _080AA47E: ldr r0, _080AA490 adds r1, r4, r6 @@ -350745,7 +350745,7 @@ _080AA494: movs r1, #0xa2 adds r2, r4, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _080AA51C @@ -350760,7 +350760,7 @@ _080AA494: movs r1, #0xd2 adds r2, r4, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -350782,11 +350782,11 @@ _080AA514: .4byte 0x00003F50 _080AA518: .4byte gUnknown_851ACB4 _080AA51C: .4byte gUnknown_20205AC _080AA520: .4byte gUnknown_851ACCC -_080AA524: .4byte sub_080AA528 +_080AA524: .4byte Task_TitleScreenPhase2 thumb_func_end sub_080AA418 - thumb_func_start sub_080AA528 -sub_080AA528: @ 0x080AA528 + thumb_func_start Task_TitleScreenPhase2 +Task_TitleScreenPhase2: @ 0x080AA528 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -350849,10 +350849,10 @@ _080AA580: bl SetGpuReg movs r0, #0x80 movs r1, #0x6c - bl sub_080A9DB4 + bl CreatePressStartBanner movs r0, #0x80 movs r1, #0x94 - bl sub_080A9E10 + bl CreateCopyrightBanner strh r7, [r5, #0x10] ldr r0, _080AA648 str r0, [r5] @@ -350924,12 +350924,12 @@ _080AA5F8: _080AA63C: .4byte 0x00002142 _080AA640: .4byte 0x00000F06 _080AA644: .4byte 0x00001741 -_080AA648: .4byte sub_080AA650 +_080AA648: .4byte Task_TitleScreenPhase3 _080AA64C: .4byte gUnknown_3005B60 - thumb_func_end sub_080AA528 + thumb_func_end Task_TitleScreenPhase2 - thumb_func_start sub_080AA650 -sub_080AA650: @ 0x080AA650 + thumb_func_start Task_TitleScreenPhase3 +Task_TitleScreenPhase3: @ 0x080AA650 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -350956,9 +350956,9 @@ _080AA670: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080AA698 - bl sub_08000540 + bl SetMainCallback2 b _080AA794 .align 2, 0 _080AA690: .4byte gUnknown_3002360 @@ -350971,7 +350971,7 @@ _080AA69C: cmp r0, #0x46 bne _080AA6B4 ldr r0, _080AA6B0 - bl sub_08000540 + bl SetMainCallback2 b _080AA794 .align 2, 0 _080AA6B0: .4byte sub_080AA7EC @@ -350991,9 +350991,9 @@ _080AA6B4: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080AA6E4 - bl sub_08000540 + bl SetMainCallback2 b _080AA794 .align 2, 0 _080AA6E4: .4byte sub_080AA808 @@ -351012,13 +351012,13 @@ _080AA6E8: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080AA718 - bl sub_08000540 + bl SetMainCallback2 b _080AA794 .align 2, 0 _080AA714: .4byte gUnknown_3002360 -_080AA718: .4byte sub_080AA824 +_080AA718: .4byte CB2_GoToBerryFixScreen _080AA71C: movs r0, #0x28 movs r1, #0 @@ -351059,7 +351059,7 @@ _080AA71C: strh r0, [r1] _080AA76E: ldrb r0, [r3, #8] - bl sub_080AA844 + bl UsePokeblockOnField ldr r0, _080AA7A8 ldr r1, _080AA7AC ldrh r0, [r0, #4] @@ -351071,9 +351071,9 @@ _080AA76E: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080AA7B0 - bl sub_08000540 + bl SetMainCallback2 _080AA794: add sp, #4 pop {r4, r5} @@ -351086,17 +351086,17 @@ _080AA7A4: .4byte gUnknown_2022ACC _080AA7A8: .4byte gUnknown_30074D0 _080AA7AC: .4byte 0x0000FFFF _080AA7B0: .4byte sub_080AA7D0 - thumb_func_end sub_080AA650 + thumb_func_end Task_TitleScreenPhase3 thumb_func_start sub_080AA7B4 sub_080AA7B4: @ 0x080AA7B4 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080AA7C6 ldr r0, _080AA7CC - bl sub_08000540 + bl SetMainCallback2 _080AA7C6: pop {r0} bx r0 @@ -351107,12 +351107,12 @@ _080AA7CC: .4byte sub_0802F340 thumb_func_start sub_080AA7D0 sub_080AA7D0: @ 0x080AA7D0 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080AA7E2 ldr r0, _080AA7E8 - bl sub_08000540 + bl SetMainCallback2 _080AA7E2: pop {r0} bx r0 @@ -351123,54 +351123,54 @@ _080AA7E8: .4byte sub_0816CCF0 thumb_func_start sub_080AA7EC sub_080AA7EC: @ 0x080AA7EC push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080AA7FE ldr r0, _080AA804 - bl sub_08000540 + bl SetMainCallback2 _080AA7FE: pop {r0} bx r0 .align 2, 0 -_080AA804: .4byte sub_0817AB80 +_080AA804: .4byte CB2_InitClearSaveDataScreen thumb_func_end sub_080AA7EC thumb_func_start sub_080AA808 sub_080AA808: @ 0x080AA808 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080AA81A ldr r0, _080AA820 - bl sub_08000540 + bl SetMainCallback2 _080AA81A: pop {r0} bx r0 .align 2, 0 -_080AA820: .4byte sub_0809E860 +_080AA820: .4byte CB2_InitResetRtcScreen thumb_func_end sub_080AA808 - thumb_func_start sub_080AA824 -sub_080AA824: @ 0x080AA824 + thumb_func_start CB2_GoToBerryFixScreen +CB2_GoToBerryFixScreen: @ 0x080AA824 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080AA83A bl m4aMPlayAllStop ldr r0, _080AA840 - bl sub_08000540 + bl SetMainCallback2 _080AA83A: pop {r0} bx r0 .align 2, 0 _080AA840: .4byte sub_081BF020 - thumb_func_end sub_080AA824 + thumb_func_end CB2_GoToBerryFixScreen - thumb_func_start sub_080AA844 -sub_080AA844: @ 0x080AA844 + thumb_func_start UsePokeblockOnField +UsePokeblockOnField: @ 0x080AA844 push {lr} sub sp, #4 lsls r0, r0, #0x18 @@ -351212,19 +351212,19 @@ _080AA87E: strh r1, [r0] movs r1, #0xef movs r2, #2 - bl sub_080A1200 + bl LoadPalette _080AA898: add sp, #4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AA844 + thumb_func_end UsePokeblockOnField - thumb_func_start sub_080AA8A0 -sub_080AA8A0: @ 0x080AA8A0 + thumb_func_start StartWeather +StartWeather: @ 0x080AA8A0 push {r4, r5, r6, lr} ldr r0, _080AA964 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0 @@ -351241,7 +351241,7 @@ sub_080AA8A0: @ 0x080AA8A0 adds r1, r1, r2 ldr r2, _080AA970 bl CpuSet - bl sub_080AAB90 + bl BuildGammaShiftTables ldr r4, _080AA974 ldr r1, _080AA978 adds r0, r4, r1 @@ -351286,7 +351286,7 @@ sub_080AA8A0: @ 0x080AA8A0 strb r6, [r0] movs r0, #0x10 movs r1, #0 - bl sub_080ABA20 + bl Weather_SetBlendCoeffs movs r2, #0xda lsls r2, r2, #3 adds r0, r4, r2 @@ -351305,7 +351305,7 @@ sub_080AA8A0: @ 0x080AA8A0 strb r0, [r1] ldr r0, _080AA98C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask ldr r1, _080AA990 adds r4, r4, r1 strb r0, [r4] @@ -351314,7 +351314,7 @@ _080AA95C: pop {r0} bx r0 .align 2, 0 -_080AA964: .4byte sub_080AAAAC +_080AA964: .4byte Task_WeatherMain _080AA968: .4byte gUnknown_8526F0C _080AA96C: .4byte gUnknown_20375B4 _080AA970: .4byte 0x04000008 @@ -351324,12 +351324,12 @@ _080AA97C: .4byte 0x00001201 _080AA980: .4byte 0x000006D4 _080AA984: .4byte 0x000006DA _080AA988: .4byte 0x000006C6 -_080AA98C: .4byte sub_080AAA5C +_080AA98C: .4byte Task_WeatherInit _080AA990: .4byte 0x000006C9 - thumb_func_end sub_080AA8A0 + thumb_func_end StartWeather - thumb_func_start sub_080AA994 -sub_080AA994: @ 0x080AA994 + thumb_func_start SetNextWeather +SetNextWeather: @ 0x080AA994 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -351339,7 +351339,7 @@ sub_080AA994: @ 0x080AA994 beq _080AA9AA cmp r4, #0xd beq _080AA9AA - bl sub_080ABC74 + bl PlayRainStoppingSoundEffect _080AA9AA: ldr r1, _080AA9EC ldr r2, _080AA9F0 @@ -351379,7 +351379,7 @@ _080AA9F0: .4byte 0x000006D1 _080AA9F4: .4byte gUnknown_8526DEC _080AA9F8: .4byte 0x000006D3 _080AA9FC: .4byte 0x000006CE - thumb_func_end sub_080AA994 + thumb_func_end SetNextWeather thumb_func_start SetCurrentAndNextWeather SetCurrentAndNextWeather: @ 0x080AAA00 @@ -351387,7 +351387,7 @@ SetCurrentAndNextWeather: @ 0x080AAA00 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_080ABC74 + bl PlayRainStoppingSoundEffect ldr r0, _080AAA24 movs r2, #0xda lsls r2, r2, #3 @@ -351410,7 +351410,7 @@ SetCurrentAndNextWeatherNoDelay: @ 0x080AAA2C adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_080ABC74 + bl PlayRainStoppingSoundEffect ldr r1, _080AAA58 movs r2, #0xda lsls r2, r2, #3 @@ -351431,8 +351431,8 @@ SetCurrentAndNextWeatherNoDelay: @ 0x080AAA2C _080AAA58: .4byte gUnknown_20380F4 thumb_func_end SetCurrentAndNextWeatherNoDelay - thumb_func_start sub_080AAA5C -sub_080AAA5C: @ 0x080AAA5C + thumb_func_start Task_WeatherInit +Task_WeatherInit: @ 0x080AAA5C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -351468,11 +351468,11 @@ _080AAA94: _080AAA9C: .4byte gUnknown_20380F4 _080AAAA0: .4byte gUnknown_8526DEC _080AAAA4: .4byte gUnknown_3005B60 -_080AAAA8: .4byte sub_080AAAAC - thumb_func_end sub_080AAA5C +_080AAAA8: .4byte Task_WeatherMain + thumb_func_end Task_WeatherInit - thumb_func_start sub_080AAAAC -sub_080AAAAC: @ 0x080AAAAC + thumb_func_start Task_WeatherMain +Task_WeatherMain: @ 0x080AAAAC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -351547,7 +351547,7 @@ _080AAB38: adds r0, r0, r1 ldr r0, [r0] bl _call_via_r0 - thumb_func_end sub_080AAAAC + thumb_func_end Task_WeatherMain thumb_func_start sub_080AAB4C sub_080AAB4C: @ 0x080AAB4C @@ -351564,8 +351564,8 @@ _080AAB60: .4byte gUnknown_20380F4 _080AAB64: .4byte 0x000006C6 thumb_func_end sub_080AAB4C - thumb_func_start sub_080AAB68 -sub_080AAB68: @ 0x080AAB68 + thumb_func_start None_Init +None_Init: @ 0x080AAB68 ldr r0, _080AAB7C ldr r2, _080AAB80 adds r1, r0, r2 @@ -351579,7 +351579,7 @@ sub_080AAB68: @ 0x080AAB68 _080AAB7C: .4byte gUnknown_20380F4 _080AAB80: .4byte 0x000006C1 _080AAB84: .4byte 0x000006C2 - thumb_func_end sub_080AAB68 + thumb_func_end None_Init thumb_func_start sub_080AAB88 sub_080AAB88: @ 0x080AAB88 @@ -351593,8 +351593,8 @@ sub_080AAB8C: @ 0x080AAB8C bx lr thumb_func_end sub_080AAB8C - thumb_func_start sub_080AAB90 -sub_080AAB90: @ 0x080AAB90 + thumb_func_start BuildGammaShiftTables +BuildGammaShiftTables: @ 0x080AAB90 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -351744,10 +351744,10 @@ _080AAC80: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080AAB90 + thumb_func_end BuildGammaShiftTables - thumb_func_start sub_080AACA4 -sub_080AACA4: @ 0x080AACA4 + thumb_func_start UpdateWeatherGammaShift +UpdateWeatherGammaShift: @ 0x080AACA4 push {r4, r5, r6, r7, lr} ldr r0, _080AACD4 ldr r1, _080AACD8 @@ -351811,16 +351811,16 @@ _080AAD14: ldrsb r2, [r0, r2] movs r0, #0 movs r1, #0x20 - bl sub_080AAF40 + bl ApplyGammaShift _080AAD28: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AACA4 + thumb_func_end UpdateWeatherGammaShift - thumb_func_start sub_080AAD30 -sub_080AAD30: @ 0x080AAD30 + thumb_func_start FadeInScreenWithWeather +FadeInScreenWithWeather: @ 0x080AAD30 push {lr} ldr r2, _080AAD68 ldr r0, _080AAD6C @@ -351867,7 +351867,7 @@ _080AAD78: @ jump table .4byte _080AADCC @ case 9 .4byte _080AADA4 @ case 10 _080AADA4: - bl sub_080AAE48 + bl FadeInScreen_RainShowShade lsls r0, r0, #0x18 cmp r0, #0 bne _080AAE38 @@ -351885,7 +351885,7 @@ _080AADA4: _080AADC4: .4byte gUnknown_20380F4 _080AADC8: .4byte 0x000006C6 _080AADCC: - bl sub_080AAEA8 + bl FadeInScreen_Drought lsls r0, r0, #0x18 cmp r0, #0 bne _080AAE38 @@ -351902,7 +351902,7 @@ _080AADCC: _080AADE8: .4byte gUnknown_20380F4 _080AADEC: .4byte 0x000006C6 _080AADF0: - bl sub_080AAF00 + bl FadeInScreen_Fog1 lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -351945,10 +351945,10 @@ _080AAE38: _080AAE3C: .4byte gUnknown_2037C74 _080AAE40: .4byte 0x000006C1 _080AAE44: .4byte 0x000006C6 - thumb_func_end sub_080AAD30 + thumb_func_end FadeInScreenWithWeather - thumb_func_start sub_080AAE48 -sub_080AAE48: @ 0x080AAE48 + thumb_func_start FadeInScreen_RainShowShade +FadeInScreen_RainShowShade: @ 0x080AAE48 push {r4, lr} sub sp, #4 ldr r2, _080AAE84 @@ -351974,7 +351974,7 @@ sub_080AAE48: @ 0x080AAE48 movs r0, #0 movs r1, #0x20 movs r2, #3 - bl sub_080AB144 + bl ApplyGammaShiftWithBlend movs r0, #1 b _080AAEA0 .align 2, 0 @@ -351985,7 +351985,7 @@ _080AAE90: movs r0, #0 movs r1, #0x20 movs r2, #3 - bl sub_080AAF40 + bl ApplyGammaShift movs r0, #0x10 strb r0, [r4] _080AAE9E: @@ -351995,10 +351995,10 @@ _080AAEA0: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080AAE48 + thumb_func_end FadeInScreen_RainShowShade - thumb_func_start sub_080AAEA8 -sub_080AAEA8: @ 0x080AAEA8 + thumb_func_start FadeInScreen_Drought +FadeInScreen_Drought: @ 0x080AAEA8 push {r4, lr} ldr r2, _080AAEDC ldr r0, _080AAEE0 @@ -352021,7 +352021,7 @@ sub_080AAEA8: @ 0x080AAEA8 ldr r3, _080AAEE4 adds r2, r2, r3 ldrh r2, [r2] - bl sub_080AB28C + bl ApplyDroughtGammaShiftWithBlend movs r0, #1 b _080AAEFA .align 2, 0 @@ -352033,7 +352033,7 @@ _080AAEE8: rsbs r2, r2, #0 movs r0, #0 movs r1, #0x20 - bl sub_080AAF40 + bl ApplyGammaShift movs r0, #0x10 strb r0, [r4] _080AAEF8: @@ -352042,10 +352042,10 @@ _080AAEFA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080AAEA8 + thumb_func_end FadeInScreen_Drought - thumb_func_start sub_080AAF00 -sub_080AAF00: @ 0x080AAF00 + thumb_func_start FadeInScreen_Fog1 +FadeInScreen_Fog1: @ 0x080AAF00 push {lr} ldr r2, _080AAF28 ldr r1, _080AAF2C @@ -352062,7 +352062,7 @@ sub_080AAF00: @ 0x080AAF00 ldr r3, _080AAF30 adds r1, r2, r3 ldrh r1, [r1] - bl sub_080AB3AC + bl ApplyFogBlend movs r0, #1 b _080AAF36 .align 2, 0 @@ -352075,7 +352075,7 @@ _080AAF36: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080AAF00 + thumb_func_end FadeInScreen_Fog1 thumb_func_start sub_080AAF3C sub_080AAF3C: @ 0x080AAF3C @@ -352083,8 +352083,8 @@ sub_080AAF3C: @ 0x080AAF3C .align 2, 0 thumb_func_end sub_080AAF3C - thumb_func_start sub_080AAF40 -sub_080AAF40: @ 0x080AAF40 + thumb_func_start ApplyGammaShift +ApplyGammaShift: @ 0x080AAF40 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -352343,10 +352343,10 @@ _080AB12A: .align 2, 0 _080AB13C: .4byte gUnknown_20373B4 _080AB140: .4byte gUnknown_20377B4 - thumb_func_end sub_080AAF40 + thumb_func_end ApplyGammaShift - thumb_func_start sub_080AB144 -sub_080AB144: @ 0x080AB144 + thumb_func_start ApplyGammaShiftWithBlend +ApplyGammaShiftWithBlend: @ 0x080AB144 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -352514,10 +352514,10 @@ _080AB270: _080AB280: .4byte gUnknown_2038554 _080AB284: .4byte gUnknown_20373B4 _080AB288: .4byte gUnknown_20377B4 - thumb_func_end sub_080AB144 + thumb_func_end ApplyGammaShiftWithBlend - thumb_func_start sub_080AB28C -sub_080AB28C: @ 0x080AB28C + thumb_func_start ApplyDroughtGammaShiftWithBlend +ApplyDroughtGammaShiftWithBlend: @ 0x080AB28C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -352663,10 +352663,10 @@ _080AB386: _080AB3A0: .4byte gUnknown_20373B4 _080AB3A4: .4byte gUnknown_851ADE8 _080AB3A8: .4byte gUnknown_20377B4 - thumb_func_end sub_080AB28C + thumb_func_end ApplyDroughtGammaShiftWithBlend - thumb_func_start sub_080AB3AC -sub_080AB3AC: @ 0x080AB3AC + thumb_func_start ApplyFogBlend +ApplyFogBlend: @ 0x080AB3AC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -352699,7 +352699,7 @@ sub_080AB3AC: @ 0x080AB3AC _080AB3E8: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080AB4FC + bl LightenSpritePaletteInFog lsls r0, r0, #0x18 cmp r0, #0 beq _080AB498 @@ -352809,7 +352809,7 @@ _080AB4AC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AB3AC + thumb_func_end ApplyFogBlend thumb_func_start MarkFogSpritePalToLighten MarkFogSpritePalToLighten: @ 0x080AB4C8 @@ -352840,8 +352840,8 @@ _080AB4F4: .4byte 0x000006FA _080AB4F8: .4byte 0x000006F4 thumb_func_end MarkFogSpritePalToLighten - thumb_func_start sub_080AB4FC -sub_080AB4FC: @ 0x080AB4FC + thumb_func_start LightenSpritePaletteInFog +LightenSpritePaletteInFog: @ 0x080AB4FC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -352879,7 +352879,7 @@ _080AB53C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080AB4FC + thumb_func_end LightenSpritePaletteInFog thumb_func_start sub_080AB544 sub_080AB544: @ 0x080AB544 @@ -352896,7 +352896,7 @@ sub_080AB544: @ 0x080AB544 asrs r2, r2, #0x18 movs r0, #0 movs r1, #0x20 - bl sub_080AAF40 + bl ApplyGammaShift movs r1, #0xd8 lsls r1, r1, #3 adds r0, r5, r1 @@ -352953,8 +352953,8 @@ _080AB5C4: .4byte 0x000006C6 _080AB5C8: .4byte 0x000006C2 thumb_func_end sub_080AB578 - thumb_func_start sub_080AB5CC -sub_080AB5CC: @ 0x080AB5CC + thumb_func_start FadeScreen +FadeScreen: @ 0x080AB5CC push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -353032,7 +353032,7 @@ _080AB64A: str r4, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080AB670 ldr r3, _080AB674 adds r0, r0, r3 @@ -353068,7 +353068,7 @@ _080AB69C: str r4, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _080AB6AE: ldr r4, _080AB6E8 ldr r1, _080AB6EC @@ -353089,7 +353089,7 @@ _080AB6AE: adds r2, #0x68 adds r1, r4, r2 ldrb r1, [r1] - bl sub_080ABA20 + bl Weather_SetBlendCoeffs movs r3, #0xd9 lsls r3, r3, #3 adds r4, r4, r3 @@ -353104,7 +353104,7 @@ _080AB6E8: .4byte gUnknown_20380F4 _080AB6EC: .4byte 0x000006C6 _080AB6F0: .4byte 0x000006CA _080AB6F4: .4byte 0x000006CB - thumb_func_end sub_080AB5CC + thumb_func_end FadeScreen thumb_func_start IsWeatherNotFadingIn IsWeatherNotFadingIn: @ 0x080AB6F8 @@ -353123,8 +353123,8 @@ _080AB70C: .4byte gUnknown_20380F4 _080AB710: .4byte 0x000006C6 thumb_func_end IsWeatherNotFadingIn - thumb_func_start sub_080AB714 -sub_080AB714: @ 0x080AB714 + thumb_func_start UpdateSpritePaletteWithWeather +UpdateSpritePaletteWithWeather: @ 0x080AB714 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #8 @@ -353153,7 +353153,7 @@ sub_080AB714: @ 0x080AB714 movs r2, #0 ldrsb r2, [r1, r2] movs r1, #1 - bl sub_080AAF40 + bl ApplyGammaShift b _080AB7F0 .align 2, 0 _080AB754: .4byte gUnknown_20380F4 @@ -353234,7 +353234,7 @@ _080AB7F0: bx r0 .align 2, 0 _080AB7F8: .4byte 0x000073FC - thumb_func_end sub_080AB714 + thumb_func_end UpdateSpritePaletteWithWeather thumb_func_start ApplyWeatherGammaShiftToPal ApplyWeatherGammaShiftToPal: @ 0x080AB7FC @@ -353248,7 +353248,7 @@ ApplyWeatherGammaShiftToPal: @ 0x080AB7FC movs r2, #0 ldrsb r2, [r1, r2] movs r1, #1 - bl sub_080AAF40 + bl ApplyGammaShift pop {r0} bx r0 .align 2, 0 @@ -353280,8 +353280,8 @@ _080AB83E: _080AB844: .4byte 0x000006CA thumb_func_end sub_080AB81C - thumb_func_start sub_080AB848 -sub_080AB848: @ 0x080AB848 + thumb_func_start LoadCustomWeatherSpritePalette +LoadCustomWeatherSpritePalette: @ 0x080AB848 push {r4, lr} ldr r4, _080AB870 ldr r1, _080AB874 @@ -353293,27 +353293,27 @@ sub_080AB848: @ 0x080AB848 adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r4] - bl sub_080AB714 + bl UpdateSpritePaletteWithWeather pop {r4} pop {r0} bx r0 .align 2, 0 _080AB870: .4byte gUnknown_20380F4 _080AB874: .4byte 0x000006D4 - thumb_func_end sub_080AB848 + thumb_func_end LoadCustomWeatherSpritePalette - thumb_func_start sub_080AB878 -sub_080AB878: @ 0x080AB878 + thumb_func_start LoadDroughtWeatherPalette +LoadDroughtWeatherPalette: @ 0x080AB878 movs r2, #0x20 strb r2, [r0] strb r2, [r1] bx lr - thumb_func_end sub_080AB878 + thumb_func_end LoadDroughtWeatherPalette - thumb_func_start sub_080AB880 -sub_080AB880: @ 0x080AB880 + thumb_func_start ResetDroughtWeatherPaletteLoading +ResetDroughtWeatherPaletteLoading: @ 0x080AB880 ldr r0, _080AB894 ldr r2, _080AB898 adds r1, r0, r2 @@ -353327,10 +353327,10 @@ sub_080AB880: @ 0x080AB880 _080AB894: .4byte gUnknown_20380F4 _080AB898: .4byte 0x0000074D _080AB89C: .4byte 0x0000074E - thumb_func_end sub_080AB880 + thumb_func_end ResetDroughtWeatherPaletteLoading - thumb_func_start sub_080AB8A0 -sub_080AB8A0: @ 0x080AB8A0 + thumb_func_start LoadDroughtWeatherPalettes +LoadDroughtWeatherPalettes: @ 0x080AB8A0 push {r4, lr} ldr r1, _080AB8C8 ldr r0, _080AB8CC @@ -353342,7 +353342,7 @@ sub_080AB8A0: @ 0x080AB8A0 ldr r0, _080AB8D0 adds r1, r1, r0 adds r0, r4, #0 - bl sub_080AB878 + bl LoadDroughtWeatherPalette movs r0, #0 ldrsb r0, [r4, r0] cmp r0, #0x1f @@ -353359,7 +353359,7 @@ _080AB8D6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080AB8A0 + thumb_func_end LoadDroughtWeatherPalettes thumb_func_start sub_080AB8DC sub_080AB8DC: @ 0x080AB8DC @@ -353528,8 +353528,8 @@ _080ABA14: _080ABA1C: .4byte 0x0000073C thumb_func_end sub_080AB918 - thumb_func_start sub_080ABA20 -sub_080ABA20: @ 0x080ABA20 + thumb_func_start Weather_SetBlendCoeffs +Weather_SetBlendCoeffs: @ 0x080ABA20 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -353559,7 +353559,7 @@ sub_080ABA20: @ 0x080ABA20 .align 2, 0 _080ABA58: .4byte gUnknown_20380F4 _080ABA5C: .4byte 0x00000736 - thumb_func_end sub_080ABA20 + thumb_func_end Weather_SetBlendCoeffs thumb_func_start Weather_SetTargetBlendCoeffs Weather_SetTargetBlendCoeffs: @ 0x080ABA60 @@ -353596,8 +353596,8 @@ _080ABA9C: .4byte 0x00000736 _080ABAA0: .4byte 0x0000073A thumb_func_end Weather_SetTargetBlendCoeffs - thumb_func_start sub_080ABAA4 -sub_080ABAA4: @ 0x080ABAA4 + thumb_func_start Weather_UpdateBlend +Weather_UpdateBlend: @ 0x080ABAA4 push {r4, r5, r6, lr} ldr r0, _080ABAFC movs r1, #0xe6 @@ -353698,7 +353698,7 @@ _080ABB6A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080ABAA4 + thumb_func_end Weather_UpdateBlend thumb_func_start sub_080ABB70 sub_080ABB70: @ 0x080ABB70 @@ -353771,8 +353771,8 @@ _080ABC02: .align 2, 0 thumb_func_end sub_080ABB70 - thumb_func_start sub_080ABC08 -sub_080ABC08: @ 0x080ABC08 + thumb_func_start GetCurrentWeather +GetCurrentWeather: @ 0x080ABC08 ldr r0, _080ABC14 movs r1, #0xda lsls r1, r1, #3 @@ -353781,7 +353781,7 @@ sub_080ABC08: @ 0x080ABC08 bx lr .align 2, 0 _080ABC14: .4byte gUnknown_20380F4 - thumb_func_end sub_080ABC08 + thumb_func_end GetCurrentWeather thumb_func_start sub_080ABC18 sub_080ABC18: @ 0x080ABC18 @@ -353835,8 +353835,8 @@ _080ABC6A: _080ABC70: .4byte 0x000006DD thumb_func_end sub_080ABC18 - thumb_func_start sub_080ABC74 -sub_080ABC74: @ 0x080ABC74 + thumb_func_start PlayRainStoppingSoundEffect +PlayRainStoppingSoundEffect: @ 0x080ABC74 push {lr} bl sub_080A31D4 lsls r0, r0, #0x18 @@ -353869,7 +353869,7 @@ _080ABCB2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080ABC74 + thumb_func_end PlayRainStoppingSoundEffect thumb_func_start sub_080ABCB8 sub_080ABCB8: @ 0x080ABCB8 @@ -353909,8 +353909,8 @@ _080ABCEC: .4byte gUnknown_20380F4 _080ABCF0: .4byte 0x000006C6 thumb_func_end sub_080ABCE0 - thumb_func_start sub_080ABCF4 -sub_080ABCF4: @ 0x080ABCF4 + thumb_func_start PreservePaletteInWeather +PreservePaletteInWeather: @ 0x080ABCF4 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -353932,7 +353932,7 @@ sub_080ABCF4: @ 0x080ABCF4 _080ABD18: .4byte gUnknown_8526EEC _080ABD1C: .4byte gUnknown_2038844 _080ABD20: .4byte gUnknown_3000F50 - thumb_func_end sub_080ABCF4 + thumb_func_end PreservePaletteInWeather thumb_func_start sub_080ABD24 sub_080ABD24: @ 0x080ABD24 @@ -353971,7 +353971,7 @@ Clouds_InitVars: @ 0x080ABD34 bne _080ABD68 movs r0, #0 movs r1, #0x10 - bl sub_080ABA20 + bl Weather_SetBlendCoeffs _080ABD68: pop {r0} bx r0 @@ -353996,7 +353996,7 @@ Clouds_InitAll: @ 0x080ABD80 bne _080ABDA0 adds r4, r1, r2 _080ABD96: - bl sub_080ABDB0 + bl Clouds_Main ldrb r0, [r4] cmp r0, #0 beq _080ABD96 @@ -354009,8 +354009,8 @@ _080ABDA8: .4byte gUnknown_8526DE8 _080ABDAC: .4byte 0x000006D2 thumb_func_end Clouds_InitAll - thumb_func_start sub_080ABDB0 -sub_080ABDB0: @ 0x080ABDB0 + thumb_func_start Clouds_Main +Clouds_Main: @ 0x080ABDB0 push {r4, r5, lr} ldr r0, _080ABDCC ldr r5, [r0] @@ -354032,7 +354032,7 @@ _080ABDD4: beq _080ABDEC b _080ABE04 _080ABDDA: - bl sub_080ABE90 + bl CreateCloudSprites b _080ABDFE _080ABDE0: movs r0, #0xc @@ -354041,7 +354041,7 @@ _080ABDE0: bl Weather_SetTargetBlendCoeffs b _080ABDFE _080ABDEC: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080ABE04 @@ -354059,10 +354059,10 @@ _080ABE04: bx r0 .align 2, 0 _080ABE0C: .4byte 0x000006D2 - thumb_func_end sub_080ABDB0 + thumb_func_end Clouds_Main - thumb_func_start sub_080ABE10 -sub_080ABE10: @ 0x080ABE10 + thumb_func_start Clouds_Finish +Clouds_Finish: @ 0x080ABE10 push {r4, lr} ldr r0, _080ABE28 ldr r0, [r0] @@ -354085,11 +354085,11 @@ _080ABE30: bl Weather_SetTargetBlendCoeffs b _080ABE4A _080ABE3C: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080ABE50 - bl sub_080ABF5C + bl DestroyCloudSprites _080ABE4A: ldrh r0, [r4] adds r0, #1 @@ -354100,7 +354100,7 @@ _080ABE52: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080ABE10 + thumb_func_end Clouds_Finish thumb_func_start Sunny_InitVars Sunny_InitVars: @ 0x080ABE58 @@ -354121,14 +354121,14 @@ _080ABE74: .4byte 0x000006C1 _080ABE78: .4byte 0x000006C2 thumb_func_end Sunny_InitVars - thumb_func_start sub_080ABE7C -sub_080ABE7C: @ 0x080ABE7C + thumb_func_start Sunny_InitAll +Sunny_InitAll: @ 0x080ABE7C push {lr} bl Sunny_InitVars pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080ABE7C + thumb_func_end Sunny_InitAll thumb_func_start sub_080ABE88 sub_080ABE88: @ 0x080ABE88 @@ -354142,8 +354142,8 @@ sub_080ABE8C: @ 0x080ABE8C bx lr thumb_func_end sub_080ABE8C - thumb_func_start sub_080ABE90 -sub_080ABE90: @ 0x080ABE90 + thumb_func_start CreateCloudSprites +CreateCloudSprites: @ 0x080ABE90 push {r4, r5, lr} ldr r0, _080ABF08 ldr r0, [r0] @@ -354153,16 +354153,16 @@ sub_080ABE90: @ 0x080ABE90 cmp r0, #1 beq _080ABF4C ldr r0, _080ABF10 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _080ABF14 - bl sub_080AB848 + bl LoadCustomWeatherSpritePalette movs r5, #0 _080ABEAE: ldr r0, _080ABF18 movs r1, #0 movs r2, #0 movs r3, #0xff - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -354238,10 +354238,10 @@ _080ABF4C: .align 2, 0 _080ABF54: .4byte gUnknown_8526DE8 _080ABF58: .4byte 0x000006DE - thumb_func_end sub_080ABE90 + thumb_func_end CreateCloudSprites - thumb_func_start sub_080ABF5C -sub_080ABF5C: @ 0x080ABF5C + thumb_func_start DestroyCloudSprites +DestroyCloudSprites: @ 0x080ABF5C push {r4, r5, lr} ldr r0, _080ABFA8 ldr r1, [r0] @@ -354283,7 +354283,7 @@ _080ABFA0: .align 2, 0 _080ABFA8: .4byte gUnknown_8526DE8 _080ABFAC: .4byte 0x000006DE - thumb_func_end sub_080ABF5C + thumb_func_end DestroyCloudSprites thumb_func_start UpdateCloudSprite UpdateCloudSprite: @ 0x080ABFB0 @@ -354343,7 +354343,7 @@ Drought_InitAll: @ 0x080AC000 bne _080AC020 adds r4, r1, r2 _080AC016: - bl sub_080AC030 + bl Drought_Main ldrb r0, [r4] cmp r0, #0 beq _080AC016 @@ -354356,8 +354356,8 @@ _080AC028: .4byte gUnknown_8526DE8 _080AC02C: .4byte 0x000006D2 thumb_func_end Drought_InitAll - thumb_func_start sub_080AC030 -sub_080AC030: @ 0x080AC030 + thumb_func_start Drought_Main +Drought_Main: @ 0x080AC030 push {lr} ldr r1, _080AC04C ldr r0, [r1] @@ -354396,7 +354396,7 @@ _080AC06C: _080AC080: .4byte 0x000006C6 _080AC084: .4byte 0x000006CC _080AC088: - bl sub_080AB880 + bl ResetDroughtWeatherPaletteLoading ldr r0, _080AC098 ldr r1, [r0] ldr r2, _080AC09C @@ -354406,7 +354406,7 @@ _080AC088: _080AC098: .4byte gUnknown_8526DE8 _080AC09C: .4byte 0x000006CC _080AC0A0: - bl sub_080AB8A0 + bl LoadDroughtWeatherPalettes lsls r0, r0, #0x18 cmp r0, #0 bne _080AC110 @@ -354459,7 +354459,7 @@ _080AC10C: _080AC110: pop {r0} bx r0 - thumb_func_end sub_080AC030 + thumb_func_end Drought_Main thumb_func_start sub_080AC114 sub_080AC114: @ 0x080AC114 @@ -354467,20 +354467,20 @@ sub_080AC114: @ 0x080AC114 bx lr thumb_func_end sub_080AC114 - thumb_func_start sub_080AC118 -sub_080AC118: @ 0x080AC118 + thumb_func_start StartDroughtWeatherBlend +StartDroughtWeatherBlend: @ 0x080AC118 push {lr} ldr r0, _080AC128 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AC128: .4byte sub_080AC12C - thumb_func_end sub_080AC118 +_080AC128: .4byte UpdateDroughtBlend + thumb_func_end StartDroughtWeatherBlend - thumb_func_start sub_080AC12C -sub_080AC12C: @ 0x080AC12C + thumb_func_start UpdateDroughtBlend +UpdateDroughtBlend: @ 0x080AC12C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -354589,14 +354589,14 @@ _080AC20C: strh r0, [r4, #8] b _080AC21E _080AC214: - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AC21E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080AC12C + thumb_func_end UpdateDroughtBlend thumb_func_start LightRain_InitVars LightRain_InitVars: @ 0x080AC224 @@ -354661,7 +354661,7 @@ sub_080AC290: @ 0x080AC290 bne _080AC2B0 adds r4, r1, r2 _080AC2A6: - bl sub_080AC2C0 + bl LightRain_Main ldrb r0, [r4] cmp r0, #0 beq _080AC2A6 @@ -354674,8 +354674,8 @@ _080AC2B8: .4byte gUnknown_8526DE8 _080AC2BC: .4byte 0x000006D2 thumb_func_end sub_080AC290 - thumb_func_start sub_080AC2C0 -sub_080AC2C0: @ 0x080AC2C0 + thumb_func_start LightRain_Main +LightRain_Main: @ 0x080AC2C0 push {r4, r5, lr} ldr r0, _080AC2DC ldr r5, [r0] @@ -354700,13 +354700,13 @@ _080AC2EA: bl sub_080AC664 b _080AC30E _080AC2F0: - bl sub_080AC674 + bl CreateRainSprite lsls r0, r0, #0x18 cmp r0, #0 bne _080AC314 b _080AC30E _080AC2FC: - bl sub_080AC7A8 + bl UpdateVisibleRainSprites lsls r0, r0, #0x18 cmp r0, #0 bne _080AC314 @@ -354724,10 +354724,10 @@ _080AC314: bx r0 .align 2, 0 _080AC31C: .4byte 0x000006D2 - thumb_func_end sub_080AC2C0 + thumb_func_end LightRain_Main - thumb_func_start sub_080AC320 -sub_080AC320: @ 0x080AC320 + thumb_func_start LightRain_Finish +LightRain_Finish: @ 0x080AC320 push {r4, r5, lr} ldr r0, _080AC33C ldr r2, [r0] @@ -354773,11 +354773,11 @@ _080AC36C: adds r0, #1 strh r0, [r3] _080AC378: - bl sub_080AC7A8 + bl UpdateVisibleRainSprites lsls r0, r0, #0x18 cmp r0, #0 bne _080AC3A4 - bl sub_080AC834 + bl DestroyRainSprites ldr r0, _080AC39C ldr r1, [r0] ldr r5, _080AC3A0 @@ -354797,10 +354797,10 @@ _080AC3A6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080AC320 + thumb_func_end LightRain_Finish - thumb_func_start sub_080AC3AC -sub_080AC3AC: @ 0x080AC3AC + thumb_func_start StartRainSpriteFall +StartRainSpriteFall: @ 0x080AC3AC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -354897,10 +354897,10 @@ _080AC470: .4byte gUnknown_852A8E8 _080AC474: .4byte gUnknown_8526DE8 _080AC478: .4byte 0x000006DC _080AC47C: .4byte gUnknown_852A8E0 - thumb_func_end sub_080AC3AC + thumb_func_end StartRainSpriteFall - thumb_func_start sub_080AC480 -sub_080AC480: @ 0x080AC480 + thumb_func_start UpdateRainSprite +UpdateRainSprite: @ 0x080AC480 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x36 @@ -355023,16 +355023,16 @@ _080AC55C: orrs r0, r1 strb r0, [r2] adds r0, r5, #0 - bl sub_080AC3AC + bl StartRainSpriteFall _080AC57C: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AC480 + thumb_func_end UpdateRainSprite - thumb_func_start sub_080AC584 -sub_080AC584: @ 0x080AC584 + thumb_func_start WaitRainSprite +WaitRainSprite: @ 0x080AC584 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x2e] @@ -355041,12 +355041,12 @@ sub_080AC584: @ 0x080AC584 cmp r0, #0 bne _080AC5A4 adds r0, r4, #0 - bl sub_080AC3AC + bl StartRainSpriteFall ldr r0, _080AC5A0 str r0, [r4, #0x1c] b _080AC5A8 .align 2, 0 -_080AC5A0: .4byte sub_080AC480 +_080AC5A0: .4byte UpdateRainSprite _080AC5A4: subs r0, r1, #1 strh r0, [r4, #0x2e] @@ -355055,10 +355055,10 @@ _080AC5A8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AC584 + thumb_func_end WaitRainSprite - thumb_func_start sub_080AC5B0 -sub_080AC5B0: @ 0x080AC5B0 + thumb_func_start InitRainSpriteMovement +InitRainSpriteMovement: @ 0x080AC5B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -355098,7 +355098,7 @@ sub_080AC5B0: @ 0x080AC5B0 adds r5, r0, #0 _080AC5FE: adds r0, r7, #0 - bl sub_080AC3AC + bl StartRainSpriteFall subs r0, r6, #1 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -355116,7 +355116,7 @@ _080AC60E: adds r5, r0, #0 _080AC620: adds r0, r7, #0 - bl sub_080AC480 + bl UpdateRainSprite subs r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -355148,21 +355148,21 @@ _080AC658: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080AC5B0 + thumb_func_end InitRainSpriteMovement thumb_func_start sub_080AC664 sub_080AC664: @ 0x080AC664 push {lr} ldr r0, _080AC670 - bl sub_08008210 + bl LoadSpriteSheet pop {r0} bx r0 .align 2, 0 _080AC670: .4byte gUnknown_852A8F0 thumb_func_end sub_080AC664 - thumb_func_start sub_080AC674 -sub_080AC674: @ 0x080AC674 + thumb_func_start CreateRainSprite +CreateRainSprite: @ 0x080AC674 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -355187,7 +355187,7 @@ _080AC68E: movs r3, #2 ldrsh r2, [r2, r3] movs r3, #0x4e - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 @@ -355233,11 +355233,11 @@ _080AC6F2: lsls r4, r4, #2 add r4, sb adds r0, r4, #0 - bl sub_080AC3AC + bl StartRainSpriteFall mov r3, r8 adds r1, r3, r7 adds r0, r4, #0 - bl sub_080AC5B0 + bl InitRainSpriteMovement adds r2, r4, #0 adds r2, #0x3e ldrb r0, [r2] @@ -355292,8 +355292,8 @@ _080AC760: .align 2, 0 _080AC778: .4byte gUnknown_8526DE8 _080AC77C: .4byte 0x000006DA -_080AC780: .4byte sub_080AC480 -_080AC784: .4byte sub_080AC584 +_080AC780: .4byte UpdateRainSprite +_080AC784: .4byte WaitRainSprite _080AC788: str r4, [r2, #0x1c] _080AC78A: @@ -355315,10 +355315,10 @@ _080AC79A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080AC674 + thumb_func_end CreateRainSprite - thumb_func_start sub_080AC7A8 -sub_080AC7A8: @ 0x080AC7A8 + thumb_func_start UpdateVisibleRainSprites +UpdateVisibleRainSprites: @ 0x080AC7A8 push {r4, r5, r6, r7, lr} ldr r0, _080AC7C4 ldr r3, [r0] @@ -355390,10 +355390,10 @@ _080AC82E: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080AC7A8 + thumb_func_end UpdateVisibleRainSprites - thumb_func_start sub_080AC834 -sub_080AC834: @ 0x080AC834 + thumb_func_start DestroyRainSprites +DestroyRainSprites: @ 0x080AC834 push {r4, r5, r6, r7, lr} movs r4, #0 ldr r0, _080AC87C @@ -355435,7 +355435,7 @@ _080AC866: _080AC87C: .4byte gUnknown_8526DE8 _080AC880: .4byte 0x000006DA _080AC884: .4byte 0x00001206 - thumb_func_end sub_080AC834 + thumb_func_end DestroyRainSprites thumb_func_start Snow_InitVars Snow_InitVars: @ 0x080AC888 @@ -355511,7 +355511,7 @@ _080AC90E: adds r0, #0x60 adds r0, r0, r1 ldr r0, [r0] - bl sub_080ACC08 + bl UpdateSnowflakeSprite adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -355544,7 +355544,7 @@ Snow_Main: @ 0x080AC944 ldrh r0, [r4] cmp r0, #0 bne _080AC96C - bl sub_080AC9E4 + bl UpdateVisibleSnowflakeSprites lsls r0, r0, #0x18 cmp r0, #0 bne _080AC96C @@ -355565,8 +355565,8 @@ _080AC978: .4byte 0x000006CC _080AC97C: .4byte 0x000006D2 thumb_func_end Snow_Main - thumb_func_start sub_080AC980 -sub_080AC980: @ 0x080AC980 + thumb_func_start Snow_Finish +Snow_Finish: @ 0x080AC980 push {r4, lr} ldr r0, _080AC998 ldr r2, [r0] @@ -355593,7 +355593,7 @@ _080AC9A0: adds r0, #1 strh r0, [r3] _080AC9B2: - bl sub_080AC9E4 + bl UpdateVisibleSnowflakeSprites lsls r0, r0, #0x18 cmp r0, #0 bne _080AC9DC @@ -355616,10 +355616,10 @@ _080AC9DE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080AC980 + thumb_func_end Snow_Finish - thumb_func_start sub_080AC9E4 -sub_080AC9E4: @ 0x080AC9E4 + thumb_func_start UpdateVisibleSnowflakeSprites +UpdateVisibleSnowflakeSprites: @ 0x080AC9E4 push {r4, lr} ldr r0, _080ACA00 ldr r1, [r0] @@ -355654,10 +355654,10 @@ _080ACA0C: ldrb r2, [r2] cmp r0, r2 bhs _080ACA32 - bl sub_080ACA60 + bl CreateSnowflakeSprite b _080ACA36 _080ACA32: - bl sub_080ACACC + bl DestroySnowflakeSprite _080ACA36: ldr r0, _080ACA54 ldr r0, [r0] @@ -355679,16 +355679,16 @@ _080ACA4E: _080ACA54: .4byte gUnknown_8526DE8 _080ACA58: .4byte 0x000006E4 _080ACA5C: .4byte 0x000006E5 - thumb_func_end sub_080AC9E4 + thumb_func_end UpdateVisibleSnowflakeSprites - thumb_func_start sub_080ACA60 -sub_080ACA60: @ 0x080ACA60 + thumb_func_start CreateSnowflakeSprite +CreateSnowflakeSprite: @ 0x080ACA60 push {r4, r5, r6, lr} ldr r0, _080ACAB4 movs r1, #0 movs r2, #0 movs r3, #0x4e - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -355705,7 +355705,7 @@ sub_080ACA60: @ 0x080ACA60 ldrb r0, [r6] strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080ACB00 + bl InitSnowflakeSpriteMovement adds r2, r4, #0 adds r2, #0x3e ldrb r0, [r2] @@ -355733,10 +355733,10 @@ _080ACAC6: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080ACA60 + thumb_func_end CreateSnowflakeSprite - thumb_func_start sub_080ACACC -sub_080ACACC: @ 0x080ACACC + thumb_func_start DestroySnowflakeSprite +DestroySnowflakeSprite: @ 0x080ACACC push {lr} ldr r0, _080ACAE0 ldr r1, [r0] @@ -355763,10 +355763,10 @@ _080ACAE8: _080ACAFC: pop {r1} bx r1 - thumb_func_end sub_080ACACC + thumb_func_end DestroySnowflakeSprite - thumb_func_start sub_080ACB00 -sub_080ACB00: @ 0x080ACB00 + thumb_func_start InitSnowflakeSpriteMovement +InitSnowflakeSpriteMovement: @ 0x080ACB00 push {r4, r5, r6, r7, lr} adds r5, r0, #0 bl Random @@ -355848,7 +355848,7 @@ _080ACB90: .align 2, 0 _080ACBA4: .4byte gUnknown_2021B3A _080ACBA8: .4byte gUnknown_2021B38 - thumb_func_end sub_080ACB00 + thumb_func_end InitSnowflakeSpriteMovement thumb_func_start WaitSnowflakeSprite WaitSnowflakeSprite: @ 0x080ACBAC @@ -355894,12 +355894,12 @@ _080ACBF2: .align 2, 0 _080ACBF8: .4byte gUnknown_8526DE8 _080ACBFC: .4byte 0x000006E2 -_080ACC00: .4byte sub_080ACC08 +_080ACC00: .4byte UpdateSnowflakeSprite _080ACC04: .4byte gUnknown_2021B3A thumb_func_end WaitSnowflakeSprite - thumb_func_start sub_080ACC08 -sub_080ACC08: @ 0x080ACC08 + thumb_func_start UpdateSnowflakeSprite +UpdateSnowflakeSprite: @ 0x080ACC08 push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x30] @@ -356041,7 +356041,7 @@ _080ACD08: cmp r0, r1 bne _080ACD34 adds r0, r4, #0 - bl sub_080ACB00 + bl InitSnowflakeSpriteMovement movs r0, #0xfa strh r0, [r4, #0x22] adds r2, r4, #0 @@ -356058,7 +356058,7 @@ _080ACD34: bx r0 .align 2, 0 _080ACD3C: .4byte WaitSnowflakeSprite - thumb_func_end sub_080ACC08 + thumb_func_end UpdateSnowflakeSprite thumb_func_start MedRain_InitVars MedRain_InitVars: @ 0x080ACD40 @@ -356220,7 +356220,7 @@ _080ACE7C: .4byte 0x000006D2 thumb_func_start sub_080ACE80 sub_080ACE80: @ 0x080ACE80 push {r4, r5, lr} - bl sub_080AD2F4 + bl UpdateThunderSound ldr r0, _080ACEA0 ldr r0, [r0] ldr r1, _080ACEA4 @@ -356268,7 +356268,7 @@ _080ACEE8: _080ACEFC: .4byte gUnknown_8526DE8 _080ACF00: .4byte 0x000006CC _080ACF04: - bl sub_080AC674 + bl CreateRainSprite lsls r0, r0, #0x18 cmp r0, #0 beq _080ACF10 @@ -356285,7 +356285,7 @@ _080ACF10: _080ACF20: .4byte gUnknown_8526DE8 _080ACF24: .4byte 0x000006CC _080ACF28: - bl sub_080AC7A8 + bl UpdateVisibleRainSprites lsls r0, r0, #0x18 cmp r0, #0 beq _080ACF34 @@ -356420,7 +356420,7 @@ _080AD026: cmp r0, #1 bne _080AD04A movs r0, #0x14 - bl sub_080AD2B8 + bl SetThunderCounter _080AD04A: bl Random ldr r1, _080AD070 @@ -356562,7 +356562,7 @@ _080AD160: cmp r0, #0 bne _080AD1F6 movs r0, #0x64 - bl sub_080AD2B8 + bl SetThunderCounter movs r0, #0x13 bl sub_080AB544 bl Random @@ -356632,8 +356632,8 @@ _080AD204: .4byte 0x000006EA _080AD208: .4byte 0x000006CC thumb_func_end sub_080ACE80 - thumb_func_start sub_080AD20C -sub_080AD20C: @ 0x080AD20C + thumb_func_start Rain_Finish +Rain_Finish: @ 0x080AD20C push {r4, r5, r6, lr} ldr r0, _080AD228 ldr r6, [r0] @@ -356695,12 +356695,12 @@ _080AD280: .4byte gUnknown_8526DE8 _080AD284: .4byte 0x000006D9 _080AD288: .4byte 0x000006CE _080AD28C: - bl sub_080AC7A8 + bl UpdateVisibleRainSprites lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 bne _080AD2B0 - bl sub_080AC834 + bl DestroyRainSprites ldr r1, _080AD2AC adds r0, r6, r1 strb r4, [r0] @@ -356718,10 +356718,10 @@ _080AD2B2: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080AD20C + thumb_func_end Rain_Finish - thumb_func_start sub_080AD2B8 -sub_080AD2B8: @ 0x080AD2B8 + thumb_func_start SetThunderCounter +SetThunderCounter: @ 0x080AD2B8 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -356750,10 +356750,10 @@ _080AD2E6: .align 2, 0 _080AD2EC: .4byte gUnknown_8526DE8 _080AD2F0: .4byte 0x000006ED - thumb_func_end sub_080AD2B8 + thumb_func_end SetThunderCounter - thumb_func_start sub_080AD2F4 -sub_080AD2F4: @ 0x080AD2F4 + thumb_func_start UpdateThunderSound +UpdateThunderSound: @ 0x080AD2F4 push {r4, lr} ldr r0, _080AD32C ldr r1, [r0] @@ -356768,7 +356768,7 @@ sub_080AD2F4: @ 0x080AD2F4 ldrh r0, [r1] cmp r0, #0 bne _080AD350 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _080AD354 @@ -356804,7 +356804,7 @@ _080AD354: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AD2F4 + thumb_func_end UpdateThunderSound thumb_func_start Fog1_InitVars Fog1_InitVars: @ 0x080AD35C @@ -356842,7 +356842,7 @@ Fog1_InitVars: @ 0x080AD35C strh r1, [r0] movs r0, #0 movs r1, #0x10 - bl sub_080ABA20 + bl Weather_SetBlendCoeffs _080AD3A4: pop {r0} bx r0 @@ -356867,7 +356867,7 @@ Fog1_InitAll: @ 0x080AD3BC bne _080AD3DC adds r4, r1, r2 _080AD3D2: - bl sub_080AD3EC + bl Fog1_Main ldrb r0, [r4] cmp r0, #0 beq _080AD3D2 @@ -356880,8 +356880,8 @@ _080AD3E4: .4byte gUnknown_8526DE8 _080AD3E8: .4byte 0x000006D2 thumb_func_end Fog1_InitAll - thumb_func_start sub_080AD3EC -sub_080AD3EC: @ 0x080AD3EC + thumb_func_start Fog1_Main +Fog1_Main: @ 0x080AD3EC push {r4, r5, r6, lr} ldr r0, _080AD438 ldr r6, [r0] @@ -356927,7 +356927,7 @@ _080AD440: .4byte 0x000006F2 _080AD444: .4byte 0x000006EE _080AD448: .4byte 0x000006CC _080AD44C: - bl sub_080AD5A8 + bl CreateFog1Sprites movs r3, #0xda lsls r3, r3, #3 adds r0, r6, r3 @@ -356957,7 +356957,7 @@ _080AD472: _080AD484: .4byte gUnknown_8526DE8 _080AD488: .4byte 0x000006CC _080AD48C: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080AD4A2 @@ -356973,10 +356973,10 @@ _080AD4A2: bx r0 .align 2, 0 _080AD4A8: .4byte 0x000006D2 - thumb_func_end sub_080AD3EC + thumb_func_end Fog1_Main - thumb_func_start sub_080AD4AC -sub_080AD4AC: @ 0x080AD4AC + thumb_func_start Fog1_Finish +Fog1_Finish: @ 0x080AD4AC push {r4, lr} ldr r0, _080AD4FC ldr r2, [r0] @@ -357034,7 +357034,7 @@ _080AD516: bl Weather_SetTargetBlendCoeffs b _080AD532 _080AD522: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080AD53E @@ -357056,7 +357056,7 @@ _080AD540: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080AD4AC + thumb_func_end Fog1_Finish thumb_func_start Fog1SpriteCallback Fog1SpriteCallback: @ 0x080AD548 @@ -357106,8 +357106,8 @@ _080AD5A0: .4byte 0x010F0000 _080AD5A4: .4byte 0x000001FF thumb_func_end Fog1SpriteCallback - thumb_func_start sub_080AD5A8 -sub_080AD5A8: @ 0x080AD5A8 + thumb_func_start CreateFog1Sprites +CreateFog1Sprites: @ 0x080AD5A8 push {r4, r5, lr} sub sp, #8 ldr r0, _080AD61C @@ -357123,14 +357123,14 @@ sub_080AD5A8: @ 0x080AD5A8 str r0, [sp] str r1, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet movs r5, #0 _080AD5CC: ldr r0, _080AD628 movs r1, #0 movs r2, #0 movs r3, #0xff - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -357195,7 +357195,7 @@ _080AD652: .align 2, 0 _080AD65C: .4byte gUnknown_8526DE8 _080AD660: .4byte 0x000006FB - thumb_func_end sub_080AD5A8 + thumb_func_end CreateFog1Sprites thumb_func_start sub_080AD664 sub_080AD664: @ 0x080AD664 @@ -357241,8 +357241,8 @@ _080AD6B0: .4byte 0x000006FB _080AD6B4: .4byte 0x00001201 thumb_func_end sub_080AD664 - thumb_func_start sub_080AD6B8 -sub_080AD6B8: @ 0x080AD6B8 + thumb_func_start Ash_InitVars +Ash_InitVars: @ 0x080AD6B8 push {lr} ldr r0, _080AD704 ldr r1, [r0] @@ -357272,7 +357272,7 @@ sub_080AD6B8: @ 0x080AD6B8 bne _080AD700 movs r0, #0 movs r1, #0x10 - bl sub_080ABA20 + bl Weather_SetBlendCoeffs movs r1, #0xfd lsls r1, r1, #6 movs r0, #0x52 @@ -357285,12 +357285,12 @@ _080AD704: .4byte gUnknown_8526DE8 _080AD708: .4byte 0x000006CC _080AD70C: .4byte 0x000006D2 _080AD710: .4byte 0x000006C2 - thumb_func_end sub_080AD6B8 + thumb_func_end Ash_InitVars thumb_func_start Ash_InitAll Ash_InitAll: @ 0x080AD714 push {r4, lr} - bl sub_080AD6B8 + bl Ash_InitVars ldr r0, _080AD73C ldr r1, [r0] ldr r2, _080AD740 @@ -357300,7 +357300,7 @@ Ash_InitAll: @ 0x080AD714 bne _080AD734 adds r4, r1, r2 _080AD72A: - bl sub_080AD744 + bl Ash_Main ldrb r0, [r4] cmp r0, #0 beq _080AD72A @@ -357313,8 +357313,8 @@ _080AD73C: .4byte gUnknown_8526DE8 _080AD740: .4byte 0x000006D2 thumb_func_end Ash_InitAll - thumb_func_start sub_080AD744 -sub_080AD744: @ 0x080AD744 + thumb_func_start Ash_Main +Ash_Main: @ 0x080AD744 push {r4, r5, lr} ldr r2, _080AD788 ldr r1, [r2] @@ -357361,7 +357361,7 @@ _080AD79C: beq _080AD7C4 b _080AD7E4 _080AD7A2: - bl sub_080AD858 + bl LoadAshSpriteSheet b _080AD7D6 _080AD7A8: movs r1, #0xe0 @@ -357370,7 +357370,7 @@ _080AD7A8: ldrb r0, [r0] cmp r0, #0 bne _080AD7B8 - bl sub_080AD868 + bl CreateAshSprites _080AD7B8: movs r0, #0x10 movs r1, #0 @@ -357378,7 +357378,7 @@ _080AD7B8: bl Weather_SetTargetBlendCoeffs b _080AD7D6 _080AD7C4: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080AD7E8 @@ -357394,16 +357394,16 @@ _080AD7D6: .align 2, 0 _080AD7E0: .4byte 0x000006D2 _080AD7E4: - bl sub_080ABAA4 + bl Weather_UpdateBlend _080AD7E8: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AD744 + thumb_func_end Ash_Main - thumb_func_start sub_080AD7F0 -sub_080AD7F0: @ 0x080AD7F0 + thumb_func_start Ash_Finish +Ash_Finish: @ 0x080AD7F0 push {r4, lr} ldr r0, _080AD80C ldr r0, [r0] @@ -357431,11 +357431,11 @@ _080AD81A: bl Weather_SetTargetBlendCoeffs b _080AD834 _080AD826: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080AD84E - bl sub_080AD910 + bl DestroyAshSprites _080AD834: ldrh r0, [r4] adds r0, #1 @@ -357458,21 +357458,21 @@ _080AD850: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080AD7F0 + thumb_func_end Ash_Finish - thumb_func_start sub_080AD858 -sub_080AD858: @ 0x080AD858 + thumb_func_start LoadAshSpriteSheet +LoadAshSpriteSheet: @ 0x080AD858 push {lr} ldr r0, _080AD864 - bl sub_08008210 + bl LoadSpriteSheet pop {r0} bx r0 .align 2, 0 _080AD864: .4byte gUnknown_852A9D4 - thumb_func_end sub_080AD858 + thumb_func_end LoadAshSpriteSheet - thumb_func_start sub_080AD868 -sub_080AD868: @ 0x080AD868 + thumb_func_start CreateAshSprites +CreateAshSprites: @ 0x080AD868 push {r4, r5, lr} ldr r0, _080AD8D4 ldr r0, [r0] @@ -357488,7 +357488,7 @@ _080AD87C: movs r1, #0 movs r2, #0 movs r3, #0x4e - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -357554,10 +357554,10 @@ _080AD904: bx r0 .align 2, 0 _080AD90C: .4byte gUnknown_8526DE8 - thumb_func_end sub_080AD868 + thumb_func_end CreateAshSprites - thumb_func_start sub_080AD910 -sub_080AD910: @ 0x080AD910 + thumb_func_start DestroyAshSprites +DestroyAshSprites: @ 0x080AD910 push {r4, r5, lr} ldr r0, _080AD95C ldr r1, [r0] @@ -357599,7 +357599,7 @@ _080AD954: .align 2, 0 _080AD95C: .4byte gUnknown_8526DE8 _080AD960: .4byte 0x00001202 - thumb_func_end sub_080AD910 + thumb_func_end DestroyAshSprites thumb_func_start UpdateAshSprite UpdateAshSprite: @ 0x080AD964 @@ -357717,7 +357717,7 @@ Fog2_InitVars: @ 0x080AD9E0 strh r2, [r0] movs r0, #0 movs r1, #0x10 - bl sub_080ABA20 + bl Weather_SetBlendCoeffs _080ADA4A: pop {r4} pop {r0} @@ -357743,7 +357743,7 @@ Fog2_InitAll: @ 0x080ADA64 bne _080ADA84 adds r4, r1, r2 _080ADA7A: - bl sub_080ADA94 + bl Fog2_Main ldrb r0, [r4] cmp r0, #0 beq _080ADA7A @@ -357756,8 +357756,8 @@ _080ADA8C: .4byte gUnknown_8526DE8 _080ADA90: .4byte 0x000006D2 thumb_func_end Fog2_InitAll - thumb_func_start sub_080ADA94 -sub_080ADA94: @ 0x080ADA94 + thumb_func_start Fog2_Main +Fog2_Main: @ 0x080ADA94 push {r4, r5, lr} bl UpdateFog2Movement ldr r0, _080ADAB4 @@ -357780,7 +357780,7 @@ _080ADABC: beq _080ADAD4 b _080ADAEC _080ADAC2: - bl sub_080ADBEC + bl CreateFog2Sprites b _080ADAE6 _080ADAC8: movs r0, #0xc @@ -357789,7 +357789,7 @@ _080ADAC8: bl Weather_SetTargetBlendCoeffs b _080ADAE6 _080ADAD4: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080ADAEC @@ -357807,10 +357807,10 @@ _080ADAEC: bx r0 .align 2, 0 _080ADAF4: .4byte 0x000006D2 - thumb_func_end sub_080ADA94 + thumb_func_end Fog2_Main - thumb_func_start sub_080ADAF8 -sub_080ADAF8: @ 0x080ADAF8 + thumb_func_start Fog2_Finish +Fog2_Finish: @ 0x080ADAF8 push {r4, lr} bl UpdateFog2Movement ldr r0, _080ADB18 @@ -357839,13 +357839,13 @@ _080ADB26: bl Weather_SetTargetBlendCoeffs b _080ADB42 _080ADB32: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080ADB4E b _080ADB42 _080ADB3E: - bl sub_080ADCA4 + bl DestroyFog2Sprites _080ADB42: ldrh r0, [r4] adds r0, #1 @@ -357861,7 +357861,7 @@ _080ADB50: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ADAF8 + thumb_func_end Fog2_Finish thumb_func_start UpdateFog2Movement UpdateFog2Movement: @ 0x080ADB58 @@ -357937,8 +357937,8 @@ _080ADBE4: .4byte gUnknown_2021B38 _080ADBE8: .4byte gUnknown_2021B3A thumb_func_end UpdateFog2Movement - thumb_func_start sub_080ADBEC -sub_080ADBEC: @ 0x080ADBEC + thumb_func_start CreateFog2Sprites +CreateFog2Sprites: @ 0x080ADBEC push {r4, r5, r6, lr} sub sp, #8 ldr r0, _080ADC58 @@ -357954,7 +357954,7 @@ sub_080ADBEC: @ 0x080ADBEC str r0, [sp] str r1, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet movs r6, #0 _080ADC10: adds r0, r6, #0 @@ -357966,7 +357966,7 @@ _080ADC10: ldr r0, _080ADC64 movs r1, #0 movs r3, #0xff - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -358025,10 +358025,10 @@ _080ADC92: .align 2, 0 _080ADC9C: .4byte gUnknown_8526DE8 _080ADCA0: .4byte 0x00000724 - thumb_func_end sub_080ADBEC + thumb_func_end CreateFog2Sprites - thumb_func_start sub_080ADCA4 -sub_080ADCA4: @ 0x080ADCA4 + thumb_func_start DestroyFog2Sprites +DestroyFog2Sprites: @ 0x080ADCA4 push {r4, r5, lr} ldr r0, _080ADCEC ldr r1, [r0] @@ -358070,7 +358070,7 @@ _080ADCE6: _080ADCEC: .4byte gUnknown_8526DE8 _080ADCF0: .4byte 0x00000724 _080ADCF4: .4byte 0x00001203 - thumb_func_end sub_080ADCA4 + thumb_func_end DestroyFog2Sprites thumb_func_start UpdateFog2Sprite UpdateFog2Sprite: @ 0x080ADCF8 @@ -358168,7 +358168,7 @@ Sandstorm_InitVars: @ 0x080ADD58 _080ADDAC: movs r0, #0 movs r1, #0x10 - bl sub_080ABA20 + bl Weather_SetBlendCoeffs _080ADDB4: pop {r4} pop {r0} @@ -358196,7 +358196,7 @@ Sandstorm_InitAll: @ 0x080ADDD8 bne _080ADDF8 adds r4, r1, r2 _080ADDEE: - bl sub_080ADE08 + bl Sandstorm_Main ldrb r0, [r4] cmp r0, #0 beq _080ADDEE @@ -358209,8 +358209,8 @@ _080ADE00: .4byte gUnknown_8526DE8 _080ADE04: .4byte 0x000006D2 thumb_func_end Sandstorm_InitAll - thumb_func_start sub_080ADE08 -sub_080ADE08: @ 0x080ADE08 + thumb_func_start Sandstorm_Main +Sandstorm_Main: @ 0x080ADE08 push {r4, r5, lr} bl UpdateSandstormMovement bl UpdateSandstormWaveIndex @@ -358243,8 +358243,8 @@ _080ADE44: beq _080ADE60 b _080ADE78 _080ADE4A: - bl sub_080AE034 - bl sub_080AE0F4 + bl CreateSandstormSprites + bl CreateSwirlSandstormSprites b _080ADE72 _080ADE54: movs r0, #0x10 @@ -358253,7 +358253,7 @@ _080ADE54: bl Weather_SetTargetBlendCoeffs b _080ADE72 _080ADE60: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080ADE78 @@ -358271,10 +358271,10 @@ _080ADE78: bx r0 .align 2, 0 _080ADE80: .4byte 0x000006D2 - thumb_func_end sub_080ADE08 + thumb_func_end Sandstorm_Main - thumb_func_start sub_080ADE84 -sub_080ADE84: @ 0x080ADE84 + thumb_func_start Sandstorm_Finish +Sandstorm_Finish: @ 0x080ADE84 push {r4, lr} bl UpdateSandstormMovement bl UpdateSandstormWaveIndex @@ -358304,13 +358304,13 @@ _080ADEB6: bl Weather_SetTargetBlendCoeffs b _080ADED2 _080ADEC2: - bl sub_080ABAA4 + bl Weather_UpdateBlend lsls r0, r0, #0x18 cmp r0, #0 beq _080ADEDE b _080ADED2 _080ADECE: - bl sub_080ADFA0 + bl DestroySandstormSprites _080ADED2: ldrh r0, [r4] adds r0, #1 @@ -358326,7 +358326,7 @@ _080ADEE0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ADE84 + thumb_func_end Sandstorm_Finish thumb_func_start UpdateSandstormWaveIndex UpdateSandstormWaveIndex: @ 0x080ADEE8 @@ -358420,8 +358420,8 @@ _080ADF98: .4byte 0x0000070E _080ADF9C: .4byte gUnknown_2021B3A thumb_func_end UpdateSandstormMovement - thumb_func_start sub_080ADFA0 -sub_080ADFA0: @ 0x080ADFA0 + thumb_func_start DestroySandstormSprites +DestroySandstormSprites: @ 0x080ADFA0 push {r4, r5, lr} ldr r0, _080AE024 ldr r1, [r0] @@ -358495,10 +358495,10 @@ _080AE024: .4byte gUnknown_8526DE8 _080AE028: .4byte 0x00000716 _080AE02C: .4byte 0x00001204 _080AE030: .4byte 0x00000717 - thumb_func_end sub_080ADFA0 + thumb_func_end DestroySandstormSprites - thumb_func_start sub_080AE034 -sub_080AE034: @ 0x080AE034 + thumb_func_start CreateSandstormSprites +CreateSandstormSprites: @ 0x080AE034 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r0, _080AE0A4 @@ -358509,9 +358509,9 @@ sub_080AE034: @ 0x080AE034 cmp r0, #0 bne _080AE0E2 ldr r0, _080AE0AC - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _080AE0B0 - bl sub_080AB848 + bl LoadCustomWeatherSpritePalette movs r7, #0 _080AE054: adds r0, r7, #0 @@ -358523,7 +358523,7 @@ _080AE054: ldr r0, _080AE0B4 movs r1, #0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -358586,10 +358586,10 @@ _080AE0E2: .align 2, 0 _080AE0EC: .4byte gUnknown_8526DE8 _080AE0F0: .4byte 0x00000716 - thumb_func_end sub_080AE034 + thumb_func_end CreateSandstormSprites - thumb_func_start sub_080AE0F4 -sub_080AE0F4: @ 0x080AE0F4 + thumb_func_start CreateSwirlSandstormSprites +CreateSwirlSandstormSprites: @ 0x080AE0F4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -358618,7 +358618,7 @@ _080AE114: ldr r0, _080AE1A4 movs r2, #0xd0 movs r3, #1 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -358711,7 +358711,7 @@ _080AE1E0: bx r0 .align 2, 0 _080AE1F0: .4byte 0x00000717 - thumb_func_end sub_080AE0F4 + thumb_func_end CreateSwirlSandstormSprites thumb_func_start UpdateSandstormSprite UpdateSandstormSprite: @ 0x080AE1F4 @@ -358872,14 +358872,14 @@ _080AE314: .4byte 0x000006C1 _080AE318: .4byte 0x000006C2 thumb_func_end Shade_InitVars - thumb_func_start sub_080AE31C -sub_080AE31C: @ 0x080AE31C + thumb_func_start Shade_InitAll +Shade_InitAll: @ 0x080AE31C push {lr} bl Shade_InitVars pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AE31C + thumb_func_end Shade_InitAll thumb_func_start sub_080AE328 sub_080AE328: @ 0x080AE328 @@ -358893,8 +358893,8 @@ sub_080AE32C: @ 0x080AE32C bx lr thumb_func_end sub_080AE32C - thumb_func_start sub_080AE330 -sub_080AE330: @ 0x080AE330 + thumb_func_start Bubbles_InitVars +Bubbles_InitVars: @ 0x080AE330 push {r4, r5, lr} bl Fog1_InitVars ldr r0, _080AE370 @@ -358905,7 +358905,7 @@ sub_080AE330: @ 0x080AE330 cmp r5, #0 bne _080AE368 ldr r0, _080AE378 - bl sub_08008210 + bl LoadSpriteSheet movs r2, #0xe5 lsls r2, r2, #3 adds r0, r4, r2 @@ -358931,12 +358931,12 @@ _080AE374: .4byte 0x0000072E _080AE378: .4byte gUnknown_852AA94 _080AE37C: .4byte gUnknown_852AA8C _080AE380: .4byte 0x0000072A - thumb_func_end sub_080AE330 + thumb_func_end Bubbles_InitVars thumb_func_start Bubbles_InitAll Bubbles_InitAll: @ 0x080AE384 push {r4, lr} - bl sub_080AE330 + bl Bubbles_InitVars ldr r0, _080AE3AC ldr r1, [r0] ldr r2, _080AE3B0 @@ -358962,7 +358962,7 @@ _080AE3B0: .4byte 0x000006D2 thumb_func_start Bubbles_Main Bubbles_Main: @ 0x080AE3B4 push {r4, r5, r6, r7, lr} - bl sub_080AD3EC + bl Fog1_Main ldr r0, _080AE414 ldr r5, [r0] ldr r0, _080AE418 @@ -358996,7 +358996,7 @@ _080AE3F4: ldr r0, _080AE424 adds r4, r5, r0 ldrh r0, [r4] - bl sub_080AE444 + bl CreateBubbleSprite ldrh r0, [r4] adds r0, #1 strh r0, [r4] @@ -359019,14 +359019,14 @@ _080AE424: .4byte 0x0000072A thumb_func_start Bubbles_Finish Bubbles_Finish: @ 0x080AE428 push {lr} - bl sub_080AD4AC + bl Fog1_Finish lsls r0, r0, #0x18 cmp r0, #0 beq _080AE438 movs r0, #1 b _080AE43E _080AE438: - bl sub_080AE4CC + bl DestroyBubbleSprites movs r0, #0 _080AE43E: pop {r1} @@ -359034,8 +359034,8 @@ _080AE43E: .align 2, 0 thumb_func_end Bubbles_Finish - thumb_func_start sub_080AE444 -sub_080AE444: @ 0x080AE444 + thumb_func_start CreateBubbleSprite +CreateBubbleSprite: @ 0x080AE444 push {r4, lr} lsls r0, r0, #0x10 ldr r1, _080AE4B4 @@ -359053,7 +359053,7 @@ sub_080AE444: @ 0x080AE444 lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -359098,10 +359098,10 @@ _080AE4BC: .4byte gUnknown_852AAE0 _080AE4C0: .4byte gUnknown_20205AC _080AE4C4: .4byte gUnknown_8526DE8 _080AE4C8: .4byte 0x0000072C - thumb_func_end sub_080AE444 + thumb_func_end CreateBubbleSprite - thumb_func_start sub_080AE4CC -sub_080AE4CC: @ 0x080AE4CC + thumb_func_start DestroyBubbleSprites +DestroyBubbleSprites: @ 0x080AE4CC push {r4, r5, lr} ldr r0, _080AE51C ldr r0, [r0] @@ -359149,10 +359149,10 @@ _080AE520: .4byte 0x0000072C _080AE524: .4byte gUnknown_20205AC _080AE528: .4byte gUnknown_852AAE0 _080AE52C: .4byte 0x00001205 - thumb_func_end sub_080AE4CC + thumb_func_end DestroyBubbleSprites - thumb_func_start sub_080AE530 -sub_080AE530: @ 0x080AE530 + thumb_func_start UpdateBubbleSprite +UpdateBubbleSprite: @ 0x080AE530 push {lr} adds r1, r0, #0 ldrh r0, [r1, #0x2e] @@ -359203,10 +359203,10 @@ _080AE58A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AE530 + thumb_func_end UpdateBubbleSprite - thumb_func_start sub_080AE590 -sub_080AE590: @ 0x080AE590 + thumb_func_start UnusedSetCurrentAlternatingWeather +UnusedSetCurrentAlternatingWeather: @ 0x080AE590 ldr r2, _080AE59C strb r0, [r2] ldr r0, _080AE5A0 @@ -359215,10 +359215,10 @@ sub_080AE590: @ 0x080AE590 .align 2, 0 _080AE59C: .4byte gUnknown_2038864 _080AE5A0: .4byte gUnknown_2038866 - thumb_func_end sub_080AE590 + thumb_func_end UnusedSetCurrentAlternatingWeather - thumb_func_start sub_080AE5A4 -sub_080AE5A4: @ 0x080AE5A4 + thumb_func_start Task_DoAlternatingWeather +Task_DoAlternatingWeather: @ 0x080AE5A4 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -359244,7 +359244,7 @@ _080AE5C8: cmp r0, #0 bgt _080AE618 ldrb r0, [r4, #2] - bl sub_080AA994 + bl SetNextWeather ldr r1, _080AE5F0 ldrh r0, [r4, #2] strb r0, [r1] @@ -359265,7 +359265,7 @@ _080AE5F4: cmp r0, #0 bgt _080AE618 ldrb r0, [r4, #4] - bl sub_080AA994 + bl SetNextWeather ldr r1, _080AE620 ldrh r0, [r4, #4] strb r0, [r1] @@ -359282,14 +359282,14 @@ _080AE618: bx r0 .align 2, 0 _080AE620: .4byte gUnknown_2038864 - thumb_func_end sub_080AE5A4 + thumb_func_end Task_DoAlternatingWeather - thumb_func_start sub_080AE624 -sub_080AE624: @ 0x080AE624 + thumb_func_start CreateAlternatingWeatherTask +CreateAlternatingWeatherTask: @ 0x080AE624 push {lr} ldr r0, _080AE650 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -359308,7 +359308,7 @@ sub_080AE624: @ 0x080AE624 movs r0, #0xc b _080AE662 .align 2, 0 -_080AE650: .4byte sub_080AE5A4 +_080AE650: .4byte Task_DoAlternatingWeather _080AE654: .4byte gUnknown_3005B68 _080AE658: .4byte gUnknown_2038864 _080AE65C: @@ -359329,7 +359329,7 @@ _080AE668: _080AE674: pop {r0} bx r0 - thumb_func_end sub_080AE624 + thumb_func_end CreateAlternatingWeatherTask thumb_func_start SetSav1Weather SetSav1Weather: @ 0x080AE678 @@ -359340,7 +359340,7 @@ SetSav1Weather: @ 0x080AE678 ldrb r5, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080AE7E4 + bl TranslateWeatherNum ldr r1, [r4] adds r1, #0x2e strb r0, [r1] @@ -359348,7 +359348,7 @@ SetSav1Weather: @ 0x080AE678 adds r0, #0x2e ldrb r0, [r0] adds r1, r5, #0 - bl sub_080AE8D8 + bl UpdateRainCounter pop {r4, r5} pop {r0} bx r0 @@ -359356,8 +359356,8 @@ SetSav1Weather: @ 0x080AE678 _080AE6A4: .4byte gUnknown_3005AEC thumb_func_end SetSav1Weather - thumb_func_start sub_080AE6A8 -sub_080AE6A8: @ 0x080AE6A8 + thumb_func_start GetSav1Weather +GetSav1Weather: @ 0x080AE6A8 ldr r0, _080AE6B4 ldr r0, [r0] adds r0, #0x2e @@ -359365,7 +359365,7 @@ sub_080AE6A8: @ 0x080AE6A8 bx lr .align 2, 0 _080AE6B4: .4byte gUnknown_3005AEC - thumb_func_end sub_080AE6A8 + thumb_func_end GetSav1Weather thumb_func_start SetSav1WeatherFromCurrMapHeader SetSav1WeatherFromCurrMapHeader: @ 0x080AE6B8 @@ -359376,7 +359376,7 @@ SetSav1WeatherFromCurrMapHeader: @ 0x080AE6B8 ldrb r5, [r0] ldr r0, _080AE6E8 ldrb r0, [r0, #0x16] - bl sub_080AE7E4 + bl TranslateWeatherNum ldr r1, [r4] adds r1, #0x2e strb r0, [r1] @@ -359384,7 +359384,7 @@ SetSav1WeatherFromCurrMapHeader: @ 0x080AE6B8 adds r0, #0x2e ldrb r0, [r0] adds r1, r5, #0 - bl sub_080AE8D8 + bl UpdateRainCounter pop {r4, r5} pop {r0} bx r0 @@ -359397,10 +359397,10 @@ _080AE6E8: .4byte gUnknown_2036FB8 SetWeather: @ 0x080AE6EC push {lr} bl SetSav1Weather - bl sub_080AE6A8 + bl GetSav1Weather lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080AA994 + bl SetNextWeather pop {r0} bx r0 .align 2, 0 @@ -359410,7 +359410,7 @@ SetWeather: @ 0x080AE6EC SetWeather_Unused: @ 0x080AE704 push {lr} bl SetSav1Weather - bl sub_080AE6A8 + bl GetSav1Weather lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl SetCurrentAndNextWeather @@ -359419,87 +359419,87 @@ SetWeather_Unused: @ 0x080AE704 .align 2, 0 thumb_func_end SetWeather_Unused - thumb_func_start sub_080AE71C -sub_080AE71C: @ 0x080AE71C + thumb_func_start DoCurrentWeather +DoCurrentWeather: @ 0x080AE71C push {r4, r5, lr} - bl sub_080AE6A8 + bl GetSav1Weather lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xf bne _080AE748 ldr r0, _080AE740 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080AE73A - bl sub_080AE624 + bl CreateAlternatingWeatherTask _080AE73A: ldr r0, _080AE744 ldrb r4, [r0] b _080AE76A .align 2, 0 -_080AE740: .4byte sub_080AE5A4 +_080AE740: .4byte Task_DoAlternatingWeather _080AE744: .4byte gUnknown_2038864 _080AE748: ldr r5, _080AE778 adds r0, r5, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _080AE764 adds r0, r5, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080AE764: ldr r1, _080AE77C movs r0, #0xd strb r0, [r1] _080AE76A: adds r0, r4, #0 - bl sub_080AA994 + bl SetNextWeather pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080AE778: .4byte sub_080AE5A4 +_080AE778: .4byte Task_DoAlternatingWeather _080AE77C: .4byte gUnknown_2038864 - thumb_func_end sub_080AE71C + thumb_func_end DoCurrentWeather - thumb_func_start sub_080AE780 -sub_080AE780: @ 0x080AE780 + thumb_func_start ResumePausedWeather +ResumePausedWeather: @ 0x080AE780 push {r4, r5, lr} - bl sub_080AE6A8 + bl GetSav1Weather lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xf bne _080AE7AC ldr r0, _080AE7A4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080AE79E - bl sub_080AE624 + bl CreateAlternatingWeatherTask _080AE79E: ldr r0, _080AE7A8 ldrb r4, [r0] b _080AE7CE .align 2, 0 -_080AE7A4: .4byte sub_080AE5A4 +_080AE7A4: .4byte Task_DoAlternatingWeather _080AE7A8: .4byte gUnknown_2038864 _080AE7AC: ldr r5, _080AE7DC adds r0, r5, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _080AE7C8 adds r0, r5, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080AE7C8: ldr r1, _080AE7E0 movs r0, #0xd @@ -359511,12 +359511,12 @@ _080AE7CE: pop {r0} bx r0 .align 2, 0 -_080AE7DC: .4byte sub_080AE5A4 +_080AE7DC: .4byte Task_DoAlternatingWeather _080AE7E0: .4byte gUnknown_2038864 - thumb_func_end sub_080AE780 + thumb_func_end ResumePausedWeather - thumb_func_start sub_080AE7E4 -sub_080AE7E4: @ 0x080AE7E4 + thumb_func_start TranslateWeatherNum +TranslateWeatherNum: @ 0x080AE7E4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -359621,7 +359621,7 @@ _080AE8B2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080AE7E4 + thumb_func_end TranslateWeatherNum thumb_func_start UpdateWeatherPerDay UpdateWeatherPerDay: @ 0x080AE8B8 @@ -359643,8 +359643,8 @@ UpdateWeatherPerDay: @ 0x080AE8B8 _080AE8D4: .4byte gUnknown_3005AEC thumb_func_end UpdateWeatherPerDay - thumb_func_start sub_080AE8D8 -sub_080AE8D8: @ 0x080AE8D8 + thumb_func_start UpdateRainCounter +UpdateRainCounter: @ 0x080AE8D8 push {lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -359662,10 +359662,10 @@ _080AE8F2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AE8D8 + thumb_func_end UpdateRainCounter - thumb_func_start sub_080AE8F8 -sub_080AE8F8: @ 0x080AE8F8 + thumb_func_start palette_bg_faded_fill_white +palette_bg_faded_fill_white: @ 0x080AE8F8 push {lr} sub sp, #4 ldr r0, _080AE910 @@ -359681,7 +359681,7 @@ sub_080AE8F8: @ 0x080AE8F8 _080AE910: .4byte 0x7FFF7FFF _080AE914: .4byte gUnknown_20377B4 _080AE918: .4byte 0x01000100 - thumb_func_end sub_080AE8F8 + thumb_func_end palette_bg_faded_fill_white thumb_func_start sub_080AE91C sub_080AE91C: @ 0x080AE91C @@ -359701,10 +359701,10 @@ _080AE934: .4byte gUnknown_20377B4 _080AE938: .4byte 0x01000100 thumb_func_end sub_080AE91C - thumb_func_start sub_080AE93C -sub_080AE93C: @ 0x080AE93C + thumb_func_start pal_fill_for_maplights +pal_fill_for_maplights: @ 0x080AE93C push {r4, lr} - bl sub_08085524 + bl GetLastUsedWarpMapType adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -359713,7 +359713,7 @@ sub_080AE93C: @ 0x080AE93C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08137418 + bl GetMapPairFadeFromType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -359725,46 +359725,46 @@ _080AE966: bl sub_080AE91C movs r0, #0 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen b _080AE980 _080AE974: - bl sub_080AE8F8 + bl palette_bg_faded_fill_white movs r0, #2 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen _080AE980: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AE93C + thumb_func_end pal_fill_for_maplights thumb_func_start sub_080AE988 sub_080AE988: @ 0x080AE988 push {lr} - bl sub_080AE8F8 + bl palette_bg_faded_fill_white movs r0, #2 movs r1, #8 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080AE988 - thumb_func_start sub_080AE99C -sub_080AE99C: @ 0x080AE99C + thumb_func_start pal_fill_black +pal_fill_black: @ 0x080AE99C push {lr} bl sub_080AE91C movs r0, #0 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AE99C + thumb_func_end pal_fill_black - thumb_func_start sub_080AE9B0 -sub_080AE9B0: @ 0x080AE9B0 + thumb_func_start WarpFadeScreen +WarpFadeScreen: @ 0x080AE9B0 push {r4, lr} bl GetCurrentMapType adds r4, r0, #0 @@ -359784,18 +359784,18 @@ sub_080AE9B0: @ 0x080AE9B0 _080AE9D6: movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen b _080AE9E8 _080AE9E0: movs r0, #3 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen _080AE9E8: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AE9B0 + thumb_func_end WarpFadeScreen thumb_func_start sub_080AE9F0 sub_080AE9F0: @ 0x080AE9F0 @@ -359813,8 +359813,8 @@ _080AE9FC: .align 2, 0 thumb_func_end sub_080AE9F0 - thumb_func_start sub_080AEA08 -sub_080AEA08: @ 0x080AEA08 + thumb_func_start task0A_nop_for_a_while +task0A_nop_for_a_while: @ 0x080AEA08 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -359822,31 +359822,31 @@ sub_080AEA08: @ 0x080AEA08 cmp r0, #1 bne _080AEA1C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080AEA1C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AEA08 + thumb_func_end task0A_nop_for_a_while thumb_func_start sub_080AEA24 sub_080AEA24: @ 0x080AEA24 push {lr} bl sub_080987DC - bl sub_080850EC - bl sub_080AE99C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_black ldr r0, _080AEA40 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AEA40: .4byte sub_080AEA08 +_080AEA40: .4byte task0A_nop_for_a_while thumb_func_end sub_080AEA24 - thumb_func_start sub_080AEA44 -sub_080AEA44: @ 0x080AEA44 + thumb_func_start task0A_asap_script_env_2_enable_and_set_ctx_running +task0A_asap_script_env_2_enable_and_set_ctx_running: @ 0x080AEA44 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -359854,46 +359854,46 @@ sub_080AEA44: @ 0x080AEA44 cmp r0, #1 bne _080AEA5C adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080AEA5C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AEA44 + thumb_func_end task0A_asap_script_env_2_enable_and_set_ctx_running - thumb_func_start sub_080AEA64 -sub_080AEA64: @ 0x080AEA64 + thumb_func_start FieldCallback_ReturnToEventScript2 +FieldCallback_ReturnToEventScript2: @ 0x080AEA64 push {lr} bl sub_080987DC - bl sub_080850EC - bl sub_080AE99C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_black ldr r0, _080AEA80 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AEA80: .4byte sub_080AEA44 - thumb_func_end sub_080AEA64 +_080AEA80: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running + thumb_func_end FieldCallback_ReturnToEventScript2 thumb_func_start sub_080AEA84 sub_080AEA84: @ 0x080AEA84 push {lr} bl sub_080987DC - bl sub_080AE99C + bl pal_fill_black ldr r0, _080AEA9C movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AEA9C: .4byte sub_080AEA44 +_080AEA9C: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running thumb_func_end sub_080AEA84 - thumb_func_start sub_080AEAA0 -sub_080AEAA0: @ 0x080AEAA0 + thumb_func_start task_mpl_807DD60 +task_mpl_807DD60: @ 0x080AEAA0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -359933,7 +359933,7 @@ _080AEADA: ldrb r0, [r1, #4] cmp r0, #1 beq _080AEB0A - bl sub_080AE93C + bl pal_fill_for_maplights _080AEAF0: ldrh r0, [r4, #8] adds r0, #1 @@ -359945,26 +359945,26 @@ _080AEAF8: bne _080AEB0A bl sub_080987E8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AEB0A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080AEAA0 + thumb_func_end task_mpl_807DD60 thumb_func_start sub_080AEB10 sub_080AEB10: @ 0x080AEB10 push {lr} bl sub_080987DC - bl sub_080850EC + bl Overworld_PlaySpecialMapMusic bl sub_080AE91C ldr r0, _080AEB2C movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AEB2C: .4byte sub_080AEAA0 +_080AEB2C: .4byte task_mpl_807DD60 thumb_func_end sub_080AEB10 thumb_func_start sub_080AEB30 @@ -359996,7 +359996,7 @@ _080AEB5E: bl sub_0800A8D4 b _080AEB8C _080AEB64: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080AEB88 @@ -360013,7 +360013,7 @@ _080AEB64: bl sub_08010C60 b _080AEBAA _080AEB88: - bl sub_080AE93C + bl pal_fill_for_maplights _080AEB8C: ldrh r0, [r4, #8] adds r0, #1 @@ -360026,7 +360026,7 @@ _080AEB94: bl sub_08009AB0 bl sub_080987E8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AEBAA: pop {r4, r5} pop {r0} @@ -360062,7 +360062,7 @@ _080AEBDE: bl sub_0800A8D4 b _080AEBEE _080AEBE4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080AEC08 @@ -360073,10 +360073,10 @@ _080AEBEE: b _080AEC08 _080AEBF6: bl sub_08009AB0 - bl sub_08086590 + bl ResetAllMultiplayerState bl sub_080987E8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AEC08: pop {r4, r5} pop {r0} @@ -360088,11 +360088,11 @@ _080AEC08: sub_080AEC10: @ 0x080AEC10 push {lr} bl sub_080987DC - bl sub_080850EC + bl Overworld_PlaySpecialMapMusic bl sub_080AE91C ldr r0, _080AEC2C movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -360138,32 +360138,32 @@ _080AEC68: _080AEC7A: adds r0, r1, #0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask add sp, #4 pop {r4} pop {r0} bx r0 .align 2, 0 -_080AEC8C: .4byte sub_080AEF0C -_080AEC90: .4byte sub_080AEE4C +_080AEC8C: .4byte task_map_chg_seq_0807E2CC +_080AEC90: .4byte task_map_chg_seq_0807E20C thumb_func_end sub_080AEC30 - thumb_func_start sub_080AEC94 -sub_080AEC94: @ 0x080AEC94 + thumb_func_start mapldr_default +mapldr_default: @ 0x080AEC94 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights bl sub_080AEC30 bl sub_080987DC pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AEC94 + thumb_func_end mapldr_default thumb_func_start sub_080AECAC sub_080AECAC: @ 0x080AECAC push {lr} - bl sub_080850EC + bl Overworld_PlaySpecialMapMusic bl sub_080AE988 bl sub_080AEC30 bl sub_080987DC @@ -360178,9 +360178,9 @@ sub_080AECC4: @ 0x080AECC4 bl sub_081D5ED4 cmp r0, #0 bne _080AECD2 - bl sub_080850EC + bl Overworld_PlaySpecialMapMusic _080AECD2: - bl sub_080AE99C + bl pal_fill_black bl sub_080AEC30 bl sub_080987DC pop {r0} @@ -360191,37 +360191,37 @@ _080AECD2: thumb_func_start sub_080AECE4 sub_080AECE4: @ 0x080AECE4 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights movs r0, #0x2e bl sub_080A306C ldr r0, _080AED04 movs r1, #0xa - bl sub_080A8878 + bl CreateTask bl sub_080987DC pop {r0} bx r0 .align 2, 0 -_080AED04: .4byte sub_080AFA5C +_080AED04: .4byte task0A_mpl_807E31C thumb_func_end sub_080AECE4 thumb_func_start sub_080AED08 sub_080AED08: @ 0x080AED08 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights movs r0, #0x2e bl sub_080A306C ldr r0, _080AED30 movs r1, #0xa - bl sub_080A8878 + bl CreateTask bl sub_080987DC movs r0, #0xe bl sub_08084EA8 pop {r0} bx r0 .align 2, 0 -_080AED30: .4byte sub_080AEF0C +_080AED30: .4byte task_map_chg_seq_0807E2CC thumb_func_end sub_080AED08 thumb_func_start sub_080AED34 @@ -360291,14 +360291,14 @@ _080AEDA0: ldr r1, _080AEDD4 adds r0, r0, r1 movs r1, #8 - bl sub_08092B30 + bl EventObjectSetHeldMovement movs r0, #2 strh r0, [r5, #8] b _080AEE46 .align 2, 0 _080AEDD4: .4byte gUnknown_2036FF0 _080AEDD8: - bl sub_08097D10 + bl walkrun_is_standing_still lsls r0, r0, #0x18 cmp r0, #0 beq _080AEE46 @@ -360306,7 +360306,7 @@ _080AEDD8: ldrsh r0, [r6, r1] movs r2, #0 ldrsh r1, [r7, r2] - bl sub_0808A210 + bl FieldAnimateDoorClose lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r5, #0xa] @@ -360348,15 +360348,15 @@ _080AEE32: _080AEE3C: bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080AEE46: pop {r4, r5, r6, r7} pop {r0} bx r0 thumb_func_end sub_080AED34 - thumb_func_start sub_080AEE4C -sub_080AEE4C: @ 0x080AEE4C + thumb_func_start task_map_chg_seq_0807E20C +task_map_chg_seq_0807E20C: @ 0x080AEE4C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -360421,14 +360421,14 @@ _080AEE9E: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement movs r0, #2 strh r0, [r5, #8] b _080AEF06 .align 2, 0 _080AEEE4: .4byte gUnknown_2036FF0 _080AEEE8: - bl sub_08097D10 + bl walkrun_is_standing_still lsls r0, r0, #0x18 cmp r0, #0 beq _080AEF06 @@ -360439,15 +360439,15 @@ _080AEEE8: _080AEEFC: bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080AEF06: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080AEE4C + thumb_func_end task_map_chg_seq_0807E20C - thumb_func_start sub_080AEF0C -sub_080AEF0C: @ 0x080AEF0C + thumb_func_start task_map_chg_seq_0807E2CC +task_map_chg_seq_0807E2CC: @ 0x080AEF0C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -360479,12 +360479,12 @@ _080AEF40: bl UnfreezeEventObjects bl sub_080987E8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AEF56: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080AEF0C + thumb_func_end task_map_chg_seq_0807E2CC thumb_func_start sub_080AEF5C sub_080AEF5C: @ 0x080AEF5C @@ -360495,10 +360495,10 @@ sub_080AEF5C: @ 0x080AEF5C cmp r0, #1 bne _080AEF78 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080AEF80 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask _080AEF78: pop {r4} pop {r0} @@ -360510,10 +360510,10 @@ _080AEF80: .4byte sub_0809F30C thumb_func_start sub_080AEF84 sub_080AEF84: @ 0x080AEF84 push {lr} - bl sub_080AE99C + bl pal_fill_black ldr r0, _080AEF9C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask bl sub_080987DC pop {r0} bx r0 @@ -360530,8 +360530,8 @@ sub_080AEFA0: @ 0x080AEFA0 bx r1 thumb_func_end sub_080AEFA0 - thumb_func_start sub_080AEFAC -sub_080AEFAC: @ 0x080AEFAC + thumb_func_start task_mpl_807E3C8 +task_mpl_807E3C8: @ 0x080AEFAC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -360540,42 +360540,42 @@ sub_080AEFAC: @ 0x080AEFAC bne _080AEFC8 bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 - bl sub_08097E7C + bl DestroyTask + bl ScriptUnfreezeEventObjects _080AEFC8: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AEFAC + thumb_func_end task_mpl_807E3C8 thumb_func_start sub_080AEFD0 sub_080AEFD0: @ 0x080AEFD0 push {lr} bl sub_080987DC - bl sub_080AE99C + bl pal_fill_black ldr r0, _080AEFE8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AEFE8: .4byte sub_080AEFAC +_080AEFE8: .4byte task_mpl_807E3C8 thumb_func_end sub_080AEFD0 thumb_func_start sub_080AEFEC sub_080AEFEC: @ 0x080AEFEC push {lr} bl sub_080987DC - bl sub_080850EC - bl sub_080AE99C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_black ldr r0, _080AF008 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AF008: .4byte sub_080AEFAC +_080AF008: .4byte task_mpl_807E3C8 thumb_func_end sub_080AEFEC thumb_func_start sub_080AF00C @@ -360605,13 +360605,13 @@ _080AF02C: bx r1 thumb_func_end WaitForWeatherFadeIn - thumb_func_start sub_080AF030 -sub_080AF030: @ 0x080AF030 + thumb_func_start DoWarp +DoWarp: @ 0x080AF030 push {lr} bl sub_080987DC - bl sub_08085278 - bl sub_080AE9B0 - bl sub_080ABC74 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen + bl PlayRainStoppingSoundEffect movs r0, #9 bl sub_080A306C ldr r0, _080AF05C @@ -360619,61 +360619,61 @@ sub_080AF030: @ 0x080AF030 str r1, [r0] ldr r0, _080AF064 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AF05C: .4byte gUnknown_3005B0C -_080AF060: .4byte sub_080AEC94 +_080AF060: .4byte mapldr_default _080AF064: .4byte sub_080AF308 - thumb_func_end sub_080AF030 + thumb_func_end DoWarp - thumb_func_start sub_080AF068 -sub_080AF068: @ 0x080AF068 + thumb_func_start DoDiveWarp +DoDiveWarp: @ 0x080AF068 push {lr} bl sub_080987DC - bl sub_08085278 - bl sub_080AE9B0 - bl sub_080ABC74 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen + bl PlayRainStoppingSoundEffect ldr r0, _080AF08C ldr r1, _080AF090 str r1, [r0] ldr r0, _080AF094 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AF08C: .4byte gUnknown_3005B0C -_080AF090: .4byte sub_080AEC94 +_080AF090: .4byte mapldr_default _080AF094: .4byte sub_080AF308 - thumb_func_end sub_080AF068 + thumb_func_end DoDiveWarp - thumb_func_start sub_080AF098 -sub_080AF098: @ 0x080AF098 + thumb_func_start ScrCmd_pokemartdecoration2 +ScrCmd_pokemartdecoration2: @ 0x080AF098 push {lr} bl sub_080987DC - bl sub_08085278 + bl TryFadeOutOldMapMusic movs r0, #3 movs r1, #8 - bl sub_080AB5CC - bl sub_080ABC74 + bl FadeScreen + bl PlayRainStoppingSoundEffect ldr r0, _080AF0C0 ldr r1, _080AF0C4 str r1, [r0] ldr r0, _080AF0C8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AF0C0: .4byte gUnknown_3005B0C _080AF0C4: .4byte sub_080AECAC _080AF0C8: .4byte sub_080AF308 - thumb_func_end sub_080AF098 + thumb_func_end ScrCmd_pokemartdecoration2 - thumb_func_start sub_080AF0CC -sub_080AF0CC: @ 0x080AF0CC + thumb_func_start DoDoorWarp +DoDoorWarp: @ 0x080AF0CC push {lr} bl sub_080987DC ldr r0, _080AF0E4 @@ -360681,19 +360681,19 @@ sub_080AF0CC: @ 0x080AF0CC str r1, [r0] ldr r0, _080AF0EC movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AF0E4: .4byte gUnknown_3005B0C -_080AF0E8: .4byte sub_080AEC94 +_080AF0E8: .4byte mapldr_default _080AF0EC: .4byte sub_080AF384 - thumb_func_end sub_080AF0CC + thumb_func_end DoDoorWarp - thumb_func_start sub_080AF0F0 -sub_080AF0F0: @ 0x080AF0F0 + thumb_func_start DoFallWarp +DoFallWarp: @ 0x080AF0F0 push {lr} - bl sub_080AF068 + bl DoDiveWarp ldr r1, _080AF100 ldr r0, _080AF104 str r0, [r1] @@ -360701,8 +360701,8 @@ sub_080AF0F0: @ 0x080AF0F0 bx r0 .align 2, 0 _080AF100: .4byte gUnknown_3005B0C -_080AF104: .4byte sub_080B62C0 - thumb_func_end sub_080AF0F0 +_080AF104: .4byte PrintAllVariableNumsOnCardPage2 + thumb_func_end DoFallWarp thumb_func_start sub_080AF108 sub_080AF108: @ 0x080AF108 @@ -360744,13 +360744,13 @@ sub_080AF134: @ 0x080AF134 sub_080AF144: @ 0x080AF144 push {lr} bl sub_080987DC - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen movs r0, #0x2d bl sub_080A306C ldr r0, _080AF16C movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, _080AF170 ldr r0, _080AF174 str r0, [r1] @@ -360769,13 +360769,13 @@ sub_080AF178: @ 0x080AF178 bl sub_08084EA8 bl sub_080987DC bl SaveEventObjects - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen movs r0, #0x2d bl sub_080A306C ldr r0, _080AF1A8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, _080AF1AC ldr r0, _080AF1B0 str r0, [r1] @@ -360791,10 +360791,10 @@ _080AF1B0: .4byte sub_080AED08 sub_080AF1B4: @ 0x080AF1B4 push {lr} bl sub_080987DC - bl sub_080AE9B0 + bl WarpFadeScreen ldr r0, _080AF1D0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, _080AF1D4 ldr r0, _080AF1D8 str r0, [r1] @@ -360838,7 +360838,7 @@ _080AF210: bl sub_080AF00C cmp r0, #0 bne _080AF23A - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080AF23A @@ -360848,11 +360848,11 @@ _080AF222: strh r0, [r4, #8] b _080AF23A _080AF22A: - bl sub_08084540 + bl WarpIntoMap ldr r0, _080AF240 - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AF23A: pop {r4, r5} pop {r0} @@ -360865,21 +360865,21 @@ _080AF240: .4byte sub_080859DC sub_080AF244: @ 0x080AF244 push {lr} bl sub_080987DC - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen movs r0, #9 bl sub_080A306C ldr r0, _080AF264 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AF264: .4byte sub_080AF1DC thumb_func_end sub_080AF244 - thumb_func_start sub_080AF268 -sub_080AF268: @ 0x080AF268 + thumb_func_start Task_ReturnToWorldFromLinkRoom +Task_ReturnToWorldFromLinkRoom: @ 0x080AF268 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -360907,8 +360907,8 @@ _080AF296: bl sub_08009B44 movs r0, #1 movs r1, #0 - bl sub_080AB5CC - bl sub_08085278 + bl FadeScreen + bl TryFadeOutOldMapMusic movs r0, #9 bl sub_080A306C b _080AF2C4 @@ -360916,7 +360916,7 @@ _080AF2AE: bl sub_080AF00C cmp r0, #0 bne _080AF2E4 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080AF2E4 @@ -360931,30 +360931,30 @@ _080AF2CC: ldrb r0, [r0] cmp r0, #0 bne _080AF2E4 - bl sub_08084540 + bl WarpIntoMap ldr r0, _080AF2F0 - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AF2E4: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080AF2EC: .4byte gUnknown_30031C4 -_080AF2F0: .4byte sub_08085934 - thumb_func_end sub_080AF268 +_080AF2F0: .4byte CB2_LoadMap + thumb_func_end Task_ReturnToWorldFromLinkRoom thumb_func_start sub_080AF2F4 sub_080AF2F4: @ 0x080AF2F4 push {lr} ldr r0, _080AF304 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AF304: .4byte sub_080AF268 +_080AF304: .4byte Task_ReturnToWorldFromLinkRoom thumb_func_end sub_080AF2F4 thumb_func_start sub_080AF308 @@ -360994,10 +360994,10 @@ _080AF340: ldrsh r0, [r4, r1] cmp r0, #0 bne _080AF356 - bl sub_081BE3C8 + bl ClearMirageTowerPulseBlendEffect strh r5, [r4, #0xa] _080AF356: - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080AF378 @@ -361007,17 +361007,17 @@ _080AF360: strh r0, [r4, #8] b _080AF378 _080AF368: - bl sub_08084540 + bl WarpIntoMap ldr r0, _080AF380 - bl sub_08000540 + bl SetMainCallback2 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080AF378: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 -_080AF380: .4byte sub_08085934 +_080AF380: .4byte CB2_LoadMap thumb_func_end sub_080AF308 thumb_func_start sub_080AF384 @@ -361065,7 +361065,7 @@ _080AF3D0: movs r2, #0 ldrsh r1, [r6, r2] subs r1, #1 - bl sub_0808A294 + bl GetDoorSoundEffect lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_080A306C @@ -361074,7 +361074,7 @@ _080AF3D0: movs r2, #0 ldrsh r1, [r6, r2] subs r1, #1 - bl sub_0808A248 + bl FieldAnimateDoorOpen lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r5, #0xa] @@ -361119,14 +361119,14 @@ _080AF422: lsls r0, r0, #2 adds r0, r0, r4 movs r1, #9 - bl sub_08092B30 + bl EventObjectSetHeldMovement movs r0, #2 strh r0, [r5, #8] b _080AF4E4 .align 2, 0 _080AF464: .4byte gUnknown_2036FF0 _080AF468: - bl sub_08097D10 + bl walkrun_is_standing_still lsls r0, r0, #0x18 cmp r0, #0 beq _080AF4E4 @@ -361135,7 +361135,7 @@ _080AF468: movs r2, #0 ldrsh r1, [r6, r2] subs r1, #1 - bl sub_0808A210 + bl FieldAnimateDoorClose lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r5, #0xa] @@ -361176,9 +361176,9 @@ _080AF4CA: strh r0, [r5, #8] b _080AF4E4 _080AF4D0: - bl sub_08085278 - bl sub_080AE9B0 - bl sub_080ABC74 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen + bl PlayRainStoppingSoundEffect movs r0, #0 strh r0, [r5, #8] ldr r0, _080AF4EC @@ -361191,8 +361191,8 @@ _080AF4E4: _080AF4EC: .4byte sub_080AF308 thumb_func_end sub_080AF384 - thumb_func_start sub_080AF4F0 -sub_080AF4F0: @ 0x080AF4F0 + thumb_func_start task0A_fade_n_map_maybe +task0A_fade_n_map_maybe: @ 0x080AF4F0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -361224,7 +361224,7 @@ _080AF528: bl sub_080AF00C cmp r0, #0 bne _080AF552 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080AF552 @@ -361234,26 +361234,26 @@ _080AF53A: strh r0, [r4, #8] b _080AF552 _080AF542: - bl sub_08084540 + bl WarpIntoMap ldr r0, _080AF558 - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AF552: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080AF558: .4byte sub_0808598C - thumb_func_end sub_080AF4F0 + thumb_func_end task0A_fade_n_map_maybe thumb_func_start sub_080AF55C sub_080AF55C: @ 0x080AF55C push {lr} bl sub_080987DC - bl sub_08085278 - bl sub_080AE9B0 - bl sub_080ABC74 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen + bl PlayRainStoppingSoundEffect movs r0, #9 bl sub_080A306C ldr r0, _080AF588 @@ -361261,13 +361261,13 @@ sub_080AF55C: @ 0x080AF55C str r1, [r0] ldr r0, _080AF590 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AF588: .4byte gUnknown_3005B0C _080AF58C: .4byte sub_080AECC4 -_080AF590: .4byte sub_080AF4F0 +_080AF590: .4byte task0A_fade_n_map_maybe thumb_func_end sub_080AF55C thumb_func_start SetFlashScanlineEffectWindowBoundary @@ -361478,8 +361478,8 @@ _080AF6F4: bx r0 thumb_func_end sub_080AF678 - thumb_func_start sub_080AF704 -sub_080AF704: @ 0x080AF704 + thumb_func_start UpdateFlashLevelEffect +UpdateFlashLevelEffect: @ 0x080AF704 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -361555,7 +361555,7 @@ _080AF760: ldrsh r0, [r4, r3] cmp r0, #1 bne _080AF7B0 - bl sub_080B9710 + bl ScanlineEffect_Stop movs r0, #2 strh r0, [r4] b _080AF7C2 @@ -361564,20 +361564,20 @@ _080AF7A8: .4byte gUnknown_20397C8 _080AF7AC: .4byte gUnknown_20388C8 _080AF7B0: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080AF7C2 _080AF7B8: - bl sub_080B9750 + bl ScanlineEffect_Clear adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AF7C2: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080AF704 + thumb_func_end UpdateFlashLevelEffect - thumb_func_start sub_080AF7C8 -sub_080AF7C8: @ 0x080AF7C8 + thumb_func_start UpdateFlash2LevelEffect +UpdateFlash2LevelEffect: @ 0x080AF7C8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -361653,7 +361653,7 @@ _080AF824: ldrsh r0, [r4, r3] cmp r0, #1 bne _080AF874 - bl sub_080B9710 + bl ScanlineEffect_Stop movs r0, #2 strh r0, [r4] b _080AF886 @@ -361662,17 +361662,17 @@ _080AF86C: .4byte gUnknown_20397C8 _080AF870: .4byte gUnknown_20388C8 _080AF874: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080AF886 _080AF87C: - bl sub_080B9750 + bl ScanlineEffect_Clear adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AF886: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080AF7C8 + thumb_func_end UpdateFlash2LevelEffect thumb_func_start sub_080AF88C sub_080AF88C: @ 0x080AF88C @@ -361680,19 +361680,19 @@ sub_080AF88C: @ 0x080AF88C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080AF8B0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080AF8A8 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080AF8A8: pop {r4} pop {r0} bx r0 .align 2, 0 -_080AF8B0: .4byte sub_080AF704 +_080AF8B0: .4byte UpdateFlashLevelEffect thumb_func_end sub_080AF88C thumb_func_start sub_080AF8B4 @@ -361700,13 +361700,13 @@ sub_080AF8B4: @ 0x080AF8B4 push {r4, lr} ldr r4, _080AF8D4 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080AF8CC adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask _080AF8CC: pop {r4} pop {r0} @@ -361731,7 +361731,7 @@ sub_080AF8D8: @ 0x080AF8D8 lsrs r7, r0, #0x18 ldr r0, _080AF91C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r2, #2 @@ -361751,7 +361751,7 @@ sub_080AF8D8: @ 0x080AF8D8 strh r7, [r1, #0xa] b _080AF928 .align 2, 0 -_080AF91C: .4byte sub_080AF704 +_080AF91C: .4byte UpdateFlashLevelEffect _080AF920: .4byte gUnknown_3005B68 _080AF924: rsbs r0, r7, #0 @@ -361783,7 +361783,7 @@ sub_080AF938: @ 0x080AF938 lsrs r7, r0, #0x18 ldr r0, _080AF97C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r2, #2 @@ -361803,7 +361803,7 @@ sub_080AF938: @ 0x080AF938 strh r7, [r1, #0xa] b _080AF988 .align 2, 0 -_080AF97C: .4byte sub_080AF7C8 +_080AF97C: .4byte UpdateFlash2LevelEffect _080AF980: .4byte gUnknown_3005B68 _080AF984: rsbs r0, r7, #0 @@ -361826,7 +361826,7 @@ sub_080AF998: @ 0x080AF998 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r4, r0, #0 - bl sub_08084E7C + bl Overworld_GetFlashLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 @@ -361857,8 +361857,8 @@ _080AF9B2: _080AF9E0: .4byte gUnknown_852AB00 thumb_func_end sub_080AF998 - thumb_func_start sub_080AF9E4 -sub_080AF9E4: @ 0x080AF9E4 + thumb_func_start WriteFlashScanlineEffectBuffer +WriteFlashScanlineEffectBuffer: @ 0x080AF9E4 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -361887,10 +361887,10 @@ _080AFA12: .align 2, 0 _080AFA18: .4byte gUnknown_20388C8 _080AFA1C: .4byte gUnknown_852AB00 - thumb_func_end sub_080AF9E4 + thumb_func_end WriteFlashScanlineEffectBuffer - thumb_func_start sub_080AFA20 -sub_080AFA20: @ 0x080AFA20 + thumb_func_start WriteBattlePyramidViewScanlineEffectBuffer +WriteBattlePyramidViewScanlineEffectBuffer: @ 0x080AFA20 push {r4, lr} ldr r4, _080AFA50 ldr r0, _080AFA54 @@ -361916,10 +361916,10 @@ sub_080AFA20: @ 0x080AFA20 _080AFA50: .4byte gUnknown_20388C8 _080AFA54: .4byte gUnknown_3005AF0 _080AFA58: .4byte 0x00000E68 - thumb_func_end sub_080AFA20 + thumb_func_end WriteBattlePyramidViewScanlineEffectBuffer - thumb_func_start sub_080AFA5C -sub_080AFA5C: @ 0x080AFA5C + thumb_func_start task0A_mpl_807E31C +task0A_mpl_807E31C: @ 0x080AFA5C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -361949,18 +361949,18 @@ _080AFA94: bl WaitForWeatherFadeIn cmp r0, #0 beq _080AFAB2 - bl sub_0808CB24 + bl RunOnLoadMapScript cmp r0, #1 beq _080AFAB2 bl UnfreezeEventObjects bl sub_080987E8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AFAB2: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080AFA5C + thumb_func_end task0A_mpl_807E31C thumb_func_start sub_080AFAB8 sub_080AFAB8: @ 0x080AFAB8 @@ -362000,13 +362000,13 @@ _080AFAFE: bl sub_0808CB58 cmp r0, #0 bne _080AFB36 - bl sub_080AE9B0 + bl WarpFadeScreen b _080AFB1E _080AFB0C: bl sub_080AF00C cmp r0, #0 bne _080AFB36 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 cmp r0, #0 beq _080AFB36 @@ -362016,17 +362016,17 @@ _080AFB1E: strh r0, [r4, #8] b _080AFB36 _080AFB26: - bl sub_08084540 + bl WarpIntoMap ldr r0, _080AFB3C - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AFB36: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080AFB3C: .4byte sub_08085934 +_080AFB3C: .4byte CB2_LoadMap thumb_func_end sub_080AFAB8 thumb_func_start sub_080AFB40 @@ -362035,7 +362035,7 @@ sub_080AFB40: @ 0x080AFB40 bl sub_080987DC ldr r0, _080AFB58 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, _080AFB5C ldr r0, _080AFB60 str r0, [r1] @@ -362056,12 +362056,12 @@ sub_080AFB64: @ 0x080AFB64 str r1, [r0] ldr r0, _080AFB84 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080AFB7C: .4byte gUnknown_3005B0C -_080AFB80: .4byte sub_080AEC94 +_080AFB80: .4byte mapldr_default _080AFB84: .4byte sub_080AFAB8 thumb_func_end sub_080AFB64 @@ -362088,7 +362088,7 @@ _080AFBA6: lsrs r1, r4, #0x10 mov r0, sp movs r2, #2 - bl sub_080A1200 + bl LoadPalette movs r0, #0x80 lsls r0, r0, #9 adds r4, r4, r0 @@ -362202,11 +362202,11 @@ _080AFC64: movs r1, #0x80 lsls r1, r1, #7 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits ldr r0, _080AFD10 ldrh r1, [r0] movs r0, #0x50 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _080AFD14 movs r0, #0x52 bl SetGpuReg @@ -362226,7 +362226,7 @@ _080AFC64: movs r3, #0x1e bl sub_081998C8 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r4, _080AFD18 movs r2, #4 ldrsh r1, [r5, r2] @@ -362246,7 +362246,7 @@ _080AFC64: ldr r0, [r2] ldr r1, [r2, #4] ldr r2, [r2, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams movs r0, #1 strh r0, [r5] b _080AFE28 @@ -362281,16 +362281,16 @@ _080AFD20: b _080AFE28 _080AFD4C: ldr r0, _080AFD64 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080AFE28 - bl sub_080988C4 + bl EnableBothScriptContexts movs r0, #3 strh r0, [r5] b _080AFE28 .align 2, 0 -_080AFD64: .4byte sub_080AF7C8 +_080AFD64: .4byte UpdateFlash2LevelEffect _080AFD68: bl InstallCameraPanAheadCallback movs r0, #0 @@ -362321,7 +362321,7 @@ _080AFD7E: movs r1, #4 _080AFDA0: movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning b _080AFE28 _080AFDA8: bl InstallCameraPanAheadCallback @@ -362376,9 +362376,9 @@ _080AFDEE: ldrh r1, [r5, #0x14] movs r0, #0x4a bl SetGpuReg - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080AFE28: add sp, #8 pop {r4, r5} @@ -362391,7 +362391,7 @@ sub_080AFE30: @ 0x080AFE30 push {lr} ldr r0, _080AFE58 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -362439,7 +362439,7 @@ _080AFE7C: sub_080AFE88: @ 0x080AFE88 push {lr} ldr r0, _080AFEA8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080AFEAC @@ -362459,38 +362459,38 @@ _080AFEAC: .4byte gUnknown_3005B60 thumb_func_start sub_080AFEB0 sub_080AFEB0: @ 0x080AFEB0 push {lr} - bl sub_08085318 + bl Overworld_FadeOutMapMusic ldr r0, _080AFEC4 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080AFEC4: .4byte sub_080AFEC8 +_080AFEC4: .4byte task50_0807F0C8 thumb_func_end sub_080AFEB0 - thumb_func_start sub_080AFEC8 -sub_080AFEC8: @ 0x080AFEC8 + thumb_func_start task50_0807F0C8 +task50_0807F0C8: @ 0x080AFEC8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080AFEE4 adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080AFEE4: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AFEC8 + thumb_func_end task50_0807F0C8 - thumb_func_start sub_080AFEEC -sub_080AFEEC: @ 0x080AFEEC + thumb_func_start Task_BattleStart +Task_BattleStart: @ 0x080AFEEC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -362514,34 +362514,34 @@ _080AFF10: bne _080AFF4E ldrb r0, [r4, #2] bl BattleTransition_StartOnField - bl sub_081BE3C8 + bl ClearMirageTowerPulseBlendEffect ldrh r0, [r4] adds r0, #1 strh r0, [r4] b _080AFF4E _080AFF2A: - bl sub_08145FE0 + bl IsBattleTransitionDone lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080AFF4E - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r0, _080AFF54 - bl sub_08000540 + bl SetMainCallback2 bl sub_0809C4B4 - bl sub_0809C458 + bl ClearPoisonStepCounter adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080AFF4E: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080AFF54: .4byte sub_080365B4 - thumb_func_end sub_080AFEEC +_080AFF54: .4byte CB2_InitBattle + thumb_func_end Task_BattleStart - thumb_func_start sub_080AFF58 -sub_080AFF58: @ 0x080AFF58 + thumb_func_start CreateBattleStartTask +CreateBattleStartTask: @ 0x080AFF58 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -362551,7 +362551,7 @@ sub_080AFF58: @ 0x080AFF58 lsrs r5, r5, #0x10 ldr r0, _080AFF8C movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080AFF90 @@ -362561,41 +362561,41 @@ sub_080AFF58: @ 0x080AFF58 adds r1, r1, r2 strh r4, [r1, #0xa] adds r0, r5, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080AFF8C: .4byte sub_080AFEEC +_080AFF8C: .4byte Task_BattleStart _080AFF90: .4byte gUnknown_3005B60 - thumb_func_end sub_080AFF58 + thumb_func_end CreateBattleStartTask - thumb_func_start sub_080AFF94 -sub_080AFF94: @ 0x080AFF94 + thumb_func_start BattleSetup_StartWildBattle +BattleSetup_StartWildBattle: @ 0x080AFF94 push {lr} bl sub_080FC910 cmp r0, #0 beq _080AFFA4 - bl sub_080B0078 + bl DoSafariBattle b _080AFFA8 _080AFFA4: - bl sub_080AFFB8 + bl DoStandardWildBattle _080AFFA8: pop {r0} bx r0 - thumb_func_end sub_080AFF94 + thumb_func_end BattleSetup_StartWildBattle - thumb_func_start sub_080AFFAC -sub_080AFFAC: @ 0x080AFFAC + thumb_func_start BattleSetup_StartBattlePikeWildBattle +BattleSetup_StartBattlePikeWildBattle: @ 0x080AFFAC push {lr} bl sub_080B00B0 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080AFFAC + thumb_func_end BattleSetup_StartBattlePikeWildBattle - thumb_func_start sub_080AFFB8 -sub_080AFFB8: @ 0x080AFFB8 + thumb_func_start DoStandardWildBattle +DoStandardWildBattle: @ 0x080AFFB8 push {r4, lr} bl sub_080987DC bl FreezeEventObjects @@ -362606,7 +362606,7 @@ sub_080AFFB8: @ 0x080AFFB8 ldr r4, _080B0020 movs r0, #0 str r0, [r4] - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080AFFEE @@ -362619,11 +362619,11 @@ sub_080AFFB8: @ 0x080AFFB8 orrs r0, r1 str r0, [r4] _080AFFEE: - bl sub_080B07B8 + bl GetWildBattleTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -362635,13 +362635,13 @@ _080AFFEE: bx r0 .align 2, 0 _080B0018: .4byte gUnknown_3002360 -_080B001C: .4byte sub_080B03F4 +_080B001C: .4byte CB2_EndWildBattle _080B0020: .4byte gUnknown_2022C90 _080B0024: .4byte 0x0000400E - thumb_func_end sub_080AFFB8 + thumb_func_end DoStandardWildBattle - thumb_func_start sub_080B0028 -sub_080B0028: @ 0x080B0028 + thumb_func_start BattleSetup_StartRoamerBattle +BattleSetup_StartRoamerBattle: @ 0x080B0028 push {lr} bl sub_080987DC bl FreezeEventObjects @@ -362653,11 +362653,11 @@ sub_080B0028: @ 0x080B0028 movs r0, #0x80 lsls r0, r0, #3 str r0, [r1] - bl sub_080B07B8 + bl GetWildBattleTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -362668,12 +362668,12 @@ sub_080B0028: @ 0x080B0028 bx r0 .align 2, 0 _080B006C: .4byte gUnknown_3002360 -_080B0070: .4byte sub_080B03F4 +_080B0070: .4byte CB2_EndWildBattle _080B0074: .4byte gUnknown_2022C90 - thumb_func_end sub_080B0028 + thumb_func_end BattleSetup_StartRoamerBattle - thumb_func_start sub_080B0078 -sub_080B0078: @ 0x080B0078 + thumb_func_start DoSafariBattle +DoSafariBattle: @ 0x080B0078 push {lr} bl sub_080987DC bl FreezeEventObjects @@ -362684,18 +362684,18 @@ sub_080B0078: @ 0x080B0078 ldr r1, _080B00AC movs r0, #0x80 str r0, [r1] - bl sub_080B07B8 + bl GetWildBattleTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask pop {r0} bx r0 .align 2, 0 _080B00A4: .4byte gUnknown_3002360 -_080B00A8: .4byte sub_080FCA00 +_080B00A8: .4byte CB2_EndSafariBattle _080B00AC: .4byte gUnknown_2022C90 - thumb_func_end sub_080B0078 + thumb_func_end DoSafariBattle thumb_func_start sub_080B00B0 sub_080B00B0: @ 0x080B00B0 @@ -362710,11 +362710,11 @@ sub_080B00B0: @ 0x080B00B0 movs r0, #0x80 lsls r0, r0, #0xd str r0, [r1] - bl sub_080B07B8 + bl GetWildBattleTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -362725,18 +362725,18 @@ sub_080B00B0: @ 0x080B00B0 bx r0 .align 2, 0 _080B00F4: .4byte gUnknown_3002360 -_080B00F8: .4byte sub_080B03F4 +_080B00F8: .4byte CB2_EndWildBattle _080B00FC: .4byte gUnknown_2022C90 thumb_func_end sub_080B00B0 - thumb_func_start sub_080B0100 -sub_080B0100: @ 0x080B0100 + thumb_func_start DoTrainerBattle +DoTrainerBattle: @ 0x080B0100 push {lr} bl sub_080B0824 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #9 @@ -362744,12 +362744,12 @@ sub_080B0100: @ 0x080B0100 bl sub_080B0B20 pop {r0} bx r0 - thumb_func_end sub_080B0100 + thumb_func_end DoTrainerBattle thumb_func_start sub_080B0124 sub_080B0124: @ 0x080B0124 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B0142 @@ -362758,7 +362758,7 @@ sub_080B0124: @ 0x080B0124 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask b _080B0152 _080B0142: movs r0, #0xb @@ -362766,7 +362766,7 @@ _080B0142: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask _080B0152: movs r0, #7 bl IncrementGameStat @@ -362778,14 +362778,14 @@ _080B0152: .align 2, 0 thumb_func_end sub_080B0124 - thumb_func_start sub_080B0168 -sub_080B0168: @ 0x080B0168 + thumb_func_start StartWallyTutorialBattle +StartWallyTutorialBattle: @ 0x080B0168 push {lr} ldr r0, _080B0194 movs r1, #0xc4 lsls r1, r1, #1 movs r2, #5 - bl sub_08067BDC + bl CreateMaleMon bl sub_080987DC ldr r1, _080B0198 ldr r0, _080B019C @@ -362796,18 +362796,18 @@ sub_080B0168: @ 0x080B0168 str r0, [r1] movs r0, #8 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask pop {r0} bx r0 .align 2, 0 _080B0194: .4byte gUnknown_20243E8 _080B0198: .4byte gUnknown_3002360 -_080B019C: .4byte sub_08085B34 +_080B019C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _080B01A0: .4byte gUnknown_2022C90 - thumb_func_end sub_080B0168 + thumb_func_end StartWallyTutorialBattle - thumb_func_start sub_080B01A4 -sub_080B01A4: @ 0x080B01A4 + thumb_func_start BattleSetup_StartScriptedWildBattle +BattleSetup_StartScriptedWildBattle: @ 0x080B01A4 push {lr} bl sub_080987DC ldr r1, _080B01DC @@ -362816,11 +362816,11 @@ sub_080B01A4: @ 0x080B01A4 ldr r1, _080B01E4 movs r0, #0 str r0, [r1] - bl sub_080B07B8 + bl GetWildBattleTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -362831,12 +362831,12 @@ sub_080B01A4: @ 0x080B01A4 bx r0 .align 2, 0 _080B01DC: .4byte gUnknown_3002360 -_080B01E0: .4byte sub_080B0468 +_080B01E0: .4byte CB2_EndScriptedWildBattle _080B01E4: .4byte gUnknown_2022C90 - thumb_func_end sub_080B01A4 + thumb_func_end BattleSetup_StartScriptedWildBattle - thumb_func_start sub_080B01E8 -sub_080B01E8: @ 0x080B01E8 + thumb_func_start BattleSetup_StartLatiBattle +BattleSetup_StartLatiBattle: @ 0x080B01E8 push {lr} bl sub_080987DC ldr r1, _080B0224 @@ -362846,11 +362846,11 @@ sub_080B01E8: @ 0x080B01E8 movs r0, #0x80 lsls r0, r0, #6 str r0, [r1] - bl sub_080B07B8 + bl GetWildBattleTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -362861,12 +362861,12 @@ sub_080B01E8: @ 0x080B01E8 bx r0 .align 2, 0 _080B0224: .4byte gUnknown_3002360 -_080B0228: .4byte sub_080B0468 +_080B0228: .4byte CB2_EndScriptedWildBattle _080B022C: .4byte gUnknown_2022C90 - thumb_func_end sub_080B01E8 + thumb_func_end BattleSetup_StartLatiBattle - thumb_func_start sub_080B0230 -sub_080B0230: @ 0x080B0230 + thumb_func_start BattleSetup_StartLegendaryBattle +BattleSetup_StartLegendaryBattle: @ 0x080B0230 push {r4, lr} bl sub_080987DC ldr r1, _080B0270 @@ -362879,7 +362879,7 @@ sub_080B0230: @ 0x080B0230 ldr r0, _080B027C movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0xca lsls r0, r0, #1 @@ -362899,7 +362899,7 @@ sub_080B0230: @ 0x080B0230 b _080B02E2 .align 2, 0 _080B0270: .4byte gUnknown_3002360 -_080B0274: .4byte sub_080B0468 +_080B0274: .4byte CB2_EndScriptedWildBattle _080B0278: .4byte gUnknown_2022C90 _080B027C: .4byte gUnknown_20243E8 _080B0280: .4byte 0x00000229 @@ -362923,7 +362923,7 @@ _080B0296: movs r1, #0xf0 lsls r1, r1, #1 movs r0, #0x17 - bl sub_080AFF58 + bl CreateBattleStartTask b _080B02FA .align 2, 0 _080B02B0: .4byte gUnknown_2022C90 @@ -362936,7 +362936,7 @@ _080B02B4: movs r1, #0xf0 lsls r1, r1, #1 movs r0, #0x16 - bl sub_080AFF58 + bl CreateBattleStartTask b _080B02FA _080B02CA: ldr r0, [r4] @@ -362947,13 +362947,13 @@ _080B02CA: movs r1, #0xeb lsls r1, r1, #1 movs r0, #0x18 - bl sub_080AFF58 + bl CreateBattleStartTask b _080B02FA _080B02E0: ldr r1, _080B02EC _080B02E2: movs r0, #0 - bl sub_080AFF58 + bl CreateBattleStartTask b _080B02FA .align 2, 0 _080B02EC: .4byte 0x00000227 @@ -362961,7 +362961,7 @@ _080B02F0: movs r1, #0xec lsls r1, r1, #1 movs r0, #0xa - bl sub_080AFF58 + bl CreateBattleStartTask _080B02FA: movs r0, #7 bl IncrementGameStat @@ -362972,10 +362972,10 @@ _080B02FA: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080B0230 + thumb_func_end BattleSetup_StartLegendaryBattle - thumb_func_start sub_080B0314 -sub_080B0314: @ 0x080B0314 + thumb_func_start StartGroudonKyogreBattle +StartGroudonKyogreBattle: @ 0x080B0314 push {lr} bl sub_080987DC ldr r1, _080B033C @@ -362992,18 +362992,18 @@ sub_080B0314: @ 0x080B0314 movs r1, #0xf0 lsls r1, r1, #1 movs r0, #0xb - bl sub_080AFF58 + bl CreateBattleStartTask b _080B0356 .align 2, 0 _080B033C: .4byte gUnknown_3002360 -_080B0340: .4byte sub_080B0468 +_080B0340: .4byte CB2_EndScriptedWildBattle _080B0344: .4byte gUnknown_2022C90 _080B0348: .4byte gUnknown_829BDA4 _080B034C: movs r1, #0xf0 lsls r1, r1, #1 movs r0, #6 - bl sub_080AFF58 + bl CreateBattleStartTask _080B0356: movs r0, #7 bl IncrementGameStat @@ -363014,10 +363014,10 @@ _080B0356: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B0314 + thumb_func_end StartGroudonKyogreBattle - thumb_func_start sub_080B0370 -sub_080B0370: @ 0x080B0370 + thumb_func_start StartRegiBattle +StartRegiBattle: @ 0x080B0370 push {lr} bl sub_080987DC ldr r1, _080B03A8 @@ -363029,7 +363029,7 @@ sub_080B0370: @ 0x080B0370 str r0, [r1] ldr r0, _080B03B4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 adds r2, r1, #0 @@ -363045,7 +363045,7 @@ sub_080B0370: @ 0x080B0370 b _080B03D0 .align 2, 0 _080B03A8: .4byte gUnknown_3002360 -_080B03AC: .4byte sub_080B0468 +_080B03AC: .4byte CB2_EndScriptedWildBattle _080B03B0: .4byte gUnknown_2022C90 _080B03B4: .4byte gUnknown_20243E8 _080B03B8: @@ -363068,7 +363068,7 @@ _080B03D0: movs r0, #0xa _080B03D2: ldr r1, _080B03F0 - bl sub_080AFF58 + bl CreateBattleStartTask movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -363079,10 +363079,10 @@ _080B03D2: bx r0 .align 2, 0 _080B03F0: .4byte 0x000001DF - thumb_func_end sub_080B0370 + thumb_func_end StartRegiBattle - thumb_func_start sub_080B03F4 -sub_080B03F4: @ 0x080B03F4 + thumb_func_start CB2_EndWildBattle +CB2_EndWildBattle: @ 0x080B03F4 push {lr} sub sp, #4 mov r1, sp @@ -363098,10 +363098,10 @@ sub_080B03F4: @ 0x080B03F4 bl ResetOamRange ldr r0, _080B0440 ldrb r0, [r0] - bl sub_080B0B94 + bl IsPlayerDefeated cmp r0, #1 bne _080B0448 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080B0448 @@ -363110,15 +363110,15 @@ sub_080B03F4: @ 0x080B03F4 cmp r0, #0 bne _080B0448 ldr r0, _080B0444 - bl sub_08000540 + bl SetMainCallback2 b _080B0454 .align 2, 0 _080B043C: .4byte 0x01000100 _080B0440: .4byte gUnknown_2023FDE -_080B0444: .4byte sub_080858C0 +_080B0444: .4byte CB2_WhiteOut _080B0448: ldr r0, _080B045C - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B0460 ldr r0, _080B0464 str r0, [r1] @@ -363130,10 +363130,10 @@ _080B0454: _080B045C: .4byte sub_08085A30 _080B0460: .4byte gUnknown_3005B0C _080B0464: .4byte sub_080AEFEC - thumb_func_end sub_080B03F4 + thumb_func_end CB2_EndWildBattle - thumb_func_start sub_080B0468 -sub_080B0468: @ 0x080B0468 + thumb_func_start CB2_EndScriptedWildBattle +CB2_EndScriptedWildBattle: @ 0x080B0468 push {lr} sub sp, #4 mov r1, sp @@ -363149,36 +363149,36 @@ sub_080B0468: @ 0x080B0468 bl ResetOamRange ldr r0, _080B04A8 ldrb r0, [r0] - bl sub_080B0B94 + bl IsPlayerDefeated cmp r0, #1 bne _080B04BC - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B04B0 ldr r0, _080B04AC - bl sub_08000540 + bl SetMainCallback2 b _080B04C2 .align 2, 0 _080B04A4: .4byte 0x01000100 _080B04A8: .4byte gUnknown_2023FDE -_080B04AC: .4byte sub_08085B34 +_080B04AC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _080B04B0: ldr r0, _080B04B8 - bl sub_08000540 + bl SetMainCallback2 b _080B04C2 .align 2, 0 -_080B04B8: .4byte sub_080858C0 +_080B04B8: .4byte CB2_WhiteOut _080B04BC: ldr r0, _080B04C8 - bl sub_08000540 + bl SetMainCallback2 _080B04C2: add sp, #4 pop {r0} bx r0 .align 2, 0 -_080B04C8: .4byte sub_08085B34 - thumb_func_end sub_080B0468 +_080B04C8: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end CB2_EndScriptedWildBattle thumb_func_start sub_080B04CC sub_080B04CC: @ 0x080B04CC @@ -363256,7 +363256,7 @@ _080B0570: b _080B0616 _080B0574: adds r0, r4, #0 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _080B05DC @@ -363268,7 +363268,7 @@ _080B0584: _080B0588: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _080B05EE @@ -363282,7 +363282,7 @@ _080B0598: cmp r0, #0 bne _080B05EE adds r0, r4, #0 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _080B05DC @@ -363295,7 +363295,7 @@ _080B0598: b _080B0616 _080B05C4: movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _080B05F2 @@ -363325,7 +363325,7 @@ _080B05F2: lsls r0, r0, #5 cmp r1, r0 beq _080B0614 - bl sub_080AE6A8 + bl GetSav1Weather lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #8 @@ -363345,8 +363345,8 @@ _080B0616: .align 2, 0 thumb_func_end sub_080B04CC - thumb_func_start sub_080B0620 -sub_080B0620: @ 0x080B0620 + thumb_func_start GetBattleTransitionTypeByMap +GetBattleTransitionTypeByMap: @ 0x080B0620 push {r4, lr} sub sp, #4 mov r4, sp @@ -363362,7 +363362,7 @@ sub_080B0620: @ 0x080B0620 bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_08084E7C + bl Overworld_GetFlashLevel lsls r0, r0, #0x18 cmp r0, #0 beq _080B0650 @@ -363371,7 +363371,7 @@ sub_080B0620: @ 0x080B0620 _080B0650: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _080B0678 @@ -363396,10 +363396,10 @@ _080B067A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B0620 + thumb_func_end GetBattleTransitionTypeByMap - thumb_func_start sub_080B0684 -sub_080B0684: @ 0x080B0684 + thumb_func_start GetSumOfPlayerPartyLevel +GetSumOfPlayerPartyLevel: @ 0x080B0684 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -363413,7 +363413,7 @@ _080B068E: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0xce lsls r0, r0, #1 @@ -363423,12 +363423,12 @@ _080B068E: beq _080B06D2 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080B06D2 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r0, r7, r0 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -363448,7 +363448,7 @@ _080B06D8: bx r1 .align 2, 0 _080B06E0: .4byte gUnknown_2024190 - thumb_func_end sub_080B0684 + thumb_func_end GetSumOfPlayerPartyLevel thumb_func_start sub_080B06E4 sub_080B06E4: @ 0x080B06E4 @@ -363571,26 +363571,26 @@ _080B07B0: bx r1 thumb_func_end sub_080B06E4 - thumb_func_start sub_080B07B8 -sub_080B07B8: @ 0x080B07B8 + thumb_func_start GetWildBattleTransition +GetWildBattleTransition: @ 0x080B07B8 push {r4, r5, r6, lr} - bl sub_080B0620 + bl GetBattleTransitionTypeByMap lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r6, r5, #0 ldr r0, _080B07F0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 - bl sub_080B0684 + bl GetSumOfPlayerPartyLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 bhs _080B0800 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B07F4 @@ -363605,7 +363605,7 @@ _080B07F4: .align 2, 0 _080B07FC: .4byte gUnknown_852AB24 _080B0800: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080B081C @@ -363624,7 +363624,7 @@ _080B081E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080B07B8 + thumb_func_end GetWildBattleTransition thumb_func_start sub_080B0824 sub_080B0824: @ 0x080B0824 @@ -363707,7 +363707,7 @@ _080B08A8: bne _080B08B2 movs r5, #2 _080B08B2: - bl sub_080B0620 + bl GetBattleTransitionTypeByMap lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrh r0, [r4] @@ -363717,7 +363717,7 @@ _080B08B2: lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 - bl sub_080B0684 + bl GetSumOfPlayerPartyLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -363748,12 +363748,12 @@ sub_080B08F8: @ 0x080B08F8 adds r5, r0, #0 ldr r0, _080B0928 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 - bl sub_080B0684 + bl GetSumOfPlayerPartyLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -363889,28 +363889,28 @@ _080B0A1C: .4byte 0x00000CB4 _080B0A20: .4byte gUnknown_852AB34 thumb_func_end sub_080B08F8 - thumb_func_start sub_080B0A24 -sub_080B0A24: @ 0x080B0A24 + thumb_func_start ChooseStarter +ChooseStarter: @ 0x080B0A24 push {lr} ldr r0, _080B0A38 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B0A3C ldr r0, _080B0A40 str r0, [r1, #8] pop {r0} bx r0 .align 2, 0 -_080B0A38: .4byte sub_08133EC4 +_080B0A38: .4byte CB2_ChooseStarter _080B0A3C: .4byte gUnknown_3002360 -_080B0A40: .4byte sub_080B0A44 - thumb_func_end sub_080B0A24 +_080B0A40: .4byte CB2_GiveStarter + thumb_func_end ChooseStarter - thumb_func_start sub_080B0A44 -sub_080B0A44: @ 0x080B0A44 + thumb_func_start CB2_GiveStarter +CB2_GiveStarter: @ 0x080B0A44 push {lr} sub sp, #8 ldr r0, _080B0A88 - bl sub_0809CF20 + bl GetVarPointer ldr r2, _080B0A8C ldrh r1, [r2] strh r1, [r0] @@ -363924,28 +363924,28 @@ sub_080B0A44: @ 0x080B0A44 movs r1, #5 movs r2, #0 movs r3, #0 - bl sub_080F9AD4 - bl sub_080A8818 + bl ScriptGiveMon + bl ResetTasks bl sub_0806E0D8 ldr r0, _080B0A90 - bl sub_08000540 + bl SetMainCallback2 movs r0, #0 - bl sub_08145FD0 + bl BattleTransition_Start add sp, #8 pop {r0} bx r0 .align 2, 0 _080B0A88: .4byte 0x00004023 _080B0A8C: .4byte gUnknown_2037290 -_080B0A90: .4byte sub_080B0A94 - thumb_func_end sub_080B0A44 +_080B0A90: .4byte CB2_StartFirstBattle + thumb_func_end CB2_GiveStarter - thumb_func_start sub_080B0A94 -sub_080B0A94: @ 0x080B0A94 + thumb_func_start CB2_StartFirstBattle +CB2_StartFirstBattle: @ 0x080B0A94 push {lr} - bl sub_080A12E4 - bl sub_080A89D4 - bl sub_08145FE0 + bl UpdatePaletteFade + bl RunTasks + bl IsBattleTransitionDone lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -363956,11 +363956,11 @@ sub_080B0A94: @ 0x080B0A94 ldr r1, _080B0AE4 ldr r0, _080B0AE8 str r0, [r1, #8] - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _080B0AEC - bl sub_08000540 + bl SetMainCallback2 bl sub_0809C4B4 - bl sub_0809C458 + bl ClearPoisonStepCounter movs r0, #7 bl IncrementGameStat movs r0, #8 @@ -363973,32 +363973,32 @@ _080B0ADC: .align 2, 0 _080B0AE0: .4byte gUnknown_2022C90 _080B0AE4: .4byte gUnknown_3002360 -_080B0AE8: .4byte sub_080B0AF0 -_080B0AEC: .4byte sub_080365B4 - thumb_func_end sub_080B0A94 +_080B0AE8: .4byte CB2_EndFirstBattle +_080B0AEC: .4byte CB2_InitBattle + thumb_func_end CB2_StartFirstBattle - thumb_func_start sub_080B0AF0 -sub_080B0AF0: @ 0x080B0AF0 + thumb_func_start CB2_EndFirstBattle +CB2_EndFirstBattle: @ 0x080B0AF0 push {lr} - bl sub_08085168 + bl Overworld_ClearSavedMusic ldr r0, _080B0B00 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080B0B00: .4byte sub_08085B34 - thumb_func_end sub_080B0AF0 +_080B0B00: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end CB2_EndFirstBattle thumb_func_start sub_080B0B04 sub_080B0B04: @ 0x080B0B04 push {lr} movs r0, #8 - bl sub_08084180 + bl GetGameStat movs r1, #0x3c bl __umodsi3 cmp r0, #0 bne _080B0B1A - bl sub_081D9DCC + bl UpdateGymLeaderRematch _080B0B1A: pop {r0} bx r0 @@ -364009,12 +364009,12 @@ _080B0B1A: sub_080B0B20: @ 0x080B0B20 push {lr} movs r0, #9 - bl sub_08084180 + bl GetGameStat movs r1, #0x14 bl __umodsi3 cmp r0, #0 bne _080B0B36 - bl sub_081D9DCC + bl UpdateGymLeaderRematch _080B0B36: pop {r0} bx r0 @@ -364037,15 +364037,15 @@ TrainerBattleLoadArg32: @ 0x080B0B3C bx lr thumb_func_end TrainerBattleLoadArg32 - thumb_func_start sub_080B0B54 -sub_080B0B54: @ 0x080B0B54 + thumb_func_start TrainerBattleLoadArg16 +TrainerBattleLoadArg16: @ 0x080B0B54 adds r1, r0, #0 ldrb r0, [r1] ldrb r1, [r1, #1] lsls r1, r1, #8 orrs r0, r1 bx lr - thumb_func_end sub_080B0B54 + thumb_func_end TrainerBattleLoadArg16 thumb_func_start sub_080B0B60 sub_080B0B60: @ 0x080B0B60 @@ -364083,8 +364083,8 @@ sub_080B0B7C: @ 0x080B0B7C _080B0B90: .4byte gUnknown_203886C thumb_func_end sub_080B0B7C - thumb_func_start sub_080B0B94 -sub_080B0B94: @ 0x080B0B94 + thumb_func_start IsPlayerDefeated +IsPlayerDefeated: @ 0x080B0B94 push {lr} subs r0, #1 cmp r0, #6 @@ -364113,10 +364113,10 @@ _080B0BCE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B0B94 + thumb_func_end IsPlayerDefeated - thumb_func_start sub_080B0BD4 -sub_080B0BD4: @ 0x080B0BD4 + thumb_func_start ResetTrainerOpponentIds +ResetTrainerOpponentIds: @ 0x080B0BD4 ldr r0, _080B0BE0 movs r1, #0 strh r1, [r0] @@ -364126,10 +364126,10 @@ sub_080B0BD4: @ 0x080B0BD4 .align 2, 0 _080B0BE0: .4byte gUnknown_203886A _080B0BE4: .4byte gUnknown_203886C - thumb_func_end sub_080B0BD4 + thumb_func_end ResetTrainerOpponentIds - thumb_func_start sub_080B0BE8 -sub_080B0BE8: @ 0x080B0BE8 + thumb_func_start InitTrainerBattleVariables +InitTrainerBattleVariables: @ 0x080B0BE8 push {lr} ldr r0, _080B0C04 movs r1, #0 @@ -364179,10 +364179,10 @@ _080B0C4C: .4byte gUnknown_2038870 _080B0C50: .4byte gUnknown_2038884 _080B0C54: .4byte gUnknown_2038888 _080B0C58: .4byte gUnknown_203888C - thumb_func_end sub_080B0BE8 + thumb_func_end InitTrainerBattleVariables - thumb_func_start sub_080B0C5C -sub_080B0C5C: @ 0x080B0C5C + thumb_func_start TrainerBattleLoadArgs +TrainerBattleLoadArgs: @ 0x080B0C5C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -364214,7 +364214,7 @@ _080B0C94: b _080B0CD4 _080B0CA2: adds r0, r5, #0 - bl sub_080B0B54 + bl TrainerBattleLoadArg16 ldr r1, [r4] strh r0, [r1] adds r5, #2 @@ -364250,10 +364250,10 @@ _080B0CD8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B0C5C + thumb_func_end TrainerBattleLoadArgs - thumb_func_start sub_080B0CE4 -sub_080B0CE4: @ 0x080B0CE4 + thumb_func_start SetMapVarsToTrainer +SetMapVarsToTrainer: @ 0x080B0CE4 push {lr} ldr r0, _080B0D0C ldrh r1, [r0] @@ -364278,13 +364278,13 @@ _080B0D0C: .4byte gUnknown_2038870 _080B0D10: .4byte gUnknown_2037292 _080B0D14: .4byte gUnknown_3005AEC _080B0D18: .4byte gUnknown_3005B50 - thumb_func_end sub_080B0CE4 + thumb_func_end SetMapVarsToTrainer - thumb_func_start sub_080B0D1C -sub_080B0D1C: @ 0x080B0D1C + thumb_func_start BattleSetup_ConfigureTrainerBattle +BattleSetup_ConfigureTrainerBattle: @ 0x080B0D1C push {r4, r5, lr} adds r5, r0, #0 - bl sub_080B0BE8 + bl InitTrainerBattleVariables ldr r4, _080B0D48 adds r0, r5, #0 bl sub_080B0B60 @@ -364321,7 +364321,7 @@ _080B0D50: @ jump table _080B0D80: ldr r0, _080B0D8C adds r1, r5, #0 - bl sub_080B0C5C + bl TrainerBattleLoadArgs ldr r0, _080B0D90 b _080B0F0A .align 2, 0 @@ -364356,8 +364356,8 @@ _080B0DC0: ldr r0, _080B0DD0 _080B0DC2: adds r1, r5, #0 - bl sub_080B0C5C - bl sub_080B0CE4 + bl TrainerBattleLoadArgs + bl SetMapVarsToTrainer ldr r0, _080B0DD4 b _080B0F0A .align 2, 0 @@ -364366,8 +364366,8 @@ _080B0DD4: .4byte gUnknown_8242424 _080B0DD8: ldr r0, _080B0DF4 adds r1, r5, #0 - bl sub_080B0C5C - bl sub_080B0CE4 + bl TrainerBattleLoadArgs + bl SetMapVarsToTrainer ldr r4, _080B0DF8 ldrh r0, [r4] bl GetRematchTrainerId @@ -364381,8 +364381,8 @@ _080B0DFC: .4byte gUnknown_8242492 _080B0E00: ldr r0, _080B0E1C adds r1, r5, #0 - bl sub_080B0C5C - bl sub_080B0CE4 + bl TrainerBattleLoadArgs + bl SetMapVarsToTrainer ldr r4, _080B0E20 ldrh r0, [r4] bl GetRematchTrainerId @@ -364400,8 +364400,8 @@ _080B0E28: bne _080B0E58 ldr r0, _080B0E4C adds r1, r5, #0 - bl sub_080B0C5C - bl sub_080B0CE4 + bl TrainerBattleLoadArgs + bl SetMapVarsToTrainer ldr r0, _080B0E50 ldrb r0, [r0] bl sub_081A9820 @@ -364415,7 +364415,7 @@ _080B0E54: .4byte gUnknown_203886A _080B0E58: ldr r0, _080B0E70 adds r1, r5, #0 - bl sub_080B0C5C + bl TrainerBattleLoadArgs ldr r0, _080B0E74 ldrb r0, [r0] bl sub_081A9820 @@ -364437,7 +364437,7 @@ _080B0E84: ldr r0, _080B0E90 _080B0E86: adds r1, r5, #0 - bl sub_080B0C5C + bl TrainerBattleLoadArgs movs r0, #0 b _080B0F0A .align 2, 0 @@ -364449,8 +364449,8 @@ _080B0E94: bne _080B0EC4 ldr r0, _080B0EB8 adds r1, r5, #0 - bl sub_080B0C5C - bl sub_080B0CE4 + bl TrainerBattleLoadArgs + bl SetMapVarsToTrainer ldr r0, _080B0EBC ldrb r0, [r0] bl sub_081D5B1C @@ -364464,7 +364464,7 @@ _080B0EC0: .4byte gUnknown_203886A _080B0EC4: ldr r0, _080B0ED8 adds r1, r5, #0 - bl sub_080B0C5C + bl TrainerBattleLoadArgs ldr r0, _080B0EDC ldrb r0, [r0] bl sub_081D5B1C @@ -364480,8 +364480,8 @@ _080B0EE0: ldr r0, _080B0EFC _080B0EEA: adds r1, r5, #0 - bl sub_080B0C5C - bl sub_080B0CE4 + bl TrainerBattleLoadArgs + bl SetMapVarsToTrainer b _080B0F08 .align 2, 0 _080B0EF8: .4byte gUnknown_203889C @@ -364490,7 +364490,7 @@ _080B0F00: ldr r0, _080B0F10 _080B0F02: adds r1, r5, #0 - bl sub_080B0C5C + bl TrainerBattleLoadArgs _080B0F08: ldr r0, _080B0F14 _080B0F0A: @@ -364500,10 +364500,10 @@ _080B0F0A: .align 2, 0 _080B0F10: .4byte gUnknown_852ACB0 _080B0F14: .4byte gUnknown_82423FC - thumb_func_end sub_080B0D1C + thumb_func_end BattleSetup_ConfigureTrainerBattle - thumb_func_start sub_080B0F18 -sub_080B0F18: @ 0x080B0F18 + thumb_func_start ConfigureAndSetUpOneTrainerBattle +ConfigureAndSetUpOneTrainerBattle: @ 0x080B0F18 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -364519,7 +364519,7 @@ sub_080B0F18: @ 0x080B0F18 strh r0, [r4] adds r1, #1 adds r0, r1, #0 - bl sub_080B0D1C + bl BattleSetup_ConfigureTrainerBattle ldr r0, _080B0F58 bl ScriptContext1_SetupScript bl sub_080987DC @@ -364531,7 +364531,7 @@ _080B0F4C: .4byte gUnknown_3005B50 _080B0F50: .4byte gUnknown_2037292 _080B0F54: .4byte gUnknown_2036FF0 _080B0F58: .4byte gUnknown_82423EE - thumb_func_end sub_080B0F18 + thumb_func_end ConfigureAndSetUpOneTrainerBattle thumb_func_start ConfigureTwoTrainersBattle ConfigureTwoTrainersBattle: @ 0x080B0F5C @@ -364550,7 +364550,7 @@ ConfigureTwoTrainersBattle: @ 0x080B0F5C strh r0, [r4] adds r1, #1 adds r0, r1, #0 - bl sub_080B0D1C + bl BattleSetup_ConfigureTrainerBattle pop {r4} pop {r0} bx r0 @@ -364560,8 +364560,8 @@ _080B0F88: .4byte gUnknown_2037292 _080B0F8C: .4byte gUnknown_2036FF0 thumb_func_end ConfigureTwoTrainersBattle - thumb_func_start sub_080B0F90 -sub_080B0F90: @ 0x080B0F90 + thumb_func_start SetUpTwoTrainersBattle +SetUpTwoTrainersBattle: @ 0x080B0F90 push {lr} ldr r0, _080B0FA0 bl ScriptContext1_SetupScript @@ -364570,13 +364570,13 @@ sub_080B0F90: @ 0x080B0F90 bx r0 .align 2, 0 _080B0FA0: .4byte gUnknown_82423EE - thumb_func_end sub_080B0F90 + thumb_func_end SetUpTwoTrainersBattle - thumb_func_start sub_080B0FA4 -sub_080B0FA4: @ 0x080B0FA4 + thumb_func_start GetTrainerFlagFromScriptPointer +GetTrainerFlagFromScriptPointer: @ 0x080B0FA4 push {lr} adds r0, #2 - bl sub_080B0B54 + bl TrainerBattleLoadArg16 lsls r0, r0, #0x10 movs r1, #0xa0 lsls r1, r1, #0x13 @@ -364588,10 +364588,10 @@ sub_080B0FA4: @ 0x080B0FA4 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B0FA4 + thumb_func_end GetTrainerFlagFromScriptPointer - thumb_func_start sub_080B0FC4 -sub_080B0FC4: @ 0x080B0FC4 + thumb_func_start SetUpTrainerMovement +SetUpTrainerMovement: @ 0x080B0FC4 push {r4, lr} ldr r0, _080B0FF0 ldrb r0, [r0] @@ -364615,7 +364615,7 @@ sub_080B0FC4: @ 0x080B0FC4 .align 2, 0 _080B0FF0: .4byte gUnknown_3005B50 _080B0FF4: .4byte gUnknown_2036FF0 - thumb_func_end sub_080B0FC4 + thumb_func_end SetUpTrainerMovement thumb_func_start sub_080B0FF8 sub_080B0FF8: @ 0x080B0FF8 @@ -364626,10 +364626,10 @@ sub_080B0FF8: @ 0x080B0FF8 _080B1000: .4byte gUnknown_2038868 thumb_func_end sub_080B0FF8 - thumb_func_start sub_080B1004 -sub_080B1004: @ 0x080B1004 + thumb_func_start GetTrainerFlag +GetTrainerFlag: @ 0x080B1004 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B1020 @@ -364651,7 +364651,7 @@ _080B1020: _080B1036: ldr r0, _080B1048 ldrb r0, [r0] - bl sub_081D5B38 + bl GetHillTrainerFlag _080B103E: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -364659,10 +364659,10 @@ _080B103E: bx r1 .align 2, 0 _080B1048: .4byte gUnknown_3005B50 - thumb_func_end sub_080B1004 + thumb_func_end GetTrainerFlag - thumb_func_start sub_080B104C -sub_080B104C: @ 0x080B104C + thumb_func_start SetBattledTrainersFlags +SetBattledTrainersFlags: @ 0x080B104C push {lr} ldr r0, _080B1074 ldrh r0, [r0] @@ -364681,10 +364681,10 @@ _080B1062: bx r0 .align 2, 0 _080B1074: .4byte gUnknown_203886C - thumb_func_end sub_080B104C + thumb_func_end SetBattledTrainersFlags - thumb_func_start sub_080B1078 -sub_080B1078: @ 0x080B1078 + thumb_func_start SetBattledTrainerFlag +SetBattledTrainerFlag: @ 0x080B1078 push {lr} bl sub_080B0B64 lsls r0, r0, #0x10 @@ -364693,10 +364693,10 @@ sub_080B1078: @ 0x080B1078 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B1078 + thumb_func_end SetBattledTrainerFlag - thumb_func_start sub_080B108C -sub_080B108C: @ 0x080B108C + thumb_func_start HasTrainerBeenFought +HasTrainerBeenFought: @ 0x080B108C push {lr} lsls r0, r0, #0x10 movs r1, #0xa0 @@ -364708,7 +364708,7 @@ sub_080B108C: @ 0x080B108C lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_080B108C + thumb_func_end HasTrainerBeenFought thumb_func_start sub_080B10A4 sub_080B10A4: @ 0x080B10A4 @@ -364736,8 +364736,8 @@ SetTrainerFlag: @ 0x080B10B8 bx r0 thumb_func_end SetTrainerFlag - thumb_func_start sub_080B10CC -sub_080B10CC: @ 0x080B10CC + thumb_func_start BattleSetup_StartTrainerBattle +BattleSetup_StartTrainerBattle: @ 0x080B10CC push {r4, lr} ldr r0, _080B10DC ldrb r0, [r0] @@ -364755,7 +364755,7 @@ _080B10E8: movs r0, #8 _080B10EC: str r0, [r1] - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B1170 @@ -364773,21 +364773,21 @@ _080B10EC: cmp r0, #2 bne _080B1150 movs r0, #1 - bl sub_08162F8C + bl FillFrontierTrainersParties ldr r4, _080B114C adds r0, r4, #0 - bl sub_08067670 + bl ZeroMonData adds r0, r4, #0 adds r0, #0x64 - bl sub_08067670 + bl ZeroMonData movs r1, #0x96 lsls r1, r1, #1 adds r0, r4, r1 - bl sub_08067670 + bl ZeroMonData movs r1, #0xc8 lsls r1, r1, #1 adds r0, r4, r1 - bl sub_08067670 + bl ZeroMonData b _080B1166 .align 2, 0 _080B1140: .4byte gUnknown_2022C90 @@ -364796,15 +364796,15 @@ _080B1148: .4byte gUnknown_3005E08 _080B114C: .4byte gUnknown_202444C _080B1150: movs r0, #1 - bl sub_08162F68 + bl FillFrontierTrainerParty ldr r4, _080B116C adds r0, r4, #0 - bl sub_08067670 + bl ZeroMonData adds r4, #0x64 adds r0, r4, #0 - bl sub_08067670 + bl ZeroMonData _080B1166: - bl sub_081A987C + bl MarkApproachingPyramidTrainersAsBattled b _080B11A4 .align 2, 0 _080B116C: .4byte gUnknown_202444C @@ -364823,15 +364823,15 @@ _080B1170: ldrb r0, [r0] cmp r0, #2 bne _080B119C - bl sub_081D5D38 + bl FillHillTrainersParties b _080B11A0 .align 2, 0 _080B1194: .4byte gUnknown_2022C90 _080B1198: .4byte gUnknown_3005E08 _080B119C: - bl sub_081D5D20 + bl FillHillTrainerParty _080B11A0: - bl sub_081D5B84 + bl SetHillTrainerFlag _080B11A4: ldr r1, _080B11DC ldr r2, _080B11E0 @@ -364847,7 +364847,7 @@ _080B11A4: ldr r1, _080B11EC ldr r0, _080B11F0 str r0, [r1, #8] - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080B11D4 @@ -364864,19 +364864,19 @@ _080B11E0: .4byte gUnknown_3005E08 _080B11E4: .4byte gUnknown_2038898 _080B11E8: .4byte gUnknown_3005DE0 _080B11EC: .4byte gUnknown_3002360 -_080B11F0: .4byte sub_080B1204 +_080B11F0: .4byte CB2_EndTrainerBattle _080B11F4: - bl sub_080B0100 + bl DoTrainerBattle _080B11F8: bl sub_080988B8 pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B10CC + thumb_func_end BattleSetup_StartTrainerBattle - thumb_func_start sub_080B1204 -sub_080B1204: @ 0x080B1204 + thumb_func_start CB2_EndTrainerBattle +CB2_EndTrainerBattle: @ 0x080B1204 push {lr} ldr r0, _080B123C ldrh r1, [r0] @@ -364886,10 +364886,10 @@ sub_080B1204: @ 0x080B1204 beq _080B1232 ldr r0, _080B1240 ldrb r0, [r0] - bl sub_080B0B94 + bl IsPlayerDefeated cmp r0, #1 bne _080B1254 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080B1232 @@ -364899,22 +364899,22 @@ sub_080B1204: @ 0x080B1204 beq _080B1248 _080B1232: ldr r0, _080B1244 - bl sub_08000540 + bl SetMainCallback2 b _080B1276 .align 2, 0 _080B123C: .4byte gUnknown_203886A _080B1240: .4byte gUnknown_2023FDE -_080B1244: .4byte sub_08085B34 +_080B1244: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _080B1248: ldr r0, _080B1250 - bl sub_08000540 + bl SetMainCallback2 b _080B1276 .align 2, 0 -_080B1250: .4byte sub_080858C0 +_080B1250: .4byte CB2_WhiteOut _080B1254: ldr r0, _080B127C - bl sub_08000540 - bl sub_081A9BB8 + bl SetMainCallback2 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080B1276 @@ -364922,17 +364922,17 @@ _080B1254: lsls r0, r0, #0x18 cmp r0, #0 bne _080B1276 - bl sub_080B19A8 - bl sub_080B104C + bl RegisterTrainerInMatchCall + bl SetBattledTrainersFlags _080B1276: pop {r0} bx r0 .align 2, 0 -_080B127C: .4byte sub_08085B34 - thumb_func_end sub_080B1204 +_080B127C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end CB2_EndTrainerBattle - thumb_func_start sub_080B1280 -sub_080B1280: @ 0x080B1280 + thumb_func_start CB2_EndRematchBattle +CB2_EndRematchBattle: @ 0x080B1280 push {lr} ldr r0, _080B1298 ldrh r1, [r0] @@ -364941,38 +364941,38 @@ sub_080B1280: @ 0x080B1280 cmp r1, r0 bne _080B12A0 ldr r0, _080B129C - bl sub_08000540 + bl SetMainCallback2 b _080B12CE .align 2, 0 _080B1298: .4byte gUnknown_203886A -_080B129C: .4byte sub_08085B34 +_080B129C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _080B12A0: ldr r0, _080B12B4 ldrb r0, [r0] - bl sub_080B0B94 + bl IsPlayerDefeated cmp r0, #1 bne _080B12BC ldr r0, _080B12B8 - bl sub_08000540 + bl SetMainCallback2 b _080B12CE .align 2, 0 _080B12B4: .4byte gUnknown_2023FDE -_080B12B8: .4byte sub_080858C0 +_080B12B8: .4byte CB2_WhiteOut _080B12BC: ldr r0, _080B12D4 - bl sub_08000540 - bl sub_080B19A8 - bl sub_080B104C + bl SetMainCallback2 + bl RegisterTrainerInMatchCall + bl SetBattledTrainersFlags bl HandleRematchVarsOnBattleEnd _080B12CE: pop {r0} bx r0 .align 2, 0 -_080B12D4: .4byte sub_08085B34 - thumb_func_end sub_080B1280 +_080B12D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end CB2_EndRematchBattle - thumb_func_start sub_080B12D8 -sub_080B12D8: @ 0x080B12D8 + thumb_func_start BattleSetup_StartRematchBattle +BattleSetup_StartRematchBattle: @ 0x080B12D8 push {lr} ldr r1, _080B12F4 movs r0, #8 @@ -364980,20 +364980,20 @@ sub_080B12D8: @ 0x080B12D8 ldr r1, _080B12F8 ldr r0, _080B12FC str r0, [r1, #8] - bl sub_080B0100 + bl DoTrainerBattle bl sub_080988B8 pop {r0} bx r0 .align 2, 0 _080B12F4: .4byte gUnknown_2022C90 _080B12F8: .4byte gUnknown_3002360 -_080B12FC: .4byte sub_080B1280 - thumb_func_end sub_080B12D8 +_080B12FC: .4byte CB2_EndRematchBattle + thumb_func_end BattleSetup_StartRematchBattle - thumb_func_start sub_080B1300 -sub_080B1300: @ 0x080B1300 + thumb_func_start ShowTrainerIntroSpeech +ShowTrainerIntroSpeech: @ 0x080B1300 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B1368 @@ -365006,7 +365006,7 @@ sub_080B1300: @ 0x080B1300 bl sub_081A9820 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_081A9C54 + bl CopyPyramidTrainerSpeechBefore b _080B13C4 .align 2, 0 _080B1328: .4byte gUnknown_3005E08 @@ -365029,7 +365029,7 @@ _080B1330: bl sub_081A9820 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_081A9C54 + bl CopyPyramidTrainerSpeechBefore b _080B13C4 .align 2, 0 _080B135C: .4byte gUnknown_2036FF0 @@ -365051,7 +365051,7 @@ _080B1368: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 movs r0, #2 - bl sub_081D4D80 + bl CopyTrainerHillTrainerText b _080B13C4 .align 2, 0 _080B1390: .4byte gUnknown_3005E08 @@ -365076,7 +365076,7 @@ _080B1398: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 movs r0, #2 - bl sub_081D4D80 + bl CopyTrainerHillTrainerText _080B13C4: bl sub_08097C40 b _080B13E0 @@ -365085,15 +365085,15 @@ _080B13CC: .4byte gUnknown_2036FF0 _080B13D0: .4byte gUnknown_3005DF0 _080B13D4: .4byte gUnknown_203889C _080B13D8: - bl sub_080B1568 - bl sub_08097B74 + bl GetIntroSpeechOfApproachingTrainer + bl ShowFieldMessage _080B13E0: pop {r0} bx r0 - thumb_func_end sub_080B1300 + thumb_func_end ShowTrainerIntroSpeech - thumb_func_start sub_080B13E4 -sub_080B13E4: @ 0x080B13E4 + thumb_func_start BattleSetup_GetScriptAddrAfterBattle +BattleSetup_GetScriptAddrAfterBattle: @ 0x080B13E4 push {lr} ldr r0, _080B13F4 ldr r0, [r0] @@ -365106,10 +365106,10 @@ _080B13F0: .align 2, 0 _080B13F4: .4byte gUnknown_203888C _080B13F8: .4byte gUnknown_8276D3D - thumb_func_end sub_080B13E4 + thumb_func_end BattleSetup_GetScriptAddrAfterBattle - thumb_func_start sub_080B13FC -sub_080B13FC: @ 0x080B13FC + thumb_func_start BattleSetup_GetTrainerPostBattleScript +BattleSetup_GetTrainerPostBattleScript: @ 0x080B13FC push {lr} ldr r1, _080B141C ldrb r2, [r1] @@ -365149,20 +365149,20 @@ _080B1442: bx r1 .align 2, 0 _080B1448: .4byte gUnknown_8244D10 - thumb_func_end sub_080B13FC + thumb_func_end BattleSetup_GetTrainerPostBattleScript - thumb_func_start sub_080B144C -sub_080B144C: @ 0x080B144C + thumb_func_start ShowTrainerCantBattleSpeech +ShowTrainerCantBattleSpeech: @ 0x080B144C push {lr} - bl sub_080B1604 - bl sub_08097B74 + bl GetTrainerCantBattleSpeech + bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B144C + thumb_func_end ShowTrainerCantBattleSpeech - thumb_func_start sub_080B145C -sub_080B145C: @ 0x080B145C + thumb_func_start SetUpTrainerEncounterMusic +SetUpTrainerEncounterMusic: @ 0x080B145C push {lr} ldr r0, _080B146C ldrb r0, [r0] @@ -365278,16 +365278,16 @@ _080B1544: .4byte 0x0000018D _080B1548: ldr r0, _080B1554 _080B154A: - bl sub_080A27D8 + bl PlayNewMapMusic _080B154E: pop {r0} bx r0 .align 2, 0 _080B1554: .4byte 0x000001A7 - thumb_func_end sub_080B145C + thumb_func_end SetUpTrainerEncounterMusic - thumb_func_start sub_080B1558 -sub_080B1558: @ 0x080B1558 + thumb_func_start ReturnEmptyStringIfNull +ReturnEmptyStringIfNull: @ 0x080B1558 push {lr} cmp r0, #0 bne _080B1560 @@ -365297,10 +365297,10 @@ _080B1560: bx r1 .align 2, 0 _080B1564: .4byte gUnknown_85C93D0 - thumb_func_end sub_080B1558 + thumb_func_end ReturnEmptyStringIfNull - thumb_func_start sub_080B1568 -sub_080B1568: @ 0x080B1568 + thumb_func_start GetIntroSpeechOfApproachingTrainer +GetIntroSpeechOfApproachingTrainer: @ 0x080B1568 push {lr} ldr r0, _080B1578 ldrb r0, [r0] @@ -365315,15 +365315,15 @@ _080B1580: ldr r0, _080B158C _080B1582: ldr r0, [r0] - bl sub_080B1558 + bl ReturnEmptyStringIfNull pop {r1} bx r1 .align 2, 0 _080B158C: .4byte gUnknown_2038874 - thumb_func_end sub_080B1568 + thumb_func_end GetIntroSpeechOfApproachingTrainer - thumb_func_start sub_080B1590 -sub_080B1590: @ 0x080B1590 + thumb_func_start GetTrainerALoseText +GetTrainerALoseText: @ 0x080B1590 push {r4, lr} ldr r0, _080B15A4 ldrh r1, [r0] @@ -365331,7 +365331,7 @@ sub_080B1590: @ 0x080B1590 lsls r0, r0, #3 cmp r1, r0 bne _080B15A8 - bl sub_080EAE98 + bl GetSecretBaseTrainerLoseText b _080B15AC .align 2, 0 _080B15A4: .4byte gUnknown_203886A @@ -365340,10 +365340,10 @@ _080B15A8: ldr r0, [r0] _080B15AC: ldr r4, _080B15C8 - bl sub_080B1558 + bl ReturnEmptyStringIfNull adds r1, r0, #0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 pop {r4} pop {r1} @@ -365351,18 +365351,18 @@ _080B15AC: .align 2, 0 _080B15C4: .4byte gUnknown_203887C _080B15C8: .4byte gUnknown_2021C7C - thumb_func_end sub_080B1590 + thumb_func_end GetTrainerALoseText - thumb_func_start sub_080B15CC -sub_080B15CC: @ 0x080B15CC + thumb_func_start GetTrainerBLoseText +GetTrainerBLoseText: @ 0x080B15CC push {r4, lr} ldr r4, _080B15E8 ldr r0, _080B15EC ldr r0, [r0] - bl sub_080B1558 + bl ReturnEmptyStringIfNull adds r1, r0, #0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 pop {r4} pop {r1} @@ -365370,31 +365370,31 @@ sub_080B15CC: @ 0x080B15CC .align 2, 0 _080B15E8: .4byte gUnknown_2021C7C _080B15EC: .4byte gUnknown_2038880 - thumb_func_end sub_080B15CC + thumb_func_end GetTrainerBLoseText - thumb_func_start sub_080B15F0 -sub_080B15F0: @ 0x080B15F0 + thumb_func_start GetTrainerWonSpeech +GetTrainerWonSpeech: @ 0x080B15F0 push {lr} ldr r0, _080B1600 ldr r0, [r0] - bl sub_080B1558 + bl ReturnEmptyStringIfNull pop {r1} bx r1 .align 2, 0 _080B1600: .4byte gUnknown_2038884 - thumb_func_end sub_080B15F0 + thumb_func_end GetTrainerWonSpeech - thumb_func_start sub_080B1604 -sub_080B1604: @ 0x080B1604 + thumb_func_start GetTrainerCantBattleSpeech +GetTrainerCantBattleSpeech: @ 0x080B1604 push {lr} ldr r0, _080B1614 ldr r0, [r0] - bl sub_080B1558 + bl ReturnEmptyStringIfNull pop {r1} bx r1 .align 2, 0 _080B1614: .4byte gUnknown_2038888 - thumb_func_end sub_080B1604 + thumb_func_end GetTrainerCantBattleSpeech thumb_func_start FirstBattleTrainerIdToRematchTableId FirstBattleTrainerIdToRematchTableId: @ 0x080B1618 @@ -365509,7 +365509,7 @@ _080B16BA: ldrh r0, [r4] cmp r0, #0 beq _080B16CE - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 bne _080B16B6 @@ -365528,8 +365528,8 @@ _080B16E0: .4byte gUnknown_3005AEC _080B16E4: .4byte 0x000009CA thumb_func_end SetRematchIdForTrainer - thumb_func_start sub_080B16E8 -sub_080B16E8: @ 0x080B16E8 + thumb_func_start UpdateRandomTrainerRematches +UpdateRandomTrainerRematches: @ 0x080B16E8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -365602,7 +365602,7 @@ _080B1760: .align 2, 0 _080B1778: .4byte gUnknown_3005AEC _080B177C: .4byte 0x000009CA - thumb_func_end sub_080B16E8 + thumb_func_end UpdateRandomTrainerRematches thumb_func_start UpdateRematchIfDefeated UpdateRematchIfDefeated: @ 0x080B1780 @@ -365612,7 +365612,7 @@ UpdateRematchIfDefeated: @ 0x080B1780 lsls r0, r4, #4 adds r0, r0, r5 ldrh r0, [r0] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -365628,8 +365628,8 @@ _080B17A0: _080B17A8: .4byte gUnknown_852AD40 thumb_func_end UpdateRematchIfDefeated - thumb_func_start sub_080B17AC -sub_080B17AC: @ 0x080B17AC + thumb_func_start DoesSomeoneWantRematchIn_ +DoesSomeoneWantRematchIn_: @ 0x080B17AC push {r4, r5, r6, lr} lsls r1, r1, #0x10 lsrs r4, r1, #0x10 @@ -365668,7 +365668,7 @@ _080B17EE: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080B17AC + thumb_func_end DoesSomeoneWantRematchIn_ thumb_func_start IsRematchTrainerIn_ IsRematchTrainerIn_: @ 0x080B17F4 @@ -365701,8 +365701,8 @@ _080B181E: bx r1 thumb_func_end IsRematchTrainerIn_ - thumb_func_start sub_080B1824 -sub_080B1824: @ 0x080B1824 + thumb_func_start IsFirstTrainerIdReadyForRematch +IsFirstTrainerIdReadyForRematch: @ 0x080B1824 push {lr} lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -365733,10 +365733,10 @@ _080B185A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B1824 + thumb_func_end IsFirstTrainerIdReadyForRematch - thumb_func_start sub_080B1860 -sub_080B1860: @ 0x080B1860 + thumb_func_start IsTrainerReadyForRematch_ +IsTrainerReadyForRematch_: @ 0x080B1860 push {lr} lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -365767,7 +365767,7 @@ _080B1896: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B1860 + thumb_func_end IsTrainerReadyForRematch_ thumb_func_start GetRematchTrainerIdFromTable GetRematchTrainerIdFromTable: @ 0x080B189C @@ -365802,7 +365802,7 @@ _080B18CE: ldrh r0, [r4] cmp r0, #0 beq _080B18B6 - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 beq _080B18C0 @@ -365853,7 +365853,7 @@ _080B1926: ldrh r0, [r4] cmp r0, #0 beq _080B190A - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 beq _080B1914 @@ -365895,8 +365895,8 @@ _080B1970: .4byte gUnknown_3005AEC _080B1974: .4byte 0x000009CA thumb_func_end ClearTrainerWantRematchState - thumb_func_start sub_080B1978 -sub_080B1978: @ 0x080B1978 + thumb_func_start GetTrainerMatchCallFlag +GetTrainerMatchCallFlag: @ 0x080B1978 push {r4, lr} adds r3, r0, #0 movs r1, #0 @@ -365923,10 +365923,10 @@ _080B199E: bx r1 .align 2, 0 _080B19A4: .4byte 0x0000FFFF - thumb_func_end sub_080B1978 + thumb_func_end GetTrainerMatchCallFlag - thumb_func_start sub_080B19A8 -sub_080B19A8: @ 0x080B19A8 + thumb_func_start RegisterTrainerInMatchCall +RegisterTrainerInMatchCall: @ 0x080B19A8 push {lr} ldr r0, _080B19D4 bl FlagGet @@ -365935,7 +365935,7 @@ sub_080B19A8: @ 0x080B19A8 beq _080B19CE ldr r0, _080B19D8 ldrh r0, [r0] - bl sub_080B1978 + bl GetTrainerMatchCallFlag adds r1, r0, #0 ldr r0, _080B19DC cmp r1, r0 @@ -365950,7 +365950,7 @@ _080B19CE: _080B19D4: .4byte 0x0000012F _080B19D8: .4byte gUnknown_203886A _080B19DC: .4byte 0x0000FFFF - thumb_func_end sub_080B19A8 + thumb_func_end RegisterTrainerInMatchCall thumb_func_start WasSecondRematchWon WasSecondRematchWon: @ 0x080B19E0 @@ -365967,7 +365967,7 @@ WasSecondRematchWon: @ 0x080B19E0 lsls r0, r1, #4 adds r0, r0, r4 ldrh r0, [r0, #2] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 beq _080B1A0A @@ -365982,8 +365982,8 @@ _080B1A0C: .align 2, 0 thumb_func_end WasSecondRematchWon - thumb_func_start sub_080B1A14 -sub_080B1A14: @ 0x080B1A14 + thumb_func_start HasAtLeastFiveBadges +HasAtLeastFiveBadges: @ 0x080B1A14 push {r4, r5, r6, lr} movs r6, #0 movs r5, #0 @@ -366012,12 +366012,12 @@ _080B1A42: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080B1A14 + thumb_func_end HasAtLeastFiveBadges - thumb_func_start sub_080B1A48 -sub_080B1A48: @ 0x080B1A48 + thumb_func_start IncrementRematchStepCounter +IncrementRematchStepCounter: @ 0x080B1A48 push {lr} - bl sub_080B1A14 + bl HasAtLeastFiveBadges cmp r0, #0 beq _080B1A70 ldr r0, _080B1A64 @@ -366039,12 +366039,12 @@ _080B1A6E: _080B1A70: pop {r0} bx r0 - thumb_func_end sub_080B1A48 + thumb_func_end IncrementRematchStepCounter - thumb_func_start sub_080B1A74 -sub_080B1A74: @ 0x080B1A74 + thumb_func_start IsRematchStepCounterMaxed +IsRematchStepCounterMaxed: @ 0x080B1A74 push {lr} - bl sub_080B1A14 + bl HasAtLeastFiveBadges cmp r0, #0 beq _080B1A98 ldr r0, _080B1A90 @@ -366065,7 +366065,7 @@ _080B1A9A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B1A74 + thumb_func_end IsRematchStepCounterMaxed thumb_func_start TryUpdateRandomTrainerRematches TryUpdateRandomTrainerRematches: @ 0x080B1AA0 @@ -366074,13 +366074,13 @@ TryUpdateRandomTrainerRematches: @ 0x080B1AA0 lsrs r5, r0, #0x10 lsls r1, r1, #0x10 lsrs r4, r1, #0x10 - bl sub_080B1A74 + bl IsRematchStepCounterMaxed cmp r0, #0 beq _080B1ACC ldr r0, _080B1AD4 adds r1, r5, #0 adds r2, r4, #0 - bl sub_080B16E8 + bl UpdateRandomTrainerRematches cmp r0, #1 bne _080B1ACC ldr r0, _080B1AD8 @@ -366110,7 +366110,7 @@ DoesSomeoneWantRematchIn: @ 0x080B1AE0 lsrs r2, r2, #0x10 ldr r0, _080B1AFC adds r1, r3, #0 - bl sub_080B17AC + bl DoesSomeoneWantRematchIn_ pop {r1} bx r1 .align 2, 0 @@ -366167,14 +366167,14 @@ GetLastBeatenRematchTrainerId: @ 0x080B1B3C _080B1B54: .4byte gUnknown_852AD40 thumb_func_end GetLastBeatenRematchTrainerId - thumb_func_start sub_080B1B58 -sub_080B1B58: @ 0x080B1B58 + thumb_func_start ShouldTryRematchBattle +ShouldTryRematchBattle: @ 0x080B1B58 push {r4, r5, lr} ldr r5, _080B1B7C ldr r4, _080B1B80 ldrh r1, [r4] adds r0, r5, #0 - bl sub_080B1824 + bl IsFirstTrainerIdReadyForRematch lsls r0, r0, #0x18 cmp r0, #0 bne _080B1B84 @@ -366193,7 +366193,7 @@ _080B1B86: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080B1B58 + thumb_func_end ShouldTryRematchBattle thumb_func_start IsTrainerReadyForRematch IsTrainerReadyForRematch: @ 0x080B1B8C @@ -366201,7 +366201,7 @@ IsTrainerReadyForRematch: @ 0x080B1B8C ldr r0, _080B1BA0 ldr r1, _080B1BA4 ldrh r1, [r1] - bl sub_080B1860 + bl IsTrainerReadyForRematch_ lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -366218,7 +366218,7 @@ HandleRematchVarsOnBattleEnd: @ 0x080B1BA8 ldr r1, _080B1BC0 ldrh r1, [r1] bl ClearTrainerWantRematchState - bl sub_080B104C + bl SetBattledTrainersFlags pop {r0} bx r0 .align 2, 0 @@ -366226,8 +366226,8 @@ _080B1BBC: .4byte gUnknown_852AD40 _080B1BC0: .4byte gUnknown_203886A thumb_func_end HandleRematchVarsOnBattleEnd - thumb_func_start sub_080B1BC4 -sub_080B1BC4: @ 0x080B1BC4 + thumb_func_start ShouldTryGetTrainerScript +ShouldTryGetTrainerScript: @ 0x080B1BC4 push {lr} ldr r1, _080B1BE0 ldrb r0, [r1] @@ -366258,17 +366258,17 @@ _080B1BF6: .align 2, 0 _080B1BFC: .4byte gUnknown_2038898 _080B1C00: .4byte gUnknown_2037290 - thumb_func_end sub_080B1BC4 + thumb_func_end ShouldTryGetTrainerScript - thumb_func_start sub_080B1C04 -sub_080B1C04: @ 0x080B1C04 + thumb_func_start CountBattledRematchTeams +CountBattledRematchTeams: @ 0x080B1C04 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 ldr r7, _080B1C20 lsrs r4, r0, #0xc adds r6, r4, r7 ldrh r0, [r6] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -366287,7 +366287,7 @@ _080B1C24: adds r4, r6, #2 _080B1C32: ldrh r0, [r4] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 beq _080B1C4C @@ -366306,7 +366306,7 @@ _080B1C50: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B1C04 + thumb_func_end CountBattledRematchTeams thumb_func_start sub_080B1C58 sub_080B1C58: @ 0x080B1C58 @@ -366317,14 +366317,14 @@ sub_080B1C58: @ 0x080B1C58 lsrs r5, r1, #0x18 ldr r4, _080B1C94 adds r0, r4, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff bne _080B1C8C adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B1C98 @@ -366358,11 +366358,11 @@ sub_080B1C9C: @ 0x080B1C9C lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldr r5, _080B1CF0 ldr r1, _080B1CF4 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r1, #0 str r1, [sp] movs r0, #0xff @@ -366375,7 +366375,7 @@ sub_080B1C9C: @ 0x080B1C9C bl AddTextPrinterParameterized adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -366397,7 +366397,7 @@ sub_080B1CF8: @ 0x080B1CF8 bl sub_08197060 adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -366446,7 +366446,7 @@ sub_080B1D54: @ 0x080B1D54 lsrs r0, r0, #0x18 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_08009C8C + bl GetLinkPlayerDataExchangeStatusTimed lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #1 @@ -366481,7 +366481,7 @@ _080B1DA4: b _080B1DCE _080B1DA8: ldr r4, _080B1DC4 - bl sub_0800A770 + bl GetLinkPlayerCount_2 adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -366545,7 +366545,7 @@ sub_080B1E08: @ 0x080B1E08 ands r0, r1 cmp r0, #0 beq _080B1E4C - bl sub_0800ADFC + bl IsLinkConnectionEstablished lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -366579,7 +366579,7 @@ sub_080B1E54: @ 0x080B1E54 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0800ADFC + bl IsLinkConnectionEstablished lsls r0, r0, #0x18 cmp r0, #0 beq _080B1E6A @@ -366623,7 +366623,7 @@ sub_080B1EA8: @ 0x080B1EA8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0800ADC4 + bl GetSioMultiSI lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -366668,7 +366668,7 @@ sub_080B1EDC: @ 0x080B1EDC movs r0, #2 bl sub_0800A09C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080B1F06: pop {r4} pop {r0} @@ -366691,11 +366691,11 @@ sub_080B1F10: @ 0x080B1F10 ldrsh r2, [r4, r3] cmp r2, #0 bne _080B1F48 - bl sub_08009C70 + bl OpenLinkTimed bl sub_0800A75C - bl sub_08009E80 + bl ResetLinkPlayers ldr r0, _080B1F44 - bl sub_08003250 + bl AddWindow strh r0, [r4, #0xa] b _080B1F54 .align 2, 0 @@ -366724,7 +366724,7 @@ sub_080B1F64: @ 0x080B1F64 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 @@ -366746,7 +366746,7 @@ sub_080B1F64: @ 0x080B1F64 adds r4, r0, r1 movs r0, #0 strh r0, [r4, #0xe] - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -366754,7 +366754,7 @@ sub_080B1F64: @ 0x080B1F64 movs r0, #0x15 bl sub_080A306C ldr r0, _080B1FC0 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage ldr r0, _080B1FC4 b _080B1FD6 .align 2, 0 @@ -366765,7 +366765,7 @@ _080B1FC8: movs r0, #0x16 bl sub_080A306C ldr r0, _080B1FE0 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage ldr r0, _080B1FE4 _080B1FD6: str r0, [r4] @@ -366833,7 +366833,7 @@ sub_080B2038: @ 0x080B2038 mov sb, r0 mov r7, r8 add r7, sb - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 @@ -366872,7 +366872,7 @@ sub_080B2038: @ 0x080B2038 movs r3, #1 bl sub_080089D8 ldr r0, _080B20D8 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage mov r0, sb subs r0, #8 add r0, r8 @@ -366917,7 +366917,7 @@ sub_080B20E0: @ 0x080B20E0 bne _080B2174 bl sub_0800A60C adds r4, r0, #0 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -366930,7 +366930,7 @@ sub_080B20E0: @ 0x080B20E0 beq _080B2154 _080B212E: ldr r0, _080B2148 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage ldr r1, _080B214C lsls r0, r5, #2 adds r0, r0, r5 @@ -366990,7 +366990,7 @@ sub_080B2184: @ 0x080B2184 lsrs r0, r0, #0x18 cmp r0, #1 beq _080B21E6 - bl sub_0800A770 + bl GetLinkPlayerCount_2 adds r4, r0, #0 bl sub_0800A60C lsls r4, r4, #0x18 @@ -367061,7 +367061,7 @@ sub_080B21F4: @ 0x080B21F4 cmp r0, #1 bhi _080B2258 bl sub_0800A7F8 - bl sub_08097C9C + bl HideFieldMessageBox ldr r0, _080B2254 b _080B22C0 .align 2, 0 @@ -367074,24 +367074,24 @@ _080B2258: cmp r2, #9 bne _080B2270 _080B2260: - bl sub_08009384 - bl sub_08097C9C + bl CloseLink + bl HideFieldMessageBox ldr r0, _080B226C b _080B22C0 .align 2, 0 _080B226C: .4byte sub_080B258C _080B2270: - bl sub_0800A770 + bl GetLinkPlayerCount_2 ldr r4, _080B22CC strb r0, [r4] - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _080B22D0 strb r0, [r1] ldrb r0, [r4] bl sub_0800A5C8 ldr r4, _080B22D4 adds r0, r4, #0 - bl sub_080C26D4 + bl TrainerCard_GenerateCardForPlayer ldr r0, _080B22D8 mov r8, r0 ldrb r0, [r0] @@ -367101,7 +367101,7 @@ _080B2270: adds r0, r0, r5 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r4, #0 adds r1, #0x54 strh r0, [r1] @@ -367111,7 +367111,7 @@ _080B2270: adds r0, r0, r5 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, #0x56 strh r0, [r4] ldr r0, _080B22E0 @@ -367147,7 +367147,7 @@ sub_080B22E4: @ 0x080B22E4 ldrh r0, [r0] cmp r0, #4 bne _080B2314 - bl sub_08009C28 + bl Link_AnyPartnersPlayingRubyOrSapphire cmp r0, #0 bne _080B2326 bl sub_0800A7F8 @@ -367165,9 +367165,9 @@ _080B231E: cmp r0, #9 bne _080B2348 _080B2326: - bl sub_08009384 + bl CloseLink _080B232A: - bl sub_08097C9C + bl HideFieldMessageBox ldr r0, _080B2340 lsls r1, r7, #2 adds r1, r1, r7 @@ -367180,17 +367180,17 @@ _080B232A: _080B2340: .4byte gUnknown_3005B60 _080B2344: .4byte sub_080B258C _080B2348: - bl sub_0800A770 + bl GetLinkPlayerCount_2 ldr r4, _080B23B4 strb r0, [r4] - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _080B23B8 strb r0, [r1] ldrb r0, [r4] bl sub_0800A5C8 ldr r4, _080B23BC adds r0, r4, #0 - bl sub_080C26D4 + bl TrainerCard_GenerateCardForPlayer ldr r0, _080B23C0 mov r8, r0 ldrb r0, [r0] @@ -367200,7 +367200,7 @@ _080B2348: adds r0, r0, r5 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r4, #0 adds r1, #0x54 strh r0, [r1] @@ -367210,7 +367210,7 @@ _080B2348: adds r0, r0, r5 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, #0x56 strh r0, [r4] ldr r1, _080B23C8 @@ -367370,10 +367370,10 @@ _080B24C8: adds r0, r0, r1 ldrh r0, [r0, #0x12] bl sub_080B1CF8 - bl sub_080988C4 + bl EnableBothScriptContexts lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _080B24FE .align 2, 0 _080B24E8: .4byte gUnknown_3005B60 @@ -367404,7 +367404,7 @@ sub_080B250C: @ 0x080B250C bl sub_080B1DD4 cmp r0, #1 beq _080B2578 - bl sub_0800A114 + bl GetBlockReceivedStatus adds r4, r0, #0 bl sub_0800A56C lsls r4, r4, #0x18 @@ -367429,19 +367429,19 @@ _080B2538: lsls r2, r2, #2 adds r2, r2, r6 ldrb r2, [r2] - bl sub_080C2750 + bl CopyTrainerCardData adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _080B255A: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 blo _080B2538 movs r0, #0 bl sub_0800AE0C - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r0, _080B2588 adds r1, r5, #0 bl sub_080B2470 @@ -367471,11 +367471,11 @@ sub_080B258C: @ 0x080B258C adds r4, r4, r0 ldrh r0, [r4, #0x12] bl sub_080B1CF8 - bl sub_080988C4 + bl EnableBothScriptContexts ldrb r0, [r4, #0x12] - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B25BA: pop {r4, r5} pop {r0} @@ -367503,10 +367503,10 @@ sub_080B25C8: @ 0x080B25C8 bl sub_080B1CF8 bl sub_08097CFC ldrb r0, [r4, #0x12] - bl sub_08003444 - bl sub_080988C4 + bl RemoveWindow + bl EnableBothScriptContexts adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5} pop {r0} bx r0 @@ -367532,11 +367532,11 @@ sub_080B2608: @ 0x080B2608 ldrh r0, [r4, #0x12] bl sub_080B1CF8 ldrb r0, [r4, #0x12] - bl sub_08003444 - bl sub_08097C9C - bl sub_080988C4 + bl RemoveWindow + bl HideFieldMessageBox + bl EnableBothScriptContexts adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5} pop {r0} bx r0 @@ -367775,7 +367775,7 @@ _080B27F8: .4byte gUnknown_2022C90 sub_080B27FC: @ 0x080B27FC push {lr} ldr r0, _080B2810 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _080B2814 @@ -367869,7 +367869,7 @@ _080B28D0: _080B28D4: ldr r0, _080B28EC movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _080B28E0: @@ -367895,11 +367895,11 @@ sub_080B28F0: @ 0x080B28F0 ldrsh r2, [r4, r3] cmp r2, #0 bne _080B2924 - bl sub_080092D0 - bl sub_08009E80 + bl OpenLink + bl ResetLinkPlayers ldr r0, _080B2920 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask b _080B2930 .align 2, 0 _080B291C: .4byte gUnknown_3005B68 @@ -367928,12 +367928,12 @@ sub_080B2940: @ 0x080B2940 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bls _080B2986 - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -367973,7 +367973,7 @@ sub_080B2994: @ 0x080B2994 lsrs r5, r0, #0x18 bl sub_0800A60C adds r4, r0, #0 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -368004,7 +368004,7 @@ sub_080B29CC: @ 0x080B29CC ldrb r0, [r0] cmp r0, #1 bne _080B29F4 - bl sub_08009E00 + bl IsLinkPlayerDataExchangeComplete lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -368012,7 +368012,7 @@ sub_080B29CC: @ 0x080B29CC bl sub_0800A6DC bl sub_08009AB0 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080B29F4: pop {r4} pop {r0} @@ -368024,7 +368024,7 @@ _080B29FC: .4byte gUnknown_30031C4 thumb_func_start sub_080B2A00 sub_080B2A00: @ 0x080B2A00 push {lr} - bl sub_0809F858 + bl SaveGame pop {r0} bx r0 .align 2, 0 @@ -368059,7 +368059,7 @@ _080B2A30: .align 2, 0 _080B2A38: .4byte gUnknown_2022C90 _080B2A3C: - bl sub_080F9D78 + bl ReducePlayerPartyToSelectedMons ldr r1, _080B2A48 movs r0, #0x4b b _080B2A50 @@ -368110,7 +368110,7 @@ _080B2A8C: @ jump table _080B2AA4: movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _080B2ABC ldr r2, _080B2AC0 adds r0, r2, #0 @@ -368161,7 +368161,7 @@ _080B2B00: cmp r0, #0 beq _080B2B1C ldr r0, _080B2B18 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM b _080B2B24 .align 2, 0 _080B2B14: .4byte gUnknown_20226A0 @@ -368169,24 +368169,24 @@ _080B2B18: .4byte 0x000001DD _080B2B1C: movs r0, #0xee lsls r0, r0, #1 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM _080B2B24: ldr r0, _080B2B54 ldrh r0, [r0] bl sub_080B2A0C - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r1, _080B2B58 movs r2, #0x80 lsls r2, r2, #4 adds r0, r2, #0 strh r0, [r1] ldr r0, _080B2B5C - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B2B60 ldr r0, _080B2B64 str r0, [r1, #8] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B2B4C: pop {r4, r5} pop {r0} @@ -368194,13 +368194,13 @@ _080B2B4C: .align 2, 0 _080B2B54: .4byte gUnknown_2037280 _080B2B58: .4byte gUnknown_203886A -_080B2B5C: .4byte sub_080365B4 +_080B2B5C: .4byte CB2_InitBattle _080B2B60: .4byte gUnknown_3002360 _080B2B64: .4byte sub_080B2D68 thumb_func_end sub_080B2A60 - thumb_func_start sub_080B2B68 -sub_080B2B68: @ 0x080B2B68 + thumb_func_start Task_BagMenu +Task_BagMenu: @ 0x080B2B68 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -368235,7 +368235,7 @@ _080B2B94: @ jump table _080B2BB4: movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _080B2BD0 ldr r2, _080B2BD4 adds r1, r2, #0 @@ -368265,14 +368265,14 @@ _080B2BF0: ldr r1, _080B2C00 movs r0, #0 movs r2, #0x1c - bl sub_0800A070 + bl SendBlock movs r0, #3 strh r0, [r5] b _080B2CDA .align 2, 0 _080B2C00: .4byte gUnknown_2022684 _080B2C04: - bl sub_0800A114 + bl GetBlockReceivedStatus adds r4, r0, #0 bl sub_0800A59C lsls r4, r4, #0x18 @@ -368297,11 +368297,11 @@ _080B2C20: str r1, [r0] lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag adds r6, #0x1c adds r4, #1 _080B2C40: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -368328,7 +368328,7 @@ _080B2C6C: strh r0, [r5] b _080B2CDA _080B2C76: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080B2CDA @@ -368343,7 +368343,7 @@ _080B2C86: cmp r0, #0 beq _080B2CA4 ldr r0, _080B2CA0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM b _080B2CAC .align 2, 0 _080B2C9C: .4byte gUnknown_20226A0 @@ -368351,7 +368351,7 @@ _080B2CA0: .4byte 0x000001DD _080B2CA4: movs r0, #0xee lsls r0, r0, #1 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM _080B2CAC: ldr r1, _080B2CE0 ldr r0, _080B2CE4 @@ -368359,19 +368359,19 @@ _080B2CAC: ldr r0, _080B2CE8 ldrh r0, [r0] bl sub_080B2A0C - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r1, _080B2CEC movs r3, #0x80 lsls r3, r3, #4 adds r0, r3, #0 strh r0, [r1] ldr r0, _080B2CF0 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B2CF4 ldr r0, _080B2CF8 str r0, [r1, #8] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080B2CDA: pop {r4, r5, r6, r7} pop {r0} @@ -368381,13 +368381,13 @@ _080B2CE0: .4byte gUnknown_20226A0 _080B2CE4: .4byte 0x00002211 _080B2CE8: .4byte gUnknown_2037280 _080B2CEC: .4byte gUnknown_203886A -_080B2CF0: .4byte sub_080365B4 +_080B2CF0: .4byte CB2_InitBattle _080B2CF4: .4byte gUnknown_3002360 _080B2CF8: .4byte sub_080B2D68 - thumb_func_end sub_080B2B68 + thumb_func_end Task_BagMenu - thumb_func_start sub_080B2CFC -sub_080B2CFC: @ 0x080B2CFC + thumb_func_start Cb_PrintCantStoreMail +Cb_PrintCantStoreMail: @ 0x080B2CFC push {r4, lr} ldr r0, _080B2D18 movs r1, #0x87 @@ -368425,22 +368425,22 @@ _080B2D3A: cmp r0, #0 bne _080B2D5A ldr r0, _080B2D50 - bl sub_08000540 + bl SetMainCallback2 b _080B2D5A .align 2, 0 _080B2D4C: .4byte gUnknown_30031C4 _080B2D50: .4byte sub_08085A30 _080B2D54: ldr r0, _080B2D64 - bl sub_08000540 + bl SetMainCallback2 _080B2D5A: - bl sub_080A89D4 + bl RunTasks pop {r4} pop {r0} bx r0 .align 2, 0 _080B2D64: .4byte sub_08085A30 - thumb_func_end sub_080B2CFC + thumb_func_end Cb_PrintCantStoreMail thumb_func_start sub_080B2D68 sub_080B2D68: @ 0x080B2D68 @@ -368451,9 +368451,9 @@ sub_080B2D68: @ 0x080B2D68 rsbs r1, r1, #0 ands r0, r1 str r0, [r2] - bl sub_080850E0 - bl sub_080767DC - bl sub_080769E8 + bl Overworld_ResetMapMusic + bl LoadPlayerParty + bl SavePlayerBag bl sub_0813BF34 ldr r0, _080B2DBC ldrh r0, [r0] @@ -368466,7 +368466,7 @@ sub_080B2D68: @ 0x080B2D68 ldrb r0, [r0] movs r5, #1 eors r0, r5 - bl sub_0813C2AC + bl UpdatePlayerLinkBattleRecords ldr r0, _080B2DC4 ldrb r0, [r0] cmp r0, #0 @@ -368486,7 +368486,7 @@ _080B2DC4: .4byte gUnknown_300319C _080B2DC8: .4byte gUnknown_2023FDE _080B2DCC: ldr r4, _080B2DEC - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -368497,13 +368497,13 @@ _080B2DCC: adds r1, r1, r4 ldr r1, [r1] movs r0, #0 - bl sub_0801B4A8 + bl WonderCard_Test_Unk_08_6 b _080B2E0E .align 2, 0 _080B2DEC: .4byte gUnknown_20226A0 _080B2DF0: ldr r4, _080B2E1C - bl sub_0800A02C + bl GetMultiplayerId eors r0, r5 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -368514,7 +368514,7 @@ _080B2DF0: adds r1, r1, r4 ldr r1, [r1] movs r0, #1 - bl sub_0801B4A8 + bl WonderCard_Test_Unk_08_6 _080B2E0E: bl InUnionRoom cmp r0, #1 @@ -368525,25 +368525,25 @@ _080B2E0E: .align 2, 0 _080B2E1C: .4byte gUnknown_20226A0 _080B2E20: .4byte gUnknown_3002360 -_080B2E24: .4byte sub_080B2CFC +_080B2E24: .4byte Cb_PrintCantStoreMail _080B2E28: ldr r1, _080B2E3C ldr r0, _080B2E40 _080B2E2C: str r0, [r1, #8] ldr r0, _080B2E44 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080B2E3C: .4byte gUnknown_3002360 -_080B2E40: .4byte sub_08085AA8 +_080B2E40: .4byte CB2_ReturnToFieldFromMultiplayer _080B2E44: .4byte sub_0809FDEC thumb_func_end sub_080B2D68 - thumb_func_start sub_080B2E48 -sub_080B2E48: @ 0x080B2E48 + thumb_func_start CleanupLinkRoomState +CleanupLinkRoomState: @ 0x080B2E48 push {lr} ldr r0, _080B2E74 ldrh r1, [r0] @@ -368558,25 +368558,25 @@ sub_080B2E48: @ 0x080B2E48 cmp r0, #9 bne _080B2E6A _080B2E62: - bl sub_080767DC - bl sub_080769E8 + bl LoadPlayerParty + bl SavePlayerBag _080B2E6A: movs r0, #0x7f - bl sub_0808461C + bl SetWarpDestinationToDynamicWarp pop {r0} bx r0 .align 2, 0 _080B2E74: .4byte gUnknown_2037280 - thumb_func_end sub_080B2E48 + thumb_func_end CleanupLinkRoomState - thumb_func_start sub_080B2E78 -sub_080B2E78: @ 0x080B2E78 + thumb_func_start ExitLinkRoom +ExitLinkRoom: @ 0x080B2E78 push {lr} - bl sub_08086C14 + bl QueueExitLinkRoomKey pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B2E78 + thumb_func_end ExitLinkRoom thumb_func_start sub_080B2E84 sub_080B2E84: @ 0x080B2E84 @@ -368607,7 +368607,7 @@ _080B2EAC: b _080B2F28 _080B2EB6: ldr r0, _080B2EC4 - bl sub_08097B74 + bl ShowFieldMessage movs r0, #1 strh r0, [r5, #8] b _080B2F28 @@ -368621,7 +368621,7 @@ _080B2EC8: bl sub_08086BEC ldr r0, _080B2EE4 ldrb r0, [r0] - bl sub_080091C4 + bl SetLocalLinkPlayerId movs r0, #2 strh r0, [r5, #8] b _080B2F28 @@ -368637,7 +368637,7 @@ _080B2EE8: beq _080B2F0E b _080B2F28 _080B2EFA: - bl sub_08097C9C + bl HideFieldMessageBox movs r0, #0 strh r0, [r5, #8] bl sub_08086C28 @@ -368653,8 +368653,8 @@ _080B2F14: movs r0, #1 bl sub_081978F0 adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080B2F28: pop {r4, r5} pop {r0} @@ -368669,7 +368669,7 @@ sub_080B2F30: @ 0x080B2F30 ldr r4, _080B2F54 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -368714,7 +368714,7 @@ _080B2F8A: bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen bl sub_08009B44 b _080B2FC0 _080B2F9C: @@ -368747,9 +368747,9 @@ _080B2FCC: cmp r0, #0 bne _080B2FE0 ldr r0, _080B2FEC - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B2FE0: pop {r4, r5} pop {r0} @@ -368790,7 +368790,7 @@ _080B3022: bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen bl sub_0800F2F8 b _080B3058 _080B3034: @@ -368818,13 +368818,13 @@ _080B3058: .align 2, 0 _080B3060: .4byte gUnknown_2031F38 _080B3064: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080B3078 bl sub_08013A80 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B3078: pop {r4, r5} pop {r0} @@ -368832,8 +368832,8 @@ _080B3078: .align 2, 0 thumb_func_end sub_080B2FF0 - thumb_func_start sub_080B3080 -sub_080B3080: @ 0x080B3080 + thumb_func_start PlayerEnteredTradeSeat +PlayerEnteredTradeSeat: @ 0x080B3080 push {lr} ldr r0, _080B3094 ldrb r0, [r0] @@ -368853,14 +368853,14 @@ _080B30A2: bx r0 .align 2, 0 _080B30A8: .4byte sub_080B2F58 - thumb_func_end sub_080B3080 + thumb_func_end PlayerEnteredTradeSeat thumb_func_start sub_080B30AC sub_080B30AC: @ 0x080B30AC push {lr} ldr r0, _080B30BC movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -368873,8 +368873,8 @@ sub_080B30C0: @ 0x080B30C0 .align 2, 0 thumb_func_end sub_080B30C0 - thumb_func_start sub_080B30C4 -sub_080B30C4: @ 0x080B30C4 + thumb_func_start ColosseumPlayerSpotTriggered +ColosseumPlayerSpotTriggered: @ 0x080B30C4 push {lr} ldr r1, _080B30E0 ldr r2, _080B30E4 @@ -368891,7 +368891,7 @@ sub_080B30C4: @ 0x080B30C4 _080B30E0: .4byte gUnknown_202267E _080B30E4: .4byte 0x00002211 _080B30E8: .4byte gUnknown_300319C -_080B30EC: .4byte sub_080B2B68 +_080B30EC: .4byte Task_BagMenu _080B30F0: ldr r0, _080B30FC bl sub_080B2F30 @@ -368900,14 +368900,14 @@ _080B30F6: bx r0 .align 2, 0 _080B30FC: .4byte sub_080B2A60 - thumb_func_end sub_080B30C4 + thumb_func_end ColosseumPlayerSpotTriggered thumb_func_start sub_080B3100 sub_080B3100: @ 0x080B3100 push {lr} ldr r0, _080B3114 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask bl sub_080988B8 pop {r0} bx r0 @@ -368915,22 +368915,22 @@ sub_080B3100: @ 0x080B3100 _080B3114: .4byte sub_080B2E84 thumb_func_end sub_080B3100 - thumb_func_start sub_080B3118 -sub_080B3118: @ 0x080B3118 + thumb_func_start sp02A_crash_sound +sp02A_crash_sound: @ 0x080B3118 push {lr} ldr r0, _080B3128 ldrb r0, [r0] ldr r1, _080B312C - bl sub_080C4798 + bl ShowTrainerCardInLink pop {r0} bx r0 .align 2, 0 _080B3128: .4byte gUnknown_2037284 -_080B312C: .4byte sub_08085B34 - thumb_func_end sub_080B3118 +_080B312C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end sp02A_crash_sound - thumb_func_start sub_080B3130 -sub_080B3130: @ 0x080B3130 + thumb_func_start GetLinkTrainerCardColor +GetLinkTrainerCardColor: @ 0x080B3130 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -368945,7 +368945,7 @@ sub_080B3130: @ 0x080B3130 adds r1, r1, r2 bl StringCopy adds r0, r4, #0 - bl sub_080C4238 + bl GetTrainerCardStars lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -368970,7 +368970,7 @@ _080B3182: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080B3130 + thumb_func_end GetLinkTrainerCardColor thumb_func_start sub_080B3188 sub_080B3188: @ 0x080B3188 @@ -368991,11 +368991,11 @@ sub_080B3188: @ 0x080B3188 lsls r0, r0, #0x11 cmp r1, r0 ble _080B31BA - bl sub_08009384 + bl CloseLink ldr r0, _080B31EC - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080B31BA: ldr r0, _080B31F0 ldrb r0, [r0] @@ -369009,21 +369009,21 @@ _080B31BA: lsls r0, r0, #0x18 cmp r0, #0 bne _080B31DE - bl sub_08009384 + bl CloseLink ldr r0, _080B31EC - bl sub_08000540 + bl SetMainCallback2 _080B31DE: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _080B31FE .align 2, 0 _080B31E8: .4byte gUnknown_3005B60 -_080B31EC: .4byte sub_0800AA0C +_080B31EC: .4byte CB2_LinkError _080B31F0: .4byte gUnknown_30031C4 _080B31F4: .4byte gUnknown_300319C _080B31F8: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B31FE: pop {r4, r5} pop {r0} @@ -369039,9 +369039,9 @@ sub_080B3204: @ 0x080B3204 ldrb r0, [r0] cmp r0, #0 bne _080B321C - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080B321C: pop {r4} pop {r0} @@ -369105,15 +369105,15 @@ _080B3282: cmp r0, #0 beq _080B3298 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _080B3310 .align 2, 0 _080B3294: .4byte gUnknown_300319C _080B3298: - bl sub_080092D0 + bl OpenLink ldr r0, _080B32A8 movs r1, #1 - bl sub_080A8878 + bl CreateTask b _080B32EE .align 2, 0 _080B32A8: .4byte sub_080B3188 @@ -369129,14 +369129,14 @@ _080B32AC: strh r0, [r5, #2] b _080B32EE _080B32C0: - bl sub_0800A770 + bl GetLinkPlayerCount_2 adds r4, r0, #0 bl sub_0800A60C lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 blo _080B3310 - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 beq _080B32EE @@ -369158,13 +369158,13 @@ _080B32F6: ldrb r0, [r0] cmp r0, #1 bne _080B3310 - bl sub_08009E00 + bl IsLinkPlayerDataExchangeComplete lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B3310 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080B3310: pop {r4, r5} pop {r0} @@ -369193,8 +369193,8 @@ _080B3338: .4byte gUnknown_202267E _080B333C: .4byte 0x00002288 thumb_func_end sub_080B331C - thumb_func_start sub_080B3340 -sub_080B3340: @ 0x080B3340 + thumb_func_start CheckForTrainersWantingBattle +CheckForTrainersWantingBattle: @ 0x080B3340 push {r4, r5, r6, r7, lr} ldr r0, _080B33CC movs r1, #0 @@ -369219,7 +369219,7 @@ _080B3350: bne _080B3390 _080B336A: adds r0, r4, #0 - bl sub_080B3458 + bl CheckTrainer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -369231,7 +369231,7 @@ _080B336A: adds r5, r0, #0 cmp r1, #1 bhi _080B33E0 - bl sub_0806B100 + bl GetMonsStateToDoubles_2 lsls r0, r0, #0x18 cmp r0, #0 bne _080B339A @@ -369247,7 +369247,7 @@ _080B339A: adds r5, r0, #0 cmp r4, #1 bne _080B33E0 - bl sub_080B0BD4 + bl ResetTrainerOpponentIds ldr r2, _080B33D8 ldrb r0, [r5] subs r0, #1 @@ -369259,7 +369259,7 @@ _080B339A: adds r2, #4 adds r1, r1, r2 ldr r1, [r1] - bl sub_080B0F18 + bl ConfigureAndSetUpOneTrainerBattle ldr r0, _080B33DC strb r4, [r0] movs r0, #1 @@ -369274,7 +369274,7 @@ _080B33E0: ldrb r0, [r5] cmp r0, #2 bne _080B3444 - bl sub_080B0BD4 + bl ResetTrainerOpponentIds movs r4, #0 ldrb r5, [r5] cmp r4, r5 @@ -369302,7 +369302,7 @@ _080B33F8: cmp r4, r0 blo _080B33F8 _080B341E: - bl sub_080B0F90 + bl SetUpTwoTrainersBattle ldr r1, _080B3438 movs r0, #0 strb r0, [r1] @@ -369327,10 +369327,10 @@ _080B344C: bx r1 .align 2, 0 _080B3454: .4byte gUnknown_3005E0C - thumb_func_end sub_080B3340 + thumb_func_end CheckForTrainersWantingBattle - thumb_func_start sub_080B3458 -sub_080B3458: @ 0x080B3458 + thumb_func_start CheckTrainer +CheckTrainer: @ 0x080B3458 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -369349,7 +369349,7 @@ _080B3476: bl GetEventObjectScriptPointerByEventObjectId _080B347C: adds r7, r0, #0 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080B3496 @@ -369366,11 +369366,11 @@ _080B3496: cmp r0, #1 bne _080B34A6 adds r0, r5, #0 - bl sub_081D5B38 + bl GetHillTrainerFlag b _080B348E _080B34A6: adds r0, r7, #0 - bl sub_080B0FA4 + bl GetTrainerFlagFromScriptPointer b _080B3490 _080B34AE: lsls r4, r5, #3 @@ -369378,7 +369378,7 @@ _080B34AE: lsls r0, r0, #2 ldr r1, _080B352C adds r0, r0, r1 - bl sub_080B3548 + bl GetTrainerApproachDistance lsls r0, r0, #0x18 lsrs r6, r0, #0x18 mov r8, r4 @@ -369392,7 +369392,7 @@ _080B34AE: cmp r0, #6 bne _080B34E2 _080B34D4: - bl sub_0806B100 + bl GetMonsStateToDoubles_2 lsls r0, r0, #0x18 cmp r0, #0 bne _080B3538 @@ -369428,7 +369428,7 @@ _080B34E2: subs r1, r6, #1 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080B37C4 + bl TrainerApproachPlayer ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -369448,10 +369448,10 @@ _080B353A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B3458 + thumb_func_end CheckTrainer - thumb_func_start sub_080B3548 -sub_080B3548: @ 0x080B3548 + thumb_func_start GetTrainerApproachDistance +GetTrainerApproachDistance: @ 0x080B3548 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -369488,7 +369488,7 @@ sub_080B3548: @ 0x080B3548 lsrs r2, r2, #0x1c adds r0, r7, #0 adds r1, r6, #0 - bl sub_080B3708 + bl CheckPathBetweenTrainerAndPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080B35E8 @@ -369521,7 +369521,7 @@ _080B35AA: adds r0, r7, #0 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080B3708 + bl CheckPathBetweenTrainerAndPlayer lsls r0, r0, #0x18 cmp r0, #0 bne _080B35A4 @@ -369538,7 +369538,7 @@ _080B35E8: bx r1 .align 2, 0 _080B35F4: .4byte gUnknown_852B3D8 - thumb_func_end sub_080B3548 + thumb_func_end GetTrainerApproachDistance thumb_func_start GetTrainerApproachDistanceSouth GetTrainerApproachDistanceSouth: @ 0x080B35F8 @@ -369700,8 +369700,8 @@ _080B3700: .align 2, 0 thumb_func_end GetTrainerApproachDistanceEast - thumb_func_start sub_080B3708 -sub_080B3708: @ 0x080B3708 + thumb_func_start CheckPathBetweenTrainerAndPlayer +CheckPathBetweenTrainerAndPlayer: @ 0x080B3708 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -369741,7 +369741,7 @@ _080B3746: ldrsh r2, [r3, r0] adds r0, r6, #0 adds r3, r7, #0 - bl sub_080925FC + bl GetCollisionFlagsAtCoords lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -369776,7 +369776,7 @@ _080B3780: ldrsh r2, [r3, r0] adds r0, r6, #0 adds r3, r7, #0 - bl sub_08092538 + bl GetCollisionAtCoords lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r4, r4, #4 @@ -369798,16 +369798,16 @@ _080B37B4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B3708 + thumb_func_end CheckPathBetweenTrainerAndPlayer - thumb_func_start sub_080B37C4 -sub_080B37C4: @ 0x080B37C4 + thumb_func_start TrainerApproachPlayer +TrainerApproachPlayer: @ 0x080B37C4 push {r4, r5, lr} lsls r5, r1, #0x18 lsrs r5, r5, #0x18 ldr r0, _080B3810 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask ldr r4, _080B3814 ldr r3, _080B3818 ldrb r2, [r3] @@ -369839,11 +369839,11 @@ sub_080B37C4: @ 0x080B37C4 pop {r0} bx r0 .align 2, 0 -_080B3810: .4byte sub_080B3870 +_080B3810: .4byte Task_RunTrainerSeeFuncList _080B3814: .4byte gUnknown_3005DF0 _080B3818: .4byte gUnknown_3005E08 _080B381C: .4byte gUnknown_3005B60 - thumb_func_end sub_080B37C4 + thumb_func_end TrainerApproachPlayer thumb_func_start sub_080B3820 sub_080B3820: @ 0x080B3820 @@ -369881,12 +369881,12 @@ _080B3840: bx r0 .align 2, 0 _080B3864: .4byte gUnknown_3005DF0 -_080B3868: .4byte sub_080B3870 +_080B3868: .4byte Task_RunTrainerSeeFuncList _080B386C: .4byte gUnknown_3005B60 thumb_func_end sub_080B3820 - thumb_func_start sub_080B3870 -sub_080B3870: @ 0x080B3870 + thumb_func_start Task_RunTrainerSeeFuncList +Task_RunTrainerSeeFuncList: @ 0x080B3870 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -369933,7 +369933,7 @@ _080B38C4: bx r0 .align 2, 0 _080B38CC: .4byte gUnknown_852B3E8 - thumb_func_end sub_080B3870 + thumb_func_end Task_RunTrainerSeeFuncList thumb_func_start sub_080B38D0 sub_080B38D0: @ 0x080B38D0 @@ -369941,8 +369941,8 @@ sub_080B38D0: @ 0x080B38D0 bx lr thumb_func_end sub_080B38D0 - thumb_func_start sub_080B38D4 -sub_080B38D4: @ 0x080B38D4 + thumb_func_start TrainerExclamationMark +TrainerExclamationMark: @ 0x080B38D4 push {r4, r5, lr} adds r5, r1, #0 adds r4, r2, #0 @@ -369953,7 +369953,7 @@ sub_080B38D4: @ 0x080B38D4 adds r0, r4, #0 bl EventObjectGetLocalIdAndMap movs r0, #0 - bl sub_080B5270 + bl FieldEffectStart ldrb r0, [r4, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -369962,7 +369962,7 @@ sub_080B38D4: @ 0x080B38D4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -369972,7 +369972,7 @@ sub_080B38D4: @ 0x080B38D4 bx r1 .align 2, 0 _080B3914: .4byte gUnknown_20388A8 - thumb_func_end sub_080B38D4 + thumb_func_end TrainerExclamationMark thumb_func_start WaitTrainerExclamationMark WaitTrainerExclamationMark: @ 0x080B3918 @@ -370013,8 +370013,8 @@ _080B3950: .align 2, 0 thumb_func_end WaitTrainerExclamationMark - thumb_func_start sub_080B3958 -sub_080B3958: @ 0x080B3958 + thumb_func_start TrainerMoveToPlayer +TrainerMoveToPlayer: @ 0x080B3958 push {r4, r5, lr} adds r5, r1, #0 adds r4, r2, #0 @@ -370041,7 +370041,7 @@ _080B3976: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #0xe] subs r0, #1 strh r0, [r5, #0xe] @@ -370049,7 +370049,7 @@ _080B3976: _080B399C: adds r0, r4, #0 movs r1, #0x3e - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -370059,10 +370059,10 @@ _080B39AA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B3958 + thumb_func_end TrainerMoveToPlayer - thumb_func_start sub_080B39B4 -sub_080B39B4: @ 0x080B39B4 + thumb_func_start PlayerFaceApproachingTrainer +PlayerFaceApproachingTrainer: @ 0x080B39B4 push {r4, r5, r6, lr} adds r6, r1, #0 adds r5, r2, #0 @@ -370126,7 +370126,7 @@ _080B3A2A: ldrb r0, [r5, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c - bl sub_08093170 + bl GetOppositeDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_08092CA0 @@ -370134,7 +370134,7 @@ _080B3A2A: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -370146,10 +370146,10 @@ _080B3A60: .align 2, 0 _080B3A68: .4byte gUnknown_2037230 _080B3A6C: .4byte gUnknown_2036FF0 - thumb_func_end sub_080B39B4 + thumb_func_end PlayerFaceApproachingTrainer - thumb_func_start sub_080B3A70 -sub_080B3A70: @ 0x080B3A70 + thumb_func_start WaitPlayerFaceApproachingTrainer +WaitPlayerFaceApproachingTrainer: @ 0x080B3A70 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -370181,7 +370181,7 @@ _080B3AA2: .align 2, 0 _080B3AAC: .4byte gUnknown_2037230 _080B3AB0: .4byte gUnknown_2036FF0 - thumb_func_end sub_080B3A70 + thumb_func_end WaitPlayerFaceApproachingTrainer thumb_func_start sub_080B3AB4 sub_080B3AB4: @ 0x080B3AB4 @@ -370201,7 +370201,7 @@ sub_080B3AB4: @ 0x080B3AB4 _080B3AD2: adds r0, r4, #0 movs r1, #0x59 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -370212,8 +370212,8 @@ _080B3AE0: bx r1 thumb_func_end sub_080B3AB4 - thumb_func_start sub_080B3AE8 -sub_080B3AE8: @ 0x080B3AE8 + thumb_func_start WaitRevealDisguisedTrainer +WaitRevealDisguisedTrainer: @ 0x080B3AE8 push {r4, lr} adds r4, r1, #0 adds r0, r2, #0 @@ -370228,7 +370228,7 @@ _080B3AFC: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080B3AE8 + thumb_func_end WaitRevealDisguisedTrainer thumb_func_start sub_080B3B04 sub_080B3B04: @ 0x080B3B04 @@ -370248,7 +370248,7 @@ sub_080B3B04: @ 0x080B3B04 _080B3B22: adds r0, r4, #0 movs r1, #0x3e - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -370259,8 +370259,8 @@ _080B3B30: bx r1 thumb_func_end sub_080B3B04 - thumb_func_start sub_080B3B38 -sub_080B3B38: @ 0x080B3B38 + thumb_func_start PopOutOfAshHiddenTrainer +PopOutOfAshHiddenTrainer: @ 0x080B3B38 push {r4, r5, lr} adds r5, r1, #0 adds r4, r2, #0 @@ -370289,7 +370289,7 @@ sub_080B3B38: @ 0x080B3B38 movs r0, #2 str r0, [r2, #0xc] movs r0, #0x31 - bl sub_080B5270 + bl FieldEffectStart strh r0, [r5, #0x10] ldrh r0, [r5, #8] adds r0, #1 @@ -370302,10 +370302,10 @@ _080B3B7E: .align 2, 0 _080B3B88: .4byte gUnknown_20388A8 _080B3B8C: .4byte gUnknown_20205AC - thumb_func_end sub_080B3B38 + thumb_func_end PopOutOfAshHiddenTrainer - thumb_func_start sub_080B3B90 -sub_080B3B90: @ 0x080B3B90 + thumb_func_start JumpInPlaceHiddenTrainer +JumpInPlaceHiddenTrainer: @ 0x080B3B90 push {r4, r5, lr} adds r5, r1, #0 adds r4, r2, #0 @@ -370351,7 +370351,7 @@ sub_080B3B90: @ 0x080B3B90 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -370362,7 +370362,7 @@ _080B3BF8: bx r1 .align 2, 0 _080B3C00: .4byte gUnknown_20205AC - thumb_func_end sub_080B3B90 + thumb_func_end JumpInPlaceHiddenTrainer thumb_func_start WaitRevealHiddenTrainer WaitRevealHiddenTrainer: @ 0x080B3C04 @@ -370397,7 +370397,7 @@ sub_080B3C20: @ 0x080B3C20 adds r0, r4, #0 adds r0, #0xa mov r1, sp - bl sub_0806F108 + bl LoadWordFromTwoHalfwords movs r1, #0x16 ldrsh r0, [r4, r1] cmp r0, #0 @@ -370448,7 +370448,7 @@ _080B3C52: adds r0, r4, #0 bl TryOverrideTemplateCoordsForEventObject adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080B3CC6 .align 2, 0 _080B3CB4: .4byte gUnknown_3005B60 @@ -370473,7 +370473,7 @@ sub_080B3CD0: @ 0x080B3CD0 adds r4, r0, #0 ldr r0, _080B3CFC movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -370484,7 +370484,7 @@ sub_080B3CD0: @ 0x080B3CD0 adds r0, r0, r1 adds r0, #2 adds r1, r4, #0 - bl sub_0806F100 + bl StoreWordInTwoHalfwords pop {r4} pop {r0} bx r0 @@ -370493,31 +370493,31 @@ _080B3CFC: .4byte sub_080B3C20 _080B3D00: .4byte gUnknown_3005B68 thumb_func_end sub_080B3CD0 - thumb_func_start sub_080B3D04 -sub_080B3D04: @ 0x080B3D04 + thumb_func_start EndTrainerApproach +EndTrainerApproach: @ 0x080B3D04 push {lr} ldr r0, _080B3D10 bl sub_080B3820 pop {r0} bx r0 .align 2, 0 -_080B3D10: .4byte sub_080B3D14 - thumb_func_end sub_080B3D04 +_080B3D10: .4byte Task_DestroyTrainerApproachTask + thumb_func_end EndTrainerApproach - thumb_func_start sub_080B3D14 -sub_080B3D14: @ 0x080B3D14 + thumb_func_start Task_DestroyTrainerApproachTask +Task_DestroyTrainerApproachTask: @ 0x080B3D14 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B3D14 + thumb_func_end Task_DestroyTrainerApproachTask - thumb_func_start sub_080B3D28 -sub_080B3D28: @ 0x080B3D28 + thumb_func_start TryPrepareSecondApproachingTrainer +TryPrepareSecondApproachingTrainer: @ 0x080B3D28 push {lr} ldr r0, _080B3D54 ldrb r0, [r0] @@ -370554,16 +370554,16 @@ _080B3D6E: bx r0 .align 2, 0 _080B3D74: .4byte gUnknown_2037290 - thumb_func_end sub_080B3D28 + thumb_func_end TryPrepareSecondApproachingTrainer - thumb_func_start sub_080B3D78 -sub_080B3D78: @ 0x080B3D78 + thumb_func_start FldEff_ExclamationMarkIcon +FldEff_ExclamationMarkIcon: @ 0x080B3D78 push {lr} ldr r0, _080B3DA8 movs r1, #0 movs r2, #0 movs r3, #0x53 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -370575,7 +370575,7 @@ sub_080B3D78: @ 0x080B3D78 adds r0, r0, r1 movs r1, #0 movs r2, #0 - bl sub_080B3E30 + bl SetIconSpriteData _080B3DA0: movs r0, #0 pop {r1} @@ -370583,16 +370583,16 @@ _080B3DA0: .align 2, 0 _080B3DA8: .4byte gUnknown_852B460 _080B3DAC: .4byte gUnknown_20205AC - thumb_func_end sub_080B3D78 + thumb_func_end FldEff_ExclamationMarkIcon - thumb_func_start sub_080B3DB0 -sub_080B3DB0: @ 0x080B3DB0 + thumb_func_start FldEff_QuestionMarkIcon +FldEff_QuestionMarkIcon: @ 0x080B3DB0 push {lr} ldr r0, _080B3DE0 movs r1, #0 movs r2, #0 movs r3, #0x52 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -370604,7 +370604,7 @@ sub_080B3DB0: @ 0x080B3DB0 adds r0, r0, r1 movs r1, #0x21 movs r2, #1 - bl sub_080B3E30 + bl SetIconSpriteData _080B3DD8: movs r0, #0 pop {r1} @@ -370612,16 +370612,16 @@ _080B3DD8: .align 2, 0 _080B3DE0: .4byte gUnknown_852B460 _080B3DE4: .4byte gUnknown_20205AC - thumb_func_end sub_080B3DB0 + thumb_func_end FldEff_QuestionMarkIcon - thumb_func_start sub_080B3DE8 -sub_080B3DE8: @ 0x080B3DE8 + thumb_func_start FldEff_HeartIcon +FldEff_HeartIcon: @ 0x080B3DE8 push {r4, lr} ldr r0, _080B3E28 movs r1, #0 movs r2, #0 movs r3, #0x52 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -370634,7 +370634,7 @@ sub_080B3DE8: @ 0x080B3DE8 adds r0, r4, #0 movs r1, #0x2e movs r2, #0 - bl sub_080B3E30 + bl SetIconSpriteData ldrb r1, [r4, #5] movs r0, #0xf ands r0, r1 @@ -370649,10 +370649,10 @@ _080B3E1E: .align 2, 0 _080B3E28: .4byte gUnknown_852B478 _080B3E2C: .4byte gUnknown_20205AC - thumb_func_end sub_080B3DE8 + thumb_func_end FldEff_HeartIcon - thumb_func_start sub_080B3E30 -sub_080B3E30: @ 0x080B3E30 + thumb_func_start SetIconSpriteData +SetIconSpriteData: @ 0x080B3E30 push {r4, lr} lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -370689,10 +370689,10 @@ sub_080B3E30: @ 0x080B3E30 .align 2, 0 _080B3E74: .4byte gUnknown_20388A8 _080B3E78: .4byte 0x0000FFFB - thumb_func_end sub_080B3E30 + thumb_func_end SetIconSpriteData - thumb_func_start sub_080B3E7C -sub_080B3E7C: @ 0x080B3E7C + thumb_func_start SpriteCB_TrainerIcons +SpriteCB_TrainerIcons: @ 0x080B3E7C push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -370770,10 +370770,10 @@ _080B3F0A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B3E7C + thumb_func_end SpriteCB_TrainerIcons - thumb_func_start sub_080B3F14 -sub_080B3F14: @ 0x080B3F14 + thumb_func_start GetCurrentApproachingTrainerEventObjectId +GetCurrentApproachingTrainerEventObjectId: @ 0x080B3F14 push {lr} ldr r0, _080B3F24 ldrb r0, [r0] @@ -370793,10 +370793,10 @@ _080B3F30: bx r1 .align 2, 0 _080B3F34: .4byte gUnknown_3005DF0 - thumb_func_end sub_080B3F14 + thumb_func_end GetCurrentApproachingTrainerEventObjectId - thumb_func_start sub_080B3F38 -sub_080B3F38: @ 0x080B3F38 + thumb_func_start GetChosenApproachingTrainerEventObjectId +GetChosenApproachingTrainerEventObjectId: @ 0x080B3F38 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -370820,7 +370820,7 @@ _080B3F58: bx r1 .align 2, 0 _080B3F5C: .4byte gUnknown_3005DF0 - thumb_func_end sub_080B3F38 + thumb_func_end GetChosenApproachingTrainerEventObjectId thumb_func_start sub_080B3F60 sub_080B3F60: @ 0x080B3F60 @@ -370845,7 +370845,7 @@ sub_080B3F60: @ 0x080B3F60 ldrb r0, [r0, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c - bl sub_08093170 + bl GetOppositeDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_08092CA0 @@ -370858,7 +370858,7 @@ sub_080B3F60: @ 0x080B3F60 ldrb r1, [r0, #5] ldrb r2, [r0, #4] movs r0, #0xff - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript b _080B3FF6 .align 2, 0 _080B3FB0: .4byte gUnknown_3005E0C @@ -370888,7 +370888,7 @@ _080B3FC8: ldrb r1, [r0, #5] ldrb r2, [r0, #4] movs r0, #0xff - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript _080B3FF6: movs r0, #0xff bl sub_0809B720 @@ -370910,8 +370910,8 @@ sub_080B4010: @ 0x080B4010 _080B4018: .4byte gUnknown_20388A0 thumb_func_end sub_080B4010 - thumb_func_start sub_080B401C -sub_080B401C: @ 0x080B401C + thumb_func_start GetRoute119WaterTileNum +GetRoute119WaterTileNum: @ 0x080B401C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -371010,10 +371010,10 @@ _080B40CC: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080B401C + thumb_func_end GetRoute119WaterTileNum - thumb_func_start sub_080B40DC -sub_080B40DC: @ 0x080B40DC + thumb_func_start CheckFeebas +CheckFeebas: @ 0x080B40DC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -371032,7 +371032,7 @@ sub_080B40DC: @ 0x080B40DC adds r4, #0xe adds r0, r5, #0 adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer ldrh r0, [r5] subs r0, #7 strh r0, [r5] @@ -371122,7 +371122,7 @@ _080B41A2: movs r3, #0 ldrsh r1, [r2, r3] adds r2, r7, #0 - bl sub_080B401C + bl GetRoute119WaterTileNum lsls r0, r0, #0x10 lsrs r1, r0, #0x10 movs r5, #0 @@ -371151,7 +371151,7 @@ _080B41D4: _080B41E4: .4byte gUnknown_3005AEC _080B41E8: .4byte 0x00002E6A _080B41EC: .4byte 0x000001BF - thumb_func_end sub_080B40DC + thumb_func_end CheckFeebas thumb_func_start sub_080B41F0 sub_080B41F0: @ 0x080B41F0 @@ -371181,8 +371181,8 @@ sub_080B4210: @ 0x080B4210 _080B421C: .4byte gUnknown_20388A4 thumb_func_end sub_080B4210 - thumb_func_start sub_080B4220 -sub_080B4220: @ 0x080B4220 + thumb_func_start ChooseWildMonIndex_Land +ChooseWildMonIndex_Land: @ 0x080B4220 push {lr} bl Random lsls r0, r0, #0x10 @@ -371287,10 +371287,10 @@ _080B42D6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B4220 + thumb_func_end ChooseWildMonIndex_Land - thumb_func_start sub_080B42DC -sub_080B42DC: @ 0x080B42DC + thumb_func_start ChooseWildMonIndex_WaterRock +ChooseWildMonIndex_WaterRock: @ 0x080B42DC push {lr} bl Random lsls r0, r0, #0x10 @@ -371336,10 +371336,10 @@ _080B432A: _080B432C: pop {r1} bx r1 - thumb_func_end sub_080B42DC + thumb_func_end ChooseWildMonIndex_WaterRock - thumb_func_start sub_080B4330 -sub_080B4330: @ 0x080B4330 + thumb_func_start ChooseWildMonIndex_Fishing +ChooseWildMonIndex_Fishing: @ 0x080B4330 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -371427,10 +371427,10 @@ _080B43C4: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080B4330 + thumb_func_end ChooseWildMonIndex_Fishing - thumb_func_start sub_080B43CC -sub_080B43CC: @ 0x080B43CC + thumb_func_start ChooseWildMonLevel +ChooseWildMonLevel: @ 0x080B43CC push {r4, r5, r6, r7, lr} adds r4, r0, #0 ldrb r0, [r4, #1] @@ -371458,11 +371458,11 @@ _080B43E2: ldr r5, _080B4434 adds r0, r5, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B4442 adds r0, r5, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x37 @@ -371498,10 +371498,10 @@ _080B4448: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B43CC + thumb_func_end ChooseWildMonLevel - thumb_func_start sub_080B4450 -sub_080B4450: @ 0x080B4450 + thumb_func_start GetCurrentMapWildMonHeaderId +GetCurrentMapWildMonHeaderId: @ 0x080B4450 push {r4, r5, r6, lr} movs r4, #0 ldr r0, _080B44A0 @@ -371568,10 +371568,10 @@ _080B44C6: bx r1 .align 2, 0 _080B44CC: .4byte 0x0000FFFF - thumb_func_end sub_080B4450 + thumb_func_end GetCurrentMapWildMonHeaderId - thumb_func_start sub_080B44D0 -sub_080B44D0: @ 0x080B44D0 + thumb_func_start PickWildMonNature +PickWildMonNature: @ 0x080B44D0 push {r4, r5, r6, r7, lr} sub sp, #0x1c bl sub_080FC910 @@ -371586,7 +371586,7 @@ sub_080B44D0: @ 0x080B44D0 lsrs r0, r0, #0x10 cmp r0, #0x4f bhi _080B4566 - bl sub_080FCC28 + bl SafariZoneGetActivePokeblock adds r7, r0, #0 cmp r7, #0 beq _080B4566 @@ -371651,11 +371651,11 @@ _080B4566: ldr r4, _080B459C adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B45A4 adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x1c @@ -371669,7 +371669,7 @@ _080B4566: bne _080B45A4 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData b _080B45AC .align 2, 0 _080B459C: .4byte gUnknown_2024190 @@ -371691,10 +371691,10 @@ _080B45B6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B44D0 + thumb_func_end PickWildMonNature - thumb_func_start sub_080B45C0 -sub_080B45C0: @ 0x080B45C0 + thumb_func_start CreateWildMon +CreateWildMon: @ 0x080B45C0 push {r4, r5, r6, r7, lr} sub sp, #0xc lsls r0, r0, #0x10 @@ -371725,11 +371725,11 @@ _080B45F0: ldr r5, _080B4654 adds r0, r5, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B4680 adds r0, r5, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x38 @@ -371744,16 +371744,16 @@ _080B45F0: beq _080B4680 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r4, #0 - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xfe @@ -371766,7 +371766,7 @@ _080B4654: .4byte gUnknown_2024190 _080B4658: movs r4, #0xfe _080B465A: - bl sub_080B44D0 + bl PickWildMonNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080B467C @@ -371778,12 +371778,12 @@ _080B465A: adds r1, r6, #0 adds r2, r7, #0 movs r3, #0x20 - bl sub_08067ADC + bl CreateMonWithGenderNatureLetter b _080B4698 .align 2, 0 _080B467C: .4byte gUnknown_20243E8 _080B4680: - bl sub_080B44D0 + bl PickWildMonNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080B46A0 @@ -371792,7 +371792,7 @@ _080B4680: adds r1, r6, #0 adds r2, r7, #0 movs r3, #0x20 - bl sub_08067A74 + bl CreateMonWithNature _080B4698: add sp, #0xc pop {r4, r5, r6, r7} @@ -371800,10 +371800,10 @@ _080B4698: bx r0 .align 2, 0 _080B46A0: .4byte gUnknown_20243E8 - thumb_func_end sub_080B45C0 + thumb_func_end CreateWildMon - thumb_func_start sub_080B46A4 -sub_080B46A4: @ 0x080B46A4 + thumb_func_start TryGenerateWildMon +TryGenerateWildMon: @ 0x080B46A4 push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 @@ -371831,7 +371831,7 @@ _080B46CE: movs r1, #8 movs r2, #0x2a mov r3, sp - bl sub_080B51A8 + bl TryGetAbilityInfluencedWildMonIndex lsls r0, r0, #0x18 cmp r0, #0 bne _080B4712 @@ -371839,23 +371839,23 @@ _080B46CE: movs r1, #0xd movs r2, #9 mov r3, sp - bl sub_080B51A8 + bl TryGetAbilityInfluencedWildMonIndex lsls r0, r0, #0x18 cmp r0, #0 bne _080B4712 - bl sub_080B4220 + bl ChooseWildMonIndex_Land b _080B470E _080B46F8: ldr r0, [r5, #4] movs r1, #0xd movs r2, #9 mov r3, sp - bl sub_080B51A8 + bl TryGetAbilityInfluencedWildMonIndex lsls r0, r0, #0x18 cmp r0, #0 bne _080B4712 _080B470A: - bl sub_080B42DC + bl ChooseWildMonIndex_WaterRock _080B470E: mov r1, sp strb r0, [r1] @@ -371865,7 +371865,7 @@ _080B4712: lsls r1, r1, #2 ldr r0, [r5, #4] adds r0, r0, r1 - bl sub_080B43CC + bl ChooseWildMonLevel lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #1 @@ -371873,7 +371873,7 @@ _080B4712: cmp r0, #0 beq _080B4738 adds r0, r4, #0 - bl sub_080B5024 + bl IsWildLevelAllowedByRepel lsls r0, r0, #0x18 cmp r0, #0 beq _080B4758 @@ -371889,7 +371889,7 @@ _080B4738: cmp r0, #0 beq _080B4760 adds r0, r4, #0 - bl sub_080B508C + bl IsAbilityAllowingEncounter lsls r0, r0, #0x18 cmp r0, #0 bne _080B4760 @@ -371906,14 +371906,14 @@ _080B4760: adds r0, r0, r1 ldrh r0, [r0, #2] adds r1, r4, #0 - bl sub_080B45C0 + bl CreateWildMon movs r0, #1 _080B4774: add sp, #4 pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080B46A4 + thumb_func_end TryGenerateWildMon thumb_func_start GenerateFishingWildMon GenerateFishingWildMon: @ 0x080B477C @@ -371921,20 +371921,20 @@ GenerateFishingWildMon: @ 0x080B477C adds r5, r0, #0 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080B4330 + bl ChooseWildMonIndex_Fishing adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x16 ldr r0, [r5, #4] adds r0, r0, r4 - bl sub_080B43CC + bl ChooseWildMonLevel adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, [r5, #4] adds r0, r4, r0 ldrh r0, [r0, #2] - bl sub_080B45C0 + bl CreateWildMon ldr r0, [r5, #4] adds r4, r4, r0 ldrh r0, [r4, #2] @@ -371944,8 +371944,8 @@ GenerateFishingWildMon: @ 0x080B477C .align 2, 0 thumb_func_end GenerateFishingWildMon - thumb_func_start sub_080B47B4 -sub_080B47B4: @ 0x080B47B4 + thumb_func_start SetUpMassOutbreakEncounter +SetUpMassOutbreakEncounter: @ 0x080B47B4 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -371958,7 +371958,7 @@ sub_080B47B4: @ 0x080B47B4 ldr r1, _080B47E0 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080B5024 + bl IsWildLevelAllowedByRepel lsls r0, r0, #0x18 cmp r0, #0 bne _080B47E4 @@ -371976,7 +371976,7 @@ _080B47E4: adds r2, #4 adds r1, r1, r2 ldrb r1, [r1] - bl sub_080B45C0 + bl CreateWildMon movs r4, #0 _080B47FA: ldr r0, _080B4824 @@ -371989,7 +371989,7 @@ _080B47FA: lsls r2, r4, #0x18 lsrs r2, r2, #0x18 ldr r0, _080B4830 - bl sub_08068D34 + bl SetMonMoveSlot adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -372005,10 +372005,10 @@ _080B4824: .4byte gUnknown_3005AEC _080B4828: .4byte 0x00002B90 _080B482C: .4byte 0x00002B98 _080B4830: .4byte gUnknown_20243E8 - thumb_func_end sub_080B47B4 + thumb_func_end SetUpMassOutbreakEncounter - thumb_func_start sub_080B4834 -sub_080B4834: @ 0x080B4834 + thumb_func_start DoMassOutbreakEncounterTest +DoMassOutbreakEncounterTest: @ 0x080B4834 push {r4, lr} ldr r4, _080B4884 ldr r2, [r4] @@ -372057,10 +372057,10 @@ _080B4896: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080B4834 + thumb_func_end DoMassOutbreakEncounterTest - thumb_func_start sub_080B489C -sub_080B489C: @ 0x080B489C + thumb_func_start DoWildEncounterRateDiceRoll +DoWildEncounterRateDiceRoll: @ 0x080B489C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 @@ -372083,10 +372083,10 @@ _080B48C2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080B489C + thumb_func_end DoWildEncounterRateDiceRoll - thumb_func_start sub_080B48C8 -sub_080B48C8: @ 0x080B48C8 + thumb_func_start DoWildEncounterRateTest +DoWildEncounterRateTest: @ 0x080B48C8 push {r4, lr} sub sp, #4 str r0, [sp] @@ -372095,7 +372095,7 @@ sub_080B48C8: @ 0x080B48C8 lsls r0, r0, #4 str r0, [sp] movs r0, #6 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _080B48F2 @@ -372108,19 +372108,19 @@ sub_080B48C8: @ 0x080B48C8 str r0, [sp] _080B48F2: mov r0, sp - bl sub_080B5208 + bl ApplyFluteEncounterRateMod mov r0, sp - bl sub_080B5248 + bl ApplyCleanseTagEncounterRateMod cmp r4, #0 bne _080B496E ldr r4, _080B4934 adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B496E adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372178,7 +372178,7 @@ _080B497A: ldr r0, [sp] lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080B489C + bl DoWildEncounterRateDiceRoll lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #4 @@ -372187,10 +372187,10 @@ _080B497A: bx r1 .align 2, 0 _080B4990: .4byte gUnknown_3005AEC - thumb_func_end sub_080B48C8 + thumb_func_end DoWildEncounterRateTest - thumb_func_start sub_080B4994 -sub_080B4994: @ 0x080B4994 + thumb_func_start DoGlobalWildEncounterDiceRoll +DoGlobalWildEncounterDiceRoll: @ 0x080B4994 push {lr} bl Random lsls r0, r0, #0x10 @@ -372209,10 +372209,10 @@ _080B49B2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B4994 + thumb_func_end DoGlobalWildEncounterDiceRoll - thumb_func_start sub_080B49B8 -sub_080B49B8: @ 0x080B49B8 + thumb_func_start AreLegendariesInSootopolisPreventingEncounters +AreLegendariesInSootopolisPreventingEncounters: @ 0x080B49B8 push {lr} ldr r0, _080B49D4 ldr r0, [r0] @@ -372234,10 +372234,10 @@ _080B49DA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B49B8 + thumb_func_end AreLegendariesInSootopolisPreventingEncounters - thumb_func_start sub_080B49E0 -sub_080B49E0: @ 0x080B49E0 + thumb_func_start StandardWildEncounter +StandardWildEncounter: @ 0x080B49E0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -372254,7 +372254,7 @@ sub_080B49E0: @ 0x080B49E0 bne _080B49FE b _080B4C56 _080B49FE: - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _080B4A7C @@ -372266,12 +372266,12 @@ _080B49FE: lsls r0, r0, #1 cmp r1, r0 bne _080B4A88 - bl sub_081A7A80 + bl GetBattlePikeWildMonHeaderId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r7, r6 beq _080B4A30 - bl sub_080B4994 + bl DoGlobalWildEncounterDiceRoll lsls r0, r0, #0x18 cmp r0, #0 bne _080B4A30 @@ -372286,7 +372286,7 @@ _080B4A30: ldr r0, [r4] ldrb r0, [r0] movs r1, #0 - bl sub_080B48C8 + bl DoWildEncounterRateTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372296,7 +372296,7 @@ _080B4A50: ldr r0, [r4] movs r1, #0 movs r2, #2 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372304,12 +372304,12 @@ _080B4A50: b _080B4C56 _080B4A64: movs r0, #1 - bl sub_081A7910 + bl TryGenerateBattlePikeWildMon cmp r0, #0 bne _080B4A70 b _080B4C56 _080B4A70: - bl sub_080AFFAC + bl BattleSetup_StartBattlePikeWildBattle movs r0, #1 b _080B4C58 .align 2, 0 @@ -372330,7 +372330,7 @@ _080B4A90: ldrh r5, [r0] cmp r7, r6 beq _080B4AAA - bl sub_080B4994 + bl DoGlobalWildEncounterDiceRoll lsls r0, r0, #0x18 cmp r0, #0 bne _080B4AAA @@ -372345,7 +372345,7 @@ _080B4AAA: ldr r0, [r4] ldrb r0, [r0] movs r1, #0 - bl sub_080B48C8 + bl DoWildEncounterRateTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372355,14 +372355,14 @@ _080B4ACA: ldr r0, [r4] movs r1, #0 movs r2, #2 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080B4ADE b _080B4C56 _080B4ADE: - bl sub_081A997C + bl GenerateBattlePyramidWildMon b _080B4C4E .align 2, 0 _080B4AE4: .4byte 0x00000169 @@ -372392,7 +372392,7 @@ _080B4AF4: _080B4B1C: cmp r7, r6 beq _080B4B2C - bl sub_080B4994 + bl DoGlobalWildEncounterDiceRoll lsls r0, r0, #0x18 cmp r0, #0 bne _080B4B2C @@ -372406,25 +372406,25 @@ _080B4B2C: ldr r0, [r0] ldrb r0, [r0] movs r1, #0 - bl sub_080B48C8 + bl DoWildEncounterRateTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080B4B4A b _080B4C56 _080B4B4A: - bl sub_08161DF0 + bl TryStartRoamerEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080B4C12 - bl sub_080B4834 + bl DoMassOutbreakEncounterTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4B70 movs r0, #3 - bl sub_080B47B4 + bl SetUpMassOutbreakEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372438,7 +372438,7 @@ _080B4B70: ldr r0, [r0] movs r1, #0 movs r2, #3 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372454,7 +372454,7 @@ _080B4B94: cmp r0, #1 beq _080B4BBC movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _080B4C56 @@ -372465,7 +372465,7 @@ _080B4B94: cmp r0, #1 bne _080B4C56 _080B4BBC: - bl sub_080B49B8 + bl AreLegendariesInSootopolisPreventingEncounters lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372482,7 +372482,7 @@ _080B4BBC: beq _080B4C56 cmp r8, sb beq _080B4BEA - bl sub_080B4994 + bl DoGlobalWildEncounterDiceRoll lsls r0, r0, #0x18 cmp r0, #0 beq _080B4C56 @@ -372495,12 +372495,12 @@ _080B4BEA: ldr r0, [r4] ldrb r0, [r0] movs r1, #0 - bl sub_080B48C8 + bl DoWildEncounterRateTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4C56 - bl sub_08161DF0 + bl TryStartRoamerEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372511,11 +372511,11 @@ _080B4C12: ldr r1, _080B4C38 adds r0, r0, r1 ldrb r0, [r0, #0xc] - bl sub_080B5024 + bl IsWildLevelAllowedByRepel lsls r0, r0, #0x18 cmp r0, #0 beq _080B4C56 - bl sub_080B0028 + bl BattleSetup_StartRoamerBattle movs r0, #1 b _080B4C58 .align 2, 0 @@ -372526,13 +372526,13 @@ _080B4C3C: ldr r0, [r4] movs r1, #1 movs r2, #3 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4C56 _080B4C4E: - bl sub_080AFF94 + bl BattleSetup_StartWildBattle movs r0, #1 b _080B4C58 _080B4C56: @@ -372544,12 +372544,12 @@ _080B4C58: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080B49E0 + thumb_func_end StandardWildEncounter - thumb_func_start sub_080B4C64 -sub_080B4C64: @ 0x080B4C64 + thumb_func_start RockSmashWildEncounter +RockSmashWildEncounter: @ 0x080B4C64 push {r4, lr} - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r2, r0, #0x10 ldr r0, _080B4CB4 @@ -372566,7 +372566,7 @@ sub_080B4C64: @ 0x080B4C64 beq _080B4CAC ldrb r0, [r4] movs r1, #1 - bl sub_080B48C8 + bl DoWildEncounterRateTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372574,12 +372574,12 @@ sub_080B4C64: @ 0x080B4C64 adds r0, r4, #0 movs r1, #2 movs r2, #3 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #1 bne _080B4CC0 - bl sub_080AFF94 + bl BattleSetup_StartWildBattle _080B4CAC: ldr r0, _080B4CBC strh r4, [r0] @@ -372598,10 +372598,10 @@ _080B4CC6: bx r0 .align 2, 0 _080B4CCC: .4byte gUnknown_2037290 - thumb_func_end sub_080B4C64 + thumb_func_end RockSmashWildEncounter - thumb_func_start sub_080B4CD0 -sub_080B4CD0: @ 0x080B4CD0 + thumb_func_start SweetScentWildEncounter +SweetScentWildEncounter: @ 0x080B4CD0 push {r4, r5, lr} sub sp, #4 mov r5, sp @@ -372609,7 +372609,7 @@ sub_080B4CD0: @ 0x080B4CD0 mov r0, sp adds r1, r5, #0 bl PlayerGetDestCoords - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r0, _080B4D30 @@ -372621,7 +372621,7 @@ sub_080B4CD0: @ 0x080B4CD0 lsls r0, r0, #1 cmp r1, r0 bne _080B4D3C - bl sub_081A7A80 + bl GetBattlePikeWildMonHeaderId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r1, _080B4D38 @@ -372633,7 +372633,7 @@ sub_080B4CD0: @ 0x080B4CD0 ldr r0, [r0] movs r1, #0 movs r2, #0 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372641,8 +372641,8 @@ sub_080B4CD0: @ 0x080B4CD0 b _080B4E4A _080B4D22: movs r0, #0 - bl sub_081A7910 - bl sub_080AFFAC + bl TryGenerateBattlePikeWildMon + bl BattleSetup_StartBattlePikeWildBattle movs r0, #1 b _080B4E4C .align 2, 0 @@ -372669,12 +372669,12 @@ _080B4D44: ldr r0, [r0] movs r1, #0 movs r2, #0 - bl sub_080B46A4 + bl TryGenerateWildMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4E4A - bl sub_081A997C + bl GenerateBattlePyramidWildMon b _080B4E42 .align 2, 0 _080B4D74: .4byte 0x00000169 @@ -372704,18 +372704,18 @@ _080B4D84: ldr r4, [r0] cmp r4, #0 beq _080B4E4A - bl sub_08161DF0 + bl TryStartRoamerEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080B4E2C - bl sub_080B4834 + bl DoMassOutbreakEncounterTest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4DD8 movs r0, #0 - bl sub_080B47B4 + bl SetUpMassOutbreakEncounter b _080B4E42 .align 2, 0 _080B4DD4: .4byte gUnknown_852D9F4 @@ -372723,7 +372723,7 @@ _080B4DD8: adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_080B46A4 + bl TryGenerateWildMon b _080B4E42 _080B4DE4: mov r0, sp @@ -372739,7 +372739,7 @@ _080B4DE4: lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4E4A - bl sub_080B49B8 + bl AreLegendariesInSootopolisPreventingEncounters lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -372753,13 +372753,13 @@ _080B4DE4: ldr r4, [r0] cmp r4, #0 beq _080B4E4A - bl sub_08161DF0 + bl TryStartRoamerEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4E38 _080B4E2C: - bl sub_080B0028 + bl BattleSetup_StartRoamerBattle movs r0, #1 b _080B4E4C .align 2, 0 @@ -372768,9 +372768,9 @@ _080B4E38: adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_080B46A4 + bl TryGenerateWildMon _080B4E42: - bl sub_080AFF94 + bl BattleSetup_StartWildBattle movs r0, #1 b _080B4E4C _080B4E4A: @@ -372780,12 +372780,12 @@ _080B4E4C: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080B4CD0 + thumb_func_end SweetScentWildEncounter - thumb_func_start sub_080B4E54 -sub_080B4E54: @ 0x080B4E54 + thumb_func_start DoesCurrentMapHaveFishingMons +DoesCurrentMapHaveFishingMons: @ 0x080B4E54 push {lr} - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r2, r0, #0x10 ldr r0, _080B4E7C @@ -372811,33 +372811,33 @@ _080B4E86: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B4E54 + thumb_func_end DoesCurrentMapHaveFishingMons - thumb_func_start sub_080B4E8C -sub_080B4E8C: @ 0x080B4E8C + thumb_func_start FishingWildEncounter +FishingWildEncounter: @ 0x080B4E8C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080B40DC + bl CheckFeebas lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B4EBC ldr r4, _080B4EB8 adds r0, r4, #0 - bl sub_080B43CC + bl ChooseWildMonLevel adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldrh r4, [r4, #2] adds r0, r4, #0 - bl sub_080B45C0 + bl CreateWildMon b _080B4EDC .align 2, 0 _080B4EB8: .4byte gUnknown_852E724 _080B4EBC: ldr r4, _080B4EF4 - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 lsls r1, r0, #2 @@ -372855,21 +372855,21 @@ _080B4EDC: bl IncrementGameStat adds r0, r4, #0 bl sub_080EE55C - bl sub_080AFF94 + bl BattleSetup_StartWildBattle pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080B4EF4: .4byte gUnknown_852D9F4 - thumb_func_end sub_080B4E8C + thumb_func_end FishingWildEncounter - thumb_func_start sub_080B4EF8 -sub_080B4EF8: @ 0x080B4EF8 + thumb_func_start GetLocalWildMon +GetLocalWildMon: @ 0x080B4EF8 push {r4, r5, r6, lr} adds r6, r0, #0 movs r0, #0 strb r0, [r6] - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r3, r0, #0x10 ldr r0, _080B4F30 @@ -372902,7 +372902,7 @@ _080B4F38: _080B4F3E: movs r0, #1 strb r0, [r6] - bl sub_080B42DC + bl ChooseWildMonIndex_WaterRock lsls r0, r0, #0x18 ldr r1, [r4, #4] b _080B4F78 @@ -372918,12 +372918,12 @@ _080B4F4C: bls _080B4F70 movs r0, #1 strb r0, [r6] - bl sub_080B42DC + bl ChooseWildMonIndex_WaterRock lsls r0, r0, #0x18 ldr r1, [r4, #4] b _080B4F78 _080B4F70: - bl sub_080B4220 + bl ChooseWildMonIndex_Land lsls r0, r0, #0x18 ldr r1, [r5, #4] _080B4F78: @@ -372934,12 +372934,12 @@ _080B4F7E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080B4EF8 + thumb_func_end GetLocalWildMon - thumb_func_start sub_080B4F84 -sub_080B4F84: @ 0x080B4F84 + thumb_func_start GetLocalWaterMon +GetLocalWaterMon: @ 0x080B4F84 push {r4, lr} - bl sub_080B4450 + bl GetCurrentMapWildMonHeaderId lsls r0, r0, #0x10 lsrs r2, r0, #0x10 ldr r0, _080B4FB8 @@ -372954,7 +372954,7 @@ sub_080B4F84: @ 0x080B4F84 ldr r4, [r0] cmp r4, #0 beq _080B4FC0 - bl sub_080B42DC + bl ChooseWildMonIndex_WaterRock lsls r0, r0, #0x18 ldr r1, [r4, #4] lsrs r0, r0, #0x16 @@ -372970,16 +372970,16 @@ _080B4FC2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080B4F84 + thumb_func_end GetLocalWaterMon - thumb_func_start sub_080B4FC8 -sub_080B4FC8: @ 0x080B4FC8 + thumb_func_start UpdateRepelCounter +UpdateRepelCounter: @ 0x080B4FC8 push {r4, r5, lr} bl InBattlePike lsls r0, r0, #0x18 cmp r0, #0 bne _080B501C - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080B501C @@ -373014,10 +373014,10 @@ _080B501E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080B4FC8 + thumb_func_end UpdateRepelCounter - thumb_func_start sub_080B5024 -sub_080B5024: @ 0x080B5024 + thumb_func_start IsWildLevelAllowedByRepel +IsWildLevelAllowedByRepel: @ 0x080B5024 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -373035,17 +373035,17 @@ _080B5038: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080B5078 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B5078 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -373069,21 +373069,21 @@ _080B5084: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B5024 + thumb_func_end IsWildLevelAllowedByRepel - thumb_func_start sub_080B508C -sub_080B508C: @ 0x080B508C + thumb_func_start IsAbilityAllowingEncounter +IsAbilityAllowingEncounter: @ 0x080B508C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _080B50DC adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B50E0 adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x33 @@ -373093,7 +373093,7 @@ sub_080B508C: @ 0x080B508C _080B50B2: adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #5 @@ -373118,10 +373118,10 @@ _080B50E2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080B508C + thumb_func_end IsAbilityAllowingEncounter - thumb_func_start sub_080B50E8 -sub_080B50E8: @ 0x080B50E8 + thumb_func_start TryGetRandomWildMonIndexByType +TryGetRandomWildMonIndexByType: @ 0x080B50E8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -373224,10 +373224,10 @@ _080B5194: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B50E8 + thumb_func_end TryGetRandomWildMonIndexByType - thumb_func_start sub_080B51A8 -sub_080B51A8: @ 0x080B51A8 + thumb_func_start TryGetAbilityInfluencedWildMonIndex +TryGetAbilityInfluencedWildMonIndex: @ 0x080B51A8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -373240,11 +373240,11 @@ sub_080B51A8: @ 0x080B51A8 ldr r4, _080B51F8 adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080B51FC adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r5 @@ -373260,7 +373260,7 @@ sub_080B51A8: @ 0x080B51A8 adds r1, r6, #0 movs r2, #0xc mov r3, r8 - bl sub_080B50E8 + bl TryGetRandomWildMonIndexByType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080B51FE @@ -373274,10 +373274,10 @@ _080B51FE: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080B51A8 + thumb_func_end TryGetAbilityInfluencedWildMonIndex - thumb_func_start sub_080B5208 -sub_080B5208: @ 0x080B5208 + thumb_func_start ApplyFluteEncounterRateMod +ApplyFluteEncounterRateMod: @ 0x080B5208 push {r4, lr} adds r4, r0, #0 ldr r0, _080B5224 @@ -373309,15 +373309,15 @@ _080B523C: bx r0 .align 2, 0 _080B5244: .4byte 0x000008AE - thumb_func_end sub_080B5208 + thumb_func_end ApplyFluteEncounterRateMod - thumb_func_start sub_080B5248 -sub_080B5248: @ 0x080B5248 + thumb_func_start ApplyCleanseTagEncounterRateMod +ApplyCleanseTagEncounterRateMod: @ 0x080B5248 push {r4, lr} adds r4, r0, #0 ldr r0, _080B526C movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0xbe bne _080B5264 ldr r0, [r4] @@ -373331,10 +373331,10 @@ _080B5264: bx r0 .align 2, 0 _080B526C: .4byte gUnknown_2024190 - thumb_func_end sub_080B5248 + thumb_func_end ApplyCleanseTagEncounterRateMod - thumb_func_start sub_080B5270 -sub_080B5270: @ 0x080B5270 + thumb_func_start FieldEffectStart +FieldEffectStart: @ 0x080B5270 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -373358,7 +373358,7 @@ _080B528E: mov r0, sp adds r1, r4, #0 bl _call_via_r2 - thumb_func_end sub_080B5270 + thumb_func_end FieldEffectStart thumb_func_start sub_080B52A0 sub_080B52A0: @ 0x080B52A0 @@ -373375,21 +373375,21 @@ _080B52B0: .4byte gUnknown_8289F5C _080B52B4: .4byte gUnknown_8536E9C thumb_func_end sub_080B52A0 - thumb_func_start sub_080B52B8 -sub_080B52B8: @ 0x080B52B8 + thumb_func_start FieldEffectCmd_loadtiles +FieldEffectCmd_loadtiles: @ 0x080B52B8 push {lr} ldr r1, [r0] adds r1, #1 str r1, [r0] - bl sub_080B5394 + bl FieldEffectScript_LoadTiles movs r0, #1 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B52B8 + thumb_func_end FieldEffectCmd_loadtiles - thumb_func_start sub_080B52CC -sub_080B52CC: @ 0x080B52CC + thumb_func_start FieldEffectCmd_loadfadedpal +FieldEffectCmd_loadfadedpal: @ 0x080B52CC push {lr} ldr r1, [r0] adds r1, #1 @@ -373399,33 +373399,33 @@ sub_080B52CC: @ 0x080B52CC pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B52CC + thumb_func_end FieldEffectCmd_loadfadedpal - thumb_func_start sub_080B52E0 -sub_080B52E0: @ 0x080B52E0 + thumb_func_start FieldEffectCmd_loadpal +FieldEffectCmd_loadpal: @ 0x080B52E0 push {lr} ldr r1, [r0] adds r1, #1 str r1, [r0] - bl sub_080B53EC + bl FieldEffectScript_LoadPalette movs r0, #1 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B52E0 + thumb_func_end FieldEffectCmd_loadpal - thumb_func_start sub_080B52F4 -sub_080B52F4: @ 0x080B52F4 + thumb_func_start FieldEffectCmd_callnative +FieldEffectCmd_callnative: @ 0x080B52F4 push {lr} ldr r2, [r0] adds r2, #1 str r2, [r0] - bl sub_080B5404 + bl FieldEffectScript_CallNative movs r0, #1 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B52F4 + thumb_func_end FieldEffectCmd_callnative thumb_func_start sub_080B5308 sub_080B5308: @ 0x080B5308 @@ -373442,12 +373442,12 @@ FieldEffectCmd_loadgfx_callnative: @ 0x080B530C adds r0, #1 str r0, [r4] adds r0, r4, #0 - bl sub_080B5394 + bl FieldEffectScript_LoadTiles adds r0, r4, #0 bl sub_080B53C4 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080B5404 + bl FieldEffectScript_CallNative movs r0, #1 pop {r4, r5} pop {r1} @@ -373463,10 +373463,10 @@ FieldEffectCmd_loadtiles_callnative: @ 0x080B5334 adds r0, #1 str r0, [r4] adds r0, r4, #0 - bl sub_080B5394 + bl FieldEffectScript_LoadTiles adds r0, r4, #0 adds r1, r5, #0 - bl sub_080B5404 + bl FieldEffectScript_CallNative movs r0, #1 pop {r4, r5} pop {r1} @@ -373486,7 +373486,7 @@ FieldEffectCmd_loadfadedpal_callnative: @ 0x080B5358 bl sub_080B53C4 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080B5404 + bl FieldEffectScript_CallNative movs r0, #1 pop {r4, r5} pop {r1} @@ -373510,8 +373510,8 @@ FieldEffectScript_ReadWord: @ 0x080B537C bx lr thumb_func_end FieldEffectScript_ReadWord - thumb_func_start sub_080B5394 -sub_080B5394: @ 0x080B5394 + thumb_func_start FieldEffectScript_LoadTiles +FieldEffectScript_LoadTiles: @ 0x080B5394 push {r4, r5, lr} adds r4, r0, #0 bl FieldEffectScript_ReadWord @@ -373523,7 +373523,7 @@ sub_080B5394: @ 0x080B5394 cmp r0, r1 bne _080B53B2 adds r0, r5, #0 - bl sub_08008210 + bl LoadSpriteSheet _080B53B2: ldr r0, [r4] adds r0, #4 @@ -373533,7 +373533,7 @@ _080B53B2: bx r0 .align 2, 0 _080B53C0: .4byte 0xFFFF0000 - thumb_func_end sub_080B5394 + thumb_func_end FieldEffectScript_LoadTiles thumb_func_start sub_080B53C4 sub_080B53C4: @ 0x080B53C4 @@ -373543,10 +373543,10 @@ sub_080B53C4: @ 0x080B53C4 adds r4, r0, #0 bl LoadSpritePalette ldrh r0, [r4, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080AB714 + bl UpdateSpritePaletteWithWeather ldr r0, [r5] adds r0, #4 str r0, [r5] @@ -373555,8 +373555,8 @@ sub_080B53C4: @ 0x080B53C4 bx r0 thumb_func_end sub_080B53C4 - thumb_func_start sub_080B53EC -sub_080B53EC: @ 0x080B53EC + thumb_func_start FieldEffectScript_LoadPalette +FieldEffectScript_LoadPalette: @ 0x080B53EC push {r4, lr} adds r4, r0, #0 bl FieldEffectScript_ReadWord @@ -373567,17 +373567,17 @@ sub_080B53EC: @ 0x080B53EC pop {r4} pop {r0} bx r0 - thumb_func_end sub_080B53EC + thumb_func_end FieldEffectScript_LoadPalette - thumb_func_start sub_080B5404 -sub_080B5404: @ 0x080B5404 + thumb_func_start FieldEffectScript_CallNative +FieldEffectScript_CallNative: @ 0x080B5404 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 bl FieldEffectScript_ReadWord bl _call_via_r0 str r0, [r5] - thumb_func_end sub_080B5404 + thumb_func_end FieldEffectScript_CallNative thumb_func_start sub_080B5414 sub_080B5414: @ 0x080B5414 @@ -373589,8 +373589,8 @@ sub_080B5414: @ 0x080B5414 bx r0 thumb_func_end sub_080B5414 - thumb_func_start sub_080B5420 -sub_080B5420: @ 0x080B5420 + thumb_func_start FieldEffectFreeGraphicsResources +FieldEffectFreeGraphicsResources: @ 0x080B5420 push {r4, r5, lr} adds r1, r0, #0 adds r1, #0x40 @@ -373599,21 +373599,21 @@ sub_080B5420: @ 0x080B5420 lsrs r4, r4, #4 bl DestroySprite adds r0, r5, #0 - bl sub_080B545C + bl FieldEffectFreeTilesIfUnused adds r0, r4, #0 - bl sub_080B54C0 + bl FieldEffectFreePaletteIfUnused pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B5420 + thumb_func_end FieldEffectFreeGraphicsResources thumb_func_start FieldEffectStop FieldEffectStop: @ 0x080B5444 push {r4, lr} lsls r4, r1, #0x18 lsrs r4, r4, #0x18 - bl sub_080B5420 + bl FieldEffectFreeGraphicsResources adds r0, r4, #0 bl FieldEffectActiveListRemove pop {r4} @@ -373622,8 +373622,8 @@ FieldEffectStop: @ 0x080B5444 .align 2, 0 thumb_func_end FieldEffectStop - thumb_func_start sub_080B545C -sub_080B545C: @ 0x080B545C + thumb_func_start FieldEffectFreeTilesIfUnused +FieldEffectFreeTilesIfUnused: @ 0x080B545C push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -373673,10 +373673,10 @@ _080B54B0: .align 2, 0 _080B54B8: .4byte 0x0000FFFF _080B54BC: .4byte gUnknown_20205AC - thumb_func_end sub_080B545C + thumb_func_end FieldEffectFreeTilesIfUnused - thumb_func_start sub_080B54C0 -sub_080B54C0: @ 0x080B54C0 + thumb_func_start FieldEffectFreePaletteIfUnused +FieldEffectFreePaletteIfUnused: @ 0x080B54C0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -373720,7 +373720,7 @@ _080B5508: .align 2, 0 _080B5510: .4byte 0x0000FFFF _080B5514: .4byte gUnknown_20205AC - thumb_func_end sub_080B54C0 + thumb_func_end FieldEffectFreePaletteIfUnused thumb_func_start FieldEffectActiveListClear FieldEffectActiveListClear: @ 0x080B5518 @@ -373831,8 +373831,8 @@ _080B55C0: bx r1 thumb_func_end FieldEffectActiveListContains - thumb_func_start sub_080B55C4 -sub_080B55C4: @ 0x080B55C4 + thumb_func_start CreateTrainerSprite +CreateTrainerSprite: @ 0x080B55C4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -373858,12 +373858,12 @@ sub_080B55C4: @ 0x080B55C4 add r8, r4 mov r0, r8 adds r1, r7, #0 - bl sub_08034418 + bl LoadCompressedSpritePaletteOverrideBuffer ldr r0, _080B5650 adds r4, r4, r0 adds r0, r4, #0 adds r1, r7, #0 - bl sub_080343BC + bl LoadCompressedSpriteSheetOverrideBuffer mov r1, sp ldrh r0, [r4, #6] movs r2, #0 @@ -373888,7 +373888,7 @@ sub_080B55C4: @ 0x080B55C4 adds r1, r5, #0 adds r2, r6, #0 mov r3, sb - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #0x18 @@ -373905,10 +373905,10 @@ _080B5654: .4byte gUnknown_8536EBC _080B5658: .4byte gUnknown_82BF304 _080B565C: .4byte gUnknown_82BF310 _080B5660: .4byte sub_08007140 - thumb_func_end sub_080B55C4 + thumb_func_end CreateTrainerSprite - thumb_func_start sub_080B5664 -sub_080B5664: @ 0x080B5664 + thumb_func_start LoadTrainerGfx_TrainerCard +LoadTrainerGfx_TrainerCard: @ 0x080B5664 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -373926,17 +373926,17 @@ sub_080B5664: @ 0x080B5664 ldr r0, [r4] adds r1, r5, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080B5694: .4byte gUnknown_82D8EE4 _080B5698: .4byte gUnknown_82D91CC - thumb_func_end sub_080B5664 + thumb_func_end LoadTrainerGfx_TrainerCard - thumb_func_start sub_080B569C -sub_080B569C: @ 0x080B569C + thumb_func_start AddNewGameBirchObject +AddNewGameBirchObject: @ 0x080B569C push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -373957,7 +373957,7 @@ sub_080B569C: @ 0x080B569C adds r1, r4, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5, r6} @@ -373966,10 +373966,10 @@ sub_080B569C: @ 0x080B569C .align 2, 0 _080B56D4: .4byte gUnknown_8536EDC _080B56D8: .4byte gUnknown_8536EF0 - thumb_func_end sub_080B569C + thumb_func_end AddNewGameBirchObject - thumb_func_start sub_080B56DC -sub_080B56DC: @ 0x080B56DC + thumb_func_start CreateMonSprite_PicBox +CreateMonSprite_PicBox: @ 0x080B56DC push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x10 @@ -373996,11 +373996,11 @@ sub_080B56DC: @ 0x080B56DC lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldrh r0, [r4, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r0, #0x10 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080ABCF4 + bl PreservePaletteInWeather ldr r0, _080B5730 cmp r5, r0 beq _080B5734 @@ -374018,10 +374018,10 @@ _080B5736: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B56DC + thumb_func_end CreateMonSprite_PicBox - thumb_func_start sub_080B5740 -sub_080B5740: @ 0x080B5740 + thumb_func_start CreateMonSprite_FieldMove +CreateMonSprite_FieldMove: @ 0x080B5740 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -374040,7 +374040,7 @@ sub_080B5740: @ 0x080B5740 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality mov r8, r0 lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -374062,11 +374062,11 @@ sub_080B5740: @ 0x080B5740 lsrs r4, r0, #0x10 mov r1, r8 ldrh r0, [r1, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r0, #0x10 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080ABCF4 + bl PreservePaletteInWeather ldr r0, _080B57B0 cmp r4, r0 beq _080B57B4 @@ -374087,10 +374087,10 @@ _080B57B6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080B5740 + thumb_func_end CreateMonSprite_FieldMove - thumb_func_start sub_080B57C8 -sub_080B57C8: @ 0x080B57C8 + thumb_func_start FreeResourcesAndDestroySprite +FreeResourcesAndDestroySprite: @ 0x080B57C8 push {r4, r5, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -374106,12 +374106,12 @@ sub_080B57C8: @ 0x080B57C8 bl FreeOamMatrix _080B57E6: adds r0, r5, #0 - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B57C8 + thumb_func_end FreeResourcesAndDestroySprite thumb_func_start MultiplyInvertedPaletteRGBComponents MultiplyInvertedPaletteRGBComponents: @ 0x080B57F4 @@ -374247,8 +374247,8 @@ _080B58F0: .4byte gUnknown_20373B4 _080B58F4: .4byte gUnknown_20377B4 thumb_func_end MultiplyPaletteRGBComponents - thumb_func_start sub_080B58F8 -sub_080B58F8: @ 0x080B58F8 + thumb_func_start FldEff_PokecenterHeal +FldEff_PokecenterHeal: @ 0x080B58F8 push {r4, lr} bl sub_0806B004 adds r4, r0, #0 @@ -374256,7 +374256,7 @@ sub_080B58F8: @ 0x080B58F8 lsrs r4, r4, #0x18 ldr r0, _080B5934 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -374280,7 +374280,7 @@ sub_080B58F8: @ 0x080B58F8 .align 2, 0 _080B5934: .4byte sub_080B593C _080B5938: .4byte gUnknown_3005B60 - thumb_func_end sub_080B58F8 + thumb_func_end FldEff_PokecenterHeal thumb_func_start sub_080B593C sub_080B593C: @ 0x080B593C @@ -374325,7 +374325,7 @@ PokecenterHealEffect_0: @ 0x080B596C movs r3, #0xe ldrsh r2, [r4, r3] movs r3, #1 - bl sub_080B5BC4 + bl CreatePokeballGlowSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x14] @@ -374333,7 +374333,7 @@ PokecenterHealEffect_0: @ 0x080B596C ldrsh r0, [r4, r1] movs r2, #0x12 ldrsh r1, [r4, r2] - bl sub_080B5FA8 + bl PokecenterHealEffectHelper lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x16] @@ -374422,10 +374422,10 @@ sub_080B5A0C: @ 0x080B5A0C movs r0, #0x19 bl FieldEffectActiveListRemove ldr r0, _080B5A48 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B5A3E: pop {r0} bx r0 @@ -374434,8 +374434,8 @@ _080B5A44: .4byte gUnknown_20205AC _080B5A48: .4byte sub_080B593C thumb_func_end sub_080B5A0C - thumb_func_start sub_080B5A4C -sub_080B5A4C: @ 0x080B5A4C + thumb_func_start FldEff_HallOfFameRecord +FldEff_HallOfFameRecord: @ 0x080B5A4C push {r4, lr} bl sub_0806B004 adds r4, r0, #0 @@ -374443,7 +374443,7 @@ sub_080B5A4C: @ 0x080B5A4C lsrs r4, r4, #0x18 ldr r0, _080B5A80 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -374463,7 +374463,7 @@ sub_080B5A4C: @ 0x080B5A4C .align 2, 0 _080B5A80: .4byte sub_080B5A88 _080B5A84: .4byte gUnknown_3005B60 - thumb_func_end sub_080B5A4C + thumb_func_end FldEff_HallOfFameRecord thumb_func_start sub_080B5A88 sub_080B5A88: @ 0x080B5A88 @@ -374494,8 +374494,8 @@ _080B5AB0: .4byte gUnknown_3005B60 _080B5AB4: .4byte gUnknown_8537020 thumb_func_end sub_080B5AAC - thumb_func_start sub_080B5AB8 -sub_080B5AB8: @ 0x080B5AB8 + thumb_func_start HallOfFameRecordEffect_0 +HallOfFameRecordEffect_0: @ 0x080B5AB8 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #8] @@ -374508,12 +374508,12 @@ sub_080B5AB8: @ 0x080B5AB8 movs r3, #0xe ldrsh r2, [r4, r3] movs r3, #0 - bl sub_080B5BC4 + bl CreatePokeballGlowSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x14] ldr r0, _080B5B28 - bl sub_080A8AE4 + bl FindTaskIdByFunc adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -374521,33 +374521,33 @@ sub_080B5AB8: @ 0x080B5AB8 movs r1, #0x78 movs r2, #0x18 movs r3, #0 - bl sub_080B6044 + bl HallOfFameRecordEffectHelper adds r0, r4, #0 movs r1, #0x28 movs r2, #8 movs r3, #1 - bl sub_080B6044 + bl HallOfFameRecordEffectHelper adds r0, r4, #0 movs r1, #0x48 movs r2, #8 movs r3, #1 - bl sub_080B6044 + bl HallOfFameRecordEffectHelper adds r0, r4, #0 movs r1, #0xa8 movs r2, #8 movs r3, #1 - bl sub_080B6044 + bl HallOfFameRecordEffectHelper adds r0, r4, #0 movs r1, #0xc8 movs r2, #8 movs r3, #1 - bl sub_080B6044 + bl HallOfFameRecordEffectHelper pop {r4} pop {r0} bx r0 .align 2, 0 _080B5B28: .4byte sub_080B5A88 - thumb_func_end sub_080B5AB8 + thumb_func_end HallOfFameRecordEffect_0 thumb_func_start HallOfFameRecordEffect_1 HallOfFameRecordEffect_1: @ 0x080B5B2C @@ -374602,8 +374602,8 @@ _080B5B7C: _080B5B80: .4byte gUnknown_20205AC thumb_func_end sub_080B5B5C - thumb_func_start sub_080B5B84 -sub_080B5B84: @ 0x080B5B84 + thumb_func_start HallOfFameRecordEffect_3 +HallOfFameRecordEffect_3: @ 0x080B5B84 push {lr} ldr r2, _080B5BBC movs r3, #0x14 @@ -374621,20 +374621,20 @@ sub_080B5B84: @ 0x080B5B84 movs r0, #0x3e bl FieldEffectActiveListRemove ldr r0, _080B5BC0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B5BB6: pop {r0} bx r0 .align 2, 0 _080B5BBC: .4byte gUnknown_20205AC _080B5BC0: .4byte sub_080B5A88 - thumb_func_end sub_080B5B84 + thumb_func_end HallOfFameRecordEffect_3 - thumb_func_start sub_080B5BC4 -sub_080B5BC4: @ 0x080B5BC4 + thumb_func_start CreatePokeballGlowSprite +CreatePokeballGlowSprite: @ 0x080B5BC4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -374652,7 +374652,7 @@ sub_080B5BC4: @ 0x080B5BC4 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 ldr r0, _080B5C10 - bl sub_08006BCC + bl CreateInvisibleSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -374674,7 +374674,7 @@ sub_080B5BC4: @ 0x080B5BC4 .align 2, 0 _080B5C10: .4byte sub_080B5C18 _080B5C14: .4byte gUnknown_20205AC - thumb_func_end sub_080B5BC4 + thumb_func_end CreatePokeballGlowSprite thumb_func_start sub_080B5C18 sub_080B5C18: @ 0x080B5C18 @@ -374692,8 +374692,8 @@ sub_080B5C18: @ 0x080B5C18 _080B5C30: .4byte gUnknown_8537030 thumb_func_end sub_080B5C18 - thumb_func_start sub_080B5C34 -sub_080B5C34: @ 0x080B5C34 + thumb_func_start PokeballGlowEffect_0 +PokeballGlowEffect_0: @ 0x080B5C34 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x30] @@ -374726,7 +374726,7 @@ _080B5C4C: lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B5CC8 @@ -374769,10 +374769,10 @@ _080B5CBA: _080B5CC0: .4byte gUnknown_8536FB0 _080B5CC4: .4byte gUnknown_8537050 _080B5CC8: .4byte gUnknown_20205AC - thumb_func_end sub_080B5C34 + thumb_func_end PokeballGlowEffect_0 - thumb_func_start sub_080B5CCC -sub_080B5CCC: @ 0x080B5CCC + thumb_func_start PokeballGlowEffect_1 +PokeballGlowEffect_1: @ 0x080B5CCC push {lr} adds r1, r0, #0 ldrh r0, [r1, #0x30] @@ -374795,14 +374795,14 @@ sub_080B5CCC: @ 0x080B5CCC beq _080B5CFC movs r0, #0xb8 lsls r0, r0, #1 - bl sub_080A29AC + bl PlayFanfare _080B5CFC: pop {r0} bx r0 - thumb_func_end sub_080B5CCC + thumb_func_end PokeballGlowEffect_1 - thumb_func_start sub_080B5D00 -sub_080B5D00: @ 0x080B5D00 + thumb_func_start PokeballGlowEffect_2 +PokeballGlowEffect_2: @ 0x080B5D00 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -374837,7 +374837,7 @@ _080B5D30: ldr r3, _080B5E28 mov sl, r3 mov r0, sl - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 movs r1, #0x84 @@ -374860,7 +374860,7 @@ _080B5D30: mov r0, r8 ands r4, r0 mov r0, sl - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 movs r1, #0x83 @@ -374879,7 +374879,7 @@ _080B5D30: mov r3, r8 ands r4, r3 mov r0, sl - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 movs r1, #0x81 @@ -374897,7 +374897,7 @@ _080B5D30: lsls r4, r4, #0x18 lsrs r4, r4, #0x18 mov r0, sl - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r3, _080B5E38 @@ -374914,7 +374914,7 @@ _080B5D30: adds r3, r4, #0 bl MultiplyInvertedPaletteRGBComponents mov r0, sl - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r1, _080B5E3C @@ -374950,10 +374950,10 @@ _080B5E30: .4byte gUnknown_853706C _080B5E34: .4byte gUnknown_8537070 _080B5E38: .4byte 0x01050000 _080B5E3C: .4byte 0x01030000 - thumb_func_end sub_080B5D00 + thumb_func_end PokeballGlowEffect_2 - thumb_func_start sub_080B5E40 -sub_080B5E40: @ 0x080B5E40 + thumb_func_start PokeballGlowEffect_3 +PokeballGlowEffect_3: @ 0x080B5E40 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -374984,7 +374984,7 @@ _080B5E70: lsrs r4, r4, #0x18 ldr r0, _080B5F1C mov r8, r0 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 movs r1, #0x84 @@ -375005,7 +375005,7 @@ _080B5E70: adds r3, r4, #0 bl MultiplyInvertedPaletteRGBComponents mov r0, r8 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 movs r1, #0x83 @@ -375017,7 +375017,7 @@ _080B5E70: adds r3, r4, #0 bl MultiplyInvertedPaletteRGBComponents mov r0, r8 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 movs r1, #0x81 @@ -375029,7 +375029,7 @@ _080B5E70: adds r3, r4, #0 bl MultiplyInvertedPaletteRGBComponents mov r0, r8 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r1, _080B5F2C @@ -375040,7 +375040,7 @@ _080B5E70: adds r3, r4, #0 bl MultiplyInvertedPaletteRGBComponents mov r0, r8 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r1, _080B5F30 @@ -375062,7 +375062,7 @@ _080B5F24: .4byte gUnknown_853706C _080B5F28: .4byte gUnknown_8537070 _080B5F2C: .4byte 0x01050000 _080B5F30: .4byte 0x01030000 - thumb_func_end sub_080B5E40 + thumb_func_end PokeballGlowEffect_3 thumb_func_start PokeballGlowEffect_4 PokeballGlowEffect_4: @ 0x080B5F34 @@ -375083,23 +375083,23 @@ _080B5F4A: .align 2, 0 thumb_func_end PokeballGlowEffect_4 - thumb_func_start sub_080B5F50 -sub_080B5F50: @ 0x080B5F50 + thumb_func_start PokeballGlowEffect_5 +PokeballGlowEffect_5: @ 0x080B5F50 ldrh r1, [r0, #0x2e] adds r1, #1 strh r1, [r0, #0x2e] bx lr - thumb_func_end sub_080B5F50 + thumb_func_end PokeballGlowEffect_5 - thumb_func_start sub_080B5F58 -sub_080B5F58: @ 0x080B5F58 + thumb_func_start PokeballGlowEffect_6 +PokeballGlowEffect_6: @ 0x080B5F58 push {r4, lr} adds r4, r0, #0 movs r1, #0x38 ldrsh r0, [r4, r1] cmp r0, #0 beq _080B5F6E - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _080B5F74 @@ -375112,7 +375112,7 @@ _080B5F74: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B5F58 + thumb_func_end PokeballGlowEffect_6 thumb_func_start sub_080B5F7C sub_080B5F7C: @ 0x080B5F7C @@ -375136,7 +375136,7 @@ SpriteCB_PokeballGlow: @ 0x080B5F80 cmp r0, #4 ble _080B5FA0 adds r0, r3, #0 - bl sub_080B5420 + bl FieldEffectFreeGraphicsResources _080B5FA0: pop {r0} bx r0 @@ -375144,8 +375144,8 @@ _080B5FA0: _080B5FA4: .4byte gUnknown_20205AC thumb_func_end SpriteCB_PokeballGlow - thumb_func_start sub_080B5FA8 -sub_080B5FA8: @ 0x080B5FA8 + thumb_func_start PokecenterHealEffectHelper +PokecenterHealEffectHelper: @ 0x080B5FA8 push {r4, lr} adds r3, r0, #0 adds r2, r1, #0 @@ -375156,7 +375156,7 @@ sub_080B5FA8: @ 0x080B5FA8 asrs r2, r2, #0x10 adds r1, r3, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -375179,7 +375179,7 @@ sub_080B5FA8: @ 0x080B5FA8 orrs r1, r2 strb r1, [r3] ldr r1, _080B6000 - bl sub_0800858C + bl SetSubspriteTables adds r0, r4, #0 pop {r4} pop {r1} @@ -375188,10 +375188,10 @@ sub_080B5FA8: @ 0x080B5FA8 _080B5FF8: .4byte gUnknown_8536FC8 _080B5FFC: .4byte gUnknown_20205AC _080B6000: .4byte gUnknown_8536F58 - thumb_func_end sub_080B5FA8 + thumb_func_end PokecenterHealEffectHelper - thumb_func_start sub_080B6004 -sub_080B6004: @ 0x080B6004 + thumb_func_start SpriteCB_PokecenterMonitor +SpriteCB_PokecenterMonitor: @ 0x080B6004 push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -375218,16 +375218,16 @@ _080B6028: cmp r0, #0 beq _080B603C adds r0, r4, #0 - bl sub_080B5420 + bl FieldEffectFreeGraphicsResources _080B603C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B6004 + thumb_func_end SpriteCB_PokecenterMonitor - thumb_func_start sub_080B6044 -sub_080B6044: @ 0x080B6044 + thumb_func_start HallOfFameRecordEffectHelper +HallOfFameRecordEffectHelper: @ 0x080B6044 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -375244,7 +375244,7 @@ sub_080B6044: @ 0x080B6044 lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r4, #4 @@ -375253,7 +375253,7 @@ sub_080B6044: @ 0x080B6044 ldr r1, _080B6084 adds r0, r0, r1 ldr r1, _080B6088 - bl sub_0800858C + bl SetSubspriteTables b _080B60A0 .align 2, 0 _080B6080: .4byte gUnknown_8536FE0 @@ -375266,7 +375266,7 @@ _080B608C: lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _080B60A0: @@ -375288,7 +375288,7 @@ _080B60A0: .align 2, 0 _080B60C0: .4byte gUnknown_8536FF8 _080B60C4: .4byte gUnknown_20205AC - thumb_func_end sub_080B6044 + thumb_func_end HallOfFameRecordEffectHelper thumb_func_start SpriteCB_HallOfFameMonitor SpriteCB_HallOfFameMonitor: @ 0x080B60C8 @@ -375343,7 +375343,7 @@ _080B611E: cmp r0, #0x7f ble _080B612C adds r0, r3, #0 - bl sub_080B5420 + bl FieldEffectFreeGraphicsResources _080B612C: pop {r0} bx r0 @@ -375355,7 +375355,7 @@ _080B6130: .4byte gUnknown_3005B60 sub_080B6134: @ 0x080B6134 push {lr} ldr r0, _080B6148 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B614C ldr r0, _080B6150 str r0, [r1] @@ -375364,16 +375364,16 @@ sub_080B6134: @ 0x080B6134 .align 2, 0 _080B6148: .4byte sub_08085A30 _080B614C: .4byte gUnknown_3005B0C -_080B6150: .4byte sub_080B6154 +_080B6150: .4byte mapldr_080842E8 thumb_func_end sub_080B6134 - thumb_func_start sub_080B6154 -sub_080B6154: @ 0x080B6154 + thumb_func_start mapldr_080842E8 +mapldr_080842E8: @ 0x080B6154 push {lr} - bl sub_080AE99C + bl pal_fill_black ldr r0, _080B6174 movs r1, #0 - bl sub_080A8878 + bl CreateTask bl sub_080987DC bl FreezeEventObjects ldr r1, _080B6178 @@ -375382,12 +375382,12 @@ sub_080B6154: @ 0x080B6154 pop {r0} bx r0 .align 2, 0 -_080B6174: .4byte sub_080B617C +_080B6174: .4byte task00_8084310 _080B6178: .4byte gUnknown_3005B0C - thumb_func_end sub_080B6154 + thumb_func_end mapldr_080842E8 - thumb_func_start sub_080B617C -sub_080B617C: @ 0x080B617C + thumb_func_start task00_8084310 +task00_8084310: @ 0x080B617C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -375404,7 +375404,7 @@ sub_080B617C: @ 0x080B617C lsls r0, r0, #0x18 cmp r0, #0 beq _080B61E2 - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _080B61EC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -375414,7 +375414,7 @@ sub_080B617C: @ 0x080B617C str r6, [r1] _080B61B0: movs r0, #0x1f - bl sub_080B5270 + bl FieldEffectStart ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -375425,14 +375425,14 @@ _080B61BC: cmp r0, #0 bne _080B61E2 bl sub_08083FE8 - bl sub_08084540 + bl WarpIntoMap ldr r0, _080B61F0 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B61F4 ldr r0, _080B61F8 str r0, [r1] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B61E2: pop {r4, r5, r6} pop {r0} @@ -375440,19 +375440,19 @@ _080B61E2: .align 2, 0 _080B61E8: .4byte gUnknown_3005B60 _080B61EC: .4byte gUnknown_20388A8 -_080B61F0: .4byte sub_08085934 +_080B61F0: .4byte CB2_LoadMap _080B61F4: .4byte gUnknown_3005B0C -_080B61F8: .4byte sub_080B61FC - thumb_func_end sub_080B617C +_080B61F8: .4byte mapldr_08084390 + thumb_func_end task00_8084310 - thumb_func_start sub_080B61FC -sub_080B61FC: @ 0x080B61FC + thumb_func_start mapldr_08084390 +mapldr_08084390: @ 0x080B61FC push {r4, lr} - bl sub_080850EC - bl sub_080AE99C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_black ldr r0, _080B6254 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r4, _080B6258 ldr r3, _080B625C ldrb r1, [r3, #5] @@ -375475,7 +375475,7 @@ sub_080B61FC: @ 0x080B61FC lsls r0, r0, #2 adds r0, r0, r4 movs r1, #3 - bl sub_0808DEB4 + bl EventObjectTurn _080B623E: bl sub_080987DC bl FreezeEventObjects @@ -375486,14 +375486,14 @@ _080B623E: pop {r0} bx r0 .align 2, 0 -_080B6254: .4byte sub_080B6264 +_080B6254: .4byte c3_080843F8 _080B6258: .4byte gUnknown_2036FF0 _080B625C: .4byte gUnknown_2037230 _080B6260: .4byte gUnknown_3005B0C - thumb_func_end sub_080B61FC + thumb_func_end mapldr_08084390 - thumb_func_start sub_080B6264 -sub_080B6264: @ 0x080B6264 + thumb_func_start c3_080843F8 +c3_080843F8: @ 0x080B6264 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -375514,7 +375514,7 @@ sub_080B6264: @ 0x080B6264 cmp r0, #0 bne _080B62B0 movs r0, #0x20 - bl sub_080B5270 + bl FieldEffectStart ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -375527,7 +375527,7 @@ _080B6296: bl sub_080987E8 bl UnfreezeEventObjects adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B62B0: pop {r4, r5} pop {r0} @@ -375535,18 +375535,18 @@ _080B62B0: .align 2, 0 _080B62B8: .4byte gUnknown_3005B60 _080B62BC: .4byte gUnknown_2037C74 - thumb_func_end sub_080B6264 + thumb_func_end c3_080843F8 - thumb_func_start sub_080B62C0 -sub_080B62C0: @ 0x080B62C0 + thumb_func_start PrintAllVariableNumsOnCardPage2 +PrintAllVariableNumsOnCardPage2: @ 0x080B62C0 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights bl sub_080987DC bl FreezeEventObjects ldr r0, _080B62E4 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, _080B62E8 movs r0, #0 str r0, [r1] @@ -375555,7 +375555,7 @@ sub_080B62C0: @ 0x080B62C0 .align 2, 0 _080B62E4: .4byte sub_080B62EC _080B62E8: .4byte gUnknown_3005B0C - thumb_func_end sub_080B62C0 + thumb_func_end PrintAllVariableNumsOnCardPage2 thumb_func_start sub_080B62EC sub_080B62EC: @ 0x080B62EC @@ -375608,7 +375608,7 @@ sub_080B6324: @ 0x080B6324 lsls r4, r4, #2 ldr r0, _080B63C8 adds r4, r4, r0 - bl sub_0808E84C + bl CameraObjectReset2 ldrb r1, [r6, #5] lsls r0, r1, #3 adds r0, r0, r1 @@ -375628,7 +375628,7 @@ sub_080B6324: @ 0x080B6324 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement adds r3, r4, #0 adds r3, #0x42 ldrb r0, [r3] @@ -375863,7 +375863,7 @@ sub_080B6530: @ 0x080B6530 movs r0, #0xa ldrsh r1, [r4, r0] movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning ldrh r0, [r4, #0xa] rsbs r2, r0, #0 strh r2, [r4, #0xa] @@ -375900,14 +375900,14 @@ sub_080B6570: @ 0x080B6570 movs r0, #0 strb r0, [r1, #6] bl sub_080987E8 - bl sub_0808E7FC + bl CameraObjectReset1 bl UnfreezeEventObjects bl InstallCameraPanAheadCallback ldr r0, _080B65A0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 @@ -375925,7 +375925,7 @@ sub_080B65A4: @ 0x080B65A4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, _080B65D8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B65DC @@ -375983,7 +375983,7 @@ sub_080B6618: @ 0x080B6618 push {r4, lr} adds r4, r0, #0 bl FreezeEventObjects - bl sub_0808E84C + bl CameraObjectReset2 ldrb r0, [r4, #0xa] bl sub_080E0AA4 ldrh r0, [r4, #8] @@ -376025,7 +376025,7 @@ _080B6662: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 movs r1, #0 @@ -376075,7 +376075,7 @@ _080B66C2: sub_080B66CC: @ 0x080B66CC push {lr} bl sub_080B6710 - bl sub_080B67B8 + bl CB2_Pokenav movs r0, #0 pop {r1} bx r1 @@ -376106,7 +376106,7 @@ _080B66F6: sub_080B6700: @ 0x080B6700 push {lr} bl sub_080B675C - bl sub_080B67B8 + bl CB2_Pokenav movs r0, #0 pop {r1} bx r1 @@ -376195,15 +376195,15 @@ _080B67A4: .4byte gUnknown_20205AC thumb_func_start sub_080B67A8 sub_080B67A8: @ 0x080B67A8 push {lr} - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080B67A8 - thumb_func_start sub_080B67B8 -sub_080B67B8: @ 0x080B67B8 + thumb_func_start CB2_Pokenav +CB2_Pokenav: @ 0x080B67B8 push {lr} ldr r0, _080B67F8 ldrb r1, [r0, #7] @@ -376211,23 +376211,23 @@ sub_080B67B8: @ 0x080B67B8 ands r0, r1 cmp r0, #0 bne _080B67F4 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B67F4 bl sub_080E0ABC - bl sub_08084540 + bl WarpIntoMap ldr r1, _080B67FC ldr r0, _080B6800 str r0, [r1] ldr r0, _080B6804 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080B6808 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B67F4: pop {r0} bx r0 @@ -376235,19 +376235,19 @@ _080B67F4: _080B67F8: .4byte gUnknown_2037C74 _080B67FC: .4byte gUnknown_3005B0C _080B6800: .4byte sub_080B680C -_080B6804: .4byte sub_08085934 +_080B6804: .4byte CB2_LoadMap _080B6808: .4byte sub_080B65E0 - thumb_func_end sub_080B67B8 + thumb_func_end CB2_Pokenav thumb_func_start sub_080B680C sub_080B680C: @ 0x080B680C push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights bl sub_080987DC ldr r0, _080B682C movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, _080B6830 movs r0, #0 str r0, [r1] @@ -376293,7 +376293,7 @@ sub_080B686C: @ 0x080B686C push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 - bl sub_0808E84C + bl CameraObjectReset2 ldr r0, _080B68CC ldrb r0, [r0, #5] lsls r4, r0, #3 @@ -376307,7 +376307,7 @@ sub_080B686C: @ 0x080B686C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement mov r4, sp adds r4, #2 mov r0, sp @@ -376348,8 +376348,8 @@ _080B68D6: .align 2, 0 thumb_func_end sub_080B686C - thumb_func_start sub_080B68E8 -sub_080B68E8: @ 0x080B68E8 + thumb_func_start MovementAction_AcroEndWheelieMoveLeft_Step0 +MovementAction_AcroEndWheelieMoveLeft_Step0: @ 0x080B68E8 push {r4, r5, lr} adds r5, r0, #0 ldr r0, _080B6920 @@ -376379,10 +376379,10 @@ sub_080B68E8: @ 0x080B68E8 .align 2, 0 _080B6920: .4byte gUnknown_2037230 _080B6924: .4byte gUnknown_20205AC - thumb_func_end sub_080B68E8 + thumb_func_end MovementAction_AcroEndWheelieMoveLeft_Step0 - thumb_func_start sub_080B6928 -sub_080B6928: @ 0x080B6928 + thumb_func_start MovementAction_AcroEndWheelieMoveRight_Step0 +MovementAction_AcroEndWheelieMoveRight_Step0: @ 0x080B6928 push {r4, r5, lr} adds r4, r0, #0 ldr r0, _080B6980 @@ -376429,7 +376429,7 @@ _080B6976: .align 2, 0 _080B6980: .4byte gUnknown_2037230 _080B6984: .4byte gUnknown_20205AC - thumb_func_end sub_080B6928 + thumb_func_end MovementAction_AcroEndWheelieMoveRight_Step0 thumb_func_start sub_080B6988 sub_080B6988: @ 0x080B6988 @@ -376552,7 +376552,7 @@ sub_080B6A4C: @ 0x080B6A4C lsls r0, r0, #0x18 cmp r0, #0 beq _080B6A90 - bl sub_0808E7FC + bl CameraObjectReset1 bl sub_080987E8 movs r0, #4 bl sub_08092CF8 @@ -376560,12 +376560,12 @@ sub_080B6A4C: @ 0x080B6A4C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldr r0, _080B6AA0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B6A90: movs r0, #0 pop {r4} @@ -376577,13 +376577,13 @@ _080B6A9C: .4byte gUnknown_2036FF0 _080B6AA0: .4byte sub_080B6834 thumb_func_end sub_080B6A4C - thumb_func_start sub_080B6AA4 -sub_080B6AA4: @ 0x080B6AA4 + thumb_func_start FldEff_UseWaterfall +FldEff_UseWaterfall: @ 0x080B6AA4 push {r4, lr} ldr r4, _080B6AD0 adds r0, r4, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B6AD4 @@ -376603,7 +376603,7 @@ sub_080B6AA4: @ 0x080B6AA4 _080B6AD0: .4byte sub_080B6ADC _080B6AD4: .4byte gUnknown_3005B60 _080B6AD8: .4byte gUnknown_20388A8 - thumb_func_end sub_080B6AA4 + thumb_func_end FldEff_UseWaterfall thumb_func_start sub_080B6ADC sub_080B6ADC: @ 0x080B6ADC @@ -376667,8 +376667,8 @@ sub_080B6B28: @ 0x080B6B28 _080B6B44: .4byte gUnknown_2037230 thumb_func_end sub_080B6B28 - thumb_func_start sub_080B6B48 -sub_080B6B48: @ 0x080B6B48 + thumb_func_start waterfall_1_do_anim_probably +waterfall_1_do_anim_probably: @ 0x080B6B48 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -376685,7 +376685,7 @@ sub_080B6B48: @ 0x080B6B48 ldrsh r0, [r4, r2] str r0, [r1] movs r0, #0x3b - bl sub_080B5270 + bl FieldEffectStart ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -376696,7 +376696,7 @@ _080B6B78: bx r1 .align 2, 0 _080B6B80: .4byte gUnknown_20388A8 - thumb_func_end sub_080B6B48 + thumb_func_end waterfall_1_do_anim_probably thumb_func_start waterfall_2_wait_anim_finish_probably waterfall_2_wait_anim_finish_probably: @ 0x080B6B84 @@ -376732,7 +376732,7 @@ sub_080B6BA8: @ 0x080B6BA8 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -376766,10 +376766,10 @@ _080B6BE6: ldr r0, _080B6C14 strb r4, [r0, #6] ldr r0, _080B6C18 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0x2b bl FieldEffectActiveListRemove movs r0, #0 @@ -376787,13 +376787,13 @@ _080B6C22: bx r1 thumb_func_end sub_080B6BD0 - thumb_func_start sub_080B6C28 -sub_080B6C28: @ 0x080B6C28 + thumb_func_start FldEff_UseDive +FldEff_UseDive: @ 0x080B6C28 push {r4, lr} ldr r4, _080B6C58 adds r0, r4, #0 movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B6C5C @@ -376815,7 +376815,7 @@ sub_080B6C28: @ 0x080B6C28 _080B6C58: .4byte sub_080B6C64 _080B6C5C: .4byte gUnknown_3005B60 _080B6C60: .4byte gUnknown_20388A8 - thumb_func_end sub_080B6C28 + thumb_func_end FldEff_UseDive thumb_func_start sub_080B6C64 sub_080B6C64: @ 0x080B6C64 @@ -376847,8 +376847,8 @@ _080B6C94: .4byte gUnknown_85370D8 _080B6C98: .4byte gUnknown_3005B60 thumb_func_end sub_080B6C64 - thumb_func_start sub_080B6C9C -sub_080B6C9C: @ 0x080B6C9C + thumb_func_start dive_1_lock +dive_1_lock: @ 0x080B6C9C ldr r2, _080B6CAC movs r1, #1 strb r1, [r2, #6] @@ -376859,10 +376859,10 @@ sub_080B6C9C: @ 0x080B6C9C bx lr .align 2, 0 _080B6CAC: .4byte gUnknown_2037230 - thumb_func_end sub_080B6C9C + thumb_func_end dive_1_lock - thumb_func_start sub_080B6CB0 -sub_080B6CB0: @ 0x080B6CB0 + thumb_func_start dive_2_unknown +dive_2_unknown: @ 0x080B6CB0 push {r4, lr} adds r4, r0, #0 bl sub_080987DC @@ -376871,7 +376871,7 @@ sub_080B6CB0: @ 0x080B6CB0 ldrsh r0, [r4, r2] str r0, [r1] movs r0, #0x3b - bl sub_080B5270 + bl FieldEffectStart ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -376881,10 +376881,10 @@ sub_080B6CB0: @ 0x080B6CB0 bx r1 .align 2, 0 _080B6CD4: .4byte gUnknown_20388A8 - thumb_func_end sub_080B6CB0 + thumb_func_end dive_2_unknown - thumb_func_start sub_080B6CD8 -sub_080B6CD8: @ 0x080B6CD8 + thumb_func_start dive_3_unknown +dive_3_unknown: @ 0x080B6CD8 push {lr} sub sp, #8 mov r1, sp @@ -376905,12 +376905,12 @@ sub_080B6CD8: @ 0x080B6CD8 adds r0, r0, r2 ldrb r1, [r0, #0x1e] mov r0, sp - bl sub_0809CA44 + bl dive_warp ldr r0, _080B6D2C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0x2c bl FieldEffectActiveListRemove _080B6D1C: @@ -376922,7 +376922,7 @@ _080B6D1C: _080B6D24: .4byte gUnknown_2036FF0 _080B6D28: .4byte gUnknown_2037230 _080B6D2C: .4byte sub_080B6C64 - thumb_func_end sub_080B6CD8 + thumb_func_end dive_3_unknown thumb_func_start sub_080B6D30 sub_080B6D30: @ 0x080B6D30 @@ -376931,7 +376931,7 @@ sub_080B6D30: @ 0x080B6D30 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, _080B6D44 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -376990,7 +376990,7 @@ sub_080B6DA4: @ 0x080B6DA4 adds r4, r0, #0 adds r5, r1, #0 bl FreezeEventObjects - bl sub_0808E84C + bl CameraObjectReset2 movs r0, #0 bl sub_08089C24 ldr r0, _080B6DD8 @@ -377019,7 +377019,7 @@ sub_080B6DDC: @ 0x080B6DDC movs r0, #0xa ldrsh r1, [r4, r0] movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning ldrh r0, [r4, #0xa] rsbs r0, r0, #0 strh r0, [r4, #0xa] @@ -377067,7 +377067,7 @@ sub_080B6E10: @ 0x080B6E10 lsrs r0, r0, #0x1e str r0, [r3, #0xc] movs r0, #0x32 - bl sub_080B5270 + bl FieldEffectStart movs r0, #0xb2 bl sub_080A306C ldrh r0, [r4, #8] @@ -377090,7 +377090,7 @@ sub_080B6E5C: @ 0x080B6E5C movs r0, #0xa ldrsh r1, [r4, r0] movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning ldrh r0, [r4, #0xa] rsbs r2, r0, #0 strh r2, [r4, #0xa] @@ -377217,8 +377217,8 @@ _080B6F48: sub_080B6F50: @ 0x080B6F50 push {r4, lr} adds r4, r0, #0 - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -377238,22 +377238,22 @@ sub_080B6F6C: @ 0x080B6F6C ands r0, r1 cmp r0, #0 bne _080B6FA4 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B6FA4 - bl sub_08084540 + bl WarpIntoMap ldr r1, _080B6FB0 ldr r0, _080B6FB4 str r0, [r1] ldr r0, _080B6FB8 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080B6FBC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B6FA4: movs r0, #0 pop {r1} @@ -377262,21 +377262,21 @@ _080B6FA4: _080B6FAC: .4byte gUnknown_2037C74 _080B6FB0: .4byte gUnknown_3005B0C _080B6FB4: .4byte sub_080B6FC0 -_080B6FB8: .4byte sub_08085934 +_080B6FB8: .4byte CB2_LoadMap _080B6FBC: .4byte sub_080B6D48 thumb_func_end sub_080B6F6C thumb_func_start sub_080B6FC0 sub_080B6FC0: @ 0x080B6FC0 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights bl sub_080987DC ldr r0, _080B6FE0 movs r1, #0 str r1, [r0] ldr r0, _080B6FE4 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -377335,7 +377335,7 @@ sub_080B7044: @ 0x080B7044 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 - bl sub_0808E84C + bl CameraObjectReset2 bl FreezeEventObjects ldr r1, _080B7070 movs r0, #1 @@ -377382,7 +377382,7 @@ sub_080B7074: @ 0x080B7074 lsrs r0, r0, #0x1e str r0, [r1, #0xc] movs r0, #0x31 - bl sub_080B5270 + bl FieldEffectStart strh r0, [r4, #0xa] ldrh r0, [r4, #8] adds r0, #1 @@ -377420,7 +377420,7 @@ sub_080B70C0: @ 0x080B70C0 rsbs r0, r0, #0 ands r0, r1 strb r0, [r4, #1] - bl sub_0808E7FC + bl CameraObjectReset1 movs r0, #0xaf bl sub_080A306C movs r0, #4 @@ -377429,7 +377429,7 @@ sub_080B70C0: @ 0x080B70C0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement _080B7108: movs r0, #0 pop {r4} @@ -377453,10 +377453,10 @@ sub_080B7114: @ 0x080B7114 bl sub_080987E8 bl UnfreezeEventObjects ldr r0, _080B7148 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B713E: movs r0, #0 pop {r1} @@ -377466,8 +377466,8 @@ _080B7144: .4byte gUnknown_2037230 _080B7148: .4byte sub_080B6FE8 thumb_func_end sub_080B7114 - thumb_func_start sub_080B714C -sub_080B714C: @ 0x080B714C + thumb_func_start FldEff_LavaridgeGymWarp +FldEff_LavaridgeGymWarp: @ 0x080B714C push {r4, lr} ldr r4, _080B71A4 adds r1, r4, #4 @@ -377483,7 +377483,7 @@ sub_080B714C: @ 0x080B714C movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080B71AC @@ -377513,7 +377513,7 @@ sub_080B714C: @ 0x080B714C _080B71A4: .4byte gUnknown_20388A8 _080B71A8: .4byte gUnknown_84DDE4C _080B71AC: .4byte gUnknown_20205AC - thumb_func_end sub_080B714C + thumb_func_end FldEff_LavaridgeGymWarp thumb_func_start sub_080B71B0 sub_080B71B0: @ 0x080B71B0 @@ -377540,7 +377540,7 @@ sub_080B71CC: @ 0x080B71CC lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, _080B71E0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -377599,7 +377599,7 @@ sub_080B7240: @ 0x080B7240 adds r5, r0, #0 adds r4, r1, #0 bl FreezeEventObjects - bl sub_0808E84C + bl CameraObjectReset2 ldr r1, _080B726C movs r0, #1 strb r0, [r1, #6] @@ -377651,7 +377651,7 @@ sub_080B7270: @ 0x080B7270 lsrs r0, r0, #0x1e str r0, [r1, #0xc] movs r0, #0x31 - bl sub_080B5270 + bl FieldEffectStart strh r0, [r5, #0xa] ldrh r0, [r5, #8] adds r0, #1 @@ -377670,7 +377670,7 @@ _080B72C4: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement movs r0, #0x27 bl sub_080A306C _080B72E4: @@ -377721,8 +377721,8 @@ sub_080B7324: @ 0x080B7324 lsls r0, r0, #0x18 cmp r0, #0 bne _080B7342 - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -377743,22 +377743,22 @@ sub_080B734C: @ 0x080B734C ands r0, r1 cmp r0, #0 bne _080B7384 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B7384 - bl sub_08084540 + bl WarpIntoMap ldr r1, _080B7390 ldr r0, _080B7394 str r0, [r1] ldr r0, _080B7398 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080B739C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B7384: movs r0, #0 pop {r1} @@ -377766,13 +377766,13 @@ _080B7384: .align 2, 0 _080B738C: .4byte gUnknown_2037C74 _080B7390: .4byte gUnknown_3005B0C -_080B7394: .4byte sub_080B62C0 -_080B7398: .4byte sub_08085934 +_080B7394: .4byte PrintAllVariableNumsOnCardPage2 +_080B7398: .4byte CB2_LoadMap _080B739C: .4byte sub_080B71E4 thumb_func_end sub_080B734C - thumb_func_start sub_080B73A0 -sub_080B73A0: @ 0x080B73A0 + thumb_func_start FldEff_PopOutOfAsh +FldEff_PopOutOfAsh: @ 0x080B73A0 push {r4, lr} ldr r4, _080B73F8 adds r1, r4, #4 @@ -377788,7 +377788,7 @@ sub_080B73A0: @ 0x080B73A0 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080B7400 @@ -377818,7 +377818,7 @@ sub_080B73A0: @ 0x080B73A0 _080B73F8: .4byte gUnknown_20388A8 _080B73FC: .4byte gUnknown_84DDE4C _080B7400: .4byte gUnknown_20205AC - thumb_func_end sub_080B73A0 + thumb_func_end FldEff_PopOutOfAsh thumb_func_start sub_080B7404 sub_080B7404: @ 0x080B7404 @@ -377838,19 +377838,19 @@ _080B741C: bx r0 thumb_func_end sub_080B7404 - thumb_func_start sub_080B7420 -sub_080B7420: @ 0x080B7420 + thumb_func_start StartEscapeRopeFieldEffect +StartEscapeRopeFieldEffect: @ 0x080B7420 push {lr} bl sub_080987DC bl FreezeEventObjects ldr r0, _080B7438 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080B7438: .4byte sub_080B743C - thumb_func_end sub_080B7420 + thumb_func_end StartEscapeRopeFieldEffect thumb_func_start sub_080B743C sub_080B743C: @ 0x080B743C @@ -377877,8 +377877,8 @@ _080B7464: .4byte gUnknown_8537120 _080B7468: .4byte gUnknown_3005B60 thumb_func_end sub_080B743C - thumb_func_start sub_080B746C -sub_080B746C: @ 0x080B746C + thumb_func_start EscapeRopeFieldEffect_Step0 +EscapeRopeFieldEffect_Step0: @ 0x080B746C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #8] @@ -377894,10 +377894,10 @@ sub_080B746C: @ 0x080B746C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B746C + thumb_func_end EscapeRopeFieldEffect_Step0 - thumb_func_start sub_080B748C -sub_080B748C: @ 0x080B748C + thumb_func_start EscapeRopeFieldEffect_Step1 +EscapeRopeFieldEffect_Step1: @ 0x080B748C push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -377915,8 +377915,8 @@ sub_080B748C: @ 0x080B748C lsls r0, r0, #0x10 cmp r0, #0 bne _080B74B8 - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen _080B74B8: ldr r0, _080B7534 ldrb r1, [r0, #5] @@ -377946,7 +377946,7 @@ _080B74DE: ands r0, r1 cmp r0, #0 bne _080B7550 - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -377956,18 +377956,18 @@ _080B74DE: lsrs r1, r1, #0x18 adds r0, r5, #0 bl SetEventObjectDirection - bl sub_0808477C - bl sub_08084540 + bl SetWarpDestinationToEscapeWarp + bl WarpIntoMap ldr r1, _080B7540 ldr r0, _080B7544 str r0, [r1] ldr r0, _080B7548 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080B754C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _080B7598 .align 2, 0 _080B7530: .4byte gUnknown_8537128 @@ -377975,8 +377975,8 @@ _080B7534: .4byte gUnknown_2037230 _080B7538: .4byte gUnknown_2036FF0 _080B753C: .4byte gUnknown_2037C74 _080B7540: .4byte gUnknown_3005B0C -_080B7544: .4byte sub_080B75A0 -_080B7548: .4byte sub_08085934 +_080B7544: .4byte CB2_RayquazaScene +_080B7548: .4byte CB2_LoadMap _080B754C: .4byte sub_080B743C _080B7550: ldrh r1, [r4, #0xa] @@ -378000,7 +378000,7 @@ _080B7564: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r1, [r4, #0xc] movs r2, #0xc ldrsh r0, [r4, r2] @@ -378020,13 +378020,13 @@ _080B7598: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080B748C + thumb_func_end EscapeRopeFieldEffect_Step1 - thumb_func_start sub_080B75A0 -sub_080B75A0: @ 0x080B75A0 + thumb_func_start CB2_RayquazaScene +CB2_RayquazaScene: @ 0x080B75A0 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights bl sub_080987DC bl FreezeEventObjects ldr r1, _080B75DC @@ -378045,7 +378045,7 @@ sub_080B75A0: @ 0x080B75A0 strb r1, [r0, #1] ldr r0, _080B75E8 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -378053,7 +378053,7 @@ _080B75DC: .4byte gUnknown_3005B0C _080B75E0: .4byte gUnknown_2036FF0 _080B75E4: .4byte gUnknown_2037230 _080B75E8: .4byte sub_080B75EC - thumb_func_end sub_080B75A0 + thumb_func_end CB2_RayquazaScene thumb_func_start sub_080B75EC sub_080B75EC: @ 0x080B75EC @@ -378158,10 +378158,10 @@ _080B768A: bl sub_080987E8 bl UnfreezeEventObjects ldr r0, _080B76D0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _080B7718 .align 2, 0 _080B76C4: .4byte gUnknown_8537128 @@ -378179,7 +378179,7 @@ _080B76D4: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r6, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r1, [r5, #0xc] movs r2, #0xc ldrsh r0, [r5, r2] @@ -378215,7 +378215,7 @@ sub_080B7720: @ 0x080B7720 push {lr} ldr r0, _080B7730 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -378247,13 +378247,13 @@ _080B775C: .4byte gUnknown_8537138 _080B7760: .4byte gUnknown_3005B60 thumb_func_end sub_080B7734 - thumb_func_start sub_080B7764 -sub_080B7764: @ 0x080B7764 + thumb_func_start TeleportFieldEffectTask1 +TeleportFieldEffectTask1: @ 0x080B7764 push {r4, lr} adds r4, r0, #0 bl sub_080987DC bl FreezeEventObjects - bl sub_0808E84C + bl CameraObjectReset2 bl GetPlayerFacingDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -378265,10 +378265,10 @@ sub_080B7764: @ 0x080B7764 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080B7764 + thumb_func_end TeleportFieldEffectTask1 - thumb_func_start sub_080B778C -sub_080B778C: @ 0x080B778C + thumb_func_start TeleportFieldEffectTask2 +TeleportFieldEffectTask2: @ 0x080B778C push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -378300,7 +378300,7 @@ _080B77BE: add r0, sp ldrb r1, [r0] adds r0, r5, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #8 strh r0, [r4, #0xa] ldrh r0, [r4, #0xc] @@ -378338,10 +378338,10 @@ _080B7806: _080B7810: .4byte gUnknown_8537128 _080B7814: .4byte gUnknown_2037230 _080B7818: .4byte gUnknown_2036FF0 - thumb_func_end sub_080B778C + thumb_func_end TeleportFieldEffectTask2 - thumb_func_start sub_080B781C -sub_080B781C: @ 0x080B781C + thumb_func_start TeleportFieldEffectTask3 +TeleportFieldEffectTask3: @ 0x080B781C push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -378376,7 +378376,7 @@ sub_080B781C: @ 0x080B781C add r0, sp ldrb r1, [r0] adds r0, r3, #0 - bl sub_0808DEB4 + bl EventObjectTurn _080B7866: ldrh r0, [r5, #0x22] ldrh r1, [r4, #0xe] @@ -378432,8 +378432,8 @@ _080B78C0: ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] - bl sub_08085278 - bl sub_080AE9B0 + bl TryFadeOutOldMapMusic + bl WarpFadeScreen _080B78D6: add sp, #8 pop {r4, r5} @@ -378444,10 +378444,10 @@ _080B78E0: .4byte gUnknown_8537128 _080B78E4: .4byte gUnknown_2037230 _080B78E8: .4byte gUnknown_2036FF0 _080B78EC: .4byte gUnknown_20205AC - thumb_func_end sub_080B781C + thumb_func_end TeleportFieldEffectTask3 - thumb_func_start sub_080B78F0 -sub_080B78F0: @ 0x080B78F0 + thumb_func_start TeleportFieldEffectTask4 +TeleportFieldEffectTask4: @ 0x080B78F0 push {r4, lr} adds r4, r0, #0 ldr r0, _080B7944 @@ -378460,44 +378460,44 @@ sub_080B78F0: @ 0x080B78F0 ldrsh r0, [r4, r1] cmp r0, #0 bne _080B7910 - bl sub_081BE3C8 + bl ClearMirageTowerPulseBlendEffect movs r0, #1 strh r0, [r4, #0x12] _080B7910: - bl sub_08085308 + bl BGMusicStopped lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080B793E - bl sub_0808466C - bl sub_08084540 + bl SetWarpDestinationToLastHealLocation + bl WarpIntoMap ldr r0, _080B7948 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080B794C ldr r0, _080B7950 str r0, [r1] ldr r0, _080B7954 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B793E: pop {r4} pop {r0} bx r0 .align 2, 0 _080B7944: .4byte gUnknown_2037C74 -_080B7948: .4byte sub_08085934 +_080B7948: .4byte CB2_LoadMap _080B794C: .4byte gUnknown_3005B0C -_080B7950: .4byte sub_080B7958 +_080B7950: .4byte mapldr_08085D88 _080B7954: .4byte sub_080B7734 - thumb_func_end sub_080B78F0 + thumb_func_end TeleportFieldEffectTask4 - thumb_func_start sub_080B7958 -sub_080B7958: @ 0x080B7958 + thumb_func_start mapldr_08085D88 +mapldr_08085D88: @ 0x080B7958 push {lr} - bl sub_080850EC - bl sub_080AE93C + bl Overworld_PlaySpecialMapMusic + bl pal_fill_for_maplights bl sub_080987DC bl FreezeEventObjects ldr r1, _080B7998 @@ -378514,10 +378514,10 @@ sub_080B7958: @ 0x080B7958 movs r2, #0x20 orrs r1, r2 strb r1, [r0, #1] - bl sub_0808E84C + bl CameraObjectReset2 ldr r0, _080B79A4 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -378525,7 +378525,7 @@ _080B7998: .4byte gUnknown_3005B0C _080B799C: .4byte gUnknown_2036FF0 _080B79A0: .4byte gUnknown_2037230 _080B79A4: .4byte sub_080B79A8 - thumb_func_end sub_080B7958 + thumb_func_end mapldr_08085D88 thumb_func_start sub_080B79A8 sub_080B79A8: @ 0x080B79A8 @@ -378734,7 +378734,7 @@ _080B7B26: add r0, sp ldrb r1, [r0] adds r0, r6, #0 - bl sub_0808DEB4 + bl EventObjectTurn _080B7B48: movs r1, #0x26 ldrsh r0, [r5, r1] @@ -378783,7 +378783,7 @@ sub_080B7B68: @ 0x080B7B68 add r0, sp ldrb r1, [r0] adds r0, r5, #0 - bl sub_0808DEB4 + bl EventObjectTurn movs r0, #8 strh r0, [r4, #0xa] ldrh r0, [r4, #0xc] @@ -378801,13 +378801,13 @@ sub_080B7B68: @ 0x080B7B68 cmp r1, r0 bne _080B7BDC bl sub_080987E8 - bl sub_0808E7FC + bl CameraObjectReset1 bl UnfreezeEventObjects ldr r0, _080B7BF0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B7BDC: add sp, #8 pop {r4, r5} @@ -378820,8 +378820,8 @@ _080B7BEC: .4byte gUnknown_2036FF0 _080B7BF0: .4byte sub_080B79A8 thumb_func_end sub_080B7B68 - thumb_func_start sub_080B7BF4 -sub_080B7BF4: @ 0x080B7BF4 + thumb_func_start FldEff_FieldMoveShowMon +FldEff_FieldMoveShowMon: @ 0x080B7BF4 push {r4, lr} bl GetCurrentMapType lsls r0, r0, #0x18 @@ -378839,7 +378839,7 @@ _080B7C14: ldr r0, _080B7C44 _080B7C16: movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r2, _080B7C48 @@ -378863,10 +378863,10 @@ _080B7C16: _080B7C44: .4byte sub_080B800C _080B7C48: .4byte gUnknown_20388A8 _080B7C4C: .4byte gUnknown_3005B60 - thumb_func_end sub_080B7BF4 + thumb_func_end FldEff_FieldMoveShowMon - thumb_func_start sub_080B7C50 -sub_080B7C50: @ 0x080B7C50 + thumb_func_start FldEff_FieldMoveShowMonInit +FldEff_FieldMoveShowMonInit: @ 0x080B7C50 push {r4, r5, r6, lr} ldr r5, _080B7CA4 ldr r0, [r5] @@ -378882,21 +378882,21 @@ sub_080B7C50: @ 0x080B7C50 adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData str r0, [r5] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [r5, #4] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r5, #8] ldr r0, [r5] orrs r0, r6 str r0, [r5] movs r0, #6 - bl sub_080B5270 + bl FieldEffectStart movs r0, #0x3b bl FieldEffectActiveListRemove movs r0, #0 @@ -378906,7 +378906,7 @@ sub_080B7C50: @ 0x080B7C50 .align 2, 0 _080B7CA4: .4byte gUnknown_20388A8 _080B7CA8: .4byte gUnknown_2024190 - thumb_func_end sub_080B7C50 + thumb_func_end FldEff_FieldMoveShowMonInit thumb_func_start sub_080B7CAC sub_080B7CAC: @ 0x080B7CAC @@ -378947,7 +378947,7 @@ sub_080B7CDC: @ 0x080B7CDC adds r0, #0x22 ldr r1, _080B7D40 ldr r1, [r1, #0xc] - bl sub_0806F100 + bl StoreWordInTwoHalfwords ldr r1, _080B7D44 strh r1, [r4, #0xa] ldr r0, _080B7D48 @@ -378968,7 +378968,7 @@ sub_080B7CDC: @ 0x080B7CDC movs r0, #0x4a bl SetGpuReg ldr r0, _080B7D4C - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -379015,7 +379015,7 @@ sub_080B7D50: @ 0x080B7D50 ldr r0, _080B7DB4 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 bl sub_080B7FCC ldrh r0, [r6, #8] @@ -379223,16 +379223,16 @@ _080B7F08: .4byte 0x04000008 _080B7F0C: .4byte 0x05000200 thumb_func_end sub_080B7EC8 - thumb_func_start sub_080B7F10 -sub_080B7F10: @ 0x080B7F10 + thumb_func_start overworld_bg_setup_2 +overworld_bg_setup_2: @ 0x080B7F10 push {r4, lr} sub sp, #4 adds r4, r0, #0 adds r0, #0x22 mov r1, sp - bl sub_0806F108 + bl LoadWordFromTwoHalfwords ldr r0, [sp] - bl sub_080006F0 + bl SetVBlankCallback bl sub_08196DF4 movs r0, #0x26 ldrsh r1, [r4, r0] @@ -379244,14 +379244,14 @@ sub_080B7F10: @ 0x080B7F10 ldrh r1, [r4, #0x26] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080B57C8 + bl FreeResourcesAndDestroySprite movs r0, #6 bl FieldEffectActiveListRemove ldr r0, _080B7F60 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask add sp, #4 pop {r4} pop {r0} @@ -379259,14 +379259,14 @@ sub_080B7F10: @ 0x080B7F10 .align 2, 0 _080B7F5C: .4byte gUnknown_20205AC _080B7F60: .4byte sub_080B7CAC - thumb_func_end sub_080B7F10 + thumb_func_end overworld_bg_setup_2 thumb_func_start sub_080B7F64 sub_080B7F64: @ 0x080B7F64 push {r4, lr} sub sp, #4 ldr r0, _080B7FC4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -379277,7 +379277,7 @@ sub_080B7F64: @ 0x080B7F64 adds r0, r4, #0 adds r0, #0x22 mov r1, sp - bl sub_0806F108 + bl LoadWordFromTwoHalfwords ldr r0, [sp] bl _call_via_r0 thumb_func_end sub_080B7F64 @@ -379384,9 +379384,9 @@ sub_080B803C: @ 0x080B803C adds r0, #0x22 ldr r1, _080B8070 ldr r1, [r1, #0xc] - bl sub_0806F100 + bl StoreWordInTwoHalfwords ldr r0, _080B8074 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -379433,7 +379433,7 @@ sub_080B8078: @ 0x080B8078 ldr r0, _080B80E0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -379584,9 +379584,9 @@ sub_080B81BC: @ 0x080B81BC adds r0, r4, #0 adds r0, #0x22 add r1, sp, #4 - bl sub_0806F108 + bl LoadWordFromTwoHalfwords ldr r0, [sp, #4] - bl sub_080006F0 + bl SetVBlankCallback bl sub_08196DF4 movs r0, #0x26 ldrsh r1, [r4, r0] @@ -379598,14 +379598,14 @@ sub_080B81BC: @ 0x080B81BC ldrh r1, [r4, #0x26] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080B57C8 + bl FreeResourcesAndDestroySprite movs r0, #6 bl FieldEffectActiveListRemove ldr r0, _080B8234 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask add sp, #8 pop {r4} pop {r0} @@ -379622,7 +379622,7 @@ sub_080B8238: @ 0x080B8238 push {r4, lr} sub sp, #4 ldr r0, _080B8278 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -379633,7 +379633,7 @@ sub_080B8238: @ 0x080B8238 adds r0, r4, #0 adds r0, #0x22 mov r1, sp - bl sub_0806F108 + bl LoadWordFromTwoHalfwords ldr r0, [sp] bl _call_via_r0 thumb_func_end sub_080B8238 @@ -379850,7 +379850,7 @@ sub_080B83B8: @ 0x080B83B8 str r4, [sp] movs r4, #0 str r4, [sp, #4] - bl sub_080B5740 + bl CreateMonSprite_FieldMove lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -379909,7 +379909,7 @@ _080B844C: .4byte sub_080B845C _080B8450: ldrh r0, [r1, #0x2e] movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 _080B8458: pop {r0} bx r0 @@ -379958,12 +379958,12 @@ _080B8496: .align 2, 0 thumb_func_end sub_080B8478 - thumb_func_start sub_080B849C -sub_080B849C: @ 0x080B849C + thumb_func_start FldEff_UseSurf +FldEff_UseSurf: @ 0x080B849C push {lr} ldr r0, _080B84CC movs r1, #0xff - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B84D0 @@ -379974,9 +379974,9 @@ sub_080B849C: @ 0x080B849C ldr r0, _080B84D4 ldr r0, [r0] strh r0, [r1, #0x26] - bl sub_08085168 + bl Overworld_ClearSavedMusic ldr r0, _080B84D8 - bl sub_0808522C + bl GetTruckCameraBobbingY movs r0, #0 pop {r1} bx r1 @@ -379985,7 +379985,7 @@ _080B84CC: .4byte sub_080B84DC _080B84D0: .4byte gUnknown_3005B60 _080B84D4: .4byte gUnknown_20388A8 _080B84D8: .4byte 0x0000016D - thumb_func_end sub_080B849C + thumb_func_end FldEff_UseSurf thumb_func_start sub_080B84DC sub_080B84DC: @ 0x080B84DC @@ -380024,7 +380024,7 @@ sub_080B850C: @ 0x080B850C movs r0, #1 strb r0, [r5, #6] movs r0, #8 - bl sub_0808B878 + bl SetPlayerAvatarStateMask adds r6, r4, #0 adds r6, #0xa movs r0, #0xc @@ -380082,7 +380082,7 @@ _080B8596: bl sub_0808BA78 adds r0, r4, #0 movs r1, #0x39 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -380118,7 +380118,7 @@ sub_080B85B8: @ 0x080B85B8 orrs r0, r1 str r0, [r2] movs r0, #0x3b - bl sub_080B5270 + bl FieldEffectStart ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -380154,7 +380154,7 @@ sub_080B8600: @ 0x080B8600 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId adds r0, r4, #0 bl EventObjectClearHeldMovementIfFinished ldrb r0, [r4, #0x18] @@ -380164,7 +380164,7 @@ sub_080B8600: @ 0x080B8600 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldr r1, _080B8678 movs r2, #0xa ldrsh r0, [r6, r2] @@ -380175,7 +380175,7 @@ sub_080B8600: @ 0x080B8600 ldrb r0, [r5, #5] str r0, [r1, #8] movs r0, #8 - bl sub_080B5270 + bl FieldEffectStart strb r0, [r4, #0x1a] ldrh r0, [r6, #8] adds r0, #1 @@ -380218,7 +380218,7 @@ sub_080B867C: @ 0x080B867C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrb r0, [r4, #0x1a] movs r1, #1 bl sub_081554E8 @@ -380227,10 +380227,10 @@ sub_080B867C: @ 0x080B867C movs r0, #9 bl FieldEffectActiveListRemove ldr r0, _080B86EC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B86DC: pop {r4, r5} pop {r0} @@ -380253,7 +380253,7 @@ sub_080B86F0: @ 0x080B86F0 rsbs r2, r2, #0 movs r1, #0x78 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -380294,7 +380294,7 @@ sub_080B86F0: @ 0x080B86F0 ldr r0, _080B880C movs r1, #0xc0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0x12 movs r1, #0x78 bl SetGpuReg @@ -380386,15 +380386,15 @@ _080B881C: .4byte 0x06008020 _080B8820: .4byte 0x06008022 thumb_func_end sub_080B86F0 - thumb_func_start sub_080B8824 -sub_080B8824: @ 0x080B8824 + thumb_func_start FldEff_NPCFlyOut +FldEff_NPCFlyOut: @ 0x080B8824 push {r4, lr} ldr r0, _080B8870 ldr r0, [r0, #0x68] movs r1, #0x78 movs r2, #0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -380428,7 +380428,7 @@ _080B8870: .4byte gUnknown_84DDE4C _080B8874: .4byte gUnknown_20205AC _080B8878: .4byte sub_080B8880 _080B887C: .4byte gUnknown_20388A8 - thumb_func_end sub_080B8824 + thumb_func_end FldEff_NPCFlyOut thumb_func_start sub_080B8880 sub_080B8880: @ 0x080B8880 @@ -380495,12 +380495,12 @@ _080B88F2: _080B88F8: .4byte gUnknown_20205AC thumb_func_end sub_080B8880 - thumb_func_start sub_080B88FC -sub_080B88FC: @ 0x080B88FC + thumb_func_start FldEff_UseFly +FldEff_UseFly: @ 0x080B88FC push {lr} ldr r0, _080B8920 movs r1, #0xfe - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B8924 @@ -380518,7 +380518,7 @@ sub_080B88FC: @ 0x080B88FC _080B8920: .4byte sub_080B892C _080B8924: .4byte gUnknown_3005B60 _080B8928: .4byte gUnknown_20388A8 - thumb_func_end sub_080B88FC + thumb_func_end FldEff_UseFly thumb_func_start sub_080B892C sub_080B892C: @ 0x080B892C @@ -380571,11 +380571,11 @@ _080B8986: strh r0, [r5, #0x26] movs r0, #1 strb r0, [r6, #6] - bl sub_0808B878 + bl SetPlayerAvatarStateMask bl sub_0808BA78 adds r0, r4, #0 movs r1, #0x39 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -380611,7 +380611,7 @@ sub_080B89B4: @ 0x080B89B4 ldrsh r0, [r4, r2] str r0, [r1] movs r0, #0x3b - bl sub_080B5270 + bl FieldEffectStart _080B89E4: pop {r4} pop {r0} @@ -380690,7 +380690,7 @@ sub_080B8A50: @ 0x080B8A50 ldr r1, _080B8A90 adds r0, r0, r1 movs r1, #2 - bl sub_08092B30 + bl EventObjectSetHeldMovement _080B8A84: pop {r4} pop {r0} @@ -380767,7 +380767,7 @@ sub_080B8AE8: @ 0x080B8AE8 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r4, #4] lsls r0, r1, #4 adds r0, r0, r1 @@ -380782,7 +380782,7 @@ sub_080B8AE8: @ 0x080B8AE8 strb r0, [r4, #1] adds r0, r4, #0 movs r1, #0x48 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r1, [r5, #0x26] movs r0, #8 ands r0, r1 @@ -380843,7 +380843,7 @@ sub_080B8B70: @ 0x080B8B70 ldrb r0, [r5, #0xa] ldrb r1, [r4, #4] bl sub_080B8CB8 - bl sub_0808E84C + bl CameraObjectReset2 ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -380865,7 +380865,7 @@ sub_080B8BCC: @ 0x080B8BCC lsls r0, r0, #0x18 cmp r0, #0 beq _080B8BE6 - bl sub_080AE9B0 + bl WarpFadeScreen ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -380887,10 +380887,10 @@ sub_080B8BEC: @ 0x080B8BEC movs r0, #0x1f bl FieldEffectActiveListRemove ldr r0, _080B8C18 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B8C0E: pop {r0} bx r0 @@ -380907,7 +380907,7 @@ sub_080B8C1C: @ 0x080B8C1C movs r1, #0xff movs r2, #0xb4 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -381296,18 +381296,18 @@ _080B8F10: .4byte gUnknown_20205AC _080B8F14: .4byte sub_080B8E08 thumb_func_end sub_080B8EEC - thumb_func_start sub_080B8F18 -sub_080B8F18: @ 0x080B8F18 + thumb_func_start FldEff_FlyIn +FldEff_FlyIn: @ 0x080B8F18 push {lr} ldr r0, _080B8F28 movs r1, #0xfe - bl sub_080A8878 + bl CreateTask movs r0, #0 pop {r1} bx r1 .align 2, 0 _080B8F28: .4byte sub_080B8F2C - thumb_func_end sub_080B8F18 + thumb_func_end FldEff_FlyIn thumb_func_start sub_080B8F2C sub_080B8F2C: @ 0x080B8F2C @@ -381365,7 +381365,7 @@ _080B8F86: strh r0, [r5, #0x26] movs r0, #1 strb r0, [r6, #6] - bl sub_0808B878 + bl SetPlayerAvatarStateMask ldrh r1, [r5, #0x26] movs r0, #8 ands r0, r1 @@ -381381,11 +381381,11 @@ _080B8FAE: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 - bl sub_0808E84C + bl EventObjectSetGraphicsId + bl CameraObjectReset2 adds r0, r4, #0 movs r1, #3 - bl sub_0808DEB4 + bl EventObjectTurn ldrb r1, [r4, #4] lsls r0, r1, #4 adds r0, r0, r1 @@ -381560,7 +381560,7 @@ sub_080B90D0: @ 0x080B90D0 bl sub_0808BA78 adds r0, r5, #0 movs r1, #0x39 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -381667,10 +381667,10 @@ _080B91EC: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId adds r0, r4, #0 movs r1, #1 - bl sub_0808DEB4 + bl EventObjectTurn ldrh r0, [r5, #0x26] strb r0, [r6] movs r0, #0 @@ -381678,10 +381678,10 @@ _080B91EC: movs r0, #0x20 bl FieldEffectActiveListRemove ldr r0, _080B9230 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _080B9222: pop {r4, r5, r6, r7} pop {r0} @@ -381707,7 +381707,7 @@ sub_080B9234: @ 0x080B9234 bne _080B9284 ldr r0, _080B927C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080B9280 @@ -381798,21 +381798,21 @@ _080B92D4: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning b _080B930E _080B9304: movs r0, #0xa ldrsh r1, [r4, r0] movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning _080B930E: - bl sub_08089C78 + bl UpdateCameraPanning movs r1, #0xa ldrsh r0, [r4, r1] cmp r0, #0 bne _080B9320 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B9320: pop {r4, r5} pop {r0} @@ -381877,7 +381877,7 @@ sub_080B9380: @ 0x080B9380 adds r5, r0, #0 ldr r0, _080B93A8 movs r1, #0x5a - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -381894,8 +381894,8 @@ sub_080B9380: @ 0x080B9380 _080B93A8: .4byte sub_080B9294 thumb_func_end sub_080B9380 - thumb_func_start sub_080B93AC -sub_080B93AC: @ 0x080B93AC + thumb_func_start SpawnLinkPlayerEventObject +SpawnLinkPlayerEventObject: @ 0x080B93AC push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 @@ -381928,13 +381928,13 @@ sub_080B93AC: @ 0x080B93AC adds r0, r6, #0 movs r1, #0x10 adds r2, r5, #0 - bl sub_080A22E8 + bl BlendPalettes str r5, [sp] adds r0, r6, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade adds r0, r4, #0 bl sub_080B947C movs r0, #0x57 @@ -381956,7 +381956,7 @@ _080B9424: .4byte gUnknown_2036FF0 _080B9428: .4byte gUnknown_20205AC _080B942C: .4byte 0x0000FFFF _080B9430: .4byte 0x00007FFF - thumb_func_end sub_080B93AC + thumb_func_end SpawnLinkPlayerEventObject thumb_func_start sub_080B9434 sub_080B9434: @ 0x080B9434 @@ -381971,7 +381971,7 @@ sub_080B9434: @ 0x080B9434 cmp r0, #0 bne _080B946E ldr r0, _080B9478 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080B946E @@ -381979,11 +381979,11 @@ sub_080B9434: @ 0x080B9434 ldrb r0, [r4, #0xc] ldrb r1, [r4, #0xe] ldrb r2, [r4, #0x10] - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap movs r0, #0x41 bl FieldEffectActiveListRemove adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080B946E: pop {r4, r5} pop {r0} @@ -382028,7 +382028,7 @@ _080B94B2: asrs r1, r2, #0x10 asrs r2, r7, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -382136,8 +382136,8 @@ _080B957C: bx r0 thumb_func_end sub_080B9510 - thumb_func_start sub_080B9580 -sub_080B9580: @ 0x080B9580 + thumb_func_start Fldeff_MoveDeoxysRock +Fldeff_MoveDeoxysRock: @ 0x080B9580 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r7, _080B9620 @@ -382175,10 +382175,10 @@ sub_080B9580: @ 0x080B9580 lsls r2, r2, #0x10 asrs r2, r2, #0x10 adds r0, r4, #0 - bl sub_0808E454 + bl ShiftEventObjectCoords ldr r0, _080B9628 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080B962C @@ -382219,13 +382219,13 @@ _080B9616: .align 2, 0 _080B9620: .4byte gUnknown_20388A8 _080B9624: .4byte gUnknown_2036FF0 -_080B9628: .4byte sub_080B9634 +_080B9628: .4byte Fldeff_MoveDeoxysRock_Step _080B962C: .4byte gUnknown_3005B60 _080B9630: .4byte gUnknown_20205AC - thumb_func_end sub_080B9580 + thumb_func_end Fldeff_MoveDeoxysRock - thumb_func_start sub_080B9634 -sub_080B9634: @ 0x080B9634 + thumb_func_start Fldeff_MoveDeoxysRock_Step +Fldeff_MoveDeoxysRock_Step: @ 0x080B9634 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -382318,7 +382318,7 @@ _080B96D4: ldrh r0, [r5, #6] strh r0, [r6, #0x22] adds r0, r4, #0 - bl sub_0808E56C + bl ShiftStillEventObjectCoords ldrb r0, [r4] movs r1, #8 orrs r0, r1 @@ -382326,17 +382326,17 @@ _080B96D4: movs r0, #0x42 bl FieldEffectActiveListRemove adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask _080B9704: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _080B970C: .4byte gUnknown_2036FF0 - thumb_func_end sub_080B9634 + thumb_func_end Fldeff_MoveDeoxysRock_Step - thumb_func_start sub_080B9710 -sub_080B9710: @ 0x080B9710 + thumb_func_start ScanlineEffect_Stop +ScanlineEffect_Stop: @ 0x080B9710 push {r4, lr} ldr r4, _080B9740 movs r0, #0 @@ -382354,7 +382354,7 @@ sub_080B9710: @ 0x080B9710 ldrb r0, [r4, #0x18] cmp r0, #0xff beq _080B973A - bl sub_080A8964 + bl DestroyTask movs r0, #0xff strb r0, [r4, #0x18] _080B973A: @@ -382366,10 +382366,10 @@ _080B9740: .4byte gUnknown_20397C8 _080B9744: .4byte 0x040000B0 _080B9748: .4byte 0x0000C5FF _080B974C: .4byte 0x00007FFF - thumb_func_end sub_080B9710 + thumb_func_end ScanlineEffect_Stop - thumb_func_start sub_080B9750 -sub_080B9750: @ 0x080B9750 + thumb_func_start ScanlineEffect_Clear +ScanlineEffect_Clear: @ 0x080B9750 push {r4, lr} sub sp, #4 mov r0, sp @@ -382398,10 +382398,10 @@ sub_080B9750: @ 0x080B9750 _080B9784: .4byte gUnknown_20388C8 _080B9788: .4byte 0x01000780 _080B978C: .4byte gUnknown_20397C8 - thumb_func_end sub_080B9750 + thumb_func_end ScanlineEffect_Clear - thumb_func_start sub_080B9790 -sub_080B9790: @ 0x080B9790 + thumb_func_start ScanlineEffect_SetParams +ScanlineEffect_SetParams: @ 0x080B9790 push {lr} sub sp, #0xc str r0, [sp] @@ -382454,10 +382454,10 @@ _080B97D4: _080B97F4: .4byte gUnknown_20397C8 _080B97F8: .4byte gUnknown_20388CC _080B97FC: .4byte CopyValue32Bit - thumb_func_end sub_080B9790 + thumb_func_end ScanlineEffect_SetParams - thumb_func_start sub_080B9800 -sub_080B9800: @ 0x080B9800 + thumb_func_start ScanlineEffect_InitHBlankDmaTransfer +ScanlineEffect_InitHBlankDmaTransfer: @ 0x080B9800 push {r4, lr} ldr r4, _080B9830 ldrb r0, [r4, #0x15] @@ -382522,7 +382522,7 @@ _080B987A: _080B9880: .4byte 0x040000B0 _080B9884: .4byte 0x0000C5FF _080B9888: .4byte 0x00007FFF - thumb_func_end sub_080B9800 + thumb_func_end ScanlineEffect_InitHBlankDmaTransfer thumb_func_start CopyValue16Bit CopyValue16Bit: @ 0x080B988C @@ -382560,8 +382560,8 @@ _080B98C4: .4byte gUnknown_20397C8 _080B98C8: .4byte gUnknown_20388C8 thumb_func_end CopyValue32Bit - thumb_func_start sub_080B98CC -sub_080B98CC: @ 0x080B98CC + thumb_func_start TaskFunc_UpdateWavePerFrame +TaskFunc_UpdateWavePerFrame: @ 0x080B98CC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -382576,7 +382576,7 @@ sub_080B98CC: @ 0x080B98CC cmp r0, #0 beq _080B98FC mov r0, ip - bl sub_080A8964 + bl DestroyTask ldr r1, _080B98F8 movs r0, #0xff strb r0, [r1, #0x18] @@ -382783,7 +382783,7 @@ _080B9A7C: .align 2, 0 _080B9A8C: .4byte gUnknown_20388C8 _080B9A90: .4byte gUnknown_20397C8 - thumb_func_end sub_080B98CC + thumb_func_end TaskFunc_UpdateWavePerFrame thumb_func_start GenerateWave GenerateWave: @ 0x080B9A94 @@ -382826,8 +382826,8 @@ _080B9ABC: _080B9AD8: .4byte gUnknown_82FA8CC thumb_func_end GenerateWave - thumb_func_start sub_080B9ADC -sub_080B9ADC: @ 0x080B9ADC + thumb_func_start ScanlineEffect_InitWave +ScanlineEffect_InitWave: @ 0x080B9ADC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -382867,7 +382867,7 @@ sub_080B9ADC: @ 0x080B9ADC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _080B9BE8 add r0, sb str r0, [sp] @@ -382882,10 +382882,10 @@ sub_080B9ADC: @ 0x080B9ADC ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _080B9BF0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080B9BF4 @@ -382962,21 +382962,21 @@ _080B9BD6: .align 2, 0 _080B9BE8: .4byte 0x04000010 _080B9BEC: .4byte 0xA2600001 -_080B9BF0: .4byte sub_080B98CC +_080B9BF0: .4byte TaskFunc_UpdateWavePerFrame _080B9BF4: .4byte gUnknown_3005B60 _080B9BF8: .4byte gUnknown_20397C8 _080B9BFC: .4byte gUnknown_20397E4 _080B9C00: .4byte gUnknown_2038B48 _080B9C04: .4byte 0xFFFFFD80 - thumb_func_end sub_080B9ADC + thumb_func_end ScanlineEffect_InitWave thumb_func_start sub_080B9C08 sub_080B9C08: @ 0x080B9C08 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -382985,16 +382985,16 @@ sub_080B9C08: @ 0x080B9C08 thumb_func_start sub_080B9C20 sub_080B9C20: @ 0x080B9C20 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080B9C20 - thumb_func_start sub_080B9C34 -sub_080B9C34: @ 0x080B9C34 + thumb_func_start CB2_InitOptionMenu +CB2_InitOptionMenu: @ 0x080B9C34 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -383030,7 +383030,7 @@ _080B9C60: @ jump table .4byte _080B9F64 @ case 11 _080B9C90: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _080B9CA0 movs r0, #0x87 lsls r0, r0, #3 @@ -383114,37 +383114,37 @@ _080B9CC2: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, _080B9DF0 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0x40 movs r1, #0 @@ -383172,9 +383172,9 @@ _080B9CC2: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg b _080B9F44 .align 2, 0 _080B9DE4: .4byte 0x040000D4 @@ -383183,8 +383183,8 @@ _080B9DEC: .4byte gUnknown_8537414 _080B9DF0: .4byte gUnknown_85373FC _080B9DF4: bl ResetPaletteFade - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData ldr r1, _080B9E10 movs r0, #0x87 @@ -383198,7 +383198,7 @@ _080B9E14: ldr r0, [r0] ldrb r0, [r0, #0x14] lsrs r0, r0, #3 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r1, [r0] movs r2, #0x90 lsls r2, r2, #1 @@ -383213,16 +383213,16 @@ _080B9E38: ldr r0, _080B9E64 movs r1, #0 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r0, _080B9E68 ldr r0, [r0] ldrb r0, [r0, #0x14] lsrs r0, r0, #3 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r0, [r0, #4] movs r1, #0x70 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080B9E6C movs r0, #0x87 lsls r0, r0, #3 @@ -383236,14 +383236,14 @@ _080B9E70: ldr r0, _080B9E7C movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _080B9F44 .align 2, 0 _080B9E7C: .4byte gUnknown_85372B0 _080B9E80: movs r0, #0 - bl sub_0800365C - bl sub_080BA800 + bl PutWindowTilemap + bl DrawTextOption ldr r1, _080B9E94 movs r0, #0x87 lsls r0, r0, #3 @@ -383258,7 +383258,7 @@ _080B9E98: b _080B9F4C _080B9EA0: movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap bl sub_080BA834 ldr r1, _080B9EC8 movs r2, #0x87 @@ -383279,7 +383279,7 @@ _080B9EC8: .4byte gUnknown_3002360 _080B9ECC: ldr r0, _080B9F54 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080B9F58 @@ -383324,10 +383324,10 @@ _080B9ECC: ldrb r0, [r4, #0x14] bl sub_080BA634 ldrb r0, [r4, #8] - bl sub_080BA290 + bl HighlightOptionMenuItem movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _080B9F44: ldr r1, _080B9F60 movs r2, #0x87 @@ -383350,11 +383350,11 @@ _080B9F64: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080B9F8C - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080B9F90 - bl sub_08000540 + bl SetMainCallback2 _080B9F80: add sp, #0xc pop {r3} @@ -383365,7 +383365,7 @@ _080B9F80: .align 2, 0 _080B9F8C: .4byte sub_080B9C20 _080B9F90: .4byte sub_080B9C08 - thumb_func_end sub_080B9C34 + thumb_func_end CB2_InitOptionMenu thumb_func_start sub_080B9F94 sub_080B9F94: @ 0x080B9F94 @@ -383391,11 +383391,11 @@ _080B9FB4: .align 2, 0 _080B9FB8: .4byte gUnknown_2037C74 _080B9FBC: .4byte gUnknown_3005B60 -_080B9FC0: .4byte sub_080B9FC4 +_080B9FC0: .4byte Task_OptionMenuProcessInput thumb_func_end sub_080B9F94 - thumb_func_start sub_080B9FC4 -sub_080B9FC4: @ 0x080B9FC4 + thumb_func_start Task_OptionMenuProcessInput +Task_OptionMenuProcessInput: @ 0x080B9FC4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -383436,7 +383436,7 @@ _080BA006: b _080BA1B2 .align 2, 0 _080BA00C: .4byte gUnknown_3005B60 -_080BA010: .4byte sub_080BA1BC +_080BA010: .4byte Task_OptionMenuSave _080BA014: movs r0, #0x40 ands r0, r1 @@ -383491,7 +383491,7 @@ _080BA06E: lsls r0, r0, #3 adds r0, r0, r7 ldrb r0, [r0, #8] - bl sub_080BA290 + bl HighlightOptionMenuItem b _080BA1B2 _080BA07C: ldr r0, _080BA09C @@ -383581,7 +383581,7 @@ _080BA12E: adds r4, r4, r7 ldrb r5, [r4, #0x10] adds r0, r5, #0 - bl sub_080BA4EC + bl Sound_ProcessInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -383617,7 +383617,7 @@ _080BA17A: adds r4, r4, r7 ldrb r5, [r4, #0x14] adds r0, r5, #0 - bl sub_080BA584 + bl FrameType_ProcessInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -383637,17 +383637,17 @@ _080BA19E: strb r0, [r1] movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _080BA1B2: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _080BA1B8: .4byte gUnknown_20397E8 - thumb_func_end sub_080B9FC4 + thumb_func_end Task_OptionMenuProcessInput - thumb_func_start sub_080BA1BC -sub_080BA1BC: @ 0x080BA1BC + thumb_func_start Task_OptionMenuSave +Task_OptionMenuSave: @ 0x080BA1BC push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -383716,7 +383716,7 @@ sub_080BA1BC: @ 0x080BA1BC movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BA25C str r0, [r4] add sp, #4 @@ -383726,11 +383726,11 @@ sub_080BA1BC: @ 0x080BA1BC .align 2, 0 _080BA254: .4byte gUnknown_3005AF0 _080BA258: .4byte gUnknown_3005B60 -_080BA25C: .4byte sub_080BA260 - thumb_func_end sub_080BA1BC +_080BA25C: .4byte Task_OptionMenuFadeOut + thumb_func_end Task_OptionMenuSave - thumb_func_start sub_080BA260 -sub_080BA260: @ 0x080BA260 + thumb_func_start Task_OptionMenuFadeOut +Task_OptionMenuFadeOut: @ 0x080BA260 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -383741,21 +383741,21 @@ sub_080BA260: @ 0x080BA260 cmp r0, #0 bne _080BA284 adds r0, r2, #0 - bl sub_080A8964 - bl sub_080034D4 + bl DestroyTask + bl FreeAllWindowBuffers ldr r0, _080BA28C ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _080BA284: pop {r0} bx r0 .align 2, 0 _080BA288: .4byte gUnknown_2037C74 _080BA28C: .4byte gUnknown_3002360 - thumb_func_end sub_080BA260 + thumb_func_end Task_OptionMenuFadeOut - thumb_func_start sub_080BA290 -sub_080BA290: @ 0x080BA290 + thumb_func_start HighlightOptionMenuItem +HighlightOptionMenuItem: @ 0x080BA290 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -383778,10 +383778,10 @@ sub_080BA290: @ 0x080BA290 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080BA290 + thumb_func_end HighlightOptionMenuItem - thumb_func_start sub_080BA2C0 -sub_080BA2C0: @ 0x080BA2C0 + thumb_func_start DrawOptionMenuChoice +DrawOptionMenuChoice: @ 0x080BA2C0 push {r4, r5, r6, lr} sub sp, #0x1c adds r4, r0, #0 @@ -383842,7 +383842,7 @@ _080BA306: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080BA2C0 + thumb_func_end DrawOptionMenuChoice thumb_func_start sub_080BA334 sub_080BA334: @ 0x080BA334 @@ -383915,19 +383915,19 @@ sub_080BA390: @ 0x080BA390 mov r1, sp ldrb r3, [r1] movs r1, #0x68 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r0, _080BA3DC mov r1, sp ldrb r3, [r1, #1] movs r1, #0x88 movs r2, #0 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r0, _080BA3E0 mov r1, sp ldrb r3, [r1, #2] movs r1, #0xa8 movs r2, #0 - bl sub_080BA2C0 + bl DrawOptionMenuChoice add sp, #4 pop {r0} bx r0 @@ -383976,7 +383976,7 @@ sub_080BA40C: @ 0x080BA40C strb r0, [r1] ldr r4, _080BA460 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -383984,11 +383984,11 @@ sub_080BA40C: @ 0x080BA40C ldrb r3, [r0] adds r0, r4, #0 movs r1, #0x68 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r4, _080BA464 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -383996,7 +383996,7 @@ sub_080BA40C: @ 0x080BA40C ldrb r3, [r0, #1] adds r0, r4, #0 movs r1, #0xa8 - bl sub_080BA2C0 + bl DrawOptionMenuChoice add sp, #4 pop {r4} pop {r0} @@ -384045,7 +384045,7 @@ sub_080BA490: @ 0x080BA490 strb r0, [r1] ldr r4, _080BA4E4 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x19 lsrs r2, r2, #0x18 @@ -384053,11 +384053,11 @@ sub_080BA490: @ 0x080BA490 ldrb r3, [r0] adds r0, r4, #0 movs r1, #0x68 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r4, _080BA4E8 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x19 lsrs r2, r2, #0x18 @@ -384065,7 +384065,7 @@ sub_080BA490: @ 0x080BA490 ldrb r3, [r0, #1] adds r0, r4, #0 movs r1, #0xa0 - bl sub_080BA2C0 + bl DrawOptionMenuChoice add sp, #4 pop {r4} pop {r0} @@ -384075,8 +384075,8 @@ _080BA4E4: .4byte gUnknown_853739D _080BA4E8: .4byte gUnknown_85373A8 thumb_func_end sub_080BA490 - thumb_func_start sub_080BA4EC -sub_080BA4EC: @ 0x080BA4EC + thumb_func_start Sound_ProcessInput +Sound_ProcessInput: @ 0x080BA4EC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -384100,7 +384100,7 @@ _080BA50C: .align 2, 0 _080BA514: .4byte gUnknown_3002360 _080BA518: .4byte gUnknown_20397E8 - thumb_func_end sub_080BA4EC + thumb_func_end Sound_ProcessInput thumb_func_start sub_080BA51C sub_080BA51C: @ 0x080BA51C @@ -384117,7 +384117,7 @@ sub_080BA51C: @ 0x080BA51C strb r0, [r1] ldr r4, _080BA57C movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #1 @@ -384128,11 +384128,11 @@ sub_080BA51C: @ 0x080BA51C ldrb r3, [r0] adds r0, r4, #0 movs r1, #0x68 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r4, _080BA580 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #1 @@ -384143,7 +384143,7 @@ sub_080BA51C: @ 0x080BA51C ldrb r3, [r0, #1] adds r0, r4, #0 movs r1, #0xa0 - bl sub_080BA2C0 + bl DrawOptionMenuChoice add sp, #4 pop {r4} pop {r0} @@ -384153,8 +384153,8 @@ _080BA57C: .4byte gUnknown_85373B3 _080BA580: .4byte gUnknown_85373BE thumb_func_end sub_080BA51C - thumb_func_start sub_080BA584 -sub_080BA584: @ 0x080BA584 + thumb_func_start FrameType_ProcessInput +FrameType_ProcessInput: @ 0x080BA584 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -384176,7 +384176,7 @@ _080BA5A8: movs r4, #0 _080BA5AA: adds r0, r4, #0 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r1, [r0] movs r2, #0x90 lsls r2, r2, #1 @@ -384185,11 +384185,11 @@ _080BA5AA: movs r0, #1 bl LoadBgTiles adds r0, r4, #0 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r0, [r0, #4] movs r1, #0x70 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080BA5F0 movs r0, #1 strb r0, [r1] @@ -384213,7 +384213,7 @@ _080BA5F8: movs r4, #0x13 _080BA5FA: adds r0, r4, #0 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r1, [r0] movs r2, #0x90 lsls r2, r2, #1 @@ -384222,11 +384222,11 @@ _080BA5FA: movs r0, #1 bl LoadBgTiles adds r0, r4, #0 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r0, [r0, #4] movs r1, #0x70 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080BA630 movs r0, #1 strb r0, [r1] @@ -384237,7 +384237,7 @@ _080BA626: bx r1 .align 2, 0 _080BA630: .4byte gUnknown_20397E8 - thumb_func_end sub_080BA584 + thumb_func_end FrameType_ProcessInput thumb_func_start sub_080BA634 sub_080BA634: @ 0x080BA634 @@ -384325,7 +384325,7 @@ _080BA6CC: strb r0, [r1] movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #2 @@ -384335,10 +384335,10 @@ _080BA6CC: mov r0, r8 movs r1, #0x68 movs r3, #0 - bl sub_080BA2C0 + bl DrawOptionMenuChoice movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #2 @@ -384348,7 +384348,7 @@ _080BA6CC: mov r0, sp movs r1, #0x80 movs r3, #1 - bl sub_080BA2C0 + bl DrawOptionMenuChoice add sp, #8 pop {r3} mov r8, r3 @@ -384427,7 +384427,7 @@ sub_080BA780: @ 0x080BA780 strb r0, [r1] ldr r4, _080BA7F4 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x1a lsrs r2, r2, #0x18 @@ -384435,11 +384435,11 @@ sub_080BA780: @ 0x080BA780 ldrb r3, [r0] adds r0, r4, #0 movs r1, #0x68 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r4, _080BA7F8 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x1a lsrs r2, r2, #0x18 @@ -384447,11 +384447,11 @@ sub_080BA780: @ 0x080BA780 ldrb r3, [r0, #1] adds r0, r4, #0 movs r1, #0x90 - bl sub_080BA2C0 + bl DrawOptionMenuChoice ldr r4, _080BA7FC movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x1a lsrs r2, r2, #0x18 @@ -384459,7 +384459,7 @@ sub_080BA780: @ 0x080BA780 ldrb r3, [r0, #2] adds r0, r4, #0 movs r1, #0xa8 - bl sub_080BA2C0 + bl DrawOptionMenuChoice add sp, #4 pop {r4} pop {r0} @@ -384470,13 +384470,13 @@ _080BA7F8: .4byte gUnknown_85373E5 _080BA7FC: .4byte gUnknown_85373EE thumb_func_end sub_080BA780 - thumb_func_start sub_080BA800 -sub_080BA800: @ 0x080BA800 + thumb_func_start DrawTextOption +DrawTextOption: @ 0x080BA800 push {lr} sub sp, #0xc movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _080BA830 movs r0, #2 str r0, [sp] @@ -384489,13 +384489,13 @@ sub_080BA800: @ 0x080BA800 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 .align 2, 0 _080BA830: .4byte gUnknown_8537310 - thumb_func_end sub_080BA800 + thumb_func_end DrawTextOption thumb_func_start sub_080BA834 sub_080BA834: @ 0x080BA834 @@ -384503,12 +384503,12 @@ sub_080BA834: @ 0x080BA834 sub sp, #0xc movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r4, #0 _080BA842: movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r1, r4, #0 muls r1, r0, r1 adds r1, #2 @@ -384534,7 +384534,7 @@ _080BA842: bls _080BA842 movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} @@ -384701,7 +384701,7 @@ sub_080BA890: @ 0x080BA890 movs r3, #0x13 bl FillBgTilemapBufferRect movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -384717,8 +384717,8 @@ _080BAA04: .4byte 0x000001A7 _080BAA08: .4byte 0x000001A9 thumb_func_end sub_080BA890 - thumb_func_start sub_080BAA0C -sub_080BAA0C: @ 0x080BAA0C + thumb_func_start ResetPokedex +ResetPokedex: @ 0x080BAA0C push {r4, r5, r6, lr} ldr r0, _080BAA78 movs r2, #0 @@ -384781,10 +384781,10 @@ _080BAA84: .4byte gUnknown_3005AF0 _080BAA88: .4byte gUnknown_3005AEC _080BAA8C: .4byte 0x00000988 _080BAA90: .4byte 0x00003B24 - thumb_func_end sub_080BAA0C + thumb_func_end ResetPokedex - thumb_func_start sub_080BAA94 -sub_080BAA94: @ 0x080BAA94 + thumb_func_start ResetPokedexScrollPositions +ResetPokedexScrollPositions: @ 0x080BAA94 ldr r1, _080BAAA4 movs r0, #0 strh r0, [r1] @@ -384795,13 +384795,13 @@ sub_080BAA94: @ 0x080BAA94 .align 2, 0 _080BAAA4: .4byte gUnknown_20397F0 _080BAAA8: .4byte gUnknown_20397F2 - thumb_func_end sub_080BAA94 + thumb_func_end ResetPokedexScrollPositions thumb_func_start sub_080BAAAC sub_080BAAAC: @ 0x080BAAAC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -385019,8 +385019,8 @@ _080BAC68: .4byte 0x00000654 _080BAC6C: .4byte 0x0000065C thumb_func_end ResetPokedexView - thumb_func_start sub_080BAC70 -sub_080BAC70: @ 0x080BAC70 + thumb_func_start CB2_Pokedex +CB2_Pokedex: @ 0x080BAC70 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -385041,7 +385041,7 @@ sub_080BAC70: @ 0x080BAC70 b _080BAE58 _080BAC94: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl sub_080BFF08 movs r3, #0xc0 @@ -385119,8 +385119,8 @@ _080BAD2C: .4byte gUnknown_3002360 _080BAD30: .4byte 0x040000D4 _080BAD34: .4byte 0x81000800 _080BAD38: - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes @@ -385137,12 +385137,12 @@ _080BAD60: .4byte gUnknown_30030BC _080BAD64: ldr r4, _080BADE4 ldr r0, _080BADE8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] bl ResetPokedexView ldr r0, _080BADEC movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] ldr r5, _080BADF0 ldr r0, [r5] @@ -385150,7 +385150,7 @@ _080BAD64: ldr r3, _080BADF4 adds r1, r1, r3 strh r0, [r1] - bl sub_0809CD04 + bl IsNationalPokedexEnabled adds r1, r0, #0 cmp r1, #0 bne _080BAD9A @@ -385180,17 +385180,17 @@ _080BAD9A: adds r0, r0, r3 movs r1, #0 strb r1, [r0] - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _080BAE0C movs r0, #0 - bl sub_080BFD9C + bl GetHoennPokedexCount ldr r1, [r4] ldr r2, _080BAE08 adds r1, r1, r2 strh r0, [r1] movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount b _080BAE20 .align 2, 0 _080BADE4: .4byte gUnknown_20397EC @@ -385241,9 +385241,9 @@ _080BAE58: movs r0, #1 bl EnableInterrupts ldr r0, _080BAE94 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080BAE98 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080BAE9C ldr r1, [r0] ldr r3, _080BAEA0 @@ -385272,15 +385272,15 @@ _080BAEA0: .4byte 0x00000612 _080BAEA4: .4byte 0x00000616 _080BAEA8: .4byte gUnknown_30074D0 _080BAEAC: .4byte 0x0000FFFF - thumb_func_end sub_080BAC70 + thumb_func_end CB2_Pokedex thumb_func_start sub_080BAEB0 sub_080BAEB0: @ 0x080BAEB0 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -385391,7 +385391,7 @@ _080BAF4C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r7] adds r0, r0, r5 ldrh r1, [r0] @@ -385473,7 +385473,7 @@ _080BB038: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade bl sub_080C07B4 ldr r1, _080BB0BC lsls r3, r6, #2 @@ -385541,7 +385541,7 @@ _080BB0DC: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080BB10C lsls r0, r6, #2 adds r0, r0, r6 @@ -385714,7 +385714,7 @@ _080BB248: adds r0, r0, r4 ldrh r0, [r0] movs r1, #0xe - bl sub_080BCA54 + bl CreateInitialPokemonSprites ldrh r1, [r5, #0x2e] _080BB25C: movs r0, #8 @@ -385732,7 +385732,7 @@ _080BB270: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080BB2BC lsls r0, r7, #2 adds r0, r0, r7 @@ -386022,7 +386022,7 @@ _080BB4B8: adds r3, #4 adds r1, r1, r3 strh r0, [r1] - bl sub_0809CD04 + bl IsNationalPokedexEnabled adds r1, r0, #0 cmp r1, #0 bne _080BB4F2 @@ -386074,7 +386074,7 @@ sub_080BB524: @ 0x080BB524 adds r1, r1, r2 ldrh r1, [r1] strb r1, [r0, #0x19] - bl sub_0809CD04 + bl IsNationalPokedexEnabled adds r1, r0, #0 cmp r1, #0 bne _080BB554 @@ -386090,16 +386090,16 @@ _080BB554: bl sub_080BD1E0 bl sub_080BBFCC adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080BB5A0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080BB5A4 ldr r1, _080BB5A8 movs r2, #0x80 lsls r2, r2, #1 bl m4aMPlayVolumeControl ldr r0, [r5] - bl sub_08000BF0 + bl Free _080BB586: pop {r4, r5, r6} pop {r0} @@ -386110,7 +386110,7 @@ _080BB590: .4byte gUnknown_3005AF0 _080BB594: .4byte gUnknown_20397EC _080BB598: .4byte 0x00000612 _080BB59C: .4byte 0x00000616 -_080BB5A0: .4byte sub_08085AFC +_080BB5A0: .4byte CB2_ReturnToFieldWithOpenMenu _080BB5A4: .4byte gUnknown_30074D0 _080BB5A8: .4byte 0x0000FFFF thumb_func_end sub_080BB524 @@ -386218,7 +386218,7 @@ _080BB628: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080BB6A4 lsls r0, r6, #2 adds r0, r0, r6 @@ -386274,7 +386274,7 @@ _080BB6F0: .4byte gUnknown_20397EC _080BB6F4: .4byte 0x00000652 _080BB6F8: .4byte 0x0000064F _080BB6FC: .4byte gUnknown_3005B60 -_080BB700: .4byte sub_080BB834 +_080BB700: .4byte HandleButtonPress_StartMenu _080BB704: movs r0, #4 ands r0, r2 @@ -386288,7 +386288,7 @@ _080BB704: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade bl sub_080C07B4 ldr r2, _080BB750 lsls r1, r6, #2 @@ -386327,7 +386327,7 @@ _080BB760: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080BB790 lsls r0, r6, #2 adds r0, r0, r6 @@ -386416,8 +386416,8 @@ _080BB82C: .4byte gUnknown_3005B60 _080BB830: .4byte sub_080BB5F4 thumb_func_end sub_080BB7E4 - thumb_func_start sub_080BB834 -sub_080BB834: @ 0x080BB834 + thumb_func_start HandleButtonPress_StartMenu +HandleButtonPress_StartMenu: @ 0x080BB834 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -386510,7 +386510,7 @@ _080BB8EE: adds r0, r0, r4 ldrh r0, [r0] movs r1, #0xe - bl sub_080BCA54 + bl CreateInitialPokemonSprites _080BB8FE: ldr r2, _080BB91C ldrh r1, [r2, #0x2e] @@ -386531,7 +386531,7 @@ _080BB920: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080BB948 lsls r0, r6, #2 adds r0, r0, r6 @@ -386552,7 +386552,7 @@ _080BB950: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080BB99C lsls r0, r6, #2 adds r0, r0, r6 @@ -386637,7 +386637,7 @@ _080BBA04: bx r0 .align 2, 0 _080BBA0C: .4byte gUnknown_20397EC - thumb_func_end sub_080BB834 + thumb_func_end HandleButtonPress_StartMenu thumb_func_start sub_080BBA10 sub_080BBA10: @ 0x080BBA10 @@ -386798,7 +386798,7 @@ sub_080BBB18: @ 0x080BBB18 adds r3, #4 adds r1, r1, r3 strh r0, [r1] - bl sub_0809CD04 + bl IsNationalPokedexEnabled adds r1, r0, #0 cmp r1, #0 bne _080BBB66 @@ -386872,7 +386872,7 @@ sub_080BBBB8: @ 0x080BBBB8 adds r3, #4 adds r1, r1, r3 strh r0, [r1] - bl sub_0809CD04 + bl IsNationalPokedexEnabled adds r1, r0, #0 cmp r1, #0 bne _080BBC06 @@ -386954,7 +386954,7 @@ _080BBC98: b _080BBF74 _080BBCAA: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _080BBD5C ldr r0, [r4] ldr r1, _080BBD60 @@ -386977,42 +386977,42 @@ _080BBCAA: movs r4, #0x80 lsls r4, r4, #4 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _080BBD6C movs r2, #0x80 lsls r2, r2, #6 str r6, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _080BBD70 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _080BBD74 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer cmp r5, #0 bne _080BBD7C ldr r1, _080BBD78 @@ -387020,7 +387020,7 @@ _080BBCAA: lsls r3, r3, #2 movs r0, #0 movs r2, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer b _080BBD8A .align 2, 0 _080BBD58: .4byte gUnknown_2037C74 @@ -387038,7 +387038,7 @@ _080BBD7C: lsls r3, r3, #2 movs r0, #0 movs r2, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer _080BBD8A: bl ResetPaletteFade cmp r5, #0 @@ -387072,15 +387072,15 @@ _080BBDBE: ldrb r0, [r0] lsls r0, r0, #0x1f lsrs r0, r0, #0x1f - bl sub_080BBF80 + bl LoadPokedexBgPalette ldr r0, _080BBE00 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _080BBE04 movs r2, #0x87 lsls r2, r2, #3 @@ -387100,11 +387100,11 @@ _080BBE08: movs r0, #8 strb r0, [r1] ldr r0, _080BBE30 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080BBE34 bl LoadSpritePalettes adds r0, r5, #0 - bl sub_080BD31C + bl CreateInterfaceSprites b _080BBF34 .align 2, 0 _080BBE2C: .4byte gUnknown_30030BC @@ -387134,7 +387134,7 @@ _080BBE58: adds r0, r0, r1 ldrh r0, [r0] movs r1, #0xe - bl sub_080BCA54 + bl CreateInitialPokemonSprites ldr r0, [r4] ldr r2, _080BBEA0 adds r0, r0, r2 @@ -387145,13 +387145,13 @@ _080BBE58: adds r0, r0, r2 strh r1, [r0] movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080BBF34 .align 2, 0 _080BBE94: .4byte gUnknown_20397EC @@ -387165,9 +387165,9 @@ _080BBEA4: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BBEC4 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _080BBEC8 movs r2, #0x87 lsls r2, r2, #3 @@ -387208,13 +387208,13 @@ _080BBECC: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _080BBF34: ldr r1, _080BBF50 movs r0, #0x87 @@ -387257,8 +387257,8 @@ _080BBF76: .align 2, 0 thumb_func_end sub_080BBC50 - thumb_func_start sub_080BBF80 -sub_080BBF80: @ 0x080BBF80 + thumb_func_start LoadPokedexBgPalette +LoadPokedexBgPalette: @ 0x080BBF80 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -387269,14 +387269,14 @@ sub_080BBF80: @ 0x080BBF80 .align 2, 0 _080BBF90: .4byte gUnknown_85374E2 _080BBF94: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _080BBFAC ldr r0, _080BBFA8 _080BBF9E: movs r1, #1 movs r2, #0xbe - bl sub_080A1200 + bl LoadPalette b _080BBFB6 .align 2, 0 _080BBFA8: .4byte gUnknown_8537422 @@ -387284,45 +387284,45 @@ _080BBFAC: ldr r0, _080BBFC8 movs r1, #1 movs r2, #0xbe - bl sub_080A1200 + bl LoadPalette _080BBFB6: bl sub_080985EC movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 _080BBFC8: .4byte gUnknown_85375A2 - thumb_func_end sub_080BBF80 + thumb_func_end LoadPokedexBgPalette thumb_func_start sub_080BBFCC sub_080BBFCC: @ 0x080BBFCC push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BBFE0 - bl sub_08000BF0 + bl Free _080BBFE0: movs r0, #1 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BBFEE - bl sub_08000BF0 + bl Free _080BBFEE: movs r0, #2 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BBFFC - bl sub_08000BF0 + bl Free _080BBFFC: movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BC00A - bl sub_08000BF0 + bl Free _080BC00A: pop {r0} bx r0 @@ -387362,7 +387362,7 @@ _080BC038: _080BC044: .4byte gUnknown_20397EC _080BC048: .4byte 0x0000060C _080BC04C: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _080BC060 mov r0, sp @@ -387429,7 +387429,7 @@ _080BC0B2: strh r0, [r1] ldrh r0, [r5, #4] movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag mov r3, r8 ldr r2, [r3] adds r2, r2, r4 @@ -387444,7 +387444,7 @@ _080BC0B2: strb r0, [r2, #2] ldrh r0, [r5, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag mov r1, r8 ldr r3, [r1] adds r3, r3, r4 @@ -387501,7 +387501,7 @@ _080BC156: strh r0, [r6, #4] ldrh r0, [r6, #4] movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 adds r7, r4, #0 cmp r0, #0 @@ -387522,7 +387522,7 @@ _080BC172: strh r0, [r1] ldrh r0, [r6, #4] movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag mov r1, r8 ldr r2, [r1] adds r2, r2, r4 @@ -387539,7 +387539,7 @@ _080BC172: strb r0, [r2, #2] ldrh r0, [r6, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag mov r2, r8 ldr r3, [r2] adds r3, r3, r4 @@ -387608,7 +387608,7 @@ _080BC216: bhi _080BC294 ldrh r0, [r5, #4] movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BC294 @@ -387629,7 +387629,7 @@ _080BC216: strb r0, [r2, #2] ldrh r0, [r5, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag mov r1, r8 ldr r3, [r1] adds r1, r3, r6 @@ -387687,7 +387687,7 @@ _080BC2BE: bhi _080BC31E ldrh r0, [r5, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BC31E @@ -387759,7 +387759,7 @@ _080BC352: bhi _080BC3BA ldrh r0, [r5, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BC3BA @@ -387828,7 +387828,7 @@ _080BC3E6: bhi _080BC446 ldrh r0, [r5, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BC446 @@ -387900,7 +387900,7 @@ _080BC47A: bhi _080BC4E2 ldrh r0, [r5, #4] movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BC4E2 @@ -388003,8 +388003,8 @@ _080BC560: .4byte gUnknown_853962E _080BC564: .4byte 0x0000FFFF thumb_func_end sub_080BC010 - thumb_func_start sub_080BC568 -sub_080BC568: @ 0x080BC568 + thumb_func_start PrintMonDexNumAndName +PrintMonDexNumAndName: @ 0x080BC568 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -388040,7 +388040,7 @@ sub_080BC568: @ 0x080BC568 str r4, [sp, #0xc] str r2, [sp, #0x10] mov r2, r8 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r3} mov r8, r3 @@ -388048,10 +388048,10 @@ sub_080BC568: @ 0x080BC568 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080BC568 + thumb_func_end PrintMonDexNumAndName - thumb_func_start sub_080BC5C0 -sub_080BC5C0: @ 0x080BC5C0 + thumb_func_start CreateMonListEntry +CreateMonListEntry: @ 0x080BC5C0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -388124,7 +388124,7 @@ _080BC62C: movs r1, #0x12 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC890 + bl CreateMonDexNum mov r2, r8 ldr r0, [r2] adds r0, r0, r6 @@ -388134,7 +388134,7 @@ _080BC62C: movs r1, #0x11 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC930 + bl CreateCaughtBall mov r3, r8 ldr r0, [r3] adds r0, r0, r6 @@ -388148,12 +388148,12 @@ _080BC67E: movs r1, #0x12 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC890 + bl CreateMonDexNum movs r0, #0 movs r1, #0x11 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC930 + bl CreateCaughtBall movs r0, #0 movs r1, #0x17 adds r2, r4, #0 @@ -388227,7 +388227,7 @@ _080BC6F4: adds r0, r5, #0 movs r1, #0x12 adds r3, r7, #0 - bl sub_080BC890 + bl CreateMonDexNum ldr r1, [r6] adds r0, r1, r4 ldrb r0, [r0, #2] @@ -388242,7 +388242,7 @@ _080BC6F4: lsrs r2, r2, #0x18 movs r1, #0x11 adds r3, r7, #0 - bl sub_080BC930 + bl CreateCaughtBall ldr r1, [r6] adds r0, r1, r4 ldrh r0, [r0] @@ -388265,7 +388265,7 @@ _080BC764: adds r0, r5, #0 movs r1, #0x12 adds r3, r7, #0 - bl sub_080BC890 + bl CreateMonDexNum ldr r0, [r6] movs r1, #0xc6 lsls r1, r1, #3 @@ -388277,7 +388277,7 @@ _080BC764: movs r0, #0 movs r1, #0x11 adds r3, r7, #0 - bl sub_080BC930 + bl CreateCaughtBall ldr r0, [r6] movs r1, #0xc6 lsls r1, r1, #3 @@ -388353,7 +388353,7 @@ _080BC808: movs r1, #0x12 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC890 + bl CreateMonDexNum mov r1, r8 ldr r0, [r1] adds r0, r0, r6 @@ -388363,7 +388363,7 @@ _080BC808: movs r1, #0x11 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC930 + bl CreateCaughtBall mov r2, r8 ldr r0, [r2] adds r0, r0, r6 @@ -388377,12 +388377,12 @@ _080BC858: movs r1, #0x12 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC890 + bl CreateMonDexNum movs r0, #0 movs r1, #0x11 adds r2, r4, #0 adds r3, r7, #0 - bl sub_080BC930 + bl CreateCaughtBall movs r0, #0 movs r1, #0x17 adds r2, r4, #0 @@ -388390,7 +388390,7 @@ _080BC858: _080BC87A: movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r3, r4, r5} mov r8, r3 mov sb, r4 @@ -388398,10 +388398,10 @@ _080BC87A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080BC5C0 + thumb_func_end CreateMonListEntry - thumb_func_start sub_080BC890 -sub_080BC890: @ 0x080BC890 + thumb_func_start CreateMonDexNum +CreateMonDexNum: @ 0x080BC890 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -388462,7 +388462,7 @@ _080BC8D0: movs r1, #1 add r2, sp, #4 mov r3, r8 - bl sub_080BC568 + bl PrintMonDexNumAndName add sp, #0xc pop {r3} mov r8, r3 @@ -388473,10 +388473,10 @@ _080BC8D0: _080BC924: .4byte gUnknown_8539C08 _080BC928: .4byte gUnknown_20397EC _080BC92C: .4byte 0x00000612 - thumb_func_end sub_080BC890 + thumb_func_end CreateMonDexNum - thumb_func_start sub_080BC930 -sub_080BC930: @ 0x080BC930 + thumb_func_start CreateCaughtBall +CreateCaughtBall: @ 0x080BC930 push {r4, lr} sub sp, #8 lsls r0, r0, #0x10 @@ -388513,7 +388513,7 @@ _080BC970: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080BC930 + thumb_func_end CreateCaughtBall thumb_func_start sub_080BC978 sub_080BC978: @ 0x080BC978 @@ -388600,7 +388600,7 @@ _080BCA0E: movs r1, #1 add r2, sp, #4 mov r3, r8 - bl sub_080BC568 + bl PrintMonDexNumAndName adds r0, r4, #0 add sp, #0x10 pop {r3} @@ -388634,8 +388634,8 @@ sub_080BCA2C: @ 0x080BCA2C .align 2, 0 thumb_func_end sub_080BCA2C - thumb_func_start sub_080BCA54 -sub_080BCA54: @ 0x080BCA54 + thumb_func_start CreateInitialPokemonSprites +CreateInitialPokemonSprites: @ 0x080BCA54 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -388676,7 +388676,7 @@ _080BCA7A: subs r0, r6, #1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080BD22C + bl GetPokemonSpriteToDisplay lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _080BCB88 @@ -388701,7 +388701,7 @@ _080BCA7A: strh r1, [r0, #0x38] _080BCAD4: adds r0, r6, #0 - bl sub_080BD22C + bl GetPokemonSpriteToDisplay lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, r4 @@ -388727,7 +388727,7 @@ _080BCB06: adds r0, r6, #1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080BD22C + bl GetPokemonSpriteToDisplay lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, r4 @@ -388753,7 +388753,7 @@ _080BCB3C: movs r0, #0 adds r1, r6, #0 mov r2, r8 - bl sub_080BC5C0 + bl CreateMonListEntry ldr r0, [r7] ldr r2, _080BCB9C adds r0, r0, r2 @@ -388790,7 +388790,7 @@ _080BCB94: .4byte sub_080BDC80 _080BCB98: .4byte 0x0000FFE0 _080BCB9C: .4byte 0x0000062D _080BCBA0: .4byte 0x00000632 - thumb_func_end sub_080BCA54 + thumb_func_end CreateInitialPokemonSprites thumb_func_start sub_080BCBA4 sub_080BCBA4: @ 0x080BCBA4 @@ -388995,8 +388995,8 @@ _080BCD38: _080BCD44: .4byte 0x0000062D thumb_func_end sub_080BCBA4 - thumb_func_start sub_080BCD48 -sub_080BCD48: @ 0x080BCD48 + thumb_func_start CreateNewPokemonSprite +CreateNewPokemonSprite: @ 0x080BCD48 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -389023,7 +389023,7 @@ _080BCD78: subs r0, r3, #1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080BD22C + bl GetPokemonSpriteToDisplay lsls r0, r0, #0x10 lsrs r1, r0, #0x10 ldr r0, _080BCDC4 @@ -389069,7 +389069,7 @@ _080BCDD8: adds r0, r3, #1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080BD22C + bl GetPokemonSpriteToDisplay lsls r0, r0, #0x10 lsrs r1, r0, #0x10 ldr r0, _080BCE24 @@ -389116,7 +389116,7 @@ _080BCE34: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080BCD48 + thumb_func_end CreateNewPokemonSprite thumb_func_start sub_080BCE3C sub_080BCE3C: @ 0x080BCE3C @@ -389156,7 +389156,7 @@ sub_080BCE3C: @ 0x080BCE3C adds r7, r0, #0 movs r0, #1 adds r1, r7, #0 - bl sub_080BCD48 + bl CreateNewPokemonSprite movs r0, #1 b _080BCED4 .align 2, 0 @@ -389188,12 +389188,12 @@ _080BCE9C: adds r7, r0, #0 movs r0, #2 adds r1, r7, #0 - bl sub_080BCD48 + bl CreateNewPokemonSprite movs r0, #2 _080BCED4: adds r1, r7, #0 adds r2, r4, #0 - bl sub_080BC5C0 + bl CreateMonListEntry movs r0, #0x6c bl sub_080A306C b _080BCFBA @@ -389240,7 +389240,7 @@ _080BCEFE: bl sub_080BD1E0 adds r0, r7, #0 movs r1, #0xe - bl sub_080BCA54 + bl CreateInitialPokemonSprites movs r0, #0x6d bl sub_080A306C b _080BCFBA @@ -389294,7 +389294,7 @@ _080BCF72: bl sub_080BD1E0 adds r0, r7, #0 movs r1, #0xe - bl sub_080BCA54 + bl CreateInitialPokemonSprites movs r0, #0x6d bl sub_080A306C _080BCFBA: @@ -389589,7 +389589,7 @@ _080BD1E8: ldrh r0, [r1] cmp r0, r7 beq _080BD20C - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r1, [r6] ldr r0, _080BD228 adds r1, r1, r0 @@ -389614,8 +389614,8 @@ _080BD224: .4byte 0x0000FFFF _080BD228: .4byte 0x0000061E thumb_func_end sub_080BD1E0 - thumb_func_start sub_080BD22C -sub_080BD22C: @ 0x080BD22C + thumb_func_start GetPokemonSpriteToDisplay +GetPokemonSpriteToDisplay: @ 0x080BD22C push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -389650,7 +389650,7 @@ _080BD266: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080BD22C + thumb_func_end GetPokemonSpriteToDisplay thumb_func_start sub_080BD26C sub_080BD26C: @ 0x080BD26C @@ -389683,7 +389683,7 @@ _080BD288: asrs r1, r1, #0x10 asrs r2, r2, #0x10 adds r3, r6, #0 - bl sub_080C03F4 + bl CreateMonSpriteFromNationalDexNumber adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -389741,8 +389741,8 @@ _080BD30C: _080BD318: .4byte 0x0000FFFF thumb_func_end sub_080BD26C - thumb_func_start sub_080BD31C -sub_080BD31C: @ 0x080BD31C + thumb_func_start CreateInterfaceSprites +CreateInterfaceSprites: @ 0x080BD31C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -389757,7 +389757,7 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0xb8 movs r2, #4 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _080BD4EC @@ -389772,7 +389772,7 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0xb8 movs r2, #0x9c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -389790,18 +389790,18 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0xe4 movs r2, #0x14 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r5, _080BD4F4 adds r0, r5, #0 movs r1, #0x10 movs r2, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r0, r5, #0 movs r1, #0x30 movs r2, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -389814,7 +389814,7 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0x10 movs r2, #0x90 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r4, r7, #4 @@ -389832,7 +389832,7 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0x30 movs r2, #0x90 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -389846,7 +389846,7 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r1, r7, #4 @@ -389876,7 +389876,7 @@ sub_080BD31C: @ 0x080BD31C movs r1, #0 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r1, r7, #4 @@ -389900,7 +389900,7 @@ sub_080BD31C: @ 0x080BD31C beq _080BD46C b _080BDBB4 _080BD46C: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _080BD476 b _080BD6EC @@ -389910,12 +389910,12 @@ _080BD476: movs r1, #0x20 movs r2, #0x28 movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r0, r4, #0 movs r1, #0x20 movs r2, #0x48 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -389930,7 +389930,7 @@ _080BD476: movs r1, #0x18 movs r2, #0x30 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD504 @@ -389978,7 +389978,7 @@ _080BD518: movs r1, #0x20 movs r2, #0x30 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD568 @@ -390031,7 +390031,7 @@ _080BD588: movs r1, #0x28 movs r2, #0x30 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r5, _080BD614 @@ -390060,7 +390060,7 @@ _080BD588: movs r1, #0x18 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, [r5] @@ -390102,7 +390102,7 @@ _080BD62C: movs r1, #0x20 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD67C @@ -390154,7 +390154,7 @@ _080BD69C: movs r1, #0x28 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD6E4 @@ -390189,12 +390189,12 @@ _080BD6EC: movs r1, #0x20 movs r2, #0x28 movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r0, r4, #0 movs r1, #0x20 movs r2, #0x4c movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -390208,12 +390208,12 @@ _080BD6EC: movs r1, #0x11 movs r2, #0x2d movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r0, r4, #0 movs r1, #0x11 movs r2, #0x37 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -390226,12 +390226,12 @@ _080BD6EC: movs r1, #0x11 movs r2, #0x51 movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r0, r4, #0 movs r1, #0x11 movs r2, #0x5b movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -390241,7 +390241,7 @@ _080BD6EC: movs r1, #1 bl StartSpriteAnim movs r0, #0 - bl sub_080BFD9C + bl GetHoennPokedexCount lsls r0, r0, #0x10 lsrs r6, r0, #0x10 movs r0, #0 @@ -390250,7 +390250,7 @@ _080BD6EC: movs r1, #0x28 movs r2, #0x2d movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r6, #0 @@ -390288,7 +390288,7 @@ _080BD7D0: movs r1, #0x30 movs r2, #0x2d movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r6, #0 @@ -390335,7 +390335,7 @@ _080BD830: movs r1, #0x38 movs r2, #0x2d movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r6, #0 @@ -390360,7 +390360,7 @@ _080BD830: movs r1, #0x28 movs r2, #0x37 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD8B4 @@ -390402,7 +390402,7 @@ _080BD8C8: movs r1, #0x30 movs r2, #0x37 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD918 @@ -390455,7 +390455,7 @@ _080BD938: movs r1, #0x38 movs r2, #0x37 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BD9C8 @@ -390479,7 +390479,7 @@ _080BD938: lsrs r1, r1, #0x18 bl StartSpriteAnim movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount lsls r0, r0, #0x10 lsrs r6, r0, #0x10 movs r0, #0 @@ -390488,7 +390488,7 @@ _080BD938: movs r1, #0x28 movs r2, #0x51 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r6, #0 @@ -390526,7 +390526,7 @@ _080BD9DC: movs r1, #0x30 movs r2, #0x51 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r6, #0 @@ -390573,7 +390573,7 @@ _080BDA3C: movs r1, #0x38 movs r2, #0x51 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r6, #0 @@ -390598,7 +390598,7 @@ _080BDA3C: movs r1, #0x28 movs r2, #0x5b movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BDAC0 @@ -390640,7 +390640,7 @@ _080BDAD4: movs r1, #0x30 movs r2, #0x5b movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BDB24 @@ -390692,7 +390692,7 @@ _080BDB44: movs r1, #0x38 movs r2, #0x5b movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080BDBA8 @@ -390720,7 +390720,7 @@ _080BDB82: movs r1, #0x90 movs r2, #0x60 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _080BDBA0 @@ -390740,7 +390740,7 @@ _080BDBB4: movs r1, #0x90 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -390762,7 +390762,7 @@ _080BDBCC: bx r0 .align 2, 0 _080BDBE4: .4byte gUnknown_8539BA4 - thumb_func_end sub_080BD31C + thumb_func_end CreateInterfaceSprites thumb_func_start sub_080BDBE8 sub_080BDBE8: @ 0x080BDBE8 @@ -390878,7 +390878,7 @@ sub_080BDC80: @ 0x080BDC80 adds r0, r1, r4 adds r0, r0, r5 ldrh r0, [r0] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, [r7] adds r0, r0, r4 adds r0, r0, r5 @@ -390985,7 +390985,7 @@ _080BDD60: adds r0, r0, r4 adds r0, r0, r6 ldrh r0, [r0] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, [r5] adds r0, r0, r4 adds r0, r0, r6 @@ -391003,8 +391003,8 @@ _080BDD9C: .4byte 0x0000061E _080BDDA0: .4byte 0x0000FFFF thumb_func_end sub_080BDC80 - thumb_func_start sub_080BDDA4 -sub_080BDDA4: @ 0x080BDDA4 + thumb_func_start SpriteCB_Scrollbar +SpriteCB_Scrollbar: @ 0x080BDDA4 push {r4, lr} adds r4, r0, #0 ldr r1, _080BDDC4 @@ -391043,7 +391043,7 @@ _080BDDE8: .align 2, 0 _080BDDF0: .4byte 0x0000060E _080BDDF4: .4byte 0x0000060C - thumb_func_end sub_080BDDA4 + thumb_func_end SpriteCB_Scrollbar thumb_func_start sub_080BDDF8 sub_080BDDF8: @ 0x080BDDF8 @@ -391418,7 +391418,7 @@ sub_080BE07C: @ 0x080BE07C movs r0, #0 movs r1, #1 adds r2, r5, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4, r5} pop {r0} @@ -391434,7 +391434,7 @@ sub_080BE0C0: @ 0x080BE0C0 str r0, [r1] ldr r0, _080BE158 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -391461,27 +391461,27 @@ sub_080BE0C0: @ 0x080BE0C0 movs r4, #0x80 lsls r4, r4, #4 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _080BE164 - bl sub_08003090 + bl InitWindows bl sub_08004480 adds r0, r5, #0 pop {r4, r5} @@ -391603,7 +391603,7 @@ _080BE22E: ldr r0, [r5, #0xc] str r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r2, #0 ldr r1, _080BE290 lsls r0, r4, #2 @@ -391647,19 +391647,19 @@ _080BE294: str r0, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _080BE2E8 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _080BE2EC ldr r0, [r0] ldrh r1, [r0] @@ -391667,7 +391667,7 @@ _080BE294: bl sub_080C0288 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _080BE2F0 movs r3, #0x87 lsls r3, r3, #3 @@ -391694,7 +391694,7 @@ _080BE2F4: ldrb r0, [r0] lsls r0, r0, #0x1f lsrs r0, r0, #0x1f - bl sub_080BBF80 + bl LoadPokedexBgPalette ldr r1, _080BE330 movs r3, #0x87 lsls r3, r3, #3 @@ -391839,17 +391839,17 @@ _080BE434: ldr r0, _080BE494 movs r1, #0x31 movs r2, #0x1e - bl sub_080A1200 + bl LoadPalette _080BE466: movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080BE5EC .align 2, 0 _080BE484: .4byte gUnknown_85C8FA2 @@ -391875,7 +391875,7 @@ _080BE4AC: movs r1, #0x30 movs r2, #0x38 movs r3, #0 - bl sub_080C03F4 + bl CreateMonSpriteFromNationalDexNumber strh r0, [r4, #0x10] ldr r2, _080BE4E0 movs r1, #0x10 @@ -391930,10 +391930,10 @@ _080BE51C: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BE53C ldr r0, [r0] - bl sub_080006F0 + bl SetVBlankCallback b _080BE5EC .align 2, 0 _080BE534: .4byte gUnknown_3005B60 @@ -391954,13 +391954,13 @@ _080BE540: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r1, _080BE584 movs r3, #0x87 lsls r3, r3, #3 @@ -392011,7 +392011,7 @@ _080BE5DC: strb r0, [r2] b _080BE624 _080BE5E2: - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _080BE624 @@ -392059,30 +392059,30 @@ _080BE630: .4byte sub_080BE678 thumb_func_start sub_080BE634 sub_080BE634: @ 0x080BE634 push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BE648 - bl sub_08000BF0 + bl Free _080BE648: movs r0, #1 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BE656 - bl sub_08000BF0 + bl Free _080BE656: movs r0, #2 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BE664 - bl sub_08000BF0 + bl Free _080BE664: movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BE672 - bl sub_08000BF0 + bl Free _080BE672: pop {r0} bx r0 @@ -392110,7 +392110,7 @@ sub_080BE678: @ 0x080BE678 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BE6B4 str r0, [r4] movs r0, #0x6c @@ -392167,7 +392167,7 @@ _080BE706: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r5] ldr r3, _080BE720 adds r0, r0, r3 @@ -392182,7 +392182,7 @@ _080BE724: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r5] ldr r1, _080BE740 adds r0, r0, r1 @@ -392209,7 +392209,7 @@ _080BE75C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, [r5] ldr r3, _080BE784 adds r0, r0, r3 @@ -392232,7 +392232,7 @@ _080BE792: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BE7A8 str r0, [r4] movs r0, #3 @@ -392338,7 +392338,7 @@ sub_080BE854: @ 0x080BE854 lsls r0, r0, #3 adds r4, r0, r1 ldrh r0, [r4, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, _080BE898 ldr r0, [r0] ldr r1, _080BE89C @@ -392393,7 +392393,7 @@ sub_080BE8BC: @ 0x080BE8BC lsls r4, r4, #3 adds r4, r4, r0 ldrh r0, [r4, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, _080BE8F0 str r0, [r4] _080BE8E2: @@ -392423,10 +392423,10 @@ sub_080BE8F4: @ 0x080BE8F4 lsls r1, r1, #3 adds r1, r1, r0 ldrh r0, [r1, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite bl sub_080BE634 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080BE920: pop {r4} pop {r0} @@ -392471,7 +392471,7 @@ _080BE94C: ldr r0, [r2, #0xc] str r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x80 lsls r0, r0, #2 bl sub_080BFF08 @@ -392502,7 +392502,7 @@ _080BE9A4: ldrb r0, [r0] lsls r0, r0, #0x1f lsrs r0, r0, #0x1f - bl sub_080BBF80 + bl LoadPokedexBgPalette movs r1, #0xd0 lsls r1, r1, #4 movs r0, #0xa @@ -392525,10 +392525,10 @@ _080BE9E0: ldr r1, [r5] ldr r4, _080BEA28 adds r1, r1, r4 - bl sub_0813D4DC + bl ShowPokedexAreaScreen ldr r0, _080BEA2C ldr r0, [r0] - bl sub_080006F0 + bl SetVBlankCallback ldr r0, [r5] adds r0, r0, r4 movs r1, #0 @@ -392690,7 +392690,7 @@ _080BEB3A: ldr r0, [r4, #0xc] str r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x80 lsls r0, r0, #2 bl sub_080BFF08 @@ -392720,21 +392720,21 @@ _080BEB94: str r0, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _080BEBDC movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _080BEBE0 movs r3, #0x87 lsls r3, r3, #3 @@ -392757,7 +392757,7 @@ _080BEBE4: ldrb r0, [r0] lsls r0, r0, #0x1f lsrs r0, r0, #0x1f - bl sub_080BBF80 + bl LoadPokedexBgPalette b _080BEE16 .align 2, 0 _080BEC08: .4byte gUnknown_20397EC @@ -392809,7 +392809,7 @@ _080BEC6C: movs r1, #0x30 movs r2, #0x38 movs r3, #0 - bl sub_080C03F4 + bl CreateMonSpriteFromNationalDexNumber ldr r2, _080BECAC lsls r1, r4, #2 adds r1, r1, r4 @@ -392928,18 +392928,18 @@ _080BED34: _080BED74: movs r0, #3 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080BEE4E .align 2, 0 _080BEDA0: .4byte 0x00FFFFFF @@ -392953,10 +392953,10 @@ _080BEDB0: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BEDD4 ldr r0, [r0] - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _080BEDD8 movs r4, #0x87 lsls r4, r4, #3 @@ -392980,13 +392980,13 @@ _080BEDDC: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _080BEE16: ldr r1, _080BEE28 movs r0, #0x87 @@ -393037,7 +393037,7 @@ sub_080BEE68: @ 0x080BEE68 lsrs r4, r0, #0x18 movs r0, #2 bl sub_08145528 - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _080BEE88 @@ -393091,7 +393091,7 @@ _080BEED2: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BEF1C bl m4aMPlayContinue ldr r0, _080BEF20 @@ -393139,7 +393139,7 @@ _080BEF4C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BEF88 bl m4aMPlayContinue ldr r0, _080BEF8C @@ -393202,7 +393202,7 @@ _080BEFD8: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BF018 bl m4aMPlayContinue ldr r0, _080BF01C @@ -393251,7 +393251,7 @@ sub_080BF02C: @ 0x080BF02C lsls r0, r0, #3 adds r4, r0, r1 ldrh r0, [r4, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, _080BF074 ldr r0, [r0] ldr r1, _080BF078 @@ -393308,7 +393308,7 @@ _080BF0AE: mov r0, sp movs r1, #0x5d movs r2, #2 - bl sub_080A1200 + bl LoadPalette add sp, #4 pop {r0} bx r0 @@ -393368,7 +393368,7 @@ _080BF12A: ldr r0, [r5, #0xc] str r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x80 lsls r0, r0, #2 bl sub_080BFF08 @@ -393397,17 +393397,17 @@ _080BF174: str r0, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _080BF1A8 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap b _080BF40A .align 2, 0 _080BF1A4: .4byte gUnknown_8537E8C @@ -393425,7 +393425,7 @@ _080BF1AC: ldrb r0, [r0] lsls r0, r0, #0x1f lsrs r0, r0, #0x1f - bl sub_080BBF80 + bl LoadPokedexBgPalette b _080BF40A .align 2, 0 _080BF1D0: .4byte gUnknown_20397EC @@ -393529,7 +393529,7 @@ _080BF22E: adds r1, #0x10 lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080BF2E0 lsls r0, r7, #2 adds r0, r0, r7 @@ -393556,7 +393556,7 @@ _080BF2E8: movs r1, #0x58 movs r2, #0x38 movs r3, #1 - bl sub_080C03F4 + bl CreateMonSpriteFromNationalDexNumber lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _080BF394 @@ -393609,7 +393609,7 @@ _080BF2E8: adds r1, #0x10 lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080BF3A0 lsls r0, r7, #2 adds r0, r0, r7 @@ -393618,13 +393618,13 @@ _080BF2E8: strh r6, [r0, #0x10] movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080BF40A .align 2, 0 _080BF390: .4byte gUnknown_20397F4 @@ -393639,10 +393639,10 @@ _080BF3A4: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BF3C8 ldr r0, [r0] - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _080BF3CC movs r0, #0x87 lsls r0, r0, #3 @@ -393666,13 +393666,13 @@ _080BF3D0: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _080BF40A: ldr r1, _080BF41C movs r2, #0x87 @@ -393744,7 +393744,7 @@ sub_080BF46C: @ 0x080BF46C str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BF4BC ldr r0, [r0] ldr r1, _080BF4C0 @@ -393789,7 +393789,7 @@ _080BF4E8: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BF524 ldr r0, [r0] ldr r1, _080BF528 @@ -393835,9 +393835,9 @@ sub_080BF534: @ 0x080BF534 lsls r0, r0, #3 adds r4, r0, r1 ldrh r0, [r4, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldrh r0, [r4, #0x12] - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite ldr r0, _080BF57C ldr r0, [r0] ldr r1, _080BF580 @@ -393875,7 +393875,7 @@ sub_080BF598: @ 0x080BF598 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer pop {r0} bx r0 .align 2, 0 @@ -393889,7 +393889,7 @@ sub_080BF5B0: @ 0x080BF5B0 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer pop {r0} bx r0 .align 2, 0 @@ -393905,7 +393905,7 @@ sub_080BF5C8: @ 0x080BF5C8 lsrs r0, r0, #0x18 mov r8, r0 movs r0, #1 - bl sub_08002194 + bl GetBgTilemapBuffer adds r7, r0, #0 movs r1, #0 _080BF5DE: @@ -393947,7 +393947,7 @@ _080BF5FA: cmp r1, #3 bls _080BF5DE movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -393966,7 +393966,7 @@ sub_080BF638: @ 0x080BF638 lsrs r0, r0, #0x18 mov r8, r0 movs r0, #1 - bl sub_08002194 + bl GetBgTilemapBuffer adds r7, r0, #0 movs r1, #0 _080BF64E: @@ -394013,7 +394013,7 @@ _080BF670: cmp r1, #3 bls _080BF64E movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -394023,8 +394023,8 @@ _080BF670: _080BF6AC: .4byte 0x00000FFF thumb_func_end sub_080BF638 - thumb_func_start sub_080BF6B0 -sub_080BF6B0: @ 0x080BF6B0 + thumb_func_start CreateDexDisplayMonDataTask +CreateDexDisplayMonDataTask: @ 0x080BF6B0 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -394033,7 +394033,7 @@ sub_080BF6B0: @ 0x080BF6B0 lsrs r4, r4, #0x10 ldr r0, _080BF6EC movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080BF6F0 @@ -394056,7 +394056,7 @@ sub_080BF6B0: @ 0x080BF6B0 .align 2, 0 _080BF6EC: .4byte sub_080BF6F4 _080BF6F0: .4byte gUnknown_3005B60 - thumb_func_end sub_080BF6B0 + thumb_func_end CreateDexDisplayMonDataTask thumb_func_start sub_080BF6F4 sub_080BF6F4: @ 0x080BF6F4 @@ -394105,7 +394105,7 @@ _080BF74E: ldr r0, [r0, #0xc] str r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x80 lsls r0, r0, #1 bl sub_080BFF08 @@ -394118,17 +394118,17 @@ _080BF74E: movs r4, #0x80 lsls r4, r4, #4 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _080BF7C0 - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r1, _080BF7C4 lsls r0, r7, #2 @@ -394153,19 +394153,19 @@ _080BF7C8: str r0, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _080BF82C movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _080BF830 lsls r4, r7, #2 adds r4, r4, r7 @@ -394176,10 +394176,10 @@ _080BF7C8: bl sub_080C0288 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram bl ResetPaletteFade movs r0, #0 - bl sub_080BBF80 + bl LoadPokedexBgPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -394199,7 +394199,7 @@ _080BF83E: movs r1, #3 movs r2, #0 bl sub_080BE07C - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _080BF86C adds r0, r5, #0 @@ -394266,11 +394266,11 @@ _080BF878: bl sub_080BE07C movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080BF98A .align 2, 0 _080BF8F4: .4byte gUnknown_85C8FBB @@ -394282,7 +394282,7 @@ _080BF904: movs r1, #0x30 movs r2, #0x38 movs r3, #0 - bl sub_080C03F4 + bl CreateMonSpriteFromNationalDexNumber adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -394302,10 +394302,10 @@ _080BF904: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080BF954 ldr r0, [r0] - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _080BF958 lsls r0, r7, #2 adds r0, r0, r7 @@ -394332,9 +394332,9 @@ _080BF95C: movs r0, #0 bl SetGpuReg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _080BF98A: ldr r1, _080BF99C lsls r0, r7, #2 @@ -394362,7 +394362,7 @@ _080BF9A0: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 ldr r1, _080BF9DC lsls r0, r7, #2 adds r0, r0, r7 @@ -394399,7 +394399,7 @@ sub_080BF9E4: @ 0x080BF9E4 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r3, _080BFA34 ldr r0, _080BFA38 lsls r1, r4, #2 @@ -394424,7 +394424,7 @@ _080BFA30: .4byte 0x0000FFFF _080BFA34: .4byte gUnknown_20205AC _080BFA38: .4byte gUnknown_3005B60 _080BFA3C: .4byte sub_080BFB28 -_080BFA40: .4byte sub_080BFA88 +_080BFA40: .4byte blockset_load_palette_to_gpu _080BFA44: ldr r1, _080BFA68 lsls r0, r4, #2 @@ -394441,7 +394441,7 @@ _080BFA44: ldr r0, _080BFA6C movs r1, #0x31 movs r2, #0xe - bl sub_080A1200 + bl LoadPalette b _080BFA7A .align 2, 0 _080BFA68: .4byte gUnknown_3005B60 @@ -394450,7 +394450,7 @@ _080BFA70: ldr r0, _080BFA84 movs r1, #0x31 movs r2, #0xe - bl sub_080A1200 + bl LoadPalette _080BFA7A: add sp, #4 pop {r4} @@ -394460,8 +394460,8 @@ _080BFA7A: _080BFA84: .4byte gUnknown_8537482 thumb_func_end sub_080BF9E4 - thumb_func_start sub_080BFA88 -sub_080BFA88: @ 0x080BFA88 + thumb_func_start blockset_load_palette_to_gpu +blockset_load_palette_to_gpu: @ 0x080BFA88 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -394475,18 +394475,18 @@ sub_080BFA88: @ 0x080BFA88 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #2 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BFAB6 - bl sub_08000BF0 + bl Free _080BFAB6: movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080BFAC4 - bl sub_08000BF0 + bl Free _080BFAC4: ldr r0, _080BFB20 lsls r4, r6, #2 @@ -394514,7 +394514,7 @@ _080BFAC4: adds r3, r3, r5 ldrb r4, [r3, #5] lsrs r4, r4, #4 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality lsls r4, r4, #4 movs r2, #0x80 lsls r2, r2, #1 @@ -394522,9 +394522,9 @@ _080BFAC4: orrs r4, r1 adds r1, r4, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080BFB16: pop {r4, r5, r6} pop {r0} @@ -394533,7 +394533,7 @@ _080BFB16: _080BFB1C: .4byte gUnknown_2037C74 _080BFB20: .4byte gUnknown_3005B60 _080BFB24: .4byte gUnknown_20205AC - thumb_func_end sub_080BFA88 + thumb_func_end blockset_load_palette_to_gpu thumb_func_start sub_080BFB28 sub_080BFB28: @ 0x080BFB28 @@ -394590,8 +394590,8 @@ sub_080BFB68: @ 0x080BFB68 _080BFB7C: .4byte gUnknown_854069C thumb_func_end sub_080BFB68 - thumb_func_start sub_080BFB80 -sub_080BFB80: @ 0x080BFB80 + thumb_func_start GetPokedexHeightWeight +GetPokedexHeightWeight: @ 0x080BFB80 push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -394625,10 +394625,10 @@ _080BFBB4: bx r1 .align 2, 0 _080BFBB8: .4byte gUnknown_854069C - thumb_func_end sub_080BFB80 + thumb_func_end GetPokedexHeightWeight - thumb_func_start sub_080BFBBC -sub_080BFBBC: @ 0x080BFBBC + thumb_func_start GetSetPokedexFlag +GetSetPokedexFlag: @ 0x080BFBBC push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsls r1, r1, #0x18 @@ -394829,7 +394829,7 @@ _080BFD40: bx r1 .align 2, 0 _080BFD48: .4byte gUnknown_3005AF0 - thumb_func_end sub_080BFBBC + thumb_func_end GetSetPokedexFlag thumb_func_start GetNationalPokedexCount GetNationalPokedexCount: @ 0x080BFD4C @@ -394860,7 +394860,7 @@ _080BFD72: lsrs r0, r0, #0x10 movs r1, #1 _080BFD7A: - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BFD8A @@ -394879,8 +394879,8 @@ _080BFD8A: .align 2, 0 thumb_func_end GetNationalPokedexCount - thumb_func_start sub_080BFD9C -sub_080BFD9C: @ 0x080BFD9C + thumb_func_start GetHoennPokedexCount +GetHoennPokedexCount: @ 0x080BFD9C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -394911,7 +394911,7 @@ _080BFDC4: lsrs r0, r0, #0x10 movs r1, #1 _080BFDD4: - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BFDE4 @@ -394927,7 +394927,7 @@ _080BFDE4: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080BFD9C + thumb_func_end GetHoennPokedexCount thumb_func_start sub_080BFDF4 sub_080BFDF4: @ 0x080BFDF4 @@ -394955,7 +394955,7 @@ _080BFE14: lsrs r0, r0, #0x10 movs r1, #1 _080BFE1C: - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BFE2C @@ -394973,8 +394973,8 @@ _080BFE2C: bx r1 thumb_func_end sub_080BFDF4 - thumb_func_start sub_080BFE3C -sub_080BFE3C: @ 0x080BFE3C + thumb_func_start HasAllHoennMons +HasAllHoennMons: @ 0x080BFE3C push {r4, lr} movs r0, #0 _080BFE40: @@ -394986,7 +394986,7 @@ _080BFE40: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 bne _080BFE60 @@ -395002,7 +395002,7 @@ _080BFE68: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080BFE3C + thumb_func_end HasAllHoennMons thumb_func_start sub_080BFE70 sub_080BFE70: @ 0x080BFE70 @@ -395014,7 +395014,7 @@ _080BFE74: lsrs r4, r0, #0x10 adds r0, r4, #0 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 bne _080BFE8C @@ -395042,7 +395042,7 @@ _080BFEA0: lsrs r4, r0, #0x10 adds r0, r4, #0 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BFEEE @@ -395056,7 +395056,7 @@ _080BFEBC: lsrs r4, r0, #0x10 adds r0, r4, #0 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _080BFEEE @@ -395071,7 +395071,7 @@ _080BFEDA: lsrs r4, r0, #0x10 adds r0, r4, #0 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 bne _080BFEF8 @@ -395105,7 +395105,7 @@ sub_080BFF08: @ 0x080BFF08 cmp r0, #0 bne _080BFF3A movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #8 movs r1, #0 bl SetGpuReg @@ -395123,7 +395123,7 @@ _080BFF3A: cmp r0, #0 bne _080BFF64 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #0xa movs r1, #0 bl SetGpuReg @@ -395141,7 +395141,7 @@ _080BFF64: cmp r0, #0 bne _080BFF8E movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #0xc movs r1, #0 bl SetGpuReg @@ -395159,7 +395159,7 @@ _080BFF8E: cmp r0, #0 bne _080BFFB8 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #0xe movs r1, #0 bl SetGpuReg @@ -395176,7 +395176,7 @@ _080BFFB8: cmp r5, #0 bne _080BFFD6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits bl ResetSpriteData bl FreeAllSpritePalettes ldr r1, _080BFFDC @@ -395218,7 +395218,7 @@ sub_080BFFE0: @ 0x080BFFE0 str r4, [sp, #0xc] str r1, [sp, #0x10] movs r1, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4, r5, r6} pop {r0} @@ -395612,7 +395612,7 @@ _080C02DC: mov r1, sp movs r2, #0x80 movs r3, #0 - bl sub_08003AC0 + bl CopyToWindowPixelBuffer add sp, #0x80 pop {r3} mov r8, r3 @@ -395753,8 +395753,8 @@ _080C03EE: .align 2, 0 thumb_func_end sub_080C03C0 - thumb_func_start sub_080C03F4 -sub_080C03F4: @ 0x080C03F4 + thumb_func_start CreateMonSpriteFromNationalDexNumber +CreateMonSpriteFromNationalDexNumber: @ 0x080C03F4 push {r4, r5, r6, lr} sub sp, #0x14 adds r4, r1, #0 @@ -395798,7 +395798,7 @@ sub_080C03F4: @ 0x080C03F4 bx r1 .align 2, 0 _080C044C: .4byte 0x0000FFFF - thumb_func_end sub_080C03F4 + thumb_func_end CreateMonSpriteFromNationalDexNumber thumb_func_start sub_080C0450 sub_080C0450: @ 0x080C0450 @@ -395831,8 +395831,8 @@ sub_080C0450: @ 0x080C0450 _080C0484: .4byte 0x0000FFFF thumb_func_end sub_080C0450 - thumb_func_start sub_080C0488 -sub_080C0488: @ 0x080C0488 + thumb_func_start save_write_to_flash +save_write_to_flash: @ 0x080C0488 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -396250,14 +396250,14 @@ _080C07A4: .4byte 0x0000060C _080C07A8: .4byte gUnknown_82F0D54 _080C07AC: .4byte 0x00000181 _080C07B0: .4byte 0x0000FFFF - thumb_func_end sub_080C0488 + thumb_func_end save_write_to_flash thumb_func_start sub_080C07B4 sub_080C07B4: @ 0x080C07B4 push {lr} ldr r0, _080C07C8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -396296,7 +396296,7 @@ sub_080C07CC: @ 0x080C07CC movs r0, #0 movs r1, #1 adds r2, r5, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4, r5} pop {r0} @@ -396394,45 +396394,45 @@ _080C08A2: movs r4, #0x80 lsls r4, r4, #4 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _080C0948 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _080C094C movs r2, #0x80 lsls r2, r2, #6 str r5, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 - bl sub_0809CD04 + bl DecompressAndLoadBgGfxUsingHeap + bl IsNationalPokedexEnabled cmp r0, #0 bne _080C0954 ldr r1, _080C0950 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer b _080C0960 .align 2, 0 _080C0938: .4byte gUnknown_2037C74 @@ -396447,12 +396447,12 @@ _080C0954: movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer _080C0960: ldr r0, _080C097C movs r1, #1 movs r2, #0x7e - bl sub_080A1200 + bl LoadPalette ldr r0, _080C0980 movs r2, #0x87 lsls r2, r2, #3 @@ -396466,7 +396466,7 @@ _080C097C: .4byte gUnknown_85437DE _080C0980: .4byte gUnknown_3002360 _080C0984: ldr r0, _080C09E4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080C09E8 bl LoadSpritePalettes adds r0, r4, #0 @@ -396492,16 +396492,16 @@ _080C09A2: movs r0, #0 bl sub_080C1684 adds r0, r4, #0 - bl sub_080C175C + bl Cb_JumpBox movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080C0A4A .align 2, 0 _080C09E4: .4byte gUnknown_8539BBC @@ -396514,7 +396514,7 @@ _080C09F0: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080C0A0C movs r2, #0x87 lsls r2, r2, #3 @@ -396537,13 +396537,13 @@ _080C0A10: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _080C0A4A: ldr r1, _080C0A5C movs r0, #0x87 @@ -396590,30 +396590,30 @@ _080C0A98: .4byte sub_080C0AE0 thumb_func_start sub_080C0A9C sub_080C0A9C: @ 0x080C0A9C push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080C0AB0 - bl sub_08000BF0 + bl Free _080C0AB0: movs r0, #1 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080C0ABE - bl sub_08000BF0 + bl Free _080C0ABE: movs r0, #2 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080C0ACC - bl sub_08000BF0 + bl Free _080C0ACC: movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _080C0ADA - bl sub_08000BF0 + bl Free _080C0ADA: pop {r0} bx r0 @@ -396634,12 +396634,12 @@ sub_080C0AE0: @ 0x080C0AE0 ldrb r0, [r5, #8] bl sub_080C1684 adds r0, r4, #0 - bl sub_080C175C + bl Cb_JumpBox movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _080C0B1C str r0, [r5] pop {r4, r5} @@ -396748,9 +396748,9 @@ _080C0BB0: bl sub_080C1684 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C0BEC: ldr r0, _080C0C38 ldrh r1, [r0, #0x2e] @@ -396777,9 +396777,9 @@ _080C0BEC: bl sub_080C1684 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C0C2C: pop {r4, r5} pop {r0} @@ -396804,12 +396804,12 @@ sub_080C0C3C: @ 0x080C0C3C ldrb r1, [r5, #0xa] bl sub_080C16B8 adds r0, r4, #0 - bl sub_080C175C + bl Cb_JumpBox movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _080C0C78 str r0, [r5] pop {r4, r5} @@ -396834,7 +396834,7 @@ sub_080C0C7C: @ 0x080C0C7C ldrsh r0, [r0, r1] cmp r0, #0 beq _080C0CB0 - bl sub_0809CD04 + bl IsNationalPokedexEnabled ldr r6, _080C0CA8 cmp r0, #0 bne _080C0CBC @@ -396845,7 +396845,7 @@ _080C0CA4: .4byte gUnknown_3005B60 _080C0CA8: .4byte gUnknown_85441BC _080C0CAC: .4byte gUnknown_85441F4 _080C0CB0: - bl sub_0809CD04 + bl IsNationalPokedexEnabled ldr r6, _080C0CE8 cmp r0, #0 bne _080C0CBC @@ -396916,7 +396916,7 @@ _080C0CFC: ldr r4, _080C0DA0 ldr r1, [r4] strb r0, [r1, #0x19] - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _080C0D58 ldr r1, [r4] @@ -396971,7 +396971,7 @@ _080C0DAC: bl sub_080A306C movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _080C0F14 .align 2, 0 _080C0DD8: .4byte gUnknown_85C8FFC @@ -397013,9 +397013,9 @@ _080C0DF0: bl sub_080C16B8 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C0E36: ldr r0, _080C0F20 ldrh r1, [r0, #0x2e] @@ -397047,9 +397047,9 @@ _080C0E36: bl sub_080C16B8 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C0E80: ldr r0, _080C0F20 ldrh r1, [r0, #0x2e] @@ -397081,9 +397081,9 @@ _080C0E80: bl sub_080C16B8 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C0ECA: ldr r0, _080C0F20 ldrh r1, [r0, #0x2e] @@ -397115,9 +397115,9 @@ _080C0ECA: bl sub_080C16B8 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C0F14: pop {r4, r5, r6, r7} pop {r0} @@ -397185,7 +397185,7 @@ sub_080C0F24: @ 0x080C0F24 mov r1, sb mov r2, r8 adds r3, r6, #0 - bl sub_080C0488 + bl save_write_to_flash ldr r1, _080C0FC4 lsls r0, r5, #2 adds r0, r0, r5 @@ -397211,7 +397211,7 @@ sub_080C0FCC: @ 0x080C0FCC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _080C1046 @@ -397260,7 +397260,7 @@ _080C1030: str r0, [r1] movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _080C1046: pop {r4} pop {r0} @@ -397393,9 +397393,9 @@ sub_080C1104: @ 0x080C1104 str r0, [r6] movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5, r6} pop {r0} bx r0 @@ -397480,9 +397480,9 @@ _080C1210: str r0, [r5] movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080C136C .align 2, 0 _080C1224: .4byte sub_080C0C3C @@ -397561,7 +397561,7 @@ _080C129C: bl sub_080C07CC movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _080C136C .align 2, 0 _080C12CC: .4byte gUnknown_85C9299 @@ -397638,7 +397638,7 @@ _080C133E: bl sub_080C07CC movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _080C136C: pop {r3} mov r8, r3 @@ -397662,7 +397662,7 @@ sub_080C137C: @ 0x080C137C str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080C13AC lsls r0, r4, #2 adds r0, r0, r4 @@ -397692,7 +397692,7 @@ sub_080C13B4: @ 0x080C13B4 bne _080C13D0 bl sub_080C0A9C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080C13D0: pop {r4} pop {r0} @@ -397717,7 +397717,7 @@ sub_080C13DC: @ 0x080C13DC lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer adds r2, r0, #0 movs r3, #0 cmp r3, r4 @@ -397833,7 +397833,7 @@ _080C14D8: .align 2, 0 _080C14E4: .4byte gUnknown_854414C _080C14E8: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _080C1514 ldr r2, _080C1510 @@ -398131,8 +398131,8 @@ _080C1732: _080C1758: .4byte gUnknown_854414C thumb_func_end sub_080C16B8 - thumb_func_start sub_080C175C -sub_080C175C: @ 0x080C175C + thumb_func_start Cb_JumpBox +Cb_JumpBox: @ 0x080C175C push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -398205,7 +398205,7 @@ sub_080C175C: @ 0x080C175C movs r1, #6 movs r2, #8 bl sub_080C07CC - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _080C181A ldrh r0, [r5, #0xe] @@ -398231,7 +398231,7 @@ _080C1828: .4byte gUnknown_85442B8 _080C182C: .4byte gUnknown_8544318 _080C1830: .4byte gUnknown_8544228 _080C1834: .4byte gUnknown_8544210 - thumb_func_end sub_080C175C + thumb_func_end Cb_JumpBox thumb_func_start sub_080C1838 sub_080C1838: @ 0x080C1838 @@ -398240,7 +398240,7 @@ sub_080C1838: @ 0x080C1838 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer adds r5, r0, #0 cmp r4, #0 bne _080C18EC @@ -398791,7 +398791,7 @@ sub_080C1C38: @ 0x080C1C38 movs r1, #0xb8 movs r2, #4 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _080C1CB4 @@ -398813,7 +398813,7 @@ sub_080C1C38: @ 0x080C1C38 movs r1, #0xb8 movs r2, #0x6c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -398843,11 +398843,11 @@ _080C1CB4: .4byte gUnknown_20205AC _080C1CB8: .4byte sub_080C1B84 thumb_func_end sub_080C1C38 - thumb_func_start sub_080C1CBC -sub_080C1CBC: @ 0x080C1CBC + thumb_func_start VblankCb_TrainerCard +VblankCb_TrainerCard: @ 0x080C1CBC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer bl sub_080C41FC ldr r0, _080C1CF0 @@ -398873,7 +398873,7 @@ _080C1CF0: .4byte gUnknown_2039988 _080C1CF4: .4byte 0x040000D4 _080C1CF8: .4byte gUnknown_20388C8 _080C1CFC: .4byte 0x800000A0 - thumb_func_end sub_080C1CBC + thumb_func_end VblankCb_TrainerCard thumb_func_start HblankCb_TrainerCard HblankCb_TrainerCard: @ 0x080C1D00 @@ -398906,17 +398906,17 @@ _080C1D34: .4byte 0x04000006 _080C1D38: .4byte 0x04000012 thumb_func_end HblankCb_TrainerCard - thumb_func_start sub_080C1D3C -sub_080C1D3C: @ 0x080C1D3C + thumb_func_start CB2_TrainerCard +CB2_TrainerCard: @ 0x080C1D3C push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C1D3C + thumb_func_end CB2_TrainerCard thumb_func_start sub_080C1D54 sub_080C1D54: @ 0x080C1D54 @@ -398929,14 +398929,14 @@ sub_080C1D54: @ 0x080C1D54 ldr r1, _080C1D88 adds r0, r0, r1 ldr r0, [r0] - bl sub_08000540 - bl sub_080034D4 + bl SetMainCallback2 + bl FreeAllWindowBuffers ldr r0, [r5] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r5] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5} pop {r0} bx r0 @@ -398986,7 +398986,7 @@ _080C1DB4: @ jump table .4byte _080C2058 @ case 15 .4byte _080C2094 @ case 16 _080C1DF8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _080C1E04 @@ -398994,7 +398994,7 @@ _080C1DF8: _080C1E04: movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer b _080C1F00 _080C1E0E: bl sub_080C2A68 @@ -399011,7 +399011,7 @@ _080C1E1C: _080C1E24: movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer bl sub_080C48F4 movs r0, #2 bl sub_080C3CC8 @@ -399035,7 +399035,7 @@ _080C1E4C: .align 2, 0 _080C1E5C: .4byte 0x00000584 _080C1E60: - bl sub_080C3F64 + bl TrainerCard_PrintStarsAndBadgesOnCard b _080C1F00 _080C1E66: ldr r0, _080C1EB8 @@ -399046,10 +399046,10 @@ _080C1E66: ldrb r0, [r0] cmp r0, #1 bne _080C1E82 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0xe6 movs r1, #0x96 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _080C1E82: movs r6, #1 rsbs r6, r6, #0 @@ -399061,7 +399061,7 @@ _080C1E82: ldrh r2, [r0] adds r0, r6, #0 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes ldr r0, [r4] adds r0, r0, r5 ldrh r0, [r0] @@ -399070,24 +399070,24 @@ _080C1E82: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080C1EC4 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, [r4] b _080C1F04 .align 2, 0 _080C1EB8: .4byte gUnknown_300319C _080C1EBC: .4byte gUnknown_30031C4 _080C1EC0: .4byte gUnknown_2039988 -_080C1EC4: .4byte sub_080C1CBC +_080C1EC4: .4byte VblankCb_TrainerCard _080C1EC8: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _080C1ED4 b _080C20F6 _080C1ED4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _080C1EE0 @@ -399103,7 +399103,7 @@ _080C1EE0: .align 2, 0 _080C1EF0: .4byte gUnknown_2039988 _080C1EF4: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _080C1F00 @@ -399129,7 +399129,7 @@ _080C1F10: ldrb r0, [r0] cmp r0, #0 beq _080C1F36 - bl sub_080C2F5C + bl WindowFunc_DrawDialogFrameWithCustomTileAndPalette movs r0, #1 bl sub_080C3CC8 ldr r0, [r4] @@ -399293,7 +399293,7 @@ _080C2058: bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _080C2090 ldr r1, [r0] movs r0, #0x10 @@ -399319,7 +399319,7 @@ _080C20A0: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] movs r0, #0xe strb r0, [r1] @@ -399327,7 +399327,7 @@ _080C20A0: .align 2, 0 _080C20C0: .4byte gUnknown_30031C4 _080C20C4: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080C20F6 @@ -399556,8 +399556,8 @@ _080C22AC: _080C22B0: .4byte gUnknown_2039988 thumb_func_end sub_080C2104 - thumb_func_start sub_080C22B4 -sub_080C22B4: @ 0x080C22B4 + thumb_func_start CB2_InitTrainerCard +CB2_InitTrainerCard: @ 0x080C22B4 push {lr} sub sp, #8 ldr r1, _080C22D4 @@ -399591,7 +399591,7 @@ _080C22DC: @ jump table .4byte _080C23D6 @ case 9 .4byte _080C23E8 @ case 10 _080C2308: - bl sub_080C297C + bl HandleGpuRegs bl sub_080C2A44 ldr r1, _080C231C movs r0, #0x87 @@ -399659,7 +399659,7 @@ _080C2380: adds r0, #1 strb r0, [r1] _080C239A: - bl sub_080C29B8 + bl InitBgsAndWindows b _080C23F4 .align 2, 0 _080C23A0: .4byte gUnknown_3002360 @@ -399697,7 +399697,7 @@ _080C23D6: .align 2, 0 _080C23E4: .4byte gUnknown_3002360 _080C23E8: - bl sub_080C3CE4 + bl SetCardBgsAndPals _080C23EC: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -399716,21 +399716,21 @@ _080C23FC: .align 2, 0 _080C2404: .4byte gUnknown_3002360 _080C2408: - bl sub_080C2A34 + bl SetTrainerCardCb2 _080C240C: add sp, #8 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C22B4 + thumb_func_end CB2_InitTrainerCard - thumb_func_start sub_080C2414 -sub_080C2414: @ 0x080C2414 + thumb_func_start GetCappedGameStat +GetCappedGameStat: @ 0x080C2414 push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08084180 + bl GetGameStat cmp r0, r4 bls _080C2426 adds r0, r4, #0 @@ -399738,10 +399738,10 @@ _080C2426: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080C2414 + thumb_func_end GetCappedGameStat - thumb_func_start sub_080C242C -sub_080C242C: @ 0x080C242C + thumb_func_start HasAllFrontierSymbols +HasAllFrontierSymbols: @ 0x080C242C push {r4, r5, lr} movs r5, #0 _080C2430: @@ -399776,17 +399776,17 @@ _080C2468: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080C242C + thumb_func_end HasAllFrontierSymbols - thumb_func_start sub_080C2470 -sub_080C2470: @ 0x080C2470 + thumb_func_start CountPlayerTrainerStars +CountPlayerTrainerStars: @ 0x080C2470 push {r4, lr} movs r0, #0xa - bl sub_08084180 + bl GetGameStat rsbs r1, r0, #0 orrs r1, r0 lsrs r4, r1, #0x1f - bl sub_080BFE3C + bl HasAllHoennMons lsls r0, r0, #0x10 cmp r0, #0 beq _080C248A @@ -399801,7 +399801,7 @@ _080C248A: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _080C249C: - bl sub_080C242C + bl HasAllFrontierSymbols lsls r0, r0, #0x18 cmp r0, #0 beq _080C24AC @@ -399813,7 +399813,7 @@ _080C24AC: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080C2470 + thumb_func_end CountPlayerTrainerStars thumb_func_start GetRubyTrainerStars GetRubyTrainerStars: @ 0x080C24B4 @@ -399856,8 +399856,8 @@ _080C24EC: .align 2, 0 thumb_func_end GetRubyTrainerStars - thumb_func_start sub_080C24F4 -sub_080C24F4: @ 0x080C24F4 + thumb_func_start SetPlayerCardData +SetPlayerCardData: @ 0x080C24F4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -399874,10 +399874,10 @@ sub_080C24F4: @ 0x080C24F4 ldrb r0, [r1, #0x10] strh r0, [r5, #0x12] movs r0, #1 - bl sub_08084180 + bl GetGameStat adds r4, r0, #0 movs r0, #0xa - bl sub_08084180 + bl GetGameStat cmp r0, #0 bne _080C2526 movs r4, #0 @@ -399901,9 +399901,9 @@ _080C2544: ldr r0, _080C25DC bl FlagGet strb r0, [r5, #2] - bl sub_080BFE3C + bl HasAllHoennMons strb r0, [r5, #3] - bl sub_080C2E20 + bl GetCaughtMonsCount strh r0, [r5, #0xc] ldr r0, [r6] ldrb r1, [r0, #0xb] @@ -399914,15 +399914,15 @@ _080C2544: ldr r4, _080C25E0 movs r0, #0x17 adds r1, r4, #0 - bl sub_080C2414 + bl GetCappedGameStat strh r0, [r5, #0x14] movs r0, #0x18 adds r1, r4, #0 - bl sub_080C2414 + bl GetCappedGameStat strh r0, [r5, #0x16] ldr r1, _080C25E4 movs r0, #0x15 - bl sub_080C2414 + bl GetCappedGameStat strh r0, [r5, #0x20] ldr r4, _080C25E8 ldr r0, [r4] @@ -399980,11 +399980,11 @@ _080C25F0: _080C25FC: ldr r1, _080C262C movs r0, #0x23 - bl sub_080C2414 + bl GetCappedGameStat strh r0, [r5, #0x1c] ldr r1, _080C2630 movs r0, #0x22 - bl sub_080C2414 + bl GetCappedGameStat strh r0, [r5, #0x1e] bl CountPlayerContestPaintings lsls r0, r0, #0x18 @@ -400017,10 +400017,10 @@ _080C2644: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C24F4 + thumb_func_end SetPlayerCardData - thumb_func_start sub_080C2650 -sub_080C2650: @ 0x080C2650 + thumb_func_start TrainerCard_GenerateCardForLinkPlayer +TrainerCard_GenerateCardForLinkPlayer: @ 0x080C2650 push {r4, lr} adds r4, r0, #0 movs r1, #0 @@ -400032,8 +400032,8 @@ sub_080C2650: @ 0x080C2650 strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl sub_080C24F4 - bl sub_080C242C + bl SetPlayerCardData + bl HasAllFrontierSymbols lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -400084,10 +400084,10 @@ _080C26BC: bx r0 .align 2, 0 _080C26D0: .4byte gUnknown_82FA6E2 - thumb_func_end sub_080C2650 + thumb_func_end TrainerCard_GenerateCardForLinkPlayer - thumb_func_start sub_080C26D4 -sub_080C26D4: @ 0x080C26D4 + thumb_func_start TrainerCard_GenerateCardForPlayer +TrainerCard_GenerateCardForPlayer: @ 0x080C26D4 push {r4, lr} adds r4, r0, #0 movs r1, #0 @@ -400099,8 +400099,8 @@ sub_080C26D4: @ 0x080C26D4 strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl sub_080C24F4 - bl sub_080C242C + bl SetPlayerCardData + bl HasAllFrontierSymbols lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x3a] @@ -400146,10 +400146,10 @@ _080C2738: bx r0 .align 2, 0 _080C274C: .4byte gUnknown_82FA6E2 - thumb_func_end sub_080C26D4 + thumb_func_end TrainerCard_GenerateCardForPlayer - thumb_func_start sub_080C2750 -sub_080C2750: @ 0x080C2750 + thumb_func_start CopyTrainerCardData +CopyTrainerCardData: @ 0x080C2750 push {r4, r5, r6, lr} adds r5, r0, #0 adds r6, r1, #0 @@ -400206,10 +400206,10 @@ _080C27BA: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080C2750 + thumb_func_end CopyTrainerCardData - thumb_func_start sub_080C27C0 -sub_080C27C0: @ 0x080C27C0 + thumb_func_start DecompressPicFromTable_2 +DecompressPicFromTable_2: @ 0x080C27C0 push {r4, r5, lr} ldr r4, _080C288C ldr r0, [r4] @@ -400325,7 +400325,7 @@ _080C2894: .4byte 0x00000526 _080C2898: .4byte 0x00000534 _080C289C: .4byte 0x00000867 _080C28A0: .4byte 0x0000086E - thumb_func_end sub_080C27C0 + thumb_func_end DecompressPicFromTable_2 thumb_func_start sub_080C28A4 sub_080C28A4: @ 0x080C28A4 @@ -400335,13 +400335,13 @@ sub_080C28A4: @ 0x080C28A4 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0xc1 bl SetGpuReg @@ -400427,13 +400427,13 @@ _080C2974: .4byte 0x00000514 _080C2978: .4byte 0x00007C94 thumb_func_end sub_080C2918 - thumb_func_start sub_080C297C -sub_080C297C: @ 0x080C297C + thumb_func_start HandleGpuRegs +HandleGpuRegs: @ 0x080C297C push {lr} movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -400452,10 +400452,10 @@ sub_080C297C: @ 0x080C297C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C297C + thumb_func_end HandleGpuRegs - thumb_func_start sub_080C29B8 -sub_080C29B8: @ 0x080C29B8 + thumb_func_start InitBgsAndWindows +InitBgsAndWindows: @ 0x080C29B8 push {lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -400466,37 +400466,37 @@ sub_080C29B8: @ 0x080C29B8 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, _080C2A30 - bl sub_08003090 + bl InitWindows bl sub_08004480 bl sub_08196F98 pop {r0} @@ -400504,29 +400504,29 @@ sub_080C29B8: @ 0x080C29B8 .align 2, 0 _080C2A2C: .4byte gUnknown_8546714 _080C2A30: .4byte gUnknown_8546724 - thumb_func_end sub_080C29B8 + thumb_func_end InitBgsAndWindows - thumb_func_start sub_080C2A34 -sub_080C2A34: @ 0x080C2A34 + thumb_func_start SetTrainerCardCb2 +SetTrainerCardCb2: @ 0x080C2A34 push {lr} ldr r0, _080C2A40 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080C2A40: .4byte sub_080C1D3C - thumb_func_end sub_080C2A34 +_080C2A40: .4byte CB2_TrainerCard + thumb_func_end SetTrainerCardCb2 thumb_func_start sub_080C2A44 sub_080C2A44: @ 0x080C2A44 push {lr} - bl sub_080A8818 - bl sub_080B9710 + bl ResetTasks + bl ScanlineEffect_Stop ldr r0, _080C2A64 movs r1, #0 - bl sub_080A8878 + bl CreateTask bl sub_080C47EC - bl sub_080C27C0 + bl DecompressPicFromTable_2 pop {r0} bx r0 .align 2, 0 @@ -400560,7 +400560,7 @@ _080C2AA0: bl sub_080C2BA4 b _080C2ACC _080C2AA6: - bl sub_080C2C5C + bl Task_PrintTestData b _080C2ACC _080C2AAC: bl sub_080C2D14 @@ -400569,7 +400569,7 @@ _080C2AB2: bl sub_080C2E40 b _080C2ACC _080C2AB8: - bl sub_080C2F5C + bl WindowFunc_DrawDialogFrameWithCustomTileAndPalette b _080C2ACC _080C2ABE: bl sub_080C310C @@ -400593,8 +400593,8 @@ _080C2AD8: _080C2ADC: .4byte gUnknown_2039988 thumb_func_end sub_080C2A68 - thumb_func_start sub_080C2AE0 -sub_080C2AE0: @ 0x080C2AE0 + thumb_func_start PrintStringsOnCardPage2 +PrintStringsOnCardPage2: @ 0x080C2AE0 push {lr} ldr r0, _080C2AF8 ldr r1, [r0] @@ -400639,7 +400639,7 @@ _080C2B42: bl sub_080C3828 b _080C2B64 _080C2B4C: - bl sub_080C3A70 + bl TrainerCard_PrintPokemonIconsOnCard bl sub_080C395C b _080C2B64 _080C2B56: @@ -400662,20 +400662,20 @@ _080C2B70: bx r1 .align 2, 0 _080C2B74: .4byte gUnknown_2039988 - thumb_func_end sub_080C2AE0 + thumb_func_end PrintStringsOnCardPage2 thumb_func_start sub_080C2B78 sub_080C2B78: @ 0x080C2B78 push {lr} bl sub_080C31FC - bl sub_080C32C0 - bl sub_080C33A0 - bl sub_080C34B8 - bl sub_080C3584 - bl sub_080C364C - bl sub_080C3710 + bl PrintLinkResultsNumsOnCard + bl PrintHofTimeOnCard + bl PrintTradesNumOnCard + bl PrintUnionNumOnCard + bl PrintBerryCrushNumOnCard + bl PrintPokeblocksNumOnCard bl sub_080C37EC - bl sub_080C38B4 + bl PrintBattleFacilityNumsOnCard pop {r0} bx r0 .align 2, 0 @@ -400704,7 +400704,7 @@ sub_080C2BA4: @ 0x080C2BA4 movs r0, #1 movs r2, #0x14 movs r3, #0x1e - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C2C04 .align 2, 0 _080C2BD4: .4byte gUnknown_2039988 @@ -400725,7 +400725,7 @@ _080C2BE8: movs r0, #1 movs r2, #0x10 movs r3, #0x22 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C2C04: ldr r0, _080C2C40 ldrb r1, [r0, #1] @@ -400750,7 +400750,7 @@ _080C2C04: adds r4, r4, r0 str r4, [sp, #8] movs r0, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4} pop {r0} @@ -400765,8 +400765,8 @@ _080C2C54: .4byte 0x00000517 _080C2C58: .4byte gUnknown_85467A2 thumb_func_end sub_080C2BA4 - thumb_func_start sub_080C2C5C -sub_080C2C5C: @ 0x080C2C5C + thumb_func_start Task_PrintTestData +Task_PrintTestData: @ 0x080C2C5C push {r4, r5, r6, lr} sub sp, #0x14 ldr r4, _080C2CB4 @@ -400797,7 +400797,7 @@ sub_080C2C5C: @ 0x080C2C5C adds r1, r6, #0 movs r2, #0x82 movs r3, #0xb - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] add r0, sp, #0xc @@ -400806,7 +400806,7 @@ sub_080C2C5C: @ 0x080C2C5C adds r1, r6, #0 movs r2, #0xa6 movs r3, #0xb - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C2CFE .align 2, 0 _080C2CB4: .4byte gUnknown_2039988 @@ -400829,7 +400829,7 @@ _080C2CCC: adds r1, r6, #0 movs r2, #0x73 movs r3, #0xa - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] add r1, sp, #0xc @@ -400838,7 +400838,7 @@ _080C2CCC: adds r1, r6, #0 movs r2, #0x99 movs r3, #0xa - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C2CFE: add sp, #0x14 pop {r4, r5, r6} @@ -400848,7 +400848,7 @@ _080C2CFE: _080C2D08: .4byte gUnknown_8546775 _080C2D0C: .4byte gUnknown_854676C _080C2D10: .4byte gUnknown_85CC323 - thumb_func_end sub_080C2C5C + thumb_func_end Task_PrintTestData thumb_func_start sub_080C2D14 sub_080C2D14: @ 0x080C2D14 @@ -400882,7 +400882,7 @@ sub_080C2D14: @ 0x080C2D14 movs r0, #1 movs r2, #0x14 movs r3, #0x38 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #0 bl StringLength lsls r0, r0, #0x10 @@ -400900,7 +400900,7 @@ sub_080C2D14: @ 0x080C2D14 movs r0, #1 adds r1, r6, #0 movs r3, #0x38 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _080C2DB0 @@ -400909,7 +400909,7 @@ sub_080C2D14: @ 0x080C2D14 adds r1, r6, #0 movs r2, #0x8a movs r3, #0x38 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C2E08 .align 2, 0 _080C2D94: .4byte gUnknown_2021C7C @@ -400933,7 +400933,7 @@ _080C2DB4: movs r0, #1 movs r2, #0x10 movs r3, #0x3a - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #0 bl StringLength lsls r0, r0, #0x10 @@ -400949,7 +400949,7 @@ _080C2DB4: movs r0, #1 adds r1, r6, #0 movs r3, #0x3a - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _080C2E1C @@ -400958,7 +400958,7 @@ _080C2DB4: adds r1, r6, #0 movs r2, #0x6e movs r3, #0x3a - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C2E08: add sp, #0xc pop {r4, r5, r6, r7} @@ -400971,14 +400971,14 @@ _080C2E18: .4byte gUnknown_85CC329 _080C2E1C: .4byte gUnknown_85CC32F thumb_func_end sub_080C2D14 - thumb_func_start sub_080C2E20 -sub_080C2E20: @ 0x080C2E20 + thumb_func_start GetCaughtMonsCount +GetCaughtMonsCount: @ 0x080C2E20 push {lr} - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 bne _080C2E32 movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount b _080C2E38 _080C2E32: movs r0, #1 @@ -400988,7 +400988,7 @@ _080C2E38: lsrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_080C2E20 + thumb_func_end GetCaughtMonsCount thumb_func_start sub_080C2E40 sub_080C2E40: @ 0x080C2E40 @@ -401027,7 +401027,7 @@ sub_080C2E40: @ 0x080C2E40 movs r0, #1 movs r2, #0x14 movs r3, #0x48 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #0 bl StringLength lsls r0, r0, #0x10 @@ -401045,7 +401045,7 @@ sub_080C2E40: @ 0x080C2E40 movs r0, #1 adds r1, r6, #0 movs r3, #0x48 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _080C2EEC @@ -401054,7 +401054,7 @@ sub_080C2E40: @ 0x080C2E40 adds r1, r6, #0 movs r2, #0x8a movs r3, #0x48 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C2F44 .align 2, 0 _080C2ECC: .4byte 0x00000861 @@ -401079,7 +401079,7 @@ _080C2EF0: movs r0, #1 movs r2, #0x10 movs r3, #0x4a - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #0 bl StringLength lsls r0, r0, #0x10 @@ -401095,7 +401095,7 @@ _080C2EF0: movs r0, #1 adds r1, r6, #0 movs r3, #0x4a - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _080C2F58 @@ -401104,7 +401104,7 @@ _080C2EF0: adds r1, r6, #0 movs r2, #0x6e movs r3, #0x4a - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C2F44: add sp, #0xc pop {r4, r5, r6, r7} @@ -401117,8 +401117,8 @@ _080C2F54: .4byte gUnknown_85CC331 _080C2F58: .4byte gUnknown_85CC339 thumb_func_end sub_080C2E40 - thumb_func_start sub_080C2F5C -sub_080C2F5C: @ 0x080C2F5C + thumb_func_start WindowFunc_DrawDialogFrameWithCustomTileAndPalette +WindowFunc_DrawDialogFrameWithCustomTileAndPalette: @ 0x080C2F5C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -401193,7 +401193,7 @@ _080C2FA4: movs r0, #1 movs r2, #0x14 movs r3, #0x58 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C302C .align 2, 0 _080C2FF0: .4byte gUnknown_3005AF0 @@ -401217,7 +401217,7 @@ _080C3010: movs r0, #1 movs r2, #0x10 movs r3, #0x5a - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C302C: ldr r0, _080C30E8 adds r1, r5, #0 @@ -401248,7 +401248,7 @@ _080C302C: str r1, [sp, #8] movs r0, #1 adds r1, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r1, _080C30FC mov r2, sb ldr r4, [r2] @@ -401270,7 +401270,7 @@ _080C302C: str r0, [sp, #8] movs r0, #1 adds r1, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _080C30E8 mov r1, sl movs r2, #2 @@ -401292,7 +401292,7 @@ _080C302C: str r1, [sp, #8] movs r0, #1 adds r1, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -401314,7 +401314,7 @@ _080C30FC: .4byte gUnknown_85467AE _080C3100: .4byte gUnknown_85467A4 _080C3104: .4byte gUnknown_85CC33C _080C3108: .4byte gUnknown_85467B0 - thumb_func_end sub_080C2F5C + thumb_func_end WindowFunc_DrawDialogFrameWithCustomTileAndPalette thumb_func_start sub_080C310C sub_080C310C: @ 0x080C310C @@ -401324,7 +401324,7 @@ sub_080C310C: @ 0x080C310C sub sp, #0xc movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r7, _080C31E8 @@ -401350,7 +401350,7 @@ sub_080C310C: @ 0x080C310C movs r0, #1 movs r1, #1 movs r2, #0xa - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, [r7] adds r0, #0x19 bl StringLength @@ -401374,7 +401374,7 @@ sub_080C310C: @ 0x080C310C str r1, [sp, #8] movs r0, #1 movs r1, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _080C31F8 mov r8, r0 ldr r1, [r7] @@ -401390,7 +401390,7 @@ sub_080C310C: @ 0x080C310C movs r0, #1 movs r1, #1 movs r2, #0xa - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, [r7] adds r0, #0x29 bl StringLength @@ -401414,7 +401414,7 @@ sub_080C310C: @ 0x080C310C str r1, [sp, #8] movs r0, #1 movs r1, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C31DC: add sp, #0xc pop {r3} @@ -401486,7 +401486,7 @@ sub_080C323C: @ 0x080C323C movs r0, #1 movs r2, #0x82 movs r3, #0xa - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C32B0 .align 2, 0 _080C3270: .4byte gUnknown_2039988 @@ -401515,7 +401515,7 @@ _080C3280: str r0, [sp, #8] movs r0, #1 movs r3, #0xa - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C32B0: add sp, #0xc pop {r4, r5} @@ -401526,8 +401526,8 @@ _080C32B8: .4byte gUnknown_8546775 _080C32BC: .4byte gUnknown_854676C thumb_func_end sub_080C323C - thumb_func_start sub_080C32C0 -sub_080C32C0: @ 0x080C32C0 + thumb_func_start PrintLinkResultsNumsOnCard +PrintLinkResultsNumsOnCard: @ 0x080C32C0 push {r4, lr} ldr r4, _080C3314 ldr r1, [r4] @@ -401561,7 +401561,7 @@ sub_080C32C0: @ 0x080C32C0 ldr r0, [r4] adds r0, #0x7f ldr r1, _080C332C - bl sub_08008BCC + bl StringExpandPlaceholders _080C330C: pop {r4} pop {r0} @@ -401574,7 +401574,7 @@ _080C3320: .4byte gUnknown_2021C54 _080C3324: .4byte gUnknown_2021C68 _080C3328: .4byte 0x0000052A _080C332C: .4byte gUnknown_85467B8 - thumb_func_end sub_080C32C0 + thumb_func_end PrintLinkResultsNumsOnCard thumb_func_start sub_080C3330 sub_080C3330: @ 0x080C3330 @@ -401602,7 +401602,7 @@ sub_080C3330: @ 0x080C3330 str r0, [sp, #8] movs r0, #1 movs r3, #0x23 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r0, _080C339C str r0, [sp] @@ -401613,7 +401613,7 @@ sub_080C3330: @ 0x080C3330 movs r0, #1 movs r2, #0x91 movs r3, #0x23 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C337C: add sp, #0xc pop {r4, r5, r6} @@ -401629,8 +401629,8 @@ _080C3398: .4byte gUnknown_85CC35A _080C339C: .4byte gUnknown_854676F thumb_func_end sub_080C3330 - thumb_func_start sub_080C33A0 -sub_080C33A0: @ 0x080C33A0 + thumb_func_start PrintHofTimeOnCard +PrintHofTimeOnCard: @ 0x080C33A0 push {r4, lr} ldr r4, _080C33F0 ldr r1, [r4] @@ -401677,7 +401677,7 @@ _080C33FC: .4byte 0x00000151 _080C3400: .4byte 0x00000534 _080C3404: .4byte 0x00000197 _080C3408: .4byte 0x00000536 - thumb_func_end sub_080C33A0 + thumb_func_end PrintHofTimeOnCard thumb_func_start sub_080C340C sub_080C340C: @ 0x080C340C @@ -401706,7 +401706,7 @@ sub_080C340C: @ 0x080C340C str r0, [sp, #8] movs r0, #1 movs r3, #0x33 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r5, [r5] str r6, [sp] str r4, [sp, #4] @@ -401716,7 +401716,7 @@ sub_080C340C: @ 0x080C340C adds r1, r5, #0 movs r2, #0x6e movs r3, #0x33 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r6, _080C34AC str r6, [sp] str r4, [sp, #4] @@ -401728,7 +401728,7 @@ sub_080C340C: @ 0x080C340C adds r1, r5, #0 movs r2, #0x82 movs r3, #0x33 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r6, [sp] str r4, [sp, #4] ldr r0, [r7] @@ -401739,7 +401739,7 @@ sub_080C340C: @ 0x080C340C adds r1, r5, #0 movs r2, #0xb9 movs r3, #0x33 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C348A: add sp, #0xc pop {r4, r5, r6, r7} @@ -401757,8 +401757,8 @@ _080C34B0: .4byte 0x00000151 _080C34B4: .4byte 0x00000197 thumb_func_end sub_080C340C - thumb_func_start sub_080C34B8 -sub_080C34B8: @ 0x080C34B8 + thumb_func_start PrintTradesNumOnCard +PrintTradesNumOnCard: @ 0x080C34B8 push {lr} ldr r0, _080C34DC ldr r1, [r0] @@ -401780,7 +401780,7 @@ _080C34D8: .align 2, 0 _080C34DC: .4byte gUnknown_2039988 _080C34E0: .4byte 0x00000223 - thumb_func_end sub_080C34B8 + thumb_func_end PrintTradesNumOnCard thumb_func_start sub_080C34E4 sub_080C34E4: @ 0x080C34E4 @@ -401808,7 +401808,7 @@ sub_080C34E4: @ 0x080C34E4 str r0, [sp, #8] movs r0, #1 movs r3, #0x43 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r2, [r7] adds r4, r2, r4 ldrb r0, [r4] @@ -401824,7 +401824,7 @@ sub_080C34E4: @ 0x080C34E4 movs r0, #1 movs r2, #0xa8 movs r3, #0x43 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C3574 .align 2, 0 _080C353C: .4byte gUnknown_2039988 @@ -401846,7 +401846,7 @@ _080C355C: movs r0, #1 movs r2, #0xa0 movs r3, #0x43 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C3574: add sp, #0xc pop {r4, r5, r6, r7} @@ -401857,8 +401857,8 @@ _080C357C: .4byte gUnknown_854676F _080C3580: .4byte 0x00000223 thumb_func_end sub_080C34E4 - thumb_func_start sub_080C3584 -sub_080C3584: @ 0x080C3584 + thumb_func_start PrintUnionNumOnCard +PrintUnionNumOnCard: @ 0x080C3584 push {lr} ldr r0, _080C35B0 ldr r2, [r0] @@ -401885,7 +401885,7 @@ _080C35B0: .4byte gUnknown_2039988 _080C35B4: .4byte 0x00000516 _080C35B8: .4byte 0x0000055C _080C35BC: .4byte 0x000002AF - thumb_func_end sub_080C3584 + thumb_func_end PrintUnionNumOnCard thumb_func_start sub_080C35C0 sub_080C35C0: @ 0x080C35C0 @@ -401920,7 +401920,7 @@ sub_080C35C0: @ 0x080C35C0 str r0, [sp, #8] movs r0, #1 movs r3, #0x63 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r0, _080C3644 str r0, [sp] @@ -401932,7 +401932,7 @@ sub_080C35C0: @ 0x080C35C0 movs r0, #1 movs r2, #0x72 movs r3, #0x63 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C361C: add sp, #0xc pop {r4, r5, r6} @@ -401951,8 +401951,8 @@ _080C3644: .4byte gUnknown_854676F _080C3648: .4byte 0x000002AF thumb_func_end sub_080C35C0 - thumb_func_start sub_080C364C -sub_080C364C: @ 0x080C364C + thumb_func_start PrintBerryCrushNumOnCard +PrintBerryCrushNumOnCard: @ 0x080C364C push {lr} ldr r0, _080C3678 ldr r2, [r0] @@ -401979,7 +401979,7 @@ _080C3674: _080C3678: .4byte gUnknown_2039988 _080C367C: .4byte 0x00000516 _080C3680: .4byte 0x0000033B - thumb_func_end sub_080C364C + thumb_func_end PrintBerryCrushNumOnCard thumb_func_start sub_080C3684 sub_080C3684: @ 0x080C3684 @@ -402015,7 +402015,7 @@ sub_080C3684: @ 0x080C3684 str r0, [sp, #8] movs r0, #1 movs r3, #0x53 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r0, _080C3708 str r0, [sp] @@ -402027,7 +402027,7 @@ sub_080C3684: @ 0x080C3684 movs r0, #1 movs r2, #0xa0 movs r3, #0x53 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C36E2: add sp, #0xc pop {r4, r5, r6} @@ -402045,8 +402045,8 @@ _080C3708: .4byte gUnknown_854676F _080C370C: .4byte 0x0000033B thumb_func_end sub_080C3684 - thumb_func_start sub_080C3710 -sub_080C3710: @ 0x080C3710 + thumb_func_start PrintPokeblocksNumOnCard +PrintPokeblocksNumOnCard: @ 0x080C3710 push {r4, lr} ldr r4, _080C3748 ldr r1, [r4] @@ -402069,7 +402069,7 @@ sub_080C3710: @ 0x080C3710 ldr r1, _080C3758 adds r0, r0, r1 ldr r1, _080C375C - bl sub_08008BCC + bl StringExpandPlaceholders _080C3742: pop {r4} pop {r0} @@ -402081,7 +402081,7 @@ _080C3750: .4byte 0x0000053E _080C3754: .4byte gUnknown_2021C40 _080C3758: .4byte 0x00000381 _080C375C: .4byte gUnknown_85CC3CF - thumb_func_end sub_080C3710 + thumb_func_end PrintPokeblocksNumOnCard thumb_func_start sub_080C3760 sub_080C3760: @ 0x080C3760 @@ -402116,7 +402116,7 @@ sub_080C3760: @ 0x080C3760 str r0, [sp, #8] movs r0, #1 movs r3, #0x53 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r0, _080C37E4 str r0, [sp] @@ -402128,7 +402128,7 @@ sub_080C3760: @ 0x080C3760 movs r0, #1 movs r2, #0xa8 movs r3, #0x53 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C37BC: add sp, #0xc pop {r4, r5, r6} @@ -402211,7 +402211,7 @@ sub_080C3828: @ 0x080C3828 str r0, [sp, #8] movs r0, #1 movs r3, #0x63 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r0, _080C38AC str r0, [sp] @@ -402223,7 +402223,7 @@ sub_080C3828: @ 0x080C3828 movs r0, #1 movs r2, #0xa8 movs r3, #0x63 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C3884: add sp, #0xc pop {r4, r5, r6} @@ -402242,8 +402242,8 @@ _080C38AC: .4byte gUnknown_854676F _080C38B0: .4byte 0x000003C7 thumb_func_end sub_080C3828 - thumb_func_start sub_080C38B4 -sub_080C38B4: @ 0x080C38B4 + thumb_func_start PrintBattleFacilityNumsOnCard +PrintBattleFacilityNumsOnCard: @ 0x080C38B4 push {r4, lr} ldr r4, _080C38D0 ldr r1, [r4] @@ -402284,7 +402284,7 @@ _080C38D8: ldr r1, _080C391C adds r0, r0, r1 ldr r1, _080C3920 - bl sub_08008BCC + bl StringExpandPlaceholders b _080C3946 .align 2, 0 _080C3910: .4byte gUnknown_2021C40 @@ -402307,7 +402307,7 @@ _080C3924: ldr r1, _080C3954 adds r0, r0, r1 ldr r1, _080C3958 - bl sub_08008BCC + bl StringExpandPlaceholders _080C3946: pop {r4} pop {r0} @@ -402317,7 +402317,7 @@ _080C394C: .4byte 0x00000582 _080C3950: .4byte gUnknown_2021C40 _080C3954: .4byte 0x0000040D _080C3958: .4byte gUnknown_85CC3F8 - thumb_func_end sub_080C38B4 + thumb_func_end PrintBattleFacilityNumsOnCard thumb_func_start sub_080C395C sub_080C395C: @ 0x080C395C @@ -402362,7 +402362,7 @@ _080C3984: str r0, [sp, #8] movs r0, #1 movs r3, #0x73 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r3, [r7] adds r4, r3, r4 @@ -402380,7 +402380,7 @@ _080C3984: str r3, [sp, #8] movs r0, #1 movs r3, #0x73 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C3A42 .align 2, 0 _080C39DC: .4byte gUnknown_8546775 @@ -402413,7 +402413,7 @@ _080C39F8: str r0, [sp, #8] movs r0, #1 movs r3, #0x73 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r1, [r5] ldr r0, _080C3A68 str r0, [sp] @@ -402425,7 +402425,7 @@ _080C39F8: movs r0, #1 movs r2, #0xa0 movs r3, #0x73 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C3A42: add sp, #0xc pop {r3} @@ -402444,8 +402444,8 @@ _080C3A68: .4byte gUnknown_854676F _080C3A6C: .4byte 0x0000040D thumb_func_end sub_080C395C - thumb_func_start sub_080C3A70 -sub_080C3A70: @ 0x080C3A70 + thumb_func_start TrainerCard_PrintPokemonIconsOnCard +TrainerCard_PrintPokemonIconsOnCard: @ 0x080C3A70 push {r4, r5, lr} sub sp, #0x20 ldr r1, _080C3AF8 @@ -402500,7 +402500,7 @@ _080C3A9C: str r0, [sp, #0xc] movs r0, #3 movs r3, #0xf - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer _080C3AE4: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -402518,7 +402518,7 @@ _080C3AFC: .4byte gUnknown_85467D6 _080C3B00: .4byte gUnknown_2039988 _080C3B04: .4byte 0x00000516 _080C3B08: .4byte 0x00000574 - thumb_func_end sub_080C3A70 + thumb_func_end TrainerCard_PrintPokemonIconsOnCard thumb_func_start sub_080C3B0C sub_080C3B0C: @ 0x080C3B0C @@ -402584,7 +402584,7 @@ _080C3B84: adds r0, r0, r1 movs r1, #0x50 movs r2, #0xc0 - bl sub_080A1200 + bl LoadPalette movs r4, #0 _080C3B96: ldr r0, _080C3BD8 @@ -402677,7 +402677,7 @@ _080C3C0C: str r0, [sp, #0xc] movs r0, #3 movs r3, #2 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer _080C3C4E: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -402701,19 +402701,19 @@ sub_080C3C6C: @ 0x080C3C6C ldr r0, _080C3CB0 movs r1, #0xb0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C3CB4 movs r1, #0xc0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C3CB8 movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C3CBC movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C3CC0 ldr r1, [r0] ldr r0, _080C3CC4 @@ -402741,17 +402741,17 @@ sub_080C3CC8: @ 0x080C3CC8 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 thumb_func_end sub_080C3CC8 - thumb_func_start sub_080C3CE4 -sub_080C3CE4: @ 0x080C3CE4 + thumb_func_start SetCardBgsAndPals +SetCardBgsAndPals: @ 0x080C3CE4 push {r4, lr} sub sp, #8 ldr r0, _080C3D00 @@ -402819,11 +402819,11 @@ _080C3D54: ldr r0, [r0] movs r1, #0 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C3DAC movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, [r4] movs r1, #0xa4 lsls r1, r1, #3 @@ -402834,7 +402834,7 @@ _080C3D54: ldr r0, _080C3DB0 movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _080C3DEC .align 2, 0 _080C3D9C: .4byte gUnknown_2039988 @@ -402853,11 +402853,11 @@ _080C3DB4: ldr r0, [r0] movs r1, #0 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C3E00 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, [r4] movs r1, #0xa4 lsls r1, r1, #3 @@ -402868,12 +402868,12 @@ _080C3DB4: ldr r0, _080C3E04 movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _080C3DEC: ldr r0, _080C3E08 movs r1, #0x40 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _080C3E6A .align 2, 0 _080C3DF8: .4byte gUnknown_8546758 @@ -402887,12 +402887,12 @@ _080C3E0C: ldr r3, _080C3E2C adds r1, r1, r3 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _080C3E30 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer b _080C3E6A .align 2, 0 _080C3E28: .4byte gUnknown_2039988 @@ -402938,7 +402938,7 @@ _080C3E76: bx r1 .align 2, 0 _080C3E80: .4byte gUnknown_2039988 - thumb_func_end sub_080C3CE4 + thumb_func_end SetCardBgsAndPals thumb_func_start sub_080C3E84 sub_080C3E84: @ 0x080C3E84 @@ -402994,7 +402994,7 @@ _080C3ECC: cmp r0, #0x13 ble _080C3E92 movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -403055,15 +403055,15 @@ _080C3F3C: cmp r0, #0x13 ble _080C3F02 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080C3EF4 - thumb_func_start sub_080C3F64 -sub_080C3F64: @ 0x080C3F64 + thumb_func_start TrainerCard_PrintStarsAndBadgesOnCard +TrainerCard_PrintStarsAndBadgesOnCard: @ 0x080C3F64 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -403185,7 +403185,7 @@ _080C4034: ble _080C3FB2 _080C4058: movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -403199,7 +403199,7 @@ _080C4070: .4byte gUnknown_85467E0 _080C4074: .4byte gUnknown_2039988 _080C4078: .4byte 0x00000517 _080C407C: .4byte 0x00000521 - thumb_func_end sub_080C3F64 + thumb_func_end TrainerCard_PrintStarsAndBadgesOnCard thumb_func_start sub_080C4080 sub_080C4080: @ 0x080C4080 @@ -403374,7 +403374,7 @@ _080C4196: bl FillBgTilemapBufferRect _080C41EA: movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -403416,8 +403416,8 @@ _080C4230: .4byte gUnknown_2039988 _080C4234: .4byte 0x00000515 thumb_func_end sub_080C41FC - thumb_func_start sub_080C4238 -sub_080C4238: @ 0x080C4238 + thumb_func_start GetTrainerCardStars +GetTrainerCardStars: @ 0x080C4238 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080C4248 @@ -403428,7 +403428,7 @@ sub_080C4238: @ 0x080C4238 bx lr .align 2, 0 _080C4248: .4byte gUnknown_20397F8 - thumb_func_end sub_080C4238 + thumb_func_end GetTrainerCardStars thumb_func_start sub_080C424C sub_080C424C: @ 0x080C424C @@ -403436,17 +403436,17 @@ sub_080C424C: @ 0x080C424C ldr r4, _080C426C adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 ldr r0, _080C4270 - bl sub_080006FC + bl SetHBlankCallback pop {r4} pop {r0} bx r0 .align 2, 0 -_080C426C: .4byte sub_080C4294 +_080C426C: .4byte Phase2Task_GridSquares _080C4270: .4byte HblankCb_TrainerCard thumb_func_end sub_080C424C @@ -403454,7 +403454,7 @@ _080C4270: .4byte HblankCb_TrainerCard sub_080C4274: @ 0x080C4274 push {lr} ldr r0, _080C4288 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -403462,7 +403462,7 @@ sub_080C4274: @ 0x080C4274 movs r0, #0 b _080C428E .align 2, 0 -_080C4288: .4byte sub_080C4294 +_080C4288: .4byte Phase2Task_GridSquares _080C428C: movs r0, #1 _080C428E: @@ -403471,8 +403471,8 @@ _080C428E: .align 2, 0 thumb_func_end sub_080C4274 - thumb_func_start sub_080C4294 -sub_080C4294: @ 0x080C4294 + thumb_func_start Phase2Task_GridSquares +Phase2Task_GridSquares: @ 0x080C4294 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -403499,18 +403499,18 @@ _080C42A6: .align 2, 0 _080C42C4: .4byte gUnknown_8546788 _080C42C8: .4byte gUnknown_3005B60 - thumb_func_end sub_080C4294 + thumb_func_end Phase2Task_GridSquares thumb_func_start sub_080C42CC sub_080C42CC: @ 0x080C42CC push {r4, lr} adds r4, r0, #0 movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C - bl sub_080B9710 - bl sub_080B9750 + bl HideBg + bl ScanlineEffect_Stop + bl ScanlineEffect_Clear movs r1, #0 ldr r0, _080C4308 movs r2, #0 @@ -403727,7 +403727,7 @@ _080C4470: @ jump table _080C4484: movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -403742,7 +403742,7 @@ _080C44A0: ldrb r0, [r0, #8] cmp r0, #0 bne _080C44B4 - bl sub_080C2AE0 + bl PrintStringsOnCardPage2 lsls r0, r0, #0x18 cmp r0, #0 bne _080C452A @@ -403783,7 +403783,7 @@ _080C44F4: .4byte gUnknown_2039988 _080C44F8: movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer b _080C452A _080C4502: ldr r0, _080C4514 @@ -403848,7 +403848,7 @@ sub_080C4550: @ 0x080C4550 ldr r1, _080C45B4 adds r0, r0, r1 bl sub_080C3EF4 - bl sub_080C3F64 + bl TrainerCard_PrintStarsAndBadgesOnCard _080C4582: movs r0, #1 bl sub_080C3CC8 @@ -404031,26 +404031,26 @@ _080C46DC: .4byte 0xFFFF0000 _080C46E0: .4byte gUnknown_20388C8 thumb_func_end sub_080C45B8 - thumb_func_start sub_080C46E4 -sub_080C46E4: @ 0x080C46E4 + thumb_func_start ResetGpuRegs +ResetGpuRegs: @ 0x080C46E4 push {lr} movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback ldr r0, _080C470C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 .align 2, 0 -_080C470C: .4byte sub_080C4294 - thumb_func_end sub_080C46E4 +_080C470C: .4byte Phase2Task_GridSquares + thumb_func_end ResetGpuRegs thumb_func_start sub_080C4710 sub_080C4710: @ 0x080C4710 @@ -404058,7 +404058,7 @@ sub_080C4710: @ 0x080C4710 adds r5, r0, #0 ldr r4, _080C4738 ldr r0, _080C473C - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 str r1, [r4] ldr r2, _080C4740 @@ -404076,7 +404076,7 @@ sub_080C4710: @ 0x080C4710 _080C4738: .4byte gUnknown_2039988 _080C473C: .4byte 0x00007C98 _080C4740: .4byte 0x0000051C -_080C4744: .4byte sub_080C5164 +_080C4744: .4byte CB2_ReshowFrontierPass _080C4748: .4byte 0x00007FFF _080C474C: movs r2, #0xa3 @@ -404106,19 +404106,19 @@ _080C4776: movs r1, #0xa4 lsls r1, r1, #3 adds r0, r0, r1 - bl sub_080C2650 + bl TrainerCard_GenerateCardForLinkPlayer ldr r0, _080C4794 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080C4790: .4byte gUnknown_2039988 -_080C4794: .4byte sub_080C22B4 +_080C4794: .4byte CB2_InitTrainerCard thumb_func_end sub_080C4710 - thumb_func_start sub_080C4798 -sub_080C4798: @ 0x080C4798 + thumb_func_start ShowTrainerCardInLink +ShowTrainerCardInLink: @ 0x080C4798 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 @@ -404126,7 +404126,7 @@ sub_080C4798: @ 0x080C4798 lsrs r4, r4, #0x18 ldr r5, _080C47D8 ldr r0, _080C47DC - bl sub_08000BDC + bl AllocZeroed str r0, [r5] ldr r2, _080C47E0 adds r1, r0, r2 @@ -404144,7 +404144,7 @@ sub_080C4798: @ 0x080C4798 movs r2, #0x64 bl memcpy ldr r0, _080C47E8 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6} pop {r0} bx r0 @@ -404153,8 +404153,8 @@ _080C47D8: .4byte gUnknown_2039988 _080C47DC: .4byte 0x00007C98 _080C47E0: .4byte 0x0000051C _080C47E4: .4byte gUnknown_20397F8 -_080C47E8: .4byte sub_080C22B4 - thumb_func_end sub_080C4798 +_080C47E8: .4byte CB2_InitTrainerCard + thumb_func_end ShowTrainerCardInLink thumb_func_start sub_080C47EC sub_080C47EC: @ 0x080C47EC @@ -404176,7 +404176,7 @@ sub_080C47EC: @ 0x080C47EC ldr r2, _080C4850 adds r0, r0, r2 strb r1, [r0] - bl sub_080C4858 + bl GetSetCardType ldr r1, [r4] ldr r3, _080C4854 adds r1, r1, r3 @@ -404193,7 +404193,7 @@ _080C481E: adds r1, r1, r3 adds r1, r1, r2 ldrh r1, [r1] - bl sub_0811F180 + bl CopyEasyChatWord adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -404209,8 +404209,8 @@ _080C4850: .4byte 0x00000514 _080C4854: .4byte 0x00000516 thumb_func_end sub_080C47EC - thumb_func_start sub_080C4858 -sub_080C4858: @ 0x080C4858 + thumb_func_start GetSetCardType +GetSetCardType: @ 0x080C4858 push {lr} ldr r0, _080C4874 ldr r1, [r0] @@ -404274,7 +404274,7 @@ _080C48C6: bx r1 .align 2, 0 _080C48CC: .4byte 0x00000517 - thumb_func_end sub_080C4858 + thumb_func_end GetSetCardType thumb_func_start VersionToCardType VersionToCardType: @ 0x080C48D0 @@ -404402,8 +404402,8 @@ _080C49C4: .4byte gUnknown_8546778 _080C49C8: .4byte 0x00000517 thumb_func_end sub_080C48F4 - thumb_func_start sub_080C49CC -sub_080C49CC: @ 0x080C49CC + thumb_func_start ResetGpuRegsAndBgs +ResetGpuRegsAndBgs: @ 0x080C49CC push {lr} sub sp, #8 movs r0, #0 @@ -404424,35 +404424,35 @@ sub_080C49CC: @ 0x080C49CC movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -404501,36 +404501,36 @@ sub_080C49CC: @ 0x080C49CC .align 2, 0 _080C4AB8: .4byte 0x0100C000 _080C4ABC: .4byte 0x05000100 - thumb_func_end sub_080C49CC + thumb_func_end ResetGpuRegsAndBgs - thumb_func_start sub_080C4AC0 -sub_080C4AC0: @ 0x080C4AC0 + thumb_func_start ShowFrontierPass +ShowFrontierPass: @ 0x080C4AC0 push {lr} - bl sub_080C4AEC + bl AllocateFrontierPassData ldr r0, _080C4AD0 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080C4AD0: .4byte sub_080C4D48 - thumb_func_end sub_080C4AC0 +_080C4AD0: .4byte CB2_InitFrontierPass + thumb_func_end ShowFrontierPass - thumb_func_start sub_080C4AD4 -sub_080C4AD4: @ 0x080C4AD4 + thumb_func_start LeaveFrontierPass +LeaveFrontierPass: @ 0x080C4AD4 push {lr} ldr r0, _080C4AE8 ldr r0, [r0] ldr r0, [r0] - bl sub_08000540 - bl sub_080C4BE0 + bl SetMainCallback2 + bl FreeFrontierPassData pop {r0} bx r0 .align 2, 0 _080C4AE8: .4byte gUnknown_203998C - thumb_func_end sub_080C4AD4 + thumb_func_end LeaveFrontierPass - thumb_func_start sub_080C4AEC -sub_080C4AEC: @ 0x080C4AEC + thumb_func_start AllocateFrontierPassData +AllocateFrontierPassData: @ 0x080C4AEC push {r4, r5, r6, lr} adds r4, r0, #0 ldr r5, _080C4AFC @@ -404543,7 +404543,7 @@ sub_080C4AEC: @ 0x080C4AEC _080C4AFC: .4byte gUnknown_203998C _080C4B00: movs r0, #0x18 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] cmp r0, #0 bne _080C4B10 @@ -404580,7 +404580,7 @@ _080C4B3C: adds r0, r0, r2 ldrh r0, [r0] strh r0, [r1, #6] - bl sub_081850F0 + bl CanCopyRecordedBattleSaveData ldr r3, [r5] movs r1, #1 ands r0, r1 @@ -404596,7 +404596,7 @@ _080C4B3C: rsbs r0, r0, #0 ands r0, r1 strb r0, [r2, #0xe] - bl sub_080C2470 + bl CountPlayerTrainerStars ldr r3, [r5] lsls r0, r0, #4 ldrb r2, [r3, #0xe] @@ -404650,10 +404650,10 @@ _080C4BD0: .4byte gUnknown_3005AF0 _080C4BD4: .4byte 0x00000EB8 _080C4BD8: .4byte 0x000008C4 _080C4BDC: .4byte 0x000008C5 - thumb_func_end sub_080C4AEC + thumb_func_end AllocateFrontierPassData - thumb_func_start sub_080C4BE0 -sub_080C4BE0: @ 0x080C4BE0 + thumb_func_start FreeFrontierPassData +FreeFrontierPassData: @ 0x080C4BE0 push {r4, lr} ldr r4, _080C4C00 ldr r0, [r4] @@ -404663,7 +404663,7 @@ sub_080C4BE0: @ 0x080C4BE0 movs r2, #0x18 bl memset ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] b _080C4C06 @@ -404675,10 +404675,10 @@ _080C4C06: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080C4BE0 + thumb_func_end FreeFrontierPassData - thumb_func_start sub_080C4C0C -sub_080C4C0C: @ 0x080C4C0C + thumb_func_start AllocateFrontierPassGfx +AllocateFrontierPassGfx: @ 0x080C4C0C push {r4, lr} ldr r4, _080C4C1C ldr r0, [r4] @@ -404690,7 +404690,7 @@ sub_080C4C0C: @ 0x080C4C0C _080C4C1C: .4byte gUnknown_2039990 _080C4C20: ldr r0, _080C4C30 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] cmp r0, #0 beq _080C4C34 @@ -404704,12 +404704,12 @@ _080C4C36: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080C4C0C + thumb_func_end AllocateFrontierPassGfx - thumb_func_start sub_080C4C3C -sub_080C4C3C: @ 0x080C4C3C + thumb_func_start FreeFrontierPassGfx +FreeFrontierPassGfx: @ 0x080C4C3C push {r4, lr} - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r4, _080C4C50 ldr r0, [r4] cmp r0, #0 @@ -404722,7 +404722,7 @@ _080C4C54: ldr r0, [r0, #0x28] cmp r0, #0 beq _080C4C64 - bl sub_08000BF0 + bl Free ldr r1, [r4] movs r0, #0 str r0, [r1, #0x28] @@ -404731,7 +404731,7 @@ _080C4C64: ldr r0, [r0, #0x24] cmp r0, #0 beq _080C4C76 - bl sub_08000BF0 + bl Free ldr r1, [r4] movs r0, #0 str r0, [r1, #0x24] @@ -404740,7 +404740,7 @@ _080C4C76: ldr r0, [r0, #0x20] cmp r0, #0 beq _080C4C88 - bl sub_08000BF0 + bl Free ldr r1, [r4] movs r0, #0 str r0, [r1, #0x20] @@ -404750,7 +404750,7 @@ _080C4C88: movs r1, #0 bl memset ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _080C4C9C: @@ -404759,10 +404759,10 @@ _080C4C9C: bx r1 .align 2, 0 _080C4CA4: .4byte 0x00002434 - thumb_func_end sub_080C4C3C + thumb_func_end FreeFrontierPassGfx - thumb_func_start sub_080C4CA8 -sub_080C4CA8: @ 0x080C4CA8 + thumb_func_start VblankCb_FrontierPass +VblankCb_FrontierPass: @ 0x080C4CA8 push {r4, r5, r6, r7, lr} sub sp, #0x10 ldr r0, _080C4D28 @@ -404814,10 +404814,10 @@ sub_080C4CA8: @ 0x080C4CA8 movs r0, #0 str r0, [sp, #0xc] movs r0, #2 - bl sub_0800200C + bl SetBgAffine _080C4D12: - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer add sp, #0x10 pop {r4, r5, r6, r7} @@ -404827,53 +404827,53 @@ _080C4D12: _080C4D28: .4byte gUnknown_2039990 _080C4D2C: .4byte gUnknown_854AF04 _080C4D30: .4byte gUnknown_203998C - thumb_func_end sub_080C4CA8 + thumb_func_end VblankCb_FrontierPass - thumb_func_start sub_080C4D34 -sub_080C4D34: @ 0x080C4D34 + thumb_func_start CB2_FrontierPass +CB2_FrontierPass: @ 0x080C4D34 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C4D34 + thumb_func_end CB2_FrontierPass - thumb_func_start sub_080C4D48 -sub_080C4D48: @ 0x080C4D48 + thumb_func_start CB2_InitFrontierPass +CB2_InitFrontierPass: @ 0x080C4D48 push {lr} - bl sub_080C4D80 + bl InitFrontierPass cmp r0, #0 beq _080C4D60 ldr r0, _080C4D64 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _080C4D68 - bl sub_08000540 + bl SetMainCallback2 _080C4D60: pop {r0} bx r0 .align 2, 0 -_080C4D64: .4byte sub_080C5344 -_080C4D68: .4byte sub_080C4D34 - thumb_func_end sub_080C4D48 +_080C4D64: .4byte Task_HandleFrontierPassInput +_080C4D68: .4byte CB2_FrontierPass + thumb_func_end CB2_InitFrontierPass - thumb_func_start sub_080C4D6C -sub_080C4D6C: @ 0x080C4D6C + thumb_func_start CB2_HideFrontierPass +CB2_HideFrontierPass: @ 0x080C4D6C push {lr} - bl sub_080C5008 + bl HideFrontierPass cmp r0, #0 beq _080C4D7A - bl sub_080C4AD4 + bl LeaveFrontierPass _080C4D7A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C4D6C + thumb_func_end CB2_HideFrontierPass - thumb_func_start sub_080C4D80 -sub_080C4D80: @ 0x080C4D80 + thumb_func_start InitFrontierPass +InitFrontierPass: @ 0x080C4D80 push {r4, r5, lr} sub sp, #0xc movs r0, #0 @@ -404907,24 +404907,24 @@ _080C4DA8: @ jump table .4byte _080C4FCC @ case 10 _080C4DD4: movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 - bl sub_08121E58 + bl SetVBlankCallback + bl ScanlineEffect_Stop + bl SetVBlankHBlankCallbacksToNull movs r0, #2 bl DisableInterrupts b _080C4FF0 _080C4DEA: - bl sub_080C49CC + bl ResetGpuRegsAndBgs b _080C4FF0 _080C4DF0: - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes bl ResetPaletteFade bl reset_temp_tile_data_buffers b _080C4FF0 _080C4E06: - bl sub_080C4C0C + bl AllocateFrontierPassGfx b _080C4FF0 _080C4E0C: movs r0, #0 @@ -404937,21 +404937,21 @@ _080C4E0C: ldr r1, [r4] adds r1, #0x32 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _080C4E54 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _080C4E58 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #2 movs r1, #6 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute b _080C4FF0 .align 2, 0 _080C4E4C: .4byte gUnknown_854AF0C @@ -404960,7 +404960,7 @@ _080C4E54: .4byte 0x00001032 _080C4E58: .4byte 0x00002032 _080C4E5C: ldr r0, _080C4E68 - bl sub_08003090 + bl InitWindows bl sub_08004480 b _080C4FF0 .align 2, 0 @@ -404968,18 +404968,18 @@ _080C4E68: .4byte gUnknown_854AF24 _080C4E6C: ldr r0, _080C4EB4 add r1, sp, #8 - bl sub_08199858 + bl malloc_and_decompress ldr r4, _080C4EB8 ldr r1, [r4] str r0, [r1, #0x20] ldr r0, _080C4EBC add r1, sp, #8 - bl sub_08199858 + bl malloc_and_decompress ldr r1, [r4] str r0, [r1, #0x24] ldr r0, _080C4EC0 add r1, sp, #8 - bl sub_08199858 + bl malloc_and_decompress ldr r1, [r4] str r0, [r1, #0x28] ldr r1, _080C4EC4 @@ -404988,13 +404988,13 @@ _080C4E6C: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _080C4EC8 str r4, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _080C4FF0 .align 2, 0 _080C4EB4: .4byte gUnknown_854AE1C @@ -405004,7 +405004,7 @@ _080C4EC0: .4byte gUnknown_8549DE8 _080C4EC4: .4byte gUnknown_85469A4 _080C4EC8: .4byte gUnknown_8549E20 _080C4ECC: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _080C4ED8 @@ -405034,11 +405034,11 @@ _080C4ED8: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080C4FF0 _080C4F20: ldr r4, _080C4F78 @@ -405046,7 +405046,7 @@ _080C4F20: lsls r2, r2, #1 adds r0, r4, #0 movs r1, #0 - bl sub_080A1200 + bl LoadPalette ldr r5, _080C4F7C ldr r0, [r5] ldrb r0, [r0, #0xe] @@ -405056,12 +405056,12 @@ _080C4F20: adds r0, r0, r4 movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 - bl sub_080985A0 + bl stdpal_get movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_080C5B88 ldr r1, [r5] ldrb r0, [r1, #0xc] @@ -405089,34 +405089,34 @@ _080C4F80: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 - bl sub_080C5BC8 + bl ShowBg + bl LoadCursorAndSymbolSprites ldr r0, _080C4FC8 - bl sub_080006F0 + bl SetVBlankCallback movs r4, #1 rsbs r4, r4, #0 adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _080C4FF0 .align 2, 0 -_080C4FC8: .4byte sub_080C4CA8 +_080C4FC8: .4byte VblankCb_FrontierPass _080C4FCC: - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -405143,10 +405143,10 @@ _080C4FFC: bx r1 .align 2, 0 _080C5004: .4byte gUnknown_203998C - thumb_func_end sub_080C4D80 + thumb_func_end InitFrontierPass - thumb_func_start sub_080C5008 -sub_080C5008: @ 0x080C5008 + thumb_func_start HideFrontierPass +HideFrontierPass: @ 0x080C5008 push {lr} sub sp, #4 ldr r1, _080C5024 @@ -405185,14 +405185,14 @@ _080C5044: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _080C50E0 _080C5066: ldr r1, [r2] movs r0, #2 b _080C50E8 _080C506C: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 beq _080C50E0 @@ -405202,33 +405202,33 @@ _080C5078: movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 - bl sub_08121E58 + bl SetVBlankCallback + bl ScanlineEffect_Stop + bl SetVBlankHBlankCallbacksToNull b _080C50E0 _080C50A2: - bl sub_080C5CE8 + bl FreeCursorAndSymbolSprites b _080C50E0 _080C50A8: - bl sub_080C49CC - bl sub_080A8818 + bl ResetGpuRegsAndBgs + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes b _080C50E0 _080C50BA: movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #2 - bl sub_08002160 - bl sub_080C4C3C + bl UnsetBgTilemapBuffer + bl FreeFrontierPassGfx ldr r0, _080C50DC ldr r1, [r0] movs r0, #0 @@ -405252,10 +405252,10 @@ _080C50EC: bx r1 .align 2, 0 _080C50F4: .4byte gUnknown_203998C - thumb_func_end sub_080C5008 + thumb_func_end HideFrontierPass - thumb_func_start sub_080C50F8 -sub_080C50F8: @ 0x080C50F8 + thumb_func_start GetCursorAreaFromCoords +GetCursorAreaFromCoords: @ 0x080C50F8 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -405313,12 +405313,12 @@ _080C515C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080C50F8 + thumb_func_end GetCursorAreaFromCoords - thumb_func_start sub_080C5164 -sub_080C5164: @ 0x080C5164 + thumb_func_start CB2_ReshowFrontierPass +CB2_ReshowFrontierPass: @ 0x080C5164 push {lr} - bl sub_080C4D80 + bl InitFrontierPass cmp r0, #0 beq _080C51C2 ldr r1, _080C519C @@ -405332,7 +405332,7 @@ sub_080C5164: @ 0x080C5164 bgt _080C51A8 ldr r0, _080C51A0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080C51A4 @@ -405345,7 +405345,7 @@ sub_080C5164: @ 0x080C5164 b _080C51BC .align 2, 0 _080C519C: .4byte gUnknown_203998C -_080C51A0: .4byte sub_080C54D4 +_080C51A0: .4byte DrawMultichoiceMenu _080C51A4: .4byte gUnknown_3005B60 _080C51A8: ldr r2, [r1] @@ -405356,24 +405356,24 @@ _080C51A8: strb r0, [r2, #0xe] ldr r0, _080C51C8 movs r1, #0 - bl sub_080A8878 + bl CreateTask _080C51BC: ldr r0, _080C51CC - bl sub_08000540 + bl SetMainCallback2 _080C51C2: pop {r0} bx r0 .align 2, 0 -_080C51C8: .4byte sub_080C5344 -_080C51CC: .4byte sub_080C4D34 - thumb_func_end sub_080C5164 +_080C51C8: .4byte Task_HandleFrontierPassInput +_080C51CC: .4byte CB2_FrontierPass + thumb_func_end CB2_ReshowFrontierPass - thumb_func_start sub_080C51D0 -sub_080C51D0: @ 0x080C51D0 + thumb_func_start CB2_ReturnFromRecord +CB2_ReturnFromRecord: @ 0x080C51D0 push {r4, lr} ldr r4, _080C5208 ldr r0, [r4] - bl sub_080C4AEC + bl AllocateFrontierPassData ldr r0, _080C520C ldr r1, [r0] ldrh r0, [r4, #4] @@ -405384,14 +405384,14 @@ sub_080C51D0: @ 0x080C51D0 movs r1, #0 movs r2, #8 bl memset - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080C5210 cmp r0, #2 beq _080C5218 - bl sub_080850EC + bl Overworld_PlaySpecialMapMusic b _080C5220 .align 2, 0 _080C5208: .4byte gUnknown_2039998 @@ -405405,21 +405405,21 @@ _080C5218: movs r0, #0xe7 lsls r0, r0, #1 _080C521C: - bl sub_080A3040 + bl PlayBGM _080C5220: ldr r0, _080C522C - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_080C522C: .4byte sub_080C5164 - thumb_func_end sub_080C51D0 +_080C522C: .4byte CB2_ReshowFrontierPass + thumb_func_end CB2_ReturnFromRecord - thumb_func_start sub_080C5230 -sub_080C5230: @ 0x080C5230 + thumb_func_start CB2_ShowFrontierPassFeature +CB2_ShowFrontierPassFeature: @ 0x080C5230 push {lr} - bl sub_080C5008 + bl HideFrontierPass cmp r0, #0 beq _080C5296 ldr r0, _080C5254 @@ -405442,10 +405442,10 @@ _080C5258: b _080C5296 _080C525E: ldr r0, _080C5268 - bl sub_080C5D40 + bl ShowFrontierMap b _080C5296 .align 2, 0 -_080C5268: .4byte sub_080C5164 +_080C5268: .4byte CB2_ReshowFrontierPass _080C526C: ldr r1, _080C5288 ldr r0, [r2] @@ -405454,13 +405454,13 @@ _080C526C: strh r0, [r1, #4] ldrh r0, [r2, #0xa] strh r0, [r1, #6] - bl sub_080C4BE0 + bl FreeFrontierPassData ldr r0, _080C528C - bl sub_08185B7C + bl PlayRecordedBattle b _080C5296 .align 2, 0 _080C5288: .4byte gUnknown_2039998 -_080C528C: .4byte sub_080C51D0 +_080C528C: .4byte CB2_ReturnFromRecord _080C5290: ldr r0, _080C529C bl sub_080C4710 @@ -405468,11 +405468,11 @@ _080C5296: pop {r0} bx r0 .align 2, 0 -_080C529C: .4byte sub_080C5164 - thumb_func_end sub_080C5230 +_080C529C: .4byte CB2_ReshowFrontierPass + thumb_func_end CB2_ShowFrontierPassFeature - thumb_func_start sub_080C52A0 -sub_080C52A0: @ 0x080C52A0 + thumb_func_start TryCallPassAreaFunction +TryCallPassAreaFunction: @ 0x080C52A0 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -405506,12 +405506,12 @@ _080C52D0: orrs r0, r1 strb r0, [r2, #0xe] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080C52EC - bl sub_08000540 + bl SetMainCallback2 b _080C5316 .align 2, 0 -_080C52EC: .4byte sub_080C5230 +_080C52EC: .4byte CB2_ShowFrontierPassFeature _080C52F0: ldr r0, _080C5334 ldr r3, [r0] @@ -405551,12 +405551,12 @@ _080C532C: .align 2, 0 _080C5334: .4byte gUnknown_203998C _080C5338: .4byte gUnknown_3005B60 -_080C533C: .4byte sub_080C54D4 +_080C533C: .4byte DrawMultichoiceMenu _080C5340: .4byte gUnknown_2039990 - thumb_func_end sub_080C52A0 + thumb_func_end TryCallPassAreaFunction - thumb_func_start sub_080C5344 -sub_080C5344: @ 0x080C5344 + thumb_func_start Task_HandleFrontierPassInput +Task_HandleFrontierPassInput: @ 0x080C5344 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -405681,7 +405681,7 @@ _080C5406: ldr r0, [r4] ldrb r1, [r0, #0xc] adds r0, r6, #0 - bl sub_080C52A0 + bl TryCallPassAreaFunction cmp r0, #0 bne _080C54C6 b _080C545A @@ -405695,9 +405695,9 @@ _080C5444: movs r0, #3 bl sub_080A306C ldr r0, _080C547C - bl sub_08000540 + bl SetMainCallback2 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080C545A: ldr r0, _080C5480 ldrh r1, [r0, #0x2e] @@ -405708,12 +405708,12 @@ _080C545A: movs r0, #3 bl sub_080A306C ldr r0, _080C547C - bl sub_08000540 + bl SetMainCallback2 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask b _080C54C6 .align 2, 0 -_080C547C: .4byte sub_080C4D6C +_080C547C: .4byte CB2_HideFrontierPass _080C5480: .4byte gUnknown_3002360 _080C5484: ldr r0, _080C54CC @@ -405727,7 +405727,7 @@ _080C5484: adds r1, #5 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_080C50F8 + bl GetCursorAreaFromCoords lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _080C54D0 @@ -405736,7 +405736,7 @@ _080C5484: cmp r0, r5 beq _080C54C6 adds r0, r5, #0 - bl sub_080C57BC + bl PrintAreaDescription ldr r1, [r4] ldrb r0, [r1, #0xc] strb r0, [r1, #0xd] @@ -405753,10 +405753,10 @@ _080C54C6: .align 2, 0 _080C54CC: .4byte gUnknown_2039990 _080C54D0: .4byte gUnknown_203998C - thumb_func_end sub_080C5344 + thumb_func_end Task_HandleFrontierPassInput - thumb_func_start sub_080C54D4 -sub_080C54D4: @ 0x080C54D4 + thumb_func_start DrawMultichoiceMenu +DrawMultichoiceMenu: @ 0x080C54D4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -405811,7 +405811,7 @@ _080C5510: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _080C55A0 .align 2, 0 _080C5544: .4byte 0x00007FFF @@ -405831,27 +405831,27 @@ _080C5548: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 - bl sub_080C5BC8 + bl ShowBg + bl LoadCursorAndSymbolSprites ldr r0, _080C55C4 - bl sub_080006F0 + bl SetVBlankCallback movs r5, #1 rsbs r5, r5, #0 ldr r4, _080C55C8 adds r0, r5, #0 movs r1, #0x10 adds r2, r4, #0 - bl sub_080A22E8 + bl BlendPalettes str r4, [sp] adds r0, r5, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _080C55A0: ldr r4, _080C55CC ldr r0, [r4] @@ -405870,11 +405870,11 @@ _080C55A0: strh r0, [r1, #0x30] b _080C5698 .align 2, 0 -_080C55C4: .4byte sub_080C4CA8 +_080C55C4: .4byte VblankCb_FrontierPass _080C55C8: .4byte 0x00007FFF _080C55CC: .4byte gUnknown_2039990 _080C55D0: - bl sub_080A12E4 + bl UpdatePaletteFade ldrh r0, [r6, #6] ldrh r1, [r6, #2] adds r0, r0, r1 @@ -405926,7 +405926,7 @@ _080C5626: movs r0, #0 strb r0, [r1] _080C5638: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080C56A2 @@ -405935,13 +405935,13 @@ _080C5638: cmp r0, #0 bne _080C5660 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080C565C - bl sub_08000540 + bl SetMainCallback2 b _080C567E .align 2, 0 _080C5658: .4byte gUnknown_2039990 -_080C565C: .4byte sub_080C5230 +_080C565C: .4byte CB2_ShowFrontierPassFeature _080C5660: movs r0, #0 movs r1, #0 @@ -405961,13 +405961,13 @@ _080C567E: movs r0, #2 movs r1, #6 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute ldr r0, _080C5694 ldr r1, [r0] movs r0, #0 b _080C56A0 .align 2, 0 -_080C5690: .4byte sub_080C5344 +_080C5690: .4byte Task_HandleFrontierPassInput _080C5694: .4byte gUnknown_203998C _080C5698: ldr r0, _080C56B0 @@ -405985,10 +405985,10 @@ _080C56A2: bx r0 .align 2, 0 _080C56B0: .4byte gUnknown_203998C - thumb_func_end sub_080C54D4 + thumb_func_end DrawMultichoiceMenu - thumb_func_start sub_080C56B4 -sub_080C56B4: @ 0x080C56B4 + thumb_func_start Task_Truck3 +Task_Truck3: @ 0x080C56B4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -405996,10 +405996,10 @@ sub_080C56B4: @ 0x080C56B4 movs r4, #0 _080C56BE: adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -406016,7 +406016,7 @@ _080C56BE: movs r1, #1 movs r2, #8 movs r3, #6 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r6, [sp] mov r1, r8 str r1, [sp, #4] @@ -406026,7 +406026,7 @@ _080C56BE: movs r1, #1 movs r2, #0xe movs r3, #6 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r6, [sp] mov r0, r8 str r0, [sp, #4] @@ -406036,7 +406036,7 @@ _080C56BE: movs r1, #0 movs r2, #8 movs r3, #3 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r4, _080C57B4 ldr r5, _080C57B8 ldr r0, [r5] @@ -406061,7 +406061,7 @@ _080C56BE: movs r0, #2 movs r1, #0 movs r3, #0xf - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r1, [r5] ldrh r0, [r1, #8] subs r0, #5 @@ -406071,7 +406071,7 @@ _080C56BE: adds r1, #5 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_080C50F8 + bl GetCursorAreaFromCoords ldr r1, [r5] strb r0, [r1, #0xc] ldr r0, [r5] @@ -406079,19 +406079,19 @@ _080C56BE: strb r1, [r0, #0xd] ldr r0, [r5] ldrb r0, [r0, #0xc] - bl sub_080C57BC + bl PrintAreaDescription movs r4, #0 _080C577E: adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #4 bls _080C577E movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r3} mov r8, r3 @@ -406105,17 +406105,17 @@ _080C57AC: .4byte gUnknown_85CCA9E _080C57B0: .4byte gUnknown_85CCAA8 _080C57B4: .4byte gUnknown_2021C7C _080C57B8: .4byte gUnknown_203998C - thumb_func_end sub_080C56B4 + thumb_func_end Task_Truck3 - thumb_func_start sub_080C57BC -sub_080C57BC: @ 0x080C57BC + thumb_func_start PrintAreaDescription +PrintAreaDescription: @ 0x080C57BC push {r4, lr} sub sp, #0xc lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #3 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r4, #3 bne _080C5804 ldr r0, _080C57F8 @@ -406135,7 +406135,7 @@ sub_080C57BC: @ 0x080C57BC movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C5826 .align 2, 0 _080C57F8: .4byte gUnknown_203998C @@ -406157,13 +406157,13 @@ _080C5804: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C5826: movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r4} pop {r0} @@ -406171,7 +406171,7 @@ _080C5826: .align 2, 0 _080C583C: .4byte gUnknown_854AF6F _080C5840: .4byte gUnknown_854B138 - thumb_func_end sub_080C57BC + thumb_func_end PrintAreaDescription thumb_func_start sub_080C5844 sub_080C5844: @ 0x080C5844 @@ -406261,7 +406261,7 @@ _080C58D8: bl FillBgTilemapBufferRect _080C58F0: movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram cmp r7, #0 beq _080C5970 movs r4, #0xfe @@ -406314,7 +406314,7 @@ _080C58F0: movs r0, #0 str r0, [sp, #0xc] movs r0, #2 - bl sub_0800200C + bl SetBgAffine b _080C59DA .align 2, 0 _080C5968: .4byte gUnknown_854AF04 @@ -406369,7 +406369,7 @@ _080C5970: str r0, [sp, #8] str r7, [sp, #0xc] movs r0, #2 - bl sub_0800200C + bl SetBgAffine _080C59DA: add sp, #0x10 pop {r3} @@ -406583,7 +406583,7 @@ _080C5B70: bhi _080C5B80 _080C5B7A: movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080C5B80: add sp, #0xc pop {r4, r5} @@ -406598,7 +406598,7 @@ sub_080C5B88: @ 0x080C5B88 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r4, _080C5BC4 ldr r1, [r4] ldrb r0, [r1, #0xc] @@ -406610,9 +406610,9 @@ sub_080C5B88: @ 0x080C5B88 lsrs r1, r1, #0x1d movs r0, #1 bl sub_080C5844 - bl sub_080C56B4 + bl Task_Truck3 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4} pop {r0} bx r0 @@ -406621,8 +406621,8 @@ _080C5BC0: .4byte gUnknown_8549610 _080C5BC4: .4byte gUnknown_203998C thumb_func_end sub_080C5B88 - thumb_func_start sub_080C5BC8 -sub_080C5BC8: @ 0x080C5BC8 + thumb_func_start LoadCursorAndSymbolSprites +LoadCursorAndSymbolSprites: @ 0x080C5BC8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -406635,10 +406635,10 @@ sub_080C5BC8: @ 0x080C5BC8 bl LoadSpritePalettes ldr r4, _080C5CC8 adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #0x10 adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080C5CCC ldr r1, _080C5CD0 ldr r2, [r1] @@ -406647,7 +406647,7 @@ sub_080C5BC8: @ 0x080C5BC8 movs r6, #0xa ldrsh r2, [r2, r6] movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _080C5CD4 @@ -406702,7 +406702,7 @@ _080C5C28: lsls r3, r4, #0x18 lsrs r3, r3, #0x18 mov r0, sp - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r3, sb @@ -406753,10 +406753,10 @@ _080C5CD8: .4byte gUnknown_20205AC _080C5CDC: .4byte gUnknown_854B108 _080C5CE0: .4byte 0x0000FFFF _080C5CE4: .4byte gUnknown_854AF78 - thumb_func_end sub_080C5BC8 + thumb_func_end LoadCursorAndSymbolSprites - thumb_func_start sub_080C5CE8 -sub_080C5CE8: @ 0x080C5CE8 + thumb_func_start FreeCursorAndSymbolSprites +FreeCursorAndSymbolSprites: @ 0x080C5CE8 push {r4, r5, r6, lr} movs r5, #0 ldr r4, _080C5D38 @@ -406796,7 +406796,7 @@ _080C5D18: bx r0 .align 2, 0 _080C5D38: .4byte gUnknown_2039990 - thumb_func_end sub_080C5CE8 + thumb_func_end FreeCursorAndSymbolSprites thumb_func_start sub_080C5D3C sub_080C5D3C: @ 0x080C5D3C @@ -406804,8 +406804,8 @@ sub_080C5D3C: @ 0x080C5D3C .align 2, 0 thumb_func_end sub_080C5D3C - thumb_func_start sub_080C5D40 -sub_080C5D40: @ 0x080C5D40 + thumb_func_start ShowFrontierMap +ShowFrontierMap: @ 0x080C5D40 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _080C5D74 @@ -406813,42 +406813,42 @@ sub_080C5D40: @ 0x080C5D40 cmp r0, #0 beq _080C5D52 adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 _080C5D52: ldr r0, _080C5D78 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] str r4, [r0] - bl sub_080A8818 + bl ResetTasks ldr r0, _080C5D7C movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _080C5D80 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080C5D74: .4byte gUnknown_2039994 _080C5D78: .4byte 0x00003014 -_080C5D7C: .4byte sub_080C60A8 -_080C5D80: .4byte sub_080C4D34 - thumb_func_end sub_080C5D40 +_080C5D7C: .4byte Task_HandleFrontierMap +_080C5D80: .4byte CB2_FrontierPass + thumb_func_end ShowFrontierMap - thumb_func_start sub_080C5D84 -sub_080C5D84: @ 0x080C5D84 + thumb_func_start FreeFrontierMap +FreeFrontierMap: @ 0x080C5D84 push {r4, lr} - bl sub_080A8818 + bl ResetTasks ldr r4, _080C5DB0 ldr r0, [r4] ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 ldr r0, [r4] ldr r2, _080C5DB4 movs r1, #0 bl memset ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] pop {r4} @@ -406857,10 +406857,10 @@ sub_080C5D84: @ 0x080C5D84 .align 2, 0 _080C5DB0: .4byte gUnknown_2039994 _080C5DB4: .4byte 0x00003014 - thumb_func_end sub_080C5D84 + thumb_func_end FreeFrontierMap - thumb_func_start sub_080C5DB8 -sub_080C5DB8: @ 0x080C5DB8 + thumb_func_start InitFrontierMap +InitFrontierMap: @ 0x080C5DB8 push {r4, r5, lr} sub sp, #8 ldr r0, _080C5DD4 @@ -406889,12 +406889,12 @@ _080C5DDC: @ jump table .4byte _080C5F64 @ case 7 _080C5DFC: movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 - bl sub_08121E58 + bl SetVBlankCallback + bl ScanlineEffect_Stop + bl SetVBlankHBlankCallbacksToNull b _080C5F80 _080C5E0C: - bl sub_080C49CC + bl ResetGpuRegsAndBgs b _080C5F80 _080C5E12: bl ResetSpriteData @@ -406913,17 +406913,17 @@ _080C5E24: ldr r1, [r4] adds r1, #0x12 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _080C5EA4 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _080C5EA8 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer movs r5, #0x1e str r5, [sp] movs r4, #0x14 @@ -406948,9 +406948,9 @@ _080C5E24: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080C5F04 .align 2, 0 _080C5E9C: .4byte gUnknown_854AF18 @@ -406959,22 +406959,22 @@ _080C5EA4: .4byte 0x00001012 _080C5EA8: .4byte 0x00002012 _080C5EAC: ldr r0, _080C5ECC - bl sub_08003090 + bl InitWindows bl sub_08004480 - bl sub_080C6480 + bl PrintOnFrontierMap ldr r1, _080C5ED0 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _080C5F80 .align 2, 0 _080C5ECC: .4byte gUnknown_854AF4C _080C5ED0: .4byte gUnknown_8548168 _080C5ED4: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _080C5F8A @@ -406982,20 +406982,20 @@ _080C5ED4: movs r2, #0xd0 lsls r2, r2, #1 movs r1, #0 - bl sub_080A1200 + bl LoadPalette movs r0, #0 - bl sub_080985A0 + bl stdpal_get movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _080C5F10 movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer _080C5F04: movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080C5F80 .align 2, 0 _080C5F0C: .4byte gUnknown_85467E4 @@ -407006,33 +407006,33 @@ _080C5F14: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 - bl sub_080C6260 + bl ShowBg + bl InitFrontierMapSprites ldr r0, _080C5F5C - bl sub_080006F0 + bl SetVBlankCallback movs r5, #1 rsbs r5, r5, #0 ldr r4, _080C5F60 adds r0, r5, #0 movs r1, #0x10 adds r2, r4, #0 - bl sub_080A22E8 + bl BlendPalettes str r4, [sp] adds r0, r5, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _080C5F80 .align 2, 0 -_080C5F5C: .4byte sub_080C4CA8 +_080C5F5C: .4byte VblankCb_FrontierPass _080C5F60: .4byte 0x00007FFF _080C5F64: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -407059,7 +407059,7 @@ _080C5F8C: bx r1 .align 2, 0 _080C5F94: .4byte gUnknown_203998C - thumb_func_end sub_080C5DB8 + thumb_func_end InitFrontierMap thumb_func_start sub_080C5F98 sub_080C5F98: @ 0x080C5F98 @@ -407093,12 +407093,12 @@ _080C5FD0: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _080C6090 .align 2, 0 _080C5FE4: .4byte 0x00007FFF _080C5FE8: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080C609A @@ -407106,17 +407106,17 @@ _080C5FE8: movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg b _080C6090 _080C600E: movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 - bl sub_08121E58 + bl SetVBlankCallback + bl ScanlineEffect_Stop + bl SetVBlankHBlankCallbacksToNull b _080C6090 _080C601E: ldr r4, _080C605C @@ -407144,22 +407144,22 @@ _080C6044: movs r0, #4 bl FreeSpriteTilesByTag _080C6056: - bl sub_080034D4 + bl FreeAllWindowBuffers b _080C6090 .align 2, 0 _080C605C: .4byte gUnknown_2039994 _080C6060: - bl sub_080C49CC + bl ResetGpuRegsAndBgs bl ResetSpriteData bl FreeAllSpritePalettes b _080C6090 _080C606E: movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer ldr r0, _080C608C ldr r1, [r0] movs r0, #0 @@ -407185,8 +407185,8 @@ _080C609C: _080C60A4: .4byte gUnknown_203998C thumb_func_end sub_080C5F98 - thumb_func_start sub_080C60A8 -sub_080C60A8: @ 0x080C60A8 + thumb_func_start Task_HandleFrontierMap +Task_HandleFrontierMap: @ 0x080C60A8 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -407217,7 +407217,7 @@ _080C60D4: @ jump table .4byte _080C61B0 @ case 4 .4byte _080C61BA @ case 5 _080C60EC: - bl sub_080C5DB8 + bl InitFrontierMap b _080C61B4 _080C60F2: ldr r0, _080C610C @@ -407244,7 +407244,7 @@ _080C6110: cmp r0, #5 bls _080C6130 movs r0, #0 - bl sub_080C655C + bl HandleFrontierMapCursorMove b _080C61CC .align 2, 0 _080C612C: .4byte gUnknown_2039994 @@ -407262,7 +407262,7 @@ _080C6134: cmp r0, #0 bne _080C6154 movs r0, #1 - bl sub_080C655C + bl HandleFrontierMapCursorMove b _080C61CC .align 2, 0 _080C6150: .4byte gUnknown_2039994 @@ -407275,7 +407275,7 @@ _080C6158: cmp r0, #3 ble _080C616E movs r0, #0 - bl sub_080C655C + bl HandleFrontierMapCursorMove movs r0, #0 strh r0, [r4, #2] movs r0, #1 @@ -407295,7 +407295,7 @@ _080C6180: cmp r0, #3 ble _080C6196 movs r0, #1 - bl sub_080C655C + bl HandleFrontierMapCursorMove movs r0, #0 strh r0, [r4, #2] movs r0, #1 @@ -407322,8 +407322,8 @@ _080C61B4: b _080C61CC _080C61BA: adds r0, r2, #0 - bl sub_080A8964 - bl sub_080C5D84 + bl DestroyTask + bl FreeFrontierMap b _080C61CC _080C61C6: ldrh r0, [r4] @@ -407335,7 +407335,7 @@ _080C61CC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C60A8 + thumb_func_end Task_HandleFrontierMap thumb_func_start MapNumToFrontierFacilityId MapNumToFrontierFacilityId: @ 0x080C61D4 @@ -407420,8 +407420,8 @@ _080C625A: .align 2, 0 thumb_func_end MapNumToFrontierFacilityId - thumb_func_start sub_080C6260 -sub_080C6260: @ 0x080C6260 + thumb_func_start InitFrontierMapSprites +InitFrontierMapSprites: @ 0x080C6260 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -407433,7 +407433,7 @@ sub_080C6260: @ 0x080C6260 bl LoadSpritePalettes ldr r6, _080C636C adds r0, r6, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080C6370 mov r8, r0 ldr r4, _080C6374 @@ -407444,7 +407444,7 @@ sub_080C6260: @ 0x080C6260 mov r0, r8 movs r1, #0x9b movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r0, [r4] @@ -407474,7 +407474,7 @@ sub_080C6260: @ 0x080C6260 bl StartSpriteAnim adds r6, #8 adds r0, r6, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r3, #0x18 add r8, r3 ldr r6, _080C637C @@ -407488,7 +407488,7 @@ sub_080C6260: @ 0x080C6260 ldrsh r2, [r0, r3] mov r0, r8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r1, [r4] @@ -407609,7 +407609,7 @@ _080C63DA: lsrs r4, r0, #0x10 _080C63DE: ldr r0, _080C640C - bl sub_08034388 + bl LoadCompressedSpriteSheet mov r1, sp ldr r0, _080C6410 ldm r0!, {r2, r3, r6} @@ -407647,7 +407647,7 @@ _080C642A: asrs r2, r2, #0x10 mov r0, sp movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r4, _080C6474 @@ -407684,19 +407684,19 @@ _080C6466: _080C6474: .4byte gUnknown_2039994 _080C6478: .4byte gUnknown_20205AC _080C647C: .4byte gUnknown_3005AF0 - thumb_func_end sub_080C6260 + thumb_func_end InitFrontierMapSprites - thumb_func_start sub_080C6480 -sub_080C6480: @ 0x080C6480 + thumb_func_start PrintOnFrontierMap +PrintOnFrontierMap: @ 0x080C6480 push {r4, r5, r6, lr} sub sp, #0xc movs r4, #0 _080C6486: adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -407724,7 +407724,7 @@ _080C64A4: movs r0, #1 movs r1, #1 movs r2, #4 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _080C64FA .align 2, 0 _080C64D0: .4byte gUnknown_854B174 @@ -407744,7 +407744,7 @@ _080C64DC: movs r0, #1 movs r1, #1 movs r2, #4 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080C64FA: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -407768,19 +407768,19 @@ _080C64FA: movs r1, #1 movs r2, #4 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r4, #0 _080C652C: adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 bls _080C652C movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -407790,10 +407790,10 @@ _080C654C: .4byte gUnknown_854AF6F _080C6550: .4byte gUnknown_854AF6C _080C6554: .4byte gUnknown_854B174 _080C6558: .4byte gUnknown_2039994 - thumb_func_end sub_080C6480 + thumb_func_end PrintOnFrontierMap - thumb_func_start sub_080C655C -sub_080C655C: @ 0x080C655C + thumb_func_start HandleFrontierMapCursorMove +HandleFrontierMapCursorMove: @ 0x080C655C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -407833,7 +407833,7 @@ _080C6580: movs r0, #1 movs r1, #1 movs r2, #4 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r5, _080C6660 ldr r1, [r5] ldrb r3, [r1, #0x10] @@ -407853,7 +407853,7 @@ _080C6580: movs r0, #1 movs r1, #1 movs r2, #4 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r1, [r5] ldr r2, [r1, #4] ldrb r0, [r1, #0x10] @@ -407881,7 +407881,7 @@ _080C6580: strh r0, [r2, #0x22] movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer subs r6, #3 str r6, [sp] mov r1, r8 @@ -407897,19 +407897,19 @@ _080C6580: movs r1, #1 movs r2, #4 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r4, #0 _080C6636: adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 bls _080C6636 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0x6c bl sub_080A306C add sp, #0xc @@ -407922,7 +407922,7 @@ _080C6636: _080C6660: .4byte gUnknown_2039994 _080C6664: .4byte gUnknown_854AF6F _080C6668: .4byte gUnknown_854B174 - thumb_func_end sub_080C655C + thumb_func_end HandleFrontierMapCursorMove thumb_func_start sub_080C666C sub_080C666C: @ 0x080C666C @@ -408090,7 +408090,7 @@ sub_080C6738: @ 0x080C6738 lsrs r5, r5, #0x18 lsls r5, r5, #5 mov r0, r8 - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -408099,10 +408099,10 @@ sub_080C6738: @ 0x080C6738 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 movs r1, #7 - bl sub_0800401C + bl GetWindowAttribute adds r7, r0, #0 mov r0, r8 ldrb r0, [r0, #3] @@ -408128,7 +408128,7 @@ sub_080C6738: @ 0x080C6738 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 lsrs r5, r5, #1 adds r0, r7, #0 ldr r1, [sp, #0x24] @@ -408141,7 +408141,7 @@ sub_080C6738: @ 0x080C6738 adds r2, r5, #0 bl CpuSet adds r0, r4, #0 - bl sub_08003444 + bl RemoveWindow add sp, #0x2c pop {r3, r4, r5} mov r8, r3 @@ -408155,8 +408155,8 @@ _080C6824: .4byte 0x00FFFFFF _080C6828: .4byte 0xFFFFFF00 thumb_func_end sub_080C6738 - thumb_func_start sub_080C682C -sub_080C682C: @ 0x080C682C + thumb_func_start CountMonsInBox +CountMonsInBox: @ 0x080C682C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -408167,7 +408167,7 @@ _080C6836: lsrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0xb - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 beq _080C684C adds r0, r5, #1 @@ -408184,10 +408184,10 @@ _080C684C: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080C682C + thumb_func_end CountMonsInBox - thumb_func_start sub_080C6860 -sub_080C6860: @ 0x080C6860 + thumb_func_start GetFirstFreeBoxSpot +GetFirstFreeBoxSpot: @ 0x080C6860 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -408197,7 +408197,7 @@ _080C6868: lsrs r1, r1, #0x18 adds r0, r5, #0 movs r2, #0xb - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 bne _080C687E lsls r0, r4, #0x10 @@ -408216,10 +408216,10 @@ _080C688C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080C6860 + thumb_func_end GetFirstFreeBoxSpot - thumb_func_start sub_080C6894 -sub_080C6894: @ 0x080C6894 + thumb_func_start CountPartyNonEggMons +CountPartyNonEggMons: @ 0x080C6894 push {r4, r5, r6, lr} movs r5, #0 movs r6, #0 @@ -408231,12 +408231,12 @@ _080C689A: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080C68C2 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080C68C2 adds r0, r6, #1 @@ -408255,10 +408255,10 @@ _080C68C2: bx r1 .align 2, 0 _080C68D8: .4byte gUnknown_2024190 - thumb_func_end sub_080C6894 + thumb_func_end CountPartyNonEggMons - thumb_func_start sub_080C68DC -sub_080C68DC: @ 0x080C68DC + thumb_func_start CountPartyAliveNonEggMonsExcept +CountPartyAliveNonEggMonsExcept: @ 0x080C68DC push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 movs r5, #0 @@ -408274,17 +408274,17 @@ _080C68E6: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080C691E adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080C691E adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080C691E adds r0, r6, #1 @@ -408303,24 +408303,24 @@ _080C691E: bx r1 .align 2, 0 _080C6934: .4byte gUnknown_2024190 - thumb_func_end sub_080C68DC + thumb_func_end CountPartyAliveNonEggMonsExcept - thumb_func_start sub_080C6938 -sub_080C6938: @ 0x080C6938 + thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot +CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 0x080C6938 push {lr} ldr r0, _080C694C ldrb r0, [r0] - bl sub_080C68DC + bl CountPartyAliveNonEggMonsExcept lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _080C694C: .4byte gUnknown_2037280 - thumb_func_end sub_080C6938 + thumb_func_end CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - thumb_func_start sub_080C6950 -sub_080C6950: @ 0x080C6950 + thumb_func_start CountPartyMons +CountPartyMons: @ 0x080C6950 push {r4, r5, lr} movs r4, #0 movs r5, #0 @@ -408330,7 +408330,7 @@ _080C6956: ldr r1, _080C6984 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080C696E adds r0, r5, #1 @@ -408349,10 +408349,10 @@ _080C696E: bx r1 .align 2, 0 _080C6984: .4byte gUnknown_2024190 - thumb_func_end sub_080C6950 + thumb_func_end CountPartyMons - thumb_func_start sub_080C6988 -sub_080C6988: @ 0x080C6988 + thumb_func_start StringCopyAndFillWithSpaces +StringCopyAndFillWithSpaces: @ 0x080C6988 push {r4, r5, lr} adds r5, r0, #0 lsls r4, r2, #0x10 @@ -408376,7 +408376,7 @@ _080C69A6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080C6988 + thumb_func_end StringCopyAndFillWithSpaces thumb_func_start sub_080C69B4 sub_080C69B4: @ 0x080C69B4 @@ -408548,8 +408548,8 @@ _080C6AEC: .4byte 0x040000D4 _080C6AF0: .4byte 0x81000800 thumb_func_end sub_080C6A30 - thumb_func_start sub_080C6AF4 -sub_080C6AF4: @ 0x080C6AF4 + thumb_func_start Task_PokemonStorageSystemPC +Task_PokemonStorageSystemPC: @ 0x080C6AF4 push {r4, r5, r6, r7, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -408590,7 +408590,7 @@ _080C6B38: bl sub_08196FB8 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _080C6B94 movs r2, #0xa ldrsh r0, [r5, r2] @@ -408609,15 +408609,15 @@ _080C6B38: movs r0, #0 movs r1, #1 movs r3, #0xff - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrh r0, [r5, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _080C6BA4 .align 2, 0 _080C6B94: .4byte gUnknown_854B1E4 @@ -408633,7 +408633,7 @@ _080C6BA4: strh r0, [r5, #8] b _080C6DF6 _080C6BAC: - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r5, #0xc] @@ -408698,7 +408698,7 @@ _080C6C1E: strh r2, [r5, #0xa] movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _080C6C58 movs r2, #0xa ldrsh r0, [r5, r2] @@ -408716,7 +408716,7 @@ _080C6C1E: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 b _080C6DF6 .align 2, 0 _080C6C54: .4byte gUnknown_3002360 @@ -408728,27 +408728,27 @@ _080C6C5C: movs r1, #1 bl sub_08197060 bl sub_080987E8 - bl sub_080988C4 + bl EnableBothScriptContexts ldrh r0, [r5, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _080C6DF6 _080C6C82: movs r3, #0xc ldrsh r4, [r5, r3] cmp r4, #0 bne _080C6CB4 - bl sub_080C6950 + bl CountPartyMons lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #6 bne _080C6CB4 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _080C6CB0 str r4, [sp] movs r0, #2 @@ -408765,14 +408765,14 @@ _080C6CB4: ldrsh r0, [r5, r1] cmp r0, #1 bne _080C6CE8 - bl sub_080C6950 + bl CountPartyMons lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #1 bne _080C6CE8 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _080C6CE4 movs r0, #0 str r0, [sp] @@ -408787,7 +408787,7 @@ _080C6CE4: .4byte gUnknown_85CB534 _080C6CE8: movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen movs r0, #4 strh r0, [r5, #8] b _080C6DF6 @@ -408801,7 +408801,7 @@ _080C6CF6: beq _080C6D28 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _080C6D24 movs r2, #0xa ldrsh r0, [r5, r2] @@ -408833,14 +408833,14 @@ _080C6D28: _080C6D44: movs r0, #1 rsbs r0, r0, #0 - bl sub_081985E8 - bl sub_08198670 + bl Menu_MoveCursor + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0xa] movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _080C6D70 movs r3, #0xa ldrsh r0, [r5, r3] @@ -408867,14 +408867,14 @@ _080C6D74: strh r6, [r5, #0xa] _080C6D8C: movs r0, #1 - bl sub_081985E8 - bl sub_08198670 + bl Menu_MoveCursor + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0xa] movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _080C6DCC movs r2, #0xa ldrsh r0, [r5, r2] @@ -408893,7 +408893,7 @@ _080C6DBE: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 strh r4, [r5, #8] b _080C6DF6 .align 2, 0 @@ -408905,15 +408905,15 @@ _080C6DD0: ands r0, r1 cmp r0, #0 bne _080C6DF6 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldrb r0, [r5, #0xc] - bl sub_080C7610 + bl Cb2_EnterPSS ldrh r0, [r5, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080C6DF6: add sp, #0x10 pop {r4, r5, r6, r7} @@ -408921,14 +408921,14 @@ _080C6DF6: bx r0 .align 2, 0 _080C6E00: .4byte gUnknown_2037C74 - thumb_func_end sub_080C6AF4 + thumb_func_end Task_PokemonStorageSystemPC - thumb_func_start sub_080C6E04 -sub_080C6E04: @ 0x080C6E04 + thumb_func_start ShowPokemonStorageSystemPC +ShowPokemonStorageSystemPC: @ 0x080C6E04 push {lr} ldr r0, _080C6E2C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080C6E30 @@ -408943,21 +408943,21 @@ sub_080C6E04: @ 0x080C6E04 pop {r0} bx r0 .align 2, 0 -_080C6E2C: .4byte sub_080C6AF4 +_080C6E2C: .4byte Task_PokemonStorageSystemPC _080C6E30: .4byte gUnknown_3005B60 - thumb_func_end sub_080C6E04 + thumb_func_end ShowPokemonStorageSystemPC - thumb_func_start sub_080C6E34 -sub_080C6E34: @ 0x080C6E34 + thumb_func_start FieldCb_ReturnToPcMenu +FieldCb_ReturnToPcMenu: @ 0x080C6E34 push {r4, r5, lr} ldr r0, _080C6E78 ldr r5, [r0, #0xc] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _080C6E7C adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080C6E80 @@ -408972,17 +408972,17 @@ sub_080C6E34: @ 0x080C6E34 strh r2, [r1, #0xa] bl _call_via_r4 adds r0, r5, #0 - bl sub_080006F0 - bl sub_080AE99C + bl SetVBlankCallback + bl pal_fill_black pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080C6E78: .4byte gUnknown_3002360 -_080C6E7C: .4byte sub_080C6AF4 +_080C6E7C: .4byte Task_PokemonStorageSystemPC _080C6E80: .4byte gUnknown_3005B60 _080C6E84: .4byte gUnknown_20399A0 - thumb_func_end sub_080C6E34 + thumb_func_end FieldCb_ReturnToPcMenu thumb_func_start sub_080C6E88 sub_080C6E88: @ 0x080C6E88 @@ -408997,7 +408997,7 @@ sub_080C6E88: @ 0x080C6E88 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 ldr r0, _080C6F08 - bl sub_08003250 + bl AddWindow adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 @@ -409008,7 +409008,7 @@ sub_080C6E88: @ 0x080C6E88 bl sub_08196FF0 movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -409023,7 +409023,7 @@ sub_080C6E88: @ 0x080C6E88 adds r0, r4, #0 movs r1, #1 movs r3, #2 - bl sub_08198850 + bl PrintTextArray mov r0, sb str r0, [sp] mov r0, r8 @@ -409049,8 +409049,8 @@ _080C6F08: .4byte gUnknown_854B20C _080C6F0C: .4byte gUnknown_854B1E4 thumb_func_end sub_080C6E88 - thumb_func_start sub_080C6F10 -sub_080C6F10: @ 0x080C6F10 + thumb_func_start Cb2_ExitPSS +Cb2_ExitPSS: @ 0x080C6F10 push {lr} bl sub_080CA714 ldr r1, _080C6F2C @@ -409059,15 +409059,15 @@ sub_080C6F10: @ 0x080C6F10 ldr r0, _080C6F34 str r0, [r1] ldr r0, _080C6F38 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080C6F2C: .4byte gUnknown_20399A0 _080C6F30: .4byte gUnknown_3005B0C -_080C6F34: .4byte sub_080C6E34 +_080C6F34: .4byte FieldCb_ReturnToPcMenu _080C6F38: .4byte sub_08085A30 - thumb_func_end sub_080C6F10 + thumb_func_end Cb2_ExitPSS thumb_func_start sub_080C6F3C sub_080C6F3C: @ 0x080C6F3C @@ -409182,8 +409182,8 @@ _080C6FFC: .align 2, 0 thumb_func_end sub_080C6F3C - thumb_func_start sub_080C7008 -sub_080C7008: @ 0x080C7008 + thumb_func_start ResetPokemonStorageSystem +ResetPokemonStorageSystem: @ 0x080C7008 push {r4, r5, r6, lr} movs r0, #0 bl SetCurrentBox @@ -409195,7 +409195,7 @@ _080C7016: lsls r1, r4, #0x18 lsrs r1, r1, #0x18 lsrs r0, r6, #0x18 - bl sub_080D18B8 + bl ZeroBoxMonAt adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -409240,7 +409240,7 @@ _080C705A: bx r0 .align 2, 0 _080C707C: .4byte gUnknown_85CB584 - thumb_func_end sub_080C7008 + thumb_func_end ResetPokemonStorageSystem thumb_func_start sub_080C7080 sub_080C7080: @ 0x080C7080 @@ -409371,17 +409371,17 @@ sub_080C716C: @ 0x080C716C .align 2, 0 thumb_func_end sub_080C716C - thumb_func_start sub_080C717C -sub_080C717C: @ 0x080C717C + thumb_func_start WallyHandleGetRawMonData +WallyHandleGetRawMonData: @ 0x080C717C push {lr} bl sub_080C73D0 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C717C + thumb_func_end WallyHandleGetRawMonData - thumb_func_start sub_080C7188 -sub_080C7188: @ 0x080C7188 + thumb_func_start HandleBoxChooseSelectionInput +HandleBoxChooseSelectionInput: @ 0x080C7188 push {lr} ldr r0, _080C71A0 ldrh r1, [r0, #0x2e] @@ -409433,7 +409433,7 @@ _080C71EA: _080C71EC: pop {r1} bx r1 - thumb_func_end sub_080C7188 + thumb_func_end HandleBoxChooseSelectionInput thumb_func_start sub_080C71F0 sub_080C71F0: @ 0x080C71F0 @@ -409505,7 +409505,7 @@ sub_080C71F0: @ 0x080C71F0 movs r1, #0xa0 movs r2, #0x60 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r3, [r6] @@ -409544,7 +409544,7 @@ _080C72BC: add r0, sp, #4 movs r1, #0x7c movs r2, #0x50 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r2, [r6] @@ -409792,7 +409792,7 @@ sub_080C74A0: @ 0x080C74A0 lsls r5, r5, #2 adds r0, r0, r5 ldrb r0, [r0] - bl sub_080C682C + bl CountMonsInBox lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, [r6] @@ -409933,11 +409933,11 @@ _080C75C0: bx r0 thumb_func_end sub_080C7590 - thumb_func_start sub_080C75C4 -sub_080C75C4: @ 0x080C75C4 + thumb_func_start VblankCb_PSS +VblankCb_PSS: @ 0x080C75C4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl sub_080D2344 bl TransferPlttBuffer ldr r0, _080C75EC @@ -409952,28 +409952,28 @@ sub_080C75C4: @ 0x080C75C4 bx r0 .align 2, 0 _080C75EC: .4byte gUnknown_20399A8 - thumb_func_end sub_080C75C4 + thumb_func_end VblankCb_PSS thumb_func_start sub_080C75F0 sub_080C75F0: @ 0x080C75F0 push {lr} - bl sub_080A89D4 - bl sub_08199668 - bl sub_080C989C + bl RunTasks + bl do_scheduled_bg_tilemap_copies_to_vram + bl ScrollBackground bl sub_080CA278 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080C75F0 - thumb_func_start sub_080C7610 -sub_080C7610: @ 0x080C7610 + thumb_func_start Cb2_EnterPSS +Cb2_EnterPSS: @ 0x080C7610 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080A8818 + bl ResetTasks ldr r0, _080C7634 strb r5, [r0] ldr r4, _080C7638 @@ -409983,13 +409983,13 @@ sub_080C7610: @ 0x080C7610 cmp r0, #0 bne _080C7644 ldr r0, _080C7640 - bl sub_08000540 + bl SetMainCallback2 b _080C7670 .align 2, 0 _080C7634: .4byte gUnknown_20399AD _080C7638: .4byte gUnknown_20399A8 _080C763C: .4byte 0x000062C4 -_080C7640: .4byte sub_080C6F10 +_080C7640: .4byte Cb2_ExitPSS _080C7644: movs r2, #0 strb r5, [r0, #1] @@ -410002,29 +410002,29 @@ _080C7644: strb r1, [r0] ldr r0, _080C767C movs r1, #3 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] strb r0, [r1, #4] bl sub_080D15AC ldr r1, _080C7680 strb r0, [r1] ldr r0, _080C7684 - bl sub_08000540 + bl SetMainCallback2 _080C7670: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080C7678: .4byte gUnknown_20399B2 -_080C767C: .4byte sub_080C7844 +_080C767C: .4byte Cb_InitPSS _080C7680: .4byte gUnknown_20399B0 _080C7684: .4byte sub_080C75F0 - thumb_func_end sub_080C7610 + thumb_func_end Cb2_EnterPSS - thumb_func_start sub_080C7688 -sub_080C7688: @ 0x080C7688 + thumb_func_start Cb2_ReturnToPSS +Cb2_ReturnToPSS: @ 0x080C7688 push {r4, lr} - bl sub_080A8818 + bl ResetTasks ldr r4, _080C76A8 ldr r0, _080C76AC bl sub_08000BC8 @@ -410033,12 +410033,12 @@ sub_080C7688: @ 0x080C7688 cmp r1, #0 bne _080C76B4 ldr r0, _080C76B0 - bl sub_08000540 + bl SetMainCallback2 b _080C76D8 .align 2, 0 _080C76A8: .4byte gUnknown_20399A8 _080C76AC: .4byte 0x000062C4 -_080C76B0: .4byte sub_080C6F10 +_080C76B0: .4byte Cb2_ExitPSS _080C76B4: ldr r0, _080C76E0 ldrb r0, [r0] @@ -410051,23 +410051,23 @@ _080C76B4: strb r2, [r0] ldr r0, _080C76E4 movs r1, #3 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] strb r0, [r1, #4] ldr r0, _080C76E8 - bl sub_08000540 + bl SetMainCallback2 _080C76D8: pop {r4} pop {r0} bx r0 .align 2, 0 _080C76E0: .4byte gUnknown_20399AD -_080C76E4: .4byte sub_080C7844 +_080C76E4: .4byte Cb_InitPSS _080C76E8: .4byte sub_080C75F0 - thumb_func_end sub_080C7688 + thumb_func_end Cb2_ReturnToPSS - thumb_func_start sub_080C76EC -sub_080C76EC: @ 0x080C76EC + thumb_func_start ResetAllBgCoords +ResetAllBgCoords: @ 0x080C76EC push {lr} movs r0, #0x10 movs r1, #0 @@ -410096,7 +410096,7 @@ sub_080C76EC: @ 0x080C76EC pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C76EC + thumb_func_end ResetAllBgCoords thumb_func_start sub_080C7734 sub_080C7734: @ 0x080C7734 @@ -410227,8 +410227,8 @@ _080C783C: .4byte gUnknown_3005B60 _080C7840: .4byte gUnknown_20399A8 thumb_func_end SetPSSCallback - thumb_func_start sub_080C7844 -sub_080C7844: @ 0x080C7844 + thumb_func_start Cb_InitPSS +Cb_InitPSS: @ 0x080C7844 push {lr} sub sp, #4 ldr r0, _080C7860 @@ -410260,7 +410260,7 @@ _080C7868: @ jump table .4byte _080C79E6 @ case 10 _080C7894: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -410293,10 +410293,10 @@ _080C78D8: bl sub_080CE160 b _080C78E2 _080C78DE: - bl sub_080C97E0 + bl GiveChosenBagItem _080C78E2: - bl sub_080C98B8 - bl sub_080C993C + bl LoadPSSMenuGfx + bl LoadWaveformSpritePalette b _080C7A34 _080C78EC: bl sub_080C9918 @@ -410308,9 +410308,9 @@ _080C78F8: b _080C796C _080C78FA: movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 str r0, [sp] movs r1, #0xc0 @@ -410326,7 +410326,7 @@ _080C78FA: .align 2, 0 _080C7924: .4byte 0x05000080 _080C7928: - bl sub_080C76EC + bl ResetAllBgCoords ldr r0, _080C7940 ldr r0, [r0] ldrb r0, [r0, #3] @@ -410353,7 +410353,7 @@ _080C795C: bl sub_080CCC68 b _080C7A34 _080C7962: - bl sub_080CFA04 + bl ItemStorage_StartScrollIndicatorAndProcessInput lsls r0, r0, #0x18 cmp r0, #0 bne _080C7978 @@ -410364,7 +410364,7 @@ _080C796C: .align 2, 0 _080C7974: .4byte sub_080C96EC _080C7978: - bl sub_080C9860 + bl SetScrollingBackground bl sub_080CA480 b _080C7A34 _080C7982: @@ -410420,28 +410420,28 @@ _080C79E6: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _080C7A0C bl SetPSSCallback b _080C7A22 .align 2, 0 _080C7A08: .4byte gUnknown_20399A8 -_080C7A0C: .4byte sub_080C7A48 +_080C7A0C: .4byte Cb_ShowPSS _080C7A10: movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _080C7A2C bl SetPSSCallback _080C7A22: ldr r0, _080C7A30 - bl sub_080006F0 + bl SetVBlankCallback b _080C7A3E .align 2, 0 -_080C7A2C: .4byte sub_080C7A94 -_080C7A30: .4byte sub_080C75C4 +_080C7A2C: .4byte Cb_ReshowPSS +_080C7A30: .4byte VblankCb_PSS _080C7A34: ldr r0, _080C7A44 ldr r1, [r0] @@ -410454,10 +410454,10 @@ _080C7A3E: bx r0 .align 2, 0 _080C7A44: .4byte gUnknown_20399A8 - thumb_func_end sub_080C7844 + thumb_func_end Cb_InitPSS - thumb_func_start sub_080C7A48 -sub_080C7A48: @ 0x080C7A48 + thumb_func_start Cb_ShowPSS +Cb_ShowPSS: @ 0x080C7A48 push {r4, lr} ldr r4, _080C7A5C ldr r0, [r4] @@ -410493,11 +410493,11 @@ _080C7A8A: pop {r0} bx r0 .align 2, 0 -_080C7A90: .4byte sub_080C7B48 - thumb_func_end sub_080C7A48 +_080C7A90: .4byte Cb_MainPSS + thumb_func_end Cb_ShowPSS - thumb_func_start sub_080C7A94 -sub_080C7A94: @ 0x080C7A94 + thumb_func_start Cb_ReshowPSS +Cb_ReshowPSS: @ 0x080C7A94 push {r4, lr} sub sp, #4 ldr r4, _080C7AAC @@ -410525,10 +410525,10 @@ _080C7ABA: adds r0, r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _080C7B1E _080C7ACC: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080C7B3C @@ -410541,7 +410541,7 @@ _080C7ACC: cmp r0, #0 beq _080C7AF8 movs r0, #0x1c - bl sub_080CA4BC + bl PrintStorageActionText b _080C7B1E .align 2, 0 _080C7AF0: .4byte gUnknown_20399AF @@ -410551,9 +410551,9 @@ _080C7AF8: bl SetPSSCallback b _080C7B3C .align 2, 0 -_080C7B00: .4byte sub_080C7B48 +_080C7B00: .4byte Cb_MainPSS _080C7B04: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C7B3C @@ -410573,7 +410573,7 @@ _080C7B1E: .align 2, 0 _080C7B28: .4byte gUnknown_3002360 _080C7B2C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C7B3C @@ -410585,11 +410585,11 @@ _080C7B3C: pop {r0} bx r0 .align 2, 0 -_080C7B44: .4byte sub_080C7B48 - thumb_func_end sub_080C7A94 +_080C7B44: .4byte Cb_MainPSS + thumb_func_end Cb_ReshowPSS - thumb_func_start sub_080C7B48 -sub_080C7B48: @ 0x080C7B48 + thumb_func_start Cb_MainPSS +Cb_MainPSS: @ 0x080C7B48 push {r4, r5, lr} ldr r0, _080C7B60 ldr r0, [r0] @@ -410682,7 +410682,7 @@ _080C7C34: cmp r0, #1 bls _080C7C58 movs r0, #0x10 - bl sub_080CA4BC + bl PrintStorageActionText ldr r1, [r4] movs r0, #3 strb r0, [r1] @@ -410695,7 +410695,7 @@ _080C7C58: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7C64: .4byte sub_080C8044 +_080C7C64: .4byte Cb_ShowPartyPokemon _080C7C68: ldr r4, _080C7C94 ldr r0, [r4] @@ -410729,13 +410729,13 @@ _080C7CA2: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7CAC: .4byte sub_080C8084 +_080C7CAC: .4byte Cb_HidePartyPokemon _080C7CB0: ldr r0, _080C7CB8 bl SetPSSCallback b _080C803A .align 2, 0 -_080C7CB8: .4byte sub_080C9484 +_080C7CB8: .4byte Cb_OnCloseBoxPressed _080C7CBC: ldr r0, _080C7CC4 bl SetPSSCallback @@ -410749,13 +410749,13 @@ _080C7CC8: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7CD8: .4byte sub_080C8FC8 +_080C7CD8: .4byte Cb_HandleBoxOptions _080C7CDC: ldr r0, _080C7CE4 bl SetPSSCallback b _080C803A .align 2, 0 -_080C7CE4: .4byte sub_080C8100 +_080C7CE4: .4byte Cb_OnSelectedMon _080C7CE8: movs r0, #5 bl sub_080A306C @@ -410815,7 +410815,7 @@ _080C7D58: strb r0, [r1] b _080C803A _080C7D64: - bl sub_080CE2AC + bl CanMovePartyMon lsls r0, r0, #0x18 cmp r0, #0 bne _080C7DC4 @@ -410843,9 +410843,9 @@ _080C7D94: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7DA4: .4byte sub_080C8614 +_080C7DA4: .4byte Cb_DepositMenu _080C7DA8: - bl sub_080CE2AC + bl CanMovePartyMon lsls r0, r0, #0x18 cmp r0, #0 bne _080C7DC4 @@ -410853,7 +410853,7 @@ _080C7DA8: bl sub_080A306C b _080C7FC8 _080C7DBA: - bl sub_080CE2E8 + bl CanShiftMon lsls r0, r0, #0x18 cmp r0, #0 bne _080C7DD4 @@ -410872,7 +410872,7 @@ _080C7DD4: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7DE4: .4byte sub_080C84E4 +_080C7DE4: .4byte Cb_ShiftMon _080C7DE8: movs r0, #5 bl sub_080A306C @@ -410880,7 +410880,7 @@ _080C7DE8: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7DF8: .4byte sub_080C852C +_080C7DF8: .4byte Cb_WithdrawMon _080C7DFC: movs r0, #5 bl sub_080A306C @@ -410896,7 +410896,7 @@ _080C7E10: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7E20: .4byte sub_080C89C4 +_080C7E20: .4byte Cb_TakeItemForMoving _080C7E24: movs r0, #5 bl sub_080A306C @@ -410904,7 +410904,7 @@ _080C7E24: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7E34: .4byte sub_080C8A78 +_080C7E34: .4byte Cb_GiveMovingItemToMon _080C7E38: movs r0, #5 bl sub_080A306C @@ -410912,7 +410912,7 @@ _080C7E38: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7E48: .4byte sub_080C8C4C +_080C7E48: .4byte Cb_SwitchSelectedItem _080C7E4C: movs r0, #5 bl sub_080A306C @@ -410989,7 +410989,7 @@ _080C7ED8: ldrb r0, [r0] cmp r0, #0 beq _080C7EEA - bl sub_080C9AD4 + bl BoxSetMosaic _080C7EEA: ldr r1, [r4] b _080C7F64 @@ -410997,7 +410997,7 @@ _080C7EEA: _080C7EF0: .4byte gUnknown_20399A8 _080C7EF4: .4byte 0x00000CEA _080C7EF8: - bl sub_080CBDC0 + bl ScrollToBox lsls r0, r0, #0x18 cmp r0, #0 beq _080C7F04 @@ -411018,7 +411018,7 @@ _080C7F04: cmp r0, #0 bne _080C7F2C bl sub_080CD888 - bl sub_080C9AD4 + bl BoxSetMosaic _080C7F2C: ldr r4, _080C7F44 ldr r1, [r4] @@ -411061,7 +411061,7 @@ _080C7F7E: bl sub_080A306C movs r0, #0x16 _080C7F86: - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C7F94 ldr r1, [r0] movs r0, #6 @@ -411082,7 +411082,7 @@ _080C7F98: b _080C803A .align 2, 0 _080C7FB0: .4byte gUnknown_3002360 -_080C7FB4: .4byte sub_080C7B48 +_080C7FB4: .4byte Cb_MainPSS _080C7FB8: bl sub_080CFA84 b _080C802C @@ -411096,7 +411096,7 @@ _080C7FC8: bl SetPSSCallback b _080C803A .align 2, 0 -_080C7FD0: .4byte sub_080C842C +_080C7FD0: .4byte Cb_MoveMon _080C7FD4: bl sub_080CFA84 lsls r0, r0, #0x18 @@ -411110,7 +411110,7 @@ _080C7FD4: ldrb r0, [r0] cmp r0, #0 beq _080C7FF2 - bl sub_080C9AD4 + bl BoxSetMosaic _080C7FF2: ldr r0, [r5] strb r4, [r0] @@ -411153,10 +411153,10 @@ _080C803A: bx r0 .align 2, 0 _080C8040: .4byte gUnknown_20399A8 - thumb_func_end sub_080C7B48 + thumb_func_end Cb_MainPSS - thumb_func_start sub_080C8044 -sub_080C8044: @ 0x080C8044 + thumb_func_start Cb_ShowPartyPokemon +Cb_ShowPartyPokemon: @ 0x080C8044 push {r4, lr} ldr r4, _080C8058 ldr r0, [r4] @@ -411169,14 +411169,14 @@ sub_080C8044: @ 0x080C8044 .align 2, 0 _080C8058: .4byte gUnknown_20399A8 _080C805C: - bl sub_080CA3B0 + bl SetUpDoShowPartyMenu ldr r1, [r4] ldrb r0, [r1] adds r0, #1 strb r0, [r1] b _080C807A _080C806A: - bl sub_080CA3D4 + bl DoShowPartyMenu lsls r0, r0, #0x18 cmp r0, #0 bne _080C807A @@ -411187,11 +411187,11 @@ _080C807A: pop {r0} bx r0 .align 2, 0 -_080C8080: .4byte sub_080C7B48 - thumb_func_end sub_080C8044 +_080C8080: .4byte Cb_MainPSS + thumb_func_end Cb_ShowPartyPokemon - thumb_func_start sub_080C8084 -sub_080C8084: @ 0x080C8084 + thumb_func_start Cb_HidePartyPokemon +Cb_HidePartyPokemon: @ 0x080C8084 push {r4, lr} ldr r4, _080C809C ldr r0, [r4] @@ -411212,10 +411212,10 @@ _080C80A0: _080C80A6: movs r0, #5 bl sub_080A306C - bl sub_080CA0EC + bl SetUpHidePartyMenu b _080C80C8 _080C80B2: - bl sub_080CA12C + bl HidePartyMenu lsls r0, r0, #0x18 cmp r0, #0 bne _080C80F2 @@ -411240,7 +411240,7 @@ _080C80D2: ldrb r0, [r0] cmp r0, #0 beq _080C80EC - bl sub_080C9AD4 + bl BoxSetMosaic _080C80EC: ldr r0, _080C80FC bl SetPSSCallback @@ -411250,11 +411250,11 @@ _080C80F2: bx r0 .align 2, 0 _080C80F8: .4byte 0x00000CEA -_080C80FC: .4byte sub_080C7B48 - thumb_func_end sub_080C8084 +_080C80FC: .4byte Cb_MainPSS + thumb_func_end Cb_HidePartyPokemon - thumb_func_start sub_080C8100 -sub_080C8100: @ 0x080C8100 + thumb_func_start Cb_OnSelectedMon +Cb_OnSelectedMon: @ 0x080C8100 push {r4, lr} ldr r0, _080C8118 ldr r0, [r0] @@ -411294,12 +411294,12 @@ _080C8148: cmp r0, #3 beq _080C8164 movs r0, #4 - bl sub_080CA4BC + bl PrintStorageActionText b _080C818E .align 2, 0 _080C8160: .4byte gUnknown_20399A8 _080C8164: - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 bne _080C817A @@ -411311,13 +411311,13 @@ _080C8164: beq _080C8188 _080C817A: movs r0, #0x17 - bl sub_080CA4BC + bl PrintStorageActionText b _080C818E .align 2, 0 _080C8184: .4byte 0x00000CE6 _080C8188: movs r0, #0x18 - bl sub_080CA4BC + bl PrintStorageActionText _080C818E: bl sub_080CF84C ldr r0, _080C819C @@ -411383,9 +411383,9 @@ _080C8228: bl SetPSSCallback b _080C841E .align 2, 0 -_080C8234: .4byte sub_080C7B48 +_080C8234: .4byte Cb_MainPSS _080C8238: - bl sub_080CE2AC + bl CanMovePartyMon lsls r0, r0, #0x18 cmp r0, #0 bne _080C82EE @@ -411396,7 +411396,7 @@ _080C8238: bl SetPSSCallback b _080C841E .align 2, 0 -_080C8254: .4byte sub_080C842C +_080C8254: .4byte Cb_MoveMon _080C8258: movs r0, #5 bl sub_080A306C @@ -411407,7 +411407,7 @@ _080C8258: .align 2, 0 _080C826C: .4byte sub_080C8488 _080C8270: - bl sub_080CE2E8 + bl CanShiftMon lsls r0, r0, #0x18 cmp r0, #0 beq _080C82EE @@ -411418,7 +411418,7 @@ _080C8270: bl SetPSSCallback b _080C841E .align 2, 0 -_080C828C: .4byte sub_080C84E4 +_080C828C: .4byte Cb_ShiftMon _080C8290: movs r0, #5 bl sub_080A306C @@ -411427,9 +411427,9 @@ _080C8290: bl SetPSSCallback b _080C841E .align 2, 0 -_080C82A4: .4byte sub_080C852C +_080C82A4: .4byte Cb_WithdrawMon _080C82A8: - bl sub_080CE2AC + bl CanMovePartyMon lsls r0, r0, #0x18 cmp r0, #0 bne _080C82EE @@ -411451,9 +411451,9 @@ _080C82A8: .align 2, 0 _080C82D8: .4byte gUnknown_20399A8 _080C82DC: .4byte 0x00000CE6 -_080C82E0: .4byte sub_080C8614 +_080C82E0: .4byte Cb_DepositMenu _080C82E4: - bl sub_080CE2AC + bl CanMovePartyMon lsls r0, r0, #0x18 cmp r0, #0 beq _080C82FC @@ -411501,7 +411501,7 @@ _080C8334: bl SetPSSCallback b _080C841E .align 2, 0 -_080C8344: .4byte sub_080C8750 +_080C8344: .4byte Cb_ReleaseMon _080C8348: movs r0, #5 bl sub_080A306C @@ -411509,7 +411509,7 @@ _080C8348: bl SetPSSCallback b _080C841E .align 2, 0 -_080C8358: .4byte sub_080C93C4 +_080C8358: .4byte Cb_ShowMonSummary _080C835C: movs r0, #5 bl sub_080A306C @@ -411517,7 +411517,7 @@ _080C835C: bl SetPSSCallback b _080C841E .align 2, 0 -_080C836C: .4byte sub_080C8940 +_080C836C: .4byte Cb_ShowMarkMenu _080C8370: movs r0, #5 bl sub_080A306C @@ -411525,7 +411525,7 @@ _080C8370: bl SetPSSCallback b _080C841E .align 2, 0 -_080C8380: .4byte sub_080C89C4 +_080C8380: .4byte Cb_TakeItemForMoving _080C8384: movs r0, #5 bl sub_080A306C @@ -411533,13 +411533,13 @@ _080C8384: bl SetPSSCallback b _080C841E .align 2, 0 -_080C8394: .4byte sub_080C8A78 +_080C8394: .4byte Cb_GiveMovingItemToMon _080C8398: ldr r0, _080C83A0 bl SetPSSCallback b _080C841E .align 2, 0 -_080C83A0: .4byte sub_080C8B34 +_080C83A0: .4byte Cb_ItemToBag _080C83A4: movs r0, #5 bl sub_080A306C @@ -411547,7 +411547,7 @@ _080C83A4: bl SetPSSCallback b _080C841E .align 2, 0 -_080C83B4: .4byte sub_080C8C4C +_080C83B4: .4byte Cb_SwitchSelectedItem _080C83B8: movs r0, #5 bl sub_080A306C @@ -411555,13 +411555,13 @@ _080C83B8: bl SetPSSCallback b _080C841E .align 2, 0 -_080C83C8: .4byte sub_080C9424 +_080C83C8: .4byte Cb_GiveItemFromBag _080C83CC: ldr r0, _080C83D4 bl SetPSSCallback b _080C841E .align 2, 0 -_080C83D4: .4byte sub_080C8D34 +_080C83D4: .4byte Cb_ShowItemInfo _080C83D8: movs r0, #0x20 bl sub_080A306C @@ -411577,7 +411577,7 @@ _080C83EC: bl sub_080A306C movs r0, #0x16 _080C83F4: - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C8404 ldr r1, [r0] movs r0, #6 @@ -411601,11 +411601,11 @@ _080C841E: bx r0 .align 2, 0 _080C8424: .4byte gUnknown_3002360 -_080C8428: .4byte sub_080C7B48 - thumb_func_end sub_080C8100 +_080C8428: .4byte Cb_MainPSS + thumb_func_end Cb_OnSelectedMon - thumb_func_start sub_080C842C -sub_080C842C: @ 0x080C842C + thumb_func_start Cb_MoveMon +Cb_MoveMon: @ 0x080C842C push {r4, lr} ldr r4, _080C8440 ldr r0, [r4] @@ -411626,7 +411626,7 @@ _080C8444: strb r0, [r1] b _080C847E _080C8454: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080C847E @@ -411639,7 +411639,7 @@ _080C8454: b _080C847E .align 2, 0 _080C8470: .4byte gUnknown_20399AC -_080C8474: .4byte sub_080C8F0C +_080C8474: .4byte Cb_HandleMovingMonFromParty _080C8478: ldr r0, _080C8484 bl SetPSSCallback @@ -411648,8 +411648,8 @@ _080C847E: pop {r0} bx r0 .align 2, 0 -_080C8484: .4byte sub_080C7B48 - thumb_func_end sub_080C842C +_080C8484: .4byte Cb_MainPSS + thumb_func_end Cb_MoveMon thumb_func_start sub_080C8488 sub_080C8488: @ 0x080C8488 @@ -411673,7 +411673,7 @@ _080C84A0: strb r0, [r1] b _080C84DA _080C84B0: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080C84DA @@ -411686,7 +411686,7 @@ _080C84B0: b _080C84DA .align 2, 0 _080C84CC: .4byte gUnknown_20399AC -_080C84D0: .4byte sub_080C8F0C +_080C84D0: .4byte Cb_HandleMovingMonFromParty _080C84D4: ldr r0, _080C84E0 bl SetPSSCallback @@ -411695,11 +411695,11 @@ _080C84DA: pop {r0} bx r0 .align 2, 0 -_080C84E0: .4byte sub_080C7B48 +_080C84E0: .4byte Cb_MainPSS thumb_func_end sub_080C8488 - thumb_func_start sub_080C84E4 -sub_080C84E4: @ 0x080C84E4 + thumb_func_start Cb_ShiftMon +Cb_ShiftMon: @ 0x080C84E4 push {r4, lr} ldr r4, _080C84F8 ldr r0, [r4] @@ -411720,11 +411720,11 @@ _080C84FC: strb r0, [r1] b _080C8520 _080C850C: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080C8520 - bl sub_080C9AD4 + bl BoxSetMosaic ldr r0, _080C8528 bl SetPSSCallback _080C8520: @@ -411732,11 +411732,11 @@ _080C8520: pop {r0} bx r0 .align 2, 0 -_080C8528: .4byte sub_080C7B48 - thumb_func_end sub_080C84E4 +_080C8528: .4byte Cb_MainPSS + thumb_func_end Cb_ShiftMon - thumb_func_start sub_080C852C -sub_080C852C: @ 0x080C852C + thumb_func_start Cb_WithdrawMon +Cb_WithdrawMon: @ 0x080C852C push {lr} ldr r0, _080C8544 ldr r0, [r0] @@ -411765,7 +411765,7 @@ _080C8564: cmp r0, #6 bne _080C8584 movs r0, #0xe - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C8580 ldr r1, [r0] movs r0, #1 @@ -411797,18 +411797,18 @@ _080C859C: b _080C860A .align 2, 0 _080C85B4: .4byte gUnknown_3002360 -_080C85B8: .4byte sub_080C7B48 +_080C85B8: .4byte Cb_MainPSS _080C85BC: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080C860A movs r0, #1 bl SetMovingMonPriority - bl sub_080CA3B0 + bl SetUpDoShowPartyMenu b _080C85F2 _080C85D2: - bl sub_080CA3D4 + bl DoShowPartyMenu lsls r0, r0, #0x18 cmp r0, #0 bne _080C860A @@ -411816,11 +411816,11 @@ _080C85D2: bl InitMonPlaceChange b _080C85F2 _080C85E4: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080C860A - bl sub_080CA384 + bl PokecenterHealEffect_3 _080C85F2: ldr r0, _080C8600 ldr r1, [r0] @@ -411837,11 +411837,11 @@ _080C860A: pop {r0} bx r0 .align 2, 0 -_080C8610: .4byte sub_080C8084 - thumb_func_end sub_080C852C +_080C8610: .4byte Cb_HidePartyPokemon + thumb_func_end Cb_WithdrawMon - thumb_func_start sub_080C8614 -sub_080C8614: @ 0x080C8614 + thumb_func_start Cb_DepositMenu +Cb_DepositMenu: @ 0x080C8614 push {r4, lr} sub sp, #4 ldr r0, _080C8630 @@ -411867,7 +411867,7 @@ _080C8638: @ jump table .4byte _080C8724 @ case 4 _080C864C: movs r0, #6 - bl sub_080CA4BC + bl PrintStorageActionText ldr r4, _080C8678 ldr r0, [r4] ldr r1, _080C867C @@ -411891,7 +411891,7 @@ _080C867C: .4byte 0x00001E5C _080C8680: .4byte 0x0000DAC7 _080C8684: .4byte gUnknown_20399AE _080C8688: - bl sub_080C7188 + bl HandleBoxChooseSelectionInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r4, r0, #0 @@ -411900,19 +411900,19 @@ _080C8688: cmp r0, #0xc9 bne _080C86A8 bl sub_080CA638 - bl sub_080C717C + bl WallyHandleGetRawMonData bl sub_080C7128 b _080C8716 _080C86A8: adds r0, r4, #0 - bl sub_080CDA18 + bl TryStorePartyMonInBox lsls r0, r0, #0x18 cmp r0, #0 beq _080C86D4 ldr r0, _080C86CC strb r4, [r0] bl sub_080CA638 - bl sub_080C717C + bl WallyHandleGetRawMonData bl sub_080C7128 ldr r0, _080C86D0 ldr r1, [r0] @@ -411923,7 +411923,7 @@ _080C86CC: .4byte gUnknown_20399AE _080C86D0: .4byte gUnknown_20399A8 _080C86D4: movs r0, #8 - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C86E4 ldr r1, [r0] movs r0, #4 @@ -411931,7 +411931,7 @@ _080C86D4: .align 2, 0 _080C86E4: .4byte gUnknown_20399A8 _080C86E8: - bl sub_080CE188 + bl CompactPartySlots bl sub_080CB1C4 ldr r0, _080C86FC ldr r1, [r0] @@ -411945,15 +411945,15 @@ _080C8700: lsls r0, r0, #0x18 cmp r0, #0 bne _080C873E - bl sub_080CDAA8 - bl sub_080C9AD4 - bl sub_080CA384 + bl WallyHandleStatusIconUpdate + bl BoxSetMosaic + bl PokecenterHealEffect_3 _080C8716: ldr r0, _080C8720 bl SetPSSCallback b _080C873E .align 2, 0 -_080C8720: .4byte sub_080C7B48 +_080C8720: .4byte Cb_MainPSS _080C8724: ldr r0, _080C8748 ldrh r1, [r0, #0x2e] @@ -411962,7 +411962,7 @@ _080C8724: cmp r0, #0 beq _080C873E movs r0, #6 - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C874C ldr r1, [r0] movs r0, #1 @@ -411976,10 +411976,10 @@ _080C873E: .align 2, 0 _080C8748: .4byte gUnknown_3002360 _080C874C: .4byte gUnknown_20399A8 - thumb_func_end sub_080C8614 + thumb_func_end Cb_DepositMenu - thumb_func_start sub_080C8750 -sub_080C8750: @ 0x080C8750 + thumb_func_start Cb_ReleaseMon +Cb_ReleaseMon: @ 0x080C8750 push {lr} ldr r0, _080C8768 ldr r0, [r0] @@ -412013,7 +412013,7 @@ _080C8770: @ jump table .4byte _080C891C @ case 13 _080C87A8: movs r0, #9 - bl sub_080CA4BC + bl PrintStorageActionText movs r0, #1 bl sub_080CA600 ldr r0, _080C87D8 @@ -412045,11 +412045,11 @@ _080C87E2: b _080C8894 _080C87E8: bl sub_080CA638 - bl sub_080CDC1C + bl InitCanRelaseMonVars bl sub_080CDACC b _080C88F8 _080C87F6: - bl sub_080CDDFC + bl RunCanReleaseMon bl sub_080CDB24 lsls r0, r0, #0x18 cmp r0, #0 @@ -412062,15 +412062,15 @@ _080C8808: bne _080C880E b _080C890C _080C880E: - bl sub_080CDDFC + bl RunCanReleaseMon lsls r0, r0, #0x18 asrs r0, r0, #0x18 cmp r0, #1 bne _080C8808 b _080C88F8 _080C881C: - bl sub_080CDB54 - bl sub_080C9AA4 + bl ReleaseMon + bl RefreshCursorMonData movs r0, #0xa b _080C88F4 _080C8828: @@ -412098,7 +412098,7 @@ _080C8840: ldrb r0, [r0] cmp r0, #0 beq _080C886C - bl sub_080CE188 + bl CompactPartySlots bl sub_080CB1C4 b _080C88F8 .align 2, 0 @@ -412118,15 +412118,15 @@ _080C887C: cmp r0, #0 bne _080C8932 bl sub_080CD888 - bl sub_080C9AD4 - bl sub_080CA384 + bl BoxSetMosaic + bl PokecenterHealEffect_3 b _080C88F8 _080C8894: ldr r0, _080C889C bl SetPSSCallback b _080C8932 .align 2, 0 -_080C889C: .4byte sub_080C7B48 +_080C889C: .4byte Cb_MainPSS _080C88A0: movs r0, #0xa b _080C88F4 @@ -412170,7 +412170,7 @@ _080C88E6: beq _080C8932 movs r0, #0x14 _080C88F4: - bl sub_080CA4BC + bl PrintStorageActionText _080C88F8: ldr r0, _080C8908 ldr r1, [r0] @@ -412204,11 +412204,11 @@ _080C8932: bx r0 .align 2, 0 _080C8938: .4byte gUnknown_3002360 -_080C893C: .4byte sub_080C7B48 - thumb_func_end sub_080C8750 +_080C893C: .4byte Cb_MainPSS + thumb_func_end Cb_ReleaseMon - thumb_func_start sub_080C8940 -sub_080C8940: @ 0x080C8940 + thumb_func_start Cb_ShowMarkMenu +Cb_ShowMarkMenu: @ 0x080C8940 push {r4, lr} ldr r4, _080C8954 ldr r0, [r4] @@ -412222,7 +412222,7 @@ sub_080C8940: @ 0x080C8940 _080C8954: .4byte gUnknown_20399A8 _080C8958: movs r0, #0xc - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, [r4] ldr r2, _080C8984 adds r1, r0, r2 @@ -412255,8 +412255,8 @@ _080C898C: ldr r1, _080C89BC adds r0, r0, r1 ldrb r0, [r0] - bl sub_080CE224 - bl sub_080C9AA4 + bl SetMonMarkings + bl RefreshCursorMonData ldr r0, _080C89C0 bl SetPSSCallback _080C89B4: @@ -412265,11 +412265,11 @@ _080C89B4: bx r0 .align 2, 0 _080C89BC: .4byte 0x00000DA8 -_080C89C0: .4byte sub_080C7B48 - thumb_func_end sub_080C8940 +_080C89C0: .4byte Cb_MainPSS + thumb_func_end Cb_ShowMarkMenu - thumb_func_start sub_080C89C4 -sub_080C89C4: @ 0x080C89C4 + thumb_func_start Cb_TakeItemForMoving +Cb_TakeItemForMoving: @ 0x080C89C4 push {r4, r5, lr} ldr r5, _080C89DC ldr r0, [r5] @@ -412320,7 +412320,7 @@ _080C8A10: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D0730 + bl Item_FromMonToMoving b _080C8A54 .align 2, 0 _080C8A34: .4byte gUnknown_20399AC @@ -412341,7 +412341,7 @@ _080C8A54: strb r0, [r1] b _080C8A6E _080C8A5E: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8A6E @@ -412352,11 +412352,11 @@ _080C8A6E: pop {r0} bx r0 .align 2, 0 -_080C8A74: .4byte sub_080C7B48 - thumb_func_end sub_080C89C4 +_080C8A74: .4byte Cb_MainPSS + thumb_func_end Cb_TakeItemForMoving - thumb_func_start sub_080C8A78 -sub_080C8A78: @ 0x080C8A78 + thumb_func_start Cb_GiveMovingItemToMon +Cb_GiveMovingItemToMon: @ 0x080C8A78 push {r4, lr} ldr r0, _080C8A90 ldr r0, [r0] @@ -412390,7 +412390,7 @@ _080C8AAC: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D0920 + bl Item_GiveMovingToMon b _080C8B04 .align 2, 0 _080C8AD0: .4byte gUnknown_20399AC @@ -412404,7 +412404,7 @@ _080C8AD4: bl sub_080CD888 bl sub_080C9D70 movs r0, #0x1c - bl sub_080CA4BC + bl PrintStorageActionText b _080C8B04 _080C8AF4: ldr r0, _080C8B10 @@ -412426,7 +412426,7 @@ _080C8B04: _080C8B10: .4byte gUnknown_3002360 _080C8B14: .4byte gUnknown_20399A8 _080C8B18: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8B28 @@ -412437,11 +412437,11 @@ _080C8B28: pop {r0} bx r0 .align 2, 0 -_080C8B30: .4byte sub_080C7B48 - thumb_func_end sub_080C8A78 +_080C8B30: .4byte Cb_MainPSS + thumb_func_end Cb_GiveMovingItemToMon - thumb_func_start sub_080C8B34 -sub_080C8B34: @ 0x080C8B34 + thumb_func_start Cb_ItemToBag +Cb_ItemToBag: @ 0x080C8B34 push {r4, r5, lr} ldr r1, _080C8B50 ldr r0, [r1] @@ -412471,14 +412471,14 @@ _080C8B6C: adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 bne _080C8B98 movs r0, #0x20 bl sub_080A306C movs r0, #0x1a - bl sub_080CA4BC + bl PrintStorageActionText ldr r1, [r5] movs r0, #3 strb r0, [r1] @@ -412498,7 +412498,7 @@ _080C8B98: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D09B4 + bl Item_TakeMons ldr r1, [r5] movs r0, #1 strb r0, [r1] @@ -412511,7 +412511,7 @@ _080C8BC4: cmp r0, #0 bne _080C8C3E movs r0, #0x19 - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C8BE0 ldr r1, [r0] movs r0, #2 @@ -412538,7 +412538,7 @@ _080C8BE4: _080C8C08: .4byte gUnknown_3002360 _080C8C0C: .4byte gUnknown_20399A8 _080C8C10: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8C3E @@ -412546,7 +412546,7 @@ _080C8C10: bl SetPSSCallback b _080C8C3E .align 2, 0 -_080C8C24: .4byte sub_080C7B48 +_080C8C24: .4byte Cb_MainPSS _080C8C28: ldr r0, _080C8C44 ldrh r1, [r0, #0x2e] @@ -412563,11 +412563,11 @@ _080C8C3E: bx r0 .align 2, 0 _080C8C44: .4byte gUnknown_3002360 -_080C8C48: .4byte sub_080C7B48 - thumb_func_end sub_080C8B34 +_080C8C48: .4byte Cb_MainPSS + thumb_func_end Cb_ItemToBag - thumb_func_start sub_080C8C4C -sub_080C8C4C: @ 0x080C8C4C + thumb_func_start Cb_SwitchSelectedItem +Cb_SwitchSelectedItem: @ 0x080C8C4C push {r4, lr} ldr r1, _080C8C64 ldr r0, [r1] @@ -412622,7 +412622,7 @@ _080C8CAC: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D084C + bl Item_SwitchMonsWithMoving b _080C8D04 .align 2, 0 _080C8CD0: .4byte gUnknown_20399AC @@ -412636,7 +412636,7 @@ _080C8CD4: bl sub_080CD888 bl sub_080C9D70 movs r0, #0x1d - bl sub_080CA4BC + bl PrintStorageActionText b _080C8D04 _080C8CF4: ldr r0, _080C8D10 @@ -412658,7 +412658,7 @@ _080C8D08: _080C8D10: .4byte gUnknown_3002360 _080C8D14: .4byte gUnknown_20399A8 _080C8D18: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8D28 @@ -412669,11 +412669,11 @@ _080C8D28: pop {r0} bx r0 .align 2, 0 -_080C8D30: .4byte sub_080C7B48 - thumb_func_end sub_080C8C4C +_080C8D30: .4byte Cb_MainPSS + thumb_func_end Cb_SwitchSelectedItem - thumb_func_start sub_080C8D34 -sub_080C8D34: @ 0x080C8D34 + thumb_func_start Cb_ShowItemInfo +Cb_ShowItemInfo: @ 0x080C8D34 push {lr} ldr r0, _080C8D4C ldr r0, [r0] @@ -412700,7 +412700,7 @@ _080C8D70: bl sub_080CA638 b _080C8DBE _080C8D76: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8DE0 @@ -412713,7 +412713,7 @@ _080C8D90: bl sub_080D10EC b _080C8DB8 _080C8D96: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy b _080C8DB8 _080C8D9C: ldr r0, _080C8DB0 @@ -412743,7 +412743,7 @@ _080C8DBE: .align 2, 0 _080C8DCC: .4byte gUnknown_20399A8 _080C8DD0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8DE0 @@ -412753,11 +412753,11 @@ _080C8DE0: pop {r0} bx r0 .align 2, 0 -_080C8DE4: .4byte sub_080C7B48 - thumb_func_end sub_080C8D34 +_080C8DE4: .4byte Cb_MainPSS + thumb_func_end Cb_ShowItemInfo - thumb_func_start sub_080C8DE8 -sub_080C8DE8: @ 0x080C8DE8 + thumb_func_start Cb_CloseBoxWhileHoldingItem +Cb_CloseBoxWhileHoldingItem: @ 0x080C8DE8 push {r4, lr} ldr r0, _080C8E00 ldr r0, [r0] @@ -412785,7 +412785,7 @@ _080C8E20: movs r0, #5 bl sub_080A306C movs r0, #0x1b - bl sub_080CA4BC + bl PrintStorageActionText movs r0, #0 bl sub_080CA600 ldr r0, _080C8E3C @@ -412821,7 +412821,7 @@ _080C8E64: adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -412836,7 +412836,7 @@ _080C8E88: .4byte gUnknown_20399A8 _080C8E8C: .4byte 0x00002234 _080C8E90: movs r0, #0x1a - bl sub_080CA4BC + bl PrintStorageActionText ldr r1, [r4] movs r0, #2 strb r0, [r1] @@ -412878,9 +412878,9 @@ _080C8EE4: bl SetPSSCallback b _080C8F00 .align 2, 0 -_080C8EEC: .4byte sub_080C7B48 +_080C8EEC: .4byte Cb_MainPSS _080C8EF0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8F00 @@ -412891,11 +412891,11 @@ _080C8F00: pop {r0} bx r0 .align 2, 0 -_080C8F08: .4byte sub_080C7B48 - thumb_func_end sub_080C8DE8 +_080C8F08: .4byte Cb_MainPSS + thumb_func_end Cb_CloseBoxWhileHoldingItem - thumb_func_start sub_080C8F0C -sub_080C8F0C: @ 0x080C8F0C + thumb_func_start Cb_HandleMovingMonFromParty +Cb_HandleMovingMonFromParty: @ 0x080C8F0C push {r4, lr} ldr r4, _080C8F20 ldr r0, [r4] @@ -412908,7 +412908,7 @@ sub_080C8F0C: @ 0x080C8F0C .align 2, 0 _080C8F20: .4byte gUnknown_20399A8 _080C8F24: - bl sub_080CE188 + bl CompactPartySlots bl sub_080CB1C4 ldr r1, [r4] ldrb r0, [r1] @@ -412920,7 +412920,7 @@ _080C8F36: lsls r0, r0, #0x18 cmp r0, #0 bne _080C8F4A - bl sub_080CA384 + bl PokecenterHealEffect_3 ldr r0, _080C8F50 bl SetPSSCallback _080C8F4A: @@ -412928,8 +412928,8 @@ _080C8F4A: pop {r0} bx r0 .align 2, 0 -_080C8F50: .4byte sub_080C7B48 - thumb_func_end sub_080C8F0C +_080C8F50: .4byte Cb_MainPSS + thumb_func_end Cb_HandleMovingMonFromParty thumb_func_start sub_080C8F54 sub_080C8F54: @ 0x080C8F54 @@ -412954,10 +412954,10 @@ _080C8F70: b _080C8FBC _080C8F7A: movs r0, #0x1e - bl sub_080CA4BC + bl PrintStorageActionText b _080C8F9E _080C8F82: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8FBC @@ -412979,7 +412979,7 @@ _080C8F9E: .align 2, 0 _080C8FA8: .4byte gUnknown_3002360 _080C8FAC: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C8FBC @@ -412990,11 +412990,11 @@ _080C8FBC: pop {r0} bx r0 .align 2, 0 -_080C8FC4: .4byte sub_080C7B48 +_080C8FC4: .4byte Cb_MainPSS thumb_func_end sub_080C8F54 - thumb_func_start sub_080C8FC8 -sub_080C8FC8: @ 0x080C8FC8 + thumb_func_start Cb_HandleBoxOptions +Cb_HandleBoxOptions: @ 0x080C8FC8 push {r4, lr} ldr r4, _080C8FE0 ldr r0, [r4] @@ -413014,7 +413014,7 @@ _080C8FE4: b _080C90B4 _080C8FEA: movs r0, #1 - bl sub_080CA4BC + bl PrintStorageActionText bl sub_080CF84C ldr r1, [r4] ldrb r0, [r1] @@ -413066,7 +413066,7 @@ _080C9060: bl SetPSSCallback b _080C90B4 .align 2, 0 -_080C9074: .4byte sub_080C7B48 +_080C9074: .4byte Cb_MainPSS _080C9078: movs r0, #5 bl sub_080A306C @@ -413074,7 +413074,7 @@ _080C9078: bl SetPSSCallback b _080C90B4 .align 2, 0 -_080C9088: .4byte sub_080C9364 +_080C9088: .4byte BattleSetup_GetTerrainId _080C908C: movs r0, #5 bl sub_080A306C @@ -413083,7 +413083,7 @@ _080C908C: bl SetPSSCallback b _080C90B4 .align 2, 0 -_080C90A0: .4byte sub_080C90C0 +_080C90A0: .4byte Cb_HandleWallpapers _080C90A4: movs r0, #5 bl sub_080A306C @@ -413096,10 +413096,10 @@ _080C90B4: bx r0 .align 2, 0 _080C90BC: .4byte sub_080C9274 - thumb_func_end sub_080C8FC8 + thumb_func_end Cb_HandleBoxOptions - thumb_func_start sub_080C90C0 -sub_080C90C0: @ 0x080C90C0 + thumb_func_start Cb_HandleWallpapers +Cb_HandleWallpapers: @ 0x080C90C0 push {r4, r5, lr} ldr r0, _080C90D8 ldr r0, [r0] @@ -413127,7 +413127,7 @@ _080C90E0: @ jump table _080C90FC: bl sub_080CA64C movs r0, #2 - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C9110 ldr r1, [r0] ldrb r0, [r1] @@ -413206,7 +413206,7 @@ _080C9188: movs r0, #6 b _080C9266 _080C91A8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C9268 @@ -413215,9 +413215,9 @@ _080C91A8: ldr r1, _080C91D4 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080CA680 + bl AddWallpapersMenu movs r0, #3 - bl sub_080CA4BC + bl PrintStorageActionText ldr r1, [r4] ldrb r0, [r1] adds r0, #1 @@ -413259,13 +413259,13 @@ _080C9208: strh r0, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080CBEF4 + bl SetWallpaperForCurrentBox ldr r1, [r4] ldrb r0, [r1] adds r0, #1 b _080C9266 _080C922C: - bl sub_080CBF24 + bl DoWallpaperGfxChange lsls r0, r0, #0x18 cmp r0, #0 bne _080C9268 @@ -413276,9 +413276,9 @@ _080C923C: bl SetPSSCallback b _080C9268 .align 2, 0 -_080C9244: .4byte sub_080C7B48 +_080C9244: .4byte Cb_MainPSS _080C9248: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080C9268 @@ -413288,7 +413288,7 @@ _080C9248: lsls r1, r1, #3 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080CBEF4 + bl SetWallpaperForCurrentBox ldr r1, [r4] movs r0, #5 _080C9266: @@ -413299,7 +413299,7 @@ _080C9268: bx r0 .align 2, 0 _080C9270: .4byte gUnknown_20399A8 - thumb_func_end sub_080C90C0 + thumb_func_end Cb_HandleWallpapers thumb_func_start sub_080C9274 sub_080C9274: @ 0x080C9274 @@ -413325,7 +413325,7 @@ _080C9290: b _080C9354 _080C929A: movs r0, #5 - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, [r5] ldr r1, _080C92C0 adds r0, r0, r1 @@ -413343,7 +413343,7 @@ _080C929A: _080C92C0: .4byte 0x00001E5C _080C92C4: .4byte 0x0000DAC7 _080C92C8: - bl sub_080C7188 + bl HandleBoxChooseSelectionInput ldr r1, [r5] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -413355,7 +413355,7 @@ _080C92C8: cmp r0, #0xc8 beq _080C9354 bl sub_080CA638 - bl sub_080C717C + bl WallyHandleGetRawMonData bl sub_080C7128 ldr r0, [r5] ldr r2, _080C9318 @@ -413378,7 +413378,7 @@ _080C9308: b _080C9354 .align 2, 0 _080C9318: .4byte 0x000002CA -_080C931C: .4byte sub_080C7B48 +_080C931C: .4byte Cb_MainPSS _080C9320: ldr r1, _080C9334 adds r0, r0, r1 @@ -413393,7 +413393,7 @@ _080C932A: .align 2, 0 _080C9334: .4byte 0x000002CA _080C9338: - bl sub_080CBDC0 + bl ScrollToBox lsls r0, r0, #0x18 cmp r0, #0 bne _080C9354 @@ -413411,11 +413411,11 @@ _080C9354: bx r0 .align 2, 0 _080C935C: .4byte 0x000002CA -_080C9360: .4byte sub_080C7B48 +_080C9360: .4byte Cb_MainPSS thumb_func_end sub_080C9274 - thumb_func_start sub_080C9364 -sub_080C9364: @ 0x080C9364 + thumb_func_start BattleSetup_GetTerrainId +BattleSetup_GetTerrainId: @ 0x080C9364 push {r4, r5, lr} sub sp, #4 ldr r5, _080C9378 @@ -413436,14 +413436,14 @@ _080C937C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r5] ldrb r0, [r1] adds r0, #1 strb r0, [r1] b _080C93B4 _080C939A: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080C93B4 @@ -413462,10 +413462,10 @@ _080C93B4: .align 2, 0 _080C93BC: .4byte gUnknown_20399AF _080C93C0: .4byte sub_080C96EC - thumb_func_end sub_080C9364 + thumb_func_end BattleSetup_GetTerrainId - thumb_func_start sub_080C93C4 -sub_080C93C4: @ 0x080C93C4 + thumb_func_start Cb_ShowMonSummary +Cb_ShowMonSummary: @ 0x080C93C4 push {r4, r5, lr} sub sp, #4 ldr r5, _080C93D8 @@ -413486,14 +413486,14 @@ _080C93DC: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r5] ldrb r0, [r1] adds r0, #1 strb r0, [r1] b _080C9414 _080C93FA: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -413512,10 +413512,10 @@ _080C9414: .align 2, 0 _080C941C: .4byte gUnknown_20399AF _080C9420: .4byte sub_080C96EC - thumb_func_end sub_080C93C4 + thumb_func_end Cb_ShowMonSummary - thumb_func_start sub_080C9424 -sub_080C9424: @ 0x080C9424 + thumb_func_start Cb_GiveItemFromBag +Cb_GiveItemFromBag: @ 0x080C9424 push {r4, lr} sub sp, #4 ldr r4, _080C9438 @@ -413535,14 +413535,14 @@ _080C943C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] ldrb r0, [r1] adds r0, #1 strb r0, [r1] b _080C9472 _080C9456: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080C9472 @@ -413562,10 +413562,10 @@ _080C9472: .align 2, 0 _080C947C: .4byte gUnknown_20399AF _080C9480: .4byte sub_080C96EC - thumb_func_end sub_080C9424 + thumb_func_end Cb_GiveItemFromBag - thumb_func_start sub_080C9484 -sub_080C9484: @ 0x080C9484 + thumb_func_start Cb_OnCloseBoxPressed +Cb_OnCloseBoxPressed: @ 0x080C9484 push {r4, lr} ldr r0, _080C949C ldr r0, [r0] @@ -413596,7 +413596,7 @@ _080C94B8: movs r0, #0x20 bl sub_080A306C movs r0, #0xf - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C94D8 ldr r1, [r0] movs r0, #1 @@ -413605,7 +413605,7 @@ _080C94B8: .align 2, 0 _080C94D8: .4byte gUnknown_20399A8 _080C94DC: - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 beq _080C94F4 @@ -413613,12 +413613,12 @@ _080C94DC: bl SetPSSCallback b _080C95A4 .align 2, 0 -_080C94F0: .4byte sub_080C8DE8 +_080C94F0: .4byte Cb_CloseBoxWhileHoldingItem _080C94F4: movs r0, #5 bl sub_080A306C movs r0, #0 - bl sub_080CA4BC + bl PrintStorageActionText movs r0, #0 bl sub_080CA600 ldr r0, _080C9510 @@ -413660,7 +413660,7 @@ _080C9546: bl SetPSSCallback b _080C95A4 .align 2, 0 -_080C9554: .4byte sub_080C7B48 +_080C9554: .4byte Cb_MainPSS _080C9558: movs r0, #3 bl sub_080A306C @@ -413681,7 +413681,7 @@ _080C956E: .align 2, 0 _080C957C: .4byte gUnknown_20399A8 _080C9580: - bl sub_080FA4A0 + bl FldEffPoison_IsActive lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -413703,7 +413703,7 @@ _080C95A4: _080C95AC: .4byte gUnknown_202418D _080C95B0: .4byte gUnknown_20399A8 _080C95B4: .4byte sub_080C96EC - thumb_func_end sub_080C9484 + thumb_func_end Cb_OnCloseBoxPressed thumb_func_start sub_080C95B8 sub_080C95B8: @ 0x080C95B8 @@ -413737,7 +413737,7 @@ _080C95EC: movs r0, #0x20 bl sub_080A306C movs r0, #0xf - bl sub_080CA4BC + bl PrintStorageActionText ldr r0, _080C960C ldr r1, [r0] movs r0, #1 @@ -413746,7 +413746,7 @@ _080C95EC: .align 2, 0 _080C960C: .4byte gUnknown_20399A8 _080C9610: - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 beq _080C9628 @@ -413754,12 +413754,12 @@ _080C9610: bl SetPSSCallback b _080C96D8 .align 2, 0 -_080C9624: .4byte sub_080C8DE8 +_080C9624: .4byte Cb_CloseBoxWhileHoldingItem _080C9628: movs r0, #5 bl sub_080A306C movs r0, #0x12 - bl sub_080CA4BC + bl PrintStorageActionText movs r0, #0 bl sub_080CA600 ldr r0, _080C9644 @@ -413802,7 +413802,7 @@ _080C967C: bl SetPSSCallback b _080C96D8 .align 2, 0 -_080C9688: .4byte sub_080C7B48 +_080C9688: .4byte Cb_MainPSS _080C968C: movs r0, #3 bl sub_080A306C @@ -413823,7 +413823,7 @@ _080C96A2: .align 2, 0 _080C96B0: .4byte gUnknown_20399A8 _080C96B4: - bl sub_080FA4A0 + bl FldEffPoison_IsActive lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -413861,7 +413861,7 @@ sub_080C96EC: @ 0x080C96EC ldrb r0, [r0, #1] cmp r0, #3 bne _080C9720 - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -413886,13 +413886,13 @@ _080C9724: cmp r4, #3 beq _080C97BC _080C9736: - bl sub_080C983C + bl FreePSSData ldr r0, _080C9748 - bl sub_08000540 + bl SetMainCallback2 b _080C97CA .align 2, 0 _080C9744: .4byte gUnknown_20399B2 -_080C9748: .4byte sub_080C6F10 +_080C9748: .4byte Cb2_ExitPSS _080C974C: ldr r0, _080C9780 ldr r1, [r0] @@ -413909,22 +413909,22 @@ _080C974C: ldr r0, _080C9788 adds r1, r1, r0 ldrb r4, [r1] - bl sub_080C983C + bl FreePSSData ldr r0, _080C978C str r0, [sp] adds r0, r4, #0 mov r1, r8 adds r2, r6, #0 adds r3, r5, #0 - bl sub_081BF280 + bl ShowPokemonSummaryScreen b _080C97CA .align 2, 0 _080C9780: .4byte gUnknown_20399A8 _080C9784: .4byte 0x0000218C _080C9788: .4byte 0x00002188 -_080C978C: .4byte sub_080C7688 +_080C978C: .4byte Cb2_ReturnToPSS _080C9790: - bl sub_080C983C + bl FreePSSData bl sub_080D15AC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -413937,19 +413937,19 @@ _080C9790: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen b _080C97CA .align 2, 0 -_080C97B8: .4byte sub_080C7688 +_080C97B8: .4byte Cb2_ReturnToPSS _080C97BC: - bl sub_080C983C + bl FreePSSData ldr r2, _080C97DC movs r0, #0xb movs r1, #0 - bl sub_081AAA08 + bl GoToBagMenu _080C97CA: adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask add sp, #8 pop {r3} mov r8, r3 @@ -413957,11 +413957,11 @@ _080C97CA: pop {r0} bx r0 .align 2, 0 -_080C97DC: .4byte sub_080C7688 +_080C97DC: .4byte Cb2_ReturnToPSS thumb_func_end sub_080C96EC - thumb_func_start sub_080C97E0 -sub_080C97E0: @ 0x080C97E0 + thumb_func_start GiveChosenBagItem +GiveChosenBagItem: @ 0x080C97E0 push {lr} sub sp, #4 ldr r0, _080C9814 @@ -413983,7 +413983,7 @@ sub_080C97E0: @ 0x080C97E0 adds r0, r0, r1 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData b _080C982A .align 2, 0 _080C9814: .4byte gUnknown_203CB48 @@ -413998,34 +413998,34 @@ _080C982A: mov r0, sp ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem _080C9834: add sp, #4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C97E0 + thumb_func_end GiveChosenBagItem - thumb_func_start sub_080C983C -sub_080C983C: @ 0x080C983C + thumb_func_start FreePSSData +FreePSSData: @ 0x080C983C push {r4, lr} bl sub_080D1E90 bl sub_080CFA58 ldr r4, _080C985C ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] - bl sub_080034D4 + bl FreeAllWindowBuffers pop {r4} pop {r0} bx r0 .align 2, 0 _080C985C: .4byte gUnknown_20399A8 - thumb_func_end sub_080C983C + thumb_func_end FreePSSData - thumb_func_start sub_080C9860 -sub_080C9860: @ 0x080C9860 + thumb_func_start SetScrollingBackground +SetScrollingBackground: @ 0x080C9860 push {lr} sub sp, #4 ldr r1, _080C988C @@ -414037,7 +414037,7 @@ sub_080C9860: @ 0x080C9860 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r0, _080C9894 ldr r1, _080C9898 bl LZ77UnCompVram @@ -414049,26 +414049,26 @@ _080C988C: .4byte 0x00001F0F _080C9890: .4byte gUnknown_854BBFC _080C9894: .4byte gUnknown_854BC94 _080C9898: .4byte 0x0600F800 - thumb_func_end sub_080C9860 + thumb_func_end SetScrollingBackground - thumb_func_start sub_080C989C -sub_080C989C: @ 0x080C989C + thumb_func_start ScrollBackground +ScrollBackground: @ 0x080C989C push {lr} movs r0, #3 movs r1, #0x80 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0x80 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C989C + thumb_func_end ScrollBackground - thumb_func_start sub_080C98B8 -sub_080C98B8: @ 0x080C98B8 + thumb_func_start LoadPSSMenuGfx +LoadPSSMenuGfx: @ 0x080C98B8 push {r4, r5, lr} sub sp, #4 ldr r1, _080C9904 @@ -414081,7 +414081,7 @@ sub_080C98B8: @ 0x080C98B8 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r0, _080C990C ldr r5, _080C9910 ldr r1, [r5] @@ -414091,11 +414091,11 @@ sub_080C98B8: @ 0x080C98B8 ldr r1, [r5] adds r1, r1, r4 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #4 pop {r4, r5} pop {r0} @@ -414106,13 +414106,13 @@ _080C9908: .4byte gUnknown_854BF9C _080C990C: .4byte gUnknown_854BDC0 _080C9910: .4byte gUnknown_20399A8 _080C9914: .4byte 0x00005AC4 - thumb_func_end sub_080C98B8 + thumb_func_end LoadPSSMenuGfx thumb_func_start sub_080C9918 sub_080C9918: @ 0x080C9918 push {lr} ldr r0, _080C9930 - bl sub_08003090 + bl InitWindows lsls r0, r0, #0x10 cmp r0, #0 beq _080C9934 @@ -414129,8 +414129,8 @@ _080C9936: .align 2, 0 thumb_func_end sub_080C9918 - thumb_func_start sub_080C993C -sub_080C993C: @ 0x080C993C + thumb_func_start LoadWaveformSpritePalette +LoadWaveformSpritePalette: @ 0x080C993C push {lr} ldr r0, _080C9948 bl LoadSpritePalette @@ -414138,7 +414138,7 @@ sub_080C993C: @ 0x080C993C bx r0 .align 2, 0 _080C9948: .4byte gUnknown_854C9F4 - thumb_func_end sub_080C993C + thumb_func_end LoadWaveformSpritePalette thumb_func_start sub_080C994C sub_080C994C: @ 0x080C994C @@ -414146,15 +414146,15 @@ sub_080C994C: @ 0x080C994C ldr r0, _080C9984 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C9988 movs r1, #0x20 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C998C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _080C9990 ldr r0, [r0] ldrb r0, [r0, #1] @@ -414163,7 +414163,7 @@ sub_080C994C: @ 0x080C994C ldr r0, _080C9994 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _080C99A2 .align 2, 0 _080C9984: .4byte gUnknown_854BEFC @@ -414175,15 +414175,15 @@ _080C9998: ldr r0, _080C99C0 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _080C99A2: ldr r1, _080C99C4 movs r0, #0xa bl SetGpuReg - bl sub_080C9B8C + bl LoadCursorMonSprite bl sub_080C99C8 bl sub_080C9A38 - bl sub_080C9AA4 + bl RefreshCursorMonData pop {r0} bx r0 .align 2, 0 @@ -414255,7 +414255,7 @@ sub_080C9A38: @ 0x080C9A38 str r0, [sp] str r1, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet movs r4, #0 _080C9A4E: lsls r1, r4, #6 @@ -414266,7 +414266,7 @@ _080C9A4E: ldr r0, _080C9A94 movs r2, #9 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080C9A98 @@ -414298,8 +414298,8 @@ _080C9A9C: .4byte 0x00000D98 _080C9AA0: .4byte gUnknown_20205AC thumb_func_end sub_080C9A38 - thumb_func_start sub_080C9AA4 -sub_080C9AA4: @ 0x080C9AA4 + thumb_func_start RefreshCursorMonData +RefreshCursorMonData: @ 0x080C9AA4 push {lr} ldr r0, _080C9ACC ldr r1, [r0] @@ -414309,22 +414309,22 @@ sub_080C9AA4: @ 0x080C9AA4 subs r2, #4 adds r1, r1, r2 ldr r1, [r1] - bl sub_080C9CC0 + bl LoadCursorMonGfx bl sub_080C9D70 bl sub_080C9EC0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 .align 2, 0 _080C9ACC: .4byte gUnknown_20399A8 _080C9AD0: .4byte 0x00000CE4 - thumb_func_end sub_080C9AA4 + thumb_func_end RefreshCursorMonData - thumb_func_start sub_080C9AD4 -sub_080C9AD4: @ 0x080C9AD4 + thumb_func_start BoxSetMosaic +BoxSetMosaic: @ 0x080C9AD4 push {lr} - bl sub_080C9AA4 + bl RefreshCursorMonData ldr r3, _080C9B24 ldr r0, [r3] movs r1, #0x89 @@ -414365,7 +414365,7 @@ _080C9B20: .align 2, 0 _080C9B24: .4byte gUnknown_20399A8 _080C9B28: .4byte sub_080C9B44 - thumb_func_end sub_080C9AD4 + thumb_func_end BoxSetMosaic thumb_func_start sub_080C9B2C sub_080C9B2C: @ 0x080C9B2C @@ -414424,8 +414424,8 @@ _080C9B82: _080C9B88: .4byte sub_08007140 thumb_func_end sub_080C9B44 - thumb_func_start sub_080C9B8C -sub_080C9B8C: @ 0x080C9B8C + thumb_func_start LoadCursorMonSprite +LoadCursorMonSprite: @ 0x080C9B8C push {r4, r5, r6, r7, lr} sub sp, #0x28 ldr r0, _080C9C20 @@ -414488,7 +414488,7 @@ _080C9BE0: movs r1, #0 str r1, [r0] adds r0, r3, #0 - bl sub_08008210 + bl LoadSpriteSheet lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, #0 @@ -414544,7 +414544,7 @@ _080C9C80: movs r1, #0x28 movs r2, #0x30 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -414570,10 +414570,10 @@ _080C9CB0: .align 2, 0 _080C9CB8: .4byte gUnknown_20399A8 _080C9CBC: .4byte 0x0000DAC6 - thumb_func_end sub_080C9B8C + thumb_func_end LoadCursorMonSprite - thumb_func_start sub_080C9CC0 -sub_080C9CC0: @ 0x080C9CC0 + thumb_func_start LoadCursorMonGfx +LoadCursorMonGfx: @ 0x080C9CC0 push {r4, r5, r6, r7, lr} sub sp, #4 adds r3, r1, #0 @@ -414620,7 +414620,7 @@ sub_080C9CC0: @ 0x080C9CC0 ldrh r1, [r0] adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, [r6] adds r0, r0, r7 ldr r1, [r0] @@ -414652,7 +414652,7 @@ _080C9D66: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080C9CC0 + thumb_func_end LoadCursorMonGfx thumb_func_start sub_080C9D70 sub_080C9D70: @ 0x080C9D70 @@ -414662,7 +414662,7 @@ sub_080C9D70: @ 0x080C9D70 sub sp, #0xc movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r6, _080C9DF0 ldr r2, [r6] ldrb r0, [r2, #1] @@ -414770,7 +414770,7 @@ _080C9E2C: _080C9E52: movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r4, _080C9E94 ldr r1, [r4] ldr r2, _080C9E98 @@ -414892,7 +414892,7 @@ _080C9F4A: movs r0, #0 bl sub_080D21B8 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #4 pop {r4} pop {r0} @@ -414914,7 +414914,7 @@ sub_080C9F68: @ 0x080C9F68 ldr r0, _080C9FE8 movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r2, [r4] adds r2, #0xb0 movs r0, #0x16 @@ -414946,7 +414946,7 @@ sub_080C9F68: @ 0x080C9F68 movs r0, #1 bl sub_080CA1E8 movs r0, #1 - bl sub_080CB05C + bl CreatePartyMonsSprites movs r0, #2 bl sub_080D21B8 movs r0, #1 @@ -414974,7 +414974,7 @@ _080C9FF4: bl sub_080D21B8 _080CA016: movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _080CA030 ldr r0, [r0] ldr r1, _080CA034 @@ -414990,8 +414990,8 @@ _080CA030: .4byte gUnknown_20399A8 _080CA034: .4byte 0x000002C7 thumb_func_end sub_080C9F68 - thumb_func_start sub_080CA038 -sub_080CA038: @ 0x080CA038 + thumb_func_start SetUpShowPartyMenu +SetUpShowPartyMenu: @ 0x080CA038 push {lr} ldr r0, _080CA064 ldr r1, [r0] @@ -415009,17 +415009,17 @@ sub_080CA038: @ 0x080CA038 adds r1, r1, r0 strb r3, [r1] movs r0, #0 - bl sub_080CB05C + bl CreatePartyMonsSprites pop {r0} bx r0 .align 2, 0 _080CA064: .4byte gUnknown_20399A8 _080CA068: .4byte 0x000002C2 _080CA06C: .4byte 0x000002C5 - thumb_func_end sub_080CA038 + thumb_func_end SetUpShowPartyMenu - thumb_func_start sub_080CA070 -sub_080CA070: @ 0x080CA070 + thumb_func_start ShowPartyMenu +ShowPartyMenu: @ 0x080CA070 push {r4, lr} ldr r4, _080CA0CC ldr r2, [r4] @@ -415046,7 +415046,7 @@ sub_080CA070: @ 0x080CA070 movs r0, #1 bl sub_080D21B8 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #8 bl sub_080CB364 ldr r1, [r4] @@ -415077,10 +415077,10 @@ _080CA0E0: bx r1 .align 2, 0 _080CA0E8: .4byte gUnknown_20399AC - thumb_func_end sub_080CA070 + thumb_func_end ShowPartyMenu - thumb_func_start sub_080CA0EC -sub_080CA0EC: @ 0x080CA0EC + thumb_func_start SetUpHidePartyMenu +SetUpHidePartyMenu: @ 0x080CA0EC push {r4, lr} ldr r4, _080CA120 ldr r1, [r4] @@ -415110,10 +415110,10 @@ _080CA118: _080CA120: .4byte gUnknown_20399A8 _080CA124: .4byte 0x000002C2 _080CA128: .4byte 0x000002C5 - thumb_func_end sub_080CA0EC + thumb_func_end SetUpHidePartyMenu - thumb_func_start sub_080CA12C -sub_080CA12C: @ 0x080CA12C + thumb_func_start HidePartyMenu +HidePartyMenu: @ 0x080CA12C push {r4, r5, lr} sub sp, #8 ldr r5, _080CA1A4 @@ -415166,7 +415166,7 @@ sub_080CA12C: @ 0x080CA12C cmp r0, #0x14 beq _080CA1B0 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 b _080CA1DA .align 2, 0 @@ -415178,7 +415178,7 @@ _080CA1B0: movs r1, #0 strb r1, [r0] bl DestroyAllPartyMonIcons - bl sub_080CE188 + bl CompactPartySlots movs r0, #2 str r0, [sp] movs r1, #0 @@ -415188,7 +415188,7 @@ _080CA1B0: movs r0, #2 bl sub_080D21B8 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _080CA1D8: movs r0, #0 _080CA1DA: @@ -415198,7 +415198,7 @@ _080CA1DA: bx r1 .align 2, 0 _080CA1E4: .4byte gUnknown_20399AC - thumb_func_end sub_080CA12C + thumb_func_end HidePartyMenu thumb_func_start sub_080CA1E8 sub_080CA1E8: @ 0x080CA1E8 @@ -415225,7 +415225,7 @@ _080CA210: movs r0, #2 bl sub_080D21B8 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #4 pop {r0} bx r0 @@ -415338,7 +415338,7 @@ _080CA2DC: ldr r1, _080CA308 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData rsbs r1, r0, #0 orrs r1, r0 lsrs r1, r1, #0x1f @@ -415420,8 +415420,8 @@ _080CA37C: .4byte gUnknown_854C754 _080CA380: .4byte gUnknown_20399A8 thumb_func_end sub_080CA30C - thumb_func_start sub_080CA384 -sub_080CA384: @ 0x080CA384 + thumb_func_start PokecenterHealEffect_3 +PokecenterHealEffect_3: @ 0x080CA384 push {lr} sub sp, #4 bl sub_080CA2D8 @@ -415435,15 +415435,15 @@ sub_080CA384: @ 0x080CA384 movs r0, #1 bl sub_080D21B8 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080CA384 + thumb_func_end PokecenterHealEffect_3 - thumb_func_start sub_080CA3B0 -sub_080CA3B0: @ 0x080CA3B0 + thumb_func_start SetUpDoShowPartyMenu +SetUpDoShowPartyMenu: @ 0x080CA3B0 push {lr} ldr r0, _080CA3CC ldr r0, [r0] @@ -415453,16 +415453,16 @@ sub_080CA3B0: @ 0x080CA3B0 strb r1, [r0] movs r0, #6 bl sub_080A306C - bl sub_080CA038 + bl SetUpShowPartyMenu pop {r0} bx r0 .align 2, 0 _080CA3CC: .4byte gUnknown_20399A8 _080CA3D0: .4byte 0x000002C6 - thumb_func_end sub_080CA3B0 + thumb_func_end SetUpDoShowPartyMenu - thumb_func_start sub_080CA3D4 -sub_080CA3D4: @ 0x080CA3D4 + thumb_func_start DoShowPartyMenu +DoShowPartyMenu: @ 0x080CA3D4 push {r4, r5, lr} ldr r4, _080CA3F0 ldr r0, [r4] @@ -415484,7 +415484,7 @@ _080CA3F8: beq _080CA438 b _080CA43C _080CA3FE: - bl sub_080CA070 + bl ShowPartyMenu lsls r0, r0, #0x18 cmp r0, #0 bne _080CA43C @@ -415501,7 +415501,7 @@ _080CA40E: ldrb r0, [r0] cmp r0, #0 beq _080CA428 - bl sub_080C9AD4 + bl BoxSetMosaic _080CA428: ldr r1, [r4] adds r1, r1, r5 @@ -415520,7 +415520,7 @@ _080CA43E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080CA3D4 + thumb_func_end DoShowPartyMenu thumb_func_start sub_080CA444 sub_080CA444: @ 0x080CA444 @@ -415575,14 +415575,14 @@ sub_080CA480: @ 0x080CA480 movs r3, #0 bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r0} bx r0 thumb_func_end sub_080CA480 - thumb_func_start sub_080CA4BC -sub_080CA4BC: @ 0x080CA4BC + thumb_func_start PrintStorageActionText +PrintStorageActionText: @ 0x080CA4BC push {r4, r5, r6, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -415633,7 +415633,7 @@ _080CA524: _080CA52C: .4byte gUnknown_20399A8 _080CA530: .4byte 0x000021E0 _080CA534: - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 beq _080CA558 @@ -415641,7 +415641,7 @@ _080CA534: ldr r4, [r0] ldr r0, _080CA554 adds r4, r4, r0 - bl sub_080D0B58 + bl GetMovingItemName adds r1, r0, #0 adds r0, r4, #0 b _080CA564 @@ -415687,10 +415687,10 @@ _080CA594: lsls r1, r6, #3 adds r1, r1, r2 ldr r1, [r1] - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, [r5] adds r2, r2, r4 movs r0, #2 @@ -415706,14 +415706,14 @@ _080CA594: movs r0, #1 movs r1, #2 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -415723,7 +415723,7 @@ _080CA5F0: .4byte gUnknown_20399A8 _080CA5F4: .4byte 0x000021EB _080CA5F8: .4byte 0x00002190 _080CA5FC: .4byte gUnknown_854CA1C - thumb_func_end sub_080CA4BC + thumb_func_end PrintStorageActionText thumb_func_start sub_080CA600 sub_080CA600: @ 0x080CA600 @@ -415746,7 +415746,7 @@ sub_080CA600: @ 0x080CA600 lsls r4, r4, #0x18 asrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround add sp, #0xc pop {r4} pop {r0} @@ -415762,7 +415762,7 @@ sub_080CA638: @ 0x080CA638 movs r1, #0 bl sub_08198134 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 thumb_func_end sub_080CA638 @@ -415772,26 +415772,26 @@ sub_080CA64C: @ 0x080CA64C push {lr} bl InitMenu movs r0, #0x12 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x13 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x14 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x15 - bl sub_080CF7B0 + bl SetMenuText bl sub_080D1D34 cmp r0, #0 beq _080CA678 movs r0, #0x16 - bl sub_080CF7B0 + bl SetMenuText _080CA678: bl sub_080CF84C pop {r0} bx r0 thumb_func_end sub_080CA64C - thumb_func_start sub_080CA680 -sub_080CA680: @ 0x080CA680 + thumb_func_start AddWallpapersMenu +AddWallpapersMenu: @ 0x080CA680 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -415812,49 +415812,49 @@ _080CA69A: b _080CA70A _080CA6A4: movs r0, #0x17 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x18 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x19 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x1a - bl sub_080CF7B0 + bl SetMenuText b _080CA70A _080CA6BE: movs r0, #0x1b - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x1c - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x1d - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x1e - bl sub_080CF7B0 + bl SetMenuText b _080CA70A _080CA6D8: movs r0, #0x1f - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x20 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x21 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x22 - bl sub_080CF7B0 + bl SetMenuText b _080CA70A _080CA6F2: movs r0, #0x23 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x24 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x25 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x26 - bl sub_080CF7B0 + bl SetMenuText _080CA70A: bl sub_080CF84C pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080CA680 + thumb_func_end AddWallpapersMenu thumb_func_start sub_080CA714 sub_080CA714: @ 0x080CA714 @@ -415910,7 +415910,7 @@ _080CA774: .4byte gUnknown_20399B2 thumb_func_start sub_080CA778 sub_080CA778: @ 0x080CA778 push {r4, r5, r6, lr} - bl sub_080D27A4 + bl LoadMonIconPalettes movs r2, #0 ldr r3, _080CA808 ldr r5, _080CA80C @@ -416009,8 +416009,8 @@ _080CA830: .align 2, 0 thumb_func_end sub_080CA820 - thumb_func_start sub_080CA838 -sub_080CA838: @ 0x080CA838 + thumb_func_start CreateMovingMonIcon +CreateMovingMonIcon: @ 0x080CA838 push {r4, r5, r6, lr} sub sp, #8 ldr r5, _080CA88C @@ -416018,12 +416018,12 @@ sub_080CA838: @ 0x080CA838 ldr r4, _080CA890 adds r0, r0, r4 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 ldr r0, [r5] adds r0, r0, r4 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -416053,7 +416053,7 @@ _080CA88C: .4byte gUnknown_20399A8 _080CA890: .4byte 0x000020A4 _080CA894: .4byte 0x00000A6C _080CA898: .4byte sub_080CB974 - thumb_func_end sub_080CA838 + thumb_func_end CreateMovingMonIcon thumb_func_start sub_080CA89C sub_080CA89C: @ 0x080CA89C @@ -416078,7 +416078,7 @@ _080CA8BC: mov r0, sb adds r1, r6, #0 movs r2, #0x41 - bl sub_080D15D0 + bl GetBoxMonDataAt lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -416086,7 +416086,7 @@ _080CA8BC: mov r0, sb adds r1, r6, #0 movs r2, #0 - bl sub_080D15D0 + bl GetBoxMonDataAt adds r1, r0, #0 lsls r2, r5, #1 adds r2, r2, r5 @@ -416164,7 +416164,7 @@ _080CA96A: mov r0, sb adds r1, r6, #0 movs r2, #0xc - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 bne _080CA990 ldr r0, _080CA9AC @@ -416410,7 +416410,7 @@ _080CAB2E: ldr r0, [r0] cmp r0, #0 beq _080CAB4E - bl sub_080CBB88 + bl DestroyBoxMonIcon ldr r0, [r7] ldr r1, _080CAB68 adds r0, r0, r1 @@ -416614,7 +416614,7 @@ _080CAC6C: ldrb r0, [r0] adds r1, r5, #0 movs r2, #0xc - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 bne _080CACFA mov r2, sl @@ -416707,7 +416707,7 @@ sub_080CAD40: @ 0x080CAD40 ldr r1, _080CADB0 adds r3, r3, r1 strh r5, [r3] - bl sub_080CAF64 + bl SetBoxSpeciesAndPersonalities cmp r4, #0 ble _080CADB8 ldr r0, [r6] @@ -416936,8 +416936,8 @@ _080CAF5E: bx r1 thumb_func_end sub_080CADF8 - thumb_func_start sub_080CAF64 -sub_080CAF64: @ 0x080CAF64 + thumb_func_start SetBoxSpeciesAndPersonalities +SetBoxSpeciesAndPersonalities: @ 0x080CAF64 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -416958,7 +416958,7 @@ _080CAF7E: adds r0, r6, #0 adds r1, r4, #0 movs r2, #0x41 - bl sub_080D15D0 + bl GetBoxMonDataAt mov r2, sb ldr r1, [r2] lsls r2, r5, #1 @@ -416972,7 +416972,7 @@ _080CAF7E: adds r0, r6, #0 adds r1, r4, #0 movs r2, #0 - bl sub_080D15D0 + bl GetBoxMonDataAt mov r2, sb ldr r1, [r2] lsls r2, r5, #2 @@ -417004,7 +417004,7 @@ _080CAFDC: .4byte gUnknown_20399A8 _080CAFE0: .4byte 0x00000BA8 _080CAFE4: .4byte 0x00000BE4 _080CAFE8: .4byte 0x00000C5C - thumb_func_end sub_080CAF64 + thumb_func_end SetBoxSpeciesAndPersonalities thumb_func_start DestroyBoxMonIconAtPosition DestroyBoxMonIconAtPosition: @ 0x080CAFEC @@ -417019,7 +417019,7 @@ DestroyBoxMonIconAtPosition: @ 0x080CAFEC ldr r0, [r1] cmp r0, #0 beq _080CB012 - bl sub_080CBB88 + bl DestroyBoxMonIcon ldr r0, [r5] ldr r1, _080CB01C adds r0, r0, r1 @@ -417068,8 +417068,8 @@ _080CB054: .4byte gUnknown_20399A8 _080CB058: .4byte 0x00000A88 thumb_func_end SetBoxMonIconObjMode - thumb_func_start sub_080CB05C -sub_080CB05C: @ 0x080CB05C + thumb_func_start CreatePartyMonsSprites +CreatePartyMonsSprites: @ 0x080CB05C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -417080,12 +417080,12 @@ sub_080CB05C: @ 0x080CB05C ldr r4, _080CB100 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #1 str r0, [sp] @@ -417111,14 +417111,14 @@ _080CB0A4: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, #0 beq _080CB108 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 subs r0, r6, #1 lsls r3, r0, #1 @@ -417218,7 +417218,7 @@ _080CB16E: ldr r1, _080CB1C0 adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080CB1A6 ldr r0, [r7] @@ -417249,7 +417249,7 @@ _080CB1B0: .align 2, 0 _080CB1BC: .4byte gUnknown_20399A8 _080CB1C0: .4byte gUnknown_2024190 - thumb_func_end sub_080CB05C + thumb_func_end CreatePartyMonsSprites thumb_func_start sub_080CB1C4 sub_080CB1C4: @ 0x080CB1C4 @@ -417467,7 +417467,7 @@ DestroyMovingMonIcon: @ 0x080CB338 ldr r0, [r0] cmp r0, #0 beq _080CB356 - bl sub_080CBB88 + bl DestroyBoxMonIcon ldr r0, [r4] ldr r1, _080CB360 adds r0, r0, r1 @@ -417562,7 +417562,7 @@ DestroyPartyMonIcon: @ 0x080CB3DC ldr r0, [r1] cmp r0, #0 beq _080CB406 - bl sub_080CBB88 + bl DestroyBoxMonIcon ldr r0, [r5] movs r1, #0xa7 lsls r1, r1, #4 @@ -417593,7 +417593,7 @@ _080CB416: ldr r0, [r0] cmp r0, #0 beq _080CB43A - bl sub_080CBB88 + bl DestroyBoxMonIcon ldr r0, [r6] movs r1, #0xa7 lsls r1, r1, #4 @@ -418200,7 +418200,7 @@ sub_080CB894: @ 0x080CB894 adds r0, r0, r1 ldr r0, [r0] ldr r0, [r0] - bl sub_080CBB88 + bl DestroyBoxMonIcon ldr r0, [r4] ldr r1, _080CB8D4 adds r0, r0, r1 @@ -418524,7 +418524,7 @@ sub_080CBAA4: @ 0x080CBAA4 asrs r2, r2, #0x10 mov r0, sp mov r3, sb - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -418577,8 +418577,8 @@ _080CBB78: bx r1 thumb_func_end sub_080CBAA4 - thumb_func_start sub_080CBB88 -sub_080CBB88: @ 0x080CBB88 + thumb_func_start DestroyBoxMonIcon +DestroyBoxMonIcon: @ 0x080CBB88 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -418589,7 +418589,7 @@ sub_080CBB88: @ 0x080CBB88 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080CBB88 + thumb_func_end DestroyBoxMonIcon thumb_func_start sub_080CBBA0 sub_080CBBA0: @ 0x080CBBA0 @@ -418599,7 +418599,7 @@ sub_080CBBA0: @ 0x080CBBA0 lsrs r4, r4, #0x18 ldr r0, _080CBBC8 movs r1, #2 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080CBBCC @@ -418620,7 +418620,7 @@ _080CBBCC: .4byte gUnknown_3005B60 sub_080CBBD0: @ 0x080CBBD0 push {lr} ldr r0, _080CBBE0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -418697,9 +418697,9 @@ _080CBC5C: ldr r2, _080CBC8C adds r1, r1, r2 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #2 - bl sub_08001B48 + bl ShowBg b _080CBCCC .align 2, 0 _080CBC88: .4byte gUnknown_20399A8 @@ -418707,10 +418707,10 @@ _080CBC8C: .4byte 0x00004AC4 _080CBC90: ldrb r0, [r4, #0xc] movs r1, #0 - bl sub_080CC014 + bl LoadWallpaperGfx b _080CBCCC _080CBC9A: - bl sub_080CC274 + bl WaitForWallpaperGfxLoad cmp r0, #0 beq _080CBCD2 ldrb r0, [r4, #0xc] @@ -418726,7 +418726,7 @@ _080CBC9A: _080CBCBC: .4byte 0x00005B0A _080CBCC0: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _080CBCCC _080CBCC8: movs r0, #0 @@ -418858,8 +418858,8 @@ _080CBDB8: .4byte 0x00000A65 _080CBDBC: .4byte 0x00000A63 thumb_func_end SetUpScrollToBox - thumb_func_start sub_080CBDC0 -sub_080CBDC0: @ 0x080CBDC0 + thumb_func_start ScrollToBox +ScrollToBox: @ 0x080CBDC0 push {r4, r5, r6, lr} ldr r4, _080CBDDC ldr r1, [r4] @@ -418889,14 +418889,14 @@ _080CBDEA: ldrb r1, [r1] lsls r1, r1, #0x18 asrs r1, r1, #0x18 - bl sub_080CC014 + bl LoadWallpaperGfx ldr r1, [r4] adds r1, r1, r5 ldrb r0, [r1] adds r0, #1 strb r0, [r1] _080CBE08: - bl sub_080CC274 + bl WaitForWallpaperGfxLoad cmp r0, #0 beq _080CBEA6 ldr r6, _080CBE50 @@ -418977,7 +418977,7 @@ _080CBEA8: .align 2, 0 _080CBEB0: .4byte gUnknown_20399A8 _080CBEB4: .4byte 0x00000A63 - thumb_func_end sub_080CBDC0 + thumb_func_end ScrollToBox thumb_func_start sub_080CBEB8 sub_080CBEB8: @ 0x080CBEB8 @@ -419016,8 +419016,8 @@ _080CBEEC: .align 2, 0 thumb_func_end sub_080CBEB8 - thumb_func_start sub_080CBEF4 -sub_080CBEF4: @ 0x080CBEF4 + thumb_func_start SetWallpaperForCurrentBox +SetWallpaperForCurrentBox: @ 0x080CBEF4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -419039,10 +419039,10 @@ sub_080CBEF4: @ 0x080CBEF4 .align 2, 0 _080CBF1C: .4byte gUnknown_20399A8 _080CBF20: .4byte 0x00000A62 - thumb_func_end sub_080CBEF4 + thumb_func_end SetWallpaperForCurrentBox - thumb_func_start sub_080CBF24 -sub_080CBF24: @ 0x080CBF24 + thumb_func_start DoWallpaperGfxChange +DoWallpaperGfxChange: @ 0x080CBF24 push {r4, lr} sub sp, #4 ldr r1, _080CBF44 @@ -419079,7 +419079,7 @@ _080CBF64: movs r1, #1 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] ldr r2, _080CBF88 adds r1, r1, r2 @@ -419088,7 +419088,7 @@ _080CBF64: _080CBF84: .4byte 0x0000FFFF _080CBF88: .4byte 0x00000A62 _080CBF8C: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080CC008 @@ -419096,10 +419096,10 @@ _080CBF8C: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080CC014 + bl LoadWallpaperGfx b _080CBFEA _080CBFA6: - bl sub_080CC274 + bl WaitForWallpaperGfxLoad cmp r0, #1 bne _080CC008 bl sub_080CC828 @@ -419114,7 +419114,7 @@ _080CBFA6: movs r1, #1 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] ldr r2, _080CBFDC adds r1, r1, r2 @@ -419124,7 +419124,7 @@ _080CBFD4: .4byte gUnknown_20399A8 _080CBFD8: .4byte 0x0000FFFF _080CBFDC: .4byte 0x00000A62 _080CBFE0: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _080CC008 @@ -419152,10 +419152,10 @@ _080CC00A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080CBF24 + thumb_func_end DoWallpaperGfxChange - thumb_func_start sub_080CC014 -sub_080CC014: @ 0x080CC014 + thumb_func_start LoadWallpaperGfx +LoadWallpaperGfx: @ 0x080CC014 push {r4, r5, r6, r7, lr} sub sp, #8 ldr r4, _080CC0C8 @@ -419240,7 +419240,7 @@ _080CC05A: adds r1, r1, r3 lsrs r1, r1, #0x10 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette b _080CC0FC .align 2, 0 _080CC0C8: .4byte gUnknown_20399A8 @@ -419264,7 +419264,7 @@ _080CC0E8: _080CC0FC: ldr r0, [r6] mov r1, sp - bl sub_08199858 + bl malloc_and_decompress adds r1, r0, #0 ldr r0, _080CC130 ldr r3, [r0] @@ -419342,7 +419342,7 @@ _080CC138: adds r1, r1, r3 lsrs r1, r1, #0x10 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette b _080CC1EA .align 2, 0 _080CC1BC: .4byte gUnknown_8555A40 @@ -419365,7 +419365,7 @@ _080CC1D4: _080CC1EA: ldr r0, [r6] mov r1, sp - bl sub_08199858 + bl malloc_and_decompress ldr r6, _080CC268 ldr r1, [r6] ldr r5, _080CC26C @@ -419377,7 +419377,7 @@ _080CC1EA: adds r0, r0, r4 ldr r0, [r0] add r1, sp, #4 - bl sub_08199858 + bl malloc_and_decompress adds r4, r0, #0 ldr r0, [r6] adds r0, r0, r5 @@ -419394,7 +419394,7 @@ _080CC1EA: adds r0, r4, #0 bl CpuSet adds r0, r4, #0 - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r5, r0, r5 ldr r1, [r5] @@ -419409,7 +419409,7 @@ _080CC1EA: bl LoadBgTiles _080CC24E: movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r4, r5, r6, r7} pop {r0} @@ -419421,12 +419421,12 @@ _080CC264: .4byte gUnknown_2037434 _080CC268: .4byte gUnknown_20399A8 _080CC26C: .4byte 0x00000A68 _080CC270: .4byte gUnknown_8555B00 - thumb_func_end sub_080CC014 + thumb_func_end LoadWallpaperGfx - thumb_func_start sub_080CC274 -sub_080CC274: @ 0x080CC274 + thumb_func_start WaitForWallpaperGfxLoad +WaitForWallpaperGfxLoad: @ 0x080CC274 push {r4, r5, lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -419441,7 +419441,7 @@ _080CC286: ldr r0, [r0] cmp r0, #0 beq _080CC2A0 - bl sub_08000BF0 + bl Free ldr r0, [r5] ldr r1, _080CC2AC adds r0, r0, r1 @@ -419455,7 +419455,7 @@ _080CC2A2: .align 2, 0 _080CC2A8: .4byte gUnknown_20399A8 _080CC2AC: .4byte 0x00000A68 - thumb_func_end sub_080CC274 + thumb_func_end WaitForWallpaperGfxLoad thumb_func_start sub_080CC2B0 sub_080CC2B0: @ 0x080CC2B0 @@ -419504,7 +419504,7 @@ sub_080CC2B0: @ 0x080CC2B0 adds r1, r5, #0 movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect cmp r7, #0 beq _080CC346 cmp r7, #0 @@ -419675,7 +419675,7 @@ sub_080CC3C4: @ 0x080CC3C4 lsls r1, r1, #2 str r1, [r0] adds r0, r7, #0 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r4, sl @@ -419697,7 +419697,7 @@ sub_080CC3C4: @ 0x080CC3C4 orrs r0, r1 str r0, [r3] adds r0, r7, #0 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sl @@ -419736,7 +419736,7 @@ sub_080CC3C4: @ 0x080CC3C4 movs r3, #0 bl sub_080C66A4 ldr r0, [sp, #0x2c] - bl sub_08008210 + bl LoadSpriteSheet mov r0, r8 bl GetBoxNamePtr bl StringLength @@ -419754,7 +419754,7 @@ _080CC4F0: ldr r0, _080CC574 movs r2, #0x1c movs r3, #0x18 - bl sub_08006B0C + bl CreateSprite adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -419923,7 +419923,7 @@ _080CC630: movs r3, #0 bl sub_080C66A4 adds r0, r6, #0 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, [sp, #0x28] bl GetBoxWallpaper lsls r0, r0, #0x18 @@ -419932,7 +419932,7 @@ _080CC630: adds r0, r0, r1 mov r1, sb movs r2, #4 - bl sub_080A1200 + bl LoadPalette ldr r0, [sp, #0x28] bl GetBoxNamePtr bl StringLength @@ -419968,7 +419968,7 @@ _080CC6BA: add r0, sp, #4 movs r2, #0x1c movs r3, #0x18 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sb @@ -420218,7 +420218,7 @@ sub_080CC898: @ 0x080CC898 sub_080CC8A8: @ 0x080CC8A8 push {r4, r5, lr} ldr r0, _080CC924 - bl sub_08008210 + bl LoadSpriteSheet movs r5, #0 _080CC8B2: lsls r1, r5, #4 @@ -420231,7 +420231,7 @@ _080CC8B2: ldr r0, _080CC928 movs r2, #0x1c movs r3, #0x16 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -420607,7 +420607,7 @@ sub_080CCB64: @ 0x080CCB64 adds r1, r5, #0 adds r2, r6, #0 adds r3, r4, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -420735,7 +420735,7 @@ sub_080CCC68: @ 0x080CCC68 ldr r1, _080CCCBC movs r2, #0x64 bl memcpy - bl sub_080CA838 + bl CreateMovingMonIcon _080CCCA2: pop {r0} bx r0 @@ -420870,7 +420870,7 @@ sub_080CCD80: @ 0x080CCD80 ldr r1, _080CCDB0 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData b _080CCDBE .align 2, 0 _080CCDA8: .4byte gUnknown_2039A18 @@ -421348,7 +421348,7 @@ _080CD154: .4byte 0x000021FF _080CD158: .4byte gUnknown_2039A1A _080CD15C: .4byte 0x00000CB4 _080CD160: - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 bne _080CD178 @@ -421572,7 +421572,7 @@ _080CD330: .4byte gUnknown_2039A19 _080CD334: .4byte 0x000021FF _080CD338: .4byte gUnknown_2039A1A _080CD33C: - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 bne _080CD354 @@ -421832,8 +421832,8 @@ _080CD520: .4byte 0x00000D8C _080CD524: .4byte sub_080CD740 thumb_func_end sub_080CD4E0 - thumb_func_start sub_080CD528 -sub_080CD528: @ 0x080CD528 + thumb_func_start DoMonPlaceChange +DoMonPlaceChange: @ 0x080CD528 push {lr} ldr r0, _080CD540 ldr r0, [r0] @@ -421841,7 +421841,7 @@ sub_080CD528: @ 0x080CD528 adds r0, r0, r1 ldr r0, [r0] bl _call_via_r0 - thumb_func_end sub_080CD528 + thumb_func_end DoMonPlaceChange thumb_func_start sub_080CD538 sub_080CD538: @ 0x080CD538 @@ -421854,8 +421854,8 @@ _080CD540: .4byte gUnknown_20399A8 _080CD544: .4byte 0x00000D8C thumb_func_end sub_080CD538 - thumb_func_start sub_080CD548 -sub_080CD548: @ 0x080CD548 + thumb_func_start MonPlaceChange_Move +MonPlaceChange_Move: @ 0x080CD548 push {r4, r5, lr} ldr r4, _080CD564 ldr r1, [r4] @@ -421908,7 +421908,7 @@ _080CD598: ldr r0, [r0] movs r1, #3 bl StartSpriteAnim - bl sub_080CD7B4 + bl MoveMon b _080CD5C6 .align 2, 0 _080CD5B8: .4byte 0x00000CB4 @@ -421929,10 +421929,10 @@ _080CD5D2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080CD548 + thumb_func_end MonPlaceChange_Move - thumb_func_start sub_080CD5D8 -sub_080CD5D8: @ 0x080CD5D8 + thumb_func_start MonPlaceChange_Place +MonPlaceChange_Place: @ 0x080CD5D8 push {r4, r5, lr} ldr r4, _080CD5F4 ldr r0, [r4] @@ -421964,7 +421964,7 @@ _080CD5FE: ldr r0, [r0] movs r1, #2 bl StartSpriteAnim - bl sub_080CD828 + bl PlaceMon b _080CD638 .align 2, 0 _080CD61C: .4byte 0x00000CB4 @@ -421997,10 +421997,10 @@ _080CD64E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080CD5D8 + thumb_func_end MonPlaceChange_Place - thumb_func_start sub_080CD654 -sub_080CD654: @ 0x080CD654 + thumb_func_start MonPlaceChange_Shift +MonPlaceChange_Shift: @ 0x080CD654 push {r4, r5, lr} ldr r4, _080CD670 ldr r1, [r4] @@ -422085,7 +422085,7 @@ _080CD6E4: ldrb r0, [r0] ldr r1, _080CD720 ldrb r1, [r1] - bl sub_080CD98C + bl SetShiftedMonData ldr r1, [r4] adds r1, r1, r5 _080CD710: @@ -422106,7 +422106,7 @@ _080CD72A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080CD654 + thumb_func_end MonPlaceChange_Shift thumb_func_start sub_080CD730 sub_080CD730: @ 0x080CD730 @@ -422191,8 +422191,8 @@ _080CD7AE: .align 2, 0 thumb_func_end sub_080CD784 - thumb_func_start sub_080CD7B4 -sub_080CD7B4: @ 0x080CD7B4 + thumb_func_start MoveMon +MoveMon: @ 0x080CD7B4 push {r4, lr} ldr r0, _080CD7DC ldrb r0, [r0] @@ -422205,7 +422205,7 @@ sub_080CD7B4: @ 0x080CD7B4 ldr r4, _080CD7E0 ldrb r1, [r4] movs r0, #0xe - bl sub_080CD894 + bl SetMovedMonData ldrb r1, [r4] movs r0, #0 bl sub_080CB488 @@ -422226,7 +422226,7 @@ _080CD7E4: lsrs r0, r0, #0x18 ldr r4, _080CD820 ldrb r1, [r4] - bl sub_080CD894 + bl SetMovedMonData ldrb r1, [r4] movs r0, #1 bl sub_080CB488 @@ -422243,10 +422243,10 @@ _080CD818: .4byte gUnknown_20399A8 _080CD81C: .4byte 0x000021FF _080CD820: .4byte gUnknown_2039A19 _080CD824: .4byte gUnknown_2039A1A - thumb_func_end sub_080CD7B4 + thumb_func_end MoveMon - thumb_func_start sub_080CD828 -sub_080CD828: @ 0x080CD828 + thumb_func_start PlaceMon +PlaceMon: @ 0x080CD828 push {r4, r5, lr} ldr r0, _080CD850 ldrb r0, [r0] @@ -422259,7 +422259,7 @@ sub_080CD828: @ 0x080CD828 ldr r4, _080CD854 ldrb r1, [r4] movs r0, #0xe - bl sub_080CD908 + bl SetPlacedMonData ldrb r1, [r4] movs r0, #0xe bl sub_080CB520 @@ -422275,7 +422275,7 @@ _080CD858: ldr r5, _080CD880 ldrb r1, [r5] adds r0, r4, #0 - bl sub_080CD908 + bl SetPlacedMonData ldrb r1, [r5] adds r0, r4, #0 bl sub_080CB520 @@ -422290,7 +422290,7 @@ _080CD87A: .align 2, 0 _080CD880: .4byte gUnknown_2039A19 _080CD884: .4byte gUnknown_2039A1A - thumb_func_end sub_080CD828 + thumb_func_end PlaceMon thumb_func_start sub_080CD888 sub_080CD888: @ 0x080CD888 @@ -422301,8 +422301,8 @@ sub_080CD888: @ 0x080CD888 .align 2, 0 thumb_func_end sub_080CD888 - thumb_func_start sub_080CD894 -sub_080CD894: @ 0x080CD894 + thumb_func_start SetMovedMonData +SetMovedMonData: @ 0x080CD894 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -422336,11 +422336,11 @@ _080CD8D0: adds r2, r2, r0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080D18F4 + bl BoxMonAtToMon _080CD8E0: adds r0, r4, #0 adds r1, r5, #0 - bl sub_080CD964 + bl PurgeMonOrBoxMon ldr r0, _080CD900 strb r4, [r0] ldr r0, _080CD904 @@ -422353,10 +422353,10 @@ _080CD8F8: .4byte gUnknown_20399A8 _080CD8FC: .4byte 0x000020A4 _080CD900: .4byte gUnknown_2039A1B _080CD904: .4byte gUnknown_2039A1C - thumb_func_end sub_080CD894 + thumb_func_end SetMovedMonData - thumb_func_start sub_080CD908 -sub_080CD908: @ 0x080CD908 + thumb_func_start SetPlacedMonData +SetPlacedMonData: @ 0x080CD908 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -422384,12 +422384,12 @@ _080CD93C: ldr r0, [r5] ldr r4, _080CD960 adds r0, r0, r4 - bl sub_0806E3BC + bl BoxMonRestorePP ldr r2, [r5] adds r2, r2, r4 adds r0, r6, #0 adds r1, r7, #0 - bl sub_080D17B8 + bl SetBoxMonAt _080CD954: pop {r4, r5, r6, r7} pop {r0} @@ -422397,10 +422397,10 @@ _080CD954: .align 2, 0 _080CD95C: .4byte gUnknown_20399A8 _080CD960: .4byte 0x000020A4 - thumb_func_end sub_080CD908 + thumb_func_end SetPlacedMonData - thumb_func_start sub_080CD964 -sub_080CD964: @ 0x080CD964 + thumb_func_start PurgeMonOrBoxMon +PurgeMonOrBoxMon: @ 0x080CD964 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -422412,19 +422412,19 @@ sub_080CD964: @ 0x080CD964 muls r0, r1, r0 ldr r1, _080CD980 adds r0, r0, r1 - bl sub_08067670 + bl ZeroMonData b _080CD988 .align 2, 0 _080CD980: .4byte gUnknown_2024190 _080CD984: - bl sub_080D18B8 + bl ZeroBoxMonAt _080CD988: pop {r0} bx r0 - thumb_func_end sub_080CD964 + thumb_func_end PurgeMonOrBoxMon - thumb_func_start sub_080CD98C -sub_080CD98C: @ 0x080CD98C + thumb_func_start SetShiftedMonData +SetShiftedMonData: @ 0x080CD98C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -422454,11 +422454,11 @@ _080CD9C0: adds r2, r2, r0 adds r0, r6, #0 adds r1, r7, #0 - bl sub_080D18F4 + bl BoxMonAtToMon _080CD9D0: adds r0, r6, #0 adds r1, r7, #0 - bl sub_080CD908 + bl SetPlacedMonData ldr r5, _080CDA04 ldr r1, [r5] ldr r4, _080CDA0C @@ -422470,7 +422470,7 @@ _080CD9D0: ldr r0, [r5] adds r0, r0, r4 movs r1, #0 - bl sub_080CE47C + bl SetCursorMonData ldr r0, _080CDA10 strb r6, [r0] ldr r0, _080CDA14 @@ -422484,15 +422484,15 @@ _080CDA08: .4byte 0x00002108 _080CDA0C: .4byte 0x000020A4 _080CDA10: .4byte gUnknown_2039A1B _080CDA14: .4byte gUnknown_2039A1C - thumb_func_end sub_080CD98C + thumb_func_end SetShiftedMonData - thumb_func_start sub_080CDA18 -sub_080CDA18: @ 0x080CDA18 + thumb_func_start TryStorePartyMonInBox +TryStorePartyMonInBox: @ 0x080CDA18 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r6, #0 - bl sub_080C6860 + bl GetFirstFreeBoxSpot lsls r0, r0, #0x10 lsrs r4, r0, #0x10 asrs r0, r0, #0x10 @@ -422510,7 +422510,7 @@ _080CDA36: lsls r4, r4, #0x18 lsrs r1, r4, #0x18 adds r0, r6, #0 - bl sub_080CD908 + bl SetPlacedMonData bl DestroyMovingMonIcon movs r0, #0 strb r0, [r5] @@ -422521,11 +422521,11 @@ _080CDA58: ldr r5, _080CDA9C ldrb r1, [r5] movs r0, #0xe - bl sub_080CD894 + bl SetMovedMonData lsls r4, r4, #0x18 lsrs r1, r4, #0x18 adds r0, r6, #0 - bl sub_080CD908 + bl SetPlacedMonData ldrb r0, [r5] bl DestroyPartyMonIcon _080CDA72: @@ -422553,10 +422553,10 @@ _080CDA96: _080CDA9C: .4byte gUnknown_2039A19 _080CDAA0: .4byte gUnknown_20399A8 _080CDAA4: .4byte 0x00000CB4 - thumb_func_end sub_080CDA18 + thumb_func_end TryStorePartyMonInBox - thumb_func_start sub_080CDAA8 -sub_080CDAA8: @ 0x080CDAA8 + thumb_func_start WallyHandleStatusIconUpdate +WallyHandleStatusIconUpdate: @ 0x080CDAA8 push {lr} ldr r0, _080CDAC4 ldr r0, [r0] @@ -422571,7 +422571,7 @@ sub_080CDAA8: @ 0x080CDAA8 .align 2, 0 _080CDAC4: .4byte gUnknown_20399A8 _080CDAC8: .4byte 0x00000CB4 - thumb_func_end sub_080CDAA8 + thumb_func_end WallyHandleStatusIconUpdate thumb_func_start sub_080CDACC sub_080CDACC: @ 0x080CDACC @@ -422641,8 +422641,8 @@ _080CDB4C: .4byte gUnknown_20399A8 _080CDB50: .4byte 0x00000CB4 thumb_func_end sub_080CDB24 - thumb_func_start sub_080CDB54 -sub_080CDB54: @ 0x080CDB54 + thumb_func_start ReleaseMon +ReleaseMon: @ 0x080CDB54 push {lr} bl sub_080CB894 ldr r1, _080CDB68 @@ -422673,14 +422673,14 @@ _080CDB88: ldr r0, _080CDB9C ldrb r1, [r0] adds r0, r2, #0 - bl sub_080CD964 + bl PurgeMonOrBoxMon _080CDB92: bl sub_080CE3BC pop {r0} bx r0 .align 2, 0 _080CDB9C: .4byte gUnknown_2039A19 - thumb_func_end sub_080CDB54 + thumb_func_end ReleaseMon thumb_func_start sub_080CDBA0 sub_080CDBA0: @ 0x080CDBA0 @@ -422749,10 +422749,10 @@ _080CDC14: .4byte gUnknown_3005AEC _080CDC18: .4byte 0x00000163 thumb_func_end sub_080CDBCC - thumb_func_start sub_080CDC1C -sub_080CDC1C: @ 0x080CDC1C + thumb_func_start InitCanRelaseMonVars +InitCanRelaseMonVars: @ 0x080CDC1C push {r4, r5, lr} - bl sub_080CDD98 + bl AtLeastThreeUsableMons adds r3, r0, #0 cmp r3, #0 bne _080CDC4C @@ -422845,7 +422845,7 @@ _080CDCE0: ldr r2, [r4] ldr r3, _080CDD4C adds r2, r2, r3 - bl sub_080D18F4 + bl BoxMonAtToMon bl sub_080D15AC ldr r1, [r4] ldr r2, _080CDD50 @@ -422870,7 +422870,7 @@ _080CDD10: adds r0, r2, r1 adds r2, r2, r4 movs r1, #0x51 - bl sub_0806A058 + bl GetMonData ldr r2, [r5] ldr r3, _080CDD5C adds r1, r2, r3 @@ -422917,10 +422917,10 @@ _080CDD88: .4byte 0x0000216D _080CDD8C: .4byte 0x0000216C _080CDD90: .4byte gUnknown_20399A8 _080CDD94: .4byte 0x00002172 - thumb_func_end sub_080CDC1C + thumb_func_end InitCanRelaseMonVars - thumb_func_start sub_080CDD98 -sub_080CDD98: @ 0x080CDD98 + thumb_func_start AtLeastThreeUsableMons +AtLeastThreeUsableMons: @ 0x080CDD98 push {r4, r5, r6, lr} ldr r0, _080CDDC8 ldrb r1, [r0] @@ -422934,7 +422934,7 @@ _080CDDA6: ldr r1, _080CDDCC adds r0, r0, r1 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080CDDBA adds r5, #1 @@ -422957,7 +422957,7 @@ _080CDDD2: _080CDDD4: adds r0, r6, #0 adds r1, r4, #0 - bl sub_080D1B10 + bl CheckBoxMonSanityAt cmp r0, #0 beq _080CDDE6 adds r5, #1 @@ -422976,10 +422976,10 @@ _080CDDF4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080CDD98 + thumb_func_end AtLeastThreeUsableMons - thumb_func_start sub_080CDDFC -sub_080CDDFC: @ 0x080CDDFC + thumb_func_start RunCanReleaseMon +RunCanReleaseMon: @ 0x080CDDFC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -423038,7 +423038,7 @@ _080CDE60: ldr r1, _080CDEB8 adds r2, r2, r1 movs r1, #0x51 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r1, [r5] @@ -423126,7 +423126,7 @@ _080CDF12: adds r2, #7 adds r3, r3, r2 movs r2, #0x51 - bl sub_080D1770 + bl GetAndCopyBoxMonDataAt lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -423212,7 +423212,7 @@ _080CDFCC: .4byte 0x00002174 _080CDFD0: .4byte gUnknown_20399A8 _080CDFD4: .4byte 0x0000216D _080CDFD8: .4byte 0x0000216C - thumb_func_end sub_080CDDFC + thumb_func_end RunCanReleaseMon thumb_func_start sub_080CDFDC sub_080CDFDC: @ 0x080CDFDC @@ -423333,7 +423333,7 @@ _080CE0B4: ldr r2, _080CE104 adds r1, r1, r2 strb r0, [r1] - bl sub_080C6950 + bl CountPartyMons ldr r1, [r4] subs r0, #1 ldr r2, _080CE108 @@ -423358,7 +423358,7 @@ _080CE110: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080D1934 + bl GetBoxedMonPtr ldr r3, _080CE14C ldr r2, [r3] ldr r4, _080CE150 @@ -423415,8 +423415,8 @@ _080CE180: .4byte gUnknown_2039A19 _080CE184: .4byte gUnknown_203CBEC thumb_func_end sub_080CE160 - thumb_func_start sub_080CE188 -sub_080CE188: @ 0x080CE188 + thumb_func_start CompactPartySlots +CompactPartySlots: @ 0x080CE188 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -423438,7 +423438,7 @@ _080CE1A4: adds r4, r0, r1 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 cmp r0, #0 beq _080CE1DC @@ -423479,7 +423479,7 @@ _080CE1FA: adds r0, r5, #0 muls r0, r6, r0 adds r0, r0, r4 - bl sub_08067670 + bl ZeroMonData adds r0, r5, #1 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -423496,10 +423496,10 @@ _080CE20E: bx r1 .align 2, 0 _080CE220: .4byte gUnknown_2024190 - thumb_func_end sub_080CE188 + thumb_func_end CompactPartySlots - thumb_func_start sub_080CE224 -sub_080CE224: @ 0x080CE224 + thumb_func_start SetMonMarkings +SetMonMarkings: @ 0x080CE224 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -423520,7 +423520,7 @@ sub_080CE224: @ 0x080CE224 adds r0, r0, r1 movs r1, #8 mov r2, sp - bl sub_0806A774 + bl SetMonData b _080CE298 .align 2, 0 _080CE254: .4byte gUnknown_20399A8 @@ -423542,7 +423542,7 @@ _080CE264: adds r0, r0, r1 movs r1, #8 mov r2, sp - bl sub_0806A774 + bl SetMonData _080CE284: movs r0, #0 ldrsb r0, [r4, r0] @@ -423562,10 +423562,10 @@ _080CE298: _080CE2A0: .4byte gUnknown_2039A18 _080CE2A4: .4byte gUnknown_2039A19 _080CE2A8: .4byte gUnknown_2024190 - thumb_func_end sub_080CE224 + thumb_func_end SetMonMarkings - thumb_func_start sub_080CE2AC -sub_080CE2AC: @ 0x080CE2AC + thumb_func_start CanMovePartyMon +CanMovePartyMon: @ 0x080CE2AC push {lr} ldr r0, _080CE2D4 ldrb r0, [r0] @@ -423579,7 +423579,7 @@ sub_080CE2AC: @ 0x080CE2AC bne _080CE2E0 ldr r0, _080CE2DC ldrb r0, [r0] - bl sub_080C68DC + bl CountPartyAliveNonEggMonsExcept lsls r0, r0, #0x18 cmp r0, #0 bne _080CE2E0 @@ -423595,10 +423595,10 @@ _080CE2E2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080CE2AC + thumb_func_end CanMovePartyMon - thumb_func_start sub_080CE2E8 -sub_080CE2E8: @ 0x080CE2E8 + thumb_func_start CanShiftMon +CanShiftMon: @ 0x080CE2E8 push {lr} ldr r0, _080CE32C ldrb r0, [r0] @@ -423612,7 +423612,7 @@ sub_080CE2E8: @ 0x080CE2E8 bne _080CE328 ldr r0, _080CE334 ldrb r0, [r0] - bl sub_080C68DC + bl CountPartyAliveNonEggMonsExcept lsls r0, r0, #0x18 cmp r0, #0 bne _080CE328 @@ -423626,7 +423626,7 @@ sub_080CE2E8: @ 0x080CE2E8 ldr r2, _080CE340 adds r0, r1, r2 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080CE344 _080CE328: @@ -423645,7 +423645,7 @@ _080CE346: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080CE2E8 + thumb_func_end CanShiftMon thumb_func_start sub_080CE34C sub_080CE34C: @ 0x080CE34C @@ -423770,7 +423770,7 @@ _080CE406: ldr r1, _080CE428 adds r0, r0, r1 movs r1, #0 - bl sub_080CE47C + bl SetCursorMonData b _080CE44C .align 2, 0 _080CE424: .4byte gUnknown_2039A19 @@ -423778,7 +423778,7 @@ _080CE428: .4byte gUnknown_2024190 _080CE42C: movs r0, #0 movs r1, #2 - bl sub_080CE47C + bl SetCursorMonData b _080CE44C _080CE436: bl sub_080D15AC @@ -423786,9 +423786,9 @@ _080CE436: lsrs r0, r0, #0x18 ldr r1, _080CE454 ldrb r1, [r1] - bl sub_080D1934 + bl GetBoxedMonPtr movs r1, #1 - bl sub_080CE47C + bl SetCursorMonData _080CE44C: pop {r4} pop {r0} @@ -423806,7 +423806,7 @@ sub_080CE458: @ 0x080CE458 beq _080CE474 ldr r0, _080CE470 movs r1, #0 - bl sub_080CE47C + bl SetCursorMonData b _080CE478 .align 2, 0 _080CE46C: .4byte gUnknown_2039A1A @@ -423818,8 +423818,8 @@ _080CE478: bx r0 thumb_func_end sub_080CE458 - thumb_func_start sub_080CE47C -sub_080CE47C: @ 0x080CE47C + thumb_func_start SetCursorMonData +SetCursorMonData: @ 0x080CE47C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -423843,7 +423843,7 @@ sub_080CE47C: @ 0x080CE47C adds r6, r4, #0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData mov r2, r8 ldr r1, [r2] ldr r3, _080CE4E8 @@ -423856,7 +423856,7 @@ sub_080CE47C: @ 0x080CE47C _080CE4C0: adds r0, r4, #0 movs r1, #4 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -423877,7 +423877,7 @@ _080CE4EC: .4byte 0x00000CED _080CE4F0: adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, r8 ldr r1, [r3] ldr r2, _080CE578 @@ -423890,27 +423890,27 @@ _080CE502: adds r2, r2, r5 adds r0, r6, #0 movs r1, #2 - bl sub_0806A058 + bl GetMonData ldr r0, [r4] adds r0, r0, r5 - bl sub_0800885C + bl StringGetEnd10 adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r3, _080CE584 adds r1, r1, r3 strb r0, [r1] adds r0, r6, #0 movs r1, #8 - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r2, _080CE588 adds r1, r1, r2 strb r0, [r1] adds r0, r6, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [r4] movs r3, #0xce lsls r3, r3, #4 @@ -423923,13 +423923,13 @@ _080CE502: adds r1, r1, r2 str r0, [r1] adds r0, r6, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 adds r0, r6, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData ldr r1, [r4] ldr r3, _080CE590 adds r1, r1, r3 @@ -424002,7 +424002,7 @@ _080CE5FA: bl sub_0806A1B4 ldr r0, [r5] adds r0, r0, r4 - bl sub_0800885C + bl StringGetEnd10 adds r0, r7, #0 bl GetLevelFromBoxMonExp ldr r1, [r5] @@ -424029,7 +424029,7 @@ _080CE5FA: adds r1, r1, r4 ldrh r0, [r1] mov r1, sb - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality ldr r1, [r5] ldr r3, _080CE690 adds r2, r1, r3 @@ -424038,7 +424038,7 @@ _080CE5FA: ldrh r0, [r4] adds r1, r1, r6 ldr r1, [r1] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -424366,10 +424366,10 @@ _080CE934: bx r0 .align 2, 0 _080CE944: .4byte 0x00000D65 - thumb_func_end sub_080CE47C + thumb_func_end SetCursorMonData - thumb_func_start sub_080CE948 -sub_080CE948: @ 0x080CE948 + thumb_func_start HandleInput_InBox +HandleInput_InBox: @ 0x080CE948 push {lr} ldr r0, _080CE968 ldr r0, [r0] @@ -424383,26 +424383,26 @@ sub_080CE948: @ 0x080CE948 cmp r0, #2 beq _080CE976 _080CE960: - bl sub_080CE984 + bl InBoxInput_Normal b _080CE97A .align 2, 0 _080CE968: .4byte gUnknown_20399A8 _080CE96C: .4byte 0x000021FF _080CE970: - bl sub_080CEBF0 + bl InBoxInput_GrabbingMultiple b _080CE97A _080CE976: - bl sub_080CED2C + bl InBoxInput_MovingMultiple _080CE97A: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080CE948 + thumb_func_end HandleInput_InBox - thumb_func_start sub_080CE984 -sub_080CE984: @ 0x080CE984 + thumb_func_start InBoxInput_Normal +InBoxInput_Normal: @ 0x080CE984 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -424711,10 +424711,10 @@ _080CEBE2: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080CE984 + thumb_func_end InBoxInput_Normal - thumb_func_start sub_080CEBF0 -sub_080CEBF0: @ 0x080CEBF0 + thumb_func_start InBoxInput_GrabbingMultiple +InBoxInput_GrabbingMultiple: @ 0x080CEBF0 push {r4, lr} ldr r1, _080CEC20 ldrh r0, [r1, #0x2c] @@ -424865,10 +424865,10 @@ _080CED18: _080CED20: .4byte gUnknown_20399A8 _080CED24: .4byte 0x000021FF _080CED28: .4byte 0x00000CB8 - thumb_func_end sub_080CEBF0 + thumb_func_end InBoxInput_GrabbingMultiple - thumb_func_start sub_080CED2C -sub_080CED2C: @ 0x080CED2C + thumb_func_start InBoxInput_MovingMultiple +InBoxInput_MovingMultiple: @ 0x080CED2C push {r4, lr} ldr r2, _080CED50 ldrh r1, [r2, #0x30] @@ -425008,10 +425008,10 @@ _080CEE38: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080CED2C + thumb_func_end InBoxInput_MovingMultiple - thumb_func_start sub_080CEE40 -sub_080CEE40: @ 0x080CEE40 + thumb_func_start HandleInput_InParty +HandleInput_InParty: @ 0x080CEE40 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -425286,10 +425286,10 @@ _080CF054: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080CEE40 + thumb_func_end HandleInput_InParty - thumb_func_start sub_080CF060 -sub_080CF060: @ 0x080CF060 + thumb_func_start HandleInput_OnBox +HandleInput_OnBox: @ 0x080CF060 push {r4, r5, r6, lr} ldr r3, _080CF09C ldr r0, [r3] @@ -425414,10 +425414,10 @@ _080CF14E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080CF060 + thumb_func_end HandleInput_OnBox - thumb_func_start sub_080CF154 -sub_080CF154: @ 0x080CF154 + thumb_func_start HandleInput_OnButtons +HandleInput_OnButtons: @ 0x080CF154 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -425560,7 +425560,7 @@ _080CF25E: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080CF154 + thumb_func_end HandleInput_OnButtons thumb_func_start sub_080CF268 sub_080CF268: @ 0x080CF268 @@ -425611,13 +425611,13 @@ AddBoxMenu: @ 0x080CF2B4 push {lr} bl InitMenu movs r0, #9 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0xa - bl sub_080CF7B0 + bl SetMenuText movs r0, #0xb - bl sub_080CF7B0 + bl SetMenuText movs r0, #0 - bl sub_080CF7B0 + bl SetMenuText pop {r0} bx r0 .align 2, 0 @@ -425671,13 +425671,13 @@ _080CF32A: cmp r1, #0 beq _080CF370 movs r0, #1 - bl sub_080CF7B0 + bl SetMenuText b _080CF374 _080CF336: cmp r1, #0 beq _080CF370 movs r0, #2 - bl sub_080CF7B0 + bl SetMenuText b _080CF374 _080CF342: ldr r0, _080CF358 @@ -425687,26 +425687,26 @@ _080CF342: cmp r1, #0 beq _080CF35C movs r0, #4 - bl sub_080CF7B0 + bl SetMenuText b _080CF374 .align 2, 0 _080CF358: .4byte gUnknown_2039A1A _080CF35C: movs r0, #5 - bl sub_080CF7B0 + bl SetMenuText b _080CF374 _080CF364: cmp r1, #0 beq _080CF370 movs r0, #3 - bl sub_080CF7B0 + bl SetMenuText b _080CF374 _080CF370: movs r0, #0 b _080CF3BA _080CF374: movs r0, #6 - bl sub_080CF7B0 + bl SetMenuText ldr r0, _080CF398 ldr r0, [r0] ldrb r0, [r0, #1] @@ -425719,21 +425719,21 @@ _080CF374: cmp r0, #0 bne _080CF3A0 movs r0, #2 - bl sub_080CF7B0 + bl SetMenuText b _080CF3A6 .align 2, 0 _080CF398: .4byte gUnknown_20399A8 _080CF39C: .4byte gUnknown_2039A18 _080CF3A0: movs r0, #1 - bl sub_080CF7B0 + bl SetMenuText _080CF3A6: movs r0, #8 - bl sub_080CF7B0 + bl SetMenuText movs r0, #7 - bl sub_080CF7B0 + bl SetMenuText movs r0, #0 - bl sub_080CF7B0 + bl SetMenuText movs r0, #1 _080CF3BA: pop {r1} @@ -425753,7 +425753,7 @@ sub_080CF3C0: @ 0x080CF3C0 lsls r0, r0, #1 cmp r1, r0 beq _080CF456 - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 bne _080CF428 @@ -425768,7 +425768,7 @@ sub_080CF3C0: @ 0x080CF3C0 cmp r0, #0 beq _080CF456 movs r0, #0xe - bl sub_080CF7B0 + bl SetMenuText b _080CF460 .align 2, 0 _080CF3FC: .4byte gUnknown_20399A8 @@ -425781,12 +425781,12 @@ _080CF408: cmp r0, #0 bne _080CF420 movs r0, #0xc - bl sub_080CF7B0 + bl SetMenuText movs r0, #0x10 - bl sub_080CF7B0 + bl SetMenuText _080CF420: movs r0, #0x11 - bl sub_080CF7B0 + bl SetMenuText b _080CF460 _080CF428: ldr r2, [r4] @@ -425800,7 +425800,7 @@ _080CF428: cmp r0, #0 beq _080CF456 movs r0, #0xd - bl sub_080CF7B0 + bl SetMenuText b _080CF460 .align 2, 0 _080CF444: .4byte 0x00000CE6 @@ -425816,10 +425816,10 @@ _080CF456: b _080CF468 _080CF45A: movs r0, #0xf - bl sub_080CF7B0 + bl SetMenuText _080CF460: movs r0, #0 - bl sub_080CF7B0 + bl SetMenuText movs r0, #1 _080CF468: pop {r4, r5} @@ -425869,14 +425869,14 @@ sub_080CF490: @ 0x080CF490 adds r0, r4, #0 bl LoadSpritePalettes ldr r0, _080CF564 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r6, _080CF568 ldr r1, [r6] ldr r4, _080CF56C adds r1, r1, r4 strb r0, [r1] ldr r0, _080CF570 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r1, [r6] ldr r5, _080CF574 adds r1, r1, r5 @@ -425897,7 +425897,7 @@ sub_080CF490: @ 0x080CF490 movs r3, #0 ldrsh r2, [r5, r3] movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -425984,7 +425984,7 @@ _080CF5BC: ldr r0, _080CF610 movs r1, #0 movs r2, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -426249,8 +426249,8 @@ _080CF7A8: .4byte 0x00000CAD _080CF7AC: .4byte 0x00000C71 thumb_func_end InitMenu - thumb_func_start sub_080CF7B0 -sub_080CF7B0: @ 0x080CF7B0 + thumb_func_start SetMenuText +SetMenuText: @ 0x080CF7B0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -426298,7 +426298,7 @@ _080CF804: .4byte 0x00000CAC _080CF808: .4byte 0x00000C74 _080CF80C: .4byte gUnknown_855657C _080CF810: .4byte 0x00000CAD - thumb_func_end sub_080CF7B0 + thumb_func_end SetMenuText thumb_func_start sub_080CF814 sub_080CF814: @ 0x080CF814 @@ -426377,7 +426377,7 @@ sub_080CF84C: @ 0x080CF84C ldr r0, [r5] ldr r1, _080CF93C adds r0, r0, r1 - bl sub_08003250 + bl AddWindow ldr r1, [r5] movs r4, #0xcb lsls r4, r4, #4 @@ -426387,14 +426387,14 @@ sub_080CF84C: @ 0x080CF84C strh r0, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] movs r1, #0 movs r2, #0xb movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, [r5] adds r0, r2, r4 ldrb r0, [r0] @@ -426409,7 +426409,7 @@ sub_080CF84C: @ 0x080CF84C movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_08198850 + bl PrintTextArray ldr r1, [r5] adds r4, r1, r4 ldrb r0, [r4] @@ -426423,7 +426423,7 @@ sub_080CF84C: @ 0x080CF84C movs r3, #2 bl sub_081984F0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, [r5] ldr r2, _080CF944 adds r0, r0, r2 @@ -426481,7 +426481,7 @@ _080CF96E: bl sub_080A306C movs r0, #1 rsbs r0, r0, #0 - bl sub_081985E8 + bl Menu_MoveCursor b _080CF9AA .align 2, 0 _080CF988: .4byte gUnknown_3002360 @@ -426493,10 +426493,10 @@ _080CF98C: movs r0, #5 bl sub_080A306C movs r0, #1 - bl sub_081985E8 + bl Menu_MoveCursor b _080CF9AA _080CF9A2: - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _080CF9AA: @@ -426540,7 +426540,7 @@ sub_080CF9DC: @ 0x080CF9DC ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow pop {r4, r5} pop {r0} bx r0 @@ -426548,8 +426548,8 @@ sub_080CF9DC: @ 0x080CF9DC _080CFA00: .4byte gUnknown_20399A8 thumb_func_end sub_080CF9DC - thumb_func_start sub_080CFA04 -sub_080CFA04: @ 0x080CFA04 + thumb_func_start ItemStorage_StartScrollIndicatorAndProcessInput +ItemStorage_StartScrollIndicatorAndProcessInput: @ 0x080CFA04 push {r4, lr} ldr r4, _080CFA40 ldr r0, _080CFA44 @@ -426558,7 +426558,7 @@ sub_080CFA04: @ 0x080CFA04 cmp r0, #0 beq _080CFA50 ldr r0, _080CFA48 - bl sub_08004130 + bl AddWindow8Bit adds r1, r0, #0 ldr r0, _080CFA4C ldr r0, [r0] @@ -426573,7 +426573,7 @@ sub_080CFA04: @ 0x080CFA04 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 b _080CFA52 .align 2, 0 @@ -426587,7 +426587,7 @@ _080CFA52: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080CFA04 + thumb_func_end ItemStorage_StartScrollIndicatorAndProcessInput thumb_func_start sub_080CFA58 sub_080CFA58: @ 0x080CFA58 @@ -426596,7 +426596,7 @@ sub_080CFA58: @ 0x080CFA58 ldr r0, [r0] cmp r0, #0 beq _080CFA66 - bl sub_08000BF0 + bl Free _080CFA66: pop {r0} bx r0 @@ -426691,7 +426691,7 @@ _080CFB08: b _080CFBD8 _080CFB0E: movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #0x80 bl sub_080D28EC b _080CFBAE @@ -426709,11 +426709,11 @@ _080CFB1C: movs r0, #0 adds r1, r4, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 adds r1, r4, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -426737,26 +426737,26 @@ _080CFB1C: movs r0, #0 movs r1, #4 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] movs r1, #3 - bl sub_080043D0 + bl CopyWindowToVram8Bit movs r0, #0xfc lsls r0, r0, #6 ldr r2, _080CFBC0 movs r1, #8 - bl sub_080A22E8 + bl BlendPalettes movs r0, #2 bl sub_080CF6D0 movs r0, #8 movs r1, #0x80 - bl sub_08001200 + bl SetGpuRegBits _080CFBAE: ldr r1, [r6] ldrb r0, [r1, #1] @@ -426768,12 +426768,12 @@ _080CFBB8: .4byte 0xFFFFFC00 _080CFBBC: .4byte gUnknown_20399A8 _080CFBC0: .4byte 0x00007FFF _080CFBC4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080CFBD8 movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #0 b _080CFBDA _080CFBD8: @@ -426807,7 +426807,7 @@ _080CFC00: b _080CFC48 _080CFC06: movs r0, #0 - bl sub_08001B5C + bl HideBg b _080CFC18 _080CFC0E: bl sub_080D03FC @@ -426820,18 +426820,18 @@ _080CFC18: strb r0, [r1, #1] b _080CFC48 _080CFC22: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080CFC48 bl sub_080CF700 movs r0, #3 - bl sub_080985A0 + bl stdpal_get movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #0 b _080CFC4A _080CFC48: @@ -426878,7 +426878,7 @@ _080CFC68: adds r0, r0, r1 ldrb r0, [r0] movs r1, #2 - bl sub_080043D0 + bl CopyWindowToVram8Bit ldr r1, [r4] ldrb r0, [r1, #1] adds r0, #1 @@ -426887,7 +426887,7 @@ _080CFC68: .align 2, 0 _080CFCA8: .4byte gUnknown_20399A8 _080CFCAC: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080CFCB8 @@ -426925,7 +426925,7 @@ _080CFCE2: movs r0, #0 b _080CFD0C _080CFCEE: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080CFD38 @@ -426949,7 +426949,7 @@ _080CFD1A: adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, #0 @@ -427022,7 +427022,7 @@ _080CFD8E: bl sub_080CD4E0 b _080CFDE6 _080CFDA6: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080CFE16 @@ -427036,10 +427036,10 @@ _080CFDA6: movs r0, #1 bl sub_080CD4E0 movs r0, #0 - bl sub_08001B5C + bl HideBg b _080CFDE6 _080CFDD2: - bl sub_080CD528 + bl DoMonPlaceChange lsls r0, r0, #0x18 cmp r0, #0 bne _080CFE16 @@ -427053,18 +427053,18 @@ _080CFDE6: strb r0, [r1, #1] b _080CFE16 _080CFDF0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _080CFE16 movs r0, #3 - bl sub_080985A0 + bl stdpal_get movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_080CF700 movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #0 b _080CFE18 _080CFE16: @@ -427522,12 +427522,12 @@ sub_080D0134: @ 0x080D0134 ldrh r1, [r1, #0xc] movs r0, #0 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX ldr r0, [r4] ldrh r1, [r0, #0xe] movs r0, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY ldr r1, [r4] ldrh r0, [r1, #0x10] subs r0, #1 @@ -427622,7 +427622,7 @@ _080D01DC: _080D01FA: mov r0, sl adds r1, r5, #0 - bl sub_080D1934 + bl GetBoxedMonPtr adds r1, r0, #0 ldr r2, _080D0240 ldr r0, [r2] @@ -427701,7 +427701,7 @@ _080D028C: bl DestroyBoxMonIconAtPosition mov r0, r8 adds r1, r5, #0 - bl sub_080D18B8 + bl ZeroBoxMonAt adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -427865,7 +427865,7 @@ _080D03A4: adds r2, r2, r4 ldr r0, [sp, #4] adds r1, r6, #0 - bl sub_080D17B8 + bl SetBoxMonAt _080D03CC: adds r0, r6, #1 lsls r0, r0, #0x18 @@ -427901,18 +427901,18 @@ sub_080D03FC: @ 0x080D03FC movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0 movs r1, #4 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #8 movs r1, #0x80 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -427922,7 +427922,7 @@ sub_080D03FC: @ 0x080D03FC movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r0} bx r0 @@ -428075,7 +428075,7 @@ _080D0540: orrs r0, r1 str r0, [r2, #4] mov r0, sb - bl sub_08034388 + bl LoadCompressedSpriteSheet mov r4, sb ldrh r0, [r4, #6] bl GetSpriteTileStartByTag @@ -428115,7 +428115,7 @@ _080D0540: movs r1, #0 movs r2, #0 movs r3, #0xb - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r4, r8 @@ -428221,22 +428221,22 @@ _080D067A: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080D06E2 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData _080D069C: lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 beq _080D06E2 adds r0, r4, #0 - bl sub_080D1034 + bl GetItemIconPic adds r6, r0, #0 adds r0, r4, #0 - bl sub_080D1044 + bl GetItemIconPalette adds r5, r0, #0 bl sub_080D0B88 adds r4, r0, #0 @@ -428300,8 +428300,8 @@ _080D0726: _080D072C: .4byte gUnknown_20399A8 thumb_func_end sub_080D06F0 - thumb_func_start sub_080D0730 -sub_080D0730: @ 0x080D0730 + thumb_func_start Item_FromMonToMoving +Item_FromMonToMoving: @ 0x080D0730 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -428354,7 +428354,7 @@ _080D0798: adds r0, r0, r1 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #1 bl SetPartyMonIconObjMode @@ -428377,7 +428377,7 @@ _080D07C8: .4byte gUnknown_2024190 _080D07CC: .4byte gUnknown_20399A8 _080D07D0: .4byte 0x00000CE6 _080D07D4: .4byte 0x00002234 - thumb_func_end sub_080D0730 + thumb_func_end Item_FromMonToMoving thumb_func_start sub_080D07D8 sub_080D07D8: @ 0x080D07D8 @@ -428388,10 +428388,10 @@ sub_080D07D8: @ 0x080D07D8 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r5, #0 - bl sub_080D1034 + bl GetItemIconPic mov r8, r0 adds r0, r5, #0 - bl sub_080D1044 + bl GetItemIconPalette adds r6, r0, #0 bl sub_080D0B88 adds r4, r0, #0 @@ -428431,8 +428431,8 @@ _080D0844: .4byte gUnknown_20399A8 _080D0848: .4byte 0x00002234 thumb_func_end sub_080D07D8 - thumb_func_start sub_080D084C -sub_080D084C: @ 0x080D084C + thumb_func_start Item_SwitchMonsWithMoving +Item_SwitchMonsWithMoving: @ 0x080D084C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -428491,7 +428491,7 @@ _080D08BC: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 mov r0, r8 @@ -428500,7 +428500,7 @@ _080D08BC: adds r2, r2, r5 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r1, r8 ldr r0, [r1] adds r0, r0, r5 @@ -428529,10 +428529,10 @@ _080D090A: .align 2, 0 _080D0918: .4byte gUnknown_2024190 _080D091C: .4byte 0x00002234 - thumb_func_end sub_080D084C + thumb_func_end Item_SwitchMonsWithMoving - thumb_func_start sub_080D0920 -sub_080D0920: @ 0x080D0920 + thumb_func_start Item_GiveMovingToMon +Item_GiveMovingToMon: @ 0x080D0920 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -428586,7 +428586,7 @@ _080D0980: ldr r1, _080D09B0 adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r0, r8 movs r1, #0 bl SetPartyMonIconObjMode @@ -428599,10 +428599,10 @@ _080D09A0: .align 2, 0 _080D09AC: .4byte gUnknown_2024190 _080D09B0: .4byte 0x00002234 - thumb_func_end sub_080D0920 + thumb_func_end Item_GiveMovingToMon - thumb_func_start sub_080D09B4 -sub_080D09B4: @ 0x080D09B4 + thumb_func_start Item_TakeMons +Item_TakeMons: @ 0x080D09B4 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -428651,7 +428651,7 @@ _080D0A10: adds r0, r0, r1 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #1 bl SetPartyMonIconObjMode @@ -428662,7 +428662,7 @@ _080D0A28: bx r0 .align 2, 0 _080D0A30: .4byte gUnknown_2024190 - thumb_func_end sub_080D09B4 + thumb_func_end Item_TakeMons thumb_func_start sub_080D0A34 sub_080D0A34: @ 0x080D0A34 @@ -428790,8 +428790,8 @@ _080D0B14: .align 2, 0 thumb_func_end sub_080D0AB8 - thumb_func_start sub_080D0B1C -sub_080D0B1C: @ 0x080D0B1C + thumb_func_start IsActiveItemMoving +IsActiveItemMoving: @ 0x080D0B1C push {lr} ldr r0, _080D0B40 ldr r1, [r0] @@ -428824,10 +428824,10 @@ _080D0B52: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D0B1C + thumb_func_end IsActiveItemMoving - thumb_func_start sub_080D0B58 -sub_080D0B58: @ 0x080D0B58 + thumb_func_start GetMovingItemName +GetMovingItemName: @ 0x080D0B58 push {lr} ldr r0, _080D0B6C ldr r0, [r0] @@ -428840,7 +428840,7 @@ sub_080D0B58: @ 0x080D0B58 .align 2, 0 _080D0B6C: .4byte gUnknown_20399A8 _080D0B70: .4byte 0x00002234 - thumb_func_end sub_080D0B58 + thumb_func_end GetMovingItemName thumb_func_start sub_080D0B74 sub_080D0B74: @ 0x080D0B74 @@ -429226,7 +429226,7 @@ _080D0E02: ldrh r1, [r0] adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _080D0E4C: add sp, #4 pop {r3, r4} @@ -429467,8 +429467,8 @@ _080D102C: .4byte 0x00002210 _080D1030: .4byte 0x00002204 thumb_func_end sub_080D0FE0 - thumb_func_start sub_080D1034 -sub_080D1034: @ 0x080D1034 + thumb_func_start GetItemIconPic +GetItemIconPic: @ 0x080D1034 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -429476,10 +429476,10 @@ sub_080D1034: @ 0x080D1034 bl GetItemIconPicOrPalette pop {r1} bx r1 - thumb_func_end sub_080D1034 + thumb_func_end GetItemIconPic - thumb_func_start sub_080D1044 -sub_080D1044: @ 0x080D1044 + thumb_func_start GetItemIconPalette +GetItemIconPalette: @ 0x080D1044 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -429487,13 +429487,13 @@ sub_080D1044: @ 0x080D1044 bl GetItemIconPicOrPalette pop {r1} bx r1 - thumb_func_end sub_080D1044 + thumb_func_end GetItemIconPalette thumb_func_start sub_080D1054 sub_080D1054: @ 0x080D1054 push {r4, lr} sub sp, #0x14 - bl sub_080D0B1C + bl IsActiveItemMoving lsls r0, r0, #0x18 cmp r0, #0 beq _080D1074 @@ -429515,7 +429515,7 @@ _080D107A: adds r4, r0, #0 movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -429527,7 +429527,7 @@ _080D107A: movs r1, #1 adds r2, r4, #0 movs r3, #4 - bl sub_08199C0C + bl AddTextPrinterParameterized5 add sp, #0x14 pop {r4} pop {r0} @@ -429590,7 +429590,7 @@ _080D110C: _080D111C: movs r0, #0 movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute adds r1, r0, #0 ldr r0, _080D117C ldr r0, [r0] @@ -429614,7 +429614,7 @@ _080D111C: str r0, [sp, #0xc] movs r0, #0 movs r3, #0xd - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer adds r4, #1 cmp r4, r5 blt _080D111C @@ -429684,7 +429684,7 @@ _080D11C0: _080D11D6: movs r0, #0 movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute adds r1, r0, #0 ldr r0, _080D124C ldr r0, [r0] @@ -429708,7 +429708,7 @@ _080D11D6: str r0, [sp, #0xc] movs r0, #0 movs r3, #0xd - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer adds r4, #1 cmp r4, r5 blt _080D11D6 @@ -429732,7 +429732,7 @@ _080D1220: movs r3, #0xc bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 _080D1244: add sp, #0x10 @@ -429804,7 +429804,7 @@ _080D128C: movs r3, #0x14 bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -430231,8 +430231,8 @@ _080D15C8: _080D15CC: .4byte gUnknown_3005AF4 thumb_func_end SetCurrentBox - thumb_func_start sub_080D15D0 -sub_080D15D0: @ 0x080D15D0 + thumb_func_start GetBoxMonDataAt +GetBoxMonDataAt: @ 0x080D15D0 push {r4, r5, lr} adds r5, r2, #0 lsls r0, r0, #0x18 @@ -430267,10 +430267,10 @@ _080D160E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080D15D0 + thumb_func_end GetBoxMonDataAt - thumb_func_start sub_080D1614 -sub_080D1614: @ 0x080D1614 + thumb_func_start SetBoxMonDataAt +SetBoxMonDataAt: @ 0x080D1614 push {r4, r5, r6, lr} adds r5, r2, #0 adds r6, r3, #0 @@ -430297,14 +430297,14 @@ sub_080D1614: @ 0x080D1614 adds r0, r0, r1 adds r1, r5, #0 adds r2, r6, #0 - bl sub_0806A864 + bl SetBoxMonData _080D164C: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080D1654: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D1614 + thumb_func_end SetBoxMonDataAt thumb_func_start GetCurrentBoxMonData GetCurrentBoxMonData: @ 0x080D1658 @@ -430317,7 +430317,7 @@ GetCurrentBoxMonData: @ 0x080D1658 ldr r0, [r0] ldrb r0, [r0] adds r1, r3, #0 - bl sub_080D15D0 + bl GetBoxMonDataAt pop {r1} bx r1 .align 2, 0 @@ -430337,7 +430337,7 @@ SetCurrentBoxMonData: @ 0x080D1678 ldrb r0, [r0] adds r1, r4, #0 adds r2, r5, #0 - bl sub_080D1614 + bl SetBoxMonDataAt pop {r4, r5} pop {r0} bx r0 @@ -430345,8 +430345,8 @@ SetCurrentBoxMonData: @ 0x080D1678 _080D1698: .4byte gUnknown_3005AF4 thumb_func_end SetCurrentBoxMonData - thumb_func_start sub_080D169C -sub_080D169C: @ 0x080D169C + thumb_func_start GetBoxMonNickAt +GetBoxMonNickAt: @ 0x080D169C push {r4, r5, lr} adds r5, r2, #0 lsls r0, r0, #0x18 @@ -430384,10 +430384,10 @@ _080D16DC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D169C + thumb_func_end GetBoxMonNickAt - thumb_func_start sub_080D16E4 -sub_080D16E4: @ 0x080D16E4 + thumb_func_start GetBoxMonLevelAt +GetBoxMonLevelAt: @ 0x080D16E4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -430425,10 +430425,10 @@ _080D1724: bx r1 .align 2, 0 _080D172C: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D16E4 + thumb_func_end GetBoxMonLevelAt - thumb_func_start sub_080D1730 -sub_080D1730: @ 0x080D1730 + thumb_func_start SetBoxMonNickAt +SetBoxMonNickAt: @ 0x080D1730 push {r4, r5, lr} adds r5, r2, #0 lsls r0, r0, #0x18 @@ -430454,17 +430454,17 @@ sub_080D1730: @ 0x080D1730 adds r0, r0, r1 movs r1, #2 adds r2, r5, #0 - bl sub_0806A864 + bl SetBoxMonData _080D1766: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080D176C: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D1730 + thumb_func_end SetBoxMonNickAt - thumb_func_start sub_080D1770 -sub_080D1770: @ 0x080D1770 + thumb_func_start GetAndCopyBoxMonDataAt +GetAndCopyBoxMonDataAt: @ 0x080D1770 push {r4, r5, r6, lr} adds r5, r2, #0 adds r6, r3, #0 @@ -430501,10 +430501,10 @@ _080D17B2: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080D1770 + thumb_func_end GetAndCopyBoxMonDataAt - thumb_func_start sub_080D17B8 -sub_080D17B8: @ 0x080D17B8 + thumb_func_start SetBoxMonAt +SetBoxMonAt: @ 0x080D17B8 push {r4, r5, lr} adds r5, r2, #0 lsls r0, r0, #0x18 @@ -430537,10 +430537,10 @@ _080D17EE: bx r0 .align 2, 0 _080D17F4: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D17B8 + thumb_func_end SetBoxMonAt - thumb_func_start sub_080D17F8 -sub_080D17F8: @ 0x080D17F8 + thumb_func_start CopyBoxMonAt +CopyBoxMonAt: @ 0x080D17F8 push {r4, r5, lr} adds r5, r2, #0 lsls r0, r0, #0x18 @@ -430573,10 +430573,10 @@ _080D182E: bx r0 .align 2, 0 _080D1834: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D17F8 + thumb_func_end CopyBoxMonAt - thumb_func_start sub_080D1838 -sub_080D1838: @ 0x080D1838 + thumb_func_start CreateBoxMonAt +CreateBoxMonAt: @ 0x080D1838 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -430629,7 +430629,7 @@ sub_080D1838: @ 0x080D1838 mov r1, sb mov r2, r8 adds r3, r4, #0 - bl sub_080677A0 + bl CreateBoxMon _080D18A4: add sp, #0x14 pop {r3, r4} @@ -430640,10 +430640,10 @@ _080D18A4: bx r0 .align 2, 0 _080D18B4: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D1838 + thumb_func_end CreateBoxMonAt - thumb_func_start sub_080D18B8 -sub_080D18B8: @ 0x080D18B8 + thumb_func_start ZeroBoxMonAt +ZeroBoxMonAt: @ 0x080D18B8 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -430673,10 +430673,10 @@ _080D18E8: bx r0 .align 2, 0 _080D18F0: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D18B8 + thumb_func_end ZeroBoxMonAt - thumb_func_start sub_080D18F4 -sub_080D18F4: @ 0x080D18F4 + thumb_func_start BoxMonAtToMon +BoxMonAtToMon: @ 0x080D18F4 push {r4, r5, lr} adds r5, r2, #0 lsls r0, r0, #0x18 @@ -430701,17 +430701,17 @@ sub_080D18F4: @ 0x080D18F4 lsls r1, r1, #4 adds r0, r0, r1 adds r1, r5, #0 - bl sub_08068B44 + bl BoxMonToMon _080D1928: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080D1930: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D18F4 + thumb_func_end BoxMonAtToMon - thumb_func_start sub_080D1934 -sub_080D1934: @ 0x080D1934 + thumb_func_start GetBoxedMonPtr +GetBoxedMonPtr: @ 0x080D1934 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -430743,7 +430743,7 @@ _080D196A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080D1934 + thumb_func_end GetBoxedMonPtr thumb_func_start GetBoxNamePtr GetBoxNamePtr: @ 0x080D1970 @@ -430932,8 +430932,8 @@ _080D1AAC: .align 2, 0 thumb_func_end sub_080D19EC - thumb_func_start sub_080D1AB8 -sub_080D1AB8: @ 0x080D1AB8 + thumb_func_start CheckFreePokemonStorageSpace +CheckFreePokemonStorageSpace: @ 0x080D1AB8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -430981,10 +430981,10 @@ _080D1B02: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D1AB8 + thumb_func_end CheckFreePokemonStorageSpace - thumb_func_start sub_080D1B10 -sub_080D1B10: @ 0x080D1B10 + thumb_func_start CheckBoxMonSanityAt +CheckBoxMonSanityAt: @ 0x080D1B10 push {r4, r5, r6, lr} adds r2, r1, #0 cmp r0, #0xd @@ -431032,10 +431032,10 @@ _080D1B6A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080D1B10 + thumb_func_end CheckBoxMonSanityAt - thumb_func_start sub_080D1B70 -sub_080D1B70: @ 0x080D1B70 + thumb_func_start CountStorageNonEggMons +CountStorageNonEggMons: @ 0x080D1B70 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -431090,10 +431090,10 @@ _080D1BBA: bx r1 .align 2, 0 _080D1BD8: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D1B70 + thumb_func_end CountStorageNonEggMons - thumb_func_start sub_080D1BDC -sub_080D1BDC: @ 0x080D1BDC + thumb_func_start CountAllStorageMons +CountAllStorageMons: @ 0x080D1BDC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -431149,10 +431149,10 @@ _080D1C26: bx r1 .align 2, 0 _080D1C44: .4byte gUnknown_3005AF4 - thumb_func_end sub_080D1BDC + thumb_func_end CountAllStorageMons - thumb_func_start sub_080D1C48 -sub_080D1C48: @ 0x080D1C48 + thumb_func_start AnyStorageMonWithMove +AnyStorageMonWithMove: @ 0x080D1C48 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -431218,7 +431218,7 @@ _080D1CBE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D1C48 + thumb_func_end AnyStorageMonWithMove thumb_func_start ResetWaldaWallpaper ResetWaldaWallpaper: @ 0x080D1CCC @@ -431260,8 +431260,8 @@ _080D1D18: .4byte 0x00006186 _080D1D1C: .4byte 0x00003D74 thumb_func_end ResetWaldaWallpaper - thumb_func_start sub_080D1D20 -sub_080D1D20: @ 0x080D1D20 + thumb_func_start SetWaldaWallpaperLockedOrUnlocked +SetWaldaWallpaperLockedOrUnlocked: @ 0x080D1D20 ldr r1, _080D1D2C ldr r1, [r1] ldr r2, _080D1D30 @@ -431271,7 +431271,7 @@ sub_080D1D20: @ 0x080D1D20 .align 2, 0 _080D1D2C: .4byte gUnknown_3005AEC _080D1D30: .4byte 0x00003D86 - thumb_func_end sub_080D1D20 + thumb_func_end SetWaldaWallpaperLockedOrUnlocked thumb_func_start sub_080D1D34 sub_080D1D34: @ 0x080D1D34 @@ -431396,8 +431396,8 @@ _080D1DF4: .4byte gUnknown_3005AEC _080D1DF8: .4byte 0x00003D74 thumb_func_end sub_080D1DE8 - thumb_func_start sub_080D1DFC -sub_080D1DFC: @ 0x080D1DFC + thumb_func_start SetWaldaPhrase +SetWaldaPhrase: @ 0x080D1DFC push {lr} adds r1, r0, #0 ldr r0, _080D1E10 @@ -431410,7 +431410,7 @@ sub_080D1DFC: @ 0x080D1DFC .align 2, 0 _080D1E10: .4byte gUnknown_3005AEC _080D1E14: .4byte 0x00003D74 - thumb_func_end sub_080D1DFC + thumb_func_end SetWaldaPhrase thumb_func_start IsWaldaPhraseEmpty IsWaldaPhraseEmpty: @ 0x080D1E18 @@ -431485,7 +431485,7 @@ sub_080D1E90: @ 0x080D1E90 push {lr} ldr r0, _080D1EA0 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 @@ -431575,13 +431575,13 @@ sub_080D1EE4: @ 0x080D1EE4 strh r1, [r0, #0x26] adds r0, r7, #0 movs r1, #3 - bl sub_08001C34 + bl GetBgAttribute adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r7, #0 movs r1, #9 - bl sub_08001C34 + bl GetBgAttribute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r2, sb @@ -432425,8 +432425,8 @@ _080D255C: .4byte 0x040000D4 _080D2560: .4byte 0x81000800 thumb_func_end sub_080D24BC - thumb_func_start sub_080D2564 -sub_080D2564: @ 0x080D2564 + thumb_func_start CreateMonIcon +CreateMonIcon: @ 0x080D2564 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -432484,7 +432484,7 @@ _080D25CA: asrs r2, r2, #0x10 mov r0, sp mov r3, sb - bl sub_080D2A54 + bl CreateMonIconSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -432493,7 +432493,7 @@ _080D25CA: lsls r0, r0, #2 ldr r1, _080D2614 adds r0, r0, r1 - bl sub_080D297C + bl UpdateMonIconFrame adds r0, r4, #0 add sp, #0x30 pop {r3, r4} @@ -432509,7 +432509,7 @@ _080D2608: .4byte gUnknown_8557144 _080D260C: .4byte gUnknown_8556EE4 _080D2610: .4byte 0x0000DAC0 _080D2614: .4byte gUnknown_20205AC - thumb_func_end sub_080D2564 + thumb_func_end CreateMonIcon thumb_func_start sub_080D2618 sub_080D2618: @ 0x080D2618 @@ -432554,7 +432554,7 @@ sub_080D2618: @ 0x080D2618 adds r1, r4, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_080D2A54 + bl CreateMonIconSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -432563,7 +432563,7 @@ sub_080D2618: @ 0x080D2618 lsls r0, r0, #2 ldr r1, _080D26A4 adds r0, r0, r1 - bl sub_080D297C + bl UpdateMonIconFrame adds r0, r4, #0 add sp, #0x18 pop {r4, r5, r6, r7} @@ -432586,7 +432586,7 @@ GetIconSpecies: @ 0x080D26A8 cmp r2, #0xc9 bne _080D26D2 adds r0, r1, #0 - bl sub_080D26E8 + bl GetUnownLetterByPersonality lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -432617,8 +432617,8 @@ _080D26E0: .align 2, 0 thumb_func_end GetIconSpecies - thumb_func_start sub_080D26E8 -sub_080D26E8: @ 0x080D26E8 + thumb_func_start GetUnownLetterByPersonality +GetUnownLetterByPersonality: @ 0x080D26E8 push {lr} adds r2, r0, #0 cmp r2, #0 @@ -432650,7 +432650,7 @@ _080D271E: _080D2720: pop {r1} bx r1 - thumb_func_end sub_080D26E8 + thumb_func_end GetUnownLetterByPersonality thumb_func_start sub_080D2724 sub_080D2724: @ 0x080D2724 @@ -432728,8 +432728,8 @@ sub_080D2798: @ 0x080D2798 .align 2, 0 thumb_func_end sub_080D2798 - thumb_func_start sub_080D27A4 -sub_080D27A4: @ 0x080D27A4 + thumb_func_start LoadMonIconPalettes +LoadMonIconPalettes: @ 0x080D27A4 push {r4, r5, lr} movs r4, #0 ldr r5, _080D27C4 @@ -432747,10 +432747,10 @@ _080D27AA: bx r0 .align 2, 0 _080D27C4: .4byte gUnknown_855709C - thumb_func_end sub_080D27A4 + thumb_func_end LoadMonIconPalettes - thumb_func_start sub_080D27C8 -sub_080D27C8: @ 0x080D27C8 + thumb_func_start SafeLoadMonIconPalette +SafeLoadMonIconPalette: @ 0x080D27C8 push {r4, lr} lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -432768,7 +432768,7 @@ _080D27DA: lsls r0, r0, #3 adds r4, r0, r1 ldrh r0, [r4, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -432782,10 +432782,10 @@ _080D27FA: .align 2, 0 _080D2800: .4byte gUnknown_8556EE4 _080D2804: .4byte gUnknown_855709C - thumb_func_end sub_080D27C8 + thumb_func_end SafeLoadMonIconPalette - thumb_func_start sub_080D2808 -sub_080D2808: @ 0x080D2808 + thumb_func_start LoadMonIconPalette +LoadMonIconPalette: @ 0x080D2808 push {r4, lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -432796,7 +432796,7 @@ sub_080D2808: @ 0x080D2808 lsls r0, r0, #3 adds r4, r0, r1 ldrh r0, [r4, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -432810,10 +432810,10 @@ _080D282E: .align 2, 0 _080D2834: .4byte gUnknown_8556EE4 _080D2838: .4byte gUnknown_855709C - thumb_func_end sub_080D2808 + thumb_func_end LoadMonIconPalette - thumb_func_start sub_080D283C -sub_080D283C: @ 0x080D283C + thumb_func_start FreeMonIconPalettes +FreeMonIconPalettes: @ 0x080D283C push {r4, r5, lr} movs r4, #0 ldr r5, _080D285C @@ -432832,10 +432832,10 @@ _080D2842: bx r0 .align 2, 0 _080D285C: .4byte gUnknown_855709C - thumb_func_end sub_080D283C + thumb_func_end FreeMonIconPalettes - thumb_func_start sub_080D2860 -sub_080D2860: @ 0x080D2860 + thumb_func_start SafeFreeMonIconPalette +SafeFreeMonIconPalette: @ 0x080D2860 push {lr} lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -432859,10 +432859,10 @@ _080D2872: .align 2, 0 _080D2888: .4byte gUnknown_8556EE4 _080D288C: .4byte gUnknown_855709C - thumb_func_end sub_080D2860 + thumb_func_end SafeFreeMonIconPalette - thumb_func_start sub_080D2890 -sub_080D2890: @ 0x080D2890 + thumb_func_start FreeMonIconPalette +FreeMonIconPalette: @ 0x080D2890 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -432879,12 +432879,12 @@ sub_080D2890: @ 0x080D2890 .align 2, 0 _080D28AC: .4byte gUnknown_8556EE4 _080D28B0: .4byte gUnknown_855709C - thumb_func_end sub_080D2890 + thumb_func_end FreeMonIconPalette thumb_func_start sub_080D28B4 sub_080D28B4: @ 0x080D28B4 push {lr} - bl sub_080D297C + bl UpdateMonIconFrame pop {r0} bx r0 .align 2, 0 @@ -432930,7 +432930,7 @@ _080D28FA: ldr r0, [r6] adds r1, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 adds r0, #0x10 lsls r0, r0, #0x10 @@ -433006,8 +433006,8 @@ _080D2974: .4byte gUnknown_855709C _080D2978: .4byte gUnknown_8556EE4 thumb_func_end GetValidMonIconPalettePtr - thumb_func_start sub_080D297C -sub_080D297C: @ 0x080D297C + thumb_func_start UpdateMonIconFrame +UpdateMonIconFrame: @ 0x080D297C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -433117,10 +433117,10 @@ _080D2A44: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D297C + thumb_func_end UpdateMonIconFrame - thumb_func_start sub_080D2A54 -sub_080D2A54: @ 0x080D2A54 + thumb_func_start CreateMonIconSprite +CreateMonIconSprite: @ 0x080D2A54 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -433186,7 +433186,7 @@ sub_080D2A54: @ 0x080D2A54 adds r1, r4, #0 adds r2, r5, #0 mov r3, r8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r6, _080D2B28 @@ -433223,7 +433223,7 @@ _080D2B1C: .4byte gUnknown_855714C _080D2B20: .4byte 0xFFFF0000 _080D2B24: .4byte 0x0000FFFF _080D2B28: .4byte gUnknown_20205AC - thumb_func_end sub_080D2A54 + thumb_func_end CreateMonIconSprite thumb_func_start sub_080D2B2C sub_080D2B2C: @ 0x080D2B2C @@ -433277,8 +433277,8 @@ sub_080D2B68: @ 0x080D2B68 .align 2, 0 thumb_func_end sub_080D2B68 - thumb_func_start sub_080D2B88 -sub_080D2B88: @ 0x080D2B88 + thumb_func_start ScriptMovement_StartObjectMovementScript +ScriptMovement_StartObjectMovementScript: @ 0x080D2B88 push {r4, lr} sub sp, #4 adds r4, r3, #0 @@ -433297,7 +433297,7 @@ sub_080D2B88: @ 0x080D2B88 b _080D2BD2 _080D2BAA: ldr r0, _080D2BDC - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080D2BBC @@ -433320,10 +433320,10 @@ _080D2BD2: bx r1 .align 2, 0 _080D2BDC: .4byte sub_080D2F00 - thumb_func_end sub_080D2B88 + thumb_func_end ScriptMovement_StartObjectMovementScript - thumb_func_start sub_080D2BE0 -sub_080D2BE0: @ 0x080D2BE0 + thumb_func_start ScriptMovement_IsObjectMovementFinished +ScriptMovement_IsObjectMovementFinished: @ 0x080D2BE0 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -433360,7 +433360,7 @@ _080D2C24: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080D2BE0 + thumb_func_end ScriptMovement_IsObjectMovementFinished thumb_func_start sub_080D2C2C sub_080D2C2C: @ 0x080D2C2C @@ -433371,9 +433371,9 @@ sub_080D2C2C: @ 0x080D2C2C cmp r4, #0xff beq _080D2C46 adds r0, r4, #0 - bl sub_080D2EBC + bl UnfreezeObjects adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080D2C46: pop {r4} pop {r0} @@ -433387,7 +433387,7 @@ sub_080D2C4C: @ 0x080D2C4C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r0, _080D2C88 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r2, #1 @@ -433422,7 +433422,7 @@ _080D2C90: .4byte 0x0000FFFF sub_080D2C94: @ 0x080D2C94 push {lr} ldr r0, _080D2CA4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -433680,8 +433680,8 @@ _080D2E56: .align 2, 0 thumb_func_end sub_080D2E24 - thumb_func_start sub_080D2E5C -sub_080D2E5C: @ 0x080D2E5C + thumb_func_start npc_obj_offscreen_culling_and_flag_update +npc_obj_offscreen_culling_and_flag_update: @ 0x080D2E5C lsls r0, r0, #0x18 ldr r2, _080D2E68 lsrs r0, r0, #0x16 @@ -433690,7 +433690,7 @@ sub_080D2E5C: @ 0x080D2E5C bx lr .align 2, 0 _080D2E68: .4byte gUnknown_2039A30 - thumb_func_end sub_080D2E5C + thumb_func_end npc_obj_offscreen_culling_and_flag_update thumb_func_start sub_080D2E6C sub_080D2E6C: @ 0x080D2E6C @@ -433724,7 +433724,7 @@ sub_080D2E7C: @ 0x080D2E7C bl sub_080D2DCC adds r0, r4, #0 mov r1, r8 - bl sub_080D2E5C + bl npc_obj_offscreen_culling_and_flag_update adds r0, r5, #0 adds r1, r4, #0 adds r2, r6, #0 @@ -433737,8 +433737,8 @@ sub_080D2E7C: @ 0x080D2E7C .align 2, 0 thumb_func_end sub_080D2E7C - thumb_func_start sub_080D2EBC -sub_080D2EBC: @ 0x080D2EBC + thumb_func_start UnfreezeObjects +UnfreezeObjects: @ 0x080D2EBC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -433773,7 +433773,7 @@ _080D2EE6: .align 2, 0 _080D2EF8: .4byte gUnknown_3005B68 _080D2EFC: .4byte gUnknown_2036FF0 - thumb_func_end sub_080D2EBC + thumb_func_end UnfreezeObjects thumb_func_start sub_080D2F00 sub_080D2F00: @ 0x080D2F00 @@ -433848,20 +433848,20 @@ _080D2F7C: adds r1, r6, #0 bl sub_080D2DFC adds r0, r4, #0 - bl sub_08096D74 + bl FreezeEventObject b _080D2FAE .align 2, 0 _080D2F94: .4byte gUnknown_2036FF0 _080D2F98: adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement lsls r0, r0, #0x18 cmp r0, #0 bne _080D2FAE adds r5, #1 mov r0, r8 adds r1, r5, #0 - bl sub_080D2E5C + bl npc_obj_offscreen_culling_and_flag_update _080D2FAE: pop {r3} mov r8, r3 @@ -433870,8 +433870,8 @@ _080D2FAE: bx r0 thumb_func_end sub_080D2F44 - thumb_func_start sub_080D2FB8 -sub_080D2FB8: @ 0x080D2FB8 + thumb_func_start SetUpFieldMove_Cut +SetUpFieldMove_Cut: @ 0x080D2FB8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -433879,7 +433879,7 @@ sub_080D2FB8: @ 0x080D2FB8 push {r5, r6, r7} sub sp, #0x1c movs r0, #0x52 - bl sub_08135478 + bl CheckObjectGraphicsInFrontOfPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -433894,21 +433894,21 @@ sub_080D2FB8: @ 0x080D2FB8 b _080D32CC .align 2, 0 _080D2FE4: .4byte gUnknown_3005B10 -_080D2FE8: .4byte sub_081B53D8 +_080D2FE8: .4byte FieldCallback_PrepareFadeInFromMenu _080D2FEC: .4byte gUnknown_203CBB8 -_080D2FF0: .4byte sub_080D333C +_080D2FF0: .4byte FieldCallback_CutTree _080D2FF4: ldr r0, _080D3028 adds r1, r0, #2 bl PlayerGetDestCoords - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 muls r0, r1, r0 ldr r1, _080D302C adds r0, r0, r1 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0xc] @@ -433989,7 +433989,7 @@ _080D3096: asrs r4, r0, #0x10 adds r0, r4, #0 mov r1, sl - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D312C @@ -434029,7 +434029,7 @@ _080D30F6: asrs r0, r0, #0x10 ldr r2, [sp, #0x14] asrs r1, r2, #0x10 - bl sub_08087B14 + bl MapGridIsImpassableAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -434164,7 +434164,7 @@ _080D31FA: asrs r4, r0, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r2, sb @@ -434218,9 +434218,9 @@ _080D3274: .4byte gUnknown_203A80C _080D3278: .4byte gUnknown_8557164 _080D327C: .4byte gUnknown_8557166 _080D3280: .4byte gUnknown_3005B10 -_080D3284: .4byte sub_081B53D8 +_080D3284: .4byte FieldCallback_PrepareFadeInFromMenu _080D3288: .4byte gUnknown_203CBB8 -_080D328C: .4byte sub_080D32F0 +_080D328C: .4byte FieldCallback_CutGrass _080D3290: .4byte gUnknown_3001108 _080D3294: movs r7, #0 @@ -434267,17 +434267,17 @@ _080D32CC: .align 2, 0 _080D32DC: .4byte gUnknown_3001108 _080D32E0: .4byte gUnknown_3005B10 -_080D32E4: .4byte sub_081B53D8 +_080D32E4: .4byte FieldCallback_PrepareFadeInFromMenu _080D32E8: .4byte gUnknown_203CBB8 -_080D32EC: .4byte sub_080D32F0 - thumb_func_end sub_080D2FB8 +_080D32EC: .4byte FieldCallback_CutGrass + thumb_func_end SetUpFieldMove_Cut - thumb_func_start sub_080D32F0 -sub_080D32F0: @ 0x080D32F0 + thumb_func_start FieldCallback_CutGrass +FieldCallback_CutGrass: @ 0x080D32F0 push {lr} movs r0, #1 - bl sub_080B5270 - bl sub_081B1024 + bl FieldEffectStart + bl GetCursorSelectionMonId ldr r1, _080D3308 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -434286,12 +434286,12 @@ sub_080D32F0: @ 0x080D32F0 bx r0 .align 2, 0 _080D3308: .4byte gUnknown_20388A8 - thumb_func_end sub_080D32F0 + thumb_func_end FieldCallback_CutGrass thumb_func_start sub_080D330C sub_080D330C: @ 0x080D330C push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D3334 @@ -434310,13 +434310,13 @@ sub_080D330C: @ 0x080D330C bx r1 .align 2, 0 _080D3334: .4byte gUnknown_3005B60 -_080D3338: .4byte sub_080D338C +_080D3338: .4byte StartCutGrassFieldEffect thumb_func_end sub_080D330C - thumb_func_start sub_080D333C -sub_080D333C: @ 0x080D333C + thumb_func_start FieldCallback_CutTree +FieldCallback_CutTree: @ 0x080D333C push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _080D3354 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -434328,12 +434328,12 @@ sub_080D333C: @ 0x080D333C .align 2, 0 _080D3354: .4byte gUnknown_20388A8 _080D3358: .4byte gUnknown_8256612 - thumb_func_end sub_080D333C + thumb_func_end FieldCallback_CutTree thumb_func_start sub_080D335C sub_080D335C: @ 0x080D335C push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D3384 @@ -434352,23 +434352,23 @@ sub_080D335C: @ 0x080D335C bx r1 .align 2, 0 _080D3384: .4byte gUnknown_3005B60 -_080D3388: .4byte sub_080D3BF4 +_080D3388: .4byte StartCutTreeFieldEffect thumb_func_end sub_080D335C - thumb_func_start sub_080D338C -sub_080D338C: @ 0x080D338C + thumb_func_start StartCutGrassFieldEffect +StartCutGrassFieldEffect: @ 0x080D338C push {lr} movs r0, #1 bl FieldEffectActiveListRemove movs r0, #0x3a - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D338C + thumb_func_end StartCutGrassFieldEffect - thumb_func_start sub_080D33A0 -sub_080D33A0: @ 0x080D33A0 + thumb_func_start FldEff_CutGrass +FldEff_CutGrass: @ 0x080D33A0 push {r4, r5, r6, r7, lr} movs r6, #0 movs r0, #0x80 @@ -434410,7 +434410,7 @@ _080D33B6: asrs r5, r5, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080D34B0 + bl SetCutGrassMetatile adds r0, r4, #0 adds r1, r5, #0 bl sub_0808E0CC @@ -434434,11 +434434,11 @@ _080D3404: adds r1, r1, r2 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_080D35FC + bl SetCutGrassMetatiles bl DrawWholeMapView ldr r4, _080D34A0 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r6, #0 ldr r5, _080D34A4 @@ -434460,7 +434460,7 @@ _080D3440: adds r2, #0x14 ldr r0, _080D34AC movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, r1, r6 strb r0, [r1] @@ -434491,10 +434491,10 @@ _080D34A0: .4byte gUnknown_2039A70 _080D34A4: .4byte gUnknown_20205AC _080D34A8: .4byte gUnknown_2037230 _080D34AC: .4byte gUnknown_85571C8 - thumb_func_end sub_080D33A0 + thumb_func_end FldEff_CutGrass - thumb_func_start sub_080D34B0 -sub_080D34B0: @ 0x080D34B0 + thumb_func_start SetCutGrassMetatile +SetCutGrassMetatile: @ 0x080D34B0 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsls r1, r1, #0x10 @@ -434504,7 +434504,7 @@ sub_080D34B0: @ 0x080D34B0 asrs r5, r1, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 ldr r0, _080D34E8 cmp r1, r0 @@ -434626,16 +434626,16 @@ _080D35A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D34B0 + thumb_func_end SetCutGrassMetatile - thumb_func_start sub_080D35A8 -sub_080D35A8: @ 0x080D35A8 + thumb_func_start GetLongGrassCaseAt +GetLongGrassCaseAt: @ 0x080D35A8 push {lr} lsls r0, r0, #0x10 asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r1, r0, #0x10 adds r2, r1, #0 @@ -434673,10 +434673,10 @@ _080D35F6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D35A8 + thumb_func_end GetLongGrassCaseAt - thumb_func_start sub_080D35FC -sub_080D35FC: @ 0x080D35FC + thumb_func_start SetCutGrassMetatiles +SetCutGrassMetatiles: @ 0x080D35FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -434715,7 +434715,7 @@ _080D362E: asrs r5, r0, #0x10 adds r0, r5, #0 adds r1, r7, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt mov r8, r4 cmp r0, #0x15 bne _080D36B2 @@ -434723,7 +434723,7 @@ _080D362E: lsls r1, r4, #0x10 asrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_080D35A8 + bl GetLongGrassCaseAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -434777,13 +434777,13 @@ _080D36B2: asrs r4, r0, #0x10 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt cmp r0, #1 bne _080D372C adds r4, #1 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0x82 lsls r1, r1, #2 cmp r0, r1 @@ -434795,7 +434795,7 @@ _080D36B2: _080D36E4: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D377C cmp r0, r1 bne _080D36FC @@ -434806,7 +434806,7 @@ _080D36E4: _080D36FC: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D3784 cmp r0, r1 bne _080D3714 @@ -434817,7 +434817,7 @@ _080D36FC: _080D3714: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D3778 cmp r0, r1 bne _080D372C @@ -434850,11 +434850,11 @@ _080D3740: movs r0, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_080D3794 + bl HandleLongGrassOnHyper movs r0, #1 adds r1, r5, #0 adds r2, r4, #0 - bl sub_080D3794 + bl HandleLongGrassOnHyper _080D3768: add sp, #4 pop {r3, r4, r5} @@ -434872,10 +434872,10 @@ _080D3784: .4byte 0x00000282 _080D3788: .4byte 0x0000027A _080D378C: .4byte 0x0000027B _080D3790: .4byte gUnknown_3001100 - thumb_func_end sub_080D35FC + thumb_func_end SetCutGrassMetatiles - thumb_func_start sub_080D3794 -sub_080D3794: @ 0x080D3794 + thumb_func_start HandleLongGrassOnHyper +HandleLongGrassOnHyper: @ 0x080D3794 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -434937,7 +434937,7 @@ _080D37EE: adds r4, r0, #3 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0x82 lsls r1, r1, #2 cmp r0, r1 @@ -434949,7 +434949,7 @@ _080D37EE: _080D381E: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D38AC cmp r0, r1 bne _080D3836 @@ -434960,7 +434960,7 @@ _080D381E: _080D3836: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D38B4 cmp r0, r1 bne _080D384E @@ -434971,7 +434971,7 @@ _080D3836: _080D384E: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D38BC cmp r0, r1 bne _080D3866 @@ -434992,7 +434992,7 @@ _080D3866: asrs r7, r4, #0x10 adds r1, r7, #2 adds r0, r6, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt mov sb, r4 cmp r0, #0x15 bne _080D38F6 @@ -435000,7 +435000,7 @@ _080D3866: lsls r1, r4, #0x10 asrs r1, r1, #0x10 adds r0, r6, #0 - bl sub_080D35A8 + bl GetLongGrassCaseAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -435054,7 +435054,7 @@ _080D38F6: adds r4, r0, #4 adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0x82 lsls r1, r1, #2 cmp r0, r1 @@ -435066,7 +435066,7 @@ _080D38F6: _080D3918: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D39A4 cmp r0, r1 bne _080D3930 @@ -435077,7 +435077,7 @@ _080D3918: _080D3930: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D39AC cmp r0, r1 bne _080D3948 @@ -435088,7 +435088,7 @@ _080D3930: _080D3948: adds r0, r5, #0 adds r1, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080D39A0 cmp r0, r1 bne _080D3960 @@ -435109,14 +435109,14 @@ _080D3960: asrs r4, r0, #0x10 adds r1, r4, #3 adds r0, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt cmp r0, #0x15 bne _080D39EA adds r4, #4 lsls r1, r4, #0x10 asrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_080D35A8 + bl GetLongGrassCaseAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -435173,10 +435173,10 @@ _080D39EA: bx r0 .align 2, 0 _080D39FC: .4byte 0x00000283 - thumb_func_end sub_080D3794 + thumb_func_end HandleLongGrassOnHyper - thumb_func_start sub_080D3A00 -sub_080D3A00: @ 0x080D3A00 + thumb_func_start CutGrassSpriteCallback1 +CutGrassSpriteCallback1: @ 0x080D3A00 movs r2, #0 movs r1, #8 strh r1, [r0, #0x2e] @@ -435186,11 +435186,11 @@ sub_080D3A00: @ 0x080D3A00 str r1, [r0, #0x1c] bx lr .align 2, 0 -_080D3A10: .4byte sub_080D3A14 - thumb_func_end sub_080D3A00 +_080D3A10: .4byte CutGrassSpriteCallback2 + thumb_func_end CutGrassSpriteCallback1 - thumb_func_start sub_080D3A14 -sub_080D3A14: @ 0x080D3A14 + thumb_func_start CutGrassSpriteCallback2 +CutGrassSpriteCallback2: @ 0x080D3A14 push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -435235,11 +435235,11 @@ _080D3A64: pop {r0} bx r0 .align 2, 0 -_080D3A6C: .4byte sub_080D3A70 - thumb_func_end sub_080D3A14 +_080D3A6C: .4byte CutGrassSpriteCallbackEnd + thumb_func_end CutGrassSpriteCallback2 - thumb_func_start sub_080D3A70 -sub_080D3A70: @ 0x080D3A70 + thumb_func_start CutGrassSpriteCallbackEnd +CutGrassSpriteCallbackEnd: @ 0x080D3A70 push {r4, r5, r6, lr} movs r4, #1 _080D3A74: @@ -435267,12 +435267,12 @@ _080D3A74: movs r1, #0x3a bl FieldEffectStop ldr r0, [r6] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r6] - bl sub_08097E7C + bl ScriptUnfreezeEventObjects bl sub_080987E8 - bl sub_081D4094 + bl IsMewPlayingHideAndSeek lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -435287,10 +435287,10 @@ _080D3ACA: _080D3AD0: .4byte gUnknown_2039A70 _080D3AD4: .4byte gUnknown_20205AC _080D3AD8: .4byte gUnknown_823B5A9 - thumb_func_end sub_080D3A70 + thumb_func_end CutGrassSpriteCallbackEnd - thumb_func_start sub_080D3ADC -sub_080D3ADC: @ 0x080D3ADC + thumb_func_start FixLongGrassMetatilesWindowTop +FixLongGrassMetatilesWindowTop: @ 0x080D3ADC push {r4, r5, lr} lsls r0, r0, #0x10 asrs r5, r0, #0x10 @@ -435309,7 +435309,7 @@ sub_080D3ADC: @ 0x080D3ADC lsls r1, r4, #0x10 asrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_080D35A8 + bl GetLongGrassCaseAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -435354,10 +435354,10 @@ _080D3B4E: bx r0 .align 2, 0 _080D3B54: .4byte 0x00000283 - thumb_func_end sub_080D3ADC + thumb_func_end FixLongGrassMetatilesWindowTop - thumb_func_start sub_080D3B58 -sub_080D3B58: @ 0x080D3B58 + thumb_func_start FixLongGrassMetatilesWindowBottom +FixLongGrassMetatilesWindowBottom: @ 0x080D3B58 push {r4, r5, lr} lsls r0, r0, #0x10 asrs r4, r0, #0x10 @@ -435365,7 +435365,7 @@ sub_080D3B58: @ 0x080D3B58 asrs r5, r1, #0x10 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt cmp r0, #1 bne _080D3BEA adds r5, #1 @@ -435380,7 +435380,7 @@ sub_080D3B58: @ 0x080D3B58 beq _080D3BEA adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 ldr r0, _080D3BA4 cmp r1, r0 @@ -435434,20 +435434,20 @@ _080D3BEA: bx r0 .align 2, 0 _080D3BF0: .4byte 0x0000027B - thumb_func_end sub_080D3B58 + thumb_func_end FixLongGrassMetatilesWindowBottom - thumb_func_start sub_080D3BF4 -sub_080D3BF4: @ 0x080D3BF4 + thumb_func_start StartCutTreeFieldEffect +StartCutTreeFieldEffect: @ 0x080D3BF4 push {lr} movs r0, #0x80 bl sub_080A306C movs r0, #2 bl FieldEffectActiveListRemove - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D3BF4 + thumb_func_end StartCutTreeFieldEffect thumb_func_start ClearMailData ClearMailData: @ 0x080D3C0C @@ -435525,12 +435525,12 @@ _080D3C76: _080D3C8C: .4byte 0x0000FFFF thumb_func_end ClearMailStruct - thumb_func_start sub_080D3C90 -sub_080D3C90: @ 0x080D3C90 + thumb_func_start MonHasMail +MonHasMail: @ 0x080D3C90 push {r4, lr} adds r4, r0, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl ItemIsMail @@ -435539,7 +435539,7 @@ sub_080D3C90: @ 0x080D3C90 beq _080D3CB8 adds r0, r4, #0 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData cmp r0, #0xff beq _080D3CB8 movs r0, #1 @@ -435550,7 +435550,7 @@ _080D3CBA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080D3C90 + thumb_func_end MonHasMail thumb_func_start sub_080D3CC0 sub_080D3CC0: @ 0x080D3CC0 @@ -435714,11 +435714,11 @@ _080D3D84: mov r0, r8 movs r1, #0x40 mov r2, sl - bl sub_0806A774 + bl SetMonData mov r0, r8 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sl ldrb r0, [r1] b _080D3E3A @@ -435759,7 +435759,7 @@ sub_080D3E4C: @ 0x080D3E4C cmp r0, #0xc9 bne _080D3E64 adds r0, r1, #0 - bl sub_080D26E8 + bl GetUnownLetterByPersonality lsls r0, r0, #0x10 ldr r1, _080D3E68 adds r0, r0, r1 @@ -435795,8 +435795,8 @@ _080D3E8A: .align 2, 0 thumb_func_end MailSpeciesToSpecies - thumb_func_start sub_080D3E90 -sub_080D3E90: @ 0x080D3E90 + thumb_func_start GiveMailToMon2 +GiveMailToMon2: @ 0x080D3E90 push {r4, r5, r6, r7, lr} sub sp, #8 adds r6, r0, #0 @@ -435827,7 +435827,7 @@ sub_080D3E90: @ 0x080D3E90 adds r0, r6, #0 movs r1, #0x40 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r0, sp strb r5, [r0] mov r1, sp @@ -435836,7 +435836,7 @@ sub_080D3E90: @ 0x080D3E90 adds r0, r6, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r4] b _080D3EF6 .align 2, 0 @@ -435850,7 +435850,7 @@ _080D3EF6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D3E90 + thumb_func_end GiveMailToMon2 thumb_func_start sub_080D3F00 sub_080D3F00: @ 0x080D3F00 @@ -435858,18 +435858,18 @@ sub_080D3F00: @ 0x080D3F00 bx lr thumb_func_end sub_080D3F00 - thumb_func_start sub_080D3F04 -sub_080D3F04: @ 0x080D3F04 + thumb_func_start TakeMailFromMon +TakeMailFromMon: @ 0x080D3F04 push {r4, lr} sub sp, #8 adds r4, r0, #0 - bl sub_080D3C90 + bl MonHasMail lsls r0, r0, #0x18 cmp r0, #0 beq _080D3F56 adds r0, r4, #0 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData add r2, sp, #4 strb r0, [r2] ldr r0, _080D3F60 @@ -435892,11 +435892,11 @@ sub_080D3F04: @ 0x080D3F04 strb r1, [r0, #1] adds r0, r4, #0 movs r1, #0x40 - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData _080D3F56: add sp, #8 pop {r4} @@ -435904,7 +435904,7 @@ _080D3F56: bx r0 .align 2, 0 _080D3F60: .4byte gUnknown_3005AEC - thumb_func_end sub_080D3F04 + thumb_func_end TakeMailFromMon thumb_func_start ClearMailItemId ClearMailItemId: @ 0x080D3F64 @@ -435926,8 +435926,8 @@ ClearMailItemId: @ 0x080D3F64 _080D3F80: .4byte gUnknown_3005AEC thumb_func_end ClearMailItemId - thumb_func_start sub_080D3F84 -sub_080D3F84: @ 0x080D3F84 + thumb_func_start TakeMailFromMon2 +TakeMailFromMon2: @ 0x080D3F84 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -435963,7 +435963,7 @@ _080D3FA8: adds r0, r5, #0 movs r1, #0x40 str r3, [sp, #8] - bl sub_0806A058 + bl GetMonData mov r1, r8 ldr r2, [r1] lsls r1, r0, #3 @@ -435980,7 +435980,7 @@ _080D3FA8: stm r4!, {r0, r2, r3} adds r0, r5, #0 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData mov r1, r8 ldr r2, [r1] lsls r1, r0, #3 @@ -435994,11 +435994,11 @@ _080D3FA8: adds r0, r5, #0 movs r1, #0x40 mov r2, sb - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 b _080D4030 .align 2, 0 @@ -436020,7 +436020,7 @@ _080D4030: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D3F84 + thumb_func_end TakeMailFromMon2 thumb_func_start ItemIsMail ItemIsMail: @ 0x080D4040 @@ -436043,15 +436043,15 @@ _080D4054: thumb_func_start sub_080D4058 sub_080D4058: @ 0x080D4058 push {lr} - bl sub_080A01FC - bl sub_080D4068 + bl HideStartMenu + bl ShowMapNamePopup movs r0, #1 pop {r1} bx r1 thumb_func_end sub_080D4058 - thumb_func_start sub_080D4068 -sub_080D4068: @ 0x080D4068 + thumb_func_start ShowMapNamePopup +ShowMapNamePopup: @ 0x080D4068 push {r4, lr} movs r0, #0x80 lsls r0, r0, #7 @@ -436062,13 +436062,13 @@ sub_080D4068: @ 0x080D4068 beq _080D40F0 ldr r4, _080D40BC adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080D40C8 adds r0, r4, #0 movs r1, #0x5a - bl sub_080A8878 + bl CreateTask ldr r4, _080D40C0 strb r0, [r4] movs r0, #0x12 @@ -436091,7 +436091,7 @@ sub_080D4068: @ 0x080D4068 strh r1, [r0, #0xc] b _080D40F0 .align 2, 0 -_080D40BC: .4byte sub_080D4100 +_080D40BC: .4byte Task_MapNamePopUpWindow _080D40C0: .4byte gUnknown_2039A74 _080D40C4: .4byte gUnknown_3005B60 _080D40C8: @@ -436123,10 +436123,10 @@ _080D40F0: .align 2, 0 _080D40F8: .4byte gUnknown_3005B60 _080D40FC: .4byte gUnknown_2039A74 - thumb_func_end sub_080D4068 + thumb_func_end ShowMapNamePopup - thumb_func_start sub_080D4100 -sub_080D4100: @ 0x080D4100 + thumb_func_start Task_MapNamePopUpWindow +Task_MapNamePopUpWindow: @ 0x080D4100 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -436167,7 +436167,7 @@ _080D4148: ble _080D41EA strh r1, [r4, #8] strh r1, [r4, #0x10] - bl sub_080D4234 + bl DrawOptionMenuTexts b _080D41EA _080D4162: ldrh r0, [r4, #0xc] @@ -436237,7 +436237,7 @@ _080D41D0: strh r0, [r4, #8] b _080D41EA _080D41E4: - bl sub_080D41F8 + bl HideMapNamePopUpWindow b _080D41F2 _080D41EA: ldrh r1, [r4, #0xc] @@ -436247,13 +436247,13 @@ _080D41F2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080D4100 + thumb_func_end Task_MapNamePopUpWindow - thumb_func_start sub_080D41F8 -sub_080D41F8: @ 0x080D41F8 + thumb_func_start HideMapNamePopUpWindow +HideMapNamePopUpWindow: @ 0x080D41F8 push {lr} ldr r0, _080D422C - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _080D4228 @@ -436268,20 +436268,20 @@ sub_080D41F8: @ 0x080D41F8 bl SetGpuReg ldr r0, _080D4230 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask _080D4228: pop {r0} bx r0 .align 2, 0 -_080D422C: .4byte sub_080D4100 +_080D422C: .4byte Task_MapNamePopUpWindow _080D4230: .4byte gUnknown_2039A74 - thumb_func_end sub_080D41F8 + thumb_func_end HideMapNamePopUpWindow - thumb_func_start sub_080D4234 -sub_080D4234: @ 0x080D4234 + thumb_func_start DrawOptionMenuTexts +DrawOptionMenuTexts: @ 0x080D4234 push {r4, r5, lr} sub sp, #0x24 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _080D428C @@ -436326,10 +436326,10 @@ _080D428C: ldrb r1, [r0, #0x14] adds r0, r4, #0 movs r2, #0 - bl sub_08124578 + bl GetMapName _080D429C: - bl sub_08197844 - bl sub_080D4464 + bl AddMapNamePopUpWindow + bl LoadMapNamePopUpWindowBg adds r0, r4, #0 bl StringLength lsls r0, r0, #0x10 @@ -436362,14 +436362,14 @@ _080D429C: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x24 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080D42F8: .4byte gUnknown_2036FB8 - thumb_func_end sub_080D4234 + thumb_func_end DrawOptionMenuTexts thumb_func_start sub_080D42FC sub_080D42FC: @ 0x080D42FC @@ -436543,8 +436543,8 @@ _080D445C: .4byte 0x0000022E _080D4460: .4byte 0x0000022F thumb_func_end sub_080D42FC - thumb_func_start sub_080D4464 -sub_080D4464: @ 0x080D4464 + thumb_func_start LoadMapNamePopUpWindowBg +LoadMapNamePopUpWindowBg: @ 0x080D4464 push {r4, r5, lr} sub sp, #8 bl sub_0819787C @@ -436571,7 +436571,7 @@ _080D448E: ldrb r4, [r0] adds r0, r5, #0 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r4, #4 @@ -436585,9 +436585,9 @@ _080D448E: bl LoadBgTiles ldr r1, _080D44E4 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _080D44E8 ldrb r0, [r0, #0x16] cmp r0, #0xe @@ -436595,7 +436595,7 @@ _080D448E: ldr r0, _080D44EC movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _080D44FE .align 2, 0 _080D44D8: .4byte gUnknown_8559FC0 @@ -436610,7 +436610,7 @@ _080D44F0: adds r0, r0, r1 movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _080D44FE: lsls r1, r4, #4 subs r1, r1, r4 @@ -436632,10 +436632,10 @@ _080D44FE: .align 2, 0 _080D4524: .4byte gUnknown_8559EE0 _080D4528: .4byte gUnknown_85571E0 - thumb_func_end sub_080D4464 + thumb_func_end LoadMapNamePopUpWindowBg - thumb_func_start sub_080D452C -sub_080D452C: @ 0x080D452C + thumb_func_start RemoveBagSprite +RemoveBagSprite: @ 0x080D452C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -436675,10 +436675,10 @@ _080D4572: _080D4578: .4byte gUnknown_203CB20 _080D457C: .4byte 0x00000804 _080D4580: .4byte gUnknown_20205AC - thumb_func_end sub_080D452C + thumb_func_end RemoveBagSprite - thumb_func_start sub_080D4584 -sub_080D4584: @ 0x080D4584 + thumb_func_start AddBagVisualSprite +AddBagVisualSprite: @ 0x080D4584 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -436691,11 +436691,11 @@ sub_080D4584: @ 0x080D4584 movs r1, #0x44 movs r2, #0x42 movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4] adds r0, r5, #0 movs r1, #0 - bl sub_080D45BC + bl SetBagVisualPocketId pop {r4, r5} pop {r0} bx r0 @@ -436703,10 +436703,10 @@ sub_080D4584: @ 0x080D4584 _080D45B0: .4byte gUnknown_203CB20 _080D45B4: .4byte 0x00000804 _080D45B8: .4byte gUnknown_855A67C - thumb_func_end sub_080D4584 + thumb_func_end AddBagVisualSprite - thumb_func_start sub_080D45BC -sub_080D45BC: @ 0x080D45BC + thumb_func_start SetBagVisualPocketId +SetBagVisualPocketId: @ 0x080D45BC push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -436738,7 +436738,7 @@ _080D45F4: .4byte gUnknown_203CB20 _080D45F8: .4byte 0x00000804 _080D45FC: .4byte gUnknown_20205AC _080D4600: .4byte 0x0000FFFB -_080D4604: .4byte sub_080D4618 +_080D4604: .4byte SpriteCB_BagVisualSwitchingPockets _080D4608: adds r1, r3, #1 lsls r1, r1, #0x18 @@ -436748,10 +436748,10 @@ _080D4608: _080D4614: pop {r0} bx r0 - thumb_func_end sub_080D45BC + thumb_func_end SetBagVisualPocketId - thumb_func_start sub_080D4618 -sub_080D4618: @ 0x080D4618 + thumb_func_start SpriteCB_BagVisualSwitchingPockets +SpriteCB_BagVisualSwitchingPockets: @ 0x080D4618 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x26] @@ -436776,10 +436776,10 @@ _080D463C: bx r0 .align 2, 0 _080D4644: .4byte sub_08007140 - thumb_func_end sub_080D4618 + thumb_func_end SpriteCB_BagVisualSwitchingPockets - thumb_func_start sub_080D4648 -sub_080D4648: @ 0x080D4648 + thumb_func_start ShakeBagVisual +ShakeBagVisual: @ 0x080D4648 push {r4, lr} ldr r0, _080D4680 ldr r0, [r0] @@ -436811,11 +436811,11 @@ _080D4678: _080D4680: .4byte gUnknown_203CB20 _080D4684: .4byte 0x00000804 _080D4688: .4byte gUnknown_20205AC -_080D468C: .4byte sub_080D4690 - thumb_func_end sub_080D4648 +_080D468C: .4byte SpriteCB_ShakeBagVisual + thumb_func_end ShakeBagVisual - thumb_func_start sub_080D4690 -sub_080D4690: @ 0x080D4690 + thumb_func_start SpriteCB_ShakeBagVisual +SpriteCB_ShakeBagVisual: @ 0x080D4690 push {r4, lr} adds r4, r0, #0 adds r0, #0x3f @@ -436835,10 +436835,10 @@ _080D46AC: bx r0 .align 2, 0 _080D46B4: .4byte sub_08007140 - thumb_func_end sub_080D4690 + thumb_func_end SpriteCB_ShakeBagVisual - thumb_func_start sub_080D46B8 -sub_080D46B8: @ 0x080D46B8 + thumb_func_start AddSwitchPocketRotatingBallSprite +AddSwitchPocketRotatingBallSprite: @ 0x080D46B8 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x10 @@ -436848,14 +436848,14 @@ sub_080D46B8: @ 0x080D46B8 ldr r0, _080D46FC adds r4, r4, r0 ldr r0, _080D4700 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _080D4704 bl LoadSpritePalette ldr r0, _080D4708 movs r1, #0x10 movs r2, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4] ldr r2, _080D470C ldrb r1, [r4] @@ -436874,7 +436874,7 @@ _080D4700: .4byte gUnknown_855A6D0 _080D4704: .4byte gUnknown_855A6D8 _080D4708: .4byte gUnknown_855A6E0 _080D470C: .4byte gUnknown_20205AC - thumb_func_end sub_080D46B8 + thumb_func_end AddSwitchPocketRotatingBallSprite thumb_func_start UpdateSwitchPocketRotatingBallCoords UpdateSwitchPocketRotatingBallCoords: @ 0x080D4710 @@ -436898,8 +436898,8 @@ UpdateSwitchPocketRotatingBallCoords: @ 0x080D4710 .align 2, 0 thumb_func_end UpdateSwitchPocketRotatingBallCoords - thumb_func_start sub_080D4734 -sub_080D4734: @ 0x080D4734 + thumb_func_start SpriteCB_SwitchPocketRotatingBallInit +SpriteCB_SwitchPocketRotatingBallInit: @ 0x080D4734 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #1] @@ -436947,7 +436947,7 @@ _080D475E: .align 2, 0 _080D4790: .4byte gUnknown_855A6CC _080D4794: .4byte SpriteCB_SwitchPocketRotatingBallContinue - thumb_func_end sub_080D4734 + thumb_func_end SpriteCB_SwitchPocketRotatingBallInit thumb_func_start SpriteCB_SwitchPocketRotatingBallContinue SpriteCB_SwitchPocketRotatingBallContinue: @ 0x080D4798 @@ -436963,15 +436963,15 @@ SpriteCB_SwitchPocketRotatingBallContinue: @ 0x080D4798 cmp r0, #0x10 bne _080D47B6 movs r0, #1 - bl sub_080D452C + bl RemoveBagSprite _080D47B6: pop {r4} pop {r0} bx r0 thumb_func_end SpriteCB_SwitchPocketRotatingBallContinue - thumb_func_start sub_080D47BC -sub_080D47BC: @ 0x080D47BC + thumb_func_start AddBagItemIconSprite +AddBagItemIconSprite: @ 0x080D47BC push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -436993,7 +436993,7 @@ sub_080D47BC: @ 0x080D47BC adds r0, r4, #0 adds r1, r4, #0 adds r2, r6, #0 - bl sub_081AFB48 + bl AddItemIconSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -437016,7 +437016,7 @@ _080D480A: _080D4810: .4byte gUnknown_203CB20 _080D4814: .4byte 0x00000806 _080D4818: .4byte gUnknown_20205AC - thumb_func_end sub_080D47BC + thumb_func_end AddBagItemIconSprite thumb_func_start RemoveBagItemIconSprite RemoveBagItemIconSprite: @ 0x080D481C @@ -437026,7 +437026,7 @@ RemoveBagItemIconSprite: @ 0x080D481C lsls r1, r1, #0x12 adds r0, r0, r1 lsrs r0, r0, #0x18 - bl sub_080D452C + bl RemoveBagSprite pop {r0} bx r0 thumb_func_end RemoveBagItemIconSprite @@ -437139,8 +437139,8 @@ _080D48E0: bx r0 thumb_func_end sub_080D489C - thumb_func_start sub_080D48F4 -sub_080D48F4: @ 0x080D48F4 + thumb_func_start LoadBerryGfx +LoadBerryGfx: @ 0x080D48F4 push {r4, r5, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -437148,7 +437148,7 @@ sub_080D48F4: @ 0x080D48F4 adds r4, r0, #0 cmp r4, #0x2a bne _080D4906 - bl sub_080E0B78 + bl IsEnigmaBerryValid _080D4906: ldr r5, _080D4944 lsls r4, r4, #3 @@ -437163,7 +437163,7 @@ _080D4906: orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_080343E4 + bl LoadCompressedSpritePalette adds r4, r4, r5 ldr r0, [r4] ldr r4, _080D4950 @@ -437183,10 +437183,10 @@ _080D4948: .4byte 0xFFFF0000 _080D494C: .4byte 0x00007544 _080D4950: .4byte gUnknown_201D000 _080D4954: .4byte 0xFFFFF000 - thumb_func_end sub_080D48F4 + thumb_func_end LoadBerryGfx - thumb_func_start sub_080D4958 -sub_080D4958: @ 0x080D4958 + thumb_func_start CreateBerryTagSprite +CreateBerryTagSprite: @ 0x080D4958 push {r4, r5, lr} adds r4, r1, #0 adds r5, r2, #0 @@ -437196,7 +437196,7 @@ sub_080D4958: @ 0x080D4958 lsrs r4, r4, #0x10 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_080D48F4 + bl LoadBerryGfx ldr r0, _080D498C lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -437205,7 +437205,7 @@ sub_080D4958: @ 0x080D4958 adds r1, r4, #0 adds r2, r5, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5} @@ -437213,10 +437213,10 @@ sub_080D4958: @ 0x080D4958 bx r1 .align 2, 0 _080D498C: .4byte gUnknown_855A71C - thumb_func_end sub_080D4958 + thumb_func_end CreateBerryTagSprite - thumb_func_start sub_080D4990 -sub_080D4990: @ 0x080D4990 + thumb_func_start FreeBerryTagSpritePalette +FreeBerryTagSpritePalette: @ 0x080D4990 push {lr} ldr r0, _080D499C bl FreeSpritePaletteByTag @@ -437224,10 +437224,10 @@ sub_080D4990: @ 0x080D4990 bx r0 .align 2, 0 _080D499C: .4byte 0x00007544 - thumb_func_end sub_080D4990 + thumb_func_end FreeBerryTagSpritePalette - thumb_func_start sub_080D49A0 -sub_080D49A0: @ 0x080D49A0 + thumb_func_start LoadSpinningBerryPicGfx +LoadSpinningBerryPicGfx: @ 0x080D49A0 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -437248,12 +437248,12 @@ sub_080D49A0: @ 0x080D49A0 ldr r0, _080D4A04 bl FreeSpritePaletteByTag adds r0, r4, #0 - bl sub_080D48F4 + bl LoadBerryGfx ldr r0, _080D4A08 adds r1, r5, #0 adds r2, r6, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r4, r1, #0 @@ -437278,10 +437278,10 @@ _080D49F6: _080D4A04: .4byte 0x00007544 _080D4A08: .4byte gUnknown_855A7AC _080D4A0C: .4byte gUnknown_20205AC - thumb_func_end sub_080D49A0 + thumb_func_end LoadSpinningBerryPicGfx - thumb_func_start sub_080D4A10 -sub_080D4A10: @ 0x080D4A10 + thumb_func_start CreateBerryFlavorCircleSprite +CreateBerryFlavorCircleSprite: @ 0x080D4A10 push {lr} adds r1, r0, #0 ldr r0, _080D4A2C @@ -437289,23 +437289,23 @@ sub_080D4A10: @ 0x080D4A10 asrs r1, r1, #0x10 movs r2, #0x63 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _080D4A2C: .4byte gUnknown_855A940 - thumb_func_end sub_080D4A10 + thumb_func_end CreateBerryFlavorCircleSprite - thumb_func_start sub_080D4A30 -sub_080D4A30: @ 0x080D4A30 + thumb_func_start AnimTask_ShakeMon +AnimTask_ShakeMon: @ 0x080D4A30 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _080D4A50 ldrb r0, [r4] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -437352,11 +437352,11 @@ _080D4A90: .align 2, 0 _080D4A98: .4byte gUnknown_20205AC _080D4A9C: .4byte gUnknown_3005B60 -_080D4AA0: .4byte sub_080D4AA4 - thumb_func_end sub_080D4A30 +_080D4AA0: .4byte AnimTask_ShakeMonStep + thumb_func_end AnimTask_ShakeMon - thumb_func_start sub_080D4AA4 -sub_080D4AA4: @ 0x080D4AA4 + thumb_func_start AnimTask_ShakeMonStep +AnimTask_ShakeMonStep: @ 0x080D4AA4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -437448,10 +437448,10 @@ _080D4B4E: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080D4AA4 + thumb_func_end AnimTask_ShakeMonStep - thumb_func_start sub_080D4B54 -sub_080D4B54: @ 0x080D4B54 + thumb_func_start AnimTask_ShakeMon2 +AnimTask_ShakeMon2: @ 0x080D4B54 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -437464,7 +437464,7 @@ sub_080D4B54: @ 0x080D4B54 bgt _080D4B80 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0xff @@ -437504,7 +437504,7 @@ _080D4BAA: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _080D4BC0 @@ -437571,11 +437571,11 @@ _080D4C2A: _080D4C30: .4byte gUnknown_20205AC _080D4C34: .4byte gUnknown_20380BE _080D4C38: .4byte gUnknown_3005B60 -_080D4C3C: .4byte sub_080D4C40 - thumb_func_end sub_080D4B54 +_080D4C3C: .4byte AnimTask_ShakeMon2Step + thumb_func_end AnimTask_ShakeMon2 - thumb_func_start sub_080D4C40 -sub_080D4C40: @ 0x080D4C40 + thumb_func_start AnimTask_ShakeMon2Step +AnimTask_ShakeMon2Step: @ 0x080D4C40 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -437680,16 +437680,16 @@ _080D4CFC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D4C40 + thumb_func_end AnimTask_ShakeMon2Step - thumb_func_start sub_080D4D08 -sub_080D4D08: @ 0x080D4D08 + thumb_func_start AnimTask_ShakeMonInPlace +AnimTask_ShakeMonInPlace: @ 0x080D4D08 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _080D4D28 ldrb r0, [r4] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0xff @@ -437745,11 +437745,11 @@ _080D4D7A: .align 2, 0 _080D4D80: .4byte gUnknown_20205AC _080D4D84: .4byte gUnknown_3005B60 -_080D4D88: .4byte sub_080D4D8C - thumb_func_end sub_080D4D08 +_080D4D88: .4byte AnimTask_ShakeMonInPlaceStep + thumb_func_end AnimTask_ShakeMonInPlace - thumb_func_start sub_080D4D8C -sub_080D4D8C: @ 0x080D4D8C + thumb_func_start AnimTask_ShakeMonInPlaceStep +AnimTask_ShakeMonInPlaceStep: @ 0x080D4D8C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -437911,17 +437911,17 @@ _080D4EC0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D4D8C + thumb_func_end AnimTask_ShakeMonInPlaceStep - thumb_func_start sub_080D4EC8 -sub_080D4EC8: @ 0x080D4EC8 + thumb_func_start AnimTask_ShakeAndSinkMon +AnimTask_ShakeAndSinkMon: @ 0x080D4EC8 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r5, _080D4F18 ldrb r0, [r5] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D4F1C @@ -437949,7 +437949,7 @@ sub_080D4EC8: @ 0x080D4EC8 str r2, [r1] adds r0, r4, #0 bl _call_via_r2 - thumb_func_end sub_080D4EC8 + thumb_func_end AnimTask_ShakeAndSinkMon thumb_func_start sub_080D4F10 sub_080D4F10: @ 0x080D4F10 @@ -437960,11 +437960,11 @@ sub_080D4F10: @ 0x080D4F10 _080D4F18: .4byte gUnknown_20380BE _080D4F1C: .4byte gUnknown_20205AC _080D4F20: .4byte gUnknown_3005B60 -_080D4F24: .4byte sub_080D4F28 +_080D4F24: .4byte AnimTask_ShakeAndSinkMonStep thumb_func_end sub_080D4F10 - thumb_func_start sub_080D4F28 -sub_080D4F28: @ 0x080D4F28 + thumb_func_start AnimTask_ShakeAndSinkMonStep +AnimTask_ShakeAndSinkMonStep: @ 0x080D4F28 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -438039,10 +438039,10 @@ _080D4FAC: .align 2, 0 _080D4FB4: .4byte gUnknown_3005B60 _080D4FB8: .4byte gUnknown_20205AC - thumb_func_end sub_080D4F28 + thumb_func_end AnimTask_ShakeAndSinkMonStep - thumb_func_start sub_080D4FBC -sub_080D4FBC: @ 0x080D4FBC + thumb_func_start AnimTask_TranslateMonElliptical +AnimTask_TranslateMonElliptical: @ 0x080D4FBC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -438051,7 +438051,7 @@ sub_080D4FBC: @ 0x080D4FBC movs r6, #1 ldr r4, _080D5030 ldrb r0, [r4] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 movs r1, #8 @@ -438106,7 +438106,7 @@ _080D5006: _080D5030: .4byte gUnknown_20380BE _080D5034: .4byte gUnknown_3005B60 _080D5038: .4byte sub_080D503C - thumb_func_end sub_080D4FBC + thumb_func_end AnimTask_TranslateMonElliptical thumb_func_start sub_080D503C sub_080D503C: @ 0x080D503C @@ -438170,14 +438170,14 @@ _080D50AC: .4byte gUnknown_3005B60 _080D50B0: .4byte gUnknown_20205AC thumb_func_end sub_080D503C - thumb_func_start sub_080D50B4 -sub_080D50B4: @ 0x080D50B4 + thumb_func_start AnimTask_TranslateMonEllipticalRespectSide +AnimTask_TranslateMonEllipticalRespectSide: @ 0x080D50B4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080D50DC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D50D0 @@ -438187,17 +438187,17 @@ sub_080D50B4: @ 0x080D50B4 strh r0, [r1, #2] _080D50D0: adds r0, r4, #0 - bl sub_080D4FBC + bl AnimTask_TranslateMonElliptical pop {r4} pop {r0} bx r0 .align 2, 0 _080D50DC: .4byte gUnknown_20380D6 _080D50E0: .4byte gUnknown_20380BE - thumb_func_end sub_080D50B4 + thumb_func_end AnimTask_TranslateMonEllipticalRespectSide - thumb_func_start sub_080D50E4 -sub_080D50E4: @ 0x080D50E4 + thumb_func_start DoHorizontalLunge +DoHorizontalLunge: @ 0x080D50E4 push {r4, lr} adds r4, r0, #0 adds r2, r4, #0 @@ -438208,7 +438208,7 @@ sub_080D50E4: @ 0x080D50E4 strb r0, [r2] ldr r0, _080D510C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D5114 @@ -438237,7 +438237,7 @@ _080D5118: strh r2, [r4, #0x36] ldr r1, _080D5150 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080D5154 str r0, [r4, #0x1c] pop {r4} @@ -438247,12 +438247,12 @@ _080D5118: _080D5144: .4byte gUnknown_20380BE _080D5148: .4byte gUnknown_2023E88 _080D514C: .4byte gUnknown_20380D6 -_080D5150: .4byte sub_080D5158 -_080D5154: .4byte sub_080A5EF8 - thumb_func_end sub_080D50E4 +_080D5150: .4byte ReverseHorizontalLungeDirection +_080D5154: .4byte TranslateMonSpriteLinear + thumb_func_end DoHorizontalLunge - thumb_func_start sub_080D5158 -sub_080D5158: @ 0x080D5158 + thumb_func_start ReverseHorizontalLungeDirection +ReverseHorizontalLungeDirection: @ 0x080D5158 push {lr} ldrh r1, [r0, #0x36] strh r1, [r0, #0x2e] @@ -438262,16 +438262,16 @@ sub_080D5158: @ 0x080D5158 ldr r1, _080D5174 str r1, [r0, #0x1c] ldr r1, _080D5178 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 -_080D5174: .4byte sub_080A5EF8 -_080D5178: .4byte sub_080A34C4 - thumb_func_end sub_080D5158 +_080D5174: .4byte TranslateMonSpriteLinear +_080D5178: .4byte DestroyAnimSprite + thumb_func_end ReverseHorizontalLungeDirection - thumb_func_start sub_080D517C -sub_080D517C: @ 0x080D517C + thumb_func_start DoVerticalDip +DoVerticalDip: @ 0x080D517C push {r4, r5, lr} adds r4, r0, #0 adds r2, r4, #0 @@ -438282,7 +438282,7 @@ sub_080D517C: @ 0x080D517C strb r0, [r2] ldr r5, _080D51BC ldrb r0, [r5, #4] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r2, [r5] @@ -438295,7 +438295,7 @@ sub_080D517C: @ 0x080D517C strh r2, [r4, #0x36] ldr r1, _080D51C0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080D51C4 str r0, [r4, #0x1c] pop {r4, r5} @@ -438303,12 +438303,12 @@ sub_080D517C: @ 0x080D517C bx r0 .align 2, 0 _080D51BC: .4byte gUnknown_20380BE -_080D51C0: .4byte sub_080D51C8 -_080D51C4: .4byte sub_080A5EF8 - thumb_func_end sub_080D517C +_080D51C0: .4byte ReverseVerticalDipDirection +_080D51C4: .4byte TranslateMonSpriteLinear + thumb_func_end DoVerticalDip - thumb_func_start sub_080D51C8 -sub_080D51C8: @ 0x080D51C8 + thumb_func_start ReverseVerticalDipDirection +ReverseVerticalDipDirection: @ 0x080D51C8 push {lr} ldrh r1, [r0, #0x36] strh r1, [r0, #0x2e] @@ -438318,16 +438318,16 @@ sub_080D51C8: @ 0x080D51C8 ldr r1, _080D51E4 str r1, [r0, #0x1c] ldr r1, _080D51E8 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 -_080D51E4: .4byte sub_080A5EF8 -_080D51E8: .4byte sub_080A34C4 - thumb_func_end sub_080D51C8 +_080D51E4: .4byte TranslateMonSpriteLinear +_080D51E8: .4byte DestroyAnimSprite + thumb_func_end ReverseVerticalDipDirection - thumb_func_start sub_080D51EC -sub_080D51EC: @ 0x080D51EC + thumb_func_start SlideMonToOriginalPos +SlideMonToOriginalPos: @ 0x080D51EC push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r0, #0 @@ -438373,7 +438373,7 @@ _080D5214: strh r0, [r6, #0x36] adds r0, r6, #0 str r3, [sp] - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation ldr r3, [sp] strh r3, [r6, #0x34] strh r3, [r6, #0x36] @@ -438416,11 +438416,11 @@ _080D528A: bx r0 .align 2, 0 _080D52A0: .4byte gUnknown_20380BE -_080D52A4: .4byte sub_080D52A8 - thumb_func_end sub_080D51EC +_080D52A4: .4byte SlideMonToOriginalPosStep + thumb_func_end SlideMonToOriginalPos - thumb_func_start sub_080D52A8 -sub_080D52A8: @ 0x080D52A8 + thumb_func_start SlideMonToOriginalPosStep +SlideMonToOriginalPosStep: @ 0x080D52A8 push {r4, r5, r6, lr} adds r2, r0, #0 ldrh r0, [r2, #0x3c] @@ -438451,7 +438451,7 @@ _080D52DA: strh r1, [r3, #0x26] _080D52DC: adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _080D5312 .align 2, 0 _080D52E4: .4byte gUnknown_20205AC @@ -438481,10 +438481,10 @@ _080D5312: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080D52A8 + thumb_func_end SlideMonToOriginalPosStep - thumb_func_start sub_080D5318 -sub_080D5318: @ 0x080D5318 + thumb_func_start SlideMonToOffset +SlideMonToOffset: @ 0x080D5318 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r0, _080D532C @@ -438505,7 +438505,7 @@ _080D5336: adds r0, r2, r0 ldrb r6, [r0] adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D5360 @@ -438543,7 +438543,7 @@ _080D5360: adds r0, r0, r1 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation strh r4, [r5, #0x34] strh r4, [r5, #0x36] strh r6, [r5, #0x38] @@ -438555,7 +438555,7 @@ _080D5360: strb r0, [r2] ldr r1, _080D53C4 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _080D53C8 str r0, [r5, #0x1c] pop {r4, r5, r6} @@ -438566,9 +438566,9 @@ _080D53B4: .4byte gUnknown_20380D7 _080D53B8: .4byte gUnknown_2023E88 _080D53BC: .4byte gUnknown_20380BE _080D53C0: .4byte gUnknown_20205AC -_080D53C4: .4byte sub_080A34C4 -_080D53C8: .4byte sub_080A5F48 - thumb_func_end sub_080D5318 +_080D53C4: .4byte DestroyAnimSprite +_080D53C8: .4byte TranslateMonSpriteLinearFixedPoint + thumb_func_end SlideMonToOffset thumb_func_start sub_080D53CC sub_080D53CC: @ 0x080D53CC @@ -438598,7 +438598,7 @@ _080D53F6: adds r0, r1, r0 ldrb r7, [r0] adds r0, r1, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D5420 @@ -438637,7 +438637,7 @@ _080D5420: adds r0, r0, r1 strh r0, [r6, #0x36] adds r0, r6, #0 - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation ldrh r0, [r4, #0x24] lsls r0, r0, #8 strh r0, [r6, #0x34] @@ -438652,18 +438652,18 @@ _080D5420: bne _080D5488 ldr r1, _080D5484 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 b _080D5490 .align 2, 0 _080D5474: .4byte gUnknown_20380D7 _080D5478: .4byte gUnknown_2023E88 _080D547C: .4byte gUnknown_20380BE _080D5480: .4byte gUnknown_20205AC -_080D5484: .4byte sub_080A34C4 +_080D5484: .4byte DestroyAnimSprite _080D5488: ldr r1, _080D549C adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _080D5490: ldr r0, _080D54A0 str r0, [r6, #0x1c] @@ -438672,7 +438672,7 @@ _080D5490: bx r0 .align 2, 0 _080D549C: .4byte sub_080D54A4 -_080D54A0: .4byte sub_080A5F48 +_080D54A0: .4byte TranslateMonSpriteLinearFixedPoint thumb_func_end sub_080D53CC thumb_func_start sub_080D54A4 @@ -438694,7 +438694,7 @@ sub_080D54A4: @ 0x080D54A4 lsls r1, r1, #2 adds r1, r1, r4 strh r3, [r1, #0x26] - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -438702,8 +438702,8 @@ sub_080D54A4: @ 0x080D54A4 _080D54D0: .4byte gUnknown_20205AC thumb_func_end sub_080D54A4 - thumb_func_start sub_080D54D4 -sub_080D54D4: @ 0x080D54D4 + thumb_func_start AnimTask_WindUpLunge +AnimTask_WindUpLunge: @ 0x080D54D4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -438717,7 +438717,7 @@ sub_080D54D4: @ 0x080D54D4 lsrs r7, r0, #0x10 ldr r0, _080D555C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D5506 @@ -438729,7 +438729,7 @@ sub_080D54D4: @ 0x080D54D4 strh r0, [r5, #0xa] _080D5506: ldrb r0, [r5] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r1, _080D5560 lsls r4, r6, #2 adds r4, r4, r6 @@ -438770,11 +438770,11 @@ _080D5506: _080D5558: .4byte gUnknown_20380BE _080D555C: .4byte gUnknown_20380D6 _080D5560: .4byte gUnknown_3005B60 -_080D5564: .4byte sub_080D5568 - thumb_func_end sub_080D54D4 +_080D5564: .4byte AnimTask_WindUpLungePart1 + thumb_func_end AnimTask_WindUpLunge - thumb_func_start sub_080D5568 -sub_080D5568: @ 0x080D5568 + thumb_func_start AnimTask_WindUpLungePart1 +AnimTask_WindUpLungePart1: @ 0x080D5568 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -438821,11 +438821,11 @@ _080D55B8: .align 2, 0 _080D55C0: .4byte gUnknown_3005B60 _080D55C4: .4byte gUnknown_20205AC -_080D55C8: .4byte sub_080D55CC - thumb_func_end sub_080D5568 +_080D55C8: .4byte AnimTask_WindUpLungePart2 + thumb_func_end AnimTask_WindUpLungePart1 - thumb_func_start sub_080D55CC -sub_080D55CC: @ 0x080D55CC + thumb_func_start AnimTask_WindUpLungePart2 +AnimTask_WindUpLungePart2: @ 0x080D55CC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -438877,7 +438877,7 @@ _080D5628: bx r0 .align 2, 0 _080D5630: .4byte gUnknown_20205AC - thumb_func_end sub_080D55CC + thumb_func_end AnimTask_WindUpLungePart2 thumb_func_start sub_080D5634 sub_080D5634: @ 0x080D5634 @@ -438894,7 +438894,7 @@ sub_080D5634: @ 0x080D5634 cmp r0, #0 blt _080D5694 ldrb r0, [r1] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 b _080D569C @@ -438915,7 +438915,7 @@ _080D566E: ldrb r0, [r5] movs r4, #2 eors r0, r4 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _080D5694 @@ -438941,7 +438941,7 @@ _080D569C: strh r2, [r5, #8] ldr r0, _080D56C0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D56C8 @@ -439015,14 +439015,14 @@ _080D5734: .4byte gUnknown_3005B60 _080D5738: .4byte gUnknown_20205AC thumb_func_end sub_080D56F0 - thumb_func_start sub_080D573C -sub_080D573C: @ 0x080D573C + thumb_func_start AnimTask_SwayMon +AnimTask_SwayMon: @ 0x080D573C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r6, _080D578C ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D5758 @@ -439033,7 +439033,7 @@ sub_080D573C: @ 0x080D573C _080D5758: ldr r4, _080D5790 ldrb r0, [r4, #8] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D5794 @@ -439079,11 +439079,11 @@ _080D579C: .align 2, 0 _080D57B4: .4byte gUnknown_20380D7 _080D57B8: .4byte gUnknown_3005B60 -_080D57BC: .4byte sub_080D57C0 - thumb_func_end sub_080D573C +_080D57BC: .4byte AnimTask_SwayMonStep + thumb_func_end AnimTask_SwayMon - thumb_func_start sub_080D57C0 -sub_080D57C0: @ 0x080D57C0 + thumb_func_start AnimTask_SwayMonStep +AnimTask_SwayMonStep: @ 0x080D57C0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -439128,7 +439128,7 @@ _080D5810: .4byte gUnknown_3005B60 _080D5814: .4byte gUnknown_20205AC _080D5818: ldrb r0, [r4, #0x12] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080D5840 @@ -439235,23 +439235,23 @@ _080D58D4: .align 2, 0 _080D58E0: .4byte gUnknown_20205AC _080D58E4: .4byte gUnknown_3005B60 - thumb_func_end sub_080D57C0 + thumb_func_end AnimTask_SwayMonStep - thumb_func_start sub_080D58E8 -sub_080D58E8: @ 0x080D58E8 + thumb_func_start AnimTask_ScaleMonAndRestore +AnimTask_ScaleMonAndRestore: @ 0x080D58E8 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r6, _080D5934 ldrb r0, [r6, #6] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 ldrb r1, [r6, #8] adds r0, r5, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r1, _080D5938 lsls r0, r4, #2 adds r0, r0, r4 @@ -439278,11 +439278,11 @@ sub_080D58E8: @ 0x080D58E8 .align 2, 0 _080D5934: .4byte gUnknown_20380BE _080D5938: .4byte gUnknown_3005B60 -_080D593C: .4byte sub_080D5940 - thumb_func_end sub_080D58E8 +_080D593C: .4byte AnimTask_ScaleMonAndRestoreStep + thumb_func_end AnimTask_ScaleMonAndRestore - thumb_func_start sub_080D5940 -sub_080D5940: @ 0x080D5940 + thumb_func_start AnimTask_ScaleMonAndRestoreStep +AnimTask_ScaleMonAndRestoreStep: @ 0x080D5940 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -439308,7 +439308,7 @@ sub_080D5940: @ 0x080D5940 ldrsh r2, [r4, r3] adds r0, r6, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0xc] subs r0, #1 strh r0, [r4, #0xc] @@ -439334,7 +439334,7 @@ sub_080D5940: @ 0x080D5940 _080D59A0: .4byte gUnknown_3005B60 _080D59A4: adds r0, r6, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r5, #0 bl DestroyAnimVisualTask _080D59B0: @@ -439342,7 +439342,7 @@ _080D59B0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D5940 + thumb_func_end AnimTask_ScaleMonAndRestoreStep thumb_func_start sub_080D59B8 sub_080D59B8: @ 0x080D59B8 @@ -439353,12 +439353,12 @@ sub_080D59B8: @ 0x080D59B8 lsrs r7, r0, #0x18 ldr r4, _080D59F4 ldrb r0, [r4, #4] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r1, _080D59F8 lsls r0, r7, #2 adds r0, r0, r7 @@ -439397,7 +439397,7 @@ _080D5A08: strh r0, [r5, #0x12] ldrh r0, [r6, #6] strh r0, [r5, #0x14] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 mov r8, r4 cmp r0, #0 @@ -439421,7 +439421,7 @@ _080D5A4C: ldr r0, _080D5AA4 _080D5A4E: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #0 lsls r0, r0, #0x18 cmp r0, #0 @@ -439439,7 +439439,7 @@ _080D5A60: ldrsh r0, [r4, r3] cmp r0, #0 beq _080D5A8C - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080D5A8C @@ -439479,12 +439479,12 @@ sub_080D5AB0: @ 0x080D5AB0 lsrs r5, r0, #0x18 ldr r4, _080D5AEC ldrb r0, [r4, #4] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r1, _080D5AF0 lsls r0, r5, #2 adds r0, r0, r5 @@ -439508,7 +439508,7 @@ _080D5AF8: ldr r0, _080D5B28 _080D5AFA: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080D5B0C @@ -439599,7 +439599,7 @@ sub_080D5B8C: @ 0x080D5B8C lsls r2, r2, #1 ldrh r3, [r4, #0xe] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale movs r2, #0x16 ldrsh r0, [r4, r2] cmp r0, #0 @@ -439629,7 +439629,7 @@ _080D5BC0: _080D5BE4: .4byte gUnknown_3005B60 _080D5BE8: ldrb r0, [r4, #0x12] - bl sub_080A6C0C + bl ResetSpriteRotScale _080D5BEE: adds r0, r5, #0 bl DestroyAnimVisualTask @@ -439724,7 +439724,7 @@ _080D5C72: ldrh r0, [r1, #8] strh r0, [r4, #0x1e] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x16] @@ -439901,8 +439901,8 @@ GetBagItemQuantity: @ 0x080D5DD8 _080D5DEC: .4byte gUnknown_3005AF0 thumb_func_end GetBagItemQuantity - thumb_func_start sub_080D5DF0 -sub_080D5DF0: @ 0x080D5DF0 + thumb_func_start SetBagItemQuantity +SetBagItemQuantity: @ 0x080D5DF0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 ldr r2, _080D5E04 @@ -439914,7 +439914,7 @@ sub_080D5DF0: @ 0x080D5DF0 bx lr .align 2, 0 _080D5E04: .4byte gUnknown_3005AF0 - thumb_func_end sub_080D5DF0 + thumb_func_end SetBagItemQuantity thumb_func_start sub_080D5E08 sub_080D5E08: @ 0x080D5E08 @@ -439928,8 +439928,8 @@ sub_080D5E0C: @ 0x080D5E0C bx lr thumb_func_end sub_080D5E0C - thumb_func_start sub_080D5E10 -sub_080D5E10: @ 0x080D5E10 + thumb_func_start ApplyNewEncryptionKeyToBagItems +ApplyNewEncryptionKeyToBagItems: @ 0x080D5E10 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -439957,7 +439957,7 @@ _080D5E34: adds r0, #2 mov r1, r8 str r2, [sp] - bl sub_08076B08 + bl ApplyNewEncryptionKeyToHword adds r6, #1 ldr r2, [sp] ldrb r4, [r4, #4] @@ -439976,16 +439976,16 @@ _080D5E50: bx r0 .align 2, 0 _080D5E64: .4byte gUnknown_2039A78 - thumb_func_end sub_080D5E10 + thumb_func_end ApplyNewEncryptionKeyToBagItems - thumb_func_start sub_080D5E68 -sub_080D5E68: @ 0x080D5E68 + thumb_func_start ApplyNewEncryptionKeyToBagItems_ +ApplyNewEncryptionKeyToBagItems_: @ 0x080D5E68 push {lr} - bl sub_080D5E10 + bl ApplyNewEncryptionKeyToBagItems pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D5E68 + thumb_func_end ApplyNewEncryptionKeyToBagItems_ thumb_func_start SetBagItemsPointers SetBagItemsPointers: @ 0x080D5E74 @@ -440040,7 +440040,7 @@ sub_080D5EC8: @ 0x080D5EC8 cmp r0, #0xaf bne _080D5EF0 movs r0, #0x2b - bl sub_080E0BC8 + bl GetBerryInfo adds r1, r0, #0 adds r0, r4, #0 bl StringCopy @@ -440062,8 +440062,8 @@ _080D5EFC: .align 2, 0 thumb_func_end sub_080D5EC8 - thumb_func_start sub_080D5F04 -sub_080D5F04: @ 0x080D5F04 + thumb_func_start IsBagPocketNonEmpty +IsBagPocketNonEmpty: @ 0x080D5F04 push {lr} lsls r0, r0, #0x18 movs r2, #0 @@ -440096,10 +440096,10 @@ _080D5F36: _080D5F38: pop {r1} bx r1 - thumb_func_end sub_080D5F04 + thumb_func_end IsBagPocketNonEmpty - thumb_func_start sub_080D5F3C -sub_080D5F3C: @ 0x080D5F3C + thumb_func_start CheckBagHasItem +CheckBagHasItem: @ 0x080D5F3C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r7, r0, #0x10 @@ -440110,7 +440110,7 @@ sub_080D5F3C: @ 0x080D5F3C lsls r0, r0, #0x18 cmp r0, #0 beq _080D5FCE - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080D5F6A @@ -440123,7 +440123,7 @@ sub_080D5F3C: @ 0x080D5F3C _080D5F6A: adds r0, r7, #0 adds r1, r5, #0 - bl sub_080D6924 + bl CheckPyramidBagHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080D5FD0 @@ -440180,16 +440180,16 @@ _080D5FD0: bx r1 .align 2, 0 _080D5FD8: .4byte gUnknown_2039A78 - thumb_func_end sub_080D5F3C + thumb_func_end CheckBagHasItem - thumb_func_start sub_080D5FDC -sub_080D5FDC: @ 0x080D5FDC + thumb_func_start HasAtLeastOneBerry +HasAtLeastOneBerry: @ 0x080D5FDC push {r4, lr} movs r4, #0x85 _080D5FE0: adds r0, r4, #0 movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #1 @@ -440216,10 +440216,10 @@ _080D600E: bx r1 .align 2, 0 _080D6014: .4byte gUnknown_2037290 - thumb_func_end sub_080D5FDC + thumb_func_end HasAtLeastOneBerry - thumb_func_start sub_080D6018 -sub_080D6018: @ 0x080D6018 + thumb_func_start CheckBagHasSpace +CheckBagHasSpace: @ 0x080D6018 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -440235,7 +440235,7 @@ sub_080D6018: @ 0x080D6018 lsls r0, r0, #0x18 cmp r0, #0 beq _080D611E - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080D6050 @@ -440248,7 +440248,7 @@ sub_080D6018: @ 0x080D6018 _080D6050: mov r0, r8 adds r1, r5, #0 - bl sub_080D699C + bl CheckPyramidBagHasSpace lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080D612E @@ -440371,10 +440371,10 @@ _080D612E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6018 + thumb_func_end CheckBagHasSpace - thumb_func_start sub_080D6140 -sub_080D6140: @ 0x080D6140 + thumb_func_start AddBagItem +AddBagItem: @ 0x080D6140 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -440393,7 +440393,7 @@ sub_080D6140: @ 0x080D6140 movs r0, #0 b _080D62AA _080D6164: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080D617C @@ -440406,7 +440406,7 @@ _080D6164: _080D617C: mov r0, sb adds r1, r5, #0 - bl sub_080D6A1C + bl AddPyramidBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080D62AA @@ -440424,7 +440424,7 @@ _080D6190: adds r7, r1, r0 ldrb r0, [r7, #4] lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed mov r8, r0 ldr r1, [r7] ldrb r2, [r7, #4] @@ -440471,7 +440471,7 @@ _080D61D4: lsrs r5, r0, #0x10 adds r0, r4, #0 adds r1, r2, #0 - bl sub_080D5DF0 + bl SetBagItemQuantity ldr r2, [sp, #4] cmp r5, #0 beq _080D6296 @@ -440505,7 +440505,7 @@ _080D6230: bhi _080D6258 adds r0, r1, #2 adds r1, r5, #0 - bl sub_080D5DF0 + bl SetBagItemQuantity b _080D6296 .align 2, 0 _080D6250: .4byte gUnknown_2039A78 @@ -440519,7 +440519,7 @@ _080D6258: adds r0, r1, #2 adds r1, r2, #0 str r2, [sp, #4] - bl sub_080D5DF0 + bl SetBagItemQuantity ldr r2, [sp, #4] _080D626E: adds r0, r6, #1 @@ -440536,11 +440536,11 @@ _080D6280: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_080D5DF0 + bl SetBagItemQuantity b _080D6296 _080D628C: mov r0, r8 - bl sub_08000BF0 + bl Free movs r0, #0 b _080D62AA _080D6296: @@ -440550,7 +440550,7 @@ _080D6296: mov r1, r8 bl memcpy mov r0, r8 - bl sub_08000BF0 + bl Free movs r0, #1 _080D62AA: add sp, #8 @@ -440562,10 +440562,10 @@ _080D62AA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6140 + thumb_func_end AddBagItem - thumb_func_start sub_080D62BC -sub_080D62BC: @ 0x080D62BC + thumb_func_start RemoveBagItem +RemoveBagItem: @ 0x080D62BC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -440583,7 +440583,7 @@ sub_080D62BC: @ 0x080D62BC mov r0, r8 cmp r0, #0 beq _080D6350 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080D62F8 @@ -440596,7 +440596,7 @@ sub_080D62BC: @ 0x080D62BC _080D62F8: mov r0, r8 adds r1, r7, #0 - bl sub_080D6B4C + bl RemovePyramidBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080D6472 @@ -440644,7 +440644,7 @@ _080D6350: .align 2, 0 _080D6354: .4byte gUnknown_2039A78 _080D6358: - bl sub_080E9EA0 + bl CurMapIsSecretBase lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -440691,7 +440691,7 @@ _080D6388: subs r1, r1, r7 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_080D5DF0 + bl SetBagItemQuantity movs r7, #0 b _080D63E2 .align 2, 0 @@ -440705,7 +440705,7 @@ _080D63D0: adds r0, r0, r4 adds r0, #2 movs r1, #0 - bl sub_080D5DF0 + bl SetBagItemQuantity _080D63E2: ldr r0, [r5] adds r0, r0, r4 @@ -440746,7 +440746,7 @@ _080D6406: subs r1, r1, r7 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_080D5DF0 + bl SetBagItemQuantity movs r7, #0 b _080D6448 _080D6436: @@ -440757,7 +440757,7 @@ _080D6436: adds r0, r0, r4 adds r0, #2 movs r1, #0 - bl sub_080D5DF0 + bl SetBagItemQuantity _080D6448: ldr r0, [r5] adds r0, r0, r4 @@ -440790,10 +440790,10 @@ _080D6472: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D62BC + thumb_func_end RemoveBagItem - thumb_func_start sub_080D6480 -sub_080D6480: @ 0x080D6480 + thumb_func_start GetPocketByItemId +GetPocketByItemId: @ 0x080D6480 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -440803,10 +440803,10 @@ sub_080D6480: @ 0x080D6480 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6480 + thumb_func_end GetPocketByItemId - thumb_func_start sub_080D6494 -sub_080D6494: @ 0x080D6494 + thumb_func_start ClearItemSlots +ClearItemSlots: @ 0x080D6494 push {r4, r5, r6, r7, lr} adds r6, r0, #0 lsls r1, r1, #0x18 @@ -440822,7 +440822,7 @@ _080D64A6: strh r7, [r0] adds r0, #2 movs r1, #0 - bl sub_080D5DF0 + bl SetBagItemQuantity adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -440832,10 +440832,10 @@ _080D64BE: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080D6494 + thumb_func_end ClearItemSlots - thumb_func_start sub_080D64C4 -sub_080D64C4: @ 0x080D64C4 + thumb_func_start FindFreePCItemSlot +FindFreePCItemSlot: @ 0x080D64C4 push {lr} movs r1, #0 ldr r0, _080D64E4 @@ -440867,7 +440867,7 @@ _080D64E8: _080D64F8: pop {r1} bx r1 - thumb_func_end sub_080D64C4 + thumb_func_end FindFreePCItemSlot thumb_func_start CountUsedPCItemSlots CountUsedPCItemSlots: @ 0x080D64FC @@ -440902,8 +440902,8 @@ _080D651C: _080D6530: .4byte gUnknown_3005AEC thumb_func_end CountUsedPCItemSlots - thumb_func_start sub_080D6534 -sub_080D6534: @ 0x080D6534 + thumb_func_start CheckPCHasItem +CheckPCHasItem: @ 0x080D6534 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -440946,10 +440946,10 @@ _080D6580: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6534 + thumb_func_end CheckPCHasItem - thumb_func_start sub_080D6588 -sub_080D6588: @ 0x080D6588 + thumb_func_start AddPCItem +AddPCItem: @ 0x080D6588 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -440959,7 +440959,7 @@ sub_080D6588: @ 0x080D6588 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 movs r0, #0xc8 - bl sub_08000BDC + bl AllocZeroed adds r7, r0, #0 ldr r0, _080D6610 ldr r1, [r0] @@ -441003,7 +441003,7 @@ _080D65E8: bls _080D65B4 cmp r5, #0 beq _080D6638 - bl sub_080D64C4 + bl FindFreePCItemSlot lsls r0, r0, #0x18 asrs r1, r0, #0x18 movs r0, #1 @@ -441011,7 +441011,7 @@ _080D65E8: cmp r1, r0 bne _080D6628 adds r0, r7, #0 - bl sub_08000BF0 + bl Free movs r0, #0 b _080D6652 .align 2, 0 @@ -441042,7 +441042,7 @@ _080D6638: movs r2, #0xc8 bl memcpy adds r0, r7, #0 - bl sub_08000BF0 + bl Free movs r0, #1 _080D6652: pop {r3} @@ -441052,7 +441052,7 @@ _080D6652: bx r1 .align 2, 0 _080D665C: .4byte gUnknown_3005AEC - thumb_func_end sub_080D6588 + thumb_func_end AddPCItem thumb_func_start RemovePCItem RemovePCItem: @ 0x080D6660 @@ -441138,8 +441138,8 @@ _080D66E2: _080D66F0: .4byte gUnknown_3005AEC thumb_func_end CompactPCItems - thumb_func_start sub_080D66F4 -sub_080D66F4: @ 0x080D66F4 + thumb_func_start SwapRegisteredBike +SwapRegisteredBike: @ 0x080D66F4 push {lr} ldr r0, _080D6710 ldr r0, [r0] @@ -441169,7 +441169,7 @@ _080D6726: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080D66F4 + thumb_func_end SwapRegisteredBike thumb_func_start BagGetItemIdByPocketPosition BagGetItemIdByPocketPosition: @ 0x080D672C @@ -441188,8 +441188,8 @@ BagGetItemIdByPocketPosition: @ 0x080D672C _080D6744: .4byte gUnknown_2039A78 thumb_func_end BagGetItemIdByPocketPosition - thumb_func_start sub_080D6748 -sub_080D6748: @ 0x080D6748 + thumb_func_start BagGetQuantityByPocketPosition +BagGetQuantityByPocketPosition: @ 0x080D6748 push {lr} lsls r0, r0, #0x18 lsls r1, r1, #0x10 @@ -441208,20 +441208,20 @@ sub_080D6748: @ 0x080D6748 bx r1 .align 2, 0 _080D676C: .4byte gUnknown_2039A78 - thumb_func_end sub_080D6748 + thumb_func_end BagGetQuantityByPocketPosition - thumb_func_start sub_080D6770 -sub_080D6770: @ 0x080D6770 + thumb_func_start SwapItemSlots +SwapItemSlots: @ 0x080D6770 ldr r3, [r0] ldr r2, [r1] str r2, [r0] str r3, [r1] bx lr .align 2, 0 - thumb_func_end sub_080D6770 + thumb_func_end SwapItemSlots - thumb_func_start sub_080D677C -sub_080D677C: @ 0x080D677C + thumb_func_start CompactItemsInBagPocket +CompactItemsInBagPocket: @ 0x080D677C push {r4, r5, r6, r7, lr} adds r6, r0, #0 movs r3, #0 @@ -441246,7 +441246,7 @@ _080D6792: adds r0, r1, r5 lsls r2, r4, #2 adds r1, r1, r2 - bl sub_080D6770 + bl SwapItemSlots _080D67AE: adds r0, r4, #1 lsls r0, r0, #0x10 @@ -441265,10 +441265,10 @@ _080D67BE: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080D677C + thumb_func_end CompactItemsInBagPocket - thumb_func_start sub_080D67CC -sub_080D67CC: @ 0x080D67CC + thumb_func_start SortBerriesOrTMHMs +SortBerriesOrTMHMs: @ 0x080D67CC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -441310,7 +441310,7 @@ _080D6816: ldr r1, [r6] adds r0, r1, r7 adds r1, r1, r4 - bl sub_080D6770 + bl SwapItemSlots _080D6820: adds r0, r5, #1 lsls r0, r0, #0x10 @@ -441332,7 +441332,7 @@ _080D6832: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080D67CC + thumb_func_end SortBerriesOrTMHMs thumb_func_start MoveItemSlotInList MoveItemSlotInList: @ 0x080D6844 @@ -441405,7 +441405,7 @@ _080D68B2: adds r1, r1, r5 ldr r0, [r1] ldrb r1, [r1, #4] - bl sub_080D6494 + bl ClearItemSlots adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -441418,8 +441418,8 @@ _080D68B2: _080D68D0: .4byte gUnknown_2039A78 thumb_func_end ClearBag - thumb_func_start sub_080D68D4 -sub_080D68D4: @ 0x080D68D4 + thumb_func_start CountTotalItemQuantityInBag +CountTotalItemQuantityInBag: @ 0x080D68D4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -441460,10 +441460,10 @@ _080D6916: bx r1 .align 2, 0 _080D6920: .4byte gUnknown_2039A70 - thumb_func_end sub_080D68D4 + thumb_func_end CountTotalItemQuantityInBag - thumb_func_start sub_080D6924 -sub_080D6924: @ 0x080D6924 + thumb_func_start CheckPyramidBagHasItem +CheckPyramidBagHasItem: @ 0x080D6924 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -441525,10 +441525,10 @@ _080D6994: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6924 + thumb_func_end CheckPyramidBagHasItem - thumb_func_start sub_080D699C -sub_080D699C: @ 0x080D699C + thumb_func_start CheckPyramidBagHasSpace +CheckPyramidBagHasSpace: @ 0x080D699C push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -441594,10 +441594,10 @@ _080D6A14: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D699C + thumb_func_end CheckPyramidBagHasSpace - thumb_func_start sub_080D6A1C -sub_080D6A1C: @ 0x080D6A1C + thumb_func_start AddPyramidBagItem +AddPyramidBagItem: @ 0x080D6A1C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -441719,9 +441719,9 @@ _080D6AFE: cmp r4, #0 beq _080D6B1C adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r6, #0 - bl sub_08000BF0 + bl Free movs r0, #0 b _080D6B3E _080D6B1C: @@ -441734,9 +441734,9 @@ _080D6B1C: movs r2, #0xa bl memcpy adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r6, #0 - bl sub_08000BF0 + bl Free movs r0, #1 _080D6B3E: pop {r3, r4} @@ -441746,10 +441746,10 @@ _080D6B3E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6A1C + thumb_func_end AddPyramidBagItem - thumb_func_start sub_080D6B4C -sub_080D6B4C: @ 0x080D6B4C + thumb_func_start RemovePyramidBagItem +RemovePyramidBagItem: @ 0x080D6B4C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -441864,9 +441864,9 @@ _080D6C26: cmp r4, #0 beq _080D6C44 adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r6, #0 - bl sub_08000BF0 + bl Free movs r0, #0 b _080D6C66 _080D6C44: @@ -441879,9 +441879,9 @@ _080D6C44: movs r2, #0xa bl memcpy adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r6, #0 - bl sub_08000BF0 + bl Free _080D6C64: movs r0, #1 _080D6C66: @@ -441892,7 +441892,7 @@ _080D6C66: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080D6B4C + thumb_func_end RemovePyramidBagItem thumb_func_start SanitizeItemId SanitizeItemId: @ 0x080D6C74 @@ -442225,8 +442225,8 @@ sub_080D6E98: @ 0x080D6E98 _080D6EA0: .4byte gUnknown_2039BCA thumb_func_end sub_080D6E98 - thumb_func_start sub_080D6EA4 -sub_080D6EA4: @ 0x080D6EA4 + thumb_func_start SetupContestGpuRegs +SetupContestGpuRegs: @ 0x080D6EA4 push {r4, lr} movs r0, #0 movs r1, #0x40 @@ -442250,7 +442250,7 @@ sub_080D6EA4: @ 0x080D6EA4 movs r1, #0xfe lsls r1, r1, #7 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r0, _080D6F20 movs r1, #0 strh r1, [r0] @@ -442293,10 +442293,10 @@ _080D6F40: .4byte gUnknown_2022AD8 _080D6F44: .4byte gUnknown_2022ADA _080D6F48: .4byte gUnknown_2022ADC _080D6F4C: .4byte gUnknown_2022ADE - thumb_func_end sub_080D6EA4 + thumb_func_end SetupContestGpuRegs - thumb_func_start sub_080D6F50 -sub_080D6F50: @ 0x080D6F50 + thumb_func_start LoadContestBgAfterMoveAnim +LoadContestBgAfterMoveAnim: @ 0x080D6F50 push {r4, r5, lr} ldr r0, _080D6FAC movs r1, #0xc0 @@ -442309,14 +442309,14 @@ sub_080D6F50: @ 0x080D6F50 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _080D6FBC movs r2, #0x80 lsls r2, r2, #2 movs r1, #0 - bl sub_080A11BC + bl LoadCompressedPalette bl sub_080D7058 movs r4, #0 movs r5, #0xa0 @@ -442329,7 +442329,7 @@ _080D6F8A: adds r1, #5 lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette adds r5, #0x20 adds r4, #1 cmp r4, #3 @@ -442345,10 +442345,10 @@ _080D6FB8: .4byte gUnknown_8C16FB0 _080D6FBC: .4byte gUnknown_8C16E98 _080D6FC0: .4byte gUnknown_201A004 _080D6FC4: .4byte gUnknown_2039BC6 - thumb_func_end sub_080D6F50 + thumb_func_end LoadContestBgAfterMoveAnim - thumb_func_start sub_080D6FC8 -sub_080D6FC8: @ 0x080D6FC8 + thumb_func_start InitContestInfoBgs +InitContestInfoBgs: @ 0x080D6FC8 push {r4, lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -442359,7 +442359,7 @@ sub_080D6FC8: @ 0x080D6FC8 movs r0, #3 movs r1, #6 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r4, #0 _080D6FE6: lsls r0, r4, #0x18 @@ -442370,7 +442370,7 @@ _080D6FE6: adds r1, #0x24 adds r1, r1, r2 ldr r1, [r1] - bl sub_0800212C + bl SetBgTilemapBuffer adds r4, #1 cmp r4, #3 ble _080D6FE6 @@ -442380,13 +442380,13 @@ _080D6FE6: .align 2, 0 _080D7008: .4byte gUnknown_8560E98 _080D700C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080D6FC8 + thumb_func_end InitContestInfoBgs - thumb_func_start sub_080D7010 -sub_080D7010: @ 0x080D7010 + thumb_func_start InitContestWindows +InitContestWindows: @ 0x080D7010 push {lr} ldr r0, _080D7038 - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r0, _080D703C ldrb r1, [r0] @@ -442416,7 +442416,7 @@ _080D704E: bx r0 .align 2, 0 _080D7054: .4byte gUnknown_30030B4 - thumb_func_end sub_080D7010 + thumb_func_end InitContestWindows thumb_func_start sub_080D7058 sub_080D7058: @ 0x080D7058 @@ -442424,11 +442424,11 @@ sub_080D7058: @ 0x080D7058 ldr r0, _080D709C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 movs r1, #0 movs r2, #2 - bl sub_080A1238 + bl FillPalette movs r5, #0xa movs r4, #0xfa lsls r4, r4, #0x10 @@ -442436,7 +442436,7 @@ _080D7074: lsrs r1, r4, #0x10 ldr r0, _080D70A0 movs r2, #2 - bl sub_080A1200 + bl LoadPalette movs r0, #0x80 lsls r0, r0, #9 adds r4, r4, r0 @@ -442446,7 +442446,7 @@ _080D7074: ldr r0, _080D70A4 movs r1, #0xf3 movs r2, #2 - bl sub_080A1238 + bl FillPalette pop {r4, r5} pop {r0} bx r0 @@ -442456,8 +442456,8 @@ _080D70A0: .4byte gUnknown_2037596 _080D70A4: .4byte 0x00007E3F thumb_func_end sub_080D7058 - thumb_func_start sub_080D70A8 -sub_080D70A8: @ 0x080D70A8 + thumb_func_start InitContestResources +InitContestResources: @ 0x080D70A8 push {r4, r5, r6, r7, lr} ldr r4, _080D71A8 ldr r0, [r4] @@ -442548,7 +442548,7 @@ _080D70F8: cmp r0, #0 bne _080D7164 movs r0, #0 - bl sub_080DC5BC + bl SortContestants _080D7164: movs r5, #0 adds r2, r4, #0 @@ -442573,7 +442573,7 @@ _080D716E: adds r5, #1 cmp r5, #3 ble _080D716E - bl sub_080DCCF4 + bl ApplyNextTurnOrder ldr r0, _080D71A8 ldr r0, [r0] ldr r0, [r0, #0x1c] @@ -442587,82 +442587,82 @@ _080D716E: _080D71A8: .4byte gUnknown_2039BD4 _080D71AC: .4byte gUnknown_2039BCA _080D71B0: .4byte gUnknown_2039BC6 - thumb_func_end sub_080D70A8 + thumb_func_end InitContestResources - thumb_func_start sub_080D71B4 -sub_080D71B4: @ 0x080D71B4 + thumb_func_start AllocContestResources +AllocContestResources: @ 0x080D71B4 push {r4, r5, lr} ldr r4, _080D727C movs r0, #0x40 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0x5c - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1] movs r0, #0x70 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #4] movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #8] movs r0, #0x44 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0xc] movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x10] movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x14] movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x18] movs r0, #0x40 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x1c] movs r0, #0xc - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x20] movs r5, #0x80 lsls r5, r5, #5 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x24] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x28] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x2c] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x30] movs r5, #0x80 lsls r5, r5, #4 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x34] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x38] movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed ldr r2, [r4] str r0, [r2, #0x3c] ldr r1, _080D7280 @@ -442677,79 +442677,79 @@ sub_080D71B4: @ 0x080D71B4 _080D727C: .4byte gUnknown_2039BD4 _080D7280: .4byte gUnknown_2022D00 _080D7284: .4byte gUnknown_2022D04 - thumb_func_end sub_080D71B4 + thumb_func_end AllocContestResources - thumb_func_start sub_080D7288 -sub_080D7288: @ 0x080D7288 + thumb_func_start FreeContestResources +FreeContestResources: @ 0x080D7288 push {r4, r5, lr} ldr r5, _080D7344 ldr r0, [r5] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] movs r4, #0 str r4, [r0] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #4] ldr r0, [r0, #8] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #8] ldr r0, [r0, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0xc] ldr r0, [r0, #0x10] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x10] ldr r0, [r0, #0x14] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x14] ldr r0, [r0, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x18] ldr r0, [r0, #0x1c] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x1c] ldr r0, [r0, #0x20] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x20] ldr r0, [r0, #0x24] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x24] ldr r0, [r0, #0x28] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x28] ldr r0, [r0, #0x2c] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x2c] ldr r0, [r0, #0x30] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x30] ldr r0, [r0, #0x34] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x34] ldr r0, [r0, #0x38] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x38] ldr r0, [r0, #0x3c] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x3c] - bl sub_08000BF0 + bl Free str r4, [r5] ldr r0, _080D7348 str r4, [r0] @@ -442762,10 +442762,10 @@ sub_080D7288: @ 0x080D7288 _080D7344: .4byte gUnknown_2039BD4 _080D7348: .4byte gUnknown_2022D00 _080D734C: .4byte gUnknown_2022D04 - thumb_func_end sub_080D7288 + thumb_func_end FreeContestResources - thumb_func_start sub_080D7350 -sub_080D7350: @ 0x080D7350 + thumb_func_start CB2_StartContest +CB2_StartContest: @ 0x080D7350 push {r4, r5, r6, lr} ldr r0, _080D736C movs r1, #0x87 @@ -442790,25 +442790,25 @@ _080D7370: _080D737A: ldr r0, _080D73EC strb r5, [r0] - bl sub_080D71B4 - bl sub_0805EBD8 + bl AllocContestResources + bl AllocateMonSpritesGfx ldr r4, _080D73F0 ldr r0, [r4] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r4] str r5, [r0] movs r0, #0x80 lsls r0, r0, #7 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1] movs r0, #0 - bl sub_080006F0 - bl sub_080D6FC8 - bl sub_080D7010 - bl sub_080D6EA4 - bl sub_080B9750 + bl SetVBlankCallback + bl InitContestInfoBgs + bl InitContestWindows + bl SetupContestGpuRegs + bl ScanlineEffect_Clear bl ResetPaletteFade ldr r2, _080D73F4 ldrb r0, [r2, #8] @@ -442816,7 +442816,7 @@ _080D737A: orrs r0, r1 strb r0, [r2, #8] bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl FreeAllSpritePalettes ldr r1, _080D73F8 movs r0, #4 @@ -442827,7 +442827,7 @@ _080D737A: adds r0, r0, r1 strb r5, [r0] bl ClearBattleMonForms - bl sub_080D70A8 + bl InitContestResources b _080D7422 .align 2, 0 _080D73EC: .4byte gUnknown_2039BD8 @@ -442844,7 +442844,7 @@ _080D7406: ldr r0, [r4] ldr r0, [r0] adds r0, #0x59 - bl sub_080D7670 + bl SetupContestGraphics lsls r0, r0, #0x18 cmp r0, #0 beq _080D7482 @@ -442875,26 +442875,26 @@ _080D7430: ands r0, r1 strb r0, [r2, #8] ldr r0, _080D7494 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080D7498 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r1, _080D749C ldr r1, [r1] ldr r1, [r1] strb r0, [r1, #8] ldr r0, _080D74A0 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080D74A4 ldrb r1, [r0] movs r0, #2 ands r0, r1 cmp r0, #0 beq _080D7482 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #8 movs r1, #8 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _080D7482: pop {r4, r5, r6} pop {r0} @@ -442903,12 +442903,12 @@ _080D7482: _080D7488: .4byte gUnknown_2022ACC _080D748C: .4byte gUnknown_2022ACE _080D7490: .4byte gUnknown_2037C74 -_080D7494: .4byte sub_080D7AA8 +_080D7494: .4byte vblank_cb_battle _080D7498: .4byte sub_080D74A8 _080D749C: .4byte gUnknown_2039BD4 -_080D74A0: .4byte sub_080D7A68 +_080D74A0: .4byte CB2_ContestMain _080D74A4: .4byte gUnknown_2039BCA - thumb_func_end sub_080D7350 + thumb_func_end CB2_StartContest thumb_func_start sub_080D74A8 sub_080D74A8: @ 0x080D74A8 @@ -442978,12 +442978,12 @@ _080D7520: beq _080D7554 b _080D7566 _080D7526: - bl sub_080DB6CC + bl ContestPrintLinkStandby ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] _080D7530: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080D75CA @@ -442999,7 +442999,7 @@ _080D7530: .align 2, 0 _080D7550: .4byte gUnknown_3005B60 _080D7554: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -443026,11 +443026,11 @@ _080D7566: ands r0, r1 cmp r0, #0 bne _080D758E - bl sub_080DB6CC + bl ContestPrintLinkStandby _080D758E: ldr r0, _080D75B0 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, _080D75B4 lsls r0, r5, #2 adds r0, r0, r5 @@ -443113,9 +443113,9 @@ sub_080D7614: @ 0x080D7614 lsls r1, r1, #0x10 cmp r1, #0 bgt _080D7656 - bl sub_0800A02C + bl GetMultiplayerId adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080D7660 ldr r0, [r0] ldr r0, [r0] @@ -443142,8 +443142,8 @@ _080D7668: .4byte gUnknown_3005AE0 _080D766C: .4byte gUnknown_3005E18 thumb_func_end sub_080D7614 - thumb_func_start sub_080D7670 -sub_080D7670: @ 0x080D7670 + thumb_func_start SetupContestGraphics +SetupContestGraphics: @ 0x080D7670 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -443250,9 +443250,9 @@ _080D7754: movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _080D78DA .align 2, 0 _080D7768: .4byte gUnknown_8C16FB0 @@ -443261,9 +443261,9 @@ _080D776C: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _080D7798 ldr r0, [r0] ldr r1, [r0, #0x2c] @@ -443286,7 +443286,7 @@ _080D77A8: movs r2, #0x80 lsls r2, r2, #2 movs r1, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r5, _080D7814 ldr r6, _080D7818 adds r0, r5, #0 @@ -443338,9 +443338,9 @@ _080D7824: .4byte gUnknown_201A004 _080D7828: .4byte 0x040000D4 _080D782C: .4byte 0x84000080 _080D7830: - bl sub_080DC7B0 - bl sub_080DB6F4 - bl sub_080DAA20 + bl DrawContestantWindows + bl FillContestantWindowBgs + bl SwapMoveDescAndContestTilemaps bl sub_080DA884 ldr r1, _080D78B8 ldr r1, [r1] @@ -443349,7 +443349,7 @@ _080D7830: strb r0, [r1, #0x12] bl sub_080DBA20 bl sub_080DBC54 - bl sub_080DBCF8 + bl CreateApplauseMeterSprite bl sub_080DBD4C bl sub_080DBF50 ldr r1, _080D78BC @@ -443366,26 +443366,26 @@ _080D7830: strb r2, [r4] ldr r0, _080D78C8 strb r3, [r0] - bl sub_080DA828 + bl AnimTask_Splash ldr r2, _080D78CC ldrb r1, [r4] adds r1, r1, r2 strb r0, [r1] bl sub_080DE184 movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg b _080D78DA .align 2, 0 _080D78B8: .4byte gUnknown_2039BD4 @@ -443415,7 +443415,7 @@ _080D78E4: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080D7670 + thumb_func_end SetupContestGraphics thumb_func_start sub_080D78F4 sub_080D78F4: @ 0x080D78F4 @@ -443498,7 +443498,7 @@ _080D7978: strh r0, [r4, #0xa] movs r0, #0x61 movs r1, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -443559,7 +443559,7 @@ _080D79DC: ldrh r1, [r4] movs r0, #0xc bl SetGpuReg - bl sub_080DD270 + bl StartMoveApplauseMeterOnscreen ldr r1, _080D7A30 lsls r0, r5, #2 adds r0, r0, r5 @@ -443601,13 +443601,13 @@ _080D7A60: .4byte gUnknown_2039BD4 _080D7A64: .4byte sub_080D7B68 thumb_func_end sub_080D7934 - thumb_func_start sub_080D7A68 -sub_080D7A68: @ 0x080D7A68 + thumb_func_start CB2_ContestMain +CB2_ContestMain: @ 0x080D7A68 push {r4, r5, lr} - bl sub_080066D8 - bl sub_080A89D4 + bl AnimateSprites + bl RunTasks bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade movs r4, #0 _080D7A7C: ldr r5, _080D7AA4 @@ -443619,7 +443619,7 @@ _080D7A7C: beq _080D7A92 lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _080D7A92: adds r4, #1 cmp r4, #3 @@ -443631,10 +443631,10 @@ _080D7A92: bx r0 .align 2, 0 _080D7AA4: .4byte gUnknown_2039BD8 - thumb_func_end sub_080D7A68 + thumb_func_end CB2_ContestMain - thumb_func_start sub_080D7AA8 -sub_080D7AA8: @ 0x080D7AA8 + thumb_func_start vblank_cb_battle +vblank_cb_battle: @ 0x080D7AA8 push {lr} ldr r0, _080D7B38 ldrh r1, [r0] @@ -443685,9 +443685,9 @@ sub_080D7AA8: @ 0x080D7AA8 movs r0, #0x46 bl SetGpuReg bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 - bl sub_080B9800 + bl LoadOam + bl ProcessSpriteCopyRequests + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -443703,7 +443703,7 @@ _080D7B58: .4byte gUnknown_2022AD8 _080D7B5C: .4byte gUnknown_2022ADA _080D7B60: .4byte gUnknown_2022ADC _080D7B64: .4byte gUnknown_2022ADE - thumb_func_end sub_080D7AA8 + thumb_func_end vblank_cb_battle thumb_func_start sub_080D7B68 sub_080D7B68: @ 0x080D7B68 @@ -443723,7 +443723,7 @@ sub_080D7B68: @ 0x080D7B68 strh r1, [r0] ldr r0, _080D7BD4 strh r1, [r0] - bl sub_080DC4AC + bl ContestDebugDoPrint ldr r1, _080D7BD8 ldr r2, _080D7BDC ldr r0, _080D7BE0 @@ -443744,7 +443744,7 @@ sub_080D7B68: @ 0x080D7B68 adds r4, r0, #0 ldr r0, _080D7BF0 ldrb r0, [r0] - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 bne _080D7BF8 @@ -443773,10 +443773,10 @@ _080D7C00: ldr r4, _080D7C2C ldr r1, _080D7C30 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D7C34 lsls r0, r5, #2 adds r0, r0, r5 @@ -443792,7 +443792,7 @@ _080D7C2C: .4byte gUnknown_2021C7C _080D7C30: .4byte gUnknown_2022AE0 _080D7C34: .4byte gUnknown_3005B60 _080D7C38: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 bne _080D7C46 strh r0, [r4, #8] @@ -443825,7 +443825,7 @@ _080D7C68: bl sub_080A306C ldr r0, _080D7C94 ldrb r0, [r0] - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 bne _080D7CA0 @@ -443918,7 +443918,7 @@ _080D7CE2: adds r0, r0, r2 ldrh r0, [r0, #8] adds r1, r5, #0 - bl sub_080E4BF0 + bl AreMovesContestCombo lsls r0, r0, #0x18 cmp r0, #0 beq _080D7D78 @@ -443984,7 +443984,7 @@ _080D7DAA: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 mov r1, sp bl sub_080DE2D4 @@ -444037,11 +444037,11 @@ _080D7E2C: .4byte gUnknown_2039BD4 _080D7E30: .4byte gUnknown_2039AA0 _080D7E34: .4byte gUnknown_2039BC5 _080D7E38: .4byte gUnknown_3005B60 -_080D7E3C: .4byte sub_080D7E40 +_080D7E3C: .4byte ReadMail thumb_func_end sub_080D7CBC - thumb_func_start sub_080D7E40 -sub_080D7E40: @ 0x080D7E40 + thumb_func_start ReadMail +ReadMail: @ 0x080D7E40 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -444123,7 +444123,7 @@ _080D7EBE: adds r4, r0, #0 ldr r0, _080D7F00 ldrb r0, [r0] - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 bne _080D7F08 @@ -444145,10 +444145,10 @@ _080D7F10: ldr r4, _080D7F44 ldr r1, _080D7F48 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r0, _080D7F4C movs r1, #0 strh r1, [r0] @@ -444274,7 +444274,7 @@ _080D8026: _080D802C: .4byte gUnknown_2039BD4 _080D8030: .4byte gUnknown_2039AA0 _080D8034: .4byte gUnknown_2039BC5 - thumb_func_end sub_080D7E40 + thumb_func_end ReadMail thumb_func_start sub_080D8038 sub_080D8038: @ 0x080D8038 @@ -444295,7 +444295,7 @@ sub_080D8038: @ 0x080D8038 str r1, [sp, #0xc] movs r0, #2 movs r2, #1 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile add sp, #0x10 pop {r0} bx r0 @@ -444339,7 +444339,7 @@ sub_080D8090: @ 0x080D8090 beq _080D8108 ldr r4, _080D80F0 ldrb r0, [r4] - bl sub_080DB01C + bl GetChosenMove ldr r1, _080D80F4 ldr r1, [r1] ldrb r2, [r4] @@ -444352,7 +444352,7 @@ sub_080D8090: @ 0x080D8090 ldr r4, _080D80F8 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D80FC @@ -444365,7 +444365,7 @@ sub_080D8090: @ 0x080D8090 adds r0, r0, r1 ldr r1, _080D8104 str r1, [r0] - bl sub_080DB6CC + bl ContestPrintLinkStandby movs r0, #0 bl sub_080DBBF4 b _080D811A @@ -444400,7 +444400,7 @@ sub_080D8128: @ 0x080D8128 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldr r2, _080D814C ldr r0, _080D8150 ldr r0, [r0] @@ -444440,12 +444440,12 @@ _080D8178: lsrs r4, r5, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0x80 lsls r0, r0, #0x11 adds r5, r5, r0 @@ -444453,7 +444453,7 @@ _080D8178: cmp r6, #3 ble _080D8178 movs r0, #0 - bl sub_080DE468 + bl Contest_SetBgCopyFlags ldr r1, _080D81E8 ldr r0, _080D81EC movs r2, #0x80 @@ -444470,7 +444470,7 @@ _080D8178: ldr r1, _080D81F4 adds r0, r0, r1 movs r1, #0 - bl sub_080A1200 + bl LoadPalette ldr r1, _080D81F8 lsls r0, r7, #2 adds r0, r0, r7 @@ -444521,7 +444521,7 @@ sub_080D8200: @ 0x080D8200 asrs r0, r0, #0x10 cmp r0, #2 bne _080D823E - bl sub_080DD34C + bl TryMoveApplauseMeterOffscreen movs r0, #1 bl sub_080DDE00 ldr r0, _080D8248 @@ -444614,7 +444614,7 @@ _080D82DA: adds r0, r0, r4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080DB01C + bl GetChosenMove ldr r1, _080D8320 ldr r1, [r1] ldrb r2, [r5] @@ -444649,11 +444649,11 @@ _080D8320: .4byte gUnknown_2039BD4 _080D8324: .4byte gUnknown_3005AE0 _080D8328: .4byte gUnknown_2039BCA _080D832C: .4byte gUnknown_2039BD0 -_080D8330: .4byte sub_080D8334 +_080D8330: .4byte NamingScreen_Init thumb_func_end sub_080D8284 - thumb_func_start sub_080D8334 -sub_080D8334: @ 0x080D8334 + thumb_func_start NamingScreen_Init +NamingScreen_Init: @ 0x080D8334 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -444752,7 +444752,7 @@ _080D8380: @ jump table .4byte _080D9654 @ case 58 .4byte _080D9694 @ case 59 _080D8470: - bl sub_080DC4AC + bl ContestDebugDoPrint movs r7, #0 ldr r0, _080D84FC ldr r0, [r0] @@ -444803,13 +444803,13 @@ _080D84D0: ldr r4, _080D8504 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D8508 adds r1, r4, #0 bl SetTaskFuncWithFollowupFunc - bl sub_080DB6CC + bl ContestPrintLinkStandby ldr r1, _080D850C mov r0, sl add r0, r8 @@ -444971,7 +444971,7 @@ _080D85CC: ldr r0, [r1] ldr r0, [r0] ldrb r0, [r0, #0x11] - bl sub_080DC150 + bl IsMetatileDirectionallyImpassable lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -445083,10 +445083,10 @@ _080D8740: ldr r4, _080D8770 ldr r1, _080D8774 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D8778 mov r3, r8 lsls r0, r3, #2 @@ -445103,7 +445103,7 @@ _080D8770: .4byte gUnknown_2021C7C _080D8774: .4byte gUnknown_824B346 _080D8778: .4byte gUnknown_3005B60 _080D877C: - bl sub_080DE454 + bl GetPlayerTextSpeed adds r1, r0, #0 cmp r1, #0 beq _080D878A @@ -445150,7 +445150,7 @@ _080D87B0: ldrb r0, [r0, #0x11] bl sub_080DE140 adds r0, r4, #0 - bl sub_080DE20C + bl SelectContestMoveBankTarget adds r0, r4, #0 bl DoMoveAnim ldr r1, _080D8804 @@ -445342,7 +445342,7 @@ _080D8970: strh r0, [r7, #8] bl _080D98F0 _080D8978: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D8984 bl _080D98F0 @@ -445719,7 +445719,7 @@ _080D8C5C: bl sub_080DAFE8 bl _080D98F0 _080D8C74: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D8C80 bl _080D98F0 @@ -446029,10 +446029,10 @@ _080D8ECC: ldr r4, _080D8F08 ldr r1, _080D8F0C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter _080D8EEE: ldr r0, _080D8F10 mov r1, sl @@ -446049,7 +446049,7 @@ _080D8F08: .4byte gUnknown_2021C7C _080D8F0C: .4byte gUnknown_824C04A _080D8F10: .4byte gUnknown_3005B60 _080D8F14: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D8F20 bl _080D98F0 @@ -446117,14 +446117,14 @@ _080D8F98: ldr r0, _080D8FA8 _080D8F9E: movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter b _080D8FB4 .align 2, 0 _080D8FA8: .4byte gUnknown_824BD18 _080D8FAC: ldr r0, _080D8FCC movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter _080D8FB4: movs r0, #3 bl sub_080DCE84 @@ -446150,10 +446150,10 @@ _080D8FD4: ldr r4, _080D901C ldr r1, _080D9020 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter movs r0, #2 bl sub_080DCE84 ldr r1, _080D9024 @@ -446198,7 +446198,7 @@ _080D903C: .align 2, 0 _080D9058: .4byte gUnknown_3005B60 _080D905C: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D9068 bl _080D98F0 @@ -446296,10 +446296,10 @@ _080D90FC: ldr r4, _080D9158 ldr r1, _080D915C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r0, _080D9160 mov r5, r8 lsls r4, r5, #2 @@ -446347,7 +446347,7 @@ _080D9186: strh r1, [r0, #8] b _080D98F0 _080D9196: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D91A0 b _080D98F0 @@ -446385,7 +446385,7 @@ _080D91A0: _080D91DC: .4byte gUnknown_2039BD4 _080D91E0: .4byte gUnknown_3005B60 _080D91E4: - bl sub_080DC4AC + bl ContestDebugDoPrint ldr r0, _080D921C ldr r0, [r0] ldr r1, [r0, #0x14] @@ -446542,7 +446542,7 @@ _080D9328: bge _080D9340 ldr r0, _080D9338 ldr r1, _080D933C - bl sub_08008BCC + bl StringExpandPlaceholders b _080D936C .align 2, 0 _080D9338: .4byte gUnknown_2021C7C @@ -446559,7 +446559,7 @@ _080D9340: bgt _080D9364 ldr r0, _080D935C ldr r1, _080D9360 - bl sub_08008BCC + bl StringExpandPlaceholders b _080D936C .align 2, 0 _080D935C: .4byte gUnknown_2021C7C @@ -446567,11 +446567,11 @@ _080D9360: .4byte gUnknown_824BFE6 _080D9364: ldr r0, _080D9390 ldr r1, _080D9394 - bl sub_08008BCC + bl StringExpandPlaceholders _080D936C: ldr r0, _080D9390 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D9398 mov r3, r8 lsls r0, r3, #2 @@ -446621,7 +446621,7 @@ _080D93C8: movs r1, #1 bl sub_080DD634 ldr r0, _080D93DC - bl sub_080A29AC + bl PlayFanfare b _080D9436 .align 2, 0 _080D93DC: .4byte 0x00000187 @@ -446635,14 +446635,14 @@ _080D93E0: beq _080D93F0 b _080D98F0 _080D93F0: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D93FA b _080D98F0 _080D93FA: movs r0, #1 rsbs r0, r0, #0 - bl sub_080DD440 + bl ShowAndUpdateApplauseMeter b _080D9436 _080D9404: mov r2, sb @@ -446721,7 +446721,7 @@ _080D9484: @ jump table .4byte _080D9536 @ case 3 .4byte _080D957C @ case 4 _080D9498: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D94A2 b _080D98F0 @@ -446744,7 +446744,7 @@ _080D94BA: movs r0, #0xdf bl sub_080A306C movs r0, #1 - bl sub_080DD440 + bl ShowAndUpdateApplauseMeter b _080D9564 _080D94CC: mov r3, sb @@ -446913,10 +446913,10 @@ _080D95CC: ldr r4, _080D9648 ldr r1, _080D964C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D9650 mov r3, r8 lsls r0, r3, #2 @@ -446937,7 +446937,7 @@ _080D9648: .4byte gUnknown_2021C7C _080D964C: .4byte gUnknown_824C091 _080D9650: .4byte gUnknown_3005B60 _080D9654: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D965E b _080D98F0 @@ -446946,10 +446946,10 @@ _080D965E: ldr r4, _080D9688 ldr r1, _080D968C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D9690 mov r4, r8 lsls r0, r4, #2 @@ -446964,7 +446964,7 @@ _080D9688: .4byte gUnknown_2021C7C _080D968C: .4byte gUnknown_824C0B1 _080D9690: .4byte gUnknown_3005B60 _080D9694: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D969E b _080D98F0 @@ -447014,10 +447014,10 @@ _080D96D0: ldr r4, _080D972C ldr r1, _080D9730 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D9734 mov r3, r8 lsls r0, r3, #2 @@ -447036,7 +447036,7 @@ _080D972C: .4byte gUnknown_2021C7C _080D9730: .4byte gUnknown_824BEC1 _080D9734: .4byte gUnknown_3005B60 _080D9738: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 beq _080D9742 b _080D98F0 @@ -447054,7 +447054,7 @@ _080D9748: .align 2, 0 _080D9754: .4byte gUnknown_3005B60 _080D9758: - bl sub_080DD34C + bl TryMoveApplauseMeterOffscreen ldr r0, _080D9770 mov r5, r8 lsls r1, r5, #2 @@ -447084,7 +447084,7 @@ _080D978A: cmp r0, #4 ble _080D9798 strb r1, [r2, #0x13] - bl sub_080DD0A4 + bl UpdateApplauseMeter _080D9798: ldr r0, _080D97AC mov r2, r8 @@ -447166,10 +447166,10 @@ _080D9828: ldr r4, _080D9864 ldr r1, _080D9868 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D986C mov r2, r8 lsls r0, r2, #2 @@ -447186,7 +447186,7 @@ _080D9864: .4byte gUnknown_2021C7C _080D9868: .4byte gUnknown_824B354 _080D986C: .4byte gUnknown_3005B60 _080D9870: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 bne _080D98F0 ldr r0, _080D988C @@ -447259,7 +447259,7 @@ _080D98F0: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080D8334 + thumb_func_end NamingScreen_Init thumb_func_start sub_080D9900 sub_080D9900: @ 0x080D9900 @@ -447274,7 +447274,7 @@ sub_080D9900: @ 0x080D9900 rsbs r1, r1, #0 ands r1, r2 strb r1, [r3, #7] - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 @@ -447385,19 +447385,19 @@ _080D99B6: lsls r0, r0, #0x18 cmp r0, #0 beq _080D99E4 - bl sub_080DB0A8 + bl RankContestants bl sub_080DB17C _080D99E4: ldr r4, _080D9A0C adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D9A10 adds r1, r4, #0 bl SetTaskFuncWithFollowupFunc - bl sub_080DB6CC + bl ContestPrintLinkStandby strh r6, [r5, #8] b _080D9A40 .align 2, 0 @@ -447406,7 +447406,7 @@ _080D9A08: .4byte gUnknown_2039BD4 _080D9A0C: .4byte sub_080FD4DC _080D9A10: .4byte sub_080D9900 _080D9A14: - bl sub_080DB0A8 + bl RankContestants bl sub_080DB17C b _080D9A2E _080D9A1E: @@ -447671,10 +447671,10 @@ sub_080D9BBC: @ 0x080D9BBC adds r4, r4, r0 ldr r1, [r4] adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r5, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -447688,13 +447688,13 @@ _080D9C2C: .4byte gUnknown_2039AA2 _080D9C30: .4byte gUnknown_2021C7C _080D9C34: .4byte gUnknown_8560CF4 _080D9C38: - bl sub_080DE454 + bl GetPlayerTextSpeed cmp r0, #0 bne _080D9C4A strh r0, [r6, #8] ldr r0, _080D9C50 str r0, [r6] - bl sub_080DC4AC + bl ContestDebugDoPrint _080D9C4A: pop {r4, r5, r6} pop {r0} @@ -447860,7 +447860,7 @@ _080D9D74: .4byte gUnknown_2039BD4 _080D9D78: .4byte gUnknown_3005B60 _080D9D7C: .4byte sub_080D9DD8 _080D9D80: - bl sub_080DD270 + bl StartMoveApplauseMeterOnscreen ldr r0, _080D9D9C lsls r1, r5, #2 adds r1, r1, r5 @@ -447950,7 +447950,7 @@ _080D9DF0: lsls r0, r0, #2 adds r0, r0, r2 ldrh r0, [r0, #8] - bl sub_080EDB90 + bl BravoTrainerPokemonProfile_BeforeInterview1 b _080D9E58 .align 2, 0 _080D9E34: .4byte gUnknown_2022ACA @@ -447971,10 +447971,10 @@ _080D9E58: ldr r4, _080D9E94 ldr r1, _080D9E98 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter ldr r1, _080D9E9C lsls r0, r5, #2 adds r0, r0, r5 @@ -448001,7 +448001,7 @@ sub_080D9EA4: @ 0x080D9EA4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080DE454 + bl GetPlayerTextSpeed adds r4, r0, #0 cmp r4, #0 bne _080D9EDA @@ -448013,7 +448013,7 @@ sub_080D9EA4: @ 0x080D9EA4 strh r0, [r1] movs r0, #0x62 movs r1, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r1, _080D9EE8 lsls r0, r5, #2 adds r0, r0, r5 @@ -448107,7 +448107,7 @@ _080D9F70: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080D9F8C _080D9F82: str r0, [r4] @@ -448129,7 +448129,7 @@ sub_080D9F90: @ 0x080D9F90 ldr r5, _080D9FCC adds r0, r5, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080D9FD0 @@ -448142,7 +448142,7 @@ sub_080D9F90: @ 0x080D9F90 adds r0, r0, r1 ldr r1, _080D9FD8 str r1, [r0] - bl sub_080DB6CC + bl ContestPrintLinkStandby movs r0, #0 bl sub_080DBBF4 pop {r4, r5} @@ -448161,14 +448161,14 @@ sub_080D9FDC: @ 0x080D9FDC sub sp, #4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _080DA014 ldr r0, _080DA018 ldr r0, [r0] @@ -448201,15 +448201,15 @@ sub_080DA020: @ 0x080DA020 cmp r0, #0 bne _080DA050 adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080DA058 ldr r1, _080DA05C str r1, [r0] - bl sub_080034D4 - bl sub_080D7288 - bl sub_0805ECB0 + bl FreeAllWindowBuffers + bl FreeContestResources + bl FreeMonSpritesGfx ldr r0, _080DA060 - bl sub_08000540 + bl SetMainCallback2 _080DA050: pop {r0} bx r0 @@ -448224,7 +448224,7 @@ _080DA060: .4byte sub_08085A30 sub_080DA064: @ 0x080DA064 push {lr} bl sub_080987E8 - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 @@ -448332,7 +448332,7 @@ _080DA104: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448340,9 +448340,9 @@ _080DA104: adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 ldrb r0, [r5] lsls r0, r0, #6 adds r1, r6, #2 @@ -448351,7 +448351,7 @@ _080DA104: bl StringCopy adds r0, r4, #0 movs r1, #0x16 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448359,7 +448359,7 @@ _080DA104: strb r0, [r1] adds r0, r4, #0 movs r1, #0x17 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448367,7 +448367,7 @@ _080DA104: strb r0, [r1] adds r0, r4, #0 movs r1, #0x18 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448375,7 +448375,7 @@ _080DA104: strb r0, [r1] adds r0, r4, #0 movs r1, #0x21 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448383,7 +448383,7 @@ _080DA104: strb r0, [r1] adds r0, r4, #0 movs r1, #0x2f - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448391,7 +448391,7 @@ _080DA104: strb r0, [r1] adds r0, r4, #0 movs r1, #0x30 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 @@ -448399,35 +448399,35 @@ _080DA104: strb r0, [r1] adds r0, r4, #0 movs r1, #0xd - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 strh r0, [r1, #0x1e] adds r0, r4, #0 movs r1, #0xe - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 strh r0, [r1, #0x20] adds r0, r4, #0 movs r1, #0xf - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 strh r0, [r1, #0x22] adds r0, r4, #0 movs r1, #0x10 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r1, r1, r6 strh r0, [r1, #0x24] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r2, r6, #0 @@ -448436,7 +448436,7 @@ _080DA104: str r0, [r1] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData ldrb r1, [r5] lsls r1, r1, #6 adds r2, r6, #0 @@ -448445,7 +448445,7 @@ _080DA104: str r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r2, r0, #0x10 mov ip, r2 @@ -448900,7 +448900,7 @@ sub_080DA58C: @ 0x080DA58C push {r4, lr} adds r4, r0, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080DA59E movs r0, #3 @@ -448908,7 +448908,7 @@ sub_080DA58C: @ 0x080DA58C _080DA59E: adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080DA5AE movs r0, #4 @@ -448952,7 +448952,7 @@ _080DA5F4: adds r0, r4, #0 movs r1, #0x36 _080DA5F8: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 b _080DA606 @@ -448987,13 +448987,13 @@ _080DA628: adds r4, r5, r4 ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] adds r0, #4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer lsls r4, r5, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 @@ -449010,8 +449010,8 @@ _080DA628: _080DA660: .4byte gUnknown_2039BC6 thumb_func_end sub_080DA624 - thumb_func_start sub_080DA664 -sub_080DA664: @ 0x080DA664 + thumb_func_start Rain_Main +Rain_Main: @ 0x080DA664 push {r4, r5, lr} adds r5, r0, #0 lsls r4, r1, #0x18 @@ -449029,7 +449029,7 @@ sub_080DA664: @ 0x080DA664 .align 2, 0 _080DA684: .4byte gUnknown_2022AE0 _080DA688: .4byte gUnknown_85CC497 - thumb_func_end sub_080DA664 + thumb_func_end Rain_Main thumb_func_start sub_080DA68C sub_080DA68C: @ 0x080DA68C @@ -449066,7 +449066,7 @@ sub_080DA6A4: @ 0x080DA6A4 bl StringAppend mov r0, sp adds r1, r5, #0 - bl sub_080DA664 + bl Rain_Main ldr r0, _080DA6F0 adds r4, r4, r0 ldrb r0, [r4] @@ -449110,7 +449110,7 @@ sub_080DA710: @ 0x080DA710 lsls r0, r4, #6 ldr r2, _080DA738 adds r0, r0, r2 - bl sub_080DA664 + bl Rain_Main ldr r0, _080DA73C adds r4, r4, r0 ldrb r0, [r4] @@ -449251,21 +449251,21 @@ _080DA80A: _080DA824: .4byte gUnknown_2039BA0 thumb_func_end sub_080DA800 - thumb_func_start sub_080DA828 -sub_080DA828: @ 0x080DA828 + thumb_func_start AnimTask_Splash +AnimTask_Splash: @ 0x080DA828 push {r4, r5, lr} ldr r0, _080DA870 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080DA874 movs r1, #0x88 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _080DA878 movs r1, #0x70 movs r2, #0x24 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _080DA87C @@ -449292,20 +449292,20 @@ _080DA874: .4byte gUnknown_8C1C700 _080DA878: .4byte gUnknown_8560B4C _080DA87C: .4byte gUnknown_20205AC _080DA880: .4byte sub_08007140 - thumb_func_end sub_080DA828 + thumb_func_end AnimTask_Splash thumb_func_start sub_080DA884 sub_080DA884: @ 0x080DA884 push {lr} ldr r0, _080DA8C8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080DA8CC - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _080DA8D0 movs r1, #0x60 movs r2, #0xa movs r3, #0x1d - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080DA8D4 @@ -449379,14 +449379,14 @@ _080DA930: adds r0, r5, #0 adds r1, r7, #0 adds r2, r6, #0 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality movs r1, #0x90 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette adds r0, r5, #0 movs r1, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r4, _080DA9CC movs r0, #2 adds r1, r5, #0 @@ -449398,7 +449398,7 @@ _080DA930: adds r0, r4, #0 movs r1, #0x70 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, _080DA9D0 @@ -449491,8 +449491,8 @@ _080DAA1C: bx r1 thumb_func_end IsSpeciesNotUnown - thumb_func_start sub_080DAA20 -sub_080DAA20: @ 0x080DAA20 + thumb_func_start SwapMoveDescAndContestTilemaps +SwapMoveDescAndContestTilemaps: @ 0x080DAA20 push {r4, r5, r6, lr} ldr r5, _080DAA4C ldr r0, [r5] @@ -449515,7 +449515,7 @@ sub_080DAA20: @ 0x080DAA20 bx r0 .align 2, 0 _080DAA4C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DAA20 + thumb_func_end SwapMoveDescAndContestTilemaps thumb_func_start sub_080DAA50 sub_080DAA50: @ 0x080DAA50 @@ -449620,7 +449620,7 @@ _080DAB08: adds r1, r7, #0 movs r2, #0xb movs r3, #0x1f - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile adds r1, r7, #0 adds r1, #0x10 str r6, [sp] @@ -449630,7 +449630,7 @@ _080DAB08: movs r0, #0 movs r2, #0xb movs r3, #0x20 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile ldr r2, _080DAB5C ldr r0, _080DAB54 mov r3, r8 @@ -449727,7 +449727,7 @@ _080DABD6: bl ContestBG_FillBoxWithTile movs r0, #0xe movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _080DAC38 ldr r0, _080DAC3C adds r0, r7, r0 @@ -449773,7 +449773,7 @@ sub_080DAC44: @ 0x080DAC44 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r4, #0 - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 bne _080DACC4 @@ -449797,7 +449797,7 @@ sub_080DAC44: @ 0x080DAC44 adds r1, r4, #0 movs r2, #0x14 adds r3, r7, #0 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile adds r4, #0x10 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -449812,7 +449812,7 @@ sub_080DAC44: @ 0x080DAC44 movs r0, #0 adds r1, r4, #0 movs r2, #0x14 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile b _080DACDA .align 2, 0 _080DACC0: .4byte gUnknown_2039BC6 @@ -450203,7 +450203,7 @@ _080DAF82: mov r1, r8 movs r2, #0x14 adds r3, r7, #0 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile mov r1, r8 adds r1, #0x10 lsls r1, r1, #0x10 @@ -450217,7 +450217,7 @@ _080DAF82: str r4, [sp, #0xc] movs r0, #0 movs r2, #0x14 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile b _080DAFD8 _080DAFC2: movs r0, #2 @@ -450262,24 +450262,24 @@ sub_080DB000: @ 0x080DB000 push {lr} movs r0, #8 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #8 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_080DE468 + bl Contest_SetBgCopyFlags pop {r0} bx r0 thumb_func_end sub_080DB000 - thumb_func_start sub_080DB01C -sub_080DB01C: @ 0x080DB01C + thumb_func_start GetChosenMove +GetChosenMove: @ 0x080DB01C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 adds r0, r4, #0 - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 beq _080DB034 @@ -450291,8 +450291,8 @@ _080DB034: cmp r4, r0 beq _080DB058 adds r0, r4, #0 - bl sub_08156200 - bl sub_08156260 + bl ContestAI_ResetAI + bl ContestAI_GetActionToUse lsls r0, r0, #0x18 ldr r2, _080DB054 lsrs r0, r0, #0x17 @@ -450321,7 +450321,7 @@ _080DB06E: .align 2, 0 _080DB074: .4byte gUnknown_2039AA0 _080DB078: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DB01C + thumb_func_end GetChosenMove thumb_func_start GetAllChosenMoves GetAllChosenMoves: @ 0x080DB07C @@ -450331,7 +450331,7 @@ GetAllChosenMoves: @ 0x080DB07C _080DB082: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080DB01C + bl GetChosenMove ldr r1, _080DB0A4 ldr r1, [r1] ldr r1, [r1, #4] @@ -450348,8 +450348,8 @@ _080DB082: _080DB0A4: .4byte gUnknown_2039BD4 thumb_func_end GetAllChosenMoves - thumb_func_start sub_080DB0A8 -sub_080DB0A8: @ 0x080DB0A8 + thumb_func_start RankContestants +RankContestants: @ 0x080DB0A8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -450452,8 +450452,8 @@ _080DB15C: cmp r6, #3 ble _080DB11E movs r0, #1 - bl sub_080DC5BC - bl sub_080DCCF4 + bl SortContestants + bl ApplyNextTurnOrder add sp, #8 pop {r3, r4} mov r8, r3 @@ -450462,7 +450462,7 @@ _080DB15C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DB0A8 + thumb_func_end RankContestants thumb_func_start sub_080DB17C sub_080DB17C: @ 0x080DB17C @@ -450511,8 +450511,8 @@ _080DB1B6: bx r0 thumb_func_end sub_080DB17C - thumb_func_start sub_080DB1CC -sub_080DB1CC: @ 0x080DB1CC + thumb_func_start ContestantCanUseTurn +ContestantCanUseTurn: @ 0x080DB1CC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -450544,7 +450544,7 @@ _080DB1FE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080DB1CC + thumb_func_end ContestantCanUseTurn thumb_func_start sub_080DB204 sub_080DB204: @ 0x080DB204 @@ -450815,8 +450815,8 @@ _080DB3A0: _080DB408: .4byte gUnknown_2039BD4 thumb_func_end sub_080DB204 - thumb_func_start sub_080DB40C -sub_080DB40C: @ 0x080DB40C + thumb_func_start Contest_IsMonsTurnDisabled +Contest_IsMonsTurnDisabled: @ 0x080DB40C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -450848,7 +450848,7 @@ _080DB43E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080DB40C + thumb_func_end Contest_IsMonsTurnDisabled thumb_func_start sub_080DB444 sub_080DB444: @ 0x080DB444 @@ -450889,7 +450889,7 @@ _080DB480: adds r4, #1 cmp r4, #3 ble _080DB480 - bl sub_080DB4B0 + bl DetermineFinalStandings pop {r4} pop {r0} bx r0 @@ -450910,8 +450910,8 @@ sub_080DB498: @ 0x080DB498 _080DB4AC: .4byte gUnknown_2039BB0 thumb_func_end sub_080DB498 - thumb_func_start sub_080DB4B0 -sub_080DB4B0: @ 0x080DB4B0 + thumb_func_start DetermineFinalStandings +DetermineFinalStandings: @ 0x080DB4B0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -451111,7 +451111,7 @@ _080DB606: _080DB62C: .4byte gUnknown_2039BA8 _080DB630: .4byte gUnknown_2039BA0 _080DB634: .4byte gUnknown_2039BC0 - thumb_func_end sub_080DB4B0 + thumb_func_end DetermineFinalStandings thumb_func_start SaveLinkContestResults SaveLinkContestResults: @ 0x080DB638 @@ -451194,8 +451194,8 @@ _080DB6C6: bx r1 thumb_func_end sub_080DB694 - thumb_func_start sub_080DB6CC -sub_080DB6CC: @ 0x080DB6CC + thumb_func_start ContestPrintLinkStandby +ContestPrintLinkStandby: @ 0x080DB6CC push {lr} ldr r0, _080DB6E8 movs r1, #0 @@ -451205,17 +451205,17 @@ sub_080DB6CC: @ 0x080DB6CC bl sub_080DB000 ldr r0, _080DB6F0 movs r1, #0 - bl sub_080DE338 + bl Contest_StartTextPrinter pop {r0} bx r0 .align 2, 0 _080DB6E8: .4byte gUnknown_2022ACA _080DB6EC: .4byte gUnknown_2022AD2 _080DB6F0: .4byte gUnknown_824C140 - thumb_func_end sub_080DB6CC + thumb_func_end ContestPrintLinkStandby - thumb_func_start sub_080DB6F4 -sub_080DB6F4: @ 0x080DB6F4 + thumb_func_start FillContestantWindowBgs +FillContestantWindowBgs: @ 0x080DB6F4 push {r4, r5, lr} sub sp, #0xc movs r5, #0x80 @@ -451244,7 +451244,7 @@ _080DB6FE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DB6F4 + thumb_func_end FillContestantWindowBgs thumb_func_start sub_080DB72C sub_080DB72C: @ 0x080DB72C @@ -451326,7 +451326,7 @@ sub_080DB78C: @ 0x080DB78C strb r0, [r1, #2] ldr r0, _080DB824 movs r1, #0x14 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r5, r5, #0x10 @@ -451439,7 +451439,7 @@ _080DB88A: cmp r0, #0 bne _080DB8C0 adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080DB8BC ldr r0, [r0] ldr r0, [r0, #0x14] @@ -451638,7 +451638,7 @@ _080DBA1C: .4byte gUnknown_3005B60 sub_080DBA20: @ 0x080DBA20 push {r4, r5, lr} ldr r0, _080DBA58 - bl sub_08008210 + bl LoadSpriteSheet movs r4, #0 ldr r5, _080DBA5C _080DBA2C: @@ -451650,7 +451650,7 @@ _080DBA2C: ldr r0, _080DBA64 movs r1, #0xb4 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, _080DBA68 ldr r1, [r1] ldr r2, [r1, #0x14] @@ -451959,7 +451959,7 @@ _080DBC6A: lsls r0, r5, #3 ldr r1, _080DBCE4 adds r0, r0, r1 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080DBCE8 adds r0, r6, r0 ldr r2, _080DBCEC @@ -451970,7 +451970,7 @@ _080DBC6A: ldrb r2, [r1] movs r1, #0xcc movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] ldr r1, [r1, #0x14] lsls r4, r5, #2 @@ -451985,7 +451985,7 @@ _080DBC6A: lsls r0, r0, #2 add r0, r8 ldr r1, _080DBCF4 - bl sub_0800858C + bl SetSubspriteTables ldr r0, [r7] ldr r0, [r0, #0x14] adds r4, r4, r0 @@ -452019,18 +452019,18 @@ _080DBCF0: .4byte gUnknown_2039BC6 _080DBCF4: .4byte gUnknown_8560AE4 thumb_func_end sub_080DBC54 - thumb_func_start sub_080DBCF8 -sub_080DBCF8: @ 0x080DBCF8 + thumb_func_start CreateApplauseMeterSprite +CreateApplauseMeterSprite: @ 0x080DBCF8 push {lr} ldr r0, _080DBD38 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080DBD3C bl LoadSpritePalette ldr r0, _080DBD40 movs r1, #0x1e movs r2, #0x2c movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080DBD44 @@ -452056,14 +452056,14 @@ _080DBD3C: .4byte gUnknown_8560B1C _080DBD40: .4byte gUnknown_8560B2C _080DBD44: .4byte gUnknown_20205AC _080DBD48: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DBCF8 + thumb_func_end CreateApplauseMeterSprite thumb_func_start sub_080DBD4C sub_080DBD4C: @ 0x080DBD4C push {r4, lr} ldr r0, _080DBD88 movs r1, #0x1e - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080DBD8C @@ -452140,7 +452140,7 @@ sub_080DBDD8: @ 0x080DBDD8 lsrs r4, r4, #0x18 ldr r0, _080DBE00 movs r1, #0x1f - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080DBE04 @@ -452214,7 +452214,7 @@ _080DBE40: movs r2, #0 bl BlendPalette adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080DBE7A: pop {r4, r5, r6, r7} pop {r0} @@ -452335,7 +452335,7 @@ sub_080DBF50: @ 0x080DBF50 push {r4, lr} ldr r0, _080DBF78 movs r1, #0x1e - bl sub_080A8878 + bl CreateTask ldr r1, _080DBF7C ldr r1, [r1] ldr r1, [r1] @@ -452602,8 +452602,8 @@ _080DC14A: .align 2, 0 thumb_func_end sub_080DC118 - thumb_func_start sub_080DC150 -sub_080DC150: @ 0x080DC150 + thumb_func_start IsMetatileDirectionallyImpassable +IsMetatileDirectionallyImpassable: @ 0x080DC150 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -452627,7 +452627,7 @@ sub_080DC150: @ 0x080DC150 lsls r4, r1, #3 ldr r0, _080DC2B0 adds r0, r4, r0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080DC2B4 adds r4, r4, r0 adds r0, r4, #0 @@ -452642,7 +452642,7 @@ sub_080DC150: @ 0x080DC150 movs r1, #0xb8 adds r2, r5, #0 movs r3, #0x1d - bl sub_08006B0C + bl CreateSprite mov sb, r0 mov r3, sb lsls r3, r3, #0x18 @@ -452652,7 +452652,7 @@ sub_080DC150: @ 0x080DC150 movs r1, #0xf8 adds r2, r5, #0 movs r3, #0x1d - bl sub_08006B0C + bl CreateSprite mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -452689,7 +452689,7 @@ sub_080DC150: @ 0x080DC150 movs r0, #0 movs r1, #3 adds r2, r4, #0 - bl sub_0806F190 + bl CopySpriteTiles ldrb r0, [r6] lsls r3, r0, #2 adds r3, r3, r0 @@ -452702,7 +452702,7 @@ sub_080DC150: @ 0x080DC150 movs r0, #0 movs r1, #3 adds r2, r4, #0 - bl sub_0806F190 + bl CopySpriteTiles movs r4, #0 str r4, [sp, #4] ldr r0, [r7] @@ -452780,7 +452780,7 @@ _080DC2CC: .4byte gUnknown_2039BD4 _080DC2D0: .4byte 0x0600E036 _080DC2D4: .4byte 0x050000C0 _080DC2D8: .4byte 0x06010000 - thumb_func_end sub_080DC150 + thumb_func_end IsMetatileDirectionallyImpassable thumb_func_start sub_080DC2DC sub_080DC2DC: @ 0x080DC2DC @@ -452990,8 +452990,8 @@ sub_080DC43C: @ 0x080DC43C _080DC468: .4byte gUnknown_2039BD4 thumb_func_end sub_080DC43C - thumb_func_start sub_080DC46C -sub_080DC46C: @ 0x080DC46C + thumb_func_start ContestDebugTogglePointTotal +ContestDebugTogglePointTotal: @ 0x080DC46C push {lr} ldr r0, _080DC484 movs r1, #0xd0 @@ -453016,18 +453016,18 @@ _080DC48A: cmp r0, #0 bne _080DC4A2 bl sub_080DA624 - bl sub_080DAA20 + bl SwapMoveDescAndContestTilemaps b _080DC4A6 _080DC4A2: - bl sub_080DC4AC + bl ContestDebugDoPrint _080DC4A6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DC46C + thumb_func_end ContestDebugTogglePointTotal - thumb_func_start sub_080DC4AC -sub_080DC4AC: @ 0x080DC4AC + thumb_func_start ContestDebugDoPrint +ContestDebugDoPrint: @ 0x080DC4AC push {r4, r5, lr} sub sp, #8 ldr r0, _080DC4D8 @@ -453057,12 +453057,12 @@ _080DC4E0: _080DC4E2: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -453147,7 +453147,7 @@ _080DC57E: lsrs r4, r0, #0x18 cmp r4, #3 bls _080DC554 - bl sub_080DAA20 + bl SwapMoveDescAndContestTilemaps _080DC5A6: add sp, #8 pop {r4, r5} @@ -453157,10 +453157,10 @@ _080DC5A6: _080DC5B0: .4byte gUnknown_2039BD4 _080DC5B4: .4byte gUnknown_85C9401 _080DC5B8: .4byte gUnknown_2039BC6 - thumb_func_end sub_080DC4AC + thumb_func_end ContestDebugDoPrint - thumb_func_start sub_080DC5BC -sub_080DC5BC: @ 0x080DC5BC + thumb_func_start SortContestants +SortContestants: @ 0x080DC5BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -453425,10 +453425,10 @@ _080DC798: .align 2, 0 _080DC7A8: .4byte gUnknown_2039BC6 _080DC7AC: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DC5BC + thumb_func_end SortContestants - thumb_func_start sub_080DC7B0 -sub_080DC7B0: @ 0x080DC7B0 + thumb_func_start DrawContestantWindows +DrawContestantWindows: @ 0x080DC7B0 push {r4, r5, lr} movs r4, #0 movs r5, #0xa0 @@ -453441,7 +453441,7 @@ _080DC7B6: adds r1, #5 lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette adds r5, #0x20 adds r4, #1 cmp r4, #3 @@ -453453,7 +453453,7 @@ _080DC7B6: .align 2, 0 _080DC7DC: .4byte gUnknown_201A004 _080DC7E0: .4byte gUnknown_2039BC6 - thumb_func_end sub_080DC7B0 + thumb_func_end DrawContestantWindows thumb_func_start sub_080DC7E4 sub_080DC7E4: @ 0x080DC7E4 @@ -453476,7 +453476,7 @@ sub_080DC7E4: @ 0x080DC7E4 adds r0, r5, r0 strh r2, [r0] adds r0, r6, #0 - bl sub_080DB1CC + bl ContestantCanUseTurn lsls r0, r0, #0x18 mov r8, r4 cmp r0, #0 @@ -453600,7 +453600,7 @@ _080DC8CA: beq _080DC918 ldrh r0, [r2, #8] ldrh r1, [r2, #6] - bl sub_080E4BF0 + bl AreMovesContestCombo lsls r0, r0, #0x18 cmp r0, #0 bne _080DC918 @@ -453682,7 +453682,7 @@ _080DC96A: adds r1, r4, r1 ldrh r0, [r1, #8] ldrh r1, [r1, #6] - bl sub_080E4BF0 + bl AreMovesContestCombo lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -454071,11 +454071,11 @@ _080DCC90: adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders bl sub_080DB000 adds r0, r4, #0 movs r1, #1 - bl sub_080DE338 + bl Contest_StartTextPrinter pop {r4, r5, r6} pop {r0} bx r0 @@ -454114,8 +454114,8 @@ MakeContestantNervous: @ 0x080DCCC4 _080DCCF0: .4byte gUnknown_2039BD4 thumb_func_end MakeContestantNervous - thumb_func_start sub_080DCCF4 -sub_080DCCF4: @ 0x080DCCF4 + thumb_func_start ApplyNextTurnOrder +ApplyNextTurnOrder: @ 0x080DCCF4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -454291,7 +454291,7 @@ _080DCDF4: .align 2, 0 _080DCE38: .4byte gUnknown_2039BC6 _080DCE3C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DCCF4 + thumb_func_end ApplyNextTurnOrder thumb_func_start sub_080DCE40 sub_080DCE40: @ 0x080DCE40 @@ -454573,8 +454573,8 @@ _080DD09C: .4byte sub_080DCE40 _080DD0A0: .4byte gUnknown_2039BD4 thumb_func_end sub_080DCE84 - thumb_func_start sub_080DD0A4 -sub_080DD0A4: @ 0x080DD0A4 + thumb_func_start UpdateApplauseMeter +UpdateApplauseMeter: @ 0x080DD0A4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -454641,7 +454641,7 @@ _080DD0CA: asrs r0, r0, #0x18 cmp r0, #4 ble _080DD12C - bl sub_080DD184 + bl StartApplauseOverflowAnimation _080DD12C: adds r5, #1 cmp r5, #4 @@ -454658,7 +454658,7 @@ _080DD144: .4byte gUnknown_20205AC _080DD148: .4byte 0x06010000 _080DD14C: .4byte 0x04000008 _080DD150: .4byte gUnknown_8D8EBD8 - thumb_func_end sub_080DD0A4 + thumb_func_end UpdateApplauseMeter thumb_func_start Contest_GetMoveExcitement Contest_GetMoveExcitement: @ 0x080DD154 @@ -454685,12 +454685,12 @@ _080DD17C: .4byte gUnknown_8565FCC _080DD180: .4byte gUnknown_2039BCC thumb_func_end Contest_GetMoveExcitement - thumb_func_start sub_080DD184 -sub_080DD184: @ 0x080DD184 + thumb_func_start StartApplauseOverflowAnimation +StartApplauseOverflowAnimation: @ 0x080DD184 push {r4, r5, lr} ldr r0, _080DD1B8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -454702,7 +454702,7 @@ sub_080DD184: @ 0x080DD184 movs r0, #1 strh r0, [r4, #0xa] ldr r0, _080DD1C0 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xc] @@ -454711,13 +454711,13 @@ sub_080DD184: @ 0x080DD184 pop {r1} bx r1 .align 2, 0 -_080DD1B8: .4byte sub_080DD1C4 +_080DD1B8: .4byte Task_ApplauseOverflowAnimation _080DD1BC: .4byte gUnknown_3005B60 _080DD1C0: .4byte 0x0000ABE2 - thumb_func_end sub_080DD184 + thumb_func_end StartApplauseOverflowAnimation - thumb_func_start sub_080DD1C4 -sub_080DD1C4: @ 0x080DD1C4 + thumb_func_start Task_ApplauseOverflowAnimation +Task_ApplauseOverflowAnimation: @ 0x080DD1C4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -454796,7 +454796,7 @@ _080DD22E: movs r3, #0x1f bl BlendPalette adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080DD262: pop {r4, r5, r6} pop {r0} @@ -454804,14 +454804,14 @@ _080DD262: .align 2, 0 _080DD268: .4byte 0x00007FFF _080DD26C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DD1C4 + thumb_func_end Task_ApplauseOverflowAnimation - thumb_func_start sub_080DD270 -sub_080DD270: @ 0x080DD270 + thumb_func_start StartMoveApplauseMeterOnscreen +StartMoveApplauseMeterOnscreen: @ 0x080DD270 push {r4, lr} ldr r0, _080DD2C0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r3, _080DD2C4 ldr r4, _080DD2C8 ldr r2, [r4] @@ -454847,14 +454847,14 @@ sub_080DD270: @ 0x080DD270 pop {r0} bx r0 .align 2, 0 -_080DD2C0: .4byte sub_080DD2D0 +_080DD2C0: .4byte Task_MoveApplauseMeterOnscreen _080DD2C4: .4byte gUnknown_20205AC _080DD2C8: .4byte gUnknown_2039BD4 _080DD2CC: .4byte 0x0000FFBA - thumb_func_end sub_080DD270 + thumb_func_end StartMoveApplauseMeterOnscreen - thumb_func_start sub_080DD2D0 -sub_080DD2D0: @ 0x080DD2D0 + thumb_func_start Task_MoveApplauseMeterOnscreen +Task_MoveApplauseMeterOnscreen: @ 0x080DD2D0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -454906,7 +454906,7 @@ _080DD31C: ands r0, r1 strb r0, [r2, #6] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask _080DD338: pop {r4, r5} pop {r0} @@ -454915,10 +454915,10 @@ _080DD338: _080DD340: .4byte gUnknown_2039BD4 _080DD344: .4byte gUnknown_20205AC _080DD348: .4byte gUnknown_3005B60 - thumb_func_end sub_080DD2D0 + thumb_func_end Task_MoveApplauseMeterOnscreen - thumb_func_start sub_080DD34C -sub_080DD34C: @ 0x080DD34C + thumb_func_start TryMoveApplauseMeterOffscreen +TryMoveApplauseMeterOffscreen: @ 0x080DD34C push {r4, r5, lr} ldr r5, _080DD378 ldr r4, _080DD37C @@ -454947,7 +454947,7 @@ _080DD37C: .4byte gUnknown_2039BD4 _080DD380: ldr r0, _080DD3AC movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r2, [r4] ldr r0, [r2] adds r0, #0x58 @@ -454968,11 +454968,11 @@ _080DD3A4: pop {r0} bx r0 .align 2, 0 -_080DD3AC: .4byte sub_080DD3B0 - thumb_func_end sub_080DD34C +_080DD3AC: .4byte Task_MoveApplauseMeterOffscreen + thumb_func_end TryMoveApplauseMeterOffscreen - thumb_func_start sub_080DD3B0 -sub_080DD3B0: @ 0x080DD3B0 + thumb_func_start Task_MoveApplauseMeterOffscreen +Task_MoveApplauseMeterOffscreen: @ 0x080DD3B0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -455032,7 +455032,7 @@ _080DD400: ands r0, r1 strb r0, [r2, #6] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080DD428: pop {r4, r5} pop {r0} @@ -455042,17 +455042,17 @@ _080DD430: .4byte gUnknown_2039BD4 _080DD434: .4byte gUnknown_20205AC _080DD438: .4byte gUnknown_3005B60 _080DD43C: .4byte 0x0000FFBA - thumb_func_end sub_080DD3B0 + thumb_func_end Task_MoveApplauseMeterOffscreen - thumb_func_start sub_080DD440 -sub_080DD440: @ 0x080DD440 + thumb_func_start ShowAndUpdateApplauseMeter +ShowAndUpdateApplauseMeter: @ 0x080DD440 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080DD478 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080DD47C @@ -455074,13 +455074,13 @@ sub_080DD440: @ 0x080DD440 pop {r0} bx r0 .align 2, 0 -_080DD478: .4byte sub_080DD484 +_080DD478: .4byte Task_ShowAndUpdateApplauseMeter _080DD47C: .4byte gUnknown_3005B60 _080DD480: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DD440 + thumb_func_end ShowAndUpdateApplauseMeter - thumb_func_start sub_080DD484 -sub_080DD484: @ 0x080DD484 + thumb_func_start Task_ShowAndUpdateApplauseMeter +Task_ShowAndUpdateApplauseMeter: @ 0x080DD484 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -455105,7 +455105,7 @@ _080DD4AC: beq _080DD4D4 b _080DD500 _080DD4B2: - bl sub_080DD270 + bl StartMoveApplauseMeterOnscreen b _080DD4C8 _080DD4B8: ldr r0, _080DD4D0 @@ -455133,7 +455133,7 @@ _080DD4D4: ble _080DD500 movs r0, #0 strh r0, [r4, #0x1e] - bl sub_080DD0A4 + bl UpdateApplauseMeter ldr r0, _080DD508 ldr r0, [r0] ldr r2, [r0] @@ -455143,14 +455143,14 @@ _080DD4D4: ands r0, r1 strb r0, [r2, #6] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080DD500: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080DD508: .4byte gUnknown_2039BD4 - thumb_func_end sub_080DD484 + thumb_func_end Task_ShowAndUpdateApplauseMeter thumb_func_start HideApplauseMeterNoAnim HideApplauseMeterNoAnim: @ 0x080DD50C @@ -455213,7 +455213,7 @@ sub_080DD570: @ 0x080DD570 push {lr} ldr r0, _080DD58C movs r1, #0xf - bl sub_080A8878 + bl CreateTask ldr r0, _080DD590 ldr r0, [r0] ldr r2, [r0] @@ -455294,7 +455294,7 @@ _080DD5F0: ands r0, r1 strb r0, [r2, #6] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080DD61E: pop {r4, r5} pop {r0} @@ -455316,7 +455316,7 @@ sub_080DD634: @ 0x080DD634 lsrs r5, r1, #0x18 ldr r0, _080DD674 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r4, r4, #0x18 @@ -455449,7 +455449,7 @@ _080DD71C: cmp r1, r0 bne _080DD760 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080DD768 ldr r0, [r0] ldr r2, [r0] @@ -455498,7 +455498,7 @@ _080DD78A: beq _080DD820 lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080DD854 + bl GetTurnOrderNumberGfx mov r3, r8 ldr r1, [r3] ldr r1, [r1, #0x14] @@ -455582,8 +455582,8 @@ _080DD83A: bx r0 thumb_func_end sub_080DD76C - thumb_func_start sub_080DD854 -sub_080DD854: @ 0x080DD854 + thumb_func_start GetTurnOrderNumberGfx +GetTurnOrderNumberGfx: @ 0x080DD854 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -455614,7 +455614,7 @@ _080DD886: bx r1 .align 2, 0 _080DD88C: .4byte gUnknown_8D8E9FC - thumb_func_end sub_080DD854 + thumb_func_end GetTurnOrderNumberGfx thumb_func_start sub_080DD890 sub_080DD890: @ 0x080DD890 @@ -455642,7 +455642,7 @@ _080DD8AA: beq _080DD92E lsls r0, r7, #0x18 lsrs r0, r0, #0x18 - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 bne _080DD92E @@ -455671,7 +455671,7 @@ _080DD8AA: adds r1, r4, #0 movs r2, #0x14 adds r3, r6, #0 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile adds r4, #0x10 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -455690,7 +455690,7 @@ _080DD8AA: adds r1, r4, #0 movs r2, #0x14 adds r3, r5, #0 - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile movs r0, #0x63 bl sub_080A306C _080DD92E: @@ -455833,9 +455833,9 @@ sub_080DD988: @ 0x080DD988 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_080DE468 + bl Contest_SetBgCopyFlags movs r5, #0 ldr r7, _080DDAB0 movs r6, #4 @@ -455904,7 +455904,7 @@ sub_080DDAB4: @ 0x080DDAB4 mov r0, sp bl CpuSet movs r0, #1 - bl sub_080DE468 + bl Contest_SetBgCopyFlags movs r0, #0xa bl GetGpuReg add r3, sp, #4 @@ -455999,7 +455999,7 @@ sub_080DDB88: @ 0x080DDB88 strh r0, [r1] movs r0, #0x62 movs r1, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r1, _080DDBC0 lsls r0, r4, #2 adds r0, r0, r4 @@ -456097,10 +456097,10 @@ _080DDC46: adds r2, #1 cmp r2, #3 ble _080DDC46 - bl sub_080DB6F4 + bl FillContestantWindowBgs bl sub_080DBFC8 bl sub_080DAE00 - bl sub_080DC7B0 + bl DrawContestantWindows movs r0, #1 bl sub_080DD76C bl sub_080DBBB0 @@ -456137,13 +456137,13 @@ _080DDCB6: ldr r4, _080DDCE0 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080DDCE4 adds r1, r4, #0 bl SetTaskFuncWithFollowupFunc - bl sub_080DB6CC + bl ContestPrintLinkStandby movs r0, #2 strh r0, [r5, #8] b _080DDD18 @@ -456172,7 +456172,7 @@ _080DDCFE: _080DDD04: .4byte gUnknown_2039BD4 _080DDD08: bl sub_080DAFE8 - bl sub_080DAA20 + bl SwapMoveDescAndContestTilemaps movs r0, #0 strh r0, [r5, #8] ldr r0, _080DDD20 @@ -456300,7 +456300,7 @@ _080DDDE4: strh r0, [r4, #0xc] movs r0, #0x61 movs r1, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r0, _080DDDFC str r0, [r4] _080DDDF4: @@ -456383,7 +456383,7 @@ _080DDE12: adds r0, r0, r1 lsls r0, r0, #2 adds r0, r0, r6 - bl sub_08007358 + bl AnimateSprite ldr r0, [r5] ldr r0, [r0, #0x14] adds r0, r4, r0 @@ -456405,7 +456405,7 @@ _080DDEB0: ble _080DDE12 ldr r0, _080DDEF0 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080DDEF4 @@ -456507,7 +456507,7 @@ _080DDF52: ands r0, r1 strb r0, [r2, #7] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080DDF86: pop {r4, r5, r6} pop {r0} @@ -456784,7 +456784,7 @@ _080DE180: .4byte gUnknown_2039AA0 sub_080DE184: @ 0x080DE184 push {lr} ldr r0, _080DE1B0 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _080DE1B4 strb r0, [r1, #3] ldr r0, _080DE1B8 @@ -456822,13 +456822,13 @@ sub_080DE1C0: @ 0x080DE1C0 strh r0, [r4, #0x26] movs r0, #3 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] movs r0, #3 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -456845,8 +456845,8 @@ _080DE204: .4byte gUnknown_2023E88 _080DE208: .4byte gUnknown_20205AC thumb_func_end sub_080DE1C0 - thumb_func_start sub_080DE20C -sub_080DE20C: @ 0x080DE20C + thumb_func_start SelectContestMoveBankTarget +SelectContestMoveBankTarget: @ 0x080DE20C push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -456915,7 +456915,7 @@ _080DE2C8: bx r0 .align 2, 0 _080DE2D0: .4byte gUnknown_2023EB0 - thumb_func_end sub_080DE20C + thumb_func_end SelectContestMoveBankTarget thumb_func_start sub_080DE2D4 sub_080DE2D4: @ 0x080DE2D4 @@ -456955,21 +456955,21 @@ sub_080DE2D4: @ 0x080DE2D4 mov r0, sp movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_080DE468 + bl Contest_SetBgCopyFlags add sp, #0x10 pop {r4} pop {r0} bx r0 thumb_func_end sub_080DE2D4 - thumb_func_start sub_080DE338 -sub_080DE338: @ 0x080DE338 + thumb_func_start Contest_StartTextPrinter +Contest_StartTextPrinter: @ 0x080DE338 push {r4, r5, lr} sub sp, #0x10 str r0, [sp] @@ -457007,7 +457007,7 @@ sub_080DE338: @ 0x080DE338 mov r0, sp movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter b _080DE3AC _080DE388: ldr r0, _080DE398 @@ -457027,20 +457027,20 @@ _080DE39C: _080DE3A4: mov r0, sp movs r2, #0 - bl sub_08004548 + bl AddTextPrinter _080DE3AC: movs r0, #8 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_080DE468 + bl Contest_SetBgCopyFlags add sp, #0x10 pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080DE338 + thumb_func_end Contest_StartTextPrinter - thumb_func_start sub_080DE3C0 -sub_080DE3C0: @ 0x080DE3C0 + thumb_func_start ContestBG_FillBoxWithIncrementingTile +ContestBG_FillBoxWithIncrementingTile: @ 0x080DE3C0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -457073,9 +457073,9 @@ sub_080DE3C0: @ 0x080DE3C0 asrs r6, r6, #0x10 str r6, [sp, #0xc] mov r0, r8 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer mov r0, r8 - bl sub_080DE468 + bl Contest_SetBgCopyFlags add sp, #0x10 pop {r3} mov r8, r3 @@ -457083,7 +457083,7 @@ sub_080DE3C0: @ 0x080DE3C0 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DE3C0 + thumb_func_end ContestBG_FillBoxWithIncrementingTile thumb_func_start ContestBG_FillBoxWithTile ContestBG_FillBoxWithTile: @ 0x080DE418 @@ -457111,15 +457111,15 @@ ContestBG_FillBoxWithTile: @ 0x080DE418 str r6, [sp, #8] movs r4, #0 str r4, [sp, #0xc] - bl sub_080DE3C0 + bl ContestBG_FillBoxWithIncrementingTile add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 thumb_func_end ContestBG_FillBoxWithTile - thumb_func_start sub_080DE454 -sub_080DE454: @ 0x080DE454 + thumb_func_start GetPlayerTextSpeed +GetPlayerTextSpeed: @ 0x080DE454 push {lr} bl sub_08004630 movs r0, #8 @@ -457128,10 +457128,10 @@ sub_080DE454: @ 0x080DE454 lsrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_080DE454 + thumb_func_end GetPlayerTextSpeed - thumb_func_start sub_080DE468 -sub_080DE468: @ 0x080DE468 + thumb_func_start Contest_SetBgCopyFlags +Contest_SetBgCopyFlags: @ 0x080DE468 ldr r2, _080DE478 movs r1, #1 lsls r1, r0 @@ -457141,7 +457141,7 @@ sub_080DE468: @ 0x080DE468 bx lr .align 2, 0 _080DE478: .4byte gUnknown_2039BD8 - thumb_func_end sub_080DE468 + thumb_func_end Contest_SetBgCopyFlags thumb_func_start ResetContestLinkResults ResetContestLinkResults: @ 0x080DE47C @@ -458362,17 +458362,17 @@ _080DED8E: beq _080DED8E _080DEDA4: mov r0, sl - bl sub_080ED900 + bl ContestLiveUpdates_BeforeInterview_1 ldr r0, [sp, #4] - bl sub_080ED950 + bl ContestLiveUpdates_BeforeInterview_2 lsrs r0, r6, #0x18 - bl sub_080ED990 + bl ContestLiveUpdates_BeforeInterview_3 ldr r0, _080DEDDC ldr r0, [r0] ldr r0, [r0, #0x1c] add r0, r8 ldrh r0, [r0, #0xa] - bl sub_080ED9D0 + bl ContestLiveUpdates_BeforeInterview_4 adds r0, r4, #0 adds r1, r7, #0 bl sub_080EDA10 @@ -458389,8 +458389,8 @@ _080DEDCC: _080DEDDC: .4byte gUnknown_2039BD4 thumb_func_end sub_080DEC00 - thumb_func_start sub_080DEDE0 -sub_080DEDE0: @ 0x080DEDE0 + thumb_func_start ContestDebugToggleBitfields +ContestDebugToggleBitfields: @ 0x080DEDE0 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -458422,7 +458422,7 @@ _080DEE0A: cmp r0, #0 bne _080DEE22 bl sub_080DA624 - bl sub_080DAA20 + bl SwapMoveDescAndContestTilemaps b _080DEE26 _080DEE22: bl sub_080DEE2C @@ -458430,7 +458430,7 @@ _080DEE26: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080DEDE0 + thumb_func_end ContestDebugToggleBitfields thumb_func_start sub_080DEE2C sub_080DEE2C: @ 0x080DEE2C @@ -458464,12 +458464,12 @@ _080DEE58: _080DEE5E: adds r0, r7, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r7, #4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r7, #1 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -458639,7 +458639,7 @@ _080DEF8E: cmp r7, #3 bls _080DEF46 _080DEFD0: - bl sub_080DAA20 + bl SwapMoveDescAndContestTilemaps _080DEFD4: add sp, #0x2c pop {r3, r4, r5} @@ -458668,7 +458668,7 @@ sub_080DEFF0: @ 0x080DEFF0 cmp r4, #0 bne _080DF024 ldr r0, _080DF01C - bl sub_08003250 + bl AddWindow strb r0, [r5, #0xe] ldr r0, _080DF020 str r0, [r5, #4] @@ -458680,7 +458680,7 @@ _080DF01C: .4byte gUnknown_85629BC _080DF020: .4byte gUnknown_8562994 _080DF024: ldr r0, _080DF088 - bl sub_08003250 + bl AddWindow strb r0, [r5, #0xe] ldr r0, _080DF08C str r0, [r5, #4] @@ -458689,7 +458689,7 @@ _080DF032: ldr r4, _080DF090 ldrb r0, [r4, #0xe] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldrb r0, [r4, #0xe] movs r5, #0x10 str r5, [sp] @@ -458699,7 +458699,7 @@ _080DF032: movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_08198850 + bl PrintTextArray ldrb r0, [r4, #0xe] str r5, [sp] str r6, [sp, #4] @@ -458710,13 +458710,13 @@ _080DF032: movs r3, #2 bl sub_081984B0 ldrb r0, [r4, #0xe] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #0xe] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _080DF094 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #0xc @@ -458727,7 +458727,7 @@ _080DF032: _080DF088: .4byte gUnknown_85629C4 _080DF08C: .4byte gUnknown_85629AC _080DF090: .4byte gUnknown_2039C00 -_080DF094: .4byte sub_080DF0D4 +_080DF094: .4byte Task_ShopMenu thumb_func_end sub_080DEFF0 thumb_func_start sub_080DF098 @@ -458769,13 +458769,13 @@ _080DF0CC: _080DF0D0: .4byte gUnknown_2039C00 thumb_func_end SetShopItemsForSale - thumb_func_start sub_080DF0D4 -sub_080DF0D4: @ 0x080DF0D4 + thumb_func_start Task_ShopMenu +Task_ShopMenu: @ 0x080DF0D4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r2, r0, #0x18 movs r0, #2 @@ -458788,7 +458788,7 @@ sub_080DF0D4: @ 0x080DF0D4 movs r0, #5 bl sub_080A306C adds r0, r4, #0 - bl sub_080DF1B4 + bl Task_HandleShopMenuQuit b _080DF110 _080DF100: ldr r0, _080DF118 @@ -458804,7 +458804,7 @@ _080DF110: bx r0 .align 2, 0 _080DF118: .4byte gUnknown_2039C00 - thumb_func_end sub_080DF0D4 + thumb_func_end Task_ShopMenu thumb_func_start sub_080DF11C sub_080DF11C: @ 0x080DF11C @@ -458826,14 +458826,14 @@ sub_080DF11C: @ 0x080DF11C str r0, [r1] movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r4} pop {r0} bx r0 .align 2, 0 _080DF14C: .4byte gUnknown_3005B68 -_080DF150: .4byte sub_080DF2E0 -_080DF154: .4byte sub_080DF1F0 +_080DF150: .4byte CB2_InitBuyMenu +_080DF154: .4byte Task_GoToBuyOrSellMenu thumb_func_end sub_080DF11C thumb_func_start sub_080DF158 @@ -458856,14 +458856,14 @@ sub_080DF158: @ 0x080DF158 str r0, [r1] movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r4} pop {r0} bx r0 .align 2, 0 _080DF188: .4byte gUnknown_3005B68 -_080DF18C: .4byte sub_081AA978 -_080DF190: .4byte sub_080DF1F0 +_080DF18C: .4byte CB2_GoToSellMenu +_080DF190: .4byte Task_GoToBuyOrSellMenu thumb_func_end sub_080DF158 thumb_func_start sub_080DF194 @@ -458873,17 +458873,17 @@ sub_080DF194: @ 0x080DF194 ldr r1, _080DF1AC str r1, [r0] ldr r0, _080DF1B0 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080DF1A8: .4byte gUnknown_3005B0C -_080DF1AC: .4byte sub_080DF22C +_080DF1AC: .4byte MapPostLoadHook_ReturnToShopMenu _080DF1B0: .4byte sub_08085A30 thumb_func_end sub_080DF194 - thumb_func_start sub_080DF1B4 -sub_080DF1B4: @ 0x080DF1B4 + thumb_func_start Task_HandleShopMenuQuit +Task_HandleShopMenuQuit: @ 0x080DF1B4 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -458893,11 +458893,11 @@ sub_080DF1B4: @ 0x080DF1B4 movs r1, #2 bl sub_08198134 ldrb r0, [r5, #0xe] - bl sub_08003444 - bl sub_080EDD80 + bl RemoveWindow + bl SaveRecordedItemPurchasesForTVShow bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r5, [r5] cmp r5, #0 beq _080DF1E4 @@ -458908,10 +458908,10 @@ _080DF1E4: bx r0 .align 2, 0 _080DF1EC: .4byte gUnknown_2039C00 - thumb_func_end sub_080DF1B4 + thumb_func_end Task_HandleShopMenuQuit - thumb_func_start sub_080DF1F0 -sub_080DF1F0: @ 0x080DF1F0 + thumb_func_start Task_GoToBuyOrSellMenu +Task_GoToBuyOrSellMenu: @ 0x080DF1F0 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -458927,12 +458927,12 @@ sub_080DF1F0: @ 0x080DF1F0 cmp r0, #0 bne _080DF21E adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 ldrh r1, [r4, #0x12] orrs r0, r1 - bl sub_08000540 + bl SetMainCallback2 _080DF21E: pop {r4} pop {r0} @@ -458940,23 +458940,23 @@ _080DF21E: .align 2, 0 _080DF224: .4byte gUnknown_3005B68 _080DF228: .4byte gUnknown_2037C74 - thumb_func_end sub_080DF1F0 + thumb_func_end Task_GoToBuyOrSellMenu - thumb_func_start sub_080DF22C -sub_080DF22C: @ 0x080DF22C + thumb_func_start MapPostLoadHook_ReturnToShopMenu +MapPostLoadHook_ReturnToShopMenu: @ 0x080DF22C push {lr} - bl sub_080AE99C + bl pal_fill_black ldr r0, _080DF240 movs r1, #8 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080DF240: .4byte sub_080DF244 - thumb_func_end sub_080DF22C +_080DF240: .4byte Task_ReturnToShopMenu + thumb_func_end MapPostLoadHook_ReturnToShopMenu - thumb_func_start sub_080DF244 -sub_080DF244: @ 0x080DF244 + thumb_func_start Task_ReturnToShopMenu +Task_ReturnToShopMenu: @ 0x080DF244 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -458973,28 +458973,28 @@ sub_080DF244: @ 0x080DF244 ldr r1, _080DF270 ldr r2, _080DF274 adds r0, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _080DF282 .align 2, 0 _080DF26C: .4byte gUnknown_2039C00 _080DF270: .4byte gUnknown_85C9A15 -_080DF274: .4byte sub_080DF290 +_080DF274: .4byte ShowShopMenuAfterExitingBuyOrSellMenu _080DF278: ldr r1, _080DF288 ldr r2, _080DF28C adds r0, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080DF282: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080DF288: .4byte gUnknown_85C99F5 -_080DF28C: .4byte sub_080DF290 - thumb_func_end sub_080DF244 +_080DF28C: .4byte ShowShopMenuAfterExitingBuyOrSellMenu + thumb_func_end Task_ReturnToShopMenu - thumb_func_start sub_080DF290 -sub_080DF290: @ 0x080DF290 + thumb_func_start ShowShopMenuAfterExitingBuyOrSellMenu +ShowShopMenuAfterExitingBuyOrSellMenu: @ 0x080DF290 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -459003,40 +459003,40 @@ sub_080DF290: @ 0x080DF290 ldrb r0, [r0, #0xf] bl sub_080DEFF0 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 .align 2, 0 _080DF2AC: .4byte gUnknown_2039C00 - thumb_func_end sub_080DF290 + thumb_func_end ShowShopMenuAfterExitingBuyOrSellMenu thumb_func_start sub_080DF2B0 sub_080DF2B0: @ 0x080DF2B0 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080DF2B0 - thumb_func_start sub_080DF2CC -sub_080DF2CC: @ 0x080DF2CC + thumb_func_start VBlankCB_BuyMenu +VBlankCB_BuyMenu: @ 0x080DF2CC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DF2CC + thumb_func_end VBlankCB_BuyMenu - thumb_func_start sub_080DF2E0 -sub_080DF2E0: @ 0x080DF2E0 + thumb_func_start CB2_InitBuyMenu +CB2_InitBuyMenu: @ 0x080DF2E0 push {r4, r5, lr} sub sp, #0xc ldr r0, _080DF354 @@ -459050,18 +459050,18 @@ sub_080DF2E0: @ 0x080DF2E0 bne _080DF2F8 b _080DF430 _080DF2F8: - bl sub_080DFA68 - bl sub_080DF70C + bl BuyMenuDrawGraphics + bl BuyMenuAddScrollIndicatorArrows ldr r0, _080DF358 movs r1, #8 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080DF35C movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit ldr r2, _080DF360 lsls r1, r4, #2 adds r1, r1, r4 @@ -459076,43 +459076,43 @@ _080DF2F8: adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes str r5, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080DF364 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080DF368 - bl sub_08000540 + bl SetMainCallback2 b _080DF440 .align 2, 0 _080DF354: .4byte gUnknown_3002360 -_080DF358: .4byte sub_080E000C +_080DF358: .4byte Task_BuyMenu _080DF35C: .4byte gUnknown_3006050 _080DF360: .4byte gUnknown_3005B60 -_080DF364: .4byte sub_080DF2CC +_080DF364: .4byte VBlankCB_BuyMenu _080DF368: .4byte sub_080DF2B0 _080DF36C: - bl sub_08121E58 + bl SetVBlankHBlankCallbacksToNull str r4, [sp, #8] movs r1, #0xe0 lsls r1, r1, #0x13 ldr r2, _080DF418 add r0, sp, #8 bl CpuFastSet - bl sub_080B9710 + bl ScanlineEffect_Stop bl reset_temp_tile_data_buffers bl FreeAllSpritePalettes bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl sub_08199640 ldr r4, _080DF41C ldr r0, _080DF420 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _080DF424 adds r0, r0, r1 @@ -459131,7 +459131,7 @@ _080DF36C: rsbs r1, r1, #0 strb r1, [r0] bl sub_080DF478 - bl sub_080DF8B0 + bl BuyMenuInitBgs movs r4, #0x20 str r4, [sp] str r4, [sp, #4] @@ -459161,8 +459161,8 @@ _080DF36C: movs r2, #0 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 - bl sub_080DF9AC - bl sub_080DF968 + bl BuyMenuInitWindows + bl BuyMenuDecompressBgGraphics b _080DF43A .align 2, 0 _080DF418: .4byte 0x01000100 @@ -459172,7 +459172,7 @@ _080DF424: .4byte 0x0000200B _080DF428: .4byte 0x0000200D _080DF42C: .4byte 0x0000200E _080DF430: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _080DF440 @@ -459185,28 +459185,28 @@ _080DF440: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080DF2E0 + thumb_func_end CB2_InitBuyMenu - thumb_func_start sub_080DF448 -sub_080DF448: @ 0x080DF448 + thumb_func_start BuyMenuFreeMemory +BuyMenuFreeMemory: @ 0x080DF448 push {lr} ldr r0, _080DF46C ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _080DF470 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _080DF474 ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers pop {r0} bx r0 .align 2, 0 _080DF46C: .4byte gUnknown_2039C10 _080DF470: .4byte gUnknown_2039C14 _080DF474: .4byte gUnknown_2039C18 - thumb_func_end sub_080DF448 + thumb_func_end BuyMenuFreeMemory thumb_func_start sub_080DF478 sub_080DF478: @ 0x080DF478 @@ -459242,7 +459242,7 @@ _080DF4A2: muls r3, r2, r3 ldr r2, [r5] adds r2, r2, r3 - bl sub_080DF554 + bl BuyMenuSetListEntry adds r0, r6, #1 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -459314,8 +459314,8 @@ _080DF54C: .4byte gUnknown_3006050 _080DF550: .4byte 0x00002004 thumb_func_end sub_080DF478 - thumb_func_start sub_080DF554 -sub_080DF554: @ 0x080DF554 + thumb_func_start BuyMenuSetListEntry +BuyMenuSetListEntry: @ 0x080DF554 push {r4, r5, r6, lr} adds r6, r0, #0 adds r5, r2, #0 @@ -459347,10 +459347,10 @@ _080DF584: bx r0 .align 2, 0 _080DF590: .4byte gUnknown_8580CD1 - thumb_func_end sub_080DF554 + thumb_func_end BuyMenuSetListEntry - thumb_func_start sub_080DF594 -sub_080DF594: @ 0x080DF594 + thumb_func_start BuyMenuPrintItemDescriptionAndShowItemIcon +BuyMenuPrintItemDescriptionAndShowItemIcon: @ 0x080DF594 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -459374,7 +459374,7 @@ _080DF5AC: ldr r2, _080DF5CC adds r1, r1, r2 ldrb r1, [r1] - bl sub_080DF7C8 + bl BuyMenuAddItemIcon b _080DF5E2 .align 2, 0 _080DF5C8: .4byte gUnknown_2039C10 @@ -459386,7 +459386,7 @@ _080DF5D0: ldr r2, _080DF628 adds r1, r1, r2 ldrb r1, [r1] - bl sub_080DF7C8 + bl BuyMenuAddItemIcon lsls r4, r7, #0x10 _080DF5E2: lsrs r4, r4, #0x10 @@ -459400,7 +459400,7 @@ _080DF5E2: adds r1, r4, #0 eors r1, r0 mov r0, r8 - bl sub_080DF860 + bl BuyMenuRemoveItemIcon ldr r1, [r6] adds r1, r1, r5 ldrb r0, [r1] @@ -459439,7 +459439,7 @@ _080DF644: _080DF646: movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -459456,7 +459456,7 @@ _080DF646: bx r0 .align 2, 0 _080DF66C: .4byte gUnknown_85C98E0 - thumb_func_end sub_080DF594 + thumb_func_end BuyMenuPrintItemDescriptionAndShowItemIcon thumb_func_start sub_080DF670 sub_080DF670: @ 0x080DF670 @@ -459481,7 +459481,7 @@ sub_080DF670: @ 0x080DF670 bl sub_080D6CD4 adds r4, r0, #0 movs r0, #1 - bl sub_080EFB3C + bl GetPriceReduction lsls r4, r4, #0x10 lsrs r4, r4, #0x10 lsls r0, r0, #0x18 @@ -459511,7 +459511,7 @@ _080DF6D6: ldr r4, _080DF704 ldr r1, _080DF708 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0xff str r0, [sp] movs r0, #1 @@ -459533,8 +459533,8 @@ _080DF704: .4byte gUnknown_2021C7C _080DF708: .4byte gUnknown_85C9A9D thumb_func_end sub_080DF670 - thumb_func_start sub_080DF70C -sub_080DF70C: @ 0x080DF70C + thumb_func_start BuyMenuAddScrollIndicatorArrows +BuyMenuAddScrollIndicatorArrows: @ 0x080DF70C push {r4, r5, lr} sub sp, #0x10 ldr r5, _080DF754 @@ -459561,7 +459561,7 @@ sub_080DF70C: @ 0x080DF70C movs r1, #0xac movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r5] adds r1, r1, r4 strb r0, [r1] @@ -459576,10 +459576,10 @@ _080DF758: .4byte 0x0000200B _080DF75C: .4byte gUnknown_2039C00 _080DF760: .4byte 0x00000834 _080DF764: .4byte 0x00002008 - thumb_func_end sub_080DF70C + thumb_func_end BuyMenuAddScrollIndicatorArrows - thumb_func_start sub_080DF768 -sub_080DF768: @ 0x080DF768 + thumb_func_start BuyMenuRemoveScrollIndicatorArrows +BuyMenuRemoveScrollIndicatorArrows: @ 0x080DF768 push {r4, lr} ldr r4, _080DF78C ldr r0, [r4] @@ -459588,7 +459588,7 @@ sub_080DF768: @ 0x080DF768 ldrb r0, [r1] cmp r0, #0xff beq _080DF786 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r1, _080DF790 adds r0, r0, r1 @@ -459601,10 +459601,10 @@ _080DF786: .align 2, 0 _080DF78C: .4byte gUnknown_2039C10 _080DF790: .4byte 0x0000200B - thumb_func_end sub_080DF768 + thumb_func_end BuyMenuRemoveScrollIndicatorArrows - thumb_func_start sub_080DF794 -sub_080DF794: @ 0x080DF794 + thumb_func_start BuyMenuPrintCursor +BuyMenuPrintCursor: @ 0x080DF794 push {r4, lr} sub sp, #8 adds r4, r1, #0 @@ -459612,7 +459612,7 @@ sub_080DF794: @ 0x080DF794 lsrs r0, r0, #0x18 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AE564 + bl ListMenuGetYCoordForPrintingArrowCursor adds r3, r0, #0 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 @@ -459629,10 +459629,10 @@ sub_080DF794: @ 0x080DF794 bx r0 .align 2, 0 _080DF7C4: .4byte gUnknown_85C9421 - thumb_func_end sub_080DF794 + thumb_func_end BuyMenuPrintCursor - thumb_func_start sub_080DF7C8 -sub_080DF7C8: @ 0x080DF7C8 + thumb_func_start BuyMenuAddItemIcon +BuyMenuAddItemIcon: @ 0x080DF7C8 push {r4, lr} sub sp, #8 lsls r0, r0, #0x10 @@ -459658,7 +459658,7 @@ _080DF7F2: ldr r0, _080DF82C adds r1, r3, r0 adds r0, r1, #0 - bl sub_081AFB48 + bl AddItemIconSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -459691,7 +459691,7 @@ _080DF834: movs r1, #0x14 movs r2, #0x54 movs r3, #1 - bl sub_081295B4 + bl AddDecorationIconObject lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -459704,10 +459704,10 @@ _080DF854: bx r0 .align 2, 0 _080DF85C: .4byte 0x0000083E - thumb_func_end sub_080DF7C8 + thumb_func_end BuyMenuAddItemIcon - thumb_func_start sub_080DF860 -sub_080DF860: @ 0x080DF860 + thumb_func_start BuyMenuRemoveItemIcon +BuyMenuRemoveItemIcon: @ 0x080DF860 push {r4, r5, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 @@ -459743,10 +459743,10 @@ _080DF8A0: .4byte gUnknown_2039C10 _080DF8A4: .4byte 0x0000200D _080DF8A8: .4byte 0x0000083E _080DF8AC: .4byte gUnknown_20205AC - thumb_func_end sub_080DF860 + thumb_func_end BuyMenuRemoveItemIcon - thumb_func_start sub_080DF8B0 -sub_080DF8B0: @ 0x080DF8B0 + thumb_func_start BuyMenuInitBgs +BuyMenuInitBgs: @ 0x080DF8B0 push {r4, lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -459760,19 +459760,19 @@ sub_080DF8B0: @ 0x080DF8B0 lsls r0, r0, #4 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r0, #0xc0 lsls r0, r0, #5 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r0, #0x80 lsls r0, r0, #5 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0x10 movs r1, #0 bl SetGpuReg @@ -459805,23 +459805,23 @@ sub_080DF8B0: @ 0x080DF8B0 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg pop {r4} pop {r0} bx r0 .align 2, 0 _080DF960: .4byte gUnknown_85629E4 _080DF964: .4byte gUnknown_2039C10 - thumb_func_end sub_080DF8B0 + thumb_func_end BuyMenuInitBgs - thumb_func_start sub_080DF968 -sub_080DF968: @ 0x080DF968 + thumb_func_start BuyMenuDecompressBgGraphics +BuyMenuDecompressBgGraphics: @ 0x080DF968 push {lr} sub sp, #4 ldr r1, _080DF998 @@ -459831,7 +459831,7 @@ sub_080DF968: @ 0x080DF968 movs r0, #0 str r0, [sp] movs r0, #1 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _080DF9A0 ldr r1, _080DF9A4 ldr r1, [r1] @@ -459839,7 +459839,7 @@ sub_080DF968: @ 0x080DF968 ldr r0, _080DF9A8 movs r1, #0xc0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette add sp, #4 pop {r0} bx r0 @@ -459849,13 +459849,13 @@ _080DF99C: .4byte 0x000003E3 _080DF9A0: .4byte gUnknown_8D9B2E8 _080DF9A4: .4byte gUnknown_2039C10 _080DF9A8: .4byte gUnknown_8D9B2C0 - thumb_func_end sub_080DF968 + thumb_func_end BuyMenuDecompressBgGraphics - thumb_func_start sub_080DF9AC -sub_080DF9AC: @ 0x080DF9AC + thumb_func_start BuyMenuInitWindows +BuyMenuInitWindows: @ 0x080DF9AC push {lr} ldr r0, _080DF9E4 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #1 @@ -459864,18 +459864,18 @@ sub_080DF9AC: @ 0x080DF9AC movs r0, #0 movs r1, #0xa movs r2, #0xe0 - bl sub_08098104 + bl LoadMessageBoxGfx movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap pop {r0} bx r0 .align 2, 0 _080DF9E4: .4byte gUnknown_85629F4 - thumb_func_end sub_080DF9AC + thumb_func_end BuyMenuInitWindows thumb_func_start sub_080DF9E8 sub_080DF9E8: @ 0x080DF9E8 @@ -459904,7 +459904,7 @@ sub_080DF9E8: @ 0x080DF9E8 str r6, [sp, #0xc] str r1, [sp, #0x10] movs r1, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r4, r5, r6} pop {r0} @@ -459913,8 +459913,8 @@ sub_080DF9E8: @ 0x080DF9E8 _080DFA28: .4byte gUnknown_8562A34 thumb_func_end sub_080DF9E8 - thumb_func_start sub_080DFA2C -sub_080DFA2C: @ 0x080DFA2C + thumb_func_start BuyMenuDisplayMessage +BuyMenuDisplayMessage: @ 0x080DFA2C push {r4, r5, r6, lr} sub sp, #0x10 adds r4, r0, #0 @@ -459934,24 +459934,24 @@ sub_080DFA2C: @ 0x080DFA2C movs r1, #5 movs r2, #0xa movs r3, #0xe - bl sub_08121E6C + bl DisplayMessageAndContinueTask movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DFA2C + thumb_func_end BuyMenuDisplayMessage - thumb_func_start sub_080DFA68 -sub_080DFA68: @ 0x080DFA68 + thumb_func_start BuyMenuDrawGraphics +BuyMenuDrawGraphics: @ 0x080DFA68 push {lr} - bl sub_080DFAB4 + bl BuyMenuDrawMapGraphics bl BuyMenuCopyMenuBgToBg1TilemapBuffer movs r0, #0x13 movs r1, #0xb - bl sub_080E4B88 + bl AddMoneyLabelObject ldr r0, _080DFAB0 ldr r0, [r0] movs r1, #0x92 @@ -459962,34 +459962,34 @@ sub_080DFA68: @ 0x080DFA68 movs r0, #0 movs r1, #1 movs r2, #0xd - bl sub_080E4A74 + bl PrintMoneyAmountInMoneyBoxWithBorder movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 .align 2, 0 _080DFAB0: .4byte gUnknown_3005AEC - thumb_func_end sub_080DFA68 + thumb_func_end BuyMenuDrawGraphics - thumb_func_start sub_080DFAB4 -sub_080DFAB4: @ 0x080DFAB4 + thumb_func_start BuyMenuDrawMapGraphics +BuyMenuDrawMapGraphics: @ 0x080DFAB4 push {lr} - bl sub_080DFCA0 - bl sub_080DFE34 - bl sub_080DFAC8 + bl BuyMenuCollectEventObjectData + bl BuyMenuDrawEventObjects + bl BuyMenuDrawMapBg pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080DFAB4 + thumb_func_end BuyMenuDrawMapGraphics - thumb_func_start sub_080DFAC8 -sub_080DFAC8: @ 0x080DFAC8 + thumb_func_start BuyMenuDrawMapBg +BuyMenuDrawMapBg: @ 0x080DFAC8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -460003,7 +460003,7 @@ sub_080DFAC8: @ 0x080DFAC8 adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r1, sp mov r0, sp ldrh r0, [r0] @@ -460030,12 +460030,12 @@ _080DFB02: movs r3, #0 ldrsh r1, [r2, r3] add r1, r8 - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r5, #0 mov r1, r8 - bl sub_080DFFCC + bl BuyMenuCheckForOverlapWithMenuBg lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -460068,7 +460068,7 @@ _080DFB4E: adds r2, r2, r3 asrs r1, r7, #0x10 adds r3, r5, #0 - bl sub_080DFBB4 + bl BuyMenuDrawMapMetatile b _080DFB88 .align 2, 0 _080DFB6C: .4byte 0x000001FF @@ -460083,7 +460083,7 @@ _080DFB70: adds r2, r2, r1 asrs r1, r7, #0x10 adds r3, r5, #0 - bl sub_080DFBB4 + bl BuyMenuDrawMapMetatile _080DFB88: movs r1, #0x80 lsls r1, r1, #9 @@ -460107,10 +460107,10 @@ _080DFB88: bx r0 .align 2, 0 _080DFBB0: .4byte 0xFFFFFE00 - thumb_func_end sub_080DFAC8 + thumb_func_end BuyMenuDrawMapBg - thumb_func_start sub_080DFBB4 -sub_080DFBB4: @ 0x080DFBB4 + thumb_func_start BuyMenuDrawMapMetatile +BuyMenuDrawMapMetatile: @ 0x080DFBB4 push {r4, r5, r6, r7, lr} adds r7, r2, #0 lsls r3, r3, #0x18 @@ -460207,7 +460207,7 @@ _080DFC6C: bx r0 .align 2, 0 _080DFC74: .4byte gUnknown_2039C10 - thumb_func_end sub_080DFBB4 + thumb_func_end BuyMenuDrawMapMetatile thumb_func_start BuyMenuDrawMapMetatileLayer BuyMenuDrawMapMetatileLayer: @ 0x080DFC78 @@ -460233,8 +460233,8 @@ BuyMenuDrawMapMetatileLayer: @ 0x080DFC78 .align 2, 0 thumb_func_end BuyMenuDrawMapMetatileLayer - thumb_func_start sub_080DFCA0 -sub_080DFCA0: @ 0x080DFCA0 + thumb_func_start BuyMenuCollectEventObjectData +BuyMenuCollectEventObjectData: @ 0x080DFCA0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -460247,7 +460247,7 @@ sub_080DFCA0: @ 0x080DFCA0 adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer movs r7, #0 ldr r5, _080DFD94 ldr r3, _080DFD98 @@ -460435,10 +460435,10 @@ _080DFE1E: bx r0 .align 2, 0 _080DFE30: .4byte 0x00002016 - thumb_func_end sub_080DFCA0 + thumb_func_end BuyMenuCollectEventObjectData - thumb_func_start sub_080DFE34 -sub_080DFE34: @ 0x080DFE34 + thumb_func_start BuyMenuDrawEventObjects +BuyMenuDrawEventObjects: @ 0x080DFE34 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -460471,7 +460471,7 @@ _080DFE4E: lsls r0, r0, #2 add r0, sl ldrb r0, [r0, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo mov r4, r8 ldr r3, [r4] ldr r2, _080DFF44 @@ -460510,7 +460510,7 @@ _080DFE4E: str r0, [sp] adds r0, r4, #0 ldr r1, _080DFF50 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r6, r4, #0 @@ -460576,7 +460576,7 @@ _080DFF48: .4byte 0x00002012 _080DFF4C: .4byte 0x00002014 _080DFF50: .4byte sub_08007140 _080DFF54: .4byte 0x00002016 - thumb_func_end sub_080DFE34 + thumb_func_end BuyMenuDrawEventObjects thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 0x080DFF58 @@ -460587,7 +460587,7 @@ BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 0x080DFF58 movs r2, #4 ldrsh r1, [r4, r2] adds r1, #2 - bl sub_080DFFCC + bl BuyMenuCheckForOverlapWithMenuBg lsls r0, r0, #0x18 cmp r0, #0 bne _080DFF7C @@ -460645,8 +460645,8 @@ _080DFFC4: .4byte 0x0000C3E3 _080DFFC8: .4byte 0x000003FF thumb_func_end BuyMenuCopyMenuBgToBg1TilemapBuffer - thumb_func_start sub_080DFFCC -sub_080DFFCC: @ 0x080DFFCC + thumb_func_start BuyMenuCheckForOverlapWithMenuBg +BuyMenuCheckForOverlapWithMenuBg: @ 0x080DFFCC push {lr} ldr r2, _080E0000 ldr r2, [r2] @@ -460681,10 +460681,10 @@ _080E0006: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080DFFCC + thumb_func_end BuyMenuCheckForOverlapWithMenuBg - thumb_func_start sub_080E000C -sub_080E000C: @ 0x080E000C + thumb_func_start Task_BuyMenu +Task_BuyMenu: @ 0x080E000C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -460704,7 +460704,7 @@ sub_080E000C: @ 0x080E000C b _080E01DA _080E002E: ldrb r0, [r4, #0xe] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r5, r0, #0 ldrb r0, [r4, #0xe] ldr r7, _080E0060 @@ -460731,18 +460731,18 @@ _080E0068: movs r0, #5 bl sub_080A306C adds r0, r6, #0 - bl sub_080E06B4 + bl ExitBuyMenu b _080E01DA _080E0076: movs r0, #5 bl sub_080A306C strh r5, [r4, #0xa] movs r0, #2 - bl sub_08003774 - bl sub_080DF768 + bl ClearWindowTilemap + bl BuyMenuRemoveScrollIndicatorArrows ldrb r0, [r4, #0xe] movs r1, #2 - bl sub_080DF794 + bl BuyMenuPrintCursor ldr r0, _080E00C0 ldrb r0, [r0, #0xf] cmp r0, #0 @@ -460752,7 +460752,7 @@ _080E0076: bl sub_080D6CD4 adds r4, r0, #0 movs r0, #1 - bl sub_080EFB3C + bl GetPriceReduction ldr r1, [r7] movs r2, #0x80 lsls r2, r2, #6 @@ -460803,7 +460803,7 @@ _080E0104: .4byte gUnknown_8580CD0 _080E0108: .4byte gUnknown_3005AEC _080E010C: .4byte gUnknown_2039C10 _080E0110: .4byte gUnknown_85C99B8 -_080E0114: .4byte sub_080E05EC +_080E0114: .4byte BuyMenuReturnToItemList _080E0118: ldr r4, _080E0158 ldrb r0, [r4, #0xf] @@ -460822,7 +460822,7 @@ _080E0118: bne _080E016C ldr r4, _080E0160 adds r0, r5, #0 - bl sub_081B69B4 + bl ItemIdToBattleMoveId adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0xd @@ -460844,11 +460844,11 @@ _080E016E: ldr r2, _080E017C _080E0170: adds r0, r6, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage b _080E01DA .align 2, 0 _080E0178: .4byte gUnknown_85C98EC -_080E017C: .4byte sub_080E01F0 +_080E017C: .4byte Task_BuyHowManyDialogueInit _080E0180: ldr r0, _080E01B4 lsls r1, r5, #3 @@ -460870,7 +460870,7 @@ _080E0180: bne _080E01C8 ldr r0, _080E01C0 ldr r1, _080E01C4 - bl sub_08008BCC + bl StringExpandPlaceholders b _080E01D0 .align 2, 0 _080E01B4: .4byte gUnknown_2021C40 @@ -460881,12 +460881,12 @@ _080E01C4: .4byte gUnknown_85C9936 _080E01C8: ldr r0, _080E01E4 ldr r1, _080E01E8 - bl sub_08008BCC + bl StringExpandPlaceholders _080E01D0: ldr r1, _080E01E4 ldr r2, _080E01EC adds r0, r6, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage _080E01DA: pop {r3} mov r8, r3 @@ -460896,11 +460896,11 @@ _080E01DA: .align 2, 0 _080E01E4: .4byte gUnknown_2021C7C _080E01E8: .4byte gUnknown_85C994B -_080E01EC: .4byte sub_080E03F8 - thumb_func_end sub_080E000C +_080E01EC: .4byte BuyMenuConfirmPurchase + thumb_func_end Task_BuyMenu - thumb_func_start sub_080E01F0 -sub_080E01F0: @ 0x080E01F0 + thumb_func_start Task_BuyHowManyDialogueInit +Task_BuyHowManyDialogueInit: @ 0x080E01F0 push {r4, r5, r6, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -460911,7 +460911,7 @@ sub_080E01F0: @ 0x080E01F0 ldr r0, _080E0290 adds r5, r5, r0 ldrh r0, [r5, #0xa] - bl sub_080D68D4 + bl CountTotalItemQuantityInBag adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -460919,7 +460919,7 @@ sub_080E01F0: @ 0x080E01F0 movs r1, #0 movs r2, #1 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r0, _080E0294 adds r1, r4, #0 movs r2, #1 @@ -460928,7 +460928,7 @@ sub_080E01F0: @ 0x080E01F0 ldr r4, _080E0298 ldr r1, _080E029C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -460943,11 +460943,11 @@ sub_080E01F0: @ 0x080E01F0 movs r1, #0 movs r2, #1 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette adds r0, r6, #0 - bl sub_080E0638 + bl BuyMenuPrintItemQuantityAndPrice movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _080E02A0 ldr r0, [r0] movs r1, #0x92 @@ -460997,11 +460997,11 @@ _080E02B2: .align 2, 0 _080E02C8: .4byte 0x0000200A _080E02CC: .4byte gUnknown_3005B60 -_080E02D0: .4byte sub_080E02D4 - thumb_func_end sub_080E01F0 +_080E02D0: .4byte Task_BuyHowManyDialogueHandleInput + thumb_func_end Task_BuyHowManyDialogueInit - thumb_func_start sub_080E02D4 -sub_080E02D4: @ 0x080E02D4 + thumb_func_start Task_BuyHowManyDialogueHandleInput +Task_BuyHowManyDialogueHandleInput: @ 0x080E02D4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -461017,7 +461017,7 @@ sub_080E02D4: @ 0x080E02D4 ldr r2, _080E0338 adds r1, r1, r2 ldrb r1, [r1] - bl sub_08122040 + bl AdjustQuantityAccordingToDPadInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -461026,7 +461026,7 @@ sub_080E02D4: @ 0x080E02D4 bl sub_080D6CD4 adds r4, r0, #0 movs r0, #1 - bl sub_080EFB3C + bl GetPriceReduction ldr r1, [r7] movs r2, #0x80 lsls r2, r2, #6 @@ -461041,7 +461041,7 @@ sub_080E02D4: @ 0x080E02D4 muls r0, r4, r0 str r0, [r1] adds r0, r6, #0 - bl sub_080E0638 + bl BuyMenuPrintItemQuantityAndPrice b _080E03F0 .align 2, 0 _080E0330: .4byte gUnknown_3005B68 @@ -461063,11 +461063,11 @@ _080E033C: movs r1, #0 bl sub_08198134 movs r0, #4 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldrh r0, [r5, #0xa] ldr r1, _080E03AC bl sub_080D5EC8 @@ -461089,7 +461089,7 @@ _080E033C: ldr r1, _080E03B8 ldr r2, _080E03BC adds r0, r6, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage b _080E03F0 .align 2, 0 _080E03A8: .4byte gUnknown_3002360 @@ -461097,7 +461097,7 @@ _080E03AC: .4byte gUnknown_2021C40 _080E03B0: .4byte gUnknown_2021C54 _080E03B4: .4byte gUnknown_2021C68 _080E03B8: .4byte gUnknown_85C991F -_080E03BC: .4byte sub_080E03F8 +_080E03BC: .4byte BuyMenuConfirmPurchase _080E03C0: movs r0, #2 ands r0, r1 @@ -461112,20 +461112,20 @@ _080E03C0: movs r1, #0 bl sub_08198134 movs r0, #4 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap adds r0, r4, #0 - bl sub_080E05EC + bl BuyMenuReturnToItemList _080E03F0: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E02D4 + thumb_func_end Task_BuyHowManyDialogueHandleInput - thumb_func_start sub_080E03F8 -sub_080E03F8: @ 0x080E03F8 + thumb_func_start BuyMenuConfirmPurchase +BuyMenuConfirmPurchase: @ 0x080E03F8 push {lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -461148,10 +461148,10 @@ sub_080E03F8: @ 0x080E03F8 .align 2, 0 _080E0420: .4byte gUnknown_8562A2C _080E0424: .4byte gUnknown_856298C - thumb_func_end sub_080E03F8 + thumb_func_end BuyMenuConfirmPurchase - thumb_func_start sub_080E0428 -sub_080E0428: @ 0x080E0428 + thumb_func_start BuyMenuTryMakePurchase +BuyMenuTryMakePurchase: @ 0x080E0428 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -461162,14 +461162,14 @@ sub_080E0428: @ 0x080E0428 ldr r1, _080E046C adds r4, r0, r1 movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r6, _080E0470 ldrb r0, [r6, #0xf] cmp r0, #0 bne _080E048C ldrh r0, [r4, #0xa] ldrh r1, [r4, #2] - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -461177,22 +461177,22 @@ sub_080E0428: @ 0x080E0428 ldr r1, _080E0474 ldr r2, _080E0478 adds r0, r5, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage adds r0, r5, #0 - bl sub_080E0750 + bl RecordItemPurchase b _080E04C6 .align 2, 0 _080E046C: .4byte gUnknown_3005B68 _080E0470: .4byte gUnknown_2039C00 _080E0474: .4byte gUnknown_85C9962 -_080E0478: .4byte sub_080E04D4 +_080E0478: .4byte BuyMenuSubtractMoney _080E047C: ldr r1, _080E0484 ldr r2, _080E0488 b _080E04AC .align 2, 0 _080E0484: .4byte gUnknown_85C99C8 -_080E0488: .4byte sub_080E05EC +_080E0488: .4byte BuyMenuReturnToItemList _080E048C: ldrb r0, [r4, #0xa] bl sub_08161868 @@ -461212,27 +461212,27 @@ _080E04AA: ldr r2, _080E04B8 _080E04AC: adds r0, r5, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage b _080E04C6 .align 2, 0 _080E04B4: .4byte gUnknown_85C9998 -_080E04B8: .4byte sub_080E04D4 +_080E04B8: .4byte BuyMenuSubtractMoney _080E04BC: ldr r1, _080E04CC ldr r2, _080E04D0 adds r0, r7, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage _080E04C6: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _080E04CC: .4byte gUnknown_85C99DE -_080E04D0: .4byte sub_080E05EC - thumb_func_end sub_080E0428 +_080E04D0: .4byte BuyMenuReturnToItemList + thumb_func_end BuyMenuTryMakePurchase - thumb_func_start sub_080E04D4 -sub_080E04D4: @ 0x080E04D4 + thumb_func_start BuyMenuSubtractMoney +BuyMenuSubtractMoney: @ 0x080E04D4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -461258,7 +461258,7 @@ sub_080E04D4: @ 0x080E04D4 adds r1, r0, #0 movs r0, #0 movs r2, #0 - bl sub_080E49E8 + bl PrintMoneyAmountInMoneyBox ldr r0, _080E0530 ldrb r0, [r0, #0xf] cmp r0, #0 @@ -461275,7 +461275,7 @@ _080E0528: .4byte gUnknown_3005AEC _080E052C: .4byte gUnknown_2039C10 _080E0530: .4byte gUnknown_2039C00 _080E0534: .4byte gUnknown_3005B60 -_080E0538: .4byte sub_080E0558 +_080E0538: .4byte Task_ReturnToItemListAfterItemPurchase _080E053C: ldr r0, _080E0550 lsls r1, r6, #2 @@ -461290,11 +461290,11 @@ _080E0548: bx r0 .align 2, 0 _080E0550: .4byte gUnknown_3005B60 -_080E0554: .4byte sub_080E05C4 - thumb_func_end sub_080E04D4 +_080E0554: .4byte Task_ReturnToItemListAfterDecorationPurchase + thumb_func_end BuyMenuSubtractMoney - thumb_func_start sub_080E0558 -sub_080E0558: @ 0x080E0558 + thumb_func_start Task_ReturnToItemListAfterItemPurchase +Task_ReturnToItemListAfterItemPurchase: @ 0x080E0558 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -461321,7 +461321,7 @@ sub_080E0558: @ 0x080E0558 ble _080E05B8 movs r0, #0xc movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -461329,24 +461329,24 @@ sub_080E0558: @ 0x080E0558 ldr r1, _080E05B0 ldr r2, _080E05B4 adds r0, r4, #0 - bl sub_080DFA2C + bl BuyMenuDisplayMessage b _080E05BE .align 2, 0 _080E05A8: .4byte gUnknown_3005B68 _080E05AC: .4byte gUnknown_3002360 _080E05B0: .4byte gUnknown_85C9A2D -_080E05B4: .4byte sub_080E05EC +_080E05B4: .4byte BuyMenuReturnToItemList _080E05B8: adds r0, r4, #0 - bl sub_080E05EC + bl BuyMenuReturnToItemList _080E05BE: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080E0558 + thumb_func_end Task_ReturnToItemListAfterItemPurchase - thumb_func_start sub_080E05C4 -sub_080E05C4: @ 0x080E05C4 + thumb_func_start Task_ReturnToItemListAfterDecorationPurchase +Task_ReturnToItemListAfterDecorationPurchase: @ 0x080E05C4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -461359,17 +461359,17 @@ sub_080E05C4: @ 0x080E05C4 movs r0, #5 bl sub_080A306C adds r0, r4, #0 - bl sub_080E05EC + bl BuyMenuReturnToItemList _080E05E2: pop {r4} pop {r0} bx r0 .align 2, 0 _080E05E8: .4byte gUnknown_3002360 - thumb_func_end sub_080E05C4 + thumb_func_end Task_ReturnToItemListAfterDecorationPurchase - thumb_func_start sub_080E05EC -sub_080E05EC: @ 0x080E05EC + thumb_func_start BuyMenuReturnToItemList +BuyMenuReturnToItemList: @ 0x080E05EC push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -461383,14 +461383,14 @@ sub_080E05EC: @ 0x080E05EC bl sub_08197EBC ldrb r0, [r6, #0xe] movs r1, #1 - bl sub_080DF794 + bl BuyMenuPrintCursor movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 - bl sub_080DF70C + bl schedule_bg_copy_tilemap_to_vram + bl BuyMenuAddScrollIndicatorArrows subs r5, #8 adds r4, r4, r5 ldr r0, _080E0634 @@ -461400,11 +461400,11 @@ sub_080E05EC: @ 0x080E05EC bx r0 .align 2, 0 _080E0630: .4byte gUnknown_3005B68 -_080E0634: .4byte sub_080E000C - thumb_func_end sub_080E05EC +_080E0634: .4byte Task_BuyMenu + thumb_func_end BuyMenuReturnToItemList - thumb_func_start sub_080E0638 -sub_080E0638: @ 0x080E0638 + thumb_func_start BuyMenuPrintItemQuantityAndPrice +BuyMenuPrintItemQuantityAndPrice: @ 0x080E0638 push {r4, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -461416,7 +461416,7 @@ sub_080E0638: @ 0x080E0638 adds r4, r4, r0 movs r0, #4 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _080E06A4 ldr r0, [r0] movs r1, #0x80 @@ -461428,7 +461428,7 @@ sub_080E0638: @ 0x080E0638 movs r0, #4 movs r1, #0x20 movs r2, #2 - bl sub_080E4A08 + bl CreateBicycleAnimationTask ldr r0, _080E06A8 movs r2, #2 ldrsh r1, [r4, r2] @@ -461438,7 +461438,7 @@ sub_080E0638: @ 0x080E0638 ldr r4, _080E06AC ldr r1, _080E06B0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -461457,10 +461457,10 @@ _080E06A4: .4byte gUnknown_2039C10 _080E06A8: .4byte gUnknown_2021C40 _080E06AC: .4byte gUnknown_2021C7C _080E06B0: .4byte gUnknown_85C943C - thumb_func_end sub_080E0638 + thumb_func_end BuyMenuPrintItemQuantityAndPrice - thumb_func_start sub_080E06B4 -sub_080E06B4: @ 0x080E06B4 + thumb_func_start ExitBuyMenu +ExitBuyMenu: @ 0x080E06B4 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -461475,7 +461475,7 @@ sub_080E06B4: @ 0x080E06B4 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _080E06F4 lsls r0, r4, #2 adds r0, r0, r4 @@ -461489,13 +461489,13 @@ sub_080E06B4: @ 0x080E06B4 bx r0 .align 2, 0 _080E06EC: .4byte gUnknown_3005B0C -_080E06F0: .4byte sub_080DF22C +_080E06F0: .4byte MapPostLoadHook_ReturnToShopMenu _080E06F4: .4byte gUnknown_3005B60 -_080E06F8: .4byte sub_080E06FC - thumb_func_end sub_080E06B4 +_080E06F8: .4byte Task_ExitBuyMenu + thumb_func_end ExitBuyMenu - thumb_func_start sub_080E06FC -sub_080E06FC: @ 0x080E06FC + thumb_func_start Task_ExitBuyMenu +Task_ExitBuyMenu: @ 0x080E06FC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -461505,12 +461505,12 @@ sub_080E06FC: @ 0x080E06FC ands r0, r1 cmp r0, #0 bne _080E0722 - bl sub_080E4BD0 - bl sub_080DF448 + bl RemoveMoneyLabelObject + bl BuyMenuFreeMemory ldr r0, _080E072C - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080E0722: pop {r4} pop {r0} @@ -461518,10 +461518,10 @@ _080E0722: .align 2, 0 _080E0728: .4byte gUnknown_2037C74 _080E072C: .4byte sub_08085A30 - thumb_func_end sub_080E06FC + thumb_func_end Task_ExitBuyMenu - thumb_func_start sub_080E0730 -sub_080E0730: @ 0x080E0730 + thumb_func_start ClearItemPurchases +ClearItemPurchases: @ 0x080E0730 push {lr} ldr r0, _080E0748 movs r1, #0 @@ -461535,10 +461535,10 @@ sub_080E0730: @ 0x080E0730 .align 2, 0 _080E0748: .4byte gUnknown_2039C1C _080E074C: .4byte gUnknown_2039C20 - thumb_func_end sub_080E0730 + thumb_func_end ClearItemPurchases - thumb_func_start sub_080E0750 -sub_080E0750: @ 0x080E0750 + thumb_func_start RecordItemPurchase +RecordItemPurchase: @ 0x080E0750 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -461606,28 +461606,28 @@ _080E07C6: bx r0 .align 2, 0 _080E07CC: .4byte gUnknown_2039C1C - thumb_func_end sub_080E0750 + thumb_func_end RecordItemPurchase - thumb_func_start sub_080E07D0 -sub_080E07D0: @ 0x080E07D0 + thumb_func_start CreatePokemartMenu +CreatePokemartMenu: @ 0x080E07D0 push {r4, lr} adds r4, r0, #0 movs r0, #0 bl sub_080DEFF0 adds r0, r4, #0 bl SetShopItemsForSale - bl sub_080E0730 + bl ClearItemPurchases ldr r0, _080E07F0 bl sub_080DF098 pop {r4} pop {r0} bx r0 .align 2, 0 -_080E07F0: .4byte sub_080988C4 - thumb_func_end sub_080E07D0 +_080E07F0: .4byte EnableBothScriptContexts + thumb_func_end CreatePokemartMenu - thumb_func_start sub_080E07F4 -sub_080E07F4: @ 0x080E07F4 + thumb_func_start CreateDecorationShop1Menu +CreateDecorationShop1Menu: @ 0x080E07F4 push {r4, lr} adds r4, r0, #0 movs r0, #1 @@ -461640,11 +461640,11 @@ sub_080E07F4: @ 0x080E07F4 pop {r0} bx r0 .align 2, 0 -_080E0810: .4byte sub_080988C4 - thumb_func_end sub_080E07F4 +_080E0810: .4byte EnableBothScriptContexts + thumb_func_end CreateDecorationShop1Menu - thumb_func_start sub_080E0814 -sub_080E0814: @ 0x080E0814 + thumb_func_start CreateDecorationShop2Menu +CreateDecorationShop2Menu: @ 0x080E0814 push {r4, lr} adds r4, r0, #0 movs r0, #2 @@ -461657,8 +461657,8 @@ sub_080E0814: @ 0x080E0814 pop {r0} bx r0 .align 2, 0 -_080E0830: .4byte sub_080988C4 - thumb_func_end sub_080E0814 +_080E0830: .4byte EnableBothScriptContexts + thumb_func_end CreateDecorationShop2Menu thumb_func_start sub_080E0834 sub_080E0834: @ 0x080E0834 @@ -461719,7 +461719,7 @@ _080E0894: adds r5, r1, r0 adds r0, r5, #0 adds r1, r6, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r2, #0 ldrsh r1, [r7, r2] lsls r0, r0, #0x10 @@ -461785,7 +461785,7 @@ _080E0914: adds r5, r1, r0 adds r0, r5, #0 adds r1, r6, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #2 subs r1, r1, r7 lsls r1, r1, #1 @@ -461952,7 +461952,7 @@ sub_080E0A58: @ 0x080E0A58 ldr r6, _080E0A9C adds r0, r6, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -462000,7 +462000,7 @@ sub_080E0ABC: @ 0x080E0ABC push {lr} ldr r0, _080E0ACC ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 @@ -462105,8 +462105,8 @@ _080E0B64: .align 2, 0 thumb_func_end GetEnigmaBerryChecksum - thumb_func_start sub_080E0B78 -sub_080E0B78: @ 0x080E0B78 + thumb_func_start IsEnigmaBerryValid +IsEnigmaBerryValid: @ 0x080E0B78 push {r4, lr} ldr r4, _080E0BAC ldr r1, [r4] @@ -462143,16 +462143,16 @@ _080E0BC2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080E0B78 + thumb_func_end IsEnigmaBerryValid - thumb_func_start sub_080E0BC8 -sub_080E0BC8: @ 0x080E0BC8 + thumb_func_start GetBerryInfo +GetBerryInfo: @ 0x080E0BC8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x2b bne _080E0BEC - bl sub_080E0B78 + bl IsEnigmaBerryValid cmp r0, #0 beq _080E0BEC ldr r0, _080E0BE4 @@ -462181,10 +462181,10 @@ _080E0C00: bx r1 .align 2, 0 _080E0C08: .4byte gUnknown_8563134 - thumb_func_end sub_080E0BC8 + thumb_func_end GetBerryInfo - thumb_func_start sub_080E0C0C -sub_080E0C0C: @ 0x080E0C0C + thumb_func_start GetBerryTreeInfo +GetBerryTreeInfo: @ 0x080E0C0C lsls r0, r0, #0x18 ldr r1, _080E0C20 lsrs r0, r0, #0x15 @@ -462197,17 +462197,17 @@ sub_080E0C0C: @ 0x080E0C0C .align 2, 0 _080E0C20: .4byte gUnknown_3005AEC _080E0C24: .4byte 0x0000169C - thumb_func_end sub_080E0C0C + thumb_func_end GetBerryTreeInfo - thumb_func_start sub_080E0C28 -sub_080E0C28: @ 0x080E0C28 + thumb_func_start EventObjectInteractionWaterBerryTree +EventObjectInteractionWaterBerryTree: @ 0x080E0C28 push {lr} ldr r0, _080E0C50 ldrb r0, [r0] - bl sub_0808EA80 + bl EventObjectGetBerryTreeId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0C0C + bl GetBerryTreeInfo adds r2, r0, #0 ldrb r0, [r2, #1] lsls r0, r0, #0x19 @@ -462254,18 +462254,18 @@ _080E0C7E: _080E0C80: pop {r1} bx r1 - thumb_func_end sub_080E0C28 + thumb_func_end EventObjectInteractionWaterBerryTree - thumb_func_start sub_080E0C84 -sub_080E0C84: @ 0x080E0C84 + thumb_func_start IsPlayerFacingEmptyBerryTreePatch +IsPlayerFacingEmptyBerryTreePatch: @ 0x080E0C84 push {lr} - bl sub_0809CB58 + bl GetEventObjectScriptPointerPlayerFacing ldr r1, _080E0CAC cmp r0, r1 bne _080E0CB4 ldr r0, _080E0CB0 ldrb r0, [r0] - bl sub_0808EA80 + bl EventObjectGetBerryTreeId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl GetStageByBerryTreeId @@ -462283,16 +462283,16 @@ _080E0CB6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E0C84 + thumb_func_end IsPlayerFacingEmptyBerryTreePatch - thumb_func_start sub_080E0CBC -sub_080E0CBC: @ 0x080E0CBC + thumb_func_start TryToWaterBerryTree +TryToWaterBerryTree: @ 0x080E0CBC push {lr} - bl sub_0809CB58 + bl GetEventObjectScriptPointerPlayerFacing ldr r1, _080E0CD4 cmp r0, r1 bne _080E0CD8 - bl sub_080E0C28 + bl EventObjectInteractionWaterBerryTree lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080E0CDA @@ -462304,7 +462304,7 @@ _080E0CDA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E0CBC + thumb_func_end TryToWaterBerryTree thumb_func_start ClearBerryTrees ClearBerryTrees: @ 0x080E0CE0 @@ -462334,8 +462334,8 @@ _080E0D0C: .4byte 0x0000169C _080E0D10: .4byte gUnknown_85636B0 thumb_func_end ClearBerryTrees - thumb_func_start sub_080E0D14 -sub_080E0D14: @ 0x080E0D14 + thumb_func_start BerryTreeGrow +BerryTreeGrow: @ 0x080E0D14 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #1] @@ -462367,7 +462367,7 @@ _080E0D3C: @ jump table .4byte _080E0D74 @ case 5 _080E0D54: adds r0, r4, #0 - bl sub_080E1064 + bl CalcBerryYield strb r0, [r4, #4] _080E0D5C: ldrb r2, [r4, #1] @@ -462421,10 +462421,10 @@ _080E0DB2: bx r1 .align 2, 0 _080E0DB8: .4byte gUnknown_85636B0 - thumb_func_end sub_080E0D14 + thumb_func_end BerryTreeGrow - thumb_func_start sub_080E0DBC -sub_080E0DBC: @ 0x080E0DBC + thumb_func_start BerryTreeTimeUpdate +BerryTreeTimeUpdate: @ 0x080E0DBC push {r4, r5, r6, r7, lr} adds r6, r0, #0 movs r2, #0 @@ -462449,7 +462449,7 @@ _080E0DC2: cmp r0, #0 bne _080E0E5C ldrb r0, [r4] - bl sub_080E10A8 + bl GetStageDurationByBerryType lsls r0, r0, #0x10 lsrs r0, r0, #0x10 lsls r1, r0, #3 @@ -462480,10 +462480,10 @@ _080E0E18: _080E0E28: subs r5, r5, r1 ldrb r0, [r4] - bl sub_080E10A8 + bl GetStageDurationByBerryType strh r0, [r4, #2] adds r0, r4, #0 - bl sub_080E0D14 + bl BerryTreeGrow cmp r0, #0 beq _080E0E5C ldrb r1, [r4, #1] @@ -462511,10 +462511,10 @@ _080E0E5C: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E0DBC + thumb_func_end BerryTreeTimeUpdate - thumb_func_start sub_080E0E68 -sub_080E0E68: @ 0x080E0E68 + thumb_func_start PlantBerryTree +PlantBerryTree: @ 0x080E0E68 push {r4, r5, r6, r7, lr} adds r4, r1, #0 adds r5, r2, #0 @@ -462526,7 +462526,7 @@ sub_080E0E68: @ 0x080E0E68 lsrs r5, r5, #0x18 lsls r3, r3, #0x18 lsrs r7, r3, #0x18 - bl sub_080E0C0C + bl GetBerryTreeInfo adds r6, r0, #0 ldr r0, _080E0ECC ldr r1, [r0, #4] @@ -462535,7 +462535,7 @@ sub_080E0E68: @ 0x080E0E68 str r1, [r6, #4] strb r4, [r6] adds r0, r4, #0 - bl sub_080E10A8 + bl GetStageDurationByBerryType strh r0, [r6, #2] movs r1, #0x7f ands r1, r5 @@ -462548,7 +462548,7 @@ sub_080E0E68: @ 0x080E0E68 cmp r5, #5 bne _080E0EBA adds r0, r6, #0 - bl sub_080E1064 + bl CalcBerryYield strb r0, [r6, #4] ldrh r0, [r6, #2] lsls r0, r0, #2 @@ -462566,7 +462566,7 @@ _080E0EC6: bx r0 .align 2, 0 _080E0ECC: .4byte gUnknown_85636B0 - thumb_func_end sub_080E0E68 + thumb_func_end PlantBerryTree thumb_func_start RemoveBerryTree RemoveBerryTree: @ 0x080E0ED0 @@ -462589,8 +462589,8 @@ _080E0EF0: .4byte 0x0000169C _080E0EF4: .4byte gUnknown_85636B0 thumb_func_end RemoveBerryTree - thumb_func_start sub_080E0EF8 -sub_080E0EF8: @ 0x080E0EF8 + thumb_func_start GetBerryTypeByBerryTreeId +GetBerryTypeByBerryTreeId: @ 0x080E0EF8 lsls r0, r0, #0x18 ldr r1, _080E0F0C ldr r1, [r1] @@ -462603,7 +462603,7 @@ sub_080E0EF8: @ 0x080E0EF8 .align 2, 0 _080E0F0C: .4byte gUnknown_3005AEC _080E0F10: .4byte 0x0000169C - thumb_func_end sub_080E0EF8 + thumb_func_end GetBerryTypeByBerryTreeId thumb_func_start GetStageByBerryTreeId GetStageByBerryTreeId: @ 0x080E0F14 @@ -462673,13 +462673,13 @@ _080E0F7E: .align 2, 0 thumb_func_end BerryTypeToItemId - thumb_func_start sub_080E0F84 -sub_080E0F84: @ 0x080E0F84 + thumb_func_start GetBerryNameByBerryType +GetBerryNameByBerryType: @ 0x080E0F84 push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0BC8 + bl GetBerryInfo adds r1, r0, #0 adds r0, r4, #0 movs r2, #6 @@ -462689,14 +462689,14 @@ sub_080E0F84: @ 0x080E0F84 pop {r4} pop {r0} bx r0 - thumb_func_end sub_080E0F84 + thumb_func_end GetBerryNameByBerryType - thumb_func_start sub_080E0FA4 -sub_080E0FA4: @ 0x080E0FA4 + thumb_func_start ResetBerryTreeSparkleFlag +ResetBerryTreeSparkleFlag: @ 0x080E0FA4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0C0C + bl GetBerryTreeInfo ldrb r2, [r0, #1] movs r1, #0x7f ands r1, r2 @@ -462704,7 +462704,7 @@ sub_080E0FA4: @ 0x080E0FA4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E0FA4 + thumb_func_end ResetBerryTreeSparkleFlag thumb_func_start BerryTreeGetNumStagesWatered BerryTreeGetNumStagesWatered: @ 0x080E0FBC @@ -462743,22 +462743,22 @@ _080E0FF2: bx r1 thumb_func_end BerryTreeGetNumStagesWatered - thumb_func_start sub_080E0FF8 -sub_080E0FF8: @ 0x080E0FF8 + thumb_func_start GetNumStagesWateredByBerryTreeId +GetNumStagesWateredByBerryTreeId: @ 0x080E0FF8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0C0C + bl GetBerryTreeInfo bl BerryTreeGetNumStagesWatered lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E0FF8 + thumb_func_end GetNumStagesWateredByBerryTreeId - thumb_func_start sub_080E1010 -sub_080E1010: @ 0x080E1010 + thumb_func_start CalcBerryYieldInternal +CalcBerryYieldInternal: @ 0x080E1010 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -462803,14 +462803,14 @@ _080E105A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E1010 + thumb_func_end CalcBerryYieldInternal - thumb_func_start sub_080E1064 -sub_080E1064: @ 0x080E1064 + thumb_func_start CalcBerryYield +CalcBerryYield: @ 0x080E1064 push {r4, r5, r6, lr} adds r4, r0, #0 ldrb r0, [r4] - bl sub_080E0BC8 + bl GetBerryInfo ldrb r6, [r0, #0xb] ldrb r5, [r0, #0xa] adds r0, r4, #0 @@ -462820,13 +462820,13 @@ sub_080E1064: @ 0x080E1064 lsrs r2, r2, #0x18 adds r0, r5, #0 adds r1, r6, #0 - bl sub_080E1010 + bl CalcBerryYieldInternal lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080E1064 + thumb_func_end CalcBerryYield thumb_func_start GetBerryCountByBerryTreeId GetBerryCountByBerryTreeId: @ 0x080E1090 @@ -462844,12 +462844,12 @@ GetBerryCountByBerryTreeId: @ 0x080E1090 _080E10A4: .4byte gUnknown_3005AEC thumb_func_end GetBerryCountByBerryTreeId - thumb_func_start sub_080E10A8 -sub_080E10A8: @ 0x080E10A8 + thumb_func_start GetStageDurationByBerryType +GetStageDurationByBerryType: @ 0x080E10A8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080E0BC8 + bl GetBerryInfo ldrb r1, [r0, #0x14] lsls r0, r1, #4 subs r0, r0, r1 @@ -462857,29 +462857,29 @@ sub_080E10A8: @ 0x080E10A8 lsrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_080E10A8 + thumb_func_end GetStageDurationByBerryType - thumb_func_start sub_080E10C0 -sub_080E10C0: @ 0x080E10C0 + thumb_func_start EventObjectInteractionGetBerryTreeData +EventObjectInteractionGetBerryTreeData: @ 0x080E10C0 push {r4, r5, r6, lr} ldr r0, _080E10FC ldrb r0, [r0] - bl sub_0808EA80 + bl EventObjectGetBerryTreeId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_080E0EF8 + bl GetBerryTypeByBerryTreeId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r5, #0 - bl sub_080E0FA4 + bl ResetBerryTreeSparkleFlag ldr r0, _080E1100 ldrb r0, [r0] ldr r1, _080E1104 ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_0809280C + bl IsBerryTreeSparkling lsls r0, r0, #0x18 cmp r0, #0 beq _080E110C @@ -462902,7 +462902,7 @@ _080E110C: _080E111A: ldr r4, _080E1148 adds r0, r5, #0 - bl sub_080E0FF8 + bl GetNumStagesWateredByBerryTreeId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -462914,7 +462914,7 @@ _080E111A: strh r0, [r4] ldr r1, _080E1150 adds r0, r6, #0 - bl sub_080E0F84 + bl GetBerryNameByBerryType pop {r4, r5, r6} pop {r0} bx r0 @@ -462923,17 +462923,17 @@ _080E1144: .4byte gUnknown_2037280 _080E1148: .4byte gUnknown_2037282 _080E114C: .4byte gUnknown_2037284 _080E1150: .4byte gUnknown_2021C40 - thumb_func_end sub_080E10C0 + thumb_func_end EventObjectInteractionGetBerryTreeData thumb_func_start sub_080E1154 sub_080E1154: @ 0x080E1154 push {lr} ldr r0, _080E1160 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080E1160: .4byte sub_081AA954 +_080E1160: .4byte CB2_ChooseBerry thumb_func_end sub_080E1154 thumb_func_start sub_080E1164 @@ -462947,14 +462947,14 @@ sub_080E1164: @ 0x080E1164 lsrs r4, r4, #0x18 ldr r0, _080E1198 ldrb r0, [r0] - bl sub_0808EA80 + bl EventObjectGetBerryTreeId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 movs r2, #1 movs r3, #1 - bl sub_080E0E68 - bl sub_080E10C0 + bl PlantBerryTree + bl EventObjectInteractionGetBerryTreeData pop {r4} pop {r0} bx r0 @@ -462963,17 +462963,17 @@ _080E1194: .4byte gUnknown_203CB48 _080E1198: .4byte gUnknown_3005B50 thumb_func_end sub_080E1164 - thumb_func_start sub_080E119C -sub_080E119C: @ 0x080E119C + thumb_func_start EventObjectInteractionPickBerryTree +EventObjectInteractionPickBerryTree: @ 0x080E119C push {r4, r5, r6, lr} ldr r0, _080E11E0 ldrb r0, [r0] - bl sub_0808EA80 + bl EventObjectGetBerryTreeId adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 adds r0, r5, #0 - bl sub_080E0EF8 + bl GetBerryTypeByBerryTreeId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r6, _080E11E4 @@ -462987,7 +462987,7 @@ sub_080E119C: @ 0x080E119C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6] @@ -462997,14 +462997,14 @@ sub_080E119C: @ 0x080E119C .align 2, 0 _080E11E0: .4byte gUnknown_3005B50 _080E11E4: .4byte gUnknown_2037280 - thumb_func_end sub_080E119C + thumb_func_end EventObjectInteractionPickBerryTree thumb_func_start sub_080E11E8 sub_080E11E8: @ 0x080E11E8 push {lr} ldr r0, _080E1210 ldrb r0, [r0] - bl sub_0808EA80 + bl EventObjectGetBerryTreeId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl RemoveBerryTree @@ -463023,19 +463023,19 @@ _080E1214: .4byte gUnknown_2037292 _080E1218: .4byte gUnknown_3005AEC thumb_func_end sub_080E11E8 - thumb_func_start sub_080E121C -sub_080E121C: @ 0x080E121C + thumb_func_start PlayerHasBerries +PlayerHasBerries: @ 0x080E121C push {lr} movs r0, #4 - bl sub_080D5F04 + bl IsBagPocketNonEmpty lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_080E121C + thumb_func_end PlayerHasBerries - thumb_func_start sub_080E122C -sub_080E122C: @ 0x080E122C + thumb_func_start ResetBerryTreeSparkleFlags +ResetBerryTreeSparkleFlags: @ 0x080E122C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -463046,7 +463046,7 @@ sub_080E122C: @ 0x080E122C adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_080884E4 + bl GetCameraCoords mov r0, sp ldrh r2, [r0] ldrh r1, [r4] @@ -463098,7 +463098,7 @@ _080E1270: cmp r1, r0 bgt _080E12AC ldrb r0, [r4, #0x1d] - bl sub_080E0FA4 + bl ResetBerryTreeSparkleFlag _080E12AC: adds r4, #0x24 subs r6, #1 @@ -463114,10 +463114,10 @@ _080E12AC: bx r0 .align 2, 0 _080E12C4: .4byte gUnknown_2036FF0 - thumb_func_end sub_080E122C + thumb_func_end ResetBerryTreeSparkleFlags - thumb_func_start sub_080E12C8 -sub_080E12C8: @ 0x080E12C8 + thumb_func_start ScriptMenu_Multichoice +ScriptMenu_Multichoice: @ 0x080E12C8 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -463129,7 +463129,7 @@ sub_080E12C8: @ 0x080E12C8 lsls r3, r3, #0x18 lsrs r4, r3, #0x18 ldr r0, _080E1304 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -463147,7 +463147,7 @@ sub_080E12C8: @ 0x080E12C8 movs r0, #1 b _080E130E .align 2, 0 -_080E1304: .4byte sub_080E1568 +_080E1304: .4byte Task_HandleMultichoiceInput _080E1308: .4byte gUnknown_2037290 _080E130C: movs r0, #0 @@ -463157,10 +463157,10 @@ _080E130E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E12C8 + thumb_func_end ScriptMenu_Multichoice - thumb_func_start sub_080E1318 -sub_080E1318: @ 0x080E1318 + thumb_func_start ScriptMenu_MultichoiceWithDefault +ScriptMenu_MultichoiceWithDefault: @ 0x080E1318 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -463178,7 +463178,7 @@ sub_080E1318: @ 0x080E1318 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080E1360 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -463195,7 +463195,7 @@ sub_080E1318: @ 0x080E1318 movs r0, #1 b _080E136A .align 2, 0 -_080E1360: .4byte sub_080E1568 +_080E1360: .4byte Task_HandleMultichoiceInput _080E1364: .4byte gUnknown_2037290 _080E1368: movs r0, #0 @@ -463207,7 +463207,7 @@ _080E136A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E1318 + thumb_func_end ScriptMenu_MultichoiceWithDefault thumb_func_start sub_080E1378 sub_080E1378: @ 0x080E1378 @@ -463333,16 +463333,16 @@ sub_080E13FC: @ 0x080E13FC lsrs r3, r3, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080E1F10 + bl CreateWindowFromRect adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -463367,7 +463367,7 @@ sub_080E13FC: @ 0x080E13FC movs r3, #2 bl sub_081984B0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram mov r0, sl adds r1, r6, #0 adds r2, r4, #0 @@ -463422,7 +463422,7 @@ _080E1500: bls _080E14F6 adds r0, r6, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _080E1538 @@ -463438,7 +463438,7 @@ _080E1500: b _080E153E .align 2, 0 _080E152C: .4byte gUnknown_2039C30 -_080E1530: .4byte sub_080E1568 +_080E1530: .4byte Task_HandleMultichoiceInput _080E1534: .4byte gUnknown_8564618 _080E1538: .4byte gUnknown_3005B60 _080E153C: @@ -463465,8 +463465,8 @@ _080E153E: _080E1564: .4byte gUnknown_3005B60 thumb_func_end sub_080E14CC - thumb_func_start sub_080E1568 -sub_080E1568: @ 0x080E1568 + thumb_func_start Task_HandleMultichoiceInput +Task_HandleMultichoiceInput: @ 0x080E1568 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -463497,10 +463497,10 @@ _080E15A0: ldrsh r0, [r5, r1] cmp r0, #0 bne _080E15AE - bl sub_081986E8 + bl Menu_ProcessInputNoWrap b _080E15B2 _080E15AE: - bl sub_0819867C + bl Menu_ProcessInput _080E15B2: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -463542,22 +463542,22 @@ _080E15FC: ldrb r0, [r5, #0xc] bl sub_080E1F6C adds r0, r6, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080E160C: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080E1614: .4byte gUnknown_2037290 - thumb_func_end sub_080E1568 + thumb_func_end Task_HandleMultichoiceInput - thumb_func_start sub_080E1618 -sub_080E1618: @ 0x080E1618 + thumb_func_start ScriptMenu_YesNo +ScriptMenu_YesNo: @ 0x080E1618 push {r4, lr} ldr r4, _080E1640 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -463568,11 +463568,11 @@ sub_080E1618: @ 0x080E1618 bl sub_08197714 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask movs r0, #1 b _080E164A .align 2, 0 -_080E1640: .4byte sub_080E166C +_080E1640: .4byte Task_HandleYesNoInput _080E1644: .4byte gUnknown_2037290 _080E1648: movs r0, #0 @@ -463580,10 +463580,10 @@ _080E164A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080E1618 + thumb_func_end ScriptMenu_YesNo - thumb_func_start sub_080E1650 -sub_080E1650: @ 0x080E1650 + thumb_func_start IsScriptActive +IsScriptActive: @ 0x080E1650 push {lr} ldr r0, _080E1660 ldrh r0, [r0] @@ -463599,10 +463599,10 @@ _080E1666: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E1650 + thumb_func_end IsScriptActive - thumb_func_start sub_080E166C -sub_080E166C: @ 0x080E166C + thumb_func_start Task_HandleYesNoInput +Task_HandleYesNoInput: @ 0x080E166C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -463655,15 +463655,15 @@ _080E16C8: strh r0, [r1] _080E16CA: adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080E16D4: pop {r4} pop {r0} bx r0 .align 2, 0 _080E16DC: .4byte gUnknown_2037290 - thumb_func_end sub_080E166C + thumb_func_end Task_HandleYesNoInput thumb_func_start sub_080E16E0 sub_080E16E0: @ 0x080E16E0 @@ -463689,7 +463689,7 @@ sub_080E16E0: @ 0x080E16E0 lsrs r7, r4, #0x18 ldr r0, _080E17C8 mov sb, r0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -463718,7 +463718,7 @@ sub_080E16E0: @ 0x080E16E0 lsrs r6, r6, #0x18 mov r0, sb movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080E17D4 @@ -463738,12 +463738,12 @@ sub_080E16E0: @ 0x080E16E0 lsrs r3, r3, #0x18 ldr r0, [sp, #0x14] ldr r1, [sp, #0x18] - bl sub_080E1F10 + bl CreateWindowFromRect lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x14] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldrb r0, [r5, #0x14] lsls r4, r4, #0x1b lsrs r4, r4, #0x18 @@ -463770,11 +463770,11 @@ sub_080E16E0: @ 0x080E16E0 bl sub_081990E4 ldrb r0, [r5, #0x14] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 b _080E17DA .align 2, 0 -_080E17C8: .4byte sub_080E17EC +_080E17C8: .4byte Task_HandleMultichoiceGridInput _080E17CC: .4byte gUnknown_2037290 _080E17D0: .4byte gUnknown_8564218 _080E17D4: .4byte gUnknown_3005B60 @@ -463792,8 +463792,8 @@ _080E17DA: .align 2, 0 thumb_func_end sub_080E16E0 - thumb_func_start sub_080E17EC -sub_080E17EC: @ 0x080E17EC + thumb_func_start Task_HandleMultichoiceGridInput +Task_HandleMultichoiceGridInput: @ 0x080E17EC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -463802,7 +463802,7 @@ sub_080E17EC: @ 0x080E17EC lsls r0, r0, #3 ldr r1, _080E1828 adds r5, r0, r1 - bl sub_08199450 + bl Menu_ProcessInputGridLayout lsls r0, r0, #0x18 asrs r1, r0, #0x18 movs r0, #2 @@ -463832,21 +463832,21 @@ _080E1834: ldrb r0, [r5, #0xc] bl sub_080E1F6C adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080E1844: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080E184C: .4byte gUnknown_2037290 - thumb_func_end sub_080E17EC + thumb_func_end Task_HandleMultichoiceGridInput thumb_func_start sub_080E1850 sub_080E1850: @ 0x080E1850 push {lr} ldr r0, _080E1870 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -463854,11 +463854,11 @@ sub_080E1850: @ 0x080E1850 ldr r1, _080E1874 movs r0, #0xff strh r0, [r1] - bl sub_080E1880 + bl ShowDomeResultsWindow movs r0, #1 b _080E187A .align 2, 0 -_080E1870: .4byte sub_080E1568 +_080E1870: .4byte Task_HandleMultichoiceInput _080E1874: .4byte gUnknown_2037290 _080E1878: movs r0, #0 @@ -463868,21 +463868,21 @@ _080E187A: .align 2, 0 thumb_func_end sub_080E1850 - thumb_func_start sub_080E1880 -sub_080E1880: @ 0x080E1880 + thumb_func_start ShowDomeResultsWindow +ShowDomeResultsWindow: @ 0x080E1880 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #0xc movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r0, #1 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute ldr r0, _080E18BC bl sub_080E1378 lsls r0, r0, #0x10 @@ -463916,12 +463916,12 @@ _080E18C6: movs r0, #0 movs r1, #0 movs r3, #8 - bl sub_080E1F10 + bl CreateWindowFromRect lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r6, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldr r2, _080E1928 movs r0, #0x22 str r0, [sp] @@ -463956,12 +463956,12 @@ _080E1930: movs r0, #0 movs r1, #0 movs r3, #6 - bl sub_080E1F10 + bl CreateWindowFromRect lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r6, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldr r2, _080E1990 movs r0, #0x22 str r0, [sp] @@ -464010,12 +464010,12 @@ _080E19B2: ldr r4, _080E1A04 ldr r1, _080E1A08 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r6, #0 adds r1, r4, #0 adds r2, r7, #0 movs r3, #0x12 - bl sub_08199CBC + bl PrintPlayerNameOnWindow movs r0, #0x10 str r0, [sp] mov r0, r8 @@ -464029,7 +464029,7 @@ _080E19B2: bl sub_081984B0 adds r0, r6, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 mov r1, r8 adds r2, r6, #0 @@ -464045,10 +464045,10 @@ _080E19B2: _080E1A00: .4byte gUnknown_85CACEC _080E1A04: .4byte gUnknown_2021C7C _080E1A08: .4byte gUnknown_85CACFE - thumb_func_end sub_080E1880 + thumb_func_end ShowDomeResultsWindow - thumb_func_start sub_080E1A0C -sub_080E1A0C: @ 0x080E1A0C + thumb_func_start ScriptMenu_DisplayPCStartupPrompt +ScriptMenu_DisplayPCStartupPrompt: @ 0x080E1A0C push {lr} sub sp, #0x10 movs r0, #0 @@ -464066,19 +464066,19 @@ sub_080E1A0C: @ 0x080E1A0C movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r0} bx r0 .align 2, 0 _080E1A3C: .4byte gUnknown_82436CD - thumb_func_end sub_080E1A0C + thumb_func_end ScriptMenu_DisplayPCStartupPrompt thumb_func_start sub_080E1A40 sub_080E1A40: @ 0x080E1A40 push {lr} ldr r0, _080E1A60 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -464090,7 +464090,7 @@ sub_080E1A40: @ 0x080E1A40 movs r0, #1 b _080E1A6A .align 2, 0 -_080E1A60: .4byte sub_080E1568 +_080E1A60: .4byte Task_HandleMultichoiceInput _080E1A64: .4byte gUnknown_2037290 _080E1A68: movs r0, #0 @@ -464124,7 +464124,7 @@ _080E1A84: bls _080E1A84 movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute ldr r0, _080E1C98 ldrh r1, [r0] cmp r1, #0 @@ -464151,7 +464151,7 @@ _080E1A84: _080E1ACE: ldr r0, _080E1C9C movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -464199,7 +464199,7 @@ _080E1B30: movs r0, #0xb9 lsls r0, r0, #1 movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -464244,7 +464244,7 @@ _080E1B68: _080E1B90: ldr r0, _080E1CA8 movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -464291,7 +464291,7 @@ _080E1BF0: movs r0, #0xbc lsls r0, r0, #1 movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -464389,12 +464389,12 @@ _080E1CB8: lsls r3, r7, #0x19 lsrs r3, r3, #0x18 adds r2, r6, #0 - bl sub_080E1F10 + bl CreateWindowFromRect lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r6, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r5, #0 movs r4, #0 subs r0, r7, #1 @@ -464446,7 +464446,7 @@ _080E1D1C: bl sub_081984B0 adds r0, r6, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 adds r1, r7, #0 adds r2, r6, #0 @@ -464485,8 +464485,8 @@ _080E1D84: .4byte gUnknown_2037290 _080E1D88: .4byte gUnknown_3001124 thumb_func_end sub_080E1D6C - thumb_func_start sub_080E1D8C -sub_080E1D8C: @ 0x080E1D8C + thumb_func_start Task_PokemonPicWindow +Task_PokemonPicWindow: @ 0x080E1D8C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -464521,7 +464521,7 @@ _080E1DBE: ldr r1, _080E1DDC adds r0, r0, r1 ldrb r1, [r4, #0xc] - bl sub_080B57C8 + bl FreeResourcesAndDestroySprite _080E1DD2: ldrh r0, [r4, #8] adds r0, #1 @@ -464533,16 +464533,16 @@ _080E1DE0: ldrb r0, [r4, #0x12] bl sub_080E1F6C adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080E1DEC: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E1D8C + thumb_func_end Task_PokemonPicWindow - thumb_func_start sub_080E1DF4 -sub_080E1DF4: @ 0x080E1DF4 + thumb_func_start ScriptMenu_ShowPokemonPic +ScriptMenu_ShowPokemonPic: @ 0x080E1DF4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -464555,7 +464555,7 @@ sub_080E1DF4: @ 0x080E1DF4 lsrs r6, r2, #0x18 ldr r4, _080E1E9C adds r0, r4, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -464570,13 +464570,13 @@ sub_080E1DF4: @ 0x080E1DF4 asrs r2, r2, #0x10 mov r0, r8 movs r3, #0 - bl sub_080B56DC + bl CreateMonSprite_PicBox adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 adds r0, r4, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -464584,7 +464584,7 @@ sub_080E1DF4: @ 0x080E1DF4 adds r1, r6, #0 movs r2, #8 movs r3, #8 - bl sub_080E1F10 + bl CreateWindowFromRect ldr r1, _080E1EA0 lsls r3, r4, #2 adds r3, r3, r4 @@ -464615,13 +464615,13 @@ sub_080E1DF4: @ 0x080E1DF4 strb r0, [r1, #5] ldrb r0, [r3, #0x12] movs r1, #1 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 b _080E1EAE .align 2, 0 -_080E1E9C: .4byte sub_080E1D8C +_080E1E9C: .4byte Task_PokemonPicWindow _080E1EA0: .4byte gUnknown_3005B60 _080E1EA4: .4byte gUnknown_20205AC _080E1EA8: .4byte sub_08007140 @@ -464633,13 +464633,13 @@ _080E1EAE: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080E1DF4 + thumb_func_end ScriptMenu_ShowPokemonPic - thumb_func_start sub_080E1EB8 -sub_080E1EB8: @ 0x080E1EB8 + thumb_func_start ScriptMenu_GetPicboxWaitFunc +ScriptMenu_GetPicboxWaitFunc: @ 0x080E1EB8 push {lr} ldr r0, _080E1EDC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -464655,22 +464655,22 @@ sub_080E1EB8: @ 0x080E1EB8 ldr r0, _080E1EE4 b _080E1EEA .align 2, 0 -_080E1EDC: .4byte sub_080E1D8C +_080E1EDC: .4byte Task_PokemonPicWindow _080E1EE0: .4byte gUnknown_3005B60 -_080E1EE4: .4byte sub_080E1EF0 +_080E1EE4: .4byte IsPicboxClosed _080E1EE8: movs r0, #0 _080E1EEA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E1EB8 + thumb_func_end ScriptMenu_GetPicboxWaitFunc - thumb_func_start sub_080E1EF0 -sub_080E1EF0: @ 0x080E1EF0 + thumb_func_start IsPicboxClosed +IsPicboxClosed: @ 0x080E1EF0 push {lr} ldr r0, _080E1F04 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -464678,17 +464678,17 @@ sub_080E1EF0: @ 0x080E1EF0 movs r0, #0 b _080E1F0A .align 2, 0 -_080E1F04: .4byte sub_080E1D8C +_080E1F04: .4byte Task_PokemonPicWindow _080E1F08: movs r0, #1 _080E1F0A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E1EF0 + thumb_func_end IsPicboxClosed - thumb_func_start sub_080E1F10 -sub_080E1F10: @ 0x080E1F10 + thumb_func_start CreateWindowFromRect +CreateWindowFromRect: @ 0x080E1F10 push {r4, r5, lr} sub sp, #0x20 adds r4, r0, #0 @@ -464721,18 +464721,18 @@ sub_080E1F10: @ 0x080E1F10 str r0, [sp, #0x18] str r1, [sp, #0x1c] add r0, sp, #0x18 - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 add sp, #0x20 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080E1F10 + thumb_func_end CreateWindowFromRect thumb_func_start sub_080E1F6C sub_080E1F6C: @ 0x080E1F6C @@ -464744,7 +464744,7 @@ sub_080E1F6C: @ 0x080E1F6C movs r1, #1 bl sub_08198134 adds r0, r4, #0 - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -464776,7 +464776,7 @@ _080E1FA4: @ jump table _080E1FBC: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _080E1FC8 b _080E2006 .align 2, 0 @@ -464784,7 +464784,7 @@ _080E1FC8: .4byte gUnknown_856464C _080E1FCC: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _080E1FD8 b _080E2006 .align 2, 0 @@ -464792,7 +464792,7 @@ _080E1FD8: .4byte gUnknown_856463C _080E1FDC: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _080E1FE8 b _080E2006 .align 2, 0 @@ -464800,7 +464800,7 @@ _080E1FE8: .4byte gUnknown_856465C _080E1FEC: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _080E1FF8 b _080E2006 .align 2, 0 @@ -464808,10 +464808,10 @@ _080E1FF8: .4byte gUnknown_856466C _080E1FFC: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _080E2030 _080E2006: - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r0, r4 @@ -464827,16 +464827,16 @@ _080E2006: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 b _080E2064 .align 2, 0 _080E2030: .4byte gUnknown_856468C _080E2034: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _080E206C - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r0, r4 @@ -464852,7 +464852,7 @@ _080E2034: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 _080E2064: add sp, #0x10 pop {r4} @@ -464866,7 +464866,7 @@ _080E206C: .4byte gUnknown_8564680 sub_080E2070: @ 0x080E2070 push {lr} ldr r0, _080E2090 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -464878,7 +464878,7 @@ sub_080E2070: @ 0x080E2070 movs r0, #1 b _080E209A .align 2, 0 -_080E2090: .4byte sub_080E1568 +_080E2090: .4byte Task_HandleMultichoiceInput _080E2094: .4byte gUnknown_2037290 _080E2098: movs r0, #0 @@ -464898,14 +464898,14 @@ sub_080E20A0: @ 0x080E20A0 sub sp, #0xc movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r5, r0, #0 adds r5, #1 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute movs r0, #8 mov sl, r0 movs r0, #0x10 @@ -464914,13 +464914,13 @@ sub_080E20A0: @ 0x080E20A0 movs r1, #0 movs r2, #6 movs r3, #0x10 - bl sub_080E1F10 + bl CreateWindowFromRect adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldr r2, _080E21D8 movs r0, #2 str r0, [sp] @@ -465021,7 +465021,7 @@ sub_080E20A0: @ 0x080E20A0 bl sub_080E21F8 adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -465058,7 +465058,7 @@ sub_080E21F8: @ 0x080E21F8 strb r0, [r1] ldr r0, _080E223C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080E2240 @@ -465076,12 +465076,12 @@ sub_080E21F8: @ 0x080E21F8 bx r0 .align 2, 0 _080E2238: .4byte gUnknown_2039C30 -_080E223C: .4byte sub_080E1568 +_080E223C: .4byte Task_HandleMultichoiceInput _080E2240: .4byte gUnknown_3005B60 thumb_func_end sub_080E21F8 - thumb_func_start sub_080E2244 -sub_080E2244: @ 0x080E2244 + thumb_func_start DoNamingScreen +DoNamingScreen: @ 0x080E2244 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -465100,7 +465100,7 @@ sub_080E2244: @ 0x080E2244 cmp r0, #0 bne _080E2274 ldr r0, [sp, #0x1c] - bl sub_08000540 + bl SetMainCallback2 b _080E22AE .align 2, 0 _080E2270: .4byte gUnknown_2039C34 @@ -465129,10 +465129,10 @@ _080E2274: str r2, [r0] cmp r7, #0 bne _080E22A8 - bl sub_08000554 + bl StartTimer1 _080E22A8: ldr r0, _080E22CC - bl sub_08000540 + bl SetMainCallback2 _080E22AE: pop {r3} mov r8, r3 @@ -465145,11 +465145,11 @@ _080E22BC: .4byte 0x00001E34 _080E22C0: .4byte 0x00001E38 _080E22C4: .4byte 0x00001E30 _080E22C8: .4byte 0x00001E3C -_080E22CC: .4byte sub_080E22D0 - thumb_func_end sub_080E2244 +_080E22CC: .4byte C2_NamingScreen + thumb_func_end DoNamingScreen - thumb_func_start sub_080E22D0 -sub_080E22D0: @ 0x080E22D0 + thumb_func_start C2_NamingScreen +C2_NamingScreen: @ 0x080E22D0 push {lr} ldr r0, _080E22EC movs r1, #0x87 @@ -465176,11 +465176,11 @@ _080E22F4: @ jump table .4byte _080E2340 @ case 6 .4byte _080E2346 @ case 7 _080E2314: - bl sub_080E4764 + bl NamingScreen_TurnOffScreen bl sub_080E2374 b _080E2352 _080E231E: - bl sub_080E24AC + bl NamingScreen_InitBGs b _080E2352 _080E2324: bl ResetPaletteFade @@ -465190,17 +465190,17 @@ _080E232A: bl FreeAllSpritePalettes b _080E2352 _080E2334: - bl sub_080A8818 + bl ResetTasks b _080E2352 _080E233A: bl sub_080E4460 b _080E2352 _080E2340: - bl sub_080E43EC + bl choose_name_or_words_screen_load_bg_tile_patterns b _080E2352 _080E2346: bl sub_080E31EC - bl sub_080A12E4 + bl UpdatePaletteFade bl sub_080E4810 _080E2352: ldr r1, _080E2364 @@ -465219,7 +465219,7 @@ _080E2368: _080E2370: pop {r0} bx r0 - thumb_func_end sub_080E22D0 + thumb_func_end C2_NamingScreen thumb_func_start sub_080E2374 sub_080E2374: @ 0x080E2374 @@ -465372,8 +465372,8 @@ _080E2490: _080E24A8: .4byte gUnknown_20205AC thumb_func_end sub_080E246C - thumb_func_start sub_080E24AC -sub_080E24AC: @ 0x080E24AC + thumb_func_start NamingScreen_InitBGs +NamingScreen_InitBGs: @ 0x080E24AC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -465453,42 +465453,42 @@ _080E24D2: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 - bl sub_08196DC4 + bl ChangeBgY + bl InitStandardTextBoxWindows bl sub_08196DF4 _080E25A0: lsls r0, r4, #3 ldr r1, _080E264C adds r0, r0, r1 - bl sub_08003250 + bl AddWindow ldr r5, _080E2650 ldr r1, [r5] ldr r2, _080E2654 @@ -465513,19 +465513,19 @@ _080E25A0: bl SetGpuReg ldr r1, [r5] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r5] movs r0, #0x80 lsls r0, r0, #4 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r5] movs r2, #0x80 lsls r2, r2, #5 adds r1, r1, r2 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer movs r4, #0x20 str r4, [sp] str r4, [sp, #4] @@ -465562,16 +465562,16 @@ _080E264C: .4byte gUnknown_8565A0C _080E2650: .4byte gUnknown_2039C34 _080E2654: .4byte 0x00001E11 _080E2658: .4byte 0x0000080C - thumb_func_end sub_080E24AC + thumb_func_end NamingScreen_InitBGs thumb_func_start sub_080E265C sub_080E265C: @ 0x080E265C push {lr} ldr r0, _080E2670 movs r1, #2 - bl sub_080A8878 + bl CreateTask ldr r0, _080E2674 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -465612,15 +465612,15 @@ _080E26A0: @ jump table _080E26C8: bl sub_080E27B8 bl sub_080E246C - bl sub_080E4778 + bl NamingScreen_InitDisplayMode b _080E2708 _080E26D6: - bl sub_080E28F0 + bl MainState_WaitFadeIn b _080E2708 _080E26DC: - bl sub_080E293C + bl MainState_MoveToOKButton _080E26E0: - bl sub_080E292C + bl MainState_HandleInput b _080E2708 _080E26E6: bl sub_080E2BD4 @@ -465629,16 +465629,16 @@ _080E26EC: bl sub_080E2C14 b _080E2708 _080E26F2: - bl sub_080E296C + bl MainState_6 b _080E2708 _080E26F8: bl sub_080E2B98 b _080E2708 _080E26FE: - bl sub_080E29DC + bl MainState_BeginFadeInOut b _080E2708 _080E2704: - bl sub_080E2A10 + bl MainState_WaitFadeOutAndExit _080E2708: pop {r0} bx r0 @@ -465824,24 +465824,24 @@ _080E287A: bl sub_080E3E24 bl sub_080E46E4 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r4, #1 rsbs r4, r4, #0 adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080E28D4 ldr r1, [r0] ldr r0, _080E28EC @@ -465864,8 +465864,8 @@ _080E28E8: .4byte 0x00001E12 _080E28EC: .4byte 0x00001E10 thumb_func_end sub_080E27B8 - thumb_func_start sub_080E28F0 -sub_080E28F0: @ 0x080E28F0 + thumb_func_start MainState_WaitFadeIn +MainState_WaitFadeIn: @ 0x080E28F0 push {lr} ldr r0, _080E2920 ldrb r1, [r0, #7] @@ -465874,7 +465874,7 @@ sub_080E28F0: @ 0x080E28F0 cmp r0, #0 bne _080E2918 movs r0, #1 - bl sub_080E3B08 + bl SetInputState movs r0, #1 bl sub_080E3378 ldr r0, _080E2924 @@ -465892,28 +465892,28 @@ _080E2918: _080E2920: .4byte gUnknown_2037C74 _080E2924: .4byte gUnknown_2039C34 _080E2928: .4byte 0x00001E10 - thumb_func_end sub_080E28F0 + thumb_func_end MainState_WaitFadeIn - thumb_func_start sub_080E292C -sub_080E292C: @ 0x080E292C + thumb_func_start MainState_HandleInput +MainState_HandleInput: @ 0x080E292C push {lr} - bl sub_080E3988 + bl HandleKeyboardEvent lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E292C + thumb_func_end MainState_HandleInput - thumb_func_start sub_080E293C -sub_080E293C: @ 0x080E293C + thumb_func_start MainState_MoveToOKButton +MainState_MoveToOKButton: @ 0x080E293C push {lr} bl IsCursorAnimFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080E295E movs r0, #1 - bl sub_080E3B08 + bl SetInputState bl sub_080E3310 ldr r0, _080E2964 ldr r0, [r0] @@ -465928,14 +465928,14 @@ _080E295E: .align 2, 0 _080E2964: .4byte gUnknown_2039C34 _080E2968: .4byte 0x00001E10 - thumb_func_end sub_080E293C + thumb_func_end MainState_MoveToOKButton - thumb_func_start sub_080E296C -sub_080E296C: @ 0x080E296C + thumb_func_start MainState_6 +MainState_6: @ 0x080E296C push {r4, lr} bl sub_080E437C movs r0, #0 - bl sub_080E3B08 + bl SetInputState movs r0, #0 bl sub_080E3378 movs r0, #3 @@ -465954,7 +465954,7 @@ sub_080E296C: @ 0x080E296C lsrs r0, r0, #0x18 cmp r0, #5 bls _080E29C0 - bl sub_080E2A78 + bl DisplaySentToPCMessage ldr r0, [r4] ldr r1, _080E29BC adds r0, r0, r1 @@ -465981,10 +465981,10 @@ _080E29CE: .align 2, 0 _080E29D4: .4byte gUnknown_2039C34 _080E29D8: .4byte 0x00001E10 - thumb_func_end sub_080E296C + thumb_func_end MainState_6 - thumb_func_start sub_080E29DC -sub_080E29DC: @ 0x080E29DC + thumb_func_start MainState_BeginFadeInOut +MainState_BeginFadeInOut: @ 0x080E29DC push {lr} sub sp, #4 movs r0, #1 @@ -465993,7 +465993,7 @@ sub_080E29DC: @ 0x080E29DC str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080E2A08 ldr r1, [r0] ldr r0, _080E2A0C @@ -466008,10 +466008,10 @@ sub_080E29DC: @ 0x080E29DC .align 2, 0 _080E2A08: .4byte gUnknown_2039C34 _080E2A0C: .4byte 0x00001E10 - thumb_func_end sub_080E29DC + thumb_func_end MainState_BeginFadeInOut - thumb_func_start sub_080E2A10 -sub_080E2A10: @ 0x080E2A10 + thumb_func_start MainState_WaitFadeOutAndExit +MainState_WaitFadeOutAndExit: @ 0x080E2A10 push {r4, r5, lr} ldr r0, _080E2A64 ldrb r1, [r0, #7] @@ -466028,21 +466028,21 @@ sub_080E2A10: @ 0x080E2A10 ldrb r0, [r0] cmp r0, #0 bne _080E2A34 - bl sub_08000560 + bl SeedRngAndSetTrainerId _080E2A34: ldr r0, [r4] ldr r1, _080E2A70 adds r0, r0, r1 ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080E2A74 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 - bl sub_080034D4 + bl DestroyTask + bl FreeAllWindowBuffers ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] _080E2A5A: movs r0, #0 @@ -466055,10 +466055,10 @@ _080E2A68: .4byte gUnknown_2039C34 _080E2A6C: .4byte 0x00001E2C _080E2A70: .4byte 0x00001E3C _080E2A74: .4byte sub_080E2678 - thumb_func_end sub_080E2A10 + thumb_func_end MainState_WaitFadeOutAndExit - thumb_func_start sub_080E2A78 -sub_080E2A78: @ 0x080E2A78 + thumb_func_start DisplaySentToPCMessage +DisplaySentToPCMessage: @ 0x080E2A78 push {r4, r5, lr} sub sp, #0x10 movs r5, #0 @@ -466131,7 +466131,7 @@ _080E2B1A: adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 movs r1, #0 bl sub_08196FB8 @@ -466155,10 +466155,10 @@ _080E2B1A: movs r0, #0 movs r1, #1 adds r2, r4, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r4, r5} pop {r0} @@ -466174,7 +466174,7 @@ _080E2B88: .4byte 0x000008AB _080E2B8C: .4byte gUnknown_2021C7C _080E2B90: .4byte gUnknown_8565858 _080E2B94: .4byte gUnknown_30030B4 - thumb_func_end sub_080E2A78 + thumb_func_end DisplaySentToPCMessage thumb_func_start sub_080E2B98 sub_080E2B98: @ 0x080E2B98 @@ -466211,9 +466211,9 @@ _080E2BD0: .4byte 0x00001E10 sub_080E2BD4: @ 0x080E2BD4 push {lr} movs r0, #0 - bl sub_080E3B08 + bl SetInputState bl sub_080E3510 - bl sub_080E2C6C + bl StartPageSwapAnim movs r0, #1 bl sub_080E3320 movs r0, #0 @@ -466239,7 +466239,7 @@ _080E2C10: .4byte 0x00001E10 thumb_func_start sub_080E2C14 sub_080E2C14: @ 0x080E2C14 push {r4, lr} - bl sub_080E2CC4 + bl IsPageSwapAnimNotInProgress lsls r0, r0, #0x18 cmp r0, #0 beq _080E2C56 @@ -466263,7 +466263,7 @@ sub_080E2C14: @ 0x080E2C14 strb r0, [r4] bl sub_080E4648 movs r0, #1 - bl sub_080E3B08 + bl SetInputState movs r0, #0 bl sub_080E3320 _080E2C56: @@ -466277,13 +466277,13 @@ _080E2C64: .4byte 0x00001E10 _080E2C68: .4byte 0x00001E22 thumb_func_end sub_080E2C14 - thumb_func_start sub_080E2C6C -sub_080E2C6C: @ 0x080E2C6C + thumb_func_start StartPageSwapAnim +StartPageSwapAnim: @ 0x080E2C6C push {r4, lr} ldr r4, _080E2C88 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -466292,7 +466292,7 @@ sub_080E2C6C: @ 0x080E2C6C bx r0 .align 2, 0 _080E2C88: .4byte sub_080E2C8C - thumb_func_end sub_080E2C6C + thumb_func_end StartPageSwapAnim thumb_func_start sub_080E2C8C sub_080E2C8C: @ 0x080E2C8C @@ -466324,11 +466324,11 @@ _080E2CBC: .4byte gUnknown_8565A50 _080E2CC0: .4byte gUnknown_3005B60 thumb_func_end sub_080E2C8C - thumb_func_start sub_080E2CC4 -sub_080E2CC4: @ 0x080E2CC4 + thumb_func_start IsPageSwapAnimNotInProgress +IsPageSwapAnimNotInProgress: @ 0x080E2CC4 push {lr} ldr r0, _080E2CD8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -466343,7 +466343,7 @@ _080E2CDE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E2CC4 + thumb_func_end IsPageSwapAnimNotInProgress thumb_func_start PageSwapAnimState_Init PageSwapAnimState_Init: @ 0x080E2CE4 @@ -466367,8 +466367,8 @@ _080E2D04: .4byte 0x00001E18 _080E2D08: .4byte 0x00001E1A thumb_func_end PageSwapAnimState_Init - thumb_func_start sub_080E2D0C -sub_080E2D0C: @ 0x080E2D0C + thumb_func_start PageSwapAnimState_1 +PageSwapAnimState_1: @ 0x080E2D0C push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -466438,10 +466438,10 @@ _080E2D90: .4byte 0x00001E1A _080E2D94: .4byte 0x00001E18 _080E2D98: .4byte 0x00001E21 _080E2D9C: .4byte 0x00001E1C - thumb_func_end sub_080E2D0C + thumb_func_end PageSwapAnimState_1 - thumb_func_start sub_080E2DA0 -sub_080E2DA0: @ 0x080E2DA0 + thumb_func_start PageSwapAnimState_2 +PageSwapAnimState_2: @ 0x080E2DA0 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -466512,29 +466512,29 @@ _080E2E24: .4byte gUnknown_2039C34 _080E2E28: .4byte 0x00001E1A _080E2E2C: .4byte 0x00001E18 _080E2E30: .4byte 0x00001E21 - thumb_func_end sub_080E2DA0 + thumb_func_end PageSwapAnimState_2 - thumb_func_start sub_080E2E34 -sub_080E2E34: @ 0x080E2E34 + thumb_func_start PageSwapAnimState_Done +PageSwapAnimState_Done: @ 0x080E2E34 push {lr} ldr r0, _080E2E4C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 .align 2, 0 _080E2E4C: .4byte sub_080E2C8C - thumb_func_end sub_080E2E34 + thumb_func_end PageSwapAnimState_Done thumb_func_start sub_080E2E50 sub_080E2E50: @ 0x080E2E50 push {lr} ldr r0, _080E2E70 movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080E2E74 @@ -466547,7 +466547,7 @@ sub_080E2E50: @ 0x080E2E50 pop {r0} bx r0 .align 2, 0 -_080E2E70: .4byte sub_080E2EEC +_080E2E70: .4byte Task_80E39BC _080E2E74: .4byte gUnknown_3005B60 thumb_func_end sub_080E2E50 @@ -466561,7 +466561,7 @@ sub_080E2E78: @ 0x080E2E78 lsls r2, r2, #0x18 lsrs r6, r2, #0x18 ldr r0, _080E2EB0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -466580,7 +466580,7 @@ sub_080E2E78: @ 0x080E2E78 strh r0, [r4, #0xc] b _080E2EE4 .align 2, 0 -_080E2EB0: .4byte sub_080E2EEC +_080E2EB0: .4byte Task_80E39BC _080E2EB4: .4byte gUnknown_3005B60 _080E2EB8: cmp r5, #3 @@ -466612,8 +466612,8 @@ _080E2EE4: .align 2, 0 thumb_func_end sub_080E2E78 - thumb_func_start sub_080E2EEC -sub_080E2EEC: @ 0x080E2EEC + thumb_func_start Task_80E39BC +Task_80E39BC: @ 0x080E2EEC push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -466710,7 +466710,7 @@ _080E2F9E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080E2EEC + thumb_func_end Task_80E39BC thumb_func_start sub_080E2FA4 sub_080E2FA4: @ 0x080E2FA4 @@ -466720,7 +466720,7 @@ sub_080E2FA4: @ 0x080E2FA4 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #4 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 movs r1, #0x87 @@ -466730,7 +466730,7 @@ sub_080E2FA4: @ 0x080E2FA4 add r6, sp, #8 strh r0, [r6] movs r0, #6 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 adds r0, r0, r5 @@ -466738,14 +466738,14 @@ sub_080E2FA4: @ 0x080E2FA4 adds r1, #0xa strh r0, [r1] movs r0, #7 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 adds r0, r0, r5 add r1, sp, #0xc strh r0, [r1] movs r0, #7 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 ldr r1, _080E3014 @@ -466915,7 +466915,7 @@ _080E3104: lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #5 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r2, _080E3140 @@ -466984,7 +466984,7 @@ sub_080E3190: @ 0x080E3190 mov r0, sp movs r2, #8 bl memcpy - bl sub_080E3F20 + bl GetTextCaretPosition lsls r0, r0, #0x18 ldrh r1, [r4, #0x2e] lsls r1, r1, #0x18 @@ -467028,24 +467028,24 @@ _080E31E4: thumb_func_start sub_080E31EC sub_080E31EC: @ 0x080E31EC push {lr} - bl sub_080E3208 - bl sub_080E344C - bl sub_080E36D8 + bl CursorInit + bl CreatePageSwitcherSprites + bl CreateBackOkSprites bl sub_080E3750 - bl sub_080E3820 + bl CreateInputTargetIcon pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080E31EC - thumb_func_start sub_080E3208 -sub_080E3208: @ 0x080E3208 + thumb_func_start CursorInit +CursorInit: @ 0x080E3208 push {r4, r5, r6, lr} ldr r0, _080E328C movs r1, #0x1b movs r2, #0x57 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r5, _080E3290 ldr r1, [r5] ldr r4, _080E3294 @@ -467107,7 +467107,7 @@ _080E328C: .4byte gUnknown_8565E50 _080E3290: .4byte gUnknown_2039C34 _080E3294: .4byte 0x00001E23 _080E3298: .4byte gUnknown_20205AC - thumb_func_end sub_080E3208 + thumb_func_end CursorInit thumb_func_start sub_080E329C sub_080E329C: @ 0x080E329C @@ -467339,8 +467339,8 @@ _080E3442: .align 2, 0 thumb_func_end sub_080E3414 - thumb_func_start sub_080E344C -sub_080E344C: @ 0x080E344C + thumb_func_start CreatePageSwitcherSprites +CreatePageSwitcherSprites: @ 0x080E344C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -467348,7 +467348,7 @@ sub_080E344C: @ 0x080E344C movs r1, #0xcc movs r2, #0x58 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080E34F4 @@ -467364,7 +467364,7 @@ sub_080E344C: @ 0x080E344C add r5, r8 ldr r1, _080E3500 adds r0, r5, #0 - bl sub_0800858C + bl SetSubspriteTables adds r1, r5, #0 adds r1, #0x3e ldrb r0, [r1] @@ -467375,7 +467375,7 @@ sub_080E344C: @ 0x080E344C movs r1, #0xcc movs r2, #0x54 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x3a] @@ -467385,7 +467385,7 @@ sub_080E344C: @ 0x080E344C add r4, r8 ldr r1, _080E3508 adds r0, r4, #0 - bl sub_0800858C + bl SetSubspriteTables adds r4, #0x3e ldrb r0, [r4] orrs r0, r6 @@ -467394,7 +467394,7 @@ sub_080E344C: @ 0x080E344C movs r1, #0xcc movs r2, #0x53 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -467426,7 +467426,7 @@ _080E3500: .4byte gUnknown_8565D68 _080E3504: .4byte gUnknown_8565E08 _080E3508: .4byte gUnknown_8565D70 _080E350C: .4byte gUnknown_8565DF0 - thumb_func_end sub_080E344C + thumb_func_end CreatePageSwitcherSprites thumb_func_start sub_080E3510 sub_080E3510: @ 0x080E3510 @@ -467634,7 +467634,7 @@ sub_080E3678: @ 0x080E3678 lsls r4, r5, #1 adds r0, r4, r0 ldrh r0, [r0] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #4 mov r1, r8 ldrb r2, [r1, #5] @@ -467669,8 +467669,8 @@ _080E36D0: .4byte gUnknown_8565A84 _080E36D4: .4byte gUnknown_8565A8A thumb_func_end sub_080E3678 - thumb_func_start sub_080E36D8 -sub_080E36D8: @ 0x080E36D8 + thumb_func_start CreateBackOkSprites +CreateBackOkSprites: @ 0x080E36D8 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -467678,7 +467678,7 @@ sub_080E36D8: @ 0x080E36D8 movs r1, #0xcc movs r2, #0x74 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -467690,7 +467690,7 @@ sub_080E36D8: @ 0x080E36D8 mov r8, r0 adds r0, r4, #0 mov r1, r8 - bl sub_0800858C + bl SetSubspriteTables adds r4, #0x3e ldrb r0, [r4] movs r5, #4 @@ -467700,7 +467700,7 @@ sub_080E36D8: @ 0x080E36D8 movs r1, #0xcc movs r2, #0x8c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -467709,7 +467709,7 @@ sub_080E36D8: @ 0x080E36D8 adds r4, r4, r6 adds r0, r4, #0 mov r1, r8 - bl sub_0800858C + bl SetSubspriteTables adds r4, #0x3e ldrb r0, [r4] orrs r0, r5 @@ -467724,7 +467724,7 @@ _080E3740: .4byte gUnknown_8565E20 _080E3744: .4byte gUnknown_20205AC _080E3748: .4byte gUnknown_8565D88 _080E374C: .4byte gUnknown_8565E38 - thumb_func_end sub_080E36D8 + thumb_func_end CreateBackOkSprites thumb_func_start sub_080E3750 sub_080E3750: @ 0x080E3750 @@ -467742,7 +467742,7 @@ sub_080E3750: @ 0x080E3750 asrs r1, r1, #0x10 movs r2, #0x38 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r3, _080E3814 @@ -467784,7 +467784,7 @@ _080E37AE: ldr r0, _080E381C movs r2, #0x3c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -467828,8 +467828,8 @@ _080E3818: .4byte 0x00001E28 _080E381C: .4byte gUnknown_8565E80 thumb_func_end sub_080E3750 - thumb_func_start sub_080E3820 -sub_080E3820: @ 0x080E3820 + thumb_func_start CreateInputTargetIcon +CreateInputTargetIcon: @ 0x080E3820 push {lr} ldr r1, _080E3840 ldr r0, _080E3844 @@ -467843,7 +467843,7 @@ sub_080E3820: @ 0x080E3820 ldr r0, [r0] bl _call_via_r0 pop {r0} - thumb_func_end sub_080E3820 + thumb_func_end CreateInputTargetIcon thumb_func_start sub_080E383C sub_080E383C: @ 0x080E383C @@ -467860,8 +467860,8 @@ sub_080E384C: @ 0x080E384C .align 2, 0 thumb_func_end sub_080E384C - thumb_func_start sub_080E3850 -sub_080E3850: @ 0x080E3850 + thumb_func_start NamingScreen_CreatePlayerIcon +NamingScreen_CreatePlayerIcon: @ 0x080E3850 push {lr} sub sp, #4 ldr r0, _080E389C @@ -467878,7 +467878,7 @@ sub_080E3850: @ 0x080E3850 str r2, [sp] movs r2, #0x38 movs r3, #0x25 - bl sub_0808D6D8 + bl AddPseudoEventObject adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -467901,16 +467901,16 @@ _080E389C: .4byte gUnknown_2039C34 _080E38A0: .4byte 0x00001E34 _080E38A4: .4byte sub_08007140 _080E38A8: .4byte gUnknown_20205AC - thumb_func_end sub_080E3850 + thumb_func_end NamingScreen_CreatePlayerIcon - thumb_func_start sub_080E38AC -sub_080E38AC: @ 0x080E38AC + thumb_func_start NamingScreen_CreatePCIcon +NamingScreen_CreatePCIcon: @ 0x080E38AC push {r4, lr} ldr r0, _080E38E0 movs r1, #0x38 movs r2, #0x29 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -467920,7 +467920,7 @@ sub_080E38AC: @ 0x080E38AC adds r4, r4, r0 ldr r1, _080E38E8 adds r0, r4, #0 - bl sub_0800858C + bl SetSubspriteTables ldrb r0, [r4, #5] movs r1, #0xc orrs r0, r1 @@ -467932,13 +467932,13 @@ sub_080E38AC: @ 0x080E38AC _080E38E0: .4byte gUnknown_8565E98 _080E38E4: .4byte gUnknown_20205AC _080E38E8: .4byte gUnknown_8565D90 - thumb_func_end sub_080E38AC + thumb_func_end NamingScreen_CreatePCIcon - thumb_func_start sub_080E38EC -sub_080E38EC: @ 0x080E38EC + thumb_func_start NamingScreen_CreateMonIcon +NamingScreen_CreateMonIcon: @ 0x080E38EC push {lr} sub sp, #0xc - bl sub_080D27A4 + bl LoadMonIconPalettes ldr r0, _080E3934 ldr r3, [r0] ldr r1, _080E3938 @@ -467955,7 +467955,7 @@ sub_080E38EC: @ 0x080E38EC str r2, [sp, #8] movs r2, #0x38 movs r3, #0x28 - bl sub_080D2564 + bl CreateMonIcon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080E3944 @@ -467976,10 +467976,10 @@ _080E3938: .4byte 0x00001E34 _080E393C: .4byte sub_08007140 _080E3940: .4byte 0x00001E38 _080E3944: .4byte gUnknown_20205AC - thumb_func_end sub_080E38EC + thumb_func_end NamingScreen_CreateMonIcon - thumb_func_start sub_080E3948 -sub_080E3948: @ 0x080E3948 + thumb_func_start NamingScreen_CreateWandaDadIcon +NamingScreen_CreateWandaDadIcon: @ 0x080E3948 push {lr} sub sp, #4 ldr r1, _080E3980 @@ -467988,7 +467988,7 @@ sub_080E3948: @ 0x080E3948 movs r0, #0x13 movs r2, #0x38 movs r3, #0x25 - bl sub_0808D6D8 + bl AddPseudoEventObject adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -468009,12 +468009,12 @@ sub_080E3948: @ 0x080E3948 .align 2, 0 _080E3980: .4byte sub_08007140 _080E3984: .4byte gUnknown_20205AC - thumb_func_end sub_080E3948 + thumb_func_end NamingScreen_CreateWandaDadIcon - thumb_func_start sub_080E3988 -sub_080E3988: @ 0x080E3988 + thumb_func_start HandleKeyboardEvent +HandleKeyboardEvent: @ 0x080E3988 push {r4, r5, lr} - bl sub_080E3AE4 + bl GetInputEvent lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 @@ -468028,7 +468028,7 @@ sub_080E3988: @ 0x080E3988 _080E39A6: cmp r4, #6 bne _080E39B0 - bl sub_080E3FB8 + bl DeleteTextCharacter b _080E39DC _080E39B0: cmp r4, #7 @@ -468058,10 +468058,10 @@ _080E39DE: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080E3988 + thumb_func_end HandleKeyboardEvent - thumb_func_start sub_080E39E4 -sub_080E39E4: @ 0x080E39E4 + thumb_func_start KeyboardKeyHandler_Character +KeyboardKeyHandler_Character: @ 0x080E39E4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -468080,7 +468080,7 @@ sub_080E39E4: @ 0x080E39E4 cmp r4, #0 beq _080E3A1E movs r0, #2 - bl sub_080E3B08 + bl SetInputState ldr r0, _080E3A28 ldr r0, [r0] ldr r1, _080E3A2C @@ -468095,10 +468095,10 @@ _080E3A1E: .align 2, 0 _080E3A28: .4byte gUnknown_2039C34 _080E3A2C: .4byte 0x00001E10 - thumb_func_end sub_080E39E4 + thumb_func_end KeyboardKeyHandler_Character - thumb_func_start sub_080E3A30 -sub_080E3A30: @ 0x080E3A30 + thumb_func_start KeyboardKeyHandler_Page +KeyboardKeyHandler_Page: @ 0x080E3A30 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -468119,10 +468119,10 @@ _080E3A52: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080E3A30 + thumb_func_end KeyboardKeyHandler_Page - thumb_func_start sub_080E3A58 -sub_080E3A58: @ 0x080E3A58 + thumb_func_start KeyboardKeyHandler_Backspace +KeyboardKeyHandler_Backspace: @ 0x080E3A58 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -468133,17 +468133,17 @@ sub_080E3A58: @ 0x080E3A58 bl sub_080E2E78 cmp r4, #5 bne _080E3A72 - bl sub_080E3FB8 + bl DeleteTextCharacter _080E3A72: movs r0, #0 pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E3A58 + thumb_func_end KeyboardKeyHandler_Backspace - thumb_func_start sub_080E3A7C -sub_080E3A7C: @ 0x080E3A7C + thumb_func_start KeyboardKeyHandler_OK +KeyboardKeyHandler_OK: @ 0x080E3A7C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -468173,7 +468173,7 @@ _080E3AAA: .align 2, 0 _080E3AB0: .4byte gUnknown_2039C34 _080E3AB4: .4byte 0x00001E10 - thumb_func_end sub_080E3A7C + thumb_func_end KeyboardKeyHandler_OK thumb_func_start sub_080E3AB8 sub_080E3AB8: @ 0x080E3AB8 @@ -468195,18 +468195,18 @@ sub_080E3AD0: @ 0x080E3AD0 push {lr} ldr r0, _080E3AE0 movs r1, #1 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080E3AE0: .4byte sub_080E3B34 thumb_func_end sub_080E3AD0 - thumb_func_start sub_080E3AE4 -sub_080E3AE4: @ 0x080E3AE4 + thumb_func_start GetInputEvent +GetInputEvent: @ 0x080E3AE4 push {lr} ldr r0, _080E3B00 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080E3B04 @@ -468220,16 +468220,16 @@ sub_080E3AE4: @ 0x080E3AE4 .align 2, 0 _080E3B00: .4byte sub_080E3B34 _080E3B04: .4byte gUnknown_3005B60 - thumb_func_end sub_080E3AE4 + thumb_func_end GetInputEvent - thumb_func_start sub_080E3B08 -sub_080E3B08: @ 0x080E3B08 + thumb_func_start SetInputState +SetInputState: @ 0x080E3B08 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _080E3B2C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080E3B30 @@ -468244,7 +468244,7 @@ sub_080E3B08: @ 0x080E3B08 .align 2, 0 _080E3B2C: .4byte sub_080E3B34 _080E3B30: .4byte gUnknown_3005B60 - thumb_func_end sub_080E3B08 + thumb_func_end SetInputState thumb_func_start sub_080E3B34 sub_080E3B34: @ 0x080E3B34 @@ -468279,8 +468279,8 @@ sub_080E3B64: @ 0x080E3B64 .align 2, 0 thumb_func_end sub_080E3B64 - thumb_func_start sub_080E3B6C -sub_080E3B6C: @ 0x080E3B6C + thumb_func_start InputState_Enabled +InputState_Enabled: @ 0x080E3B6C push {lr} adds r1, r0, #0 movs r0, #0 @@ -468335,7 +468335,7 @@ _080E3BC6: _080E3BCC: pop {r0} bx r0 - thumb_func_end sub_080E3B6C + thumb_func_end InputState_Enabled thumb_func_start sub_080E3BD0 sub_080E3BD0: @ 0x080E3BD0 @@ -468553,7 +468553,7 @@ sub_080E3D50: @ 0x080E3D50 adds r0, r0, r4 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, [r5] adds r0, r1, r4 ldrb r0, [r0] @@ -468572,7 +468572,7 @@ sub_080E3D50: @ 0x080E3D50 ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap add sp, #0xc pop {r4, r5} pop {r0} @@ -468612,7 +468612,7 @@ sub_080E3DA4: @ 0x080E3DA4 adds r0, r0, r4 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] @@ -468628,7 +468628,7 @@ sub_080E3DA4: @ 0x080E3DA4 ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap add sp, #0x2c pop {r4, r5} pop {r0} @@ -468736,7 +468736,7 @@ _080E3EA6: movs r1, #1 movs r2, #0x5b movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _080E3ECA: add sp, #0x10 pop {r4, r5} @@ -468780,8 +468780,8 @@ sub_080E3EEC: @ 0x080E3EEC _080E3F1C: .4byte gUnknown_8565EB0 thumb_func_end sub_080E3EEC - thumb_func_start sub_080E3F20 -sub_080E3F20: @ 0x080E3F20 + thumb_func_start GetTextCaretPosition +GetTextCaretPosition: @ 0x080E3F20 push {r4, r5, lr} movs r2, #0 ldr r0, _080E3F48 @@ -468827,10 +468827,10 @@ _080E3F6A: bx r1 .align 2, 0 _080E3F70: .4byte 0x00001E28 - thumb_func_end sub_080E3F20 + thumb_func_end GetTextCaretPosition - thumb_func_start sub_080E3F74 -sub_080E3F74: @ 0x080E3F74 + thumb_func_start GetPreviousTextCaretPosition +GetPreviousTextCaretPosition: @ 0x080E3F74 push {lr} ldr r0, _080E3FA0 ldr r2, [r0] @@ -468867,12 +468867,12 @@ _080E3FB2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E3F74 + thumb_func_end GetPreviousTextCaretPosition - thumb_func_start sub_080E3FB8 -sub_080E3FB8: @ 0x080E3FB8 + thumb_func_start DeleteTextCharacter +DeleteTextCharacter: @ 0x080E3FB8 push {r4, r5, r6, lr} - bl sub_080E3F74 + bl GetPreviousTextCaretPosition adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -468887,7 +468887,7 @@ sub_080E3FB8: @ 0x080E3FB8 bl sub_080E4510 bl sub_080E3E4C movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, [r6] adds r0, r0, r5 adds r0, r0, r4 @@ -468913,7 +468913,7 @@ _080E4006: bx r0 .align 2, 0 _080E4014: .4byte gUnknown_2039C34 - thumb_func_end sub_080E3FB8 + thumb_func_end DeleteTextCharacter thumb_func_start sub_080E4018 sub_080E4018: @ 0x080E4018 @@ -468948,17 +468948,17 @@ _080E4050: b _080E405C _080E4056: adds r0, r1, #0 - bl sub_080E4188 + bl AddTextCharacter _080E405C: bl sub_080E4510 bl sub_080E3E4C movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #5 bl sub_080A306C cmp r4, #0 beq _080E409C - bl sub_080E3F74 + bl GetPreviousTextCaretPosition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080E4094 @@ -468989,7 +468989,7 @@ _080E409E: sub_080E40A8: @ 0x080E40A8 push {r4, r5, r6, r7, lr} movs r4, #0 - bl sub_080E3F74 + bl GetPreviousTextCaretPosition lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r6, _080E40E0 @@ -469029,7 +469029,7 @@ _080E40F6: bl sub_080E4510 bl sub_080E3E4C movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #5 bl sub_080A306C pop {r4, r5, r6, r7} @@ -469040,7 +469040,7 @@ _080E40F6: thumb_func_start sub_080E4110 sub_080E4110: @ 0x080E4110 push {r4, r5, lr} - bl sub_080E3F74 + bl GetPreviousTextCaretPosition lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _080E4138 @@ -469073,7 +469073,7 @@ _080E4146: thumb_func_start sub_080E414C sub_080E414C: @ 0x080E414C push {r4, r5, lr} - bl sub_080E3F74 + bl GetPreviousTextCaretPosition lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _080E4174 @@ -469095,7 +469095,7 @@ _080E4174: .4byte gUnknown_2039C34 _080E4178: adds r0, r4, #0 adds r1, r5, #0 - bl sub_080E4318 + bl GetMultiplayerId_ movs r0, #1 _080E4182: pop {r4, r5} @@ -469103,13 +469103,13 @@ _080E4182: bx r1 thumb_func_end sub_080E414C - thumb_func_start sub_080E4188 -sub_080E4188: @ 0x080E4188 + thumb_func_start AddTextCharacter +AddTextCharacter: @ 0x080E4188 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_080E3F20 + bl GetTextCaretPosition lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080E41AC @@ -469124,7 +469124,7 @@ sub_080E4188: @ 0x080E4188 bx r0 .align 2, 0 _080E41AC: .4byte gUnknown_2039C34 - thumb_func_end sub_080E4188 + thumb_func_end AddTextCharacter thumb_func_start sub_080E41B0 sub_080E41B0: @ 0x080E41B0 @@ -469335,8 +469335,8 @@ _080E4302: _080E4314: .4byte gUnknown_2039C34 thumb_func_end sub_080E4248 - thumb_func_start sub_080E4318 -sub_080E4318: @ 0x080E4318 + thumb_func_start GetMultiplayerId_ +GetMultiplayerId_: @ 0x080E4318 push {lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -469391,7 +469391,7 @@ _080E4364: bx r0 .align 2, 0 _080E4378: .4byte gUnknown_2039C34 - thumb_func_end sub_080E4318 + thumb_func_end GetMultiplayerId_ thumb_func_start sub_080E437C sub_080E437C: @ 0x080E437C @@ -469453,8 +469453,8 @@ _080E43E2: _080E43E8: .4byte 0x00001E28 thumb_func_end sub_080E437C - thumb_func_start sub_080E43EC -sub_080E43EC: @ 0x080E43EC + thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns +choose_name_or_words_screen_load_bg_tile_patterns: @ 0x080E43EC push {r4, r5, r6, lr} ldr r0, _080E443C ldr r6, _080E4440 @@ -469495,7 +469495,7 @@ _080E4440: .4byte gUnknown_2039C34 _080E4444: .4byte 0x00001810 _080E4448: .4byte gUnknown_8565EE0 _080E444C: .4byte gUnknown_8565F48 - thumb_func_end sub_080E43EC + thumb_func_end choose_name_or_words_screen_load_bg_tile_patterns thumb_func_start sub_080E4450 sub_080E4450: @ 0x080E4450 @@ -469513,16 +469513,16 @@ sub_080E4460: @ 0x080E4460 ldr r0, _080E4488 movs r1, #0 movs r2, #0xc0 - bl sub_080A1200 + bl LoadPalette ldr r0, _080E448C movs r1, #0xa0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #2 - bl sub_080985A0 + bl stdpal_get movs r1, #0xb0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 @@ -469537,7 +469537,7 @@ sub_080E4490: @ 0x080E4490 lsrs r0, r0, #0x18 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer pop {r0} bx r0 .align 2, 0 @@ -469618,7 +469618,7 @@ sub_080E4510: @ 0x080E4510 adds r1, r1, r0 ldrb r0, [r1] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r4, #0 cmp r4, r6 bhs _080E45A0 @@ -469677,7 +469677,7 @@ _080E45A0: ldr r1, _080E45C8 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -469707,7 +469707,7 @@ sub_080E45D0: @ 0x080E45D0 adds r0, r5, r0 ldrb r1, [r0] adds r0, r6, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r4, #0 ldr r1, _080E4640 lsls r0, r5, #2 @@ -469732,14 +469732,14 @@ _080E45FA: adds r0, r6, #0 movs r1, #1 movs r2, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #3 bls _080E45FA adds r0, r6, #0 - bl sub_0800365C + bl PutWindowTilemap add sp, #0xc pop {r3} mov r8, r3 @@ -469811,7 +469811,7 @@ _080E4682: adds r0, r6, #0 bl sub_080E44A4 adds r0, r7, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -469836,7 +469836,7 @@ sub_080E46E4: @ 0x080E46E4 adds r0, r0, r4 ldrb r0, [r0] movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] @@ -469849,16 +469849,16 @@ sub_080E46E4: @ 0x080E46E4 movs r1, #0 movs r2, #0x18 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r5] adds r0, r0, r4 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r4, r5} pop {r0} @@ -469873,43 +469873,43 @@ _080E4748: .4byte gUnknown_85658A0 thumb_func_start sub_080E474C sub_080E474C: @ 0x080E474C push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080E474C - thumb_func_start sub_080E4764 -sub_080E4764: @ 0x080E4764 + thumb_func_start NamingScreen_TurnOffScreen +NamingScreen_TurnOffScreen: @ 0x080E4764 push {lr} movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E4764 + thumb_func_end NamingScreen_TurnOffScreen - thumb_func_start sub_080E4778 -sub_080E4778: @ 0x080E4778 + thumb_func_start NamingScreen_InitDisplayMode +NamingScreen_InitDisplayMode: @ 0x080E4778 push {lr} ldr r0, _080E4784 - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_080E4784: .4byte sub_080E4788 - thumb_func_end sub_080E4778 +_080E4784: .4byte VBlankCB_NamingScreen + thumb_func_end NamingScreen_InitDisplayMode - thumb_func_start sub_080E4788 -sub_080E4788: @ 0x080E4788 + thumb_func_start VBlankCB_NamingScreen +VBlankCB_NamingScreen: @ 0x080E4788 push {r4, r5, lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer ldr r5, _080E47F8 ldr r0, [r5] @@ -469936,7 +469936,7 @@ sub_080E4788: @ 0x080E4788 adds r0, r0, r1 ldrh r1, [r0] movs r0, #0xa - bl sub_08001200 + bl SetGpuRegBits movs r0, #0xc bl GetGpuReg ands r4, r0 @@ -469948,7 +469948,7 @@ sub_080E4788: @ 0x080E4788 adds r0, r0, r1 ldrh r1, [r0] movs r0, #0xc - bl sub_08001200 + bl SetGpuRegBits pop {r4, r5} pop {r0} bx r0 @@ -469959,19 +469959,19 @@ _080E4800: .4byte 0x00001E1A _080E4804: .4byte 0x0000FFFC _080E4808: .4byte 0x00001E1C _080E480C: .4byte 0x00001E1E - thumb_func_end sub_080E4788 + thumb_func_end VBlankCB_NamingScreen thumb_func_start sub_080E4810 sub_080E4810: @ 0x080E4810 push {lr} movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg pop {r0} bx r0 .align 2, 0 @@ -470023,13 +470023,13 @@ sub_080E4868: @ 0x080E4868 str r0, [sp, #4] movs r0, #0 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r0} bx r0 .align 2, 0 _080E4888: .4byte gUnknown_3005AF0 -_080E488C: .4byte sub_08085AFC +_080E488C: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_080E4868 thumb_func_start sub_080E4890 @@ -470045,13 +470045,13 @@ sub_080E4890: @ 0x080E4890 str r0, [sp, #4] movs r0, #1 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r0} bx r0 .align 2, 0 _080E48B0: .4byte gUnknown_3005AF0 -_080E48B4: .4byte sub_08085AFC +_080E48B4: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_080E4890 thumb_func_start sub_080E48B8 @@ -470067,13 +470067,13 @@ sub_080E48B8: @ 0x080E48B8 str r0, [sp, #4] movs r0, #2 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r0} bx r0 .align 2, 0 _080E48D8: .4byte gUnknown_3005AF0 -_080E48DC: .4byte sub_08085AFC +_080E48DC: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_080E48B8 thumb_func_start sub_080E48E0 @@ -470089,13 +470089,13 @@ sub_080E48E0: @ 0x080E48E0 str r0, [sp, #4] movs r0, #3 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r0} bx r0 .align 2, 0 _080E4900: .4byte gUnknown_3005AF0 -_080E4904: .4byte sub_08085AFC +_080E4904: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_080E48E0 thumb_func_start sub_080E4908 @@ -470230,8 +470230,8 @@ _080E49E0: .4byte gUnknown_3005AEC _080E49E4: .4byte gUnknown_2037282 thumb_func_end SubtractMoneyFromVar0x8005 - thumb_func_start sub_080E49E8 -sub_080E49E8: @ 0x080E49E8 + thumb_func_start PrintMoneyAmountInMoneyBox +PrintMoneyAmountInMoneyBox: @ 0x080E49E8 push {lr} sub sp, #4 adds r3, r1, #0 @@ -470242,15 +470242,15 @@ sub_080E49E8: @ 0x080E49E8 str r2, [sp] movs r1, #0x28 movs r2, #2 - bl sub_080E4A08 + bl CreateBicycleAnimationTask add sp, #4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E49E8 + thumb_func_end PrintMoneyAmountInMoneyBox - thumb_func_start sub_080E4A08 -sub_080E4A08: @ 0x080E4A08 + thumb_func_start CreateBicycleAnimationTask +CreateBicycleAnimationTask: @ 0x080E4A08 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -470278,7 +470278,7 @@ sub_080E4A08: @ 0x080E4A08 ldr r0, _080E4A6C mov sb, r0 ldr r1, _080E4A70 - bl sub_08008BCC + bl StringExpandPlaceholders str r5, [sp] str r4, [sp, #4] movs r0, #0 @@ -470299,10 +470299,10 @@ sub_080E4A08: @ 0x080E4A08 _080E4A68: .4byte gUnknown_2021C40 _080E4A6C: .4byte gUnknown_2021C7C _080E4A70: .4byte gUnknown_85C9A9D - thumb_func_end sub_080E4A08 + thumb_func_end CreateBicycleAnimationTask - thumb_func_start sub_080E4A74 -sub_080E4A74: @ 0x080E4A74 + thumb_func_start PrintMoneyAmountInMoneyBoxWithBorder +PrintMoneyAmountInMoneyBoxWithBorder: @ 0x080E4A74 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -470320,35 +470320,35 @@ sub_080E4A74: @ 0x080E4A74 movs r1, #0 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette adds r0, r6, #0 mov r1, r8 movs r2, #0 - bl sub_080E49E8 + bl PrintMoneyAmountInMoneyBox pop {r3} mov r8, r3 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E4A74 + thumb_func_end PrintMoneyAmountInMoneyBoxWithBorder - thumb_func_start sub_080E4AB0 -sub_080E4AB0: @ 0x080E4AB0 + thumb_func_start ChangeAmountInMoneyBox +ChangeAmountInMoneyBox: @ 0x080E4AB0 push {lr} adds r1, r0, #0 ldr r0, _080E4AC4 ldrb r0, [r0] movs r2, #0 - bl sub_080E49E8 + bl PrintMoneyAmountInMoneyBox pop {r0} bx r0 .align 2, 0 _080E4AC4: .4byte gUnknown_2039C38 - thumb_func_end sub_080E4AB0 + thumb_func_end ChangeAmountInMoneyBox - thumb_func_start sub_080E4AC8 -sub_080E4AC8: @ 0x080E4AC8 + thumb_func_start DrawMoneyBox +DrawMoneyBox: @ 0x080E4AC8 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -470380,22 +470380,22 @@ sub_080E4AC8: @ 0x080E4AC8 bl SetWindowTemplateFields ldr r4, _080E4B5C add r0, sp, #0x10 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] movs r1, #0x85 lsls r1, r1, #2 movs r2, #0xe mov r3, r8 - bl sub_080E4A74 + bl PrintMoneyAmountInMoneyBoxWithBorder lsls r6, r6, #0x13 movs r0, #0x98 lsls r0, r0, #0xd @@ -470408,7 +470408,7 @@ sub_080E4AC8: @ 0x080E4AC8 lsrs r5, r5, #0x10 adds r0, r6, #0 adds r1, r5, #0 - bl sub_080E4B88 + bl AddMoneyLabelObject add sp, #0x18 pop {r3} mov r8, r3 @@ -470417,30 +470417,30 @@ sub_080E4AC8: @ 0x080E4AC8 bx r0 .align 2, 0 _080E4B5C: .4byte gUnknown_2039C38 - thumb_func_end sub_080E4AC8 + thumb_func_end DrawMoneyBox - thumb_func_start sub_080E4B60 -sub_080E4B60: @ 0x080E4B60 + thumb_func_start HideMoneyBox +HideMoneyBox: @ 0x080E4B60 push {r4, lr} - bl sub_080E4BD0 + bl RemoveMoneyLabelObject ldr r4, _080E4B84 ldrb r0, [r4] movs r1, #0 bl sub_08198134 ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 _080E4B84: .4byte gUnknown_2039C38 - thumb_func_end sub_080E4B60 + thumb_func_end HideMoneyBox - thumb_func_start sub_080E4B88 -sub_080E4B88: @ 0x080E4B88 + thumb_func_start AddMoneyLabelObject +AddMoneyLabelObject: @ 0x080E4B88 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -470449,9 +470449,9 @@ sub_080E4B88: @ 0x080E4B88 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 ldr r0, _080E4BC0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080E4BC4 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _080E4BC8 lsls r4, r4, #0x10 asrs r4, r4, #0x10 @@ -470460,7 +470460,7 @@ sub_080E4B88: @ 0x080E4B88 adds r1, r4, #0 adds r2, r5, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, _080E4BCC strb r0, [r1] pop {r4, r5} @@ -470471,10 +470471,10 @@ _080E4BC0: .4byte gUnknown_8565FBC _080E4BC4: .4byte gUnknown_8565FC4 _080E4BC8: .4byte gUnknown_8565FA4 _080E4BCC: .4byte gUnknown_2039C39 - thumb_func_end sub_080E4B88 + thumb_func_end AddMoneyLabelObject - thumb_func_start sub_080E4BD0 -sub_080E4BD0: @ 0x080E4BD0 + thumb_func_start RemoveMoneyLabelObject +RemoveMoneyLabelObject: @ 0x080E4BD0 push {lr} ldr r0, _080E4BE8 ldrb r1, [r0] @@ -470489,10 +470489,10 @@ sub_080E4BD0: @ 0x080E4BD0 .align 2, 0 _080E4BE8: .4byte gUnknown_2039C39 _080E4BEC: .4byte gUnknown_20205AC - thumb_func_end sub_080E4BD0 + thumb_func_end RemoveMoneyLabelObject - thumb_func_start sub_080E4BF0 -sub_080E4BF0: @ 0x080E4BF0 + thumb_func_start AreMovesContestCombo +AreMovesContestCombo: @ 0x080E4BF0 push {r4, lr} sub sp, #4 lsls r0, r0, #0x10 @@ -470546,7 +470546,7 @@ _080E4C4E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E4BF0 + thumb_func_end AreMovesContestCombo thumb_func_start sub_080E4C58 sub_080E4C58: @ 0x080E4C58 @@ -470554,8 +470554,8 @@ sub_080E4C58: @ 0x080E4C58 .align 2, 0 thumb_func_end sub_080E4C58 - thumb_func_start sub_080E4C5C -sub_080E4C5C: @ 0x080E4C5C + thumb_func_start ContestEffect_UserMoreEasilyStartled +ContestEffect_UserMoreEasilyStartled: @ 0x080E4C5C push {lr} ldr r3, _080E4C88 ldr r1, [r3] @@ -470579,10 +470579,10 @@ sub_080E4C5C: @ 0x080E4C5C bx r0 .align 2, 0 _080E4C88: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4C5C + thumb_func_end ContestEffect_UserMoreEasilyStartled - thumb_func_start sub_080E4C8C -sub_080E4C8C: @ 0x080E4C8C + thumb_func_start ContestEffect_GreatAppealButNoMoreMoves +ContestEffect_GreatAppealButNoMoreMoves: @ 0x080E4C8C push {lr} ldr r3, _080E4CB8 ldr r1, [r3] @@ -470606,7 +470606,7 @@ sub_080E4C8C: @ 0x080E4C8C bx r0 .align 2, 0 _080E4CB8: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4C8C + thumb_func_end ContestEffect_GreatAppealButNoMoreMoves thumb_func_start ContestEffect_RepetitionNotBoring ContestEffect_RepetitionNotBoring: @ 0x080E4CBC @@ -470654,8 +470654,8 @@ ContestEffect_RepetitionNotBoring: @ 0x080E4CBC _080E4D0C: .4byte gUnknown_2039BD4 thumb_func_end ContestEffect_RepetitionNotBoring - thumb_func_start sub_080E4D10 -sub_080E4D10: @ 0x080E4D10 + thumb_func_start ContestEffect_AvoidStartleOnce +ContestEffect_AvoidStartleOnce: @ 0x080E4D10 push {lr} ldr r3, _080E4D38 ldr r1, [r3] @@ -470677,10 +470677,10 @@ sub_080E4D10: @ 0x080E4D10 bx r0 .align 2, 0 _080E4D38: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4D10 + thumb_func_end ContestEffect_AvoidStartleOnce - thumb_func_start sub_080E4D3C -sub_080E4D3C: @ 0x080E4D3C + thumb_func_start ContestEffect_AvoidStartle +ContestEffect_AvoidStartle: @ 0x080E4D3C push {lr} ldr r3, _080E4D68 ldr r1, [r3] @@ -470704,10 +470704,10 @@ sub_080E4D3C: @ 0x080E4D3C bx r0 .align 2, 0 _080E4D68: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4D3C + thumb_func_end ContestEffect_AvoidStartle - thumb_func_start sub_080E4D6C -sub_080E4D6C: @ 0x080E4D6C + thumb_func_start ContestEffect_AvoidStartleSlightly +ContestEffect_AvoidStartleSlightly: @ 0x080E4D6C push {lr} ldr r3, _080E4D94 ldr r1, [r3] @@ -470729,10 +470729,10 @@ sub_080E4D6C: @ 0x080E4D6C bx r0 .align 2, 0 _080E4D94: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4D6C + thumb_func_end ContestEffect_AvoidStartleSlightly - thumb_func_start sub_080E4D98 -sub_080E4D98: @ 0x080E4D98 + thumb_func_start ContestEffect_UserLessEasilyStartled +ContestEffect_UserLessEasilyStartled: @ 0x080E4D98 push {lr} ldr r3, _080E4DC4 ldr r1, [r3] @@ -470756,10 +470756,10 @@ sub_080E4D98: @ 0x080E4D98 bx r0 .align 2, 0 _080E4DC4: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4D98 + thumb_func_end ContestEffect_UserLessEasilyStartled - thumb_func_start sub_080E4DC8 -sub_080E4DC8: @ 0x080E4DC8 + thumb_func_start ContestEffect_StartleFrontMon +ContestEffect_StartleFrontMon: @ 0x080E4DC8 push {r4, r5, lr} movs r2, #0 ldr r5, _080E4E3C @@ -470797,7 +470797,7 @@ _080E4DFE: ldr r1, [r0, #8] movs r0, #0xff strb r0, [r1, #9] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 lsrs r2, r0, #0x18 _080E4E16: @@ -470821,10 +470821,10 @@ _080E4E28: bx r0 .align 2, 0 _080E4E3C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4DC8 + thumb_func_end ContestEffect_StartleFrontMon - thumb_func_start sub_080E4E40 -sub_080E4E40: @ 0x080E4E40 + thumb_func_start ContestEffect_StartlePrevMons +ContestEffect_StartlePrevMons: @ 0x080E4E40 push {r4, r5, r6, lr} movs r1, #0 ldr r2, _080E4EB8 @@ -470863,7 +470863,7 @@ _080E4E74: adds r0, r0, r4 movs r1, #0xff strb r1, [r0] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 lsrs r1, r0, #0x18 _080E4E90: @@ -470887,10 +470887,10 @@ _080E4EA2: bx r0 .align 2, 0 _080E4EB8: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4E40 + thumb_func_end ContestEffect_StartlePrevMons - thumb_func_start sub_080E4EBC -sub_080E4EBC: @ 0x080E4EBC + thumb_func_start ContestEffect_StartlePrevMon2 +ContestEffect_StartlePrevMon2: @ 0x080E4EBC push {lr} bl Random lsls r0, r0, #0x10 @@ -470911,15 +470911,15 @@ _080E4EDE: ldr r0, [r0] ldr r0, [r0, #8] strh r1, [r0, #4] - bl sub_080E4DC8 + bl ContestEffect_StartleFrontMon pop {r0} bx r0 .align 2, 0 _080E4EF0: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4EBC + thumb_func_end ContestEffect_StartlePrevMon2 - thumb_func_start sub_080E4EF4 -sub_080E4EF4: @ 0x080E4EF4 + thumb_func_start ContestEffect_StartlePrevMons2 +ContestEffect_StartlePrevMons2: @ 0x080E4EF4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -470976,7 +470976,7 @@ _080E4F5E: ldr r0, [r6] ldr r0, [r0, #8] strh r1, [r0, #4] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 cmp r0, #0 beq _080E4F74 @@ -471010,10 +471010,10 @@ _080E4F9A: bx r0 .align 2, 0 _080E4FA4: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4EF4 + thumb_func_end ContestEffect_StartlePrevMons2 - thumb_func_start sub_080E4FA8 -sub_080E4FA8: @ 0x080E4FA8 + thumb_func_start ContestEffect_ShiftJudgeAttention +ContestEffect_ShiftJudgeAttention: @ 0x080E4FA8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -471054,7 +471054,7 @@ _080E4FD0: lsls r0, r6, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080E61A4 + bl CanUnnerveContestant lsls r0, r0, #0x18 cmp r0, #0 beq _080E502C @@ -471110,10 +471110,10 @@ _080E5056: bx r0 .align 2, 0 _080E5064: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E4FA8 + thumb_func_end ContestEffect_ShiftJudgeAttention - thumb_func_start sub_080E5068 -sub_080E5068: @ 0x080E5068 + thumb_func_start ContestEffect_StartleMonWithJudgesAttention +ContestEffect_StartleMonWithJudgesAttention: @ 0x080E5068 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -471164,7 +471164,7 @@ _080E50B6: ldr r1, [r0, #8] movs r0, #0xff strb r0, [r1, #9] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 cmp r0, #0 beq _080E50DC @@ -471202,10 +471202,10 @@ _080E5104: bx r0 .align 2, 0 _080E5110: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5068 + thumb_func_end ContestEffect_StartleMonWithJudgesAttention - thumb_func_start sub_080E5114 -sub_080E5114: @ 0x080E5114 + thumb_func_start ContestEffect_JamsOthersButMissOneTurn +ContestEffect_JamsOthersButMissOneTurn: @ 0x080E5114 push {r4, lr} ldr r4, _080E5148 ldr r1, [r4] @@ -471220,7 +471220,7 @@ sub_080E5114: @ 0x080E5114 movs r2, #4 orrs r1, r2 strb r1, [r0, #0x11] - bl sub_080E4E40 + bl ContestEffect_StartlePrevMons ldr r0, [r4] ldr r0, [r0, #8] ldrb r0, [r0, #0x11] @@ -471231,10 +471231,10 @@ sub_080E5114: @ 0x080E5114 bx r0 .align 2, 0 _080E5148: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5114 + thumb_func_end ContestEffect_JamsOthersButMissOneTurn - thumb_func_start sub_080E514C -sub_080E514C: @ 0x080E514C + thumb_func_start ContestEffect_StartleMonsSameTypeAppeal +ContestEffect_StartleMonsSameTypeAppeal: @ 0x080E514C push {r4, lr} ldr r4, _080E5184 ldr r1, [r4] @@ -471252,7 +471252,7 @@ sub_080E514C: @ 0x080E514C ldrb r0, [r0, #1] lsls r0, r0, #0x1d lsrs r0, r0, #0x1d - bl sub_080E6110 + bl JamByMoveCategory ldr r0, [r4] ldr r0, [r0, #8] ldrb r0, [r0, #0x11] @@ -471264,13 +471264,13 @@ sub_080E514C: @ 0x080E514C .align 2, 0 _080E5184: .4byte gUnknown_2039BD4 _080E5188: .4byte gUnknown_8565FCC - thumb_func_end sub_080E514C + thumb_func_end ContestEffect_StartleMonsSameTypeAppeal - thumb_func_start sub_080E518C -sub_080E518C: @ 0x080E518C + thumb_func_start ContestEffect_StartleMonsCoolAppeal +ContestEffect_StartleMonsCoolAppeal: @ 0x080E518C push {lr} movs r0, #0 - bl sub_080E6110 + bl JamByMoveCategory ldr r0, _080E51A8 ldr r0, [r0] ldr r0, [r0, #8] @@ -471281,13 +471281,13 @@ sub_080E518C: @ 0x080E518C bx r0 .align 2, 0 _080E51A8: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E518C + thumb_func_end ContestEffect_StartleMonsCoolAppeal - thumb_func_start sub_080E51AC -sub_080E51AC: @ 0x080E51AC + thumb_func_start ContestEffect_StartleMonsBeautyAppeal +ContestEffect_StartleMonsBeautyAppeal: @ 0x080E51AC push {lr} movs r0, #1 - bl sub_080E6110 + bl JamByMoveCategory ldr r0, _080E51C8 ldr r0, [r0] ldr r0, [r0, #8] @@ -471298,13 +471298,13 @@ sub_080E51AC: @ 0x080E51AC bx r0 .align 2, 0 _080E51C8: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E51AC + thumb_func_end ContestEffect_StartleMonsBeautyAppeal thumb_func_start sub_080E51CC sub_080E51CC: @ 0x080E51CC push {lr} movs r0, #2 - bl sub_080E6110 + bl JamByMoveCategory ldr r0, _080E51E8 ldr r0, [r0] ldr r0, [r0, #8] @@ -471317,11 +471317,11 @@ sub_080E51CC: @ 0x080E51CC _080E51E8: .4byte gUnknown_2039BD4 thumb_func_end sub_080E51CC - thumb_func_start sub_080E51EC -sub_080E51EC: @ 0x080E51EC + thumb_func_start ContestEffect_StartleMonsSmartAppeal +ContestEffect_StartleMonsSmartAppeal: @ 0x080E51EC push {lr} movs r0, #3 - bl sub_080E6110 + bl JamByMoveCategory ldr r0, _080E5208 ldr r0, [r0] ldr r0, [r0, #8] @@ -471332,13 +471332,13 @@ sub_080E51EC: @ 0x080E51EC bx r0 .align 2, 0 _080E5208: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E51EC + thumb_func_end ContestEffect_StartleMonsSmartAppeal - thumb_func_start sub_080E520C -sub_080E520C: @ 0x080E520C + thumb_func_start ContestEffect_StartleMonsToughAppeal +ContestEffect_StartleMonsToughAppeal: @ 0x080E520C push {lr} movs r0, #4 - bl sub_080E6110 + bl JamByMoveCategory ldr r0, _080E5228 ldr r0, [r0] ldr r0, [r0, #8] @@ -471349,10 +471349,10 @@ sub_080E520C: @ 0x080E520C bx r0 .align 2, 0 _080E5228: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E520C + thumb_func_end ContestEffect_StartleMonsToughAppeal - thumb_func_start sub_080E522C -sub_080E522C: @ 0x080E522C + thumb_func_start ContestEffect_MakeFollowingMonNervous +ContestEffect_MakeFollowingMonNervous: @ 0x080E522C push {r4, r5, r6, lr} movs r4, #0 ldr r2, _080E5278 @@ -471380,7 +471380,7 @@ _080E5244: lsls r0, r5, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080E61A4 + bl CanUnnerveContestant lsls r0, r0, #0x18 cmp r0, #0 beq _080E527C @@ -471419,10 +471419,10 @@ _080E52A8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E522C + thumb_func_end ContestEffect_MakeFollowingMonNervous - thumb_func_start sub_080E52B0 -sub_080E52B0: @ 0x080E52B0 + thumb_func_start ContestEffect_MakeFollowingMonsNervous +ContestEffect_MakeFollowingMonsNervous: @ 0x080E52B0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -471464,7 +471464,7 @@ _080E52DC: bne _080E5314 lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 bne _080E5314 @@ -471608,7 +471608,7 @@ _080E53F2: cmp r0, r2 bge _080E5442 adds r0, r3, #0 - bl sub_080E61A4 + bl CanUnnerveContestant lsls r0, r0, #0x18 cmp r0, #0 beq _080E544C @@ -471681,10 +471681,10 @@ _080E549C: bx r0 .align 2, 0 _080E54AC: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E52B0 + thumb_func_end ContestEffect_MakeFollowingMonsNervous - thumb_func_start sub_080E54B0 -sub_080E54B0: @ 0x080E54B0 + thumb_func_start ContestEffect_WorsenConditionOfPrevMons +ContestEffect_WorsenConditionOfPrevMons: @ 0x080E54B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -471713,7 +471713,7 @@ _080E54C0: lsls r0, r6, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080E61A4 + bl CanUnnerveContestant lsls r0, r0, #0x18 cmp r0, #0 beq _080E5522 @@ -471768,10 +471768,10 @@ _080E554A: bx r0 .align 2, 0 _080E5554: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E54B0 + thumb_func_end ContestEffect_WorsenConditionOfPrevMons - thumb_func_start sub_080E5558 -sub_080E5558: @ 0x080E5558 + thumb_func_start ContestEffect_BadlyStartlesMonsInGoodCondition +ContestEffect_BadlyStartlesMonsInGoodCondition: @ 0x080E5558 push {r4, r5, r6, r7, lr} movs r7, #0 movs r4, #0 @@ -471809,7 +471809,7 @@ _080E558E: ldr r1, [r0, #8] movs r0, #0xff strb r0, [r1, #9] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 cmp r0, #0 beq _080E55AE @@ -471840,10 +471840,10 @@ _080E55D4: bx r0 .align 2, 0 _080E55DC: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5558 + thumb_func_end ContestEffect_BadlyStartlesMonsInGoodCondition - thumb_func_start sub_080E55E0 -sub_080E55E0: @ 0x080E55E0 + thumb_func_start ContestEffect_BetterIfFirst +ContestEffect_BetterIfFirst: @ 0x080E55E0 push {r4, lr} ldr r1, _080E5628 ldr r0, _080E562C @@ -471885,10 +471885,10 @@ _080E5628: .4byte gUnknown_2039BC6 _080E562C: .4byte gUnknown_2039BD4 _080E5630: .4byte gUnknown_8566AE4 _080E5634: .4byte gUnknown_8565FCC - thumb_func_end sub_080E55E0 + thumb_func_end ContestEffect_BetterIfFirst - thumb_func_start sub_080E5638 -sub_080E5638: @ 0x080E5638 + thumb_func_start ContestEffect_BetterIfLast +ContestEffect_BetterIfLast: @ 0x080E5638 push {r4, lr} ldr r1, _080E5680 ldr r0, _080E5684 @@ -471930,10 +471930,10 @@ _080E5680: .4byte gUnknown_2039BC6 _080E5684: .4byte gUnknown_2039BD4 _080E5688: .4byte gUnknown_8566AE4 _080E568C: .4byte gUnknown_8565FCC - thumb_func_end sub_080E5638 + thumb_func_end ContestEffect_BetterIfLast - thumb_func_start sub_080E5690 -sub_080E5690: @ 0x080E5690 + thumb_func_start ContestEffect_AppealAsGoodAsPrevOnes +ContestEffect_AppealAsGoodAsPrevOnes: @ 0x080E5690 push {r4, r5, r6, r7, lr} movs r1, #0 movs r5, #0 @@ -472008,7 +472008,7 @@ _080E5708: adds r0, r0, r1 movs r7, #2 ldrsh r0, [r0, r7] - bl sub_080E634C + bl RoundTowardsZero ldr r2, [r4] ldr r1, [r2, #8] ldrb r3, [r1, #0x11] @@ -472023,10 +472023,10 @@ _080E5708: bx r0 .align 2, 0 _080E573C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5690 + thumb_func_end ContestEffect_AppealAsGoodAsPrevOnes - thumb_func_start sub_080E5740 -sub_080E5740: @ 0x080E5740 + thumb_func_start ContestEffect_AppealAsGoodAsPrevOne +ContestEffect_AppealAsGoodAsPrevOne: @ 0x080E5740 push {r4, r5, r6, r7, lr} movs r6, #0 ldr r0, _080E579C @@ -472094,10 +472094,10 @@ _080E57BA: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E5740 + thumb_func_end ContestEffect_AppealAsGoodAsPrevOne - thumb_func_start sub_080E57C0 -sub_080E57C0: @ 0x080E57C0 + thumb_func_start ContestEffect_BetterWhenLater +ContestEffect_BetterWhenLater: @ 0x080E57C0 push {r4, r5, lr} ldr r1, _080E57E4 ldr r3, [r1] @@ -472165,10 +472165,10 @@ _080E583C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E57C0 + thumb_func_end ContestEffect_BetterWhenLater - thumb_func_start sub_080E5844 -sub_080E5844: @ 0x080E5844 + thumb_func_start ContestEffect_QualityDependsOnTiming +ContestEffect_QualityDependsOnTiming: @ 0x080E5844 push {r4, lr} bl Random lsls r0, r0, #0x10 @@ -472253,10 +472253,10 @@ _080E58D8: bx r0 .align 2, 0 _080E58F4: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5844 + thumb_func_end ContestEffect_QualityDependsOnTiming - thumb_func_start sub_080E58F8 -sub_080E58F8: @ 0x080E58F8 + thumb_func_start ContestEffect_BetterIfSameType +ContestEffect_BetterIfSameType: @ 0x080E58F8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -472379,10 +472379,10 @@ _080E59D4: .align 2, 0 _080E59E0: .4byte gUnknown_8565FCC _080E59E4: .4byte gUnknown_8566AE4 - thumb_func_end sub_080E58F8 + thumb_func_end ContestEffect_BetterIfSameType - thumb_func_start sub_080E59E8 -sub_080E59E8: @ 0x080E59E8 + thumb_func_start ContestEffect_BetterIfDiffType +ContestEffect_BetterIfDiffType: @ 0x080E59E8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -472468,10 +472468,10 @@ _080E5A88: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E59E8 + thumb_func_end ContestEffect_BetterIfDiffType - thumb_func_start sub_080E5A94 -sub_080E5A94: @ 0x080E5A94 + thumb_func_start ContestEffect_AffectedByPrevAppeal +ContestEffect_AffectedByPrevAppeal: @ 0x080E5A94 push {r4, r5, r6, r7, lr} ldr r0, _080E5AEC ldr r0, [r0] @@ -472535,10 +472535,10 @@ _080E5B0A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E5A94 + thumb_func_end ContestEffect_AffectedByPrevAppeal - thumb_func_start sub_080E5B10 -sub_080E5B10: @ 0x080E5B10 + thumb_func_start ContestEffect_ImproveConditionPreventNervousness +ContestEffect_ImproveConditionPreventNervousness: @ 0x080E5B10 push {r4, lr} ldr r4, _080E5B60 ldr r1, [r4] @@ -472589,10 +472589,10 @@ _080E5B6C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E5B10 + thumb_func_end ContestEffect_ImproveConditionPreventNervousness - thumb_func_start sub_080E5B74 -sub_080E5B74: @ 0x080E5B74 + thumb_func_start ContestEffect_BetterWithGoodCondition +ContestEffect_BetterWithGoodCondition: @ 0x080E5B74 push {lr} ldr r3, _080E5BB4 ldr r1, [r3] @@ -472633,10 +472633,10 @@ _080E5BB8: _080E5BC0: pop {r0} bx r0 - thumb_func_end sub_080E5B74 + thumb_func_end ContestEffect_BetterWithGoodCondition - thumb_func_start sub_080E5BC4 -sub_080E5BC4: @ 0x080E5BC4 + thumb_func_start ContestEffect_NextAppealEarlier +ContestEffect_NextAppealEarlier: @ 0x080E5BC4 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r0, _080E5C4C @@ -472800,10 +472800,10 @@ _080E5CF4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E5BC4 + thumb_func_end ContestEffect_NextAppealEarlier - thumb_func_start sub_080E5CFC -sub_080E5CFC: @ 0x080E5CFC + thumb_func_start ContestEffect_NextAppealLater +ContestEffect_NextAppealLater: @ 0x080E5CFC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -472974,7 +472974,7 @@ _080E5E34: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E5CFC + thumb_func_end ContestEffect_NextAppealLater thumb_func_start sub_080E5E40 sub_080E5E40: @ 0x080E5E40 @@ -472982,8 +472982,8 @@ sub_080E5E40: @ 0x080E5E40 .align 2, 0 thumb_func_end sub_080E5E40 - thumb_func_start sub_080E5E44 -sub_080E5E44: @ 0x080E5E44 + thumb_func_start ContestEffect_ScrambleNextTurnOrder +ContestEffect_ScrambleNextTurnOrder: @ 0x080E5E44 push {r4, r5, r6, r7, lr} sub sp, #8 ldr r0, _080E5EC0 @@ -473124,7 +473124,7 @@ _080E5F48: bx r0 .align 2, 0 _080E5F50: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5E44 + thumb_func_end ContestEffect_ScrambleNextTurnOrder thumb_func_start ContestEffect_ExciteAudienceInAnyContest ContestEffect_ExciteAudienceInAnyContest: @ 0x080E5F54 @@ -473162,8 +473162,8 @@ _080E5F90: .4byte gUnknown_2039BD4 _080E5F94: .4byte gUnknown_2039BCC thumb_func_end ContestEffect_ExciteAudienceInAnyContest - thumb_func_start sub_080E5F98 -sub_080E5F98: @ 0x080E5F98 + thumb_func_start ContestEffect_BadlyStartleMonsWithGoodAppeals +ContestEffect_BadlyStartleMonsWithGoodAppeals: @ 0x080E5F98 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -473195,7 +473195,7 @@ _080E5FA8: ldr r0, [r3, #8] movs r1, #4 ldrsh r0, [r0, r1] - bl sub_080E6390 + bl RoundUp ldr r1, [r5] ldr r1, [r1, #8] strh r0, [r1, #4] @@ -473213,7 +473213,7 @@ _080E5FE8: ldr r1, [r0, #8] movs r0, #0xff strb r0, [r1, #9] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 cmp r0, #0 beq _080E600A @@ -473250,10 +473250,10 @@ _080E6026: bx r0 .align 2, 0 _080E6040: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E5F98 + thumb_func_end ContestEffect_BadlyStartleMonsWithGoodAppeals - thumb_func_start sub_080E6044 -sub_080E6044: @ 0x080E6044 + thumb_func_start ContestEffect_BetterWhenAudienceExcited +ContestEffect_BetterWhenAudienceExcited: @ 0x080E6044 push {r4, lr} ldr r0, _080E6064 ldr r1, [r0] @@ -473320,10 +473320,10 @@ _080E60AA: bx r0 .align 2, 0 _080E60C4: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E6044 + thumb_func_end ContestEffect_BetterWhenAudienceExcited - thumb_func_start sub_080E60C8 -sub_080E60C8: @ 0x080E60C8 + thumb_func_start ContestEffect_DontExciteAudience +ContestEffect_DontExciteAudience: @ 0x080E60C8 push {r4, lr} ldr r4, _080E610C ldr r0, [r4] @@ -473360,10 +473360,10 @@ _080E6106: bx r0 .align 2, 0 _080E610C: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E60C8 + thumb_func_end ContestEffect_DontExciteAudience - thumb_func_start sub_080E6110 -sub_080E6110: @ 0x080E6110 + thumb_func_start JamByMoveCategory +JamByMoveCategory: @ 0x080E6110 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -473413,7 +473413,7 @@ _080E615E: ldr r1, [r0, #8] movs r0, #0xff strb r0, [r1, #9] - bl sub_080E6208 + bl WasAtLeastOneOpponentJammed lsls r0, r0, #0x18 cmp r0, #0 beq _080E617A @@ -473440,10 +473440,10 @@ _080E6194: bx r0 .align 2, 0 _080E61A0: .4byte gUnknown_2039BD4 - thumb_func_end sub_080E6110 + thumb_func_end JamByMoveCategory - thumb_func_start sub_080E61A4 -sub_080E61A4: @ 0x080E61A4 + thumb_func_start CanUnnerveContestant +CanUnnerveContestant: @ 0x080E61A4 push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -473498,10 +473498,10 @@ _080E6202: _080E6204: pop {r1} bx r1 - thumb_func_end sub_080E61A4 + thumb_func_end CanUnnerveContestant - thumb_func_start sub_080E6208 -sub_080E6208: @ 0x080E6208 + thumb_func_start WasAtLeastOneOpponentJammed +WasAtLeastOneOpponentJammed: @ 0x080E6208 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -473527,7 +473527,7 @@ _080E622A: ldrb r5, [r0] adds r6, r5, #0 adds r0, r5, #0 - bl sub_080E61A4 + bl CanUnnerveContestant lsls r0, r0, #0x18 cmp r0, #0 beq _080E62DA @@ -473641,7 +473641,7 @@ _080E630A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E6208 + thumb_func_end WasAtLeastOneOpponentJammed thumb_func_start JamContestant JamContestant: @ 0x080E6318 @@ -473672,8 +473672,8 @@ JamContestant: @ 0x080E6318 _080E6348: .4byte gUnknown_2039BD4 thumb_func_end JamContestant - thumb_func_start sub_080E634C -sub_080E634C: @ 0x080E634C + thumb_func_start RoundTowardsZero +RoundTowardsZero: @ 0x080E634C push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -473711,10 +473711,10 @@ _080E6384: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E634C + thumb_func_end RoundTowardsZero - thumb_func_start sub_080E6390 -sub_080E6390: @ 0x080E6390 + thumb_func_start RoundUp +RoundUp: @ 0x080E6390 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -473742,18 +473742,18 @@ _080E63B8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E6390 + thumb_func_end RoundUp - thumb_func_start sub_080E63C4 -sub_080E63C4: @ 0x080E63C4 + thumb_func_start RecordMixingPlayerSpotTriggered +RecordMixingPlayerSpotTriggered: @ 0x080E63C4 push {lr} ldr r0, _080E63D0 bl sub_080B2F30 pop {r0} bx r0 .align 2, 0 -_080E63D0: .4byte sub_080E6934 - thumb_func_end sub_080E63C4 +_080E63D0: .4byte Task_RecordMixing_Main + thumb_func_end RecordMixingPlayerSpotTriggered thumb_func_start SetSrcLookupPointers SetSrcLookupPointers: @ 0x080E63D4 @@ -473824,8 +473824,8 @@ _080E6474: .4byte gUnknown_3001154 _080E6478: .4byte gUnknown_3001158 thumb_func_end SetSrcLookupPointers - thumb_func_start sub_080E647C -sub_080E647C: @ 0x080E647C + thumb_func_start PrepareUnknownExchangePacket +PrepareUnknownExchangePacket: @ 0x080E647C push {r4, r5, lr} adds r5, r0, #0 ldr r0, _080E6500 @@ -473870,11 +473870,11 @@ sub_080E647C: @ 0x080E647C ldr r2, _080E6528 adds r1, r5, r2 bl sub_08165820 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080E64F8 - bl sub_08153910 + bl GetRecordMixingGift ldr r2, _080E652C adds r1, r5, r2 strh r0, [r1] @@ -473895,7 +473895,7 @@ _080E6520: .4byte 0x000010AC _080E6524: .4byte gUnknown_300114C _080E6528: .4byte 0x00001124 _080E652C: .4byte 0x000011C8 - thumb_func_end sub_080E647C + thumb_func_end PrepareUnknownExchangePacket thumb_func_start sub_080E6530 sub_080E6530: @ 0x080E6530 @@ -473909,7 +473909,7 @@ sub_080E6530: @ 0x080E6530 adds r2, r4, #0 bl memcpy adds r0, r5, #0 - bl sub_080EBD2C + bl ClearJapaneseSecretBases adds r4, r5, r4 ldr r0, _080E65D8 ldr r1, [r0] @@ -473955,11 +473955,11 @@ sub_080E6530: @ 0x080E6530 bl sub_08165820 adds r0, r4, #0 bl sub_080E8290 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080E65CC - bl sub_08153910 + bl GetRecordMixingGift ldr r2, _080E6600 adds r1, r5, r2 strh r0, [r1] @@ -473982,13 +473982,13 @@ _080E65FC: .4byte gUnknown_300114C _080E6600: .4byte 0x000011C8 thumb_func_end sub_080E6530 - thumb_func_start sub_080E6604 -sub_080E6604: @ 0x080E6604 + thumb_func_start PrepareExchangePacket +PrepareExchangePacket: @ 0x080E6604 push {r4, r5, lr} - bl sub_080EA574 + bl SetPlayerSecretBaseParty bl sub_080F1694 bl SetSrcLookupPointers - bl sub_08009C28 + bl Link_AnyPartnersPlayingRubyOrSapphire cmp r0, #0 beq _080E6640 bl sub_08009BD4 @@ -473996,7 +473996,7 @@ sub_080E6604: @ 0x080E6604 bne _080E6630 ldr r0, _080E662C ldr r0, [r0] - bl sub_080E647C + bl PrepareUnknownExchangePacket b _080E66EA .align 2, 0 _080E662C: .4byte gUnknown_2039CB8 @@ -474062,11 +474062,11 @@ _080E6640: ldr r1, [r1] movs r2, #0xec bl memcpy - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080E66D2 - bl sub_08153910 + bl GetRecordMixingGift ldr r1, [r5] ldr r2, _080E6728 adds r1, r1, r2 @@ -474081,7 +474081,7 @@ _080E66D2: ldr r0, [r5] ldr r2, _080E6734 adds r0, r0, r2 - bl sub_080E7A48 + bl GetPlayerHallRecords _080E66EA: pop {r4, r5} pop {r0} @@ -474105,15 +474105,15 @@ _080E6728: .4byte 0x00001210 _080E672C: .4byte 0x00001254 _080E6730: .4byte gUnknown_3001154 _080E6734: .4byte 0x000012DC - thumb_func_end sub_080E6604 + thumb_func_end PrepareExchangePacket - thumb_func_start sub_080E6738 -sub_080E6738: @ 0x080E6738 + thumb_func_start ReceiveExchangePacket +ReceiveExchangePacket: @ 0x080E6738 push {r4, r5, r6, lr} mov r6, r8 push {r6} adds r4, r0, #0 - bl sub_08009C28 + bl Link_AnyPartnersPlayingRubyOrSapphire cmp r0, #0 beq _080E67EC ldr r5, _080E67CC @@ -474129,7 +474129,7 @@ sub_080E6738: @ 0x080E6738 lsrs r4, r4, #0x18 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080EBB64 + bl ReceiveSecretBasesData ldr r3, [r5] ldr r1, _080E67D4 adds r0, r3, r1 @@ -474153,7 +474153,7 @@ sub_080E6738: @ 0x080E6738 adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080F1758 + bl ReceivePokeNewsData ldr r0, [r5] ldr r1, _080E67E0 adds r0, r0, r1 @@ -474165,12 +474165,12 @@ sub_080E6738: @ 0x080E6738 adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_08122888 + bl ReceiveEasyChatPairsData ldr r0, [r5] ldr r1, _080E67E8 adds r0, r0, r1 adds r1, r4, #0 - bl sub_080E7750 + bl ReceiveGiftItem b _080E6896 .align 2, 0 _080E67CC: .4byte gUnknown_2039CB4 @@ -474195,7 +474195,7 @@ _080E67EC: lsrs r4, r4, #0x18 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080EBB64 + bl ReceiveSecretBasesData ldr r0, [r5] add r0, r8 adds r1, r6, #0 @@ -474206,7 +474206,7 @@ _080E67EC: adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080F1758 + bl ReceivePokeNewsData ldr r0, [r5] ldr r1, _080E68AC adds r0, r0, r1 @@ -474218,7 +474218,7 @@ _080E67EC: adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_08122888 + bl ReceiveEasyChatPairsData ldr r3, [r5] ldr r1, _080E68B4 adds r0, r3, r1 @@ -474236,25 +474236,25 @@ _080E67EC: ldr r1, _080E68BC adds r0, r0, r1 adds r1, r4, #0 - bl sub_080E7750 + bl ReceiveGiftItem ldr r0, [r5] ldr r1, _080E68C0 adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080E71E4 + bl ReceiveLilycoveLadyData ldr r0, [r5] ldr r1, _080E68C4 adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080E7C50 + bl ReceiveApprenticeData ldr r0, [r5] ldr r1, _080E68C8 adds r0, r0, r1 adds r1, r6, #0 adds r2, r4, #0 - bl sub_080E8194 + bl ReceiveRankingHallRecords _080E6896: pop {r3} mov r8, r3 @@ -474273,10 +474273,10 @@ _080E68BC: .4byte 0x00001210 _080E68C0: .4byte 0x00001214 _080E68C4: .4byte 0x00001254 _080E68C8: .4byte 0x000012DC - thumb_func_end sub_080E6738 + thumb_func_end ReceiveExchangePacket - thumb_func_start sub_080E68CC -sub_080E68CC: @ 0x080E68CC + thumb_func_start PrintTextOnRecordMixing +PrintTextOnRecordMixing: @ 0x080E68CC push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -474294,16 +474294,16 @@ sub_080E68CC: @ 0x080E68CC bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E68CC + thumb_func_end PrintTextOnRecordMixing - thumb_func_start sub_080E6900 -sub_080E6900: @ 0x080E6900 + thumb_func_start Task_RecordMixing_SoundEffect +Task_RecordMixing_SoundEffect: @ 0x080E6900 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -474329,10 +474329,10 @@ _080E6928: bx r0 .align 2, 0 _080E6930: .4byte gUnknown_3005B60 - thumb_func_end sub_080E6900 + thumb_func_end Task_RecordMixing_SoundEffect - thumb_func_start sub_080E6934 -sub_080E6934: @ 0x080E6934 + thumb_func_start Task_RecordMixing_Main +Task_RecordMixing_Main: @ 0x080E6934 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -474373,7 +474373,7 @@ _080E6978: str r0, [r4] ldr r0, _080E69E0 ldrb r0, [r0] - bl sub_080091C4 + bl SetLocalLinkPlayerId movs r0, #0x80 lsls r0, r0, #7 movs r1, #1 @@ -474381,19 +474381,19 @@ _080E6978: ldr r1, _080E69E4 movs r0, #0 strb r0, [r1] - bl sub_080E6604 - bl sub_080FB87C + bl PrepareExchangePacket + bl CreateRecordMixingSprite movs r0, #1 strh r0, [r5] ldr r0, _080E69E8 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x14] ldr r0, _080E69EC movs r1, #0x51 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x1e] @@ -474405,8 +474405,8 @@ _080E69D8: .4byte gUnknown_2039CB4 _080E69DC: .4byte 0x00005110 _080E69E0: .4byte gUnknown_2037282 _080E69E4: .4byte gUnknown_3001130 -_080E69E8: .4byte sub_080E6AFC -_080E69EC: .4byte sub_080E6900 +_080E69E8: .4byte Task_MixingRecordsRecv +_080E69EC: .4byte Task_RecordMixing_SoundEffect _080E69F0: ldr r2, _080E6A1C movs r0, #0x14 @@ -474422,9 +474422,9 @@ _080E69F0: strh r0, [r5] ldr r0, _080E6A20 bl FlagSet - bl sub_080FB8E4 + bl DestroyRecordMixingSprite ldrb r0, [r5, #0x1e] - bl sub_080A8964 + bl DestroyTask b _080E6AE2 .align 2, 0 _080E6A1C: .4byte gUnknown_3005B60 @@ -474432,7 +474432,7 @@ _080E6A20: .4byte 0x00000894 _080E6A24: ldr r0, _080E6A40 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x14] @@ -474442,7 +474442,7 @@ _080E6A24: bl sub_080A306C b _080E6AE2 .align 2, 0 -_080E6A40: .4byte sub_080E77E0 +_080E6A40: .4byte Task_DoRecordMixing _080E6A44: ldr r2, _080E6A78 movs r0, #0x14 @@ -474466,7 +474466,7 @@ _080E6A44: strh r0, [r5, #0x14] _080E6A6E: ldr r0, _080E6A80 - bl sub_080E68CC + bl PrintTextOnRecordMixing strh r4, [r5, #0x10] b _080E6AE2 .align 2, 0 @@ -474497,10 +474497,10 @@ _080E6A98: bne _080E6AE2 ldr r0, _080E6AEC ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _080E6AF0 ldr r0, [r0] - bl sub_08000BF0 + bl Free bl sub_08086C00 ldr r0, _080E6AF4 ldrb r0, [r0] @@ -474508,14 +474508,14 @@ _080E6A98: beq _080E6AD0 ldr r0, _080E6AF8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask _080E6AD0: movs r0, #0 movs r1, #1 bl sub_08197028 adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _080E6AE2: pop {r4, r5} pop {r0} @@ -474526,10 +474526,10 @@ _080E6AEC: .4byte gUnknown_2039CB4 _080E6AF0: .4byte gUnknown_2039CB8 _080E6AF4: .4byte gUnknown_300319C _080E6AF8: .4byte sub_080AEBB0 - thumb_func_end sub_080E6934 + thumb_func_end Task_RecordMixing_Main - thumb_func_start sub_080E6AFC -sub_080E6AFC: @ 0x080E6AFC + thumb_func_start Task_MixingRecordsRecv +Task_MixingRecordsRecv: @ 0x080E6AFC push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -474585,7 +474585,7 @@ _080E6B48: _080E6B58: .4byte 0x0000012D _080E6B5C: ldr r0, _080E6B74 - bl sub_080E68CC + bl PrintTextOnRecordMixing movs r0, #0xe1 lsls r0, r0, #3 strh r0, [r5, #0x18] @@ -474611,10 +474611,10 @@ _080E6B88: movs r0, #0x65 b _080E6D3C _080E6B90: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -474643,7 +474643,7 @@ _080E6BCC: .4byte 0x0000012D _080E6BD0: bl sub_0800A60C adds r4, r0, #0 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -474655,7 +474655,7 @@ _080E6BE4: strh r4, [r5, #0x20] lsls r4, r4, #0x10 asrs r4, r4, #0x10 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -474671,7 +474671,7 @@ _080E6C02: _080E6C0A: bl sub_0800A60C adds r4, r0, #0 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -474717,7 +474717,7 @@ _080E6C46: _080E6C60: .4byte gUnknown_30031C4 _080E6C64: .4byte gUnknown_2021C40 _080E6C68: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -474729,17 +474729,17 @@ _080E6C68: strh r0, [r5, #0x12] ldr r0, _080E6CC4 str r0, [r5] - bl sub_08009C28 + bl Link_AnyPartnersPlayingRubyOrSapphire cmp r0, #0 beq _080E6CDC ldr r0, _080E6CC8 ldr r0, [r0] adds r1, r5, #0 adds r1, #0xc - bl sub_080E6FE0 + bl StorePtrInTaskData ldr r0, _080E6CCC movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x1c] @@ -474752,15 +474752,15 @@ _080E6C68: ldr r0, [r0] adds r1, r6, r1 adds r1, #0x12 - bl sub_080E6FE0 + bl StorePtrInTaskData ldr r1, _080E6CD4 ldr r0, _080E6CD8 str r0, [r1] b _080E6D3E .align 2, 0 -_080E6CC4: .4byte sub_080E6D44 +_080E6CC4: .4byte Task_SendPacket _080E6CC8: .4byte gUnknown_2039CB8 -_080E6CCC: .4byte sub_080E6E08 +_080E6CCC: .4byte Task_CopyReceiveBuffer _080E6CD0: .4byte gUnknown_2039CB4 _080E6CD4: .4byte gUnknown_300115C _080E6CD8: .4byte 0x00001230 @@ -474769,10 +474769,10 @@ _080E6CDC: ldr r0, [r0] adds r1, r5, #0 adds r1, #0xc - bl sub_080E6FE0 + bl StorePtrInTaskData ldr r0, _080E6D18 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x1c] @@ -474785,14 +474785,14 @@ _080E6CDC: ldr r0, [r0] adds r1, r6, r1 adds r1, #0x12 - bl sub_080E6FE0 + bl StorePtrInTaskData ldr r1, _080E6D20 ldr r0, _080E6D24 str r0, [r1] b _080E6D3E .align 2, 0 _080E6D14: .4byte gUnknown_2039CB8 -_080E6D18: .4byte sub_080E6E08 +_080E6D18: .4byte Task_CopyReceiveBuffer _080E6D1C: .4byte gUnknown_2039CB4 _080E6D20: .4byte gUnknown_300115C _080E6D24: .4byte 0x00001444 @@ -474813,10 +474813,10 @@ _080E6D3E: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080E6AFC + thumb_func_end Task_MixingRecordsRecv - thumb_func_start sub_080E6D44 -sub_080E6D44: @ 0x080E6D44 + thumb_func_start Task_SendPacket +Task_SendPacket: @ 0x080E6D44 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -474847,7 +474847,7 @@ _080E6D70: @ jump table _080E6D84: adds r0, r5, #0 adds r0, #0xc - bl sub_080E6FD4 + bl LoadPtrFromTaskData adds r1, r0, #0 movs r0, #0x10 ldrsh r2, [r5, r0] @@ -474861,7 +474861,7 @@ _080E6D84: .align 2, 0 _080E6DA4: .4byte gUnknown_202257C _080E6DA8: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080E6DD4 @@ -474910,10 +474910,10 @@ _080E6DFC: bx r0 .align 2, 0 _080E6E04: .4byte Task_SendPacket_SwitchToReceive - thumb_func_end sub_080E6D44 + thumb_func_end Task_SendPacket - thumb_func_start sub_080E6E08 -sub_080E6E08: @ 0x080E6E08 + thumb_func_start Task_CopyReceiveBuffer +Task_CopyReceiveBuffer: @ 0x080E6E08 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -474930,7 +474930,7 @@ sub_080E6E08: @ 0x080E6E08 ldr r1, _080E6E4C adds r0, r0, r1 mov sl, r0 - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #4] @@ -474960,7 +474960,7 @@ _080E6E50: beq _080E6EEC mov r0, sl adds r0, #0x12 - bl sub_080E6FD4 + bl LoadPtrFromTaskData mov r3, sb lsls r4, r3, #1 mov r5, sl @@ -474978,7 +474978,7 @@ _080E6E50: adds r1, r2, #0 adds r6, r0, r1 mov r0, r8 - bl sub_080E6FF8 + bl GetPlayerRecvBuffer adds r1, r0, #0 movs r3, #0 ldrsh r2, [r4, r3] @@ -475001,7 +475001,7 @@ _080E6EB4: bl memcpy _080E6EBC: mov r0, r8 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag mov r0, sb lsls r1, r0, #1 adds r1, r5, r1 @@ -475028,7 +475028,7 @@ _080E6EEC: lsrs r0, r0, #0x18 mov r8, r0 _080E6EF4: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r8, r0 @@ -475045,14 +475045,14 @@ _080E6EF4: adds r1, #1 strh r1, [r0, #8] _080E6F16: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, [sp, #8] cmp r4, r0 bne _080E6F2A ldr r0, [sp] - bl sub_080A8964 + bl DestroyTask _080E6F2A: add sp, #0xc pop {r3, r4, r5} @@ -475065,7 +475065,7 @@ _080E6F2A: .align 2, 0 _080E6F3C: .4byte gUnknown_300115C _080E6F40: .4byte gUnknown_3005B60 - thumb_func_end sub_080E6E08 + thumb_func_end Task_CopyReceiveBuffer thumb_func_start sub_080E6F44 sub_080E6F44: @ 0x080E6F44 @@ -475087,7 +475087,7 @@ sub_080E6F44: @ 0x080E6F44 cmp r0, #0 bne _080E6F6C adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask _080E6F6C: pop {r4} pop {r0} @@ -475114,7 +475114,7 @@ Task_ReceivePacket: @ 0x080E6F78 bne _080E6F9C movs r2, #0x12 ldrsh r0, [r1, r2] - bl sub_080E6738 + bl ReceiveExchangePacket _080E6F9C: pop {r0} bx r0 @@ -475145,28 +475145,28 @@ _080E6FCC: .4byte Task_ReceivePacket _080E6FD0: .4byte gUnknown_3001130 thumb_func_end Task_SendPacket_SwitchToReceive - thumb_func_start sub_080E6FD4 -sub_080E6FD4: @ 0x080E6FD4 + thumb_func_start LoadPtrFromTaskData +LoadPtrFromTaskData: @ 0x080E6FD4 adds r1, r0, #0 ldrh r0, [r1] ldrh r1, [r1, #2] lsls r1, r1, #0x10 orrs r0, r1 bx lr - thumb_func_end sub_080E6FD4 + thumb_func_end LoadPtrFromTaskData - thumb_func_start sub_080E6FE0 -sub_080E6FE0: @ 0x080E6FE0 + thumb_func_start StorePtrInTaskData +StorePtrInTaskData: @ 0x080E6FE0 strh r0, [r1] lsrs r0, r0, #0x10 strh r0, [r1, #2] bx lr - thumb_func_end sub_080E6FE0 + thumb_func_end StorePtrInTaskData thumb_func_start sub_080E6FE8 sub_080E6FE8: @ 0x080E6FE8 push {lr} - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -475174,8 +475174,8 @@ sub_080E6FE8: @ 0x080E6FE8 .align 2, 0 thumb_func_end sub_080E6FE8 - thumb_func_start sub_080E6FF8 -sub_080E6FF8: @ 0x080E6FF8 + thumb_func_start GetPlayerRecvBuffer +GetPlayerRecvBuffer: @ 0x080E6FF8 lsls r0, r0, #0x18 lsrs r0, r0, #0x10 ldr r1, _080E7004 @@ -475183,13 +475183,13 @@ sub_080E6FF8: @ 0x080E6FF8 bx lr .align 2, 0 _080E7004: .4byte gUnknown_202207C - thumb_func_end sub_080E6FF8 + thumb_func_end GetPlayerRecvBuffer - thumb_func_start sub_080E7008 -sub_080E7008: @ 0x080E7008 + thumb_func_start ShufflePlayerIndices +ShufflePlayerIndices: @ 0x080E7008 push {r4, lr} adds r4, r0, #0 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -475263,7 +475263,7 @@ _080E7090: bx r0 .align 2, 0 _080E7098: .4byte gUnknown_8566CCF - thumb_func_end sub_080E7008 + thumb_func_end ShufflePlayerIndices thumb_func_start sub_080E709C sub_080E709C: @ 0x080E709C @@ -475274,7 +475274,7 @@ sub_080E709C: @ 0x080E709C lsls r2, r2, #0x18 lsrs r6, r2, #0x18 mov r0, sp - bl sub_080E7008 + bl ShufflePlayerIndices ldr r1, _080E70E4 lsls r0, r6, #2 add r0, sp @@ -475320,7 +475320,7 @@ _080E70F8: adds r1, r5, r1 movs r2, #0x40 bl memcpy - bl sub_08120B50 + bl ResetMauvilleOldManFlag add sp, #0x10 pop {r4, r5, r6} pop {r0} @@ -475341,8 +475341,8 @@ sub_080E711C: @ 0x080E711C lsls r2, r2, #0x18 lsrs r5, r2, #0x18 mov r0, sp - bl sub_080E7008 - bl sub_08009C28 + bl ShufflePlayerIndices + bl Link_AnyPartnersPlayingRubyOrSapphire cmp r0, #0 beq _080E71B4 lsls r0, r5, #2 @@ -475421,7 +475421,7 @@ _080E71B4: _080E71CE: mov r0, r8 add r0, sb - bl sub_081627A4 + bl PutNewBattleTowerRecord add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -475431,8 +475431,8 @@ _080E71CE: bx r0 thumb_func_end sub_080E711C - thumb_func_start sub_080E71E4 -sub_080E71E4: @ 0x080E71E4 + thumb_func_start ReceiveLilycoveLadyData +ReceiveLilycoveLadyData: @ 0x080E71E4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -475442,7 +475442,7 @@ sub_080E71E4: @ 0x080E71E4 lsls r2, r2, #0x18 lsrs r5, r2, #0x18 mov r0, sp - bl sub_080E7008 + bl ShufflePlayerIndices adds r0, r7, #0 muls r0, r5, r0 add r0, r8 @@ -475483,7 +475483,7 @@ _080E7232: adds r0, r4, #0 bl sub_0818E1CC adds r0, r4, #0 - bl sub_08000BF0 + bl Free _080E725A: add sp, #0x10 pop {r3} @@ -475493,7 +475493,7 @@ _080E725A: bx r0 .align 2, 0 _080E7268: .4byte gUnknown_3001150 - thumb_func_end sub_080E71E4 + thumb_func_end ReceiveLilycoveLadyData thumb_func_start sub_080E726C sub_080E726C: @ 0x080E726C @@ -475625,7 +475625,7 @@ sub_080E7330: @ 0x080E7330 ldr r0, _080E73BC ldrh r0, [r0, #4] bl sub_0806F094 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0 @@ -475836,7 +475836,7 @@ _080E74E2: lsrs r0, r0, #0x10 mov r8, r0 _080E74EC: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r8, r0 @@ -476136,7 +476136,7 @@ _080E7704: movs r2, #0x38 bl memcpy ldr r0, [sp, #0x38] - bl sub_0806F07C + bl SeedRng add sp, #0x50 pop {r3, r4, r5} mov r8, r3 @@ -476151,8 +476151,8 @@ _080E7748: .4byte gUnknown_3005AEC _080E774C: .4byte 0x0000310C thumb_func_end sub_080E7330 - thumb_func_start sub_080E7750 -sub_080E7750: @ 0x080E7750 + thumb_func_start ReceiveGiftItem +ReceiveGiftItem: @ 0x080E7750 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -476161,26 +476161,26 @@ sub_080E7750: @ 0x080E7750 ldrh r0, [r4] cmp r0, #0 beq _080E77D4 - bl sub_080D6480 + bl GetPocketByItemId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #5 bne _080E77D4 ldrh r0, [r4] movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 cmp r0, #0 bne _080E77CC ldrh r0, [r4] movs r1, #1 - bl sub_080D6534 + bl CheckPCHasItem lsls r0, r0, #0x18 cmp r0, #0 bne _080E77CC ldrh r0, [r4] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 beq _080E77CC @@ -476213,10 +476213,10 @@ _080E77D4: bx r0 .align 2, 0 _080E77DC: .4byte 0x00004001 - thumb_func_end sub_080E7750 + thumb_func_end ReceiveGiftItem - thumb_func_start sub_080E77E0 -sub_080E77E0: @ 0x080E77E0 + thumb_func_start Task_DoRecordMixing +Task_DoRecordMixing: @ 0x080E77E0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -476251,18 +476251,18 @@ _080E780C: @ jump table .4byte _080E78D6 @ case 8 .4byte _080E78E2 @ case 9 _080E7834: - bl sub_08009C28 + bl Link_AnyPartnersPlayingRubyOrSapphire cmp r0, #0 bne _080E78DA movs r0, #6 strh r0, [r4, #8] b _080E78F2 _080E7842: - bl sub_08076764 + bl SetContinueGameWarpStatusToDynamicWarp bl sub_0815336C b _080E78DA _080E784C: - bl sub_081533B0 + bl CheckSaveFile lsls r0, r0, #0x18 cmp r0, #0 beq _080E78F2 @@ -476288,7 +476288,7 @@ _080E7878: cmp r0, #0 bne _080E78F2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080E78F2 .align 2, 0 _080E7888: .4byte gUnknown_30031C4 @@ -476300,13 +476300,13 @@ _080E788C: bne _080E78F2 ldr r0, _080E78A4 movs r1, #5 - bl sub_080A8878 + bl CreateTask b _080E78DA .align 2, 0 _080E78A4: .4byte sub_081535C4 _080E78A8: ldr r0, _080E78C8 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _080E78F2 @@ -476334,17 +476334,17 @@ _080E78DA: strh r0, [r4, #8] b _080E78F2 _080E78E2: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080E78F2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080E78F2: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080E77E0 + thumb_func_end Task_DoRecordMixing thumb_func_start sub_080E78F8 sub_080E78F8: @ 0x080E78F8 @@ -476515,8 +476515,8 @@ _080E7A34: _080E7A44: .4byte gUnknown_3005AF0 thumb_func_end sub_080E78F8 - thumb_func_start sub_080E7A48 -sub_080E7A48: @ 0x080E7A48 + thumb_func_start GetPlayerHallRecords +GetPlayerHallRecords: @ 0x080E7A48 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -476727,7 +476727,7 @@ _080E7BF4: .4byte 0x00000DEA _080E7BF8: .4byte 0x00000E08 _080E7BFC: .4byte 0x00000E1E _080E7C00: .4byte 0x00000CFC - thumb_func_end sub_080E7A48 + thumb_func_end GetPlayerHallRecords thumb_func_start sub_080E7C04 sub_080E7C04: @ 0x080E7C04 @@ -476772,8 +476772,8 @@ _080E7C46: bx r1 thumb_func_end sub_080E7C04 - thumb_func_start sub_080E7C50 -sub_080E7C50: @ 0x080E7C50 + thumb_func_start ReceiveApprenticeData +ReceiveApprenticeData: @ 0x080E7C50 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -476782,7 +476782,7 @@ sub_080E7C50: @ 0x080E7C50 adds r5, r1, #0 adds r4, r2, #0 mov r0, sp - bl sub_080E7008 + bl ShufflePlayerIndices lsls r4, r4, #2 mov r1, sp adds r0, r1, r4 @@ -476910,7 +476910,7 @@ _080E7D4E: bx r0 .align 2, 0 _080E7D5C: .4byte gUnknown_3005AF0 - thumb_func_end sub_080E7C50 + thumb_func_end ReceiveApprenticeData thumb_func_start sub_080E7D60 sub_080E7D60: @ 0x080E7D60 @@ -477489,8 +477489,8 @@ _080E818C: .4byte gUnknown_3005AF0 _080E8190: .4byte 0x0000057C thumb_func_end sub_080E810C - thumb_func_start sub_080E8194 -sub_080E8194: @ 0x080E8194 + thumb_func_start ReceiveRankingHallRecords +ReceiveRankingHallRecords: @ 0x080E8194 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -477499,13 +477499,13 @@ sub_080E8194: @ 0x080E8194 adds r6, r0, #0 mov r8, r1 mov sb, r2 - bl sub_08009B64 + bl GetLinkPlayerCount adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0x81 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 str r4, [sp] adds r1, r6, #0 @@ -477515,7 +477515,7 @@ sub_080E8194: @ 0x080E8194 adds r0, r5, #0 bl sub_080E810C adds r0, r5, #0 - bl sub_08000BF0 + bl Free add sp, #4 pop {r3, r4} mov r8, r3 @@ -477524,7 +477524,7 @@ sub_080E8194: @ 0x080E8194 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E8194 + thumb_func_end ReceiveRankingHallRecords thumb_func_start sub_080E81E0 sub_080E81E0: @ 0x080E81E0 @@ -477550,7 +477550,7 @@ sub_080E81E0: @ 0x080E81E0 ldr r1, _080E8234 adds r0, r0, r1 adds r1, r5, #0 - bl sub_0806F520 + bl InitDaycareMailRecordMixing ldr r0, _080E8238 ldr r1, [r0] adds r0, r6, #0 @@ -477658,10 +477658,10 @@ _080E82D4: thumb_func_start sub_080E82DC sub_080E82DC: @ 0x080E82DC push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -477670,8 +477670,8 @@ sub_080E82DC: @ 0x080E82DC thumb_func_start sub_080E82F4 sub_080E82F4: @ 0x080E82F4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer ldr r0, _080E831C ldrb r0, [r0] @@ -477720,7 +477720,7 @@ _080E8348: @ jump table .4byte _080E840C @ case 7 _080E8368: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl sub_080E9560 ldr r1, _080E837C movs r0, #0x87 @@ -477730,7 +477730,7 @@ _080E8368: .align 2, 0 _080E837C: .4byte gUnknown_3002360 _080E8380: - bl sub_080E96A8 + bl PutFirstMemBlockHeader b _080E83F8 _080E8386: movs r0, #0 @@ -477754,17 +477754,17 @@ _080E83AC: adds r1, r2, r0 b _080E8400 _080E83B4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080E8480 movs r0, #0 - bl sub_08001B48 + bl ShowBg b _080E83F8 _080E83C8: ldr r0, _080E83E0 - bl sub_08003090 + bl InitWindows bl sub_08004480 bl sub_08196F98 ldr r1, _080E83E4 @@ -477782,7 +477782,7 @@ _080E83E8: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _080E83F8: ldr r1, _080E8408 movs r2, #0x87 @@ -477815,12 +477815,12 @@ _080E840C: movs r0, #1 bl EnableInterrupts ldr r0, _080E848C - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _080E8490 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _080E8494 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080E8498 @@ -477904,7 +477904,7 @@ sub_080E84A4: @ 0x080E84A4 bne _080E85C2 movs r0, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle str r5, [sp] movs r4, #0xff str r4, [sp, #4] @@ -477927,7 +477927,7 @@ sub_080E84A4: @ 0x080E84A4 bl sub_080E9734 movs r0, #1 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle str r5, [sp] str r4, [sp, #4] str r5, [sp, #8] @@ -477948,7 +477948,7 @@ sub_080E84A4: @ 0x080E84A4 bl sub_080E9734 movs r0, #2 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle str r5, [sp] str r4, [sp, #4] str r5, [sp, #8] @@ -478216,7 +478216,7 @@ _080E878C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _080E87B0 str r0, [r5] b _080E8868 @@ -478375,16 +478375,16 @@ sub_080E88A8: @ 0x080E88A8 movs r4, #0 _080E88BC: adds r0, r4, #0 - bl sub_080E9750 + bl RemoveTrainerHillRecordsWindow adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 bls _080E88BC adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080E88E4 - bl sub_08000540 + bl SetMainCallback2 _080E88D8: pop {r4, r5} pop {r0} @@ -478561,13 +478561,13 @@ _080E8A1A: movs r4, #0 _080E8A1C: adds r0, r4, #0 - bl sub_080E9750 + bl RemoveTrainerHillRecordsWindow adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 bls _080E8A1C - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _080E8A44 @@ -478578,16 +478578,16 @@ _080E8A1C: .align 2, 0 _080E8A44: .4byte gUnknown_8566D08 _080E8A48: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080E8A94 ldr r0, _080E8A6C - bl sub_08003090 + bl InitWindows movs r0, #0 movs r1, #1 - bl sub_08197638 + bl SetStandardWindowBorderStyle _080E8A62: ldrh r0, [r5, #0x26] adds r0, #1 @@ -478597,7 +478597,7 @@ _080E8A62: _080E8A6C: .4byte gUnknown_8566D64 _080E8A70: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r1, #0xc5 lsls r1, r1, #6 movs r0, #0 @@ -478718,7 +478718,7 @@ sub_080E8AA0: @ 0x080E8AA0 bl memcpy movs r0, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r2, #0x10 str r2, [sp] movs r5, #0xff @@ -478960,7 +478960,7 @@ _080E8D9C: beq _080E8DB0 movs r0, #1 rsbs r0, r0, #0 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround b _080E8F8E _080E8DB0: movs r0, #0x80 @@ -478968,7 +478968,7 @@ _080E8DB0: cmp r0, #0 beq _080E8DC0 movs r0, #1 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround b _080E8F8E _080E8DC0: movs r0, #8 @@ -479218,7 +479218,7 @@ sub_080E8FA4: @ 0x080E8FA4 mov r0, sp movs r2, #0x40 bl memcpy - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r5, r2, #0 @@ -479603,7 +479603,7 @@ _080E92A4: bgt _080E92EA lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_080A3138 + bl SE12PanpotControl b _080E92EA .align 2, 0 _080E92D0: .4byte gUnknown_8566E58 @@ -479617,7 +479617,7 @@ _080E92D4: ble _080E92EA lsls r0, r1, #0x18 asrs r0, r0, #0x18 - bl sub_080A3138 + bl SE12PanpotControl _080E92EA: ldr r0, _080E9310 ldrh r1, [r0, #0x2e] @@ -479664,7 +479664,7 @@ _080E931C: movs r4, #0x40 rsbs r4, r4, #0 adds r1, r4, #0 - bl sub_080A307C + bl PlaySE12WithPanning str r4, [r5, #0x1c] b _080E9364 .align 2, 0 @@ -479673,7 +479673,7 @@ _080E9354: .4byte gUnknown_2039CC0 _080E9358: ldrh r0, [r5] movs r1, #0x3f - bl sub_080A307C + bl PlaySE12WithPanning movs r0, #0x3f str r0, [r5, #0x1c] _080E9364: @@ -479683,7 +479683,7 @@ _080E9364: b _080E93D2 _080E936C: ldrh r0, [r5] - bl sub_080A307C + bl PlaySE12WithPanning str r4, [r5, #0x18] b _080E93D2 _080E9376: @@ -479793,8 +479793,8 @@ _080E9438: b _080E94A2 _080E943E: movs r0, #0 - bl sub_080E9750 - bl sub_080034D4 + bl RemoveTrainerHillRecordsWindow + bl FreeAllWindowBuffers movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _080E945C @@ -479805,13 +479805,13 @@ _080E943E: .align 2, 0 _080E945C: .4byte gUnknown_8566D08 _080E9460: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _080E94A2 ldr r0, _080E947C - bl sub_08003090 + bl InitWindows _080E9472: ldrh r0, [r4, #0x26] adds r0, #1 @@ -479821,7 +479821,7 @@ _080E9472: _080E947C: .4byte gUnknown_8566D0C _080E9480: movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r1, _080E94A8 movs r0, #0 bl SetGpuReg @@ -480072,11 +480072,11 @@ _080E96A0: .4byte 0x040000D4 _080E96A4: .4byte 0x81000800 thumb_func_end sub_080E9560 - thumb_func_start sub_080E96A8 -sub_080E96A8: @ 0x080E96A8 + thumb_func_start PutFirstMemBlockHeader +PutFirstMemBlockHeader: @ 0x080E96A8 push {lr} - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl ResetAllPicSprites bl ResetPaletteFade @@ -480084,7 +480084,7 @@ sub_080E96A8: @ 0x080E96A8 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E96A8 + thumb_func_end PutFirstMemBlockHeader thumb_func_start sub_080E96C8 sub_080E96C8: @ 0x080E96C8 @@ -480104,35 +480104,35 @@ sub_080E96DC: @ 0x080E96DC movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 @@ -480145,39 +480145,39 @@ sub_080E9734: @ 0x080E9734 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 thumb_func_end sub_080E9734 - thumb_func_start sub_080E9750 -sub_080E9750: @ 0x080E9750 + thumb_func_start RemoveTrainerHillRecordsWindow +RemoveTrainerHillRecordsWindow: @ 0x080E9750 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 - bl sub_08003774 + bl ClearWindowTilemap adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080E9750 + thumb_func_end RemoveTrainerHillRecordsWindow - thumb_func_start sub_080E977C -sub_080E977C: @ 0x080E977C + thumb_func_start ClearSecretBase +ClearSecretBase: @ 0x080E977C push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -480206,7 +480206,7 @@ _080E9796: bx r0 .align 2, 0 _080E97B0: .4byte 0x01000028 - thumb_func_end sub_080E977C + thumb_func_end ClearSecretBase thumb_func_start ClearSecretBases ClearSecretBases: @ 0x080E97B4 @@ -480221,7 +480221,7 @@ _080E97BA: adds r1, r1, r0 ldr r0, [r5] adds r0, r0, r1 - bl sub_080E977C + bl ClearSecretBase adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -480235,8 +480235,8 @@ _080E97DC: .4byte gUnknown_3005AEC _080E97E0: .4byte 0x00001A9C thumb_func_end ClearSecretBases - thumb_func_start sub_080E97E4 -sub_080E97E4: @ 0x080E97E4 + thumb_func_start SetCurSecretBaseId +SetCurSecretBaseId: @ 0x080E97E4 ldr r0, _080E97F0 ldr r1, _080E97F4 ldrh r1, [r1] @@ -480245,10 +480245,10 @@ sub_080E97E4: @ 0x080E97E4 .align 2, 0 _080E97F0: .4byte gUnknown_2039CE8 _080E97F4: .4byte gUnknown_2037280 - thumb_func_end sub_080E97E4 + thumb_func_end SetCurSecretBaseId - thumb_func_start sub_080E97F8 -sub_080E97F8: @ 0x080E97F8 + thumb_func_start TrySetCurSecretBaseIndex +TrySetCurSecretBaseIndex: @ 0x080E97F8 push {r4, lr} ldr r0, _080E9808 movs r1, #0 @@ -480292,10 +480292,10 @@ _080E9844: .4byte gUnknown_2039CE8 _080E9848: .4byte gUnknown_3005AEC _080E984C: .4byte 0x00001A9C _080E9850: .4byte 0x00004054 - thumb_func_end sub_080E97F8 + thumb_func_end TrySetCurSecretBaseIndex - thumb_func_start sub_080E9854 -sub_080E9854: @ 0x080E9854 + thumb_func_start CheckPlayerHasSecretBase +CheckPlayerHasSecretBase: @ 0x080E9854 push {lr} ldr r0, _080E986C ldr r0, [r0] @@ -480320,17 +480320,17 @@ _080E987C: bx r0 .align 2, 0 _080E9880: .4byte gUnknown_2037290 - thumb_func_end sub_080E9854 + thumb_func_end CheckPlayerHasSecretBase - thumb_func_start sub_080E9884 -sub_080E9884: @ 0x080E9884 + thumb_func_start GetSecretBaseTypeInFrontOfPlayer_ +GetSecretBaseTypeInFrontOfPlayer_: @ 0x080E9884 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -480409,13 +480409,13 @@ _080E991A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E9884 + thumb_func_end GetSecretBaseTypeInFrontOfPlayer_ thumb_func_start GetSecretBaseTypeInFrontOfPlayer GetSecretBaseTypeInFrontOfPlayer: @ 0x080E9924 push {r4, lr} ldr r4, _080E9938 - bl sub_080E9884 + bl GetSecretBaseTypeInFrontOfPlayer_ lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -480426,8 +480426,8 @@ GetSecretBaseTypeInFrontOfPlayer: @ 0x080E9924 _080E9938: .4byte gUnknown_2037286 thumb_func_end GetSecretBaseTypeInFrontOfPlayer - thumb_func_start sub_080E993C -sub_080E993C: @ 0x080E993C + thumb_func_start FindMetatileIdMapCoords +FindMetatileIdMapCoords: @ 0x080E993C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -480509,10 +480509,10 @@ _080E99C8: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E993C + thumb_func_end FindMetatileIdMapCoords - thumb_func_start sub_080E99D8 -sub_080E99D8: @ 0x080E99D8 + thumb_func_start ToggleSecretBaseEntranceMetatile +ToggleSecretBaseEntranceMetatile: @ 0x080E99D8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -480521,13 +480521,13 @@ sub_080E99D8: @ 0x080E99D8 adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r5, #0 mov ip, r4 lsls r0, r0, #0x10 @@ -480599,7 +480599,7 @@ _080E9A74: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E99D8 + thumb_func_end ToggleSecretBaseEntranceMetatile thumb_func_start GetNameLength GetNameLength: @ 0x080E9A80 @@ -480626,8 +480626,8 @@ _080E9A9E: .align 2, 0 thumb_func_end GetNameLength - thumb_func_start sub_080E9AA4 -sub_080E9AA4: @ 0x080E9AA4 + thumb_func_start SetPlayerSecretBase +SetPlayerSecretBase: @ 0x080E9AA4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -480714,10 +480714,10 @@ _080E9B5C: .4byte 0x00001A9D _080E9B60: .4byte 0x00001AA9 _080E9B64: .4byte 0x00004026 _080E9B68: .4byte gUnknown_2036FB8 - thumb_func_end sub_080E9AA4 + thumb_func_end SetPlayerSecretBase - thumb_func_start sub_080E9B6C -sub_080E9B6C: @ 0x080E9B6C + thumb_func_start SetOccupiedSecretBaseEntranceMetatiles +SetOccupiedSecretBaseEntranceMetatiles: @ 0x080E9B6C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -480763,7 +480763,7 @@ _080E9B96: asrs r0, r5, #0x10 lsls r4, r4, #0x10 asrs r1, r4, #0x10 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r3, #0 lsls r0, r0, #0x10 asrs r1, r0, #0x10 @@ -480815,10 +480815,10 @@ _080E9C16: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080E9B6C + thumb_func_end SetOccupiedSecretBaseEntranceMetatiles - thumb_func_start sub_080E9C28 -sub_080E9C28: @ 0x080E9C28 + thumb_func_start SetSecretBaseWarpDestination +SetSecretBaseWarpDestination: @ 0x080E9C28 push {lr} ldr r0, _080E9C54 ldrb r0, [r0] @@ -480842,10 +480842,10 @@ sub_080E9C28: @ 0x080E9C28 .align 2, 0 _080E9C54: .4byte gUnknown_2039CE8 _080E9C58: .4byte gUnknown_8568A94 - thumb_func_end sub_080E9C28 + thumb_func_end SetSecretBaseWarpDestination - thumb_func_start sub_080E9C5C -sub_080E9C5C: @ 0x080E9C5C + thumb_func_start Task_EnterSecretBase +Task_EnterSecretBase: @ 0x080E9C5C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -480894,15 +480894,15 @@ _080E9C98: adds r0, #1 strb r0, [r2] _080E9CBC: - bl sub_080E9C28 - bl sub_08084540 + bl SetSecretBaseWarpDestination + bl WarpIntoMap ldr r0, _080E9CE8 ldr r1, _080E9CEC str r1, [r0] ldr r0, _080E9CF0 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080E9CD6: pop {r4} pop {r0} @@ -480912,19 +480912,19 @@ _080E9CDC: .4byte 0x00004054 _080E9CE0: .4byte gUnknown_3005AEC _080E9CE4: .4byte 0x00001AAC _080E9CE8: .4byte gUnknown_3005B0C -_080E9CEC: .4byte sub_080AEA64 -_080E9CF0: .4byte sub_08085934 - thumb_func_end sub_080E9C5C +_080E9CEC: .4byte FieldCallback_ReturnToEventScript2 +_080E9CF0: .4byte CB2_LoadMap + thumb_func_end Task_EnterSecretBase - thumb_func_start sub_080E9CF4 -sub_080E9CF4: @ 0x080E9CF4 + thumb_func_start EnterSecretBase +EnterSecretBase: @ 0x080E9CF4 push {lr} ldr r0, _080E9D20 movs r1, #0 - bl sub_080A8878 + bl CreateTask movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _080E9D24 ldr r0, [r0] movs r1, #4 @@ -480938,12 +480938,12 @@ sub_080E9CF4: @ 0x080E9CF4 pop {r0} bx r0 .align 2, 0 -_080E9D20: .4byte sub_080E9C5C +_080E9D20: .4byte Task_EnterSecretBase _080E9D24: .4byte gUnknown_3005AEC - thumb_func_end sub_080E9CF4 + thumb_func_end EnterSecretBase - thumb_func_start sub_080E9D28 -sub_080E9D28: @ 0x080E9D28 + thumb_func_start SecretBaseMapPopupEnabled +SecretBaseMapPopupEnabled: @ 0x080E9D28 push {lr} ldr r0, _080E9D44 ldrb r0, [r0, #0x17] @@ -480965,10 +480965,10 @@ _080E9D4E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E9D28 + thumb_func_end SecretBaseMapPopupEnabled - thumb_func_start sub_080E9D54 -sub_080E9D54: @ 0x080E9D54 + thumb_func_start EnterNewlyCreatedSecretBase_WaitFadeIn +EnterNewlyCreatedSecretBase_WaitFadeIn: @ 0x080E9D54 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -480980,15 +480980,15 @@ sub_080E9D54: @ 0x080E9D54 ldr r1, _080E9D90 adds r0, r0, r1 movs r1, #2 - bl sub_0808DEB4 + bl EventObjectTurn bl IsWeatherNotFadingIn lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080E9D84 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080E9D84: pop {r4} pop {r0} @@ -480996,21 +480996,21 @@ _080E9D84: .align 2, 0 _080E9D8C: .4byte gUnknown_2037230 _080E9D90: .4byte gUnknown_2036FF0 - thumb_func_end sub_080E9D54 + thumb_func_end EnterNewlyCreatedSecretBase_WaitFadeIn - thumb_func_start sub_080E9D94 -sub_080E9D94: @ 0x080E9D94 + thumb_func_start EnterNewlyCreatedSecretBase_StartFadeIn +EnterNewlyCreatedSecretBase_StartFadeIn: @ 0x080E9D94 push {r4, lr} sub sp, #4 bl sub_080987DC - bl sub_080D41F8 + bl HideMapNamePopUpWindow mov r4, sp adds r4, #2 movs r2, #0x88 lsls r2, r2, #2 mov r0, sp adds r1, r4, #0 - bl sub_080E993C + bl FindMetatileIdMapCoords mov r1, sp mov r0, sp ldrh r0, [r0] @@ -481033,20 +481033,20 @@ sub_080E9D94: @ 0x080E9D94 movs r2, #0 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt - bl sub_080AE99C + bl pal_fill_black ldr r0, _080E9DF4 movs r1, #0 - bl sub_080A8878 + bl CreateTask add sp, #4 pop {r4} pop {r0} bx r0 .align 2, 0 -_080E9DF4: .4byte sub_080E9D54 - thumb_func_end sub_080E9D94 +_080E9DF4: .4byte EnterNewlyCreatedSecretBase_WaitFadeIn + thumb_func_end EnterNewlyCreatedSecretBase_StartFadeIn - thumb_func_start sub_080E9DF8 -sub_080E9DF8: @ 0x080E9DF8 + thumb_func_start Task_EnterNewlyCreatedSecretBase +Task_EnterNewlyCreatedSecretBase: @ 0x080E9DF8 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -481086,14 +481086,14 @@ sub_080E9DF8: @ 0x080E9DF8 str r0, [sp] adds r0, r5, #0 bl SetWarpDestination - bl sub_08084540 + bl WarpIntoMap ldr r1, _080E9E78 ldr r0, _080E9E7C str r0, [r1] ldr r0, _080E9E80 - bl sub_08000540 + bl SetMainCallback2 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080E9E60: add sp, #4 pop {r4, r5, r6} @@ -481105,27 +481105,27 @@ _080E9E6C: .4byte gUnknown_2039CE8 _080E9E70: .4byte gUnknown_3005AEC _080E9E74: .4byte gUnknown_8568A94 _080E9E78: .4byte gUnknown_3005B0C -_080E9E7C: .4byte sub_080E9D94 -_080E9E80: .4byte sub_08085934 - thumb_func_end sub_080E9DF8 +_080E9E7C: .4byte EnterNewlyCreatedSecretBase_StartFadeIn +_080E9E80: .4byte CB2_LoadMap + thumb_func_end Task_EnterNewlyCreatedSecretBase thumb_func_start sub_080E9E84 sub_080E9E84: @ 0x080E9E84 push {lr} ldr r0, _080E9E9C movs r1, #0 - bl sub_080A8878 + bl CreateTask movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 -_080E9E9C: .4byte sub_080E9DF8 +_080E9E9C: .4byte Task_EnterNewlyCreatedSecretBase thumb_func_end sub_080E9E84 - thumb_func_start sub_080E9EA0 -sub_080E9EA0: @ 0x080E9EA0 + thumb_func_start CurMapIsSecretBase +CurMapIsSecretBase: @ 0x080E9EA0 push {lr} ldr r0, _080E9EB8 ldr r1, [r0] @@ -481146,7 +481146,7 @@ _080E9EBE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080E9EA0 + thumb_func_end CurMapIsSecretBase thumb_func_start sub_080E9EC4 sub_080E9EC4: @ 0x080E9EC4 @@ -481158,7 +481158,7 @@ sub_080E9EC4: @ 0x080E9EC4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 - bl sub_080E9EA0 + bl CurMapIsSecretBase lsls r0, r0, #0x18 cmp r0, #0 beq _080E9FBC @@ -481226,7 +481226,7 @@ _080E9F40: lsls r2, r2, #2 mov r0, sp adds r1, r4, #0 - bl sub_080E993C + bl FindMetatileIdMapCoords mov r0, sp ldrh r0, [r0] adds r0, #7 @@ -481257,7 +481257,7 @@ _080E9F88: lsls r2, r2, #2 mov r0, sp adds r1, r4, #0 - bl sub_080E993C + bl FindMetatileIdMapCoords mov r0, sp ldrh r0, [r0] adds r0, #7 @@ -481278,15 +481278,15 @@ _080E9FCC: .4byte 0x00004089 _080E9FD0: .4byte 0x00000E0A thumb_func_end sub_080E9EC4 - thumb_func_start sub_080E9FD4 -sub_080E9FD4: @ 0x080E9FD4 + thumb_func_start InitSecretBaseDecorationSprites +InitSecretBaseDecorationSprites: @ 0x080E9FD4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb mov r5, r8 push {r5, r6, r7} sub sp, #0x18 - bl sub_080E9EA0 + bl CurMapIsSecretBase lsls r0, r0, #0x18 cmp r0, #0 bne _080EA00C @@ -481489,7 +481489,7 @@ _080EA0FE: ldrb r1, [r2, #5] ldrb r2, [r2, #4] bl TryOverrideEventObjectTemplateCoords - bl sub_080E9EA0 + bl CurMapIsSecretBase lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -481507,7 +481507,7 @@ _080EA0FE: ldrb r1, [r2, #5] ldrb r2, [r2, #4] movs r3, #6 - bl sub_0808EBFC + bl OverrideSecretBaseDecorationSpriteScript b _080EA1EC .align 2, 0 _080EA1B0: .4byte gUnknown_8580CD0 @@ -481529,7 +481529,7 @@ _080EA1D8: ldrb r1, [r2, #5] ldrb r2, [r2, #4] movs r3, #7 - bl sub_0808EBFC + bl OverrideSecretBaseDecorationSpriteScript _080EA1EC: ldr r1, _080EA214 ldrh r0, [r1] @@ -481555,10 +481555,10 @@ _080EA202: bx r0 .align 2, 0 _080EA214: .4byte gUnknown_2037280 - thumb_func_end sub_080E9FD4 + thumb_func_end InitSecretBaseDecorationSprites - thumb_func_start sub_080EA218 -sub_080EA218: @ 0x080EA218 + thumb_func_start HideSecretBaseDecorationSprites +HideSecretBaseDecorationSprites: @ 0x080EA218 push {r4, r5, r6, lr} movs r5, #0 ldr r1, _080EA26C @@ -481586,7 +481586,7 @@ _080EA228: ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap adds r0, r4, #0 bl FlagSet _080EA256: @@ -481604,10 +481604,10 @@ _080EA264: .align 2, 0 _080EA26C: .4byte gUnknown_2036FB8 _080EA270: .4byte gUnknown_3005AEC - thumb_func_end sub_080EA218 + thumb_func_end HideSecretBaseDecorationSprites - thumb_func_start sub_080EA274 -sub_080EA274: @ 0x080EA274 + thumb_func_start SetSecretBaseOwnerGfxId +SetSecretBaseOwnerGfxId: @ 0x080EA274 push {r4, r5, lr} ldr r5, _080EA29C ldr r4, _080EA2A0 @@ -481615,7 +481615,7 @@ sub_080EA274: @ 0x080EA274 bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080EAE54 + bl GetSecretBaseOwnerType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r4 @@ -481629,10 +481629,10 @@ sub_080EA274: @ 0x080EA274 _080EA29C: .4byte 0x0000401F _080EA2A0: .4byte gUnknown_8568B0C _080EA2A4: .4byte 0x00004054 - thumb_func_end sub_080EA274 + thumb_func_end SetSecretBaseOwnerGfxId - thumb_func_start sub_080EA2A8 -sub_080EA2A8: @ 0x080EA2A8 + thumb_func_start SetCurSecretBaseIdFromPosition +SetCurSecretBaseIdFromPosition: @ 0x080EA2A8 push {r4, r5, r6, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -481683,26 +481683,26 @@ _080EA300: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080EA2A8 + thumb_func_end SetCurSecretBaseIdFromPosition - thumb_func_start sub_080EA308 -sub_080EA308: @ 0x080EA308 + thumb_func_start FldEffPoison_Start +FldEffPoison_Start: @ 0x080EA308 push {lr} - bl sub_080EA2A8 - bl sub_080E97F8 + bl SetCurSecretBaseIdFromPosition + bl TrySetCurSecretBaseIndex ldr r0, _080EA31C bl ScriptContext1_SetupScript pop {r0} bx r0 .align 2, 0 _080EA31C: .4byte gUnknown_8245C66 - thumb_func_end sub_080EA308 + thumb_func_end FldEffPoison_Start - thumb_func_start sub_080EA320 -sub_080EA320: @ 0x080EA320 + thumb_func_start TrySetCurSecretBase +TrySetCurSecretBase: @ 0x080EA320 push {lr} - bl sub_080E97E4 - bl sub_080E97F8 + bl SetCurSecretBaseId + bl TrySetCurSecretBaseIndex ldr r0, _080EA338 ldrh r0, [r0] cmp r0, #1 @@ -481717,10 +481717,10 @@ _080EA33E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080EA320 + thumb_func_end TrySetCurSecretBase - thumb_func_start sub_080EA344 -sub_080EA344: @ 0x080EA344 + thumb_func_start Task_WarpOutOfSecretBase +Task_WarpOutOfSecretBase: @ 0x080EA344 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -481763,43 +481763,43 @@ _080EA37C: _080EA390: .4byte gUnknown_2037C74 _080EA394: movs r0, #0x7e - bl sub_0808461C - bl sub_08084540 + bl SetWarpDestinationToDynamicWarp + bl WarpIntoMap ldr r0, _080EA3BC ldr r1, _080EA3C0 str r1, [r0] ldr r0, _080EA3C4 - bl sub_08000540 + bl SetMainCallback2 bl sub_080987E8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080EA3B4: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080EA3BC: .4byte gUnknown_3005B0C -_080EA3C0: .4byte sub_080AEC94 -_080EA3C4: .4byte sub_08085934 - thumb_func_end sub_080EA344 +_080EA3C0: .4byte mapldr_default +_080EA3C4: .4byte CB2_LoadMap + thumb_func_end Task_WarpOutOfSecretBase thumb_func_start sub_080EA3C8 sub_080EA3C8: @ 0x080EA3C8 push {lr} ldr r0, _080EA3E0 movs r1, #0 - bl sub_080A8878 + bl CreateTask movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 -_080EA3E0: .4byte sub_080EA344 +_080EA3E0: .4byte Task_WarpOutOfSecretBase thumb_func_end sub_080EA3C8 - thumb_func_start sub_080EA3E4 -sub_080EA3E4: @ 0x080EA3E4 + thumb_func_start IsCurSecretBaseOwnedByAnotherPlayer +IsCurSecretBaseOwnedByAnotherPlayer: @ 0x080EA3E4 push {lr} ldr r0, _080EA400 ldr r0, [r0] @@ -481827,7 +481827,7 @@ _080EA414: bx r0 .align 2, 0 _080EA41C: .4byte gUnknown_2037290 - thumb_func_end sub_080EA3E4 + thumb_func_end IsCurSecretBaseOwnedByAnotherPlayer thumb_func_start sub_080EA420 sub_080EA420: @ 0x080EA420 @@ -481919,8 +481919,8 @@ _080EA4D0: .4byte 0x00001A9E _080EA4D4: .4byte gUnknown_2021C40 thumb_func_end sub_080EA48C - thumb_func_start sub_080EA4D8 -sub_080EA4D8: @ 0x080EA4D8 + thumb_func_start IsSecretBaseRegistered +IsSecretBaseRegistered: @ 0x080EA4D8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -481947,44 +481947,44 @@ _080EA506: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080EA4D8 + thumb_func_end IsSecretBaseRegistered - thumb_func_start sub_080EA50C -sub_080EA50C: @ 0x080EA50C + thumb_func_start GetAverageEVs +GetAverageEVs: @ 0x080EA50C push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x1a - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x1b - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x1c - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x1d - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x1e - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x1f - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -481996,10 +481996,10 @@ sub_080EA50C: @ 0x080EA50C pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080EA50C + thumb_func_end GetAverageEVs - thumb_func_start sub_080EA574 -sub_080EA574: @ 0x080EA574 + thumb_func_start SetPlayerSecretBaseParty +SetPlayerSecretBaseParty: @ 0x080EA574 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -482083,12 +482083,12 @@ _080EA5CE: adds r4, r5, r3 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080EA6B4 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080EA6B4 movs r4, #0 @@ -482105,7 +482105,7 @@ _080EA63A: adds r1, #0xd adds r0, r5, r2 str r2, [sp, #0x20] - bl sub_0806A058 + bl GetMonData mov r3, r8 adds r1, r3, r4 lsls r1, r1, #1 @@ -482125,30 +482125,30 @@ _080EA63A: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0xc] adds r1, r2, r7 strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x10] adds r1, r3, r7 strh r0, [r1] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x18] add r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [sp] add r1, r8 str r0, [r1] adds r0, r4, #0 - bl sub_080EA50C + bl GetAverageEVs ldr r1, [sp, #0x1c] add r1, sl strb r0, [r1] @@ -482181,10 +482181,10 @@ _080EA6E0: .4byte 0x00001B18 _080EA6E4: .4byte 0x00001B24 _080EA6E8: .4byte 0x00001B36 _080EA6EC: .4byte gUnknown_2024190 - thumb_func_end sub_080EA574 + thumb_func_end SetPlayerSecretBaseParty - thumb_func_start sub_080EA6F0 -sub_080EA6F0: @ 0x080EA6F0 + thumb_func_start ClearAndLeaveSecretBase +ClearAndLeaveSecretBase: @ 0x080EA6F0 push {r4, r5, r6, lr} ldr r5, _080EA714 ldr r0, [r5] @@ -482193,7 +482193,7 @@ sub_080EA6F0: @ 0x080EA6F0 ldrh r6, [r1] ldr r1, _080EA71C adds r0, r0, r1 - bl sub_080E977C + bl ClearSecretBase ldr r0, [r5] adds r0, r0, r4 strh r6, [r0] @@ -482205,20 +482205,20 @@ sub_080EA6F0: @ 0x080EA6F0 _080EA714: .4byte gUnknown_3005AEC _080EA718: .4byte 0x00001AAA _080EA71C: .4byte 0x00001A9C - thumb_func_end sub_080EA6F0 + thumb_func_end ClearAndLeaveSecretBase - thumb_func_start sub_080EA720 -sub_080EA720: @ 0x080EA720 + thumb_func_start MoveOutOfSecretBase +MoveOutOfSecretBase: @ 0x080EA720 push {lr} movs r0, #0x14 bl IncrementGameStat - bl sub_080EA6F0 + bl ClearAndLeaveSecretBase pop {r0} bx r0 - thumb_func_end sub_080EA720 + thumb_func_end MoveOutOfSecretBase - thumb_func_start sub_080EA730 -sub_080EA730: @ 0x080EA730 + thumb_func_start ClosePlayerSecretBaseEntrance +ClosePlayerSecretBaseEntrance: @ 0x080EA730 push {r4, r5, r6, r7, lr} ldr r0, _080EA73C ldr r4, [r0, #4] @@ -482248,7 +482248,7 @@ _080EA740: adds r0, #7 ldrh r1, [r2, #2] adds r1, #7 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0 ldr r5, _080EA798 lsls r0, r0, #0x10 @@ -482300,12 +482300,12 @@ _080EA7C8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080EA730 + thumb_func_end ClosePlayerSecretBaseEntrance - thumb_func_start sub_080EA7D0 -sub_080EA7D0: @ 0x080EA7D0 + thumb_func_start MoveOutOfSecretBaseFromOutside +MoveOutOfSecretBaseFromOutside: @ 0x080EA7D0 push {r4, r5, r6, lr} - bl sub_080EA730 + bl ClosePlayerSecretBaseEntrance movs r0, #0x14 bl IncrementGameStat ldr r5, _080EA7FC @@ -482315,7 +482315,7 @@ sub_080EA7D0: @ 0x080EA7D0 ldrh r6, [r1] ldr r1, _080EA804 adds r0, r0, r1 - bl sub_080E977C + bl ClearSecretBase ldr r0, [r5] adds r0, r0, r4 strh r6, [r0] @@ -482326,7 +482326,7 @@ sub_080EA7D0: @ 0x080EA7D0 _080EA7FC: .4byte gUnknown_3005AEC _080EA800: .4byte 0x00001AAA _080EA804: .4byte 0x00001A9C - thumb_func_end sub_080EA7D0 + thumb_func_end MoveOutOfSecretBaseFromOutside thumb_func_start GetNumRegisteredSecretBases GetNumRegisteredSecretBases: @ 0x080EA808 @@ -482336,7 +482336,7 @@ GetNumRegisteredSecretBases: @ 0x080EA808 _080EA80E: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080EA4D8 + bl IsSecretBaseRegistered lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -482359,14 +482359,14 @@ _080EA824: bx r1 thumb_func_end GetNumRegisteredSecretBases - thumb_func_start sub_080EA83C -sub_080EA83C: @ 0x080EA83C + thumb_func_start GetCurSecretBaseRegistrationValidity +GetCurSecretBaseRegistrationValidity: @ 0x080EA83C push {lr} ldr r0, _080EA85C bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080EA4D8 + bl IsSecretBaseRegistered lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #1 @@ -482398,10 +482398,10 @@ _080EA882: bx r0 .align 2, 0 _080EA888: .4byte gUnknown_2037290 - thumb_func_end sub_080EA83C + thumb_func_end GetCurSecretBaseRegistrationValidity - thumb_func_start sub_080EA88C -sub_080EA88C: @ 0x080EA88C + thumb_func_start ToggleCurSecretBaseRegistry +ToggleCurSecretBaseRegistry: @ 0x080EA88C push {lr} ldr r0, _080EA8C8 bl VarGet @@ -482433,14 +482433,14 @@ sub_080EA88C: @ 0x080EA88C _080EA8C8: .4byte 0x00004054 _080EA8CC: .4byte gUnknown_3005AEC _080EA8D0: .4byte 0x00001A9D - thumb_func_end sub_080EA88C + thumb_func_end ToggleCurSecretBaseRegistry thumb_func_start sub_080EA8D4 sub_080EA8D4: @ 0x080EA8D4 push {lr} ldr r0, _080EA8E4 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -482452,15 +482452,15 @@ sub_080EA8E8: @ 0x080EA8E8 push {lr} ldr r0, _080EA8F8 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080EA8F8: .4byte sub_080EA8FC +_080EA8F8: .4byte Task_ShowSecretBaseRegistryMenu thumb_func_end sub_080EA8E8 - thumb_func_start sub_080EA8FC -sub_080EA8FC: @ 0x080EA8FC + thumb_func_start Task_ShowSecretBaseRegistryMenu +Task_ShowSecretBaseRegistryMenu: @ 0x080EA8FC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -482488,15 +482488,15 @@ sub_080EA8FC: @ 0x080EA8FC ldr r4, _080EA964 movs r0, #0x84 lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r0, _080EA968 - bl sub_08003250 + bl AddWindow strh r0, [r5, #0xc] adds r0, r6, #0 - bl sub_080EA98C + bl BuildRegistryMenuItems adds r0, r6, #0 - bl sub_080EAA60 + bl FinalizeRegistryMenu mov r0, r8 subs r0, #8 adds r0, r7, r0 @@ -482507,12 +482507,12 @@ sub_080EA8FC: @ 0x080EA8FC _080EA960: .4byte gUnknown_3005B68 _080EA964: .4byte gUnknown_2039CEC _080EA968: .4byte gUnknown_8568B18 -_080EA96C: .4byte sub_080EAAF0 +_080EA96C: .4byte HandleRegistryMenuInput _080EA970: ldr r1, _080EA984 ldr r2, _080EA988 adds r0, r6, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080EA97A: pop {r3} mov r8, r3 @@ -482521,11 +482521,11 @@ _080EA97A: bx r0 .align 2, 0 _080EA984: .4byte gUnknown_85CA688 -_080EA988: .4byte sub_080EAE18 - thumb_func_end sub_080EA8FC +_080EA988: .4byte EventObjectInteractionPlantBerryTree + thumb_func_end Task_ShowSecretBaseRegistryMenu - thumb_func_start sub_080EA98C -sub_080EA98C: @ 0x080EA98C + thumb_func_start BuildRegistryMenuItems +BuildRegistryMenuItems: @ 0x080EA98C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -482542,7 +482542,7 @@ sub_080EA98C: @ 0x080EA98C mov r8, r0 _080EA9A8: adds r0, r5, #0 - bl sub_080EA4D8 + bl IsSecretBaseRegistered lsls r0, r0, #0x18 cmp r0, #0 beq _080EA9DC @@ -482621,7 +482621,7 @@ _080EAA1C: .align 2, 0 _080EAA44: .4byte gUnknown_3006050 _080EAA48: .4byte gUnknown_8568B28 - thumb_func_end sub_080EA98C + thumb_func_end BuildRegistryMenuItems thumb_func_start sub_080EAA4C sub_080EAA4C: @ 0x080EAA4C @@ -482637,8 +482637,8 @@ _080EAA5C: bx r0 thumb_func_end sub_080EAA4C - thumb_func_start sub_080EAA60 -sub_080EAA60: @ 0x080EAA60 + thumb_func_start FinalizeRegistryMenu +FinalizeRegistryMenu: @ 0x080EAA60 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -482650,28 +482650,28 @@ sub_080EAA60: @ 0x080EAA60 adds r4, r4, r0 ldrb r0, [r4, #0xc] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldr r0, _080EAAA0 ldrh r1, [r4, #4] ldrh r2, [r4, #2] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xa] adds r0, r5, #0 - bl sub_080EAAA4 + bl AddRegistryMenuScrollArrows movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080EAA9C: .4byte gUnknown_3005B68 _080EAAA0: .4byte gUnknown_3006050 - thumb_func_end sub_080EAA60 + thumb_func_end FinalizeRegistryMenu - thumb_func_start sub_080EAAA4 -sub_080EAAA4: @ 0x080EAAA4 + thumb_func_start AddRegistryMenuScrollArrows +AddRegistryMenuScrollArrows: @ 0x080EAAA4 push {r4, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -482696,7 +482696,7 @@ sub_080EAAA4: @ 0x080EAAA4 movs r1, #0xbc movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x10] @@ -482707,10 +482707,10 @@ sub_080EAAA4: @ 0x080EAAA4 .align 2, 0 _080EAAE8: .4byte gUnknown_3005B68 _080EAAEC: .4byte 0x000013F8 - thumb_func_end sub_080EAAA4 + thumb_func_end AddRegistryMenuScrollArrows - thumb_func_start sub_080EAAF0 -sub_080EAAF0: @ 0x080EAAF0 + thumb_func_start HandleRegistryMenuInput +HandleRegistryMenuInput: @ 0x080EAAF0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -482720,7 +482720,7 @@ sub_080EAAF0: @ 0x080EAAF0 ldr r1, _080EAB24 adds r4, r0, r1 ldrb r0, [r4, #0xa] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r5, r0, #0 ldrb r0, [r4, #0xa] adds r1, r4, #4 @@ -482742,23 +482742,23 @@ _080EAB28: ldrb r0, [r4, #0xa] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r4, #0x10] - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldrb r0, [r4, #0xc] movs r1, #0 bl sub_08197060 ldrb r0, [r4, #0xc] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #0xc] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _080EAB68 ldr r0, [r0] - bl sub_08000BF0 + bl Free adds r0, r6, #0 - bl sub_080EAE18 + bl EventObjectInteractionPlantBerryTree b _080EAB7A .align 2, 0 _080EAB68: .4byte gUnknown_2039CEC @@ -482772,7 +482772,7 @@ _080EAB7A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080EAAF0 + thumb_func_end HandleRegistryMenuInput thumb_func_start sub_080EAB80 sub_080EAB80: @ 0x080EAB80 @@ -482786,14 +482786,14 @@ sub_080EAB80: @ 0x080EAB80 ldr r6, _080EABE8 adds r5, r4, r6 ldrb r0, [r5, #0x10] - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, _080EABEC - bl sub_08003250 + bl AddWindow strh r0, [r5, #0xe] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldrb r0, [r5, #0xe] ldr r1, _080EABF0 str r1, [sp] @@ -482813,7 +482813,7 @@ sub_080EAB80: @ 0x080EAB80 movs r3, #2 bl sub_081984B0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram subs r6, #8 adds r4, r4, r6 ldr r0, _080EABF4 @@ -482835,7 +482835,7 @@ sub_080EABF8: @ 0x080EABF8 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r6, r5, #0 - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 @@ -482848,7 +482848,7 @@ sub_080EABF8: @ 0x080EABF8 movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_080EADD4 + bl ReturnToMainRegistryMenu b _080EAC3A _080EAC24: movs r0, #5 @@ -482868,8 +482868,8 @@ _080EAC3A: _080EAC40: .4byte gUnknown_8568AF4 thumb_func_end sub_080EABF8 - thumb_func_start sub_080EAC44 -sub_080EAC44: @ 0x080EAC44 + thumb_func_start ShowRegistryMenuDeleteConfirmation +ShowRegistryMenuDeleteConfirmation: @ 0x080EAC44 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -482886,24 +482886,24 @@ sub_080EAC44: @ 0x080EAC44 movs r1, #0 bl sub_08197060 ldrb r0, [r4, #0xc] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #0xe] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #0xe] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _080EACA4 ldrb r1, [r4, #8] bl sub_080EA420 ldr r4, _080EACA8 ldr r1, _080EACAC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _080EACB0 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r4, r5} pop {r0} bx r0 @@ -482913,7 +482913,7 @@ _080EACA4: .4byte gUnknown_2021C40 _080EACA8: .4byte gUnknown_2021C7C _080EACAC: .4byte gUnknown_85CA658 _080EACB0: .4byte sub_080EACB4 - thumb_func_end sub_080EAC44 + thumb_func_end ShowRegistryMenuDeleteConfirmation thumb_func_start sub_080EACB4 sub_080EACB4: @ 0x080EACB4 @@ -482932,8 +482932,8 @@ sub_080EACB4: @ 0x080EACB4 _080EACD0: .4byte gUnknown_8568B04 thumb_func_end sub_080EACB4 - thumb_func_start sub_080EACD4 -sub_080EACD4: @ 0x080EACD4 + thumb_func_start DeleteRegistry_Yes_Callback +DeleteRegistry_Yes_Callback: @ 0x080EACD4 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -482958,7 +482958,7 @@ sub_080EACD4: @ 0x080EACD4 mov sl, r1 mov r1, sb mov r2, sl - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _080EAD5C ldr r2, [r0] movs r0, #8 @@ -482974,14 +482974,14 @@ sub_080EACD4: @ 0x080EACD4 ands r0, r1 strb r0, [r2] adds r0, r4, #0 - bl sub_080EA98C + bl BuildRegistryMenuItems ldrb r2, [r6, #6] ldrb r3, [r6] mov r0, sb mov r1, sl bl sub_08122268 adds r0, r4, #0 - bl sub_080EAA60 + bl FinalizeRegistryMenu movs r0, #8 rsbs r0, r0, #0 add r8, r0 @@ -482999,8 +482999,8 @@ sub_080EACD4: @ 0x080EACD4 _080EAD58: .4byte gUnknown_3005B68 _080EAD5C: .4byte gUnknown_3005AEC _080EAD60: .4byte 0x00001A9D -_080EAD64: .4byte sub_080EAAF0 - thumb_func_end sub_080EACD4 +_080EAD64: .4byte HandleRegistryMenuInput + thumb_func_end DeleteRegistry_Yes_Callback thumb_func_start sub_080EAD68 sub_080EAD68: @ 0x080EAD68 @@ -483009,16 +483009,16 @@ sub_080EAD68: @ 0x080EAD68 lsrs r0, r0, #0x18 ldr r1, _080EAD7C ldr r2, _080EAD80 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r0} bx r0 .align 2, 0 _080EAD7C: .4byte gUnknown_85CA676 -_080EAD80: .4byte sub_080EACD4 +_080EAD80: .4byte DeleteRegistry_Yes_Callback thumb_func_end sub_080EAD68 - thumb_func_start sub_080EAD84 -sub_080EAD84: @ 0x080EAD84 + thumb_func_start DeleteRegistry_No +DeleteRegistry_No: @ 0x080EAD84 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -483038,9 +483038,9 @@ sub_080EAD84: @ 0x080EAD84 adds r1, r6, #4 adds r6, #2 adds r2, r6, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask adds r0, r5, #0 - bl sub_080EAA60 + bl FinalizeRegistryMenu movs r0, #8 rsbs r0, r0, #0 add r8, r0 @@ -483054,11 +483054,11 @@ sub_080EAD84: @ 0x080EAD84 bx r0 .align 2, 0 _080EADCC: .4byte gUnknown_3005B68 -_080EADD0: .4byte sub_080EAAF0 - thumb_func_end sub_080EAD84 +_080EADD0: .4byte HandleRegistryMenuInput + thumb_func_end DeleteRegistry_No - thumb_func_start sub_080EADD4 -sub_080EADD4: @ 0x080EADD4 + thumb_func_start ReturnToMainRegistryMenu +ReturnToMainRegistryMenu: @ 0x080EADD4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -483067,16 +483067,16 @@ sub_080EADD4: @ 0x080EADD4 lsls r4, r4, #3 ldr r6, _080EAE10 adds r5, r4, r6 - bl sub_080EAAA4 + bl AddRegistryMenuScrollArrows ldrb r0, [r5, #0xe] movs r1, #0 bl sub_08197060 ldrb r0, [r5, #0xe] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r5, #0xe] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram subs r6, #8 adds r4, r4, r6 ldr r0, _080EAE14 @@ -483086,11 +483086,11 @@ sub_080EADD4: @ 0x080EADD4 bx r0 .align 2, 0 _080EAE10: .4byte gUnknown_3005B68 -_080EAE14: .4byte sub_080EAAF0 - thumb_func_end sub_080EADD4 +_080EAE14: .4byte HandleRegistryMenuInput + thumb_func_end ReturnToMainRegistryMenu - thumb_func_start sub_080EAE18 -sub_080EAE18: @ 0x080EAE18 + thumb_func_start EventObjectInteractionPlantBerryTree +EventObjectInteractionPlantBerryTree: @ 0x080EAE18 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -483110,16 +483110,16 @@ _080EAE3C: bl ScriptContext1_SetupScript _080EAE42: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 .align 2, 0 _080EAE50: .4byte gUnknown_821D4D8 - thumb_func_end sub_080EAE18 + thumb_func_end EventObjectInteractionPlantBerryTree - thumb_func_start sub_080EAE54 -sub_080EAE54: @ 0x080EAE54 + thumb_func_start GetSecretBaseOwnerType +GetSecretBaseOwnerType: @ 0x080EAE54 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -483151,16 +483151,16 @@ sub_080EAE54: @ 0x080EAE54 _080EAE8C: .4byte gUnknown_3005AEC _080EAE90: .4byte 0x00001AA5 _080EAE94: .4byte 0x00001A9D - thumb_func_end sub_080EAE54 + thumb_func_end GetSecretBaseOwnerType - thumb_func_start sub_080EAE98 -sub_080EAE98: @ 0x080EAE98 + thumb_func_start GetSecretBaseTrainerLoseText +GetSecretBaseTrainerLoseText: @ 0x080EAE98 push {lr} ldr r0, _080EAEB8 bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080EAE54 + bl GetSecretBaseOwnerType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -483234,10 +483234,10 @@ _080EAF22: bx r1 .align 2, 0 _080EAF28: .4byte gUnknown_8245819 - thumb_func_end sub_080EAE98 + thumb_func_end GetSecretBaseTrainerLoseText - thumb_func_start sub_080EAF2C -sub_080EAF2C: @ 0x080EAF2C + thumb_func_start PrepSecretBaseBattleFlags +PrepSecretBaseBattleFlags: @ 0x080EAF2C push {lr} movs r0, #1 bl sub_0813BB14 @@ -483255,7 +483255,7 @@ sub_080EAF2C: @ 0x080EAF2C _080EAF48: .4byte gUnknown_203886A _080EAF4C: .4byte gUnknown_2022C90 _080EAF50: .4byte 0x08000008 - thumb_func_end sub_080EAF2C + thumb_func_end PrepSecretBaseBattleFlags thumb_func_start sub_080EAF54 sub_080EAF54: @ 0x080EAF54 @@ -483292,8 +483292,8 @@ _080EAF94: .4byte gUnknown_2037290 _080EAF98: .4byte 0x00001A9D thumb_func_end sub_080EAF54 - thumb_func_start sub_080EAF9C -sub_080EAF9C: @ 0x080EAF9C + thumb_func_start GetSecretBaseOwnerInteractionState +GetSecretBaseOwnerInteractionState: @ 0x080EAF9C push {r4, r5, r6, r7, lr} ldr r0, _080EB014 bl VarGet @@ -483331,7 +483331,7 @@ _080EAFE2: ldr r4, _080EB024 lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080EAE54 + bl GetSecretBaseOwnerType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -483358,10 +483358,10 @@ _080EB01C: .4byte gUnknown_3005AEC _080EB020: .4byte 0x00001A9D _080EB024: .4byte gUnknown_2037280 _080EB028: .4byte gUnknown_2037290 - thumb_func_end sub_080EAF9C + thumb_func_end GetSecretBaseOwnerInteractionState - thumb_func_start sub_080EB02C -sub_080EB02C: @ 0x080EB02C + thumb_func_start SecretBasePerStepCallback +SecretBasePerStepCallback: @ 0x080EB02C push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -483460,7 +483460,7 @@ _080EB0BC: ldrsh r0, [r0, r3] movs r2, #0 ldrsh r1, [r6, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #0x8d @@ -483574,7 +483574,7 @@ _080EB1CE: ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r6, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080EB208 cmp r0, r1 bne _080EB214 @@ -483703,7 +483703,7 @@ _080EB2E0: ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r6, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 asrs r0, r0, #0x10 mov r1, sp @@ -483711,7 +483711,7 @@ _080EB2E0: ldrsh r1, [r1, r3] movs r3, #0 ldrsh r2, [r6, r3] - bl sub_080FAE54 + bl PopSecretBaseBalloon ldr r0, _080EB340 ldrb r0, [r0] cmp r0, #1 @@ -483723,7 +483723,7 @@ _080EB318: ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r6, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 movs r0, #0xce lsls r0, r0, #2 @@ -483792,7 +483792,7 @@ _080EB3A6: ldrsh r0, [r0, r3] movs r2, #0 ldrsh r1, [r6, r2] - bl sub_080FB004 + bl ShatterSecretBaseBreakableDoor b _080EB468 .align 2, 0 _080EB3B8: .4byte gUnknown_2039CE9 @@ -483883,7 +483883,7 @@ _080EB468: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080EB02C + thumb_func_end SecretBasePerStepCallback thumb_func_start sub_080EB470 sub_080EB470: @ 0x080EB470 @@ -484045,8 +484045,8 @@ _080EB580: .align 2, 0 thumb_func_end SecretBasesBelongToSamePlayer - thumb_func_start sub_080EB588 -sub_080EB588: @ 0x080EB588 + thumb_func_start GetSecretBaseIndexFromId +GetSecretBaseIndexFromId: @ 0x080EB588 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -484084,10 +484084,10 @@ _080EB5C8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080EB588 + thumb_func_end GetSecretBaseIndexFromId - thumb_func_start sub_080EB5D0 -sub_080EB5D0: @ 0x080EB5D0 + thumb_func_start FindAvailableSecretBaseIndex +FindAvailableSecretBaseIndex: @ 0x080EB5D0 push {r4, lr} movs r2, #1 ldr r0, _080EB5F4 @@ -484122,7 +484122,7 @@ _080EB60A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080EB5D0 + thumb_func_end FindAvailableSecretBaseIndex thumb_func_start sub_080EB610 sub_080EB610: @ 0x080EB610 @@ -484177,7 +484177,7 @@ sub_080EB65C: @ 0x080EB65C cmp r0, #0 beq _080EB6DE ldrb r0, [r5] - bl sub_080EB588 + bl GetSecretBaseIndexFromId lsls r0, r0, #0x10 lsrs r4, r0, #0x10 asrs r2, r0, #0x10 @@ -484216,7 +484216,7 @@ _080EB6AA: _080EB6B0: .4byte gUnknown_3005AEC _080EB6B4: .4byte 0x00001A9D _080EB6B8: - bl sub_080EB5D0 + bl FindAvailableSecretBaseIndex lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -484242,8 +484242,8 @@ _080EB6E0: .align 2, 0 thumb_func_end sub_080EB65C - thumb_func_start sub_080EB6E8 -sub_080EB6E8: @ 0x080EB6E8 + thumb_func_start SortSecretBasesByRegistryStatus +SortSecretBasesByRegistryStatus: @ 0x080EB6E8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -484334,7 +484334,7 @@ _080EB778: .align 2, 0 _080EB790: .4byte gUnknown_3005AEC _080EB794: .4byte 0x00001A9C - thumb_func_end sub_080EB6E8 + thumb_func_end SortSecretBasesByRegistryStatus thumb_func_start sub_080EB798 sub_080EB798: @ 0x080EB798 @@ -484367,8 +484367,8 @@ _080EB7BC: bx r0 thumb_func_end sub_080EB798 - thumb_func_start sub_080EB7CC -sub_080EB7CC: @ 0x080EB7CC + thumb_func_start SecretBaseBelongsToPlayer +SecretBaseBelongsToPlayer: @ 0x080EB7CC push {r4, r5, r6, lr} adds r5, r0, #0 ldrb r0, [r5] @@ -484440,10 +484440,10 @@ _080EB846: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080EB7CC + thumb_func_end SecretBaseBelongsToPlayer - thumb_func_start sub_080EB84C -sub_080EB84C: @ 0x080EB84C + thumb_func_start DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords +DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords: @ 0x080EB84C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -484465,13 +484465,13 @@ _080EB860: mov r1, sl adds r4, r1, r0 adds r0, r4, #0 - bl sub_080EB7CC + bl SecretBaseBelongsToPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080EB88A adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase movs r0, #1 orrs r5, r0 _080EB88A: @@ -484486,13 +484486,13 @@ _080EB88A: mov r1, sb adds r4, r1, r0 adds r0, r4, #0 - bl sub_080EB7CC + bl SecretBaseBelongsToPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080EB8B8 adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase orrs r5, r7 lsls r0, r5, #0x18 lsrs r5, r0, #0x18 @@ -484508,13 +484508,13 @@ _080EB8B8: mov r1, r8 adds r4, r1, r0 adds r0, r4, #0 - bl sub_080EB7CC + bl SecretBaseBelongsToPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080EB8E6 adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase orrs r5, r7 lsls r0, r5, #0x18 lsrs r5, r0, #0x18 @@ -484535,7 +484535,7 @@ _080EB8F4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080EB84C + thumb_func_end DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords thumb_func_start sub_080EB904 sub_080EB904: @ 0x080EB904 @@ -484566,7 +484566,7 @@ _080EB914: cmp r7, #0 bne _080EB940 adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase b _080EB978 _080EB940: ldrh r0, [r6, #0xe] @@ -484574,7 +484574,7 @@ _080EB940: cmp r0, r3 bls _080EB950 adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase b _080EB978 _080EB950: ldrb r0, [r6, #1] @@ -484588,7 +484588,7 @@ _080EB950: orrs r1, r0 strb r1, [r4, #1] adds r0, r6, #0 - bl sub_080E977C + bl ClearSecretBase movs r0, #1 b _080EB97A _080EB96E: @@ -484753,7 +484753,7 @@ sub_080EBA80: @ 0x080EBA80 adds r1, r2, #0 bl sub_080EB65C adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase _080EBA9E: pop {r4} pop {r0} @@ -484799,7 +484799,7 @@ sub_080EBAE0: @ 0x080EBAE0 ldr r0, [r4] ldr r1, [r4, #8] ldr r2, [r4, #0x10] - bl sub_080EB84C + bl DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords ldr r0, _080EBB5C ldr r0, [r0] ldr r1, _080EBB60 @@ -484849,8 +484849,8 @@ _080EBB5C: .4byte gUnknown_3005AEC _080EBB60: .4byte 0x00001A9C thumb_func_end sub_080EBAE0 - thumb_func_start sub_080EBB64 -sub_080EBB64: @ 0x080EBB64 + thumb_func_start ReceiveSecretBasesData +ReceiveSecretBasesData: @ 0x080EBB64 push {r4, r5, r6, r7, lr} sub sp, #0x18 adds r6, r0, #0 @@ -484864,7 +484864,7 @@ sub_080EBB64: @ 0x080EBB64 bne _080EBB7E b _080EBD0C _080EBB7E: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -485029,7 +485029,7 @@ _080EBCB4: lsrs r3, r0, #0x10 cmp r3, #0x13 bls _080EBC84 - bl sub_080EB6E8 + bl SortSecretBasesByRegistryStatus movs r3, #1 ldr r7, _080EBD18 adds r6, r7, #0 @@ -485081,10 +485081,10 @@ _080EBD1C: .4byte 0x00001A9D _080EBD20: .4byte 0x00001A9C _080EBD24: .4byte 0x00001AAA _080EBD28: .4byte 0x0000FFFF - thumb_func_end sub_080EBB64 + thumb_func_end ReceiveSecretBasesData - thumb_func_start sub_080EBD2C -sub_080EBD2C: @ 0x080EBD2C + thumb_func_start ClearJapaneseSecretBases +ClearJapaneseSecretBases: @ 0x080EBD2C push {r4, r5, lr} movs r5, #0 adds r4, r0, #0 @@ -485093,7 +485093,7 @@ _080EBD32: cmp r0, #1 beq _080EBD3E adds r0, r4, #0 - bl sub_080E977C + bl ClearSecretBase _080EBD3E: adds r4, #0xa0 adds r5, #1 @@ -485102,10 +485102,10 @@ _080EBD3E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080EBD2C + thumb_func_end ClearJapaneseSecretBases - thumb_func_start sub_080EBD4C -sub_080EBD4C: @ 0x080EBD4C + thumb_func_start EventObjectInteractionRemoveBerryTree +EventObjectInteractionRemoveBerryTree: @ 0x080EBD4C push {lr} ldr r0, _080EBD84 movs r1, #0 @@ -485148,7 +485148,7 @@ _080EBDA4: .align 2, 0 _080EBDB0: .4byte 0x000040F0 _080EBDB4: .4byte gUnknown_2039CE9 - thumb_func_end sub_080EBD4C + thumb_func_end EventObjectInteractionRemoveBerryTree thumb_func_start sub_080EBDB8 sub_080EBDB8: @ 0x080EBDB8 @@ -485163,7 +485163,7 @@ sub_080EBDB8: @ 0x080EBDB8 ldrb r0, [r6] cmp r0, #1 bne _080EBE12 - bl sub_080E9EA0 + bl CurMapIsSecretBase lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -485436,21 +485436,21 @@ _080EC030: .4byte 0x0000C7FF _080EC034: .4byte 0x0000FFFE thumb_func_end sub_080EBFD8 - thumb_func_start sub_080EC038 -sub_080EC038: @ 0x080EC038 + thumb_func_start SetSecretBaseSecretsTvFlags_Poster +SetSecretBaseSecretsTvFlags_Poster: @ 0x080EC038 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080EC068 adds r0, r0, r1 cmp r0, #0x18 @@ -485515,7 +485515,7 @@ _080EC0FC: .align 2, 0 _080EC104: .4byte 0x00004054 _080EC108: .4byte 0x000040EE - thumb_func_end sub_080EC038 + thumb_func_end SetSecretBaseSecretsTvFlags_Poster thumb_func_start sub_080EC10C sub_080EC10C: @ 0x080EC10C @@ -485525,13 +485525,13 @@ sub_080EC10C: @ 0x080EC10C adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080EC140 adds r0, r0, r1 cmp r0, #0xcf @@ -485864,21 +485864,21 @@ _080EC578: .4byte 0x00004054 _080EC57C: .4byte 0x000040EF thumb_func_end sub_080EC10C - thumb_func_start sub_080EC580 -sub_080EC580: @ 0x080EC580 + thumb_func_start SetSecretBaseSecretsTvFlags_LargeDecorationSpot +SetSecretBaseSecretsTvFlags_LargeDecorationSpot: @ 0x080EC580 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080EC5B4 adds r0, r0, r1 cmp r0, #0x35 @@ -485972,23 +485972,23 @@ _080EC6B8: .align 2, 0 _080EC6C0: .4byte 0x00004054 _080EC6C4: .4byte 0x000040EF - thumb_func_end sub_080EC580 + thumb_func_end SetSecretBaseSecretsTvFlags_LargeDecorationSpot - thumb_func_start sub_080EC6C8 -sub_080EC6C8: @ 0x080EC6C8 + thumb_func_start SetSecretBaseSecretsTvFlags_SmallDecorationSpot +SetSecretBaseSecretsTvFlags_SmallDecorationSpot: @ 0x080EC6C8 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080EC6FC adds r0, r0, r1 cmp r0, #0xa2 @@ -486229,23 +486229,23 @@ _080ECA0C: .align 2, 0 _080ECA14: .4byte 0x00004054 _080ECA18: .4byte 0x000040EF - thumb_func_end sub_080EC6C8 + thumb_func_end SetSecretBaseSecretsTvFlags_SmallDecorationSpot - thumb_func_start sub_080ECA1C -sub_080ECA1C: @ 0x080ECA1C + thumb_func_start SetSecretBaseSecretsTvFlags_SandOrnament +SetSecretBaseSecretsTvFlags_SandOrnament: @ 0x080ECA1C push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 ldr r0, _080ECA74 cmp r1, r0 @@ -486277,10 +486277,10 @@ _080ECA6C: _080ECA74: .4byte 0x0000028E _080ECA78: .4byte 0x00004054 _080ECA7C: .4byte 0x000040EF - thumb_func_end sub_080ECA1C + thumb_func_end SetSecretBaseSecretsTvFlags_SandOrnament - thumb_func_start sub_080ECA80 -sub_080ECA80: @ 0x080ECA80 + thumb_func_start ClearTVShowData +ClearTVShowData: @ 0x080ECA80 push {r4, r5, r6, r7, lr} movs r3, #0 ldr r6, _080ECAD0 @@ -486326,10 +486326,10 @@ _080ECAAA: _080ECAD0: .4byte gUnknown_3005AEC _080ECAD4: .4byte 0x000027CE _080ECAD8: .4byte 0x000027CC - thumb_func_end sub_080ECA80 + thumb_func_end ClearTVShowData - thumb_func_start sub_080ECADC -sub_080ECADC: @ 0x080ECADC + thumb_func_start special_0x44 +special_0x44: @ 0x080ECADC push {r4, r5, r6, r7, lr} movs r4, #5 ldr r1, _080ECB50 @@ -486425,12 +486425,12 @@ _080ECB8C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ECADC + thumb_func_end special_0x44 - thumb_func_start sub_080ECB94 -sub_080ECB94: @ 0x080ECB94 + thumb_func_start FindAnyTVShowOnTheAir +FindAnyTVShowOnTheAir: @ 0x080ECB94 push {lr} - bl sub_080ECADC + bl special_0x44 lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0xff @@ -486454,7 +486454,7 @@ _080ECBA6: ldrb r0, [r0] cmp r0, #0x29 bne _080ECBDC - bl sub_080ECD2C + bl FindFirstActiveTVShowThatIsNotAMassOutbreak lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080ECBDE @@ -486468,16 +486468,16 @@ _080ECBDE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ECB94 + thumb_func_end FindAnyTVShowOnTheAir - thumb_func_start sub_080ECBE4 -sub_080ECBE4: @ 0x080ECBE4 + thumb_func_start UpdateTVScreensOnMap +UpdateTVScreensOnMap: @ 0x080ECBE4 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 ldr r0, _080ECC18 bl FlagSet - bl sub_080F0B0C + bl CheckForBigMovieOrEmergencyNewsOnTV lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -486493,7 +486493,7 @@ _080ECC0A: adds r0, r4, #0 adds r1, r5, #0 movs r2, #3 - bl sub_080ECC6C + bl SetTVMetatilesOnMap b _080ECC5E .align 2, 0 _080ECC18: .4byte 0x00000891 @@ -486504,17 +486504,17 @@ _080ECC20: lsls r0, r0, #0x18 cmp r0, #0 beq _080ECC5E - bl sub_080ECB94 + bl FindAnyTVShowOnTheAir lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff bne _080ECC4E - bl sub_080EFA24 + bl FindAnyTVNewsOnTheAir lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff bne _080ECC4E - bl sub_080ED0D0 + bl IsTVShowInSearchOfTrainersAiring lsls r0, r0, #0x18 cmp r0, #0 beq _080ECC5E @@ -486524,7 +486524,7 @@ _080ECC4E: adds r0, r4, #0 adds r1, r5, #0 movs r2, #3 - bl sub_080ECC6C + bl SetTVMetatilesOnMap _080ECC5E: pop {r4, r5} pop {r0} @@ -486532,10 +486532,10 @@ _080ECC5E: .align 2, 0 _080ECC64: .4byte 0x00000892 _080ECC68: .4byte 0x00000891 - thumb_func_end sub_080ECBE4 + thumb_func_end UpdateTVScreensOnMap - thumb_func_start sub_080ECC6C -sub_080ECC6C: @ 0x080ECC6C + thumb_func_start SetTVMetatilesOnMap +SetTVMetatilesOnMap: @ 0x080ECC6C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -486589,37 +486589,37 @@ _080ECCC0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080ECC6C + thumb_func_end SetTVMetatilesOnMap - thumb_func_start sub_080ECCD0 -sub_080ECCD0: @ 0x080ECCD0 + thumb_func_start TurnOffTVScreen +TurnOffTVScreen: @ 0x080ECCD0 push {lr} ldr r1, _080ECCE8 ldr r0, [r1] ldr r1, [r1, #4] movs r2, #2 - bl sub_080ECC6C + bl SetTVMetatilesOnMap bl DrawWholeMapView pop {r0} bx r0 .align 2, 0 _080ECCE8: .4byte gUnknown_3005B20 - thumb_func_end sub_080ECCD0 + thumb_func_end TurnOffTVScreen - thumb_func_start sub_080ECCEC -sub_080ECCEC: @ 0x080ECCEC + thumb_func_start TurnOnTVScreen +TurnOnTVScreen: @ 0x080ECCEC push {lr} ldr r1, _080ECD04 ldr r0, [r1] ldr r1, [r1, #4] movs r2, #3 - bl sub_080ECC6C + bl SetTVMetatilesOnMap bl DrawWholeMapView pop {r0} bx r0 .align 2, 0 _080ECD04: .4byte gUnknown_3005B20 - thumb_func_end sub_080ECCEC + thumb_func_end TurnOnTVScreen thumb_func_start special_0x45 special_0x45: @ 0x080ECD08 @@ -486641,8 +486641,8 @@ _080ECD24: .4byte gUnknown_2037280 _080ECD28: .4byte 0x000027CC thumb_func_end special_0x45 - thumb_func_start sub_080ECD2C -sub_080ECD2C: @ 0x080ECD2C + thumb_func_start FindFirstActiveTVShowThatIsNotAMassOutbreak +FindFirstActiveTVShowThatIsNotAMassOutbreak: @ 0x080ECD2C push {r4, lr} movs r2, #0 ldr r0, _080ECD58 @@ -486681,7 +486681,7 @@ _080ECD6C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ECD2C + thumb_func_end FindFirstActiveTVShowThatIsNotAMassOutbreak thumb_func_start sub_080ECD74 sub_080ECD74: @ 0x080ECD74 @@ -486704,7 +486704,7 @@ sub_080ECD74: @ 0x080ECD74 ldrh r0, [r0] cmp r0, #0 beq _080ECDB4 - bl sub_080ECD2C + bl FindFirstActiveTVShowThatIsNotAMassOutbreak lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _080ECDB6 @@ -486846,8 +486846,8 @@ _080ECEB4: .4byte 0x00002BAF _080ECEB8: .4byte 0x00002BAC thumb_func_end ResetGabbyAndTy - thumb_func_start sub_080ECEBC -sub_080ECEBC: @ 0x080ECEBC + thumb_func_start GabbyAndTyBeforeInterview +GabbyAndTyBeforeInterview: @ 0x080ECEBC push {r4, lr} ldr r3, _080ECF24 ldr r2, [r3] @@ -486998,10 +486998,10 @@ _080ECFD6: _080ECFDC: .4byte 0x00002BAE _080ECFE0: .4byte gUnknown_3005AEC _080ECFE4: .4byte 0x00002BA8 - thumb_func_end sub_080ECEBC + thumb_func_end GabbyAndTyBeforeInterview - thumb_func_start sub_080ECFE8 -sub_080ECFE8: @ 0x080ECFE8 + thumb_func_start GabbyAndTyAfterInterview +GabbyAndTyAfterInterview: @ 0x080ECFE8 push {r4, r5, r6, lr} ldr r5, _080ED074 ldr r2, [r5] @@ -487077,7 +487077,7 @@ _080ED078: .4byte 0x00002BAE _080ED07C: .4byte 0x00002BAF _080ED080: .4byte gUnknown_2036FB8 _080ED084: .4byte 0x00002BAC - thumb_func_end sub_080ECFE8 + thumb_func_end GabbyAndTyAfterInterview thumb_func_start TakeTVShowInSearchOfTrainersOffTheAir TakeTVShowInSearchOfTrainersOffTheAir: @ 0x080ED088 @@ -487096,8 +487096,8 @@ _080ED09C: .4byte gUnknown_3005AEC _080ED0A0: .4byte 0x00002BAE thumb_func_end TakeTVShowInSearchOfTrainersOffTheAir - thumb_func_start sub_080ED0A4 -sub_080ED0A4: @ 0x080ED0A4 + thumb_func_start GabbyAndTyGetBattleNum +GabbyAndTyGetBattleNum: @ 0x080ED0A4 push {lr} ldr r0, _080ED0C8 ldr r0, [r0] @@ -487118,10 +487118,10 @@ _080ED0C2: .align 2, 0 _080ED0C8: .4byte gUnknown_3005AEC _080ED0CC: .4byte 0x00002BAD - thumb_func_end sub_080ED0A4 + thumb_func_end GabbyAndTyGetBattleNum - thumb_func_start sub_080ED0D0 -sub_080ED0D0: @ 0x080ED0D0 + thumb_func_start IsTVShowInSearchOfTrainersAiring +IsTVShowInSearchOfTrainersAiring: @ 0x080ED0D0 ldr r0, _080ED0E0 ldr r0, [r0] ldr r1, _080ED0E4 @@ -487133,10 +487133,10 @@ sub_080ED0D0: @ 0x080ED0D0 .align 2, 0 _080ED0E0: .4byte gUnknown_3005AEC _080ED0E4: .4byte 0x00002BAE - thumb_func_end sub_080ED0D0 + thumb_func_end IsTVShowInSearchOfTrainersAiring - thumb_func_start sub_080ED0E8 -sub_080ED0E8: @ 0x080ED0E8 + thumb_func_start GabbyAndTyGetLastQuote +GabbyAndTyGetLastQuote: @ 0x080ED0E8 push {r4, r5, lr} ldr r5, _080ED114 ldr r0, [r5] @@ -487148,7 +487148,7 @@ sub_080ED0E8: @ 0x080ED0E8 beq _080ED124 ldr r0, _080ED120 ldrh r1, [r1] - bl sub_0811F180 + bl CopyEasyChatWord ldr r1, [r5] ldr r0, _080ED118 adds r1, r1, r0 @@ -487169,10 +487169,10 @@ _080ED126: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080ED0E8 + thumb_func_end GabbyAndTyGetLastQuote - thumb_func_start sub_080ED12C -sub_080ED12C: @ 0x080ED12C + thumb_func_start GabbyAndTyGetLastBattleTrivia +GabbyAndTyGetLastBattleTrivia: @ 0x080ED12C push {lr} ldr r0, _080ED144 ldr r0, [r0] @@ -487215,12 +487215,12 @@ _080ED172: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ED12C + thumb_func_end GabbyAndTyGetLastBattleTrivia - thumb_func_start sub_080ED178 -sub_080ED178: @ 0x080ED178 + thumb_func_start GabbyAndTySetScriptVarsToEventObjectLocalIds +GabbyAndTySetScriptVarsToEventObjectLocalIds: @ 0x080ED178 push {lr} - bl sub_080ED0A4 + bl GabbyAndTyGetBattleNum lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #1 @@ -487326,10 +487326,10 @@ _080ED250: .align 2, 0 _080ED254: .4byte gUnknown_2037280 _080ED258: .4byte gUnknown_2037282 - thumb_func_end sub_080ED178 + thumb_func_end GabbyAndTySetScriptVarsToEventObjectLocalIds - thumb_func_start sub_080ED25C -sub_080ED25C: @ 0x080ED25C + thumb_func_start InterviewAfter +InterviewAfter: @ 0x080ED25C push {lr} ldr r0, _080ED274 ldrh r0, [r0] @@ -487354,10 +487354,10 @@ _080ED27C: @ jump table .4byte _080ED2BA @ case 6 .4byte _080ED2C0 @ case 7 _080ED29C: - bl sub_080EE07C + bl InterviewAfter_FanClubLetter b _080ED2C4 _080ED2A2: - bl sub_080EE0EC + bl InterviewAfter_RecentHappenings b _080ED2C4 _080ED2A8: bl sub_080EE144 @@ -487366,20 +487366,20 @@ _080ED2AE: bl sub_080EE234 b _080ED2C4 _080ED2B4: - bl sub_080EDAB0 + bl InterviewAfter_BravoTrainerPokemonProfile b _080ED2C4 _080ED2BA: - bl sub_080EDCAC + bl InterviewAfter_BravoTrainerBattleTowerProfile b _080ED2C4 _080ED2C0: - bl sub_080ED5CC + bl InterviewAfter_ContestLiveUpdates _080ED2C4: pop {r0} bx r0 - thumb_func_end sub_080ED25C + thumb_func_end InterviewAfter - thumb_func_start sub_080ED2C8 -sub_080ED2C8: @ 0x080ED2C8 + thumb_func_start PutPokemonTodayCaughtOnAir +PutPokemonTodayCaughtOnAir: @ 0x080ED2C8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -487390,14 +487390,14 @@ sub_080ED2C8: @ 0x080ED2C8 ldrh r0, [r5, #0x28] cmp r0, #0 bne _080ED2EC - bl sub_080ED490 + bl PutPokemonTodayFailedOnTheAir b _080ED41E .align 2, 0 _080ED2E8: .4byte gUnknown_3005A70 _080ED2EC: bl sub_080ED438 ldr r0, _080ED3A8 - bl sub_080F0628 + bl TV_BernoulliTrial lsls r0, r0, #0x18 cmp r0, #0 beq _080ED2FE @@ -487431,7 +487431,7 @@ _080ED318: beq _080ED41E movs r0, #0x15 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -487537,7 +487537,7 @@ _080ED3F2: ldrh r0, [r4, #0x28] strh r0, [r5, #0x10] adds r0, r5, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080ED434 ldrb r0, [r0] strb r0, [r5, #2] @@ -487553,7 +487553,7 @@ _080ED428: .4byte gUnknown_2023EAC _080ED42C: .4byte gUnknown_3005AF0 _080ED430: .4byte gUnknown_3005A9A _080ED434: .4byte gUnknown_829BDA5 - thumb_func_end sub_080ED2C8 + thumb_func_end PutPokemonTodayCaughtOnAir thumb_func_start sub_080ED438 sub_080ED438: @ 0x080ED438 @@ -487570,7 +487570,7 @@ sub_080ED438: @ 0x080ED438 movs r1, #0x18 bl DeleteTVShowInArrayByIdx movs r0, #5 - bl sub_08084180 + bl GetGameStat strh r0, [r4, #6] movs r0, #0x19 strb r0, [r4] @@ -487597,13 +487597,13 @@ _080ED488: .4byte gUnknown_3005A70 _080ED48C: .4byte gUnknown_2036FB8 thumb_func_end sub_080ED438 - thumb_func_start sub_080ED490 -sub_080ED490: @ 0x080ED490 + thumb_func_start PutPokemonTodayFailedOnTheAir +PutPokemonTodayFailedOnTheAir: @ 0x080ED490 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} ldr r0, _080ED554 - bl sub_080F0628 + bl TV_BernoulliTrial lsls r0, r0, #0x18 cmp r0, #0 bne _080ED548 @@ -487650,7 +487650,7 @@ _080ED4D4: beq _080ED548 movs r0, #0x17 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -487685,7 +487685,7 @@ _080ED4D4: ldr r1, [r1] bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080ED578 ldrb r0, [r0] strb r0, [r4, #2] @@ -487706,10 +487706,10 @@ _080ED56C: .4byte gUnknown_3005A70 _080ED570: .4byte gUnknown_2036FB8 _080ED574: .4byte gUnknown_3005AF0 _080ED578: .4byte gUnknown_829BDA5 - thumb_func_end sub_080ED490 + thumb_func_end PutPokemonTodayFailedOnTheAir - thumb_func_start sub_080ED57C -sub_080ED57C: @ 0x080ED57C + thumb_func_start tv_store_id_3x +tv_store_id_3x: @ 0x080ED57C push {r4, lr} adds r4, r0, #0 bl GetPlayerIDAsU32 @@ -487729,10 +487729,10 @@ sub_080ED57C: @ 0x080ED57C pop {r4} pop {r0} bx r0 - thumb_func_end sub_080ED57C + thumb_func_end tv_store_id_3x - thumb_func_start sub_080ED5A4 -sub_080ED5A4: @ 0x080ED5A4 + thumb_func_start tv_store_id_2x +tv_store_id_2x: @ 0x080ED5A4 push {r4, lr} adds r4, r0, #0 bl GetPlayerIDAsU32 @@ -487752,10 +487752,10 @@ sub_080ED5A4: @ 0x080ED5A4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080ED5A4 + thumb_func_end tv_store_id_2x - thumb_func_start sub_080ED5CC -sub_080ED5CC: @ 0x080ED5CC + thumb_func_start InterviewAfter_ContestLiveUpdates +InterviewAfter_ContestLiveUpdates: @ 0x080ED5CC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -487796,7 +487796,7 @@ sub_080ED5CC: @ 0x080ED5CC adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #0x12] ldrh r0, [r6, #2] strh r0, [r4, #2] @@ -487815,7 +487815,7 @@ sub_080ED5CC: @ 0x080ED5CC adds r1, r7, r2 bl StringCopy adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080ED690 ldrb r0, [r0] strb r0, [r4, #0x1d] @@ -487843,7 +487843,7 @@ _080ED684: .4byte gUnknown_2039BC4 _080ED688: .4byte gUnknown_2024190 _080ED68C: .4byte 0x00002B30 _080ED690: .4byte gUnknown_829BDA5 - thumb_func_end sub_080ED5CC + thumb_func_end InterviewAfter_ContestLiveUpdates thumb_func_start sub_080ED694 sub_080ED694: @ 0x080ED694 @@ -487877,7 +487877,7 @@ sub_080ED694: @ 0x080ED694 cmp r0, r1 beq _080ED76E movs r0, #0xa - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080ED724 ldrh r0, [r0] cmp r0, #1 @@ -487937,7 +487937,7 @@ _080ED734: adds r1, r5, r6 bl StringCopy adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080ED780 ldrb r0, [r0] strb r0, [r4, #0x19] @@ -487964,8 +487964,8 @@ _080ED77C: .4byte gUnknown_20226A8 _080ED780: .4byte gUnknown_829BDA5 thumb_func_end sub_080ED694 - thumb_func_start sub_080ED784 -sub_080ED784: @ 0x080ED784 + thumb_func_start Put3CheersForPokeblocksOnTheAir +Put3CheersForPokeblocksOnTheAir: @ 0x080ED784 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -487999,7 +487999,7 @@ sub_080ED784: @ 0x080ED784 cmp r0, r1 beq _080ED7D4 movs r0, #9 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080ED7E4 ldrh r0, [r0] cmp r0, #1 @@ -488051,7 +488051,7 @@ _080ED7E8: ldrb r0, [r0] strb r0, [r4, #2] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080ED854 ldrb r0, [r0] strb r0, [r4, #0x14] @@ -488081,7 +488081,7 @@ _080ED85E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080ED784 + thumb_func_end Put3CheersForPokeblocksOnTheAir thumb_func_start sub_080ED870 sub_080ED870: @ 0x080ED870 @@ -488119,7 +488119,7 @@ sub_080ED870: @ 0x080ED870 ldr r1, _080ED8EC bl StringCopy adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080ED8F0 ldrb r0, [r0] strb r0, [r4, #0x17] @@ -488151,8 +488151,8 @@ _080ED8FA: bx r0 thumb_func_end sub_080ED870 - thumb_func_start sub_080ED900 -sub_080ED900: @ 0x080ED900 + thumb_func_start ContestLiveUpdates_BeforeInterview_1 +ContestLiveUpdates_BeforeInterview_1: @ 0x080ED900 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -488188,10 +488188,10 @@ _080ED940: .4byte gUnknown_3005AEC _080ED944: .4byte 0x000027CC _080ED948: .4byte gUnknown_3005E20 _080ED94C: .4byte 0x00002B2C - thumb_func_end sub_080ED900 + thumb_func_end ContestLiveUpdates_BeforeInterview_1 - thumb_func_start sub_080ED950 -sub_080ED950: @ 0x080ED950 + thumb_func_start ContestLiveUpdates_BeforeInterview_2 +ContestLiveUpdates_BeforeInterview_2: @ 0x080ED950 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -488220,10 +488220,10 @@ _080ED980: .4byte gUnknown_3005AEC _080ED984: .4byte 0x00002B2C _080ED988: .4byte 0x000027CC _080ED98C: .4byte gUnknown_3005E20 - thumb_func_end sub_080ED950 + thumb_func_end ContestLiveUpdates_BeforeInterview_2 - thumb_func_start sub_080ED990 -sub_080ED990: @ 0x080ED990 + thumb_func_start ContestLiveUpdates_BeforeInterview_3 +ContestLiveUpdates_BeforeInterview_3: @ 0x080ED990 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -488252,10 +488252,10 @@ _080ED9C0: .4byte gUnknown_3005AEC _080ED9C4: .4byte 0x00002B2C _080ED9C8: .4byte 0x000027CC _080ED9CC: .4byte gUnknown_3005E20 - thumb_func_end sub_080ED990 + thumb_func_end ContestLiveUpdates_BeforeInterview_3 - thumb_func_start sub_080ED9D0 -sub_080ED9D0: @ 0x080ED9D0 + thumb_func_start ContestLiveUpdates_BeforeInterview_4 +ContestLiveUpdates_BeforeInterview_4: @ 0x080ED9D0 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -488284,7 +488284,7 @@ _080EDA00: .4byte gUnknown_3005AEC _080EDA04: .4byte 0x00002B2C _080EDA08: .4byte 0x000027CC _080EDA0C: .4byte gUnknown_3005E20 - thumb_func_end sub_080ED9D0 + thumb_func_end ContestLiveUpdates_BeforeInterview_4 thumb_func_start sub_080EDA10 sub_080EDA10: @ 0x080EDA10 @@ -488362,8 +488362,8 @@ _080EDAA8: .4byte gUnknown_829BDA5 _080EDAAC: .4byte gUnknown_20226A0 thumb_func_end sub_080EDA10 - thumb_func_start sub_080EDAB0 -sub_080EDAB0: @ 0x080EDAB0 + thumb_func_start InterviewAfter_BravoTrainerPokemonProfile +InterviewAfter_BravoTrainerPokemonProfile: @ 0x080EDAB0 push {r4, r5, r6, r7, lr} ldr r0, _080EDB54 ldr r6, [r0] @@ -488431,7 +488431,7 @@ sub_080EDAB0: @ 0x080EDAB0 orrs r0, r1 strb r0, [r4, #0x13] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EDB6C ldrb r0, [r0] strb r0, [r4, #0x1e] @@ -488467,10 +488467,10 @@ _080EDB80: .align 2, 0 _080EDB88: .4byte gUnknown_3005AEC _080EDB8C: .4byte 0x000027CC - thumb_func_end sub_080EDAB0 + thumb_func_end InterviewAfter_BravoTrainerPokemonProfile - thumb_func_start sub_080EDB90 -sub_080EDB90: @ 0x080EDB90 + thumb_func_start BravoTrainerPokemonProfile_BeforeInterview1 +BravoTrainerPokemonProfile_BeforeInterview1: @ 0x080EDB90 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -488478,7 +488478,7 @@ sub_080EDB90: @ 0x080EDB90 ldr r0, [r4] ldr r1, _080EDBD8 adds r5, r0, r1 - bl sub_080F02B8 + bl InterviewBefore_BravoTrainerPkmnProfile ldr r0, [r4] ldr r1, _080EDBDC adds r0, r0, r1 @@ -488508,7 +488508,7 @@ _080EDBD4: .4byte gUnknown_3005AEC _080EDBD8: .4byte 0x00002B2C _080EDBDC: .4byte 0x000027CC _080EDBE0: .4byte gUnknown_3005E20 - thumb_func_end sub_080EDB90 + thumb_func_end BravoTrainerPokemonProfile_BeforeInterview1 thumb_func_start sub_080EDBE4 sub_080EDBE4: @ 0x080EDBE4 @@ -488569,7 +488569,7 @@ sub_080EDBE4: @ 0x080EDBE4 adds r0, r0, r4 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #2] ldrb r0, [r6] muls r0, r5, r0 @@ -488577,12 +488577,12 @@ sub_080EDBE4: @ 0x080EDBE4 ldr r2, _080EDCA8 add r2, r8 movs r1, #2 - bl sub_0806A058 + bl GetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #3 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #0x1f] _080EDC7C: pop {r3} @@ -488602,8 +488602,8 @@ _080EDCA4: .4byte gUnknown_2024190 _080EDCA8: .4byte 0x00002B34 thumb_func_end sub_080EDBE4 - thumb_func_start sub_080EDCAC -sub_080EDCAC: @ 0x080EDCAC + thumb_func_start InterviewAfter_BravoTrainerBattleTowerProfile +InterviewAfter_BravoTrainerBattleTowerProfile: @ 0x080EDCAC push {r4, r5, r6, lr} ldr r2, _080EDD1C ldr r0, _080EDD20 @@ -488674,7 +488674,7 @@ _080EDD3E: ldrh r0, [r0] strb r0, [r6, #0x1b] adds r0, r6, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EDD74 ldrb r0, [r0] strb r0, [r6, #0x1d] @@ -488699,10 +488699,10 @@ _080EDD70: .4byte gUnknown_2037280 _080EDD74: .4byte gUnknown_829BDA5 _080EDD78: .4byte gUnknown_3005AF0 _080EDD7C: .4byte 0x00000BEB - thumb_func_end sub_080EDCAC + thumb_func_end InterviewAfter_BravoTrainerBattleTowerProfile - thumb_func_start sub_080EDD80 -sub_080EDD80: @ 0x080EDD80 + thumb_func_start SaveRecordedItemPurchasesForTVShow +SaveRecordedItemPurchasesForTVShow: @ 0x080EDD80 push {r4, r5, r6, r7, lr} ldr r5, _080EDE40 ldr r0, [r5] @@ -488714,7 +488714,7 @@ sub_080EDD80: @ 0x080EDD80 cmp r1, r0 beq _080EDE3A ldr r0, _080EDE4C - bl sub_080F0628 + bl TV_BernoulliTrial lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -488733,7 +488733,7 @@ sub_080EDD80: @ 0x080EDD80 beq _080EDE3A movs r0, #0x16 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -488778,7 +488778,7 @@ _080EDDFE: cmp r4, #2 bls _080EDDFE movs r0, #1 - bl sub_080EFB3C + bl GetPriceReduction strb r0, [r5, #2] adds r0, r5, #0 adds r0, #0x13 @@ -488786,7 +488786,7 @@ _080EDDFE: ldr r1, [r1] bl StringCopy adds r0, r5, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EDE64 ldrb r0, [r0] strb r0, [r5, #3] @@ -488805,15 +488805,15 @@ _080EDE58: .4byte gUnknown_2039C20 _080EDE5C: .4byte gUnknown_2036FB8 _080EDE60: .4byte gUnknown_3005AF0 _080EDE64: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EDD80 + thumb_func_end SaveRecordedItemPurchasesForTVShow - thumb_func_start sub_080EDE68 -sub_080EDE68: @ 0x080EDE68 + thumb_func_start PutNameRaterShowOnTheAir +PutNameRaterShowOnTheAir: @ 0x080EDE68 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} - bl sub_080F02AC + bl InterviewBefore_NameRater ldr r0, _080EDF40 ldrh r0, [r0] cmp r0, #1 @@ -488828,7 +488828,7 @@ sub_080EDE68: @ 0x080EDE68 ldr r4, _080EDF4C movs r1, #2 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _080EDF50 mov sb, r1 ldr r0, [r1] @@ -488864,7 +488864,7 @@ sub_080EDE68: @ 0x080EDE68 adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #2] bl Random lsls r0, r0, #0x10 @@ -488878,7 +488878,7 @@ sub_080EDE68: @ 0x080EDE68 ands r0, r5 strb r0, [r4, #0x1b] ldrh r0, [r4, #2] - bl sub_080F0514 + bl TV_GetSomeOtherSpeciesAlreadySeenByPlayer strh r0, [r4, #0x1c] adds r0, r4, #0 adds r0, #0xf @@ -488891,9 +488891,9 @@ sub_080EDE68: @ 0x080EDE68 adds r0, r0, r6 adds r2, r4, #4 movs r1, #2 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EDF60 ldrb r0, [r0] strb r0, [r4, #0x1e] @@ -488915,7 +488915,7 @@ _080EDF54: .4byte gUnknown_3005AEC _080EDF58: .4byte gUnknown_3005E20 _080EDF5C: .4byte 0x000027CC _080EDF60: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EDE68 + thumb_func_end PutNameRaterShowOnTheAir thumb_func_start StartMassOutbreak StartMassOutbreak: @ 0x080EDF64 @@ -489001,8 +489001,8 @@ _080EE008: .4byte 0x00002BA0 _080EE00C: .4byte 0x00002BA2 thumb_func_end StartMassOutbreak - thumb_func_start sub_080EE010 -sub_080EE010: @ 0x080EE010 + thumb_func_start PutLilycoveContestLadyShowOnTheAir +PutLilycoveContestLadyShowOnTheAir: @ 0x080EE010 push {r4, lr} bl sub_080F0578 ldr r0, _080EE06C @@ -489039,7 +489039,7 @@ sub_080EE010: @ 0x080EE010 bl sub_0818E4DC strb r0, [r4, #0x16] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x _080EE066: pop {r4} pop {r0} @@ -489049,10 +489049,10 @@ _080EE06C: .4byte gUnknown_2037290 _080EE070: .4byte gUnknown_3005AEC _080EE074: .4byte gUnknown_3005E20 _080EE078: .4byte 0x000027CC - thumb_func_end sub_080EE010 + thumb_func_end PutLilycoveContestLadyShowOnTheAir - thumb_func_start sub_080EE07C -sub_080EE07C: @ 0x080EE07C + thumb_func_start InterviewAfter_FanClubLetter +InterviewAfter_FanClubLetter: @ 0x080EE07C push {r4, lr} ldr r2, _080EE0D4 ldr r0, _080EE0D8 @@ -489073,7 +489073,7 @@ sub_080EE07C: @ 0x080EE07C ldr r1, _080EE0E0 ldr r1, [r1] bl StringCopy - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -489082,10 +489082,10 @@ sub_080EE07C: @ 0x080EE07C adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #2] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EE0E8 ldrb r0, [r0] strb r0, [r4, #0x18] @@ -489099,10 +489099,10 @@ _080EE0DC: .4byte 0x000027CC _080EE0E0: .4byte gUnknown_3005AF0 _080EE0E4: .4byte gUnknown_2024190 _080EE0E8: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EE07C + thumb_func_end InterviewAfter_FanClubLetter - thumb_func_start sub_080EE0EC -sub_080EE0EC: @ 0x080EE0EC + thumb_func_start InterviewAfter_RecentHappenings +InterviewAfter_RecentHappenings: @ 0x080EE0EC push {r4, r5, lr} ldr r2, _080EE130 ldr r0, _080EE134 @@ -489127,7 +489127,7 @@ sub_080EE0EC: @ 0x080EE0EC bl StringCopy strh r5, [r4, #2] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EE140 ldrb r0, [r0] strb r0, [r4, #0x18] @@ -489140,7 +489140,7 @@ _080EE134: .4byte gUnknown_3005E20 _080EE138: .4byte 0x000027CC _080EE13C: .4byte gUnknown_3005AF0 _080EE140: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EE0EC + thumb_func_end InterviewAfter_RecentHappenings thumb_func_start sub_080EE144 sub_080EE144: @ 0x080EE144 @@ -489160,7 +489160,7 @@ sub_080EE144: @ 0x080EE144 strb r0, [r4] movs r7, #1 strb r7, [r4, #1] - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r6, #0x64 @@ -489169,7 +489169,7 @@ sub_080EE144: @ 0x080EE144 adds r0, r0, r5 movs r1, #0x20 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsrs r0, r0, #4 movs r1, #0xf ands r0, r1 @@ -489190,7 +489190,7 @@ sub_080EE144: @ 0x080EE144 ldr r1, _080EE210 ldr r1, [r1] bl StringCopy - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r6, r0 @@ -489198,30 +489198,30 @@ sub_080EE144: @ 0x080EE144 adds r2, r4, #0 adds r2, #0x10 movs r1, #2 - bl sub_0806A058 - bl sub_081396F8 + bl GetMonData + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r6, r0 adds r0, r0, r5 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r4, #2] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EE214 ldrb r0, [r0] strb r0, [r4, #0xd] cmp r0, #1 beq _080EE1F8 - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r6, r0 adds r0, r0, r5 movs r1, #3 - bl sub_0806A058 + bl GetMonData cmp r0, #1 bne _080EE218 _080EE1F8: @@ -489236,13 +489236,13 @@ _080EE20C: .4byte gUnknown_2037286 _080EE210: .4byte gUnknown_3005AF0 _080EE214: .4byte gUnknown_829BDA5 _080EE218: - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r6, r0 adds r0, r0, r5 movs r1, #3 - bl sub_0806A058 + bl GetMonData strb r0, [r4, #0xe] _080EE22C: pop {r4, r5, r6, r7} @@ -489284,7 +489284,7 @@ _080EE24E: cmp r1, #0x17 bls _080EE24E ldr r0, _080EE318 - bl sub_080F0628 + bl TV_BernoulliTrial lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -489352,7 +489352,7 @@ _080EE24E: strb r2, [r4, #0x15] strh r3, [r4, #0x16] adds r0, r4, #0 - bl sub_080ED5A4 + bl tv_store_id_2x ldr r0, _080EE324 ldrb r0, [r0] strb r0, [r4, #0x18] @@ -489433,8 +489433,8 @@ _080EE3A0: .4byte 0x00002B93 _080EE3A4: .4byte 0x00002BA0 thumb_func_end EndMassOutbreak - thumb_func_start sub_080EE3A8 -sub_080EE3A8: @ 0x080EE3A8 + thumb_func_start UpdateTVShowsPerDay +UpdateTVShowsPerDay: @ 0x080EE3A8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 @@ -489442,7 +489442,7 @@ sub_080EE3A8: @ 0x080EE3A8 adds r0, r4, #0 bl sub_080EE3D4 adds r0, r4, #0 - bl sub_080EE444 + bl UpdateMassOutbreakTimeLeft adds r0, r4, #0 bl sub_080EFC24 adds r0, r4, #0 @@ -489452,7 +489452,7 @@ sub_080EE3A8: @ 0x080EE3A8 pop {r4} pop {r0} bx r0 - thumb_func_end sub_080EE3A8 + thumb_func_end UpdateTVShowsPerDay thumb_func_start sub_080EE3D4 sub_080EE3D4: @ 0x080EE3D4 @@ -489515,8 +489515,8 @@ _080EE43C: .align 2, 0 thumb_func_end sub_080EE3D4 - thumb_func_start sub_080EE444 -sub_080EE444: @ 0x080EE444 + thumb_func_start UpdateMassOutbreakTimeLeft +UpdateMassOutbreakTimeLeft: @ 0x080EE444 push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -489538,7 +489538,7 @@ _080EE468: _080EE46C: pop {r0} bx r0 - thumb_func_end sub_080EE444 + thumb_func_end UpdateMassOutbreakTimeLeft thumb_func_start sub_080EE470 sub_080EE470: @ 0x080EE470 @@ -489551,7 +489551,7 @@ sub_080EE470: @ 0x080EE470 lsrs r0, r0, #8 cmp r0, #4 bls _080EE486 - bl sub_080EE4C8 + bl PutFishingAdviceShowOnTheAir _080EE486: ldrb r0, [r4] strh r0, [r4] @@ -489566,7 +489566,7 @@ _080EE498: ldrb r0, [r4] cmp r0, #4 bls _080EE4A4 - bl sub_080EE4C8 + bl PutFishingAdviceShowOnTheAir _080EE4A4: ldrh r0, [r4] movs r1, #0xff @@ -489589,8 +489589,8 @@ _080EE4BC: _080EE4C4: .4byte gUnknown_2039CF2 thumb_func_end sub_080EE470 - thumb_func_start sub_080EE4C8 -sub_080EE4C8: @ 0x080EE4C8 + thumb_func_start PutFishingAdviceShowOnTheAir +PutFishingAdviceShowOnTheAir: @ 0x080EE4C8 push {r4, r5, r6, lr} ldr r6, _080EE540 ldr r0, [r6] @@ -489607,7 +489607,7 @@ sub_080EE4C8: @ 0x080EE4C8 beq _080EE538 movs r0, #0x18 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -489639,7 +489639,7 @@ sub_080EE4C8: @ 0x080EE4C8 ldr r1, [r1] bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EE558 ldrb r0, [r0] strb r0, [r4, #6] @@ -489655,7 +489655,7 @@ _080EE54C: .4byte gUnknown_2039CF2 _080EE550: .4byte gUnknown_2039CF0 _080EE554: .4byte gUnknown_3005AF0 _080EE558: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EE4C8 + thumb_func_end PutFishingAdviceShowOnTheAir thumb_func_start sub_080EE55C sub_080EE55C: @ 0x080EE55C @@ -489706,7 +489706,7 @@ sub_080EE5A0: @ 0x080EE5A0 ldr r1, _080EE64C adds r5, r0, r1 ldr r0, _080EE650 - bl sub_080F0628 + bl TV_BernoulliTrial lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0 @@ -489726,7 +489726,7 @@ sub_080EE5A0: @ 0x080EE5A0 beq _080EE63C movs r0, #0x19 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -489745,7 +489745,7 @@ sub_080EE5A0: @ 0x080EE5A0 ldrh r0, [r5, #2] strh r0, [r4, #2] movs r0, #5 - bl sub_08084180 + bl GetGameStat ldrh r1, [r5, #6] subs r0, r0, r1 strh r0, [r4, #6] @@ -489761,7 +489761,7 @@ sub_080EE5A0: @ 0x080EE5A0 ldr r1, [r1] bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EE660 ldrb r0, [r0] strb r0, [r4, #0xb] @@ -489790,7 +489790,7 @@ sub_080EE664: @ 0x080EE664 push {r4, r5, r6, r7, lr} movs r0, #0x1a movs r1, #1 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID ldr r4, _080EE6D8 ldr r0, [r4] ldr r1, _080EE6DC @@ -489835,7 +489835,7 @@ _080EE6BC: cmp r6, r0 bls _080EE6A8 strb r5, [r4, #4] - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _080EE6EC movs r0, #1 @@ -489849,7 +489849,7 @@ _080EE6E4: .4byte 0x00000867 _080EE6E8: .4byte 0x0000086E _080EE6EC: movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount _080EE6F2: strh r0, [r4, #2] ldr r1, _080EE768 @@ -489901,7 +489901,7 @@ _080EE73C: adds r0, r7, #0 bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EE77C ldrb r0, [r0] strb r0, [r4, #0xc] @@ -489937,7 +489937,7 @@ sub_080EE780: @ 0x080EE780 beq _080EE7EE movs r0, #0x1b movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -489967,7 +489967,7 @@ sub_080EE780: @ 0x080EE780 ldr r1, [r1] bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EE804 ldrb r0, [r0] strb r0, [r4, #9] @@ -490001,7 +490001,7 @@ sub_080EE808: @ 0x080EE808 beq _080EE876 movs r0, #0x1c movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -490032,7 +490032,7 @@ sub_080EE808: @ 0x080EE808 ldr r1, [r1] bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EE894 ldrb r0, [r0] strb r0, [r4, #5] @@ -490050,8 +490050,8 @@ _080EE890: .4byte gUnknown_3005AF0 _080EE894: .4byte gUnknown_829BDA5 thumb_func_end sub_080EE808 - thumb_func_start sub_080EE898 -sub_080EE898: @ 0x080EE898 + thumb_func_start AlertTVOfNewCoinTotal +AlertTVOfNewCoinTotal: @ 0x080EE898 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -490070,7 +490070,7 @@ sub_080EE898: @ 0x080EE898 beq _080EE974 movs r0, #0x1d movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -490156,7 +490156,7 @@ _080EE932: ldr r1, [r1] bl StringCopy adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EE98C ldrb r0, [r0] strb r0, [r4, #8] @@ -490170,10 +490170,10 @@ _080EE980: .4byte gUnknown_3005E20 _080EE984: .4byte 0x000027CC _080EE988: .4byte gUnknown_3005AF0 _080EE98C: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EE898 + thumb_func_end AlertTVOfNewCoinTotal - thumb_func_start sub_080EE990 -sub_080EE990: @ 0x080EE990 + thumb_func_start AlertTVThatPlayerPlayedSlotMachine +AlertTVThatPlayerPlayedSlotMachine: @ 0x080EE990 ldr r2, _080EE99C movs r1, #0 strb r1, [r2] @@ -490183,10 +490183,10 @@ sub_080EE990: @ 0x080EE990 .align 2, 0 _080EE99C: .4byte gUnknown_2039CF6 _080EE9A0: .4byte gUnknown_2039CF4 - thumb_func_end sub_080EE990 + thumb_func_end AlertTVThatPlayerPlayedSlotMachine - thumb_func_start sub_080EE9A4 -sub_080EE9A4: @ 0x080EE9A4 + thumb_func_start AlertTVThatPlayerPlayedRoulette +AlertTVThatPlayerPlayedRoulette: @ 0x080EE9A4 ldr r2, _080EE9B0 movs r1, #1 strb r1, [r2] @@ -490196,7 +490196,7 @@ sub_080EE9A4: @ 0x080EE9A4 .align 2, 0 _080EE9B0: .4byte gUnknown_2039CF6 _080EE9B4: .4byte gUnknown_2039CF4 - thumb_func_end sub_080EE9A4 + thumb_func_end AlertTVThatPlayerPlayedRoulette thumb_func_start sub_080EE9B8 sub_080EE9B8: @ 0x080EE9B8 @@ -490370,17 +490370,17 @@ _080EEAEA: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080EEBB4 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080EEBB4 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r2, _080EEC20 mov r3, sb lsls r1, r3, #3 @@ -490388,12 +490388,12 @@ _080EEAEA: strb r0, [r6] adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData strh r0, [r6, #2] movs r5, #0 adds r0, r4, #0 movs r1, #0xd - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -490404,7 +490404,7 @@ _080EEAEA: _080EEB40: adds r0, r4, #0 movs r1, #0xe - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -490418,7 +490418,7 @@ _080EEB40: _080EEB5C: adds r0, r4, #0 movs r1, #0xf - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -490432,7 +490432,7 @@ _080EEB5C: _080EEB78: adds r0, r4, #0 movs r1, #0x10 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -490514,12 +490514,12 @@ _080EEC1C: .4byte gUnknown_2024190 _080EEC20: .4byte gUnknown_3005E50 thumb_func_end sub_080EEAD4 - thumb_func_start sub_080EEC24 -sub_080EEC24: @ 0x080EEC24 + thumb_func_start TV_PutSecretBaseVisitOnTheAir +TV_PutSecretBaseVisitOnTheAir: @ 0x080EEC24 push {r4, lr} movs r0, #0x1f movs r1, #1 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID ldr r4, _080EEC90 ldr r0, [r4] ldr r1, _080EEC94 @@ -490556,7 +490556,7 @@ sub_080EEC24: @ 0x080EEC24 adds r0, r4, #0 bl sub_080EEAD4 adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EECA0 ldrb r0, [r0] strb r0, [r4, #0xc] @@ -490570,7 +490570,7 @@ _080EEC94: .4byte 0x000027CC _080EEC98: .4byte gUnknown_3005E20 _080EEC9C: .4byte gUnknown_3005AF0 _080EECA0: .4byte gUnknown_829BDA5 - thumb_func_end sub_080EEC24 + thumb_func_end TV_PutSecretBaseVisitOnTheAir thumb_func_start sub_080EECA4 sub_080EECA4: @ 0x080EECA4 @@ -490592,7 +490592,7 @@ sub_080EECA4: @ 0x080EECA4 _080EECC4: movs r0, #0x1e movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -490724,7 +490724,7 @@ _080EEDD2: strh r0, [r4, #0xc] _080EEDD6: adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EEDE8 ldrb r0, [r0] strb r0, [r4, #0xe] @@ -490754,7 +490754,7 @@ sub_080EEDEC: @ 0x080EEDEC beq _080EEE5A movs r0, #0x20 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -490785,7 +490785,7 @@ sub_080EEDEC: @ 0x080EEDEC ldrh r0, [r0] strh r0, [r4, #2] adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EEE78 ldrb r0, [r0] strb r0, [r4, #5] @@ -490840,7 +490840,7 @@ sub_080EEE7C: @ 0x080EEE7C beq _080EEF46 movs r0, #0x21 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -490900,7 +490900,7 @@ _080EEF28: ldrh r2, [r2] strh r2, [r4, #0xe] adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EEF68 ldrb r0, [r0] strb r0, [r4, #0x11] @@ -490946,7 +490946,7 @@ sub_080EEF6C: @ 0x080EEF6C beq _080EEFDE movs r0, #0x27 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -490972,7 +490972,7 @@ sub_080EEF6C: @ 0x080EEF6C strb r0, [r4, #2] strb r7, [r4, #3] adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EEFF8 ldrb r0, [r0] strb r0, [r4, #4] @@ -491014,7 +491014,7 @@ sub_080EEFFC: @ 0x080EEFFC beq _080EF0B2 movs r0, #0x23 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -491039,15 +491039,15 @@ sub_080EEFFC: @ 0x080EEFFC adds r2, r4, #4 adds r0, r5, #0 movs r1, #2 - bl sub_0806A058 + bl GetMonData adds r0, r5, #0 - bl sub_080EF0BC + bl GetRibbonCount strb r0, [r4, #2] mov r0, r8 bl TV_MonDataIdxToRibbon strb r0, [r4, #3] adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EF0A4 ldrb r0, [r0] strb r0, [r4, #0xf] @@ -491055,7 +491055,7 @@ sub_080EEFFC: @ 0x080EEFFC beq _080EF090 adds r0, r5, #0 movs r1, #3 - bl sub_0806A058 + bl GetMonData cmp r0, #1 bne _080EF0A8 _080EF090: @@ -491070,7 +491070,7 @@ _080EF0A4: .4byte gUnknown_829BDA5 _080EF0A8: adds r0, r5, #0 movs r1, #3 - bl sub_0806A058 + bl GetMonData _080EF0B0: strb r0, [r4, #0x10] _080EF0B2: @@ -491081,108 +491081,108 @@ _080EF0B2: bx r0 thumb_func_end sub_080EEFFC - thumb_func_start sub_080EF0BC -sub_080EF0BC: @ 0x080EF0BC + thumb_func_start GetRibbonCount +GetRibbonCount: @ 0x080EF0BC push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x32 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x33 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x34 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x35 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x36 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x43 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x44 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x45 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x46 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x47 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x48 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x49 - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x4a - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x4b - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x4c - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x4d - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x4e - bl sub_0806A058 + bl GetMonData adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -491190,7 +491190,7 @@ sub_080EF0BC: @ 0x080EF0BC pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080EF0BC + thumb_func_end GetRibbonCount thumb_func_start TV_MonDataIdxToRibbon TV_MonDataIdxToRibbon: @ 0x080EF1B4 @@ -491304,7 +491304,7 @@ sub_080EF244: @ 0x080EF244 beq _080EF2B4 movs r0, #0x22 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -491336,7 +491336,7 @@ sub_080EF244: @ 0x080EF244 ldrh r0, [r0] strh r0, [r4, #6] adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EF2D4 ldrb r0, [r0] strb r0, [r4, #8] @@ -491371,7 +491371,7 @@ sub_080EF2D8: @ 0x080EF2D8 cmp r0, r1 beq _080EF328 movs r0, #0xb - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080EF320 ldrh r0, [r0] cmp r0, #1 @@ -491403,7 +491403,7 @@ sub_080EF330: @ 0x080EF330 push {r4, r5, r6, r7, lr} movs r0, #0x24 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -491566,19 +491566,19 @@ _080EF490: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #4] adds r0, r4, #0 adds r0, #0x64 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #6] adds r4, #0xc8 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #8] b _080EF55E .align 2, 0 @@ -491588,26 +491588,26 @@ _080EF4C0: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #4] adds r0, r4, #0 adds r0, #0x64 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #6] adds r0, r4, #0 adds r0, #0xc8 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #8] movs r1, #0x96 lsls r1, r1, #1 adds r0, r4, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #0xa] b _080EF55E .align 2, 0 @@ -491617,7 +491617,7 @@ _080EF500: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #4] adds r4, #0x64 adds r0, r4, #0 @@ -491642,7 +491642,7 @@ _080EF518: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #4] ldr r0, [r6] ldr r2, _080EF580 @@ -491657,11 +491657,11 @@ _080EF518: _080EF554: movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r7, #6] _080EF55E: adds r0, r7, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EF584 ldrb r0, [r0] strb r0, [r7, #0xc] @@ -491684,7 +491684,7 @@ sub_080EF588: @ 0x080EF588 push {r4, r5, r6, r7, lr} movs r0, #0x26 movs r1, #0 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -491741,7 +491741,7 @@ sub_080EF588: @ 0x080EF588 adds r4, r4, r0 str r4, [r5, #0xc] adds r0, r5, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EF668 ldrb r0, [r0] strb r0, [r5, #0x1b] @@ -491857,7 +491857,7 @@ sub_080EF6F8: @ 0x080EF6F8 lsrs r5, r0, #0x18 movs r0, #0x25 movs r1, #1 - bl sub_080EFF70 + bl HasMixableShowAlreadyBeenSpawnedWithPlayerID ldr r4, _080EF76C ldr r0, [r4] ldr r1, _080EF770 @@ -491897,7 +491897,7 @@ sub_080EF6F8: @ 0x080EF6F8 bl VarGet strh r0, [r4, #2] adds r0, r4, #0 - bl sub_080ED57C + bl tv_store_id_3x ldr r0, _080EF780 ldrb r0, [r0] strb r0, [r4, #5] @@ -492075,7 +492075,7 @@ sub_080EF88C: @ 0x080EF88C cmp r0, r1 beq _080EF910 ldr r0, _080EF928 - bl sub_080F0628 + bl TV_BernoulliTrial lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -492266,8 +492266,8 @@ _080EFA16: bx r0 thumb_func_end sub_080EF9BC - thumb_func_start sub_080EFA24 -sub_080EFA24: @ 0x080EFA24 + thumb_func_start FindAnyTVNewsOnTheAir +FindAnyTVNewsOnTheAir: @ 0x080EFA24 push {r4, lr} movs r2, #0 ldr r0, _080EFA54 @@ -492307,12 +492307,12 @@ _080EFA68: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080EFA24 + thumb_func_end FindAnyTVNewsOnTheAir - thumb_func_start sub_080EFA70 -sub_080EFA70: @ 0x080EFA70 + thumb_func_start DoPokeNews +DoPokeNews: @ 0x080EFA70 push {r4, r5, lr} - bl sub_080EFA24 + bl FindAnyTVNewsOnTheAir lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -492364,7 +492364,7 @@ _080EFAD4: lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage b _080EFB1A .align 2, 0 _080EFAE4: .4byte gUnknown_8568BDC @@ -492390,7 +492390,7 @@ _080EFAEC: lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage _080EFB1A: ldr r1, _080EFB38 movs r0, #1 @@ -492405,10 +492405,10 @@ _080EFB2C: .4byte 0x00002B51 _080EFB30: .4byte gUnknown_8568BB4 _080EFB34: .4byte 0x00002B50 _080EFB38: .4byte gUnknown_2037290 - thumb_func_end sub_080EFA70 + thumb_func_end DoPokeNews - thumb_func_start sub_080EFB3C -sub_080EFB3C: @ 0x080EFB3C + thumb_func_start GetPriceReduction +GetPriceReduction: @ 0x080EFB3C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -492436,7 +492436,7 @@ _080EFB50: cmp r0, #2 bne _080EFB8E adds r0, r3, #0 - bl sub_080EFB98 + bl IsPriceDiscounted lsls r0, r0, #0x18 cmp r0, #0 bne _080EFB48 @@ -492458,10 +492458,10 @@ _080EFB90: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080EFB3C + thumb_func_end GetPriceReduction - thumb_func_start sub_080EFB98 -sub_080EFB98: @ 0x080EFB98 + thumb_func_start IsPriceDiscounted +IsPriceDiscounted: @ 0x080EFB98 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -492503,7 +492503,7 @@ _080EFBDA: .align 2, 0 _080EFBE0: .4byte gUnknown_3005AEC _080EFBE4: .4byte 0x0000150D - thumb_func_end sub_080EFB98 + thumb_func_end IsPriceDiscounted thumb_func_start sub_080EFBE8 sub_080EFBE8: @ 0x080EFBE8 @@ -492619,8 +492619,8 @@ _080EFCB8: .4byte 0x00000864 _080EFCBC: .4byte 0x00002B52 thumb_func_end sub_080EFC24 - thumb_func_start sub_080EFCC0 -sub_080EFCC0: @ 0x080EFCC0 + thumb_func_start CopyContestRankToStringVar +CopyContestRankToStringVar: @ 0x080EFCC0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -492690,10 +492690,10 @@ _080EFD48: .align 2, 0 _080EFD4C: .4byte gUnknown_8568BF0 _080EFD50: .4byte gUnknown_85645A0 - thumb_func_end sub_080EFCC0 + thumb_func_end CopyContestRankToStringVar - thumb_func_start sub_080EFD54 -sub_080EFD54: @ 0x080EFD54 + thumb_func_start CopyContestCategoryToStringVar +CopyContestCategoryToStringVar: @ 0x080EFD54 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -492776,7 +492776,7 @@ _080EFE04: .align 2, 0 _080EFE08: .4byte gUnknown_8568BF0 _080EFE0C: .4byte gUnknown_85645A0 - thumb_func_end sub_080EFD54 + thumb_func_end CopyContestCategoryToStringVar thumb_func_start SetContestCategoryStringVarForInterview SetContestCategoryStringVarForInterview: @ 0x080EFE10 @@ -492795,7 +492795,7 @@ SetContestCategoryStringVarForInterview: @ 0x080EFE10 lsls r1, r1, #0x1d lsrs r1, r1, #0x1d movs r0, #1 - bl sub_080EFD54 + bl CopyContestCategoryToStringVar pop {r0} bx r0 .align 2, 0 @@ -492804,15 +492804,15 @@ _080EFE3C: .4byte gUnknown_2037280 _080EFE40: .4byte 0x000027CC thumb_func_end SetContestCategoryStringVarForInterview - thumb_func_start sub_080EFE44 -sub_080EFE44: @ 0x080EFE44 + thumb_func_start TV_PrintIntToStringVar +TV_PrintIntToStringVar: @ 0x080EFE44 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 - bl sub_080EFE74 + bl CountDigits adds r3, r0, #0 ldr r0, _080EFE70 lsls r4, r4, #2 @@ -492828,10 +492828,10 @@ sub_080EFE44: @ 0x080EFE44 bx r0 .align 2, 0 _080EFE70: .4byte gUnknown_8568BF0 - thumb_func_end sub_080EFE44 + thumb_func_end TV_PrintIntToStringVar - thumb_func_start sub_080EFE74 -sub_080EFE74: @ 0x080EFE74 + thumb_func_start CountDigits +CountDigits: @ 0x080EFE74 push {r4, lr} adds r4, r0, #0 movs r1, #0xa @@ -492911,7 +492911,7 @@ _080EFF0A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080EFE74 + thumb_func_end CountDigits thumb_func_start sub_080EFF10 sub_080EFF10: @ 0x080EFF10 @@ -492951,12 +492951,12 @@ _080EFF42: bne _080EFF5C asrs r1, r7, #1 mov r0, r8 - bl sub_080EFE44 + bl TV_PrintIntToStringVar b _080EFF64 _080EFF5C: mov r0, r8 adds r1, r7, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar _080EFF64: pop {r3} mov r8, r3 @@ -492966,8 +492966,8 @@ _080EFF64: .align 2, 0 thumb_func_end sub_080EFF10 - thumb_func_start sub_080EFF70 -sub_080EFF70: @ 0x080EFF70 + thumb_func_start HasMixableShowAlreadyBeenSpawnedWithPlayerID +HasMixableShowAlreadyBeenSpawnedWithPlayerID: @ 0x080EFF70 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -493042,7 +493042,7 @@ _080EFFF4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080EFF70 + thumb_func_end HasMixableShowAlreadyBeenSpawnedWithPlayerID thumb_func_start TV_SortPurchasesByQuantity TV_SortPurchasesByQuantity: @ 0x080F0004 @@ -493091,8 +493091,8 @@ _080F0040: _080F0050: .4byte gUnknown_2039C20 thumb_func_end TV_SortPurchasesByQuantity - thumb_func_start sub_080F0054 -sub_080F0054: @ 0x080F0054 + thumb_func_start FindActiveBroadcastByShowType_SetScriptResult +FindActiveBroadcastByShowType_SetScriptResult: @ 0x080F0054 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -493141,7 +493141,7 @@ _080F00B6: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080F0054 + thumb_func_end FindActiveBroadcastByShowType_SetScriptResult thumb_func_start sub_080F00BC sub_080F00BC: @ 0x080F00BC @@ -493176,51 +493176,51 @@ _080F00E4: @ jump table .4byte _080F014A @ case 9 .4byte _080F0146 @ case 10 _080F0110: - bl sub_080F0150 + bl InterviewBefore_FanClubLetter b _080F014A _080F0116: - bl sub_080F01C8 + bl InterviewBefore_RecentHappenings b _080F014A _080F011C: - bl sub_080F0208 + bl InterviewBefore_PkmnFanClubOpinions b _080F014A _080F0122: bl sub_080F02A0 b _080F014A _080F0128: - bl sub_080F02AC + bl InterviewBefore_NameRater b _080F014A _080F012E: - bl sub_080F02B8 + bl InterviewBefore_BravoTrainerPkmnProfile b _080F014A _080F0134: - bl sub_080F0310 + bl InterviewBefore_BravoTrainerBTProfile b _080F014A _080F013A: - bl sub_080F02F8 + bl InterviewBefore_ContestLiveUpdates b _080F014A _080F0140: - bl sub_080F0304 + bl InterviewBefore_3CheersForPokeblocks b _080F014A _080F0146: - bl sub_080F0350 + bl InterviewBefore_FanClubSpecial _080F014A: pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080F00BC - thumb_func_start sub_080F0150 -sub_080F0150: @ 0x080F0150 + thumb_func_start InterviewBefore_FanClubLetter +InterviewBefore_FanClubLetter: @ 0x080F0150 push {r4, lr} movs r0, #1 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080F01AC ldrh r0, [r0] cmp r0, #0 bne _080F01A6 ldr r4, _080F01B0 - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -493229,7 +493229,7 @@ sub_080F0150: @ 0x080F0150 adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r0, #1 adds r1, r1, r0 lsls r1, r1, #1 @@ -493262,13 +493262,13 @@ _080F01B8: .4byte gUnknown_82EA31C _080F01BC: .4byte gUnknown_3005AEC _080F01C0: .4byte gUnknown_3005E20 _080F01C4: .4byte 0x000027D0 - thumb_func_end sub_080F0150 + thumb_func_end InterviewBefore_FanClubLetter - thumb_func_start sub_080F01C8 -sub_080F01C8: @ 0x080F01C8 + thumb_func_start InterviewBefore_RecentHappenings +InterviewBefore_RecentHappenings: @ 0x080F01C8 push {lr} movs r0, #2 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080F01F8 ldrh r0, [r0] cmp r0, #0 @@ -493294,19 +493294,19 @@ _080F01F8: .4byte gUnknown_2037290 _080F01FC: .4byte gUnknown_3005AEC _080F0200: .4byte gUnknown_3005E20 _080F0204: .4byte 0x000027D0 - thumb_func_end sub_080F01C8 + thumb_func_end InterviewBefore_RecentHappenings - thumb_func_start sub_080F0208 -sub_080F0208: @ 0x080F0208 + thumb_func_start InterviewBefore_PkmnFanClubOpinions +InterviewBefore_PkmnFanClubOpinions: @ 0x080F0208 push {r4, r5, r6, lr} movs r0, #3 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080F0280 ldrh r0, [r0] cmp r0, #0 bne _080F027A ldr r6, _080F0284 - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0x64 @@ -493315,7 +493315,7 @@ sub_080F0208: @ 0x080F0208 adds r0, r0, r4 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r0, #1 adds r1, r1, r0 lsls r1, r1, #1 @@ -493323,7 +493323,7 @@ sub_080F0208: @ 0x080F0208 adds r1, r1, r0 adds r0, r6, #0 bl StringCopy - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r5, r0 @@ -493331,9 +493331,9 @@ sub_080F0208: @ 0x080F0208 ldr r4, _080F0290 movs r1, #2 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 ldr r2, _080F0294 ldr r0, _080F0298 movs r1, #0 @@ -493360,7 +493360,7 @@ _080F0290: .4byte gUnknown_2021C54 _080F0294: .4byte gUnknown_3005AEC _080F0298: .4byte gUnknown_3005E20 _080F029C: .4byte 0x000027E8 - thumb_func_end sub_080F0208 + thumb_func_end InterviewBefore_PkmnFanClubOpinions thumb_func_start sub_080F02A0 sub_080F02A0: @ 0x080F02A0 @@ -493372,20 +493372,20 @@ sub_080F02A0: @ 0x080F02A0 _080F02A8: .4byte gUnknown_2037290 thumb_func_end sub_080F02A0 - thumb_func_start sub_080F02AC -sub_080F02AC: @ 0x080F02AC + thumb_func_start InterviewBefore_NameRater +InterviewBefore_NameRater: @ 0x080F02AC push {lr} movs r0, #5 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult pop {r0} bx r0 - thumb_func_end sub_080F02AC + thumb_func_end InterviewBefore_NameRater - thumb_func_start sub_080F02B8 -sub_080F02B8: @ 0x080F02B8 + thumb_func_start InterviewBefore_BravoTrainerPkmnProfile +InterviewBefore_BravoTrainerPkmnProfile: @ 0x080F02B8 push {lr} movs r0, #6 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080F02E8 ldrh r0, [r0] cmp r0, #0 @@ -493411,31 +493411,31 @@ _080F02E8: .4byte gUnknown_2037290 _080F02EC: .4byte gUnknown_3005AEC _080F02F0: .4byte gUnknown_3005E20 _080F02F4: .4byte 0x000027D0 - thumb_func_end sub_080F02B8 + thumb_func_end InterviewBefore_BravoTrainerPkmnProfile - thumb_func_start sub_080F02F8 -sub_080F02F8: @ 0x080F02F8 + thumb_func_start InterviewBefore_ContestLiveUpdates +InterviewBefore_ContestLiveUpdates: @ 0x080F02F8 push {lr} movs r0, #8 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult pop {r0} bx r0 - thumb_func_end sub_080F02F8 + thumb_func_end InterviewBefore_ContestLiveUpdates - thumb_func_start sub_080F0304 -sub_080F0304: @ 0x080F0304 + thumb_func_start InterviewBefore_3CheersForPokeblocks +InterviewBefore_3CheersForPokeblocks: @ 0x080F0304 push {lr} movs r0, #9 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult pop {r0} bx r0 - thumb_func_end sub_080F0304 + thumb_func_end InterviewBefore_3CheersForPokeblocks - thumb_func_start sub_080F0310 -sub_080F0310: @ 0x080F0310 + thumb_func_start InterviewBefore_BravoTrainerBTProfile +InterviewBefore_BravoTrainerBTProfile: @ 0x080F0310 push {lr} movs r0, #7 - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080F0340 ldrh r0, [r0] cmp r0, #0 @@ -493461,13 +493461,13 @@ _080F0340: .4byte gUnknown_2037290 _080F0344: .4byte gUnknown_3005AEC _080F0348: .4byte gUnknown_3005E20 _080F034C: .4byte 0x000027E4 - thumb_func_end sub_080F0310 + thumb_func_end InterviewBefore_BravoTrainerBTProfile - thumb_func_start sub_080F0350 -sub_080F0350: @ 0x080F0350 + thumb_func_start InterviewBefore_FanClubSpecial +InterviewBefore_FanClubSpecial: @ 0x080F0350 push {lr} movs r0, #0xb - bl sub_080F0054 + bl FindActiveBroadcastByShowType_SetScriptResult ldr r0, _080F0380 ldrh r0, [r0] cmp r0, #0 @@ -493493,7 +493493,7 @@ _080F0380: .4byte gUnknown_2037290 _080F0384: .4byte gUnknown_3005AEC _080F0388: .4byte gUnknown_3005E20 _080F038C: .4byte 0x000027E0 - thumb_func_end sub_080F0350 + thumb_func_end InterviewBefore_FanClubSpecial thumb_func_start sub_080F0390 sub_080F0390: @ 0x080F0390 @@ -493509,11 +493509,11 @@ sub_080F0390: @ 0x080F0390 adds r0, r4, #0 movs r1, #2 adds r2, r5, #0 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r0, r1, #1 adds r0, r0, r1 @@ -493541,7 +493541,7 @@ _080F03DE: thumb_func_start sub_080F03E4 sub_080F03E4: @ 0x080F03E4 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_080F0390 @@ -493677,8 +493677,8 @@ _080F04C4: .align 2, 0 thumb_func_end sub_080F0428 - thumb_func_start sub_080F04D4 -sub_080F04D4: @ 0x080F04D4 + thumb_func_start TV_GetSomeOtherSpeciesAlreadySeenByPlayer_AndPrintName +TV_GetSomeOtherSpeciesAlreadySeenByPlayer_AndPrintName: @ 0x080F04D4 push {r4, r5, lr} adds r4, r0, #0 adds r0, r1, #0 @@ -493686,7 +493686,7 @@ sub_080F04D4: @ 0x080F04D4 lsrs r4, r4, #0x18 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080F0514 + bl TV_GetSomeOtherSpeciesAlreadySeenByPlayer adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 @@ -493707,10 +493707,10 @@ sub_080F04D4: @ 0x080F04D4 .align 2, 0 _080F050C: .4byte gUnknown_8568BF0 _080F0510: .4byte gUnknown_82EA31C - thumb_func_end sub_080F04D4 + thumb_func_end TV_GetSomeOtherSpeciesAlreadySeenByPlayer_AndPrintName - thumb_func_start sub_080F0514 -sub_080F0514: @ 0x080F0514 + thumb_func_start TV_GetSomeOtherSpeciesAlreadySeenByPlayer +TV_GetSomeOtherSpeciesAlreadySeenByPlayer: @ 0x080F0514 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -493748,7 +493748,7 @@ _080F0552: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 asrs r0, r0, #0x18 cmp r0, #1 @@ -493761,7 +493761,7 @@ _080F056E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F0514 + thumb_func_end TV_GetSomeOtherSpeciesAlreadySeenByPlayer thumb_func_start sub_080F0578 sub_080F0578: @ 0x080F0578 @@ -493864,8 +493864,8 @@ _080F0624: bx r1 thumb_func_end FindEmptyTVSlotBeyondFirstFiveShowsOfArray - thumb_func_start sub_080F0628 -sub_080F0628: @ 0x080F0628 + thumb_func_start TV_BernoulliTrial +TV_BernoulliTrial: @ 0x080F0628 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 @@ -493883,10 +493883,10 @@ _080F0642: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080F0628 + thumb_func_end TV_BernoulliTrial - thumb_func_start sub_080F0648 -sub_080F0648: @ 0x080F0648 + thumb_func_start TV_FanClubLetter_RandomWordToStringVar3 +TV_FanClubLetter_RandomWordToStringVar3: @ 0x080F0648 push {r4, r5, r6, lr} adds r4, r0, #0 bl Random @@ -493919,13 +493919,13 @@ _080F0674: ldr r0, _080F0690 adds r1, r3, r1 ldrh r1, [r1] - bl sub_0811F180 + bl CopyEasyChatWord pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080F0690: .4byte gUnknown_2021C68 - thumb_func_end sub_080F0648 + thumb_func_end TV_FanClubLetter_RandomWordToStringVar3 thumb_func_start TV_GetNicknameSumMod8 TV_GetNicknameSumMod8: @ 0x080F0694 @@ -494148,8 +494148,8 @@ _080F0800: _080F081C: .4byte gUnknown_8568BF0 thumb_func_end sub_080F06CC - thumb_func_start sub_080F0820 -sub_080F0820: @ 0x080F0820 + thumb_func_start TV_IsScriptShowKindAlreadyInQueue +TV_IsScriptShowKindAlreadyInQueue: @ 0x080F0820 push {r4, lr} movs r1, #0 ldr r0, _080F0844 @@ -494184,10 +494184,10 @@ _080F085C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F0820 + thumb_func_end TV_IsScriptShowKindAlreadyInQueue - thumb_func_start sub_080F0864 -sub_080F0864: @ 0x080F0864 + thumb_func_start TV_PutNameRaterShowOnTheAirIfNicknameChanged +TV_PutNameRaterShowOnTheAirIfNicknameChanged: @ 0x080F0864 push {r4, lr} ldr r0, _080F0890 ldrh r1, [r0] @@ -494198,13 +494198,13 @@ sub_080F0864: @ 0x080F0864 ldr r4, _080F0898 movs r1, #2 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData ldr r0, _080F089C adds r1, r4, #0 bl StringCompare cmp r0, #0 beq _080F08A0 - bl sub_080EDE68 + bl PutNameRaterShowOnTheAir movs r0, #1 b _080F08A2 .align 2, 0 @@ -494218,10 +494218,10 @@ _080F08A2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080F0864 + thumb_func_end TV_PutNameRaterShowOnTheAirIfNicknameChanged - thumb_func_start sub_080F08A8 -sub_080F08A8: @ 0x080F08A8 + thumb_func_start ChangePokemonNickname +ChangePokemonNickname: @ 0x080F08A8 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -494240,7 +494240,7 @@ sub_080F08A8: @ 0x080F08A8 adds r0, r0, r6 ldr r2, _080F0958 movs r1, #2 - bl sub_0806A058 + bl GetMonData mov r1, sb ldrh r0, [r1] mov r1, r8 @@ -494251,7 +494251,7 @@ sub_080F08A8: @ 0x080F08A8 mov sl, r1 movs r1, #2 mov r2, sl - bl sub_0806A058 + bl GetMonData mov r1, sb ldrh r0, [r1] mov r1, r8 @@ -494260,7 +494260,7 @@ sub_080F08A8: @ 0x080F08A8 adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 @@ -494270,7 +494270,7 @@ sub_080F08A8: @ 0x080F08A8 muls r1, r0, r1 adds r0, r1, #0 adds r0, r0, r6 - bl sub_08069AF4 + bl GetMonGender adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -494282,7 +494282,7 @@ sub_080F08A8: @ 0x080F08A8 adds r0, r0, r6 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldr r0, _080F0960 str r0, [sp, #4] @@ -494290,7 +494290,7 @@ sub_080F08A8: @ 0x080F08A8 mov r1, sl adds r2, r5, #0 adds r3, r4, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r3, r4, r5} mov r8, r3 @@ -494304,11 +494304,11 @@ _080F0950: .4byte gUnknown_2037280 _080F0954: .4byte gUnknown_2024190 _080F0958: .4byte gUnknown_2021C68 _080F095C: .4byte gUnknown_2021C54 -_080F0960: .4byte sub_080F0964 - thumb_func_end sub_080F08A8 +_080F0960: .4byte ChangePokemonNickname_CB + thumb_func_end ChangePokemonNickname - thumb_func_start sub_080F0964 -sub_080F0964: @ 0x080F0964 + thumb_func_start ChangePokemonNickname_CB +ChangePokemonNickname_CB: @ 0x080F0964 push {lr} ldr r0, _080F0984 ldrh r1, [r0] @@ -494318,18 +494318,18 @@ sub_080F0964: @ 0x080F0964 adds r0, r0, r1 ldr r2, _080F098C movs r1, #2 - bl sub_0806A774 - bl sub_08085B34 + bl SetMonData + bl CB2_ReturnToFieldContinueScriptPlayMapMusic pop {r0} bx r0 .align 2, 0 _080F0984: .4byte gUnknown_2037280 _080F0988: .4byte gUnknown_2024190 _080F098C: .4byte gUnknown_2021C54 - thumb_func_end sub_080F0964 + thumb_func_end ChangePokemonNickname_CB - thumb_func_start sub_080F0990 -sub_080F0990: @ 0x080F0990 + thumb_func_start ChangeBoxPokemonNickname +ChangeBoxPokemonNickname: @ 0x080F0990 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -494338,7 +494338,7 @@ sub_080F0990: @ 0x080F0990 ldrb r0, [r0] ldr r1, _080F0A04 ldrb r1, [r1] - bl sub_080D1934 + bl GetBoxedMonPtr adds r6, r0, #0 ldr r2, _080F0A08 movs r1, #2 @@ -494357,7 +494357,7 @@ sub_080F0990: @ 0x080F0990 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 - bl sub_08069B04 + bl GetBoxMonGender adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -494372,7 +494372,7 @@ sub_080F0990: @ 0x080F0990 mov r1, r8 adds r2, r5, #0 adds r3, r4, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r3} mov r8, r3 @@ -494384,29 +494384,29 @@ _080F0A00: .4byte gUnknown_2037296 _080F0A04: .4byte gUnknown_2037298 _080F0A08: .4byte gUnknown_2021C68 _080F0A0C: .4byte gUnknown_2021C54 -_080F0A10: .4byte sub_080F0A14 - thumb_func_end sub_080F0990 +_080F0A10: .4byte ChangeBoxPokemonNickname_CB + thumb_func_end ChangeBoxPokemonNickname - thumb_func_start sub_080F0A14 -sub_080F0A14: @ 0x080F0A14 + thumb_func_start ChangeBoxPokemonNickname_CB +ChangeBoxPokemonNickname_CB: @ 0x080F0A14 push {lr} ldr r0, _080F0A2C ldrb r0, [r0] ldr r1, _080F0A30 ldrb r1, [r1] ldr r2, _080F0A34 - bl sub_080D1730 - bl sub_08085B34 + bl SetBoxMonNickAt + bl CB2_ReturnToFieldContinueScriptPlayMapMusic pop {r0} bx r0 .align 2, 0 _080F0A2C: .4byte gUnknown_2037296 _080F0A30: .4byte gUnknown_2037298 _080F0A34: .4byte gUnknown_2021C54 - thumb_func_end sub_080F0A14 + thumb_func_end ChangeBoxPokemonNickname_CB - thumb_func_start sub_080F0A38 -sub_080F0A38: @ 0x080F0A38 + thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated +TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 0x080F0A38 push {r4, lr} ldr r0, _080F0A5C ldrh r1, [r0] @@ -494417,9 +494417,9 @@ sub_080F0A38: @ 0x080F0A38 ldr r4, _080F0A64 movs r1, #2 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 pop {r4} pop {r0} bx r0 @@ -494427,10 +494427,10 @@ sub_080F0A38: @ 0x080F0A38 _080F0A5C: .4byte gUnknown_2037280 _080F0A60: .4byte gUnknown_2024190 _080F0A64: .4byte gUnknown_2021C40 - thumb_func_end sub_080F0A38 + thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated - thumb_func_start sub_080F0A68 -sub_080F0A68: @ 0x080F0A68 + thumb_func_start TV_CheckMonOTIDEqualsPlayerID +TV_CheckMonOTIDEqualsPlayerID: @ 0x080F0A68 push {r4, lr} bl GetPlayerIDAsU32 adds r4, r0, #0 @@ -494442,7 +494442,7 @@ sub_080F0A68: @ 0x080F0A68 adds r0, r0, r1 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 bne _080F0A9C ldr r1, _080F0A98 @@ -494462,7 +494462,7 @@ _080F0AA0: bx r0 .align 2, 0 _080F0AA8: .4byte gUnknown_2037290 - thumb_func_end sub_080F0A68 + thumb_func_end TV_CheckMonOTIDEqualsPlayerID thumb_func_start GetTVChannelByShowType GetTVChannelByShowType: @ 0x080F0AAC @@ -494524,8 +494524,8 @@ GetPlayerIDAsU32: @ 0x080F0AEC _080F0B08: .4byte gUnknown_3005AF0 thumb_func_end GetPlayerIDAsU32 - thumb_func_start sub_080F0B0C -sub_080F0B0C: @ 0x080F0B0C + thumb_func_start CheckForBigMovieOrEmergencyNewsOnTV +CheckForBigMovieOrEmergencyNewsOnTV: @ 0x080F0B0C push {lr} ldr r0, _080F0B30 ldr r1, [r0] @@ -494578,10 +494578,10 @@ _080F0B6A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F0B0C + thumb_func_end CheckForBigMovieOrEmergencyNewsOnTV - thumb_func_start sub_080F0B70 -sub_080F0B70: @ 0x080F0B70 + thumb_func_start GetMomOrDadStringForTVMessage +GetMomOrDadStringForTVMessage: @ 0x080F0B70 push {r4, lr} ldr r0, _080F0BA4 ldr r1, [r0] @@ -494699,7 +494699,7 @@ _080F0C74: .align 2, 0 _080F0C7C: .4byte gUnknown_2021C40 _080F0C80: .4byte gUnknown_85CA9DE - thumb_func_end sub_080F0B70 + thumb_func_end GetMomOrDadStringForTVMessage thumb_func_start sub_080F0C84 sub_080F0C84: @ 0x080F0C84 @@ -494712,7 +494712,7 @@ sub_080F0C84: @ 0x080F0C84 ldrb r1, [r0, #5] ldrb r2, [r0, #4] movs r0, #5 - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap ldr r0, _080F0CB0 bl FlagSet pop {r0} @@ -494801,7 +494801,7 @@ _080F0D42: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _080F0D48: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -494896,7 +494896,7 @@ _080F0DF6: bl sub_080F11E4 bl sub_080F1640 mov r0, sb - bl sub_08000BF0 + bl Free _080F0E1C: pop {r3, r4, r5} mov r8, r3 @@ -494930,7 +494930,7 @@ sub_080F0E34: @ 0x080F0E34 str r0, [sp, #8] add r0, sp, #0x1c str r0, [sp, #0xc] - bl sub_08009B64 + bl GetLinkPlayerCount ldr r1, _080F0EB0 strb r0, [r1] _080F0E60: @@ -495901,7 +495901,7 @@ sub_080F1600: @ 0x080F1600 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 asrs r2, r0, #0x18 cmp r2, #0 @@ -496076,8 +496076,8 @@ _080F1750: .4byte gUnknown_3005AEC _080F1754: .4byte 0x000027CC thumb_func_end sub_080F16E0 - thumb_func_start sub_080F1758 -sub_080F1758: @ 0x080F1758 + thumb_func_start ReceivePokeNewsData +ReceivePokeNewsData: @ 0x080F1758 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -496176,7 +496176,7 @@ _080F181A: bl sub_080F19C8 bl sub_080F1A00 adds r0, r5, #0 - bl sub_08000BF0 + bl Free _080F1828: pop {r3} mov r8, r3 @@ -496186,7 +496186,7 @@ _080F1828: .align 2, 0 _080F1834: .4byte gUnknown_3005AEC _080F1838: .4byte 0x00002B50 - thumb_func_end sub_080F1758 + thumb_func_end ReceivePokeNewsData thumb_func_start sub_080F183C sub_080F183C: @ 0x080F183C @@ -496208,7 +496208,7 @@ sub_080F183C: @ 0x080F183C str r0, [sp, #8] add r0, sp, #0x1c str r0, [sp, #0xc] - bl sub_08009B64 + bl GetLinkPlayerCount ldr r1, _080F1878 strb r0, [r1] movs r0, #0 @@ -496473,7 +496473,7 @@ sub_080F1A40: @ 0x080F1A40 adds r6, r0, #0 adds r5, r1, #0 movs r0, #0x2c - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 movs r7, #0 _080F1A50: @@ -496783,7 +496783,7 @@ _080F1CD0: b _080F1A50 _080F1CD8: adds r0, r4, #0 - bl sub_08000BF0 + bl Free pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -496828,8 +496828,8 @@ _080F1D18: bx r0 thumb_func_end sub_080F1CE4 - thumb_func_start sub_080F1D28 -sub_080F1D28: @ 0x080F1D28 + thumb_func_start DoTVShow +DoTVShow: @ 0x080F1D28 push {lr} ldr r0, _080F1D60 ldr r2, [r0] @@ -496907,34 +496907,34 @@ _080F1D70: @ jump table .4byte _080F1ED2 @ case 39 .4byte _080F1E2C @ case 40 _080F1E14: - bl sub_080F2CB8 + bl DoTVShowPokemonFanClubLetter b _080F1ED2 _080F1E1A: bl sub_080F2EE8 b _080F1ED2 _080F1E20: - bl sub_080F3080 + bl DoTVShowPokemonFanClubOpinions b _080F1ED2 _080F1E26: bl sub_080F3174 b _080F1ED2 _080F1E2C: - bl sub_080F3178 + bl DoTVShowPokemonNewsMassOutbreak b _080F1ED2 _080F1E32: bl sub_080F1ED8 b _080F1ED2 _080F1E38: - bl sub_080F2164 + bl DoTVShowBravoTrainerBattleTower b _080F1ED2 _080F1E3E: - bl sub_080F28FC + bl DoTVShowPokemonTodaySuccessfulCapture b _080F1ED2 _080F1E44: - bl sub_080F23EC + bl DoTVShowTodaysSmartShopper b _080F1ED2 _080F1E4A: - bl sub_080F2620 + bl DoTVShowTheNameRaterShow b _080F1ED2 _080F1E50: bl sub_080F31E8 @@ -496946,34 +496946,34 @@ _080F1E5C: bl sub_080F3C00 b _080F1ED2 _080F1E62: - bl sub_080F2B50 + bl DoTVShowPokemonTodayFailedCapture b _080F1ED2 _080F1E68: - bl sub_080F40A4 + bl DoTVShowPokemonAngler b _080F1ED2 _080F1E6E: - bl sub_080F4180 + bl DoTVShowTheWorldOfMasters b _080F1ED2 _080F1E74: bl sub_080F4260 b _080F1ED2 _080F1E7A: - bl sub_080F4470 + bl DoTVShowDewfordTrendWatcherNetwork b _080F1ED2 _080F1E80: - bl sub_080F45E0 + bl DoTVShowHoennTreasureInvestigators b _080F1ED2 _080F1E86: - bl sub_080F46E0 + bl DoTVShowFindThatGamer b _080F1ED2 _080F1E8C: bl sub_080F488C b _080F1ED2 _080F1E92: - bl sub_080F4BBC + bl DoTVShowSecretBaseVisit b _080F1ED2 _080F1E98: - bl sub_080F4E0C + bl DoTVShowPokemonLotteryWinnerFlashReport b _080F1ED2 _080F1E9E: bl sub_080F4EA0 @@ -496991,21 +496991,21 @@ _080F1EB6: bl sub_080F55B0 b _080F1ED2 _080F1EBC: - bl sub_080F5858 + bl DoTVShowWhatsNo1InHoennToday b _080F1ED2 _080F1EC2: bl sub_080F5A10 b _080F1ED2 _080F1EC8: - bl sub_080F5D54 + bl DoTVShowSafariFanClub b _080F1ED2 _080F1ECE: - bl sub_080F5ED0 + bl DoTVShowPokemonContestLiveUpdates2 _080F1ED2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080F1D28 + thumb_func_end DoTVShow thumb_func_start sub_080F1ED8 sub_080F1ED8: @ 0x080F1ED8 @@ -497060,12 +497060,12 @@ _080F1F44: lsls r1, r1, #0x1d lsrs r1, r1, #0x1d movs r0, #1 - bl sub_080EFD54 + bl CopyContestCategoryToStringVar ldrb r1, [r4, #0x13] lsls r1, r1, #0x1b lsrs r1, r1, #0x1e movs r0, #2 - bl sub_080EFCC0 + bl CopyContestRankToStringVar ldrh r1, [r4, #2] lsls r0, r1, #1 adds r0, r0, r1 @@ -497102,12 +497102,12 @@ _080F1F9C: ldr r0, _080F1FD0 adds r1, r4, #0 adds r1, #8 - bl sub_08008828 + bl StringCopy10 ldrb r1, [r4, #0x13] lsls r1, r1, #0x1d lsrs r1, r1, #0x1d movs r0, #2 - bl sub_080EFD54 + bl CopyContestCategoryToStringVar b _080F213A .align 2, 0 _080F1FC8: .4byte gUnknown_2021C40 @@ -497142,13 +497142,13 @@ _080F2004: bl StringCopy ldr r0, _080F2030 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldrb r1, [r4, #0x13] lsls r1, r1, #0x19 lsrs r1, r1, #0x1e adds r1, #1 movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F2034 movs r0, #5 b _080F213E @@ -497163,13 +497163,13 @@ _080F2038: bl StringCopy ldr r0, _080F2064 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldrb r1, [r4, #0x13] lsls r1, r1, #0x19 lsrs r1, r1, #0x1e adds r1, #1 movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F2068 movs r0, #5 b _080F213E @@ -497186,10 +497186,10 @@ _080F206C: lsls r1, r1, #0x1d lsrs r1, r1, #0x1d movs r0, #1 - bl sub_080EFD54 + bl CopyContestCategoryToStringVar ldr r0, _080F209C ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord ldrh r0, [r4, #0x14] cmp r0, #0 beq _080F20A4 @@ -497223,7 +497223,7 @@ _080F20B0: bl StringCopy ldr r0, _080F20F0 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord ldr r1, _080F20F4 movs r0, #7 b _080F213E @@ -497272,7 +497272,7 @@ _080F2140: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -497283,8 +497283,8 @@ _080F215C: .4byte gUnknown_2039CFC _080F2160: .4byte gUnknown_8568CB0 thumb_func_end sub_080F1ED8 - thumb_func_start sub_080F2164 -sub_080F2164: @ 0x080F2164 + thumb_func_start DoTVShowBravoTrainerBattleTower +DoTVShowBravoTrainerBattleTower: @ 0x080F2164 push {r4, r5, lr} ldr r2, _080F2198 ldr r0, _080F219C @@ -497383,7 +497383,7 @@ _080F2248: _080F2250: ldrh r1, [r4, #0x16] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrb r0, [r4, #0x1c] cmp r0, #1 bne _080F2274 @@ -497410,7 +497410,7 @@ _080F2280: ldrh r1, [r4, #0x16] adds r1, #1 movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar _080F2294: ldrb r0, [r4, #0x1b] cmp r0, #0 @@ -497502,7 +497502,7 @@ _080F2348: .4byte gUnknown_2039CFC _080F234C: ldr r0, _080F2364 ldrh r1, [r4, #0x18] - bl sub_0811F180 + bl CopyEasyChatWord ldrb r0, [r4, #0x1b] cmp r0, #0 bne _080F236C @@ -497523,7 +497523,7 @@ _080F2374: .4byte gUnknown_2039CFC _080F2378: ldr r0, _080F239C ldrh r1, [r4, #0x18] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F23A0 adds r1, r4, #2 bl StringCopy @@ -497558,7 +497558,7 @@ _080F23CA: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -497567,10 +497567,10 @@ _080F23DC: .4byte gUnknown_2021C40 _080F23E0: .4byte gUnknown_2021C54 _080F23E4: .4byte gUnknown_82EA31C _080F23E8: .4byte gUnknown_8568CEC - thumb_func_end sub_080F2164 + thumb_func_end DoTVShowBravoTrainerBattleTower - thumb_func_start sub_080F23EC -sub_080F23EC: @ 0x080F23EC + thumb_func_start DoTVShowTodaysSmartShopper +DoTVShowTodaysSmartShopper: @ 0x080F23EC push {r4, r5, r6, lr} ldr r2, _080F2420 ldr r0, _080F2424 @@ -497626,7 +497626,7 @@ _080F246C: ldr r0, _080F2494 ldrb r1, [r5, #0x12] movs r2, #0 - bl sub_08124578 + bl GetMapName ldrh r0, [r5, #0xc] cmp r0, #0xfe bls _080F249C @@ -497658,7 +497658,7 @@ _080F24A8: bl StringCopy ldrh r1, [r5, #0xc] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r4, _080F24EC bl Random ldrb r2, [r4] @@ -497689,7 +497689,7 @@ _080F2502: ldrh r1, [r5, #0xc] adds r1, #1 movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrh r0, [r5, #8] cmp r0, #0 beq _080F2520 @@ -497715,7 +497715,7 @@ _080F252C: bl StringCopy ldrh r1, [r5, #0xe] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrh r0, [r5, #0xa] cmp r0, #0 beq _080F2574 @@ -497735,7 +497735,7 @@ _080F255C: bl StringCopy ldrh r1, [r5, #0x10] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar _080F2574: ldrb r0, [r5, #2] cmp r0, #1 @@ -497812,17 +497812,17 @@ _080F2606: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080F2618: .4byte gUnknown_2021C40 _080F261C: .4byte gUnknown_8568C7C - thumb_func_end sub_080F23EC + thumb_func_end DoTVShowTodaysSmartShopper - thumb_func_start sub_080F2620 -sub_080F2620: @ 0x080F2620 + thumb_func_start DoTVShowTheNameRaterShow +DoTVShowTheNameRaterShow: @ 0x080F2620 push {r4, r5, r6, lr} sub sp, #8 ldr r2, _080F2654 @@ -497892,7 +497892,7 @@ _080F26B8: bl StringCopy ldr r0, _080F26F8 adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 ldr r4, _080F26FC adds r0, r5, #0 bl TV_GetNicknameSumMod8 @@ -497964,7 +497964,7 @@ _080F2764: .4byte gUnknown_2039CFC _080F2768: ldr r0, _080F279C adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 movs r4, #0 str r4, [sp] str r5, [sp, #4] @@ -498132,14 +498132,14 @@ _080F28D0: .4byte gUnknown_2039CFC _080F28D4: ldr r0, _080F28F4 adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 bl TVShowDone _080F28E0: ldr r0, _080F28F8 lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage add sp, #8 pop {r4, r5, r6} pop {r0} @@ -498147,10 +498147,10 @@ _080F28E0: .align 2, 0 _080F28F4: .4byte gUnknown_2021C40 _080F28F8: .4byte gUnknown_8568DE4 - thumb_func_end sub_080F2620 + thumb_func_end DoTVShowTheNameRaterShow - thumb_func_start sub_080F28FC -sub_080F28FC: @ 0x080F28FC + thumb_func_start DoTVShowPokemonTodaySuccessfulCapture +DoTVShowPokemonTodaySuccessfulCapture: @ 0x080F28FC push {r4, r5, r6, lr} ldr r2, _080F2930 ldr r0, _080F2934 @@ -498212,7 +498212,7 @@ _080F2978: bl StringCopy ldr r0, _080F29B8 adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 ldrb r0, [r5, #0xf] cmp r0, #1 bne _080F29C0 @@ -498246,7 +498246,7 @@ _080F29D2: bl StringCopy ldrb r1, [r5, #0x12] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrb r0, [r5, #0x12] cmp r0, #3 bhi _080F2A00 @@ -498279,7 +498279,7 @@ _080F2A0C: bl StringCopy ldr r0, _080F2A40 adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 b _080F2A66 .align 2, 0 _080F2A34: .4byte gUnknown_2021C40 @@ -498328,7 +498328,7 @@ _080F2A80: bl StringCopy ldr r0, _080F2AC8 adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 ldr r4, _080F2ACC bl Random ldrb r2, [r4] @@ -498357,10 +498357,10 @@ _080F2AD0: bl StringCopy ldr r0, _080F2AFC adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 ldrh r1, [r5, #0x10] movs r0, #2 - bl sub_080F04D4 + bl TV_GetSomeOtherSpeciesAlreadySeenByPlayer_AndPrintName b _080F2B1A .align 2, 0 _080F2AF4: .4byte gUnknown_2021C40 @@ -498377,7 +498377,7 @@ _080F2B00: bl StringCopy ldr r0, _080F2B2C adds r1, r5, #4 - bl sub_08008828 + bl StringCopy10 _080F2B1A: ldr r1, _080F2B30 movs r0, #0xb @@ -498395,16 +498395,16 @@ _080F2B38: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080F2B4C: .4byte gUnknown_8568C4C - thumb_func_end sub_080F28FC + thumb_func_end DoTVShowPokemonTodaySuccessfulCapture - thumb_func_start sub_080F2B50 -sub_080F2B50: @ 0x080F2B50 + thumb_func_start DoTVShowPokemonTodayFailedCapture +DoTVShowPokemonTodayFailedCapture: @ 0x080F2B50 push {r4, r5, lr} ldr r2, _080F2B80 ldr r0, _080F2B84 @@ -498475,7 +498475,7 @@ _080F2BE8: ldr r0, _080F2C20 ldrb r1, [r4, #0x12] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r0, _080F2C24 ldrh r2, [r4, #0xe] lsls r1, r2, #1 @@ -498511,7 +498511,7 @@ _080F2C3C: bl StringCopy ldrb r1, [r4, #0x10] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar bl Random lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -498553,16 +498553,16 @@ _080F2CA0: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080F2CB4: .4byte gUnknown_8568E40 - thumb_func_end sub_080F2B50 + thumb_func_end DoTVShowPokemonTodayFailedCapture - thumb_func_start sub_080F2CB8 -sub_080F2CB8: @ 0x080F2CB8 + thumb_func_start DoTVShowPokemonFanClubLetter +DoTVShowPokemonFanClubLetter: @ 0x080F2CB8 push {r4, r5, r6, r7, lr} ldr r2, _080F2CEC ldr r0, _080F2CF0 @@ -498710,7 +498710,7 @@ _080F2E3A: b _080F2ED0 _080F2E52: adds r0, r5, #0 - bl sub_080F0648 + bl TV_FanClubLetter_RandomWordToStringVar3 ldr r1, _080F2E60 movs r0, #7 strb r0, [r1] @@ -498728,7 +498728,7 @@ _080F2E64: lsrs r2, r0, #0x10 movs r0, #2 adds r1, r2, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar bl TVShowDone b _080F2ED0 _080F2E86: @@ -498739,7 +498739,7 @@ _080F2E86: movs r3, #2 bl ConvertEasyChatWordsToString adds r0, r4, #0 - bl sub_08097B74 + bl ShowFieldMessage ldr r1, _080F2EA8 movs r0, #1 strb r0, [r1] @@ -498755,7 +498755,7 @@ _080F2EAC: movs r3, #2 bl ConvertEasyChatWordsToString adds r0, r4, #0 - bl sub_08097B74 + bl ShowFieldMessage ldr r1, _080F2ECC movs r0, #3 strb r0, [r1] @@ -498768,14 +498768,14 @@ _080F2ED0: lsls r1, r7, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage _080F2EDC: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _080F2EE4: .4byte gUnknown_8568BFC - thumb_func_end sub_080F2CB8 + thumb_func_end DoTVShowPokemonFanClubLetter thumb_func_start sub_080F2EE8 sub_080F2EE8: @ 0x080F2EE8 @@ -498870,7 +498870,7 @@ _080F3000: adds r1, #0x10 bl StringCopy adds r0, r5, #0 - bl sub_080F0648 + bl TV_FanClubLetter_RandomWordToStringVar3 ldr r1, _080F301C movs r0, #0x32 strb r0, [r1] @@ -498904,7 +498904,7 @@ _080F3044: movs r3, #2 bl ConvertEasyChatWordsToString adds r0, r4, #0 - bl sub_08097B74 + bl ShowFieldMessage ldr r1, _080F3064 movs r0, #1 strb r0, [r1] @@ -498917,7 +498917,7 @@ _080F3068: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage _080F3074: pop {r4, r5, r6, r7} pop {r0} @@ -498926,8 +498926,8 @@ _080F3074: _080F307C: .4byte gUnknown_8568C1C thumb_func_end sub_080F2EE8 - thumb_func_start sub_080F3080 -sub_080F3080: @ 0x080F3080 + thumb_func_start DoTVShowPokemonFanClubOpinions +DoTVShowPokemonFanClubOpinions: @ 0x080F3080 push {r4, r5, r6, lr} ldr r2, _080F30B0 ldr r0, _080F30B4 @@ -498976,7 +498976,7 @@ _080F30CA: ldr r0, _080F3104 adds r1, r4, #0 adds r1, #0x10 - bl sub_08008828 + bl StringCopy10 ldrb r0, [r4, #4] lsrs r0, r0, #4 adds r0, #1 @@ -499001,7 +499001,7 @@ _080F3108: bl StringCopy ldr r0, _080F313C ldrh r1, [r4, #0x1c] - bl sub_0811F180 + bl CopyEasyChatWord movs r0, #4 strb r0, [r6] b _080F3154 @@ -499016,14 +499016,14 @@ _080F3140: bl StringCopy ldr r0, _080F316C ldrh r1, [r4, #0x1e] - bl sub_0811F180 + bl CopyEasyChatWord bl TVShowDone _080F3154: ldr r0, _080F3170 lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -499031,7 +499031,7 @@ _080F3154: _080F3168: .4byte gUnknown_2021C40 _080F316C: .4byte gUnknown_2021C68 _080F3170: .4byte gUnknown_8568C34 - thumb_func_end sub_080F3080 + thumb_func_end DoTVShowPokemonFanClubOpinions thumb_func_start sub_080F3174 sub_080F3174: @ 0x080F3174 @@ -499039,8 +499039,8 @@ sub_080F3174: @ 0x080F3174 .align 2, 0 thumb_func_end sub_080F3174 - thumb_func_start sub_080F3178 -sub_080F3178: @ 0x080F3178 + thumb_func_start DoTVShowPokemonNewsMassOutbreak +DoTVShowPokemonNewsMassOutbreak: @ 0x080F3178 push {r4, lr} ldr r2, _080F31C8 ldr r0, _080F31CC @@ -499055,7 +499055,7 @@ sub_080F3178: @ 0x080F3178 ldr r0, _080F31D4 ldrb r1, [r4, #0x10] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r0, _080F31D8 ldrh r2, [r4, #0xc] lsls r1, r2, #1 @@ -499072,7 +499072,7 @@ sub_080F3178: @ 0x080F3178 lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage pop {r4} pop {r0} bx r0 @@ -499085,7 +499085,7 @@ _080F31D8: .4byte gUnknown_2021C54 _080F31DC: .4byte gUnknown_82EA31C _080F31E0: .4byte gUnknown_8568C48 _080F31E4: .4byte gUnknown_2039CFC - thumb_func_end sub_080F3178 + thumb_func_end DoTVShowPokemonNewsMassOutbreak thumb_func_start sub_080F31E8 sub_080F31E8: @ 0x080F31E8 @@ -500015,7 +500015,7 @@ _080F39A8: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -500253,7 +500253,7 @@ _080F3BD8: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -500550,7 +500550,7 @@ _080F3E94: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -500598,7 +500598,7 @@ _080F3EFC: adds r1, r1, r2 ldrb r1, [r1] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r0, [r4] ldr r1, _080F3F30 adds r0, r0, r1 @@ -500728,7 +500728,7 @@ _080F4016: ldr r2, _080F4080 adds r1, r1, r2 ldrh r1, [r1] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F4084 ldr r1, [r4] ldr r2, _080F4088 @@ -500762,7 +500762,7 @@ _080F4064: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -500780,8 +500780,8 @@ _080F409C: .4byte gUnknown_2039CFC _080F40A0: .4byte gUnknown_8569118 thumb_func_end sub_080F3EAC - thumb_func_start sub_080F40A4 -sub_080F40A4: @ 0x080F40A4 + thumb_func_start DoTVShowPokemonAngler +DoTVShowPokemonAngler: @ 0x080F40A4 push {r4, r5, lr} ldr r2, _080F40D0 ldr r0, _080F40D4 @@ -500838,7 +500838,7 @@ _080F40FC: bl StringCopy ldrb r1, [r4, #3] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar bl TVShowDone b _080F415C .align 2, 0 @@ -500860,14 +500860,14 @@ _080F4134: bl StringCopy ldrb r1, [r4, #2] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar bl TVShowDone _080F415C: ldr r0, _080F417C lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -500876,10 +500876,10 @@ _080F4170: .4byte gUnknown_2021C40 _080F4174: .4byte gUnknown_2021C54 _080F4178: .4byte gUnknown_82EA31C _080F417C: .4byte gUnknown_8568E5C - thumb_func_end sub_080F40A4 + thumb_func_end DoTVShowPokemonAngler - thumb_func_start sub_080F4180 -sub_080F4180: @ 0x080F4180 + thumb_func_start DoTVShowTheWorldOfMasters +DoTVShowTheWorldOfMasters: @ 0x080F4180 push {r4, r5, r6, lr} ldr r2, _080F41B0 ldr r0, _080F41B4 @@ -500920,10 +500920,10 @@ _080F41CA: bl StringCopy ldrh r1, [r4, #6] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrh r1, [r4, #2] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar movs r0, #1 strb r0, [r6] b _080F423A @@ -500952,7 +500952,7 @@ _080F4210: ldr r0, _080F4250 ldrb r1, [r4, #0xa] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r0, _080F4254 ldrh r2, [r4, #4] lsls r1, r2, #1 @@ -500967,7 +500967,7 @@ _080F423A: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -500977,7 +500977,7 @@ _080F4250: .4byte gUnknown_2021C54 _080F4254: .4byte gUnknown_2021C68 _080F4258: .4byte gUnknown_82EA31C _080F425C: .4byte gUnknown_8568E64 - thumb_func_end sub_080F4180 + thumb_func_end DoTVShowTheWorldOfMasters thumb_func_start sub_080F4260 sub_080F4260: @ 0x080F4260 @@ -501063,11 +501063,11 @@ _080F430E: bl StringCopy ldrh r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r0, _080F4338 ldrb r1, [r4, #7] movs r2, #0 - bl sub_08124578 + bl GetMapName _080F432A: ldrb r0, [r4, #4] cmp r0, #0 @@ -501083,7 +501083,7 @@ _080F433C: bl StringCopy ldrh r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar b _080F432A .align 2, 0 _080F4350: .4byte gUnknown_2021C40 @@ -501094,7 +501094,7 @@ _080F4354: bl StringCopy ldrh r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar b _080F432A .align 2, 0 _080F4368: .4byte gUnknown_2021C40 @@ -501105,7 +501105,7 @@ _080F436C: bl StringCopy ldrh r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrb r0, [r4, #4] cmp r0, #0 beq _080F4394 @@ -501127,7 +501127,7 @@ _080F439C: .4byte gUnknown_2039CFC _080F43A0: ldrb r1, [r4, #4] movs r0, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r0, _080F43C0 bl FlagGet lsls r0, r0, #0x18 @@ -501183,10 +501183,10 @@ _080F440C: _080F4412: ldrb r1, [r4, #6] movs r0, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrb r1, [r4, #5] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrh r0, [r4, #8] cmp r0, #0 beq _080F443C @@ -501199,7 +501199,7 @@ _080F4430: .4byte gUnknown_2039CFC _080F4434: ldrh r1, [r4, #8] movs r0, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar _080F443C: ldr r1, _080F4444 movs r0, #6 @@ -501218,7 +501218,7 @@ _080F4456: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -501227,8 +501227,8 @@ _080F4468: .4byte gUnknown_2021C40 _080F446C: .4byte gUnknown_8568E70 thumb_func_end sub_080F4260 - thumb_func_start sub_080F4470 -sub_080F4470: @ 0x080F4470 + thumb_func_start DoTVShowDewfordTrendWatcherNetwork +DoTVShowDewfordTrendWatcherNetwork: @ 0x080F4470 push {r4, r5, lr} ldr r2, _080F44A0 ldr r0, _080F44A4 @@ -501272,10 +501272,10 @@ _080F44B8: @ jump table _080F44D4: ldr r0, _080F44F4 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F44F8 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord ldrb r0, [r4, #8] cmp r0, #0 bne _080F4500 @@ -501297,10 +501297,10 @@ _080F4508: .4byte gUnknown_2039CFC _080F450C: ldr r0, _080F4530 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F4534 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F4538 adds r1, r4, #0 adds r1, #0x13 @@ -501317,10 +501317,10 @@ _080F453C: .4byte gUnknown_2039CFC _080F4540: ldr r0, _080F4560 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F4564 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord ldrb r0, [r4, #8] cmp r0, #0 bne _080F456C @@ -501342,10 +501342,10 @@ _080F4574: .4byte gUnknown_2039CFC _080F4578: ldr r0, _080F459C ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F45A0 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F45A4 adds r1, r4, #0 adds r1, #0x13 @@ -501362,17 +501362,17 @@ _080F45A8: .4byte gUnknown_2039CFC _080F45AC: ldr r0, _080F45D4 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F45D8 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord bl TVShowDone _080F45C0: ldr r0, _080F45DC lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -501380,10 +501380,10 @@ _080F45C0: _080F45D4: .4byte gUnknown_2021C40 _080F45D8: .4byte gUnknown_2021C54 _080F45DC: .4byte gUnknown_8568E9C - thumb_func_end sub_080F4470 + thumb_func_end DoTVShowDewfordTrendWatcherNetwork - thumb_func_start sub_080F45E0 -sub_080F45E0: @ 0x080F45E0 + thumb_func_start DoTVShowHoennTreasureInvestigators +DoTVShowHoennTreasureInvestigators: @ 0x080F45E0 push {r4, r5, r6, r7, lr} ldr r2, _080F4610 ldr r0, _080F4614 @@ -501465,7 +501465,7 @@ _080F466E: ldr r0, _080F46A0 ldrb r1, [r5, #4] movs r2, #0 - bl sub_08124578 + bl GetMapName bl TVShowDone b _080F46C2 .align 2, 0 @@ -501489,7 +501489,7 @@ _080F46C2: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -501497,10 +501497,10 @@ _080F46C2: _080F46D4: .4byte gUnknown_2021C40 _080F46D8: .4byte gUnknown_2021C54 _080F46DC: .4byte gUnknown_8568EB8 - thumb_func_end sub_080F45E0 + thumb_func_end DoTVShowHoennTreasureInvestigators - thumb_func_start sub_080F46E0 -sub_080F46E0: @ 0x080F46E0 + thumb_func_start DoTVShowFindThatGamer +DoTVShowFindThatGamer: @ 0x080F46E0 push {r4, r5, lr} ldr r2, _080F4710 ldr r0, _080F4714 @@ -501609,7 +501609,7 @@ _080F47BC: _080F47C4: ldrh r1, [r4, #4] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar bl TVShowDone b _080F486C .align 2, 0 @@ -501643,7 +501643,7 @@ _080F480C: _080F4814: ldrh r1, [r4, #4] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F482C movs r0, #3 strb r0, [r1] @@ -501684,7 +501684,7 @@ _080F486C: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -501692,7 +501692,7 @@ _080F486C: _080F4880: .4byte gUnknown_2021C54 _080F4884: .4byte gUnknown_85CBFAD _080F4888: .4byte gUnknown_8568EC4 - thumb_func_end sub_080F46E0 + thumb_func_end DoTVShowFindThatGamer thumb_func_start sub_080F488C sub_080F488C: @ 0x080F488C @@ -501770,7 +501770,7 @@ _080F491E: ldr r0, _080F4958 ldrb r1, [r5, #4] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r1, _080F495C movs r0, #2 strb r0, [r1] @@ -501814,7 +501814,7 @@ _080F49A4: .4byte gUnknown_2039CFC _080F49A8: ldrh r1, [r5, #8] movs r0, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r4, _080F49C8 ldrh r0, [r5, #6] bl sub_080D6C8C @@ -501836,7 +501836,7 @@ _080F49D0: ldr r0, _080F49F0 ldrb r1, [r5, #4] movs r2, #0 - bl sub_08124578 + bl GetMapName bl TVShowDone b _080F4BA2 .align 2, 0 @@ -501858,7 +501858,7 @@ _080F49F4: ldr r0, _080F4A30 ldrb r1, [r5, #4] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r1, _080F4A34 movs r0, #6 strb r0, [r1] @@ -502015,7 +502015,7 @@ _080F4B50: _080F4B6E: ldrb r1, [r5, #4] movs r2, #0 - bl sub_08124578 + bl GetMapName ldr r1, _080F4B90 movs r0, #0xb strb r0, [r1] @@ -502037,7 +502037,7 @@ _080F4BA2: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -502046,8 +502046,8 @@ _080F4BB4: .4byte gUnknown_2021C40 _080F4BB8: .4byte gUnknown_8568ED4 thumb_func_end sub_080F488C - thumb_func_start sub_080F4BBC -sub_080F4BBC: @ 0x080F4BBC + thumb_func_start DoTVShowSecretBaseVisit +DoTVShowSecretBaseVisit: @ 0x080F4BBC push {r4, r5, r6, lr} ldr r2, _080F4BF0 ldr r0, _080F4BF4 @@ -502309,16 +502309,16 @@ _080F4DF4: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080F4E08: .4byte gUnknown_8568F08 - thumb_func_end sub_080F4BBC + thumb_func_end DoTVShowSecretBaseVisit - thumb_func_start sub_080F4E0C -sub_080F4E0C: @ 0x080F4E0C + thumb_func_start DoTVShowPokemonLotteryWinnerFlashReport +DoTVShowPokemonLotteryWinnerFlashReport: @ 0x080F4E0C push {r4, r5, r6, lr} ldr r2, _080F4E48 ldr r0, _080F4E4C @@ -502358,7 +502358,7 @@ _080F4E64: .4byte gUnknown_85CBFEC _080F4E68: ldrb r1, [r5, #4] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar _080F4E70: ldr r4, _080F4E98 ldrh r0, [r5, #2] @@ -502371,14 +502371,14 @@ _080F4E70: lsls r0, r6, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080F4E98: .4byte gUnknown_2021C68 _080F4E9C: .4byte gUnknown_8568F40 - thumb_func_end sub_080F4E0C + thumb_func_end DoTVShowPokemonLotteryWinnerFlashReport thumb_func_start sub_080F4EA0 sub_080F4EA0: @ 0x080F4EA0 @@ -502599,7 +502599,7 @@ _080F508A: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -502661,7 +502661,7 @@ _080F510C: bl StringCopy ldr r0, _080F513C ldrh r1, [r4, #0x14] - bl sub_0811F180 + bl CopyEasyChatWord ldrb r1, [r4, #0x16] cmp r1, #0x59 bls _080F5144 @@ -502709,7 +502709,7 @@ _080F5170: bl StringCopy ldrb r1, [r4, #0x16] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F519C movs r0, #5 strb r0, [r1] @@ -502728,14 +502728,14 @@ _080F51A0: bl StringCopy ldr r0, _080F51D8 ldrh r1, [r4, #0x14] - bl sub_0811F180 + bl CopyEasyChatWord bl TVShowDone _080F51BE: ldr r0, _080F51DC lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -502913,17 +502913,17 @@ _080F533A: bl StringCopy ldr r0, _080F5370 ldrh r1, [r4, #4] - bl sub_0811F180 + bl CopyEasyChatWord ldr r0, _080F5374 ldrh r1, [r4, #6] - bl sub_0811F180 + bl CopyEasyChatWord bl TVShowDone _080F5358: ldr r0, _080F5378 lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -503030,7 +503030,7 @@ _080F544C: bl StringCopy ldrb r1, [r4, #2] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5478 movs r0, #4 strb r0, [r1] @@ -503170,7 +503170,7 @@ _080F5598: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 @@ -503320,7 +503320,7 @@ _080F56E2: bl StringCopy ldrh r1, [r5, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5700 movs r0, #0x10 strb r0, [r1] @@ -503335,7 +503335,7 @@ _080F5704: bl StringCopy ldrh r1, [r5, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5724 movs r0, #0xf strb r0, [r1] @@ -503350,7 +503350,7 @@ _080F5728: bl StringCopy ldrh r1, [r5, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5748 movs r0, #0xe strb r0, [r1] @@ -503468,7 +503468,7 @@ _080F583E: lsls r1, r6, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -503477,8 +503477,8 @@ _080F5850: .4byte gUnknown_2021C40 _080F5854: .4byte gUnknown_8568FD0 thumb_func_end sub_080F55B0 - thumb_func_start sub_080F5858 -sub_080F5858: @ 0x080F5858 + thumb_func_start DoTVShowWhatsNo1InHoennToday +DoTVShowWhatsNo1InHoennToday: @ 0x080F5858 push {r4, r5, lr} ldr r2, _080F5888 ldr r0, _080F588C @@ -503601,7 +503601,7 @@ _080F5958: bl StringCopy ldrh r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5978 movs r0, #8 strb r0, [r1] @@ -503620,14 +503620,14 @@ _080F598A: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080F599C: .4byte gUnknown_2021C40 _080F59A0: .4byte gUnknown_856901C - thumb_func_end sub_080F5858 + thumb_func_end DoTVShowWhatsNo1InHoennToday thumb_func_start TVShowGetFlagCount TVShowGetFlagCount: @ 0x080F59A4 @@ -503657,8 +503657,8 @@ _080F59BE: bx r1 thumb_func_end TVShowGetFlagCount - thumb_func_start sub_080F59D0 -sub_080F59D0: @ 0x080F59D0 + thumb_func_start SecretBaseSecrets_GetStateForFlagNumber +SecretBaseSecrets_GetStateForFlagNumber: @ 0x080F59D0 push {r4, r5, r6, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 @@ -503695,7 +503695,7 @@ _080F5A0A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_080F59D0 + thumb_func_end SecretBaseSecrets_GetStateForFlagNumber thumb_func_start sub_080F5A10 sub_080F5A10: @ 0x080F5A10 @@ -503930,7 +503930,7 @@ _080F5C3A: _080F5C42: adds r0, r5, #0 _080F5C44: - bl sub_080F59D0 + bl SecretBaseSecrets_GetStateForFlagNumber ldr r1, _080F5C58 strb r0, [r1] b _080F5D36 @@ -503948,7 +503948,7 @@ _080F5C5C: bl StringCopy ldrh r1, [r5, #2] movs r0, #2 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrh r0, [r5, #2] cmp r0, #0x1e bhi _080F5C90 @@ -504048,7 +504048,7 @@ _080F5D36: lsls r1, r2, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r3, r4} mov r8, r3 mov sb, r4 @@ -504059,8 +504059,8 @@ _080F5D36: _080F5D50: .4byte gUnknown_8569040 thumb_func_end sub_080F5A10 - thumb_func_start sub_080F5D54 -sub_080F5D54: @ 0x080F5D54 + thumb_func_start DoTVShowSafariFanClub +DoTVShowSafariFanClub: @ 0x080F5D54 push {r4, r5, lr} ldr r2, _080F5D88 ldr r0, _080F5D8C @@ -504130,7 +504130,7 @@ _080F5DE8: bl StringCopy ldrb r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrb r0, [r4, #3] cmp r0, #0 bne _080F5E10 @@ -504151,7 +504151,7 @@ _080F5E18: .4byte gUnknown_2039CFC _080F5E1C: ldrb r1, [r4, #3] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5E2C movs r0, #4 strb r0, [r1] @@ -504169,7 +504169,7 @@ _080F5E36: bl StringCopy ldrb r1, [r4, #2] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldrb r0, [r4, #3] cmp r0, #0 beq _080F5E64 @@ -504202,7 +504202,7 @@ _080F5E7C: .4byte gUnknown_2039CFC _080F5E80: ldrb r1, [r4, #3] movs r0, #1 - bl sub_080EFE44 + bl TV_PrintIntToStringVar ldr r1, _080F5E90 movs r0, #9 strb r0, [r1] @@ -504232,16 +504232,16 @@ _080F5EB8: lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080F5ECC: .4byte gUnknown_85690EC - thumb_func_end sub_080F5D54 + thumb_func_end DoTVShowSafariFanClub - thumb_func_start sub_080F5ED0 -sub_080F5ED0: @ 0x080F5ED0 + thumb_func_start DoTVShowPokemonContestLiveUpdates2 +DoTVShowPokemonContestLiveUpdates2: @ 0x080F5ED0 push {r4, r5, r6, lr} ldr r2, _080F5F00 ldr r0, _080F5F04 @@ -504299,19 +504299,19 @@ _080F5F3A: _080F5F40: ldr r0, _080F5F68 adds r1, r4, #2 - bl sub_08008888 + bl StringCopy7 _080F5F48: ldr r0, _080F5F6C adds r1, r4, #0 adds r1, #0xb - bl sub_08008828 + bl StringCopy10 bl TVShowDone _080F5F56: ldr r0, _080F5F70 lsls r1, r5, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -504319,7 +504319,7 @@ _080F5F56: _080F5F68: .4byte gUnknown_2021C68 _080F5F6C: .4byte gUnknown_2021C54 _080F5F70: .4byte gUnknown_8568E30 - thumb_func_end sub_080F5ED0 + thumb_func_end DoTVShowPokemonContestLiveUpdates2 thumb_func_start TVShowDone TVShowDone: @ 0x080F5F74 @@ -504382,12 +504382,12 @@ _080F5FD8: adds r1, #0xc adds r1, r1, r2 ldr r1, [r1] - bl sub_0800212C + bl SetBgTilemapBuffer adds r4, #1 cmp r4, #3 ble _080F5FD8 ldr r0, _080F60D8 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0x4c movs r1, #0 @@ -504446,7 +504446,7 @@ _080F5FD8: movs r1, #0xff lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r0, _080F60E4 movs r1, #0 strh r1, [r0] @@ -504511,27 +504511,27 @@ sub_080F6114: @ 0x080F6114 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _080F61D4 movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _080F61D8 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC - bl sub_080F7A3C + bl CopyToBgTilemapBuffer + bl RecordedBattle_SaveParties ldr r0, _080F61DC movs r2, #0x80 lsls r2, r2, #2 movs r1, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _080F61E0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r7, #0 movs r0, #1 mov r8, r0 @@ -504623,21 +504623,21 @@ _080F61EE: cmp r7, #3 ble _080F616E movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -504723,7 +504723,7 @@ _080F62FC: cmp r4, #3 ble _080F62FC movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4} pop {r0} bx r0 @@ -504740,16 +504740,16 @@ sub_080F6318: @ 0x080F6318 orrs r0, r6 strb r0, [r5, #8] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl sub_080F8684 bl sub_080F5FBC - bl sub_080B9750 + bl ScanlineEffect_Clear bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl FreeAllSpritePalettes bl sub_080F6114 - bl sub_080F72C0 + bl HealStatusConditions movs r0, #0 movs r1, #1 bl LoadAllContestMonIcons @@ -504773,19 +504773,19 @@ sub_080F6318: @ 0x080F6318 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldrb r1, [r5, #8] movs r0, #0x7f ands r0, r1 strb r0, [r5, #8] ldr r0, _080F63E0 movs r1, #5 - bl sub_080A8878 + bl CreateTask ldr r1, [r4] ldr r1, [r1] strb r0, [r1, #2] ldr r0, _080F63E4 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080F63E8 movs r0, #0xf0 strh r0, [r1] @@ -504795,7 +504795,7 @@ sub_080F6318: @ 0x080F6318 strh r0, [r1] ldr r0, _080F63F4 movs r1, #0x14 - bl sub_080A8878 + bl CreateTask bl sub_080F8110 ldr r0, _080F63F8 ldrb r1, [r0] @@ -504820,10 +504820,10 @@ _080F63F8: .4byte gUnknown_2039BCA _080F63FC: movs r0, #0xdf lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM _080F6404: ldr r0, _080F6414 - bl sub_080006F0 + bl SetVBlankCallback add sp, #4 pop {r4, r5, r6} pop {r0} @@ -504835,14 +504835,14 @@ _080F6414: .4byte sub_080F643C thumb_func_start sub_080F6418 sub_080F6418: @ 0x080F6418 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A89D4 - bl sub_080A12E4 + bl RunTasks + bl UpdatePaletteFade movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r0} bx r0 .align 2, 0 @@ -504899,10 +504899,10 @@ sub_080F643C: @ 0x080F643C ldrh r1, [r0] movs r0, #0x46 bl SetGpuReg - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -504976,7 +504976,7 @@ _080F6542: ldrh r0, [r0] cmp r0, #1 beq _080F6570 - bl sub_080ED25C + bl InterviewAfter _080F6570: movs r0, #2 bl sub_0813BB14 @@ -505002,9 +505002,9 @@ _080F6570: adds r0, r5, #0 movs r1, #0 bl VarSet - bl sub_08076764 + bl SetContinueGameWarpStatusToDynamicWarp movs r0, #1 - bl sub_08153274 + bl TrySavingData bl sub_08076780 adds r0, r5, #0 adds r1, r4, #0 @@ -505039,7 +505039,7 @@ _080F65F8: movs r0, #0x64 b _080F6644 _080F660C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080F66D2 @@ -505049,14 +505049,14 @@ _080F660C: strh r0, [r4, #8] b _080F66D2 _080F6622: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080F66D2 movs r0, #0xdf lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM ldr r2, _080F667C ldrb r1, [r2, #8] movs r0, #0x7f @@ -505152,7 +505152,7 @@ sub_080F66F0: @ 0x080F66F0 beq _080F6714 ldr r0, _080F6720 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, _080F6724 lsls r0, r4, #2 adds r0, r0, r4 @@ -505191,12 +505191,12 @@ sub_080F6748: @ 0x080F6748 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080F6778 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r2, _080F6780 ldr r0, _080F6784 ldr r0, [r0] @@ -505236,7 +505236,7 @@ sub_080F678C: @ 0x080F678C bne _080F67E4 ldr r0, _080F67D8 movs r1, #0x14 - bl sub_080A8878 + bl CreateTask ldr r4, _080F67DC ldr r0, _080F67E0 ldr r0, [r0] @@ -505245,7 +505245,7 @@ sub_080F678C: @ 0x080F678C adds r0, r4, #0 bl sub_080F739C adds r0, r4, #0 - bl sub_080F76E8 + bl SpeciesToMailSpecies lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r3, #0x88 @@ -505297,7 +505297,7 @@ _080F6818: adds r0, r4, #0 bl sub_080F739C adds r0, r4, #0 - bl sub_080F76E8 + bl SpeciesToMailSpecies lsls r0, r0, #0x10 asrs r0, r0, #0x10 ldr r2, _080F6854 @@ -505449,7 +505449,7 @@ sub_080F6918: @ 0x080F6918 adds r0, r4, #0 bl sub_080F739C adds r0, r4, #0 - bl sub_080F76E8 + bl SpeciesToMailSpecies lsls r0, r0, #0x10 asrs r0, r0, #0x10 ldr r2, _080F6978 @@ -505639,7 +505639,7 @@ _080F6ABE: _080F6AC4: ldr r0, _080F6AF0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -505685,7 +505685,7 @@ _080F6B1E: strh r0, [r4, #0xa] ldr r0, _080F6B58 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -505755,7 +505755,7 @@ _080F6B98: bl StringCopy ldr r1, _080F6BFC mov r0, sp - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _080F6C00 ldr r0, [r0] ldr r0, [r0] @@ -505763,7 +505763,7 @@ _080F6B98: mov r0, sp bl sub_080F739C mov r0, sp - bl sub_080F76E8 + bl SpeciesToMailSpecies lsls r0, r0, #0x10 asrs r0, r0, #0x10 ldr r2, _080F6C04 @@ -505921,12 +505921,12 @@ _080F6D16: adds r0, r6, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality adds r4, r0, #0 - bl sub_080343E4 + bl LoadCompressedSpritePalette adds r0, r6, #0 movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _080F6D90 ldrh r1, [r4, #4] strh r1, [r0, #2] @@ -505934,7 +505934,7 @@ _080F6D16: lsls r1, r1, #1 movs r2, #0x50 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _080F6D94 @@ -505957,12 +505957,12 @@ _080F6D16: ldr r1, [r1] strb r0, [r1, #8] ldr r0, _080F6DA0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _080F6DA4 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _080F6DA8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r0, _080F6DAC mov r4, sl adds r1, r4, r7 @@ -506161,7 +506161,7 @@ _080F6EFE: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag adds r5, #0x40 subs r4, #1 cmp r4, #0 @@ -506250,7 +506250,7 @@ sub_080F6FA0: @ 0x080F6FA0 ands r0, r1 cmp r0, #0 beq _080F6FBE - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite _080F6FBE: bl sub_080F79B8 ldr r0, _080F6FE0 @@ -506296,7 +506296,7 @@ _080F700A: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A2078 + bl BeginHardwarePaletteFade ldr r1, _080F703C lsls r0, r4, #2 adds r0, r0, r4 @@ -506341,7 +506341,7 @@ sub_080F7044: @ 0x080F7044 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, #3] - bl sub_080A8964 + bl DestroyTask ldr r0, _080F7088 b _080F7092 .align 2, 0 @@ -506356,7 +506356,7 @@ _080F708C: _080F7092: movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldrh r0, [r4, #0xa] adds r0, #1 strh r0, [r4, #0xa] @@ -506371,17 +506371,17 @@ _080F70A8: movs r1, #0 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 - bl sub_080034D4 + bl DestroyTask + bl FreeAllWindowBuffers ldr r0, _080F70D4 - bl sub_08000540 + bl SetMainCallback2 bl sub_080F86F4 _080F70CC: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080F70D4: .4byte sub_08085B34 +_080F70D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_080F7044 thumb_func_start sub_080F70D8 @@ -506585,7 +506585,7 @@ _080F7202: movs r0, #1 str r0, [sp, #0xc] movs r2, #3 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer b _080F7278 .align 2, 0 _080F725C: .4byte gUnknown_2039BC5 @@ -506642,8 +506642,8 @@ _080F7298: _080F72BC: .4byte gUnknown_2039AA0 thumb_func_end LoadAllContestMonIcons - thumb_func_start sub_080F72C0 -sub_080F72C0: @ 0x080F72C0 + thumb_func_start HealStatusConditions +HealStatusConditions: @ 0x080F72C0 push {r4, r5, r6, lr} movs r4, #0 ldr r6, _080F7300 @@ -506665,7 +506665,7 @@ _080F72CA: adds r0, r0, r1 lsrs r1, r5, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0x80 lsls r0, r0, #0xd adds r5, r5, r0 @@ -506679,7 +506679,7 @@ _080F72CA: _080F7300: .4byte gUnknown_8556EE4 _080F7304: .4byte gUnknown_2039AA0 _080F7308: .4byte gUnknown_85567A4 - thumb_func_end sub_080F72C0 + thumb_func_end HealStatusConditions thumb_func_start sub_080F730C sub_080F730C: @ 0x080F730C @@ -506690,10 +506690,10 @@ sub_080F730C: @ 0x080F730C ands r0, r1 cmp r0, #0 beq _080F737C - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #8 movs r1, #8 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite ldr r4, _080F7388 ldr r0, _080F738C ldrb r1, [r0] @@ -506705,7 +506705,7 @@ sub_080F730C: @ 0x080F730C movs r1, #1 strb r1, [r0] ldr r0, _080F7390 - bl sub_08008210 + bl LoadSpriteSheet adds r1, r0, #0 lsls r1, r1, #0x10 movs r0, #1 @@ -506720,7 +506720,7 @@ sub_080F730C: @ 0x080F730C movs r1, #8 movs r2, #8 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -506822,7 +506822,7 @@ sub_080F739C: @ 0x080F739C ldr r0, [r0, #8] movs r1, #1 adds r2, r4, #0 - bl sub_08005F7C + bl RenderTextFont9 adds r0, r5, #0 bl StringLength lsls r0, r0, #0x18 @@ -507062,7 +507062,7 @@ sub_080F760C: @ 0x080F760C movs r4, #7 _080F7622: adds r0, r6, #0 - bl sub_08008210 + bl LoadSpriteSheet adds r6, #8 subs r4, #1 cmp r4, #0 @@ -507077,7 +507077,7 @@ _080F763A: lsls r1, r1, #1 movs r2, #0x90 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite adds r1, r5, r4 strb r0, [r1] ldrh r0, [r6] @@ -507155,8 +507155,8 @@ _080F76E0: .4byte gUnknown_20205AC _080F76E4: .4byte gUnknown_2039D00 thumb_func_end sub_080F760C - thumb_func_start sub_080F76E8 -sub_080F76E8: @ 0x080F76E8 + thumb_func_start SpeciesToMailSpecies +SpeciesToMailSpecies: @ 0x080F76E8 push {lr} bl StringLength adds r1, r0, #0 @@ -507172,7 +507172,7 @@ sub_080F76E8: @ 0x080F76E8 bx r1 .align 2, 0 _080F7704: .4byte 0xFFF80000 - thumb_func_end sub_080F76E8 + thumb_func_end SpeciesToMailSpecies thumb_func_start sub_080F7708 sub_080F7708: @ 0x080F7708 @@ -507443,7 +507443,7 @@ sub_080F78E8: @ 0x080F78E8 adds r0, r4, #0 bl sub_080F739C adds r0, r4, #0 - bl sub_080F76E8 + bl SpeciesToMailSpecies lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, [r5] @@ -507598,8 +507598,8 @@ _080F7A34: .4byte gUnknown_2022ADA _080F7A38: .4byte 0x00003F3F thumb_func_end sub_080F79B8 - thumb_func_start sub_080F7A3C -sub_080F7A3C: @ 0x080F7A3C + thumb_func_start RecordedBattle_SaveParties +RecordedBattle_SaveParties: @ 0x080F7A3C push {r4, r5, r6, lr} sub sp, #0xc movs r5, #0 @@ -507773,7 +507773,7 @@ _080F7B58: _080F7B94: .4byte gUnknown_8569424 _080F7B98: .4byte gUnknown_8569438 _080F7B9C: .4byte gUnknown_2039D00 - thumb_func_end sub_080F7A3C + thumb_func_end RecordedBattle_SaveParties thumb_func_start sub_080F7BA0 sub_080F7BA0: @ 0x080F7BA0 @@ -507957,7 +507957,7 @@ _080F7CAC: movs r0, #2 adds r1, r4, #0 movs r2, #1 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer adds r4, #0x10 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -507976,7 +507976,7 @@ _080F7CAC: movs r0, #2 adds r1, r4, #0 movs r2, #1 - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer ldr r0, _080F7D48 ldr r0, [r0] ldr r1, [r0] @@ -507984,7 +507984,7 @@ _080F7CAC: adds r0, #1 strb r0, [r1, #5] mov r0, r8 - bl sub_080A8964 + bl DestroyTask movs r0, #0x18 bl sub_080A306C _080F7D34: @@ -508141,7 +508141,7 @@ sub_080F7E38: @ 0x080F7E38 bne _080F7EA0 ldrh r0, [r4, #0x30] movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 movs r0, #0 strh r0, [r4, #0x30] b _080F7EA0 @@ -508273,7 +508273,7 @@ sub_080F7F00: @ 0x080F7F00 adds r0, r4, #0 movs r2, #0x2c movs r3, #5 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -508330,7 +508330,7 @@ _080F7FC2: cmp r0, #0 beq _080F7FD4 adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask _080F7FD4: pop {r3} mov r8, r3 @@ -508422,7 +508422,7 @@ sub_080F8070: @ 0x080F8070 lsrs r5, r5, #0x18 ldr r0, _080F80A8 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080F80AC @@ -508805,7 +508805,7 @@ _080F833C: bl FillBgTilemapBufferRect_Palette0 ldr r0, _080F83DC movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 mov r0, sl @@ -508905,7 +508905,7 @@ _080F840C: bl FillBgTilemapBufferRect_Palette0 ldr r0, _080F849C movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _080F8494 @@ -509200,7 +509200,7 @@ _080F865A: subs r0, #1 strb r0, [r1, #0x14] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _080F866C: add sp, #8 pop {r3, r4} @@ -509219,44 +509219,44 @@ sub_080F8684: @ 0x080F8684 push {r4, r5, lr} ldr r4, _080F86F0 movs r0, #0x20 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0x18 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1] movs r0, #0x50 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #4] movs r5, #0x80 lsls r5, r5, #4 adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #8] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0xc] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x10] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x14] adds r0, r5, #0 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x18] movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0x1c] - bl sub_0805EBD8 + bl AllocateMonSpritesGfx pop {r4, r5} pop {r0} bx r0 @@ -509270,41 +509270,41 @@ sub_080F86F4: @ 0x080F86F4 ldr r5, _080F875C ldr r0, [r5] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] movs r4, #0 str r4, [r0] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #4] ldr r0, [r0, #8] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #8] ldr r0, [r0, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0xc] ldr r0, [r0, #0x10] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x10] ldr r0, [r0, #0x14] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x14] ldr r0, [r0, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x18] ldr r0, [r0, #0x1c] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #0x1c] - bl sub_08000BF0 + bl Free str r4, [r5] - bl sub_0805ECB0 + bl FreeMonSpritesGfx pop {r4, r5} pop {r0} bx r0 @@ -509350,11 +509350,11 @@ sub_080F8760: @ 0x080F8760 mov r0, sp movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap add sp, #0x10 pop {r4} pop {r0} @@ -509448,7 +509448,7 @@ _080F886C: adds r0, r2, #0 movs r1, #0x36 _080F8870: - bl sub_0806A058 + bl GetMonData ldr r1, _080F8888 ldrh r1, [r1] cmp r0, r1 @@ -509506,7 +509506,7 @@ _080F88D8: ldr r4, _080F8940 adds r0, r0, r4 movs r1, #0x32 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 mov r0, sp @@ -509530,11 +509530,11 @@ _080F8904: adds r0, r0, r4 movs r1, #0x32 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -509560,7 +509560,7 @@ _080F8948: ldr r5, _080F89AC adds r0, r0, r5 movs r1, #0x33 - bl sub_0806A058 + bl GetMonData strb r0, [r4] mov r0, sp ldrb r2, [r0] @@ -509582,11 +509582,11 @@ _080F8972: adds r0, r0, r5 movs r1, #0x33 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r7] muls r0, r6, r0 adds r0, r0, r5 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -509612,7 +509612,7 @@ _080F89B4: ldr r5, _080F8A18 adds r0, r0, r5 movs r1, #0x34 - bl sub_0806A058 + bl GetMonData strb r0, [r4] mov r0, sp ldrb r2, [r0] @@ -509634,11 +509634,11 @@ _080F89DE: adds r0, r0, r5 movs r1, #0x34 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r7] muls r0, r6, r0 adds r0, r0, r5 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -509662,7 +509662,7 @@ _080F8A20: ldr r5, _080F8A80 adds r0, r0, r5 movs r1, #0x35 - bl sub_0806A058 + bl GetMonData strb r0, [r4] mov r0, sp ldrb r2, [r0] @@ -509680,11 +509680,11 @@ _080F8A20: adds r0, r0, r5 movs r1, #0x35 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r7] muls r0, r6, r0 adds r0, r0, r5 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -509708,7 +509708,7 @@ _080F8A88: ldr r5, _080F8AEC adds r0, r0, r5 movs r1, #0x36 - bl sub_0806A058 + bl GetMonData strb r0, [r4] mov r0, sp ldrb r2, [r0] @@ -509726,11 +509726,11 @@ _080F8A88: adds r0, r0, r5 movs r1, #0x36 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r7] muls r0, r6, r0 adds r0, r0, r5 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -509943,11 +509943,11 @@ _080F8C50: .4byte gUnknown_2039AA2 sub_080F8C54: @ 0x080F8C54 push {lr} ldr r0, _080F8C60 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080F8C60: .4byte sub_080D7350 +_080F8C60: .4byte CB2_StartContest thumb_func_end sub_080F8C54 thumb_func_start sub_080F8C64 @@ -509962,9 +509962,9 @@ sub_080F8C64: @ 0x080F8C64 cmp r0, #0 bne _080F8C82 adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080F8C8C - bl sub_08000540 + bl SetMainCallback2 _080F8C82: pop {r0} bx r0 @@ -509973,27 +509973,27 @@ _080F8C88: .4byte gUnknown_2037C74 _080F8C8C: .4byte sub_080F8C54 thumb_func_end sub_080F8C64 - thumb_func_start sub_080F8C90 -sub_080F8C90: @ 0x080F8C90 + thumb_func_start WarpIntoSecretBase +WarpIntoSecretBase: @ 0x080F8C90 push {lr} sub sp, #4 bl sub_080987DC ldr r0, _080F8CB8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 .align 2, 0 _080F8CB8: .4byte sub_080F8C64 - thumb_func_end sub_080F8C90 + thumb_func_end WarpIntoSecretBase thumb_func_start sub_080F8CBC sub_080F8CBC: @ 0x080F8CBC @@ -510024,9 +510024,9 @@ sub_080F8CDC: @ 0x080F8CDC cmp r0, #0 bne _080F8CFA adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080F8D04 - bl sub_08000540 + bl SetMainCallback2 _080F8CFA: pop {r0} bx r0 @@ -510042,14 +510042,14 @@ sub_080F8D08: @ 0x080F8D08 bl sub_080987DC ldr r0, _080F8D30 movs r1, #0xa - bl sub_080A8878 + bl CreateTask movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 @@ -510079,7 +510079,7 @@ sub_080F8D48: @ 0x080F8D48 ldr r6, _080F8D80 adds r0, r6, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -510124,7 +510124,7 @@ sub_080F8D8C: @ 0x080F8D8C .align 2, 0 _080F8DB4: .4byte gUnknown_2039BCA _080F8DB8: .4byte gUnknown_2039BC4 -_080F8DBC: .4byte sub_080FCF2C +_080F8DBC: .4byte ContestLiveUpdates_BeforeInterview_5 _080F8DC0: .4byte sub_080F8DEC _080F8DC4: ldr r0, _080F8DE0 @@ -510326,7 +510326,7 @@ sub_080F8F3C: @ 0x080F8F3C lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_080DC5BC + bl SortContestants ldr r1, _080F8F5C ldr r2, _080F8F60 adds r0, r4, #0 @@ -510336,7 +510336,7 @@ sub_080F8F3C: @ 0x080F8F3C bx r0 .align 2, 0 _080F8F5C: .4byte sub_080FD824 -_080F8F60: .4byte sub_080F8F98 +_080F8F60: .4byte ReceiveOldManData thumb_func_end sub_080F8F3C thumb_func_start sub_080F8F64 @@ -510372,8 +510372,8 @@ _080F8F8C: _080F8F94: .4byte gUnknown_2039BD0 thumb_func_end sub_080F8F64 - thumb_func_start sub_080F8F98 -sub_080F8F98: @ 0x080F8F98 + thumb_func_start ReceiveOldManData +ReceiveOldManData: @ 0x080F8F98 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -510381,7 +510381,7 @@ sub_080F8F98: @ 0x080F8F98 ldrh r0, [r0] cmp r0, #1 bne _080F8FCC - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080F900C @@ -510407,13 +510407,13 @@ _080F8FD4: orrs r0, r7 strb r0, [r4, #0x10] adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 adds r4, #0x40 subs r5, #1 cmp r5, #0 bge _080F8FD4 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _080F9018 ldr r0, [r0] movs r1, #4 @@ -510425,7 +510425,7 @@ _080F8FD4: movs r0, #0 bl SetDynamicWarp bl sub_080987E8 - bl sub_080988C4 + bl EnableBothScriptContexts _080F900C: pop {r4, r5, r6, r7} pop {r0} @@ -510433,7 +510433,7 @@ _080F900C: .align 2, 0 _080F9014: .4byte gUnknown_2039AA0 _080F9018: .4byte gUnknown_3005AEC - thumb_func_end sub_080F8F98 + thumb_func_end ReceiveOldManData thumb_func_start sub_080F901C sub_080F901C: @ 0x080F901C @@ -510467,9 +510467,9 @@ sub_080F9044: @ 0x080F9044 cmp r0, #0 bne _080F9060 adds r0, r1, #0 - bl sub_080A8964 + bl DestroyTask bl sub_080987E8 - bl sub_080988C4 + bl EnableBothScriptContexts _080F9060: pop {r0} bx r0 @@ -510887,32 +510887,32 @@ _080F9346: _080F9358: .4byte gUnknown_2037284 thumb_func_end sub_080F9200 - thumb_func_start sub_080F935C -sub_080F935C: @ 0x080F935C + thumb_func_start ShowContestWinnerCleanup +ShowContestWinnerCleanup: @ 0x080F935C push {lr} ldr r0, _080F9368 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080F9368: .4byte sub_08085B34 - thumb_func_end sub_080F935C +_080F9368: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end ShowContestWinnerCleanup - thumb_func_start sub_080F936C -sub_080F936C: @ 0x080F936C + thumb_func_start ShowContestWinner +ShowContestWinner: @ 0x080F936C push {lr} ldr r0, _080F9380 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _080F9384 ldr r0, _080F9388 str r0, [r1, #8] pop {r0} bx r0 .align 2, 0 -_080F9380: .4byte sub_0812FE24 +_080F9380: .4byte CB2_ContestPainting _080F9384: .4byte gUnknown_3002360 -_080F9388: .4byte sub_080F935C - thumb_func_end sub_080F936C +_080F9388: .4byte ShowContestWinnerCleanup + thumb_func_end ShowContestWinner thumb_func_start sub_080F938C sub_080F938C: @ 0x080F938C @@ -511072,7 +511072,7 @@ _080F94C8: ldr r0, _080F94DC _080F94D2: movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _080F94EA .align 2, 0 _080F94DC: .4byte gUnknown_8470C4C @@ -511080,7 +511080,7 @@ _080F94E0: lsrs r1, r4, #0x10 ldr r0, _080F9504 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _080F94EA: movs r0, #0x80 lsls r0, r0, #0xd @@ -511101,8 +511101,8 @@ _080F9504: .4byte gUnknown_847C6CC _080F9508: .4byte gUnknown_2039BD0 thumb_func_end sub_080F9424 - thumb_func_start sub_080F950C -sub_080F950C: @ 0x080F950C + thumb_func_start GiveMonArtistRibbon +GiveMonArtistRibbon: @ 0x080F950C push {r4, r5, r6, lr} sub sp, #4 ldr r6, _080F958C @@ -511112,7 +511112,7 @@ sub_080F950C: @ 0x080F950C ldr r4, _080F9590 adds r0, r0, r4 movs r1, #0x46 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sp @@ -511146,11 +511146,11 @@ sub_080F950C: @ 0x080F950C adds r0, r0, r4 movs r1, #0x46 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -511179,7 +511179,7 @@ _080F95AA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F950C + thumb_func_end GiveMonArtistRibbon thumb_func_start sub_080F95B4 sub_080F95B4: @ 0x080F95B4 @@ -511187,8 +511187,8 @@ sub_080F95B4: @ 0x080F95B4 bx lr thumb_func_end sub_080F95B4 - thumb_func_start sub_080F95B8 -sub_080F95B8: @ 0x080F95B8 + thumb_func_start ShowContestEntryMonPic +ShowContestEntryMonPic: @ 0x080F95B8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -511196,14 +511196,14 @@ sub_080F95B8: @ 0x080F95B8 push {r5, r6, r7} ldr r7, _080F9638 adds r0, r7, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _080F95D4 b _080F972C _080F95D4: - bl sub_0805EBD8 + bl AllocateMonSpritesGfx movs r0, #0xa mov sb, r0 movs r1, #3 @@ -511224,7 +511224,7 @@ _080F95D4: mov r8, r1 adds r0, r7, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _080F9644 @@ -511272,12 +511272,12 @@ _080F9668: adds r0, r6, #0 mov r1, r8 adds r2, r5, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality adds r4, r0, #0 - bl sub_080343E4 + bl LoadCompressedSpritePalette adds r0, r6, #0 movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _080F96DC ldrh r1, [r4, #4] strh r1, [r0, #2] @@ -511295,7 +511295,7 @@ _080F9668: adds r2, r2, r3 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _080F96E0 @@ -511316,7 +511316,7 @@ _080F9668: adds r1, r6, #0 movs r2, #0 movs r3, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation b _080F96FC .align 2, 0 _080F96D4: .4byte gUnknown_82DDA1C @@ -511333,7 +511333,7 @@ _080F96E8: adds r1, r6, #0 movs r2, #0 movs r3, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation _080F96FC: ldr r1, _080F9740 lsls r0, r7, #2 @@ -511371,13 +511371,13 @@ _080F972C: _080F973C: .4byte gUnknown_20205AC _080F9740: .4byte gUnknown_3005B60 _080F9744: .4byte sub_08007140 - thumb_func_end sub_080F95B8 + thumb_func_end ShowContestEntryMonPic thumb_func_start sub_080F9748 sub_080F9748: @ 0x080F9748 push {lr} ldr r0, _080F9770 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -511390,7 +511390,7 @@ sub_080F9748: @ 0x080F9748 ldrh r0, [r1, #8] adds r0, #1 strh r0, [r1, #8] - bl sub_0805ECB0 + bl FreeMonSpritesGfx _080F976C: pop {r0} bx r0 @@ -511433,12 +511433,12 @@ _080F97B8: movs r1, #3 movs r2, #8 movs r3, #8 - bl sub_080E1F10 + bl CreateWindowFromRect lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x12] movs r1, #1 - bl sub_08197638 + bl SetStandardWindowBorderStyle b _080F9808 _080F97D2: movs r0, #0xc @@ -511480,7 +511480,7 @@ _080F9814: ldrb r0, [r0, #0x12] bl sub_080E1F6C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080F9828: pop {r4, r5} pop {r0} @@ -511488,8 +511488,8 @@ _080F9828: .align 2, 0 thumb_func_end sub_080F9778 - thumb_func_start sub_080F9830 -sub_080F9830: @ 0x080F9830 + thumb_func_start ScriptGetMultiplayerId +ScriptGetMultiplayerId: @ 0x080F9830 push {r4, lr} ldr r0, _080F985C ldrb r1, [r0] @@ -511506,7 +511506,7 @@ sub_080F9830: @ 0x080F9830 cmp r0, #0 bne _080F9868 ldr r4, _080F9864 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -511525,10 +511525,10 @@ _080F986E: bx r0 .align 2, 0 _080F9874: .4byte gUnknown_2037290 - thumb_func_end sub_080F9830 + thumb_func_end ScriptGetMultiplayerId - thumb_func_start sub_080F9878 -sub_080F9878: @ 0x080F9878 + thumb_func_start ScriptRandom +ScriptRandom: @ 0x080F9878 push {r4, lr} ldr r0, _080F989C ldrb r1, [r0] @@ -511566,7 +511566,7 @@ _080F98BA: bx r0 .align 2, 0 _080F98C8: .4byte gUnknown_2037290 - thumb_func_end sub_080F9878 + thumb_func_end ScriptRandom thumb_func_start sub_080F98CC sub_080F98CC: @ 0x080F98CC @@ -511601,7 +511601,7 @@ _080F9900: .4byte gUnknown_2039BCA _080F9904: ldr r0, _080F9914 movs r1, #5 - bl sub_080A8878 + bl CreateTask movs r0, #1 _080F990E: pop {r1} @@ -511626,19 +511626,19 @@ sub_080F9918: @ 0x080F9918 beq _080F9950 cmp r0, #1 beq _080F995E - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _080F9964 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080F9964 .align 2, 0 _080F994C: .4byte gUnknown_3005B60 _080F9950: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080F9964 @@ -511667,10 +511667,10 @@ sub_080F996C: @ 0x080F996C ldrb r0, [r0] cmp r0, #0 beq _080F998E - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #8 movs r1, #8 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _080F998E: pop {r0} bx r0 @@ -511692,7 +511692,7 @@ sub_080F999C: @ 0x080F999C ldrb r0, [r0] cmp r0, #0 beq _080F99B6 - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite _080F99B6: pop {r0} bx r0 @@ -511753,8 +511753,8 @@ _080F9A0A: .align 2, 0 thumb_func_end sub_080F99F0 - thumb_func_start sub_080F9A10 -sub_080F9A10: @ 0x080F9A10 + thumb_func_start HealPlayerParty +HealPlayerParty: @ 0x080F9A10 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -511777,7 +511777,7 @@ _080F9A2E: add r4, sl adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData lsls r1, r0, #0x10 strb r0, [r6] lsrs r1, r1, #0x18 @@ -511785,10 +511785,10 @@ _080F9A2E: adds r0, r4, #0 movs r1, #0x39 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r7, r0, #0x18 movs r5, #0 @@ -511799,18 +511799,18 @@ _080F9A64: adds r1, r5, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r7, #0 adds r2, r5, #0 - bl sub_0806B424 + bl CalculatePPWithBonus strb r0, [r6] adds r1, r5, #0 adds r1, #0x11 adds r0, r4, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -511827,7 +511827,7 @@ _080F9A64: add r0, sl movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sb lsls r0, r1, #0x18 lsrs r0, r0, #0x18 @@ -511848,10 +511848,10 @@ _080F9ABC: .align 2, 0 _080F9ACC: .4byte gUnknown_202418D _080F9AD0: .4byte gUnknown_2024190 - thumb_func_end sub_080F9A10 + thumb_func_end HealPlayerParty - thumb_func_start sub_080F9AD4 -sub_080F9AD4: @ 0x080F9AD4 + thumb_func_start ScriptGiveMon +ScriptGiveMon: @ 0x080F9AD4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -511876,7 +511876,7 @@ sub_080F9AD4: @ 0x080F9AD4 adds r1, r5, #0 adds r2, r3, #0 movs r3, #0x20 - bl sub_08067730 + bl CreateMon add r0, sp, #0x10 mov r1, r8 strb r1, [r0] @@ -511885,9 +511885,9 @@ sub_080F9AD4: @ 0x080F9AD4 adds r0, r6, #0 movs r1, #0xc add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 - bl sub_0806AEDC + bl GiveMonToPlayer lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r5, #0 @@ -511900,10 +511900,10 @@ sub_080F9AD4: @ 0x080F9AD4 blt _080F9B48 adds r0, r5, #0 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag adds r0, r5, #0 movs r1, #3 - bl sub_080BFBBC + bl GetSetPokedexFlag _080F9B48: adds r0, r4, #0 add sp, #0x78 @@ -511913,10 +511913,10 @@ _080F9B48: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F9AD4 + thumb_func_end ScriptGiveMon - thumb_func_start sub_080F9B58 -sub_080F9B58: @ 0x080F9B58 + thumb_func_start ScriptGiveEgg +ScriptGiveEgg: @ 0x080F9B58 push {lr} sub sp, #0x68 adds r1, r0, #0 @@ -511930,20 +511930,20 @@ sub_080F9B58: @ 0x080F9B58 strb r0, [r2] mov r0, sp movs r1, #0x2d - bl sub_0806A774 + bl SetMonData mov r0, sp - bl sub_0806AEDC + bl GiveMonToPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #0x68 pop {r1} bx r1 - thumb_func_end sub_080F9B58 + thumb_func_end ScriptGiveEgg - thumb_func_start sub_080F9B88 -sub_080F9B88: @ 0x080F9B88 + thumb_func_start HasEnoughMonsForDoubleBattle +HasEnoughMonsForDoubleBattle: @ 0x080F9B88 push {lr} - bl sub_0806B08C + bl GetMonsStateToDoubles lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #1 @@ -511964,10 +511964,10 @@ _080F9BA8: bx r0 .align 2, 0 _080F9BAC: .4byte gUnknown_2037290 - thumb_func_end sub_080F9B88 + thumb_func_end HasEnoughMonsForDoubleBattle - thumb_func_start sub_080F9BB0 -sub_080F9BB0: @ 0x080F9BB0 + thumb_func_start CheckPartyMonHasHeldItem +CheckPartyMonHasHeldItem: @ 0x080F9BB0 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -511982,7 +511982,7 @@ _080F9BBC: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0 @@ -511991,7 +511991,7 @@ _080F9BBC: beq _080F9BF0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, r6 bne _080F9BF0 movs r0, #1 @@ -512008,13 +512008,13 @@ _080F9BF8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F9BB0 + thumb_func_end CheckPartyMonHasHeldItem thumb_func_start sub_080F9C00 sub_080F9C00: @ 0x080F9C00 push {r4, lr} movs r0, #0xaf - bl sub_080F9BB0 + bl CheckPartyMonHasHeldItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r4, r0, #0 @@ -512025,7 +512025,7 @@ sub_080F9C00: @ 0x080F9C00 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _080F9C2C - bl sub_080E0F84 + bl GetBerryNameByBerryType _080F9C22: adds r0, r4, #0 pop {r4} @@ -512035,8 +512035,8 @@ _080F9C22: _080F9C2C: .4byte gUnknown_2021C40 thumb_func_end sub_080F9C00 - thumb_func_start sub_080F9C30 -sub_080F9C30: @ 0x080F9C30 + thumb_func_start CreateScriptedWildMon +CreateScriptedWildMon: @ 0x080F9C30 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -512061,7 +512061,7 @@ sub_080F9C30: @ 0x080F9C30 adds r1, r4, #0 adds r2, r5, #0 movs r3, #0x20 - bl sub_08067730 + bl CreateMon cmp r6, #0 beq _080F9C7E add r0, sp, #0x10 @@ -512072,7 +512072,7 @@ sub_080F9C30: @ 0x080F9C30 mov r0, r8 movs r1, #0xc add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData _080F9C7E: add sp, #0x14 pop {r3} @@ -512082,10 +512082,10 @@ _080F9C7E: bx r0 .align 2, 0 _080F9C8C: .4byte gUnknown_20243E8 - thumb_func_end sub_080F9C30 + thumb_func_end CreateScriptedWildMon - thumb_func_start sub_080F9C90 -sub_080F9C90: @ 0x080F9C90 + thumb_func_start ScriptSetMonMoveSlot +ScriptSetMonMoveSlot: @ 0x080F9C90 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -512106,17 +512106,17 @@ _080F9CAC: ldr r1, _080F9CC4 adds r0, r0, r1 adds r1, r4, #0 - bl sub_08068D34 + bl SetMonMoveSlot pop {r4} pop {r0} bx r0 .align 2, 0 _080F9CC0: .4byte gUnknown_202418D _080F9CC4: .4byte gUnknown_2024190 - thumb_func_end sub_080F9C90 + thumb_func_end ScriptSetMonMoveSlot - thumb_func_start sub_080F9CC8 -sub_080F9CC8: @ 0x080F9CC8 + thumb_func_start ChooseHalfPartyForBattle +ChooseHalfPartyForBattle: @ 0x080F9CC8 push {lr} ldr r0, _080F9CE4 ldr r1, _080F9CE8 @@ -512125,14 +512125,14 @@ sub_080F9CC8: @ 0x080F9CC8 movs r1, #9 bl VarSet movs r0, #0 - bl sub_081B81B8 + bl InitChooseHalfPartyForBattle pop {r0} bx r0 .align 2, 0 _080F9CE4: .4byte gUnknown_3002360 _080F9CE8: .4byte sub_080F9CF0 _080F9CEC: .4byte 0x000040CF - thumb_func_end sub_080F9CC8 + thumb_func_end ChooseHalfPartyForBattle thumb_func_start sub_080F9CF0 sub_080F9CF0: @ 0x080F9CF0 @@ -512153,12 +512153,12 @@ _080F9D08: strh r0, [r1] _080F9D0E: ldr r0, _080F9D1C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080F9D18: .4byte gUnknown_2037290 -_080F9D1C: .4byte sub_08085B34 +_080F9D1C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_080F9CF0 thumb_func_start sub_080F9D20 @@ -512172,7 +512172,7 @@ sub_080F9D20: @ 0x080F9D20 adds r0, #1 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081B81B8 + bl InitChooseHalfPartyForBattle pop {r0} bx r0 .align 2, 0 @@ -512200,16 +512200,16 @@ _080F9D60: strh r0, [r1] _080F9D66: ldr r0, _080F9D74 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080F9D70: .4byte gUnknown_2037290 -_080F9D74: .4byte sub_08085B34 +_080F9D74: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_080F9D48 - thumb_func_start sub_080F9D78 -sub_080F9D78: @ 0x080F9D78 + thumb_func_start ReducePlayerPartyToSelectedMons +ReducePlayerPartyToSelectedMons: @ 0x080F9D78 push {r4, r5, r6, r7, lr} sub sp, #0x198 add r0, sp, #0x190 @@ -512268,13 +512268,13 @@ _080F9DE8: .4byte 0x05000064 _080F9DEC: .4byte gUnknown_2024190 _080F9DF0: .4byte gUnknown_203CBC4 _080F9DF4: .4byte 0x05000096 - thumb_func_end sub_080F9D78 + thumb_func_end ReducePlayerPartyToSelectedMons thumb_func_start sub_080F9DF8 sub_080F9DF8: @ 0x080F9DF8 push {lr} movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -512294,8 +512294,8 @@ _080F9E16: .align 2, 0 thumb_func_end sub_080F9DF8 - thumb_func_start sub_080F9E1C -sub_080F9E1C: @ 0x080F9E1C + thumb_func_start AllMonsFainted +AllMonsFainted: @ 0x080F9E1C push {r4, r5, lr} ldr r4, _080F9E3C movs r5, #0 @@ -512306,7 +512306,7 @@ _080F9E22: beq _080F9E40 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080F9E40 movs r0, #0 @@ -512323,10 +512323,10 @@ _080F9E4A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080F9E1C + thumb_func_end AllMonsFainted - thumb_func_start sub_080F9E50 -sub_080F9E50: @ 0x080F9E50 + thumb_func_start FaintFromFieldPoison +FaintFromFieldPoison: @ 0x080F9E50 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -512340,18 +512340,18 @@ sub_080F9E50: @ 0x080F9E50 str r0, [sp] adds r0, r4, #0 movs r1, #7 - bl sub_0806D3CC + bl AdjustFriendship adds r0, r4, #0 movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r5, _080F9E98 adds r0, r4, #0 movs r1, #2 adds r2, r5, #0 - bl sub_0806A058 + bl GetMonData adds r0, r5, #0 - bl sub_0800885C + bl StringGetEnd10 add sp, #4 pop {r4, r5} pop {r0} @@ -512359,10 +512359,10 @@ sub_080F9E50: @ 0x080F9E50 .align 2, 0 _080F9E94: .4byte gUnknown_2024190 _080F9E98: .4byte gUnknown_2021C40 - thumb_func_end sub_080F9E50 + thumb_func_end FaintFromFieldPoison - thumb_func_start sub_080F9E9C -sub_080F9E9C: @ 0x080F9E9C + thumb_func_start MonFaintedFromPoison +MonFaintedFromPoison: @ 0x080F9E9C push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -512376,12 +512376,12 @@ sub_080F9E9C: @ 0x080F9E9C beq _080F9EDC adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080F9EDC adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -512397,10 +512397,10 @@ _080F9EDE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080F9E9C + thumb_func_end MonFaintedFromPoison - thumb_func_start sub_080F9EE4 -sub_080F9EE4: @ 0x080F9EE4 + thumb_func_start Task_WhiteOut +Task_WhiteOut: @ 0x080F9EE4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -512433,7 +512433,7 @@ _080F9F12: _080F9F1C: lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080F9E9C + bl MonFaintedFromPoison cmp r0, #0 bne _080F9F8C ldrh r0, [r4, #2] @@ -512458,11 +512458,11 @@ _080F9F3E: strh r0, [r4] b _080F9FB2 _080F9F50: - bl sub_080F9E1C + bl AllMonsFainted adds r1, r0, #0 cmp r1, #0 beq _080F9FA4 - bl sub_081A9BB8 + bl InBattlePyramid adds r4, r0, #0 bl InBattlePike orrs r4, r0 @@ -512488,9 +512488,9 @@ _080F9F80: _080F9F88: .4byte gUnknown_2037290 _080F9F8C: ldrb r0, [r4, #2] - bl sub_080F9E50 + bl FaintFromFieldPoison ldr r0, _080F9FA0 - bl sub_08097B74 + bl ShowFieldMessage ldrh r0, [r4] adds r0, #1 strh r0, [r4] @@ -512501,32 +512501,32 @@ _080F9FA4: ldr r0, _080F9FB8 strh r1, [r0] _080F9FA8: - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _080F9FB2: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _080F9FB8: .4byte gUnknown_2037290 - thumb_func_end sub_080F9EE4 + thumb_func_end Task_WhiteOut thumb_func_start sub_080F9FBC sub_080F9FBC: @ 0x080F9FBC push {lr} ldr r0, _080F9FD0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask bl sub_080988B8 pop {r0} bx r0 .align 2, 0 -_080F9FD0: .4byte sub_080F9EE4 +_080F9FD0: .4byte Task_WhiteOut thumb_func_end sub_080F9FBC - thumb_func_start sub_080F9FD4 -sub_080F9FD4: @ 0x080F9FD4 + thumb_func_start DoPoisonFieldEffect +DoPoisonFieldEffect: @ 0x080F9FD4 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r4, _080FA040 @@ -512536,12 +512536,12 @@ sub_080F9FD4: @ 0x080F9FD4 _080F9FE0: adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080FA024 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -512549,7 +512549,7 @@ _080F9FE0: bne _080FA024 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData str r0, [sp] cmp r0, #0 beq _080FA016 @@ -512563,7 +512563,7 @@ _080FA018: adds r0, r4, #0 movs r1, #0x39 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r7, #1 _080FA024: adds r4, #0x64 @@ -512596,10 +512596,10 @@ _080FA04E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080F9FD4 + thumb_func_end DoPoisonFieldEffect - thumb_func_start sub_080FA058 -sub_080FA058: @ 0x080FA058 + thumb_func_start GetMonSizeHash +GetMonSizeHash: @ 0x080FA058 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -512608,45 +512608,45 @@ sub_080FA058: @ 0x080FA058 sub sp, #8 adds r5, r0, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 str r0, [sp, #4] lsrs r0, r0, #0x10 str r0, [sp] adds r0, r5, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData adds r7, r0, #0 movs r6, #0xf ands r7, r6 adds r0, r5, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, r8 ands r1, r6 mov r8, r1 adds r0, r5, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov sb, r0 mov r3, sb ands r3, r6 mov sb, r3 adds r0, r5, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData mov sl, r0 ands r0, r6 mov sl, r0 adds r0, r5, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 ands r4, r6 adds r0, r5, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 ands r2, r6 mov r1, r8 @@ -512675,10 +512675,10 @@ sub_080FA058: @ 0x080FA058 pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080FA058 + thumb_func_end GetMonSizeHash - thumb_func_start sub_080FA0FC -sub_080FA0FC: @ 0x080FA0FC + thumb_func_start TranslateBigMonSizeTableIndex +TranslateBigMonSizeTableIndex: @ 0x080FA0FC push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -512706,10 +512706,10 @@ _080FA11C: _080FA128: pop {r1} bx r1 - thumb_func_end sub_080FA0FC + thumb_func_end TranslateBigMonSizeTableIndex - thumb_func_start sub_080FA12C -sub_080FA12C: @ 0x080FA12C + thumb_func_start GetMonSize +GetMonSize: @ 0x080FA12C push {r4, r5, r6, r7, lr} sub sp, #8 adds r6, r1, #0 @@ -512721,11 +512721,11 @@ sub_080FA12C: @ 0x080FA12C lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080BFB80 + bl GetPokedexHeightWeight lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r6, #0 - bl sub_080FA0FC + bl TranslateBigMonSizeTableIndex lsls r0, r0, #0x18 ldr r1, _080FA19C lsrs r0, r0, #0x15 @@ -512761,7 +512761,7 @@ sub_080FA12C: @ 0x080FA12C bx r1 .align 2, 0 _080FA19C: .4byte gUnknown_85694D0 - thumb_func_end sub_080FA12C + thumb_func_end GetMonSize thumb_func_start sub_080FA1A0 sub_080FA1A0: @ 0x080FA1A0 @@ -512800,8 +512800,8 @@ sub_080FA1A0: @ 0x080FA1A0 _080FA1EC: .4byte gUnknown_8569550 thumb_func_end sub_080FA1A0 - thumb_func_start sub_080FA1F0 -sub_080FA1F0: @ 0x080FA1F0 + thumb_func_start CompareMonSize +CompareMonSize: @ 0x080FA1F0 push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r1, #0 @@ -512823,12 +512823,12 @@ _080FA20C: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #1 beq _080FA22E adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, r6 beq _080FA238 _080FA22E: @@ -512839,16 +512839,16 @@ _080FA234: .4byte gUnknown_2024190 _080FA238: mov r4, sp adds r0, r5, #0 - bl sub_080FA058 + bl GetMonSizeHash strh r0, [r4] mov r0, sp ldrh r1, [r0] adds r0, r6, #0 - bl sub_080FA12C + bl GetMonSize adds r5, r0, #0 ldrh r1, [r7] adds r0, r6, #0 - bl sub_080FA12C + bl GetMonSize adds r4, r0, #0 ldr r0, _080FA270 adds r1, r5, #0 @@ -512870,10 +512870,10 @@ _080FA276: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FA1F0 + thumb_func_end CompareMonSize - thumb_func_start sub_080FA280 -sub_080FA280: @ 0x080FA280 + thumb_func_start GetMonSizeRecordInfo +GetMonSizeRecordInfo: @ 0x080FA280 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -512881,7 +512881,7 @@ sub_080FA280: @ 0x080FA280 lsrs r4, r4, #0x10 ldrh r1, [r5] adds r0, r4, #0 - bl sub_080FA12C + bl GetMonSize adds r1, r0, #0 ldr r0, _080FA2C0 bl sub_080FA1A0 @@ -512919,7 +512919,7 @@ _080FA2DE: .align 2, 0 _080FA2E4: .4byte gUnknown_2021C54 _080FA2E8: .4byte gUnknown_3005AF0 - thumb_func_end sub_080FA280 + thumb_func_end GetMonSizeRecordInfo thumb_func_start sub_080FA2EC sub_080FA2EC: @ 0x080FA2EC @@ -512934,31 +512934,31 @@ sub_080FA2EC: @ 0x080FA2EC _080FA2FC: .4byte 0x00004047 thumb_func_end sub_080FA2EC - thumb_func_start sub_080FA300 -sub_080FA300: @ 0x080FA300 + thumb_func_start GetSeedotSizeRecordInfo +GetSeedotSizeRecordInfo: @ 0x080FA300 push {lr} ldr r0, _080FA318 - bl sub_0809CF20 + bl GetVarPointer adds r1, r0, #0 movs r0, #0x95 lsls r0, r0, #1 - bl sub_080FA280 + bl GetMonSizeRecordInfo pop {r0} bx r0 .align 2, 0 _080FA318: .4byte 0x00004047 - thumb_func_end sub_080FA300 + thumb_func_end GetSeedotSizeRecordInfo - thumb_func_start sub_080FA31C -sub_080FA31C: @ 0x080FA31C + thumb_func_start CompareSeedotSize +CompareSeedotSize: @ 0x080FA31C push {r4, lr} ldr r0, _080FA33C - bl sub_0809CF20 + bl GetVarPointer adds r1, r0, #0 ldr r4, _080FA340 movs r0, #0x95 lsls r0, r0, #1 - bl sub_080FA1F0 + bl CompareMonSize lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -512968,7 +512968,7 @@ sub_080FA31C: @ 0x080FA31C .align 2, 0 _080FA33C: .4byte 0x00004047 _080FA340: .4byte gUnknown_2037290 - thumb_func_end sub_080FA31C + thumb_func_end CompareSeedotSize thumb_func_start sub_080FA344 sub_080FA344: @ 0x080FA344 @@ -512983,30 +512983,30 @@ sub_080FA344: @ 0x080FA344 _080FA354: .4byte 0x0000404F thumb_func_end sub_080FA344 - thumb_func_start sub_080FA358 -sub_080FA358: @ 0x080FA358 + thumb_func_start GetLotadSizeRecordInfo +GetLotadSizeRecordInfo: @ 0x080FA358 push {lr} ldr r0, _080FA36C - bl sub_0809CF20 + bl GetVarPointer adds r1, r0, #0 ldr r0, _080FA370 - bl sub_080FA280 + bl GetMonSizeRecordInfo pop {r0} bx r0 .align 2, 0 _080FA36C: .4byte 0x0000404F _080FA370: .4byte 0x00000127 - thumb_func_end sub_080FA358 + thumb_func_end GetLotadSizeRecordInfo - thumb_func_start sub_080FA374 -sub_080FA374: @ 0x080FA374 + thumb_func_start CompareLotadSize +CompareLotadSize: @ 0x080FA374 push {r4, lr} ldr r0, _080FA394 - bl sub_0809CF20 + bl GetVarPointer adds r1, r0, #0 ldr r4, _080FA398 ldr r0, _080FA39C - bl sub_080FA1F0 + bl CompareMonSize lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -513017,10 +513017,10 @@ sub_080FA374: @ 0x080FA374 _080FA394: .4byte 0x0000404F _080FA398: .4byte gUnknown_2037290 _080FA39C: .4byte 0x00000127 - thumb_func_end sub_080FA374 + thumb_func_end CompareLotadSize - thumb_func_start sub_080FA3A0 -sub_080FA3A0: @ 0x080FA3A0 + thumb_func_start GiveGiftRibbonToParty +GiveGiftRibbonToParty: @ 0x080FA3A0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -513057,12 +513057,12 @@ _080FA3DA: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _080FA40C adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _080FA40C mov r1, sp @@ -513070,7 +513070,7 @@ _080FA3DA: ldrb r1, [r0] adds r0, r4, #0 mov r2, r8 - bl sub_0806A774 + bl SetMonData movs r7, #1 _080FA40C: adds r5, #1 @@ -513093,7 +513093,7 @@ _080FA42C: .4byte gUnknown_3005AEC _080FA430: .4byte 0x000031A8 _080FA434: .4byte gUnknown_2024190 _080FA438: .4byte 0x0000089B - thumb_func_end sub_080FA3A0 + thumb_func_end GiveGiftRibbonToParty thumb_func_start sub_080FA43C sub_080FA43C: @ 0x080FA43C @@ -513145,7 +513145,7 @@ _080FA488: .4byte sub_080FA66C sub_080FA48C: @ 0x080FA48C push {lr} ldr r0, _080FA49C - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -513154,18 +513154,18 @@ sub_080FA48C: @ 0x080FA48C _080FA49C: .4byte sub_080FA500 thumb_func_end sub_080FA48C - thumb_func_start sub_080FA4A0 -sub_080FA4A0: @ 0x080FA4A0 + thumb_func_start FldEffPoison_IsActive +FldEffPoison_IsActive: @ 0x080FA4A0 push {lr} ldr r0, _080FA4B0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _080FA4B0: .4byte sub_080FA66C - thumb_func_end sub_080FA4A0 + thumb_func_end FldEffPoison_IsActive thumb_func_start sub_080FA4B4 sub_080FA4B4: @ 0x080FA4B4 @@ -513176,7 +513176,7 @@ sub_080FA4B4: @ 0x080FA4B4 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 adds r1, r3, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r2, r0, #0 @@ -513247,7 +513247,7 @@ _080FA532: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldrh r1, [r4, #0xe] lsls r1, r1, #8 ldrh r0, [r4, #0x10] @@ -513315,7 +513315,7 @@ _080FA5C0: rsbs r0, r0, #0 movs r1, #0 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _080FA600 strh r5, [r0] _080FA5E6: @@ -513355,7 +513355,7 @@ _080FA620: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits _080FA632: ldrh r1, [r4, #0x12] lsls r1, r1, #8 @@ -513376,7 +513376,7 @@ _080FA64E: movs r0, #0x50 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080FA664 _080FA65E: ldrh r0, [r4, #8] @@ -513433,7 +513433,7 @@ _080FA6A8: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldrh r1, [r4, #0xe] lsls r1, r1, #8 ldrh r0, [r4, #0x10] @@ -513521,7 +513521,7 @@ _080FA766: subs r0, #0x79 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r1, _080FA798 movs r0, #0 strh r0, [r1] @@ -513545,7 +513545,7 @@ _080FA79C: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r0, #0x54 movs r1, #0 bl SetGpuReg @@ -513553,7 +513553,7 @@ _080FA79C: movs r1, #0 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080FA7C4 _080FA7BE: ldrh r0, [r4, #8] @@ -513566,23 +513566,23 @@ _080FA7C4: .align 2, 0 thumb_func_end sub_080FA66C - thumb_func_start sub_080FA7CC -sub_080FA7CC: @ 0x080FA7CC + thumb_func_start SetCurrentSecretBase +SetCurrentSecretBase: @ 0x080FA7CC push {lr} ldr r0, _080FA7E0 ldr r1, _080FA7E4 ldr r1, [r1, #4] - bl sub_080EA2A8 - bl sub_080E97F8 + bl SetCurSecretBaseIdFromPosition + bl TrySetCurSecretBaseIndex pop {r0} bx r0 .align 2, 0 _080FA7E0: .4byte gUnknown_203A80C _080FA7E4: .4byte gUnknown_2036FB8 - thumb_func_end sub_080FA7CC + thumb_func_end SetCurrentSecretBase - thumb_func_start sub_080FA7E8 -sub_080FA7E8: @ 0x080FA7E8 + thumb_func_start AdjustSecretPowerSpritePixelOffsets +AdjustSecretPowerSpritePixelOffsets: @ 0x080FA7E8 push {lr} ldr r0, _080FA808 ldrb r1, [r0] @@ -513665,12 +513665,12 @@ _080FA86E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FA7E8 + thumb_func_end AdjustSecretPowerSpritePixelOffsets - thumb_func_start sub_080FA874 -sub_080FA874: @ 0x080FA874 + thumb_func_start SetUpFieldMove_SecretPower +SetUpFieldMove_SecretPower: @ 0x080FA874 push {r4, lr} - bl sub_080E9854 + bl CheckPlayerHasSecretBase ldr r0, _080FA8C8 ldrh r0, [r0] cmp r0, #1 @@ -513683,7 +513683,7 @@ sub_080FA874: @ 0x080FA874 ldr r4, _080FA8CC adds r1, r4, #2 adds r0, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer movs r1, #0 ldrsh r0, [r4, r1] movs r2, #2 @@ -513697,7 +513697,7 @@ sub_080FA874: @ 0x080FA874 lsrs r0, r0, #0x18 cmp r0, #1 bne _080FA8E0 - bl sub_080FA7CC + bl SetCurrentSecretBase ldr r1, _080FA8D0 ldr r0, _080FA8D4 str r0, [r1] @@ -513708,7 +513708,7 @@ sub_080FA874: @ 0x080FA874 _080FA8C8: .4byte gUnknown_2037290 _080FA8CC: .4byte gUnknown_203A80C _080FA8D0: .4byte gUnknown_3005B10 -_080FA8D4: .4byte sub_081B53D8 +_080FA8D4: .4byte FieldCallback_PrepareFadeInFromMenu _080FA8D8: .4byte gUnknown_203CBB8 _080FA8DC: .4byte sub_080FA94C _080FA8E0: @@ -513718,7 +513718,7 @@ _080FA8E0: lsrs r0, r0, #0x18 cmp r0, #1 bne _080FA910 - bl sub_080FA7CC + bl SetCurrentSecretBase ldr r1, _080FA900 ldr r0, _080FA904 str r0, [r1] @@ -513727,7 +513727,7 @@ _080FA8E0: b _080FA930 .align 2, 0 _080FA900: .4byte gUnknown_3005B10 -_080FA904: .4byte sub_081B53D8 +_080FA904: .4byte FieldCallback_PrepareFadeInFromMenu _080FA908: .4byte gUnknown_203CBB8 _080FA90C: .4byte sub_080FAA58 _080FA910: @@ -513741,7 +513741,7 @@ _080FA91E: movs r0, #0 b _080FA934 _080FA922: - bl sub_080FA7CC + bl SetCurrentSecretBase ldr r1, _080FA93C ldr r0, _080FA940 str r0, [r1] @@ -513756,15 +513756,15 @@ _080FA934: bx r1 .align 2, 0 _080FA93C: .4byte gUnknown_3005B10 -_080FA940: .4byte sub_081B53D8 +_080FA940: .4byte FieldCallback_PrepareFadeInFromMenu _080FA944: .4byte gUnknown_203CBB8 _080FA948: .4byte sub_080FABBC - thumb_func_end sub_080FA874 + thumb_func_end SetUpFieldMove_SecretPower thumb_func_start sub_080FA94C sub_080FA94C: @ 0x080FA94C push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _080FA964 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -513781,7 +513781,7 @@ _080FA968: .4byte gUnknown_8245B35 thumb_func_start sub_080FA96C sub_080FA96C: @ 0x080FA96C push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FA990 @@ -513798,25 +513798,25 @@ sub_080FA96C: @ 0x080FA96C bx r1 .align 2, 0 _080FA990: .4byte gUnknown_3005B60 -_080FA994: .4byte sub_080FA998 +_080FA994: .4byte StartSecretBaseCaveFieldEffect thumb_func_end sub_080FA96C - thumb_func_start sub_080FA998 -sub_080FA998: @ 0x080FA998 + thumb_func_start StartSecretBaseCaveFieldEffect +StartSecretBaseCaveFieldEffect: @ 0x080FA998 push {lr} movs r0, #0xb bl FieldEffectActiveListRemove movs r0, #0x37 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FA998 + thumb_func_end StartSecretBaseCaveFieldEffect - thumb_func_start sub_080FA9AC -sub_080FA9AC: @ 0x080FA9AC + thumb_func_start FldEff_SecretPowerCave +FldEff_SecretPowerCave: @ 0x080FA9AC push {r4, lr} - bl sub_080FA7E8 + bl AdjustSecretPowerSpritePixelOffsets ldr r0, _080FA9EC ldr r3, _080FA9F0 ldr r1, _080FA9F4 @@ -513839,7 +513839,7 @@ sub_080FA9AC: @ 0x080FA9AC lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0x94 - bl sub_08006B0C + bl CreateSprite movs r0, #0 pop {r4} pop {r1} @@ -513849,7 +513849,7 @@ _080FA9EC: .4byte gUnknown_856A1E4 _080FA9F0: .4byte gUnknown_20205AC _080FA9F4: .4byte gUnknown_2037230 _080FA9F8: .4byte gUnknown_20388A8 - thumb_func_end sub_080FA9AC + thumb_func_end FldEff_SecretPowerCave thumb_func_start sub_080FA9FC sub_080FA9FC: @ 0x080FA9FC @@ -513883,7 +513883,7 @@ sub_080FAA18: @ 0x080FAA18 asrs r0, r0, #0x10 cmp r0, #0x14 bne _080FAA40 - bl sub_080E99D8 + bl ToggleSecretBaseEntranceMetatile b _080FAA40 _080FAA38: movs r0, #0 @@ -513894,23 +513894,23 @@ _080FAA40: pop {r0} bx r0 .align 2, 0 -_080FAA44: .4byte sub_080FAA48 +_080FAA44: .4byte CaveEntranceSpriteCallbackEnd thumb_func_end sub_080FAA18 - thumb_func_start sub_080FAA48 -sub_080FAA48: @ 0x080FAA48 + thumb_func_start CaveEntranceSpriteCallbackEnd +CaveEntranceSpriteCallbackEnd: @ 0x080FAA48 push {lr} movs r1, #0x37 bl FieldEffectStop - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 - thumb_func_end sub_080FAA48 + thumb_func_end CaveEntranceSpriteCallbackEnd thumb_func_start sub_080FAA58 sub_080FAA58: @ 0x080FAA58 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _080FAA70 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -513927,7 +513927,7 @@ _080FAA74: .4byte gUnknown_8245B8E thumb_func_start sub_080FAA78 sub_080FAA78: @ 0x080FAA78 push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FAA9C @@ -513944,23 +513944,23 @@ sub_080FAA78: @ 0x080FAA78 bx r1 .align 2, 0 _080FAA9C: .4byte gUnknown_3005B60 -_080FAAA0: .4byte sub_080FAAA4 +_080FAAA0: .4byte StartSecretBaseTreeFieldEffect thumb_func_end sub_080FAA78 - thumb_func_start sub_080FAAA4 -sub_080FAAA4: @ 0x080FAAA4 + thumb_func_start StartSecretBaseTreeFieldEffect +StartSecretBaseTreeFieldEffect: @ 0x080FAAA4 push {lr} movs r0, #0x1a bl FieldEffectActiveListRemove movs r0, #0x38 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FAAA4 + thumb_func_end StartSecretBaseTreeFieldEffect - thumb_func_start sub_080FAAB8 -sub_080FAAB8: @ 0x080FAAB8 + thumb_func_start FldEff_SecretPowerTree +FldEff_SecretPowerTree: @ 0x080FAAB8 push {r4, lr} ldr r1, _080FAB30 movs r2, #0 @@ -513984,7 +513984,7 @@ _080FAADA: movs r0, #2 str r0, [r1, #0x1c] _080FAAE4: - bl sub_080FA7E8 + bl AdjustSecretPowerSpritePixelOffsets ldr r0, _080FAB3C ldr r3, _080FAB40 ldr r1, _080FAB44 @@ -514007,14 +514007,14 @@ _080FAAE4: lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0x94 - bl sub_08006B0C + bl CreateSprite ldr r0, [r4, #0x1c] cmp r0, #1 beq _080FAB22 cmp r0, #3 bne _080FAB26 _080FAB22: - bl sub_080E99D8 + bl ToggleSecretBaseEntranceMetatile _080FAB26: movs r0, #0 pop {r4} @@ -514027,10 +514027,10 @@ _080FAB38: .4byte gUnknown_20388A8 _080FAB3C: .4byte gUnknown_856A1FC _080FAB40: .4byte gUnknown_20205AC _080FAB44: .4byte gUnknown_2037230 - thumb_func_end sub_080FAAB8 + thumb_func_end FldEff_SecretPowerTree - thumb_func_start sub_080FAB48 -sub_080FAB48: @ 0x080FAB48 + thumb_func_start TreeEntranceSpriteCallback1 +TreeEntranceSpriteCallback1: @ 0x080FAB48 push {r4, lr} adds r4, r0, #0 movs r0, #0x9b @@ -514049,11 +514049,11 @@ sub_080FAB48: @ 0x080FAB48 bx r0 .align 2, 0 _080FAB6C: .4byte gUnknown_20388A8 -_080FAB70: .4byte sub_080FAB74 - thumb_func_end sub_080FAB48 +_080FAB70: .4byte TreeEntranceSpriteCallback2 + thumb_func_end TreeEntranceSpriteCallback1 - thumb_func_start sub_080FAB74 -sub_080FAB74: @ 0x080FAB74 + thumb_func_start TreeEntranceSpriteCallback2 +TreeEntranceSpriteCallback2: @ 0x080FAB74 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -514070,7 +514070,7 @@ sub_080FAB74: @ 0x080FAB74 cmp r0, #2 bne _080FAB96 _080FAB92: - bl sub_080E99D8 + bl ToggleSecretBaseEntranceMetatile _080FAB96: movs r0, #0 strh r0, [r4, #0x2e] @@ -514082,23 +514082,23 @@ _080FAB9E: bx r0 .align 2, 0 _080FABA4: .4byte gUnknown_20388A8 -_080FABA8: .4byte sub_080FABAC - thumb_func_end sub_080FAB74 +_080FABA8: .4byte TreeEntranceSpriteCallbackEnd + thumb_func_end TreeEntranceSpriteCallback2 - thumb_func_start sub_080FABAC -sub_080FABAC: @ 0x080FABAC + thumb_func_start TreeEntranceSpriteCallbackEnd +TreeEntranceSpriteCallbackEnd: @ 0x080FABAC push {lr} movs r1, #0x38 bl FieldEffectStop - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 - thumb_func_end sub_080FABAC + thumb_func_end TreeEntranceSpriteCallbackEnd thumb_func_start sub_080FABBC sub_080FABBC: @ 0x080FABBC push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _080FABD4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -514115,7 +514115,7 @@ _080FABD8: .4byte gUnknown_8245BE7 thumb_func_start sub_080FABDC sub_080FABDC: @ 0x080FABDC push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FAC00 @@ -514132,25 +514132,25 @@ sub_080FABDC: @ 0x080FABDC bx r1 .align 2, 0 _080FAC00: .4byte gUnknown_3005B60 -_080FAC04: .4byte sub_080FAC08 +_080FAC04: .4byte StartSecretBaseShrubFieldEffect thumb_func_end sub_080FABDC - thumb_func_start sub_080FAC08 -sub_080FAC08: @ 0x080FAC08 + thumb_func_start StartSecretBaseShrubFieldEffect +StartSecretBaseShrubFieldEffect: @ 0x080FAC08 push {lr} movs r0, #0x1b bl FieldEffectActiveListRemove movs r0, #0x39 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FAC08 + thumb_func_end StartSecretBaseShrubFieldEffect thumb_func_start sub_080FAC1C sub_080FAC1C: @ 0x080FAC1C push {r4, lr} - bl sub_080FA7E8 + bl AdjustSecretPowerSpritePixelOffsets ldr r0, _080FAC5C ldr r3, _080FAC60 ldr r1, _080FAC64 @@ -514173,7 +514173,7 @@ sub_080FAC1C: @ 0x080FAC1C lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0x94 - bl sub_08006B0C + bl CreateSprite movs r0, #0 pop {r4} pop {r1} @@ -514185,8 +514185,8 @@ _080FAC64: .4byte gUnknown_2037230 _080FAC68: .4byte gUnknown_20388A8 thumb_func_end sub_080FAC1C - thumb_func_start sub_080FAC6C -sub_080FAC6C: @ 0x080FAC6C + thumb_func_start ShrubEntranceSpriteCallback1 +ShrubEntranceSpriteCallback1: @ 0x080FAC6C push {r4, lr} adds r4, r0, #0 movs r0, #0xa9 @@ -514200,7 +514200,7 @@ sub_080FAC6C: @ 0x080FAC6C bx r0 .align 2, 0 _080FAC84: .4byte sub_080FAC88 - thumb_func_end sub_080FAC6C + thumb_func_end ShrubEntranceSpriteCallback1 thumb_func_start sub_080FAC88 sub_080FAC88: @ 0x080FAC88 @@ -514217,7 +514217,7 @@ sub_080FAC88: @ 0x080FAC88 asrs r0, r0, #0x10 cmp r0, #0x14 bne _080FACB0 - bl sub_080E99D8 + bl ToggleSecretBaseEntranceMetatile b _080FACB0 _080FACA8: movs r0, #0 @@ -514228,31 +514228,31 @@ _080FACB0: pop {r0} bx r0 .align 2, 0 -_080FACB4: .4byte sub_080FACB8 +_080FACB4: .4byte ShrubEntranceSpriteCallbackEnd thumb_func_end sub_080FAC88 - thumb_func_start sub_080FACB8 -sub_080FACB8: @ 0x080FACB8 + thumb_func_start ShrubEntranceSpriteCallbackEnd +ShrubEntranceSpriteCallbackEnd: @ 0x080FACB8 push {lr} movs r1, #0x39 bl FieldEffectStop - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 - thumb_func_end sub_080FACB8 + thumb_func_end ShrubEntranceSpriteCallbackEnd - thumb_func_start sub_080FACC8 -sub_080FACC8: @ 0x080FACC8 + thumb_func_start FldEff_SecretBasePCTurnOn +FldEff_SecretBasePCTurnOn: @ 0x080FACC8 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer ldr r0, _080FAD08 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FAD0C @@ -514273,12 +514273,12 @@ sub_080FACC8: @ 0x080FACC8 pop {r1} bx r1 .align 2, 0 -_080FAD08: .4byte sub_080FAD10 +_080FAD08: .4byte Task_SecretBasePCTurnOn _080FAD0C: .4byte gUnknown_3005B60 - thumb_func_end sub_080FACC8 + thumb_func_end FldEff_SecretBasePCTurnOn - thumb_func_start sub_080FAD10 -sub_080FAD10: @ 0x080FAD10 + thumb_func_start Task_SecretBasePCTurnOn +Task_SecretBasePCTurnOn: @ 0x080FAD10 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -514357,9 +514357,9 @@ _080FADB0: bl CurrentMapDrawMetatileAt movs r0, #0x3d bl FieldEffectActiveListRemove - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080FADE4 _080FADDE: ldrh r0, [r4, #4] @@ -514370,17 +514370,17 @@ _080FADE4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FAD10 + thumb_func_end Task_SecretBasePCTurnOn - thumb_func_start sub_080FADEC -sub_080FADEC: @ 0x080FADEC + thumb_func_start DoSecretBasePCTurnOffEffect +DoSecretBasePCTurnOffEffect: @ 0x080FADEC push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer movs r0, #3 bl sub_080A306C ldr r0, _080FAE24 @@ -514420,10 +514420,10 @@ _080FAE38: bx r0 .align 2, 0 _080FAE50: .4byte 0x00000E21 - thumb_func_end sub_080FADEC + thumb_func_end DoSecretBasePCTurnOffEffect - thumb_func_start sub_080FAE54 -sub_080FAE54: @ 0x080FAE54 + thumb_func_start PopSecretBaseBalloon +PopSecretBaseBalloon: @ 0x080FAE54 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -514436,7 +514436,7 @@ sub_080FAE54: @ 0x080FAE54 lsrs r6, r6, #0x10 ldr r0, _080FAE94 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FAE98 @@ -514455,12 +514455,12 @@ sub_080FAE54: @ 0x080FAE54 pop {r0} bx r0 .align 2, 0 -_080FAE94: .4byte sub_080FAE9C +_080FAE94: .4byte Task_PopSecretBaseBalloon _080FAE98: .4byte gUnknown_3005B60 - thumb_func_end sub_080FAE54 + thumb_func_end PopSecretBaseBalloon - thumb_func_start sub_080FAE9C -sub_080FAE9C: @ 0x080FAE9C + thumb_func_start Task_PopSecretBaseBalloon +Task_PopSecretBaseBalloon: @ 0x080FAE9C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -514492,7 +514492,7 @@ _080FAEC2: bne _080FAEDC movs r2, #0 ldrsh r0, [r4, r2] - bl sub_080FAF1C + bl DoBalloonSoundEffect _080FAEDC: movs r3, #2 ldrsh r0, [r4, r3] @@ -514515,7 +514515,7 @@ _080FAEDC: cmp r0, #3 bne _080FAF10 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _080FAF14 _080FAF10: adds r0, r1, #1 @@ -514525,10 +514525,10 @@ _080FAF14: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FAE9C + thumb_func_end Task_PopSecretBaseBalloon - thumb_func_start sub_080FAF1C -sub_080FAF1C: @ 0x080FAF1C + thumb_func_start DoBalloonSoundEffect +DoBalloonSoundEffect: @ 0x080FAF1C push {lr} lsls r0, r0, #0x10 asrs r1, r0, #0x10 @@ -514571,7 +514571,7 @@ _080FAF66: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FAF1C + thumb_func_end DoBalloonSoundEffect thumb_func_start sub_080FAF6C sub_080FAF6C: @ 0x080FAF6C @@ -514585,8 +514585,8 @@ sub_080FAF70: @ 0x080FAF70 bx lr thumb_func_end sub_080FAF70 - thumb_func_start sub_080FAF74 -sub_080FAF74: @ 0x080FAF74 + thumb_func_start DoSecretBaseBreakableDoorEffect +DoSecretBaseBreakableDoorEffect: @ 0x080FAF74 push {r4, r5, r6, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -514621,10 +514621,10 @@ sub_080FAF74: @ 0x080FAF74 .align 2, 0 _080FAFBC: .4byte 0x00000276 _080FAFC0: .4byte 0x0000026E - thumb_func_end sub_080FAF74 + thumb_func_end DoSecretBaseBreakableDoorEffect - thumb_func_start sub_080FAFC4 -sub_080FAFC4: @ 0x080FAFC4 + thumb_func_start Task_ShatterSecretBaseBreakableDoor +Task_ShatterSecretBaseBreakableDoor: @ 0x080FAFC4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -514642,9 +514642,9 @@ sub_080FAFC4: @ 0x080FAFC4 ldrsh r0, [r1, r2] movs r3, #0xc ldrsh r1, [r1, r3] - bl sub_080FAF74 + bl DoSecretBaseBreakableDoorEffect adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _080FAFFC .align 2, 0 _080FAFF4: .4byte gUnknown_3005B60 @@ -514656,10 +514656,10 @@ _080FAFFC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FAFC4 + thumb_func_end Task_ShatterSecretBaseBreakableDoor - thumb_func_start sub_080FB004 -sub_080FB004: @ 0x080FB004 + thumb_func_start ShatterSecretBaseBreakableDoor +ShatterSecretBaseBreakableDoor: @ 0x080FB004 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -514676,14 +514676,14 @@ sub_080FB004: @ 0x080FB004 asrs r0, r0, #0x10 lsls r1, r4, #0x10 asrs r1, r1, #0x10 - bl sub_080FAF74 + bl DoSecretBaseBreakableDoorEffect b _080FB04E _080FB02C: cmp r0, #2 bne _080FB04E ldr r0, _080FB054 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FB058 @@ -514700,12 +514700,12 @@ _080FB04E: pop {r0} bx r0 .align 2, 0 -_080FB054: .4byte sub_080FAFC4 +_080FB054: .4byte Task_ShatterSecretBaseBreakableDoor _080FB058: .4byte gUnknown_3005B60 - thumb_func_end sub_080FB004 + thumb_func_end ShatterSecretBaseBreakableDoor - thumb_func_start sub_080FB05C -sub_080FB05C: @ 0x080FB05C + thumb_func_start Task_SecretBaseMusicNoteMatSound +Task_SecretBaseMusicNoteMatSound: @ 0x080FB05C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -514834,7 +514834,7 @@ _080FB1C8: bl sub_080A306C _080FB1CE: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _080FB1DA _080FB1D6: adds r0, r2, #1 @@ -514843,17 +514843,17 @@ _080FB1DA: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FB05C + thumb_func_end Task_SecretBaseMusicNoteMatSound - thumb_func_start sub_080FB1E0 -sub_080FB1E0: @ 0x080FB1E0 + thumb_func_start PlaySecretBaseMusicNoteMatSound +PlaySecretBaseMusicNoteMatSound: @ 0x080FB1E0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r0, _080FB20C movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FB210 @@ -514868,12 +514868,12 @@ sub_080FB1E0: @ 0x080FB1E0 pop {r0} bx r0 .align 2, 0 -_080FB20C: .4byte sub_080FB05C +_080FB20C: .4byte Task_SecretBaseMusicNoteMatSound _080FB210: .4byte gUnknown_3005B60 - thumb_func_end sub_080FB1E0 + thumb_func_end PlaySecretBaseMusicNoteMatSound - thumb_func_start sub_080FB214 -sub_080FB214: @ 0x080FB214 + thumb_func_start SpriteCB_GlitterMatSparkle +SpriteCB_GlitterMatSparkle: @ 0x080FB214 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -514896,10 +514896,10 @@ _080FB23A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FB214 + thumb_func_end SpriteCB_GlitterMatSparkle - thumb_func_start sub_080FB240 -sub_080FB240: @ 0x080FB240 + thumb_func_start DoSecretBaseGlitterMatSparkle +DoSecretBaseGlitterMatSparkle: @ 0x080FB240 push {r4, lr} sub sp, #4 ldr r3, _080FB2D8 @@ -514934,7 +514934,7 @@ sub_080FB240: @ 0x080FB240 movs r3, #0 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -514979,11 +514979,11 @@ _080FB2D8: .4byte gUnknown_2036FF0 _080FB2DC: .4byte gUnknown_2037230 _080FB2E0: .4byte gUnknown_84DDE4C _080FB2E4: .4byte gUnknown_20205AC -_080FB2E8: .4byte sub_080FB214 - thumb_func_end sub_080FB240 +_080FB2E8: .4byte SpriteCB_GlitterMatSparkle + thumb_func_end DoSecretBaseGlitterMatSparkle - thumb_func_start sub_080FB2EC -sub_080FB2EC: @ 0x080FB2EC + thumb_func_start FldEff_SandPillar +FldEff_SandPillar: @ 0x080FB2EC push {r4, lr} sub sp, #4 bl sub_080987DC @@ -514991,7 +514991,7 @@ sub_080FB2EC: @ 0x080FB2EC adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer ldr r1, _080FB328 mov r0, sp movs r2, #0 @@ -515037,7 +515037,7 @@ _080FB336: ldrb r2, [r2] adds r2, #0x20 movs r3, #0 - bl sub_08006B0C + bl CreateSprite b _080FB3FC .align 2, 0 _080FB360: .4byte gUnknown_856A270 @@ -515084,7 +515084,7 @@ _080FB39C: adds r2, #0x10 _080FB3BC: movs r3, #0x94 - bl sub_08006B0C + bl CreateSprite b _080FB3FC .align 2, 0 _080FB3C4: .4byte gUnknown_856A270 @@ -515110,7 +515110,7 @@ _080FB3D4: ldrb r2, [r2] adds r2, #0x10 movs r3, #0x94 - bl sub_08006B0C + bl CreateSprite _080FB3FC: movs r0, #0 add sp, #4 @@ -515121,10 +515121,10 @@ _080FB3FC: _080FB408: .4byte gUnknown_856A270 _080FB40C: .4byte gUnknown_20205AC _080FB410: .4byte gUnknown_2037230 - thumb_func_end sub_080FB2EC + thumb_func_end FldEff_SandPillar - thumb_func_start sub_080FB414 -sub_080FB414: @ 0x080FB414 + thumb_func_start SpriteCB_SandPillar_0 +SpriteCB_SandPillar_0: @ 0x080FB414 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x83 @@ -515133,7 +515133,7 @@ sub_080FB414: @ 0x080FB414 ldr r0, [r4, #0x14] ldr r1, [r4, #0x18] subs r1, #1 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _080FB444 cmp r0, r1 bne _080FB44C @@ -515177,11 +515177,11 @@ _080FB45A: .align 2, 0 _080FB488: .4byte gUnknown_20388A8 _080FB48C: .4byte 0x0000020A -_080FB490: .4byte sub_080FB494 - thumb_func_end sub_080FB414 +_080FB490: .4byte SpriteCB_SandPillar_1 + thumb_func_end SpriteCB_SandPillar_0 - thumb_func_start sub_080FB494 -sub_080FB494: @ 0x080FB494 + thumb_func_start SpriteCB_SandPillar_1 +SpriteCB_SandPillar_1: @ 0x080FB494 push {r4, r5, lr} adds r5, r0, #0 ldrh r1, [r5, #0x2e] @@ -515213,33 +515213,33 @@ _080FB4C4: _080FB4CC: .4byte gUnknown_20388A8 _080FB4D0: .4byte 0x00000E8C _080FB4D4: .4byte sub_080FB4D8 - thumb_func_end sub_080FB494 + thumb_func_end SpriteCB_SandPillar_1 thumb_func_start sub_080FB4D8 sub_080FB4D8: @ 0x080FB4D8 push {lr} movs r1, #0x34 bl FieldEffectStop - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 thumb_func_end sub_080FB4D8 - thumb_func_start sub_080FB4E8 -sub_080FB4E8: @ 0x080FB4E8 + thumb_func_start GetShieldToyTVDecorationInfo +GetShieldToyTVDecorationInfo: @ 0x080FB4E8 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B88 + bl MapGridGetMetatileIdAt adds r1, r0, #0 ldr r0, _080FB520 cmp r1, r0 @@ -515384,7 +515384,7 @@ _080FB63E: _080FB648: .4byte gUnknown_2037290 _080FB64C: .4byte 0x00004054 _080FB650: .4byte 0x000040EE - thumb_func_end sub_080FB4E8 + thumb_func_end GetShieldToyTVDecorationInfo thumb_func_start sub_080FB654 sub_080FB654: @ 0x080FB654 @@ -515394,7 +515394,7 @@ sub_080FB654: @ 0x080FB654 adds r6, r4, #0 lsls r1, r1, #0x18 lsrs r5, r1, #0x18 - bl sub_080E9EA0 + bl CurMapIsSecretBase lsls r0, r0, #0x18 cmp r0, #0 beq _080FB698 @@ -515433,8 +515433,8 @@ _080FB6A0: .4byte 0x0000028D _080FB6A4: .4byte 0x0000023F thumb_func_end sub_080FB654 - thumb_func_start sub_080FB6A8 -sub_080FB6A8: @ 0x080FB6A8 + thumb_func_start Task_FieldPoisonEffect +Task_FieldPoisonEffect: @ 0x080FB6A8 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -515481,7 +515481,7 @@ _080FB6F2: b _080FB702 _080FB6FA: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _080FB712 _080FB702: ldrh r0, [r1, #2] @@ -515495,7 +515495,7 @@ _080FB712: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FB6A8 + thumb_func_end Task_FieldPoisonEffect thumb_func_start sub_080FB718 sub_080FB718: @ 0x080FB718 @@ -515504,24 +515504,24 @@ sub_080FB718: @ 0x080FB718 bl sub_080A306C ldr r0, _080FB72C movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080FB72C: .4byte sub_080FB6A8 +_080FB72C: .4byte Task_FieldPoisonEffect thumb_func_end sub_080FB718 thumb_func_start sub_080FB730 sub_080FB730: @ 0x080FB730 push {lr} ldr r0, _080FB740 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_080FB740: .4byte sub_080FB6A8 +_080FB740: .4byte Task_FieldPoisonEffect thumb_func_end sub_080FB730 thumb_func_start sub_080FB744 @@ -515538,11 +515538,11 @@ sub_080FB744: @ 0x080FB744 bx lr .align 2, 0 _080FB758: .4byte gUnknown_3005B60 -_080FB75C: .4byte sub_080FB760 +_080FB75C: .4byte Task_WateringBerryTreeAnim_1 thumb_func_end sub_080FB744 - thumb_func_start sub_080FB760 -sub_080FB760: @ 0x080FB760 + thumb_func_start Task_WateringBerryTreeAnim_1 +Task_WateringBerryTreeAnim_1: @ 0x080FB760 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -515576,7 +515576,7 @@ _080FB78C: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldr r1, _080FB7CC lsls r0, r5, #2 adds r0, r0, r5 @@ -515592,11 +515592,11 @@ _080FB7BE: _080FB7C4: .4byte gUnknown_2037230 _080FB7C8: .4byte gUnknown_2036FF0 _080FB7CC: .4byte gUnknown_3005B60 -_080FB7D0: .4byte sub_080FB7D4 - thumb_func_end sub_080FB760 +_080FB7D0: .4byte Task_WateringBerryTreeAnim_2 + thumb_func_end Task_WateringBerryTreeAnim_1 - thumb_func_start sub_080FB7D4 -sub_080FB7D4: @ 0x080FB7D4 + thumb_func_start Task_WateringBerryTreeAnim_2 +Task_WateringBerryTreeAnim_2: @ 0x080FB7D4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -515632,7 +515632,7 @@ sub_080FB7D4: @ 0x080FB7D4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08092B30 + bl EventObjectSetHeldMovement b _080FB838 .align 2, 0 _080FB828: .4byte gUnknown_2037230 @@ -515646,11 +515646,11 @@ _080FB838: pop {r0} bx r0 .align 2, 0 -_080FB840: .4byte sub_080FB844 - thumb_func_end sub_080FB7D4 +_080FB840: .4byte AnimBonemerangProjectileEnd + thumb_func_end Task_WateringBerryTreeAnim_2 - thumb_func_start sub_080FB844 -sub_080FB844: @ 0x080FB844 + thumb_func_start AnimBonemerangProjectileEnd +AnimBonemerangProjectileEnd: @ 0x080FB844 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -515660,27 +515660,27 @@ sub_080FB844: @ 0x080FB844 lsrs r0, r0, #0x18 bl SetPlayerAvatarTransitionFlags adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FB844 + thumb_func_end AnimBonemerangProjectileEnd - thumb_func_start sub_080FB868 -sub_080FB868: @ 0x080FB868 + thumb_func_start DoWateringBerryTreeAnim +DoWateringBerryTreeAnim: @ 0x080FB868 push {lr} ldr r0, _080FB878 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _080FB878: .4byte sub_080FB744 - thumb_func_end sub_080FB868 + thumb_func_end DoWateringBerryTreeAnim - thumb_func_start sub_080FB87C -sub_080FB87C: @ 0x080FB87C + thumb_func_start CreateRecordMixingSprite +CreateRecordMixingSprite: @ 0x080FB87C push {r4, r5, lr} ldr r0, _080FB8D0 bl LoadSpritePalette @@ -515688,7 +515688,7 @@ sub_080FB87C: @ 0x080FB87C movs r1, #0 movs r2, #0 movs r3, #0x52 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 @@ -515729,10 +515729,10 @@ _080FB8DE: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_080FB87C + thumb_func_end CreateRecordMixingSprite - thumb_func_start sub_080FB8E4 -sub_080FB8E4: @ 0x080FB8E4 + thumb_func_start DestroyRecordMixingSprite +DestroyRecordMixingSprite: @ 0x080FB8E4 push {r4, r5, r6, r7, lr} ldr r4, _080FB918 adds r7, r4, #0 @@ -515747,7 +515747,7 @@ _080FB8EE: cmp r1, r0 bne _080FB908 adds r0, r4, #0 - bl sub_080072FC + bl FreeSpritePalette adds r0, r4, #0 bl DestroySprite _080FB908: @@ -515762,7 +515762,7 @@ _080FB908: .align 2, 0 _080FB918: .4byte gUnknown_20205AC _080FB91C: .4byte gUnknown_856A464 - thumb_func_end sub_080FB8E4 + thumb_func_end DestroyRecordMixingSprite thumb_func_start sub_080FB920 sub_080FB920: @ 0x080FB920 @@ -515791,8 +515791,8 @@ _080FB946: bx r1 thumb_func_end sub_080FB920 - thumb_func_start sub_080FB94C -sub_080FB94C: @ 0x080FB94C + thumb_func_start GetTruckBoxMovement +GetTruckBoxMovement: @ 0x080FB94C push {lr} adds r0, #0x78 movs r1, #0xb4 @@ -515808,10 +515808,10 @@ _080FB962: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FB94C + thumb_func_end GetTruckBoxMovement - thumb_func_start sub_080FB968 -sub_080FB968: @ 0x080FB968 + thumb_func_start Task_Truck1 +Task_Truck1: @ 0x080FB968 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -515824,7 +515824,7 @@ sub_080FB968: @ 0x080FB968 movs r1, #0 ldrsh r0, [r5, r1] adds r0, #0x1e - bl sub_080FB94C + bl GetTruckBoxMovement ldr r4, _080FBA10 ldr r2, [r4] ldrb r1, [r2, #5] @@ -515840,7 +515840,7 @@ sub_080FB968: @ 0x080FB968 bl sub_0808E19C movs r3, #0 ldrsh r0, [r5, r3] - bl sub_080FB94C + bl GetTruckBoxMovement ldr r2, [r4] ldrb r1, [r2, #5] ldrb r2, [r2, #4] @@ -515854,7 +515854,7 @@ sub_080FB968: @ 0x080FB968 bl sub_0808E19C movs r1, #0 ldrsh r0, [r5, r1] - bl sub_080FB94C + bl GetTruckBoxMovement ldr r2, [r4] ldrb r1, [r2, #5] ldrb r2, [r2, #4] @@ -515882,7 +515882,7 @@ _080FB9F0: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning add sp, #4 pop {r4, r5} pop {r0} @@ -515892,10 +515892,10 @@ _080FBA0C: .4byte gUnknown_3005B68 _080FBA10: .4byte gUnknown_3005AEC _080FBA14: .4byte 0xFFFD0000 _080FBA18: .4byte 0x75300000 - thumb_func_end sub_080FB968 + thumb_func_end Task_Truck1 - thumb_func_start sub_080FBA1C -sub_080FBA1C: @ 0x080FBA1C + thumb_func_start Task_Truck2 +Task_Truck2: @ 0x080FBA1C push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -515925,7 +515925,7 @@ _080FBA4C: cmp r0, #0x13 bne _080FBA60 adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _080FBB18 .align 2, 0 _080FBA5C: .4byte gUnknown_3005B68 @@ -515961,11 +515961,11 @@ _080FBA7C: lsls r1, r1, #0x10 asrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_08089C30 + bl SetCameraPanning movs r4, #4 ldrsh r0, [r7, r4] adds r0, #0x1e - bl sub_080FB94C + bl GetTruckBoxMovement ldr r6, _080FBB28 ldr r2, [r6] ldrb r1, [r2, #5] @@ -515984,7 +515984,7 @@ _080FBA7C: bl sub_0808E19C movs r1, #4 ldrsh r0, [r7, r1] - bl sub_080FB94C + bl GetTruckBoxMovement ldr r2, [r6] ldrb r1, [r2, #5] ldrb r2, [r2, #4] @@ -516000,7 +516000,7 @@ _080FBA7C: bl sub_0808E19C movs r1, #4 ldrsh r0, [r7, r1] - bl sub_080FB94C + bl GetTruckBoxMovement ldr r2, [r6] ldrb r1, [r2, #5] ldrb r2, [r2, #4] @@ -516025,7 +516025,7 @@ _080FBB20: .4byte gUnknown_856A47C _080FBB24: .4byte sub_080FBB30 _080FBB28: .4byte gUnknown_3005AEC _080FBB2C: .4byte 0xFFFD0000 - thumb_func_end sub_080FBA1C + thumb_func_end Task_Truck2 thumb_func_start sub_080FBB30 sub_080FBB30: @ 0x080FBB30 @@ -516058,7 +516058,7 @@ _080FBB60: cmp r0, #0x13 bne _080FBB74 adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask b _080FBBC8 .align 2, 0 _080FBB70: .4byte gUnknown_3005B68 @@ -516072,7 +516072,7 @@ _080FBB74: movs r6, #0 ldrsb r6, [r0, r6] adds r0, r6, #0 - bl sub_08089C30 + bl SetCameraPanning ldr r5, _080FBBD8 ldr r0, [r5] ldrb r1, [r0, #5] @@ -516113,8 +516113,8 @@ _080FBBD4: .4byte gUnknown_856A47C _080FBBD8: .4byte gUnknown_3005AEC thumb_func_end sub_080FBB30 - thumb_func_start sub_080FBBDC -sub_080FBBDC: @ 0x080FBBDC + thumb_func_start Task_HandleTruckSequence +Task_HandleTruckSequence: @ 0x080FBBDC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -516160,7 +516160,7 @@ _080FBC30: strh r0, [r4, #2] ldr r0, _080FBC54 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #4] @@ -516170,7 +516170,7 @@ _080FBC30: bl sub_080A306C b _080FBD48 .align 2, 0 -_080FBC54: .4byte sub_080FB968 +_080FBC54: .4byte Task_Truck1 _080FBC58: ldrh r0, [r4, #2] adds r0, #1 @@ -516179,7 +516179,7 @@ _080FBC58: asrs r0, r0, #0x10 cmp r0, #0x96 bne _080FBD48 - bl sub_080AE99C + bl pal_fill_black movs r0, #0 strh r0, [r4, #2] movs r0, #2 @@ -516204,10 +516204,10 @@ _080FBC74: ble _080FBD48 strh r2, [r4, #2] ldrb r0, [r4, #4] - bl sub_080A8964 + bl DestroyTask ldr r0, _080FBCBC movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #6] @@ -516218,7 +516218,7 @@ _080FBC74: b _080FBD48 .align 2, 0 _080FBCB8: .4byte gUnknown_2037C74 -_080FBCBC: .4byte sub_080FBA1C +_080FBCBC: .4byte Task_Truck2 _080FBCC0: ldr r2, _080FBCE0 movs r0, #6 @@ -516279,17 +516279,17 @@ _080FBD02: movs r0, #0x34 bl sub_080A306C adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask bl sub_080987E8 _080FBD48: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FBBDC + thumb_func_end Task_HandleTruckSequence - thumb_func_start sub_080FBD50 -sub_080FBD50: @ 0x080FBD50 + thumb_func_start ExecuteTruckSequence +ExecuteTruckSequence: @ 0x080FBD50 push {lr} sub sp, #4 ldr r2, _080FBD98 @@ -516314,7 +516314,7 @@ sub_080FBD50: @ 0x080FBD50 bl CpuFastSet ldr r0, _080FBDAC movs r1, #0xa - bl sub_080A8878 + bl CreateTask add sp, #4 pop {r0} bx r0 @@ -516324,15 +516324,15 @@ _080FBD9C: .4byte 0x00000215 _080FBDA0: .4byte 0x0000021D _080FBDA4: .4byte gUnknown_20377B4 _080FBDA8: .4byte 0x01000100 -_080FBDAC: .4byte sub_080FBBDC - thumb_func_end sub_080FBD50 +_080FBDAC: .4byte Task_HandleTruckSequence + thumb_func_end ExecuteTruckSequence - thumb_func_start sub_080FBDB0 -sub_080FBDB0: @ 0x080FBDB0 + thumb_func_start EndTruckSequence +EndTruckSequence: @ 0x080FBDB0 push {r4, r5, r6, lr} sub sp, #4 ldr r0, _080FBE04 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0 @@ -516368,9 +516368,9 @@ _080FBDFA: pop {r0} bx r0 .align 2, 0 -_080FBE04: .4byte sub_080FBBDC +_080FBE04: .4byte Task_HandleTruckSequence _080FBE08: .4byte gUnknown_3005AEC - thumb_func_end sub_080FBDB0 + thumb_func_end EndTruckSequence thumb_func_start sub_080FBE0C sub_080FBE0C: @ 0x080FBE0C @@ -516385,7 +516385,7 @@ sub_080FBE0C: @ 0x080FBE0C adds r1, r4, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_0813806C + bl GetSSTidalLocation lsls r0, r0, #0x18 cmp r0, #0 bne _080FBE4E @@ -516414,8 +516414,8 @@ _080FBE50: bx r1 thumb_func_end sub_080FBE0C - thumb_func_start sub_080FBE58 -sub_080FBE58: @ 0x080FBE58 + thumb_func_start Task_HandlePorthole +Task_HandlePorthole: @ 0x080FBE58 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -516425,7 +516425,7 @@ sub_080FBE58: @ 0x080FBE58 ldr r1, _080FBE88 adds r4, r0, r1 ldr r0, _080FBE8C - bl sub_0809CF20 + bl GetVarPointer adds r7, r0, #0 ldr r0, _080FBE90 ldr r3, [r0] @@ -516474,12 +516474,12 @@ _080FBEC6: ldrb r1, [r6, #1] ldrb r2, [r3, #4] movs r0, #0xff - bl sub_080D2BE0 + bl ScriptMovement_IsObjectMovementFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FBF52 movs r0, #1 - bl sub_08138030 + bl CountSSTidalStep cmp r0, #1 bne _080FBEF6 ldrh r0, [r7] @@ -516522,7 +516522,7 @@ _080FBF1C: ldr r3, _080FBF30 _080FBF22: movs r0, #0xff - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript movs r0, #1 strh r0, [r4] b _080FBF52 @@ -516535,17 +516535,17 @@ _080FBF34: lsls r0, r0, #7 bl FlagClear movs r0, #0 - bl sub_0808461C - bl sub_080AF068 + bl SetWarpDestinationToDynamicWarp + bl DoDiveWarp adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _080FBF52: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _080FBF58: .4byte 0x00004001 - thumb_func_end sub_080FBE58 + thumb_func_end Task_HandlePorthole thumb_func_start sub_080FBF5C sub_080FBF5C: @ 0x080FBF5C @@ -516557,7 +516557,7 @@ sub_080FBF5C: @ 0x080FBF5C movs r0, #0x8c movs r2, #0x70 movs r3, #0x50 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FBFB4 @@ -516621,17 +516621,17 @@ sub_080FBFD8: @ 0x080FBFD8 movs r2, #0x20 orrs r1, r2 strb r1, [r0, #1] - bl sub_080AE99C + bl pal_fill_black ldr r0, _080FC010 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask bl sub_080987DC pop {r0} bx r0 .align 2, 0 _080FC008: .4byte gUnknown_2036FF0 _080FC00C: .4byte gUnknown_2037230 -_080FC010: .4byte sub_080FBE58 +_080FC010: .4byte Task_HandlePorthole thumb_func_end sub_080FBFD8 thumb_func_start sub_080FC014 @@ -516664,8 +516664,8 @@ _080FC050: .4byte 0x00004001 _080FC054: .4byte gUnknown_3005AEC thumb_func_end sub_080FC014 - thumb_func_start sub_080FC058 -sub_080FC058: @ 0x080FC058 + thumb_func_start GetCurrentMapRotatingGatePuzzleType +GetCurrentMapRotatingGatePuzzleType: @ 0x080FC058 push {lr} ldr r0, _080FC06C ldr r0, [r0] @@ -516692,14 +516692,14 @@ _080FC082: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FC058 + thumb_func_end GetCurrentMapRotatingGatePuzzleType - thumb_func_start sub_080FC088 -sub_080FC088: @ 0x080FC088 + thumb_func_start RotatingGate_ResetAllGateOrientations +RotatingGate_ResetAllGateOrientations: @ 0x080FC088 push {r4, r5, r6, lr} movs r0, #0x80 lsls r0, r0, #7 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 movs r3, #0 ldr r4, _080FC0BC @@ -516725,27 +516725,27 @@ _080FC0B4: .align 2, 0 _080FC0BC: .4byte gUnknown_2039D14 _080FC0C0: .4byte gUnknown_2039D10 - thumb_func_end sub_080FC088 + thumb_func_end RotatingGate_ResetAllGateOrientations - thumb_func_start sub_080FC0C4 -sub_080FC0C4: @ 0x080FC0C4 + thumb_func_start RotatingGate_GetGateOrientation +RotatingGate_GetGateOrientation: @ 0x080FC0C4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0x80 lsls r0, r0, #7 - bl sub_0809CF20 + bl GetVarPointer adds r0, r0, r4 ldrb r0, [r0] pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FC0C4 + thumb_func_end RotatingGate_GetGateOrientation - thumb_func_start sub_080FC0E0 -sub_080FC0E0: @ 0x080FC0E0 + thumb_func_start RotatingGate_SetGateOrientation +RotatingGate_SetGateOrientation: @ 0x080FC0E0 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -516755,13 +516755,13 @@ sub_080FC0E0: @ 0x080FC0E0 lsrs r5, r5, #0x18 movs r0, #0x80 lsls r0, r0, #7 - bl sub_0809CF20 + bl GetVarPointer adds r0, r0, r4 strb r5, [r0] pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_080FC0E0 + thumb_func_end RotatingGate_SetGateOrientation thumb_func_start RotatingGate_RotateInDirection RotatingGate_RotateInDirection: @ 0x080FC100 @@ -516770,7 +516770,7 @@ RotatingGate_RotateInDirection: @ 0x080FC100 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_080FC0C4 + bl RotatingGate_GetGateOrientation lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r4, #1 @@ -516793,16 +516793,16 @@ _080FC12E: lsrs r1, r0, #0x18 _080FC130: adds r0, r5, #0 - bl sub_080FC0E0 + bl RotatingGate_SetGateOrientation pop {r4, r5} pop {r0} bx r0 thumb_func_end RotatingGate_RotateInDirection - thumb_func_start sub_080FC13C -sub_080FC13C: @ 0x080FC13C + thumb_func_start RotatingGate_LoadPuzzleConfig +RotatingGate_LoadPuzzleConfig: @ 0x080FC13C push {lr} - bl sub_080FC058 + bl GetCurrentMapRotatingGatePuzzleType cmp r0, #1 beq _080FC150 cmp r0, #1 @@ -516846,7 +516846,7 @@ _080FC188: .4byte gUnknown_2039D10 _080FC18C: .4byte gUnknown_856A4D4 _080FC190: .4byte gUnknown_2039D14 _080FC194: .4byte gUnknown_2039D04 - thumb_func_end sub_080FC13C + thumb_func_end RotatingGate_LoadPuzzleConfig thumb_func_start RotatingGate_CreateGatesWithinViewport RotatingGate_CreateGatesWithinViewport: @ 0x080FC198 @@ -516930,7 +516930,7 @@ _080FC1E6: adds r0, r5, #0 asrs r1, r1, #0x10 asrs r2, r2, #0x10 - bl sub_080FC26C + bl RotatingGate_CreateGate strb r0, [r4] _080FC23C: adds r0, r5, #1 @@ -516956,8 +516956,8 @@ _080FC264: .4byte gUnknown_2039D10 _080FC268: .4byte gUnknown_2039D04 thumb_func_end RotatingGate_CreateGatesWithinViewport - thumb_func_start sub_080FC26C -sub_080FC26C: @ 0x080FC26C + thumb_func_start RotatingGate_CreateGate +RotatingGate_CreateGate: @ 0x080FC26C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -517004,7 +517004,7 @@ _080FC2A8: movs r1, #0 movs r2, #0 movs r3, #0x94 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 @@ -517050,7 +517050,7 @@ _080FC2A8: adds r0, r4, #0 bl RotatingGate_HideGatesOutsideViewport adds r0, r6, #0 - bl sub_080FC0C4 + bl RotatingGate_GetGateOrientation adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -517071,10 +517071,10 @@ _080FC346: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FC26C + thumb_func_end RotatingGate_CreateGate - thumb_func_start sub_080FC354 -sub_080FC354: @ 0x080FC354 + thumb_func_start SpriteCallback_RotatingGate +SpriteCallback_RotatingGate: @ 0x080FC354 push {r4, r5, r6, r7, lr} adds r6, r0, #0 ldrh r0, [r6, #0x30] @@ -517091,7 +517091,7 @@ sub_080FC354: @ 0x080FC354 adds r0, r4, #4 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0811A988 + bl GetPlayerSpeed lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #1 @@ -517114,7 +517114,7 @@ _080FC39A: adds r0, #8 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0811A988 + bl GetPlayerSpeed lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #1 @@ -517136,7 +517136,7 @@ _080FC3C8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FC354 + thumb_func_end SpriteCallback_RotatingGate thumb_func_start RotatingGate_HideGatesOutsideViewport RotatingGate_HideGatesOutsideViewport: @ 0x080FC3D4 @@ -517234,8 +517234,8 @@ sub_080FC470: @ 0x080FC470 _080FC47C: .4byte gUnknown_856D93C thumb_func_end sub_080FC470 - thumb_func_start sub_080FC480 -sub_080FC480: @ 0x080FC480 + thumb_func_start RotatingGate_DestroyGatesOutsideViewport +RotatingGate_DestroyGatesOutsideViewport: @ 0x080FC480 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -517337,10 +517337,10 @@ _080FC53C: .4byte gUnknown_2039D10 _080FC540: .4byte gUnknown_2039D04 _080FC544: .4byte gUnknown_20205AC _080FC548: .4byte gUnknown_2039D14 - thumb_func_end sub_080FC480 + thumb_func_end RotatingGate_DestroyGatesOutsideViewport - thumb_func_start sub_080FC54C -sub_080FC54C: @ 0x080FC54C + thumb_func_start RotatingGate_CanRotate +RotatingGate_CanRotate: @ 0x080FC54C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -517367,7 +517367,7 @@ _080FC574: mov sl, r1 _080FC578: adds r0, r4, #0 - bl sub_080FC0C4 + bl RotatingGate_GetGateOrientation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp] @@ -517425,7 +517425,7 @@ _080FC5C2: asrs r1, r1, #0x18 add r1, r8 str r3, [sp, #8] - bl sub_08087B14 + bl MapGridIsImpassableAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, [sp, #8] @@ -517453,7 +517453,7 @@ _080FC608: _080FC618: .4byte gUnknown_856DC1C _080FC61C: .4byte gUnknown_2039D10 _080FC620: .4byte gUnknown_856DC5C - thumb_func_end sub_080FC54C + thumb_func_end RotatingGate_CanRotate thumb_func_start RotatingGate_HasArm RotatingGate_HasArm: @ 0x080FC624 @@ -517468,7 +517468,7 @@ RotatingGate_HasArm: @ 0x080FC624 movs r0, #1 ands r5, r0 adds r0, r6, #0 - bl sub_080FC0C4 + bl RotatingGate_GetGateOrientation subs r4, r4, r0 adds r1, r4, #4 adds r0, r1, #0 @@ -517517,7 +517517,7 @@ RotatingGate_TriggerRotationAnimation: @ 0x080FC678 adds r4, r4, r0 strh r1, [r4, #0x30] adds r0, r3, #0 - bl sub_080FC0C4 + bl RotatingGate_GetGateOrientation strh r0, [r4, #0x32] _080FC69C: pop {r4} @@ -517528,8 +517528,8 @@ _080FC6A4: .4byte gUnknown_2039D04 _080FC6A8: .4byte gUnknown_20205AC thumb_func_end RotatingGate_TriggerRotationAnimation - thumb_func_start sub_080FC6AC -sub_080FC6AC: @ 0x080FC6AC + thumb_func_start RotatingGate_GetRotationInfo +RotatingGate_GetRotationInfo: @ 0x080FC6AC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -517578,16 +517578,16 @@ _080FC6F8: bx r1 .align 2, 0 _080FC6FC: .4byte gUnknown_856DC0C - thumb_func_end sub_080FC6AC + thumb_func_end RotatingGate_GetRotationInfo thumb_func_start RotatingGate_InitPuzzle RotatingGate_InitPuzzle: @ 0x080FC700 push {lr} - bl sub_080FC058 + bl GetCurrentMapRotatingGatePuzzleType cmp r0, #0 beq _080FC712 - bl sub_080FC13C - bl sub_080FC088 + bl RotatingGate_LoadPuzzleConfig + bl RotatingGate_ResetAllGateOrientations _080FC712: pop {r0} bx r0 @@ -517601,7 +517601,7 @@ RotatingGatePuzzleCameraUpdate: @ 0x080FC718 lsrs r4, r0, #0x10 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 - bl sub_080FC058 + bl GetCurrentMapRotatingGatePuzzleType cmp r0, #0 beq _080FC73A lsls r0, r4, #0x10 @@ -517609,7 +517609,7 @@ RotatingGatePuzzleCameraUpdate: @ 0x080FC718 lsls r1, r5, #0x10 asrs r1, r1, #0x10 bl RotatingGate_CreateGatesWithinViewport - bl sub_080FC480 + bl RotatingGate_DestroyGatesOutsideViewport _080FC73A: pop {r4, r5} pop {r0} @@ -517619,11 +517619,11 @@ _080FC73A: thumb_func_start RotatingGate_InitPuzzleAndGraphics RotatingGate_InitPuzzleAndGraphics: @ 0x080FC740 push {lr} - bl sub_080FC058 + bl GetCurrentMapRotatingGatePuzzleType cmp r0, #0 beq _080FC75A bl sub_080FC470 - bl sub_080FC13C + bl RotatingGate_LoadPuzzleConfig movs r0, #0 movs r1, #0 bl RotatingGate_CreateGatesWithinViewport @@ -517633,8 +517633,8 @@ _080FC75A: .align 2, 0 thumb_func_end RotatingGate_InitPuzzleAndGraphics - thumb_func_start sub_080FC760 -sub_080FC760: @ 0x080FC760 + thumb_func_start CheckForRotatingGatePuzzleCollision +CheckForRotatingGatePuzzleCollision: @ 0x080FC760 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -517647,7 +517647,7 @@ sub_080FC760: @ 0x080FC760 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 mov r8, r2 - bl sub_080FC058 + bl GetCurrentMapRotatingGatePuzzleType cmp r0, #0 bne _080FC794 b _080FC832 @@ -517706,7 +517706,7 @@ _080FC7A2: lsls r2, r2, #0x10 asrs r2, r2, #0x10 mov r0, sb - bl sub_080FC6AC + bl RotatingGate_GetRotationInfo lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -517722,7 +517722,7 @@ _080FC7A2: beq _080FC828 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080FC54C + bl RotatingGate_CanRotate cmp r0, #0 bne _080FC782 movs r0, #1 @@ -517747,7 +517747,7 @@ _080FC834: bx r1 .align 2, 0 _080FC840: .4byte gUnknown_2039D14 - thumb_func_end sub_080FC760 + thumb_func_end CheckForRotatingGatePuzzleCollision thumb_func_start CheckForRotatingGatePuzzleCollisionWithoutAnimation CheckForRotatingGatePuzzleCollisionWithoutAnimation: @ 0x080FC844 @@ -517763,7 +517763,7 @@ CheckForRotatingGatePuzzleCollisionWithoutAnimation: @ 0x080FC844 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 mov r8, r2 - bl sub_080FC058 + bl GetCurrentMapRotatingGatePuzzleType cmp r0, #0 bne _080FC86A b _080FC8FA @@ -517817,7 +517817,7 @@ _080FC878: lsls r2, r2, #0x10 asrs r2, r2, #0x10 mov r0, sb - bl sub_080FC6AC + bl RotatingGate_GetRotationInfo lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -517833,7 +517833,7 @@ _080FC878: beq _080FC8F0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_080FC54C + bl RotatingGate_CanRotate cmp r0, #0 beq _080FC866 _080FC8F0: @@ -517891,13 +517891,13 @@ sub_080FC934: @ 0x080FC934 _080FC940: .4byte 0x0000088C thumb_func_end sub_080FC934 - thumb_func_start sub_080FC944 -sub_080FC944: @ 0x080FC944 + thumb_func_start EnterSafariMode +EnterSafariMode: @ 0x080FC944 push {lr} movs r0, #0x11 bl IncrementGameStat bl sub_080FC924 - bl sub_080FCAB4 + bl ClearAllPokeblockFeeders ldr r1, _080FC974 movs r0, #0x1e strb r0, [r1] @@ -517918,10 +517918,10 @@ _080FC974: .4byte gUnknown_2039D18 _080FC978: .4byte gUnknown_2039D1A _080FC97C: .4byte gUnknown_2039D1C _080FC980: .4byte gUnknown_2039D1D - thumb_func_end sub_080FC944 + thumb_func_end EnterSafariMode - thumb_func_start sub_080FC984 -sub_080FC984: @ 0x080FC984 + thumb_func_start ExitSafariMode +ExitSafariMode: @ 0x080FC984 push {lr} ldr r0, _080FC9AC ldrb r0, [r0] @@ -517929,7 +517929,7 @@ sub_080FC984: @ 0x080FC984 ldrb r1, [r1] bl sub_080EEF6C bl sub_080FC934 - bl sub_080FCAB4 + bl ClearAllPokeblockFeeders ldr r1, _080FC9B4 movs r0, #0 strb r0, [r1] @@ -517943,10 +517943,10 @@ _080FC9AC: .4byte gUnknown_2039D1C _080FC9B0: .4byte gUnknown_2039D1D _080FC9B4: .4byte gUnknown_2039D18 _080FC9B8: .4byte gUnknown_2039D1A - thumb_func_end sub_080FC984 + thumb_func_end ExitSafariMode - thumb_func_start sub_080FC9BC -sub_080FC9BC: @ 0x080FC9BC + thumb_func_start SafariZoneTakeStep +SafariZoneTakeStep: @ 0x080FC9BC push {lr} bl sub_080FC910 cmp r0, #0 @@ -517973,7 +517973,7 @@ _080FC9E8: bx r1 .align 2, 0 _080FC9EC: .4byte gUnknown_82623E8 - thumb_func_end sub_080FC9BC + thumb_func_end SafariZoneTakeStep thumb_func_start sub_080FC9F0 sub_080FC9F0: @ 0x080FC9F0 @@ -517986,8 +517986,8 @@ sub_080FC9F0: @ 0x080FC9F0 _080FC9FC: .4byte gUnknown_82623CD thumb_func_end sub_080FC9F0 - thumb_func_start sub_080FCA00 -sub_080FCA00: @ 0x080FCA00 + thumb_func_start CB2_EndSafariBattle +CB2_EndSafariBattle: @ 0x080FCA00 push {lr} ldr r1, _080FCA30 ldr r0, _080FCA34 @@ -518009,7 +518009,7 @@ _080FCA1E: cmp r0, #0 beq _080FCA48 ldr r0, _080FCA44 - bl sub_08000540 + bl SetMainCallback2 b _080FCA8C .align 2, 0 _080FCA30: .4byte gUnknown_2039D1D @@ -518024,18 +518024,18 @@ _080FCA48: bne _080FCA78 ldr r0, _080FCA68 bl ScriptContext2_RunNewScript - bl sub_08084540 + bl WarpIntoMap ldr r1, _080FCA6C ldr r0, _080FCA70 str r0, [r1] ldr r0, _080FCA74 - bl sub_08000540 + bl SetMainCallback2 b _080FCA8C .align 2, 0 _080FCA68: .4byte gUnknown_82623AA _080FCA6C: .4byte gUnknown_3005B0C _080FCA70: .4byte sub_080AEFEC -_080FCA74: .4byte sub_08085934 +_080FCA74: .4byte CB2_LoadMap _080FCA78: cmp r0, #7 bne _080FCA8C @@ -518043,17 +518043,17 @@ _080FCA78: bl ScriptContext1_SetupScript bl sub_080988B8 ldr r0, _080FCA94 - bl sub_08000540 + bl SetMainCallback2 _080FCA8C: pop {r0} bx r0 .align 2, 0 _080FCA90: .4byte gUnknown_82623F9 -_080FCA94: .4byte sub_08085B34 - thumb_func_end sub_080FCA00 +_080FCA94: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end CB2_EndSafariBattle - thumb_func_start sub_080FCA98 -sub_080FCA98: @ 0x080FCA98 + thumb_func_start ClearPokeblockFeeder +ClearPokeblockFeeder: @ 0x080FCA98 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x14 @@ -518066,10 +518066,10 @@ sub_080FCA98: @ 0x080FCA98 bx r0 .align 2, 0 _080FCAB0: .4byte gUnknown_2039D20 - thumb_func_end sub_080FCA98 + thumb_func_end ClearPokeblockFeeder - thumb_func_start sub_080FCAB4 -sub_080FCAB4: @ 0x080FCAB4 + thumb_func_start ClearAllPokeblockFeeders +ClearAllPokeblockFeeders: @ 0x080FCAB4 push {lr} ldr r0, _080FCAC4 movs r1, #0 @@ -518079,17 +518079,17 @@ sub_080FCAB4: @ 0x080FCAB4 bx r0 .align 2, 0 _080FCAC4: .4byte gUnknown_2039D20 - thumb_func_end sub_080FCAB4 + thumb_func_end ClearAllPokeblockFeeders - thumb_func_start sub_080FCAC8 -sub_080FCAC8: @ 0x080FCAC8 + thumb_func_start GetPokeblockFeederInFront +GetPokeblockFeederInFront: @ 0x080FCAC8 push {r4, r5, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer movs r5, #0 _080FCADA: ldr r0, _080FCB20 @@ -518150,10 +518150,10 @@ _080FCB46: .align 2, 0 _080FCB50: .4byte gUnknown_2037290 _080FCB54: .4byte 0x0000FFFF - thumb_func_end sub_080FCAC8 + thumb_func_end GetPokeblockFeederInFront - thumb_func_start sub_080FCB58 -sub_080FCB58: @ 0x080FCB58 + thumb_func_start GetPokeblockFeederWithinRange +GetPokeblockFeederWithinRange: @ 0x080FCB58 push {r4, r5, r6, r7, lr} sub sp, #4 mov r4, sp @@ -518233,12 +518233,12 @@ _080FCBE6: .align 2, 0 _080FCBF0: .4byte gUnknown_2037290 _080FCBF4: .4byte 0x0000FFFF - thumb_func_end sub_080FCB58 + thumb_func_end GetPokeblockFeederWithinRange - thumb_func_start sub_080FCBF8 -sub_080FCBF8: @ 0x080FCBF8 + thumb_func_start SafariZoneGetPokeblockInFront +SafariZoneGetPokeblockInFront: @ 0x080FCBF8 push {lr} - bl sub_080FCAC8 + bl GetPokeblockFeederInFront ldr r2, _080FCC14 ldrh r1, [r2] ldr r0, _080FCC18 @@ -518259,12 +518259,12 @@ _080FCC22: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FCBF8 + thumb_func_end SafariZoneGetPokeblockInFront - thumb_func_start sub_080FCC28 -sub_080FCC28: @ 0x080FCC28 + thumb_func_start SafariZoneGetActivePokeblock +SafariZoneGetActivePokeblock: @ 0x080FCC28 push {lr} - bl sub_080FCB58 + bl GetPokeblockFeederWithinRange ldr r2, _080FCC44 ldrh r1, [r2] ldr r0, _080FCC48 @@ -518285,10 +518285,10 @@ _080FCC52: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FCC28 + thumb_func_end SafariZoneGetActivePokeblock - thumb_func_start sub_080FCC58 -sub_080FCC58: @ 0x080FCC58 + thumb_func_start SafariZoneActivatePokeblockFeeder +SafariZoneActivatePokeblockFeeder: @ 0x080FCC58 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -518322,7 +518322,7 @@ _080FCC78: bne _080FCCD8 mov r0, sp adds r1, r6, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer ldr r0, [r7] ldrb r0, [r0, #5] strb r0, [r4, #4] @@ -518364,7 +518364,7 @@ _080FCCE2: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_080FCC58 + thumb_func_end SafariZoneActivatePokeblockFeeder thumb_func_start DecrementFeederStepCounters DecrementFeederStepCounters: @ 0x080FCCF0 @@ -518383,7 +518383,7 @@ _080FCCF6: cmp r0, #0 bne _080FCD10 adds r0, r4, #0 - bl sub_080FCA98 + bl ClearPokeblockFeeder _080FCD10: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -518397,10 +518397,10 @@ _080FCD10: _080FCD20: .4byte gUnknown_2039D20 thumb_func_end DecrementFeederStepCounters - thumb_func_start sub_080FCD24 -sub_080FCD24: @ 0x080FCD24 + thumb_func_start GetInFrontFeederPokeblockAndSteps +GetInFrontFeederPokeblockAndSteps: @ 0x080FCD24 push {lr} - bl sub_080FCAC8 + bl GetPokeblockFeederInFront ldr r3, _080FCD4C ldrh r1, [r3] ldr r0, _080FCD50 @@ -518427,7 +518427,7 @@ _080FCD5E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FCD24 + thumb_func_end GetInFrontFeederPokeblockAndSteps thumb_func_start sub_080FCD64 sub_080FCD64: @ 0x080FCD64 @@ -518445,7 +518445,7 @@ sub_080FCD64: @ 0x080FCD64 lsrs r0, r0, #0x18 adds r1, r5, #0 adds r2, r4, #0 - bl sub_0800A070 + bl SendBlock lsls r0, r0, #0x18 cmp r0, #0 bne _080FCD98 @@ -518470,12 +518470,12 @@ sub_080FCDA0: @ 0x080FCDA0 lsls r4, r4, #0x11 lsls r4, r5 lsrs r4, r4, #0x18 - bl sub_0800A114 + bl GetBlockReceivedStatus ands r4, r0 cmp r4, #0 beq _080FCDC2 adds r0, r5, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag movs r0, #1 b _080FCDC4 _080FCDC2: @@ -518490,7 +518490,7 @@ _080FCDC4: thumb_func_start sub_080FCDCC sub_080FCDCC: @ 0x080FCDCC push {r4, lr} - bl sub_0800A114 + bl GetBlockReceivedStatus adds r4, r0, #0 bl sub_0800A59C lsls r4, r4, #0x18 @@ -518500,7 +518500,7 @@ sub_080FCDCC: @ 0x080FCDCC movs r0, #0 b _080FCDEA _080FCDE4: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #1 _080FCDEA: pop {r4} @@ -518569,10 +518569,10 @@ sub_080FCE4C: @ 0x080FCE4C ldrb r0, [r0] cmp r0, #0 beq _080FCEC0 - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _080FCECC strb r0, [r1] - bl sub_08009B64 + bl GetLinkPlayerCount ldr r4, _080FCED0 strb r0, [r4] ldr r1, _080FCED4 @@ -518650,7 +518650,7 @@ sub_080FCEE0: @ 0x080FCEE0 beq _080FCF10 cmp r0, #1 beq _080FCF1E - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -518661,7 +518661,7 @@ _080FCF08: .align 2, 0 _080FCF0C: .4byte gUnknown_2039BCA _080FCF10: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FCF24 @@ -518678,8 +518678,8 @@ _080FCF26: bx r1 thumb_func_end sub_080FCEE0 - thumb_func_start sub_080FCF2C -sub_080FCF2C: @ 0x080FCF2C + thumb_func_start ContestLiveUpdates_BeforeInterview_5 +ContestLiveUpdates_BeforeInterview_5: @ 0x080FCF2C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -518713,11 +518713,11 @@ _080FCF64: beq _080FD018 b _080FD034 _080FCF6A: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080FCFA4 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD04C @@ -518822,7 +518822,7 @@ _080FD04C: bx r0 .align 2, 0 _080FD054: .4byte gUnknown_3005B60 - thumb_func_end sub_080FCF2C + thumb_func_end ContestLiveUpdates_BeforeInterview_5 thumb_func_start sub_080FD058 sub_080FD058: @ 0x080FD058 @@ -518848,11 +518848,11 @@ sub_080FD058: @ 0x080FD058 .align 2, 0 _080FD080: .4byte gUnknown_3005B60 _080FD084: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080FD0CE - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD0D4 @@ -518935,11 +518935,11 @@ _080FD132: ldr r1, _080FD154 ldrh r0, [r4, #0x1a] strb r0, [r1] - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080FD158 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD1DA @@ -519049,7 +519049,7 @@ sub_080FD1EC: @ 0x080FD1EC .align 2, 0 _080FD214: .4byte gUnknown_3005B60 _080FD218: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD244 @@ -519106,7 +519106,7 @@ sub_080FD24C: @ 0x080FD24C .align 2, 0 _080FD280: .4byte gUnknown_3005B60 _080FD284: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD306 @@ -519222,7 +519222,7 @@ _080FD350: @ jump table .4byte _080FD48C @ case 10 .4byte _080FD3C0 @ case 11 _080FD380: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080FD38C @@ -519273,7 +519273,7 @@ _080FD3D8: strh r0, [r2, #8] b _080FD4D6 _080FD3E4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD4D6 @@ -519300,7 +519300,7 @@ _080FD414: .4byte gUnknown_2039BB0 _080FD418: .4byte gUnknown_2039BCB _080FD41C: .4byte gUnknown_202207C _080FD420: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD4D6 @@ -519327,7 +519327,7 @@ _080FD450: .4byte gUnknown_2039BB8 _080FD454: .4byte gUnknown_2039BCB _080FD458: .4byte gUnknown_202207C _080FD45C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD4D6 @@ -519427,7 +519427,7 @@ _080FD50C: @ jump table .4byte _080FD64C @ case 10 .4byte _080FD584 @ case 11 _080FD53C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _080FD548 @@ -519482,7 +519482,7 @@ _080FD59C: strh r0, [r2, #8] b _080FD696 _080FD5A8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD696 @@ -519513,7 +519513,7 @@ _080FD5E0: .4byte gUnknown_2039BD4 _080FD5E4: .4byte gUnknown_2039BCB _080FD5E8: .4byte gUnknown_202207C _080FD5EC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD696 @@ -519535,7 +519535,7 @@ _080FD604: .align 2, 0 _080FD618: .4byte gUnknown_2039BD4 _080FD61C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD696 @@ -519640,11 +519640,11 @@ _080FD6E6: ldr r1, _080FD708 movs r0, #0x6e strb r0, [r1] - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _080FD70C - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD782 @@ -519757,7 +519757,7 @@ sub_080FD794: @ 0x080FD794 .align 2, 0 _080FD7D0: .4byte gUnknown_3005B68 _080FD7D4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD812 @@ -519828,7 +519828,7 @@ sub_080FD824: @ 0x080FD824 .align 2, 0 _080FD860: .4byte gUnknown_3005B68 _080FD864: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _080FD8A2 @@ -519867,8 +519867,8 @@ _080FD8AC: .4byte gUnknown_2039BCB _080FD8B0: .4byte gUnknown_202207C thumb_func_end sub_080FD824 - thumb_func_start sub_080FD8B4 -sub_080FD8B4: @ 0x080FD8B4 + thumb_func_start SetUpItemUseCallback +SetUpItemUseCallback: @ 0x080FD8B4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -519893,7 +519893,7 @@ _080FD8DE: subs r0, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FD90C @@ -519927,10 +519927,10 @@ _080FD920: .align 2, 0 _080FD928: .4byte gUnknown_203CBF8 _080FD92C: .4byte gUnknown_856DCBC - thumb_func_end sub_080FD8B4 + thumb_func_end SetUpItemUseCallback - thumb_func_start sub_080FD930 -sub_080FD930: @ 0x080FD930 + thumb_func_start SetUpItemUseOnFieldCallback +SetUpItemUseOnFieldCallback: @ 0x080FD930 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -519947,12 +519947,12 @@ sub_080FD930: @ 0x080FD930 ldr r0, _080FD960 str r0, [r1] adds r0, r2, #0 - bl sub_080FD8B4 + bl SetUpItemUseCallback b _080FD96E .align 2, 0 _080FD958: .4byte gUnknown_3005B60 _080FD95C: .4byte gUnknown_3005B0C -_080FD960: .4byte sub_080FD978 +_080FD960: .4byte MapPostLoadHook_UseItem _080FD964: ldr r0, _080FD974 ldr r1, [r0] @@ -519963,23 +519963,23 @@ _080FD96E: bx r0 .align 2, 0 _080FD974: .4byte gUnknown_2039DC0 - thumb_func_end sub_080FD930 + thumb_func_end SetUpItemUseOnFieldCallback - thumb_func_start sub_080FD978 -sub_080FD978: @ 0x080FD978 + thumb_func_start MapPostLoadHook_UseItem +MapPostLoadHook_UseItem: @ 0x080FD978 push {lr} - bl sub_080AE99C + bl pal_fill_black ldr r0, _080FD98C movs r1, #8 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_080FD98C: .4byte sub_080FD990 - thumb_func_end sub_080FD978 +_080FD98C: .4byte Task_CallItemUseOnFieldCallback + thumb_func_end MapPostLoadHook_UseItem - thumb_func_start sub_080FD990 -sub_080FD990: @ 0x080FD990 + thumb_func_start Task_CallItemUseOnFieldCallback +Task_CallItemUseOnFieldCallback: @ 0x080FD990 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -519998,10 +519998,10 @@ _080FD9AC: bx r0 .align 2, 0 _080FD9B4: .4byte gUnknown_2039DC0 - thumb_func_end sub_080FD990 + thumb_func_end Task_CallItemUseOnFieldCallback - thumb_func_start sub_080FD9B8 -sub_080FD9B8: @ 0x080FD9B8 + thumb_func_start DisplayCannotUseItemMessage +DisplayCannotUseItemMessage: @ 0x080FD9B8 push {r4, r5, r6, lr} adds r4, r1, #0 adds r1, r2, #0 @@ -520011,10 +520011,10 @@ sub_080FD9B8: @ 0x080FD9B8 lsrs r4, r4, #0x18 ldr r6, _080FD9EC adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders cmp r4, #0 bne _080FDA08 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FD9F4 @@ -520022,11 +520022,11 @@ sub_080FD9B8: @ 0x080FD9B8 adds r0, r5, #0 movs r1, #1 adds r2, r6, #0 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FDA12 .align 2, 0 _080FD9EC: .4byte gUnknown_2021C7C -_080FD9F0: .4byte sub_081AB968 +_080FD9F0: .4byte BagMenu_InitListsMenu _080FD9F4: ldr r1, _080FDA00 ldr r2, _080FDA04 @@ -520040,14 +520040,14 @@ _080FDA08: ldr r2, _080FDA18 adds r0, r5, #0 adds r1, r6, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080FDA12: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 -_080FDA18: .4byte sub_080FDA4C - thumb_func_end sub_080FD9B8 +_080FDA18: .4byte CleanUpAfterFailingToUseRegisteredKeyItemOnField + thumb_func_end DisplayCannotUseItemMessage thumb_func_start DisplayDadsAdviceCannotUseItemMessage DisplayDadsAdviceCannotUseItemMessage: @ 0x080FDA1C @@ -520057,7 +520057,7 @@ DisplayDadsAdviceCannotUseItemMessage: @ 0x080FDA1C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r2, _080FDA30 - bl sub_080FD9B8 + bl DisplayCannotUseItemMessage pop {r0} bx r0 .align 2, 0 @@ -520072,15 +520072,15 @@ DisplayCannotDismountBikeMessage: @ 0x080FDA34 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r2, _080FDA48 - bl sub_080FD9B8 + bl DisplayCannotUseItemMessage pop {r0} bx r0 .align 2, 0 _080FDA48: .4byte gUnknown_85C957F thumb_func_end DisplayCannotDismountBikeMessage - thumb_func_start sub_080FDA4C -sub_080FDA4C: @ 0x080FDA4C + thumb_func_start CleanUpAfterFailingToUseRegisteredKeyItemOnField +CleanUpAfterFailingToUseRegisteredKeyItemOnField: @ 0x080FDA4C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -520089,16 +520089,16 @@ sub_080FDA4C: @ 0x080FDA4C movs r1, #1 bl sub_08197028 adds r0, r4, #0 - bl sub_080A8964 - bl sub_08097E7C + bl DestroyTask + bl ScriptUnfreezeEventObjects bl sub_080987E8 pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FDA4C + thumb_func_end CleanUpAfterFailingToUseRegisteredKeyItemOnField - thumb_func_start sub_080FDA70 -sub_080FDA70: @ 0x080FDA70 + thumb_func_start CheckIfItemIsTMHMOrEvolutionStone +CheckIfItemIsTMHMOrEvolutionStone: @ 0x080FDA70 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -520110,7 +520110,7 @@ sub_080FDA70: @ 0x080FDA70 movs r0, #1 b _080FDAA2 .align 2, 0 -_080FDA88: .4byte sub_080FE79C +_080FDA88: .4byte ItemUseOutOfBattle_TMHM _080FDA8C: adds r0, r4, #0 bl sub_080D6DF8 @@ -520120,14 +520120,14 @@ _080FDA8C: movs r0, #0 b _080FDAA2 .align 2, 0 -_080FDA9C: .4byte sub_080FEBC8 +_080FDA9C: .4byte ItemUseOutOfBattle_EvolutionStone _080FDAA0: movs r0, #2 _080FDAA2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_080FDA70 + thumb_func_end CheckIfItemIsTMHMOrEvolutionStone thumb_func_start sub_080FDAA8 sub_080FDAA8: @ 0x080FDAA8 @@ -520146,7 +520146,7 @@ sub_080FDAA8: @ 0x080FDAA8 bx r0 .align 2, 0 _080FDAC4: .4byte gUnknown_203CB48 -_080FDAC8: .4byte sub_081AD204 +_080FDAC8: .4byte bag_menu_mail_related thumb_func_end sub_080FDAA8 thumb_func_start sub_080FDACC @@ -520166,8 +520166,8 @@ _080FDAE4: .4byte gUnknown_203CB20 _080FDAE8: .4byte sub_080FDAA8 thumb_func_end sub_080FDACC - thumb_func_start sub_080FDAEC -sub_080FDAEC: @ 0x080FDAEC + thumb_func_start ItemUseOutOfBattle_Bike +ItemUseOutOfBattle_Bike: @ 0x080FDAEC push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -520229,10 +520229,10 @@ _080FDB62: _080FDB6C: .4byte gUnknown_3005B68 _080FDB70: .4byte 0x0000088B _080FDB74: - bl sub_08084DDC + bl Overworld_IsBikingAllowed cmp r0, #1 bne _080FDB9C - bl sub_0811A848 + bl IsBikingDisallowedByPlayer lsls r0, r0, #0x18 cmp r0, #0 bne _080FDB9C @@ -520240,7 +520240,7 @@ _080FDB74: ldr r0, _080FDB98 str r0, [r1] adds r0, r5, #0 - bl sub_080FD930 + bl SetUpItemUseOnFieldCallback b _080FDBA4 .align 2, 0 _080FDB94: .4byte gUnknown_2039DC0 @@ -520254,7 +520254,7 @@ _080FDBA4: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_080FDAEC + thumb_func_end ItemUseOutOfBattle_Bike thumb_func_start sub_080FDBAC sub_080FDBAC: @ 0x080FDBAC @@ -520268,33 +520268,33 @@ sub_080FDBAC: @ 0x080FDBAC cmp r0, #0 bne _080FDBCC movs r0, #2 - bl sub_0811A8D0 + bl GetOnOffBike b _080FDBD2 .align 2, 0 _080FDBC8: .4byte gUnknown_203CB48 _080FDBCC: movs r0, #4 - bl sub_0811A8D0 + bl GetOnOffBike _080FDBD2: - bl sub_08097E7C + bl ScriptUnfreezeEventObjects bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_080FDBAC - thumb_func_start sub_080FDBE8 -sub_080FDBE8: @ 0x080FDBE8 + thumb_func_start CanFish +CanFish: @ 0x080FDBE8 push {r4, r5, r6, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -520311,16 +520311,16 @@ sub_080FDBE8: @ 0x080FDBE8 cmp r0, #0 bne _080FDC70 movs r0, #0x10 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 bne _080FDC70 movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 bne _080FDC40 - bl sub_0808B7D8 + bl IsPlayerFacingSurfableFishableWater lsls r0, r0, #0x18 cmp r0, #0 beq _080FDC70 @@ -520329,7 +520329,7 @@ _080FDC3C: b _080FDC72 _080FDC40: adds r0, r5, #0 - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 beq _080FDC60 @@ -520338,7 +520338,7 @@ _080FDC40: ldrsh r0, [r0, r1] movs r2, #0 ldrsh r1, [r4, r2] - bl sub_08087B14 + bl MapGridIsImpassableAt lsls r0, r0, #0x18 cmp r0, #0 beq _080FDC3C @@ -520358,21 +520358,21 @@ _080FDC72: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FDBE8 + thumb_func_end CanFish - thumb_func_start sub_080FDC7C -sub_080FDC7C: @ 0x080FDC7C + thumb_func_start ItemUseOutOfBattle_Rod +ItemUseOutOfBattle_Rod: @ 0x080FDC7C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080FDBE8 + bl CanFish cmp r0, #1 bne _080FDCA0 ldr r1, _080FDC98 ldr r0, _080FDC9C str r0, [r1] adds r0, r4, #0 - bl sub_080FD930 + bl SetUpItemUseOnFieldCallback b _080FDCB2 .align 2, 0 _080FDC98: .4byte gUnknown_2039DC0 @@ -520392,7 +520392,7 @@ _080FDCB2: bx r0 .align 2, 0 _080FDCB8: .4byte gUnknown_3005B60 - thumb_func_end sub_080FDC7C + thumb_func_end ItemUseOutOfBattle_Rod thumb_func_start sub_080FDCBC sub_080FDCBC: @ 0x080FDCBC @@ -520405,9 +520405,9 @@ sub_080FDCBC: @ 0x080FDCBC bl sub_080D6E6C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0808C1F0 + bl StartFishing adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -520415,8 +520415,8 @@ sub_080FDCBC: @ 0x080FDCBC _080FDCE0: .4byte gUnknown_203CB48 thumb_func_end sub_080FDCBC - thumb_func_start sub_080FDCE4 -sub_080FDCE4: @ 0x080FDCE4 + thumb_func_start ItemUseOutOfBattle_Itemfinder +ItemUseOutOfBattle_Itemfinder: @ 0x080FDCE4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -520427,24 +520427,24 @@ sub_080FDCE4: @ 0x080FDCE4 ldr r0, _080FDD08 str r0, [r1] adds r0, r4, #0 - bl sub_080FD930 + bl SetUpItemUseOnFieldCallback pop {r4} pop {r0} bx r0 .align 2, 0 _080FDD04: .4byte gUnknown_2039DC0 -_080FDD08: .4byte sub_080FDD0C - thumb_func_end sub_080FDCE4 +_080FDD08: .4byte ItemUseOnFieldCB_Itemfinder + thumb_func_end ItemUseOutOfBattle_Itemfinder - thumb_func_start sub_080FDD0C -sub_080FDD0C: @ 0x080FDD0C + thumb_func_start ItemUseOnFieldCB_Itemfinder +ItemUseOnFieldCB_Itemfinder: @ 0x080FDD0C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080FDD34 ldr r0, [r0, #4] adds r1, r4, #0 - bl sub_080FDE44 + bl ItemfinderCheckForHiddenItems lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -520465,7 +520465,7 @@ _080FDD40: ldr r1, _080FDD50 ldr r2, _080FDD54 adds r0, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080FDD4A: pop {r4} pop {r0} @@ -520473,7 +520473,7 @@ _080FDD4A: .align 2, 0 _080FDD50: .4byte gUnknown_85C95D3 _080FDD54: .4byte sub_080FDE20 - thumb_func_end sub_080FDD0C + thumb_func_end ItemUseOnFieldCB_Itemfinder thumb_func_start sub_080FDD58 sub_080FDD58: @ 0x080FDD58 @@ -520585,17 +520585,17 @@ sub_080FDE20: @ 0x080FDE20 movs r0, #0 movs r1, #1 bl sub_08197028 - bl sub_08097E7C + bl ScriptUnfreezeEventObjects bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 thumb_func_end sub_080FDE20 - thumb_func_start sub_080FDE44 -sub_080FDE44: @ 0x080FDE44 + thumb_func_start ItemfinderCheckForHiddenItems +ItemfinderCheckForHiddenItems: @ 0x080FDE44 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -520711,7 +520711,7 @@ _080FDF1A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_080FDE44 + thumb_func_end ItemfinderCheckForHiddenItems thumb_func_start sub_080FDF28 sub_080FDF28: @ 0x080FDF28 @@ -520772,7 +520772,7 @@ sub_080FDF84: @ 0x080FDF84 adds r4, r0, #0 adds r5, r1, #0 adds r6, r2, #0 - bl sub_080876A8 + bl mapconnection_get_mapheader adds r3, r0, #0 ldrb r0, [r4] cmp r0, #2 @@ -521238,7 +521238,7 @@ sub_080FE278: @ 0x080FE278 adds r0, r0, r4 bl UnfreezeEventObject adds r0, r5, #0 - bl sub_0808B18C + bl PlayerTurnInPlace pop {r4, r5} pop {r0} bx r0 @@ -521271,7 +521271,7 @@ sub_080FE2E8: @ 0x080FE2E8 ldr r1, _080FE328 ldr r2, _080FE32C adds r0, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080FE31E: pop {r4} pop {r0} @@ -521338,7 +521338,7 @@ _080FE370: ldr r1, _080FE3B8 ldr r2, _080FE3BC adds r0, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080FE3A4: pop {r4, r5} pop {r0} @@ -521351,8 +521351,8 @@ _080FE3B8: .4byte gUnknown_85C95B6 _080FE3BC: .4byte sub_080FDE20 thumb_func_end sub_080FE330 - thumb_func_start sub_080FE3C0 -sub_080FE3C0: @ 0x080FE3C0 + thumb_func_start ItemUseOutOfBattle_PokeblockCase +ItemUseOutOfBattle_PokeblockCase: @ 0x080FE3C0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -521399,7 +521399,7 @@ _080FE41C: str r1, [r0] movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _080FE43C str r0, [r5] _080FE42E: @@ -521410,7 +521410,7 @@ _080FE42E: _080FE434: .4byte gUnknown_3005B0C _080FE438: .4byte sub_080AEFD0 _080FE43C: .4byte sub_080FE454 - thumb_func_end sub_080FE3C0 + thumb_func_end ItemUseOutOfBattle_PokeblockCase thumb_func_start sub_080FE440 sub_080FE440: @ 0x080FE440 @@ -521421,7 +521421,7 @@ sub_080FE440: @ 0x080FE440 pop {r0} bx r0 .align 2, 0 -_080FE450: .4byte sub_081AD204 +_080FE450: .4byte bag_menu_mail_related thumb_func_end sub_080FE440 thumb_func_start sub_080FE454 @@ -521435,12 +521435,12 @@ sub_080FE454: @ 0x080FE454 ands r0, r1 cmp r0, #0 bne _080FE478 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r1, _080FE484 movs r0, #0 bl sub_08135850 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _080FE478: pop {r4} pop {r0} @@ -521450,8 +521450,8 @@ _080FE480: .4byte gUnknown_2037C74 _080FE484: .4byte sub_08085A30 thumb_func_end sub_080FE454 - thumb_func_start sub_080FE488 -sub_080FE488: @ 0x080FE488 + thumb_func_start ItemUseOutOfBattle_CoinCase +ItemUseOutOfBattle_CoinCase: @ 0x080FE488 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -521467,7 +521467,7 @@ sub_080FE488: @ 0x080FE488 ldr r4, _080FE4D4 ldr r1, _080FE4D8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r1, _080FE4DC lsls r0, r5, #2 adds r0, r0, r5 @@ -521481,29 +521481,29 @@ sub_080FE488: @ 0x080FE488 adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FE4EE .align 2, 0 _080FE4D0: .4byte gUnknown_2021C40 _080FE4D4: .4byte gUnknown_2021C7C _080FE4D8: .4byte gUnknown_85C95F0 _080FE4DC: .4byte gUnknown_3005B60 -_080FE4E0: .4byte sub_081AB968 +_080FE4E0: .4byte BagMenu_InitListsMenu _080FE4E4: ldr r2, _080FE4F4 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080FE4EE: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080FE4F4: .4byte sub_080FDA4C - thumb_func_end sub_080FE488 +_080FE4F4: .4byte CleanUpAfterFailingToUseRegisteredKeyItemOnField + thumb_func_end ItemUseOutOfBattle_CoinCase - thumb_func_start sub_080FE4F8 -sub_080FE4F8: @ 0x080FE4F8 + thumb_func_start ItemUseOutOfBattle_PowderJar +ItemUseOutOfBattle_PowderJar: @ 0x080FE4F8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -521517,7 +521517,7 @@ sub_080FE4F8: @ 0x080FE4F8 ldr r4, _080FE540 ldr r1, _080FE544 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r1, _080FE548 lsls r0, r5, #2 adds r0, r0, r5 @@ -521531,33 +521531,33 @@ sub_080FE4F8: @ 0x080FE4F8 adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FE55A .align 2, 0 _080FE53C: .4byte gUnknown_2021C40 _080FE540: .4byte gUnknown_2021C7C _080FE544: .4byte gUnknown_85C96CE _080FE548: .4byte gUnknown_3005B60 -_080FE54C: .4byte sub_081AB968 +_080FE54C: .4byte BagMenu_InitListsMenu _080FE550: ldr r2, _080FE560 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _080FE55A: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_080FE560: .4byte sub_080FDA4C - thumb_func_end sub_080FE4F8 +_080FE560: .4byte CleanUpAfterFailingToUseRegisteredKeyItemOnField + thumb_func_end ItemUseOutOfBattle_PowderJar thumb_func_start sub_080FE564 sub_080FE564: @ 0x080FE564 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080E0C84 + bl IsPlayerFacingEmptyBerryTreePatch lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -521579,7 +521579,7 @@ sub_080FE564: @ 0x080FE564 _080FE594: .4byte gUnknown_2039DC0 _080FE598: .4byte sub_080FE5C8 _080FE59C: .4byte gUnknown_3005B0C -_080FE5A0: .4byte sub_080FD978 +_080FE5A0: .4byte MapPostLoadHook_UseItem _080FE5A4: .4byte gUnknown_203CB20 _080FE5A8: .4byte sub_08085A30 _080FE5AC: @@ -521606,12 +521606,12 @@ sub_080FE5C8: @ 0x080FE5C8 ldr r0, _080FE5F0 ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem bl sub_080987DC ldr r0, _080FE5F4 bl ScriptContext1_SetupScript adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -521620,8 +521620,8 @@ _080FE5F0: .4byte gUnknown_203CB48 _080FE5F4: .4byte gUnknown_8244E9D thumb_func_end sub_080FE5C8 - thumb_func_start sub_080FE5F8 -sub_080FE5F8: @ 0x080FE5F8 + thumb_func_start ItemUseOutOfBattle_WailmerPail +ItemUseOutOfBattle_WailmerPail: @ 0x080FE5F8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -521638,7 +521638,7 @@ sub_080FE5F8: @ 0x080FE5F8 _080FE614: .4byte gUnknown_2039DC0 _080FE618: .4byte sub_080FE6D0 _080FE61C: - bl sub_080E0CBC + bl TryToWaterBerryTree lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -521648,7 +521648,7 @@ _080FE61C: _080FE62C: str r0, [r1] adds r0, r4, #0 - bl sub_080FD930 + bl SetUpItemUseOnFieldCallback b _080FE652 .align 2, 0 _080FE638: .4byte gUnknown_2039DC0 @@ -521668,7 +521668,7 @@ _080FE652: bx r0 .align 2, 0 _080FE658: .4byte gUnknown_3005B60 - thumb_func_end sub_080FE5F8 + thumb_func_end ItemUseOutOfBattle_WailmerPail thumb_func_start sub_080FE65C sub_080FE65C: @ 0x080FE65C @@ -521680,7 +521680,7 @@ sub_080FE65C: @ 0x080FE65C ldr r0, _080FE67C bl ScriptContext1_SetupScript adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -521696,7 +521696,7 @@ sub_080FE680: @ 0x080FE680 adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer bl PlayerGetZCoord adds r2, r0, #0 lsls r2, r2, #0x18 @@ -521704,7 +521704,7 @@ sub_080FE680: @ 0x080FE680 mov r0, sp ldrh r0, [r0] ldrh r1, [r4] - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x10 @@ -521742,7 +521742,7 @@ sub_080FE6D0: @ 0x080FE6D0 ldr r0, _080FE6F0 bl ScriptContext1_SetupScript adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -521758,12 +521758,12 @@ ItemUseOutOfBattle_Medicine: @ 0x080FE6F4 ldr r2, _080FE708 ldr r1, _080FE70C str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 _080FE708: .4byte gUnknown_3006068 -_080FE70C: .4byte sub_081B6228 +_080FE70C: .4byte ItemUseCB_Medicine thumb_func_end ItemUseOutOfBattle_Medicine thumb_func_start ItemUseOutOfBattle_ReduceEV @@ -521774,7 +521774,7 @@ ItemUseOutOfBattle_ReduceEV: @ 0x080FE710 ldr r2, _080FE724 ldr r1, _080FE728 str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 @@ -521790,7 +521790,7 @@ ItemUseOutOfBattle_SacredAsh: @ 0x080FE72C ldr r2, _080FE740 ldr r1, _080FE744 str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 @@ -521806,12 +521806,12 @@ ItemUseOutOfBattle_PPRecovery: @ 0x080FE748 ldr r2, _080FE75C ldr r1, _080FE760 str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 _080FE75C: .4byte gUnknown_3006068 -_080FE760: .4byte sub_081B67C4 +_080FE760: .4byte dp05_ether thumb_func_end ItemUseOutOfBattle_PPRecovery thumb_func_start ItemUseOutOfBattle_PPUp @@ -521822,12 +521822,12 @@ ItemUseOutOfBattle_PPUp: @ 0x080FE764 ldr r2, _080FE778 ldr r1, _080FE77C str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 _080FE778: .4byte gUnknown_3006068 -_080FE77C: .4byte sub_081B6978 +_080FE77C: .4byte dp05_pp_up thumb_func_end ItemUseOutOfBattle_PPUp thumb_func_start ItemUseOutOfBattle_RareCandy @@ -521838,16 +521838,16 @@ ItemUseOutOfBattle_RareCandy: @ 0x080FE780 ldr r2, _080FE794 ldr r1, _080FE798 str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 _080FE794: .4byte gUnknown_3006068 -_080FE798: .4byte sub_081B70B0 +_080FE798: .4byte dp05_rare_candy thumb_func_end ItemUseOutOfBattle_RareCandy - thumb_func_start sub_080FE79C -sub_080FE79C: @ 0x080FE79C + thumb_func_start ItemUseOutOfBattle_TMHM +ItemUseOutOfBattle_TMHM: @ 0x080FE79C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -521861,7 +521861,7 @@ sub_080FE79C: @ 0x080FE79C ldr r3, _080FE7C4 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FE7D4 .align 2, 0 _080FE7BC: .4byte gUnknown_203CB48 @@ -521872,7 +521872,7 @@ _080FE7C8: ldr r3, _080FE7E0 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage _080FE7D4: pop {r4} pop {r0} @@ -521880,7 +521880,7 @@ _080FE7D4: .align 2, 0 _080FE7DC: .4byte gUnknown_85C9600 _080FE7E0: .4byte sub_080FE7E4 - thumb_func_end sub_080FE79C + thumb_func_end ItemUseOutOfBattle_TMHM thumb_func_start sub_080FE7E4 sub_080FE7E4: @ 0x080FE7E4 @@ -521919,7 +521919,7 @@ sub_080FE810: @ 0x080FE810 ldr r4, _080FE85C ldr r0, _080FE860 ldrh r0, [r0] - bl sub_081B69B4 + bl ItemIdToBattleMoveId adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0xd @@ -521930,12 +521930,12 @@ sub_080FE810: @ 0x080FE810 ldr r4, _080FE868 ldr r1, _080FE86C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _080FE870 adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage _080FE852: pop {r4, r5} pop {r0} @@ -521957,7 +521957,7 @@ sub_080FE874: @ 0x080FE874 lsrs r0, r0, #0x18 ldr r2, _080FE888 movs r1, #6 - bl sub_081ADF10 + bl BagMenu_YesNo pop {r0} bx r0 .align 2, 0 @@ -521972,7 +521972,7 @@ sub_080FE88C: @ 0x080FE88C ldr r2, _080FE8A0 ldr r1, _080FE8A4 str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 @@ -521986,14 +521986,14 @@ sub_080FE8A8: @ 0x080FE8A8 ldr r4, _080FE8EC ldrh r0, [r4] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem ldrh r0, [r4] ldr r1, _080FE8F0 bl sub_080D5EC8 ldr r0, _080FE8F4 ldr r1, _080FE8F8 - bl sub_08008BCC - bl sub_081A9BB8 + bl StringExpandPlaceholders + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FE8FC @@ -522006,7 +522006,7 @@ sub_080FE8A8: @ 0x080FE8A8 bl sub_080D6DB0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081AB834 + bl SetInitialScrollAndCursorPositions b _080FE904 .align 2, 0 _080FE8EC: .4byte gUnknown_203CB48 @@ -522023,8 +522023,8 @@ _080FE904: .align 2, 0 thumb_func_end sub_080FE8A8 - thumb_func_start sub_080FE90C -sub_080FE90C: @ 0x080FE90C + thumb_func_start ItemUseOutOfBattle_Repel +ItemUseOutOfBattle_Repel: @ 0x080FE90C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -522047,7 +522047,7 @@ _080FE930: .4byte 0x00004021 _080FE934: .4byte gUnknown_3005B60 _080FE938: .4byte sub_080FE974 _080FE93C: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FE95C @@ -522055,11 +522055,11 @@ _080FE93C: ldr r3, _080FE958 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FE966 .align 2, 0 _080FE954: .4byte gUnknown_85C9654 -_080FE958: .4byte sub_081AB968 +_080FE958: .4byte BagMenu_InitListsMenu _080FE95C: ldr r1, _080FE96C ldr r2, _080FE970 @@ -522072,7 +522072,7 @@ _080FE966: .align 2, 0 _080FE96C: .4byte gUnknown_85C9654 _080FE970: .4byte sub_081C5F24 - thumb_func_end sub_080FE90C + thumb_func_end ItemUseOutOfBattle_Repel thumb_func_start sub_080FE974 sub_080FE974: @ 0x080FE974 @@ -522115,7 +522115,7 @@ sub_080FE9B4: @ 0x080FE9B4 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r6, r5, #0 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _080FEA12 @@ -522129,7 +522129,7 @@ sub_080FE9B4: @ 0x080FE9B4 adds r0, r4, #0 bl VarSet bl sub_080FE8A8 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEA08 @@ -522137,13 +522137,13 @@ sub_080FE9B4: @ 0x080FE9B4 ldr r3, _080FEA04 adds r0, r5, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FEA12 .align 2, 0 _080FE9F8: .4byte 0x00004021 _080FE9FC: .4byte gUnknown_203CB48 _080FEA00: .4byte gUnknown_2021C7C -_080FEA04: .4byte sub_081AB968 +_080FEA04: .4byte BagMenu_InitListsMenu _080FEA08: ldr r1, _080FEA18 ldr r2, _080FEA1C @@ -522178,7 +522178,7 @@ sub_080FEA20: @ 0x080FEA20 ble _080FEA76 movs r0, #0x75 bl sub_080A306C - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEA6C @@ -522186,12 +522186,12 @@ sub_080FEA20: @ 0x080FEA20 ldr r3, _080FEA68 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FEA76 .align 2, 0 _080FEA60: .4byte gUnknown_3005B60 _080FEA64: .4byte gUnknown_2021C7C -_080FEA68: .4byte sub_081AB968 +_080FEA68: .4byte BagMenu_InitListsMenu _080FEA6C: ldr r1, _080FEA7C ldr r2, _080FEA80 @@ -522206,8 +522206,8 @@ _080FEA7C: .4byte gUnknown_2021C7C _080FEA80: .4byte sub_081C5F24 thumb_func_end sub_080FEA20 - thumb_func_start sub_080FEA84 -sub_080FEA84: @ 0x080FEA84 + thumb_func_start ItemUseOutOfBattle_BlackWhiteFlute +ItemUseOutOfBattle_BlackWhiteFlute: @ 0x080FEA84 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -522224,7 +522224,7 @@ sub_080FEA84: @ 0x080FEA84 bl FlagClear ldr r0, _080FEAC0 ldr r1, _080FEAC4 - bl sub_08008BCC + bl StringExpandPlaceholders b _080FEADC .align 2, 0 _080FEAB0: .4byte gUnknown_203CB48 @@ -522240,7 +522240,7 @@ _080FEAC8: bl FlagClear ldr r0, _080FEAFC ldr r1, _080FEB00 - bl sub_08008BCC + bl StringExpandPlaceholders _080FEADC: ldr r1, _080FEB04 lsls r0, r5, #2 @@ -522261,7 +522261,7 @@ _080FEAFC: .4byte gUnknown_2021C7C _080FEB00: .4byte gUnknown_85C9699 _080FEB04: .4byte gUnknown_3005B60 _080FEB08: .4byte sub_080FEA20 - thumb_func_end sub_080FEA84 + thumb_func_end ItemUseOutOfBattle_BlackWhiteFlute thumb_func_start sub_080FEB0C sub_080FEB0C: @ 0x080FEB0C @@ -522269,17 +522269,17 @@ sub_080FEB0C: @ 0x080FEB0C adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_08084BD0 - bl sub_080B7420 + bl ResetInitialPlayerAvatarState + bl StartEscapeRopeFieldEffect adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 thumb_func_end sub_080FEB0C - thumb_func_start sub_080FEB28 -sub_080FEB28: @ 0x080FEB28 + thumb_func_start re_escape_rope +re_escape_rope: @ 0x080FEB28 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -522296,7 +522296,7 @@ sub_080FEB28: @ 0x080FEB28 ldr r1, _080FEB5C ldr r2, _080FEB60 adds r0, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r4} pop {r0} bx r0 @@ -522304,10 +522304,10 @@ sub_080FEB28: @ 0x080FEB28 _080FEB58: .4byte gUnknown_3005B60 _080FEB5C: .4byte gUnknown_2021C7C _080FEB60: .4byte sub_080FEB0C - thumb_func_end sub_080FEB28 + thumb_func_end re_escape_rope - thumb_func_start sub_080FEB64 -sub_080FEB64: @ 0x080FEB64 + thumb_func_start CanUseEscapeRopeOnCurrMap +CanUseEscapeRopeOnCurrMap: @ 0x080FEB64 push {lr} ldr r0, _080FEB78 ldrb r1, [r0, #0x1a] @@ -522325,14 +522325,14 @@ _080FEB7E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_080FEB64 + thumb_func_end CanUseEscapeRopeOnCurrMap - thumb_func_start sub_080FEB84 -sub_080FEB84: @ 0x080FEB84 + thumb_func_start ItemUseOutOfBattle_EscapeRope +ItemUseOutOfBattle_EscapeRope: @ 0x080FEB84 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080FEB64 + bl CanUseEscapeRopeOnCurrMap lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -522341,11 +522341,11 @@ sub_080FEB84: @ 0x080FEB84 ldr r0, _080FEBA8 str r0, [r1] adds r0, r4, #0 - bl sub_080FD930 + bl SetUpItemUseOnFieldCallback b _080FEBBE .align 2, 0 _080FEBA4: .4byte gUnknown_2039DC0 -_080FEBA8: .4byte sub_080FEB28 +_080FEBA8: .4byte re_escape_rope _080FEBAC: ldr r0, _080FEBC4 lsls r1, r4, #2 @@ -522361,39 +522361,39 @@ _080FEBBE: bx r0 .align 2, 0 _080FEBC4: .4byte gUnknown_3005B60 - thumb_func_end sub_080FEB84 + thumb_func_end ItemUseOutOfBattle_EscapeRope - thumb_func_start sub_080FEBC8 -sub_080FEBC8: @ 0x080FEBC8 + thumb_func_start ItemUseOutOfBattle_EvolutionStone +ItemUseOutOfBattle_EvolutionStone: @ 0x080FEBC8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _080FEBDC ldr r1, _080FEBE0 str r1, [r2] - bl sub_080FD8B4 + bl SetUpItemUseCallback pop {r0} bx r0 .align 2, 0 _080FEBDC: .4byte gUnknown_3006068 _080FEBE0: .4byte sub_081B7918 - thumb_func_end sub_080FEBC8 + thumb_func_end ItemUseOutOfBattle_EvolutionStone - thumb_func_start sub_080FEBE4 -sub_080FEBE4: @ 0x080FEBE4 + thumb_func_start ItemUseInBattle_PokeBall +ItemUseInBattle_PokeBall: @ 0x080FEBE4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_0806B378 + bl IsPlayerPartyAndPokemonStorageFull lsls r0, r0, #0x18 cmp r0, #0 bne _080FEC20 ldr r0, _080FEC14 ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC - bl sub_081A9BB8 + bl RemoveBagItem + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEC18 @@ -522407,7 +522407,7 @@ _080FEC18: bl sub_081C5310 b _080FEC4A _080FEC20: - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEC40 @@ -522415,11 +522415,11 @@ _080FEC20: ldr r3, _080FEC3C adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FEC4A .align 2, 0 _080FEC38: .4byte gUnknown_85C96BD -_080FEC3C: .4byte sub_081AB968 +_080FEC3C: .4byte BagMenu_InitListsMenu _080FEC40: ldr r1, _080FEC50 ldr r2, _080FEC54 @@ -522432,7 +522432,7 @@ _080FEC4A: .align 2, 0 _080FEC50: .4byte gUnknown_85C96BD _080FEC54: .4byte sub_081C5F24 - thumb_func_end sub_080FEBE4 + thumb_func_end ItemUseInBattle_PokeBall thumb_func_start sub_080FEC58 sub_080FEC58: @ 0x080FEC58 @@ -522446,7 +522446,7 @@ sub_080FEC58: @ 0x080FEC58 ands r0, r1 cmp r0, #0 beq _080FEC8A - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEC84 @@ -522464,8 +522464,8 @@ _080FEC8A: bx r0 thumb_func_end sub_080FEC58 - thumb_func_start sub_080FEC90 -sub_080FEC90: @ 0x080FEC90 + thumb_func_start OpponentHandleFaintAnimation +OpponentHandleFaintAnimation: @ 0x080FEC90 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -522487,8 +522487,8 @@ sub_080FEC90: @ 0x080FEC90 ldr r4, _080FECE4 ldrh r0, [r4] movs r1, #1 - bl sub_080D62BC - bl sub_081A9BB8 + bl RemoveBagItem + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FECEC @@ -522498,7 +522498,7 @@ sub_080FEC90: @ 0x080FEC90 ldr r3, _080FECE8 adds r0, r5, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FECFC .align 2, 0 _080FECE0: .4byte gUnknown_3005B60 @@ -522517,10 +522517,10 @@ _080FECFC: bx r0 .align 2, 0 _080FED04: .4byte sub_080FEC58 - thumb_func_end sub_080FEC90 + thumb_func_end OpponentHandleFaintAnimation - thumb_func_start sub_080FED08 -sub_080FED08: @ 0x080FED08 + thumb_func_start ItemUseInBattle_StatIncrease +ItemUseInBattle_StatIncrease: @ 0x080FED08 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -522544,7 +522544,7 @@ sub_080FED08: @ 0x080FED08 lsrs r2, r0, #0x18 cmp r2, #0 beq _080FED7C - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FED68 @@ -522552,7 +522552,7 @@ sub_080FED08: @ 0x080FED08 ldr r3, _080FED64 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FED8C .align 2, 0 _080FED50: .4byte gUnknown_2023D12 @@ -522560,7 +522560,7 @@ _080FED54: .4byte gUnknown_202415C _080FED58: .4byte gUnknown_2024190 _080FED5C: .4byte gUnknown_203CB48 _080FED60: .4byte gUnknown_85C9AF7 -_080FED64: .4byte sub_081AB968 +_080FED64: .4byte BagMenu_InitListsMenu _080FED68: ldr r1, _080FED74 ldr r2, _080FED78 @@ -522585,15 +522585,15 @@ _080FED8C: bx r0 .align 2, 0 _080FED94: .4byte gUnknown_3005B60 -_080FED98: .4byte sub_080FEC90 - thumb_func_end sub_080FED08 +_080FED98: .4byte OpponentHandleFaintAnimation + thumb_func_end ItemUseInBattle_StatIncrease thumb_func_start sub_080FED9C sub_080FED9C: @ 0x080FED9C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEDC4 @@ -522636,7 +522636,7 @@ ItemUseInBattle_Medicine: @ 0x080FEDE0 bx r0 .align 2, 0 _080FEDF4: .4byte gUnknown_3006068 -_080FEDF8: .4byte sub_081B6228 +_080FEDF8: .4byte ItemUseCB_Medicine thumb_func_end ItemUseInBattle_Medicine thumb_func_start sub_080FEDFC @@ -522668,7 +522668,7 @@ ItemUseInBattle_PPRecovery: @ 0x080FEE18 bx r0 .align 2, 0 _080FEE2C: .4byte gUnknown_3006068 -_080FEE30: .4byte sub_081B67C4 +_080FEE30: .4byte dp05_ether thumb_func_end ItemUseInBattle_PPRecovery thumb_func_start sub_080FEE34 @@ -522683,7 +522683,7 @@ sub_080FEE34: @ 0x080FEE34 cmp r0, #0 bne _080FEE84 bl sub_080FE8A8 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _080FEE70 @@ -522691,7 +522691,7 @@ sub_080FEE34: @ 0x080FEE34 ldr r3, _080FEE6C adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _080FEE96 .align 2, 0 _080FEE64: .4byte gUnknown_2022C90 @@ -522723,14 +522723,14 @@ _080FEE96: _080FEE9C: .4byte gUnknown_3005B60 thumb_func_end sub_080FEE34 - thumb_func_start sub_080FEEA0 -sub_080FEEA0: @ 0x080FEEA0 + thumb_func_start ItemUseOutOfBattle_EnigmaBerry +ItemUseOutOfBattle_EnigmaBerry: @ 0x080FEEA0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _080FEEC4 ldrh r0, [r0] - bl sub_081B7990 + bl GetItemEffectType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #1 @@ -522842,14 +522842,14 @@ _080FEFAC: movs r0, #4 strh r0, [r1, #0x10] adds r0, r4, #0 - bl sub_080FF070 + bl ItemUseOutOfBattle_CannotUse _080FEFC0: pop {r4} pop {r0} bx r0 .align 2, 0 _080FEFC8: .4byte gUnknown_3005B60 - thumb_func_end sub_080FEEA0 + thumb_func_end ItemUseOutOfBattle_EnigmaBerry thumb_func_start sub_080FEFCC sub_080FEFCC: @ 0x080FEFCC @@ -522858,7 +522858,7 @@ sub_080FEFCC: @ 0x080FEFCC lsrs r4, r0, #0x18 ldr r0, _080FEFEC ldrh r0, [r0] - bl sub_081B7990 + bl GetItemEffectType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x15 @@ -522896,7 +522896,7 @@ _080FEFF4: @ jump table .4byte _080FF05C @ case 21 _080FF04C: adds r0, r4, #0 - bl sub_080FED08 + bl ItemUseInBattle_StatIncrease b _080FF06A _080FF054: adds r0, r4, #0 @@ -522908,15 +522908,15 @@ _080FF05C: b _080FF06A _080FF064: adds r0, r4, #0 - bl sub_080FF070 + bl ItemUseOutOfBattle_CannotUse _080FF06A: pop {r4} pop {r0} bx r0 thumb_func_end sub_080FEFCC - thumb_func_start sub_080FF070 -sub_080FF070: @ 0x080FF070 + thumb_func_start ItemUseOutOfBattle_CannotUse +ItemUseOutOfBattle_CannotUse: @ 0x080FF070 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -522931,10 +522931,10 @@ sub_080FF070: @ 0x080FF070 bx r0 .align 2, 0 _080FF08C: .4byte gUnknown_3005B60 - thumb_func_end sub_080FF070 + thumb_func_end ItemUseOutOfBattle_CannotUse - thumb_func_start sub_080FF090 -sub_080FF090: @ 0x080FF090 + thumb_func_start AnimMovePowderParticle +AnimMovePowderParticle: @ 0x080FF090 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _080FF0C4 @@ -522952,7 +522952,7 @@ sub_080FF090: @ 0x080FF090 strh r0, [r4, #0x30] ldr r0, _080FF0C8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080FF0CC @@ -522976,11 +522976,11 @@ _080FF0CE: bx r0 .align 2, 0 _080FF0E0: .4byte gUnknown_20380BE -_080FF0E4: .4byte sub_080FF0E8 - thumb_func_end sub_080FF090 +_080FF0E4: .4byte AnimMovePowderParticleStep + thumb_func_end AnimMovePowderParticle - thumb_func_start sub_080FF0E8 -sub_080FF0E8: @ 0x080FF0E8 + thumb_func_start AnimMovePowderParticleStep +AnimMovePowderParticleStep: @ 0x080FF0E8 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x2e] @@ -523012,32 +523012,32 @@ sub_080FF0E8: @ 0x080FF0E8 b _080FF12A _080FF124: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FF12A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FF0E8 + thumb_func_end AnimMovePowderParticleStep - thumb_func_start sub_080FF130 -sub_080FF130: @ 0x080FF130 + thumb_func_start AnimPowerAbsorptionOrb +AnimPowerAbsorptionOrb: @ 0x080FF130 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _080FF170 ldrh r0, [r0, #4] strh r0, [r4, #0x2e] ldr r5, _080FF174 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] @@ -523045,7 +523045,7 @@ sub_080FF130: @ 0x080FF130 str r0, [r4, #0x1c] ldr r1, _080FF17C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 @@ -523053,15 +523053,15 @@ sub_080FF130: @ 0x080FF130 _080FF170: .4byte gUnknown_20380BE _080FF174: .4byte gUnknown_20380D6 _080FF178: .4byte sub_080A67B4 -_080FF17C: .4byte sub_080A6014 - thumb_func_end sub_080FF130 +_080FF17C: .4byte DestroySpriteAndMatrix + thumb_func_end AnimPowerAbsorptionOrb thumb_func_start sub_080FF180 sub_080FF180: @ 0x080FF180 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r5, _080FF1C8 ldrb r1, [r5, #6] adds r0, r4, #0 @@ -523071,13 +523071,13 @@ sub_080FF180: @ 0x080FF180 ldr r5, _080FF1CC ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] @@ -523085,7 +523085,7 @@ sub_080FF180: @ 0x080FF180 str r0, [r4, #0x1c] ldr r1, _080FF1D4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 @@ -523093,7 +523093,7 @@ sub_080FF180: @ 0x080FF180 _080FF1C8: .4byte gUnknown_20380BE _080FF1CC: .4byte gUnknown_20380D7 _080FF1D0: .4byte sub_080A67B4 -_080FF1D4: .4byte sub_080A34C4 +_080FF1D4: .4byte DestroyAnimSprite thumb_func_end sub_080FF180 thumb_func_start sub_080FF1D8 @@ -523101,7 +523101,7 @@ sub_080FF1D8: @ 0x080FF1D8 push {r4, r5, r6, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r6, _080FF228 ldrh r0, [r6, #4] strh r0, [r4, #0x2e] @@ -523110,7 +523110,7 @@ sub_080FF1D8: @ 0x080FF1D8 ldr r5, _080FF22C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -523118,12 +523118,12 @@ sub_080FF1D8: @ 0x080FF1D8 strh r0, [r4, #0x34] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldrh r0, [r6, #6] strh r0, [r4, #0x38] ldr r1, _080FF230 @@ -523136,11 +523136,11 @@ sub_080FF1D8: @ 0x080FF1D8 .align 2, 0 _080FF228: .4byte gUnknown_20380BE _080FF22C: .4byte gUnknown_20380D7 -_080FF230: .4byte sub_080FF234 +_080FF230: .4byte AnimSolarbeamSmallOrbStep thumb_func_end sub_080FF1D8 - thumb_func_start sub_080FF234 -sub_080FF234: @ 0x080FF234 + thumb_func_start AnimSolarbeamSmallOrbStep +AnimSolarbeamSmallOrbStep: @ 0x080FF234 push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -523196,10 +523196,10 @@ _080FF29E: bx r0 .align 2, 0 _080FF2A4: .4byte gUnknown_20380D7 - thumb_func_end sub_080FF234 + thumb_func_end AnimSolarbeamSmallOrbStep - thumb_func_start sub_080FF2A8 -sub_080FF2A8: @ 0x080FF2A8 + thumb_func_start AnimTask_CreateSmallSolarbeamOrbs +AnimTask_CreateSmallSolarbeamOrbs: @ 0x080FF2A8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -523242,7 +523242,7 @@ sub_080FF2A8: @ 0x080FF2A8 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_08006D6C + bl CreateSpriteAndAnimate _080FF302: movs r1, #0xa ldrsh r0, [r5, r1] @@ -523259,10 +523259,10 @@ _080FF318: .4byte gUnknown_3005B60 _080FF31C: .4byte gUnknown_20380BE _080FF320: .4byte gUnknown_856DDF4 _080FF324: .4byte gUnknown_20380D7 - thumb_func_end sub_080FF2A8 + thumb_func_end AnimTask_CreateSmallSolarbeamOrbs - thumb_func_start sub_080FF328 -sub_080FF328: @ 0x080FF328 + thumb_func_start AnimAbsorptionOrb +AnimAbsorptionOrb: @ 0x080FF328 push {r4, r5, r6, lr} adds r4, r0, #0 movs r1, #1 @@ -523273,20 +523273,20 @@ sub_080FF328: @ 0x080FF328 ldr r5, _080FF370 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] ldrh r0, [r6, #4] strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _080FF374 str r0, [r4, #0x1c] pop {r4, r5, r6} @@ -523296,18 +523296,18 @@ sub_080FF328: @ 0x080FF328 _080FF36C: .4byte gUnknown_20380BE _080FF370: .4byte gUnknown_20380D6 _080FF374: .4byte sub_080FF378 - thumb_func_end sub_080FF328 + thumb_func_end AnimAbsorptionOrb thumb_func_start sub_080FF378 sub_080FF378: @ 0x080FF378 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _080FF38C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FF38C: pop {r4} pop {r0} @@ -523315,8 +523315,8 @@ _080FF38C: .align 2, 0 thumb_func_end sub_080FF378 - thumb_func_start sub_080FF394 -sub_080FF394: @ 0x080FF394 + thumb_func_start AnimHyperBeamOrb +AnimHyperBeamOrb: @ 0x080FF394 push {r4, r5, lr} adds r5, r0, #0 bl sub_0806F0A4 @@ -523330,18 +523330,18 @@ sub_080FF394: @ 0x080FF394 ldr r4, _080FF3DC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080FF3E0 @@ -523367,7 +523367,7 @@ _080FF3E4: ldr r4, _080FF444 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -523375,12 +523375,12 @@ _080FF3E4: strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A6A28 + bl InitAnimFastLinearTranslationWithSpeed bl sub_0806F0A4 movs r1, #0xff ands r1, r0 @@ -523398,11 +523398,11 @@ _080FF3E4: bx r0 .align 2, 0 _080FF444: .4byte gUnknown_20380D7 -_080FF448: .4byte sub_080FF44C - thumb_func_end sub_080FF394 +_080FF448: .4byte AnimHyperBeamOrbStep + thumb_func_end AnimHyperBeamOrb - thumb_func_start sub_080FF44C -sub_080FF44C: @ 0x080FF44C + thumb_func_start AnimHyperBeamOrbStep +AnimHyperBeamOrbStep: @ 0x080FF44C push {r4, lr} adds r4, r0, #0 bl AnimFastTranslateLinear @@ -523410,7 +523410,7 @@ sub_080FF44C: @ 0x080FF44C cmp r0, #0 beq _080FF462 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _080FF492 _080FF462: movs r1, #0x38 @@ -523442,17 +523442,17 @@ _080FF492: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FF44C + thumb_func_end AnimHyperBeamOrbStep - thumb_func_start sub_080FF498 -sub_080FF498: @ 0x080FF498 + thumb_func_start AnimLeechSeed +AnimLeechSeed: @ 0x080FF498 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _080FF4F8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080FF4B8 @@ -523467,7 +523467,7 @@ _080FF4B8: ldr r5, _080FF500 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -523475,7 +523475,7 @@ _080FF4B8: strh r0, [r6, #0x32] ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #6] @@ -523484,7 +523484,7 @@ _080FF4B8: ldrh r0, [r4, #0xa] strh r0, [r6, #0x38] adds r0, r6, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _080FF504 str r0, [r6, #0x1c] pop {r4, r5, r6} @@ -523494,14 +523494,14 @@ _080FF4B8: _080FF4F8: .4byte gUnknown_20380D6 _080FF4FC: .4byte gUnknown_20380BE _080FF500: .4byte gUnknown_20380D7 -_080FF504: .4byte sub_080FF508 - thumb_func_end sub_080FF498 +_080FF504: .4byte AnimLeechSeedStep + thumb_func_end AnimLeechSeed - thumb_func_start sub_080FF508 -sub_080FF508: @ 0x080FF508 + thumb_func_start AnimLeechSeedStep +AnimLeechSeedStep: @ 0x080FF508 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _080FF532 @@ -523517,18 +523517,18 @@ sub_080FF508: @ 0x080FF508 str r0, [r4, #0x1c] ldr r1, _080FF53C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _080FF532: pop {r4} pop {r0} bx r0 .align 2, 0 _080FF538: .4byte WaitAnimForDuration -_080FF53C: .4byte sub_080FF540 - thumb_func_end sub_080FF508 +_080FF53C: .4byte AnimLeechSeedSprouts + thumb_func_end AnimLeechSeedStep - thumb_func_start sub_080FF540 -sub_080FF540: @ 0x080FF540 + thumb_func_start AnimLeechSeedSprouts +AnimLeechSeedSprouts: @ 0x080FF540 push {r4, lr} adds r4, r0, #0 adds r2, r4, #0 @@ -523547,17 +523547,17 @@ sub_080FF540: @ 0x080FF540 str r0, [r4, #0x1c] ldr r1, _080FF574 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _080FF570: .4byte WaitAnimForDuration -_080FF574: .4byte sub_080A34C4 - thumb_func_end sub_080FF540 +_080FF574: .4byte DestroyAnimSprite + thumb_func_end AnimLeechSeedSprouts - thumb_func_start sub_080FF578 -sub_080FF578: @ 0x080FF578 + thumb_func_start AnimSporeParticle +AnimSporeParticle: @ 0x080FF578 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 @@ -523591,11 +523591,11 @@ _080FF5A2: bx r0 .align 2, 0 _080FF5BC: .4byte gUnknown_20380BE -_080FF5C0: .4byte sub_080FF5C4 - thumb_func_end sub_080FF578 +_080FF5C0: .4byte AnimSporeParticleStep + thumb_func_end AnimSporeParticle - thumb_func_start sub_080FF5C4 -sub_080FF5C4: @ 0x080FF5C4 + thumb_func_start AnimSporeParticleStep +AnimSporeParticleStep: @ 0x080FF5C4 push {r4, lr} adds r4, r0, #0 movs r1, #0x30 @@ -523623,7 +523623,7 @@ sub_080FF5C4: @ 0x080FF5C4 bhi _080FF618 ldr r0, _080FF614 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -523638,7 +523638,7 @@ _080FF614: .4byte gUnknown_20380D7 _080FF618: ldr r0, _080FF668 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority adds r0, #1 lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -523671,25 +523671,25 @@ _080FF63C: cmp r0, r1 bne _080FF660 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FF660: pop {r4} pop {r0} bx r0 .align 2, 0 _080FF668: .4byte gUnknown_20380D7 - thumb_func_end sub_080FF5C4 + thumb_func_end AnimSporeParticleStep - thumb_func_start sub_080FF66C -sub_080FF66C: @ 0x080FF66C + thumb_func_start AnimTask_SporeDoubleBattle +AnimTask_SporeDoubleBattle: @ 0x080FF66C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _080FF686 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _080FF68E @@ -523708,7 +523708,7 @@ _080FF68E: movs r0, #2 movs r1, #4 movs r2, #3 - bl sub_0811887C + bl SetAnimBgAttribute b _080FF6BA .align 2, 0 _080FF6AC: .4byte gUnknown_20380D7 @@ -523716,7 +523716,7 @@ _080FF6B0: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _080FF6BA: adds r0, r4, #0 bl DestroyAnimVisualTask @@ -523725,14 +523725,14 @@ _080FF6C0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FF66C + thumb_func_end AnimTask_SporeDoubleBattle - thumb_func_start sub_080FF6C8 -sub_080FF6C8: @ 0x080FF6C8 + thumb_func_start AnimPetalDanceBigFlower +AnimPetalDanceBigFlower: @ 0x080FF6C8 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r5, _080FF710 ldrh r0, [r5, #6] strh r0, [r4, #0x2e] @@ -523744,14 +523744,14 @@ sub_080FF6C8: @ 0x080FF6C8 ldr r0, _080FF714 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r5, [r5, #4] adds r0, r0, r5 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation movs r0, #0x40 strh r0, [r4, #0x38] ldr r1, _080FF718 @@ -523764,11 +523764,11 @@ sub_080FF6C8: @ 0x080FF6C8 .align 2, 0 _080FF710: .4byte gUnknown_20380BE _080FF714: .4byte gUnknown_20380D6 -_080FF718: .4byte sub_080FF71C - thumb_func_end sub_080FF6C8 +_080FF718: .4byte AnimPetalDanceBigFlowerStep + thumb_func_end AnimPetalDanceBigFlower - thumb_func_start sub_080FF71C -sub_080FF71C: @ 0x080FF71C + thumb_func_start AnimPetalDanceBigFlowerStep +AnimPetalDanceBigFlowerStep: @ 0x080FF71C push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -523822,19 +523822,19 @@ _080FF772: _080FF784: .4byte gUnknown_20380D6 _080FF788: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FF78E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FF71C + thumb_func_end AnimPetalDanceBigFlowerStep - thumb_func_start sub_080FF794 -sub_080FF794: @ 0x080FF794 + thumb_func_start AnimPetalDanceSmallFlower +AnimPetalDanceSmallFlower: @ 0x080FF794 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r5, _080FF7DC ldrh r0, [r5, #6] strh r0, [r4, #0x2e] @@ -523846,14 +523846,14 @@ sub_080FF794: @ 0x080FF794 ldr r0, _080FF7E0 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r5, [r5, #4] adds r0, r0, r5 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation movs r0, #0x40 strh r0, [r4, #0x38] ldr r1, _080FF7E4 @@ -523866,11 +523866,11 @@ sub_080FF794: @ 0x080FF794 .align 2, 0 _080FF7DC: .4byte gUnknown_20380BE _080FF7E0: .4byte gUnknown_20380D6 -_080FF7E4: .4byte sub_080FF7E8 - thumb_func_end sub_080FF794 +_080FF7E4: .4byte AnimPetalDanceSmallFlowerStep + thumb_func_end AnimPetalDanceSmallFlower - thumb_func_start sub_080FF7E8 -sub_080FF7E8: @ 0x080FF7E8 + thumb_func_start AnimPetalDanceSmallFlowerStep +AnimPetalDanceSmallFlowerStep: @ 0x080FF7E8 push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -523917,27 +523917,27 @@ _080FF834: b _080FF846 _080FF840: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FF846: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FF7E8 + thumb_func_end AnimPetalDanceSmallFlowerStep - thumb_func_start sub_080FF84C -sub_080FF84C: @ 0x080FF84C + thumb_func_start AnimCuttingSlice +AnimCuttingSlice: @ 0x080FF84C push {r4, r5, lr} adds r4, r0, #0 ldr r5, _080FF888 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -523956,11 +523956,11 @@ sub_080FF84C: @ 0x080FF84C .align 2, 0 _080FF888: .4byte gUnknown_20380D6 _080FF88C: .4byte gUnknown_20380BE -_080FF890: .4byte sub_080FF894 - thumb_func_end sub_080FF84C +_080FF890: .4byte AnimRazorLeafParticleStep1 + thumb_func_end AnimCuttingSlice - thumb_func_start sub_080FF894 -sub_080FF894: @ 0x080FF894 + thumb_func_start AnimRazorLeafParticleStep1 +AnimRazorLeafParticleStep1: @ 0x080FF894 push {lr} adds r1, r0, #0 ldrh r0, [r1, #0x32] @@ -523987,7 +523987,7 @@ _080FF8BC: str r0, [r1, #0x1c] b _080FF8DC .align 2, 0 -_080FF8C4: .4byte sub_080FF8E0 +_080FF8C4: .4byte AnimRazorLeafParticleStep2 _080FF8C8: subs r0, #1 strh r0, [r1, #0x32] @@ -524002,15 +524002,15 @@ _080FF8C8: _080FF8DC: pop {r0} bx r0 - thumb_func_end sub_080FF894 + thumb_func_end AnimRazorLeafParticleStep1 - thumb_func_start sub_080FF8E0 -sub_080FF8E0: @ 0x080FF8E0 + thumb_func_start AnimRazorLeafParticleStep2 +AnimRazorLeafParticleStep2: @ 0x080FF8E0 push {r4, lr} adds r4, r0, #0 ldr r0, _080FF900 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080FF904 @@ -524050,23 +524050,23 @@ _080FF92E: cmp r0, #0x50 ble _080FF93C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FF93C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FF8E0 + thumb_func_end AnimRazorLeafParticleStep2 - thumb_func_start sub_080FF944 -sub_080FF944: @ 0x080FF944 + thumb_func_start AnimTranslateLinearSingleSineWave +AnimTranslateLinearSingleSineWave: @ 0x080FF944 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _080FF998 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080FF964 @@ -524085,7 +524085,7 @@ _080FF964: ldr r4, _080FF9A0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #4] @@ -524093,7 +524093,7 @@ _080FF964: strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #6] @@ -524125,14 +524125,14 @@ _080FF9C4: ldrh r0, [r0, #0xa] strh r0, [r5, #0x38] adds r0, r5, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _080FF9F8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r0, _080FF9F0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -524153,11 +524153,11 @@ _080FF9FE: pop {r0} bx r0 .align 2, 0 -_080FFA0C: .4byte sub_080FFA10 - thumb_func_end sub_080FF944 +_080FFA0C: .4byte AnimTranslateLinearSingleSineWaveStep + thumb_func_end AnimTranslateLinearSingleSineWave - thumb_func_start sub_080FFA10 -sub_080FFA10: @ 0x080FFA10 + thumb_func_start AnimTranslateLinearSingleSineWaveStep +AnimTranslateLinearSingleSineWaveStep: @ 0x080FFA10 push {r4, r5, r6, r7, lr} adds r6, r0, #0 movs r7, #0 @@ -524166,7 +524166,7 @@ sub_080FFA10: @ 0x080FFA10 movs r0, #1 strh r0, [r6, #0x2e] adds r0, r6, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc ldrh r0, [r6, #0x3c] strh r5, [r6, #0x2e] lsls r4, r4, #0x10 @@ -524240,19 +524240,19 @@ _080FFAA6: cmp r7, #0 beq _080FFAB0 adds r0, r6, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FFAB0: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_080FFA10 + thumb_func_end AnimTranslateLinearSingleSineWaveStep - thumb_func_start sub_080FFAB8 -sub_080FFAB8: @ 0x080FFAB8 + thumb_func_start AnimMoveTwisterParticle +AnimMoveTwisterParticle: @ 0x080FFAB8 push {r4, lr} adds r4, r0, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -524288,11 +524288,11 @@ _080FFADA: .align 2, 0 _080FFB00: .4byte gUnknown_20380D7 _080FFB04: .4byte gUnknown_20380BE -_080FFB08: .4byte sub_080FFB0C - thumb_func_end sub_080FFAB8 +_080FFB08: .4byte AnimMoveTwisterParticleStep + thumb_func_end AnimMoveTwisterParticle - thumb_func_start sub_080FFB0C -sub_080FFB0C: @ 0x080FFB0C + thumb_func_start AnimMoveTwisterParticleStep +AnimMoveTwisterParticleStep: @ 0x080FFB0C push {r4, r5, lr} adds r4, r0, #0 ldrh r1, [r4, #0x30] @@ -524347,7 +524347,7 @@ _080FFB48: bgt _080FFB88 ldr r0, _080FFB84 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #1 @@ -524357,7 +524357,7 @@ _080FFB84: .4byte gUnknown_20380D7 _080FFB88: ldr r0, _080FFBC0 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -524378,17 +524378,17 @@ _080FFB96: cmp r0, #0 bne _080FFBBA adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FFBBA: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _080FFBC0: .4byte gUnknown_20380D7 - thumb_func_end sub_080FFB0C + thumb_func_end AnimMoveTwisterParticleStep - thumb_func_start sub_080FFBC4 -sub_080FFBC4: @ 0x080FFBC4 + thumb_func_start AnimConstrictBinding +AnimConstrictBinding: @ 0x080FFBC4 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0 @@ -524414,11 +524414,11 @@ sub_080FFBC4: @ 0x080FFBC4 bx r0 .align 2, 0 _080FFBF8: .4byte gUnknown_20380BE -_080FFBFC: .4byte sub_080FFC00 - thumb_func_end sub_080FFBC4 +_080FFBFC: .4byte AnimConstrictBindingStep1 + thumb_func_end AnimConstrictBinding - thumb_func_start sub_080FFC00 -sub_080FFC00: @ 0x080FFC00 + thumb_func_start AnimConstrictBindingStep1 +AnimConstrictBindingStep1: @ 0x080FFC00 push {r4, lr} adds r4, r0, #0 ldr r0, _080FFC30 @@ -524433,7 +524433,7 @@ sub_080FFC00: @ 0x080FFC00 ands r0, r1 strb r0, [r2] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId movs r0, #0x80 lsls r0, r0, #1 strh r0, [r4, #0x2e] @@ -524446,15 +524446,15 @@ _080FFC2A: .align 2, 0 _080FFC30: .4byte gUnknown_20380BE _080FFC34: .4byte 0x0000FFFF -_080FFC38: .4byte sub_080FFC3C - thumb_func_end sub_080FFC00 +_080FFC38: .4byte AnimConstrictBindingStep2 + thumb_func_end AnimConstrictBindingStep1 - thumb_func_start sub_080FFC3C -sub_080FFC3C: @ 0x080FFC3C + thumb_func_start AnimConstrictBindingStep2 +AnimConstrictBindingStep2: @ 0x080FFC3C push {r4, lr} adds r4, r0, #0 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId movs r1, #0x32 ldrsh r0, [r4, r1] cmp r0, #0 @@ -524502,12 +524502,12 @@ _080FFC74: b _080FFCA2 _080FFC9C: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _080FFCA2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_080FFC3C + thumb_func_end AnimConstrictBindingStep2 thumb_func_start sub_080FFCA8 sub_080FFCA8: @ 0x080FFCA8 @@ -524519,7 +524519,7 @@ sub_080FFCA8: @ 0x080FFCA8 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r0, _080FFCE4 @@ -524543,7 +524543,7 @@ _080FFCE4: .4byte gUnknown_20205AC _080FFCE8: adds r0, r1, #0 movs r1, #1 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r0, _080FFD7C lsls r6, r4, #2 adds r6, r6, r4 @@ -524556,7 +524556,7 @@ _080FFCE8: ldr r0, _080FFD80 mov sb, r0 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 mov r8, r1 mov r1, r8 @@ -524570,7 +524570,7 @@ _080FFCE8: orrs r0, r1 strb r0, [r7, #5] movs r0, #3 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r4, r1, #4 @@ -524585,7 +524585,7 @@ _080FFCE8: ldrb r1, [r2] movs r0, #2 eors r0, r1 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority mov r1, r8 ands r1, r0 lsls r1, r1, #2 @@ -524625,7 +524625,7 @@ sub_080FFD8C: @ 0x080FFD8C lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r6, r0, #0 @@ -524648,7 +524648,7 @@ sub_080FFD8C: @ 0x080FFD8C strh r1, [r5, #0x24] ldr r0, _080FFE14 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _080FFDD6 @@ -524664,9 +524664,9 @@ _080FFDD6: adds r0, r6, #0 adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale adds r0, r6, #0 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale ldrh r0, [r4, #0xa] subs r0, #1 strh r0, [r4, #0xa] @@ -524709,12 +524709,12 @@ sub_080FFE1C: @ 0x080FFE1C cmp r5, #0 bne _080FFEC4 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r6, _080FFEAC lsls r1, r4, #4 adds r1, r1, r4 @@ -524734,7 +524734,7 @@ sub_080FFE1C: @ 0x080FFE1C orrs r0, r2 strb r0, [r1, #5] movs r0, #3 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -524789,8 +524789,8 @@ _080FFEDE: _080FFEE4: .4byte gUnknown_3005B60 thumb_func_end sub_080FFE1C - thumb_func_start sub_080FFEE8 -sub_080FFEE8: @ 0x080FFEE8 + thumb_func_start AnimMimicOrb +AnimMimicOrb: @ 0x080FFEE8 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0x2e @@ -524803,7 +524803,7 @@ sub_080FFEE8: @ 0x080FFEE8 _080FFEFA: ldr r6, _080FFF4C ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _080FFF12 @@ -524815,7 +524815,7 @@ _080FFEFA: _080FFF12: ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _080FFF50 lsrs r0, r0, #0x18 @@ -524824,7 +524824,7 @@ _080FFF12: strh r0, [r5, #0x20] ldrb r0, [r6] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #2] @@ -524866,13 +524866,13 @@ _080FFF54: ldr r4, _080FFFAC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -524880,7 +524880,7 @@ _080FFF54: str r0, [r5, #0x1c] ldr r1, _080FFFB4 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _080FFFA6: pop {r4, r5, r6} pop {r0} @@ -524888,11 +524888,11 @@ _080FFFA6: .align 2, 0 _080FFFAC: .4byte gUnknown_20380D6 _080FFFB0: .4byte sub_080A6988 -_080FFFB4: .4byte sub_080A34C4 - thumb_func_end sub_080FFEE8 +_080FFFB4: .4byte DestroyAnimSprite + thumb_func_end AnimMimicOrb - thumb_func_start sub_080FFFB8 -sub_080FFFB8: @ 0x080FFFB8 + thumb_func_start AnimIngrainRoot +AnimIngrainRoot: @ 0x080FFFB8 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x2e @@ -524902,13 +524902,13 @@ sub_080FFFB8: @ 0x080FFFB8 ldr r4, _08100030 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -524953,11 +524953,11 @@ _08100024: .align 2, 0 _08100030: .4byte gUnknown_20380D6 _08100034: .4byte gUnknown_20380BE -_08100038: .4byte sub_0810012C - thumb_func_end sub_080FFFB8 +_08100038: .4byte AnimRootFlickerOut + thumb_func_end AnimIngrainRoot - thumb_func_start sub_0810003C -sub_0810003C: @ 0x0810003C + thumb_func_start AnimFrenzyPlantRoot +AnimFrenzyPlantRoot: @ 0x0810003C push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -524968,13 +524968,13 @@ sub_0810003C: @ 0x0810003C ldr r4, _08100118 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -524983,13 +524983,13 @@ sub_0810003C: @ 0x0810003C ldr r6, _0810011C ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r2, r0, #0 lsls r2, r2, #0x18 subs r4, r4, r5 @@ -525064,12 +525064,12 @@ sub_0810003C: @ 0x0810003C _08100118: .4byte gUnknown_20380D6 _0810011C: .4byte gUnknown_20380D7 _08100120: .4byte gUnknown_20380BE -_08100124: .4byte sub_0810012C +_08100124: .4byte AnimRootFlickerOut _08100128: .4byte gUnknown_2039DC4 - thumb_func_end sub_0810003C + thumb_func_end AnimFrenzyPlantRoot - thumb_func_start sub_0810012C -sub_0810012C: @ 0x0810012C + thumb_func_start AnimRootFlickerOut +AnimRootFlickerOut: @ 0x0810012C push {lr} adds r3, r0, #0 ldrh r1, [r3, #0x2e] @@ -525110,15 +525110,15 @@ _0810016C: cmp r1, r0 ble _0810017E adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810017E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810012C + thumb_func_end AnimRootFlickerOut - thumb_func_start sub_08100184 -sub_08100184: @ 0x08100184 + thumb_func_start AnimIngrainOrb +AnimIngrainOrb: @ 0x08100184 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #0x2e @@ -525128,7 +525128,7 @@ sub_08100184: @ 0x08100184 ldr r5, _08100200 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _08100204 lsrs r0, r0, #0x18 @@ -525137,7 +525137,7 @@ sub_08100184: @ 0x08100184 strh r0, [r6, #0x20] ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -525174,7 +525174,7 @@ _081001C4: cmp r1, r0 ble _081001FA adds r0, r6, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081001FA: pop {r4, r5, r6} pop {r0} @@ -525182,7 +525182,7 @@ _081001FA: .align 2, 0 _08100200: .4byte gUnknown_20380D6 _08100204: .4byte gUnknown_20380BE - thumb_func_end sub_08100184 + thumb_func_end AnimIngrainOrb thumb_func_start sub_08100208 sub_08100208: @ 0x08100208 @@ -525316,7 +525316,7 @@ _081002E8: cmp r0, #0x32 ble _081002FC adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081002FC: pop {r4} pop {r0} @@ -525377,21 +525377,21 @@ _0810035E: _08100364: .4byte sub_081002D4 thumb_func_end sub_08100304 - thumb_func_start sub_08100368 -sub_08100368: @ 0x08100368 + thumb_func_start AnimPresent +AnimPresent: @ 0x08100368 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r4, _081003B0 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _081003B4 @@ -525433,7 +525433,7 @@ _081003CA: bx r0 .align 2, 0 _081003DC: .4byte sub_08100304 - thumb_func_end sub_08100368 + thumb_func_end AnimPresent thumb_func_start sub_081003E0 sub_081003E0: @ 0x081003E0 @@ -525479,7 +525479,7 @@ _0810040A: strh r5, [r4, #0x26] strh r5, [r4, #0x2e] adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810043C: pop {r4, r5} pop {r0} @@ -525487,18 +525487,18 @@ _0810043C: .align 2, 0 thumb_func_end sub_081003E0 - thumb_func_start sub_08100444 -sub_08100444: @ 0x08100444 + thumb_func_start AnimKnockOffItem +AnimKnockOffItem: @ 0x08100444 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r4, _08100480 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -525525,7 +525525,7 @@ _08100488: adds r0, r6, #0 adds r0, #0xa strh r0, [r5, #0x3c] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081004A0 @@ -525547,10 +525547,10 @@ _081004B2: bx r0 .align 2, 0 _081004BC: .4byte sub_081003E0 - thumb_func_end sub_08100444 + thumb_func_end AnimKnockOffItem - thumb_func_start sub_081004C0 -sub_081004C0: @ 0x081004C0 + thumb_func_start AnimPresentHealParticle +AnimPresentHealParticle: @ 0x081004C0 push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -525578,17 +525578,17 @@ _081004DA: cmp r0, #0 beq _081004FA adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081004FA: pop {r4} pop {r0} bx r0 .align 2, 0 _08100500: .4byte gUnknown_20380BE - thumb_func_end sub_081004C0 + thumb_func_end AnimPresentHealParticle - thumb_func_start sub_08100504 -sub_08100504: @ 0x08100504 + thumb_func_start AnimItemSteal +AnimItemSteal: @ 0x08100504 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0 @@ -525596,12 +525596,12 @@ sub_08100504: @ 0x08100504 ldr r4, _0810054C ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _08100550 @@ -525642,11 +525642,11 @@ _08100566: pop {r0} bx r0 .align 2, 0 -_08100578: .4byte sub_0810057C - thumb_func_end sub_08100504 +_08100578: .4byte AnimItemStealStep + thumb_func_end AnimItemSteal - thumb_func_start sub_0810057C -sub_0810057C: @ 0x0810057C + thumb_func_start AnimItemStealStep +AnimItemStealStep: @ 0x0810057C push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x34 @@ -525685,12 +525685,12 @@ _081005A6: cmp r0, #0 bne _081005DA movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x7d - bl sub_080A307C + bl PlaySE12WithPanning _081005DA: adds r0, r4, #0 bl sub_08100230 @@ -525703,29 +525703,29 @@ _081005DA: str r0, [r4, #0x1c] movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x7d - bl sub_080A307C + bl PlaySE12WithPanning _08100602: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08100608: .4byte sub_081002D4 - thumb_func_end sub_0810057C + thumb_func_end AnimItemStealStep - thumb_func_start sub_0810060C -sub_0810060C: @ 0x0810060C + thumb_func_start AnimTrickBag +AnimTrickBag: @ 0x0810060C push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x2e ldrsh r0, [r4, r1] cmp r0, #0 bne _081006A0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08100634 @@ -525787,7 +525787,7 @@ _08100656: b _0810069E .align 2, 0 _08100690: .4byte gUnknown_20380BE -_08100694: .4byte sub_081006A8 +_08100694: .4byte AnimTrickBagStep1 _08100698: adds r1, r4, #0 adds r1, #0x43 @@ -525799,10 +525799,10 @@ _081006A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810060C + thumb_func_end AnimTrickBag - thumb_func_start sub_081006A8 -sub_081006A8: @ 0x081006A8 + thumb_func_start AnimTrickBagStep1 +AnimTrickBagStep1: @ 0x081006A8 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x34 @@ -525858,11 +525858,11 @@ _0810070A: pop {r0} bx r0 .align 2, 0 -_08100710: .4byte sub_08100714 - thumb_func_end sub_081006A8 +_08100710: .4byte AnimTrickBagStep2 + thumb_func_end AnimTrickBagStep1 - thumb_func_start sub_08100714 -sub_08100714: @ 0x08100714 + thumb_func_start AnimTrickBagStep2 +AnimTrickBagStep2: @ 0x08100714 push {r4, r5, r6, lr} adds r4, r0, #0 ldr r5, _08100758 @@ -525900,7 +525900,7 @@ _0810074C: b _081007C6 .align 2, 0 _08100758: .4byte gUnknown_856E2E4 -_0810075C: .4byte sub_081007CC +_0810075C: .4byte AnimTrickBagStep3 _08100760: adds r0, r2, #1 strh r0, [r4, #0x32] @@ -525922,7 +525922,7 @@ _08100760: movs r1, #0xff ands r0, r1 strh r0, [r4, #0x30] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _081007AE @@ -525957,10 +525957,10 @@ _081007C6: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08100714 + thumb_func_end AnimTrickBagStep2 - thumb_func_start sub_081007CC -sub_081007CC: @ 0x081007CC + thumb_func_start AnimTrickBagStep3 +AnimTrickBagStep3: @ 0x081007CC push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -525968,7 +525968,7 @@ sub_081007CC: @ 0x081007CC cmp r0, #0x14 ble _081007DE adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081007DE: movs r0, #0x2e ldrsh r1, [r4, r0] @@ -525995,7 +525995,7 @@ _081007DE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081007CC + thumb_func_end AnimTrickBagStep3 thumb_func_start sub_08100810 sub_08100810: @ 0x08100810 @@ -526017,26 +526017,26 @@ sub_08100810: @ 0x08100810 strh r0, [r5, #0x10] ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x14] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x16] ldrb r0, [r4] movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr strh r0, [r5, #0x1c] ldrb r0, [r4] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr strh r0, [r5, #0x1e] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r2, #1 @@ -526064,7 +526064,7 @@ _08100878: movs r3, #0x1a ldrsh r2, [r5, r3] ldrb r3, [r5, #0x10] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0xc] @@ -526154,7 +526154,7 @@ _081008B0: adds r0, r0, r1 lsls r0, r0, #2 adds r0, r0, r4 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _08100974 str r0, [r5] pop {r4, r5, r6} @@ -526222,7 +526222,7 @@ _081009D0: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 bne _081009E6 @@ -526251,7 +526251,7 @@ _08100A04: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 bne _08100A1A @@ -526280,7 +526280,7 @@ _08100A36: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 bne _08100A4C @@ -526324,7 +526324,7 @@ _08100A54: adds r0, r4, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r6, #8] adds r0, #1 b _08100D4A @@ -526333,7 +526333,7 @@ _08100AA4: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 bne _08100ABA @@ -526396,7 +526396,7 @@ _08100AC2: adds r0, r4, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r6, #8] adds r0, #1 b _08100D4A @@ -526455,7 +526455,7 @@ _08100B38: adds r0, r4, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r6, #8] adds r0, #1 b _08100D4A @@ -526464,7 +526464,7 @@ _08100BB2: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 bne _08100BC8 @@ -526509,7 +526509,7 @@ _08100BD0: adds r0, r4, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r6, #8] adds r0, #1 b _08100D4A @@ -526566,7 +526566,7 @@ _08100C22: adds r0, r4, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r6, #8] adds r0, #1 b _08100D4A @@ -526575,7 +526575,7 @@ _08100C98: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08100D4C @@ -526618,7 +526618,7 @@ _08100CB4: adds r0, r4, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r6, #8] adds r0, #1 b _08100D4A @@ -526627,7 +526627,7 @@ _08100D06: adds r1, r2, #0 bl sub_08100D74 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08100D4C @@ -526721,7 +526721,7 @@ sub_08100D74: @ 0x08100D74 lsls r2, r2, #0x10 asrs r2, r2, #0x10 ldrb r3, [r6, #0x10] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -526850,7 +526850,7 @@ _08100EAC: _08100EAE: ldrb r6, [r0] adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08100ED8 @@ -526911,7 +526911,7 @@ _08100F1E: _08100F24: adds r0, r6, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r5, [r5] @@ -526919,7 +526919,7 @@ _08100F24: _08100F34: strh r0, [r4, #0x22] adds r0, r6, #0 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -526934,17 +526934,17 @@ _08100F50: ldr r0, _08100F94 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r7, [r7] adds r0, r0, r7 strh r0, [r4, #0x22] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId _08100F6A: adds r0, r6, #0 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -527025,7 +527025,7 @@ _08100FF4: bgt _0810100C _08101006: adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810100C: pop {r4, r5} pop {r0} @@ -527054,7 +527054,7 @@ sub_08101014: @ 0x08101014 _08101034: .4byte gUnknown_3005B60 _08101038: ldr r0, _08101064 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 movs r2, #0x80 @@ -527063,7 +527063,7 @@ _08101038: adds r0, r0, r4 strh r0, [r5, #0x18] ldr r0, _08101068 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 adds r0, r0, r4 @@ -527149,7 +527149,7 @@ sub_081010E8: @ 0x081010E8 cmp r0, #0 bne _08101104 adds r0, r6, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _081011DE .align 2, 0 _08101100: .4byte gUnknown_20380BE @@ -527167,12 +527167,12 @@ _08101114: _08101116: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _08101154 @@ -527242,7 +527242,7 @@ _08101168: bl ArcTan2Neg lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081011CA @@ -527257,7 +527257,7 @@ _081011CA: adds r0, r6, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldr r0, _081011EC str r0, [r6, #0x1c] _081011DE: @@ -527298,7 +527298,7 @@ sub_081011F0: @ 0x081011F0 b _08101226 _08101220: adds r0, r2, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _08101226: pop {r4} pop {r0} @@ -527316,7 +527316,7 @@ sub_0810122C: @ 0x0810122C cmp r0, #0 beq _08101242 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08101242: pop {r0} bx r0 @@ -527329,7 +527329,7 @@ sub_08101248: @ 0x08101248 adds r4, r0, #0 ldr r0, _08101268 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08101270 @@ -527358,14 +527358,14 @@ _0810127C: str r0, [r4, #0x1c] ldr r1, _0810129C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _08101294: .4byte gUnknown_20380BE _08101298: .4byte RunStoredCallbackWhenAnimEnds -_0810129C: .4byte sub_080A34C4 +_0810129C: .4byte DestroyAnimSprite thumb_func_end sub_08101248 thumb_func_start sub_081012A0 @@ -527374,7 +527374,7 @@ sub_081012A0: @ 0x081012A0 adds r5, r0, #0 ldr r0, _081012D8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081012BA @@ -527388,7 +527388,7 @@ _081012BA: movs r0, #0 ldrsh r1, [r4, r0] adds r0, r5, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r4, #2] ldrh r1, [r5, #0x22] adds r0, r0, r1 @@ -527428,7 +527428,7 @@ sub_081012E4: @ 0x081012E4 bl StartSpriteAffineAnim ldr r1, _08101328 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810132C str r0, [r4, #0x1c] pop {r4} @@ -527436,8 +527436,8 @@ sub_081012E4: @ 0x081012E4 bx r0 .align 2, 0 _08101324: .4byte gUnknown_20380BE -_08101328: .4byte sub_080A6014 -_0810132C: .4byte sub_080A5FA4 +_08101328: .4byte DestroySpriteAndMatrix +_0810132C: .4byte TranslateSpriteLinearAndFlicker thumb_func_end sub_081012E4 thumb_func_start sub_08101330 @@ -527447,18 +527447,18 @@ sub_08101330: @ 0x08101330 ldr r4, _08101380 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08101364 @@ -527481,7 +527481,7 @@ _08101364: b _081013A0 .align 2, 0 _08101380: .4byte gUnknown_20380D7 -_08101384: .4byte sub_0810151C +_08101384: .4byte AnimSliceStep _08101388: .4byte gUnknown_20380BE _0810138C: ldrh r0, [r5, #0x20] @@ -527550,7 +527550,7 @@ _081013F8: movs r4, #2 eors r0, r4 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldrb r0, [r5] @@ -527563,12 +527563,12 @@ _08101418: ldr r5, _08101470 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldrb r0, [r5] @@ -527576,7 +527576,7 @@ _08101418: mov r8, r2 mov r1, r8 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810148E @@ -527584,7 +527584,7 @@ _08101418: mov r2, r8 eors r0, r2 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r7 @@ -527593,7 +527593,7 @@ _08101418: mov r1, r8 eors r0, r1 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r4 @@ -527605,13 +527605,13 @@ _08101474: ldr r4, _081014C0 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldrb r0, [r4] _08101484: movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r4, r0, #0x18 _0810148E: @@ -527619,7 +527619,7 @@ _0810148E: strh r4, [r6, #0x22] ldr r0, _081014C0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081014A6 @@ -527642,7 +527642,7 @@ _081014A6: b _081014E0 .align 2, 0 _081014C0: .4byte gUnknown_20380D7 -_081014C4: .4byte sub_0810151C +_081014C4: .4byte AnimSliceStep _081014C8: .4byte gUnknown_20380BE _081014CC: ldrh r0, [r6, #0x20] @@ -527689,8 +527689,8 @@ _0810150E: _08101518: .4byte 0xFFFFFC00 thumb_func_end sub_081013D8 - thumb_func_start sub_0810151C -sub_0810151C: @ 0x0810151C + thumb_func_start AnimSliceStep +AnimSliceStep: @ 0x0810151C push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x30] @@ -527733,7 +527733,7 @@ _08101542: bne _08101578 ldr r1, _08101580 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 movs r0, #3 strh r0, [r4, #0x2e] ldr r0, _08101584 @@ -527743,12 +527743,12 @@ _08101578: pop {r0} bx r0 .align 2, 0 -_08101580: .4byte sub_080A34C4 +_08101580: .4byte DestroyAnimSprite _08101584: .4byte WaitAnimForDuration - thumb_func_end sub_0810151C + thumb_func_end AnimSliceStep - thumb_func_start sub_08101588 -sub_08101588: @ 0x08101588 + thumb_func_start unref_sub_8100D38 +unref_sub_8100D38: @ 0x08101588 push {r4, r5, lr} adds r5, r0, #0 ldrh r1, [r5, #0x32] @@ -527855,14 +527855,14 @@ _08101630: adds r0, r0, r4 bl DestroySprite adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08101660: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08101668: .4byte gUnknown_20205AC - thumb_func_end sub_08101588 + thumb_func_end unref_sub_8100D38 thumb_func_start sub_0810166C sub_0810166C: @ 0x0810166C @@ -527873,7 +527873,7 @@ sub_0810166C: @ 0x0810166C strh r0, [r5, #0x2e] ldr r0, _08101690 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08101694 @@ -527967,7 +527967,7 @@ _08101702: cmp r0, r1 bne _08101738 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08101738: pop {r4} pop {r0} @@ -527979,7 +527979,7 @@ _08101738: sub_08101740: @ 0x08101740 push {r4, r5, r6, lr} adds r5, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08101756 @@ -527991,7 +527991,7 @@ _08101756: ldr r6, _081017B8 ldrb r0, [r6] movs r1, #0 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 ldr r4, _081017B4 lsrs r0, r0, #0x18 @@ -528000,24 +528000,24 @@ _08101756: strh r0, [r5, #0x20] ldrb r0, [r6] movs r1, #1 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #2] adds r0, r0, r4 strh r0, [r5, #0x22] ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08101794 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081017BC _08101794: ldrb r0, [r6] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -528036,7 +528036,7 @@ _081017B4: .4byte gUnknown_20380BE _081017B8: .4byte gUnknown_20380D6 _081017BC: ldrb r0, [r6] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -528051,7 +528051,7 @@ _081017D4: ldrh r0, [r0, #4] strh r0, [r5, #0x2e] ldr r0, _0810181C - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 movs r1, #0x80 @@ -528222,14 +528222,14 @@ sub_0810191C: @ 0x0810191C ldr r6, _0810197C ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 strh r0, [r4, #0x20] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08101980 @@ -528441,7 +528441,7 @@ _08101ACA: movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08101AE0: pop {r4} pop {r0} @@ -528529,7 +528529,7 @@ _08101B70: movs r0, #0 ldrsh r1, [r5, r0] adds r0, r4, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r5, #2] ldrh r1, [r4, #0x22] adds r0, r0, r1 @@ -528542,7 +528542,7 @@ _08101B70: strh r0, [r4, #0x32] ldr r1, _08101BA4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08101BA8 str r0, [r4, #0x1c] pop {r4, r5} @@ -528550,7 +528550,7 @@ _08101B70: bx r0 .align 2, 0 _08101BA0: .4byte gUnknown_20380BE -_08101BA4: .4byte sub_080A34C4 +_08101BA4: .4byte DestroyAnimSprite _08101BA8: .4byte TranslateSpriteLinearFixedPoint thumb_func_end sub_08101B5C @@ -528572,14 +528572,14 @@ _08101BC8: ldr r0, _08101C0C _08101BCA: ldrb r6, [r0] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08101C14 movs r1, #2 adds r0, r6, #0 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08101C14 @@ -528594,7 +528594,7 @@ _08101BCA: movs r2, #0 ldrsh r1, [r4, r2] adds r0, r5, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r4, #2] ldrh r1, [r5, #0x22] adds r0, r0, r1 @@ -528611,7 +528611,7 @@ _08101C14: bne _08101C38 adds r0, r6, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] @@ -528623,14 +528623,14 @@ _08101C34: .4byte gUnknown_20380BE _08101C38: adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] adds r0, r6, #0 movs r1, #3 _08101C4A: - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #2] @@ -528640,7 +528640,7 @@ _08101C4A: movs r2, #0 ldrsh r1, [r0, r2] adds r0, r5, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset _08101C64: ldr r1, _08101C84 ldrh r0, [r1, #0xa] @@ -528651,7 +528651,7 @@ _08101C64: strh r0, [r5, #0x32] ldr r1, _08101C88 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08101C8C str r0, [r5, #0x1c] pop {r4, r5, r6} @@ -528659,7 +528659,7 @@ _08101C64: bx r0 .align 2, 0 _08101C84: .4byte gUnknown_20380BE -_08101C88: .4byte sub_080A34C4 +_08101C88: .4byte DestroyAnimSprite _08101C8C: .4byte TranslateSpriteLinearFixedPoint thumb_func_end sub_08101BAC @@ -528670,7 +528670,7 @@ sub_08101C90: @ 0x08101C90 bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _08101CBC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08101CC4 @@ -528748,7 +528748,7 @@ _08101D28: cmp r0, #0 beq _08101D3C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08101D3C: pop {r4} pop {r0} @@ -528763,7 +528763,7 @@ sub_08101D44: @ 0x08101D44 bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _08101D74 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08101D7C @@ -528841,7 +528841,7 @@ sub_08101DB0: @ 0x08101DB0 cmp r0, #0x3c ble _08101DF4 adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _08101DF4: pop {r4} pop {r0} @@ -528863,7 +528863,7 @@ sub_08101DFC: @ 0x08101DFC ldr r1, _08101E1C str r1, [r0, #0x1c] ldr r1, _08101E20 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 @@ -528890,7 +528890,7 @@ _08101E3A: str r0, [r5, #0x1c] ldr r1, _08101E50 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 b _08101EBA .align 2, 0 _08101E4C: .4byte WaitAnimForDuration @@ -528930,7 +528930,7 @@ _08101E54: str r0, [r5, #0x1c] ldr r1, _08101ED0 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 movs r1, #0x80 lsls r1, r1, #1 adds r0, r1, #0 @@ -528938,12 +528938,12 @@ _08101E54: adds r0, r0, r1 strh r0, [r5, #0x38] movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xd2 - bl sub_080A307C + bl PlaySE12WithPanning _08101EBA: ldrh r0, [r5, #0x38] movs r1, #1 @@ -528973,7 +528973,7 @@ sub_08101ED4: @ 0x08101ED4 str r0, [r2, #0x1c] ldr r1, _08101EF8 adds r0, r2, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 b _08101F00 .align 2, 0 _08101EF4: .4byte WaitAnimForDuration @@ -529003,7 +529003,7 @@ sub_08101F08: @ 0x08101F08 str r0, [r5, #0x1c] ldr r1, _08101F2C adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 b _08101FB0 .align 2, 0 _08101F28: .4byte WaitAnimForDuration @@ -529059,14 +529059,14 @@ _08101F68: ldr r4, _08101FB8 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r7 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r6 @@ -529075,7 +529075,7 @@ _08101F68: str r0, [r5, #0x1c] ldr r1, _08101FC0 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _08101FB0: pop {r4, r5, r6, r7} pop {r0} @@ -529129,7 +529129,7 @@ _08101FF4: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 ldr r2, _08102050 - bl sub_080A22E8 + bl BlendPalettes movs r3, #0x30 ldrsh r0, [r4, r3] cmp r0, #0x10 @@ -529147,14 +529147,14 @@ _08101FF4: adds r2, r3, #0 orrs r1, r2 movs r2, #4 - bl sub_080A1200 + bl LoadPalette movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xc0 - bl sub_080A307C + bl PlaySE12WithPanning b _08102064 .align 2, 0 _08102050: .4byte 0x00007FFF @@ -529233,7 +529233,7 @@ _081020CC: cmp r0, #8 bne _081020E0 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081020E0: pop {r4} pop {r0} @@ -529392,7 +529392,7 @@ sub_081021E8: @ 0x081021E8 strh r0, [r4, #0x2e] ldr r5, _08102228 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r2, #2 rsbs r2, r2, #0 @@ -529411,7 +529411,7 @@ _08102206: strh r0, [r4, #0x34] ldr r1, _08102230 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08102234 str r0, [r4, #0x1c] pop {r4, r5} @@ -529421,7 +529421,7 @@ _08102206: _08102228: .4byte gUnknown_20380D6 _0810222C: .4byte gUnknown_2023E88 _08102230: .4byte sub_08102238 -_08102234: .4byte sub_080A5EF8 +_08102234: .4byte TranslateMonSpriteLinear thumb_func_end sub_081021E8 thumb_func_start sub_08102238 @@ -529439,9 +529439,9 @@ sub_08102238: @ 0x08102238 ldrb r0, [r0] strh r0, [r5, #0x34] movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x3a] @@ -529467,7 +529467,7 @@ _08102274: lsls r2, r2, #1 ldrh r3, [r5, #0x38] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r5, #0x34] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -529502,7 +529502,7 @@ sub_081022C4: @ 0x081022C4 strh r0, [r4, #0x2e] ldr r5, _08102304 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r1, #3 cmp r0, #0 @@ -529521,7 +529521,7 @@ _081022E2: strh r0, [r4, #0x34] ldr r1, _0810230C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08102310 str r0, [r4, #0x1c] pop {r4, r5} @@ -529531,7 +529531,7 @@ _081022E2: _08102304: .4byte gUnknown_20380D6 _08102308: .4byte gUnknown_2023E88 _0810230C: .4byte sub_081023D4 -_08102310: .4byte sub_080A5EF8 +_08102310: .4byte TranslateMonSpriteLinear thumb_func_end sub_081022C4 thumb_func_start sub_08102314 @@ -529571,12 +529571,12 @@ sub_08102338: @ 0x08102338 ldrb r0, [r0] strh r0, [r5, #0x34] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x3a] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810237C @@ -529609,7 +529609,7 @@ _08102388: lsls r2, r2, #1 ldrh r3, [r5, #0x38] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r5, #0x34] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -529624,7 +529624,7 @@ _08102388: ldrh r0, [r5, #0x34] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r0, _081023D0 str r0, [r5, #0x1c] _081023C8: @@ -529638,7 +529638,7 @@ _081023D0: .4byte sub_081023D4 thumb_func_start sub_081023D4 sub_081023D4: @ 0x081023D4 push {lr} - bl sub_080A34C4 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -529681,7 +529681,7 @@ _0810240C: ldrb r0, [r0] strh r0, [r4, #0x32] ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x34] @@ -529699,7 +529699,7 @@ _08102434: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldrh r0, [r4, #0x2e] adds r0, #1 strh r0, [r4, #0x2e] @@ -529715,7 +529715,7 @@ _0810244A: lsls r2, r2, #1 ldrh r3, [r4, #0x38] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x32] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -529753,7 +529753,7 @@ _0810249C: lsls r2, r2, #1 ldrh r3, [r4, #0x38] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x32] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -529768,9 +529768,9 @@ _0810249C: ldrh r0, [r4, #0x32] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081024DE: pop {r4, r5} pop {r0} @@ -529795,7 +529795,7 @@ sub_081024E4: @ 0x081024E4 movs r4, #0 strh r0, [r5, #8] ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 strh r2, [r5, #0xa] @@ -529912,7 +529912,7 @@ _081025E2: strh r1, [r4, #0x12] ldrb r0, [r4, #8] movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale b _081026F8 _081025EE: movs r3, #0xe @@ -529928,7 +529928,7 @@ _081025EE: lsls r2, r2, #1 ldrh r3, [r4, #0x10] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r0, [r4, #8] bl SetBattlerSpriteYOffsetFromRotation b _08102724 @@ -530119,7 +530119,7 @@ sub_0810273C: @ 0x0810273C lsls r2, r2, #1 ldrh r3, [r4, #0x10] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r0, [r4, #8] bl SetBattlerSpriteYOffsetFromRotation ldrh r0, [r4, #0xe] @@ -530130,7 +530130,7 @@ sub_0810273C: @ 0x0810273C _08102778: .4byte gUnknown_3005B60 _0810277C: ldrb r0, [r4, #8] - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r5, #0 bl DestroyAnimVisualTask _08102788: @@ -530159,7 +530159,7 @@ _081027AC: _081027AE: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #2] @@ -530167,7 +530167,7 @@ _081027AE: strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #4] @@ -530178,7 +530178,7 @@ _081027AE: strh r0, [r5, #0x30] ldr r1, _081027F0 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _081027F4 str r0, [r5, #0x1c] pop {r4, r5, r6} @@ -530197,7 +530197,7 @@ sub_081027F8: @ 0x081027F8 ldr r5, _08102830 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08102834 @@ -530205,13 +530205,13 @@ sub_081027F8: @ 0x081027F8 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] ldr r1, _08102838 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810283C str r0, [r4, #0x1c] pop {r4, r5} @@ -530231,7 +530231,7 @@ sub_08102840: @ 0x08102840 ldr r5, _08102884 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08102888 @@ -530243,7 +530243,7 @@ sub_08102840: @ 0x08102840 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -530283,7 +530283,7 @@ sub_08102894: @ 0x08102894 strh r0, [r4, #0x32] ldr r1, _081028C4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _081028C8 str r0, [r4, #0x1c] _081028BE: @@ -530343,7 +530343,7 @@ sub_081028DC: @ 0x081028DC cmp r0, #8 ble _08102924 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08102924: pop {r0} bx r0 @@ -530368,7 +530368,7 @@ _08102944: _08102946: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #2] @@ -530376,7 +530376,7 @@ _08102946: strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #4] @@ -530429,7 +530429,7 @@ _081029AC: cmp r0, #0 beq _081029C8 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081029C8: pop {r0} bx r0 @@ -530442,14 +530442,14 @@ sub_081029CC: @ 0x081029CC ldr r6, _08102A14 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 strh r0, [r4, #0x20] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0xc @@ -530461,7 +530461,7 @@ sub_081029CC: @ 0x081029CC strh r5, [r4, #0x34] strh r5, [r4, #0x36] subs r0, #0x42 - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r4, #0x38] @@ -530516,7 +530516,7 @@ sub_08102A1C: @ 0x08102A1C lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xc2 - bl sub_080A307C + bl PlaySE12WithPanning _08102A6E: movs r1, #0 strh r1, [r4, #0x2e] @@ -530551,7 +530551,7 @@ _08102A88: cmp r0, #0 beq _08102AB2 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08102AB2: pop {r4} pop {r0} @@ -530569,7 +530569,7 @@ sub_08102AB8: @ 0x08102AB8 ldr r4, _08102B18 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r5, _08102B1C lsrs r0, r0, #0x18 @@ -530578,13 +530578,13 @@ sub_08102AB8: @ 0x08102AB8 strh r0, [r6, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r5, [r5, #2] adds r0, r0, r5 strh r0, [r6, #0x22] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08102AFC @@ -530602,7 +530602,7 @@ _08102B02: cmp r1, r0 bne _08102B12 adds r0, r6, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08102B12: pop {r4, r5, r6} pop {r0} @@ -530727,13 +530727,13 @@ _08102BE0: ldr r4, _08102C24 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -530741,7 +530741,7 @@ _08102BE0: str r0, [r5, #0x1c] ldr r1, _08102C2C adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _08102C1C: pop {r4, r5} pop {r0} @@ -530749,7 +530749,7 @@ _08102C1C: .align 2, 0 _08102C24: .4byte gUnknown_20380D6 _08102C28: .4byte sub_080A67B4 -_08102C2C: .4byte sub_080A34C4 +_08102C2C: .4byte DestroyAnimSprite thumb_func_end sub_08102BCC thumb_func_start sub_08102C30 @@ -530796,8 +530796,8 @@ _08102C78: _08102C80: .4byte gUnknown_3005B60 thumb_func_end sub_08102C30 - thumb_func_start sub_08102C84 -sub_08102C84: @ 0x08102C84 + thumb_func_start unref_sub_8102434 +unref_sub_8102434: @ 0x08102C84 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -530814,7 +530814,7 @@ _08102C98: cmp r0, #1 bne _08102CB4 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08102CB4 @@ -530827,7 +530827,7 @@ _08102CB4: cmp r0, #1 bne _08102CD2 adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -530853,10 +530853,10 @@ _08102CE0: _08102CEC: .4byte gUnknown_2023D10 _08102CF0: .4byte gUnknown_20380BE _08102CF4: .4byte gUnknown_3005AD0 - thumb_func_end sub_08102C84 + thumb_func_end unref_sub_8102434 - thumb_func_start sub_08102CF8 -sub_08102CF8: @ 0x08102CF8 + thumb_func_start unref_sub_81024A8 +unref_sub_81024A8: @ 0x08102CF8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -530883,13 +530883,13 @@ _08102D12: .align 2, 0 _08102D28: .4byte gUnknown_3005AD0 _08102D2C: .4byte gUnknown_2023D10 - thumb_func_end sub_08102CF8 + thumb_func_end unref_sub_81024A8 thumb_func_start sub_08102D30 sub_08102D30: @ 0x08102D30 push {r4, lr} adds r4, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08102D46 @@ -530933,7 +530933,7 @@ sub_08102D78: @ 0x08102D78 cmp r0, #0 beq _08102D8A adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08102D8A: pop {r0} bx r0 @@ -530947,7 +530947,7 @@ sub_08102D90: @ 0x08102D90 ldr r0, _08102DC8 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r2, _08102DCC lsrs r0, r0, #0x18 @@ -531003,7 +531003,7 @@ _08102DFE: cmp r0, #0 beq _08102E0C adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08102E0C: pop {r0} bx r0 @@ -531069,9 +531069,9 @@ sub_08102E10: @ 0x08102E10 adds r5, #0x1e adds r1, r5, #0 mov r2, r8 - bl sub_080A7910 + bl StorePointerInVars ldr r0, _08102EE8 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r4, #0x80 @@ -531082,7 +531082,7 @@ sub_08102E10: @ 0x08102E10 orrs r0, r1 mov sl, r0 ldr r0, _08102EEC - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0 @@ -531094,7 +531094,7 @@ sub_08102E10: @ 0x08102E10 movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08102EF4 str r1, [r6] adds r0, r7, #0 @@ -531300,13 +531300,13 @@ _0810303C: ldrsh r0, [r4, r1] movs r2, #0x26 ldrsh r1, [r4, r2] - bl sub_080A7918 + bl LoadPointerFromVars ldr r1, _0810306C str r1, [sp] movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _08103064: ldrh r0, [r4, #8] adds r0, #1 @@ -531360,7 +531360,7 @@ _081030B2: ldr r4, _0810311C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6] @@ -531368,7 +531368,7 @@ _081030B2: strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #2] @@ -531377,7 +531377,7 @@ _081030B2: ldrh r1, [r5, #0x20] strh r1, [r5, #0x3a] strh r0, [r5, #0x3c] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08103124 @@ -531407,7 +531407,7 @@ _08103120: .4byte 0xFFFFEC00 _08103124: ldr r0, _08103164 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810316C @@ -531512,7 +531512,7 @@ _081031F2: cmp r0, #0 bne _08103200 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08103200: pop {r0} bx r0 @@ -531533,7 +531533,7 @@ sub_08103204: @ 0x08103204 ldr r1, _08103294 adds r6, r0, r1 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #8] @@ -531625,7 +531625,7 @@ _081032D8: cmp r5, #1 bhi _081032EA movs r0, #0 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -531643,7 +531643,7 @@ _081032EA: movs r1, #0x80 lsls r1, r1, #2 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits b _08103322 .align 2, 0 _0810330C: .4byte sub_0810338C @@ -531653,7 +531653,7 @@ _08103318: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits _08103322: pop {r3, r4} mov r8, r3 @@ -531688,7 +531688,7 @@ sub_08103330: @ 0x08103330 movs r1, #0x80 lsls r1, r1, #2 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits b _08103376 .align 2, 0 _08103364: .4byte gUnknown_3005B60 @@ -531697,7 +531697,7 @@ _0810336C: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits _08103376: ldr r0, _08103388 bl FreeSpritePaletteByTag @@ -531743,7 +531743,7 @@ _081033A8: subs r1, #1 strh r1, [r0, #0xe] adds r0, r5, #0 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram b _08103412 .align 2, 0 _081033CC: .4byte gUnknown_3005B60 @@ -531791,14 +531791,14 @@ sub_0810341C: @ 0x0810341C push {r4, lr} adds r4, r0, #0 ldr r1, _08103430 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08103434 str r0, [r4, #0x1c] pop {r4} pop {r0} bx r0 .align 2, 0 -_08103430: .4byte sub_080A34C4 +_08103430: .4byte DestroyAnimSprite _08103434: .4byte RunStoredCallbackWhenAnimEnds thumb_func_end sub_0810341C @@ -531813,7 +531813,7 @@ sub_08103438: @ 0x08103438 mov sb, r0 ldr r4, _081034E8 ldrh r0, [r4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0xff @@ -531944,7 +531944,7 @@ sub_08103524: @ 0x08103524 lsls r0, r0, #2 adds r0, r0, r2 ldrh r0, [r0] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -531962,7 +531962,7 @@ _08103560: strh r1, [r5, #0x32] ldrh r0, [r4, #4] strh r0, [r5, #0x34] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08103584 @@ -531976,12 +531976,12 @@ _08103584: ldr r4, _081035D4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r3, r0, #0x18 _0810359E: @@ -532119,7 +532119,7 @@ _08103650: ble _081036A6 _0810369E: adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix b _081036F6 _081036A6: movs r0, #0x34 @@ -532151,7 +532151,7 @@ _081036CE: lsls r0, r0, #2 adds r0, r0, r2 ldrh r0, [r0] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -532176,7 +532176,7 @@ sub_08103700: @ 0x08103700 adds r6, r0, #0 ldr r7, _08103784 ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -532189,7 +532189,7 @@ sub_08103700: @ 0x08103700 _0810371E: ldrb r0, [r7] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _08103788 lsrs r0, r0, #0x18 @@ -532199,7 +532199,7 @@ _0810371E: strh r0, [r6, #0x20] ldrb r0, [r7] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r2, [r4, #4] @@ -532295,7 +532295,7 @@ _081037EE: cmp r0, #0x30 bne _08103802 adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _08103802: pop {r4} pop {r0} @@ -532328,14 +532328,14 @@ _0810382E: ldr r4, _0810386C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r6 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #8 @@ -532346,7 +532346,7 @@ _0810382E: str r0, [r5, #0x1c] ldr r1, _08103874 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6} pop {r0} bx r0 @@ -532354,7 +532354,7 @@ _0810382E: _08103868: .4byte 0x0000FFF0 _0810386C: .4byte gUnknown_20380D6 _08103870: .4byte WaitAnimForDuration -_08103874: .4byte sub_080A34C4 +_08103874: .4byte DestroyAnimSprite thumb_func_end sub_08103808 thumb_func_start sub_08103878 @@ -532377,7 +532377,7 @@ sub_08103878: @ 0x08103878 lsls r0, r0, #2 adds r0, r0, r2 ldrh r0, [r0] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -532409,7 +532409,7 @@ _081038C4: subs r0, #0x28 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldrh r0, [r5, #6] strh r0, [r4, #0x38] ldr r0, _081038FC @@ -532466,7 +532466,7 @@ _0810392C: b _08103956 _08103950: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08103956: pop {r4} pop {r0} @@ -532480,29 +532480,29 @@ sub_0810395C: @ 0x0810395C lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810397C adds r0, r5, #0 movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 b _08103986 _0810397C: adds r0, r5, #0 movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 _08103986: strh r0, [r6, #0x20] adds r0, r5, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 adds r0, r5, #0 movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x10 @@ -532541,7 +532541,7 @@ _081039D2: adds r1, r5, #0 bl sub_0810395C adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 rsbs r1, r0, #0 @@ -532556,7 +532556,7 @@ _081039D2: bl StartSpriteAnim ldr r1, _08103A18 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08103A1C str r0, [r5, #0x1c] pop {r4, r5} @@ -532581,7 +532581,7 @@ sub_08103A20: @ 0x08103A20 bne _08103A48 ldr r1, _08103A50 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrh r1, [r4, #0x30] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -532594,7 +532594,7 @@ _08103A48: pop {r0} bx r0 .align 2, 0 -_08103A50: .4byte sub_080A34C4 +_08103A50: .4byte DestroyAnimSprite _08103A54: .4byte RunStoredCallbackWhenAnimEnds thumb_func_end sub_08103A20 @@ -532622,7 +532622,7 @@ _08103A76: strh r0, [r4, #0x2e] ldr r1, _08103A98 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08103A9C str r0, [r4, #0x1c] pop {r4} @@ -532650,7 +532650,7 @@ sub_08103AA0: @ 0x08103AA0 bl StartSpriteAffineAnim ldr r1, _08103ACC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08103AD0 str r0, [r4, #0x1c] _08103AC6: @@ -532658,7 +532658,7 @@ _08103AC6: pop {r0} bx r0 .align 2, 0 -_08103ACC: .4byte sub_080A6014 +_08103ACC: .4byte DestroySpriteAndMatrix _08103AD0: .4byte RunStoredCallbackWhenAffineAnimEnds thumb_func_end sub_08103AA0 @@ -532682,14 +532682,14 @@ _08103AF2: ldrb r5, [r0] adds r0, r5, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r6, #0 strh r0, [r4, #0x20] adds r0, r5, #0 movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr strh r0, [r4, #0x22] lsls r0, r0, #0x10 asrs r0, r0, #0x10 @@ -532711,7 +532711,7 @@ _08103B1A: strh r6, [r4, #0x36] ldr r1, _08103B48 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08103B4C str r0, [r4, #0x1c] pop {r4, r5, r6} @@ -532830,7 +532830,7 @@ _08103BFE: adds r1, r5, #0 bl sub_0810395C adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08103C24 @@ -532877,7 +532877,7 @@ sub_08103C40: @ 0x08103C40 bl StartSpriteAnim ldr r1, _08103C74 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08103C78 str r0, [r4, #0x1c] _08103C6E: @@ -532901,7 +532901,7 @@ sub_08103C7C: @ 0x08103C7C cmp r0, #5 ble _08103C94 adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08103C94: pop {r0} bx r0 @@ -532916,7 +532916,7 @@ sub_08103C98: @ 0x08103C98 movs r0, #0 ldrsh r1, [r5, r0] adds r0, r4, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r5, #2] ldrh r1, [r4, #0x22] adds r0, r0, r1 @@ -532931,7 +532931,7 @@ sub_08103C98: @ 0x08103C98 strh r0, [r4, #0x36] ldr r1, _08103CE0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _08103CE4 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -532941,8 +532941,8 @@ sub_08103C98: @ 0x08103C98 bx r0 .align 2, 0 _08103CDC: .4byte gUnknown_20380BE -_08103CE0: .4byte sub_080A6014 -_08103CE4: .4byte sub_080A5D18 +_08103CE0: .4byte DestroySpriteAndMatrix +_08103CE4: .4byte TranslateSpriteInEllipseOverDuration thumb_func_end sub_08103C98 thumb_func_start sub_08103CE8 @@ -533031,7 +533031,7 @@ _08103D74: cmp r0, #0x40 bne _08103D88 adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08103D88: pop {r0} bx r0 @@ -533068,7 +533068,7 @@ sub_08103D8C: @ 0x08103D8C adds r0, r0, r3 strh r2, [r0, #0x24] adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _08103DCA: ldrh r0, [r4, #0x2e] subs r0, #1 @@ -533087,13 +533087,13 @@ sub_08103DDC: @ 0x08103DDC ldr r4, _08103E24 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -533103,7 +533103,7 @@ sub_08103DDC: @ 0x08103DDC adds r0, r0, r1 ldrb r6, [r0] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08103E34 @@ -533156,7 +533156,7 @@ sub_08103E70: @ 0x08103E70 push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r1, _08103E9C ldrh r0, [r1, #4] strh r0, [r4, #0x2e] @@ -533168,7 +533168,7 @@ sub_08103E70: @ 0x08103E70 str r0, [r4, #0x1c] ldr r1, _08103EA4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 @@ -533191,7 +533191,7 @@ sub_08103EA8: @ 0x08103EA8 ldr r1, _08103EC8 str r1, [r0, #0x1c] ldr r1, _08103ECC - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 @@ -533209,7 +533209,7 @@ sub_08103ED0: @ 0x08103ED0 cmp r0, #0 bne _08103EE6 adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _08103EEA _08103EE6: subs r0, r2, #1 @@ -533220,8 +533220,8 @@ _08103EEA: .align 2, 0 thumb_func_end sub_08103ED0 - thumb_func_start sub_08103EF0 -sub_08103EF0: @ 0x08103EF0 + thumb_func_start AnimTask_Withdraw +AnimTask_Withdraw: @ 0x08103EF0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -533232,7 +533232,7 @@ sub_08103EF0: @ 0x08103EF0 adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r1, _08103F24 lsls r0, r4, #2 adds r0, r0, r4 @@ -533247,11 +533247,11 @@ sub_08103EF0: @ 0x08103EF0 _08103F1C: .4byte gUnknown_2023E88 _08103F20: .4byte gUnknown_20380D6 _08103F24: .4byte gUnknown_3005B60 -_08103F28: .4byte sub_08103F2C - thumb_func_end sub_08103EF0 +_08103F28: .4byte AnimTask_WithdrawStep + thumb_func_end AnimTask_Withdraw - thumb_func_start sub_08103F2C -sub_08103F2C: @ 0x08103F2C + thumb_func_start AnimTask_WithdrawStep +AnimTask_WithdrawStep: @ 0x08103F2C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -533260,7 +533260,7 @@ sub_08103F2C: @ 0x08103F2C ldrb r0, [r0] adds r1, r0, r1 ldrb r4, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08103F68 @@ -533292,7 +533292,7 @@ _08103F76: lsls r2, r2, #1 adds r0, r4, #0 adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldr r1, _08103FA8 adds r0, r6, r5 lsls r0, r0, #3 @@ -533361,7 +533361,7 @@ _08103FFA: cmp r0, #2 bne _0810401C adds r0, r4, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r5, #0 bl DestroyAnimVisualTask b _08104020 @@ -533377,16 +533377,16 @@ _08104020: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08103F2C + thumb_func_end AnimTask_WithdrawStep - thumb_func_start sub_08104028 -sub_08104028: @ 0x08104028 + thumb_func_start Anim_KinesisZapEnergy +Anim_KinesisZapEnergy: @ 0x08104028 push {r4, r5, lr} adds r4, r0, #0 bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _0810404C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08104054 @@ -533414,7 +533414,7 @@ _08104060: strh r0, [r4, #0x22] ldr r0, _08104098 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810409C @@ -533452,36 +533452,36 @@ _081040B0: str r0, [r4, #0x1c] ldr r1, _081040C8 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081040C4: .4byte RunStoredCallbackWhenAnimEnds -_081040C8: .4byte sub_080A34C4 - thumb_func_end sub_08104028 +_081040C8: .4byte DestroyAnimSprite + thumb_func_end Anim_KinesisZapEnergy thumb_func_start sub_081040CC sub_081040CC: @ 0x081040CC push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _081040E8 str r0, [r4, #0x1c] ldr r1, _081040EC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _081040E8: .4byte RunStoredCallbackWhenAffineAnimEnds -_081040EC: .4byte sub_081040F0 +_081040EC: .4byte Anim_SwordsDanceBladeStep thumb_func_end sub_081040CC - thumb_func_start sub_081040F0 -sub_081040F0: @ 0x081040F0 + thumb_func_start Anim_SwordsDanceBladeStep +Anim_SwordsDanceBladeStep: @ 0x081040F0 push {lr} movs r1, #6 strh r1, [r0, #0x2e] @@ -533493,22 +533493,22 @@ sub_081040F0: @ 0x081040F0 ldr r1, _08104110 str r1, [r0, #0x1c] ldr r1, _08104114 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 _08104110: .4byte sub_080A67B4 -_08104114: .4byte sub_080A34C4 - thumb_func_end sub_081040F0 +_08104114: .4byte DestroyAnimSprite + thumb_func_end Anim_SwordsDanceBladeStep - thumb_func_start sub_08104118 -sub_08104118: @ 0x08104118 + thumb_func_start AnimSonicBoomProjectile +AnimSonicBoomProjectile: @ 0x08104118 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #4 adds r5, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810413C @@ -533522,7 +533522,7 @@ _08104138: .4byte gUnknown_20380BE _0810413C: ldr r0, _08104204 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810415E @@ -533539,11 +533539,11 @@ _0810413C: _0810415E: adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r4, _0810420C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r6, _08104208 lsrs r0, r0, #0x18 @@ -533554,7 +533554,7 @@ _0810415E: mov r8, r0 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r2, [r6, #6] @@ -533581,7 +533581,7 @@ _0810415E: lsls r1, r1, #0x18 adds r0, r0, r1 lsrs r4, r0, #0x10 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081041D0 @@ -533596,7 +533596,7 @@ _081041D0: adds r0, r5, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldrh r0, [r6, #8] strh r0, [r5, #0x2e] mov r0, r8 @@ -533606,7 +533606,7 @@ _081041D0: str r0, [r5, #0x1c] ldr r1, _08104218 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 add sp, #4 pop {r3} mov r8, r3 @@ -533619,8 +533619,8 @@ _08104208: .4byte gUnknown_20380BE _0810420C: .4byte gUnknown_20380D7 _08104210: .4byte 0xFFFFA000 _08104214: .4byte sub_080A67B4 -_08104218: .4byte sub_080A34C4 - thumb_func_end sub_08104118 +_08104218: .4byte DestroyAnimSprite + thumb_func_end AnimSonicBoomProjectile thumb_func_start sub_0810421C sub_0810421C: @ 0x0810421C @@ -533955,7 +533955,7 @@ sub_0810445C: @ 0x0810445C subs r3, r3, r4 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov ip, r0 @@ -534022,12 +534022,12 @@ _081044E0: strh r0, [r4, #0xa] movs r0, #0x3f rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x9a - bl sub_080A307C + bl PlaySE12WithPanning movs r3, #0xa ldrsh r0, [r4, r3] cmp r0, #2 @@ -534062,7 +534062,7 @@ sub_08104540: @ 0x08104540 mov r4, sp adds r4, #2 strh r1, [r4] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 mov sl, r4 cmp r0, #0 @@ -534145,7 +534145,7 @@ _08104606: ldr r5, _08104660 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord ldr r1, _08104664 mov r3, r8 adds r4, r3, r7 @@ -534157,7 +534157,7 @@ _08104606: adds r6, r0, #0 ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1c] @@ -534172,7 +534172,7 @@ _08104606: ldrb r1, [r4] movs r0, #2 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08104670 @@ -534192,13 +534192,13 @@ _08104670: ldr r4, _081046CC ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sl @@ -534410,10 +534410,10 @@ sub_08104838: @ 0x08104838 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _08104860 ldrh r0, [r0, #2] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 movs r1, #0x80 @@ -534481,7 +534481,7 @@ _081048A0: cmp r0, #0x18 bne _081048CC adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081048CC: pop {r4, r5, r6, r7} pop {r0} @@ -534496,16 +534496,16 @@ sub_081048D8: @ 0x081048D8 sub sp, #4 adds r5, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r4, _08104978 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0810497C lsrs r0, r0, #0x18 @@ -534515,7 +534515,7 @@ sub_081048D8: @ 0x081048D8 lsrs r7, r0, #0x10 ldr r0, _08104980 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810491C @@ -534552,7 +534552,7 @@ _0810491C: adds r0, r5, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldrh r0, [r4, #8] strh r0, [r5, #0x2e] strh r6, [r5, #0x32] @@ -534561,7 +534561,7 @@ _0810491C: str r0, [r5, #0x1c] ldr r1, _08104988 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -534571,7 +534571,7 @@ _08104978: .4byte gUnknown_20380D7 _0810497C: .4byte gUnknown_20380BE _08104980: .4byte gUnknown_20380D6 _08104984: .4byte sub_080A68C8 -_08104988: .4byte sub_080A34C4 +_08104988: .4byte DestroyAnimSprite thumb_func_end sub_081048D8 thumb_func_start sub_0810498C @@ -534601,7 +534601,7 @@ sub_081049A4: @ 0x081049A4 strh r0, [r4, #0x24] ldr r0, _08104A10 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081049C8 @@ -534638,7 +534638,7 @@ _081049C8: cmp r0, #2 bne _08104A08 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08104A08: pop {r4} pop {r0} @@ -534652,19 +534652,19 @@ sub_08104A14: @ 0x08104A14 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker movs r0, #0x14 strh r0, [r4, #0x2e] ldr r5, _08104A60 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] @@ -534678,7 +534678,7 @@ sub_08104A14: @ 0x08104A14 strb r0, [r2] ldr r1, _08104A68 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 @@ -534693,12 +534693,12 @@ sub_08104A6C: @ 0x08104A6C push {r4, lr} adds r4, r0, #0 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xa6 - bl sub_080A307C + bl PlaySE12WithPanning ldrh r0, [r4, #0x24] ldrh r1, [r4, #0x20] adds r0, r0, r1 @@ -534799,22 +534799,22 @@ _08104B0E: cmp r0, #1 bne _08104B4E adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08104B4E: pop {r4} pop {r0} bx r0 thumb_func_end sub_08104AF0 - thumb_func_start sub_08104B54 -sub_08104B54: @ 0x08104B54 + thumb_func_start Anim_RazorWindTornado +Anim_RazorWindTornado: @ 0x08104B54 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _08104BA4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08104B72 @@ -534837,7 +534837,7 @@ _08104B72: str r0, [r4, #0x1c] ldr r1, _08104BB0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, [r4, #0x1c] adds r0, r4, #0 bl _call_via_r1 @@ -534847,12 +534847,12 @@ _08104B72: .align 2, 0 _08104BA4: .4byte gUnknown_20380D6 _08104BA8: .4byte gUnknown_20380BE -_08104BAC: .4byte sub_080A5BB4 -_08104BB0: .4byte sub_080A34C4 - thumb_func_end sub_08104B54 +_08104BAC: .4byte TranslateSpriteInCircleOverDuration +_08104BB0: .4byte DestroyAnimSprite + thumb_func_end Anim_RazorWindTornado - thumb_func_start sub_08104BB4 -sub_08104BB4: @ 0x08104BB4 + thumb_func_start Anim_ViceGripPincer +Anim_ViceGripPincer: @ 0x08104BB4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -534890,14 +534890,14 @@ _08104BE0: ldr r4, _08104C3C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r0, r8 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r6 @@ -534906,7 +534906,7 @@ _08104BE0: str r0, [r5, #0x1c] ldr r1, _08104C44 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -534919,7 +534919,7 @@ _08104C38: .4byte gUnknown_20380BE _08104C3C: .4byte gUnknown_20380D7 _08104C40: .4byte sub_080A67B4 _08104C44: .4byte sub_08104C48 - thumb_func_end sub_08104BB4 + thumb_func_end Anim_ViceGripPincer thumb_func_start sub_08104C48 sub_08104C48: @ 0x08104C48 @@ -534932,15 +534932,15 @@ sub_08104C48: @ 0x08104C48 cmp r0, #0 beq _08104C5E adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08104C5E: pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08104C48 - thumb_func_start sub_08104C64 -sub_08104C64: @ 0x08104C64 + thumb_func_start Anim_GuillotinePincer +Anim_GuillotinePincer: @ 0x08104C64 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -534984,7 +534984,7 @@ _08104C98: ldr r4, _08104D04 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add r0, sb @@ -534993,13 +534993,13 @@ _08104C98: strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r6 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldrh r0, [r7] strh r0, [r5, #0x38] ldrh r0, [r5, #0x2e] @@ -535017,11 +535017,11 @@ _08104CF8: .4byte 0x0000FFE0 _08104CFC: .4byte 0x0000FFF0 _08104D00: .4byte gUnknown_20380BE _08104D04: .4byte gUnknown_20380D7 -_08104D08: .4byte sub_08104D0C - thumb_func_end sub_08104C64 +_08104D08: .4byte Anim_GuillotinePincerStep1 + thumb_func_end Anim_GuillotinePincer - thumb_func_start sub_08104D0C -sub_08104D0C: @ 0x08104D0C + thumb_func_start Anim_GuillotinePincerStep1 +Anim_GuillotinePincerStep1: @ 0x08104D0C push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -535076,11 +535076,11 @@ _08104D70: bx r0 .align 2, 0 _08104D78: .4byte 0x0000FFFE -_08104D7C: .4byte sub_08104D80 - thumb_func_end sub_08104D0C +_08104D7C: .4byte Anim_GuillotinePincerStep2 + thumb_func_end Anim_GuillotinePincerStep1 - thumb_func_start sub_08104D80 -sub_08104D80: @ 0x08104D80 + thumb_func_start Anim_GuillotinePincerStep2 +Anim_GuillotinePincerStep2: @ 0x08104D80 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -535132,7 +535132,7 @@ _08104DDA: bx r0 .align 2, 0 _08104DE0: .4byte sub_08104DE4 - thumb_func_end sub_08104D80 + thumb_func_end Anim_GuillotinePincerStep2 thumb_func_start sub_08104DE4 sub_08104DE4: @ 0x08104DE4 @@ -535143,7 +535143,7 @@ sub_08104DE4: @ 0x08104DE4 cmp r0, #0 beq _08104DF8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08104DF8: pop {r4} pop {r0} @@ -535151,25 +535151,25 @@ _08104DF8: .align 2, 0 thumb_func_end sub_08104DE4 - thumb_func_start sub_08104E00 -sub_08104E00: @ 0x08104E00 + thumb_func_start AnimTask_GrowAndGreyscale +AnimTask_GrowAndGreyscale: @ 0x08104E00 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #1 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale adds r0, r4, #0 movs r1, #0xd0 movs r2, #0xd0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldr r1, _08104E58 lsls r0, r4, #4 adds r0, r0, r4 @@ -535179,7 +535179,7 @@ sub_08104E00: @ 0x08104E00 lsrs r0, r0, #4 adds r0, #0x10 movs r1, #0 - bl sub_080A6DD4 + bl SetGreyscaleOrOriginalPalette ldr r1, _08104E5C lsls r0, r5, #2 adds r0, r0, r5 @@ -535195,11 +535195,11 @@ sub_08104E00: @ 0x08104E00 .align 2, 0 _08104E58: .4byte gUnknown_20205AC _08104E5C: .4byte gUnknown_3005B60 -_08104E60: .4byte sub_08104E64 - thumb_func_end sub_08104E00 +_08104E60: .4byte AnimTask_GrowAndGreyscaleStep + thumb_func_end AnimTask_GrowAndGreyscale - thumb_func_start sub_08104E64 -sub_08104E64: @ 0x08104E64 + thumb_func_start AnimTask_GrowAndGreyscaleStep +AnimTask_GrowAndGreyscaleStep: @ 0x08104E64 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -535218,12 +535218,12 @@ sub_08104E64: @ 0x08104E64 cmp r1, r0 bne _08104EB4 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r1, _08104EC0 lsls r0, r4, #4 adds r0, r0, r4 @@ -535233,7 +535233,7 @@ sub_08104E64: @ 0x08104E64 lsrs r0, r0, #4 adds r0, #0x10 movs r1, #1 - bl sub_080A6DD4 + bl SetGreyscaleOrOriginalPalette adds r0, r5, #0 bl DestroyAnimVisualTask _08104EB4: @@ -535243,10 +535243,10 @@ _08104EB4: .align 2, 0 _08104EBC: .4byte gUnknown_3005B60 _08104EC0: .4byte gUnknown_20205AC - thumb_func_end sub_08104E64 + thumb_func_end AnimTask_GrowAndGreyscaleStep - thumb_func_start sub_08104EC4 -sub_08104EC4: @ 0x08104EC4 + thumb_func_start AnimTask_Minimize +AnimTask_Minimize: @ 0x08104EC4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -535256,13 +535256,13 @@ sub_08104EC4: @ 0x08104EC4 ldr r0, _08104F10 adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 strh r0, [r4, #8] movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale strh r5, [r4, #0xa] strh r5, [r4, #0xc] strh r5, [r4, #0xe] @@ -535285,11 +535285,11 @@ sub_08104EC4: @ 0x08104EC4 .align 2, 0 _08104F10: .4byte gUnknown_3005B60 _08104F14: .4byte gUnknown_20380D6 -_08104F18: .4byte sub_08104F1C - thumb_func_end sub_08104EC4 +_08104F18: .4byte AnimTask_MinimizeStep1 + thumb_func_end AnimTask_Minimize - thumb_func_start sub_08104F1C -sub_08104F1C: @ 0x08104F1C + thumb_func_start AnimTask_MinimizeStep1 +AnimTask_MinimizeStep1: @ 0x08104F1C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -535331,7 +535331,7 @@ _08104F60: _08104F70: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08105050 + bl CreateMinimizeSprite _08104F78: ldrh r0, [r4, #0xc] adds r0, #1 @@ -535344,9 +535344,9 @@ _08104F78: ldrsh r2, [r4, r1] adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r0, [r4, #8] - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale movs r2, #0xc ldrsh r0, [r4, r2] cmp r0, #0x20 @@ -535376,9 +535376,9 @@ _08104FBE: ldrb r0, [r4, #8] adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r0, [r4, #8] - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale movs r0, #2 strh r0, [r4, #0xa] b _08105046 @@ -535407,9 +535407,9 @@ _08104FF4: ldrsh r2, [r4, r1] adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r0, [r4, #8] - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale movs r2, #0xc ldrsh r0, [r4, r2] cmp r0, #0x20 @@ -535424,7 +535424,7 @@ _08105020: b _08105046 _08105028: ldrb r0, [r4, #8] - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r2, _0810504C movs r0, #0x26 ldrsh r1, [r4, r0] @@ -535442,10 +535442,10 @@ _08105046: bx r0 .align 2, 0 _0810504C: .4byte gUnknown_20205AC - thumb_func_end sub_08104F1C + thumb_func_end AnimTask_MinimizeStep1 - thumb_func_start sub_08105050 -sub_08105050: @ 0x08105050 + thumb_func_start CreateMinimizeSprite +CreateMinimizeSprite: @ 0x08105050 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -535455,7 +535455,7 @@ sub_08105050: @ 0x08105050 lsrs r1, r1, #0x18 mov sb, r1 movs r0, #0 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 @@ -535473,7 +535473,7 @@ sub_08105050: @ 0x08105050 lsls r0, r0, #2 ldr r1, _08105090 adds r0, r0, r1 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram b _0810512A .align 2, 0 _08105090: .4byte gUnknown_20205AC @@ -535536,7 +535536,7 @@ _08105094: ldrsh r2, [r7, r1] adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r0, [r4, #1] movs r3, #4 rsbs r3, r3, #0 @@ -535560,11 +535560,11 @@ _0810512A: bx r0 .align 2, 0 _08105138: .4byte gUnknown_20205AC -_0810513C: .4byte sub_08105140 - thumb_func_end sub_08105050 +_0810513C: .4byte ClonedMinizeSprite_Step + thumb_func_end CreateMinimizeSprite - thumb_func_start sub_08105140 -sub_08105140: @ 0x08105140 + thumb_func_start ClonedMinizeSprite_Step +ClonedMinizeSprite_Step: @ 0x08105140 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -535593,14 +535593,14 @@ sub_08105140: @ 0x08105140 lsrs r0, r0, #0x1b bl FreeOamMatrix adds r0, r4, #0 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram _0810517E: pop {r4} pop {r0} bx r0 .align 2, 0 _08105184: .4byte gUnknown_3005B60 - thumb_func_end sub_08105140 + thumb_func_end ClonedMinizeSprite_Step thumb_func_start sub_08105188 sub_08105188: @ 0x08105188 @@ -535625,7 +535625,7 @@ _081051AC: .4byte gUnknown_3005B60 _081051B0: .4byte gUnknown_20380BE _081051B4: ldrb r0, [r5] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -535647,11 +535647,11 @@ _081051DA: bx r0 .align 2, 0 _081051E0: .4byte gUnknown_856F1CC -_081051E4: .4byte sub_081051E8 +_081051E4: .4byte AnimTask_SplashStep thumb_func_end sub_08105188 - thumb_func_start sub_081051E8 -sub_081051E8: @ 0x081051E8 + thumb_func_start AnimTask_SplashStep +AnimTask_SplashStep: @ 0x081051E8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -535679,7 +535679,7 @@ _08105210: b _081052F8 _0810521A: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData ldrh r2, [r4, #0x10] adds r2, #3 strh r2, [r4, #0x10] @@ -535706,7 +535706,7 @@ _0810521A: _0810524C: .4byte gUnknown_20205AC _08105250: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData ldr r2, _08105280 movs r0, #8 ldrsh r1, [r4, r0] @@ -535758,7 +535758,7 @@ _081052AC: b _081052F8 _081052B4: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -535794,10 +535794,10 @@ _081052F8: bx r0 .align 2, 0 _08105300: .4byte gUnknown_856F1CC - thumb_func_end sub_081051E8 + thumb_func_end AnimTask_SplashStep - thumb_func_start sub_08105304 -sub_08105304: @ 0x08105304 + thumb_func_start AnimTask_GrowAndShrink +AnimTask_GrowAndShrink: @ 0x08105304 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -535807,7 +535807,7 @@ sub_08105304: @ 0x08105304 ldr r0, _08105334 adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -535823,7 +535823,7 @@ sub_08105304: @ 0x08105304 _08105334: .4byte gUnknown_3005B60 _08105338: .4byte gUnknown_856F1EC _0810533C: .4byte sub_08105340 - thumb_func_end sub_08105304 + thumb_func_end AnimTask_GrowAndShrink thumb_func_start sub_08105340 sub_08105340: @ 0x08105340 @@ -535835,7 +535835,7 @@ sub_08105340: @ 0x08105340 lsls r0, r0, #3 ldr r1, _08105368 adds r0, r0, r1 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _08105360 @@ -535849,13 +535849,13 @@ _08105360: _08105368: .4byte gUnknown_3005B60 thumb_func_end sub_08105340 - thumb_func_start sub_0810536C -sub_0810536C: @ 0x0810536C + thumb_func_start Anim_BreathPuff +Anim_BreathPuff: @ 0x0810536C push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0810539C ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081053A0 @@ -535864,7 +535864,7 @@ sub_0810536C: @ 0x0810536C bl StartSpriteAnim ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x20 @@ -535879,7 +535879,7 @@ _081053A0: bl StartSpriteAnim ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0x20 @@ -535890,7 +535890,7 @@ _081053BA: ldr r0, _081053F0 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -535902,7 +535902,7 @@ _081053BA: strh r1, [r4, #0x36] ldr r1, _081053F4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _081053F8 str r0, [r4, #0x1c] pop {r4, r5} @@ -535911,12 +535911,12 @@ _081053BA: .align 2, 0 _081053EC: .4byte 0x0000FFC0 _081053F0: .4byte gUnknown_20380D6 -_081053F4: .4byte sub_080A34C4 +_081053F4: .4byte DestroyAnimSprite _081053F8: .4byte TranslateSpriteLinearFixedPoint - thumb_func_end sub_0810536C + thumb_func_end Anim_BreathPuff - thumb_func_start sub_081053FC -sub_081053FC: @ 0x081053FC + thumb_func_start Anim_AngerMark +Anim_AngerMark: @ 0x081053FC push {r4, r5, r6, lr} adds r6, r0, #0 ldr r0, _08105410 @@ -535934,7 +535934,7 @@ _08105418: _0810541A: ldrb r5, [r0] adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -535947,7 +535947,7 @@ _0810541A: _08105434: adds r0, r5, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0810547C lsrs r0, r0, #0x18 @@ -535956,7 +535956,7 @@ _08105434: strh r0, [r6, #0x20] adds r0, r5, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #4] @@ -535971,7 +535971,7 @@ _08105434: _08105466: ldr r1, _08105480 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08105484 str r0, [r6, #0x1c] pop {r4, r5, r6} @@ -535980,9 +535980,9 @@ _08105466: .align 2, 0 _08105478: .4byte gUnknown_20380D7 _0810547C: .4byte gUnknown_20380BE -_08105480: .4byte sub_080A6014 +_08105480: .4byte DestroySpriteAndMatrix _08105484: .4byte RunStoredCallbackWhenAffineAnimEnds - thumb_func_end sub_081053FC + thumb_func_end Anim_AngerMark thumb_func_start sub_08105488 sub_08105488: @ 0x08105488 @@ -535995,7 +535995,7 @@ sub_08105488: @ 0x08105488 ldr r0, _081054BC adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -536026,7 +536026,7 @@ sub_081054C8: @ 0x081054C8 lsls r0, r0, #3 ldr r1, _081054F0 adds r0, r0, r1 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _081054E8 @@ -536051,7 +536051,7 @@ sub_081054F4: @ 0x081054F4 ldr r0, _08105568 adds r4, r1, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r2, #0 @@ -536084,7 +536084,7 @@ sub_081054F4: @ 0x081054F4 strh r0, [r4, #0x1a] ldr r0, _08105570 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -536295,7 +536295,7 @@ sub_081056C4: @ 0x081056C4 adds r5, r1, r0 ldr r4, _08105718 ldrb r0, [r4] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x20 @@ -536308,7 +536308,7 @@ sub_081056C4: @ 0x081056C4 strh r1, [r5, #0x10] strh r1, [r5, #0x12] ldrb r0, [r4] - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr strh r0, [r5, #0x26] ldrb r0, [r4] bl GetBattlerSpriteBGPriorityRank @@ -536377,7 +536377,7 @@ _0810576A: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _081057A0 str r0, [r5] add sp, #0xc @@ -536508,14 +536508,14 @@ sub_0810586C: @ 0x0810586C ldr r6, _081058C0 ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0x10 movs r5, #0 strh r0, [r4, #0x20] ldrb r0, [r6] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -536528,11 +536528,11 @@ sub_0810586C: @ 0x0810586C strh r5, [r4, #0x36] ldrb r0, [r6] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #2 strh r0, [r4, #0x38] movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r4, #0x3a] @@ -536634,7 +536634,7 @@ _0810592C: lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xcd - bl sub_080A307C + bl PlaySE12WithPanning _08105972: ldrh r0, [r4, #0x34] ldrh r2, [r4, #0x36] @@ -536717,7 +536717,7 @@ _081059EA: ands r0, r1 strb r0, [r2] adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08105A0C: pop {r4} pop {r0} @@ -536756,14 +536756,14 @@ _08105A42: movs r0, #1 adds r4, r0, #0 eors r4, r1 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08105ABA movs r1, #2 adds r0, r5, #0 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08105ABA @@ -536783,11 +536783,11 @@ _08105A80: adds r0, r5, #0 movs r1, #2 _08105A84: - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08105AB0 @@ -536833,7 +536833,7 @@ sub_08105AD4: @ 0x08105AD4 adds r0, r4, #0 bl FreeSpriteOamMatrix adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08105AEE: pop {r4} pop {r0} @@ -536896,13 +536896,13 @@ _08105B58: str r3, [sp, #4] _08105B60: adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08105BBC adds r0, r7, #0 mov r1, sl - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r1, _08105BA0 lsrs r0, r0, #0x18 @@ -536915,7 +536915,7 @@ _08105B60: mov r4, r8 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08105BAC @@ -536938,7 +536938,7 @@ _08105BB8: .4byte gUnknown_2023E88 _08105BBC: adds r0, r7, #0 mov r1, sl - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08105C24 @@ -536947,7 +536947,7 @@ _08105BBC: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08105C34 @@ -536955,7 +536955,7 @@ _08105BBC: adds r4, r7, #0 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08105C34 @@ -537011,7 +537011,7 @@ _08105C4A: strb r0, [r1] adds r0, r7, #0 ldr r1, [sp, #4] - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _08105C98 lsrs r0, r0, #0x18 @@ -537019,14 +537019,14 @@ _08105C4A: adds r0, r0, r1 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08105C9C movs r1, #2 mov r0, r8 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08105C9C @@ -537045,20 +537045,20 @@ _08105C9C: mov r4, sp mov r0, r8 mov r1, sl - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] mov r0, r8 ldr r1, [sp, #4] - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r2, sp strh r0, [r2, #2] _08105CBC: mov r0, r8 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08105CE0 @@ -537099,7 +537099,7 @@ _08105CEE: ldrh r0, [r2] strh r0, [r5, #0x2e] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r1, _08105D34 str r1, [r5, #0x1c] adds r0, r5, #0 @@ -537122,7 +537122,7 @@ sub_08105D38: @ 0x08105D38 push {r4, lr} adds r4, r0, #0 ldr r0, _08105D78 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -537159,10 +537159,10 @@ sub_08105D88: @ 0x08105D88 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _08105DBC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r1, #0xa0 cmp r0, #0 @@ -537207,7 +537207,7 @@ sub_08105DCC: @ 0x08105DCC strh r2, [r4, #0x2e] ldr r0, _08105E38 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r1, #0xa0 cmp r0, #0 @@ -537441,7 +537441,7 @@ _08105FA4: pop {r0} bx r0 .align 2, 0 -_08105FA8: .4byte sub_080A34C4 +_08105FA8: .4byte DestroyAnimSprite thumb_func_end sub_08105F6C thumb_func_start sub_08105FAC @@ -537455,7 +537455,7 @@ sub_08105FAC: @ 0x08105FAC movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -537472,7 +537472,7 @@ sub_08105FCC: @ 0x08105FCC ldr r0, _08105FFC adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -537502,7 +537502,7 @@ sub_08106008: @ 0x08106008 ldr r1, _08106058 adds r4, r0, r1 adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -537556,7 +537556,7 @@ sub_08106060: @ 0x08106060 strh r0, [r4, #0x20] ldr r0, _08106098 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081060A0 @@ -537575,7 +537575,7 @@ _081060A0: _081060A6: strh r0, [r4, #0x24] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -537768,7 +537768,7 @@ sub_081061EC: @ 0x081061EC movs r0, #2 strh r0, [r4, #0x24] movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -537914,13 +537914,13 @@ sub_081062FC: @ 0x081062FC ldr r5, _08106350 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x24] ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -538032,7 +538032,7 @@ _081063EE: movs r3, #0x26 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -538167,7 +538167,7 @@ sub_08106504: @ 0x08106504 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _081065A0 - bl sub_0800851C + bl IndexOfSpritePaletteTag mov r1, sp strb r0, [r1] movs r4, #1 @@ -538186,7 +538186,7 @@ _0810651C: ble _0810651C movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 ldr r0, _081065A8 ldr r0, [r0] @@ -538215,7 +538215,7 @@ _08106550: adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette adds r4, #1 cmp r4, #2 ble _08106550 @@ -538224,7 +538224,7 @@ _08106550: lsls r4, r4, #1 adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] adds r0, r0, r4 movs r1, #0 @@ -538297,7 +538297,7 @@ sub_081065D8: @ 0x081065D8 lsls r2, r2, #1 adds r2, r2, r0 ldrh r0, [r2] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #4 ldrb r2, [r5, #5] movs r1, #0xf @@ -538318,10 +538318,10 @@ sub_08106638: @ 0x08106638 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r6, _081066A0 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08106658 @@ -538335,7 +538335,7 @@ _08106658: strh r0, [r5, #0x2e] ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -538343,7 +538343,7 @@ _08106658: strh r0, [r5, #0x32] ldrb r0, [r6] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #6] @@ -538353,7 +538353,7 @@ _08106658: str r0, [r5, #0x1c] ldr r1, _081066AC adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r1, [r4, #0xa] ldrb r2, [r4, #0xc] adds r0, r5, #0 @@ -538365,7 +538365,7 @@ _08106658: _081066A0: .4byte gUnknown_20380D6 _081066A4: .4byte gUnknown_20380BE _081066A8: .4byte sub_080A67B4 -_081066AC: .4byte sub_080A34C4 +_081066AC: .4byte DestroyAnimSprite thumb_func_end sub_08106638 thumb_func_start sub_081066B0 @@ -538381,7 +538381,7 @@ sub_081066B0: @ 0x081066B0 bne _081066CA adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker _081066CA: movs r1, #0x30 ldrsh r0, [r4, r1] @@ -538404,7 +538404,7 @@ _081066CA: cmp r0, #0x3c bne _081066FA adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081066FA: pop {r4} pop {r0} @@ -538416,7 +538416,7 @@ sub_08106700: @ 0x08106700 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 movs r6, #0xf0 cmp r0, #0 @@ -538548,7 +538548,7 @@ sub_081067D4: @ 0x081067D4 bl sub_080A6E74 ldr r2, _08106824 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes b _0810685C .align 2, 0 _08106820: .4byte gUnknown_3005B60 @@ -538593,7 +538593,7 @@ sub_08106870: @ 0x08106870 lsrs r0, r0, #0x18 adds r6, r0, #0 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r1, _081068C0 @@ -538609,7 +538609,7 @@ sub_08106870: @ 0x08106870 cmp r0, #1 bne _081068CC movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -538638,7 +538638,7 @@ _081068CC: rsbs r0, r0, #0 strh r0, [r4, #0x24] adds r0, r5, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -538662,7 +538662,7 @@ sub_08106900: @ 0x08106900 lsrs r0, r0, #0x18 adds r6, r0, #0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r1, _08106950 @@ -538678,7 +538678,7 @@ sub_08106900: @ 0x08106900 cmp r0, #1 bne _0810695C movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -538707,7 +538707,7 @@ _0810695C: rsbs r0, r0, #0 strh r0, [r4, #0x24] adds r0, r5, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -538729,7 +538729,7 @@ sub_08106990: @ 0x08106990 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker movs r0, #0x5f strh r0, [r4, #0x2e] ldrh r0, [r4, #0x20] @@ -538737,7 +538737,7 @@ sub_08106990: @ 0x08106990 ldr r5, _081069D4 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -538745,12 +538745,12 @@ sub_08106990: @ 0x08106990 strh r0, [r4, #0x34] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _081069D8 str r0, [r4, #0x1c] pop {r4, r5} @@ -538784,7 +538784,7 @@ sub_081069DC: @ 0x081069DC b _08106A0C _08106A06: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08106A0C: pop {r4} pop {r0} @@ -538856,7 +538856,7 @@ _08106A86: cmp r0, #0x78 ble _08106A94 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08106A94: pop {r4} pop {r0} @@ -538879,7 +538879,7 @@ sub_08106A9C: @ 0x08106A9C ldr r1, _08106AC4 str r1, [r0, #0x1c] ldr r1, _08106AC8 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 @@ -538938,15 +538938,15 @@ sub_08106ACC: @ 0x08106ACC cmp r5, #0x40 bgt _08106B32 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08106B32: pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_08106ACC - thumb_func_start sub_08106B38 -sub_08106B38: @ 0x08106B38 + thumb_func_start AnimTask_HeartsBackground +AnimTask_HeartsBackground: @ 0x08106B38 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -538961,19 +538961,19 @@ sub_08106B38: @ 0x08106B38 movs r0, #1 movs r1, #4 movs r2, #3 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08106B7A movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _08106B7A: ldr r0, _08106BDC movs r1, #0 @@ -538993,7 +538993,7 @@ _08106B7A: ldr r1, _08106BE4 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r1, _08106BE8 mov r0, sp movs r2, #0 @@ -539003,7 +539003,7 @@ _08106B7A: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r1, _08106BF0 lsls r0, r5, #2 adds r0, r0, r5 @@ -539024,7 +539024,7 @@ _08106BE8: .4byte gUnknown_8C23E1C _08106BEC: .4byte gUnknown_8C23DF4 _08106BF0: .4byte gUnknown_3005B60 _08106BF4: .4byte sub_08106BF8 - thumb_func_end sub_08106B38 + thumb_func_end AnimTask_HeartsBackground thumb_func_start sub_08106BF8 sub_08106BF8: @ 0x08106BF8 @@ -539162,14 +539162,14 @@ _08106CE6: .align 2, 0 _08106D08: .4byte gUnknown_3005B60 _08106D0C: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08106D20 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _08106D20: movs r0, #0x50 movs r1, #0 @@ -539180,7 +539180,7 @@ _08106D20: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute adds r0, r4, #0 bl DestroyAnimVisualTask _08106D40: @@ -539206,19 +539206,19 @@ sub_08106D48: @ 0x08106D48 movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08106D8A movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _08106D8A: ldr r0, _08106DBC movs r1, #0 @@ -539233,7 +539233,7 @@ _08106D8A: bl SetGpuReg mov r0, sp bl sub_080A63F8 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08106DC8 @@ -539247,7 +539247,7 @@ _08106DC4: .4byte gUnknown_8D93914 _08106DC8: ldr r0, _08106DE4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -539272,13 +539272,13 @@ _08106DF6: ldr r1, _08106E2C mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _08106E30 mov r1, sp ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r1, _08106E34 lsls r0, r5, #2 adds r0, r0, r5 @@ -539432,14 +539432,14 @@ _08106F2A: adds r0, #1 strh r0, [r1, #0x20] _08106F4C: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08106F60 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _08106F60: movs r0, #0x50 movs r1, #0 @@ -539450,7 +539450,7 @@ _08106F60: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute adds r0, r4, #0 bl DestroyAnimVisualTask _08106F80: @@ -539462,20 +539462,20 @@ _08106F80: _08106F88: .4byte gUnknown_3005B60 thumb_func_end sub_08106E3C - thumb_func_start sub_08106F8C -sub_08106F8C: @ 0x08106F8C + thumb_func_start AnimOrbitFast +AnimOrbitFast: @ 0x08106F8C push {r4, r5, lr} adds r4, r0, #0 ldr r5, _08106FE0 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -539505,11 +539505,11 @@ sub_08106F8C: @ 0x08106F8C .align 2, 0 _08106FE0: .4byte gUnknown_20380D6 _08106FE4: .4byte gUnknown_20380BE -_08106FE8: .4byte sub_08106FEC - thumb_func_end sub_08106F8C +_08106FE8: .4byte AnimOrbitFastStep + thumb_func_end AnimOrbitFast - thumb_func_start sub_08106FEC -sub_08106FEC: @ 0x08106FEC + thumb_func_start AnimOrbitFastStep +AnimOrbitFastStep: @ 0x08106FEC push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x30] @@ -539610,7 +539610,7 @@ _081070A8: cmp r1, r0 bne _081070B8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081070B8: pop {r4} pop {r0} @@ -539618,7 +539618,7 @@ _081070B8: .align 2, 0 _081070C0: .4byte gUnknown_20380BE _081070C4: .4byte 0x0000FFFF - thumb_func_end sub_08106FEC + thumb_func_end AnimOrbitFastStep thumb_func_start sub_081070C8 sub_081070C8: @ 0x081070C8 @@ -539627,13 +539627,13 @@ sub_081070C8: @ 0x081070C8 ldr r4, _08107110 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -539656,11 +539656,11 @@ sub_081070C8: @ 0x081070C8 .align 2, 0 _08107110: .4byte gUnknown_20380D6 _08107114: .4byte gUnknown_20380BE -_08107118: .4byte sub_0810711C +_08107118: .4byte AnimOrbitScatterStep thumb_func_end sub_081070C8 - thumb_func_start sub_0810711C -sub_0810711C: @ 0x0810711C + thumb_func_start AnimOrbitScatterStep +AnimOrbitScatterStep: @ 0x0810711C push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x2e] @@ -539694,11 +539694,11 @@ sub_0810711C: @ 0x0810711C bge _08107160 _0810715A: adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107160: pop {r0} bx r0 - thumb_func_end sub_0810711C + thumb_func_end AnimOrbitScatterStep thumb_func_start sub_08107164 sub_08107164: @ 0x08107164 @@ -539722,7 +539722,7 @@ sub_08107164: @ 0x08107164 cmp r0, r1 blt _08107190 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107190: pop {r0} bx r0 @@ -539735,13 +539735,13 @@ sub_08107194: @ 0x08107194 ldr r4, _081071E0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -539780,7 +539780,7 @@ sub_081071EC: @ 0x081071EC cmp r0, #0 beq _08107202 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107202: pop {r0} bx r0 @@ -539792,7 +539792,7 @@ sub_08107208: @ 0x08107208 push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0810721C str r0, [r4, #0x1c] pop {r4} @@ -539872,7 +539872,7 @@ _081072A0: cmp r2, #0x64 ble _081072AA adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081072AA: pop {r4, r5} pop {r0} @@ -539931,7 +539931,7 @@ _0810730A: cmp r0, #0x1e ble _08107318 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107318: pop {r4} pop {r0} @@ -540154,7 +540154,7 @@ _081074BA: cmp r0, #0x5a ble _081074C8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081074C8: pop {r4} pop {r0} @@ -540197,7 +540197,7 @@ _08107504: cmp r0, #0 beq _08107518 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107518: pop {r4} pop {r0} @@ -540215,7 +540215,7 @@ sub_08107520: @ 0x08107520 cmp r0, #0 bne _0810753C adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _081075A0 .align 2, 0 _08107538: .4byte gUnknown_20380BE @@ -540233,13 +540233,13 @@ _0810754C: _0810754E: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -540302,7 +540302,7 @@ sub_081075AC: @ 0x081075AC b _081075DC _081075D6: adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081075DC: pop {r0} bx r0 @@ -540316,7 +540316,7 @@ sub_081075E0: @ 0x081075E0 lsrs r5, r5, #0x18 ldr r0, _08107614 ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -540350,7 +540350,7 @@ sub_08107624: @ 0x08107624 lsls r0, r0, #3 ldr r1, _0810764C adds r0, r0, r1 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _08107644 @@ -540383,7 +540383,7 @@ _0810766C: _0810766E: ldrb r6, [r0] adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -540396,7 +540396,7 @@ _0810766E: _08107688: adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r7, _08107708 lsrs r0, r0, #0x18 @@ -540406,7 +540406,7 @@ _08107688: strh r0, [r5, #0x20] adds r0, r6, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r7, #4] @@ -540489,7 +540489,7 @@ sub_08107718: @ 0x08107718 cmp r0, #0x10 ble _0810774C adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810774C: pop {r0} bx r0 @@ -540528,7 +540528,7 @@ _08107772: lsrs r0, r0, #4 adds r0, #0x10 movs r1, #0 - bl sub_080A6DD4 + bl SetGreyscaleOrOriginalPalette _08107790: movs r0, #0x2e ldrsh r1, [r4, r0] @@ -540538,7 +540538,7 @@ _08107790: cmp r1, r0 bne _081077A4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081077A4: pop {r4} pop {r0} @@ -540707,14 +540707,14 @@ _081078B6: orrs r0, r1 strb r0, [r3] adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081078E8: movs r1, #0x36 ldrsh r0, [r4, r1] cmp r0, #4 bne _081078F6 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081078F6: pop {r4} pop {r0} @@ -540735,7 +540735,7 @@ sub_081078FC: @ 0x081078FC ldrb r1, [r4] movs r0, #2 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08107948 @@ -540760,13 +540760,13 @@ _08107948: ldr r4, _08107988 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x28 @@ -540783,18 +540783,18 @@ _08107968: str r0, [r5, #0x1c] ldr r1, _08107990 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08107988: .4byte gUnknown_20380D6 _0810798C: .4byte sub_080A67B4 -_08107990: .4byte sub_080A34C4 +_08107990: .4byte DestroyAnimSprite thumb_func_end sub_081078FC - thumb_func_start sub_08107994 -sub_08107994: @ 0x08107994 + thumb_func_start AnimTask_IsFuryCutterHitRight +AnimTask_IsFuryCutterHitRight: @ 0x08107994 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -540811,10 +540811,10 @@ sub_08107994: @ 0x08107994 .align 2, 0 _081079B0: .4byte gUnknown_20380BE _081079B4: .4byte gUnknown_20380A0 - thumb_func_end sub_08107994 + thumb_func_end AnimTask_IsFuryCutterHitRight - thumb_func_start sub_081079B8 -sub_081079B8: @ 0x081079B8 + thumb_func_start AnimTask_GetFuryCutterHitCount +AnimTask_GetFuryCutterHitCount: @ 0x081079B8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -540829,10 +540829,10 @@ sub_081079B8: @ 0x081079B8 .align 2, 0 _081079D0: .4byte gUnknown_20380BE _081079D4: .4byte gUnknown_20380A0 - thumb_func_end sub_081079B8 + thumb_func_end AnimTask_GetFuryCutterHitCount - thumb_func_start sub_081079D8 -sub_081079D8: @ 0x081079D8 + thumb_func_start AnimTask_CreateRaindrops +AnimTask_CreateRaindrops: @ 0x081079D8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -540883,7 +540883,7 @@ _08107A00: ldr r0, _08107A68 adds r1, r4, #0 movs r3, #4 - bl sub_08006B0C + bl CreateSprite _08107A48: movs r0, #8 ldrsh r1, [r5, r0] @@ -540901,7 +540901,7 @@ _08107A5A: _08107A60: .4byte gUnknown_3005B60 _08107A64: .4byte gUnknown_20380BE _08107A68: .4byte gUnknown_8570C04 - thumb_func_end sub_081079D8 + thumb_func_end AnimTask_CreateRaindrops thumb_func_start sub_08107A6C sub_08107A6C: @ 0x08107A6C @@ -540951,13 +540951,13 @@ sub_08107AB0: @ 0x08107AB0 adds r6, r0, #0 ldr r5, _08107AD8 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08107AE0 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _08107ADC @@ -540970,7 +540970,7 @@ _08107ADC: .4byte gUnknown_20380BE _08107AE0: ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _08107BB8 lsrs r0, r0, #0x18 @@ -540980,7 +540980,7 @@ _08107AF2: strh r0, [r6, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #2] @@ -540994,7 +540994,7 @@ _08107AF2: strb r0, [r2] ldr r0, _08107BBC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08107B28 @@ -541011,7 +541011,7 @@ _08107B28: ldr r4, _08107BC0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x32] @@ -541019,14 +541019,14 @@ _08107B28: strh r0, [r6, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x36] adds r0, r6, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _08107BC4 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -541159,7 +541159,7 @@ sub_08107C58: @ 0x08107C58 ldr r1, _08107C78 str r1, [r0, #0x1c] ldr r1, _08107C7C - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 @@ -541175,12 +541175,12 @@ sub_08107C80: @ 0x08107C80 ldr r1, _08107C94 str r1, [r0, #0x1c] ldr r1, _08107C98 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 _08107C94: .4byte WaitAnimForDuration -_08107C98: .4byte sub_080A6014 +_08107C98: .4byte DestroySpriteAndMatrix thumb_func_end sub_08107C80 thumb_func_start sub_08107C9C @@ -541188,10 +541188,10 @@ sub_08107C9C: @ 0x08107C9C push {r4, r5, r6, r7, lr} adds r5, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _08107CC4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08107CCC @@ -541217,7 +541217,7 @@ _08107CD2: ldr r4, _08107D2C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r6 @@ -541226,14 +541226,14 @@ _08107CD2: strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r7, [r7, #6] adds r0, r0, r7 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _08107D30 str r0, [r5, #0x1c] adds r2, r5, #0 @@ -541279,7 +541279,7 @@ _08107D56: cmp r0, #0 beq _08107D68 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107D68: pop {r4} pop {r0} @@ -541303,7 +541303,7 @@ sub_08107D78: @ 0x08107D78 ldrh r0, [r0] strh r0, [r4, #8] ldr r0, _08107DB4 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 movs r1, #0x80 @@ -541396,7 +541396,7 @@ sub_08107E3C: @ 0x08107E3C push {r4, r5, lr} adds r5, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker movs r0, #0x1e strh r0, [r5, #0x2e] ldrh r0, [r5, #0x20] @@ -541404,7 +541404,7 @@ sub_08107E3C: @ 0x08107E3C ldr r4, _08107EA4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -541412,12 +541412,12 @@ sub_08107E3C: @ 0x08107E3C strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation movs r0, #0x2e ldrsh r1, [r5, r0] movs r0, #0xd2 @@ -541466,7 +541466,7 @@ sub_08107EC4: @ 0x08107EC4 cmp r0, #0 beq _08107ED8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08107ED8: ldrh r0, [r4, #0x3a] lsls r0, r0, #0x10 @@ -541565,13 +541565,13 @@ sub_08107F80: @ 0x08107F80 ldr r7, _08107FCC ldrb r0, [r7] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r7] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -541581,12 +541581,12 @@ sub_08107F80: @ 0x08107F80 bl GetBattlerSpriteSubpriority lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08107FDA ldrb r0, [r7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08107FD4 @@ -541628,7 +541628,7 @@ sub_08107FF4: @ 0x08107FF4 cmp r0, #0 beq _0810800A adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810800A: pop {r0} bx r0 @@ -541641,11 +541641,11 @@ sub_08108010: @ 0x08108010 adds r6, r0, #0 ldr r5, _081080D0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r0, _081080D4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -541690,10 +541690,10 @@ _0810806E: movs r7, #3 _08108078: adds r0, r6, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _081080D0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08108092 @@ -541706,7 +541706,7 @@ _08108092: ldr r4, _081080D4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r5, #4] @@ -541714,7 +541714,7 @@ _08108092: strh r0, [r6, #0x32] ldrb r0, [r4] adds r1, r7, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r5, [r5, #6] @@ -541724,7 +541724,7 @@ _08108092: str r0, [r6, #0x1c] ldr r1, _081080E0 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -541733,7 +541733,7 @@ _081080D0: .4byte gUnknown_20380D6 _081080D4: .4byte gUnknown_20380D7 _081080D8: .4byte gUnknown_20380BE _081080DC: .4byte sub_080A67B4 -_081080E0: .4byte sub_080A34C4 +_081080E0: .4byte DestroyAnimSprite thumb_func_end sub_08108010 thumb_func_start sub_081080E4 @@ -541756,14 +541756,14 @@ sub_081080E4: @ 0x081080E4 str r0, [r4, #0x1c] ldr r1, _0810811C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _08108114: .4byte gUnknown_20380BE _08108118: .4byte sub_080A67B4 -_0810811C: .4byte sub_080A34C4 +_0810811C: .4byte DestroyAnimSprite thumb_func_end sub_081080E4 thumb_func_start sub_08108120 @@ -541784,7 +541784,7 @@ _08108138: .4byte gUnknown_20380BE _0810813C: adds r0, r4, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker _08108144: ldr r0, _08108154 ldrh r0, [r0, #4] @@ -541830,7 +541830,7 @@ sub_0810815C: @ 0x0810815C cmp r0, r1 bne _0810819C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810819C: pop {r4} pop {r0} @@ -541838,8 +541838,8 @@ _0810819C: .align 2, 0 thumb_func_end sub_0810815C - thumb_func_start sub_081081A4 -sub_081081A4: @ 0x081081A4 + thumb_func_start AnimTask_CreateSurfWave +AnimTask_CreateSurfWave: @ 0x081081A4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -541859,24 +541859,24 @@ sub_081081A4: @ 0x081081A4 movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute mov r0, sp bl sub_080A63F8 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08108230 movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _08108218 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -541884,7 +541884,7 @@ sub_081081A4: @ 0x081081A4 mov r0, sp ldrb r0, [r0, #9] ldr r1, _0810821C - bl sub_080A6610 + bl AnimLoadCompressedBgTilemap b _0810823A .align 2, 0 _08108214: .4byte 0x00003F42 @@ -541894,7 +541894,7 @@ _08108220: mov r0, sp ldrb r0, [r0, #9] ldr r1, _0810822C - bl sub_080A6610 + bl AnimLoadCompressedBgTilemap b _0810823A .align 2, 0 _0810822C: .4byte gUnknown_8D96084 @@ -541909,7 +541909,7 @@ _0810823A: ldr r1, _08108268 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _0810826C movs r1, #0 ldrsh r0, [r0, r1] @@ -541920,7 +541920,7 @@ _0810823A: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _08108282 .align 2, 0 _08108264: .4byte gUnknown_8D96358 @@ -541933,7 +541933,7 @@ _08108274: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette _08108282: ldr r0, _081082F0 ldr r4, _081082F4 @@ -541946,7 +541946,7 @@ _08108282: adds r1, #1 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -541965,7 +541965,7 @@ _08108282: lsls r0, r0, #5 strh r0, [r7, #0xa] strh r0, [r7, #0xc] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -541995,7 +541995,7 @@ _08108300: .4byte gUnknown_2022ACE _08108304: ldr r0, _08108334 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #1 @@ -542087,7 +542087,7 @@ _081083A8: .align 2, 0 _081083CC: .4byte gUnknown_3005B60 _081083D0: .4byte sub_081083D4 - thumb_func_end sub_081081A4 + thumb_func_end AnimTask_CreateSurfWave thumb_func_start sub_081083D4 sub_081083D4: @ 0x081083D4 @@ -542286,14 +542286,14 @@ _0810854C: .4byte gUnknown_2022ACC _08108550: .4byte gUnknown_2022ACE _08108554: .4byte gUnknown_3005B60 _08108558: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810856C movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _0810856C: movs r0, #0 strh r0, [r7] @@ -542495,7 +542495,7 @@ _081086CA: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -542699,9 +542699,9 @@ _0810885C: rsbs r0, r0, #0 cmp r1, r0 bne _08108872 - bl sub_080B9710 + bl ScanlineEffect_Stop adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask _08108872: add sp, #0xc pop {r4, r5, r6, r7} @@ -542798,7 +542798,7 @@ _08108910: cmp r0, #0x15 bne _0810892E adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810892E: pop {r4} pop {r0} @@ -542816,7 +542816,7 @@ sub_08108934: @ 0x08108934 ldr r0, _08108984 adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -542837,7 +542837,7 @@ sub_08108934: @ 0x08108934 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r0, _0810898C str r0, [r4] pop {r4} @@ -542962,7 +542962,7 @@ _08108A72: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale ldr r2, _08108A90 movs r0, #0x26 ldrsh r1, [r4, r0] @@ -543106,7 +543106,7 @@ _08108B70: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale movs r0, #0x26 ldrsh r1, [r4, r0] lsls r0, r1, #4 @@ -543144,7 +543144,7 @@ sub_08108BD4: @ 0x08108BD4 push {r4, r5, lr} ldr r4, _08108BF8 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08108C08 @@ -543177,12 +543177,12 @@ _08108C18: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r3, r0, #0x10 lsrs r4, r4, #0x12 @@ -543222,13 +543222,13 @@ sub_08108C58: @ 0x08108C58 ldr r4, _08108D60 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r5, #0xac @@ -543265,7 +543265,7 @@ _08108CC2: mov r1, sl mov r2, sb ldr r3, [sp, #8] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r6, r5, #0x10 @@ -543451,7 +543451,7 @@ sub_08108E18: @ 0x08108E18 strh r0, [r4, #0xa] ldr r0, _08108E4C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08108E50 @@ -543540,7 +543540,7 @@ _08108EBA: ldr r6, _08108F4C adds r0, r6, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -543561,7 +543561,7 @@ _08108F04: strh r0, [r5] adds r0, r6, #0 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -543634,7 +543634,7 @@ sub_08108F6C: @ 0x08108F6C ldrsh r1, [r4, r2] movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -543721,7 +543721,7 @@ sub_08109010: @ 0x08109010 movs r3, #0x22 ldrsh r2, [r5, r3] movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x30] @@ -543850,19 +543850,19 @@ sub_08109134: @ 0x08109134 ldr r4, _081091BC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r6, #0 strh r0, [r5, #0xe] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x10] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r2, #1 rsbs r2, r2, #0 @@ -543872,7 +543872,7 @@ sub_08109134: @ 0x08109134 movs r1, #1 _08109178: strh r1, [r5, #0x16] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810918C @@ -544094,7 +544094,7 @@ sub_08109310: @ 0x08109310 movs r3, #0x10 ldrsh r2, [r6, r3] movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -544112,7 +544112,7 @@ sub_08109310: @ 0x08109310 strh r1, [r0, #0x36] ldrh r1, [r6, #0x1a] strh r1, [r0, #0x38] - bl sub_080A619C + bl InitAnimArcTranslation adds r5, #0x1c adds r4, r4, r5 ldr r0, _08109378 @@ -544134,7 +544134,7 @@ _08109378: .4byte sub_0810937C sub_0810937C: @ 0x0810937C push {r4, r5, r6, lr} adds r6, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _081093D6 @@ -544169,7 +544169,7 @@ sub_0810937C: @ 0x0810937C mvns r1, r1 strh r1, [r6, #0x38] adds r0, r6, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _081093E0 str r0, [r6, #0x1c] _081093D6: @@ -544185,7 +544185,7 @@ _081093E0: .4byte sub_081093E4 sub_081093E4: @ 0x081093E4 push {r4, r5, r6, lr} adds r5, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08109420 @@ -544277,7 +544277,7 @@ sub_08109458: @ 0x08109458 cmp r0, #0 bne _0810949C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810949C: pop {r4} pop {r0} @@ -544325,17 +544325,17 @@ sub_081094E4: @ 0x081094E4 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r5, _08109520 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x30] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -544406,7 +544406,7 @@ _08109584: cmp r1, r0 bne _08109596 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08109596: ldrh r0, [r4, #0x2e] adds r0, #1 @@ -544493,7 +544493,7 @@ _08109632: mov r3, sl asrs r2, r3, #0x10 movs r3, #0x82 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _08109678 @@ -544551,7 +544551,7 @@ _081096A8: mov r3, sl asrs r2, r3, #0x10 movs r3, #0x82 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _081096F0 @@ -544618,7 +544618,7 @@ sub_08109718: @ 0x08109718 strh r0, [r4, #0x36] ldr r1, _08109750 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _08109754 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -544628,8 +544628,8 @@ sub_08109718: @ 0x08109718 bx r0 .align 2, 0 _0810974C: .4byte gUnknown_20380BE -_08109750: .4byte sub_080A34C4 -_08109754: .4byte sub_080A5C14 +_08109750: .4byte DestroyAnimSprite +_08109754: .4byte TranslateSpriteInGrowingCircleOverDuration thumb_func_end sub_08109718 thumb_func_start sub_08109758 @@ -544640,7 +544640,7 @@ sub_08109758: @ 0x08109758 movs r0, #0 ldrsh r1, [r5, r0] adds r0, r4, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r5, #2] ldrh r1, [r4, #0x22] adds r0, r0, r1 @@ -544655,14 +544655,14 @@ sub_08109758: @ 0x08109758 str r0, [r4, #0x1c] ldr r1, _08109798 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08109790: .4byte gUnknown_20380BE _08109794: .4byte TranslateSpriteLinearFixedPoint -_08109798: .4byte sub_080A34C4 +_08109798: .4byte DestroyAnimSprite thumb_func_end sub_08109758 thumb_func_start sub_0810979C @@ -544672,7 +544672,7 @@ sub_0810979C: @ 0x0810979C bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _081097D0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081097D8 @@ -544728,7 +544728,7 @@ sub_0810980C: @ 0x0810980C adds r4, r0, #0 ldr r0, _08109838 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08109840 @@ -544807,7 +544807,7 @@ _0810989E: cmp r1, r0 bne _081098B0 adds r0, r2, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _081098B0: pop {r0} bx r0 @@ -544820,7 +544820,7 @@ sub_081098B4: @ 0x081098B4 bl SetSpriteCoordsToAnimAttackerCoords ldr r0, _081098D8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081098E0 @@ -544943,7 +544943,7 @@ _081099A8: b _081099B6 _081099B0: adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _081099B6: pop {r4} pop {r0} @@ -544965,25 +544965,25 @@ sub_081099BC: @ 0x081099BC ldr r1, _081099E0 str r1, [r0, #0x1c] ldr r1, _081099E4 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 _081099E0: .4byte sub_080A67B4 -_081099E4: .4byte sub_080A34C4 +_081099E4: .4byte DestroyAnimSprite thumb_func_end sub_081099BC - thumb_func_start sub_081099E8 -sub_081099E8: @ 0x081099E8 + thumb_func_start AnimEmberFlare +AnimEmberFlare: @ 0x081099E8 push {r4, r5, r6, lr} adds r6, r0, #0 ldr r5, _08109A40 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r0, _08109A44 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -545020,7 +545020,7 @@ _08109A40: .4byte gUnknown_20380D6 _08109A44: .4byte gUnknown_20380D7 _08109A48: .4byte gUnknown_20380BE _08109A4C: .4byte sub_080A7200 - thumb_func_end sub_081099E8 + thumb_func_end AnimEmberFlare thumb_func_start sub_08109A50 sub_08109A50: @ 0x08109A50 @@ -545039,12 +545039,12 @@ _08109A64: .4byte gUnknown_20380BE _08109A68: .4byte sub_080A7200 thumb_func_end sub_08109A50 - thumb_func_start sub_08109A6C -sub_08109A6C: @ 0x08109A6C + thumb_func_start AnimFireRing +AnimFireRing: @ 0x08109A6C push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _08109A8C ldrh r0, [r0, #4] movs r1, #0 @@ -545057,14 +545057,14 @@ sub_08109A6C: @ 0x08109A6C bx r0 .align 2, 0 _08109A8C: .4byte gUnknown_20380BE -_08109A90: .4byte sub_08109A94 - thumb_func_end sub_08109A6C +_08109A90: .4byte AnimFireRingStep1 + thumb_func_end AnimFireRing - thumb_func_start sub_08109A94 -sub_08109A94: @ 0x08109A94 + thumb_func_start AnimFireRingStep1 +AnimFireRingStep1: @ 0x08109A94 push {r4, r5, lr} adds r5, r0, #0 - bl sub_08109B88 + bl UpdateFireRingCircleOffset ldrh r0, [r5, #0x2e] adds r0, #1 strh r0, [r5, #0x2e] @@ -545079,7 +545079,7 @@ sub_08109A94: @ 0x08109A94 ldr r4, _08109AE4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -545087,12 +545087,12 @@ sub_08109A94: @ 0x08109A94 strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _08109AE8 str r0, [r5, #0x1c] _08109ADE: @@ -545101,11 +545101,11 @@ _08109ADE: bx r0 .align 2, 0 _08109AE4: .4byte gUnknown_20380D7 -_08109AE8: .4byte sub_08109AEC - thumb_func_end sub_08109A94 +_08109AE8: .4byte AnimFireRingStep2 + thumb_func_end AnimFireRingStep1 - thumb_func_start sub_08109AEC -sub_08109AEC: @ 0x08109AEC + thumb_func_start AnimFireRingStep2 +AnimFireRingStep2: @ 0x08109AEC push {r4, r5, r6, lr} adds r6, r0, #0 bl AnimTranslateLinear @@ -545117,13 +545117,13 @@ sub_08109AEC: @ 0x08109AEC ldr r5, _08109B2C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x22] @@ -545136,7 +545136,7 @@ sub_08109AEC: @ 0x08109AEC b _08109B5E .align 2, 0 _08109B2C: .4byte gUnknown_20380D7 -_08109B30: .4byte sub_08109B64 +_08109B30: .4byte AnimFireRingStep3 _08109B34: movs r1, #0x3c ldrsh r0, [r6, r1] @@ -545161,13 +545161,13 @@ _08109B5E: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08109AEC + thumb_func_end AnimFireRingStep2 - thumb_func_start sub_08109B64 -sub_08109B64: @ 0x08109B64 + thumb_func_start AnimFireRingStep3 +AnimFireRingStep3: @ 0x08109B64 push {r4, lr} adds r4, r0, #0 - bl sub_08109B88 + bl UpdateFireRingCircleOffset ldrh r0, [r4, #0x2e] adds r0, #1 strh r0, [r4, #0x2e] @@ -545176,16 +545176,16 @@ sub_08109B64: @ 0x08109B64 cmp r0, #0x1f bne _08109B80 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08109B80: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08109B64 + thumb_func_end AnimFireRingStep3 - thumb_func_start sub_08109B88 -sub_08109B88: @ 0x08109B88 + thumb_func_start UpdateFireRingCircleOffset +UpdateFireRingCircleOffset: @ 0x08109B88 push {r4, lr} adds r4, r0, #0 movs r1, #0x3c @@ -545206,10 +545206,10 @@ sub_08109B88: @ 0x08109B88 pop {r4} pop {r0} bx r0 - thumb_func_end sub_08109B88 + thumb_func_end UpdateFireRingCircleOffset - thumb_func_start sub_08109BB4 -sub_08109BB4: @ 0x08109BB4 + thumb_func_start AnimFireCross +AnimFireCross: @ 0x08109BB4 push {r4, lr} adds r4, r0, #0 ldr r1, _08109BE8 @@ -545229,7 +545229,7 @@ sub_08109BB4: @ 0x08109BB4 strh r0, [r4, #0x32] ldr r1, _08109BEC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08109BF0 str r0, [r4, #0x1c] pop {r4} @@ -545237,16 +545237,16 @@ sub_08109BB4: @ 0x08109BB4 bx r0 .align 2, 0 _08109BE8: .4byte gUnknown_20380BE -_08109BEC: .4byte sub_080A34C4 +_08109BEC: .4byte DestroyAnimSprite _08109BF0: .4byte TranslateSpriteLinear - thumb_func_end sub_08109BB4 + thumb_func_end AnimFireCross thumb_func_start sub_08109BF4 sub_08109BF4: @ 0x08109BF4 push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r1, _08109C28 ldrh r0, [r1, #4] strh r0, [r4, #0x30] @@ -545262,7 +545262,7 @@ sub_08109BF4: @ 0x08109BF4 str r0, [r4, #0x1c] ldr r1, _08109C30 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 @@ -545331,7 +545331,7 @@ sub_08109C5C: @ 0x08109C5C cmp r0, r1 bne _08109CA8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08109CA8: pop {r4} pop {r0} @@ -545350,7 +545350,7 @@ sub_08109CB0: @ 0x08109CB0 ldr r0, _08109D10 adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 @@ -545370,7 +545370,7 @@ sub_08109CB0: @ 0x08109CB0 strh r0, [r4, #0x10] ldr r0, _08109D18 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x12] @@ -545379,7 +545379,7 @@ sub_08109CB0: @ 0x08109CB0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r0, _08109D1C str r0, [r4] pop {r4, r5} @@ -545519,7 +545519,7 @@ _08109E18: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale ldr r2, _08109E3C movs r0, #0x26 ldrsh r1, [r4, r0] @@ -545743,7 +545743,7 @@ _08109FB4: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale strh r5, [r4, #0xc] _08109FE0: ldrh r0, [r4, #8] @@ -545796,7 +545796,7 @@ sub_0810A004: @ 0x0810A004 ldrh r4, [r0, #0x20] ldr r0, _0810A058 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810A05C @@ -545838,7 +545838,7 @@ _0810A084: ldr r3, [sp, #4] asrs r2, r3, #0x10 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -545978,7 +545978,7 @@ sub_0810A180: @ 0x0810A180 lsrs r4, r0, #0x10 ldr r0, _0810A1BC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810A1C0 @@ -546206,7 +546206,7 @@ _0810A330: cmp r0, #0x10 ble _0810A344 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810A344: pop {r4} pop {r0} @@ -546234,7 +546234,7 @@ _0810A362: _0810A368: adds r0, r5, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r4, _0810A390 ldrb r1, [r4, #4] adds r0, r5, #0 @@ -546243,7 +546243,7 @@ _0810A368: strh r0, [r5, #0x3c] ldr r0, _0810A394 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810A398 @@ -546258,7 +546258,7 @@ _0810A39A: strh r0, [r5, #0x36] ldr r0, _0810A3BC ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -546278,7 +546278,7 @@ _0810A3C0: strh r0, [r5, #0x30] ldr r0, _0810A3E0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810A3E4 @@ -546357,7 +546357,7 @@ _0810A41E: ldr r4, _0810A494 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -546365,7 +546365,7 @@ _0810A41E: strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -546421,13 +546421,13 @@ _0810A4D2: movs r1, #0 ldrsb r1, [r0, r1] movs r0, #0x90 - bl sub_080A307C + bl PlaySE12WithPanning b _0810A4FA .align 2, 0 _0810A4F0: .4byte gUnknown_20380E0 _0810A4F4: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810A4FA: pop {r4} pop {r0} @@ -546476,7 +546476,7 @@ _0810A518: movs r1, #0xff ands r0, r1 strh r0, [r4, #0x30] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810A5B4 @@ -546488,7 +546488,7 @@ _0810A518: bls _0810A58C ldr r0, _0810A588 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -546505,7 +546505,7 @@ _0810A588: .4byte gUnknown_20380D7 _0810A58C: ldr r0, _0810A5B0 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -546565,7 +546565,7 @@ _0810A5F8: cmp r0, #0x1e bne _0810A606 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810A606: pop {r4} pop {r0} @@ -546584,7 +546584,7 @@ sub_0810A60C: @ 0x0810A60C adds r4, r1, r0 ldr r0, _0810A670 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r2, #1 rsbs r2, r2, #0 @@ -546598,18 +546598,18 @@ _0810A632: ldrb r1, [r0] movs r0, #2 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 strh r0, [r4, #0x22] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x24] movs r0, #3 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -546930,8 +546930,8 @@ _0810A8A4: _0810A8AC: .4byte gUnknown_20205AC thumb_func_end sub_0810A67C - thumb_func_start sub_0810A8B0 -sub_0810A8B0: @ 0x0810A8B0 + thumb_func_start AnimTask_BlendBackground +AnimTask_BlendBackground: @ 0x0810A8B0 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -546955,7 +546955,7 @@ sub_0810A8B0: @ 0x0810A8B0 bx r0 .align 2, 0 _0810A8E0: .4byte gUnknown_20380BE - thumb_func_end sub_0810A8B0 + thumb_func_end AnimTask_BlendBackground thumb_func_start sub_0810A8E4 sub_0810A8E4: @ 0x0810A8E4 @@ -547102,7 +547102,7 @@ sub_0810A9F8: @ 0x0810A9F8 adds r4, r0, #0 ldr r0, _0810AA18 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810AA20 @@ -547148,7 +547148,7 @@ sub_0810AA48: @ 0x0810AA48 cmp r0, #0 beq _0810AA5E adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810AA5E: pop {r0} bx r0 @@ -547161,7 +547161,7 @@ sub_0810AA64: @ 0x0810AA64 adds r4, r0, #0 ldr r0, _0810AA84 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810AA8C @@ -547202,7 +547202,7 @@ sub_0810AAA8: @ 0x0810AAA8 cmp r0, #0 beq _0810AABE adds r0, r2, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810AABE: pop {r0} bx r0 @@ -547216,19 +547216,19 @@ sub_0810AAC4: @ 0x0810AAC4 ldr r4, _0810AB08 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldr r0, _0810AB0C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810AB14 @@ -547268,7 +547268,7 @@ _0810AB28: strh r0, [r5, #0x34] ldr r1, _0810AB50 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810AB54 str r0, [r5, #0x1c] pop {r4, r5} @@ -547276,8 +547276,8 @@ _0810AB28: bx r0 .align 2, 0 _0810AB4C: .4byte gUnknown_20380BE -_0810AB50: .4byte sub_080A6014 -_0810AB54: .4byte sub_080A5BB4 +_0810AB50: .4byte DestroySpriteAndMatrix +_0810AB54: .4byte TranslateSpriteInCircleOverDuration thumb_func_end sub_0810AAC4 thumb_func_start sub_0810AB58 @@ -547312,7 +547312,7 @@ _0810AB88: ldrb r0, [r4] movs r6, #2 eors r0, r6 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _0810ABA4 @@ -547330,7 +547330,7 @@ _0810ABAC: ldrb r0, [r0] movs r4, #2 eors r0, r4 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810ABD0 @@ -547353,7 +547353,7 @@ _0810ABD4: bne _0810ABFC adds r0, r4, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] @@ -547366,14 +547366,14 @@ _0810ABF8: .4byte gUnknown_20380BE _0810ABFC: adds r0, r4, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] adds r0, r4, #0 movs r1, #3 _0810AC0E: - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -547408,7 +547408,7 @@ _0810AC0E: cmp r0, #0 beq _0810AC72 adds r0, r4, #0 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -547463,7 +547463,7 @@ sub_0810ACBC: @ 0x0810ACBC push {r4, r5, r6, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r5, _0810AD30 ldrh r0, [r5, #6] strh r0, [r4, #0x2e] @@ -547472,7 +547472,7 @@ sub_0810ACBC: @ 0x0810ACBC ldr r6, _0810AD34 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -547480,12 +547480,12 @@ sub_0810ACBC: @ 0x0810ACBC strh r0, [r4, #0x34] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldrh r0, [r5, #4] strh r0, [r4, #0x38] ldrh r0, [r5, #0xa] @@ -547574,7 +547574,7 @@ sub_0810AD44: @ 0x0810AD44 b _0810ADB4 _0810ADAE: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810ADB4: pop {r4} pop {r0} @@ -547620,7 +547620,7 @@ _0810ADF4: cmp r0, #0 bgt _0810AE06 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810AE06: pop {r0} bx r0 @@ -547631,13 +547631,13 @@ _0810AE06: sub_0810AE0C: @ 0x0810AE0C push {r4, r5, r6, lr} adds r6, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810AE28 ldr r0, _0810AE6C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810AE30 @@ -547650,7 +547650,7 @@ _0810AE30: ldr r5, _0810AE6C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0810AE70 lsrs r0, r0, #0x18 @@ -547659,7 +547659,7 @@ _0810AE30: strh r0, [r6, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -547704,12 +547704,12 @@ _0810AE9C: ldr r0, _0810AF24 _0810AE9E: ldrb r6, [r0] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810AEB6 adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810AEBE @@ -547721,7 +547721,7 @@ _0810AEB6: _0810AEBE: adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0810AF28 lsrs r0, r0, #0x18 @@ -547730,7 +547730,7 @@ _0810AEBE: strh r0, [r5, #0x20] adds r0, r6, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -547826,7 +547826,7 @@ _0810AF92: cmp r0, #0 bgt _0810AFA4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810AFA4: pop {r4} pop {r0} @@ -547888,14 +547888,14 @@ _0810B006: str r0, [r4, #0x1c] ldr r1, _0810B028 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0810B020: .4byte gUnknown_20380BE _0810B024: .4byte WaitAnimForDuration -_0810B028: .4byte sub_080A34C4 +_0810B028: .4byte DestroyAnimSprite thumb_func_end sub_0810AFAC thumb_func_start sub_0810B02C @@ -547907,7 +547907,7 @@ sub_0810B02C: @ 0x0810B02C ldr r6, _0810B074 ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord ldr r1, _0810B078 lsls r4, r5, #2 adds r4, r4, r5 @@ -547921,7 +547921,7 @@ sub_0810B02C: @ 0x0810B02C strh r0, [r4, #8] ldrb r0, [r6] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r5, #2] @@ -548087,7 +548087,7 @@ _0810B1A2: lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r7, #1 @@ -548219,7 +548219,7 @@ sub_0810B27C: @ 0x0810B27C adds r3, r4, #0 adds r3, #0x43 ldrb r3, [r3] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _0810B2EC @@ -548297,7 +548297,7 @@ _0810B334: cmp r0, #0x33 bne _0810B348 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810B348: pop {r0} bx r0 @@ -548329,13 +548329,13 @@ _0810B378: _0810B37A: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x24] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x26] @@ -548395,7 +548395,7 @@ sub_0810B3C8: @ 0x0810B3C8 movs r3, #0x26 ldrsh r2, [r5, r3] movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -548440,10 +548440,10 @@ sub_0810B3C8: @ 0x0810B3C8 strh r0, [r4, #0x36] strh r6, [r4, #0x38] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r1, _0810B4C0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810B4C4 str r0, [r4, #0x1c] ldrh r0, [r5, #0x1a] @@ -548562,19 +548562,19 @@ _0810B544: _0810B546: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldr r1, _0810B578 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810B57C str r0, [r5, #0x1c] pop {r4, r5} @@ -548582,7 +548582,7 @@ _0810B546: bx r0 .align 2, 0 _0810B574: .4byte gUnknown_20380D7 -_0810B578: .4byte sub_080A6014 +_0810B578: .4byte DestroySpriteAndMatrix _0810B57C: .4byte RunStoredCallbackWhenAffineAnimEnds thumb_func_end sub_0810B528 @@ -548605,13 +548605,13 @@ _0810B59C: _0810B59E: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -548622,7 +548622,7 @@ _0810B59E: strh r0, [r5, #0x26] ldr r1, _0810B5E0 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810B5E4 str r0, [r5, #0x1c] pop {r4, r5} @@ -548631,7 +548631,7 @@ _0810B59E: .align 2, 0 _0810B5D8: .4byte gUnknown_20380D7 _0810B5DC: .4byte gUnknown_20380BE -_0810B5E0: .4byte sub_080A34C4 +_0810B5E0: .4byte DestroyAnimSprite _0810B5E4: .4byte RunStoredCallbackWhenAnimEnds thumb_func_end sub_0810B580 @@ -548644,25 +548644,25 @@ sub_0810B5E8: @ 0x0810B5E8 ldr r4, _0810B640 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x3a] movs r0, #0x10 strh r0, [r5, #0x3c] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -548728,7 +548728,7 @@ _0810B670: cmp r0, r1 bls _0810B6A0 adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810B6A0: pop {r4} pop {r0} @@ -548768,7 +548768,7 @@ _0810B6DE: b _0810B810 _0810B6E0: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r6, #0 @@ -548776,12 +548776,12 @@ _0810B6E0: ldr r4, _0810B714 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x24] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810B71C @@ -548957,7 +548957,7 @@ _0810B84A: _0810B84C: ldr r4, _0810B88C ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r2, #1 rsbs r2, r2, #0 @@ -548993,13 +548993,13 @@ _0810B894: .4byte 0x0000FFF0 _0810B898: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0xe] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x12] @@ -549019,13 +549019,13 @@ _0810B8C0: ldr r4, _0810B8F4 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x12] ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r2, #0xa @@ -549141,7 +549141,7 @@ sub_0810B9A4: @ 0x0810B9A4 movs r3, #0x12 ldrsh r2, [r4, r3] movs r3, #0x23 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -549271,13 +549271,13 @@ _0810BA9E: ldr r4, _0810BACC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -549299,7 +549299,7 @@ _0810BAD0: cmp r0, #0 beq _0810BAE4 adds r0, r5, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810BAE4: pop {r4, r5} pop {r0} @@ -549341,13 +549341,13 @@ _0810BB2C: ldr r4, _0810BBB0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x14] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x16] @@ -549356,7 +549356,7 @@ _0810BB2C: ldr r0, _0810BBB4 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x1c] @@ -549375,12 +549375,12 @@ _0810BB2C: movs r0, #0xc strh r0, [r5, #0x1e] subs r0, #0x4c - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r5, #0x20] movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 asrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -549524,7 +549524,7 @@ sub_0810BC80: @ 0x0810BC80 movs r3, #0x16 ldrsh r2, [r4, r3] movs r3, #0x23 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -549585,7 +549585,7 @@ _0810BCEC: lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x76 - bl sub_080A307C + bl PlaySE12WithPanning _0810BD0E: movs r0, #0x12 ldrsh r3, [r4, r0] @@ -549701,7 +549701,7 @@ _0810BDDA: ldr r0, _0810BE24 ldrb r0, [r0] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x20 @@ -549723,7 +549723,7 @@ _0810BE04: ldr r4, _0810BE24 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -549784,7 +549784,7 @@ sub_0810BE64: @ 0x0810BE64 ldrh r3, [r4, #0x20] lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -549888,26 +549888,26 @@ sub_0810BF14: @ 0x0810BF14 ldr r4, _0810C024 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldr r4, _0810C028 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldrb r0, [r4] movs r1, #3 str r3, [sp] - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r1, _0810C02C @@ -550104,7 +550104,7 @@ sub_0810C098: @ 0x0810C098 b _0810C0F6 _0810C0F0: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810C0F6: pop {r4} pop {r0} @@ -550129,7 +550129,7 @@ sub_0810C0FC: @ 0x0810C0FC strh r0, [r4, #0x36] ldr r1, _0810C134 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _0810C138 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -550139,26 +550139,26 @@ sub_0810C0FC: @ 0x0810C0FC bx r0 .align 2, 0 _0810C130: .4byte gUnknown_20380BE -_0810C134: .4byte sub_080A34C4 -_0810C138: .4byte sub_080A5C14 +_0810C134: .4byte DestroyAnimSprite +_0810C138: .4byte TranslateSpriteInGrowingCircleOverDuration thumb_func_end sub_0810C0FC - thumb_func_start sub_0810C13C -sub_0810C13C: @ 0x0810C13C + thumb_func_start AnimIceBeamParticle +AnimIceBeamParticle: @ 0x0810C13C push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0810C170 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldr r0, _0810C174 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C17C @@ -550182,7 +550182,7 @@ _0810C186: ldr r0, _0810C1B8 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r1, _0810C1B4 lsrs r0, r0, #0x18 @@ -550193,7 +550193,7 @@ _0810C186: strh r0, [r4, #0x2e] ldr r1, _0810C1BC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810C1C0 str r0, [r4, #0x1c] pop {r4} @@ -550202,12 +550202,12 @@ _0810C186: .align 2, 0 _0810C1B4: .4byte gUnknown_20380BE _0810C1B8: .4byte gUnknown_20380D7 -_0810C1BC: .4byte sub_080A34C4 +_0810C1BC: .4byte DestroyAnimSprite _0810C1C0: .4byte sub_080A67B4 - thumb_func_end sub_0810C13C + thumb_func_end AnimIceBeamParticle - thumb_func_start sub_0810C1C4 -sub_0810C1C4: @ 0x0810C1C4 + thumb_func_start AnimIceEffectParticle +AnimIceEffectParticle: @ 0x0810C1C4 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0810C1DC @@ -550232,7 +550232,7 @@ _0810C1E0: bl SetAverageBattlerPositions ldr r0, _0810C22C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C206 @@ -550251,7 +550251,7 @@ _0810C206: _0810C216: ldr r1, _0810C230 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810C234 str r0, [r4, #0x1c] pop {r4, r5} @@ -550260,12 +550260,12 @@ _0810C216: .align 2, 0 _0810C228: .4byte gUnknown_20380D7 _0810C22C: .4byte gUnknown_20380D6 -_0810C230: .4byte sub_0810C238 +_0810C230: .4byte AnimFlickerIceEffectParticle _0810C234: .4byte RunStoredCallbackWhenAffineAnimEnds - thumb_func_end sub_0810C1C4 + thumb_func_end AnimIceEffectParticle - thumb_func_start sub_0810C238 -sub_0810C238: @ 0x0810C238 + thumb_func_start AnimFlickerIceEffectParticle +AnimFlickerIceEffectParticle: @ 0x0810C238 push {lr} adds r3, r0, #0 movs r0, #0x3e @@ -550291,20 +550291,20 @@ sub_0810C238: @ 0x0810C238 cmp r0, #0x14 bne _0810C26E adds r0, r3, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810C26E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810C238 + thumb_func_end AnimFlickerIceEffectParticle - thumb_func_start sub_0810C274 -sub_0810C274: @ 0x0810C274 + thumb_func_start AnimSwirlingSnowball_Step1 +AnimSwirlingSnowball_Step1: @ 0x0810C274 push {r4, r5, r6, r7, lr} sub sp, #0x10 adds r5, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r6, _0810C2BC ldrh r0, [r6, #8] strh r0, [r5, #0x2e] @@ -550319,13 +550319,13 @@ sub_0810C274: @ 0x0810C274 ldr r4, _0810C2C0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #6] @@ -550347,7 +550347,7 @@ _0810C2C4: _0810C2D6: ldr r0, _0810C2F4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C2FC @@ -550382,7 +550382,7 @@ _0810C310: cmp r4, #0 bge _0810C310 adds r0, r5, #0 - bl sub_080A6A28 + bl InitAnimFastLinearTranslationWithSpeed ldrh r0, [r5, #0x30] movs r1, #1 eors r0, r1 @@ -550443,7 +550443,7 @@ _0810C386: bge _0810C386 str r6, [r5, #0x1c] adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 add sp, #0x10 pop {r4, r5, r6, r7} pop {r0} @@ -550451,11 +550451,11 @@ _0810C386: .align 2, 0 _0810C3A4: .4byte gUnknown_20380BE _0810C3A8: .4byte sub_080A6A54 -_0810C3AC: .4byte sub_0810C3B0 - thumb_func_end sub_0810C274 +_0810C3AC: .4byte AnimSwirlingSnowball_Step2 + thumb_func_end AnimSwirlingSnowball_Step1 - thumb_func_start sub_0810C3B0 -sub_0810C3B0: @ 0x0810C3B0 + thumb_func_start AnimSwirlingSnowball_Step2 +AnimSwirlingSnowball_Step2: @ 0x0810C3B0 push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x24] @@ -550473,7 +550473,7 @@ sub_0810C3B0: @ 0x0810C3B0 strh r0, [r4, #0x2e] ldr r0, _0810C40C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _0810C410 cmp r0, #0 @@ -550502,16 +550502,16 @@ _0810C3E0: .align 2, 0 _0810C40C: .4byte gUnknown_20380D6 _0810C410: .4byte 0x0000FFEC -_0810C414: .4byte sub_0810C418 - thumb_func_end sub_0810C3B0 +_0810C414: .4byte AnimSwirlingSnowball_Step3 + thumb_func_end AnimSwirlingSnowball_Step2 - thumb_func_start sub_0810C418 -sub_0810C418: @ 0x0810C418 + thumb_func_start AnimSwirlingSnowball_Step3 +AnimSwirlingSnowball_Step3: @ 0x0810C418 push {r4, lr} adds r4, r0, #0 ldr r0, _0810C46C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _0810C470 cmp r0, #0 @@ -550570,11 +550570,11 @@ _0810C492: pop {r0} bx r0 .align 2, 0 -_0810C498: .4byte sub_0810C49C - thumb_func_end sub_0810C418 +_0810C498: .4byte AnimSwirlingSnowball_End + thumb_func_end AnimSwirlingSnowball_Step3 - thumb_func_start sub_0810C49C -sub_0810C49C: @ 0x0810C49C + thumb_func_start AnimSwirlingSnowball_End +AnimSwirlingSnowball_End: @ 0x0810C49C push {r4, lr} adds r4, r0, #0 movs r0, #1 @@ -550606,20 +550606,20 @@ sub_0810C49C: @ 0x0810C49C bge _0810C4DE _0810C4D8: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810C4DE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0810C49C + thumb_func_end AnimSwirlingSnowball_End - thumb_func_start sub_0810C4E4 -sub_0810C4E4: @ 0x0810C4E4 + thumb_func_start AnimMoveParticleBeyondTarget +AnimMoveParticleBeyondTarget: @ 0x0810C4E4 push {r4, r5, r6, r7, lr} sub sp, #0x10 adds r5, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r1, _0810C528 ldrh r0, [r1, #8] strh r0, [r5, #0x2e] @@ -550634,13 +550634,13 @@ sub_0810C4E4: @ 0x0810C4E4 ldr r4, _0810C52C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -550660,7 +550660,7 @@ _0810C530: _0810C542: ldr r0, _0810C564 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C56C @@ -550687,7 +550687,7 @@ _0810C576: adds r0, r0, r1 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A6A28 + bl InitAnimFastLinearTranslationWithSpeed adds r7, r5, #0 adds r7, #0x2e adds r2, r7, #0 @@ -550770,11 +550770,11 @@ _0810C5FE: bx r0 .align 2, 0 _0810C620: .4byte gUnknown_20380BE -_0810C624: .4byte sub_0810C628 - thumb_func_end sub_0810C4E4 +_0810C624: .4byte AnimWiggleParticleTowardsTarget + thumb_func_end AnimMoveParticleBeyondTarget - thumb_func_start sub_0810C628 -sub_0810C628: @ 0x0810C628 + thumb_func_start AnimWiggleParticleTowardsTarget +AnimWiggleParticleTowardsTarget: @ 0x0810C628 push {r4, lr} adds r4, r0, #0 bl AnimFastTranslateLinear @@ -550826,15 +550826,15 @@ _0810C63C: bge _0810C692 _0810C68C: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810C692: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0810C628 + thumb_func_end AnimWiggleParticleTowardsTarget - thumb_func_start sub_0810C698 -sub_0810C698: @ 0x0810C698 + thumb_func_start AnimWaveFromCenterOfTarget +AnimWaveFromCenterOfTarget: @ 0x0810C698 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x2e @@ -550863,7 +550863,7 @@ _0810C6BC: bl SetAverageBattlerPositions ldr r0, _0810C700 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C6E2 @@ -550896,16 +550896,16 @@ _0810C704: cmp r0, #0 beq _0810C718 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810C718: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810C698 + thumb_func_end AnimWaveFromCenterOfTarget - thumb_func_start sub_0810C720 -sub_0810C720: @ 0x0810C720 + thumb_func_start InitSwirlingFogAnim +InitSwirlingFogAnim: @ 0x0810C720 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r6, _0810C740 @@ -550919,7 +550919,7 @@ sub_0810C720: @ 0x0810C720 bne _0810C744 adds r0, r5, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _0810C782 .align 2, 0 _0810C740: .4byte gUnknown_20380BE @@ -550933,7 +550933,7 @@ _0810C744: movs r1, #0 bl SetAverageBattlerPositions ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C770 @@ -550979,7 +550979,7 @@ _0810C7A2: movs r1, #0 bl SetAverageBattlerPositions ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810C7CC @@ -551010,7 +551010,7 @@ _0810C7E0: ldrsh r0, [r0, r1] cmp r0, #0 beq _0810C7F8 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _0810C804 @@ -551026,7 +551026,7 @@ _0810C806: strh r0, [r5, #0x3a] ldr r0, _0810C84C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810C81C @@ -551046,7 +551046,7 @@ _0810C81C: adds r0, r0, r1 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation movs r0, #0x40 strh r0, [r5, #0x38] ldr r1, _0810C854 @@ -551059,11 +551059,11 @@ _0810C81C: .align 2, 0 _0810C84C: .4byte gUnknown_20380D7 _0810C850: .4byte gUnknown_20380BE -_0810C854: .4byte sub_0810C858 - thumb_func_end sub_0810C720 +_0810C854: .4byte AnimSwirlingFogAnim + thumb_func_end InitSwirlingFogAnim - thumb_func_start sub_0810C858 -sub_0810C858: @ 0x0810C858 + thumb_func_start AnimSwirlingFogAnim +AnimSwirlingFogAnim: @ 0x0810C858 push {r4, lr} adds r4, r0, #0 bl AnimTranslateLinear @@ -551095,7 +551095,7 @@ sub_0810C858: @ 0x0810C858 ldrh r0, [r4, #0x3c] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -551110,7 +551110,7 @@ _0810C8B4: ldrh r0, [r4, #0x3c] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -551132,16 +551132,16 @@ _0810C8D6: b _0810C8E8 _0810C8E2: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810C8E8: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810C858 + thumb_func_end AnimSwirlingFogAnim - thumb_func_start sub_0810C8F0 -sub_0810C8F0: @ 0x0810C8F0 + thumb_func_start AnimTask_Haze1 +AnimTask_Haze1: @ 0x0810C8F0 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -551156,19 +551156,19 @@ sub_0810C8F0: @ 0x0810C8F0 movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810C932 movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _0810C932: ldr r0, _0810C998 movs r1, #0 @@ -551200,7 +551200,7 @@ _0810C932: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0810C9AC lsls r0, r5, #2 adds r0, r0, r5 @@ -551220,11 +551220,11 @@ _0810C9A0: .4byte gUnknown_852776C _0810C9A4: .4byte gUnknown_8D93294 _0810C9A8: .4byte gUnknown_8526F0C _0810C9AC: .4byte gUnknown_3005B60 -_0810C9B0: .4byte sub_0810C9B4 - thumb_func_end sub_0810C8F0 +_0810C9B0: .4byte AnimTask_Haze2 + thumb_func_end AnimTask_Haze1 - thumb_func_start sub_0810C9B4 -sub_0810C9B4: @ 0x0810C9B4 + thumb_func_start AnimTask_Haze2 +AnimTask_Haze2: @ 0x0810C9B4 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -551375,14 +551375,14 @@ _0810CACA: adds r0, #1 strh r0, [r1, #0x20] _0810CAEC: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810CB00 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _0810CB00: ldr r0, _0810CB38 movs r1, #0 @@ -551398,7 +551398,7 @@ _0810CB00: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute adds r0, r4, #0 bl DestroyAnimVisualTask _0810CB2A: @@ -551410,22 +551410,22 @@ _0810CB2A: _0810CB34: .4byte gUnknown_3005B60 _0810CB38: .4byte gUnknown_2022ACC _0810CB3C: .4byte gUnknown_2022ACE - thumb_func_end sub_0810C9B4 + thumb_func_end AnimTask_Haze2 - thumb_func_start sub_0810CB40 -sub_0810CB40: @ 0x0810CB40 + thumb_func_start AnimThrowMistBall +AnimThrowMistBall: @ 0x0810CB40 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0810CB6C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -551437,10 +551437,10 @@ sub_0810CB40: @ 0x0810CB40 .align 2, 0 _0810CB6C: .4byte gUnknown_20380D6 _0810CB70: .4byte TranslateAnimSpriteToTargetMonLocation - thumb_func_end sub_0810CB40 + thumb_func_end AnimThrowMistBall - thumb_func_start sub_0810CB74 -sub_0810CB74: @ 0x0810CB74 + thumb_func_start AnimTask_LoadMistTiles +AnimTask_LoadMistTiles: @ 0x0810CB74 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -551455,19 +551455,19 @@ sub_0810CB74: @ 0x0810CB74 movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810CBB6 movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _0810CBB6: ldr r0, _0810CC20 movs r1, #0 @@ -551499,7 +551499,7 @@ _0810CBB6: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _0810CC34 lsls r0, r5, #2 adds r0, r0, r5 @@ -551522,11 +551522,11 @@ _0810CC2C: .4byte gUnknown_8D93294 _0810CC30: .4byte gUnknown_8526F0C _0810CC34: .4byte gUnknown_3005B60 _0810CC38: .4byte 0x0000FFFF -_0810CC3C: .4byte sub_0810CC40 - thumb_func_end sub_0810CB74 +_0810CC3C: .4byte AnimTask_OverlayFogTiles + thumb_func_end AnimTask_LoadMistTiles - thumb_func_start sub_0810CC40 -sub_0810CC40: @ 0x0810CC40 + thumb_func_start AnimTask_OverlayFogTiles +AnimTask_OverlayFogTiles: @ 0x0810CC40 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -551664,14 +551664,14 @@ _0810CD3A: adds r0, #1 strh r0, [r1, #0x20] _0810CD5C: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810CD70 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _0810CD70: ldr r0, _0810CDA8 movs r1, #0 @@ -551687,7 +551687,7 @@ _0810CD70: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute adds r0, r4, #0 bl DestroyAnimVisualTask _0810CD9A: @@ -551699,10 +551699,10 @@ _0810CD9A: _0810CDA4: .4byte gUnknown_3005B60 _0810CDA8: .4byte gUnknown_2022ACC _0810CDAC: .4byte gUnknown_2022ACE - thumb_func_end sub_0810CC40 + thumb_func_end AnimTask_OverlayFogTiles - thumb_func_start sub_0810CDB0 -sub_0810CDB0: @ 0x0810CDB0 + thumb_func_start InitPoisonGasCloudAnim +InitPoisonGasCloudAnim: @ 0x0810CDB0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -551714,12 +551714,12 @@ sub_0810CDB0: @ 0x0810CDB0 mov r8, r0 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 ldr r7, _0810CEA0 ldrb r0, [r7] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -551759,7 +551759,7 @@ _0810CDE4: cmp r0, #0 bne _0810CE40 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0810CEA8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -551780,13 +551780,13 @@ _0810CE44: ldr r4, _0810CE9C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -551802,7 +551802,7 @@ _0810CE44: ldr r4, _0810CEA0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #6] @@ -551829,7 +551829,7 @@ _0810CEAC: ldr r4, _0810CF1C ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #6] @@ -551842,20 +551842,20 @@ _0810CEAC: ldrb r0, [r4] movs r1, #1 _0810CED4: - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #8] adds r0, r0, r6 strh r0, [r5, #0x36] ldrb r0, [r4] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x10 ldrh r1, [r5, #0x3c] orrs r0, r1 strh r0, [r5, #0x3c] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810CF08 @@ -551867,7 +551867,7 @@ _0810CED4: strb r0, [r1] _0810CF08: adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _0810CF20 str r0, [r5, #0x1c] pop {r3} @@ -551877,11 +551877,11 @@ _0810CF08: bx r0 .align 2, 0 _0810CF1C: .4byte gUnknown_20380D7 -_0810CF20: .4byte sub_0810CF24 - thumb_func_end sub_0810CDB0 +_0810CF20: .4byte MovePoisonGasCloud + thumb_func_end InitPoisonGasCloudAnim - thumb_func_start sub_0810CF24 -sub_0810CF24: @ 0x0810CF24 + thumb_func_start MovePoisonGasCloud +MovePoisonGasCloud: @ 0x0810CF24 push {r4, r5, r6, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3c] @@ -551941,7 +551941,7 @@ _0810CF86: ldr r6, _0810CFD4 ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] @@ -551957,7 +551957,7 @@ _0810CF86: ldrh r0, [r4, #0x3c] adds r0, #1 strh r0, [r4, #0x3c] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810CFDC @@ -551995,7 +551995,7 @@ _0810CFDE: ands r0, r1 strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation b _0810D15C .align 2, 0 _0810D008: .4byte gUnknown_82FA8CC @@ -552027,7 +552027,7 @@ _0810D00C: ldrh r1, [r4, #0x26] adds r0, r0, r1 strh r0, [r4, #0x26] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810D08A @@ -552105,7 +552105,7 @@ _0810D0AA: strh r0, [r4, #0x34] adds r0, #4 strh r0, [r4, #0x36] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810D104 @@ -552174,7 +552174,7 @@ _0810D15C: bx r0 .align 2, 0 _0810D164: .4byte gUnknown_203809E - thumb_func_end sub_0810CF24 + thumb_func_end MovePoisonGasCloud thumb_func_start AnimTask_Hail1 AnimTask_Hail1: @ 0x0810D168 @@ -552190,11 +552190,11 @@ AnimTask_Hail1: @ 0x0810D168 bx lr .align 2, 0 _0810D17C: .4byte gUnknown_3005B60 -_0810D180: .4byte sub_0810D184 +_0810D180: .4byte AnimTask_Hail2 thumb_func_end AnimTask_Hail1 - thumb_func_start sub_0810D184 -sub_0810D184: @ 0x0810D184 + thumb_func_start AnimTask_Hail2 +AnimTask_Hail2: @ 0x0810D184 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -552239,7 +552239,7 @@ _0810D1C8: ldrb r0, [r4, #0xe] ldrb r1, [r4, #0xc] movs r3, #1 - bl sub_0810D234 + bl GenerateHailParticle lsls r0, r0, #0x18 cmp r0, #0 beq _0810D1E8 @@ -552290,10 +552290,10 @@ _0810D22C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810D184 + thumb_func_end AnimTask_Hail2 - thumb_func_start sub_0810D234 -sub_0810D234: @ 0x0810D234 + thumb_func_start GenerateHailParticle +GenerateHailParticle: @ 0x0810D234 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -552328,7 +552328,7 @@ sub_0810D234: @ 0x0810D234 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810D320 @@ -552336,12 +552336,12 @@ sub_0810D234: @ 0x0810D234 str r0, [sp, #4] adds r0, r5, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r5, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 mov r1, r8 @@ -552355,7 +552355,7 @@ _0810D2AC: .4byte gUnknown_8571898 _0810D2B0: adds r0, r5, #0 movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r1, #6 @@ -552367,7 +552367,7 @@ _0810D2B0: lsrs r7, r1, #0x10 adds r0, r5, #0 movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r1, #6 @@ -552379,7 +552379,7 @@ _0810D2B0: _0810D2E6: adds r0, r5, #0 movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r1, #6 @@ -552391,7 +552391,7 @@ _0810D2E6: lsrs r7, r1, #0x10 adds r0, r5, #0 movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r1, #6 @@ -552429,7 +552429,7 @@ _0810D332: movs r2, #8 rsbs r2, r2, #0 movs r3, #0x12 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 @@ -552471,10 +552471,10 @@ _0810D396: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0810D234 + thumb_func_end GenerateHailParticle - thumb_func_start sub_0810D3A8 -sub_0810D3A8: @ 0x0810D3A8 + thumb_func_start AnimHailBegin +AnimHailBegin: @ 0x0810D3A8 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x20] @@ -552513,7 +552513,7 @@ _0810D3D2: adds r3, r4, #0 adds r3, #0x43 ldrb r3, [r3] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x2e] @@ -552557,7 +552557,7 @@ _0810D436: .align 2, 0 _0810D448: .4byte gUnknown_857174C _0810D44C: .4byte gUnknown_20205AC -_0810D450: .4byte sub_0810D48C +_0810D450: .4byte AnimHailContinue _0810D454: ldr r3, _0810D488 movs r2, #0x3c @@ -552586,10 +552586,10 @@ _0810D482: bx r0 .align 2, 0 _0810D488: .4byte gUnknown_3005B60 - thumb_func_end sub_0810D3A8 + thumb_func_end AnimHailBegin - thumb_func_start sub_0810D48C -sub_0810D48C: @ 0x0810D48C + thumb_func_start AnimHailContinue +AnimHailContinue: @ 0x0810D48C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -552626,10 +552626,10 @@ _0810D4CC: bx r0 .align 2, 0 _0810D4D4: .4byte gUnknown_3005B60 - thumb_func_end sub_0810D48C + thumb_func_end AnimHailContinue - thumb_func_start sub_0810D4D8 -sub_0810D4D8: @ 0x0810D4D8 + thumb_func_start InitIceBallAnim +InitIceBallAnim: @ 0x0810D4D8 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r0, _0810D558 @@ -552650,13 +552650,13 @@ _0810D4F6: bl StartSpriteAffineAnim adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r6, _0810D55C ldrh r0, [r6, #8] strh r0, [r5, #0x2e] ldr r0, _0810D560 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810D51E @@ -552667,7 +552667,7 @@ _0810D51E: ldr r4, _0810D564 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #4] @@ -552675,7 +552675,7 @@ _0810D51E: strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #6] @@ -552684,7 +552684,7 @@ _0810D51E: ldrh r0, [r6, #0xa] strh r0, [r5, #0x38] adds r0, r5, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _0810D568 str r0, [r5, #0x1c] pop {r4, r5, r6} @@ -552696,13 +552696,13 @@ _0810D55C: .4byte gUnknown_20380BE _0810D560: .4byte gUnknown_20380D6 _0810D564: .4byte gUnknown_20380D7 _0810D568: .4byte sub_0810D56C - thumb_func_end sub_0810D4D8 + thumb_func_end InitIceBallAnim thumb_func_start sub_0810D56C sub_0810D56C: @ 0x0810D56C push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _0810D58E @@ -552713,14 +552713,14 @@ sub_0810D56C: @ 0x0810D56C str r0, [r4, #0x1c] ldr r1, _0810D598 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _0810D58E: pop {r4} pop {r0} bx r0 .align 2, 0 _0810D594: .4byte RunStoredCallbackWhenAnimEnds -_0810D598: .4byte sub_080A34C4 +_0810D598: .4byte DestroyAnimSprite thumb_func_end sub_0810D56C thumb_func_start sub_0810D59C @@ -552809,15 +552809,15 @@ _0810D628: cmp r0, #0x15 bne _0810D646 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810D646: pop {r4} pop {r0} bx r0 thumb_func_end sub_0810D600 - thumb_func_start sub_0810D64C -sub_0810D64C: @ 0x0810D64C + thumb_func_start AnimTask_GetRolloutCounter +AnimTask_GetRolloutCounter: @ 0x0810D64C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -552840,17 +552840,17 @@ sub_0810D64C: @ 0x0810D64C .align 2, 0 _0810D674: .4byte gUnknown_20380BE _0810D678: .4byte gUnknown_20380A0 - thumb_func_end sub_0810D64C + thumb_func_end AnimTask_GetRolloutCounter - thumb_func_start sub_0810D67C -sub_0810D67C: @ 0x0810D67C + thumb_func_start unc_080B08A0 +unc_080B08A0: @ 0x0810D67C push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0810D6AC movs r0, #0 ldrsh r1, [r5, r0] adds r0, r4, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r5, #2] ldrh r1, [r4, #0x22] adds r0, r0, r1 @@ -552861,15 +552861,15 @@ sub_0810D67C: @ 0x0810D67C str r0, [r4, #0x1c] ldr r1, _0810D6B4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0810D6AC: .4byte gUnknown_20380BE _0810D6B0: .4byte WaitAnimForDuration -_0810D6B4: .4byte sub_080A34C4 - thumb_func_end sub_0810D67C +_0810D6B4: .4byte DestroyAnimSprite + thumb_func_end unc_080B08A0 thumb_func_start sub_0810D6B8 sub_0810D6B8: @ 0x0810D6B8 @@ -552882,7 +552882,7 @@ sub_0810D6B8: @ 0x0810D6B8 bne _0810D6E0 ldr r0, _0810D700 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810D6E0 @@ -552913,7 +552913,7 @@ _0810D700: .4byte gUnknown_20380D6 sub_0810D704: @ 0x0810D704 push {r4, lr} adds r4, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810D720 @@ -552934,8 +552934,8 @@ _0810D720: _0810D72C: .4byte gUnknown_20380BE thumb_func_end sub_0810D704 - thumb_func_start sub_0810D730 -sub_0810D730: @ 0x0810D730 + thumb_func_start AnimBasicFistOrFoot +AnimBasicFistOrFoot: @ 0x0810D730 push {r4, r5, lr} adds r5, r0, #0 ldr r4, _0810D750 @@ -552947,7 +552947,7 @@ sub_0810D730: @ 0x0810D730 bne _0810D754 adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _0810D75C .align 2, 0 _0810D750: .4byte gUnknown_20380BE @@ -552963,15 +552963,15 @@ _0810D75C: str r0, [r5, #0x1c] ldr r1, _0810D77C adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0810D774: .4byte gUnknown_20380BE _0810D778: .4byte WaitAnimForDuration -_0810D77C: .4byte sub_080A34C4 - thumb_func_end sub_0810D730 +_0810D77C: .4byte DestroyAnimSprite + thumb_func_end AnimBasicFistOrFoot thumb_func_start sub_0810D780 sub_0810D780: @ 0x0810D780 @@ -553013,19 +553013,19 @@ _0810D7C4: bl StartSpriteAnim mov r0, r8 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] mov r0, r8 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] mov r0, r8 movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r1, r0, #0x10 lsrs r0, r0, #0x1f @@ -553034,7 +553034,7 @@ _0810D7C4: lsrs r6, r1, #0x10 mov r0, r8 movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -553115,7 +553115,7 @@ _0810D878: adds r3, #1 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x3c] @@ -553190,7 +553190,7 @@ sub_0810D908: @ 0x0810D908 bl DestroySprite _0810D944: adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _0810D954 .align 2, 0 _0810D94C: .4byte gUnknown_20205AC @@ -553241,7 +553241,7 @@ _0810D992: str r0, [r4, #0x1c] ldr r1, _0810D9B0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 @@ -553282,14 +553282,14 @@ sub_0810D9B4: @ 0x0810D9B4 str r0, [r5, #0x1c] ldr r1, _0810DA00 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _0810D9F4: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _0810D9FC: .4byte sub_080A67B4 -_0810DA00: .4byte sub_080A34C4 +_0810DA00: .4byte DestroyAnimSprite thumb_func_end sub_0810D9B4 thumb_func_start sub_0810DA04 @@ -553321,7 +553321,7 @@ _0810DA30: bl InitSpritePosToAnimTarget ldr r0, _0810DA80 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810DA4E @@ -553343,7 +553343,7 @@ _0810DA4E: strh r0, [r6, #0x34] strh r0, [r6, #0x36] adds r0, r6, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldrh r0, [r4, #0xa] strh r0, [r6, #0x38] ldrh r0, [r4, #8] @@ -553385,15 +553385,15 @@ sub_0810DA90: @ 0x0810DA90 b _0810DAC2 _0810DABC: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810DAC2: pop {r4} pop {r0} bx r0 thumb_func_end sub_0810DA90 - thumb_func_start sub_0810DAC8 -sub_0810DAC8: @ 0x0810DAC8 + thumb_func_start AnimSpinningKickOrPunch +AnimSpinningKickOrPunch: @ 0x0810DAC8 push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 @@ -553408,18 +553408,18 @@ sub_0810DAC8: @ 0x0810DAC8 str r0, [r4, #0x1c] ldr r1, _0810DAFC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0810DAF4: .4byte gUnknown_20380BE _0810DAF8: .4byte WaitAnimForDuration -_0810DAFC: .4byte sub_0810DB00 - thumb_func_end sub_0810DAC8 +_0810DAFC: .4byte AnimSpinningKickOrPunchFinish + thumb_func_end AnimSpinningKickOrPunch - thumb_func_start sub_0810DB00 -sub_0810DB00: @ 0x0810DB00 + thumb_func_start AnimSpinningKickOrPunchFinish +AnimSpinningKickOrPunchFinish: @ 0x0810DB00 push {r4, lr} adds r4, r0, #0 movs r1, #0 @@ -553436,17 +553436,17 @@ sub_0810DB00: @ 0x0810DB00 str r0, [r4, #0x1c] ldr r1, _0810DB30 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _0810DB2C: .4byte WaitAnimForDuration -_0810DB30: .4byte sub_080A34C4 - thumb_func_end sub_0810DB00 +_0810DB30: .4byte DestroyAnimSprite + thumb_func_end AnimSpinningKickOrPunchFinish - thumb_func_start sub_0810DB34 -sub_0810DB34: @ 0x0810DB34 + thumb_func_start AnimStompFoot +AnimStompFoot: @ 0x0810DB34 push {r4, lr} adds r4, r0, #0 movs r1, #1 @@ -553461,11 +553461,11 @@ sub_0810DB34: @ 0x0810DB34 bx r0 .align 2, 0 _0810DB50: .4byte gUnknown_20380BE -_0810DB54: .4byte sub_0810DB58 - thumb_func_end sub_0810DB34 +_0810DB54: .4byte AnimStompFootStep + thumb_func_end AnimStompFoot - thumb_func_start sub_0810DB58 -sub_0810DB58: @ 0x0810DB58 + thumb_func_start AnimStompFootStep +AnimStompFootStep: @ 0x0810DB58 push {r4, r5, lr} adds r5, r0, #0 ldrh r0, [r5, #0x2e] @@ -553482,13 +553482,13 @@ sub_0810DB58: @ 0x0810DB58 ldr r4, _0810DBA4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -553496,7 +553496,7 @@ sub_0810DB58: @ 0x0810DB58 str r0, [r5, #0x1c] ldr r1, _0810DBAC adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _0810DB9C: pop {r4, r5} pop {r0} @@ -553504,24 +553504,24 @@ _0810DB9C: .align 2, 0 _0810DBA4: .4byte gUnknown_20380D7 _0810DBA8: .4byte sub_080A67B4 -_0810DBAC: .4byte sub_0810DBB0 - thumb_func_end sub_0810DB58 +_0810DBAC: .4byte AnimStompFootEnd + thumb_func_end AnimStompFootStep - thumb_func_start sub_0810DBB0 -sub_0810DBB0: @ 0x0810DBB0 + thumb_func_start AnimStompFootEnd +AnimStompFootEnd: @ 0x0810DBB0 push {lr} movs r1, #0xf strh r1, [r0, #0x2e] ldr r1, _0810DBC4 str r1, [r0, #0x1c] ldr r1, _0810DBC8 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r0} bx r0 .align 2, 0 _0810DBC4: .4byte WaitAnimForDuration -_0810DBC8: .4byte sub_080A34C4 - thumb_func_end sub_0810DBB0 +_0810DBC8: .4byte DestroyAnimSprite + thumb_func_end AnimStompFootEnd thumb_func_start sub_0810DBCC sub_0810DBCC: @ 0x0810DBCC @@ -553590,7 +553590,7 @@ _0810DC46: cmp r0, #0x78 ble _0810DC54 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810DC54: pop {r4} pop {r0} @@ -553617,13 +553617,13 @@ _0810DC78: _0810DC7A: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -553677,7 +553677,7 @@ _0810DCDE: cmp r0, #0 bne _0810DCFA adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _0810DD3C _0810DCFA: ldrh r0, [r1, #0x2e] @@ -553715,7 +553715,7 @@ _0810DD2A: cmp r0, #0 bne _0810DD3C adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810DD3C: pop {r0} bx r0 @@ -553723,8 +553723,8 @@ _0810DD3C: _0810DD40: .4byte 0x0000FFFE thumb_func_end sub_0810DCCC - thumb_func_start sub_0810DD44 -sub_0810DD44: @ 0x0810DD44 + thumb_func_start DaycarePrintMonLvl +DaycarePrintMonLvl: @ 0x0810DD44 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r6, _0810DD68 @@ -553735,7 +553735,7 @@ sub_0810DD44: @ 0x0810DD44 ldr r4, _0810DD6C ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r2, [r6, #4] @@ -553748,7 +553748,7 @@ _0810DD70: ldr r4, _0810DDCC ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #4] @@ -553757,7 +553757,7 @@ _0810DD82: strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #6] @@ -553828,7 +553828,7 @@ _0810DE10: b _0810DE1E _0810DE16: adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _0810DE22 _0810DE1E: ldr r0, _0810DE28 @@ -553839,7 +553839,7 @@ _0810DE22: bx r0 .align 2, 0 _0810DE28: .4byte sub_0810DE2C - thumb_func_end sub_0810DD44 + thumb_func_end DaycarePrintMonLvl thumb_func_start sub_0810DE2C sub_0810DE2C: @ 0x0810DE2C @@ -553861,7 +553861,7 @@ sub_0810DE2C: @ 0x0810DE2C cmp r0, #0x28 ble _0810DE54 adds r0, r1, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810DE54: pop {r0} bx r0 @@ -553879,19 +553879,19 @@ sub_0810DE58: @ 0x0810DE58 ldr r4, _0810DEA8 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldr r0, _0810DEAC ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -553911,7 +553911,7 @@ _0810DEB0: .4byte gUnknown_20380D7 _0810DEB4: ldr r0, _0810DEEC ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -553964,7 +553964,7 @@ sub_0810DEF8: @ 0x0810DEF8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -553974,15 +553974,15 @@ sub_0810DEF8: @ 0x0810DEF8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r1, _0810DF5C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810DF60 str r0, [r4, #0x1c] _0810DF54: @@ -553990,7 +553990,7 @@ _0810DF54: pop {r0} bx r0 .align 2, 0 -_0810DF5C: .4byte sub_080A6014 +_0810DF5C: .4byte DestroySpriteAndMatrix _0810DF60: .4byte sub_080A6860 thumb_func_end sub_0810DEF8 @@ -554010,7 +554010,7 @@ sub_0810DF64: @ 0x0810DF64 adds r1, r5, #0 adds r1, #0x38 lsls r2, r2, #8 - bl sub_080A7910 + bl StorePointerInVars ldrh r0, [r4, #2] strh r0, [r5, #0x3a] ldrh r2, [r5, #4] @@ -554053,7 +554053,7 @@ sub_0810DFC0: @ 0x0810DFC0 ldrsh r0, [r7, r2] movs r2, #0x38 ldrsh r1, [r7, r2] - bl sub_080A7918 + bl LoadPointerFromVars adds r4, r0, #0 movs r1, #0x3a ldrsh r0, [r7, r1] @@ -554063,7 +554063,7 @@ sub_0810DFC0: @ 0x0810DFC0 adds r1, r7, #0 adds r1, #0x38 adds r2, r4, #0 - bl sub_080A7910 + bl StorePointerInVars asrs r4, r4, #8 strh r4, [r7, #0x22] lsls r4, r4, #0x10 @@ -554073,7 +554073,7 @@ sub_0810DFC0: @ 0x0810DFC0 cmp r4, r0 bge _0810E00A adds r0, r7, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _0810E068 _0810E00A: ldrh r0, [r7, #0x2e] @@ -554084,13 +554084,13 @@ _0810E012: ldr r4, _0810E074 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -554098,14 +554098,14 @@ _0810E012: mov r8, r2 ldrb r0, [r2] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 mov r1, r8 ldrb r0, [r1] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 subs r4, r4, r6 strh r4, [r7, #0x2e] @@ -554165,7 +554165,7 @@ sub_0810E080: @ 0x0810E080 ble _0810E0C0 _0810E0BA: adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E0C0: pop {r0} bx r0 @@ -554183,13 +554183,13 @@ sub_0810E0C4: @ 0x0810E0C4 ldr r4, _0810E0FC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -554208,7 +554208,7 @@ _0810E108: ldr r0, _0810E144 _0810E10E: ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -554218,7 +554218,7 @@ _0810E10E: ands r0, r2 orrs r0, r1 strb r0, [r5, #5] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810E148 @@ -554235,7 +554235,7 @@ _0810E140: .4byte gUnknown_20380D6 _0810E144: .4byte gUnknown_20380D7 _0810E148: adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810E168 @@ -554257,7 +554257,7 @@ _0810E168: strh r0, [r5, #0x30] adds r0, r4, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -554265,22 +554265,22 @@ _0810E168: strh r0, [r5, #0x34] adds r0, r4, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r1, _0810E1A8 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810E1AC str r0, [r5, #0x1c] pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0810E1A8: .4byte sub_080A34C4 +_0810E1A8: .4byte DestroyAnimSprite _0810E1AC: .4byte sub_080A6860 thumb_func_end sub_0810E0C4 @@ -554295,7 +554295,7 @@ sub_0810E1B0: @ 0x0810E1B0 cmp r1, r0 bne _0810E1C6 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E1C6: ldrh r0, [r4, #0x2e] adds r0, #1 @@ -554313,13 +554313,13 @@ sub_0810E1D4: @ 0x0810E1D4 ldr r4, _0810E250 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -554335,7 +554335,7 @@ sub_0810E1D4: @ 0x0810E1D4 ldr r0, _0810E258 ldrb r6, [r0] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810E21E @@ -554386,7 +554386,7 @@ sub_0810E260: @ 0x0810E260 bne _0810E27C adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _0810E284 .align 2, 0 _0810E278: .4byte gUnknown_20380BE @@ -554395,7 +554395,7 @@ _0810E27C: movs r1, #0 bl InitSpritePosToAnimTarget _0810E284: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810E298 @@ -554406,7 +554406,7 @@ _0810E284: _0810E298: ldr r0, _0810E2C0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810E2AE @@ -554418,14 +554418,14 @@ _0810E2AE: str r0, [r4, #0x1c] ldr r1, _0810E2C8 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _0810E2C0: .4byte gUnknown_20380D6 _0810E2C4: .4byte RunStoredCallbackWhenAnimEnds -_0810E2C8: .4byte sub_080A34C4 +_0810E2C8: .4byte DestroyAnimSprite thumb_func_end sub_0810E260 thumb_func_start sub_0810E2CC @@ -554456,7 +554456,7 @@ sub_0810E2CC: @ 0x0810E2CC cmp r0, #0x28 ble _0810E306 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E306: pop {r4} pop {r0} @@ -554521,7 +554521,7 @@ _0810E36A: strh r0, [r4, #0x1c] ldr r0, _0810E398 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810E3A0 @@ -554598,26 +554598,26 @@ sub_0810E3FC: @ 0x0810E3FC _0810E412: adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldrh r0, [r4, #4] strh r0, [r5, #0x2e] ldr r4, _0810E454 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] ldr r0, _0810E458 strh r0, [r5, #0x38] adds r0, r5, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _0810E45C str r0, [r5, #0x1c] pop {r4, r5} @@ -554634,12 +554634,12 @@ _0810E45C: .4byte sub_0810E460 sub_0810E460: @ 0x0810E460 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _0810E474 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E474: pop {r4} pop {r0} @@ -554663,7 +554663,7 @@ sub_0810E47C: @ 0x0810E47C _0810E494: adds r0, r4, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0810E4F4 ldrb r0, [r0] mov r6, sp @@ -554674,7 +554674,7 @@ _0810E494: bl SetAverageBattlerPositions ldr r0, _0810E4F8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810E4C2 @@ -554696,7 +554696,7 @@ _0810E4C2: ldr r0, _0810E4FC strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _0810E500 str r0, [r4, #0x1c] add sp, #4 @@ -554715,12 +554715,12 @@ _0810E500: .4byte sub_0810E504 sub_0810E504: @ 0x0810E504 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _0810E518 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E518: pop {r4} pop {r0} @@ -554746,7 +554746,7 @@ sub_0810E520: @ 0x0810E520 adds r0, r0, r1 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation movs r1, #0x30 ldrsh r0, [r4, r1] movs r2, #4 @@ -554787,7 +554787,7 @@ sub_0810E574: @ 0x0810E574 cmp r0, #0 bne _0810E59A adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E59A: pop {r4} pop {r0} @@ -554808,7 +554808,7 @@ sub_0810E5A0: @ 0x0810E5A0 bl SetAverageBattlerPositions ldr r0, _0810E604 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810E5CC @@ -554837,7 +554837,7 @@ _0810E5CC: str r0, [r4, #0x1c] ldr r1, _0810E610 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 @@ -554846,11 +554846,11 @@ _0810E600: .4byte gUnknown_20380D7 _0810E604: .4byte gUnknown_20380D6 _0810E608: .4byte gUnknown_20380BE _0810E60C: .4byte sub_080A67B4 -_0810E610: .4byte sub_080A34C4 +_0810E610: .4byte DestroyAnimSprite thumb_func_end sub_0810E5A0 - thumb_func_start sub_0810E614 -sub_0810E614: @ 0x0810E614 + thumb_func_start AnimBubbleEffect +AnimBubbleEffect: @ 0x0810E614 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0810E62C @@ -554875,7 +554875,7 @@ _0810E630: bl SetAverageBattlerPositions ldr r0, _0810E674 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810E656 @@ -554900,11 +554900,11 @@ _0810E666: .align 2, 0 _0810E670: .4byte gUnknown_20380D7 _0810E674: .4byte gUnknown_20380D6 -_0810E678: .4byte sub_0810E67C - thumb_func_end sub_0810E614 +_0810E678: .4byte AnimBubbleEffectStep + thumb_func_end AnimBubbleEffect - thumb_func_start sub_0810E67C -sub_0810E67C: @ 0x0810E67C + thumb_func_start AnimBubbleEffectStep +AnimBubbleEffectStep: @ 0x0810E67C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -554932,13 +554932,13 @@ sub_0810E67C: @ 0x0810E67C cmp r0, #0 beq _0810E6B8 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E6B8: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810E67C + thumb_func_end AnimBubbleEffectStep thumb_func_start sub_0810E6C0 sub_0810E6C0: @ 0x0810E6C0 @@ -554989,7 +554989,7 @@ sub_0810E6E8: @ 0x0810E6E8 cmp r0, #0x47 bne _0810E722 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E722: pop {r4} pop {r0} @@ -555012,7 +555012,7 @@ sub_0810E728: @ 0x0810E728 ldrh r0, [r1] strh r0, [r4, #0xa] ldr r0, _0810E760 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xc] @@ -555107,10 +555107,10 @@ sub_0810E7F8: @ 0x0810E7F8 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0810E864 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810E818 @@ -555127,7 +555127,7 @@ _0810E818: ldr r5, _0810E86C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -555137,19 +555137,19 @@ _0810E818: strh r0, [r6, #0x34] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #6] adds r0, r0, r4 strh r0, [r6, #0x36] adds r0, r6, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _0810E870 str r0, [r6, #0x1c] ldr r1, _0810E874 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6} pop {r0} bx r0 @@ -555170,7 +555170,7 @@ sub_0810E878: @ 0x0810E878 cmp r0, #0 beq _0810E88C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810E88C: pop {r4} pop {r0} @@ -555184,7 +555184,7 @@ sub_0810E894: @ 0x0810E894 adds r5, r0, #0 ldr r4, _0810E930 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810E8C0 @@ -555202,7 +555202,7 @@ sub_0810E894: @ 0x0810E894 rsbs r0, r0, #0 strh r0, [r1, #6] _0810E8C0: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0810E8D8 @@ -555216,13 +555216,13 @@ _0810E8C0: _0810E8D8: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r2, _0810E934 ldrh r1, [r2] @@ -555242,13 +555242,13 @@ _0810E8D8: ldr r4, _0810E938 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -555280,7 +555280,7 @@ _0810E94E: str r0, [r5, #0x1c] ldr r1, _0810E988 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r1, [r4, #0xa] adds r0, r5, #0 bl SeekSpriteAnim @@ -555291,7 +555291,7 @@ _0810E94E: _0810E97C: .4byte gUnknown_20380D7 _0810E980: .4byte gUnknown_20380BE _0810E984: .4byte sub_080A67B4 -_0810E988: .4byte sub_080A34C4 +_0810E988: .4byte DestroyAnimSprite thumb_func_end sub_0810E894 thumb_func_start sub_0810E98C @@ -555299,7 +555299,7 @@ sub_0810E98C: @ 0x0810E98C push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r1, _0810E9C8 ldrh r0, [r1, #4] strh r0, [r4, #0x2e] @@ -555308,7 +555308,7 @@ sub_0810E98C: @ 0x0810E98C ldr r0, _0810E9CC str r0, [r4, #0x1c] movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0810E9D0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -555363,7 +555363,7 @@ _0810E9FA: cmp r0, r1 bge _0810EA12 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810EA12: pop {r0} bx r0 @@ -555376,7 +555376,7 @@ sub_0810EA18: @ 0x0810EA18 adds r5, r0, #0 ldr r0, _0810EA40 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810EA48 @@ -555405,7 +555405,7 @@ _0810EA4E: ldr r4, _0810EA94 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -555413,12 +555413,12 @@ _0810EA4E: strh r0, [r5, #0x34] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] adds r0, r5, #0 - bl sub_080A671C + bl InitAnimLinearTranslation ldr r0, _0810EA98 str r0, [r5, #0x1c] pop {r4, r5} @@ -555472,7 +555472,7 @@ _0810EAC4: ble _0810EB0C _0810EAE6: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0810EB14 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -555487,7 +555487,7 @@ _0810EAE6: ands r0, r2 strb r0, [r1] adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810EB0C: pop {r4} pop {r0} @@ -555562,7 +555562,7 @@ _0810EB8C: _0810EB8E: ldrb r6, [r0] adds r0, r6, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810EBA4 @@ -555573,7 +555573,7 @@ _0810EB8E: _0810EBA4: adds r0, r6, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0810EC3C lsrs r0, r0, #0x18 @@ -555582,7 +555582,7 @@ _0810EBA4: strh r0, [r7, #0x20] adds r0, r6, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldrh r1, [r4, #2] lsrs r0, r0, #0x18 @@ -555621,12 +555621,12 @@ _0810EBA4: lsrs r1, r1, #0x10 cmp r1, #0x7f bhi _0810EC9A - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810EC40 adds r0, r6, #0 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #1 @@ -555645,7 +555645,7 @@ _0810EC38: .4byte gUnknown_20380D7 _0810EC3C: .4byte gUnknown_20380BE _0810EC40: adds r0, r6, #0 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -555691,7 +555691,7 @@ _0810EC58: b _0810ECF2 _0810EC9A: adds r0, r6, #0 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -555918,7 +555918,7 @@ _0810EE04: ands r0, r1 cmp r0, #0 beq _0810EEC2 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810EE92 @@ -556050,7 +556050,7 @@ _0810EEF8: ands r0, r1 cmp r0, #0 beq _0810EFB6 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810EF86 @@ -556182,7 +556182,7 @@ _0810EFEC: ands r0, r1 cmp r0, #0 beq _0810F0AA - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810F07A @@ -556323,7 +556323,7 @@ _0810F0F4: ands r0, r1 cmp r0, #0 beq _0810F1B2 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810F182 @@ -556515,7 +556515,7 @@ sub_0810F29C: @ 0x0810F29C adds r4, r0, #0 ldr r0, _0810F2E4 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r1, #3 ands r1, r0 lsls r1, r1, #2 @@ -556528,13 +556528,13 @@ sub_0810F29C: @ 0x0810F29C ldr r5, _0810F2E8 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -556560,7 +556560,7 @@ sub_0810F2F0: @ 0x0810F2F0 bne _0810F30C adds r0, r5, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _0810F314 .align 2, 0 _0810F308: .4byte gUnknown_20380BE @@ -556576,7 +556576,7 @@ _0810F314: bne _0810F32C ldr r0, _0810F380 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810F342 @@ -556587,7 +556587,7 @@ _0810F32C: bne _0810F348 ldr r0, _0810F384 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810F348 @@ -556662,7 +556662,7 @@ _0810F3BA: cmp r0, r1 bne _0810F3D2 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F3D2: pop {r4} pop {r0} @@ -556713,20 +556713,20 @@ sub_0810F3D8: @ 0x0810F3D8 ldr r5, _0810F480 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 mov r0, r8 adds r1, r4, #0 movs r3, #3 - bl sub_08006D6C + bl CreateSpriteAndAnimate _0810F452: ldrh r0, [r7, #8] adds r0, #8 @@ -556765,9 +556765,9 @@ sub_0810F484: @ 0x0810F484 _0810F496: adds r0, r4, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0810F4C4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -556795,7 +556795,7 @@ _0810F4C8: cmp r0, #0 beq _0810F4DC adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F4DC: pop {r4} pop {r0} @@ -556824,7 +556824,7 @@ _0810F500: ldr r0, _0810F518 ldrb r0, [r0] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -556860,7 +556860,7 @@ _0810F530: cmp r0, r1 bge _0810F56E movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0810F574 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -556875,7 +556875,7 @@ _0810F530: ands r0, r2 strb r0, [r1] adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F56E: pop {r4} pop {r0} @@ -556889,7 +556889,7 @@ sub_0810F578: @ 0x0810F578 push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r1, _0810F5B4 ldrh r0, [r1, #4] strh r0, [r4, #0x2e] @@ -556898,7 +556898,7 @@ sub_0810F578: @ 0x0810F578 ldr r0, _0810F5B8 str r0, [r4, #0x1c] movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0810F5BC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -556972,11 +556972,11 @@ _0810F618: pop {r0} bx r0 .align 2, 0 -_0810F61C: .4byte sub_0810F620 +_0810F61C: .4byte LinkOpponentHandlePaletteFade thumb_func_end sub_0810F5C0 - thumb_func_start sub_0810F620 -sub_0810F620: @ 0x0810F620 + thumb_func_start LinkOpponentHandlePaletteFade +LinkOpponentHandlePaletteFade: @ 0x0810F620 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x32] @@ -557007,12 +557007,12 @@ _0810F650: cmp r0, #0 ble _0810F65E adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F65E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0810F620 + thumb_func_end LinkOpponentHandlePaletteFade thumb_func_start sub_0810F664 sub_0810F664: @ 0x0810F664 @@ -557042,13 +557042,13 @@ _0810F690: _0810F692: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -557061,7 +557061,7 @@ _0810F692: str r0, [sp] adds r0, r5, #0 movs r1, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldrh r0, [r5, #0x2e] adds r0, #1 strh r0, [r5, #0x2e] @@ -557091,7 +557091,7 @@ _0810F6E2: ldrsh r3, [r5, r0] str r1, [sp] adds r0, r5, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldrb r1, [r5, #3] lsls r1, r1, #0x1a lsrs r1, r1, #0x1b @@ -557121,7 +557121,7 @@ _0810F71C: adds r0, r5, #0 bl sub_080A6D64 adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F73C: add sp, #4 pop {r4, r5} @@ -557202,13 +557202,13 @@ _0810F7C4: _0810F7C6: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x20 @@ -557269,7 +557269,7 @@ _0810F83A: cmp r0, #0x1f bne _0810F84E adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F84E: pop {r4} pop {r0} @@ -557342,7 +557342,7 @@ _0810F87A: b _0810F8CE _0810F8C8: adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0810F8CE: pop {r0} bx r0 @@ -557362,14 +557362,14 @@ sub_0810F8D4: @ 0x0810F8D4 ldr r6, _0810F988 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 strh r0, [r1, #0x20] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -557423,7 +557423,7 @@ sub_0810F8D4: @ 0x0810F8D4 mov r0, r8 movs r1, #1 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldr r0, _0810F98C mov r2, r8 str r0, [r2, #0x1c] @@ -557472,14 +557472,14 @@ sub_0810F990: @ 0x0810F990 bge _0810F9D0 _0810F9CA: adds r0, r2, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810F9D0: pop {r0} bx r0 thumb_func_end sub_0810F990 - thumb_func_start sub_0810F9D4 -sub_0810F9D4: @ 0x0810F9D4 + thumb_func_start unref_sub_810F184 +unref_sub_810F184: @ 0x0810F9D4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -557489,7 +557489,7 @@ sub_0810F9D4: @ 0x0810F9D4 cmp r0, #0 bne _0810FA0C movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0810FA08 @@ -557507,7 +557507,7 @@ _0810FA04: .4byte gUnknown_20380BE _0810FA08: .4byte gUnknown_20205AC _0810FA0C: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0810FA38 @@ -557529,7 +557529,7 @@ _0810FA2A: bx r0 .align 2, 0 _0810FA38: .4byte gUnknown_20205AC - thumb_func_end sub_0810F9D4 + thumb_func_end unref_sub_810F184 thumb_func_start sub_0810FA3C sub_0810FA3C: @ 0x0810FA3C @@ -557537,13 +557537,13 @@ sub_0810FA3C: @ 0x0810FA3C mov r7, r8 push {r7} adds r5, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldr r0, _0810FAFC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810FA62 @@ -557581,20 +557581,20 @@ _0810FA7E: orrs r1, r0 lsrs r6, r1, #0x1f adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FAB4 adds r0, r4, #0 adds r1, r6, #0 movs r2, #0 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG _0810FAB4: movs r0, #2 adds r4, r0, #0 eors r4, r7 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FAD4 @@ -557603,18 +557603,18 @@ _0810FAB4: adds r0, r4, #0 adds r1, r6, #0 movs r2, #0 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG _0810FAD4: mov r0, r8 cmp r0, #0 bne _0810FB08 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0810FB08 ldr r0, _0810FAFC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810FB00 @@ -557632,7 +557632,7 @@ _0810FB00: _0810FB08: ldr r6, _0810FB70 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810FB1E @@ -557643,7 +557643,7 @@ _0810FB08: _0810FB1E: ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0810FB74 lsrs r0, r0, #0x18 @@ -557652,7 +557652,7 @@ _0810FB1E: strh r0, [r5, #0x20] ldrb r0, [r6] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #2] @@ -557661,7 +557661,7 @@ _0810FB42: strh r0, [r5, #0x22] ldr r0, _0810FB74 ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x14 movs r1, #0x80 @@ -557713,7 +557713,7 @@ sub_0810FB90: @ 0x0810FB90 b _0810FC06 _0810FBAC: adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FBD2 @@ -557734,7 +557734,7 @@ _0810FBD2: movs r0, #2 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FBFC @@ -557880,7 +557880,7 @@ sub_0810FCBC: @ 0x0810FCBC rsbs r1, r1, #0 cmp r0, r1 bne _0810FD62 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810FD52 @@ -557890,7 +557890,7 @@ sub_0810FCBC: @ 0x0810FCBC lsrs r4, r0, #0x18 adds r6, r4, #0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FD24 @@ -557913,7 +557913,7 @@ _0810FD24: adds r4, r0, #0 eors r4, r6 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FD52 @@ -557954,7 +557954,7 @@ _0810FD70: .4byte sub_0810FD74 sub_0810FD74: @ 0x0810FD74 push {r4, r5, r6, lr} adds r6, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810FDCC @@ -557972,7 +557972,7 @@ sub_0810FD74: @ 0x0810FD74 orrs r1, r0 lsrs r5, r1, #0x1f adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FDB2 @@ -557982,7 +557982,7 @@ _0810FDB2: movs r0, #2 eors r4, r0 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0810FDCC @@ -557997,7 +557997,7 @@ _0810FDCC: pop {r0} bx r0 .align 2, 0 -_0810FDD8: .4byte sub_080A34C4 +_0810FDD8: .4byte DestroyAnimSprite thumb_func_end sub_0810FD74 thumb_func_start sub_0810FDDC @@ -558016,17 +558016,17 @@ sub_0810FDDC: @ 0x0810FDDC bne _0810FDF6 movs r6, #1 _0810FDF6: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0810FE3E - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0810FE3E ldr r0, _0810FE2C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0810FE30 @@ -558057,7 +558057,7 @@ _0810FE3E: bne _0810FE58 adds r0, r4, #0 adds r1, r6, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _0810FE60 .align 2, 0 _0810FE54: .4byte gUnknown_20380BE @@ -558079,7 +558079,7 @@ _0810FE68: cmp r0, #0 beq _0810FE7C adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0810FE7C: pop {r4, r5, r6} pop {r0} @@ -558094,18 +558094,18 @@ sub_0810FE84: @ 0x0810FE84 ldr r4, _0810FECC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0810FED4 @@ -558135,14 +558135,14 @@ _0810FEE2: strh r0, [r5, #0x30] ldr r1, _0810FEF8 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810FEFC str r0, [r5, #0x1c] pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0810FEF8: .4byte sub_080A34C4 +_0810FEF8: .4byte DestroyAnimSprite _0810FEFC: .4byte RunStoredCallbackWhenAnimEnds thumb_func_end sub_0810FE84 @@ -558153,7 +558153,7 @@ sub_0810FF00: @ 0x0810FF00 ldr r6, _0810FF84 ldrb r0, [r6] movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r1, r0, #0x10 lsrs r0, r0, #0x1f @@ -558162,7 +558162,7 @@ sub_0810FF00: @ 0x0810FF00 lsrs r4, r1, #0x10 ldrb r0, [r6] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r1, r0, #0x10 lsrs r0, r0, #0x1f @@ -558172,7 +558172,7 @@ sub_0810FF00: @ 0x0810FF00 lsls r1, r1, #0x10 lsrs r7, r1, #0x10 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -558183,14 +558183,14 @@ sub_0810FF00: @ 0x0810FF00 _0810FF46: ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r4 strh r0, [r5, #0x20] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r7 @@ -558204,7 +558204,7 @@ _0810FF46: _0810FF72: ldr r1, _0810FF88 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0810FF8C str r0, [r5, #0x1c] pop {r4, r5, r6, r7} @@ -558288,7 +558288,7 @@ _08110004: cmp r0, r1 bne _0811001C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0811001C: pop {r4} pop {r0} @@ -558307,7 +558307,7 @@ sub_08110024: @ 0x08110024 ldr r0, _08110054 adds r4, r4, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -558336,7 +558336,7 @@ sub_08110060: @ 0x08110060 lsls r0, r0, #3 ldr r1, _08110088 adds r0, r0, r1 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _08110080 @@ -558361,7 +558361,7 @@ sub_0811008C: @ 0x0811008C ldr r0, _081100D8 adds r4, r1, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -558370,7 +558370,7 @@ sub_0811008C: @ 0x0811008C strh r1, [r4, #0xc] ldr r0, _081100DC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r1, #8 cmp r0, #0 @@ -558415,7 +558415,7 @@ sub_081100E8: @ 0x081100E8 _08110108: .4byte gUnknown_3005B60 _0811010C: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData ldrh r0, [r4, #0xc] adds r0, #1 strh r0, [r4, #0xc] @@ -558471,7 +558471,7 @@ _08110150: lsls r1, r1, #1 strh r1, [r0, #0x20] ldrb r0, [r4, #8] - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r5, #0 bl DestroyAnimVisualTask _08110186: @@ -558499,19 +558499,19 @@ sub_08110190: @ 0x08110190 ldr r4, _0811021C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x24] ldrb r0, [r4] movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r1, #3 @@ -558520,7 +558520,7 @@ sub_08110190: @ 0x08110190 lsrs r6, r0, #0x10 ldrb r0, [r4] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r1, #3 @@ -558599,7 +558599,7 @@ _0811026A: movs r3, #0x24 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r0, #0xc @@ -558795,7 +558795,7 @@ _081103DA: cmp r1, r0 bne _081103EC adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081103EC: ldrh r0, [r4, #0x30] adds r0, #1 @@ -558817,13 +558817,13 @@ sub_081103F8: @ 0x081103F8 ldr r4, _08110438 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -558851,7 +558851,7 @@ sub_08110440: @ 0x08110440 lsls r1, r1, #3 ldr r0, _0811049C adds r5, r1, r0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081104E4 @@ -558865,23 +558865,23 @@ sub_08110440: @ 0x08110440 ldr r4, _081104A8 ldrb r0, [r4] movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 strh r0, [r5, #0x1e] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r5, #0x20] ldr r4, _081104AC ldrb r0, [r4] movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 strh r0, [r5, #0x22] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 b _0811056E .align 2, 0 @@ -558896,18 +558896,18 @@ _081104B0: ldr r4, _081104DC ldrb r0, [r4] movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r5, #0x1e] ldrb r0, [r4] movs r1, #3 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 strh r0, [r5, #0x20] ldr r4, _081104E0 ldrb r0, [r4] movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 b _08110562 .align 2, 0 @@ -558924,23 +558924,23 @@ _081104E4: ldr r4, _08110530 ldrb r0, [r4] movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r5, #0x1e] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r5, #0x20] ldr r4, _08110534 ldrb r0, [r4] movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r5, #0x22] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 b _0811056E .align 2, 0 @@ -558954,24 +558954,24 @@ _08110538: ldr r4, _08110580 ldrb r0, [r4] movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 strh r0, [r5, #0x1e] ldrb r0, [r4] movs r1, #3 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 strh r0, [r5, #0x20] ldr r4, _08110584 ldrb r0, [r4] movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 _08110562: strh r0, [r5, #0x22] ldrb r0, [r4] movs r1, #3 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 _0811056E: strh r0, [r5, #0x24] @@ -559022,7 +559022,7 @@ _081105B0: movs r3, #0x20 ldrsh r2, [r5, r3] movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -559041,7 +559041,7 @@ _081105B0: ldrh r0, [r5, #0x1c] strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldrb r0, [r5, #0xc] movs r1, #3 ands r1, r0 @@ -559083,7 +559083,7 @@ _08110638: sub_08110640: @ 0x08110640 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _0811065E @@ -559112,7 +559112,7 @@ sub_08110664: @ 0x08110664 adds r4, r1, r0 ldr r0, _081106A0 ldrb r0, [r0] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r0, r1, #0 @@ -559232,7 +559232,7 @@ _0811074A: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _08110780 str r0, [r4] add sp, #0xc @@ -559417,7 +559417,7 @@ _081108B8: .4byte gUnknown_3005B60 _081108BC: ldr r1, _081108E0 ldrb r0, [r1] - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend lsls r0, r0, #0x10 lsrs r1, r0, #0x10 mov sb, r1 @@ -559473,7 +559473,7 @@ _081108E4: lsls r2, r2, #1 adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrb r3, [r4, #1] lsrs r1, r3, #6 ldrb r2, [r4, #3] @@ -559484,7 +559484,7 @@ _081108E4: bl CalcCenterToCornerVec ldr r1, _0811097C ldrb r0, [r1] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x22] @@ -559560,14 +559560,14 @@ _081109B6: ldrsh r2, [r4, r1] adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #0x22] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080A7788 + bl SetBattlerSpriteYOffsetFromOtherYScale movs r2, #0xa ldrsh r0, [r4, r2] cmp r0, #0x30 @@ -559599,14 +559599,14 @@ _08110A08: ldrsh r2, [r4, r1] adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #0x22] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080A7788 + bl SetBattlerSpriteYOffsetFromOtherYScale movs r2, #0xa ldrsh r0, [r4, r2] cmp r0, #0 @@ -559622,7 +559622,7 @@ _08110A58: lsls r0, r0, #2 ldr r1, _08110A74 adds r0, r0, r1 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram _08110A6A: ldrh r0, [r4, #8] adds r0, #1 @@ -559667,17 +559667,17 @@ _08110AB0: ldr r4, _08110B04 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08110ADE @@ -559713,12 +559713,12 @@ _08110B08: beq _08110BB0 movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xcb - bl sub_080A307C + bl PlaySE12WithPanning adds r0, r5, #0 movs r1, #1 bl ChangeSpriteAffineAnim @@ -559784,7 +559784,7 @@ _08110B9A: movs r1, #0 bl SetGpuReg adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08110BB0: pop {r4, r5} pop {r0} @@ -559796,7 +559796,7 @@ _08110BB0: sub_08110BB8: @ 0x08110BB8 push {r4, r5, r6, lr} adds r6, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08110BE4 @@ -559816,7 +559816,7 @@ _08110BE0: .4byte gUnknown_20380BE _08110BE4: ldr r0, _08110C78 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08110C14 @@ -559840,7 +559840,7 @@ _08110C14: ldr r5, _08110C78 ldrb r0, [r5] movs r1, #2 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 ldr r4, _08110C7C lsrs r0, r0, #0x18 @@ -559849,7 +559849,7 @@ _08110C14: strh r0, [r6, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -559859,7 +559859,7 @@ _08110C14: strh r0, [r6, #0x2e] ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -559867,7 +559867,7 @@ _08110C14: strh r0, [r6, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #6] @@ -559877,7 +559877,7 @@ _08110C14: str r0, [r6, #0x1c] ldr r1, _08110C84 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6} pop {r0} bx r0 @@ -559885,14 +559885,14 @@ _08110C14: _08110C78: .4byte gUnknown_20380D7 _08110C7C: .4byte gUnknown_20380BE _08110C80: .4byte sub_080A67B4 -_08110C84: .4byte sub_080A34C4 +_08110C84: .4byte DestroyAnimSprite thumb_func_end sub_08110BB8 thumb_func_start sub_08110C88 sub_08110C88: @ 0x08110C88 push {r4, r5, r6, lr} adds r6, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08110CAC @@ -559909,7 +559909,7 @@ _08110CA8: .4byte gUnknown_20380BE _08110CAC: ldr r0, _08110D24 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08110CC8 @@ -559924,7 +559924,7 @@ _08110CC8: ldr r5, _08110D24 ldrb r0, [r5] movs r1, #2 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 ldr r4, _08110D28 lsrs r0, r0, #0x18 @@ -559933,7 +559933,7 @@ _08110CC8: strh r0, [r6, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -559943,13 +559943,13 @@ _08110CC8: strh r0, [r6, #0x2e] ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x36] @@ -559957,7 +559957,7 @@ _08110CC8: str r0, [r6, #0x1c] ldr r1, _08110D30 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6} pop {r0} bx r0 @@ -559965,14 +559965,14 @@ _08110CC8: _08110D24: .4byte gUnknown_20380D7 _08110D28: .4byte gUnknown_20380BE _08110D2C: .4byte sub_080A67B4 -_08110D30: .4byte sub_080A34C4 +_08110D30: .4byte DestroyAnimSprite thumb_func_end sub_08110C88 - thumb_func_start sub_08110D34 -sub_08110D34: @ 0x08110D34 + thumb_func_start AnimTranslateWebThread +AnimTranslateWebThread: @ 0x08110D34 push {r4, r5, lr} adds r5, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08110D50 @@ -559986,7 +559986,7 @@ sub_08110D34: @ 0x08110D34 _08110D50: adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r1, _08110D90 ldrh r0, [r1, #4] strh r0, [r5, #0x2e] @@ -560001,13 +560001,13 @@ _08110D50: ldr r4, _08110D94 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -560039,7 +560039,7 @@ _08110DAA: _08110DC0: .4byte gUnknown_20380D7 _08110DC4: .4byte gUnknown_20380BE _08110DC8: .4byte sub_08110DCC - thumb_func_end sub_08110D34 + thumb_func_end AnimTranslateWebThread thumb_func_start sub_08110DCC sub_08110DCC: @ 0x08110DCC @@ -560050,7 +560050,7 @@ sub_08110DCC: @ 0x08110DCC cmp r0, #0 beq _08110DE2 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _08110DFE _08110DE2: movs r1, #0x3a @@ -560086,7 +560086,7 @@ sub_08110E04: @ 0x08110E04 bl SetAverageBattlerPositions ldr r0, _08110E38 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08110E40 @@ -560114,7 +560114,7 @@ _08110E4C: strh r0, [r4, #0x22] ldr r0, _08110E78 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08110E68 @@ -560170,7 +560170,7 @@ _08110EB4: cmp r0, #0x33 bne _08110EC8 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08110EC8: pop {r0} bx r0 @@ -560260,18 +560260,18 @@ sub_08110F50: @ 0x08110F50 movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 thumb_func_end sub_08110F50 - thumb_func_start sub_08110F70 -sub_08110F70: @ 0x08110F70 + thumb_func_start AnimTranslateStinger +AnimTranslateStinger: @ 0x08110F70 push {r4, r5, r6, r7, lr} sub sp, #4 adds r7, r0, #0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08110F90 @@ -560285,7 +560285,7 @@ _08110F8C: .4byte gUnknown_20380BE _08110F90: ldr r0, _0811108C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08110FB2 @@ -560300,17 +560300,17 @@ _08110F90: rsbs r0, r0, #0 strh r0, [r1, #6] _08110FB2: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08111002 ldr r0, _0811108C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r5, _08111094 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -560339,11 +560339,11 @@ _08110FF0: _08111002: adds r0, r7, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r5, _08111094 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 ldr r6, _08111090 @@ -560354,7 +560354,7 @@ _08111002: lsrs r4, r4, #0x10 ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -560385,7 +560385,7 @@ _08111002: adds r0, r7, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldrh r0, [r6, #8] strh r0, [r7, #0x2e] strh r4, [r7, #0x32] @@ -560394,7 +560394,7 @@ _08111002: str r0, [r7, #0x1c] ldr r1, _0811109C adds r0, r7, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -560404,18 +560404,18 @@ _0811108C: .4byte gUnknown_20380D6 _08111090: .4byte gUnknown_20380BE _08111094: .4byte gUnknown_20380D7 _08111098: .4byte sub_080A67B4 -_0811109C: .4byte sub_080A34C4 - thumb_func_end sub_08110F70 +_0811109C: .4byte DestroyAnimSprite + thumb_func_end AnimTranslateStinger thumb_func_start sub_081110A0 sub_081110A0: @ 0x081110A0 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0811110C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081110C0 @@ -560430,7 +560430,7 @@ _081110C0: ldr r5, _08111114 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -560438,7 +560438,7 @@ _081110C0: strh r0, [r6, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #6] @@ -560447,7 +560447,7 @@ _081110C0: ldrh r0, [r4, #0xa] strh r0, [r6, #0x38] adds r0, r6, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _08111118 str r0, [r6, #0x1c] adds r2, r6, #0 @@ -560463,11 +560463,11 @@ _081110C0: _0811110C: .4byte gUnknown_20380D6 _08111110: .4byte gUnknown_20380BE _08111114: .4byte gUnknown_20380D7 -_08111118: .4byte sub_0811111C +_08111118: .4byte AnimMissileArcStep thumb_func_end sub_081110A0 - thumb_func_start sub_0811111C -sub_0811111C: @ 0x0811111C + thumb_func_start AnimMissileArcStep +AnimMissileArcStep: @ 0x0811111C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -560481,12 +560481,12 @@ sub_0811111C: @ 0x0811111C ands r1, r0 strb r1, [r2] adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08111148 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _081111D8 _08111148: movs r0, #0x2e @@ -560516,7 +560516,7 @@ _0811115E: lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 bne _081111D8 @@ -560548,7 +560548,7 @@ _0811115E: adds r0, r4, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale add r2, sp, #4 mov r1, r8 movs r3, #7 @@ -560567,7 +560567,7 @@ _081111D8: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0811111C + thumb_func_end AnimMissileArcStep thumb_func_start sub_081111E4 sub_081111E4: @ 0x081111E4 @@ -560588,20 +560588,20 @@ _08111200: _08111202: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x12 strh r0, [r5, #0x22] ldr r1, _08111238 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0811123C str r0, [r5, #0x1c] pop {r4, r5} @@ -560609,7 +560609,7 @@ _08111202: bx r0 .align 2, 0 _08111234: .4byte gUnknown_20380D7 -_08111238: .4byte sub_080A6014 +_08111238: .4byte DestroySpriteAndMatrix _0811123C: .4byte RunStoredCallbackWhenAffineAnimEnds thumb_func_end sub_081111E4 @@ -560643,7 +560643,7 @@ _08111260: adds r0, r5, #0 bl StartSpriteAnim adds r0, r5, #0 - bl sub_08007358 + bl AnimateSprite strh r4, [r5, #0x2e] strh r4, [r5, #0x30] movs r0, #4 @@ -560656,7 +560656,7 @@ _08111260: strh r0, [r5, #0x38] ldr r1, _081112B8 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _081112BC str r1, [r5, #0x1c] adds r0, r5, #0 @@ -560669,7 +560669,7 @@ _081112AC: .4byte gUnknown_20380BE _081112B0: .4byte gUnknown_20380D7 _081112B4: .4byte 0x0000FFBA _081112B8: .4byte sub_081112C0 -_081112BC: .4byte sub_080A5D18 +_081112BC: .4byte TranslateSpriteInEllipseOverDuration thumb_func_end sub_08111240 thumb_func_start sub_081112C0 @@ -560691,7 +560691,7 @@ sub_081112C0: @ 0x081112C0 strh r0, [r4, #0x36] ldr r1, _081112FC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _08111300 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -560701,8 +560701,8 @@ sub_081112C0: @ 0x081112C0 bx r0 .align 2, 0 _081112F8: .4byte 0x0000FFE8 -_081112FC: .4byte sub_080A6014 -_08111300: .4byte sub_080A5D18 +_081112FC: .4byte DestroySpriteAndMatrix +_08111300: .4byte TranslateSpriteInEllipseOverDuration thumb_func_end sub_081112C0 thumb_func_start sub_08111304 @@ -560713,10 +560713,10 @@ sub_08111304: @ 0x08111304 ldrb r1, [r4, #0xa] bl StartSpriteAnim adds r0, r5, #0 - bl sub_08007358 + bl AnimateSprite ldr r0, _08111330 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08111334 @@ -560751,21 +560751,21 @@ _0811133A: adds r2, r2, r0 strh r2, [r5, #0x36] adds r0, r5, #0 - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation strh r4, [r5, #0x34] strh r4, [r5, #0x36] ldr r0, _08111380 str r0, [r5, #0x1c] ldr r1, _08111384 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0811137C: .4byte gUnknown_20380BE _08111380: .4byte TranslateSpriteLinearFixedPoint -_08111384: .4byte sub_080A6014 +_08111384: .4byte DestroySpriteAndMatrix thumb_func_end sub_08111304 thumb_func_start sub_08111388 @@ -560779,7 +560779,7 @@ sub_08111388: @ 0x08111388 bne _081113A4 adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _081113AC .align 2, 0 _081113A0: .4byte gUnknown_20380BE @@ -560841,15 +560841,15 @@ sub_081113D0: @ 0x081113D0 cmp r0, r1 bne _08111416 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08111416: pop {r4} pop {r0} bx r0 thumb_func_end sub_081113D0 - thumb_func_start sub_0811141C -sub_0811141C: @ 0x0811141C + thumb_func_start AnimTask_LoadSandstormBackground +AnimTask_LoadSandstormBackground: @ 0x0811141C push {r4, r5, r6, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -560865,19 +560865,19 @@ sub_0811141C: @ 0x0811141C movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08111460 movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _08111460: ldr r0, _081114DC strh r5, [r0] @@ -560896,7 +560896,7 @@ _08111460: ldr r1, _081114E4 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r1, _081114E8 mov r0, sp movs r2, #0 @@ -560906,7 +560906,7 @@ _08111460: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081114F0 movs r1, #0 ldrsh r0, [r0, r1] @@ -560914,7 +560914,7 @@ _08111460: beq _081114BE ldr r0, _081114F4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081114BE @@ -560943,7 +560943,7 @@ _081114F0: .4byte gUnknown_20380BE _081114F4: .4byte gUnknown_20380D6 _081114F8: .4byte gUnknown_3005B60 _081114FC: .4byte sub_08111500 - thumb_func_end sub_0811141C + thumb_func_end AnimTask_LoadSandstormBackground thumb_func_start sub_08111500 sub_08111500: @ 0x08111500 @@ -561108,14 +561108,14 @@ _08111640: .align 2, 0 _08111648: .4byte gUnknown_3005B60 _0811164C: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08111660 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _08111660: ldr r0, _08111694 movs r1, #0 @@ -561131,7 +561131,7 @@ _08111660: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute adds r0, r5, #0 bl DestroyAnimVisualTask _0811168A: @@ -561144,8 +561144,8 @@ _08111694: .4byte gUnknown_2022ACC _08111698: .4byte gUnknown_2022ACE thumb_func_end sub_08111500 - thumb_func_start sub_0811169C -sub_0811169C: @ 0x0811169C + thumb_func_start AnimDirtParticleAcrossScreen +AnimDirtParticleAcrossScreen: @ 0x0811169C push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x2e @@ -561159,7 +561159,7 @@ sub_0811169C: @ 0x0811169C beq _081116E8 ldr r0, _081116E4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081116E8 @@ -561190,7 +561190,7 @@ _081116EC: strh r0, [r5, #0x22] ldr r1, _08111714 adds r0, r5, #0 - bl sub_0800858C + bl SetSubspriteTables ldrh r0, [r4, #2] strh r0, [r5, #0x30] ldrh r0, [r4, #4] @@ -561257,11 +561257,11 @@ _08111774: pop {r0} bx r0 .align 2, 0 -_0811177C: .4byte sub_080A34C4 - thumb_func_end sub_0811169C +_0811177C: .4byte DestroyAnimSprite + thumb_func_end AnimDirtParticleAcrossScreen - thumb_func_start sub_08111780 -sub_08111780: @ 0x08111780 + thumb_func_start AnimRaiseSprite +AnimRaiseSprite: @ 0x08111780 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _081117B8 @@ -561269,7 +561269,7 @@ sub_08111780: @ 0x08111780 bl StartSpriteAnim adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldrh r0, [r5, #6] strh r0, [r4, #0x2e] ldrh r0, [r4, #0x20] @@ -561282,15 +561282,15 @@ sub_08111780: @ 0x08111780 str r0, [r4, #0x1c] ldr r1, _081117C0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081117B8: .4byte gUnknown_20380BE _081117BC: .4byte sub_080A67B4 -_081117C0: .4byte sub_080A34C4 - thumb_func_end sub_08111780 +_081117C0: .4byte DestroyAnimSprite + thumb_func_end AnimRaiseSprite thumb_func_start sub_081117C4 sub_081117C4: @ 0x081117C4 @@ -561309,13 +561309,13 @@ sub_081117C4: @ 0x081117C4 ldr r5, _08111848 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r1, #0xc0 @@ -561325,13 +561325,13 @@ sub_081117C4: @ 0x081117C4 ldr r4, _0811184C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r2, #0xc0 @@ -561402,13 +561402,13 @@ _0811186E: strh r4, [r6, #0x16] movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r4, r0, #0 lsls r4, r4, #0x18 asrs r4, r4, #8 lsrs r4, r4, #0x10 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 strh r4, [r6, #0x22] asrs r0, r0, #0x18 @@ -561421,7 +561421,7 @@ _0811186E: strh r0, [r6, #0x24] strh r5, [r6, #0xa] movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x26] @@ -561514,7 +561514,7 @@ _08111984: lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xa2 - bl sub_080A307C + bl PlaySE12WithPanning b _08111A5C .align 2, 0 _08111994: .4byte gUnknown_20205AC @@ -561600,7 +561600,7 @@ _081119FC: lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xaf - bl sub_080A307C + bl PlaySE12WithPanning _08111A3A: ldrh r0, [r4, #0x18] subs r0, #1 @@ -561692,7 +561692,7 @@ _08111AC0: asrs r2, r2, #0x10 adds r0, r3, #0 movs r3, #0x23 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -561736,7 +561736,7 @@ _08111AC0: ands r1, r3 orrs r1, r2 strh r1, [r0, #4] - bl sub_080A619C + bl InitAnimArcTranslation ldrh r0, [r4, #0x1e] adds r0, #1 strh r0, [r4, #0x1e] @@ -561760,12 +561760,12 @@ _08111B68: .4byte 0xFFFFFC00 sub_08111B6C: @ 0x08111B6C push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08111B9E ldr r0, _08111BA4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -561889,7 +561889,7 @@ _08111C50: cmp r0, #0 bne _08111C62 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08111C62: pop {r0} bx r0 @@ -561902,7 +561902,7 @@ sub_08111C68: @ 0x08111C68 adds r4, r0, #0 ldr r0, _08111C90 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -561927,13 +561927,13 @@ sub_08111C94: @ 0x08111C94 ldr r5, _08111CE0 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08111CE4 @@ -561997,15 +561997,15 @@ sub_08111CEC: @ 0x08111CEC cmp r0, #0x8c ble _08111D36 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08111D36: pop {r4} pop {r0} bx r0 thumb_func_end sub_08111CEC - thumb_func_start sub_08111D3C -sub_08111D3C: @ 0x08111D3C + thumb_func_start SafariHandleLoadMonSprite +SafariHandleLoadMonSprite: @ 0x08111D3C push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -562039,7 +562039,7 @@ _08111D6A: .align 2, 0 _08111D74: .4byte gUnknown_20380A4 _08111D78: .4byte gUnknown_20380BE - thumb_func_end sub_08111D3C + thumb_func_end SafariHandleLoadMonSprite thumb_func_start sub_08111D7C sub_08111D7C: @ 0x08111D7C @@ -562156,7 +562156,7 @@ sub_08111E5C: @ 0x08111E5C push {r4, r5, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _08111EB8 ldrh r0, [r0, #4] strh r0, [r4, #0x2e] @@ -562165,7 +562165,7 @@ sub_08111E5C: @ 0x08111E5C ldr r5, _08111EBC ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -562173,7 +562173,7 @@ sub_08111E5C: @ 0x08111E5C strh r0, [r4, #0x34] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] @@ -562249,7 +562249,7 @@ _08111F1C: movs r1, #0 ldrsb r1, [r0, r1] movs r0, #0xc4 - bl sub_080A307C + bl PlaySE12WithPanning _08111F2E: pop {r4} pop {r0} @@ -562476,7 +562476,7 @@ _081120A2: cmp r0, #0x3d bne _081120D4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081120D4: pop {r4} pop {r0} @@ -562499,18 +562499,18 @@ sub_081120DC: @ 0x081120DC movs r0, #0x52 bl SetGpuReg movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #1 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale adds r0, r4, #0 movs r1, #0x80 movs r2, #0x80 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldr r1, _08112154 lsls r0, r4, #4 adds r0, r0, r4 @@ -562617,7 +562617,7 @@ sub_081121BC: @ 0x081121BC _081121E0: .4byte gUnknown_3005B60 _081121E4: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldrh r0, [r4, #8] @@ -562632,11 +562632,11 @@ _081121E4: adds r0, r1, #0 adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale b _08112228 _0811220C: adds r0, r1, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r5, #0 bl DestroyAnimVisualTask movs r0, #0x50 @@ -562652,8 +562652,8 @@ _08112228: .align 2, 0 thumb_func_end sub_081121BC - thumb_func_start sub_08112230 -sub_08112230: @ 0x08112230 + thumb_func_start InitAnimShadowBall +InitAnimShadowBall: @ 0x08112230 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -562666,7 +562666,7 @@ sub_08112230: @ 0x08112230 mov r8, r0 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -562675,7 +562675,7 @@ sub_08112230: @ 0x08112230 mov r1, r8 ldrb r0, [r1] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -562731,11 +562731,11 @@ sub_08112230: @ 0x08112230 .align 2, 0 _081122CC: .4byte gUnknown_20380D6 _081122D0: .4byte gUnknown_20380BE -_081122D4: .4byte sub_081122D8 - thumb_func_end sub_08112230 +_081122D4: .4byte AnimShadowBallStep + thumb_func_end InitAnimShadowBall - thumb_func_start sub_081122D8 -sub_081122D8: @ 0x081122D8 + thumb_func_start AnimShadowBallStep +AnimShadowBallStep: @ 0x081122D8 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x2e @@ -562785,13 +562785,13 @@ _08112322: ldr r4, _08112388 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x30] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] @@ -562848,13 +562848,13 @@ _0811238C: ldr r4, _081123DC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -562867,12 +562867,12 @@ _081123D2: _081123DC: .4byte gUnknown_20380D7 _081123E0: adds r0, r5, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _081123E6: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081122D8 + thumb_func_end AnimShadowBallStep thumb_func_start sub_081123EC sub_081123EC: @ 0x081123EC @@ -562966,7 +562966,7 @@ _08112488: cmp r6, #0 beq _08112494 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _0811249A _08112494: ldrh r0, [r3, #0x30] @@ -562989,7 +562989,7 @@ sub_081124A0: @ 0x081124A0 ldr r1, _081124CC adds r5, r0, r1 movs r0, #1 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend movs r6, #0 movs r1, #0 strh r0, [r5, #8] @@ -563031,7 +563031,7 @@ _081124D0: strh r1, [r0, #0x2e] ldr r0, _0811253C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08112544 @@ -563096,7 +563096,7 @@ _08112562: lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _081125BC - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 movs r0, #8 ldrsh r1, [r5, r0] lsls r0, r1, #4 @@ -563198,7 +563198,7 @@ _0811262A: lsls r0, r0, #2 ldr r1, _08112668 adds r0, r0, r1 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram movs r0, #1 strh r0, [r4, #0x10] b _08112698 @@ -563311,7 +563311,7 @@ _08112720: cmp r0, #0xf beq _0811274E movs r0, #1 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend strh r0, [r5, #8] lsls r0, r0, #0x10 cmp r0, #0 @@ -563390,7 +563390,7 @@ _0811275C: movs r0, #0x10 strh r0, [r5, #0xe] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -563419,7 +563419,7 @@ _08112814: lsls r1, r1, #3 _08112818: movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits b _08112916 _08112820: movs r1, #0x24 @@ -563500,7 +563500,7 @@ _081128A4: _081128BC: movs r2, #2 movs r3, #6 - bl sub_080B9ADC + bl ScanlineEffect_InitWave lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x1c] @@ -563532,13 +563532,13 @@ _081128F8: movs r1, #0x80 lsls r1, r1, #2 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits b _08112912 _08112908: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits _08112912: ldr r0, _08112928 str r0, [r5] @@ -563668,7 +563668,7 @@ _081129FE: movs r0, #3 strb r0, [r1, #0x15] movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x24] @@ -563684,7 +563684,7 @@ _08112A20: lsls r1, r1, #3 _08112A24: movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits b _08112AA8 _08112A2C: ldrh r0, [r4, #0x10] @@ -563714,7 +563714,7 @@ _08112A40: adds r0, r0, r1 lsls r0, r0, #2 adds r0, r0, r3 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram ldr r0, _08112A94 bl FreeSpritePaletteByTag movs r0, #0x50 @@ -563728,7 +563728,7 @@ _08112A40: movs r1, #0x80 lsls r1, r1, #2 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits b _08112AA2 .align 2, 0 _08112A90: .4byte gUnknown_20205AC @@ -563737,7 +563737,7 @@ _08112A98: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits _08112AA2: adds r0, r5, #0 bl DestroyAnimVisualTask @@ -563766,12 +563766,12 @@ sub_08112AB4: @ 0x08112AB4 ldr r4, _08112AF4 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r2, #0xe0 @@ -563788,12 +563788,12 @@ _08112AFC: ldr r4, _08112BC4 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r2, #0xe0 @@ -563804,13 +563804,13 @@ _08112AFC: _08112B20: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #8 movs r1, #0xe0 @@ -563961,17 +563961,17 @@ sub_08112C14: @ 0x08112C14 ldr r4, _08112D6C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #4] ldrb r0, [r4] movs r1, #3 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #8] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08112C84 @@ -563993,7 +563993,7 @@ _08112C86: lsls r0, r4, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08112D52 @@ -564005,7 +564005,7 @@ _08112C86: adds r1, r6, #0 adds r2, r7, #0 movs r3, #0x37 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -564013,13 +564013,13 @@ _08112C86: beq _08112D52 adds r0, r4, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 adds r0, r4, #0 movs r1, #3 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 @@ -564103,7 +564103,7 @@ _08112D80: adds r1, r7, #0 ldr r2, [sp, #0xc] movs r3, #0x37 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -564402,11 +564402,11 @@ sub_08112FA8: @ 0x08112FA8 bl SetGpuReg ldr r0, _08113004 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08112FF0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08113008 @@ -564607,7 +564607,7 @@ _08113188: movs r1, #0 movs r2, #0x10 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081131D8 str r0, [r4] _081131B6: @@ -564682,10 +564682,10 @@ sub_08113240: @ 0x08113240 push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0811326C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08113274 @@ -564774,7 +564774,7 @@ _081132AE: str r0, [r3, #0x1c] ldr r1, _0811330C adds r0, r3, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 b _08113314 .align 2, 0 _08113300: .4byte 0x000003FF @@ -564872,7 +564872,7 @@ sub_08113394: @ 0x08113394 ldr r0, _081133C4 strh r1, [r0] adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -564892,7 +564892,7 @@ sub_081133C8: @ 0x081133C8 strh r0, [r5, #0x24] ldr r0, _08113430 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081133EC @@ -565000,7 +565000,7 @@ sub_0811349C: @ 0x0811349C movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -565027,18 +565027,18 @@ sub_081134BC: @ 0x081134BC ldr r5, _08113558 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1a] ldrb r0, [r5] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1c] ldrb r0, [r5] movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r0, r0, #0x10 asrs r1, r0, #0x10 lsrs r0, r0, #0x1f @@ -565048,7 +565048,7 @@ sub_081134BC: @ 0x081134BC strh r1, [r4, #0x1e] strh r6, [r4, #0x16] ldrb r0, [r5] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x12] @@ -565123,7 +565123,7 @@ _081135A6: ldrsh r2, [r4, r0] ldrb r3, [r4, #0x14] ldr r0, _08113608 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -565136,7 +565136,7 @@ _081135A6: strh r7, [r5, #0x2e] ldr r0, _08113610 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide movs r1, #0 lsls r0, r0, #0x18 cmp r0, #0 @@ -565519,7 +565519,7 @@ _081138A4: bx r0 .align 2, 0 _081138AC: .4byte gUnknown_20205AC -_081138B0: .4byte sub_080A6014 +_081138B0: .4byte DestroySpriteAndMatrix thumb_func_end sub_08113808 thumb_func_start sub_081138B4 @@ -565529,18 +565529,18 @@ sub_081138B4: @ 0x081138B4 ldr r4, _081138FC ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08113904 @@ -565587,7 +565587,7 @@ _0811390E: strb r0, [r2] ldr r1, _08113948 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0811394C str r0, [r5, #0x1c] pop {r4, r5} @@ -565595,8 +565595,8 @@ _0811390E: bx r0 .align 2, 0 _08113944: .4byte gUnknown_20380BE -_08113948: .4byte sub_080A6014 -_0811394C: .4byte sub_080A5FA4 +_08113948: .4byte DestroySpriteAndMatrix +_0811394C: .4byte TranslateSpriteLinearAndFlicker thumb_func_end sub_081138B4 thumb_func_start sub_08113950 @@ -565607,19 +565607,19 @@ sub_08113950: @ 0x08113950 ldr r4, _081139A8 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] ldr r0, _081139AC ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081139B4 @@ -565673,14 +565673,14 @@ _081139DE: str r0, [r5, #0x1c] ldr r1, _08113A00 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081139F8: .4byte gUnknown_20380BE _081139FC: .4byte sub_080A67B4 -_08113A00: .4byte sub_080A6014 +_08113A00: .4byte DestroySpriteAndMatrix thumb_func_end sub_08113950 thumb_func_start sub_08113A04 @@ -565702,13 +565702,13 @@ _08113A20: _08113A22: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -565716,7 +565716,7 @@ _08113A22: movs r0, #2 ldrsh r1, [r4, r0] adds r0, r5, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r4, #4] ldrh r1, [r5, #0x22] adds r0, r0, r1 @@ -565725,7 +565725,7 @@ _08113A22: str r0, [r5, #0x1c] ldr r1, _08113A70 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 @@ -565733,7 +565733,7 @@ _08113A22: _08113A64: .4byte gUnknown_20380D7 _08113A68: .4byte gUnknown_20380BE _08113A6C: .4byte RunStoredCallbackWhenAnimEnds -_08113A70: .4byte sub_080A6014 +_08113A70: .4byte DestroySpriteAndMatrix thumb_func_end sub_08113A04 thumb_func_start sub_08113A74 @@ -565742,7 +565742,7 @@ sub_08113A74: @ 0x08113A74 adds r4, r0, #0 ldr r0, _08113A9C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08113A8E @@ -565766,14 +565766,14 @@ sub_08113AA0: @ 0x08113AA0 ldr r4, _08113AF4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 strh r0, [r6, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x22] @@ -565786,12 +565786,12 @@ sub_08113AA0: @ 0x08113AA0 ldr r4, _08113AFC ldrb r0, [r4] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r7, r0, #0x10 lsrs r5, r7, #0x10 ldrb r0, [r4] movs r1, #1 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r1, r0, #0x10 lsrs r0, r1, #0x10 cmp r5, r0 @@ -565957,7 +565957,7 @@ _08113C1E: cmp r0, #0x14 ble _08113C32 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08113C32: pop {r4, r5} pop {r0} @@ -566008,7 +566008,7 @@ _08113C7A: strb r5, [r0, #9] ldr r0, _08113CFC ldrb r0, [r0] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -566048,7 +566048,7 @@ _08113CD8: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _08113D04 str r0, [r4] add sp, #0xc @@ -566243,14 +566243,14 @@ sub_08113E3C: @ 0x08113E3C mov r8, r1 ldrb r0, [r1] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] mov r2, r8 ldrb r0, [r2] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r3, [r5, #8] @@ -566342,7 +566342,7 @@ sub_08113EEC: @ 0x08113EEC cmp r0, r1 ble _08113F30 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08113F30: pop {r4} pop {r0} @@ -566601,33 +566601,33 @@ sub_08114124: @ 0x08114124 ldr r6, _08114190 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x30] ldr r5, _08114194 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x34] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] movs r0, #0x7e strh r0, [r4, #0x2e] adds r0, r4, #0 - bl sub_080A66DC + bl InitSpriteDataForLinearTranslation ldrh r0, [r4, #0x30] rsbs r0, r0, #0 strh r0, [r4, #0x34] @@ -566717,7 +566717,7 @@ _08114212: cmp r0, #0 bne _08114224 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08114224: pop {r4, r5, r6} pop {r0} @@ -566818,7 +566818,7 @@ sub_081142A8: @ 0x081142A8 cmp r0, #0 bne _081142DA adds r0, r3, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _081142DA: pop {r0} bx r0 @@ -566878,47 +566878,47 @@ _08114338: _08114342: adds r0, r5, #0 movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 strh r0, [r4, #0x20] adds r0, r5, #0 movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r4, #0x22] b _081143B0 _0811435C: adds r0, r5, #0 movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #0xe strh r0, [r4, #0x20] adds r0, r5, #0 movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #0x10 strh r0, [r4, #0x22] b _081143B0 _08114376: adds r0, r5, #0 movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 strh r0, [r4, #0x20] adds r0, r5, #0 movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 b _081143A4 _0811438E: adds r0, r5, #0 movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #0xe strh r0, [r4, #0x20] adds r0, r5, #0 movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #0x10 _081143A4: strh r0, [r4, #0x22] @@ -566940,7 +566940,7 @@ _081143B0: ldr r0, _081143D8 strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _081143DC str r0, [r4, #0x1c] pop {r4, r5, r6, r7} @@ -566955,12 +566955,12 @@ _081143DC: .4byte sub_081143E0 sub_081143E0: @ 0x081143E0 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _081143F4 adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _081143F4: pop {r4} pop {r0} @@ -566982,7 +566982,7 @@ sub_081143FC: @ 0x081143FC ldr r4, _08114464 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x1f @@ -566990,7 +566990,7 @@ sub_081143FC: @ 0x081143FC strh r0, [r5, #0x16] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #7 strh r0, [r5, #0x14] ldrh r1, [r5, #0x16] @@ -567001,7 +567001,7 @@ sub_081143FC: @ 0x081143FC strh r1, [r5, #0x22] ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -567010,7 +567010,7 @@ sub_081143FC: @ 0x081143FC adds r0, #0x20 strh r0, [r5, #0x26] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0811446C @@ -567045,11 +567045,11 @@ _0811446E: lsls r1, r1, #4 movs r0, #0 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette ldr r0, _081144C8 str r0, [sp] movs r7, #2 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08114500 @@ -567072,11 +567072,11 @@ _081144D0: movs r0, #0 movs r1, #0x90 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette ldr r0, _08114590 str r0, [sp] movs r7, #4 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08114500 @@ -567123,7 +567123,7 @@ _0811452C: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams movs r0, #0x3f eors r7, r0 movs r1, #0xfc @@ -567341,7 +567341,7 @@ _081146F8: @ jump table .4byte _08114840 @ case 3 .4byte _081148A8 @ case 4 _0811470C: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -567411,7 +567411,7 @@ _08114790: lsls r1, r1, #4 movs r0, #0 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette b _081147C8 .align 2, 0 _081147B4: .4byte gUnknown_2022ACE @@ -567422,7 +567422,7 @@ _081147B8: movs r0, #0 movs r1, #0x90 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette _081147C8: movs r0, #3 bl sub_08114BC4 @@ -567433,7 +567433,7 @@ _081147D4: ldr r4, _08114820 ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x1f @@ -567441,7 +567441,7 @@ _081147D4: strh r0, [r5, #0x16] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #7 strh r0, [r5, #0x14] ldrh r1, [r5, #0x16] @@ -567450,7 +567450,7 @@ _081147D4: strh r1, [r5, #0x22] ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r1, r0, #4 @@ -567458,7 +567458,7 @@ _081147D4: adds r0, #4 strh r0, [r5, #0x26] ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08114828 @@ -567525,7 +567525,7 @@ _08114860: strb r2, [r4, #9] ldr r0, [sp, #0x10] ldr r2, [r4, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams _08114894: ldrh r0, [r5, #8] adds r0, #1 @@ -567960,7 +567960,7 @@ sub_08114BC4: @ 0x08114BC4 _08114BDA: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -568009,7 +568009,7 @@ sub_08114C10: @ 0x08114C10 ldrb r0, [r6] adds r1, r4, #0 movs r2, #1 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG ldr r0, _08114CB8 mov sb, r0 ldr r0, _08114CBC @@ -568031,7 +568031,7 @@ sub_08114C10: @ 0x08114C10 ldrb r0, [r6] movs r5, #2 eors r0, r5 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08114C9E @@ -568041,7 +568041,7 @@ sub_08114C10: @ 0x08114C10 eors r4, r1 adds r1, r4, #0 movs r2, #1 - bl sub_080A3C54 + bl MoveBattlerSpriteToBG ldrb r0, [r6] eors r0, r5 add r0, r8 @@ -568091,7 +568091,7 @@ sub_08114CC0: @ 0x08114CC0 ldrb r1, [r4] movs r0, #2 eors r0, r1 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08114CFC @@ -568129,18 +568129,18 @@ sub_08114D0C: @ 0x08114D0C str r0, [r4, #0x1c] ldr r1, _08114D44 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4} pop {r0} bx r0 .align 2, 0 _08114D3C: .4byte gUnknown_20380BE _08114D40: .4byte RunStoredCallbackWhenAnimEnds -_08114D44: .4byte sub_080A34C4 +_08114D44: .4byte DestroyAnimSprite thumb_func_end sub_08114D0C - thumb_func_start sub_08114D48 -sub_08114D48: @ 0x08114D48 + thumb_func_start AnimTask_MetallicShine +AnimTask_MetallicShine: @ 0x08114D48 push {r4, r5, r6, r7, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -568159,7 +568159,7 @@ sub_08114D48: @ 0x08114D48 movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _08114E4C movs r0, #0x50 bl SetGpuReg @@ -568169,25 +568169,25 @@ sub_08114D48: @ 0x08114D48 movs r0, #1 movs r1, #4 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08114DAC movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _08114DAC: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08114E26 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08114E26 @@ -568207,7 +568207,7 @@ _08114DDC: ldrb r0, [r4] movs r5, #2 eors r0, r5 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -568237,10 +568237,10 @@ _08114DDC: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r6, #1 _08114E26: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08114E64 @@ -568263,7 +568263,7 @@ _08114E60: .4byte gUnknown_2039BD4 _08114E64: ldr r4, _08114E84 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08114E90 @@ -568292,12 +568292,12 @@ _08114E90: _08114EA0: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 _08114EAC: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -568313,19 +568313,19 @@ _08114EAC: mov r0, sp ldrb r0, [r0, #9] ldr r1, _08114F3C - bl sub_080A6610 + bl AnimLoadCompressedBgTilemap mov r0, sp ldrb r0, [r0, #9] ldr r1, _08114F40 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _08114F44 mov r1, sp ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r2, _08114F48 ldr r0, _08114F4C lsls r1, r4, #4 @@ -568352,7 +568352,7 @@ _08114EAC: bne _08114F58 adds r0, r1, #0 movs r1, #0 - bl sub_080A6DD4 + bl SetGreyscaleOrOriginalPalette b _08114F64 .align 2, 0 _08114F30: .4byte gUnknown_2023D12 @@ -568396,7 +568396,7 @@ _08114F64: _08114F8C: .4byte gUnknown_3005B60 _08114F90: .4byte gUnknown_20380BE _08114F94: .4byte sub_08114F98 - thumb_func_end sub_08114D48 + thumb_func_end AnimTask_MetallicShine thumb_func_start sub_08114F98 sub_08114F98: @ 0x08114F98 @@ -568436,7 +568436,7 @@ _08114FC6: cmp r0, #2 bne _08115074 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _08115068 @@ -568454,7 +568454,7 @@ _08114FC6: bne _08115008 adds r0, r1, #0 movs r1, #1 - bl sub_080A6DD4 + bl SetGreyscaleOrOriginalPalette _08115008: movs r0, #8 ldrsh r1, [r4, r0] @@ -568516,14 +568516,14 @@ _08115074: movs r0, #0x4a adds r1, r4, #0 bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _081150A6 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _081150A6: movs r0, #0 bl GetGpuReg @@ -568555,8 +568555,8 @@ _081150E4: .4byte gUnknown_2022ADA _081150E8: .4byte 0x00003F3F thumb_func_end sub_08114F98 - thumb_func_start sub_081150EC -sub_081150EC: @ 0x081150EC + thumb_func_start AnimTask_SetGreyscaleOrOriginalPal +AnimTask_SetGreyscaleOrOriginalPal: @ 0x081150EC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -568586,7 +568586,7 @@ _08115114: @ jump table .4byte _0811514C @ case 7 _08115134: ldrb r0, [r2] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 b _08115152 @@ -568614,7 +568614,7 @@ _08115158: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0811517C @@ -568639,7 +568639,7 @@ _0811517E: adds r0, #0x10 ldr r1, _081151AC ldrb r1, [r1, #2] - bl sub_080A6DD4 + bl SetGreyscaleOrOriginalPalette _0811519A: adds r0, r5, #0 bl DestroyAnimVisualTask @@ -568649,7 +568649,7 @@ _0811519A: .align 2, 0 _081151A8: .4byte gUnknown_20205AC _081151AC: .4byte gUnknown_20380BE - thumb_func_end sub_081150EC + thumb_func_end AnimTask_SetGreyscaleOrOriginalPal thumb_func_start sub_081151B0 sub_081151B0: @ 0x081151B0 @@ -568680,20 +568680,20 @@ _081151DC: .4byte gUnknown_20380D2 _081151E0: .4byte gUnknown_20380BE thumb_func_end sub_081151B0 - thumb_func_start sub_081151E4 -sub_081151E4: @ 0x081151E4 + thumb_func_start AnimBonemerangProjectile +AnimBonemerangProjectile: @ 0x081151E4 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0811523C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -568702,20 +568702,20 @@ sub_081151E4: @ 0x081151E4 ldr r5, _08115240 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x36] ldr r0, _08115244 strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _08115248 str r0, [r4, #0x1c] pop {r4, r5} @@ -568725,14 +568725,14 @@ sub_081151E4: @ 0x081151E4 _0811523C: .4byte gUnknown_20380D6 _08115240: .4byte gUnknown_20380D7 _08115244: .4byte 0x0000FFD8 -_08115248: .4byte sub_0811524C - thumb_func_end sub_081151E4 +_08115248: .4byte AnimBonemerangProjectileStep + thumb_func_end AnimBonemerangProjectile - thumb_func_start sub_0811524C -sub_0811524C: @ 0x0811524C + thumb_func_start AnimBonemerangProjectileStep +AnimBonemerangProjectileStep: @ 0x0811524C push {r4, r5, lr} adds r5, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _081152A0 @@ -568752,20 +568752,20 @@ sub_0811524C: @ 0x0811524C ldr r4, _081152A8 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] movs r0, #0x28 strh r0, [r5, #0x38] adds r0, r5, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _081152AC str r0, [r5, #0x1c] _081152A0: @@ -568774,25 +568774,25 @@ _081152A0: bx r0 .align 2, 0 _081152A8: .4byte gUnknown_20380D6 -_081152AC: .4byte sub_081152B0 - thumb_func_end sub_0811524C +_081152AC: .4byte AnimFissureDirtPlumeParticleStep + thumb_func_end AnimBonemerangProjectileStep - thumb_func_start sub_081152B0 -sub_081152B0: @ 0x081152B0 + thumb_func_start AnimFissureDirtPlumeParticleStep +AnimFissureDirtPlumeParticleStep: @ 0x081152B0 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _081152C4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081152C4: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081152B0 + thumb_func_end AnimFissureDirtPlumeParticleStep thumb_func_start sub_081152CC sub_081152CC: @ 0x081152CC @@ -568802,7 +568802,7 @@ sub_081152CC: @ 0x081152CC bl InitSpritePosToAnimTarget ldr r0, _0811532C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081152EC @@ -568817,7 +568817,7 @@ _081152EC: ldr r5, _08115334 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -568825,7 +568825,7 @@ _081152EC: strh r0, [r6, #0x32] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r4, [r4, #6] @@ -568835,7 +568835,7 @@ _081152EC: str r0, [r6, #0x1c] ldr r1, _0811533C adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5, r6} pop {r0} bx r0 @@ -568844,27 +568844,27 @@ _0811532C: .4byte gUnknown_20380D6 _08115330: .4byte gUnknown_20380BE _08115334: .4byte gUnknown_20380D7 _08115338: .4byte sub_080A67B4 -_0811533C: .4byte sub_080A34C4 +_0811533C: .4byte DestroyAnimSprite thumb_func_end sub_081152CC - thumb_func_start sub_08115340 -sub_08115340: @ 0x08115340 + thumb_func_start AnimDirtScatter +AnimDirtScatter: @ 0x08115340 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} adds r6, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r4, _081153C0 ldrb r0, [r4] movs r1, #2 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 ldrb r0, [r4] movs r1, #3 - bl sub_080A5974 + bl GetBattlerSpriteCoord2 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 bl sub_0806F0A4 @@ -568902,7 +568902,7 @@ _08115398: str r0, [r6, #0x1c] ldr r1, _081153CC adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -568912,8 +568912,8 @@ _08115398: _081153C0: .4byte gUnknown_20380D7 _081153C4: .4byte gUnknown_20380BE _081153C8: .4byte sub_080A67B4 -_081153CC: .4byte sub_080A6014 - thumb_func_end sub_08115340 +_081153CC: .4byte DestroySpriteAndMatrix + thumb_func_end AnimDirtScatter thumb_func_start sub_081153D0 sub_081153D0: @ 0x081153D0 @@ -568938,7 +568938,7 @@ sub_081153D0: @ 0x081153D0 ldr r4, _0811543C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r2, [r6, #2] @@ -568946,7 +568946,7 @@ sub_081153D0: @ 0x081153D0 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r3, [r6, #4] @@ -568969,7 +568969,7 @@ _08115430: .4byte 0x000003FF _08115434: .4byte 0xFFFFFC00 _08115438: .4byte gUnknown_20380BE _0811543C: .4byte gUnknown_20380D6 -_08115440: .4byte sub_08115460 +_08115440: .4byte AnimMudSportDirtRising _08115444: ldrh r0, [r6, #2] strh r0, [r5, #0x20] @@ -568984,11 +568984,11 @@ _08115452: pop {r0} bx r0 .align 2, 0 -_0811545C: .4byte sub_0811549C +_0811545C: .4byte AnimMudSportDirtFalling thumb_func_end sub_081153D0 - thumb_func_start sub_08115460 -sub_08115460: @ 0x08115460 + thumb_func_start AnimMudSportDirtRising +AnimMudSportDirtRising: @ 0x08115460 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x30] @@ -569015,15 +569015,15 @@ _0811547E: cmp r0, r1 bge _08115496 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08115496: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08115460 + thumb_func_end AnimMudSportDirtRising - thumb_func_start sub_0811549C -sub_0811549C: @ 0x0811549C + thumb_func_start AnimMudSportDirtFalling +AnimMudSportDirtFalling: @ 0x0811549C push {lr} adds r3, r0, #0 movs r0, #0x2e @@ -569077,12 +569077,12 @@ _081154C4: cmp r0, #0xa bne _08115506 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08115506: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0811549C + thumb_func_end AnimMudSportDirtFalling thumb_func_start sub_0811550C sub_0811550C: @ 0x0811550C @@ -569150,7 +569150,7 @@ _08115578: @ jump table .4byte _081156DC @ case 4 _0811558C: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1c] @@ -569181,7 +569181,7 @@ _081155C8: strh r0, [r4, #0x22] ldr r0, _0811560C ldrb r0, [r0] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -569345,7 +569345,7 @@ sub_08115704: @ 0x08115704 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08115744 @@ -569443,7 +569443,7 @@ sub_081157A4: @ 0x081157A4 _081157C4: .4byte gUnknown_3005B60 _081157C8: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1c] @@ -569522,7 +569522,7 @@ _08115854: @ jump table .4byte _08115924 @ case 4 _08115868: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1c] @@ -569546,7 +569546,7 @@ _08115896: strh r0, [r4, #0x20] ldr r0, _081158B8 ldrb r0, [r0] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -569709,7 +569709,7 @@ _081159BE: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -569721,8 +569721,8 @@ _081159E8: .4byte gUnknown_20388C8 _081159EC: .4byte 0xA2600001 thumb_func_end sub_08115930 - thumb_func_start sub_081159F0 -sub_081159F0: @ 0x081159F0 + thumb_func_start AnimFissureDirtPlumeParticle +AnimFissureDirtPlumeParticle: @ 0x081159F0 push {r4, r5, r6, r7, lr} adds r5, r0, #0 ldr r0, _08115A04 @@ -569756,13 +569756,13 @@ _08115A0E: _08115A2A: adds r0, r4, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r6 strh r0, [r5, #0x20] adds r0, r4, #0 - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x1e @@ -569779,7 +569779,7 @@ _08115A2A: ldrh r0, [r7, #8] strh r0, [r5, #0x38] adds r0, r5, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _08115A74 str r0, [r5, #0x1c] pop {r4, r5, r6, r7} @@ -569788,18 +569788,18 @@ _08115A2A: .align 2, 0 _08115A70: .4byte gUnknown_20380D7 _08115A74: .4byte sub_08115A78 - thumb_func_end sub_081159F0 + thumb_func_end AnimFissureDirtPlumeParticle thumb_func_start sub_08115A78 sub_08115A78: @ 0x08115A78 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08115A8C adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08115A8C: pop {r4} pop {r0} @@ -569807,8 +569807,8 @@ _08115A8C: .align 2, 0 thumb_func_end sub_08115A78 - thumb_func_start sub_08115A94 -sub_08115A94: @ 0x08115A94 + thumb_func_start AnimDigDirtMound +AnimDigDirtMound: @ 0x08115A94 push {r4, r5, r6, lr} adds r6, r0, #0 ldr r0, _08115AA8 @@ -569827,7 +569827,7 @@ _08115AB2: ldrb r5, [r0] adds r0, r5, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08115B14 @@ -569839,7 +569839,7 @@ _08115AB2: adds r0, r0, r1 strh r0, [r6, #0x20] adds r0, r5, #0 - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x20 @@ -569860,7 +569860,7 @@ _08115AB2: strh r0, [r6, #4] ldr r1, _08115B24 adds r0, r6, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrh r0, [r4, #4] strh r0, [r6, #0x2e] ldr r0, _08115B28 @@ -569874,9 +569874,9 @@ _08115B14: .4byte 0x0000FFF0 _08115B18: .4byte gUnknown_20380BE _08115B1C: .4byte 0x000003FF _08115B20: .4byte 0xFFFFFC00 -_08115B24: .4byte sub_080A34C4 +_08115B24: .4byte DestroyAnimSprite _08115B28: .4byte WaitAnimForDuration - thumb_func_end sub_08115A94 + thumb_func_end AnimDigDirtMound thumb_func_start sub_08115B2C sub_08115B2C: @ 0x08115B2C @@ -569934,7 +569934,7 @@ _08115B90: _08115B96: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08115BC0 @@ -569963,7 +569963,7 @@ _08115BC0: _08115BCC: .4byte gUnknown_2023E88 _08115BD0: ldrb r0, [r6] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x1a] @@ -570311,8 +570311,8 @@ _08115E44: _08115E4C: .4byte gUnknown_20205AC thumb_func_end sub_08115DD8 - thumb_func_start sub_08115E50 -sub_08115E50: @ 0x08115E50 + thumb_func_start AnimTask_IsPowerOver99 +AnimTask_IsPowerOver99: @ 0x08115E50 push {lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -570332,7 +570332,7 @@ _08115E64: .align 2, 0 _08115E70: .4byte gUnknown_20380BE _08115E74: .4byte gUnknown_20380A8 - thumb_func_end sub_08115E50 + thumb_func_end AnimTask_IsPowerOver99 thumb_func_start sub_08115E78 sub_08115E78: @ 0x08115E78 @@ -570365,7 +570365,7 @@ _08115E9A: _08115EAA: ldr r0, _08115F0C ldrb r1, [r6, #2] - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -570375,7 +570375,7 @@ _08115EAA: adds r4, r4, r0 adds r0, r5, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x20 @@ -570386,7 +570386,7 @@ _08115EAA: strh r1, [r4, #0xa] adds r0, r5, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x40 @@ -570438,7 +570438,7 @@ sub_08115F20: @ 0x08115F20 ldr r0, _08115F5C strh r1, [r0] adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask b _08115F6C .align 2, 0 _08115F50: .4byte gUnknown_3005B60 @@ -570461,8 +570461,8 @@ _08115F74: .4byte gUnknown_2022AD4 _08115F78: .4byte gUnknown_2022AD6 thumb_func_end sub_08115F20 - thumb_func_start sub_08115F7C -sub_08115F7C: @ 0x08115F7C + thumb_func_start AnimConfusionDuck +AnimConfusionDuck: @ 0x08115F7C push {r4, r5, lr} adds r4, r0, #0 ldr r5, _08115FB4 @@ -570478,7 +570478,7 @@ sub_08115F7C: @ 0x08115F7C strh r0, [r4, #0x2e] ldr r0, _08115FB8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -570512,11 +570512,11 @@ _08115FCA: bx r0 .align 2, 0 _08115FE0: .4byte gUnknown_20380BE -_08115FE4: .4byte sub_08115FE8 - thumb_func_end sub_08115F7C +_08115FE4: .4byte AnimConfusionDuckStep + thumb_func_end AnimConfusionDuck - thumb_func_start sub_08115FE8 -sub_08115FE8: @ 0x08115FE8 + thumb_func_start AnimConfusionDuckStep +AnimConfusionDuckStep: @ 0x08115FE8 push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -570562,29 +570562,29 @@ _08116022: cmp r0, r1 bne _08116046 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08116046: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08115FE8 + thumb_func_end AnimConfusionDuckStep - thumb_func_start sub_0811604C -sub_0811604C: @ 0x0811604C + thumb_func_start AnimSimplePaletteBlend +AnimSimplePaletteBlend: @ 0x0811604C push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 ldr r4, _08116084 movs r1, #0 ldrsh r0, [r4, r1] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes movs r1, #2 ldrsb r1, [r4, r1] ldrb r2, [r4, #4] ldrb r3, [r4, #6] ldrh r4, [r4, #8] str r4, [sp] - bl sub_080A139C + bl BeginNormalPaletteFade adds r2, r5, #0 adds r2, #0x3e ldrb r0, [r2] @@ -570600,10 +570600,10 @@ sub_0811604C: @ 0x0811604C .align 2, 0 _08116084: .4byte gUnknown_20380BE _08116088: .4byte sub_081160D4 - thumb_func_end sub_0811604C + thumb_func_end AnimSimplePaletteBlend - thumb_func_start sub_0811608C -sub_0811608C: @ 0x0811608C + thumb_func_start UnpackSelectedBattleAnimPalettes +UnpackSelectedBattleAnimPalettes: @ 0x0811608C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -570639,7 +570639,7 @@ sub_0811608C: @ 0x0811608C pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0811608C + thumb_func_end UnpackSelectedBattleAnimPalettes thumb_func_start sub_081160D4 sub_081160D4: @ 0x081160D4 @@ -570652,7 +570652,7 @@ sub_081160D4: @ 0x081160D4 cmp r0, #0 bne _081160EA adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081160EA: pop {r0} bx r0 @@ -570682,10 +570682,10 @@ sub_081160F4: @ 0x081160F4 strh r0, [r5, #0x3c] movs r1, #0x3c ldrsh r0, [r5, r1] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes ldrb r1, [r4, #8] ldrh r2, [r4, #6] - bl sub_080A22E8 + bl BlendPalettes adds r2, r5, #0 adds r2, #0x3e ldrb r0, [r2] @@ -570734,7 +570734,7 @@ _0811617C: .4byte sub_081161D4 _08116180: movs r2, #0x3c ldrsh r0, [r4, r2] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes adds r3, r0, #0 ldrh r1, [r4, #0x30] movs r0, #0x80 @@ -570747,7 +570747,7 @@ _08116180: lsrs r1, r1, #0x18 ldrh r2, [r4, #0x34] adds r0, r3, #0 - bl sub_080A22E8 + bl BlendPalettes b _081161B4 _081161A6: ldrh r1, [r4, #0x3a] @@ -570755,7 +570755,7 @@ _081161A6: lsrs r1, r1, #0x18 ldrh r2, [r4, #0x38] adds r0, r3, #0 - bl sub_080A22E8 + bl BlendPalettes _081161B4: ldrh r0, [r4, #0x30] movs r2, #0x80 @@ -570788,12 +570788,12 @@ sub_081161D4: @ 0x081161D4 bne _081161FA movs r1, #0x3c ldrsh r0, [r4, r1] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes movs r1, #0 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _081161FA: pop {r4} pop {r0} @@ -570828,7 +570828,7 @@ sub_08116204: @ 0x08116204 strh r2, [r4, #0x38] ldr r1, _0811624C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _08116250 str r1, [r4, #0x1c] adds r0, r4, #0 @@ -570838,8 +570838,8 @@ sub_08116204: @ 0x08116204 bx r0 .align 2, 0 _08116248: .4byte gUnknown_20380BE -_0811624C: .4byte sub_080A6014 -_08116250: .4byte sub_080A5C14 +_0811624C: .4byte DestroySpriteAndMatrix +_08116250: .4byte TranslateSpriteInGrowingCircleOverDuration thumb_func_end sub_08116204 thumb_func_start sub_08116254 @@ -570901,14 +570901,14 @@ sub_081162A4: @ 0x081162A4 adds r4, r4, r1 movs r1, #8 ldrsh r0, [r4, r1] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes movs r1, #0xa ldrsb r1, [r4, r1] ldrh r2, [r4, #0x12] str r2, [sp] adds r2, r5, #0 adds r3, r6, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #0xc] subs r0, #1 strh r0, [r4, #0xc] @@ -571103,7 +571103,7 @@ sub_08116418: @ 0x08116418 ldrh r2, [r4, #0x12] str r2, [sp] adds r2, r5, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #0xc] subs r0, #1 strh r0, [r4, #0xc] @@ -571235,7 +571235,7 @@ sub_08116520: @ 0x08116520 lsls r4, r4, #3 adds r4, r4, r1 ldrh r0, [r4, #8] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -571248,7 +571248,7 @@ sub_08116520: @ 0x08116520 adds r0, r2, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #0xc] subs r0, #1 strh r0, [r4, #0xc] @@ -571351,7 +571351,7 @@ sub_081165E4: @ 0x081165E4 ldrh r0, [r5] strh r0, [r4, #0x16] ldrh r0, [r5] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -571363,7 +571363,7 @@ sub_081165E4: @ 0x081165E4 adds r0, r1, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0811664C str r0, [r4] add sp, #4 @@ -571416,7 +571416,7 @@ _08116694: .4byte gUnknown_2037C74 _08116698: .4byte sub_08116708 _0811669C: ldrh r0, [r4, #0x16] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -571434,7 +571434,7 @@ _0811669C: adds r0, r2, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _081166DA _081166CA: ldrb r3, [r4, #0x14] @@ -571443,7 +571443,7 @@ _081166CA: adds r0, r2, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _081166DA: ldr r0, _08116704 lsls r1, r5, #2 @@ -571491,7 +571491,7 @@ sub_08116708: @ 0x08116708 lsls r0, r0, #3 adds r0, r0, r1 ldrh r0, [r0, #0x16] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -571502,7 +571502,7 @@ sub_08116708: @ 0x08116708 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade adds r0, r4, #0 bl DestroyAnimVisualTask _0811674E: @@ -571652,7 +571652,7 @@ _08116848: adds r0, r0, r2 ldr r0, [r0] ldrh r0, [r0, #2] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r6, #0 @@ -571766,14 +571766,14 @@ _08116944: ldr r1, _08116950 _08116946: adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 b _0811695C .align 2, 0 _08116950: .4byte gUnknown_2021B38 _08116954: ldr r1, _0811698C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _0811695C: movs r0, #0x3a ldrsh r1, [r4, r0] @@ -571885,7 +571885,7 @@ _08116A0A: blo _08116A0A _08116A2C: adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08116A32: pop {r4, r5, r6, r7} pop {r0} @@ -572120,7 +572120,7 @@ sub_08116BD8: @ 0x08116BD8 bne _08116BFC adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _08116C04 .align 2, 0 _08116BF8: .4byte gUnknown_20380BE @@ -572133,13 +572133,13 @@ _08116C04: str r0, [r5, #0x1c] ldr r1, _08116C1C adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08116C18: .4byte RunStoredCallbackWhenAffineAnimEnds -_08116C1C: .4byte sub_080A34C4 +_08116C1C: .4byte DestroyAnimSprite thumb_func_end sub_08116BD8 thumb_func_start sub_08116C20 @@ -572155,7 +572155,7 @@ sub_08116C20: @ 0x08116C20 bne _08116C44 adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _08116C4C .align 2, 0 _08116C40: .4byte gUnknown_20380BE @@ -572171,7 +572171,7 @@ _08116C4C: str r0, [r5, #0x1c] ldr r1, _08116C6C adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 @@ -572187,11 +572187,11 @@ sub_08116C70: @ 0x08116C70 adds r4, r0, #0 ldr r0, _08116CA0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08116C94 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08116C94 @@ -572235,7 +572235,7 @@ _08116CC4: bne _08116CE4 adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _08116CEC .align 2, 0 _08116CE0: .4byte gUnknown_20380BE @@ -572266,7 +572266,7 @@ _08116CEC: strh r0, [r4, #0x26] ldr r1, _08116D38 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08116D3C str r0, [r4, #0x1c] pop {r4, r5} @@ -572275,7 +572275,7 @@ _08116CEC: .align 2, 0 _08116D30: .4byte 0x0000FFE8 _08116D34: .4byte 0x0000FFF4 -_08116D38: .4byte sub_080A6014 +_08116D38: .4byte DestroySpriteAndMatrix _08116D3C: .4byte RunStoredCallbackWhenAffineAnimEnds thumb_func_end sub_08116CA8 @@ -572285,7 +572285,7 @@ sub_08116D40: @ 0x08116D40 adds r4, r0, #0 ldr r5, _08116DA0 ldrb r0, [r5] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x2e] @@ -572319,7 +572319,7 @@ sub_08116D40: @ 0x08116D40 bl StartSpriteAffineAnim ldr r1, _08116DA8 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08116DAC str r0, [r4, #0x1c] pop {r4, r5} @@ -572328,7 +572328,7 @@ sub_08116D40: @ 0x08116D40 .align 2, 0 _08116DA0: .4byte gUnknown_20380BE _08116DA4: .4byte gUnknown_20205AC -_08116DA8: .4byte sub_080A6014 +_08116DA8: .4byte DestroySpriteAndMatrix _08116DAC: .4byte RunStoredCallbackWhenAffineAnimEnds thumb_func_end sub_08116D40 @@ -572343,7 +572343,7 @@ sub_08116DB0: @ 0x08116DB0 bne _08116DCC adds r0, r4, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _08116DD4 .align 2, 0 _08116DC8: .4byte gUnknown_20380BE @@ -572357,7 +572357,7 @@ _08116DD4: strh r0, [r4, #0x2e] ldr r1, _08116DF0 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08116DF4 str r0, [r4, #0x1c] pop {r4} @@ -572365,7 +572365,7 @@ _08116DD4: bx r0 .align 2, 0 _08116DEC: .4byte gUnknown_20380BE -_08116DF0: .4byte sub_080A34C4 +_08116DF0: .4byte DestroyAnimSprite _08116DF4: .4byte WaitAnimForDuration thumb_func_end sub_08116DB0 @@ -572382,7 +572382,7 @@ sub_08116DF8: @ 0x08116DF8 bne _08116E1C adds r0, r5, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker b _08116E24 .align 2, 0 _08116E18: .4byte gUnknown_20380BE @@ -572427,7 +572427,7 @@ sub_08116E34: @ 0x08116E34 cmp r0, #0xc ble _08116E6A adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _08116E6A: pop {r0} bx r0 @@ -572443,7 +572443,7 @@ sub_08116E70: @ 0x08116E70 ldr r4, _08116EB0 movs r1, #0 ldrsh r0, [r4, r1] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes adds r6, r0, #0 ldrh r3, [r4] lsls r3, r3, #0x10 @@ -572460,7 +572460,7 @@ sub_08116E70: @ 0x08116E70 orrs r6, r0 adds r0, r5, #0 adds r1, r6, #0 - bl sub_081170C4 + bl StartBlendAnimSpriteColor pop {r4, r5, r6} pop {r0} bx r0 @@ -572478,7 +572478,7 @@ sub_08116EB4: @ 0x08116EB4 movs r0, #0xff strb r0, [r1, #1] movs r0, #1 - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes adds r5, r0, #0 ldr r0, _08116EE0 movs r1, #0 @@ -572565,7 +572565,7 @@ _08116F62: cmp r4, r0 beq _08116F8C adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08116F8C @@ -572585,7 +572585,7 @@ _08116F8C: bls _08116F62 adds r0, r7, #0 adds r1, r5, #0 - bl sub_081170C4 + bl StartBlendAnimSpriteColor add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -572594,15 +572594,15 @@ _08116F8C: _08116FA8: .4byte gUnknown_20380D7 thumb_func_end sub_08116EB4 - thumb_func_start sub_08116FAC -sub_08116FAC: @ 0x08116FAC + thumb_func_start AnimTask_SetCamouflageBlend +AnimTask_SetCamouflageBlend: @ 0x08116FAC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _08116FD0 movs r1, #0 ldrsh r0, [r0, r1] - bl sub_0811608C + bl UnpackSelectedBattleAnimPalettes adds r2, r0, #0 ldr r0, _08116FD4 ldrb r0, [r0] @@ -572692,40 +572692,40 @@ _08117080: _08117082: adds r0, r4, #0 adds r1, r2, #0 - bl sub_081170C4 + bl StartBlendAnimSpriteColor pop {r4} pop {r0} bx r0 .align 2, 0 _08117090: .4byte gUnknown_20380BE _08117094: .4byte 0x00007FFF - thumb_func_end sub_08116FAC + thumb_func_end AnimTask_SetCamouflageBlend - thumb_func_start sub_08117098 -sub_08117098: @ 0x08117098 + thumb_func_start AnimTask_BlendParticle +AnimTask_BlendParticle: @ 0x08117098 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _081170C0 ldrh r0, [r0] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 movs r1, #1 lsls r1, r0 adds r0, r4, #0 - bl sub_081170C4 + bl StartBlendAnimSpriteColor pop {r4} pop {r0} bx r0 .align 2, 0 _081170C0: .4byte gUnknown_20380BE - thumb_func_end sub_08117098 + thumb_func_end AnimTask_BlendParticle - thumb_func_start sub_081170C4 -sub_081170C4: @ 0x081170C4 + thumb_func_start StartBlendAnimSpriteColor +StartBlendAnimSpriteColor: @ 0x081170C4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -572756,11 +572756,11 @@ sub_081170C4: @ 0x081170C4 .align 2, 0 _081170FC: .4byte gUnknown_3005B60 _08117100: .4byte gUnknown_20380BE -_08117104: .4byte sub_08117108 - thumb_func_end sub_081170C4 +_08117104: .4byte AnimTask_BlendSpriteColor_Step2 + thumb_func_end StartBlendAnimSpriteColor - thumb_func_start sub_08117108 -sub_08117108: @ 0x08117108 + thumb_func_start AnimTask_BlendSpriteColor_Step2 +AnimTask_BlendSpriteColor_Step2: @ 0x08117108 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -572850,7 +572850,7 @@ _081171A4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08117108 + thumb_func_end AnimTask_BlendSpriteColor_Step2 thumb_func_start sub_081171B0 sub_081171B0: @ 0x081171B0 @@ -572866,7 +572866,7 @@ sub_081171B0: @ 0x081171B0 ldrb r3, [r4, #6] ldrb r4, [r4, #8] str r4, [sp] - bl sub_080A2078 + bl BeginHardwarePaletteFade ldr r1, _081171E8 lsls r0, r5, #2 adds r0, r0, r5 @@ -572961,7 +572961,7 @@ sub_08117248: @ 0x08117248 _08117274: .4byte gUnknown_3005B60 _08117278: ldrb r0, [r4, #8] - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend strh r0, [r4, #0x14] lsls r0, r0, #0x10 cmp r0, #0 @@ -573075,7 +573075,7 @@ _08117334: subs r0, #1 strh r0, [r1] adds r0, r4, #0 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram _08117358: pop {r4} pop {r0} @@ -573108,7 +573108,7 @@ sub_08117364: @ 0x08117364 movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _0811749C movs r0, #0x50 bl SetGpuReg @@ -573134,7 +573134,7 @@ sub_08117364: @ 0x08117364 ldrh r1, [r4] movs r0, #0xa bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _081173F2 @@ -573149,11 +573149,11 @@ sub_08117364: @ 0x08117364 movs r0, #0xa bl SetGpuReg _081173F2: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08117476 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08117476 @@ -573173,7 +573173,7 @@ _08117422: ldrb r0, [r5] movs r6, #2 eors r0, r6 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -573211,7 +573211,7 @@ _08117422: bl SetGpuReg movs r7, #1 _08117476: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081174B4 @@ -573234,7 +573234,7 @@ _081174B0: .4byte gUnknown_2039BD4 _081174B4: ldr r4, _081174D4 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081174E0 @@ -573263,12 +573263,12 @@ _081174E0: _081174F0: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 _081174FC: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -573291,14 +573291,14 @@ _081174FC: ldr r1, _08117598 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _0811759C mov r1, sp ldrb r1, [r1, #8] lsls r1, r1, #4 adds r1, #1 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r2, _081175A0 ldr r0, _081175A4 lsls r1, r4, #4 @@ -573398,7 +573398,7 @@ sub_081175B4: @ 0x081175B4 movs r0, #0x4a adds r1, r4, #0 bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08117646 @@ -573433,7 +573433,7 @@ _08117646: movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r4, _081176F8 movs r0, #8 ldrsh r1, [r5, r0] @@ -573504,7 +573504,7 @@ sub_08117704: @ 0x08117704 lsrs r5, r0, #0x18 ldr r4, _08117744 movs r0, #0x18 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r2, #0 ldr r3, _08117748 @@ -573565,7 +573565,7 @@ _08117776: movs r1, #2 eors r0, r1 strb r0, [r2, #1] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _081177A6 @@ -573575,7 +573575,7 @@ _08117776: cmp r0, #0 beq _081177AC ldrb r0, [r1, #1] - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _081177AC @@ -573598,7 +573598,7 @@ _081177AC: movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _081178B8 movs r0, #0x50 bl SetGpuReg @@ -573609,21 +573609,21 @@ _081177AC: movs r0, #1 movs r1, #4 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0811780A movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _0811780A: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08117886 @@ -573648,7 +573648,7 @@ _0811780A: _0811783C: ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -573678,11 +573678,11 @@ _0811783C: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, [r4] strb r5, [r0, #2] _08117886: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081178C8 @@ -573708,7 +573708,7 @@ _081178C8: ldr r4, _081178EC ldr r0, [r4] ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081178F8 @@ -573739,7 +573739,7 @@ _081178F8: _0811790A: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldr r1, [r4] _08117914: strh r0, [r1, #0x14] @@ -573821,7 +573821,7 @@ _081179B2: ldr r1, _081179DC mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _081179E0 ldr r0, [r0] movs r1, #6 @@ -573883,7 +573883,7 @@ _08117A36: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _08117A56 .align 2, 0 _08117A44: .4byte gUnknown_8C2DCEC @@ -573893,7 +573893,7 @@ _08117A48: ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette _08117A56: ldr r3, _08117A84 movs r2, #0 @@ -573979,12 +573979,12 @@ _08117AD0: bne _08117B1C movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4B40 + bl BattleAnimAdjustPanning2 adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xef - bl sub_080A307C + bl PlaySE12WithPanning b _08117B30 .align 2, 0 _08117B14: .4byte gUnknown_2023E88 @@ -573992,12 +573992,12 @@ _08117B18: .4byte sub_08117B3C _08117B1C: movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4B40 + bl BattleAnimAdjustPanning2 adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xf5 - bl sub_080A307C + bl PlaySE12WithPanning _08117B30: add sp, #0x10 pop {r3} @@ -574127,14 +574127,14 @@ _08117C06: movs r0, #0x4a adds r1, r4, #0 bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08117C36 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _08117C36: movs r0, #0 bl GetGpuReg @@ -574198,7 +574198,7 @@ _08117C8A: _08117CB6: ldr r4, _08117CE0 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] adds r0, r6, #0 @@ -574452,7 +574452,7 @@ _08117E8C: bne _08117E8C adds r0, r6, #0 adds r1, r4, #0 - bl sub_081170C4 + bl StartBlendAnimSpriteColor pop {r4, r5, r6} pop {r0} bx r0 @@ -574470,7 +574470,7 @@ sub_08117EB0: @ 0x08117EB0 bl sub_080A6674 ldr r0, _08117F18 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _08117F1C @@ -574480,7 +574480,7 @@ sub_08117EB0: @ 0x08117EB0 beq _08117EEC ldr r0, _08117F20 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08117EEC @@ -574568,7 +574568,7 @@ sub_08117F28: @ 0x08117F28 movs r0, #1 bl sub_080A6674 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08117F8E: pop {r4, r5, r6, r7} pop {r0} @@ -574588,7 +574588,7 @@ sub_08117FA4: @ 0x08117FA4 lsrs r4, r4, #0x18 ldr r0, _08117FC8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide ldr r1, _08117FCC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -574611,7 +574611,7 @@ sub_08117FD0: @ 0x08117FD0 lsrs r4, r4, #0x18 ldr r0, _08117FF4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide ldr r1, _08117FF8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -574626,8 +574626,8 @@ _08117FF4: .4byte gUnknown_20380D7 _08117FF8: .4byte gUnknown_20380BE thumb_func_end sub_08117FD0 - thumb_func_start sub_08117FFC -sub_08117FFC: @ 0x08117FFC + thumb_func_start AnimTask_GetTargetIsAttackerPartner +AnimTask_GetTargetIsAttackerPartner: @ 0x08117FFC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -574653,7 +574653,7 @@ _08118018: _08118028: .4byte gUnknown_20380BE _0811802C: .4byte gUnknown_20380D6 _08118030: .4byte gUnknown_20380D7 - thumb_func_end sub_08117FFC + thumb_func_end AnimTask_GetTargetIsAttackerPartner thumb_func_start sub_08118034 sub_08118034: @ 0x08118034 @@ -574669,7 +574669,7 @@ _0811803E: beq _0811807C lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _0811807C @@ -574748,7 +574748,7 @@ sub_081180A4: @ 0x081180A4 movs r0, #2 adds r6, r7, #0 eors r6, r0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08118106 @@ -574756,7 +574756,7 @@ sub_081180A4: @ 0x081180A4 cmp r1, #0 beq _0811810A adds r0, r6, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _0811810A @@ -574778,7 +574778,7 @@ _0811810A: movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _081181AC movs r0, #0x50 bl SetGpuReg @@ -574805,7 +574805,7 @@ _0811810A: movs r1, #0x20 orrs r0, r1 strb r0, [r2] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08118180 @@ -574820,7 +574820,7 @@ _08118180: ldrh r1, [r4] movs r0, #0xa bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081181B4 @@ -574838,7 +574838,7 @@ _081181AC: .4byte 0x00003F42 _081181B0: .4byte gUnknown_2039BD4 _081181B4: adds r0, r7, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _081181D8 @@ -574864,7 +574864,7 @@ _081181D8: _081181E6: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 _081181F2: @@ -574899,13 +574899,13 @@ _0811821C: mov r1, sp ldrh r2, [r1, #0xa] ldr r1, [sp, #0x54] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx mov r0, sp ldrb r1, [r0, #8] lsls r1, r1, #4 ldr r0, [sp, #0x5c] movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081182A0 movs r1, #0 strh r1, [r0] @@ -575106,7 +575106,7 @@ _08118384: movs r0, #0x4a adds r1, r4, #0 bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08118402 @@ -575176,8 +575176,8 @@ _0811846C: .4byte 0x00003F3F _08118470: .4byte gUnknown_20205AC thumb_func_end sub_081182B0 - thumb_func_start sub_08118474 -sub_08118474: @ 0x08118474 + thumb_func_start AnimTask_GetBattleTerrain +AnimTask_GetBattleTerrain: @ 0x08118474 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -575191,7 +575191,7 @@ sub_08118474: @ 0x08118474 .align 2, 0 _0811848C: .4byte gUnknown_20380BE _08118490: .4byte gUnknown_2022C94 - thumb_func_end sub_08118474 + thumb_func_end AnimTask_GetBattleTerrain thumb_func_start sub_08118494 sub_08118494: @ 0x08118494 @@ -575201,7 +575201,7 @@ sub_08118494: @ 0x08118494 lsrs r4, r4, #0x18 movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed ldr r1, _081184BC ldr r1, [r1] movs r2, #0xbe @@ -575229,7 +575229,7 @@ sub_081184C0: @ 0x081184C0 lsls r5, r5, #1 adds r0, r0, r5 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r0, r0, r5 movs r1, #0 @@ -575476,12 +575476,12 @@ _081186A8: .4byte gUnknown_20373B4 _081186AC: .4byte gUnknown_20377B4 thumb_func_end sub_08118628 - thumb_func_start sub_081186B0 -sub_081186B0: @ 0x081186B0 + thumb_func_start AnimTask_IsContest +AnimTask_IsContest: @ 0x081186B0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -575503,7 +575503,7 @@ _081186D4: bx r0 .align 2, 0 _081186E0: .4byte gUnknown_20380BE - thumb_func_end sub_081186B0 + thumb_func_end AnimTask_IsContest thumb_func_start sub_081186E4 sub_081186E4: @ 0x081186E4 @@ -575528,18 +575528,18 @@ _0811870C: .4byte gUnknown_20380D7 _08118710: .4byte gUnknown_2023EB2 thumb_func_end sub_081186E4 - thumb_func_start sub_08118714 -sub_08118714: @ 0x08118714 + thumb_func_start AnimTask_IsTargetSameSide +AnimTask_IsTargetSameSide: @ 0x08118714 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _0811873C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide adds r4, r0, #0 ldr r0, _08118740 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r4, r4, #0x18 lsls r0, r0, #0x18 cmp r4, r0 @@ -575563,7 +575563,7 @@ _0811874C: bx r0 .align 2, 0 _0811875C: .4byte gUnknown_20380BE - thumb_func_end sub_08118714 + thumb_func_end AnimTask_IsTargetSameSide thumb_func_start sub_08118760 sub_08118760: @ 0x08118760 @@ -575610,7 +575610,7 @@ sub_081187B0: @ 0x081187B0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _081187C8 @@ -575694,7 +575694,7 @@ sub_08118820: @ 0x08118820 orrs r0, r1 strb r0, [r3] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08118864: pop {r4} pop {r0} @@ -575706,8 +575706,8 @@ _08118874: .4byte gUnknown_20380D6 _08118878: .4byte gUnknown_3005B60 thumb_func_end sub_08118820 - thumb_func_start sub_0811887C -sub_0811887C: @ 0x0811887C + thumb_func_start SetAnimBgAttribute +SetAnimBgAttribute: @ 0x0811887C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -575843,10 +575843,10 @@ _08118982: .align 2, 0 _08118988: .4byte gUnknown_2039DE0 _0811898C: .4byte gUnknown_8572FFE - thumb_func_end sub_0811887C + thumb_func_end SetAnimBgAttribute - thumb_func_start sub_08118990 -sub_08118990: @ 0x08118990 + thumb_func_start GetAnimBgAttribute +GetAnimBgAttribute: @ 0x08118990 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -575922,10 +575922,10 @@ _08118A1A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08118990 + thumb_func_end GetAnimBgAttribute - thumb_func_start sub_08118A24 -sub_08118A24: @ 0x08118A24 + thumb_func_start HandleIntroSlide +HandleIntroSlide: @ 0x08118A24 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -575947,7 +575947,7 @@ sub_08118A24: @ 0x08118A24 _08118A48: .4byte gUnknown_2022C90 _08118A4C: .4byte gUnknown_203886E _08118A50: .4byte 0x00000C03 -_08118A54: .4byte sub_081195B8 +_08118A54: .4byte BattleIntroSlidePartner _08118A58: ldr r2, [r2] movs r0, #2 @@ -575957,7 +575957,7 @@ _08118A58: ldr r0, _08118A68 b _08118AA8 .align 2, 0 -_08118A68: .4byte sub_08119310 +_08118A68: .4byte BattleIntroSlideLink _08118A6C: ldr r0, _08118A78 ands r0, r2 @@ -575967,7 +575967,7 @@ _08118A6C: b _08118AA8 .align 2, 0 _08118A78: .4byte 0x003F0100 -_08118A7C: .4byte sub_08119094 +_08118A7C: .4byte BattleIntroSlide3 _08118A80: movs r0, #0x80 lsls r0, r0, #5 @@ -575983,7 +575983,7 @@ _08118A80: b _08118AA8 .align 2, 0 _08118A98: .4byte gUnknown_829BDA4 -_08118A9C: .4byte sub_08118D88 +_08118A9C: .4byte BattleIntroSlide2 _08118AA0: ldr r1, _08118AD4 lsls r0, r4, #2 @@ -575991,7 +575991,7 @@ _08118AA0: ldr r0, [r0] _08118AA8: movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _08118AD8 @@ -576013,14 +576013,14 @@ _08118AA8: .align 2, 0 _08118AD4: .4byte gUnknown_8573008 _08118AD8: .4byte gUnknown_3005B60 - thumb_func_end sub_08118A24 + thumb_func_end HandleIntroSlide thumb_func_start sub_08118ADC sub_08118ADC: @ 0x08118ADC push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldr r0, _08118B28 movs r1, #0 strh r1, [r0] @@ -576057,8 +576057,8 @@ _08118B34: .4byte gUnknown_2022AD2 _08118B38: .4byte 0x00003F3F thumb_func_end sub_08118ADC - thumb_func_start sub_08118B3C -sub_08118B3C: @ 0x08118B3C + thumb_func_start BattleIntroSlide1 +BattleIntroSlide1: @ 0x08118B3C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -576310,11 +576310,11 @@ _08118CFA: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r1, #0x9c lsls r1, r1, #8 movs r0, #0xa @@ -576345,10 +576345,10 @@ _08118D7A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08118B3C + thumb_func_end BattleIntroSlide1 - thumb_func_start sub_08118D88 -sub_08118D88: @ 0x08118D88 + thumb_func_start BattleIntroSlide2 +BattleIntroSlide2: @ 0x08118D88 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -576683,11 +576683,11 @@ _08118FF4: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r1, #0x9c lsls r1, r1, #8 movs r0, #0xa @@ -576729,10 +576729,10 @@ _08119082: bx r0 .align 2, 0 _08119090: .4byte gUnknown_3005B60 - thumb_func_end sub_08118D88 + thumb_func_end BattleIntroSlide2 - thumb_func_start sub_08119094 -sub_08119094: @ 0x08119094 + thumb_func_start BattleIntroSlide3 +BattleIntroSlide3: @ 0x08119094 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -576991,11 +576991,11 @@ _0811926E: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r1, #0x9c lsls r1, r1, #8 movs r0, #0xa @@ -577038,10 +577038,10 @@ _08119300: bx r0 .align 2, 0 _0811930C: .4byte gUnknown_3005B60 - thumb_func_end sub_08119094 + thumb_func_end BattleIntroSlide3 - thumb_func_start sub_08119310 -sub_08119310: @ 0x08119310 + thumb_func_start BattleIntroSlideLink +BattleIntroSlideLink: @ 0x08119310 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -577338,11 +577338,11 @@ _08119548: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r1, #0x9c lsls r1, r1, #8 movs r0, #0xa @@ -577369,10 +577369,10 @@ _081195AA: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08119310 + thumb_func_end BattleIntroSlideLink - thumb_func_start sub_081195B8 -sub_081195B8: @ 0x081195B8 + thumb_func_start BattleIntroSlidePartner +BattleIntroSlidePartner: @ 0x081195B8 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -577603,11 +577603,11 @@ _08119778: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r1, #0x9c lsls r1, r1, #8 movs r0, #0xa @@ -577647,7 +577647,7 @@ _08119802: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081195B8 + thumb_func_end BattleIntroSlidePartner thumb_func_start sub_0811980C sub_0811980C: @ 0x0811980C @@ -577869,8 +577869,8 @@ _081199AC: .4byte gUnknown_2024178 _081199B0: .4byte 0x80000400 thumb_func_end unref_sub_8119094 - thumb_func_start sub_081199B4 -sub_081199B4: @ 0x081199B4 + thumb_func_start MovePlayerOnBike +MovePlayerOnBike: @ 0x081199B4 push {r4, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -577886,30 +577886,30 @@ sub_081199B4: @ 0x081199B4 beq _081199DC adds r0, r3, #0 adds r1, r4, #0 - bl sub_081199EC + bl MovePlayerOnMachBike b _081199E4 .align 2, 0 _081199D8: .4byte gUnknown_2037230 _081199DC: adds r0, r3, #0 adds r1, r4, #0 - bl sub_08119C18 + bl MovePlayerOnAcroBike _081199E4: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081199B4 + thumb_func_end MovePlayerOnBike - thumb_func_start sub_081199EC -sub_081199EC: @ 0x081199EC + thumb_func_start MovePlayerOnMachBike +MovePlayerOnMachBike: @ 0x081199EC push {r4, lr} sub sp, #4 mov r1, sp strb r0, [r1] ldr r4, _08119A18 mov r0, sp - bl sub_08119A1C + bl GetMachBikeTransition lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r0, r4 @@ -577919,7 +577919,7 @@ sub_081199EC: @ 0x081199EC adds r0, r1, #0 bl _call_via_r2 add sp, #4 - thumb_func_end sub_081199EC + thumb_func_end MovePlayerOnMachBike thumb_func_start sub_08119A10 sub_08119A10: @ 0x08119A10 @@ -577930,8 +577930,8 @@ sub_08119A10: @ 0x08119A10 _08119A18: .4byte gUnknown_8573030 thumb_func_end sub_08119A10 - thumb_func_start sub_08119A1C -sub_08119A1C: @ 0x08119A1C + thumb_func_start GetMachBikeTransition +GetMachBikeTransition: @ 0x08119A1C push {r4, lr} adds r4, r0, #0 bl GetPlayerMovementDirection @@ -577981,22 +577981,22 @@ _08119A6C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08119A1C + thumb_func_end GetMachBikeTransition - thumb_func_start sub_08119A74 -sub_08119A74: @ 0x08119A74 + thumb_func_start MachBikeTransition_FaceDirection +MachBikeTransition_FaceDirection: @ 0x08119A74 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_0808B174 - bl sub_0811A978 + bl Bike_SetBikeStill pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08119A74 + thumb_func_end MachBikeTransition_FaceDirection - thumb_func_start sub_08119A88 -sub_08119A88: @ 0x08119A88 + thumb_func_start MachBikeTransition_TurnDirection +MachBikeTransition_TurnDirection: @ 0x08119A88 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -578009,13 +578009,13 @@ sub_08119A88: @ 0x08119A88 adds r4, r0, r1 ldrb r1, [r4, #0x1e] adds r0, r5, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 beq _08119AC0 adds r0, r5, #0 - bl sub_0808B18C - bl sub_0811A978 + bl PlayerTurnInPlace + bl Bike_SetBikeStill b _08119ACA .align 2, 0 _08119AB8: .4byte gUnknown_2037230 @@ -578024,15 +578024,15 @@ _08119AC0: ldrb r0, [r4, #0x18] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c - bl sub_08119A74 + bl MachBikeTransition_FaceDirection _08119ACA: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08119A88 + thumb_func_end MachBikeTransition_TurnDirection - thumb_func_start sub_08119AD0 -sub_08119AD0: @ 0x08119AD0 + thumb_func_start MachBikeTransition_TrySpeedUp +MachBikeTransition_TrySpeedUp: @ 0x08119AD0 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -578046,7 +578046,7 @@ sub_08119AD0: @ 0x08119AD0 adds r4, r0, r1 ldrb r1, [r4, #0x1e] adds r0, r5, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _08119B16 @@ -578063,11 +578063,11 @@ _08119B08: .4byte gUnknown_2036FF0 _08119B0C: ldrb r0, [r4, #0x18] lsrs r0, r0, #4 - bl sub_08119A74 + bl MachBikeTransition_FaceDirection b _08119B8A _08119B16: adds r0, r5, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r1, #0xff @@ -578082,16 +578082,16 @@ _08119B16: bl sub_0808B1A4 b _08119B8A _08119B38: - bl sub_0811A978 + bl Bike_SetBikeStill cmp r4, #4 bne _08119B54 adds r0, r5, #0 - bl sub_0808AC88 + bl IsPlayerCollidingWithFarawayIslandMew lsls r0, r0, #0x18 cmp r0, #0 beq _08119B54 adds r0, r5, #0 - bl sub_0808B120 + bl PlayerOnBikeCollideWithFarawayIslandMew b _08119B8A _08119B54: subs r0, r4, #5 @@ -578100,7 +578100,7 @@ _08119B54: cmp r0, #3 bls _08119B8A adds r0, r7, #0 - bl sub_0808B0FC + bl PlayerOnBikeCollide b _08119B8A _08119B66: ldr r1, _08119B90 @@ -578126,7 +578126,7 @@ _08119B8A: bx r0 .align 2, 0 _08119B90: .4byte gUnknown_8573040 - thumb_func_end sub_08119AD0 + thumb_func_end MachBikeTransition_TrySpeedUp thumb_func_start sub_08119B94 sub_08119B94: @ 0x08119B94 @@ -578143,7 +578143,7 @@ sub_08119B94: @ 0x08119B94 strb r0, [r6, #0xa] _08119BAA: adds r0, r5, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r1, #0xff @@ -578160,16 +578160,16 @@ _08119BAA: .align 2, 0 _08119BCC: .4byte gUnknown_2037230 _08119BD0: - bl sub_0811A978 + bl Bike_SetBikeStill cmp r4, #4 bne _08119BEC adds r0, r5, #0 - bl sub_0808AC88 + bl IsPlayerCollidingWithFarawayIslandMew lsls r0, r0, #0x18 cmp r0, #0 beq _08119BEC adds r0, r5, #0 - bl sub_0808B120 + bl PlayerOnBikeCollideWithFarawayIslandMew b _08119C0E _08119BEC: subs r0, r4, #5 @@ -578178,7 +578178,7 @@ _08119BEC: cmp r0, #3 bls _08119C0E adds r0, r7, #0 - bl sub_0808B0FC + bl PlayerOnBikeCollide b _08119C0E _08119BFE: ldr r0, _08119C14 @@ -578196,8 +578196,8 @@ _08119C0E: _08119C14: .4byte gUnknown_8573040 thumb_func_end sub_08119B94 - thumb_func_start sub_08119C18 -sub_08119C18: @ 0x08119C18 + thumb_func_start MovePlayerOnAcroBike +MovePlayerOnAcroBike: @ 0x08119C18 push {r4, lr} sub sp, #4 mov r3, sp @@ -578208,7 +578208,7 @@ sub_08119C18: @ 0x08119C18 lsrs r2, r2, #0x10 ldr r4, _08119C4C mov r0, sp - bl sub_08119C50 + bl CheckMovementInputAcroBike lsls r0, r0, #0x18 lsrs r0, r0, #0x16 adds r0, r0, r4 @@ -578218,7 +578218,7 @@ sub_08119C18: @ 0x08119C18 adds r0, r1, #0 bl _call_via_r2 add sp, #4 - thumb_func_end sub_08119C18 + thumb_func_end MovePlayerOnAcroBike thumb_func_start sub_08119C44 sub_08119C44: @ 0x08119C44 @@ -578229,8 +578229,8 @@ sub_08119C44: @ 0x08119C44 _08119C4C: .4byte gUnknown_857304C thumb_func_end sub_08119C44 - thumb_func_start sub_08119C50 -sub_08119C50: @ 0x08119C50 + thumb_func_start CheckMovementInputAcroBike +CheckMovementInputAcroBike: @ 0x08119C50 push {r4, lr} lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -578251,10 +578251,10 @@ sub_08119C50: @ 0x08119C50 .align 2, 0 _08119C74: .4byte gUnknown_8573080 _08119C78: .4byte gUnknown_2037230 - thumb_func_end sub_08119C50 + thumb_func_end CheckMovementInputAcroBike - thumb_func_start sub_08119C7C -sub_08119C7C: @ 0x08119C7C + thumb_func_start AcroBikeHandleInputNormal +AcroBikeHandleInputNormal: @ 0x08119C7C push {r4, r5, r6, lr} adds r4, r0, #0 lsls r1, r1, #0x10 @@ -578323,7 +578323,7 @@ _08119CE2: adds r0, r4, #0 adds r1, r6, #0 adds r2, r5, #0 - bl sub_08119C50 + bl CheckMovementInputAcroBike lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08119D10 @@ -578337,10 +578337,10 @@ _08119D10: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08119C7C + thumb_func_end AcroBikeHandleInputNormal - thumb_func_start sub_08119D18 -sub_08119D18: @ 0x08119D18 + thumb_func_start AcroBikeHandleInputTurning +AcroBikeHandleInputTurning: @ 0x08119D18 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r4, _08119D40 @@ -578357,7 +578357,7 @@ sub_08119D18: @ 0x08119D18 strb r0, [r4, #2] movs r0, #0 strb r0, [r4, #8] - bl sub_0811A978 + bl Bike_SetBikeStill movs r0, #1 b _08119D8A .align 2, 0 @@ -578366,17 +578366,17 @@ _08119D44: bl GetPlayerMovementDirection lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_0811A580 + bl AcroBike_GetJumpDirection ldrb r1, [r5] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r1, r0 bne _08119D86 - bl sub_0811A978 + bl Bike_SetBikeStill movs r0, #1 strb r0, [r4, #0xb] adds r0, r6, #0 - bl sub_08093170 + bl GetOppositeDirection ldrb r1, [r5] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -578400,10 +578400,10 @@ _08119D8A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08119D18 + thumb_func_end AcroBikeHandleInputTurning - thumb_func_start sub_08119D90 -sub_08119D90: @ 0x08119D90 + thumb_func_start AcroBikeHandleInputWheelieStanding +AcroBikeHandleInputWheelieStanding: @ 0x08119D90 push {r4, r5, r6, r7, lr} adds r7, r0, #0 lsls r4, r2, #0x10 @@ -578435,7 +578435,7 @@ sub_08119D90: @ 0x08119D90 bne _08119DEA strb r6, [r7] strb r0, [r5, #8] - bl sub_0811A978 + bl Bike_SetBikeStill movs r0, #4 b _08119E28 .align 2, 0 @@ -578453,7 +578453,7 @@ _08119DEA: strb r6, [r7] movs r0, #3 strb r0, [r1, #8] - bl sub_0811A978 + bl Bike_SetBikeStill movs r0, #6 b _08119E28 .align 2, 0 @@ -578466,7 +578466,7 @@ _08119E04: strb r0, [r1, #2] movs r0, #4 strb r0, [r1, #8] - bl sub_0811A978 + bl Bike_SetBikeStill movs r0, #0xa b _08119E28 _08119E1A: @@ -578484,10 +578484,10 @@ _08119E28: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08119D90 + thumb_func_end AcroBikeHandleInputWheelieStanding - thumb_func_start sub_08119E30 -sub_08119E30: @ 0x08119E30 + thumb_func_start AcroBikeHandleInputBunnyHop +AcroBikeHandleInputBunnyHop: @ 0x08119E30 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -578515,7 +578515,7 @@ sub_08119E30: @ 0x08119E30 ands r0, r1 cmp r0, #0 bne _08119EA2 - bl sub_0811A978 + bl Bike_SetBikeStill ldrb r0, [r7, #0x1e] bl MetatileBehavior_IsBumpySlope lsls r0, r0, #0x18 @@ -578527,7 +578527,7 @@ sub_08119E30: @ 0x08119E30 adds r0, r6, #0 mov r1, sb mov r2, r8 - bl sub_08119C50 + bl CheckMovementInputAcroBike lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08119EC6 @@ -578571,10 +578571,10 @@ _08119EC6: bx r1 .align 2, 0 _08119ED4: .4byte gUnknown_2037230 - thumb_func_end sub_08119E30 + thumb_func_end AcroBikeHandleInputBunnyHop - thumb_func_start sub_08119ED8 -sub_08119ED8: @ 0x08119ED8 + thumb_func_start AcroBikeHandleInputWheelieMoving +AcroBikeHandleInputWheelieMoving: @ 0x08119ED8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -578605,7 +578605,7 @@ sub_08119ED8: @ 0x08119ED8 ands r0, r1 cmp r0, #0 bne _08119F70 - bl sub_0811A978 + bl Bike_SetBikeStill ldrb r0, [r7, #0x1e] bl MetatileBehavior_IsBumpySlope lsls r0, r0, #0x18 @@ -578645,7 +578645,7 @@ _08119F5C: adds r0, r6, #0 mov r1, sl mov r2, r8 - bl sub_08119C50 + bl CheckMovementInputAcroBike lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08119FA0 @@ -578657,7 +578657,7 @@ _08119F70: mov r1, sb strb r1, [r4, #8] strb r0, [r4, #2] - bl sub_0811A978 + bl Bike_SetBikeStill movs r0, #5 b _08119FA0 _08119F86: @@ -578685,10 +578685,10 @@ _08119FA0: bx r1 .align 2, 0 _08119FB0: .4byte gUnknown_2037230 - thumb_func_end sub_08119ED8 + thumb_func_end AcroBikeHandleInputWheelieMoving - thumb_func_start sub_08119FB4 -sub_08119FB4: @ 0x08119FB4 + thumb_func_start AcroBikeHandleInputSidewaysJump +AcroBikeHandleInputSidewaysJump: @ 0x08119FB4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -578720,7 +578720,7 @@ sub_08119FB4: @ 0x08119FB4 mov r0, r8 adds r1, r4, #0 adds r2, r5, #0 - bl sub_08119C50 + bl CheckMovementInputAcroBike lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r3} @@ -578731,7 +578731,7 @@ sub_08119FB4: @ 0x08119FB4 .align 2, 0 _0811A008: .4byte gUnknown_2037230 _0811A00C: .4byte gUnknown_2036FF0 - thumb_func_end sub_08119FB4 + thumb_func_end AcroBikeHandleInputSidewaysJump thumb_func_start AcroBikeHandleInputTurnJump AcroBikeHandleInputTurnJump: @ 0x0811A010 @@ -578743,7 +578743,7 @@ AcroBikeHandleInputTurnJump: @ 0x0811A010 ldr r4, _0811A030 movs r3, #0 strb r3, [r4, #8] - bl sub_08119C50 + bl CheckMovementInputAcroBike lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4} @@ -578753,8 +578753,8 @@ AcroBikeHandleInputTurnJump: @ 0x0811A010 _0811A030: .4byte gUnknown_2037230 thumb_func_end AcroBikeHandleInputTurnJump - thumb_func_start sub_0811A034 -sub_0811A034: @ 0x0811A034 + thumb_func_start AcroBikeTransition_TurnJump +AcroBikeTransition_TurnJump: @ 0x0811A034 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -578762,10 +578762,10 @@ sub_0811A034: @ 0x0811A034 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0811A034 + thumb_func_end AcroBikeTransition_TurnJump - thumb_func_start sub_0811A044 -sub_0811A044: @ 0x0811A044 + thumb_func_start AcroBikeTransition_TurnDirection +AcroBikeTransition_TurnDirection: @ 0x0811A044 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -578778,7 +578778,7 @@ sub_0811A044: @ 0x0811A044 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A06A @@ -578793,10 +578793,10 @@ _0811A06A: .align 2, 0 _0811A078: .4byte gUnknown_2037230 _0811A07C: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A044 + thumb_func_end AcroBikeTransition_TurnDirection - thumb_func_start sub_0811A080 -sub_0811A080: @ 0x0811A080 + thumb_func_start AcroBikeTransition_Moving +AcroBikeTransition_Moving: @ 0x0811A080 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -578810,20 +578810,20 @@ sub_0811A080: @ 0x0811A080 adds r4, r0, r1 ldrb r1, [r4, #0x1e] adds r0, r5, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A0B8 ldrb r0, [r4, #0x18] lsrs r0, r0, #4 - bl sub_0811A034 + bl AcroBikeTransition_TurnJump b _0811A10A .align 2, 0 _0811A0B0: .4byte gUnknown_2037230 _0811A0B4: .4byte gUnknown_2036FF0 _0811A0B8: adds r0, r5, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r1, #0xff @@ -578841,12 +578841,12 @@ _0811A0DA: cmp r4, #4 bne _0811A0F2 adds r0, r5, #0 - bl sub_0808AC88 + bl IsPlayerCollidingWithFarawayIslandMew lsls r0, r0, #0x18 cmp r0, #0 beq _0811A0F2 adds r0, r5, #0 - bl sub_0808B120 + bl PlayerOnBikeCollideWithFarawayIslandMew b _0811A10A _0811A0F2: subs r0, r4, #5 @@ -578855,19 +578855,19 @@ _0811A0F2: cmp r0, #3 bls _0811A10A adds r0, r6, #0 - bl sub_0808B0FC + bl PlayerOnBikeCollide b _0811A10A _0811A104: adds r0, r6, #0 - bl sub_0808B0B4 + bl pokemonanimfunc_49 _0811A10A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0811A080 + thumb_func_end AcroBikeTransition_Moving - thumb_func_start sub_0811A110 -sub_0811A110: @ 0x0811A110 + thumb_func_start AcroBikeTransition_NormalToWheelie +AcroBikeTransition_NormalToWheelie: @ 0x0811A110 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -578880,7 +578880,7 @@ sub_0811A110: @ 0x0811A110 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A136 @@ -578888,17 +578888,17 @@ sub_0811A110: @ 0x0811A110 lsrs r4, r0, #4 _0811A136: adds r0, r4, #0 - bl sub_0808B224 + bl PlayerStartWheelie pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0811A144: .4byte gUnknown_2037230 _0811A148: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A110 + thumb_func_end AcroBikeTransition_NormalToWheelie - thumb_func_start sub_0811A14C -sub_0811A14C: @ 0x0811A14C + thumb_func_start AcroBikeTransition_WheelieToNormal +AcroBikeTransition_WheelieToNormal: @ 0x0811A14C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -578911,7 +578911,7 @@ sub_0811A14C: @ 0x0811A14C adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A172 @@ -578926,10 +578926,10 @@ _0811A172: .align 2, 0 _0811A180: .4byte gUnknown_2037230 _0811A184: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A14C + thumb_func_end AcroBikeTransition_WheelieToNormal - thumb_func_start sub_0811A188 -sub_0811A188: @ 0x0811A188 + thumb_func_start AcroBikeTransition_WheelieIdle +AcroBikeTransition_WheelieIdle: @ 0x0811A188 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -578942,7 +578942,7 @@ sub_0811A188: @ 0x0811A188 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A1AE @@ -578950,17 +578950,17 @@ sub_0811A188: @ 0x0811A188 lsrs r4, r0, #4 _0811A1AE: adds r0, r4, #0 - bl sub_0808B20C + bl PlayerIdleWheelie pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0811A1BC: .4byte gUnknown_2037230 _0811A1C0: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A188 + thumb_func_end AcroBikeTransition_WheelieIdle - thumb_func_start sub_0811A1C4 -sub_0811A1C4: @ 0x0811A1C4 + thumb_func_start AcroBikeTransition_WheelieHoppingStanding +AcroBikeTransition_WheelieHoppingStanding: @ 0x0811A1C4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -578973,7 +578973,7 @@ sub_0811A1C4: @ 0x0811A1C4 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A1EA @@ -578988,10 +578988,10 @@ _0811A1EA: .align 2, 0 _0811A1F8: .4byte gUnknown_2037230 _0811A1FC: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A1C4 + thumb_func_end AcroBikeTransition_WheelieHoppingStanding - thumb_func_start sub_0811A200 -sub_0811A200: @ 0x0811A200 + thumb_func_start AcroBikeTransition_WheelieHoppingMoving +AcroBikeTransition_WheelieHoppingMoving: @ 0x0811A200 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -579004,20 +579004,20 @@ sub_0811A200: @ 0x0811A200 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A234 ldrb r0, [r5, #0x18] lsrs r0, r0, #4 - bl sub_0811A1C4 + bl AcroBikeTransition_WheelieHoppingStanding b _0811A26E .align 2, 0 _0811A22C: .4byte gUnknown_2037230 _0811A230: .4byte gUnknown_2036FF0 _0811A234: adds r0, r4, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -579027,7 +579027,7 @@ _0811A234: cmp r1, #6 bne _0811A252 adds r0, r4, #0 - bl sub_0808B29C + bl PlayerLedgeHoppingWheelie b _0811A26E _0811A252: subs r0, r1, #5 @@ -579038,24 +579038,24 @@ _0811A252: cmp r1, #0xb bhi _0811A268 adds r0, r4, #0 - bl sub_0811A1C4 + bl AcroBikeTransition_WheelieHoppingStanding b _0811A26E _0811A268: adds r0, r4, #0 - bl sub_0808B278 + bl PlayerMovingHoppingWheelie _0811A26E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0811A200 + thumb_func_end AcroBikeTransition_WheelieHoppingMoving - thumb_func_start sub_0811A274 -sub_0811A274: @ 0x0811A274 + thumb_func_start AcroBikeTransition_SideJump +AcroBikeTransition_SideJump: @ 0x0811A274 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -579073,7 +579073,7 @@ sub_0811A274: @ 0x0811A274 bne _0811A2A8 _0811A2A0: adds r0, r5, #0 - bl sub_0811A044 + bl AcroBikeTransition_TurnDirection b _0811A2D4 _0811A2A8: ldr r0, _0811A2DC @@ -579094,7 +579094,7 @@ _0811A2A8: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_0808B048 + bl PlayerSetAnimId _0811A2D4: pop {r4, r5} pop {r0} @@ -579102,21 +579102,21 @@ _0811A2D4: .align 2, 0 _0811A2DC: .4byte gUnknown_2037230 _0811A2E0: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A274 + thumb_func_end AcroBikeTransition_SideJump thumb_func_start sub_0811A2E4 sub_0811A2E4: @ 0x0811A2E4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0808B2C0 + bl PlayerAcroTurnJump pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0811A2E4 - thumb_func_start sub_0811A2F4 -sub_0811A2F4: @ 0x0811A2F4 + thumb_func_start AcroBikeTransition_WheelieMoving +AcroBikeTransition_WheelieMoving: @ 0x0811A2F4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -579130,20 +579130,20 @@ sub_0811A2F4: @ 0x0811A2F4 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A32C ldrb r0, [r5, #0x18] lsrs r0, r0, #4 - bl sub_0808B20C + bl PlayerIdleWheelie b _0811A37C .align 2, 0 _0811A324: .4byte gUnknown_2037230 _0811A328: .4byte gUnknown_2036FF0 _0811A32C: adds r0, r4, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r2, #0xff @@ -579155,7 +579155,7 @@ _0811A32C: cmp r1, #6 bne _0811A34E adds r0, r4, #0 - bl sub_0808B29C + bl PlayerLedgeHoppingWheelie b _0811A37C _0811A34E: cmp r1, #9 @@ -579169,11 +579169,11 @@ _0811A34E: beq _0811A36A _0811A362: adds r0, r4, #0 - bl sub_0808B20C + bl PlayerIdleWheelie b _0811A37C _0811A36A: adds r0, r4, #0 - bl sub_0808B2E4 + bl PlayerStandingHoppingWheelie b _0811A37C _0811A372: adds r0, r6, #0 @@ -579185,10 +579185,10 @@ _0811A37C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0811A2F4 + thumb_func_end AcroBikeTransition_WheelieMoving - thumb_func_start sub_0811A384 -sub_0811A384: @ 0x0811A384 + thumb_func_start AcroBikeTransition_WheelieRisingMoving +AcroBikeTransition_WheelieRisingMoving: @ 0x0811A384 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -579202,20 +579202,20 @@ sub_0811A384: @ 0x0811A384 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A3BC ldrb r0, [r5, #0x18] lsrs r0, r0, #4 - bl sub_0808B224 + bl PlayerStartWheelie b _0811A40C .align 2, 0 _0811A3B4: .4byte gUnknown_2037230 _0811A3B8: .4byte gUnknown_2036FF0 _0811A3BC: adds r0, r4, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r2, #0xff @@ -579227,7 +579227,7 @@ _0811A3BC: cmp r1, #6 bne _0811A3DE adds r0, r4, #0 - bl sub_0808B29C + bl PlayerLedgeHoppingWheelie b _0811A40C _0811A3DE: cmp r1, #9 @@ -579241,11 +579241,11 @@ _0811A3DE: beq _0811A3FA _0811A3F2: adds r0, r4, #0 - bl sub_0808B20C + bl PlayerIdleWheelie b _0811A40C _0811A3FA: adds r0, r4, #0 - bl sub_0808B2E4 + bl PlayerStandingHoppingWheelie b _0811A40C _0811A402: adds r0, r6, #0 @@ -579257,10 +579257,10 @@ _0811A40C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0811A384 + thumb_func_end AcroBikeTransition_WheelieRisingMoving - thumb_func_start sub_0811A414 -sub_0811A414: @ 0x0811A414 + thumb_func_start AcroBikeTransition_WheelieLoweringMoving +AcroBikeTransition_WheelieLoweringMoving: @ 0x0811A414 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -579274,7 +579274,7 @@ sub_0811A414: @ 0x0811A414 adds r5, r0, r1 ldrb r1, [r5, #0x1e] adds r0, r4, #0 - bl sub_0811A7C4 + bl CanBikeFaceDirOnMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A44C @@ -579287,7 +579287,7 @@ _0811A444: .4byte gUnknown_2037230 _0811A448: .4byte gUnknown_2036FF0 _0811A44C: adds r0, r4, #0 - bl sub_0811A688 + bl get_some_collision lsls r0, r0, #0x18 lsrs r1, r0, #0x18 movs r2, #0xff @@ -579317,7 +579317,7 @@ _0811A486: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0811A414 + thumb_func_end AcroBikeTransition_WheelieLoweringMoving thumb_func_start Bike_TryAcroBikeHistoryUpdate Bike_TryAcroBikeHistoryUpdate: @ 0x0811A48C @@ -579334,7 +579334,7 @@ Bike_TryAcroBikeHistoryUpdate: @ 0x0811A48C beq _0811A4AA adds r0, r3, #0 adds r1, r2, #0 - bl sub_0811A4B4 + bl AcroBike_TryHistoryUpdate _0811A4AA: pop {r0} bx r0 @@ -579342,8 +579342,8 @@ _0811A4AA: _0811A4B0: .4byte gUnknown_2037230 thumb_func_end Bike_TryAcroBikeHistoryUpdate - thumb_func_start sub_0811A4B4 -sub_0811A4B4: @ 0x0811A4B4 + thumb_func_start AcroBike_TryHistoryUpdate +AcroBike_TryHistoryUpdate: @ 0x0811A4B4 push {r4, r5, lr} lsls r1, r1, #0x10 lsrs r5, r1, #0x10 @@ -579397,10 +579397,10 @@ _0811A516: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0811A4B4 + thumb_func_end AcroBike_TryHistoryUpdate - thumb_func_start sub_0811A51C -sub_0811A51C: @ 0x0811A51C + thumb_func_start HasPlayerInputTakenLongerThanList +HasPlayerInputTakenLongerThanList: @ 0x0811A51C push {r4, r5, lr} adds r3, r0, #0 adds r4, r1, #0 @@ -579457,10 +579457,10 @@ _0811A578: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A51C + thumb_func_end HasPlayerInputTakenLongerThanList - thumb_func_start sub_0811A580 -sub_0811A580: @ 0x0811A580 + thumb_func_start AcroBike_GetJumpDirection +AcroBike_GetJumpDirection: @ 0x0811A580 push {r4, r5, r6, lr} movs r6, #0 movs r5, #0 @@ -579482,7 +579482,7 @@ _0811A586: bne _0811A5C0 ldr r0, [r4, #0x10] ldr r1, [r4, #0x14] - bl sub_0811A51C + bl HasPlayerInputTakenLongerThanList lsls r0, r0, #0x18 cmp r0, #0 beq _0811A5C0 @@ -579501,7 +579501,7 @@ _0811A5CA: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0811A580 + thumb_func_end AcroBike_GetJumpDirection thumb_func_start Bike_UpdateDirTimerHistory Bike_UpdateDirTimerHistory: @ 0x0811A5D0 @@ -579614,8 +579614,8 @@ _0811A682: .align 2, 0 thumb_func_end Bike_DPadToDirection - thumb_func_start sub_0811A688 -sub_0811A688: @ 0x0811A688 + thumb_func_start get_some_collision +get_some_collision: @ 0x0811A688 push {r4, r5, r6, lr} sub sp, #8 adds r6, r0, #0 @@ -579655,7 +579655,7 @@ sub_0811A688: @ 0x0811A688 str r0, [sp] adds r0, r4, #0 adds r3, r6, #0 - bl sub_0811A6F4 + bl Bike_CheckCollisionTryAdvanceCollisionCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 add sp, #8 @@ -579665,10 +579665,10 @@ sub_0811A688: @ 0x0811A688 .align 2, 0 _0811A6EC: .4byte gUnknown_2037230 _0811A6F0: .4byte gUnknown_2036FF0 - thumb_func_end sub_0811A688 + thumb_func_end get_some_collision - thumb_func_start sub_0811A6F4 -sub_0811A6F4: @ 0x0811A6F4 + thumb_func_start Bike_CheckCollisionTryAdvanceCollisionCount +Bike_CheckCollisionTryAdvanceCollisionCount: @ 0x0811A6F4 push {r4, r5, lr} sub sp, #4 ldr r4, [sp, #0x10] @@ -579682,7 +579682,7 @@ sub_0811A6F4: @ 0x0811A6F4 lsls r2, r2, #0x10 asrs r2, r2, #0x10 str r5, [sp] - bl sub_0808A9F8 + bl CheckForEventObjectCollision lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #4 @@ -579690,7 +579690,7 @@ sub_0811A6F4: @ 0x0811A6F4 cmp r4, #0 bne _0811A730 adds r0, r5, #0 - bl sub_0811A768 + bl IsRunningDisallowedByMetatile lsls r0, r0, #0x18 cmp r0, #0 beq _0811A72C @@ -579707,14 +579707,14 @@ _0811A734: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A6F4 + thumb_func_end Bike_CheckCollisionTryAdvanceCollisionCount - thumb_func_start sub_0811A740 -sub_0811A740: @ 0x0811A740 + thumb_func_start RS_IsRunningDisallowed +RS_IsRunningDisallowed: @ 0x0811A740 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0811A768 + bl IsRunningDisallowedByMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A758 @@ -579733,10 +579733,10 @@ _0811A762: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A740 + thumb_func_end RS_IsRunningDisallowed - thumb_func_start sub_0811A768 -sub_0811A768: @ 0x0811A768 + thumb_func_start IsRunningDisallowedByMetatile +IsRunningDisallowedByMetatile: @ 0x0811A768 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -579765,7 +579765,7 @@ _0811A798: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A768 + thumb_func_end IsRunningDisallowedByMetatile thumb_func_start Bike_TryAdvanceCyclingRoadCollisions Bike_TryAdvanceCyclingRoadCollisions: @ 0x0811A7A0 @@ -579788,8 +579788,8 @@ _0811A7BC: .4byte gUnknown_203A820 _0811A7C0: .4byte gUnknown_203A821 thumb_func_end Bike_TryAdvanceCyclingRoadCollisions - thumb_func_start sub_0811A7C4 -sub_0811A7C4: @ 0x0811A7C4 + thumb_func_start CanBikeFaceDirOnMetatile +CanBikeFaceDirOnMetatile: @ 0x0811A7C4 push {r4, r5, lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -579831,7 +579831,7 @@ _0811A80C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A7C4 + thumb_func_end CanBikeFaceDirOnMetatile thumb_func_start WillPlayerCollideWithCollision WillPlayerCollideWithCollision: @ 0x0811A814 @@ -579867,8 +579867,8 @@ _0811A842: .align 2, 0 thumb_func_end WillPlayerCollideWithCollision - thumb_func_start sub_0811A848 -sub_0811A848: @ 0x0811A848 + thumb_func_start IsBikingDisallowedByPlayer +IsBikingDisallowedByPlayer: @ 0x0811A848 push {r4, lr} sub sp, #4 ldr r0, _0811A884 @@ -579890,7 +579890,7 @@ sub_0811A848: @ 0x0811A848 bl MapGridGetMetatileBehaviorAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0811A768 + bl IsRunningDisallowedByMetatile lsls r0, r0, #0x18 cmp r0, #0 bne _0811A888 @@ -579906,13 +579906,13 @@ _0811A88A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A848 + thumb_func_end IsBikingDisallowedByPlayer - thumb_func_start sub_0811A894 -sub_0811A894: @ 0x0811A894 + thumb_func_start IsMonValidSpecies +IsMonValidSpecies: @ 0x0811A894 push {lr} movs r0, #4 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _0811A8C8 @@ -579939,10 +579939,10 @@ _0811A8CA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811A894 + thumb_func_end IsMonValidSpecies - thumb_func_start sub_0811A8D0 -sub_0811A8D0: @ 0x0811A8D0 + thumb_func_start GetOnOffBike +GetOnOffBike: @ 0x0811A8D0 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -579957,8 +579957,8 @@ sub_0811A8D0: @ 0x0811A8D0 beq _0811A900 movs r0, #1 bl SetPlayerAvatarTransitionFlags - bl sub_08085168 - bl sub_080850EC + bl Overworld_ClearSavedMusic + bl Overworld_PlaySpecialMapMusic b _0811A914 .align 2, 0 _0811A8F8: .4byte gUnknown_2036FE8 @@ -579968,16 +579968,16 @@ _0811A900: bl SetPlayerAvatarTransitionFlags ldr r4, _0811A91C adds r0, r4, #0 - bl sub_0808515C + bl Overworld_SetSavedMusic adds r0, r4, #0 - bl sub_0808522C + bl GetTruckCameraBobbingY _0811A914: pop {r4} pop {r0} bx r0 .align 2, 0 _0811A91C: .4byte 0x00000193 - thumb_func_end sub_0811A8D0 + thumb_func_end GetOnOffBike thumb_func_start BikeClearState BikeClearState: @ 0x0811A920 @@ -580018,8 +580018,8 @@ _0811A95C: .4byte gUnknown_2037230 _0811A960: .4byte gUnknown_203724C thumb_func_end BikeClearState - thumb_func_start sub_0811A964 -sub_0811A964: @ 0x0811A964 + thumb_func_start Bike_UpdateBikeCounterSpeed +Bike_UpdateBikeCounterSpeed: @ 0x0811A964 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0811A974 @@ -580030,10 +580030,10 @@ sub_0811A964: @ 0x0811A964 bx lr .align 2, 0 _0811A974: .4byte gUnknown_2037230 - thumb_func_end sub_0811A964 + thumb_func_end Bike_UpdateBikeCounterSpeed - thumb_func_start sub_0811A978 -sub_0811A978: @ 0x0811A978 + thumb_func_start Bike_SetBikeStill +Bike_SetBikeStill: @ 0x0811A978 ldr r1, _0811A984 movs r0, #0 strb r0, [r1, #0xa] @@ -580041,10 +580041,10 @@ sub_0811A978: @ 0x0811A978 bx lr .align 2, 0 _0811A984: .4byte gUnknown_2037230 - thumb_func_end sub_0811A978 + thumb_func_end Bike_SetBikeStill - thumb_func_start sub_0811A988 -sub_0811A988: @ 0x0811A988 + thumb_func_start GetPlayerSpeed +GetPlayerSpeed: @ 0x0811A988 push {lr} sub sp, #8 ldr r1, _0811A9B0 @@ -580086,10 +580086,10 @@ _0811A9D2: add sp, #8 pop {r1} bx r1 - thumb_func_end sub_0811A988 + thumb_func_end GetPlayerSpeed - thumb_func_start sub_0811A9D8 -sub_0811A9D8: @ 0x0811A9D8 + thumb_func_start Bike_HandleBumpySlopeJump +Bike_HandleBumpySlopeJump: @ 0x0811A9D8 push {r4, r5, lr} sub sp, #4 ldr r5, _0811AA28 @@ -580128,10 +580128,10 @@ _0811AA20: bx r0 .align 2, 0 _0811AA28: .4byte gUnknown_2037230 - thumb_func_end sub_0811A9D8 + thumb_func_end Bike_HandleBumpySlopeJump - thumb_func_start sub_0811AA2C -sub_0811AA2C: @ 0x0811AA2C + thumb_func_start IsRunningDisallowed +IsRunningDisallowed: @ 0x0811AA2C push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -580142,7 +580142,7 @@ sub_0811AA2C: @ 0x0811AA2C cmp r0, #0 beq _0811AA4C adds r0, r2, #0 - bl sub_0811A768 + bl IsRunningDisallowedByMetatile lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -580158,10 +580158,10 @@ _0811AA56: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811AA2C + thumb_func_end IsRunningDisallowed - thumb_func_start sub_0811AA5C -sub_0811AA5C: @ 0x0811AA5C + thumb_func_start DoEasyChatScreen +DoEasyChatScreen: @ 0x0811AA5C push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -580174,10 +580174,10 @@ sub_0811AA5C: @ 0x0811AA5C lsrs r6, r6, #0x18 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 - bl sub_080A8818 + bl ResetTasks ldr r0, _0811AABC movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -580197,7 +580197,7 @@ sub_0811AA5C: @ 0x0811AA5C mov r2, sb bl SetWordTaskArg ldr r0, _0811AAC4 - bl sub_08000540 + bl SetMainCallback2 pop {r3, r4} mov r8, r3 mov sb, r4 @@ -580208,15 +580208,15 @@ sub_0811AA5C: @ 0x0811AA5C _0811AABC: .4byte sub_0811AB10 _0811AAC0: .4byte gUnknown_3005B60 _0811AAC4: .4byte sub_0811AAC8 - thumb_func_end sub_0811AA5C + thumb_func_end DoEasyChatScreen thumb_func_start sub_0811AAC8 sub_0811AAC8: @ 0x0811AAC8 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -580226,8 +580226,8 @@ sub_0811AAC8: @ 0x0811AAC8 sub_0811AAE0: @ 0x0811AAE0 push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests pop {r0} bx r0 .align 2, 0 @@ -580255,7 +580255,7 @@ sub_0811AB10: @ 0x0811AB10 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 bne _0811AB2C _0811AB1E: @@ -580318,20 +580318,20 @@ _0811AB7C: @ jump table .4byte _0811AC5C @ case 5 _0811AB94: ldr r0, _0811ABBC - bl sub_080006F0 + bl SetVBlankCallback movs r4, #1 rsbs r4, r4, #0 adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 adds r1, r4, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #5 b _0811AC6A .align 2, 0 @@ -580352,7 +580352,7 @@ _0811ABC0: movs r2, #0 str r2, [sp] movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #3 strh r0, [r5] strh r4, [r5, #0xc] @@ -580366,7 +580366,7 @@ _0811ABEE: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #4 b _0811AC6A _0811AC06: @@ -580459,7 +580459,7 @@ _0811ACA4: @ jump table .4byte _0811AD00 @ case 4 _0811ACB8: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes bl ResetPaletteFade @@ -580475,7 +580475,7 @@ _0811ACD2: adds r1, r0, #0 ldrb r2, [r6, #0xe] adds r0, r4, #0 - bl sub_0811B1AC + bl EasyChat_AllocateResources b _0811ACEC _0811ACE8: bl sub_0811C850 @@ -580517,16 +580517,16 @@ sub_0811AD20: @ 0x0811AD20 bl sub_0811C9FC bl sub_0811B2D0 bl sub_0811F814 - bl sub_080034D4 + bl FreeAllWindowBuffers adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 thumb_func_end sub_0811AD20 - thumb_func_start sub_0811AD40 -sub_0811AD40: @ 0x0811AD40 + thumb_func_start ShowEasyChatScreen +ShowEasyChatScreen: @ 0x0811AD40 push {r4, r5, lr} movs r5, #3 ldr r0, _0811AD58 @@ -580841,26 +580841,26 @@ _0811B00C: bl sub_0801AB30 adds r4, r0, #0 _0811B012: - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0811B02C ldrb r0, [r0] ldr r2, _0811B030 adds r1, r4, #0 adds r3, r5, #0 - bl sub_0811AA5C + bl DoEasyChatScreen _0811B024: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0811B02C: .4byte gUnknown_2037280 -_0811B030: .4byte sub_08085B18 - thumb_func_end sub_0811AD40 +_0811B030: .4byte CB2_ReturnToFieldContinueScript + thumb_func_end ShowEasyChatScreen thumb_func_start sub_0811B034 sub_0811B034: @ 0x0811B034 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0811B050 movs r1, #0x87 lsls r1, r1, #3 @@ -580876,7 +580876,7 @@ _0811B050: .4byte gUnknown_3002360 _0811B054: movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen b _0811B090 _0811B05E: ldr r0, _0811B080 @@ -580891,7 +580891,7 @@ _0811B05E: adds r0, r0, r1 ldr r1, _0811B08C strh r1, [r0, #0x16] - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps bl DoQuizQuestionEasyChatScreen b _0811B09E .align 2, 0 @@ -580918,7 +580918,7 @@ _0811B0A4: .4byte gUnknown_3002360 sub_0811B0A8: @ 0x0811B0A8 push {lr} ldr r0, _0811B0B4 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -580971,7 +580971,7 @@ sub_0811B0F4: @ 0x0811B0F4 lsrs r0, r0, #0x10 bl sub_0811B0B8 adds r4, r0, #0 - bl sub_080A8818 + bl ResetTasks ldr r0, _0811B118 lsls r4, r4, #3 adds r0, #4 @@ -580995,13 +580995,13 @@ DoQuizAnswerEasyChatScreen: @ 0x0811B11C ldr r2, _0811B13C movs r0, #0xf movs r3, #3 - bl sub_0811AA5C + bl DoEasyChatScreen pop {r0} bx r0 .align 2, 0 _0811B134: .4byte gUnknown_3005AEC _0811B138: .4byte 0x00003B6E -_0811B13C: .4byte sub_08085B18 +_0811B13C: .4byte CB2_ReturnToFieldContinueScript thumb_func_end DoQuizAnswerEasyChatScreen thumb_func_start DoQuizQuestionEasyChatScreen @@ -581014,13 +581014,13 @@ DoQuizQuestionEasyChatScreen: @ 0x0811B140 ldr r2, _0811B160 movs r0, #0x10 movs r3, #3 - bl sub_0811AA5C + bl DoEasyChatScreen pop {r0} bx r0 .align 2, 0 _0811B158: .4byte gUnknown_3005AEC _0811B15C: .4byte 0x00003B5A -_0811B160: .4byte sub_08085B18 +_0811B160: .4byte CB2_ReturnToFieldContinueScript thumb_func_end DoQuizQuestionEasyChatScreen thumb_func_start DoQuizSetAnswerEasyChatScreen @@ -581033,13 +581033,13 @@ DoQuizSetAnswerEasyChatScreen: @ 0x0811B164 ldr r2, _0811B184 movs r0, #0x12 movs r3, #3 - bl sub_0811AA5C + bl DoEasyChatScreen pop {r0} bx r0 .align 2, 0 _0811B17C: .4byte gUnknown_3005AEC _0811B180: .4byte 0x00003B6C -_0811B184: .4byte sub_08085B18 +_0811B184: .4byte CB2_ReturnToFieldContinueScript thumb_func_end DoQuizSetAnswerEasyChatScreen thumb_func_start DoQuizSetQuestionEasyChatScreen @@ -581052,17 +581052,17 @@ DoQuizSetQuestionEasyChatScreen: @ 0x0811B188 ldr r2, _0811B1A8 movs r0, #0x11 movs r3, #3 - bl sub_0811AA5C + bl DoEasyChatScreen pop {r0} bx r0 .align 2, 0 _0811B1A0: .4byte gUnknown_3005AEC _0811B1A4: .4byte 0x00003B5A -_0811B1A8: .4byte sub_08085B18 +_0811B1A8: .4byte CB2_ReturnToFieldContinueScript thumb_func_end DoQuizSetQuestionEasyChatScreen - thumb_func_start sub_0811B1AC -sub_0811B1AC: @ 0x0811B1AC + thumb_func_start EasyChat_AllocateResources +EasyChat_AllocateResources: @ 0x0811B1AC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -581097,7 +581097,7 @@ _0811B1D4: ldr r0, [r4] strb r7, [r0, #0x13] adds r0, r5, #0 - bl sub_0811C4CC + bl GetEachChatScreenTemplateId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r5, #0x10 @@ -581208,7 +581208,7 @@ _0811B2BE: .align 2, 0 _0811B2C8: .4byte 0x0000FFFF _0811B2CC: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811B1AC + thumb_func_end EasyChat_AllocateResources thumb_func_start sub_0811B2D0 sub_0811B2D0: @ 0x0811B2D0 @@ -581217,7 +581217,7 @@ sub_0811B2D0: @ 0x0811B2D0 ldr r0, [r4] cmp r0, #0 beq _0811B2E2 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0811B2E2: @@ -582946,7 +582946,7 @@ _0811BEE4: ldrb r0, [r1, #0xb] adds r0, #1 strb r0, [r1, #0xb] - bl sub_0811BF38 + bl AnimTask_GrowAndShrinkStep b _0811BF08 .align 2, 0 _0811BEF4: .4byte gUnknown_2039DE4 @@ -582991,8 +582991,8 @@ _0811BF2E: _0811BF34: .4byte gUnknown_2039DE4 thumb_func_end sub_0811BF14 - thumb_func_start sub_0811BF38 -sub_0811BF38: @ 0x0811BF38 + thumb_func_start AnimTask_GrowAndShrinkStep +AnimTask_GrowAndShrinkStep: @ 0x0811BF38 push {r4, lr} ldr r4, _0811BF50 ldr r1, [r4] @@ -583014,7 +583014,7 @@ _0811BF5E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0811BF38 + thumb_func_end AnimTask_GrowAndShrinkStep thumb_func_start sub_0811BF64 sub_0811BF64: @ 0x0811BF64 @@ -583492,55 +583492,55 @@ _0811C284: .4byte gUnknown_8573134 _0811C288: .4byte gUnknown_2039DE4 thumb_func_end GetEasyChatScreenFrameId - thumb_func_start sub_0811C28C -sub_0811C28C: @ 0x0811C28C + thumb_func_start GetTitleText +GetTitleText: @ 0x0811C28C ldr r0, _0811C294 ldr r0, [r0] ldr r0, [r0, #0x34] bx lr .align 2, 0 _0811C294: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811C28C + thumb_func_end GetTitleText - thumb_func_start sub_0811C298 -sub_0811C298: @ 0x0811C298 + thumb_func_start GetEasyChatWordBuffer +GetEasyChatWordBuffer: @ 0x0811C298 ldr r0, _0811C2A0 ldr r0, [r0] adds r0, #0x3c bx lr .align 2, 0 _0811C2A0: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811C298 + thumb_func_end GetEasyChatWordBuffer - thumb_func_start sub_0811C2A4 -sub_0811C2A4: @ 0x0811C2A4 + thumb_func_start GetNumRows +GetNumRows: @ 0x0811C2A4 ldr r0, _0811C2AC ldr r0, [r0] ldrb r0, [r0, #3] bx lr .align 2, 0 _0811C2AC: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811C2A4 + thumb_func_end GetNumRows - thumb_func_start sub_0811C2B0 -sub_0811C2B0: @ 0x0811C2B0 + thumb_func_start GetNumColumns +GetNumColumns: @ 0x0811C2B0 ldr r0, _0811C2B8 ldr r0, [r0] ldrb r0, [r0, #2] bx lr .align 2, 0 _0811C2B8: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811C2B0 + thumb_func_end GetNumColumns - thumb_func_start sub_0811C2BC -sub_0811C2BC: @ 0x0811C2BC + thumb_func_start GetMainCursorColumn +GetMainCursorColumn: @ 0x0811C2BC ldr r0, _0811C2C4 ldr r0, [r0] ldrb r0, [r0, #5] bx lr .align 2, 0 _0811C2C4: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811C2BC + thumb_func_end GetMainCursorColumn thumb_func_start sub_0811C2C8 sub_0811C2C8: @ 0x0811C2C8 @@ -583655,8 +583655,8 @@ _0811C382: _0811C388: .4byte gUnknown_85CBA63 thumb_func_end sub_0811C344 - thumb_func_start sub_0811C38C -sub_0811C38C: @ 0x0811C38C + thumb_func_start GetEasyChatConfirmDeletionText +GetEasyChatConfirmDeletionText: @ 0x0811C38C ldr r2, _0811C398 str r2, [r0] ldr r0, _0811C39C @@ -583665,7 +583665,7 @@ sub_0811C38C: @ 0x0811C38C .align 2, 0 _0811C398: .4byte gUnknown_85CBAA7 _0811C39C: .4byte gUnknown_85CBAB6 - thumb_func_end sub_0811C38C + thumb_func_end GetEasyChatConfirmDeletionText thumb_func_start sub_0811C3A0 sub_0811C3A0: @ 0x0811C3A0 @@ -583814,14 +583814,14 @@ _0811C46E: .align 2, 0 thumb_func_end sub_0811C430 - thumb_func_start sub_0811C474 -sub_0811C474: @ 0x0811C474 + thumb_func_start FooterHasFourOptions_ +FooterHasFourOptions_: @ 0x0811C474 push {lr} bl FooterHasFourOptions pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811C474 + thumb_func_end FooterHasFourOptions_ thumb_func_start sub_0811C480 sub_0811C480: @ 0x0811C480 @@ -583863,18 +583863,18 @@ _0811C4B8: .align 2, 0 thumb_func_end sub_0811C480 - thumb_func_start sub_0811C4C0 -sub_0811C4C0: @ 0x0811C4C0 + thumb_func_start GetDisplayedPersonType +GetDisplayedPersonType: @ 0x0811C4C0 ldr r0, _0811C4C8 ldr r0, [r0] ldrb r0, [r0, #0x12] bx lr .align 2, 0 _0811C4C8: .4byte gUnknown_2039DE4 - thumb_func_end sub_0811C4C0 + thumb_func_end GetDisplayedPersonType - thumb_func_start sub_0811C4CC -sub_0811C4CC: @ 0x0811C4CC + thumb_func_start GetEachChatScreenTemplateId +GetEachChatScreenTemplateId: @ 0x0811C4CC push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -583899,7 +583899,7 @@ _0811C4F2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811C4CC + thumb_func_end GetEachChatScreenTemplateId thumb_func_start sub_0811C4F8 sub_0811C4F8: @ 0x0811C4F8 @@ -584074,7 +584074,7 @@ _0811C624: _0811C62C: ldr r1, _0811C640 adds r0, r5, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders pop {r4, r5} pop {r0} bx r0 @@ -584100,7 +584100,7 @@ _0811C65C: ldrh r1, [r4] adds r0, r2, #0 movs r2, #0 - bl sub_0811F990 + bl CopyEasyChatWordPadded adds r2, r0, #0 movs r0, #0 strb r0, [r2] @@ -584291,7 +584291,7 @@ sub_0811C79C: @ 0x0811C79C adds r4, #0x3c adds r4, r4, r0 ldrh r0, [r4] - bl sub_0811F25C + bl GetEasyChatWordStringLength lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #6 @@ -584316,7 +584316,7 @@ _0811C7E0: adds r0, #0x3c adds r0, r0, r1 ldrh r0, [r0] - bl sub_0811F25C + bl GetEasyChatWordStringLength lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #6 @@ -584352,7 +584352,7 @@ sub_0811C820: @ 0x0811C820 cmp r0, #0 beq _0811C848 adds r0, r1, #0 - bl sub_0811F25C + bl GetEasyChatWordStringLength lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #6 @@ -584424,15 +584424,15 @@ _0811C8A4: ldr r0, _0811C8FC adds r1, r1, r0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r0, #0xbf lsls r0, r0, #2 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _0811C900 - bl sub_08003090 + bl InitWindows bl sub_08004480 bl sub_0811D814 bl sub_0811D7B4 @@ -584457,12 +584457,12 @@ _0811C908: movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _0811C948 movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer bl sub_0811DE14 ldr r0, _0811C94C ldr r0, [r0] @@ -584472,7 +584472,7 @@ _0811C908: bl sub_0811DCAC bl sub_0811DB10 movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0811C9E4 .align 2, 0 _0811C944: .4byte gUnknown_8573E84 @@ -584485,9 +584485,9 @@ _0811C950: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0811C9E4 .align 2, 0 _0811C968: .4byte gUnknown_857427C @@ -584507,7 +584507,7 @@ _0811C97E: bl sub_0811E6D8 b _0811C9E4 _0811C994: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811C9EE @@ -584523,16 +584523,16 @@ _0811C994: movs r1, #0x3b bl SetGpuReg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0 - bl sub_08001B48 + bl ShowBg bl sub_0811ED20 bl sub_0811EE6C - bl sub_0811EF74 + bl GetCoolColorFromPersonality b _0811C9E4 _0811C9E0: movs r0, #0 @@ -584561,7 +584561,7 @@ sub_0811C9FC: @ 0x0811C9FC ldr r0, [r4] cmp r0, #0 beq _0811CA0E - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0811CA0E: @@ -584675,7 +584675,7 @@ _0811CB18: bl sub_0811D0E4 b _0811CB88 _0811CB1E: - bl sub_0811D1A4 + bl IsDma3ManagerBusyWithBgCopy_ b _0811CB88 _0811CB24: bl sub_0811D250 @@ -584759,7 +584759,7 @@ _0811CBAC: strh r0, [r1] b _0811CBC4 _0811CBBA: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811CBC6 @@ -584778,20 +584778,20 @@ sub_0811CBCC: @ 0x0811CBCC mov r6, sb mov r5, r8 push {r5, r6, r7} - bl sub_0811C298 + bl GetEasyChatWordBuffer adds r5, r0, #0 bl GetEasyChatScreenFrameId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 - bl sub_0811C2BC + bl GetMainCursorColumn lsls r0, r0, #0x18 lsrs r7, r0, #0x18 bl sub_0811C2C8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 - bl sub_0811C2B0 + bl GetNumColumns lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sb @@ -584819,7 +584819,7 @@ _0811CC2A: ldrh r0, [r5] cmp r0, r8 beq _0811CC44 - bl sub_0811F25C + bl GetEasyChatWordStringLength adds r1, r4, #2 adds r0, r0, r1 b _0811CC46 @@ -584868,7 +584868,7 @@ _0811CC84: .4byte gUnknown_8574358 sub_0811CC88: @ 0x0811CC88 push {r4, lr} ldr r4, _0811CCB0 - bl sub_0811C2BC + bl GetMainCursorColumn lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0811CCB4 @@ -584914,7 +584914,7 @@ _0811CCD0: strh r0, [r1] b _0811CCF4 _0811CCEA: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811CCF6 @@ -584951,7 +584951,7 @@ _0811CD14: strh r0, [r1] b _0811CD38 _0811CD2E: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811CD3A @@ -584988,7 +584988,7 @@ _0811CD58: strh r0, [r1] b _0811CD7C _0811CD72: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811CD7E @@ -585019,14 +585019,14 @@ _0811CD9C: bl sub_0811D9D8 bl sub_0811DBA8 movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r1, [r4] ldrh r0, [r1] adds r0, #1 strh r0, [r1] b _0811CDC4 _0811CDBA: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811CDC6 @@ -585062,7 +585062,7 @@ _0811CDE4: adds r0, #1 strh r0, [r1] _0811CDFA: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _0811CE02: @@ -585096,7 +585096,7 @@ _0811CE28: @ jump table _0811CE3C: bl sub_0811E7A0 movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #0 movs r1, #0 movs r2, #0 @@ -585105,7 +585105,7 @@ _0811CE3C: bl sub_0811DEDC b _0811CE8E _0811CE58: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811CECC @@ -585113,7 +585113,7 @@ _0811CE58: bl sub_0811E1E0 b _0811CE8E _0811CE6A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811CECC @@ -585123,7 +585123,7 @@ _0811CE6A: bne _0811CECC b _0811CE8E _0811CE80: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811CECC @@ -585213,13 +585213,13 @@ _0811CF32: .align 2, 0 _0811CF40: .4byte gUnknown_2039DE8 _0811CF44: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811CF6C bl sub_0811E7C0 movs r0, #0 - bl sub_08001B48 + bl ShowBg _0811CF58: ldr r0, _0811CF64 ldr r1, [r0] @@ -585281,7 +585281,7 @@ _0811CFBC: bl sub_0811DEDC b _0811CFEA _0811CFD6: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D02C @@ -585459,10 +585459,10 @@ _0811D12A: lsls r0, r0, #0x18 cmp r0, #0 bne _0811D19C - bl sub_0811E1C8 + bl VBlankCB_MailRead b _0811D15C _0811D13A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D19C @@ -585486,7 +585486,7 @@ _0811D15C: .align 2, 0 _0811D168: .4byte gUnknown_2039DE8 _0811D16C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D19C @@ -585513,8 +585513,8 @@ _0811D19E: .align 2, 0 thumb_func_end sub_0811D0E4 - thumb_func_start sub_0811D1A4 -sub_0811D1A4: @ 0x0811D1A4 + thumb_func_start IsDma3ManagerBusyWithBgCopy_ +IsDma3ManagerBusyWithBgCopy_: @ 0x0811D1A4 push {lr} ldr r0, _0811D1BC ldr r0, [r0] @@ -585543,10 +585543,10 @@ _0811D1E2: bl sub_0811EACC bl sub_0811EDFC bl sub_0811EF44 - bl sub_0811E1C8 + bl VBlankCB_MailRead b _0811D216 _0811D1F4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D248 @@ -585559,7 +585559,7 @@ _0811D206: cmp r0, #0 bne _0811D248 movs r0, #0 - bl sub_08001B48 + bl ShowBg _0811D216: ldr r0, _0811D224 ldr r1, [r0] @@ -585570,7 +585570,7 @@ _0811D216: .align 2, 0 _0811D224: .4byte gUnknown_2039DE8 _0811D228: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D248 @@ -585591,7 +585591,7 @@ _0811D24A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0811D1A4 + thumb_func_end IsDma3ManagerBusyWithBgCopy_ thumb_func_start sub_0811D250 sub_0811D250: @ 0x0811D250 @@ -585624,10 +585624,10 @@ _0811D292: bl sub_0811EACC bl sub_0811EDFC bl sub_0811EF44 - bl sub_0811E1C8 + bl VBlankCB_MailRead b _0811D2D8 _0811D2A4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D308 @@ -585643,12 +585643,12 @@ _0811D2B6: bl sub_0811D9D8 b _0811D2D8 _0811D2C8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D308 movs r0, #0 - bl sub_08001B48 + bl ShowBg _0811D2D8: ldr r0, _0811D2E4 ldr r1, [r0] @@ -585659,7 +585659,7 @@ _0811D2D8: .align 2, 0 _0811D2E4: .4byte gUnknown_2039DE8 _0811D2E8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D308 @@ -585708,10 +585708,10 @@ _0811D344: bl sub_0811EACC bl sub_0811EDFC bl sub_0811EF44 - bl sub_0811E1C8 + bl VBlankCB_MailRead b _0811D386 _0811D356: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D3C4 @@ -585726,7 +585726,7 @@ _0811D368: bl sub_0811DEDC b _0811D386 _0811D378: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D3C4 @@ -585800,7 +585800,7 @@ _0811D3FE: bl sub_0811DFBC b _0811D416 _0811D404: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D442 @@ -585862,7 +585862,7 @@ _0811D472: bl sub_0811DFE0 b _0811D48C _0811D478: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D4B4 @@ -585923,7 +585923,7 @@ _0811D4E2: bl sub_0811E004 b _0811D50E _0811D4E8: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D53A @@ -585993,7 +585993,7 @@ _0811D56A: bl sub_0811E048 b _0811D596 _0811D570: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _0811D5BE @@ -586060,7 +586060,7 @@ _0811D5E0: strh r0, [r1] b _0811D5FE _0811D5F4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811D600 @@ -586096,7 +586096,7 @@ _0811D620: strh r0, [r1] b _0811D63E _0811D634: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811D640 @@ -586132,7 +586132,7 @@ _0811D660: strh r0, [r1] b _0811D67E _0811D674: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811D680 @@ -586168,7 +586168,7 @@ _0811D6A0: strh r0, [r1] b _0811D6BE _0811D6B4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811D6C0 @@ -586204,7 +586204,7 @@ _0811D6E0: strh r0, [r1] b _0811D6FE _0811D6F4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811D700 @@ -586240,7 +586240,7 @@ _0811D720: strh r0, [r1] b _0811D73E _0811D734: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811D740 @@ -586293,7 +586293,7 @@ sub_0811D748: @ 0x0811D748 adds r3, #4 adds r0, r2, r3 str r1, [r0] - bl sub_0811C474 + bl FooterHasFourOptions_ ldr r1, [r4] strb r0, [r1, #0xa] movs r0, #1 @@ -586315,35 +586315,35 @@ sub_0811D7B4: @ 0x0811D7B4 movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r1, #0xc1 lsls r1, r1, #6 movs r0, #0 @@ -586359,32 +586359,32 @@ sub_0811D814: @ 0x0811D814 ldr r0, _0811D868 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0811D86C movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0811D870 movs r1, #0x40 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0811D874 movs r1, #0xa0 movs r2, #8 - bl sub_080A1200 + bl LoadPalette ldr r4, _0811D878 adds r0, r4, #0 movs r1, #0xb0 movs r2, #0xc - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xf0 movs r2, #0xc - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0x30 movs r2, #0xc - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -586400,7 +586400,7 @@ _0811D878: .4byte gUnknown_857434C sub_0811D87C: @ 0x0811D87C push {r4, r5, lr} sub sp, #0x14 - bl sub_0811C28C + bl GetTitleText adds r5, r0, #0 cmp r5, #0 beq _0811D8D8 @@ -586416,7 +586416,7 @@ sub_0811D87C: @ 0x0811D87C lsrs r4, r4, #0x10 movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r1, #0 @@ -586434,10 +586434,10 @@ sub_0811D87C: @ 0x0811D87C adds r3, r4, #0 bl sub_0811D920 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0811D8D8: add sp, #0x14 pop {r4, r5} @@ -586531,7 +586531,7 @@ _0811D966: str r0, [sp, #8] mov r0, ip adds r2, r7, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -586563,13 +586563,13 @@ sub_0811D990: @ 0x0811D990 movs r0, #1 movs r1, #1 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #0 bl sub_0811D9D8 movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r0} bx r0 @@ -586622,7 +586622,7 @@ _0811DA34: _0811DA3E: add r1, sp, #0x10 add r0, sp, #0xc - bl sub_0811C38C + bl GetEasyChatConfirmDeletionText b _0811DA90 _0811DA48: ldr r0, _0811DA50 @@ -586665,7 +586665,7 @@ _0811DA8E: _0811DA90: movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, [sp, #0xc] cmp r2, #0 beq _0811DAB2 @@ -586695,7 +586695,7 @@ _0811DAB2: _0811DACE: movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x14 pop {r0} bx r0 @@ -586777,13 +586777,13 @@ sub_0811DB10: @ 0x0811DB10 orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08003250 + bl AddWindow ldr r1, _0811DBA4 ldr r1, [r1] strh r0, [r1, #2] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap add sp, #8 pop {r4, r5, r6} pop {r0} @@ -586806,13 +586806,13 @@ sub_0811DBA8: @ 0x0811DBA8 mov r5, r8 push {r5, r6, r7} sub sp, #0x10 - bl sub_0811C298 + bl GetEasyChatWordBuffer adds r6, r0, #0 - bl sub_0811C2B0 + bl GetNumColumns lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 - bl sub_0811C2A4 + bl GetNumRows lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0xc] @@ -586820,7 +586820,7 @@ sub_0811DBA8: @ 0x0811DBA8 ldr r0, [r4] ldrb r0, [r0, #2] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r5, #0 b _0811DC86 .align 2, 0 @@ -586850,7 +586850,7 @@ _0811DC0A: beq _0811DC28 adds r1, r0, #0 adds r0, r2, #0 - bl sub_0811F180 + bl CopyEasyChatWord adds r2, r0, #0 adds r5, r6, #2 adds r4, #1 @@ -586914,7 +586914,7 @@ _0811DC86: ldr r0, [r0] ldrb r0, [r0, #2] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -587112,7 +587112,7 @@ sub_0811DE14: @ 0x0811DE14 push {r4, lr} sub sp, #8 movs r0, #3 - bl sub_08002194 + bl GetBgTilemapBuffer adds r4, r0, #0 bl GetEasyChatScreenFrameId lsls r0, r0, #0x18 @@ -587177,9 +587177,9 @@ _0811DE84: sub_0811DE8C: @ 0x0811DE8C push {lr} movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r0} bx r0 .align 2, 0 @@ -587192,7 +587192,7 @@ sub_0811DEA0: @ 0x0811DEA0 bl sub_0811E598 movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r4, #1 beq _0811DEC4 cmp r4, #1 @@ -587211,7 +587211,7 @@ _0811DECA: _0811DECE: movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -587492,7 +587492,7 @@ _0811E0BC: adds r0, #0xcc adds r1, r4, #0 movs r2, #0 - bl sub_0811F990 + bl CopyEasyChatWordPadded adds r0, r4, #0 bl sub_0811C820 adds r1, r0, #0 @@ -587548,7 +587548,7 @@ _0811E144: blt _0811E0A4 movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x1c pop {r3, r4, r5} mov r8, r3 @@ -587614,19 +587614,19 @@ _0811E1BE: .align 2, 0 thumb_func_end sub_0811E164 - thumb_func_start sub_0811E1C8 -sub_0811E1C8: @ 0x0811E1C8 + thumb_func_start VBlankCB_MailRead +VBlankCB_MailRead: @ 0x0811E1C8 push {lr} movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0811E1C8 + thumb_func_end VBlankCB_MailRead thumb_func_start sub_0811E1E0 sub_0811E1E0: @ 0x0811E1E0 @@ -587925,7 +587925,7 @@ _0811E422: bl sub_0811E43C _0811E42E: movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r4} pop {r0} @@ -588115,7 +588115,7 @@ sub_0811E598: @ 0x0811E598 lsls r1, r1, #4 movs r0, #2 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, _0811E5B8 ldr r0, [r0] ldr r1, _0811E5BC @@ -588138,7 +588138,7 @@ sub_0811E5C0: @ 0x0811E5C0 lsls r1, r1, #0x18 lsrs r5, r1, #0x18 movs r0, #2 - bl sub_08001FD0 + bl GetBgY adds r2, r0, #0 ldr r0, _0811E60C ldr r3, [r0] @@ -588174,7 +588174,7 @@ _0811E614: movs r0, #2 adds r1, r2, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY _0811E61E: pop {r4, r5} pop {r0} @@ -588185,7 +588185,7 @@ _0811E61E: sub_0811E624: @ 0x0811E624 push {lr} movs r0, #2 - bl sub_08001FD0 + bl GetBgY ldr r1, _0811E650 ldr r2, [r1] movs r3, #0xb4 @@ -588200,7 +588200,7 @@ sub_0811E624: @ 0x0811E624 ldr r1, [r0] movs r0, #2 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 b _0811E656 .align 2, 0 @@ -588265,7 +588265,7 @@ sub_0811E6A4: @ 0x0811E6A4 ldr r4, _0811E6D4 _0811E6B6: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #3 @@ -588299,7 +588299,7 @@ sub_0811E6D8: @ 0x0811E6D8 asrs r1, r1, #0x10 lsls r2, r2, #3 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0811E72C @@ -588427,7 +588427,7 @@ sub_0811E7D8: @ 0x0811E7D8 movs r1, #0 movs r2, #0 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0811E80C @@ -588691,7 +588691,7 @@ sub_0811E9D0: @ 0x0811E9D0 movs r1, #0 movs r2, #0 movs r3, #4 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0811EA18 @@ -588852,7 +588852,7 @@ sub_0811EAF8: @ 0x0811EAF8 movs r1, #0xd0 movs r2, #0x80 movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _0811EB54 @@ -588873,7 +588873,7 @@ sub_0811EAF8: @ 0x0811EAF8 movs r1, #0xd0 movs r2, #0x50 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [r5] @@ -589150,7 +589150,7 @@ sub_0811ED20: @ 0x0811ED20 movs r1, #0x60 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -589171,7 +589171,7 @@ _0811ED4E: movs r1, #0x60 movs r2, #0x9c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -589328,7 +589328,7 @@ sub_0811EE6C: @ 0x0811EE6C movs r1, #0xdc movs r2, #0x54 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -589349,7 +589349,7 @@ _0811EE9A: movs r1, #0xdc movs r2, #0x9c movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -589459,11 +589459,11 @@ sub_0811EF44: @ 0x0811EF44 _0811EF70: .4byte gUnknown_2039DE8 thumb_func_end sub_0811EF44 - thumb_func_start sub_0811EF74 -sub_0811EF74: @ 0x0811EF74 + thumb_func_start GetCoolColorFromPersonality +GetCoolColorFromPersonality: @ 0x0811EF74 push {r4, r5, r6, r7, lr} sub sp, #4 - bl sub_0811C4C0 + bl GetDisplayedPersonType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -589509,7 +589509,7 @@ _0811EFBA: movs r6, #0 str r6, [sp] adds r1, r7, #0 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -589541,7 +589541,7 @@ _0811EFFC: adds r0, r1, #0 adds r1, r7, #0 adds r3, r4, #0 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -589567,7 +589567,7 @@ _0811F02E: _0811F038: .4byte sub_08007140 _0811F03C: .4byte gUnknown_20205AC _0811F040: .4byte gUnknown_3005AF0 - thumb_func_end sub_0811EF74 + thumb_func_end GetCoolColorFromPersonality thumb_func_start sub_0811F044 sub_0811F044: @ 0x0811F044 @@ -589609,8 +589609,8 @@ _0811F084: bx r1 thumb_func_end sub_0811F044 - thumb_func_start sub_0811F088 -sub_0811F088: @ 0x0811F088 + thumb_func_start EasyChat_GetNumWordsInGroup +EasyChat_GetNumWordsInGroup: @ 0x0811F088 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -589640,7 +589640,7 @@ _0811F0B6: bx r1 .align 2, 0 _0811F0BC: .4byte gUnknown_8578D14 - thumb_func_end sub_0811F088 + thumb_func_end EasyChat_GetNumWordsInGroup thumb_func_start sub_0811F0C0 sub_0811F0C0: @ 0x0811F0C0 @@ -589705,8 +589705,8 @@ _0811F126: bx r1 thumb_func_end sub_0811F0C0 - thumb_func_start sub_0811F12C -sub_0811F12C: @ 0x0811F12C + thumb_func_start GetEasyChatWord +GetEasyChatWord: @ 0x0811F12C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -589753,10 +589753,10 @@ _0811F176: bx r1 .align 2, 0 _0811F17C: .4byte gUnknown_8578D14 - thumb_func_end sub_0811F12C + thumb_func_end GetEasyChatWord - thumb_func_start sub_0811F180 -sub_0811F180: @ 0x0811F180 + thumb_func_start CopyEasyChatWord +CopyEasyChatWord: @ 0x0811F180 push {r4, r5, r6, lr} adds r5, r0, #0 lsls r6, r1, #0x10 @@ -589777,7 +589777,7 @@ _0811F19C: ldr r1, _0811F1BC ands r1, r4 lsrs r0, r6, #0x19 - bl sub_0811F12C + bl GetEasyChatWord adds r1, r0, #0 _0811F1AE: adds r0, r5, #0 @@ -589794,7 +589794,7 @@ _0811F1C6: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0811F180 + thumb_func_end CopyEasyChatWord thumb_func_start ConvertEasyChatWordsToString ConvertEasyChatWordsToString: @ 0x0811F1CC @@ -589826,7 +589826,7 @@ _0811F1FA: ldrh r1, [r5] adds r0, r4, #0 str r2, [sp] - bl sub_0811F180 + bl CopyEasyChatWord adds r4, r0, #0 ldrh r0, [r5] ldr r2, [sp] @@ -589846,7 +589846,7 @@ _0811F220: ldrh r1, [r5] adds r5, #2 adds r0, r4, #0 - bl sub_0811F180 + bl CopyEasyChatWord adds r4, r0, #0 movs r0, #0xfe strb r0, [r4] @@ -589873,8 +589873,8 @@ _0811F254: .4byte 0xFFFF0000 _0811F258: .4byte 0x0000FFFF thumb_func_end ConvertEasyChatWordsToString - thumb_func_start sub_0811F25C -sub_0811F25C: @ 0x0811F25C + thumb_func_start GetEasyChatWordStringLength +GetEasyChatWordStringLength: @ 0x0811F25C push {r4, r5, lr} lsls r5, r0, #0x10 lsrs r0, r5, #0x10 @@ -589895,7 +589895,7 @@ _0811F274: ldr r1, _0811F28C ands r1, r4 lsrs r0, r5, #0x19 - bl sub_0811F12C + bl GetEasyChatWord b _0811F292 .align 2, 0 _0811F28C: .4byte 0x000001FF @@ -589911,7 +589911,7 @@ _0811F29A: bx r1 .align 2, 0 _0811F2A0: .4byte gUnknown_8579F30 - thumb_func_end sub_0811F25C + thumb_func_end GetEasyChatWordStringLength thumb_func_start sub_0811F2A4 sub_0811F2A4: @ 0x0811F2A4 @@ -589946,7 +589946,7 @@ _0811F2D8: ldrh r0, [r6] adds r6, #2 str r1, [sp] - bl sub_0811F25C + bl GetEasyChatWordStringLength adds r0, r4, r0 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -590133,7 +590133,7 @@ _0811F428: adds r1, r5, #0 bl ConvertEasyChatWordsToString adds r0, r4, #0 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage _0811F438: pop {r4, r5} pop {r0} @@ -590160,7 +590160,7 @@ _0811F45E: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 ldr r0, _0811F474 - bl sub_0811F180 + bl CopyEasyChatWord pop {r0} bx r0 .align 2, 0 @@ -590366,7 +590366,7 @@ _0811F5D4: .4byte 0x0000FFFF thumb_func_start sub_0811F5D8 sub_0811F5D8: @ 0x0811F5D8 push {lr} - bl sub_0809CD04 + bl IsNationalPokedexEnabled lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -590378,7 +590378,7 @@ sub_0811F5D8: @ 0x0811F5D8 sub_0811F5E8: @ 0x0811F5E8 push {r4, r5, r6, r7, lr} movs r0, #0 - bl sub_0811F088 + bl EasyChat_GetNumWordsInGroup lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -590411,7 +590411,7 @@ _0811F626: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _0811F646 @@ -590641,7 +590641,7 @@ sub_0811F814: @ 0x0811F814 ldr r0, [r4] cmp r0, #0 beq _0811F826 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0811F826: @@ -590738,7 +590738,7 @@ _0811F8B4: movs r1, #0x14 strh r1, [r0] _0811F8D6: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _0811F8F4 ldr r0, _0811F8FC @@ -590797,8 +590797,8 @@ _0811F936: .align 2, 0 thumb_func_end sub_0811F914 - thumb_func_start sub_0811F93C -sub_0811F93C: @ 0x0811F93C + thumb_func_start unref_sub_811F3E0 +unref_sub_811F3E0: @ 0x0811F93C push {r4, r5, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -590834,7 +590834,7 @@ _0811F970: bx r1 .align 2, 0 _0811F97C: .4byte gUnknown_8579ED8 - thumb_func_end sub_0811F93C + thumb_func_end unref_sub_811F3E0 thumb_func_start sub_0811F980 sub_0811F980: @ 0x0811F980 @@ -590848,15 +590848,15 @@ sub_0811F980: @ 0x0811F980 _0811F98C: .4byte gUnknown_8579ED8 thumb_func_end sub_0811F980 - thumb_func_start sub_0811F990 -sub_0811F990: @ 0x0811F990 + thumb_func_start CopyEasyChatWordPadded +CopyEasyChatWordPadded: @ 0x0811F990 push {r4, r5, lr} adds r4, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 lsls r2, r2, #0x10 lsrs r5, r2, #0x10 - bl sub_0811F180 + bl CopyEasyChatWord adds r1, r0, #0 subs r4, r1, r4 lsls r4, r4, #0x10 @@ -590879,7 +590879,7 @@ _0811F9BC: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0811F990 + thumb_func_end CopyEasyChatWordPadded thumb_func_start sub_0811F9C8 sub_0811F9C8: @ 0x0811F9C8 @@ -591333,7 +591333,7 @@ _0811FD2C: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0811FD80 @@ -591347,7 +591347,7 @@ _0811FD42: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080BFBBC + bl GetSetPokedexFlag _0811FD5C: movs r0, #1 b _0811FD80 @@ -591492,7 +591492,7 @@ sub_0811FE38: @ 0x0811FE38 ldr r0, [r0] ldrb r0, [r0, #0x14] lsrs r0, r0, #3 - bl sub_080980E0 + bl GetWindowFrameTilesPal ldr r3, _0811FE74 ldr r2, [r3] ldr r1, [r0] @@ -592045,7 +592045,7 @@ _08120278: asrs r1, r2, #0x10 asrs r2, r7, #0x10 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -592108,7 +592108,7 @@ _081202E8: mov r3, sb asrs r1, r3, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -592138,7 +592138,7 @@ _0812030E: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -592191,7 +592191,7 @@ _081203AC: .4byte gUnknown_82BF310 _081203B0: .4byte sub_0812045C _081203B4: .4byte gUnknown_20205AC _081203B8: .4byte gUnknown_857AB00 -_081203BC: .4byte sub_08120460 +_081203BC: .4byte OpponentHandleChosenMonReturnValue _081203C0: .4byte gUnknown_857AAA8 _081203C4: .4byte sub_08007140 _081203C8: @@ -592209,7 +592209,7 @@ _081203CE: adds r0, r4, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -592278,8 +592278,8 @@ sub_0812045C: @ 0x0812045C .align 2, 0 thumb_func_end sub_0812045C - thumb_func_start sub_08120460 -sub_08120460: @ 0x08120460 + thumb_func_start OpponentHandleChosenMonReturnValue +OpponentHandleChosenMonReturnValue: @ 0x08120460 push {lr} adds r2, r0, #0 ldr r0, _08120488 @@ -592309,7 +592309,7 @@ _08120496: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08120460 + thumb_func_end OpponentHandleChosenMonReturnValue thumb_func_start sub_0812049C sub_0812049C: @ 0x0812049C @@ -592411,14 +592411,14 @@ sub_081204F4: @ 0x081204F4 orrs r0, r3 str r0, [r5, #4] adds r0, r5, #0 - bl sub_08008210 + bl LoadSpriteSheet adds r0, r4, #0 bl LoadSpritePalette mov r0, sp movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -592529,14 +592529,14 @@ _08120634: .4byte 0x00002E28 _08120638: .4byte gUnknown_829BDA5 thumb_func_end SetupHipster - thumb_func_start sub_0812063C -sub_0812063C: @ 0x0812063C + thumb_func_start SafariHandleDrawPartyStatusSummary +SafariHandleDrawPartyStatusSummary: @ 0x0812063C push {lr} bl StorytellerSetup pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812063C + thumb_func_end SafariHandleDrawPartyStatusSummary thumb_func_start SetupGiddy SetupGiddy: @ 0x08120648 @@ -592564,14 +592564,14 @@ _08120670: .4byte 0x00002E48 thumb_func_start sub_08120674 sub_08120674: @ 0x08120674 push {lr} - bl sub_08133A2C + bl TraderSetup pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08120674 - thumb_func_start sub_08120680 -sub_08120680: @ 0x08120680 + thumb_func_start SetMauvilleOldMan +SetMauvilleOldMan: @ 0x08120680 push {lr} ldr r0, _081206A8 ldr r0, [r0] @@ -592609,15 +592609,15 @@ _081206D0: bl sub_08120674 b _081206E0 _081206D6: - bl sub_0812063C + bl SafariHandleDrawPartyStatusSummary b _081206E0 _081206DC: bl SetupGiddy _081206E0: - bl sub_08120E18 + bl ScrSpecial_SetMauvilleOldManEventObjGfx pop {r0} bx r0 - thumb_func_end sub_08120680 + thumb_func_end SetMauvilleOldMan thumb_func_start sub_081206E8 sub_081206E8: @ 0x081206E8 @@ -592647,8 +592647,8 @@ ScrSpecial_GetCurrentMauvilleMan: @ 0x081206FC _08120710: .4byte gUnknown_2037290 thumb_func_end ScrSpecial_GetCurrentMauvilleMan - thumb_func_start sub_08120714 -sub_08120714: @ 0x08120714 + thumb_func_start ScrSpecial_HasBardSongBeenChanged +ScrSpecial_HasBardSongBeenChanged: @ 0x08120714 ldr r1, _08120724 ldr r0, _08120728 ldr r0, [r0] @@ -592661,10 +592661,10 @@ sub_08120714: @ 0x08120714 _08120724: .4byte gUnknown_2037290 _08120728: .4byte gUnknown_3005AEC _0812072C: .4byte 0x00002E51 - thumb_func_end sub_08120714 + thumb_func_end ScrSpecial_HasBardSongBeenChanged - thumb_func_start sub_08120730 -sub_08120730: @ 0x08120730 + thumb_func_start ScrSpecial_SaveBardSongLyrics +ScrSpecial_SaveBardSongLyrics: @ 0x08120730 push {r4, r5, r6, lr} ldr r0, _0812078C ldr r4, [r0] @@ -592718,7 +592718,7 @@ _08120790: .4byte 0x00002E28 _08120794: .4byte 0x00002E42 _08120798: .4byte gUnknown_3005AF0 _0812079C: .4byte 0x00002E4D - thumb_func_end sub_08120730 + thumb_func_end ScrSpecial_SaveBardSongLyrics thumb_func_start sub_081207A0 sub_081207A0: @ 0x081207A0 @@ -592740,7 +592740,7 @@ _081207BA: ldrh r1, [r4] adds r4, #2 adds r0, r2, #0 - bl sub_0811F180 + bl CopyEasyChatWord adds r2, r0, #0 movs r0, #0 strb r0, [r2] @@ -592748,7 +592748,7 @@ _081207BA: ldrh r1, [r4] adds r4, #2 adds r0, r2, #0 - bl sub_0811F180 + bl CopyEasyChatWord adds r2, r0, #0 movs r0, #0xfe strb r0, [r2] @@ -592756,7 +592756,7 @@ _081207BA: ldrh r1, [r4] adds r4, #2 adds r0, r2, #0 - bl sub_0811F180 + bl CopyEasyChatWord adds r2, r0, #0 cmp r5, #0 bne _081207FA @@ -592783,21 +592783,21 @@ _08120818: .4byte 0x00002E2A _0812081C: .4byte gUnknown_2021C7C thumb_func_end sub_081207A0 - thumb_func_start sub_08120820 -sub_08120820: @ 0x08120820 + thumb_func_start ScrSpecial_PlayBardSong +ScrSpecial_PlayBardSong: @ 0x08120820 push {lr} ldr r0, _08120834 ldrb r0, [r0] - bl sub_08120BA0 + bl StartBardSong bl sub_080988B8 pop {r0} bx r0 .align 2, 0 _08120834: .4byte gUnknown_2037280 - thumb_func_end sub_08120820 + thumb_func_end ScrSpecial_PlayBardSong - thumb_func_start sub_08120838 -sub_08120838: @ 0x08120838 + thumb_func_start ScrSpecial_GetHipsterSpokenFlag +ScrSpecial_GetHipsterSpokenFlag: @ 0x08120838 ldr r1, _08120848 ldr r0, _0812084C ldr r0, [r0] @@ -592810,10 +592810,10 @@ sub_08120838: @ 0x08120838 _08120848: .4byte gUnknown_2037290 _0812084C: .4byte gUnknown_3005AEC _08120850: .4byte 0x00002E28 - thumb_func_end sub_08120838 + thumb_func_end ScrSpecial_GetHipsterSpokenFlag - thumb_func_start sub_08120854 -sub_08120854: @ 0x08120854 + thumb_func_start ScrSpecial_SetHipsterSpokenFlag +ScrSpecial_SetHipsterSpokenFlag: @ 0x08120854 ldr r0, _08120864 ldr r0, [r0] ldr r1, _08120868 @@ -592824,10 +592824,10 @@ sub_08120854: @ 0x08120854 .align 2, 0 _08120864: .4byte gUnknown_3005AEC _08120868: .4byte 0x00002E28 - thumb_func_end sub_08120854 + thumb_func_end ScrSpecial_SetHipsterSpokenFlag - thumb_func_start sub_0812086C -sub_0812086C: @ 0x0812086C + thumb_func_start ScrSpecial_HipsterTeachWord +ScrSpecial_HipsterTeachWord: @ 0x0812086C push {lr} bl sub_0811F4FC lsls r0, r0, #0x10 @@ -592843,7 +592843,7 @@ _08120884: .4byte 0x0000FFFF _08120888: .4byte gUnknown_2037290 _0812088C: ldr r0, _0812089C - bl sub_0811F180 + bl CopyEasyChatWord ldr r1, _081208A0 movs r0, #1 _08120896: @@ -592853,10 +592853,10 @@ _08120896: .align 2, 0 _0812089C: .4byte gUnknown_2021C40 _081208A0: .4byte gUnknown_2037290 - thumb_func_end sub_0812086C + thumb_func_end ScrSpecial_HipsterTeachWord - thumb_func_start sub_081208A4 -sub_081208A4: @ 0x081208A4 + thumb_func_start ScrSpecial_GiddyShouldTellAnotherTale +ScrSpecial_GiddyShouldTellAnotherTale: @ 0x081208A4 push {lr} ldr r0, _081208C0 ldr r0, [r0] @@ -592883,10 +592883,10 @@ _081208D2: bx r0 .align 2, 0 _081208D8: .4byte gUnknown_2037290 - thumb_func_end sub_081208A4 + thumb_func_end ScrSpecial_GiddyShouldTellAnotherTale - thumb_func_start sub_081208DC -sub_081208DC: @ 0x081208DC + thumb_func_start ScrSpecial_GenerateGiddyLine +ScrSpecial_GenerateGiddyLine: @ 0x081208DC push {r4, r5, r6, lr} ldr r0, _08120940 ldr r4, [r0] @@ -592895,7 +592895,7 @@ sub_081208DC: @ 0x081208DC ldrb r0, [r5, #1] cmp r0, #0 bne _081208F0 - bl sub_081209BC + bl InitGiddyTaleList _081208F0: ldrb r0, [r5, #1] lsls r0, r0, #1 @@ -592917,7 +592917,7 @@ _081208F0: lsls r1, r1, #1 adds r1, r6, r1 ldrh r1, [r1] - bl sub_0811F180 + bl CopyEasyChatWord adds r2, r0, #0 ldr r1, _08120954 bl StringCopy @@ -592985,10 +592985,10 @@ _081209A8: bx r0 .align 2, 0 _081209B8: .4byte gUnknown_2037290 - thumb_func_end sub_081208DC + thumb_func_end ScrSpecial_GenerateGiddyLine - thumb_func_start sub_081209BC -sub_081209BC: @ 0x081209BC + thumb_func_start InitGiddyTaleList +InitGiddyTaleList: @ 0x081209BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -593052,7 +593052,7 @@ _08120A32: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] - bl sub_0811F088 + bl EasyChat_GetNumWordsInGroup add r4, r8 strh r0, [r4] add r0, sl @@ -593152,7 +593152,7 @@ _08120AEE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081209BC + thumb_func_end InitGiddyTaleList thumb_func_start sub_08120B08 sub_08120B08: @ 0x08120B08 @@ -593168,8 +593168,8 @@ _08120B18: .4byte gUnknown_3005AEC _08120B1C: .4byte 0x00002E51 thumb_func_end sub_08120B08 - thumb_func_start sub_08120B20 -sub_08120B20: @ 0x08120B20 + thumb_func_start ResetHipsterFlag +ResetHipsterFlag: @ 0x08120B20 ldr r0, _08120B30 ldr r0, [r0] ldr r1, _08120B34 @@ -593180,7 +593180,7 @@ sub_08120B20: @ 0x08120B20 .align 2, 0 _08120B30: .4byte gUnknown_3005AEC _08120B34: .4byte 0x00002E28 - thumb_func_end sub_08120B20 + thumb_func_end ResetHipsterFlag thumb_func_start sub_08120B38 sub_08120B38: @ 0x08120B38 @@ -593200,8 +593200,8 @@ sub_08120B44: @ 0x08120B44 .align 2, 0 thumb_func_end sub_08120B44 - thumb_func_start sub_08120B50 -sub_08120B50: @ 0x08120B50 + thumb_func_start ResetMauvilleOldManFlag +ResetMauvilleOldManFlag: @ 0x08120B50 push {lr} bl sub_081206E8 lsls r0, r0, #0x18 @@ -593225,7 +593225,7 @@ _08120B80: bl sub_08120B08 b _08120B96 _08120B86: - bl sub_08120B20 + bl ResetHipsterFlag b _08120B96 _08120B8C: bl sub_08120B44 @@ -593233,21 +593233,21 @@ _08120B8C: _08120B92: bl sub_08120B38 _08120B96: - bl sub_08120E18 + bl ScrSpecial_SetMauvilleOldManEventObjGfx pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08120B50 + thumb_func_end ResetMauvilleOldManFlag - thumb_func_start sub_08120BA0 -sub_08120BA0: @ 0x08120BA0 + thumb_func_start StartBardSong +StartBardSong: @ 0x08120BA0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _08120BC8 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08120BCC @@ -593262,7 +593262,7 @@ sub_08120BA0: @ 0x08120BA0 .align 2, 0 _08120BC8: .4byte sub_08120C2C _08120BCC: .4byte gUnknown_3005B60 - thumb_func_end sub_08120BA0 + thumb_func_end StartBardSong thumb_func_start sub_08120BD0 sub_08120BD0: @ 0x08120BD0 @@ -593307,7 +593307,7 @@ sub_08120BE8: @ 0x08120BE8 strb r4, [r0] movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -593358,13 +593358,13 @@ _08120C70: strh r0, [r4, #0xe] strh r0, [r4, #0x10] movs r0, #4 - bl sub_080A2AB0 + bl PlayBattleBGM movs r0, #1 b _08120E0A .align 2, 0 _08120C90: .4byte gUnknown_2021C7C _08120C94: - bl sub_080A2AC8 + bl IsBGMPausedOrStopped lsls r0, r0, #0x18 cmp r0, #0 bne _08120CA0 @@ -593471,9 +593471,9 @@ _08120D4E: bne _08120D74 movs r0, #6 bl sub_080A2AF0 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask b _08120E0C .align 2, 0 _08120D70: .4byte gUnknown_2021C7C @@ -593562,15 +593562,15 @@ _08120E08: _08120E0A: strh r0, [r4, #8] _08120E0C: - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08120C2C - thumb_func_start sub_08120E18 -sub_08120E18: @ 0x08120E18 + thumb_func_start ScrSpecial_SetMauvilleOldManEventObjGfx +ScrSpecial_SetMauvilleOldManEventObjGfx: @ 0x08120E18 push {lr} ldr r0, _08120E28 movs r1, #0x45 @@ -593579,7 +593579,7 @@ sub_08120E18: @ 0x08120E18 bx r0 .align 2, 0 _08120E28: .4byte 0x00004010 - thumb_func_end sub_08120E18 + thumb_func_end ScrSpecial_SetMauvilleOldManEventObjGfx thumb_func_start sub_08120E2C sub_08120E2C: @ 0x08120E2C @@ -593810,8 +593810,8 @@ _08120FB8: .4byte gUnknown_3005AEC _08120FBC: .4byte 0x00002E28 thumb_func_end Storyteller_ResetFlag - thumb_func_start sub_08120FC0 -sub_08120FC0: @ 0x08120FC0 + thumb_func_start StorytellerGetGameStat +StorytellerGetGameStat: @ 0x08120FC0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -593819,13 +593819,13 @@ sub_08120FC0: @ 0x08120FC0 bne _08120FCC movs r0, #0 _08120FCC: - bl sub_08084180 + bl GetGameStat pop {r1} bx r1 - thumb_func_end sub_08120FC0 + thumb_func_end StorytellerGetGameStat - thumb_func_start sub_08120FD4 -sub_08120FD4: @ 0x08120FD4 + thumb_func_start GetStoryByStat +GetStoryByStat: @ 0x08120FD4 push {lr} adds r3, r0, #0 movs r2, #0 @@ -593849,34 +593849,34 @@ _08120FF6: bx r1 .align 2, 0 _08120FFC: .4byte gUnknown_857AE9C - thumb_func_end sub_08120FD4 + thumb_func_end GetStoryByStat - thumb_func_start sub_08121000 -sub_08121000: @ 0x08121000 + thumb_func_start GetStoryTitleByStat +GetStoryTitleByStat: @ 0x08121000 push {lr} - bl sub_08120FD4 + bl GetStoryByStat ldr r0, [r0, #4] pop {r1} bx r1 - thumb_func_end sub_08121000 + thumb_func_end GetStoryTitleByStat - thumb_func_start sub_0812100C -sub_0812100C: @ 0x0812100C + thumb_func_start GetStoryTextByStat +GetStoryTextByStat: @ 0x0812100C push {lr} - bl sub_08120FD4 + bl GetStoryByStat ldr r0, [r0, #0xc] pop {r1} bx r1 - thumb_func_end sub_0812100C + thumb_func_end GetStoryTextByStat - thumb_func_start sub_08121018 -sub_08121018: @ 0x08121018 + thumb_func_start GetStoryActionByStat +GetStoryActionByStat: @ 0x08121018 push {lr} - bl sub_08120FD4 + bl GetStoryByStat ldr r0, [r0, #8] pop {r1} bx r1 - thumb_func_end sub_08121018 + thumb_func_end GetStoryActionByStat thumb_func_start GetFreeStorySlot GetFreeStorySlot: @ 0x08121024 @@ -593948,8 +593948,8 @@ StorytellerSetRecordedTrainerStat: @ 0x08121078 _08121094: .4byte gUnknown_2039DF8 thumb_func_end StorytellerSetRecordedTrainerStat - thumb_func_start sub_08121098 -sub_08121098: @ 0x08121098 + thumb_func_start HasTrainerStatIncreased +HasTrainerStatIncreased: @ 0x08121098 push {r4, r5, lr} adds r5, r0, #0 ldr r0, _081210BC @@ -593957,7 +593957,7 @@ sub_08121098: @ 0x08121098 adds r0, #4 adds r0, r0, r5 ldrb r0, [r0] - bl sub_08120FC0 + bl StorytellerGetGameStat adds r4, r0, #0 adds r0, r5, #0 bl StorytellerGetRecordedTrainerStat @@ -593973,10 +593973,10 @@ _081210C2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08121098 + thumb_func_end HasTrainerStatIncreased - thumb_func_start sub_081210C8 -sub_081210C8: @ 0x081210C8 + thumb_func_start GetStoryByStattellerPlayerName +GetStoryByStattellerPlayerName: @ 0x081210C8 push {r4, r5, lr} adds r5, r1, #0 ldr r2, _081210F4 @@ -593998,10 +593998,10 @@ sub_081210C8: @ 0x081210C8 bx r0 .align 2, 0 _081210F4: .4byte gUnknown_2039DF8 - thumb_func_end sub_081210C8 + thumb_func_end GetStoryByStattellerPlayerName - thumb_func_start sub_081210F8 -sub_081210F8: @ 0x081210F8 + thumb_func_start StorytellerSetPlayerName +StorytellerSetPlayerName: @ 0x081210F8 push {r4, r5, lr} adds r5, r1, #0 ldr r2, _08121124 @@ -594023,10 +594023,10 @@ sub_081210F8: @ 0x081210F8 bx r0 .align 2, 0 _08121124: .4byte gUnknown_2039DF8 - thumb_func_end sub_081210F8 + thumb_func_end StorytellerSetPlayerName - thumb_func_start sub_08121128 -sub_08121128: @ 0x08121128 + thumb_func_start StorytellerRecordNewStat +StorytellerRecordNewStat: @ 0x08121128 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -594042,17 +594042,17 @@ sub_08121128: @ 0x08121128 ldr r0, _081211A0 ldr r1, [r0] mov r0, r8 - bl sub_081210F8 + bl StorytellerSetPlayerName lsls r4, r6, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_08120FC0 + bl StorytellerGetGameStat adds r1, r0, #0 mov r0, r8 bl StorytellerSetRecordedTrainerStat ldr r5, _081211A4 adds r0, r4, #0 - bl sub_08120FC0 + bl StorytellerGetGameStat adds r1, r0, #0 adds r0, r5, #0 movs r2, #0 @@ -594060,7 +594060,7 @@ sub_08121128: @ 0x08121128 bl sub_080089D8 ldr r4, _081211A8 adds r0, r6, #0 - bl sub_08121018 + bl GetStoryActionByStat adds r1, r0, #0 adds r0, r4, #0 bl StringCopy @@ -594083,10 +594083,10 @@ _081211A0: .4byte gUnknown_3005AF0 _081211A4: .4byte gUnknown_2021C40 _081211A8: .4byte gUnknown_2021C54 _081211AC: .4byte gUnknown_829BDA5 - thumb_func_end sub_08121128 + thumb_func_end StorytellerRecordNewStat - thumb_func_start sub_081211B0 -sub_081211B0: @ 0x081211B0 + thumb_func_start ScrambleStatList +ScrambleStatList: @ 0x081211B0 push {r4, r5, r6, r7, lr} adds r7, r0, #0 adds r6, r1, #0 @@ -594129,10 +594129,10 @@ _081211FC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081211B0 + thumb_func_end ScrambleStatList - thumb_func_start sub_08121204 -sub_08121204: @ 0x08121204 + thumb_func_start StorytellerInitializeRandomStat +StorytellerInitializeRandomStat: @ 0x08121204 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -594152,7 +594152,7 @@ sub_08121204: @ 0x08121204 mov sb, sp mov r0, sp movs r1, #0x24 - bl sub_081211B0 + bl ScrambleStatList movs r5, #0 _08121230: ldr r1, _08121290 @@ -594183,7 +594183,7 @@ _0812125E: cmp r1, #4 bne _081212AE adds r0, r4, #0 - bl sub_08120FC0 + bl StorytellerGetGameStat cmp r0, r6 blo _081212AE ldr r0, _08121294 @@ -594198,7 +594198,7 @@ _0812125E: ldr r0, _08121298 ldrb r0, [r0] adds r1, r4, #0 - bl sub_08121128 + bl StorytellerRecordNewStat b _081212AA .align 2, 0 _0812128C: .4byte gUnknown_857AEAC @@ -594210,7 +594210,7 @@ _0812129C: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 - bl sub_08121128 + bl StorytellerRecordNewStat _081212AA: movs r0, #1 b _081212B6 @@ -594227,7 +594227,7 @@ _081212B6: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08121204 + thumb_func_end StorytellerInitializeRandomStat thumb_func_start sub_081212C4 sub_081212C4: @ 0x081212C4 @@ -594248,16 +594248,16 @@ sub_081212C4: @ 0x081212C4 bl sub_080089D8 ldr r4, _08121318 adds r0, r6, #0 - bl sub_08121018 + bl GetStoryActionByStat adds r1, r0, #0 adds r0, r4, #0 bl StringCopy ldr r1, _0812131C adds r0, r5, #0 - bl sub_081210C8 + bl GetStoryByStattellerPlayerName adds r0, r6, #0 - bl sub_0812100C - bl sub_08097B74 + bl GetStoryTextByStat + bl ShowFieldMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -594268,8 +594268,8 @@ _08121318: .4byte gUnknown_2021C54 _0812131C: .4byte gUnknown_2021C68 thumb_func_end sub_081212C4 - thumb_func_start sub_08121320 -sub_08121320: @ 0x08121320 + thumb_func_start Task_Dive +Task_Dive: @ 0x08121320 push {r4, r5, lr} sub sp, #0xc bl GetFreeStorySlot @@ -594282,12 +594282,12 @@ sub_08121320: @ 0x08121320 movs r0, #0 movs r1, #0 movs r2, #0x17 - bl sub_080E1F10 + bl CreateWindowFromRect ldr r1, _081213E0 strb r0, [r1] ldrb r0, [r1] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r5, #0 ldr r0, _081213E4 ldr r0, [r0] @@ -594297,7 +594297,7 @@ sub_08121320: @ 0x08121320 movs r4, #0x80 lsls r4, r4, #0x12 _0812135A: - bl sub_08121000 + bl GetStoryTitleByStat adds r2, r0, #0 ldr r0, _081213E0 ldrb r0, [r0] @@ -594353,7 +594353,7 @@ _08121392: bl sub_081984F0 ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -594362,10 +594362,10 @@ _08121392: _081213E0: .4byte gUnknown_2039DFC _081213E4: .4byte gUnknown_2039DF8 _081213E8: .4byte gUnknown_85CB1B9 - thumb_func_end sub_08121320 + thumb_func_end Task_Dive - thumb_func_start sub_081213EC -sub_081213EC: @ 0x081213EC + thumb_func_start Task_StoryListMenu +Task_StoryListMenu: @ 0x081213EC push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -594384,13 +594384,13 @@ sub_081213EC: @ 0x081213EC .align 2, 0 _0812140C: .4byte gUnknown_3005B60 _08121410: - bl sub_08121320 + bl Task_Dive ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] b _08121466 _0812141C: - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 @@ -594422,8 +594422,8 @@ _08121454: ldrb r0, [r0] bl sub_080E1F6C adds r0, r6, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _08121466: pop {r4, r5, r6} pop {r0} @@ -594432,19 +594432,19 @@ _08121466: _0812146C: .4byte gUnknown_2037290 _08121470: .4byte gUnknown_3001178 _08121474: .4byte gUnknown_2039DFC - thumb_func_end sub_081213EC + thumb_func_end Task_StoryListMenu - thumb_func_start sub_08121478 -sub_08121478: @ 0x08121478 + thumb_func_start ScrSpecial_StorytellerStoryListMenu +ScrSpecial_StorytellerStoryListMenu: @ 0x08121478 push {lr} ldr r0, _08121488 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_08121488: .4byte sub_081213EC - thumb_func_end sub_08121478 +_08121488: .4byte Task_StoryListMenu + thumb_func_end ScrSpecial_StorytellerStoryListMenu thumb_func_start sub_0812148C sub_0812148C: @ 0x0812148C @@ -594478,8 +594478,8 @@ _081214C0: .4byte gUnknown_3005AEC _081214C4: .4byte 0x00002E28 thumb_func_end sub_081214A0 - thumb_func_start sub_081214C8 -sub_081214C8: @ 0x081214C8 + thumb_func_start ScrSpecial_StorytellerUpdateStat +ScrSpecial_StorytellerUpdateStat: @ 0x081214C8 push {r4, r5, lr} ldr r2, _081214F0 ldr r0, _081214F4 @@ -594493,7 +594493,7 @@ sub_081214C8: @ 0x081214C8 adds r1, r1, r2 adds r1, r1, r0 ldrb r4, [r1] - bl sub_08121098 + bl HasTrainerStatIncreased cmp r0, #1 beq _08121504 movs r0, #0 @@ -594507,16 +594507,16 @@ _08121500: .4byte 0x00002E2C _08121504: ldrb r0, [r5] adds r1, r4, #0 - bl sub_08121128 + bl StorytellerRecordNewStat movs r0, #1 _0812150E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081214C8 + thumb_func_end ScrSpecial_StorytellerUpdateStat - thumb_func_start sub_08121514 -sub_08121514: @ 0x08121514 + thumb_func_start ScrSpecial_HasStorytellerAlreadyRecorded +ScrSpecial_HasStorytellerAlreadyRecorded: @ 0x08121514 push {lr} ldr r1, _0812152C ldr r0, _08121530 @@ -594539,7 +594539,7 @@ _0812153A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08121514 + thumb_func_end ScrSpecial_HasStorytellerAlreadyRecorded thumb_func_start sub_08121540 sub_08121540: @ 0x08121540 @@ -594550,7 +594550,7 @@ sub_08121540: @ 0x08121540 ldr r2, _08121564 adds r0, r0, r2 str r0, [r1] - bl sub_08121204 + bl StorytellerInitializeRandomStat lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -594571,7 +594571,7 @@ sub_08121568: @ 0x08121568 lsrs r6, r2, #0x18 ldr r4, _081215B4 ldr r0, _081215B8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] adds r0, #0xdd movs r3, #0 @@ -594603,7 +594603,7 @@ sub_08121568: @ 0x08121568 .align 2, 0 _081215B4: .4byte gUnknown_2039E00 _081215B8: .4byte 0x000020EC -_081215BC: .4byte sub_0811F180 +_081215BC: .4byte CopyEasyChatWord _081215C0: .4byte ConvertEasyChatWordsToString _081215C4: adds r0, r2, #0 @@ -594696,18 +594696,18 @@ _08121660: adds r0, #0xc strb r6, [r0] ldr r0, _08121684 - bl sub_08000540 + bl SetMainCallback2 add sp, #4 pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _08121680: .4byte gUnknown_2039E00 -_08121684: .4byte sub_08121A60 +_08121684: .4byte CB2_InitMailRead thumb_func_end sub_08121568 - thumb_func_start sub_08121688 -sub_08121688: @ 0x08121688 + thumb_func_start MailReadBuildGraphics +MailReadBuildGraphics: @ 0x08121688 push {r4, r5, r6, lr} sub sp, #0xc ldr r0, _081216A8 @@ -594749,8 +594749,8 @@ _081216B0: @ jump table .4byte _081219F4 @ case 18 _081216FC: movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 + bl SetVBlankCallback + bl ScanlineEffect_Stop movs r0, #0 b _08121788 _0812170A: @@ -594769,7 +594769,7 @@ _08121724: bl ResetPaletteFade b _08121A44 _0812172A: - bl sub_080A8818 + bl ResetTasks b _08121A44 _08121730: bl ResetSpriteData @@ -594820,12 +594820,12 @@ _08121790: ldr r1, [r4] adds r1, #0xec movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081217C4 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer b _08121A44 .align 2, 0 _081217BC: .4byte gUnknown_857AEB4 @@ -594833,7 +594833,7 @@ _081217C0: .4byte gUnknown_2039E00 _081217C4: .4byte 0x000010EC _081217C8: ldr r0, _081217D4 - bl sub_08003090 + bl InitWindows bl sub_08004480 b _08121A44 .align 2, 0 @@ -594855,13 +594855,13 @@ _081217D8: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _08121A44 .align 2, 0 _08121800: .4byte gUnknown_857AEE4 _08121804: .4byte gUnknown_2039E00 _08121808: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _08121814 @@ -594899,24 +594899,24 @@ _08121816: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer b _08121A44 .align 2, 0 _0812185C: .4byte gUnknown_857AEE4 _08121860: .4byte gUnknown_2039E00 _08121864: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08121A44 _08121878: bl sub_080985EC movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r6, _08121920 ldr r4, _08121924 ldr r0, _08121928 @@ -594967,7 +594967,7 @@ _08121878: ldr r0, [r0] movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _08121930 ldr r0, _08121934 ldr r2, [r0] @@ -595020,7 +595020,7 @@ _08121950: ldrb r0, [r0] cmp r0, #0 beq _08121A44 - bl sub_08121B64 + bl LoadSavedMapView bl sub_08004630 b _08121A44 .align 2, 0 @@ -595032,7 +595032,7 @@ _0812196C: b _08121A52 _08121976: ldr r0, _08121988 - bl sub_080006F0 + bl SetVBlankCallback ldr r2, _0812198C ldrb r0, [r2, #8] movs r1, #0x80 @@ -595063,7 +595063,7 @@ _08121990: _081219B4: .4byte gUnknown_2039E00 _081219B8: adds r0, r4, #0 - bl sub_080D2808 + bl LoadMonIconPalette ldr r1, _081219CC movs r0, #0 str r0, [sp] @@ -595075,7 +595075,7 @@ _081219B8: _081219CC: .4byte sub_08007140 _081219D0: adds r0, r4, #0 - bl sub_080D2808 + bl LoadMonIconPalette ldr r1, _081219F0 movs r0, #0 str r0, [sp] @@ -595097,18 +595097,18 @@ _081219F4: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _08121A38 ldrb r1, [r2, #8] movs r0, #0x7f @@ -595124,7 +595124,7 @@ _081219F4: .align 2, 0 _08121A38: .4byte gUnknown_2037C74 _08121A3C: .4byte gUnknown_2039E00 -_08121A40: .4byte sub_08121CA0 +_08121A40: .4byte CB2_WaitForPaletteExitOnKeyPress _08121A44: ldr r1, _08121A5C movs r0, #0x87 @@ -595142,19 +595142,19 @@ _08121A54: bx r1 .align 2, 0 _08121A5C: .4byte gUnknown_3002360 - thumb_func_end sub_08121688 + thumb_func_end MailReadBuildGraphics - thumb_func_start sub_08121A60 -sub_08121A60: @ 0x08121A60 + thumb_func_start CB2_InitMailRead +CB2_InitMailRead: @ 0x08121A60 push {lr} _08121A62: - bl sub_08121688 + bl MailReadBuildGraphics lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08121A7C ldr r0, _08121A78 - bl sub_08000540 + bl SetMainCallback2 b _08121A88 .align 2, 0 _08121A78: .4byte sub_08121C74 @@ -595167,7 +595167,7 @@ _08121A7C: _08121A88: pop {r0} bx r0 - thumb_func_end sub_08121A60 + thumb_func_end CB2_InitMailRead thumb_func_start sub_08121A8C sub_08121A8C: @ 0x08121A8C @@ -595279,8 +595279,8 @@ _08121B5A: .align 2, 0 thumb_func_end sub_08121A8C - thumb_func_start sub_08121B64 -sub_08121B64: @ 0x08121B64 + thumb_func_start LoadSavedMapView +LoadSavedMapView: @ 0x08121B64 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -595288,15 +595288,15 @@ sub_08121B64: @ 0x08121B64 sub sp, #0xc movs r7, #0 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r6, #0 ldr r0, _08121C58 mov sb, r0 @@ -595342,7 +595342,7 @@ _08121BA0: str r0, [sp, #4] str r5, [sp, #8] movs r1, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r1, r8 ldr r0, [r1] adds r0, #0xe8 @@ -595384,13 +595384,13 @@ _08121C10: str r0, [sp, #8] movs r0, #1 movs r1, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4} mov r8, r3 @@ -595401,13 +595401,13 @@ _08121C10: .align 2, 0 _08121C58: .4byte gUnknown_2039E00 _08121C5C: .4byte gUnknown_857AED8 - thumb_func_end sub_08121B64 + thumb_func_end LoadSavedMapView thumb_func_start sub_08121C60 sub_08121C60: @ 0x08121C60 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -595423,7 +595423,7 @@ sub_08121C74: @ 0x08121C74 ldrb r0, [r0] cmp r0, #0 beq _08121C8A - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer _08121C8A: ldr r0, [r4] @@ -595441,10 +595441,10 @@ sub_08121C94: @ 0x08121C94 _08121C9C: .4byte gUnknown_2039E00 thumb_func_end sub_08121C94 - thumb_func_start sub_08121CA0 -sub_08121CA0: @ 0x08121CA0 + thumb_func_start CB2_WaitForPaletteExitOnKeyPress +CB2_WaitForPaletteExitOnKeyPress: @ 0x08121CA0 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _08121CB6 @@ -595458,11 +595458,11 @@ _08121CB6: bx r0 .align 2, 0 _08121CBC: .4byte gUnknown_2039E00 -_08121CC0: .4byte sub_08121CC4 - thumb_func_end sub_08121CA0 +_08121CC0: .4byte CB2_ExitOnKeyPress + thumb_func_end CB2_WaitForPaletteExitOnKeyPress - thumb_func_start sub_08121CC4 -sub_08121CC4: @ 0x08121CC4 + thumb_func_start CB2_ExitOnKeyPress +CB2_ExitOnKeyPress: @ 0x08121CC4 push {lr} sub sp, #4 ldr r0, _08121CF4 @@ -595477,7 +595477,7 @@ sub_08121CC4: @ 0x08121CC4 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08121CF8 ldr r0, [r0] adds r0, #0xd0 @@ -595490,13 +595490,13 @@ _08121CEE: .align 2, 0 _08121CF4: .4byte gUnknown_3002360 _08121CF8: .4byte gUnknown_2039E00 -_08121CFC: .4byte sub_08121D00 - thumb_func_end sub_08121CC4 +_08121CFC: .4byte CB2_ExitMailReadFreeVars + thumb_func_end CB2_ExitOnKeyPress - thumb_func_start sub_08121D00 -sub_08121D00: @ 0x08121D00 + thumb_func_start CB2_ExitMailReadFreeVars +CB2_ExitMailReadFreeVars: @ 0x08121D00 push {r4, lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _08121D7E @@ -595504,7 +595504,7 @@ sub_08121D00: @ 0x08121D00 ldr r0, [r4] adds r0, #0xcc ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 ldr r0, [r4] adds r1, r0, #0 adds r1, #0xdb @@ -595519,7 +595519,7 @@ sub_08121D00: @ 0x08121D00 bl sub_080D2724 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080D2890 + bl FreeMonIconPalette ldr r0, [r4] adds r0, #0xdc ldrb r1, [r0] @@ -595537,14 +595537,14 @@ _08121D4E: bl memset bl ResetPaletteFade movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #0 bl ResetBgsAndClearDma3BusyFlags - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08121D7E: @@ -595555,10 +595555,10 @@ _08121D7E: _08121D84: .4byte gUnknown_2039E00 _08121D88: .4byte gUnknown_20205AC _08121D8C: .4byte 0x000020EC - thumb_func_end sub_08121D00 + thumb_func_end CB2_ExitMailReadFreeVars - thumb_func_start sub_08121D90 -sub_08121D90: @ 0x08121D90 + thumb_func_start ResetVramOamAndBgCntRegs +ResetVramOamAndBgCntRegs: @ 0x08121D90 push {r4, lr} sub sp, #0xc movs r0, #0 @@ -595605,62 +595605,62 @@ sub_08121D90: @ 0x08121D90 _08121DF4: .4byte 0x0100C000 _08121DF8: .4byte 0x05000100 _08121DFC: .4byte 0x01000200 - thumb_func_end sub_08121D90 + thumb_func_end ResetVramOamAndBgCntRegs - thumb_func_start sub_08121E00 -sub_08121E00: @ 0x08121E00 + thumb_func_start ResetAllBgsCoordinates +ResetAllBgsCoordinates: @ 0x08121E00 push {lr} movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08121E00 + thumb_func_end ResetAllBgsCoordinates - thumb_func_start sub_08121E58 -sub_08121E58: @ 0x08121E58 + thumb_func_start SetVBlankHBlankCallbacksToNull +SetVBlankHBlankCallbacksToNull: @ 0x08121E58 push {lr} movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08121E58 + thumb_func_end SetVBlankHBlankCallbacksToNull - thumb_func_start sub_08121E6C -sub_08121E6C: @ 0x08121E6C + thumb_func_start DisplayMessageAndContinueTask +DisplayMessageAndContinueTask: @ 0x08121E6C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -595685,14 +595685,14 @@ sub_08121E6C: @ 0x08121E6C strb r6, [r0] adds r0, r6, #0 movs r1, #1 - bl sub_08197924 + bl DrawDialogFrameWithCustomTileAndPalette ldr r4, _08121EFC ldr r0, [sp, #0x30] cmp r0, r4 beq _08121EB0 adds r0, r4, #0 ldr r1, [sp, #0x30] - bl sub_08008BCC + bl StringExpandPlaceholders _08121EB0: ldr r2, _08121F00 ldrb r0, [r2] @@ -595711,7 +595711,7 @@ _08121EB0: adds r1, r7, #0 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldr r1, _08121F04 ldr r0, [sp, #0x34] str r0, [r1] @@ -595735,11 +595735,11 @@ _08121EFC: .4byte gUnknown_2021C7C _08121F00: .4byte gUnknown_30030B4 _08121F04: .4byte gUnknown_300117C _08121F08: .4byte gUnknown_3005B60 -_08121F0C: .4byte sub_08121F2C - thumb_func_end sub_08121E6C +_08121F0C: .4byte Task_ContinueTaskAfterMessagePrints + thumb_func_end DisplayMessageAndContinueTask - thumb_func_start sub_08121F10 -sub_08121F10: @ 0x08121F10 + thumb_func_start RunTextPrintersRetIsActive +RunTextPrintersRetIsActive: @ 0x08121F10 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -595752,16 +595752,16 @@ sub_08121F10: @ 0x08121F10 pop {r4} pop {r1} bx r1 - thumb_func_end sub_08121F10 + thumb_func_end RunTextPrintersRetIsActive - thumb_func_start sub_08121F2C -sub_08121F2C: @ 0x08121F2C + thumb_func_start Task_ContinueTaskAfterMessagePrints +Task_ContinueTaskAfterMessagePrints: @ 0x08121F2C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _08121F50 ldrb r0, [r0] - bl sub_08121F10 + bl RunTextPrintersRetIsActive lsls r0, r0, #0x10 cmp r0, #0 bne _08121F4A @@ -595776,7 +595776,7 @@ _08121F4A: .align 2, 0 _08121F50: .4byte gUnknown_2039E0C _08121F54: .4byte gUnknown_300117C - thumb_func_end sub_08121F2C + thumb_func_end Task_ContinueTaskAfterMessagePrints thumb_func_start DoYesNoFuncWithChoice DoYesNoFuncWithChoice: @ 0x08121F58 @@ -595798,7 +595798,7 @@ DoYesNoFuncWithChoice: @ 0x08121F58 .align 2, 0 _08121F78: .4byte gUnknown_2039E04 _08121F7C: .4byte gUnknown_3005B60 -_08121F80: .4byte sub_08121FE8 +_08121F80: .4byte Task_CallYesOrNoCallback thumb_func_end DoYesNoFuncWithChoice thumb_func_start sub_08121F84 @@ -595849,11 +595849,11 @@ sub_08121F84: @ 0x08121F84 .align 2, 0 _08121FDC: .4byte gUnknown_2039E04 _08121FE0: .4byte gUnknown_3005B60 -_08121FE4: .4byte sub_08121FE8 +_08121FE4: .4byte Task_CallYesOrNoCallback thumb_func_end sub_08121F84 - thumb_func_start sub_08121FE8 -sub_08121FE8: @ 0x08121FE8 + thumb_func_start Task_CallYesOrNoCallback +Task_CallYesOrNoCallback: @ 0x08121FE8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -595896,10 +595896,10 @@ _08122034: bx r0 .align 2, 0 _0812203C: .4byte gUnknown_2039E04 - thumb_func_end sub_08121FE8 + thumb_func_end Task_CallYesOrNoCallback - thumb_func_start sub_08122040 -sub_08122040: @ 0x08122040 + thumb_func_start AdjustQuantityAccordingToDPadInput +AdjustQuantityAccordingToDPadInput: @ 0x08122040 push {r4, r5, r6, lr} adds r2, r0, #0 lsls r1, r1, #0x10 @@ -595987,10 +595987,10 @@ _081220D4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08122040 + thumb_func_end AdjustQuantityAccordingToDPadInput - thumb_func_start sub_081220DC -sub_081220DC: @ 0x081220DC + thumb_func_start GetLRKeysState +GetLRKeysState: @ 0x081220DC push {lr} ldr r0, _081220FC ldr r0, [r0] @@ -596022,7 +596022,7 @@ _08122112: _08122114: pop {r1} bx r1 - thumb_func_end sub_081220DC + thumb_func_end GetLRKeysState thumb_func_start sub_08122118 sub_08122118: @ 0x08122118 @@ -596089,12 +596089,12 @@ _08122182: .align 2, 0 thumb_func_end sub_08122154 - thumb_func_start sub_08122188 -sub_08122188: @ 0x08122188 + thumb_func_start itemid_80BF6D8_mail_related +itemid_80BF6D8_mail_related: @ 0x08122188 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 beq _0812219E bl InUnionRoom @@ -596115,12 +596115,12 @@ _081221B2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08122188 + thumb_func_end itemid_80BF6D8_mail_related thumb_func_start sub_081221B8 sub_081221B8: @ 0x081221B8 push {lr} - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #1 beq _081221CA ldr r0, _081221D0 @@ -596350,9 +596350,9 @@ _0812232E: sub_08122334: @ 0x08122334 push {lr} ldr r0, _08122348 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0812234C - bl sub_080343E4 + bl LoadCompressedSpritePalette pop {r0} bx r0 .align 2, 0 @@ -596377,7 +596377,7 @@ _08122364: ldr r0, _081223B8 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite mov r1, r8 adds r4, r1, r5 strb r0, [r4] @@ -596583,8 +596583,8 @@ _081224D4: bx r0 thumb_func_end sub_08122454 - thumb_func_start sub_081224E0 -sub_081224E0: @ 0x081224E0 + thumb_func_start InitDewfordTrend +InitDewfordTrend: @ 0x081224E0 push {r4, r5, r6, r7, lr} movs r6, #0 ldr r5, _08122514 @@ -596662,10 +596662,10 @@ _0812257C: .4byte 0x00002E6E _08122580: .4byte 0x00002E69 _08122584: .4byte 0x00002E68 _08122588: .4byte gUnknown_3005AEC - thumb_func_end sub_081224E0 + thumb_func_end InitDewfordTrend - thumb_func_start sub_0812258C -sub_0812258C: @ 0x0812258C + thumb_func_start UpdateDewfordTrendPerDay +UpdateDewfordTrendPerDay: @ 0x0812258C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -596842,7 +596842,7 @@ _081226CA: .align 2, 0 _081226DC: .4byte gUnknown_3005AEC _081226E0: .4byte 0x00002E68 - thumb_func_end sub_0812258C + thumb_func_end UpdateDewfordTrendPerDay thumb_func_start sub_081226E4 sub_081226E4: @ 0x081226E4 @@ -596856,7 +596856,7 @@ sub_081226E4: @ 0x081226E4 str r0, [sp] str r1, [sp, #4] mov r0, r8 - bl sub_08122BBC + bl SB1ContainsWords lsls r0, r0, #0x18 cmp r0, #0 beq _08122704 @@ -597063,8 +597063,8 @@ _08122878: .align 2, 0 thumb_func_end sub_08122810 - thumb_func_start sub_08122888 -sub_08122888: @ 0x08122888 + thumb_func_start ReceiveEasyChatPairsData +ReceiveEasyChatPairsData: @ 0x08122888 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -597086,10 +597086,10 @@ sub_08122888: @ 0x08122888 cmp r7, #0 bne _081228BC mov r0, sl - bl sub_08000BF0 + bl Free b _0812298C _081228BC: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -597192,9 +597192,9 @@ _0812296A: cmp r5, #4 bls _0812296A mov r0, sl - bl sub_08000BF0 + bl Free adds r0, r7, #0 - bl sub_08000BF0 + bl Free _0812298C: add sp, #4 pop {r3, r4, r5} @@ -597207,10 +597207,10 @@ _0812298C: .align 2, 0 _0812299C: .4byte gUnknown_3005AEC _081229A0: .4byte 0x00002E68 - thumb_func_end sub_08122888 + thumb_func_end ReceiveEasyChatPairsData - thumb_func_start sub_081229A4 -sub_081229A4: @ 0x081229A4 + thumb_func_start BufferTrendyPhraseString +BufferTrendyPhraseString: @ 0x081229A4 push {lr} ldr r2, _081229C4 ldr r0, _081229C8 @@ -597231,7 +597231,7 @@ _081229C4: .4byte gUnknown_3005AEC _081229C8: .4byte gUnknown_2037280 _081229CC: .4byte gUnknown_2021C40 _081229D0: .4byte 0x00002E6C - thumb_func_end sub_081229A4 + thumb_func_end BufferTrendyPhraseString thumb_func_start TrendyPhraseIsOld TrendyPhraseIsOld: @ 0x081229D4 @@ -597485,8 +597485,8 @@ _08122B76: _08122BB8: .4byte 0xFFFFC07F thumb_func_end sub_08122B34 - thumb_func_start sub_08122BBC -sub_08122BBC: @ 0x08122BBC + thumb_func_start SB1ContainsWords +SB1ContainsWords: @ 0x08122BBC push {r4, r5, r6, lr} adds r5, r0, #0 movs r4, #0 @@ -597519,7 +597519,7 @@ _08122BF4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08122BBC + thumb_func_end SB1ContainsWords thumb_func_start IsEasyChatPairEqual IsEasyChatPairEqual: @ 0x08122BFC @@ -597589,8 +597589,8 @@ _08122C62: bx r1 thumb_func_end GetEqualEasyChatPairIndex - thumb_func_start sub_08122C68 -sub_08122C68: @ 0x08122C68 + thumb_func_start GetHealLocationIndexByMap +GetHealLocationIndexByMap: @ 0x08122C68 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -597621,16 +597621,16 @@ _08122C9A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08122C68 + thumb_func_end GetHealLocationIndexByMap - thumb_func_start sub_08122CA0 -sub_08122CA0: @ 0x08122CA0 + thumb_func_start GetHealLocationByMap +GetHealLocationByMap: @ 0x08122CA0 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_08122C68 + bl GetHealLocationIndexByMap cmp r0, #0 beq _08122CC0 lsls r0, r0, #3 @@ -597645,10 +597645,10 @@ _08122CC2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08122CA0 + thumb_func_end GetHealLocationByMap - thumb_func_start sub_08122CC8 -sub_08122CC8: @ 0x08122CC8 + thumb_func_start GetHealLocation +GetHealLocation: @ 0x08122CC8 push {lr} cmp r0, #0 beq _08122CE0 @@ -597666,7 +597666,7 @@ _08122CE2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08122CC8 + thumb_func_end GetHealLocation thumb_func_start InitRegionMap InitRegionMap: @ 0x08122CE8 @@ -597739,7 +597739,7 @@ _08122D36: strb r1, [r0] b _08122D8C .align 2, 0 -_08122D6C: .4byte sub_081230D0 +_08122D6C: .4byte ProcessRegionMapInput_Full _08122D70: ldr r0, [r3] adds r0, #0x80 @@ -597767,7 +597767,7 @@ sub_08122D94: @ 0x08122D94 push {r4, lr} ldr r4, _08122DB8 str r0, [r4] - bl sub_081238B8 + bl RegionMap_InitializeStateBasedOnPlayerLocation ldr r2, [r4] adds r0, r2, #0 adds r0, #0x54 @@ -597847,7 +597847,7 @@ _08122E38: ldrb r0, [r0] cmp r0, #0 beq _08122E70 - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _08122E50 @@ -597862,7 +597862,7 @@ _08122E50: movs r2, #0 _08122E5E: movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _08123020 .align 2, 0 _08122E68: .4byte gUnknown_2039E10 @@ -597876,7 +597876,7 @@ _08122E70: _08122E7C: .4byte gUnknown_857C0B0 _08122E80: .4byte 0x0600E000 _08122E84: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _08122E90 @@ -597885,7 +597885,7 @@ _08122E90: ldr r0, _08122E9C movs r1, #0x70 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette b _08123020 .align 2, 0 _08122E9C: .4byte gUnknown_857B30C @@ -597914,7 +597914,7 @@ _08122EBC: _08122ED0: .4byte gUnknown_857B220 _08122ED4: .4byte gUnknown_2039E10 _08122ED8: - bl sub_081238B8 + bl RegionMap_InitializeStateBasedOnPlayerLocation ldr r4, _08122F18 ldr r2, [r4] adds r0, r2, #0 @@ -597928,18 +597928,18 @@ _08122ED8: adds r1, #0x76 strh r0, [r1] ldrh r0, [r2] - bl sub_08123EC0 + bl CorrectSpecialMapSecId_Internal ldr r1, [r4] strh r0, [r1] ldrh r0, [r1] - bl sub_08123D64 + bl get_flagnr_blue_points ldr r1, [r4] strb r0, [r1, #2] ldr r1, [r4] adds r0, r1, #4 ldrh r1, [r1] movs r2, #0xa - bl sub_08124578 + bl GetMapName b _08123020 .align 2, 0 _08122F18: .4byte gUnknown_2039E10 @@ -598005,8 +598005,8 @@ _08122F48: bl CalcZoomScrollParams b _08123020 _08122F98: - bl sub_08123FBC - bl sub_081237C0 + bl RegionMap_GetPositionOfCursorWithinMapSection + bl UpdateRegionMapVideoRegs ldr r4, _0812301C ldr r0, [r4] movs r1, #0 @@ -598028,7 +598028,7 @@ _08122F98: ldrb r0, [r0] movs r1, #3 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute ldr r1, [r4] adds r0, r1, #0 adds r0, #0x80 @@ -598036,7 +598036,7 @@ _08122F98: adds r1, #0x81 ldrb r2, [r1] movs r1, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r1, [r4] adds r0, r1, #0 adds r0, #0x80 @@ -598044,19 +598044,19 @@ _08122F98: adds r1, #0x82 ldrb r2, [r1] movs r1, #2 - bl sub_08001B70 + bl SetBgAttribute ldr r0, [r4] adds r0, #0x80 ldrb r0, [r0] movs r1, #6 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r0, [r4] adds r0, #0x80 ldrb r0, [r0] movs r1, #4 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute _0812300E: ldr r1, [r4] adds r1, #0x79 @@ -598095,7 +598095,7 @@ sub_0812303C: @ 0x0812303C lsls r0, r0, #2 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _08123060 ldr r1, _08123064 movs r2, #0x30 @@ -598107,8 +598107,8 @@ _08123060: .4byte gUnknown_2037894 _08123064: .4byte gUnknown_2037494 thumb_func_end sub_0812303C - thumb_func_start sub_08123068 -sub_08123068: @ 0x08123068 + thumb_func_start FreeRegionMapIconResources +FreeRegionMapIconResources: @ 0x08123068 push {r4, lr} ldr r4, _081230B4 ldr r0, [r4] @@ -598144,7 +598144,7 @@ _081230AC: bx r0 .align 2, 0 _081230B4: .4byte gUnknown_2039E10 - thumb_func_end sub_08123068 + thumb_func_end FreeRegionMapIconResources thumb_func_start sub_081230B8 sub_081230B8: @ 0x081230B8 @@ -598165,8 +598165,8 @@ sub_081230C4: @ 0x081230C4 _081230CC: .4byte gUnknown_2039E10 thumb_func_end sub_081230C4 - thumb_func_start sub_081230D0 -sub_081230D0: @ 0x081230D0 + thumb_func_start ProcessRegionMapInput_Full +ProcessRegionMapInput_Full: @ 0x081230D0 push {r4, lr} movs r4, #0 ldr r2, _0812316C @@ -598273,11 +598273,11 @@ _08123190: pop {r1} bx r1 .align 2, 0 -_08123198: .4byte sub_0812319C - thumb_func_end sub_081230D0 +_08123198: .4byte MoveRegionMapCursor_Full + thumb_func_end ProcessRegionMapInput_Full - thumb_func_start sub_0812319C -sub_0812319C: @ 0x0812319C + thumb_func_start MoveRegionMapCursor_Full +MoveRegionMapCursor_Full: @ 0x0812319C push {r4, r5, lr} ldr r5, _081231B4 ldr r1, [r5] @@ -598354,7 +598354,7 @@ _08123216: lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_08123D64 + bl get_flagnr_blue_points ldr r1, [r5] strb r0, [r1, #2] ldr r1, [r5] @@ -598365,9 +598365,9 @@ _08123216: adds r0, r1, #4 ldrh r1, [r1] movs r2, #0xa - bl sub_08124578 + bl GetMapName _08123248: - bl sub_08123FBC + bl RegionMap_GetPositionOfCursorWithinMapSection ldr r1, [r5] ldr r0, _0812325C str r0, [r1, #0x18] @@ -598377,8 +598377,8 @@ _08123254: pop {r1} bx r1 .align 2, 0 -_0812325C: .4byte sub_081230D0 - thumb_func_end sub_0812319C +_0812325C: .4byte ProcessRegionMapInput_Full + thumb_func_end MoveRegionMapCursor_Full thumb_func_start ProcessRegionMapInput_Zoomed ProcessRegionMapInput_Zoomed: @ 0x08123260 @@ -598496,11 +598496,11 @@ _08123326: _08123330: .4byte gUnknown_2039E10 _08123334: .4byte gUnknown_3002360 _08123338: .4byte 0x0000FFFF -_0812333C: .4byte sub_08123340 +_0812333C: .4byte MoveRegionMapCursor_Zoomed thumb_func_end ProcessRegionMapInput_Zoomed - thumb_func_start sub_08123340 -sub_08123340: @ 0x08123340 + thumb_func_start MoveRegionMapCursor_Zoomed +MoveRegionMapCursor_Zoomed: @ 0x08123340 push {r4, r5, lr} ldr r5, _08123414 ldr r2, [r5] @@ -598581,7 +598581,7 @@ _081233CE: lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_08123D64 + bl get_flagnr_blue_points ldr r1, [r5] strb r0, [r1, #2] ldr r1, [r5] @@ -598592,9 +598592,9 @@ _081233CE: adds r0, r1, #4 ldrh r1, [r1] movs r2, #0xa - bl sub_08124578 + bl GetMapName _081233FA: - bl sub_08123FBC + bl RegionMap_GetPositionOfCursorWithinMapSection _081233FE: ldr r0, _08123414 ldr r2, [r0] @@ -598615,7 +598615,7 @@ _0812341E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08123340 + thumb_func_end MoveRegionMapCursor_Zoomed thumb_func_start sub_08123424 sub_08123424: @ 0x08123424 @@ -598742,7 +598742,7 @@ _08123506: adds r0, #0x6e movs r1, #0 strh r1, [r0] - bl sub_08124244 + bl FreeRegionMapCursorSprite bl HideRegionMapPlayerIcon pop {r4, r5, r6} pop {r0} @@ -598818,13 +598818,13 @@ _08123590: ldrh r0, [r0] adds r1, #0x5a ldrh r1, [r1] - bl sub_081240E0 - bl sub_081243E8 + bl CreateRegionMapCursor + bl UnhideRegionMapPlayerIcon movs r4, #0 b _08123692 .align 2, 0 _081235A8: .4byte ProcessRegionMapInput_Zoomed -_081235AC: .4byte sub_081230D0 +_081235AC: .4byte ProcessRegionMapInput_Full _081235B0: ldr r2, [r3, #0x3c] ldr r0, [r3, #0x44] @@ -599106,8 +599106,8 @@ RegionMap_SetBG2XAndBG2Y: @ 0x08123798 _081237BC: .4byte gUnknown_2039E10 thumb_func_end RegionMap_SetBG2XAndBG2Y - thumb_func_start sub_081237C0 -sub_081237C0: @ 0x081237C0 + thumb_func_start UpdateRegionMapVideoRegs +UpdateRegionMapVideoRegs: @ 0x081237C0 push {r4, lr} ldr r4, _0812382C ldr r1, [r4] @@ -599157,7 +599157,7 @@ _08123826: bx r0 .align 2, 0 _0812382C: .4byte gUnknown_2039E10 - thumb_func_end sub_081237C0 + thumb_func_end UpdateRegionMapVideoRegs thumb_func_start PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs: @ 0x08123830 @@ -599178,7 +599178,7 @@ PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs: @ 0x08123830 movs r2, #0x38 movs r3, #0x48 bl CalcZoomScrollParams - bl sub_081237C0 + bl UpdateRegionMapVideoRegs ldr r0, _08123874 ldr r2, [r0] ldr r1, [r2, #0x20] @@ -599236,8 +599236,8 @@ _081238B0: _081238B4: .4byte gUnknown_857C53C thumb_func_end GetRegionMapSectionIdAt_Internal - thumb_func_start sub_081238B8 -sub_081238B8: @ 0x081238B8 + thumb_func_start RegionMap_InitializeStateBasedOnPlayerLocation +RegionMap_InitializeStateBasedOnPlayerLocation: @ 0x081238B8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -599257,7 +599257,7 @@ sub_081238B8: @ 0x081238B8 lsrs r0, r0, #0x18 cmp r0, #2 bhi _081238E8 - bl sub_08123C0C + bl RegionMap_InitializeStateBasedOnSSTidalLocation b _08123BF8 .align 2, 0 _081238E4: .4byte gUnknown_3005AEC @@ -599464,7 +599464,7 @@ _08123A96: ldr r4, _08123AB4 ldr r0, [r4] ldrb r0, [r0] - bl sub_08123F80 + bl RegionMap_IsPlayerInCave adds r1, r0, #0 cmp r1, #0 beq _08123AB8 @@ -599658,10 +599658,10 @@ _08123BF8: bx r0 .align 2, 0 _08123C08: .4byte gUnknown_2039E10 - thumb_func_end sub_081238B8 + thumb_func_end RegionMap_InitializeStateBasedOnPlayerLocation - thumb_func_start sub_08123C0C -sub_08123C0C: @ 0x08123C0C + thumb_func_start RegionMap_InitializeStateBasedOnSSTidalLocation +RegionMap_InitializeStateBasedOnSSTidalLocation: @ 0x08123C0C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -599680,7 +599680,7 @@ sub_08123C0C: @ 0x08123C0C adds r1, r4, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_0813806C + bl GetSSTidalLocation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r5 @@ -599827,10 +599827,10 @@ _08123D1C: .align 2, 0 _08123D5C: .4byte gUnknown_2039E10 _08123D60: .4byte gUnknown_857CD6C - thumb_func_end sub_08123C0C + thumb_func_end RegionMap_InitializeStateBasedOnSSTidalLocation - thumb_func_start sub_08123D64 -sub_08123D64: @ 0x08123D64 + thumb_func_start get_flagnr_blue_points +get_flagnr_blue_points: @ 0x08123D64 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -600017,7 +600017,7 @@ _08123EA2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08123D64 + thumb_func_end get_flagnr_blue_points thumb_func_start GetRegionMapSectionIdAt GetRegionMapSectionIdAt: @ 0x08123EA8 @@ -600034,8 +600034,8 @@ GetRegionMapSectionIdAt: @ 0x08123EA8 .align 2, 0 thumb_func_end GetRegionMapSectionIdAt - thumb_func_start sub_08123EC0 -sub_08123EC0: @ 0x08123EC0 + thumb_func_start CorrectSpecialMapSecId_Internal +CorrectSpecialMapSecId_Internal: @ 0x08123EC0 push {lr} lsls r0, r0, #0x10 lsrs r3, r0, #0x10 @@ -600045,7 +600045,7 @@ _08123ECA: ldrh r0, [r1] cmp r0, r3 bne _08123EE0 - bl sub_08123F10 + bl RegionMap_GetTerraCaveMapSecId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 b _08123F0C @@ -600080,10 +600080,10 @@ _08123F0A: _08123F0C: pop {r1} bx r1 - thumb_func_end sub_08123EC0 + thumb_func_end CorrectSpecialMapSecId_Internal - thumb_func_start sub_08123F10 -sub_08123F10: @ 0x08123F10 + thumb_func_start RegionMap_GetTerraCaveMapSecId +RegionMap_GetTerraCaveMapSecId: @ 0x08123F10 push {lr} ldr r0, _08123F34 bl VarGet @@ -600104,7 +600104,7 @@ _08123F24: .align 2, 0 _08123F34: .4byte 0x00004037 _08123F38: .4byte gUnknown_857D47A - thumb_func_end sub_08123F10 + thumb_func_end RegionMap_GetTerraCaveMapSecId thumb_func_start sub_08123F3C sub_08123F3C: @ 0x08123F3C @@ -600142,8 +600142,8 @@ _08123F78: .4byte 0xFFF70000 _08123F7C: .4byte gUnknown_857D49C thumb_func_end sub_08123F3C - thumb_func_start sub_08123F80 -sub_08123F80: @ 0x08123F80 + thumb_func_start RegionMap_IsPlayerInCave +RegionMap_IsPlayerInCave: @ 0x08123F80 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -600166,23 +600166,23 @@ _08123F9C: _08123FA4: pop {r1} bx r1 - thumb_func_end sub_08123F80 + thumb_func_end RegionMap_IsPlayerInCave - thumb_func_start sub_08123FA8 -sub_08123FA8: @ 0x08123FA8 + thumb_func_start CorrectSpecialMapSecId +CorrectSpecialMapSecId: @ 0x08123FA8 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08123EC0 + bl CorrectSpecialMapSecId_Internal lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08123FA8 + thumb_func_end CorrectSpecialMapSecId - thumb_func_start sub_08123FBC -sub_08123FBC: @ 0x08123FBC + thumb_func_start RegionMap_GetPositionOfCursorWithinMapSection +RegionMap_GetPositionOfCursorWithinMapSection: @ 0x08123FBC push {r4, r5, r6, lr} ldr r0, _08123FD0 ldr r1, [r0] @@ -600254,7 +600254,7 @@ _0812403A: bx r0 .align 2, 0 _08124040: .4byte gUnknown_2039E10 - thumb_func_end sub_08123FBC + thumb_func_end RegionMap_GetPositionOfCursorWithinMapSection thumb_func_start RegionMap_IsMapSecIdInNextRow RegionMap_IsMapSecIdInNextRow: @ 0x08124044 @@ -600348,8 +600348,8 @@ sub_081240DC: @ 0x081240DC .align 2, 0 thumb_func_end sub_081240DC - thumb_func_start sub_081240E0 -sub_081240E0: @ 0x081240E0 + thumb_func_start CreateRegionMapCursor +CreateRegionMapCursor: @ 0x081240E0 push {r4, r5, r6, r7, lr} sub sp, #0x28 lsls r0, r0, #0x10 @@ -600427,14 +600427,14 @@ _08124164: _0812417A: str r0, [sp, #0x14] adds r0, r2, #0 - bl sub_08008210 + bl LoadSpriteSheet adds r0, r7, #0 bl LoadSpritePalette mov r0, sp movs r1, #0x38 movs r2, #0x48 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -600502,7 +600502,7 @@ _08124210: movs r0, #2 strh r0, [r1, #0x30] adds r0, r6, #0 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r1, [r4] ldr r2, [r1, #0x1c] lsls r0, r0, #0x18 @@ -600521,10 +600521,10 @@ _08124234: .align 2, 0 _0812423C: .4byte gUnknown_2039E10 _08124240: .4byte 0x00000101 - thumb_func_end sub_081240E0 + thumb_func_end CreateRegionMapCursor - thumb_func_start sub_08124244 -sub_08124244: @ 0x08124244 + thumb_func_start FreeRegionMapCursorSprite +FreeRegionMapCursorSprite: @ 0x08124244 push {r4, lr} ldr r4, _08124270 ldr r0, [r4] @@ -600546,7 +600546,7 @@ _08124268: bx r0 .align 2, 0 _08124270: .4byte gUnknown_2039E10 - thumb_func_end sub_08124244 + thumb_func_end FreeRegionMapCursorSprite thumb_func_start sub_08124274 sub_08124274: @ 0x08124274 @@ -600572,8 +600572,8 @@ sub_08124284: @ 0x08124284 _08124290: .4byte gUnknown_2039E10 thumb_func_end sub_08124284 - thumb_func_start sub_08124294 -sub_08124294: @ 0x08124294 + thumb_func_start CreateRegionMapPlayerIcon +CreateRegionMapPlayerIcon: @ 0x08124294 push {r4, r5, r6, lr} sub sp, #0x28 lsls r0, r0, #0x10 @@ -600638,14 +600638,14 @@ _08124310: str r0, [sp, #0x20] _08124322: adds r0, r6, #0 - bl sub_08008210 + bl LoadSpriteSheet adds r0, r4, #0 bl LoadSpritePalette mov r0, sp movs r1, #0 movs r2, #0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08124384 @@ -600708,8 +600708,8 @@ _081243B0: pop {r0} bx r0 .align 2, 0 -_081243B8: .4byte sub_08124468 - thumb_func_end sub_08124294 +_081243B8: .4byte RegionMapPlayerIconSpriteCallback_Zoomed + thumb_func_end CreateRegionMapPlayerIcon thumb_func_start HideRegionMapPlayerIcon HideRegionMapPlayerIcon: @ 0x081243BC @@ -600736,8 +600736,8 @@ _081243E0: .4byte gUnknown_2039E10 _081243E4: .4byte sub_08007140 thumb_func_end HideRegionMapPlayerIcon - thumb_func_start sub_081243E8 -sub_081243E8: @ 0x081243E8 + thumb_func_start UnhideRegionMapPlayerIcon +UnhideRegionMapPlayerIcon: @ 0x081243E8 push {lr} ldr r0, _08124420 ldr r3, [r0] @@ -600767,7 +600767,7 @@ sub_081243E8: @ 0x081243E8 b _08124450 .align 2, 0 _08124420: .4byte gUnknown_2039E10 -_08124424: .4byte sub_08124468 +_08124424: .4byte RegionMapPlayerIconSpriteCallback_Zoomed _08124428: adds r0, r3, #0 adds r0, #0x74 @@ -600802,10 +600802,10 @@ _0812445E: bx r0 .align 2, 0 _08124464: .4byte sub_081244F8 - thumb_func_end sub_081243E8 + thumb_func_end UnhideRegionMapPlayerIcon - thumb_func_start sub_08124468 -sub_08124468: @ 0x08124468 + thumb_func_start RegionMapPlayerIconSpriteCallback_Zoomed +RegionMapPlayerIconSpriteCallback_Zoomed: @ 0x08124468 push {r4, lr} adds r3, r0, #0 ldr r0, _081244CC @@ -600868,7 +600868,7 @@ _081244D2: cmp r0, #1 bne _081244E4 adds r0, r3, #0 - bl sub_08124504 + bl RegionMapPlayerIconSpriteCallback b _081244F0 _081244E4: adds r0, r3, #0 @@ -600882,19 +600882,19 @@ _081244F0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08124468 + thumb_func_end RegionMapPlayerIconSpriteCallback_Zoomed thumb_func_start sub_081244F8 sub_081244F8: @ 0x081244F8 push {lr} - bl sub_08124504 + bl RegionMapPlayerIconSpriteCallback pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081244F8 - thumb_func_start sub_08124504 -sub_08124504: @ 0x08124504 + thumb_func_start RegionMapPlayerIconSpriteCallback +RegionMapPlayerIconSpriteCallback: @ 0x08124504 push {lr} adds r2, r0, #0 ldr r0, _08124544 @@ -600938,7 +600938,7 @@ _08124548: _08124554: pop {r0} bx r0 - thumb_func_end sub_08124504 + thumb_func_end RegionMapPlayerIconSpriteCallback thumb_func_start sub_08124558 sub_08124558: @ 0x08124558 @@ -600960,8 +600960,8 @@ _0812456E: _08124574: .4byte gUnknown_2039E10 thumb_func_end sub_08124558 - thumb_func_start sub_08124578 -sub_08124578: @ 0x08124578 + thumb_func_start GetMapName +GetMapName: @ 0x08124578 push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x10 @@ -601023,7 +601023,7 @@ _081245E2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08124578 + thumb_func_end GetMapName thumb_func_start sub_081245E8 sub_081245E8: @ 0x081245E8 @@ -601047,7 +601047,7 @@ _08124604: _0812460C: .4byte gUnknown_85CBEC1 _08124610: movs r2, #0 - bl sub_08124578 + bl GetMapName _08124616: pop {r1} bx r1 @@ -601133,8 +601133,8 @@ _08124698: bx r1 thumb_func_end sub_08124674 - thumb_func_start sub_0812469C -sub_0812469C: @ 0x0812469C + thumb_func_start MCB2_FlyMap +MCB2_FlyMap: @ 0x0812469C push {r4, lr} sub sp, #0xc ldr r0, _081246BC @@ -601168,7 +601168,7 @@ _081246C4: @ jump table .4byte _08124878 @ case 10 _081246F0: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -601203,12 +601203,12 @@ _081246F0: cmp r0, #0 bne _08124760 ldr r0, _0812475C - bl sub_08000540 + bl SetMainCallback2 b _081248B6 .align 2, 0 _08124754: .4byte gUnknown_2039E14 _08124758: .4byte 0x00000A74 -_0812475C: .4byte sub_08085AFC +_0812475C: .4byte CB2_ReturnToFieldWithOpenMenu _08124760: bl ResetPaletteFade bl ResetSpriteData @@ -601227,7 +601227,7 @@ _08124772: _08124784: .4byte gUnknown_857D7D4 _08124788: ldr r0, _08124794 - bl sub_08003090 + bl InitWindows bl sub_08004480 b _081248A8 .align 2, 0 @@ -601247,10 +601247,10 @@ _081247A8: bl InitRegionMap movs r0, #0 movs r1, #0 - bl sub_081240E0 + bl CreateRegionMapCursor movs r0, #1 movs r1, #1 - bl sub_08124294 + bl CreateRegionMapPlayerIcon ldr r0, [r4] ldrh r1, [r0, #8] strh r1, [r0, #6] @@ -601288,12 +601288,12 @@ _08124818: ldr r0, _08124850 movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _08124854 movs r0, #2 str r0, [sp] @@ -601305,7 +601305,7 @@ _08124818: movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081248A8 .align 2, 0 _08124850: .4byte gUnknown_857D528 @@ -601318,12 +601318,12 @@ _0812485E: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _08124874 - bl sub_080006F0 + bl SetVBlankCallback b _081248A8 .align 2, 0 -_08124874: .4byte sub_081248CC +_08124874: .4byte CheckLeadMonTough _08124878: movs r0, #0x50 movs r1, #0 @@ -601331,17 +601331,17 @@ _08124878: movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r0, _081248C0 bl sub_08124900 ldr r0, _081248C4 - bl sub_08000540 + bl SetMainCallback2 _081248A8: ldr r1, _081248C8 movs r0, #0x87 @@ -601359,18 +601359,18 @@ _081248B6: _081248C0: .4byte sub_08124CFC _081248C4: .4byte sub_081248E0 _081248C8: .4byte gUnknown_3002360 - thumb_func_end sub_0812469C + thumb_func_end MCB2_FlyMap - thumb_func_start sub_081248CC -sub_081248CC: @ 0x081248CC + thumb_func_start CheckLeadMonTough +CheckLeadMonTough: @ 0x081248CC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081248CC + thumb_func_end CheckLeadMonTough thumb_func_start sub_081248E0 sub_081248E0: @ 0x081248E0 @@ -601379,13 +601379,13 @@ sub_081248E0: @ 0x081248E0 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 - bl sub_080066D8 + bl AnimateSprites thumb_func_end sub_081248E0 thumb_func_start sub_081248F0 sub_081248F0: @ 0x081248F0 bl BuildOamBuffer - bl sub_08199668 + bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} bx r0 .align 2, 0 @@ -601451,7 +601451,7 @@ _08124930: movs r1, #0 movs r2, #0x51 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, [r5] adds r2, #0xc movs r0, #2 @@ -601477,7 +601477,7 @@ _08124930: movs r3, #0x10 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081249BC str r7, [r0] b _081249CA @@ -601505,7 +601505,7 @@ _081249CA: movs r1, #0 movs r2, #0x51 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette _081249EA: ldr r0, _08124A10 ldr r2, [r0] @@ -601519,7 +601519,7 @@ _081249EA: movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram str r7, [r4] b _08124A4A .align 2, 0 @@ -601537,16 +601537,16 @@ _08124A14: movs r1, #0 movs r2, #0x51 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette _08124A30: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0 str r0, [r4] _08124A4A: @@ -601584,7 +601584,7 @@ sub_08124A58: @ 0x08124A58 orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _08124AB8 bl LoadSpritePalette bl sub_08124ABC @@ -601670,7 +601670,7 @@ _08124B2C: ldrsh r2, [r3, r0] ldr r0, _08124B78 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 @@ -601798,7 +601798,7 @@ _08124BF4: ldrsh r2, [r5, r0] ldr r0, _08124C9C movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -601921,14 +601921,14 @@ _08124D14: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] ldrh r0, [r1, #4] adds r0, #1 strh r0, [r1, #4] b _08124D3E _08124D2E: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _08124D3E @@ -602039,18 +602039,18 @@ _08124E0C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] ldrh r0, [r1, #4] adds r0, #1 strh r0, [r1, #4] b _08124F02 _08124E26: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _08124F02 - bl sub_08123068 + bl FreeRegionMapIconResources ldr r1, [r4] ldr r2, _08124E50 adds r0, r1, r2 @@ -602073,11 +602073,11 @@ _08124E54: cmp r0, #0x49 bne _08124EA4 movs r0, #0x15 - bl sub_08084634 + bl SetWarpDestinationToHealLocation b _08124EE2 _08124E64: movs r0, #0x16 - bl sub_08084634 + bl SetWarpDestinationToHealLocation b _08124EE2 _08124E6C: ldr r0, _08124E7C @@ -602104,7 +602104,7 @@ _08124E80: movs r1, #0x14 _08124E98: adds r0, r1, #0 - bl sub_08084634 + bl SetWarpDestinationToHealLocation b _08124EE2 .align 2, 0 _08124EA0: .4byte 0x000008B4 @@ -602120,7 +602120,7 @@ _08124EA4: ldrb r0, [r1] cmp r0, #0 beq _08124EC8 - bl sub_08084634 + bl SetWarpDestinationToHealLocation b _08124EE2 .align 2, 0 _08124EC0: .4byte gUnknown_857D72C @@ -602143,17 +602143,17 @@ _08124EE2: b _08124EEE _08124EE8: ldr r0, _08124F0C - bl sub_08000540 + bl SetMainCallback2 _08124EEE: ldr r4, _08124F10 ldr r0, [r4] cmp r0, #0 beq _08124EFE - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08124EFE: - bl sub_080034D4 + bl FreeAllWindowBuffers _08124F02: add sp, #4 pop {r4} @@ -605708,16 +605708,16 @@ sub_081269BC: @ 0x081269BC lsls r0, r0, #3 ldr r1, _081269F4 adds r0, r0, r1 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r2, #0x85 lsls r2, r2, #2 movs r1, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] pop {r4} pop {r1} @@ -605727,8 +605727,8 @@ _081269F0: .4byte gUnknown_2039E54 _081269F4: .4byte gUnknown_8581A74 thumb_func_end sub_081269BC - thumb_func_start sub_081269F8 -sub_081269F8: @ 0x081269F8 + thumb_func_start RemoveDecorationWindow +RemoveDecorationWindow: @ 0x081269F8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -605739,17 +605739,17 @@ sub_081269F8: @ 0x081269F8 movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 .align 2, 0 _08126A24: .4byte gUnknown_2039E54 - thumb_func_end sub_081269F8 + thumb_func_end RemoveDecorationWindow thumb_func_start sub_08126A28 sub_08126A28: @ 0x08126A28 @@ -605762,7 +605762,7 @@ sub_08126A28: @ 0x08126A28 lsrs r4, r4, #0x18 movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -605775,7 +605775,7 @@ sub_08126A28: @ 0x08126A28 adds r0, r4, #0 movs r1, #1 movs r3, #2 - bl sub_08198850 + bl PrintTextArray str r6, [sp] str r5, [sp, #4] ldr r0, _08126A80 @@ -605795,20 +605795,20 @@ _08126A7C: .4byte gUnknown_8581A2C _08126A80: .4byte gUnknown_2039E1C thumb_func_end sub_08126A28 - thumb_func_start sub_08126A84 -sub_08126A84: @ 0x08126A84 + thumb_func_start InitDecorationActionsWindow +InitDecorationActionsWindow: @ 0x08126A84 push {lr} ldr r1, _08126A9C movs r0, #0 strb r0, [r1] bl sub_080987DC bl sub_08126A28 - bl sub_08126BD0 + bl PrintCurMainMenuDescription pop {r0} bx r0 .align 2, 0 _08126A9C: .4byte gUnknown_2039E1C - thumb_func_end sub_08126A84 + thumb_func_end InitDecorationActionsWindow thumb_func_start DoSecretBaseDecorationMenu DoSecretBaseDecorationMenu: @ 0x08126AA0 @@ -605816,7 +605816,7 @@ DoSecretBaseDecorationMenu: @ 0x08126AA0 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_08126A84 + bl InitDecorationActionsWindow ldr r2, _08126ADC ldr r0, _08126AE0 ldr r0, [r0] @@ -605846,7 +605846,7 @@ _08126AE0: .4byte gUnknown_3005AEC _08126AE4: .4byte 0x00001AAE _08126AE8: .4byte 0x00001ABE _08126AEC: .4byte gUnknown_3005B60 -_08126AF0: .4byte sub_08126B48 +_08126AF0: .4byte HandleDecorationActionsMenuInput thumb_func_end DoSecretBaseDecorationMenu thumb_func_start DoPlayerRoomDecorationMenu @@ -605855,7 +605855,7 @@ DoPlayerRoomDecorationMenu: @ 0x08126AF4 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_08126A84 + bl InitDecorationActionsWindow ldr r2, _08126B30 ldr r0, _08126B34 ldr r0, [r0] @@ -605885,11 +605885,11 @@ _08126B34: .4byte gUnknown_3005AEC _08126B38: .4byte 0x0000271C _08126B3C: .4byte 0x00002728 _08126B40: .4byte gUnknown_3005B60 -_08126B44: .4byte sub_08126B48 +_08126B44: .4byte HandleDecorationActionsMenuInput thumb_func_end DoPlayerRoomDecorationMenu - thumb_func_start sub_08126B48 -sub_08126B48: @ 0x08126B48 + thumb_func_start HandleDecorationActionsMenuInput +HandleDecorationActionsMenuInput: @ 0x08126B48 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -605899,10 +605899,10 @@ sub_08126B48: @ 0x08126B48 ands r0, r1 cmp r0, #0 bne _08126BC8 - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 asrs r1, r0, #0x18 movs r0, #2 @@ -605929,7 +605929,7 @@ _08126B94: .4byte gUnknown_2037C74 _08126B98: .4byte gUnknown_8581A2C _08126B9C: .4byte gUnknown_2039E1C _08126BA0: - bl sub_08198670 + bl Menu_GetCursorPos ldr r1, _08126BB8 strb r0, [r1] lsls r0, r4, #0x18 @@ -605937,7 +605937,7 @@ _08126BA0: ldrb r1, [r1] cmp r0, r1 beq _08126BC8 - bl sub_08126BD0 + bl PrintCurMainMenuDescription b _08126BC8 .align 2, 0 _08126BB8: .4byte gUnknown_2039E1C @@ -605945,21 +605945,21 @@ _08126BBC: movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_08126D34 + bl DecorationMenuAction_Cancel _08126BC8: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08126B48 + thumb_func_end HandleDecorationActionsMenuInput - thumb_func_start sub_08126BD0 -sub_08126BD0: @ 0x08126BD0 + thumb_func_start PrintCurMainMenuDescription +PrintCurMainMenuDescription: @ 0x08126BD0 push {lr} sub sp, #0x10 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _08126C08 ldr r0, _08126C0C ldrb r0, [r0] @@ -605977,17 +605977,17 @@ sub_08126BD0: @ 0x08126BD0 movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r0} bx r0 .align 2, 0 _08126C08: .4byte gUnknown_8581A4C _08126C0C: .4byte gUnknown_2039E1C - thumb_func_end sub_08126BD0 + thumb_func_end PrintCurMainMenuDescription - thumb_func_start sub_08126C10 -sub_08126C10: @ 0x08126C10 + thumb_func_start DecorationMenuAction_Decorate +DecorationMenuAction_Decorate: @ 0x08126C10 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -605998,11 +605998,11 @@ sub_08126C10: @ 0x08126C10 ldr r4, _08126C38 ldr r1, _08126C3C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08126C40 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _08126C5E .align 2, 0 _08126C38: .4byte gUnknown_2021C7C @@ -606020,7 +606020,7 @@ _08126C44: ldr r0, _08126C68 strb r2, [r0] adds r0, r5, #0 - bl sub_08126D94 + bl SecretBasePC_PrepMenuForSelectingStoredDecors _08126C5E: pop {r4, r5} pop {r0} @@ -606028,10 +606028,10 @@ _08126C5E: .align 2, 0 _08126C64: .4byte gUnknown_3005B60 _08126C68: .4byte gUnknown_2039E3F - thumb_func_end sub_08126C10 + thumb_func_end DecorationMenuAction_Decorate - thumb_func_start sub_08126C6C -sub_08126C6C: @ 0x08126C6C + thumb_func_start DecorationMenuAction_PutAway +DecorationMenuAction_PutAway: @ 0x08126C6C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -606043,11 +606043,11 @@ sub_08126C6C: @ 0x08126C6C ldr r4, _08126C94 ldr r1, _08126C98 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08126C9C adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _08126CC8 .align 2, 0 _08126C94: .4byte gUnknown_2021C7C @@ -606055,13 +606055,13 @@ _08126C98: .4byte gUnknown_85CA87A _08126C9C: .4byte ReturnToDecorationActionsAfterInvalidSelection _08126CA0: movs r0, #0 - bl sub_081269F8 + bl RemoveDecorationWindow movs r0, #0 movs r1, #0 bl sub_08197028 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _08126CD0 lsls r0, r5, #2 adds r0, r0, r5 @@ -606078,7 +606078,7 @@ _08126CC8: .align 2, 0 _08126CD0: .4byte gUnknown_3005B60 _08126CD4: .4byte sub_08129AAC - thumb_func_end sub_08126C6C + thumb_func_end DecorationMenuAction_PutAway thumb_func_start sub_08126CD8 sub_08126CD8: @ 0x08126CD8 @@ -606092,11 +606092,11 @@ sub_08126CD8: @ 0x08126CD8 ldr r4, _08126D00 ldr r1, _08126D04 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08126D08 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _08126D26 .align 2, 0 _08126D00: .4byte gUnknown_2021C7C @@ -606114,7 +606114,7 @@ _08126D0C: ldr r0, _08126D30 strb r2, [r0] adds r0, r5, #0 - bl sub_08126D94 + bl SecretBasePC_PrepMenuForSelectingStoredDecors _08126D26: pop {r4, r5} pop {r0} @@ -606124,13 +606124,13 @@ _08126D2C: .4byte gUnknown_3005B60 _08126D30: .4byte gUnknown_2039E3F thumb_func_end sub_08126CD8 - thumb_func_start sub_08126D34 -sub_08126D34: @ 0x08126D34 + thumb_func_start DecorationMenuAction_Cancel +DecorationMenuAction_Cancel: @ 0x08126D34 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0 - bl sub_081269F8 + bl RemoveDecorationWindow ldr r0, _08126D58 ldrb r0, [r0, #9] cmp r0, #0 @@ -606138,19 +606138,19 @@ sub_08126D34: @ 0x08126D34 ldr r0, _08126D5C bl ScriptContext1_SetupScript adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _08126D66 .align 2, 0 _08126D58: .4byte gUnknown_2039E48 _08126D5C: .4byte gUnknown_821D3D7 _08126D60: adds r0, r4, #0 - bl sub_0816AE78 + bl ReshowPlayerPC _08126D66: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08126D34 + thumb_func_end DecorationMenuAction_Cancel thumb_func_start ReturnToDecorationActionsAfterInvalidSelection ReturnToDecorationActionsAfterInvalidSelection: @ 0x08126D6C @@ -606158,7 +606158,7 @@ ReturnToDecorationActionsAfterInvalidSelection: @ 0x08126D6C adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_08126BD0 + bl PrintCurMainMenuDescription ldr r1, _08126D8C lsls r0, r4, #2 adds r0, r0, r4 @@ -606171,11 +606171,11 @@ ReturnToDecorationActionsAfterInvalidSelection: @ 0x08126D6C bx r0 .align 2, 0 _08126D8C: .4byte gUnknown_3005B60 -_08126D90: .4byte sub_08126B48 +_08126D90: .4byte HandleDecorationActionsMenuInput thumb_func_end ReturnToDecorationActionsAfterInvalidSelection - thumb_func_start sub_08126D94 -sub_08126D94: @ 0x08126D94 + thumb_func_start SecretBasePC_PrepMenuForSelectingStoredDecors +SecretBasePC_PrepMenuForSelectingStoredDecors: @ 0x08126D94 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -606183,12 +606183,12 @@ sub_08126D94: @ 0x08126D94 ldr r0, _08126DC0 movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 movs r1, #0 bl sub_08197028 movs r0, #0 - bl sub_081269F8 + bl RemoveDecorationWindow adds r0, r4, #0 bl sub_08126DC4 pop {r4} @@ -606196,7 +606196,7 @@ sub_08126D94: @ 0x08126D94 bx r0 .align 2, 0 _08126DC0: .4byte gUnknown_8581A94 - thumb_func_end sub_08126D94 + thumb_func_end SecretBasePC_PrepMenuForSelectingStoredDecors thumb_func_start sub_08126DC4 sub_08126DC4: @ 0x08126DC4 @@ -606238,11 +606238,11 @@ sub_08126DC4: @ 0x08126DC4 .align 2, 0 _08126E10: .4byte gUnknown_2039E3F _08126E14: .4byte gUnknown_3005B60 -_08126E18: .4byte sub_08127040 +_08126E18: .4byte HandleDecorationCategoriesMenuInput thumb_func_end sub_08126DC4 - thumb_func_start sub_08126E1C -sub_08126E1C: @ 0x08126E1C + thumb_func_start task_map_chg_seq_0807EC34 +task_map_chg_seq_0807EC34: @ 0x08126E1C push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -606251,7 +606251,7 @@ sub_08126E1C: @ 0x08126E1C ldr r5, _08126E68 ldrb r0, [r5, #1] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 bl sub_08126E78 ldrb r0, [r5, #1] @@ -606281,8 +606281,8 @@ sub_08126E1C: @ 0x08126E1C _08126E68: .4byte gUnknown_2039E54 _08126E6C: .4byte gUnknown_2039E3F _08126E70: .4byte gUnknown_3005B60 -_08126E74: .4byte sub_08127040 - thumb_func_end sub_08126E1C +_08126E74: .4byte HandleDecorationCategoriesMenuInput + thumb_func_end task_map_chg_seq_0807EC34 thumb_func_start sub_08126E78 sub_08126E78: @ 0x08126E78 @@ -606360,7 +606360,7 @@ _08126EE8: movs r3, #8 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -606400,7 +606400,7 @@ sub_08126F20: @ 0x08126F20 ldr r2, _08126FF4 mov r8, r2 mov r0, r8 - bl sub_08127010 + bl ColorMenuItemString ldr r0, _08126FF8 mov sb, r0 mov r1, r8 @@ -606445,7 +606445,7 @@ sub_08126F20: @ 0x08126F20 bl sub_080089D8 ldr r1, _0812700C mov r0, sb - bl sub_08008BCC + bl StringExpandPlaceholders adds r6, #0x30 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -606477,8 +606477,8 @@ _08127008: .4byte gUnknown_203B90C _0812700C: .4byte gUnknown_85CA6A4 thumb_func_end sub_08126F20 - thumb_func_start sub_08127010 -sub_08127010: @ 0x08127010 + thumb_func_start ColorMenuItemString +ColorMenuItemString: @ 0x08127010 push {r4, r5, lr} adds r5, r0, #0 lsls r4, r1, #0x18 @@ -606503,10 +606503,10 @@ _08127036: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08127010 + thumb_func_end ColorMenuItemString - thumb_func_start sub_08127040 -sub_08127040: @ 0x08127040 + thumb_func_start HandleDecorationCategoriesMenuInput +HandleDecorationCategoriesMenuInput: @ 0x08127040 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -606516,7 +606516,7 @@ sub_08127040: @ 0x08127040 ands r0, r1 cmp r0, #0 bne _08127096 - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 lsrs r4, r0, #0x18 asrs r1, r0, #0x18 @@ -606539,7 +606539,7 @@ _08127078: movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_08127154 + bl ExitDecorationCategoriesMenu b _08127096 _08127086: movs r0, #5 @@ -606547,17 +606547,17 @@ _08127086: ldr r0, _0812709C strb r4, [r0] adds r0, r5, #0 - bl sub_081270A0 + bl SelectDecorationCategory _08127096: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0812709C: .4byte gUnknown_2039E3F - thumb_func_end sub_08127040 + thumb_func_end HandleDecorationCategoriesMenuInput - thumb_func_start sub_081270A0 -sub_081270A0: @ 0x081270A0 + thumb_func_start SelectDecorationCategory +SelectDecorationCategory: @ 0x081270A0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -606579,7 +606579,7 @@ sub_081270A0: @ 0x081270A0 ldr r0, [r0] str r0, [r2] adds r0, r5, #0 - bl sub_08127964 + bl IdentifyOwnedDecorationsCurrentlyInUse ldr r0, _081270FC movs r1, #0 strh r1, [r0] @@ -606601,18 +606601,18 @@ _081270F8: .4byte gUnknown_203B90C _081270FC: .4byte gUnknown_2039E3C _08127100: .4byte gUnknown_2039E3A _08127104: .4byte gUnknown_3005B60 -_08127108: .4byte sub_081275CC +_08127108: .4byte ShowDecorationItemsWindow _0812710C: movs r0, #1 - bl sub_081269F8 + bl RemoveDecorationWindow ldr r4, _0812712C ldr r1, _08127130 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08127134 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _08127126: pop {r4, r5} pop {r0} @@ -606620,11 +606620,11 @@ _08127126: .align 2, 0 _0812712C: .4byte gUnknown_2021C7C _08127130: .4byte gUnknown_85CA70B -_08127134: .4byte sub_08127138 - thumb_func_end sub_081270A0 +_08127134: .4byte ReturnToDecorationCategoriesAfterInvalidSelection + thumb_func_end SelectDecorationCategory - thumb_func_start sub_08127138 -sub_08127138: @ 0x08127138 + thumb_func_start ReturnToDecorationCategoriesAfterInvalidSelection +ReturnToDecorationCategoriesAfterInvalidSelection: @ 0x08127138 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -606637,10 +606637,10 @@ sub_08127138: @ 0x08127138 pop {r4} pop {r0} bx r0 - thumb_func_end sub_08127138 + thumb_func_end ReturnToDecorationCategoriesAfterInvalidSelection - thumb_func_start sub_08127154 -sub_08127154: @ 0x08127154 + thumb_func_start ExitDecorationCategoriesMenu +ExitDecorationCategoriesMenu: @ 0x08127154 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -606654,32 +606654,32 @@ sub_08127154: @ 0x08127154 cmp r0, #2 beq _08127178 adds r0, r2, #0 - bl sub_08127184 + bl ReturnToActionsMenuFromCategories b _0812717E .align 2, 0 _08127174: .4byte gUnknown_3005B60 _08127178: adds r0, r2, #0 - bl sub_08127220 + bl ExitTraderDecorationMenu _0812717E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08127154 + thumb_func_end ExitDecorationCategoriesMenu - thumb_func_start sub_08127184 -sub_08127184: @ 0x08127184 + thumb_func_start ReturnToActionsMenuFromCategories +ReturnToActionsMenuFromCategories: @ 0x08127184 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 - bl sub_081269F8 + bl RemoveDecorationWindow bl sub_08126A28 movs r0, #0 movs r1, #0 bl sub_08196FB8 - bl sub_08126BD0 + bl PrintCurMainMenuDescription ldr r1, _081271B8 lsls r0, r4, #2 adds r0, r0, r4 @@ -606692,11 +606692,11 @@ sub_08127184: @ 0x08127184 bx r0 .align 2, 0 _081271B8: .4byte gUnknown_3005B60 -_081271BC: .4byte sub_08126B48 - thumb_func_end sub_08127184 +_081271BC: .4byte HandleDecorationActionsMenuInput + thumb_func_end ReturnToActionsMenuFromCategories - thumb_func_start sub_081271C0 -sub_081271C0: @ 0x081271C0 + thumb_func_start ShowDecorationCategoriesWindow +ShowDecorationCategoriesWindow: @ 0x081271C0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -606704,7 +606704,7 @@ sub_081271C0: @ 0x081271C0 ldr r0, _081271FC movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 movs r1, #0 bl sub_08197028 @@ -606727,10 +606727,10 @@ sub_081271C0: @ 0x081271C0 _081271FC: .4byte gUnknown_8581A94 _08127200: .4byte gUnknown_3005B60 _08127204: .4byte gUnknown_2039E3F - thumb_func_end sub_081271C0 + thumb_func_end ShowDecorationCategoriesWindow - thumb_func_start sub_08127208 -sub_08127208: @ 0x08127208 + thumb_func_start CopyDecorationCategoryName +CopyDecorationCategoryName: @ 0x08127208 push {lr} lsls r1, r1, #0x18 ldr r2, _0812721C @@ -606742,26 +606742,26 @@ sub_08127208: @ 0x08127208 bx r0 .align 2, 0 _0812721C: .4byte gUnknown_8581A0C - thumb_func_end sub_08127208 + thumb_func_end CopyDecorationCategoryName - thumb_func_start sub_08127220 -sub_08127220: @ 0x08127220 + thumb_func_start ExitTraderDecorationMenu +ExitTraderDecorationMenu: @ 0x08127220 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 - bl sub_081269F8 + bl RemoveDecorationWindow adds r0, r4, #0 - bl sub_08133DD8 + bl ExitTraderMenu pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08127220 + thumb_func_end ExitTraderDecorationMenu - thumb_func_start sub_0812723C -sub_0812723C: @ 0x0812723C + thumb_func_start InitDecorationItemsMenuLimits +InitDecorationItemsMenuLimits: @ 0x0812723C push {lr} ldr r3, _08127264 ldr r2, [r3] @@ -606795,7 +606795,7 @@ _08127276: bx r0 .align 2, 0 _0812727C: .4byte 0x000003D9 - thumb_func_end sub_0812723C + thumb_func_end InitDecorationItemsMenuLimits thumb_func_start sub_08127280 sub_08127280: @ 0x08127280 @@ -606849,8 +606849,8 @@ _081272E0: .4byte gUnknown_2039E58 _081272E4: .4byte 0x000003D9 thumb_func_end sub_081272B0 - thumb_func_start sub_081272E8 -sub_081272E8: @ 0x081272E8 + thumb_func_start PrintDecorationItemMenuItems +PrintDecorationItemMenuItems: @ 0x081272E8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -606876,7 +606876,7 @@ sub_081272E8: @ 0x081272E8 bne _08127330 ldr r0, _0812732C movs r1, #1 - bl sub_08127010 + bl ColorMenuItemString b _08127338 .align 2, 0 _08127320: .4byte gUnknown_3005B68 @@ -606886,7 +606886,7 @@ _0812732C: .4byte gUnknown_2021C40 _08127330: ldr r0, _081273E4 movs r1, #0 - bl sub_08127010 + bl ColorMenuItemString _08127338: movs r6, #0 ldr r1, _081273E8 @@ -606910,7 +606910,7 @@ _0812734E: ldr r1, [r1] adds r1, r1, r6 ldrb r1, [r1] - bl sub_08127404 + bl CopyDecorationMenuItemName ldr r1, [r5] lsls r2, r6, #3 adds r0, r1, r2 @@ -606982,10 +606982,10 @@ _081273F4: .4byte gUnknown_3006050 _081273F8: .4byte gUnknown_8581AB4 _081273FC: .4byte gUnknown_2039E54 _08127400: .4byte 0x000003D9 - thumb_func_end sub_081272E8 + thumb_func_end PrintDecorationItemMenuItems - thumb_func_start sub_08127404 -sub_08127404: @ 0x08127404 + thumb_func_start CopyDecorationMenuItemName +CopyDecorationMenuItemName: @ 0x08127404 push {r4, r5, lr} adds r5, r0, #0 lsls r4, r1, #0x10 @@ -607005,10 +607005,10 @@ sub_08127404: @ 0x08127404 .align 2, 0 _08127428: .4byte gUnknown_2021C40 _0812742C: .4byte gUnknown_8580CD1 - thumb_func_end sub_08127404 + thumb_func_end CopyDecorationMenuItemName - thumb_func_start sub_08127430 -sub_08127430: @ 0x08127430 + thumb_func_start DecorationItemsMenu_OnCursorMove +DecorationItemsMenu_OnCursorMove: @ 0x08127430 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -607019,12 +607019,12 @@ sub_08127430: @ 0x08127430 bl sub_080A306C _08127442: adds r0, r4, #0 - bl sub_081276F0 + bl PrintDecorationItemDescription pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08127430 + thumb_func_end DecorationItemsMenu_OnCursorMove thumb_func_start sub_08127450 sub_08127450: @ 0x08127450 @@ -607054,7 +607054,7 @@ sub_08127450: @ 0x08127450 adds r0, r6, #0 movs r1, #0x18 movs r2, #0x5c - bl sub_08199F90 + bl blit_move_info_icon b _081274A6 _0812748C: adds r0, r4, #0 @@ -607067,7 +607067,7 @@ _0812748C: mov r0, r8 movs r1, #0x19 movs r2, #0x5c - bl sub_08199F90 + bl blit_move_info_icon _081274A6: pop {r3} mov r8, r3 @@ -607076,8 +607076,8 @@ _081274A6: bx r0 thumb_func_end sub_08127450 - thumb_func_start sub_081274B0 -sub_081274B0: @ 0x081274B0 + thumb_func_start AddDecorationItemsScrollIndicators +AddDecorationItemsScrollIndicators: @ 0x081274B0 push {r4, lr} sub sp, #0x10 ldr r4, _081274F8 @@ -607104,7 +607104,7 @@ sub_081274B0: @ 0x081274B0 movs r1, #0x3c movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r4] ldr r2, _081274FC adds r1, r1, r2 @@ -607118,7 +607118,7 @@ _081274F0: _081274F8: .4byte gUnknown_2039E58 _081274FC: .4byte 0x000003DA _08127500: .4byte gUnknown_2039E3C - thumb_func_end sub_081274B0 + thumb_func_end AddDecorationItemsScrollIndicators thumb_func_start sub_08127504 sub_08127504: @ 0x08127504 @@ -607130,7 +607130,7 @@ sub_08127504: @ 0x08127504 ldrb r0, [r1] cmp r0, #0xff beq _08127522 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r1, _0812752C adds r0, r0, r1 @@ -607154,15 +607154,15 @@ sub_08127530: @ 0x08127530 movs r0, #1 bl sub_081269BC adds r0, r4, #0 - bl sub_0812754C + bl InitDecorationItemsWindow pop {r4} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08127530 - thumb_func_start sub_0812754C -sub_0812754C: @ 0x0812754C + thumb_func_start InitDecorationItemsWindow +InitDecorationItemsWindow: @ 0x0812754C push {r4, r5, r6, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -607176,31 +607176,31 @@ sub_0812754C: @ 0x0812754C bl sub_081269BC ldr r0, _081275B4 ldrb r0, [r0] - bl sub_081276C4 + bl ShowDecorationCategorySummaryWindow ldr r6, _081275B8 movs r0, #0xf7 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] ldr r1, _081275BC adds r0, r0, r1 movs r1, #0xff strb r1, [r0] - bl sub_0812723C + bl InitDecorationItemsMenuLimits bl sub_08127280 bl sub_081272B0 adds r0, r4, #0 - bl sub_081272E8 + bl PrintDecorationItemMenuItems ldr r0, _081275C0 ldr r1, _081275C4 ldrh r1, [r1] ldr r2, _081275C8 ldrh r2, [r2] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x1a] - bl sub_081274B0 + bl AddDecorationItemsScrollIndicators pop {r4, r5, r6} pop {r0} bx r0 @@ -607212,16 +607212,16 @@ _081275BC: .4byte 0x000003DA _081275C0: .4byte gUnknown_3006050 _081275C4: .4byte gUnknown_2039E3C _081275C8: .4byte gUnknown_2039E3A - thumb_func_end sub_0812754C + thumb_func_end InitDecorationItemsWindow - thumb_func_start sub_081275CC -sub_081275CC: @ 0x081275CC + thumb_func_start ShowDecorationItemsWindow +ShowDecorationItemsWindow: @ 0x081275CC push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0812754C + bl InitDecorationItemsWindow ldr r1, _081275F0 lsls r0, r4, #2 adds r0, r0, r4 @@ -607234,11 +607234,11 @@ sub_081275CC: @ 0x081275CC bx r0 .align 2, 0 _081275F0: .4byte gUnknown_3005B60 -_081275F4: .4byte sub_081275F8 - thumb_func_end sub_081275CC +_081275F4: .4byte HandleDecorationItemsMenuInput + thumb_func_end ShowDecorationItemsWindow - thumb_func_start sub_081275F8 -sub_081275F8: @ 0x081275F8 + thumb_func_start HandleDecorationItemsMenuInput +HandleDecorationItemsMenuInput: @ 0x081275F8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -607256,7 +607256,7 @@ sub_081275F8: @ 0x081275F8 cmp r0, #0 bne _081276AC ldrb r0, [r5, #0x1a] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r4, r0, #0 ldrb r0, [r5, #0x1a] ldr r7, _08127648 @@ -607302,13 +607302,13 @@ _08127670: ldrb r0, [r5, #0x1a] adds r1, r7, #0 mov r2, r8 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #1 - bl sub_081269F8 - bl sub_08127758 + bl RemoveDecorationWindow + bl RemoveDecorationItemsOtherWindows ldr r0, _081276BC ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r1, _081276C0 movs r2, #0x16 ldrsh r0, [r5, r2] @@ -607327,10 +607327,10 @@ _081276AC: _081276B8: .4byte gUnknown_2039E3E _081276BC: .4byte gUnknown_2039E58 _081276C0: .4byte gUnknown_8581A5C - thumb_func_end sub_081275F8 + thumb_func_end HandleDecorationItemsMenuInput - thumb_func_start sub_081276C4 -sub_081276C4: @ 0x081276C4 + thumb_func_start ShowDecorationCategorySummaryWindow +ShowDecorationCategorySummaryWindow: @ 0x081276C4 push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -607351,10 +607351,10 @@ sub_081276C4: @ 0x081276C4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_081276C4 + thumb_func_end ShowDecorationCategorySummaryWindow - thumb_func_start sub_081276F0 -sub_081276F0: @ 0x081276F0 + thumb_func_start PrintDecorationItemDescription +PrintDecorationItemDescription: @ 0x081276F0 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -607362,7 +607362,7 @@ sub_081276F0: @ 0x081276F0 ldrb r5, [r0, #3] adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _08127714 ldrb r0, [r0] cmp r4, r0 @@ -607402,19 +607402,19 @@ _08127732: .align 2, 0 _08127750: .4byte gUnknown_8580CD0 _08127754: .4byte gUnknown_2039E18 - thumb_func_end sub_081276F0 + thumb_func_end PrintDecorationItemDescription - thumb_func_start sub_08127758 -sub_08127758: @ 0x08127758 + thumb_func_start RemoveDecorationItemsOtherWindows +RemoveDecorationItemsOtherWindows: @ 0x08127758 push {lr} movs r0, #3 - bl sub_081269F8 + bl RemoveDecorationWindow movs r0, #2 - bl sub_081269F8 + bl RemoveDecorationWindow pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08127758 + thumb_func_end RemoveDecorationItemsOtherWindows thumb_func_start sub_0812776C sub_0812776C: @ 0x0812776C @@ -607472,8 +607472,8 @@ _081277C0: bx r1 thumb_func_end sub_08127798 - thumb_func_start sub_081277C4 -sub_081277C4: @ 0x081277C4 + thumb_func_start IdentifyOwnedDecorationsCurrentlyInUseInternal +IdentifyOwnedDecorationsCurrentlyInUseInternal: @ 0x081277C4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -607679,21 +607679,21 @@ _0812794A: bx r0 .align 2, 0 _08127960: .4byte gUnknown_2039E3F - thumb_func_end sub_081277C4 + thumb_func_end IdentifyOwnedDecorationsCurrentlyInUseInternal - thumb_func_start sub_08127964 -sub_08127964: @ 0x08127964 + thumb_func_start IdentifyOwnedDecorationsCurrentlyInUse +IdentifyOwnedDecorationsCurrentlyInUse: @ 0x08127964 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081277C4 + bl IdentifyOwnedDecorationsCurrentlyInUseInternal pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08127964 + thumb_func_end IdentifyOwnedDecorationsCurrentlyInUse - thumb_func_start sub_08127974 -sub_08127974: @ 0x08127974 + thumb_func_start IsSelectedDecorInThePC +IsSelectedDecorInThePC: @ 0x08127974 push {r4, lr} movs r2, #0 ldr r0, _081279A0 @@ -607735,7 +607735,7 @@ _081279BC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08127974 + thumb_func_end IsSelectedDecorInThePC thumb_func_start sub_081279C4 sub_081279C4: @ 0x081279C4 @@ -607746,7 +607746,7 @@ sub_081279C4: @ 0x081279C4 movs r0, #1 bl sub_081269BC adds r0, r4, #0 - bl sub_081275CC + bl ShowDecorationItemsWindow pop {r4} pop {r0} bx r0 @@ -607794,7 +607794,7 @@ sub_08127A0C: @ 0x08127A0C movs r0, #1 bl sub_081269BC adds r0, r4, #0 - bl sub_081275CC + bl ShowDecorationItemsWindow _08127A32: pop {r4} pop {r0} @@ -607803,8 +607803,8 @@ _08127A32: _08127A38: .4byte gUnknown_3002360 thumb_func_end sub_08127A0C - thumb_func_start sub_08127A3C -sub_08127A3C: @ 0x08127A3C + thumb_func_start SafariHandleSuccessBallThrowAnim +SafariHandleSuccessBallThrowAnim: @ 0x08127A3C push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -607815,23 +607815,23 @@ sub_08127A3C: @ 0x08127A3C ldr r0, _08127A74 adds r4, r4, r0 bl sub_08127504 - bl sub_08127758 + bl RemoveDecorationItemsOtherWindows ldrb r0, [r4, #0x1a] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _08127A78 ldr r0, [r0] - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_08126E1C + bl task_map_chg_seq_0807EC34 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08127A74: .4byte gUnknown_3005B68 _08127A78: .4byte gUnknown_2039E58 - thumb_func_end sub_08127A3C + thumb_func_end SafariHandleSuccessBallThrowAnim thumb_func_start sub_08127A7C sub_08127A7C: @ 0x08127A7C @@ -607891,7 +607891,7 @@ sub_08127AB4: @ 0x08127AB4 asrs r4, r4, #0x18 str r4, [sp] bl SetWarpDestination - bl sub_08084540 + bl WarpIntoMap add sp, #4 pop {r4, r5} pop {r0} @@ -607901,8 +607901,8 @@ _08127AFC: .4byte gUnknown_3005AEC _08127B00: .4byte gUnknown_3005B60 thumb_func_end sub_08127AB4 - thumb_func_start sub_08127B04 -sub_08127B04: @ 0x08127B04 + thumb_func_start GetDecorationElevation +GetDecorationElevation: @ 0x08127B04 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -607933,10 +607933,10 @@ _08127B36: bx r1 .align 2, 0 _08127B3C: .4byte gUnknown_85821D0 - thumb_func_end sub_08127B04 + thumb_func_end GetDecorationElevation - thumb_func_start sub_08127B40 -sub_08127B40: @ 0x08127B40 + thumb_func_start ShowDecorationOnMap_ +ShowDecorationOnMap_: @ 0x08127B40 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -608022,7 +608022,7 @@ _08127BBE: adds r0, r0, r1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08087CD4 + bl GetBehaviorByMetatileId lsls r4, r0, #0x10 lsls r0, r4, #8 lsrs r0, r0, #0x18 @@ -608083,7 +608083,7 @@ _08127C4A: adds r5, r3, r1 lsls r1, r5, #0x18 lsrs r1, r1, #0x18 - bl sub_08127B04 + bl GetDecorationElevation lsls r0, r0, #0x10 lsrs r6, r0, #0x10 ldr r0, _08127CA0 @@ -608166,7 +608166,7 @@ _08127CF4: bx r0 .align 2, 0 _08127D04: .4byte gUnknown_8580CE8 - thumb_func_end sub_08127B40 + thumb_func_end ShowDecorationOnMap_ thumb_func_start sub_08127D08 sub_08127D08: @ 0x08127D08 @@ -608224,7 +608224,7 @@ _08127D78: movs r2, #3 _08127D80: movs r3, #1 - bl sub_08127B40 + bl ShowDecorationOnMap_ b _08127DE4 _08127D88: str r2, [sp] @@ -608245,7 +608245,7 @@ _08127D9C: movs r2, #1 _08127DA4: movs r3, #2 - bl sub_08127B40 + bl ShowDecorationOnMap_ b _08127DE4 _08127DAC: str r2, [sp] @@ -608259,7 +608259,7 @@ _08127DB6: adds r1, r4, #0 movs r2, #2 movs r3, #4 - bl sub_08127B40 + bl ShowDecorationOnMap_ b _08127DE4 _08127DC6: str r2, [sp] @@ -608268,7 +608268,7 @@ _08127DC6: movs r2, #3 _08127DCE: movs r3, #3 - bl sub_08127B40 + bl ShowDecorationOnMap_ b _08127DE4 _08127DD6: str r2, [sp] @@ -608276,7 +608276,7 @@ _08127DD6: adds r1, r4, #0 movs r2, #3 movs r3, #2 - bl sub_08127B40 + bl ShowDecorationOnMap_ _08127DE4: add sp, #4 pop {r4} @@ -608471,11 +608471,11 @@ sub_08127F3C: @ 0x08127F3C ldr r4, _08127F74 ldr r1, _08127F78 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08127F7C adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _08128020 .align 2, 0 _08127F6C: .4byte gUnknown_2039E48 @@ -608484,7 +608484,7 @@ _08127F74: .4byte gUnknown_2021C7C _08127F78: .4byte gUnknown_85CA7D9 _08127F7C: .4byte sub_08127A0C _08127F80: - bl sub_08127974 + bl IsSelectedDecorInThePC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -608496,7 +608496,7 @@ _08127F80: bne _08127FBC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _08127FB4 lsls r0, r5, #2 adds r0, r0, r5 @@ -608522,7 +608522,7 @@ _08127FBC: bne _08127FEC ldr r0, _08127FE4 ldr r1, _08127FE8 - bl sub_08008BCC + bl StringExpandPlaceholders b _08127FF4 .align 2, 0 _08127FDC: .4byte gUnknown_2021C40 @@ -608532,12 +608532,12 @@ _08127FE8: .4byte gUnknown_85CA776 _08127FEC: ldr r0, _08128000 ldr r1, _08128004 - bl sub_08008BCC + bl StringExpandPlaceholders _08127FF4: ldr r1, _08128000 ldr r2, _08128008 adds r0, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _08128020 .align 2, 0 _08128000: .4byte gUnknown_2021C7C @@ -608547,11 +608547,11 @@ _0812800C: ldr r4, _08128028 ldr r1, _0812802C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08128030 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _08128020: pop {r4, r5} pop {r0} @@ -608615,13 +608615,13 @@ _08128080: adds r0, r0, r1 ldrb r1, [r0] adds r0, r5, #0 - bl sub_081280EC + bl ConfigureCameraObjectForPlacingDecoration adds r0, r6, #0 bl sub_08128240 adds r0, r6, #0 adds r1, r5, #0 - bl sub_0812817C - bl sub_080AE99C + bl SetUpPlacingDecorationPlayerAvatar + bl pal_fill_black ldrb r1, [r4, #8] movs r0, #0x7f ands r0, r1 @@ -608650,8 +608650,8 @@ _081280E6: bx r0 thumb_func_end sub_08128034 - thumb_func_start sub_081280EC -sub_081280EC: @ 0x081280EC + thumb_func_start ConfigureCameraObjectForPlacingDecoration +ConfigureCameraObjectForPlacingDecoration: @ 0x081280EC push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x18 @@ -608719,10 +608719,10 @@ _0812816C: .4byte gUnknown_20205AC _08128170: .4byte gUnknown_3005B30 _08128174: .4byte sub_081292B0 _08128178: .4byte gUnknown_8582134 - thumb_func_end sub_081280EC + thumb_func_end ConfigureCameraObjectForPlacingDecoration - thumb_func_start sub_0812817C -sub_0812817C: @ 0x0812817C + thumb_func_start SetUpPlacingDecorationPlayerAvatar +SetUpPlacingDecorationPlayerAvatar: @ 0x0812817C push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -608779,7 +608779,7 @@ _081281E0: movs r0, #0xc2 _081281E8: movs r3, #0x48 - bl sub_0808D6D8 + bl AddPseudoEventObject ldr r1, _08128230 strb r0, [r1] ldr r3, _08128234 @@ -608816,7 +608816,7 @@ _08128230: .4byte gUnknown_203A705 _08128234: .4byte gUnknown_20205AC _08128238: .4byte gUnknown_203A704 _0812823C: .4byte gUnknown_3005B30 - thumb_func_end sub_0812817C + thumb_func_end SetUpPlacingDecorationPlayerAvatar thumb_func_start sub_08128240 sub_08128240: @ 0x08128240 @@ -609059,11 +609059,11 @@ sub_081283EC: @ 0x081283EC ldr r5, _08128450 ldr r1, _08128454 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08128458 adds r0, r4, #0 adds r1, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r4, r5} pop {r0} bx r0 @@ -609171,7 +609171,7 @@ sub_081284CC: @ 0x081284CC _081284FA: lsls r0, r6, #0x18 lsrs r0, r0, #0x18 - bl sub_08088C78 + bl MetatileBehavior_IsNormal lsls r0, r0, #0x18 cmp r0, #0 beq _0812850C @@ -609295,7 +609295,7 @@ _081285A8: adds r0, r0, r1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08087CD4 + bl GetBehaviorByMetatileId movs r3, #0xf0 lsls r3, r3, #8 adds r1, r3, #0 @@ -609324,7 +609324,7 @@ _0812861E: ldr r2, [sp, #0xc] lsrs r1, r2, #0x10 movs r2, #0 - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -609412,14 +609412,14 @@ _08128690: adds r0, r0, r1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08087CD4 + bl GetBehaviorByMetatileId movs r3, #0xf0 lsls r3, r3, #8 adds r1, r3, #0 adds r5, r1, #0 ands r5, r0 adds r0, r4, #0 - bl sub_08088C78 + bl MetatileBehavior_IsNormal lsls r0, r0, #0x18 cmp r0, #0 bne _081286FC @@ -609447,7 +609447,7 @@ _08128712: ldr r2, [sp, #0x20] lsrs r1, r2, #0x10 movs r2, #0 - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x10 @@ -609517,14 +609517,14 @@ _08128768: adds r0, r0, r1 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08087CD4 + bl GetBehaviorByMetatileId movs r3, #0xf0 lsls r3, r3, #8 adds r1, r3, #0 adds r5, r1, #0 ands r5, r0 adds r0, r4, #0 - bl sub_08088C78 + bl MetatileBehavior_IsNormal lsls r0, r0, #0x18 cmp r0, #0 bne _081287CA @@ -609551,7 +609551,7 @@ _081287E0: ldr r2, [sp, #0x20] lsrs r1, r2, #0x10 movs r2, #0 - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -609613,7 +609613,7 @@ _08128840: beq _081288E4 adds r0, r4, #0 adds r1, r5, #1 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0xa3 lsls r1, r1, #2 cmp r0, r1 @@ -609691,7 +609691,7 @@ _081288F4: ldr r2, [sp, #0x20] lsrs r1, r2, #0x10 movs r2, #0 - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x10 @@ -609741,11 +609741,11 @@ sub_08128928: @ 0x08128928 ldr r4, _08128974 ldr r1, _08128978 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _0812897C adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _0812899A .align 2, 0 _08128968: .4byte gUnknown_2039E3E @@ -609760,11 +609760,11 @@ _08128980: ldr r4, _081289A0 ldr r1, _081289A4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _081289A8 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _0812899A: pop {r4, r5} pop {r0} @@ -609862,7 +609862,7 @@ _08128A44: ldrb r0, [r0, #0x14] cmp r0, #0x56 bne _08128A64 - bl sub_080EEC24 + bl TV_PutSecretBaseVisitOnTheAir _08128A64: adds r0, r4, #0 bl sub_08128B9C @@ -610033,7 +610033,7 @@ sub_08128B9C: @ 0x08128B9C lsrs r4, r4, #0x18 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _08128BC4 lsls r0, r4, #2 adds r0, r0, r4 @@ -610048,11 +610048,11 @@ sub_08128B9C: @ 0x08128B9C bx r0 .align 2, 0 _08128BC4: .4byte gUnknown_3005B60 -_08128BC8: .4byte sub_08128BCC +_08128BC8: .4byte c1_overworld_prev_quest thumb_func_end sub_08128B9C - thumb_func_start sub_08128BCC -sub_08128BCC: @ 0x08128BCC + thumb_func_start c1_overworld_prev_quest +c1_overworld_prev_quest: @ 0x08128BCC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -610093,9 +610093,9 @@ _08128C10: ldr r0, _08128C3C str r0, [r1] ldr r0, _08128C40 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08128C2C: pop {r4, r5} pop {r0} @@ -610105,7 +610105,7 @@ _08128C34: .4byte 0x00000BE5 _08128C38: .4byte gUnknown_3005B0C _08128C3C: .4byte sub_08128CB4 _08128C40: .4byte sub_08085A30 - thumb_func_end sub_08128BCC + thumb_func_end c1_overworld_prev_quest thumb_func_start sub_08128C44 sub_08128C44: @ 0x08128C44 @@ -610135,7 +610135,7 @@ _08128C6C: beq _08128C94 b _08128CAA _08128C76: - bl sub_080EA218 + bl HideSecretBaseDecorationSprites b _08128C8C _08128C7C: ldr r0, _08128C84 @@ -610166,17 +610166,17 @@ _08128CAA: pop {r0} bx r0 .align 2, 0 -_08128CB0: .4byte sub_081275F8 +_08128CB0: .4byte HandleDecorationItemsMenuInput thumb_func_end sub_08128C44 thumb_func_start sub_08128CB4 sub_08128CB4: @ 0x08128CB4 push {r4, lr} bl sub_080987DC - bl sub_080AE99C + bl pal_fill_black ldr r0, _08128CE8 movs r1, #8 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -611094,7 +611094,7 @@ sub_08129314: @ 0x08129314 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite b _081293AA .align 2, 0 _08129380: .4byte gUnknown_8580CD0 @@ -611111,7 +611111,7 @@ _08129398: str r2, [sp] movs r2, #0 movs r3, #0 - bl sub_0808D6D8 + bl AddPseudoEventObject _081293AA: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -611123,8 +611123,8 @@ _081293AA: _081293B8: .4byte sub_08007140 thumb_func_end sub_08129314 - thumb_func_start sub_081293BC -sub_081293BC: @ 0x081293BC + thumb_func_start AddDecorationIconObjectFromIconTable +AddDecorationIconObjectFromIconTable: @ 0x081293BC push {r4, r5, r6, r7, lr} sub sp, #0x10 lsls r0, r0, #0x10 @@ -611133,7 +611133,7 @@ sub_081293BC: @ 0x081293BC lsrs r6, r1, #0x10 lsls r2, r2, #0x18 lsrs r5, r2, #0x18 - bl sub_081AFABC + bl AllocItemIconTemporaryBuffers lsls r0, r0, #0x18 cmp r0, #0 beq _08129474 @@ -611146,7 +611146,7 @@ sub_081293BC: @ 0x081293BC ldr r0, [r4] ldr r4, _08129464 ldr r1, [r4] - bl sub_081AFB1C + bl CopyItemIconPicTo4x4Buffer ldr r0, [r4] str r0, [sp] ldr r4, _08129468 @@ -611161,7 +611161,7 @@ sub_081293BC: @ 0x081293BC orrs r0, r2 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r5, #0 movs r1, #1 bl GetDecorationIconPicOrPalette @@ -611171,7 +611171,7 @@ sub_081293BC: @ 0x081293BC ands r1, r4 orrs r1, r6 str r1, [r0, #4] - bl sub_080343E4 + bl LoadCompressedSpritePalette movs r0, #0x18 bl sub_08000BC8 adds r5, r0, #0 @@ -611187,13 +611187,13 @@ sub_081293BC: @ 0x081293BC movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AFAFC + bl FreeItemIconTemporaryBuffers adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r4, #0 b _08129476 .align 2, 0 @@ -611210,7 +611210,7 @@ _08129476: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081293BC + thumb_func_end AddDecorationIconObjectFromIconTable thumb_func_start GetDecorationIconPicOrPalette GetDecorationIconPicOrPalette: @ 0x08129480 @@ -611299,7 +611299,7 @@ sub_081294A4: @ 0x081294A4 orrs r0, r1 str r0, [sp, #8] add r0, sp, #4 - bl sub_08008210 + bl LoadSpriteSheet str r5, [sp, #0xc] add r0, sp, #0xc ldr r1, [r0, #4] @@ -611323,11 +611323,11 @@ sub_081294A4: @ 0x081294A4 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 - bl sub_08000BF0 + bl Free b _081295A2 .align 2, 0 _08129570: .4byte gUnknown_2039E5C @@ -611345,7 +611345,7 @@ _0812958C: str r2, [sp] movs r2, #0 movs r3, #0 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _081295A2: @@ -611360,8 +611360,8 @@ _081295A2: _081295B0: .4byte sub_08007140 thumb_func_end sub_081294A4 - thumb_func_start sub_081295B4 -sub_081295B4: @ 0x081295B4 + thumb_func_start AddDecorationIconObject +AddDecorationIconObject: @ 0x081295B4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -611394,7 +611394,7 @@ sub_081295B4: @ 0x081295B4 adds r0, r4, #0 adds r1, r5, #0 movs r2, #0 - bl sub_081293BC + bl AddDecorationIconObjectFromIconTable lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x40 @@ -611456,7 +611456,7 @@ _0812966C: adds r0, r3, #0 adds r1, r2, #0 mov r2, ip - bl sub_081293BC + bl AddDecorationIconObjectFromIconTable lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x40 @@ -611509,7 +611509,7 @@ _081296C0: bx r1 .align 2, 0 _081296D0: .4byte gUnknown_20205AC - thumb_func_end sub_081295B4 + thumb_func_end AddDecorationIconObject thumb_func_start sub_081296D4 sub_081296D4: @ 0x081296D4 @@ -611837,8 +611837,8 @@ _08129940: .4byte gUnknown_8245DDD _08129944: bl sub_080987DC adds r0, r5, #0 - bl sub_081277C4 - bl sub_080AE99C + bl IdentifyOwnedDecorationsCurrentlyInUseInternal + bl pal_fill_black movs r0, #3 strh r0, [r4, #0xc] b _08129984 @@ -611851,16 +611851,16 @@ _08129958: ldr r4, _0812998C ldr r1, _08129990 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08129994 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField ldr r0, _08129998 ldrb r0, [r0, #0x14] cmp r0, #0x56 bne _08129984 - bl sub_080EEC24 + bl TV_PutSecretBaseVisitOnTheAir _08129984: pop {r4, r5} pop {r0} @@ -611903,8 +611903,8 @@ _081299C8: bx r1 thumb_func_end sub_0812999C - thumb_func_start sub_081299CC -sub_081299CC: @ 0x081299CC + thumb_func_start SetUpPuttingAwayDecorationPlayerAvatar +SetUpPuttingAwayDecorationPlayerAvatar: @ 0x081299CC push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -611920,12 +611920,12 @@ sub_081299CC: @ 0x081299CC adds r0, r0, r2 ldrh r0, [r0, #0x2e] strb r0, [r3] - bl sub_0812A3A8 + bl CB2_PokeblockMenu ldr r0, _08129A20 movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r4, #4] @@ -611953,7 +611953,7 @@ _08129A2C: _08129A34: movs r2, #0x88 movs r3, #0x48 - bl sub_0808D6D8 + bl AddPseudoEventObject ldr r1, _08129A9C strb r0, [r1] ldr r6, _08129AA0 @@ -612005,7 +612005,7 @@ _08129A9C: .4byte gUnknown_203A705 _08129AA0: .4byte gUnknown_20205AC _08129AA4: .4byte gUnknown_203A704 _08129AA8: .4byte gUnknown_3005B30 - thumb_func_end sub_081299CC + thumb_func_end SetUpPuttingAwayDecorationPlayerAvatar thumb_func_start sub_08129AAC sub_08129AAC: @ 0x08129AAC @@ -612049,8 +612049,8 @@ _08129ADA: .align 2, 0 _08129AF8: .4byte gUnknown_2037C74 _08129AFC: - bl sub_081299CC - bl sub_080AE99C + bl SetUpPuttingAwayDecorationPlayerAvatar + bl pal_fill_black movs r0, #2 strh r0, [r4, #4] b _08129B1E @@ -612203,11 +612203,11 @@ sub_08129BE8: @ 0x08129BE8 ldr r5, _08129C58 ldr r1, _08129C5C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08129C60 adds r0, r4, #0 adds r1, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r4, r5} pop {r0} bx r0 @@ -612235,7 +612235,7 @@ sub_08129C64: @ 0x08129C64 ldr r4, _08129C8C ldr r1, _08129C90 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08129C94 b _08129D04 .align 2, 0 @@ -612293,12 +612293,12 @@ _08129CCE: ldr r4, _08129D20 ldr r1, _08129D24 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08129D28 _08129D04: adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _08129D40 .align 2, 0 _08129D10: .4byte gUnknown_3005B68 @@ -612312,11 +612312,11 @@ _08129D2C: ldr r4, _08129D48 ldr r1, _08129D4C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _08129D50 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _08129D40: pop {r4, r5} pop {r0} @@ -612529,7 +612529,7 @@ sub_08129E6C: @ 0x08129E6C bne _08129ECC adds r0, r5, #7 adds r1, r6, #7 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0xa3 lsls r1, r1, #2 cmp r0, r1 @@ -612931,7 +612931,7 @@ sub_0812A1CC: @ 0x0812A1CC lsrs r4, r4, #0x18 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _0812A1F4 lsls r0, r4, #2 adds r0, r0, r4 @@ -612990,7 +612990,7 @@ sub_0812A238: @ 0x0812A238 lsrs r4, r4, #0x18 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _0812A260 lsls r0, r4, #2 adds r0, r0, r4 @@ -613047,9 +613047,9 @@ _0812A2A8: ldr r1, _0812A2C8 str r1, [r0] ldr r0, _0812A2CC - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0812A2BE: pop {r4, r5} pop {r0} @@ -613088,7 +613088,7 @@ _0812A2F8: beq _0812A320 b _0812A336 _0812A302: - bl sub_080EA218 + bl HideSecretBaseDecorationSprites b _0812A318 _0812A308: ldr r0, _0812A310 @@ -613119,20 +613119,20 @@ _0812A336: pop {r0} bx r0 .align 2, 0 -_0812A33C: .4byte sub_08126B48 +_0812A33C: .4byte HandleDecorationActionsMenuInput thumb_func_end sub_0812A2D0 thumb_func_start sub_0812A340 sub_0812A340: @ 0x0812A340 push {lr} - bl sub_080AE99C + bl pal_fill_black movs r0, #0 movs r1, #1 bl sub_08196FB8 - bl sub_08126A84 + bl InitDecorationActionsWindow ldr r0, _0812A370 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0812A374 @@ -613179,8 +613179,8 @@ _0812A3A4: bx r0 thumb_func_end sub_0812A378 - thumb_func_start sub_0812A3A8 -sub_0812A3A8: @ 0x0812A3A8 + thumb_func_start CB2_PokeblockMenu +CB2_PokeblockMenu: @ 0x0812A3A8 push {lr} ldr r0, _0812A3BC ldr r0, [r0] @@ -613201,7 +613201,7 @@ _0812A3CA: bx r0 .align 2, 0 _0812A3D0: .4byte gUnknown_85822C4 - thumb_func_end sub_0812A3A8 + thumb_func_end CB2_PokeblockMenu thumb_func_start sub_0812A3D4 sub_0812A3D4: @ 0x0812A3D4 @@ -613217,7 +613217,7 @@ sub_0812A3E0: @ 0x0812A3E0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_08127974 + bl IsSelectedDecorInThePC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -613238,11 +613238,11 @@ sub_0812A3E0: @ 0x0812A3E0 ldr r4, _0812A434 ldr r1, _0812A438 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _0812A43C adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _0812A454 .align 2, 0 _0812A424: .4byte gUnknown_2021C40 @@ -613256,11 +613256,11 @@ _0812A440: ldr r4, _0812A45C ldr r1, _0812A460 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _0812A464 adds r0, r5, #0 adds r1, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _0812A454: pop {r4, r5} pop {r0} @@ -613309,15 +613309,15 @@ sub_0812A488: @ 0x0812A488 ldrb r0, [r5] bl CondenseDecorationsInCategory adds r0, r4, #0 - bl sub_081277C4 + bl IdentifyOwnedDecorationsCurrentlyInUseInternal ldr r5, _0812A4E0 ldr r1, _0812A4E4 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _0812A4E8 adds r0, r4, #0 adds r1, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r4, r5} pop {r0} bx r0 @@ -613331,8 +613331,8 @@ _0812A4E4: .4byte gUnknown_85CA829 _0812A4E8: .4byte sub_08127A0C thumb_func_end sub_0812A488 - thumb_func_start sub_0812A4EC -sub_0812A4EC: @ 0x0812A4EC + thumb_func_start Task_FadeToSlotMachine +Task_FadeToSlotMachine: @ 0x0812A4EC push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -613358,7 +613358,7 @@ _0812A510: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -613371,9 +613371,9 @@ _0812A528: cmp r0, #0 bne _0812A540 ldr r0, _0812A54C - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0812A540: add sp, #4 pop {r4, r5} @@ -613381,11 +613381,11 @@ _0812A540: bx r0 .align 2, 0 _0812A548: .4byte gUnknown_2037C74 -_0812A54C: .4byte sub_0812A598 - thumb_func_end sub_0812A4EC +_0812A54C: .4byte CB2_SlotMachineSetup + thumb_func_end Task_FadeToSlotMachine - thumb_func_start sub_0812A550 -sub_0812A550: @ 0x0812A550 + thumb_func_start PlaySlotMachine +PlaySlotMachine: @ 0x0812A550 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 @@ -613393,14 +613393,14 @@ sub_0812A550: @ 0x0812A550 lsrs r4, r4, #0x18 ldr r5, _0812A58C movs r0, #0x68 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] adds r0, r4, #0 adds r1, r6, #0 - bl sub_0812A6E4 + bl PlaySlotMachine_Internal ldr r0, _0812A590 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0812A594 @@ -613415,12 +613415,12 @@ sub_0812A550: @ 0x0812A550 bx r0 .align 2, 0 _0812A58C: .4byte gUnknown_203A800 -_0812A590: .4byte sub_0812A4EC +_0812A590: .4byte Task_FadeToSlotMachine _0812A594: .4byte gUnknown_3005B60 - thumb_func_end sub_0812A550 + thumb_func_end PlaySlotMachine - thumb_func_start sub_0812A598 -sub_0812A598: @ 0x0812A598 + thumb_func_start CB2_SlotMachineSetup +CB2_SlotMachineSetup: @ 0x0812A598 push {lr} sub sp, #4 ldr r0, _0812A5B4 @@ -613452,27 +613452,27 @@ _0812A5BC: @ jump table .4byte _0812A654 @ case 10 .4byte _0812A670 @ case 11 _0812A5EC: - bl sub_0812A760 - bl sub_0812A8D4 + bl SlotMachineSetup_0_0 + bl SlotMachineSetup_0_1 b _0812A65C _0812A5F6: bl SlotMachineSetup_1_0 b _0812A65C _0812A5FC: bl SlotMachineSetup_2_0 - bl sub_0812A844 + bl SlotMachineSetup_2_1 b _0812A65C _0812A606: - bl sub_0812A9BC + bl SlotMachineSetup_3_0 b _0812A65C _0812A60C: - bl sub_0812A9DC + bl SlotMachineSetup_4_0 b _0812A65C _0812A612: - bl sub_0812AA58 + bl SlotMachineSetup_5_0 b _0812A65C _0812A618: - bl sub_0812A7AC + bl ContestEffect_StartleMonsCuteAppeal b _0812A65C _0812A61E: movs r0, #1 @@ -613481,18 +613481,18 @@ _0812A61E: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg b _0812A65C _0812A648: - bl sub_0812FBFC + bl SlotMachineSetup_8_0 b _0812A65C _0812A64E: bl SlotMachineSetup_9_0 @@ -613513,32 +613513,32 @@ _0812A65C: _0812A66C: .4byte gUnknown_3002360 _0812A670: ldr r0, _0812A67C - bl sub_08000540 + bl SetMainCallback2 _0812A676: add sp, #4 pop {r0} bx r0 .align 2, 0 _0812A67C: .4byte sub_0812A680 - thumb_func_end sub_0812A598 + thumb_func_end CB2_SlotMachineSetup thumb_func_start sub_0812A680 sub_0812A680: @ 0x0812A680 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0812A680 - thumb_func_start sub_0812A698 -sub_0812A698: @ 0x0812A698 + thumb_func_start mevent_srv_new_wcard +mevent_srv_new_wcard: @ 0x0812A698 push {r4, lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer ldr r4, _0812A6E0 ldr r0, [r4] @@ -613566,10 +613566,10 @@ sub_0812A698: @ 0x0812A698 bx r0 .align 2, 0 _0812A6E0: .4byte gUnknown_203A800 - thumb_func_end sub_0812A698 + thumb_func_end mevent_srv_new_wcard - thumb_func_start sub_0812A6E4 -sub_0812A6E4: @ 0x0812A6E4 + thumb_func_start PlaySlotMachine_Internal +PlaySlotMachine_Internal: @ 0x0812A6E4 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -613577,7 +613577,7 @@ sub_0812A6E4: @ 0x0812A6E4 lsrs r4, r4, #0x18 ldr r0, _0812A718 movs r1, #0xff - bl sub_080A8878 + bl CreateTask adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -613589,20 +613589,20 @@ sub_0812A6E4: @ 0x0812A6E4 strh r4, [r0, #8] adds r0, #0xa adds r1, r5, #0 - bl sub_0806F100 + bl StoreWordInTwoHalfwords pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0812A718: .4byte sub_0812A75C _0812A71C: .4byte gUnknown_3005B60 - thumb_func_end sub_0812A6E4 + thumb_func_end PlaySlotMachine_Internal thumb_func_start sub_0812A720 sub_0812A720: @ 0x0812A720 push {lr} ldr r0, _0812A750 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #2 @@ -613618,7 +613618,7 @@ sub_0812A720: @ 0x0812A720 ldr r1, [r3] adds r1, #0x64 adds r0, r2, #0 - bl sub_0806F108 + bl LoadWordFromTwoHalfwords pop {r0} bx r0 .align 2, 0 @@ -613633,14 +613633,14 @@ sub_0812A75C: @ 0x0812A75C .align 2, 0 thumb_func_end sub_0812A75C - thumb_func_start sub_0812A760 -sub_0812A760: @ 0x0812A760 + thumb_func_start SlotMachineSetup_0_0 +SlotMachineSetup_0_0: @ 0x0812A760 push {lr} sub sp, #4 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 str r0, [sp] movs r1, #0xc0 @@ -613655,7 +613655,7 @@ sub_0812A760: @ 0x0812A760 movs r2, #4 bl InitBgsFromTemplates ldr r0, _0812A7A8 - bl sub_08003090 + bl InitWindows bl sub_08004480 add sp, #4 pop {r0} @@ -613664,13 +613664,13 @@ sub_0812A760: @ 0x0812A760 _0812A7A0: .4byte 0x05006000 _0812A7A4: .4byte gUnknown_85843A8 _0812A7A8: .4byte gUnknown_85843B8 - thumb_func_end sub_0812A760 + thumb_func_end SlotMachineSetup_0_0 - thumb_func_start sub_0812A7AC -sub_0812A7AC: @ 0x0812A7AC + thumb_func_start ContestEffect_StartleMonsCuteAppeal +ContestEffect_StartleMonsCuteAppeal: @ 0x0812A7AC push {lr} ldr r0, _0812A7C8 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 bl EnableInterrupts movs r1, #0xc1 @@ -613680,8 +613680,8 @@ sub_0812A7AC: @ 0x0812A7AC pop {r0} bx r0 .align 2, 0 -_0812A7C8: .4byte sub_0812A698 - thumb_func_end sub_0812A7AC +_0812A7C8: .4byte mevent_srv_new_wcard + thumb_func_end ContestEffect_StartleMonsCuteAppeal thumb_func_start SlotMachineSetup_1_0 SlotMachineSetup_1_0: @ 0x0812A7CC @@ -613750,8 +613750,8 @@ _0812A83C: .4byte 0x040000D4 _0812A840: .4byte 0x81000200 thumb_func_end SlotMachineSetup_2_0 - thumb_func_start sub_0812A844 -sub_0812A844: @ 0x0812A844 + thumb_func_start SlotMachineSetup_2_1 +SlotMachineSetup_2_1: @ 0x0812A844 push {lr} movs r0, #8 movs r1, #0 @@ -613806,10 +613806,10 @@ sub_0812A844: @ 0x0812A844 .align 2, 0 _0812A8CC: .4byte 0x00001048 _0812A8D0: .4byte 0x00000809 - thumb_func_end sub_0812A844 + thumb_func_end SlotMachineSetup_2_1 - thumb_func_start sub_0812A8D4 -sub_0812A8D4: @ 0x0812A8D4 + thumb_func_start SlotMachineSetup_0_1 +SlotMachineSetup_0_1: @ 0x0812A8D4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -613909,7 +613909,7 @@ _0812A944: bl GetCoins lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080EE990 + bl AlertTVThatPlayerPlayedSlotMachine pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -613918,10 +613918,10 @@ _0812A944: .align 2, 0 _0812A9B4: .4byte gUnknown_203A800 _0812A9B8: .4byte gUnknown_8584638 - thumb_func_end sub_0812A8D4 + thumb_func_end SlotMachineSetup_0_1 - thumb_func_start sub_0812A9BC -sub_0812A9BC: @ 0x0812A9BC + thumb_func_start SlotMachineSetup_3_0 +SlotMachineSetup_3_0: @ 0x0812A9BC push {lr} bl ResetPaletteFade bl ResetSpriteData @@ -613929,15 +613929,15 @@ sub_0812A9BC: @ 0x0812A9BC movs r0, #0x80 strb r0, [r1] bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks pop {r0} bx r0 .align 2, 0 _0812A9D8: .4byte gUnknown_2021AB4 - thumb_func_end sub_0812A9BC + thumb_func_end SlotMachineSetup_3_0 - thumb_func_start sub_0812A9DC -sub_0812A9DC: @ 0x0812A9DC + thumb_func_start SlotMachineSetup_4_0 +SlotMachineSetup_4_0: @ 0x0812A9DC push {r4, r5, lr} ldr r4, _0812AA30 movs r0, #8 @@ -613945,11 +613945,11 @@ sub_0812A9DC: @ 0x0812A9DC str r0, [r4] ldr r4, _0812AA34 movs r0, #0xe - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r5, _0812AA38 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] ldr r1, [r4] ldr r2, _0812AA3C @@ -613988,29 +613988,29 @@ _0812AA48: .4byte 0x00002861 _0812AA4C: .4byte 0x000020BE _0812AA50: .4byte 0x000028BE _0812AA54: .4byte 0x000020BF - thumb_func_end sub_0812A9DC + thumb_func_end SlotMachineSetup_4_0 - thumb_func_start sub_0812AA58 -sub_0812AA58: @ 0x0812AA58 + thumb_func_start SlotMachineSetup_5_0 +SlotMachineSetup_5_0: @ 0x0812AA58 push {lr} - bl sub_0812F918 + bl Anim_SwordsDanceBlade bl sub_0812F968 bl sub_0812F7F4 movs r1, #0x80 lsls r1, r1, #2 movs r0, #0 movs r2, #0xf0 - bl sub_08098104 + bl LoadMessageBoxGfx movs r1, #0x85 lsls r1, r1, #2 movs r0, #0 movs r2, #0xe0 bl LoadUserWindowBorderGfx movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap pop {r0} bx r0 - thumb_func_end sub_0812AA58 + thumb_func_end SlotMachineSetup_5_0 thumb_func_start SlotMachineSetup_10_0 SlotMachineSetup_10_0: @ 0x0812AA88 @@ -614027,8 +614027,8 @@ SlotMachineSetup_10_0: @ 0x0812AA88 thumb_func_start SlotMachineSetupGameplayTasks SlotMachineSetupGameplayTasks: @ 0x0812AAA0 push {lr} - bl sub_0812D198 - bl sub_0812BE6C + bl GameplayTask_PikaPower + bl GameplayTask_StopSlotReel bl sub_0812DEA4 bl sub_0812AAB8 pop {r0} @@ -614042,7 +614042,7 @@ sub_0812AAB8: @ 0x0812AAB8 ldr r4, _0812AAD4 adds r0, r4, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -614050,11 +614050,11 @@ sub_0812AAB8: @ 0x0812AAB8 pop {r0} bx r0 .align 2, 0 -_0812AAD4: .4byte sub_0812AAD8 +_0812AAD4: .4byte RunSlotActions thumb_func_end sub_0812AAB8 - thumb_func_start sub_0812AAD8 -sub_0812AAD8: @ 0x0812AAD8 + thumb_func_start RunSlotActions +RunSlotActions: @ 0x0812AAD8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -614082,10 +614082,10 @@ _0812AAE8: _0812AB08: .4byte gUnknown_85843D4 _0812AB0C: .4byte gUnknown_3005B60 _0812AB10: .4byte gUnknown_203A800 - thumb_func_end sub_0812AAD8 + thumb_func_end RunSlotActions - thumb_func_start sub_0812AB14 -sub_0812AB14: @ 0x0812AB14 + thumb_func_start SlotAction_UnfadeScreen +SlotAction_UnfadeScreen: @ 0x0812AB14 push {r4, lr} sub sp, #4 movs r0, #1 @@ -614094,7 +614094,7 @@ sub_0812AB14: @ 0x0812AB14 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r4, _0812AB44 ldr r0, [r4] ldrb r0, [r0, #2] @@ -614110,7 +614110,7 @@ sub_0812AB14: @ 0x0812AB14 bx r1 .align 2, 0 _0812AB44: .4byte gUnknown_203A800 - thumb_func_end sub_0812AB14 + thumb_func_end SlotAction_UnfadeScreen thumb_func_start SlotAction_WaitForUnfade SlotAction_WaitForUnfade: @ 0x0812AB48 @@ -614135,8 +614135,8 @@ _0812AB68: .4byte gUnknown_2037C74 _0812AB6C: .4byte gUnknown_203A800 thumb_func_end SlotAction_WaitForUnfade - thumb_func_start sub_0812AB70 -sub_0812AB70: @ 0x0812AB70 + thumb_func_start SlotAction_SetSlotMachineVars +SlotAction_SetSlotMachineVars: @ 0x0812AB70 push {lr} ldr r3, _0812AB9C ldr r1, [r3] @@ -614174,7 +614174,7 @@ _0812ABB0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0812AB70 + thumb_func_end SlotAction_SetSlotMachineVars thumb_func_start SlotAction3 SlotAction3: @ 0x0812ABB8 @@ -614221,8 +614221,8 @@ _0812AC00: .4byte gUnknown_203A800 _0812AC04: .4byte 0x0000270E thumb_func_end SlotAction4 - thumb_func_start sub_0812AC08 -sub_0812AC08: @ 0x0812AC08 + thumb_func_start SlotAction_AwaitPlayerInput +SlotAction_AwaitPlayerInput: @ 0x0812AC08 push {r4, r5, lr} ldr r0, _0812AC24 ldrh r1, [r0, #0x2e] @@ -614231,7 +614231,7 @@ sub_0812AC08: @ 0x0812AC08 cmp r0, #0 beq _0812AC2C movs r0, #0 - bl sub_0812DC90 + bl OpenInfoBox ldr r0, _0812AC28 ldr r1, [r0] movs r0, #8 @@ -614352,7 +614352,7 @@ _0812ACF4: .align 2, 0 _0812ACFC: .4byte gUnknown_203A800 _0812AD00: .4byte gUnknown_3002360 - thumb_func_end sub_0812AC08 + thumb_func_end SlotAction_AwaitPlayerInput thumb_func_start sub_0812AD04 sub_0812AD04: @ 0x0812AD04 @@ -614372,7 +614372,7 @@ sub_0812AD04: @ 0x0812AD04 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0812AD40 ldr r1, [r0] movs r0, #7 @@ -614430,8 +614430,8 @@ _0812AD84: _0812AD8C: .4byte gUnknown_203A800 thumb_func_end SlotAction_GivingInformation - thumb_func_start sub_0812AD90 -sub_0812AD90: @ 0x0812AD90 + thumb_func_start SlotAction9 +SlotAction9: @ 0x0812AD90 push {r4, lr} adds r4, r0, #0 bl DrawLuckyFlags @@ -614452,7 +614452,7 @@ sub_0812AD90: @ 0x0812AD90 ands r0, r1 cmp r0, #0 beq _0812ADD4 - bl sub_0812D4BC + bl BeginReeltime ldr r1, [r4] movs r0, #0xa b _0812ADDE @@ -614472,7 +614472,7 @@ _0812ADDE: ldrb r0, [r0, #0xa] cmp r0, #0 beq _0812ADF6 - bl sub_0812B79C + bl SlowReelSpeed ldr r1, [r4] strh r0, [r1, #0x1a] _0812ADF6: @@ -614482,7 +614482,7 @@ _0812ADF6: bx r1 .align 2, 0 _0812AE00: .4byte gUnknown_203A800 - thumb_func_end sub_0812AD90 + thumb_func_end SlotAction9 thumb_func_start SlotAction10 SlotAction10: @ 0x0812AE04 @@ -614533,8 +614533,8 @@ _0812AE50: _0812AE58: .4byte gUnknown_203A800 thumb_func_end SlotAction_SetLuckySpins - thumb_func_start sub_0812AE5C -sub_0812AE5C: @ 0x0812AE5C + thumb_func_start SlotAction_AwaitReelStop +SlotAction_AwaitReelStop: @ 0x0812AE5C push {r4, lr} ldr r0, _0812AE90 ldrh r1, [r0, #0x2e] @@ -614562,10 +614562,10 @@ _0812AE88: .align 2, 0 _0812AE90: .4byte gUnknown_3002360 _0812AE94: .4byte gUnknown_203A800 - thumb_func_end sub_0812AE5C + thumb_func_end SlotAction_AwaitReelStop - thumb_func_start sub_0812AE98 -sub_0812AE98: @ 0x0812AE98 + thumb_func_start SlotAction_WaitForAllReelsToStop +SlotAction_WaitForAllReelsToStop: @ 0x0812AE98 push {r4, lr} ldr r4, _0812AEC8 ldr r0, [r4] @@ -614598,10 +614598,10 @@ _0812AECE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0812AE98 + thumb_func_end SlotAction_WaitForAllReelsToStop - thumb_func_start sub_0812AED4 -sub_0812AED4: @ 0x0812AED4 + thumb_func_start SlotAction_CheckMatches +SlotAction_CheckMatches: @ 0x0812AED4 push {r4, lr} ldr r4, _0812AF40 ldr r2, [r4] @@ -614627,7 +614627,7 @@ _0812AEFA: beq _0812AFDC movs r0, #0xf strb r0, [r1] - bl sub_0812BACC + bl AwardPayout bl sub_0812D0C0 ldr r2, [r4] ldrh r0, [r2, #0x10] @@ -614648,7 +614648,7 @@ _0812AF22: cmp r0, #0 beq _0812AF48 ldr r0, _0812AF44 - bl sub_080A29AC + bl PlayFanfare movs r0, #6 bl sub_0812DEF4 b _0812AF72 @@ -614661,7 +614661,7 @@ _0812AF48: cmp r0, #0 beq _0812AF64 ldr r0, _0812AF60 - bl sub_080A29AC + bl PlayFanfare movs r0, #5 bl sub_0812DEF4 b _0812AF72 @@ -614670,7 +614670,7 @@ _0812AF60: .4byte 0x00000185 _0812AF64: movs r0, #0xc3 lsls r0, r0, #1 - bl sub_080A29AC + bl PlayFanfare movs r0, #2 bl sub_0812DEF4 _0812AF72: @@ -614750,7 +614750,7 @@ _0812AFFE: bx r1 .align 2, 0 _0812B008: .4byte 0x0000270F - thumb_func_end sub_0812AED4 + thumb_func_end SlotAction_CheckMatches thumb_func_start SlotAction_WaitForPayoutToBeAwarded SlotAction_WaitForPayoutToBeAwarded: @ 0x0812B00C @@ -614771,8 +614771,8 @@ _0812B020: _0812B028: .4byte gUnknown_203A800 thumb_func_end SlotAction_WaitForPayoutToBeAwarded - thumb_func_start sub_0812B02C -sub_0812B02C: @ 0x0812B02C + thumb_func_start SlotAction_EndOfRoll +SlotAction_EndOfRoll: @ 0x0812B02C push {r4, lr} bl sub_0812D0F0 lsls r0, r0, #0x18 @@ -614834,7 +614834,7 @@ _0812B098: bx r1 .align 2, 0 _0812B0A0: .4byte gUnknown_203A800 - thumb_func_end sub_0812B02C + thumb_func_end SlotAction_EndOfRoll thumb_func_start SlotAction_MatchedPower SlotAction_MatchedPower: @ 0x0812B0A4 @@ -614945,8 +614945,8 @@ _0812B15E: _0812B164: .4byte gUnknown_203A800 thumb_func_end SlotAction_NoMatches - thumb_func_start sub_0812B168 -sub_0812B168: @ 0x0812B168 + thumb_func_start SlotAction_PrintQuitTheGame +SlotAction_PrintQuitTheGame: @ 0x0812B168 push {lr} sub sp, #0xc movs r0, #0 @@ -614963,7 +614963,7 @@ sub_0812B168: @ 0x0812B168 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r2, #0x85 lsls r2, r2, #2 movs r3, #0xca @@ -614974,7 +614974,7 @@ sub_0812B168: @ 0x0812B168 str r0, [sp, #4] movs r0, #0x15 movs r1, #7 - bl sub_080320C4 + bl CreateYesNoMenuParameterized ldr r0, _0812B1BC ldr r1, [r0] movs r0, #0x16 @@ -614986,10 +614986,10 @@ sub_0812B168: @ 0x0812B168 .align 2, 0 _0812B1B8: .4byte gUnknown_8588606 _0812B1BC: .4byte gUnknown_203A800 - thumb_func_end sub_0812B168 + thumb_func_end SlotAction_PrintQuitTheGame - thumb_func_start sub_0812B1C0 -sub_0812B1C0: @ 0x0812B1C0 + thumb_func_start SlotAction_SeeIfPlayerQuits +SlotAction_SeeIfPlayerQuits: @ 0x0812B1C0 push {lr} bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, r0, #0x18 @@ -615037,7 +615037,7 @@ _0812B218: bx r1 .align 2, 0 _0812B220: .4byte gUnknown_203A800 - thumb_func_end sub_0812B1C0 + thumb_func_end SlotAction_SeeIfPlayerQuits thumb_func_start sub_0812B224 sub_0812B224: @ 0x0812B224 @@ -615057,7 +615057,7 @@ sub_0812B224: @ 0x0812B224 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0812B260 ldr r1, [r0] movs r0, #0x18 @@ -615096,8 +615096,8 @@ _0812B288: .4byte gUnknown_3002360 _0812B28C: .4byte gUnknown_203A800 thumb_func_end sub_0812B264 - thumb_func_start sub_0812B290 -sub_0812B290: @ 0x0812B290 + thumb_func_start SlotAction_PrintMessage_NoMoreCoins +SlotAction_PrintMessage_NoMoreCoins: @ 0x0812B290 push {lr} sub sp, #0xc movs r0, #0 @@ -615114,7 +615114,7 @@ sub_0812B290: @ 0x0812B290 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0812B2CC ldr r1, [r0] movs r0, #0x1a @@ -615126,7 +615126,7 @@ sub_0812B290: @ 0x0812B290 .align 2, 0 _0812B2C8: .4byte gUnknown_8588627 _0812B2CC: .4byte gUnknown_203A800 - thumb_func_end sub_0812B290 + thumb_func_end SlotAction_PrintMessage_NoMoreCoins thumb_func_start sub_0812B2D0 sub_0812B2D0: @ 0x0812B2D0 @@ -615153,8 +615153,8 @@ _0812B2F4: .4byte gUnknown_3002360 _0812B2F8: .4byte gUnknown_203A800 thumb_func_end sub_0812B2D0 - thumb_func_start sub_0812B2FC -sub_0812B2FC: @ 0x0812B2FC + thumb_func_start SlotAction_EndGame +SlotAction_EndGame: @ 0x0812B2FC push {r4, lr} sub sp, #4 ldr r4, _0812B338 @@ -615164,14 +615164,14 @@ sub_0812B2FC: @ 0x0812B2FC bl GetCoins lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080EE898 + bl AlertTVOfNewCoinTotal movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r4] ldrb r0, [r1] adds r0, #1 @@ -615183,10 +615183,10 @@ sub_0812B2FC: @ 0x0812B2FC bx r1 .align 2, 0 _0812B338: .4byte gUnknown_203A800 - thumb_func_end sub_0812B2FC + thumb_func_end SlotAction_EndGame - thumb_func_start sub_0812B33C -sub_0812B33C: @ 0x0812B33C + thumb_func_start SlotAction_FreeDataStructures +SlotAction_FreeDataStructures: @ 0x0812B33C push {r4, r5, r6, lr} ldr r0, _0812B488 ldrb r1, [r0, #7] @@ -615201,129 +615201,129 @@ _0812B350: ldr r6, _0812B48C ldr r0, [r6] ldr r0, [r0, #0x64] - bl sub_08000540 + bl SetMainCallback2 ldr r4, _0812B490 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B494 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B498 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B49C ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4A0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4A4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4A8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4AC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4B0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4B4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4B8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4BC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4C0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4C4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4C8 ldr r0, [r4] cmp r0, #0 beq _0812B3F4 - bl sub_08000BF0 + bl Free str r5, [r4] _0812B3F4: ldr r4, _0812B4CC ldr r0, [r4] cmp r0, #0 beq _0812B402 - bl sub_08000BF0 + bl Free str r5, [r4] _0812B402: ldr r4, _0812B4D0 ldr r0, [r4] cmp r0, #0 beq _0812B410 - bl sub_08000BF0 + bl Free str r5, [r4] _0812B410: ldr r4, _0812B4D4 ldr r0, [r4] cmp r0, #0 beq _0812B41E - bl sub_08000BF0 + bl Free str r5, [r4] _0812B41E: ldr r4, _0812B4D8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4DC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4E0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4E4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4E8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4EC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4F0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4F4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0812B4F8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r0, [r6] - bl sub_08000BF0 + bl Free str r5, [r6] _0812B480: movs r0, #0 @@ -615360,7 +615360,7 @@ _0812B4EC: .4byte gUnknown_203A7A8 _0812B4F0: .4byte gUnknown_203A7AC _0812B4F4: .4byte gUnknown_203A7F8 _0812B4F8: .4byte gUnknown_203A7FC - thumb_func_end sub_0812B33C + thumb_func_end SlotAction_FreeDataStructures thumb_func_start DrawLuckyFlags DrawLuckyFlags: @ 0x0812B4FC @@ -615375,11 +615375,11 @@ DrawLuckyFlags: @ 0x0812B4FC ands r0, r1 cmp r0, #0 bne _0812B55A - bl sub_0812B5C0 + bl IsThisRoundLucky lsls r0, r0, #0x18 cmp r0, #0 beq _0812B53C - bl sub_0812B5FC + bl AttemptsAtLuckyFlags_Top3 lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #3 @@ -615395,7 +615395,7 @@ DrawLuckyFlags: @ 0x0812B4FC cmp r3, #1 bne _0812B55A _0812B53C: - bl sub_0812B644 + bl AttemptsAtLuckyFlags_NotTop3 lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #5 @@ -615439,8 +615439,8 @@ _0812B582: _0812B588: .4byte gUnknown_203A800 thumb_func_end SetLuckySpins - thumb_func_start sub_0812B58C -sub_0812B58C: @ 0x0812B58C + thumb_func_start GetBiasTag +GetBiasTag: @ 0x0812B58C push {r4, lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -615469,10 +615469,10 @@ _0812B5BA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0812B58C + thumb_func_end GetBiasTag - thumb_func_start sub_0812B5C0 -sub_0812B5C0: @ 0x0812B5C0 + thumb_func_start IsThisRoundLucky +IsThisRoundLucky: @ 0x0812B5C0 push {r4, lr} bl Random lsls r0, r0, #0x18 @@ -615502,10 +615502,10 @@ _0812B5F6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0812B5C0 + thumb_func_end IsThisRoundLucky - thumb_func_start sub_0812B5FC -sub_0812B5FC: @ 0x0812B5FC + thumb_func_start AttemptsAtLuckyFlags_Top3 +AttemptsAtLuckyFlags_Top3: @ 0x0812B5FC push {r4, r5, r6, lr} movs r5, #0 ldr r6, _0812B63C @@ -615541,10 +615541,10 @@ _0812B630: .align 2, 0 _0812B63C: .4byte gUnknown_8584656 _0812B640: .4byte gUnknown_203A800 - thumb_func_end sub_0812B5FC + thumb_func_end AttemptsAtLuckyFlags_Top3 - thumb_func_start sub_0812B644 -sub_0812B644: @ 0x0812B644 + thumb_func_start AttemptsAtLuckyFlags_NotTop3 +AttemptsAtLuckyFlags_NotTop3: @ 0x0812B644 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -615621,10 +615621,10 @@ _0812B6C4: .align 2, 0 _0812B6D4: .4byte gUnknown_203A800 _0812B6D8: .4byte 0xFFF60000 - thumb_func_end sub_0812B644 + thumb_func_end AttemptsAtLuckyFlags_NotTop3 - thumb_func_start sub_0812B6DC -sub_0812B6DC: @ 0x0812B6DC + thumb_func_start GetReelTimeProbability +GetReelTimeProbability: @ 0x0812B6DC push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -615651,10 +615651,10 @@ _0812B6FA: bx r1 .align 2, 0 _0812B70C: .4byte gUnknown_8584686 - thumb_func_end sub_0812B6DC + thumb_func_end GetReelTimeProbability - thumb_func_start sub_0812B710 -sub_0812B710: @ 0x0812B710 + thumb_func_start GetReeltimeDraw +GetReeltimeDraw: @ 0x0812B710 push {r4, r5, r6, lr} ldr r0, _0812B734 ldr r1, [r0] @@ -615664,7 +615664,7 @@ sub_0812B710: @ 0x0812B710 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0 - bl sub_0812B6DC + bl GetReelTimeProbability lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -615687,7 +615687,7 @@ _0812B73E: lsrs r4, r0, #0x18 lsls r0, r6, #0x18 lsrs r0, r0, #0x18 - bl sub_0812B6DC + bl GetReelTimeProbability lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -615702,10 +615702,10 @@ _0812B764: bx r0 .align 2, 0 _0812B76C: .4byte gUnknown_203A800 - thumb_func_end sub_0812B710 + thumb_func_end GetReeltimeDraw - thumb_func_start sub_0812B770 -sub_0812B770: @ 0x0812B770 + thumb_func_start SkipToReeltimeAction14 +SkipToReeltimeAction14: @ 0x0812B770 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 @@ -615729,10 +615729,10 @@ _0812B796: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0812B770 + thumb_func_end SkipToReeltimeAction14 - thumb_func_start sub_0812B79C -sub_0812B79C: @ 0x0812B79C + thumb_func_start SlowReelSpeed +SlowReelSpeed: @ 0x0812B79C push {r4, r5, lr} movs r4, #0 ldr r0, _0812B7B4 @@ -615811,7 +615811,7 @@ _0812B832: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0812B79C + thumb_func_end SlowReelSpeed thumb_func_start CheckMatch CheckMatch: @ 0x0812B838 @@ -615847,25 +615847,25 @@ CheckMatch_CenterRow: @ 0x0812B86C push {r4, r5, lr} movs r0, #0 movs r1, #2 - bl sub_0812BC54 + bl GetNearbyTag_Quantized adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 movs r0, #1 movs r1, #2 - bl sub_0812BC54 + bl GetNearbyTag_Quantized adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #2 movs r1, #2 - bl sub_0812BC54 + bl GetNearbyTag_Quantized adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0812BA7C + bl GetMatchFromSymbolsInRow lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #9 @@ -615902,22 +615902,22 @@ CheckMatch_TopAndBottom: @ 0x0812B8E0 push {r4, r5, lr} movs r0, #0 movs r1, #1 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #1 movs r1, #1 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #2 movs r1, #1 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0812BA7C + bl GetMatchFromSymbolsInRow lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #9 @@ -615946,22 +615946,22 @@ _0812B91C: _0812B940: movs r0, #0 movs r1, #3 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #1 movs r1, #3 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #2 movs r1, #3 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0812BA7C + bl GetMatchFromSymbolsInRow lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #9 @@ -616002,22 +616002,22 @@ CheckMatch_Diagonals: @ 0x0812B9B0 push {r4, r5, lr} movs r0, #0 movs r1, #1 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #1 movs r1, #2 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #2 movs r1, #3 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0812BA7C + bl GetMatchFromSymbolsInRow lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #9 @@ -616045,22 +616045,22 @@ _0812BA08: _0812BA0E: movs r0, #0 movs r1, #3 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #1 movs r1, #2 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #2 movs r1, #1 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r0, r5, #0 adds r1, r4, #0 - bl sub_0812BA7C + bl GetMatchFromSymbolsInRow lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #9 @@ -616095,8 +616095,8 @@ _0812BA74: .4byte gUnknown_85847AC _0812BA78: .4byte gUnknown_858479A thumb_func_end CheckMatch_Diagonals - thumb_func_start sub_0812BA7C -sub_0812BA7C: @ 0x0812BA7C + thumb_func_start GetMatchFromSymbolsInRow +GetMatchFromSymbolsInRow: @ 0x0812BA7C push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -616142,15 +616142,15 @@ _0812BAC6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0812BA7C + thumb_func_end GetMatchFromSymbolsInRow - thumb_func_start sub_0812BACC -sub_0812BACC: @ 0x0812BACC + thumb_func_start AwardPayout +AwardPayout: @ 0x0812BACC push {r4, lr} ldr r4, _0812BAE8 adds r0, r4, #0 movs r1, #4 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -616159,13 +616159,13 @@ sub_0812BACC: @ 0x0812BACC bx r0 .align 2, 0 _0812BAE8: .4byte sub_0812BB0C - thumb_func_end sub_0812BACC + thumb_func_end AwardPayout thumb_func_start sub_0812BAEC sub_0812BAEC: @ 0x0812BAEC push {lr} ldr r0, _0812BB00 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -616212,8 +616212,8 @@ _0812BB3C: .4byte gUnknown_8584448 _0812BB40: .4byte gUnknown_3005B60 thumb_func_end sub_0812BB0C - thumb_func_start sub_0812BB44 -sub_0812BB44: @ 0x0812BB44 + thumb_func_start AwardPayoutAction0 +AwardPayoutAction0: @ 0x0812BB44 push {r4, lr} adds r4, r0, #0 bl sub_0812CF7C @@ -616241,10 +616241,10 @@ _0812BB72: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0812BB44 + thumb_func_end AwardPayoutAction0 - thumb_func_start sub_0812BB78 -sub_0812BB78: @ 0x0812BB78 + thumb_func_start AwardPayoutAction_GivePayoutToPlayer +AwardPayoutAction_GivePayoutToPlayer: @ 0x0812BB78 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0xa] @@ -616256,7 +616256,7 @@ sub_0812BB78: @ 0x0812BB78 rsbs r1, r1, #0 cmp r0, r1 bne _0812BBCC - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _0812BB9E @@ -616288,7 +616288,7 @@ _0812BBB8: movs r0, #4 strh r0, [r4, #0xa] _0812BBCC: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _0812BC06 @@ -616336,30 +616336,30 @@ _0812BC20: .4byte gUnknown_203A800 _0812BC24: .4byte 0x0000270E _0812BC28: .4byte gUnknown_3002360 _0812BC2C: .4byte 0x0000270F - thumb_func_end sub_0812BB78 + thumb_func_end AwardPayoutAction_GivePayoutToPlayer - thumb_func_start sub_0812BC30 -sub_0812BC30: @ 0x0812BC30 + thumb_func_start AwardPayoutAction_FreeTask +AwardPayoutAction_FreeTask: @ 0x0812BC30 push {lr} bl sub_0812CFC8 lsls r0, r0, #0x18 cmp r0, #0 beq _0812BC4A ldr r0, _0812BC50 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0812BC4A: movs r0, #0 pop {r1} bx r1 .align 2, 0 _0812BC50: .4byte sub_0812BB0C - thumb_func_end sub_0812BC30 + thumb_func_end AwardPayoutAction_FreeTask - thumb_func_start sub_0812BC54 -sub_0812BC54: @ 0x0812BC54 + thumb_func_start GetNearbyTag_Quantized +GetNearbyTag_Quantized: @ 0x0812BC54 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -616401,10 +616401,10 @@ _0812BC86: .align 2, 0 _0812BCA0: .4byte gUnknown_203A800 _0812BCA4: .4byte gUnknown_85845F2 - thumb_func_end sub_0812BC54 + thumb_func_end GetNearbyTag_Quantized - thumb_func_start sub_0812BCA8 -sub_0812BCA8: @ 0x0812BCA8 + thumb_func_start GetNearbyTag +GetNearbyTag: @ 0x0812BCA8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -616434,7 +616434,7 @@ _0812BCD2: lsls r1, r1, #0x10 asrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5, r6} @@ -616443,10 +616443,10 @@ _0812BCD2: .align 2, 0 _0812BCF0: .4byte gUnknown_203A800 _0812BCF4: .4byte 0x0000FFFF - thumb_func_end sub_0812BCA8 + thumb_func_end GetNearbyTag - thumb_func_start sub_0812BCF8 -sub_0812BCF8: @ 0x0812BCF8 + thumb_func_start GetNearbyReelTimeTag +GetNearbyReelTimeTag: @ 0x0812BCF8 push {lr} ldr r1, _0812BD30 ldr r1, [r1] @@ -616477,10 +616477,10 @@ _0812BD20: .align 2, 0 _0812BD30: .4byte gUnknown_203A800 _0812BD34: .4byte gUnknown_8584631 - thumb_func_end sub_0812BCF8 + thumb_func_end GetNearbyReelTimeTag - thumb_func_start sub_0812BD38 -sub_0812BD38: @ 0x0812BD38 + thumb_func_start AdvanceSlotReel +AdvanceSlotReel: @ 0x0812BD38 push {r4, r5, r6, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -616515,10 +616515,10 @@ sub_0812BD38: @ 0x0812BD38 bx r0 .align 2, 0 _0812BD7C: .4byte gUnknown_203A800 - thumb_func_end sub_0812BD38 + thumb_func_end AdvanceSlotReel - thumb_func_start sub_0812BD80 -sub_0812BD80: @ 0x0812BD80 + thumb_func_start AdvanceSlotReelToNextTag +AdvanceSlotReelToNextTag: @ 0x0812BD80 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -616549,7 +616549,7 @@ _0812BDB6: lsls r1, r4, #0x10 asrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_0812BD38 + bl AdvanceSlotReel ldr r0, [r7] adds r0, #0x1c adds r0, r0, r6 @@ -616567,10 +616567,10 @@ _0812BDD4: bx r1 .align 2, 0 _0812BDE0: .4byte gUnknown_203A800 - thumb_func_end sub_0812BD80 + thumb_func_end AdvanceSlotReelToNextTag - thumb_func_start sub_0812BDE4 -sub_0812BDE4: @ 0x0812BDE4 + thumb_func_start AdvanceReeltimeReel +AdvanceReeltimeReel: @ 0x0812BDE4 push {r4, lr} ldr r1, _0812BE18 ldr r4, [r1] @@ -616596,10 +616596,10 @@ sub_0812BDE4: @ 0x0812BDE4 bx r0 .align 2, 0 _0812BE18: .4byte gUnknown_203A800 - thumb_func_end sub_0812BDE4 + thumb_func_end AdvanceReeltimeReel - thumb_func_start sub_0812BE1C -sub_0812BE1C: @ 0x0812BE1C + thumb_func_start AdvanceReeltimeReelToNextTag +AdvanceReeltimeReelToNextTag: @ 0x0812BE1C push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -616623,7 +616623,7 @@ sub_0812BE1C: @ 0x0812BE1C _0812BE46: lsls r0, r4, #0x10 asrs r0, r0, #0x10 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldr r0, [r5] movs r1, #0x14 ldrsh r0, [r0, r1] @@ -616639,10 +616639,10 @@ _0812BE5E: bx r1 .align 2, 0 _0812BE68: .4byte gUnknown_203A800 - thumb_func_end sub_0812BE1C + thumb_func_end AdvanceReeltimeReelToNextTag - thumb_func_start sub_0812BE6C -sub_0812BE6C: @ 0x0812BE6C + thumb_func_start GameplayTask_StopSlotReel +GameplayTask_StopSlotReel: @ 0x0812BE6C push {r4, r5, r6, lr} movs r4, #0 ldr r5, _0812BEA8 @@ -616650,7 +616650,7 @@ sub_0812BE6C: @ 0x0812BE6C _0812BE74: adds r0, r5, #0 movs r1, #2 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -616676,7 +616676,7 @@ _0812BE74: _0812BEA8: .4byte sub_0812BF3C _0812BEAC: .4byte gUnknown_3005B60 _0812BEB0: .4byte gUnknown_203A800 - thumb_func_end sub_0812BE6C + thumb_func_end GameplayTask_StopSlotReel thumb_func_start ReelTasks_SetUnkTaskData ReelTasks_SetUnkTaskData: @ 0x0812BEB4 @@ -616800,7 +616800,7 @@ SlotReelAction_Spin: @ 0x0812BF78 ldr r1, [r1] movs r2, #0x1a ldrsh r1, [r1, r2] - bl sub_0812BD38 + bl AdvanceSlotReel movs r0, #0 pop {r1} bx r1 @@ -616808,8 +616808,8 @@ SlotReelAction_Spin: @ 0x0812BF78 _0812BF94: .4byte gUnknown_203A800 thumb_func_end SlotReelAction_Spin - thumb_func_start sub_0812BF98 -sub_0812BF98: @ 0x0812BF98 + thumb_func_start SlotReelAction_DecideWhereToStop +SlotReelAction_DecideWhereToStop: @ 0x0812BF98 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #8] @@ -616881,10 +616881,10 @@ _0812C004: _0812C020: .4byte gUnknown_203A800 _0812C024: .4byte gUnknown_8584468 _0812C028: .4byte gUnknown_8584474 - thumb_func_end sub_0812BF98 + thumb_func_end SlotReelAction_DecideWhereToStop - thumb_func_start sub_0812C02C -sub_0812C02C: @ 0x0812C02C + thumb_func_start SlotReelAction_MoveToStop +SlotReelAction_MoveToStop: @ 0x0812C02C push {r4, r5, r6, r7, lr} sub sp, #0xc adds r4, r0, #0 @@ -616913,7 +616913,7 @@ sub_0812C02C: @ 0x0812C02C lsrs r0, r0, #0x18 movs r6, #0x1a ldrsh r1, [r5, r6] - bl sub_0812BD80 + bl AdvanceSlotReelToNextTag b _0812C0B0 .align 2, 0 _0812C070: .4byte gUnknown_8584480 @@ -616934,7 +616934,7 @@ _0812C078: lsrs r0, r0, #0x18 movs r2, #0x1a ldrsh r1, [r5, r2] - bl sub_0812BD38 + bl AdvanceSlotReel ldr r1, [r7] movs r6, #0x26 ldrsh r0, [r4, r6] @@ -616980,7 +616980,7 @@ _0812C0E2: bx r1 .align 2, 0 _0812C0EC: .4byte gUnknown_203A800 - thumb_func_end sub_0812C02C + thumb_func_end SlotReelAction_MoveToStop thumb_func_start SlotReelAction_OscillatingStop SlotReelAction_OscillatingStop: @ 0x0812C0F0 @@ -617031,13 +617031,13 @@ _0812C13A: _0812C144: .4byte gUnknown_203A800 thumb_func_end SlotReelAction_OscillatingStop - thumb_func_start sub_0812C148 -sub_0812C148: @ 0x0812C148 + thumb_func_start DecideReelTurns_BiasTag_Reel1 +DecideReelTurns_BiasTag_Reel1: @ 0x0812C148 push {r4, r5, lr} ldr r4, _0812C18C ldr r0, [r4] ldrb r0, [r0, #4] - bl sub_0812B58C + bl GetBiasTag lsls r0, r0, #0x18 lsrs r3, r0, #0x18 adds r5, r3, #0 @@ -617060,7 +617060,7 @@ _0812C16A: adds r0, r5, #0 adds r1, r3, #0 bl _call_via_r2 - thumb_func_end sub_0812C148 + thumb_func_end DecideReelTurns_BiasTag_Reel1 thumb_func_start sub_0812C180 sub_0812C180: @ 0x0812C180 @@ -617074,8 +617074,8 @@ _0812C18C: .4byte gUnknown_203A800 _0812C190: .4byte gUnknown_858448C thumb_func_end sub_0812C180 - thumb_func_start sub_0812C194 -sub_0812C194: @ 0x0812C194 + thumb_func_start AreTagsAtPosition_Reel1 +AreTagsAtPosition_Reel1: @ 0x0812C194 push {r4, r5, lr} adds r3, r0, #0 adds r4, r1, #0 @@ -617087,7 +617087,7 @@ sub_0812C194: @ 0x0812C194 asrs r3, r3, #0x10 movs r0, #0 adds r1, r3, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -617109,7 +617109,7 @@ _0812C1CE: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0812C194 + thumb_func_end AreTagsAtPosition_Reel1 thumb_func_start AreCherriesOnScreen_Reel1 AreCherriesOnScreen_Reel1: @ 0x0812C1D4 @@ -617121,7 +617121,7 @@ AreCherriesOnScreen_Reel1: @ 0x0812C1D4 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -617131,7 +617131,7 @@ AreCherriesOnScreen_Reel1: @ 0x0812C1D4 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -617141,7 +617141,7 @@ AreCherriesOnScreen_Reel1: @ 0x0812C1D4 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -617157,8 +617157,8 @@ _0812C222: bx r1 thumb_func_end AreCherriesOnScreen_Reel1 - thumb_func_start sub_0812C228 -sub_0812C228: @ 0x0812C228 + thumb_func_start IsBiasTowardsCherryOr7s +IsBiasTowardsCherryOr7s: @ 0x0812C228 push {lr} ldr r0, _0812C23C ldr r0, [r0] @@ -617177,10 +617177,10 @@ _0812C242: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0812C228 + thumb_func_end IsBiasTowardsCherryOr7s - thumb_func_start sub_0812C248 -sub_0812C248: @ 0x0812C248 + thumb_func_start DecideReelTurns_BiasTag_Reel1_Bet1 +DecideReelTurns_BiasTag_Reel1_Bet1: @ 0x0812C248 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -617200,7 +617200,7 @@ _0812C25C: asrs r0, r0, #0x10 adds r1, r7, #0 adds r2, r6, #0 - bl sub_0812C194 + bl AreTagsAtPosition_Reel1 lsls r0, r0, #0x18 cmp r0, #0 beq _0812C288 @@ -617227,10 +617227,10 @@ _0812C296: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0812C248 + thumb_func_end DecideReelTurns_BiasTag_Reel1_Bet1 - thumb_func_start sub_0812C2A0 -sub_0812C2A0: @ 0x0812C2A0 + thumb_func_start DecideReelTurns_BiasTag_Reel1_Bet2or3 +DecideReelTurns_BiasTag_Reel1_Bet2or3: @ 0x0812C2A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -617242,7 +617242,7 @@ sub_0812C2A0: @ 0x0812C2A0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r8, r1 - bl sub_0812C228 + bl IsBiasTowardsCherryOr7s lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -617261,7 +617261,7 @@ _0812C2D2: adds r0, r4, #0 mov r1, sb mov r2, r8 - bl sub_0812C194 + bl AreTagsAtPosition_Reel1 lsls r0, r0, #0x18 cmp r0, #0 beq _0812C2F8 @@ -617302,7 +617302,7 @@ _0812C31E: asrs r0, r0, #0x10 mov r1, sb mov r2, r8 - bl sub_0812C194 + bl AreTagsAtPosition_Reel1 lsls r0, r0, #0x18 cmp r0, #0 beq _0812C390 @@ -617371,10 +617371,10 @@ _0812C3A0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0812C2A0 + thumb_func_end DecideReelTurns_BiasTag_Reel1_Bet2or3 - thumb_func_start sub_0812C3B0 -sub_0812C3B0: @ 0x0812C3B0 + thumb_func_start DecideReelTurns_BiasTag_Reel2 +DecideReelTurns_BiasTag_Reel2: @ 0x0812C3B0 push {lr} ldr r1, _0812C3D0 ldr r0, _0812C3D4 @@ -617386,7 +617386,7 @@ sub_0812C3B0: @ 0x0812C3B0 adds r0, r0, r1 ldr r0, [r0] bl _call_via_r0 - thumb_func_end sub_0812C3B0 + thumb_func_end DecideReelTurns_BiasTag_Reel2 thumb_func_start sub_0812C3C8 sub_0812C3C8: @ 0x0812C3C8 @@ -617399,8 +617399,8 @@ _0812C3D0: .4byte gUnknown_8584498 _0812C3D4: .4byte gUnknown_203A800 thumb_func_end sub_0812C3C8 - thumb_func_start sub_0812C3D8 -sub_0812C3D8: @ 0x0812C3D8 + thumb_func_start DecideReelTurns_BiasTag_Reel2_Bet1or2 +DecideReelTurns_BiasTag_Reel2_Bet1or2: @ 0x0812C3D8 push {r4, r5, r6, r7, lr} ldr r0, _0812C40C ldr r0, [r0] @@ -617415,7 +617415,7 @@ _0812C3E6: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag ldr r1, _0812C40C ldr r1, [r1] lsls r0, r0, #0x18 @@ -617441,12 +617441,12 @@ _0812C41E: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0812C3D8 + thumb_func_end DecideReelTurns_BiasTag_Reel2_Bet1or2 - thumb_func_start sub_0812C424 -sub_0812C424: @ 0x0812C424 + thumb_func_start DecideReelTurns_BiasTag_Reel2_Bet3 +DecideReelTurns_BiasTag_Reel2_Bet3: @ 0x0812C424 push {r4, r5, r6, lr} - bl sub_0812C3D8 + bl DecideReelTurns_BiasTag_Reel2_Bet1or2 lsls r0, r0, #0x18 cmp r0, #0 beq _0812C486 @@ -617471,7 +617471,7 @@ _0812C44C: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag ldr r1, _0812C478 ldr r1, [r1] lsls r0, r0, #0x18 @@ -617511,7 +617511,7 @@ _0812C496: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag ldr r1, _0812C4C8 ldr r1, [r1] lsls r0, r0, #0x18 @@ -617533,10 +617533,10 @@ _0812C4C2: bx r1 .align 2, 0 _0812C4C8: .4byte gUnknown_203A800 - thumb_func_end sub_0812C424 + thumb_func_end DecideReelTurns_BiasTag_Reel2_Bet3 - thumb_func_start sub_0812C4CC -sub_0812C4CC: @ 0x0812C4CC + thumb_func_start DecideReelTurns_BiasTag_Reel3 +DecideReelTurns_BiasTag_Reel3: @ 0x0812C4CC push {r4, lr} ldr r2, _0812C508 ldr r0, [r2] @@ -617570,10 +617570,10 @@ _0812C4E8: .align 2, 0 _0812C508: .4byte gUnknown_203A800 _0812C50C: .4byte gUnknown_85844A4 - thumb_func_end sub_0812C4CC + thumb_func_end DecideReelTurns_BiasTag_Reel3 - thumb_func_start sub_0812C510 -sub_0812C510: @ 0x0812C510 + thumb_func_start DecideReelTurns_BiasTag_Reel3_Bet1or2 +DecideReelTurns_BiasTag_Reel3_Bet1or2: @ 0x0812C510 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -617593,7 +617593,7 @@ _0812C528: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r7 @@ -617621,10 +617621,10 @@ _0812C562: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0812C510 + thumb_func_end DecideReelTurns_BiasTag_Reel3_Bet1or2 - thumb_func_start sub_0812C56C -sub_0812C56C: @ 0x0812C56C + thumb_func_start DecideReelTurns_BiasTag_Reel3_Bet3 +DecideReelTurns_BiasTag_Reel3_Bet3: @ 0x0812C56C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -617639,7 +617639,7 @@ sub_0812C56C: @ 0x0812C56C cmp r1, r0 bne _0812C5AC adds r0, r6, #0 - bl sub_0812C510 + bl DecideReelTurns_BiasTag_Reel3_Bet1or2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _0812C5E2 @@ -617672,7 +617672,7 @@ _0812C5BC: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, r6 @@ -617690,7 +617690,7 @@ _0812C5E2: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0812C56C + thumb_func_end DecideReelTurns_BiasTag_Reel3_Bet3 thumb_func_start DecideReelTurns_NoBiasTag_Reel1 DecideReelTurns_NoBiasTag_Reel1: @ 0x0812C5EC @@ -617767,8 +617767,8 @@ _0812C654: .4byte gUnknown_85844B0 _0812C658: .4byte gUnknown_203A800 thumb_func_end sub_0812C650 - thumb_func_start sub_0812C65C -sub_0812C65C: @ 0x0812C65C + thumb_func_start DecideReelTurns_NoBiasTag_Reel2_Bet1 +DecideReelTurns_NoBiasTag_Reel2_Bet1: @ 0x0812C65C push {r4, r5, r6, r7, lr} sub sp, #4 ldr r0, _0812C6C4 @@ -617788,7 +617788,7 @@ sub_0812C65C: @ 0x0812C65C lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag mov r1, sp strb r0, [r1] mov r0, sp @@ -617806,7 +617806,7 @@ _0812C69C: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag ldrb r1, [r6] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -617832,10 +617832,10 @@ _0812C6D4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0812C65C + thumb_func_end DecideReelTurns_NoBiasTag_Reel2_Bet1 - thumb_func_start sub_0812C6DC -sub_0812C6DC: @ 0x0812C6DC + thumb_func_start DecideReelTurns_NoBiasTag_Reel2_Bet2 +DecideReelTurns_NoBiasTag_Reel2_Bet2: @ 0x0812C6DC push {r4, r5, r6, r7, lr} sub sp, #4 ldr r4, _0812C744 @@ -617855,7 +617855,7 @@ sub_0812C6DC: @ 0x0812C6DC lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag mov r1, sp strb r0, [r1] mov r0, sp @@ -617875,7 +617875,7 @@ _0812C71C: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag ldrb r1, [r7] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -617900,10 +617900,10 @@ _0812C754: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0812C6DC + thumb_func_end DecideReelTurns_NoBiasTag_Reel2_Bet2 - thumb_func_start sub_0812C75C -sub_0812C75C: @ 0x0812C75C + thumb_func_start DecideReelTurns_NoBiasTag_Reel2_Bet3 +DecideReelTurns_NoBiasTag_Reel2_Bet3: @ 0x0812C75C push {r4, r5, r6, r7, lr} sub sp, #4 ldr r6, _0812C784 @@ -617920,7 +617920,7 @@ sub_0812C75C: @ 0x0812C75C beq _0812C85A cmp r3, #2 bne _0812C7A6 - bl sub_0812C6DC + bl DecideReelTurns_NoBiasTag_Reel2_Bet2 b _0812C85A .align 2, 0 _0812C784: .4byte gUnknown_203A800 @@ -617948,7 +617948,7 @@ _0812C7A6: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag mov r1, sp strb r0, [r1] mov r0, sp @@ -617971,7 +617971,7 @@ _0812C7D6: asrs r4, r0, #0x10 movs r0, #1 adds r1, r4, #0 - bl sub_0812BCA8 + bl GetNearbyTag ldrb r1, [r7] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -618000,7 +618000,7 @@ _0812C808: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag ldrb r1, [r7] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -618040,7 +618040,7 @@ _0812C85A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812C75C + thumb_func_end DecideReelTurns_NoBiasTag_Reel2_Bet3 thumb_func_start AreTagsMixed77 AreTagsMixed77: @ 0x0812C864 @@ -618177,8 +618177,8 @@ _0812C928: .4byte gUnknown_85844BC _0812C92C: .4byte gUnknown_203A800 thumb_func_end sub_0812C924 - thumb_func_start sub_0812C930 -sub_0812C930: @ 0x0812C930 + thumb_func_start DecideReelTurns_NoBiasTag_Reel3_Bet1 +DecideReelTurns_NoBiasTag_Reel3_Bet1: @ 0x0812C930 push {r4, r5, r6, r7, lr} movs r6, #0 ldr r7, _0812C96C @@ -618189,7 +618189,7 @@ sub_0812C930: @ 0x0812C930 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, [r7] @@ -618199,7 +618199,7 @@ sub_0812C930: @ 0x0812C930 asrs r4, r4, #0x10 movs r0, #1 adds r1, r4, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r5, r1 @@ -618221,7 +618221,7 @@ _0812C97A: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -618256,7 +618256,7 @@ _0812C9BE: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -618282,7 +618282,7 @@ _0812C9EE: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -618296,10 +618296,10 @@ _0812CA06: bx r0 .align 2, 0 _0812CA14: .4byte gUnknown_203A800 - thumb_func_end sub_0812C930 + thumb_func_end DecideReelTurns_NoBiasTag_Reel3_Bet1 - thumb_func_start sub_0812CA18 -sub_0812CA18: @ 0x0812CA18 + thumb_func_start DecideReelTurns_NoBiasTag_Reel3_Bet2 +DecideReelTurns_NoBiasTag_Reel3_Bet2: @ 0x0812CA18 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -618329,7 +618329,7 @@ sub_0812CA18: @ 0x0812CA18 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r0, [r4] @@ -618339,7 +618339,7 @@ sub_0812CA18: @ 0x0812CA18 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r7, #0 @@ -618368,7 +618368,7 @@ _0812CA8E: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r7, r4 @@ -618395,7 +618395,7 @@ _0812CAC4: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r7, r0, #0x18 mov r2, sb @@ -618405,7 +618405,7 @@ _0812CAC4: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r6, r0, #0x18 mov r1, sl @@ -618415,7 +618415,7 @@ _0812CAC4: asrs r4, r4, #0x10 movs r0, #2 adds r1, r4, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r7, #0 @@ -618486,14 +618486,14 @@ _0812CB70: bx r0 .align 2, 0 _0812CB8C: .4byte gUnknown_203A800 - thumb_func_end sub_0812CA18 + thumb_func_end DecideReelTurns_NoBiasTag_Reel3_Bet2 - thumb_func_start sub_0812CB90 -sub_0812CB90: @ 0x0812CB90 + thumb_func_start DecideReelTurns_NoBiasTag_Reel3_Bet3 +DecideReelTurns_NoBiasTag_Reel3_Bet3: @ 0x0812CB90 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - bl sub_0812CA18 + bl DecideReelTurns_NoBiasTag_Reel3_Bet2 ldr r4, _0812CC34 ldr r2, [r4] movs r0, #0x36 @@ -618515,7 +618515,7 @@ sub_0812CB90: @ 0x0812CB90 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, [r4] @@ -618525,7 +618525,7 @@ sub_0812CB90: @ 0x0812CB90 lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r6, #0 @@ -618558,7 +618558,7 @@ _0812CC06: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r6, r4 @@ -618587,7 +618587,7 @@ _0812CC46: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, [r7] @@ -618597,7 +618597,7 @@ _0812CC46: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, [r7] @@ -618607,7 +618607,7 @@ _0812CC46: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r6, #0 @@ -618648,7 +618648,7 @@ _0812CCC6: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #0 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, [r7] @@ -618658,7 +618658,7 @@ _0812CCC6: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #1 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, [r7] @@ -618668,7 +618668,7 @@ _0812CCC6: lsls r1, r1, #0x10 asrs r1, r1, #0x10 movs r0, #2 - bl sub_0812BCA8 + bl GetNearbyTag lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r6, #0 @@ -618706,7 +618706,7 @@ _0812CD44: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812CB90 + thumb_func_end DecideReelTurns_NoBiasTag_Reel3_Bet3 thumb_func_start sub_0812CD50 sub_0812CD50: @ 0x0812CD50 @@ -618717,7 +618717,7 @@ sub_0812CD50: @ 0x0812CD50 ldr r5, _0812CD7C adds r0, r5, #0 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0812CD80 @@ -618833,7 +618833,7 @@ sub_0812CE04: @ 0x0812CE04 movs r3, #0x52 bl sub_0812FA9C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask add sp, #4 pop {r4} pop {r0} @@ -618856,7 +618856,7 @@ sub_0812CE3C: @ 0x0812CE3C ldrb r1, [r0] adds r0, r2, #0 movs r2, #2 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 @@ -618878,7 +618878,7 @@ sub_0812CE64: @ 0x0812CE64 ldrb r1, [r0] adds r0, r2, #0 movs r2, #2 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 @@ -618959,7 +618959,7 @@ sub_0812CF04: @ 0x0812CF04 ldr r5, _0812CF38 _0812CF0A: ldr r0, _0812CF3C - bl sub_08006BCC + bl CreateInvisibleSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -619210,7 +619210,7 @@ sub_0812D0C0: @ 0x0812D0C0 ldr r4, _0812D0E8 adds r0, r4, #0 movs r1, #6 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0812D0EC @@ -619233,7 +619233,7 @@ _0812D0EC: .4byte gUnknown_3005B60 sub_0812D0F0: @ 0x0812D0F0 push {lr} ldr r0, _0812D114 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _0812D118 @@ -619252,12 +619252,12 @@ _0812D114: .4byte sub_0812D138 _0812D118: .4byte gUnknown_3005B60 _0812D11C: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _0812D134 ldr r0, [r0] movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #1 _0812D130: pop {r1} @@ -619309,7 +619309,7 @@ _0812D176: ldr r0, [r1] movs r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 @@ -619317,12 +619317,12 @@ _0812D190: .4byte gUnknown_3005B60 _0812D194: .4byte gUnknown_85855A4 thumb_func_end sub_0812D138 - thumb_func_start sub_0812D198 -sub_0812D198: @ 0x0812D198 + thumb_func_start GameplayTask_PikaPower +GameplayTask_PikaPower: @ 0x0812D198 push {lr} ldr r0, _0812D1B0 movs r1, #8 - bl sub_080A8878 + bl CreateTask ldr r1, _0812D1B4 ldr r1, [r1] adds r1, #0x3e @@ -619332,7 +619332,7 @@ sub_0812D198: @ 0x0812D198 .align 2, 0 _0812D1B0: .4byte sub_0812D240 _0812D1B4: .4byte gUnknown_203A800 - thumb_func_end sub_0812D198 + thumb_func_end GameplayTask_PikaPower thumb_func_start DisplayPikaPower DisplayPikaPower: @ 0x0812D1B8 @@ -619753,13 +619753,13 @@ _0812D4B4: .4byte gUnknown_3005B60 _0812D4B8: .4byte gUnknown_203A800 thumb_func_end sub_0812D3C4 - thumb_func_start sub_0812D4BC -sub_0812D4BC: @ 0x0812D4BC + thumb_func_start BeginReeltime +BeginReeltime: @ 0x0812D4BC push {r4, lr} ldr r4, _0812D4D8 adds r0, r4, #0 movs r1, #7 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl _call_via_r4 @@ -619768,13 +619768,13 @@ sub_0812D4BC: @ 0x0812D4BC bx r0 .align 2, 0 _0812D4D8: .4byte sub_0812D4FC - thumb_func_end sub_0812D4BC + thumb_func_end BeginReeltime thumb_func_start sub_0812D4DC sub_0812D4DC: @ 0x0812D4DC push {lr} ldr r0, _0812D4F0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -619816,8 +619816,8 @@ _0812D524: .4byte gUnknown_85844F8 _0812D528: .4byte gUnknown_3005B60 thumb_func_end sub_0812D4FC - thumb_func_start sub_0812D52C -sub_0812D52C: @ 0x0812D52C + thumb_func_start ReeltimeAction0 +ReeltimeAction0: @ 0x0812D52C push {lr} ldr r3, _0812D598 ldr r1, [r3] @@ -619853,21 +619853,21 @@ sub_0812D52C: @ 0x0812D52C bl sub_0812E660 bl sub_0812E71C bl sub_0812E7DC - bl sub_0812B710 - bl sub_080A27F8 + bl GetReeltimeDraw + bl StopMapMusic movs r0, #0xc4 lsls r0, r0, #1 - bl sub_080A27D8 + bl PlayNewMapMusic pop {r0} bx r0 .align 2, 0 _0812D598: .4byte gUnknown_203A800 _0812D59C: .4byte gUnknown_2021B38 _0812D5A0: .4byte gUnknown_2021B3A - thumb_func_end sub_0812D52C + thumb_func_end ReeltimeAction0 - thumb_func_start sub_0812D5A4 -sub_0812D5A4: @ 0x0812D5A4 + thumb_func_start ReeltimeAction1 +ReeltimeAction1: @ 0x0812D5A4 push {r4, r5, lr} adds r4, r0, #0 ldr r1, _0812D614 @@ -619919,14 +619919,14 @@ _0812D604: ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0812D614: .4byte gUnknown_2021B38 _0812D618: .4byte 0x000001FF - thumb_func_end sub_0812D5A4 + thumb_func_end ReeltimeAction1 thumb_func_start ReeltimeAction2 ReeltimeAction2: @ 0x0812D61C @@ -619935,7 +619935,7 @@ ReeltimeAction2: @ 0x0812D61C ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldrh r0, [r4, #0x12] adds r0, #1 strh r0, [r4, #0x12] @@ -619946,16 +619946,16 @@ ReeltimeAction2: @ 0x0812D61C ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] - bl sub_0812E944 - bl sub_0812EAC0 + bl CreateReelTimeSprites1 + bl CreateReelTimeSprite2 _0812D646: pop {r4} pop {r0} bx r0 thumb_func_end ReeltimeAction2 - thumb_func_start sub_0812D64C -sub_0812D64C: @ 0x0812D64C + thumb_func_start ReeltimeAction3 +ReeltimeAction3: @ 0x0812D64C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -619978,7 +619978,7 @@ sub_0812D64C: @ 0x0812D64C ldrh r0, [r7, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldrh r0, [r7, #0x10] subs r0, #4 strh r0, [r7, #0x10] @@ -620034,16 +620034,16 @@ _0812D6EC: .4byte gUnknown_8584548 _0812D6F0: .4byte gUnknown_8584550 _0812D6F4: .4byte gUnknown_203A800 _0812D6F8: .4byte gUnknown_20205AC - thumb_func_end sub_0812D64C + thumb_func_end ReeltimeAction3 - thumb_func_start sub_0812D6FC -sub_0812D6FC: @ 0x0812D6FC + thumb_func_start ReeltimeAction4 +ReeltimeAction4: @ 0x0812D6FC push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldrh r0, [r4, #0x12] adds r0, #1 strh r0, [r4, #0x12] @@ -620076,7 +620076,7 @@ _0812D740: .align 2, 0 _0812D748: .4byte gUnknown_203A800 _0812D74C: .4byte gUnknown_20205AC - thumb_func_end sub_0812D6FC + thumb_func_end ReeltimeAction4 thumb_func_start ReeltimeAction5 ReeltimeAction5: @ 0x0812D750 @@ -620085,7 +620085,7 @@ ReeltimeAction5: @ 0x0812D750 ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldrb r0, [r4, #0x10] adds r0, #0x80 strh r0, [r4, #0x10] @@ -620108,14 +620108,14 @@ _0812D77C: .align 2, 0 thumb_func_end ReeltimeAction5 - thumb_func_start sub_0812D784 -sub_0812D784: @ 0x0812D784 + thumb_func_start ReeltimeAction6 +ReeltimeAction6: @ 0x0812D784 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldrb r0, [r4, #0x10] adds r0, #0x40 strh r0, [r4, #0x10] @@ -620153,7 +620153,7 @@ _0812D7C8: b _0812D7E4 _0812D7D6: ldrh r0, [r4, #0x14] - bl sub_0812B770 + bl SkipToReeltimeAction14 lsls r0, r0, #0x18 cmp r0, #0 beq _0812D7E6 @@ -620169,10 +620169,10 @@ _0812D7EC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812D784 + thumb_func_end ReeltimeAction6 - thumb_func_start sub_0812D7F4 -sub_0812D7F4: @ 0x0812D7F4 + thumb_func_start ReelTimeAction_LandOnOutcome +ReelTimeAction_LandOnOutcome: @ 0x0812D7F4 push {r4, r5, r6, lr} adds r4, r0, #0 ldr r6, _0812D81C @@ -620188,13 +620188,13 @@ sub_0812D7F4: @ 0x0812D7F4 ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BE1C + bl AdvanceReeltimeReelToNextTag b _0812D848 .align 2, 0 _0812D81C: .4byte gUnknown_203A800 _0812D820: movs r0, #1 - bl sub_0812BCF8 + bl GetNearbyReelTimeTag ldr r1, [r6] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -620204,7 +620204,7 @@ _0812D820: ldrh r0, [r4, #0x10] lsls r0, r0, #0x10 asrs r0, r0, #0x18 - bl sub_0812BDE4 + bl AdvanceReeltimeReel ldr r0, [r6] movs r1, #0x14 ldrsh r0, [r0, r1] @@ -620222,7 +620222,7 @@ _0812D852: cmp r5, #0 bne _0812D876 movs r0, #1 - bl sub_0812BCF8 + bl GetNearbyReelTimeTag ldr r1, _0812D87C ldr r1, [r1] lsls r0, r0, #0x18 @@ -620240,10 +620240,10 @@ _0812D876: bx r0 .align 2, 0 _0812D87C: .4byte gUnknown_203A800 - thumb_func_end sub_0812D7F4 + thumb_func_end ReelTimeAction_LandOnOutcome - thumb_func_start sub_0812D880 -sub_0812D880: @ 0x0812D880 + thumb_func_start ReeltimeAction8 +ReeltimeAction8: @ 0x0812D880 push {r4, r5, r6, lr} adds r4, r0, #0 ldrh r0, [r4, #0x10] @@ -620254,7 +620254,7 @@ sub_0812D880: @ 0x0812D880 asrs r0, r0, #0x10 cmp r0, #0x3b ble _0812D924 - bl sub_080A27F8 + bl StopMapMusic bl sub_0812EA8C bl sub_0812EBDC ldrh r0, [r4, #8] @@ -620278,7 +620278,7 @@ sub_0812D880: @ 0x0812D880 movs r1, #5 bl StartSpriteAnimIfDifferent ldr r0, _0812D8DC - bl sub_080A29AC + bl PlayFanfare b _0812D924 .align 2, 0 _0812D8D4: .4byte gUnknown_203A800 @@ -620316,14 +620316,14 @@ _0812D8E0: _0812D91C: movs r0, #0xc3 lsls r0, r0, #1 - bl sub_080A29AC + bl PlayFanfare _0812D924: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _0812D92C: .4byte gUnknown_20205AC - thumb_func_end sub_0812D880 + thumb_func_end ReeltimeAction8 thumb_func_start ReeltimeAction9 ReeltimeAction9: @ 0x0812D930 @@ -620354,8 +620354,8 @@ _0812D958: .align 2, 0 thumb_func_end ReeltimeAction9 - thumb_func_start sub_0812D960 -sub_0812D960: @ 0x0812D960 + thumb_func_start ReeltimeAction10 +ReeltimeAction10: @ 0x0812D960 push {r4, r5, lr} adds r4, r0, #0 ldr r1, _0812D9A0 @@ -620397,10 +620397,10 @@ _0812D9AE: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0812D960 + thumb_func_end ReeltimeAction10 - thumb_func_start sub_0812D9B4 -sub_0812D9B4: @ 0x0812D9B4 + thumb_func_start ReeltimeAction11 +ReeltimeAction11: @ 0x0812D9B4 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r4, _0812DA08 @@ -620424,16 +620424,16 @@ sub_0812D9B4: @ 0x0812D9B4 ldr r0, [r4] adds r0, #0x60 ldrh r0, [r0] - bl sub_080A27D8 + bl PlayNewMapMusic ldr r0, [r4] ldrb r0, [r0, #0xa] cmp r0, #0 bne _0812DA14 ldr r0, _0812DA10 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _0812DA2A .align 2, 0 _0812DA08: .4byte gUnknown_203A800 @@ -620442,7 +620442,7 @@ _0812DA10: .4byte sub_0812D4FC _0812DA14: movs r0, #4 bl sub_0812DEF4 - bl sub_0812B79C + bl SlowReelSpeed strh r0, [r5, #0xa] strh r6, [r5, #0xc] strh r6, [r5, #0xe] @@ -620453,10 +620453,10 @@ _0812DA2A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0812D9B4 + thumb_func_end ReeltimeAction11 - thumb_func_start sub_0812DA30 -sub_0812DA30: @ 0x0812DA30 + thumb_func_start ReeltimeAction12 +ReeltimeAction12: @ 0x0812DA30 push {r4, r5, lr} adds r4, r0, #0 ldr r0, _0812DA4C @@ -620496,35 +620496,35 @@ _0812DA76: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0812DA30 + thumb_func_end ReeltimeAction12 - thumb_func_start sub_0812DA7C -sub_0812DA7C: @ 0x0812DA7C + thumb_func_start ReeltimeAction13 +ReeltimeAction13: @ 0x0812DA7C push {lr} bl sub_0812E064 lsls r0, r0, #0x18 cmp r0, #0 beq _0812DA96 ldr r0, _0812DA9C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0812DA96: pop {r0} bx r0 .align 2, 0 _0812DA9C: .4byte sub_0812D4FC - thumb_func_end sub_0812DA7C + thumb_func_end ReeltimeAction13 - thumb_func_start sub_0812DAA0 -sub_0812DAA0: @ 0x0812DAA0 + thumb_func_start ReeltimeAction14 +ReeltimeAction14: @ 0x0812DAA0 push {r4, r5, lr} adds r4, r0, #0 bl sub_0812E83C bl sub_0812EA8C bl sub_0812EBDC - bl sub_0812EC30 + bl VBlankCB_ContestPainting ldr r5, _0812DB08 ldr r3, _0812DB0C ldr r0, [r3] @@ -620555,9 +620555,9 @@ sub_0812DAA0: @ 0x0812DAA0 movs r0, #4 strh r0, [r4, #0x10] strh r1, [r4, #0x12] - bl sub_080A27F8 + bl StopMapMusic ldr r0, _0812DB10 - bl sub_080A29AC + bl PlayFanfare movs r0, #0xb2 bl sub_080A306C pop {r4, r5} @@ -620567,10 +620567,10 @@ sub_0812DAA0: @ 0x0812DAA0 _0812DB08: .4byte gUnknown_20205AC _0812DB0C: .4byte gUnknown_203A800 _0812DB10: .4byte 0x00000187 - thumb_func_end sub_0812DAA0 + thumb_func_end ReeltimeAction14 - thumb_func_start sub_0812DB14 -sub_0812DB14: @ 0x0812DB14 + thumb_func_start ReeltimeAction15 +ReeltimeAction15: @ 0x0812DB14 push {r4, r5, lr} adds r4, r0, #0 ldr r1, _0812DB90 @@ -620635,10 +620635,10 @@ _0812DB8A: _0812DB90: .4byte gUnknown_2021B3A _0812DB94: .4byte gUnknown_20205AC _0812DB98: .4byte gUnknown_203A800 - thumb_func_end sub_0812DB14 + thumb_func_end ReeltimeAction15 - thumb_func_start sub_0812DB9C -sub_0812DB9C: @ 0x0812DB9C + thumb_func_start ReeltimeAction16 +ReeltimeAction16: @ 0x0812DB9C push {r4, lr} adds r4, r0, #0 ldr r1, _0812DBC8 @@ -620661,10 +620661,10 @@ _0812DBC2: bx r0 .align 2, 0 _0812DBC8: .4byte gUnknown_2021B3A - thumb_func_end sub_0812DB9C + thumb_func_end ReeltimeAction16 - thumb_func_start sub_0812DBCC -sub_0812DBCC: @ 0x0812DBCC + thumb_func_start ReeltimeAction17 +ReeltimeAction17: @ 0x0812DBCC push {lr} ldr r1, _0812DC0C movs r0, #0 @@ -620676,23 +620676,23 @@ sub_0812DBCC: @ 0x0812DBCC ldr r0, [r0] adds r0, #0x60 ldrh r0, [r0] - bl sub_080A27D8 + bl PlayNewMapMusic bl sub_0812E3F8 bl sub_0812E908 bl sub_0812E8D4 bl sub_0812ED9C ldr r0, _0812DC14 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 _0812DC0C: .4byte gUnknown_2021B38 _0812DC10: .4byte gUnknown_203A800 _0812DC14: .4byte sub_0812D4FC - thumb_func_end sub_0812DBCC + thumb_func_end ReeltimeAction17 thumb_func_start sub_0812DC18 sub_0812DC18: @ 0x0812DC18 @@ -620760,8 +620760,8 @@ _0812DC68: _0812DC8C: .4byte gUnknown_8588604 thumb_func_end sub_0812DC60 - thumb_func_start sub_0812DC90 -sub_0812DC90: @ 0x0812DC90 + thumb_func_start OpenInfoBox +OpenInfoBox: @ 0x0812DC90 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -620769,7 +620769,7 @@ sub_0812DC90: @ 0x0812DC90 ldr r5, _0812DCBC adds r0, r5, #0 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0812DCC0 @@ -620785,13 +620785,13 @@ sub_0812DC90: @ 0x0812DC90 .align 2, 0 _0812DCBC: .4byte sub_0812DCE4 _0812DCC0: .4byte gUnknown_3005B60 - thumb_func_end sub_0812DC90 + thumb_func_end OpenInfoBox thumb_func_start sub_0812DCC4 sub_0812DCC4: @ 0x0812DCC4 push {lr} ldr r0, _0812DCD8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -620833,8 +620833,8 @@ _0812DD0C: .4byte gUnknown_8584558 _0812DD10: .4byte gUnknown_3005B60 thumb_func_end sub_0812DCE4 - thumb_func_start sub_0812DD14 -sub_0812DD14: @ 0x0812DD14 + thumb_func_start InfoBox_FadeIn +InfoBox_FadeIn: @ 0x0812DD14 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -620844,7 +620844,7 @@ sub_0812DD14: @ 0x0812DD14 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -620852,7 +620852,7 @@ sub_0812DD14: @ 0x0812DD14 pop {r4} pop {r0} bx r0 - thumb_func_end sub_0812DD14 + thumb_func_end InfoBox_FadeIn thumb_func_start InfoBox_WaitForFade InfoBox_WaitForFade: @ 0x0812DD38 @@ -620874,19 +620874,19 @@ _0812DD4E: _0812DD54: .4byte gUnknown_2037C74 thumb_func_end InfoBox_WaitForFade - thumb_func_start sub_0812DD58 -sub_0812DD58: @ 0x0812DD58 + thumb_func_start InfoBox_8104B80 +InfoBox_8104B80: @ 0x0812DD58 push {r4, lr} adds r4, r0, #0 bl sub_0812DFEC bl sub_0812FB18 ldr r0, _0812DD84 - bl sub_08003250 + bl AddWindow movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -620895,10 +620895,10 @@ sub_0812DD58: @ 0x0812DD58 bx r0 .align 2, 0 _0812DD84: .4byte gUnknown_85843C8 - thumb_func_end sub_0812DD58 + thumb_func_end InfoBox_8104B80 - thumb_func_start sub_0812DD88 -sub_0812DD88: @ 0x0812DD88 + thumb_func_start InfoBox_AddText +InfoBox_AddText: @ 0x0812DD88 push {r4, r5, lr} sub sp, #0xc adds r5, r0, #0 @@ -620912,17 +620912,17 @@ sub_0812DD88: @ 0x0812DD88 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 rsbs r0, r0, #0 str r4, [sp] movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -620933,10 +620933,10 @@ sub_0812DD88: @ 0x0812DD88 .align 2, 0 _0812DDCC: .4byte gUnknown_85843D0 _0812DDD0: .4byte gUnknown_8588651 - thumb_func_end sub_0812DD88 + thumb_func_end InfoBox_AddText - thumb_func_start sub_0812DDD4 -sub_0812DDD4: @ 0x0812DDD4 + thumb_func_start InfoBox_AwaitPlayerInput +InfoBox_AwaitPlayerInput: @ 0x0812DDD4 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -620948,21 +620948,21 @@ sub_0812DDD4: @ 0x0812DDD4 beq _0812DE18 movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_08003444 + bl RemoveWindow movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -620973,15 +620973,15 @@ _0812DE18: bx r0 .align 2, 0 _0812DE20: .4byte gUnknown_3002360 - thumb_func_end sub_0812DDD4 + thumb_func_end InfoBox_AwaitPlayerInput - thumb_func_start sub_0812DE24 -sub_0812DE24: @ 0x0812DE24 + thumb_func_start InfoBox_812DE14 +InfoBox_812DE14: @ 0x0812DE24 push {r4, lr} adds r4, r0, #0 bl sub_0812F978 movs r0, #3 - bl sub_08001B48 + bl ShowBg ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -620989,7 +620989,7 @@ sub_0812DE24: @ 0x0812DE24 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812DE24 + thumb_func_end InfoBox_812DE14 thumb_func_start InfoBox_812DE30 InfoBox_812DE30: @ 0x0812DE40 @@ -621006,8 +621006,8 @@ InfoBox_812DE30: @ 0x0812DE40 .align 2, 0 thumb_func_end InfoBox_812DE30 - thumb_func_start sub_0812DE58 -sub_0812DE58: @ 0x0812DE58 + thumb_func_start InfoBox_8104BFC +InfoBox_8104BFC: @ 0x0812DE58 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -621021,7 +621021,7 @@ sub_0812DE58: @ 0x0812DE58 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -621031,16 +621031,16 @@ sub_0812DE58: @ 0x0812DE58 bx r0 .align 2, 0 _0812DE88: .4byte gUnknown_203A800 - thumb_func_end sub_0812DE58 + thumb_func_end InfoBox_8104BFC thumb_func_start sub_0812DE8C sub_0812DE8C: @ 0x0812DE8C push {lr} ldr r0, _0812DEA0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 @@ -621052,7 +621052,7 @@ sub_0812DEA4: @ 0x0812DEA4 push {lr} ldr r0, _0812DEE4 movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r0, _0812DEE8 @@ -621375,7 +621375,7 @@ _0812E100: asrs r1, r5, #0x10 movs r2, #0 movs r3, #0xe - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -621460,7 +621460,7 @@ sub_0812E164: @ 0x0812E164 lsls r1, r1, #0x10 asrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0812BC54 + bl GetNearbyTag_Quantized lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl GetSpriteTileStartByTag @@ -621555,7 +621555,7 @@ sub_0812E240: @ 0x0812E240 adds r1, r5, #0 adds r2, r6, #0 movs r3, #0xd - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -621645,7 +621645,7 @@ sub_0812E310: @ 0x0812E310 movs r1, #0x58 movs r2, #0x48 movs r3, #0xf - bl sub_08006B0C + bl CreateSprite adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -621659,7 +621659,7 @@ sub_0812E310: @ 0x0812E310 orrs r1, r2 strb r1, [r0, #5] ldr r1, _0812E348 - bl sub_0800858C + bl SetSubspriteTables pop {r0} bx r0 .align 2, 0 @@ -621677,7 +621677,7 @@ sub_0812E34C: @ 0x0812E34C cmp r0, #0 bne _0812E360 movs r0, #0x28 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _0812E360: ldr r2, [r4] @@ -621717,7 +621717,7 @@ _0812E360: mov r0, sp movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0812E3F0 @@ -621770,7 +621770,7 @@ sub_0812E3F8: @ 0x0812E3F8 ldr r0, [r4] cmp r0, #0 beq _0812E420 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0812E420: @@ -621842,7 +621842,7 @@ sub_0812E484: @ 0x0812E484 cmp r0, #0 bne _0812E4A0 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _0812E4A0: ldr r2, [r4] @@ -621868,7 +621868,7 @@ _0812E4A0: lsls r1, r1, #1 movs r2, #0x34 movs r3, #7 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r4, #4 @@ -621894,7 +621894,7 @@ _0812E4A0: strb r0, [r1] ldr r1, _0812E5A4 adds r0, r2, #0 - bl sub_0800858C + bl SetSubspriteTables ldr r5, _0812E5A8 ldr r0, [r5] adds r0, #0x49 @@ -621904,7 +621904,7 @@ _0812E4A0: cmp r0, #0 bne _0812E520 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _0812E520: ldr r2, [r4] @@ -621929,7 +621929,7 @@ _0812E520: lsls r1, r1, #1 movs r2, #0x54 movs r3, #7 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r4, #4 @@ -621950,7 +621950,7 @@ _0812E520: strb r0, [r1] ldr r1, _0812E5B4 adds r0, r2, #0 - bl sub_0800858C + bl SetSubspriteTables ldr r0, [r5] adds r0, #0x4a strb r4, [r0] @@ -621983,7 +621983,7 @@ sub_0812E5B8: @ 0x0812E5B8 cmp r0, #0 bne _0812E5CC movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _0812E5CC: ldr r2, [r4] @@ -622012,7 +622012,7 @@ _0812E5CC: mov r0, sp movs r2, #0x50 movs r3, #7 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -622035,7 +622035,7 @@ _0812E5CC: orrs r1, r2 strb r1, [r3] ldr r1, _0812E658 - bl sub_0800858C + bl SetSubspriteTables ldr r0, _0812E65C ldr r0, [r0] adds r0, #0x42 @@ -622065,7 +622065,7 @@ _0812E666: lsls r1, r1, #1 movs r2, #0 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r3, r0, #4 @@ -622136,7 +622136,7 @@ sub_0812E6D4: @ 0x0812E6D4 bl __divsi3 lsls r0, r0, #0x10 asrs r0, r0, #0x10 - bl sub_0812BCF8 + bl GetNearbyReelTimeTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -622161,7 +622161,7 @@ sub_0812E71C: @ 0x0812E71C ldr r0, _0812E7CC movs r2, #0x64 movs r3, #9 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -622192,7 +622192,7 @@ sub_0812E71C: @ 0x0812E71C mov sb, r0 adds r0, r2, #0 mov r1, sb - bl sub_0800858C + bl SetSubspriteTables ldr r6, _0812E7D8 ldr r0, [r6] adds r0, #0x4e @@ -622202,7 +622202,7 @@ sub_0812E71C: @ 0x0812E71C ldr r0, _0812E7CC movs r2, #0x68 movs r3, #4 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -622223,7 +622223,7 @@ sub_0812E71C: @ 0x0812E71C strb r5, [r2, #5] adds r0, r2, #0 mov r1, sb - bl sub_0800858C + bl SetSubspriteTables ldr r0, [r6] adds r0, #0x4f strb r4, [r0] @@ -622249,7 +622249,7 @@ sub_0812E7DC: @ 0x0812E7DC lsls r1, r1, #1 movs r2, #0x4c movs r3, #0xb - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -622272,7 +622272,7 @@ sub_0812E7DC: @ 0x0812E7DC orrs r1, r2 strb r1, [r0, #5] ldr r1, _0812E834 - bl sub_0800858C + bl SetSubspriteTables ldr r0, _0812E838 ldr r0, [r0] adds r0, #0x40 @@ -622322,7 +622322,7 @@ _0812E856: ldr r0, [r4] cmp r0, #0 beq _0812E888 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0812E888: @@ -622330,7 +622330,7 @@ _0812E888: ldr r0, [r4] cmp r0, #0 beq _0812E898 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0812E898: @@ -622408,7 +622408,7 @@ sub_0812E908: @ 0x0812E908 ldr r0, [r4] cmp r0, #0 beq _0812E930 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0812E930: @@ -622421,8 +622421,8 @@ _0812E93C: .4byte gUnknown_20205AC _0812E940: .4byte gUnknown_203A7BC thumb_func_end sub_0812E908 - thumb_func_start sub_0812E944 -sub_0812E944: @ 0x0812E944 + thumb_func_start CreateReelTimeSprites1 +CreateReelTimeSprites1: @ 0x0812E944 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -622433,7 +622433,7 @@ sub_0812E944: @ 0x0812E944 movs r1, #0x98 movs r2, #0x20 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -622475,7 +622475,7 @@ sub_0812E944: @ 0x0812E944 movs r1, #0xb8 movs r2, #0x20 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -622508,7 +622508,7 @@ _0812E9E8: .4byte gUnknown_8584D54 _0812E9EC: .4byte gUnknown_20205AC _0812E9F0: .4byte gUnknown_203A800 _0812E9F4: .4byte 0x0000FFFF - thumb_func_end sub_0812E944 + thumb_func_end CreateReelTimeSprites1 thumb_func_start sub_0812E9F8 sub_0812E9F8: @ 0x0812E9F8 @@ -622622,8 +622622,8 @@ _0812EAB8: .4byte gUnknown_203A800 _0812EABC: .4byte gUnknown_20205AC thumb_func_end sub_0812EA8C - thumb_func_start sub_0812EAC0 -sub_0812EAC0: @ 0x0812EAC0 + thumb_func_start CreateReelTimeSprite2 +CreateReelTimeSprite2: @ 0x0812EAC0 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -622633,7 +622633,7 @@ sub_0812EAC0: @ 0x0812EAC0 movs r1, #0x48 movs r2, #0x50 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0812EB50 @@ -622666,7 +622666,7 @@ sub_0812EAC0: @ 0x0812EAC0 movs r1, #0x68 movs r2, #0x50 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -622695,7 +622695,7 @@ sub_0812EAC0: @ 0x0812EAC0 _0812EB4C: .4byte gUnknown_8584D6C _0812EB50: .4byte gUnknown_20205AC _0812EB54: .4byte gUnknown_203A800 - thumb_func_end sub_0812EAC0 + thumb_func_end CreateReelTimeSprite2 thumb_func_start sub_0812EB58 sub_0812EB58: @ 0x0812EB58 @@ -622717,7 +622717,7 @@ sub_0812EB58: @ 0x0812EB58 cmp r0, #0 bgt _0812EBAA movs r0, #7 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r2, _0812EBB8 @@ -622769,7 +622769,7 @@ _0812EBD8: .4byte gUnknown_203A800 sub_0812EBDC: @ 0x0812EBDC push {r4, lr} movs r0, #7 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #4 ldr r1, _0812EC24 @@ -622806,14 +622806,14 @@ _0812EC28: .4byte gUnknown_203A800 _0812EC2C: .4byte gUnknown_20205AC thumb_func_end sub_0812EBDC - thumb_func_start sub_0812EC30 -sub_0812EC30: @ 0x0812EC30 + thumb_func_start VBlankCB_ContestPainting +VBlankCB_ContestPainting: @ 0x0812EC30 push {lr} ldr r0, _0812EC68 movs r1, #0xa8 movs r2, #0x50 movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0812EC6C @@ -622838,7 +622838,7 @@ sub_0812EC30: @ 0x0812EC30 _0812EC68: .4byte gUnknown_8584D84 _0812EC6C: .4byte gUnknown_20205AC _0812EC70: .4byte gUnknown_203A800 - thumb_func_end sub_0812EC30 + thumb_func_end VBlankCB_ContestPainting thumb_func_start sub_0812EC74 sub_0812EC74: @ 0x0812EC74 @@ -622889,7 +622889,7 @@ _0812ECB4: ldr r0, _0812ED24 movs r2, #0x44 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r3, r0, #4 @@ -623033,7 +623033,7 @@ sub_0812EDD0: @ 0x0812EDD0 movs r1, #0xa8 movs r2, #0x3c movs r3, #8 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -623206,7 +623206,7 @@ sub_0812EF10: @ 0x0812EF10 asrs r2, r2, #0x10 adds r1, r3, #0 movs r3, #0xc - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -623347,7 +623347,7 @@ sub_0812EFEC: @ 0x0812EFEC asrs r2, r2, #0x10 mov r0, sp movs r3, #0x10 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r7, r0, #0 @@ -623372,7 +623372,7 @@ sub_0812EFEC: @ 0x0812EFEC cmp r1, #0 beq _0812F066 adds r0, r2, #0 - bl sub_0800858C + bl SetSubspriteTables _0812F066: adds r0, r7, #0 add sp, #0x18 @@ -623971,7 +623971,7 @@ sub_0812F480: @ 0x0812F480 adds r0, r0, r1 ldr r4, [r0] movs r0, #6 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #4 @@ -623981,7 +623981,7 @@ sub_0812F480: @ 0x0812F480 lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r5, #0x32] adds r0, #1 strh r0, [r5, #0x32] @@ -624005,7 +624005,7 @@ _0812F4D0: adds r0, r0, r1 ldr r4, [r0] movs r0, #6 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #4 @@ -624015,7 +624015,7 @@ _0812F4D0: lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r5, #0x32] adds r0, #1 movs r1, #0 @@ -624396,7 +624396,7 @@ sub_0812F7A4: @ 0x0812F7A4 ldr r0, _0812F7CC ldr r4, [r0] movs r0, #6 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #4 @@ -624406,7 +624406,7 @@ sub_0812F7A4: @ 0x0812F7A4 lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -624458,7 +624458,7 @@ sub_0812F7F4: @ 0x0812F7F4 bl sub_08034370 ldr r4, _0812F8A4 movs r0, #0xb0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r3, #0 ldr r5, _0812F8A8 @@ -624526,12 +624526,12 @@ sub_0812F8B0: @ 0x0812F8B0 push {r4, r5, r6, lr} ldr r5, _0812F90C movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] ldr r4, _0812F910 movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] adds r3, r0, #0 movs r1, #0 @@ -624563,7 +624563,7 @@ _0812F8D6: strh r1, [r0, #4] movs r1, #0x11 strh r1, [r0, #6] - bl sub_08008210 + bl LoadSpriteSheet pop {r4, r5, r6} pop {r0} bx r0 @@ -624573,8 +624573,8 @@ _0812F910: .4byte gUnknown_203A7AC _0812F914: .4byte gUnknown_8585368 thumb_func_end sub_0812F8B0 - thumb_func_start sub_0812F918 -sub_0812F918: @ 0x0812F918 + thumb_func_start Anim_SwordsDanceBlade +Anim_SwordsDanceBlade: @ 0x0812F918 push {r4, lr} ldr r4, _0812F958 movs r0, #0x80 @@ -624593,11 +624593,11 @@ sub_0812F918: @ 0x0812F918 ldr r0, _0812F960 movs r1, #0 movs r2, #0xa0 - bl sub_080A1200 + bl LoadPalette ldr r0, _0812F964 movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -624606,13 +624606,13 @@ _0812F958: .4byte gUnknown_203A794 _0812F95C: .4byte gUnknown_8586F4C _0812F960: .4byte gUnknown_858544C _0812F964: .4byte gUnknown_8585628 - thumb_func_end sub_0812F918 + thumb_func_end Anim_SwordsDanceBlade thumb_func_start sub_0812F968 sub_0812F968: @ 0x0812F968 push {lr} bl sub_0812F978 - bl sub_0812F9A4 + bl LoadSlotMachineWheelOverlay pop {r0} bx r0 .align 2, 0 @@ -624644,8 +624644,8 @@ _0812F97C: _0812F9A0: .4byte gUnknown_8587AEC thumb_func_end sub_0812F978 - thumb_func_start sub_0812F9A4 -sub_0812F9A4: @ 0x0812F9A4 + thumb_func_start LoadSlotMachineWheelOverlay +LoadSlotMachineWheelOverlay: @ 0x0812F9A4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -624766,7 +624766,7 @@ _0812FA56: bx r0 .align 2, 0 _0812FA98: .4byte gUnknown_203A79C - thumb_func_end sub_0812F9A4 + thumb_func_end LoadSlotMachineWheelOverlay thumb_func_start sub_0812FA9C sub_0812FA9C: @ 0x0812FA9C @@ -624848,7 +624848,7 @@ _0812FB1C: cmp r4, #0x13 bls _0812FB1C movs r0, #3 - bl sub_08001B5C + bl HideBg pop {r4} pop {r0} bx r0 @@ -624933,14 +624933,14 @@ _0812FBF4: .4byte gUnknown_203A7DC _0812FBF8: .4byte gUnknown_203A7E0 thumb_func_end SlotMachineSetup_9_0 - thumb_func_start sub_0812FBFC -sub_0812FBFC: @ 0x0812FBFC + thumb_func_start SlotMachineSetup_8_0 +SlotMachineSetup_8_0: @ 0x0812FBFC push {r4, r5, r6, lr} mov r6, r8 push {r6} ldr r4, _0812FDA4 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r6, _0812FDA8 ldr r1, [r6] @@ -624950,7 +624950,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r5, [r0, #4] ldr r4, _0812FDAC movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] adds r1, r1, r5 @@ -624962,7 +624962,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r2, [r0, #4] ldr r4, _0812FDB0 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r3, #0x80 @@ -624973,7 +624973,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r4, [r0, #4] ldr r4, _0812FDB4 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r2, #0xa0 @@ -624984,7 +624984,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r3, [r0, #4] ldr r4, _0812FDB8 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r4, #0xc0 @@ -624996,7 +624996,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r5, [r0, #4] ldr r4, _0812FDBC movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r2, #0x80 @@ -625008,7 +625008,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r1, [r0, #4] ldr r4, _0812FDC0 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r3, #0xa0 @@ -625019,7 +625019,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r4, [r0, #4] ldr r4, _0812FDC4 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r2, #0xb0 @@ -625029,7 +625029,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r5, [r0, #4] ldr r4, _0812FDC8 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r3, #0xc8 @@ -625039,7 +625039,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r5, [r0, #4] ldr r4, _0812FDCC movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r4, #0xe0 @@ -625055,7 +625055,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r2, [r0, #0xc] ldr r4, _0812FDD0 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, [r6] movs r4, #0x80 @@ -625067,7 +625067,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r1, [r0, #4] ldr r4, _0812FDD4 movs r0, #0x28 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r2, [r6] movs r3, #0x8a @@ -625096,7 +625096,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r3, [r0, #0x24] ldr r4, _0812FDD8 movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r2, [r6] movs r3, #0x98 @@ -625113,7 +625113,7 @@ sub_0812FBFC: @ 0x0812FBFC strh r1, [r0, #0xc] ldr r4, _0812FDDC movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r2, [r6] movs r3, #0xbc @@ -625149,7 +625149,7 @@ _0812FDD0: .4byte gUnknown_203A7E8 _0812FDD4: .4byte gUnknown_203A7EC _0812FDD8: .4byte gUnknown_203A7F0 _0812FDDC: .4byte gUnknown_203A7F4 - thumb_func_end sub_0812FBFC + thumb_func_end SlotMachineSetup_8_0 thumb_func_start sub_0812FDE0 sub_0812FDE0: @ 0x0812FDE0 @@ -625184,48 +625184,48 @@ _0812FE1C: .4byte gUnknown_2039BDC _0812FE20: .4byte 0x00002E90 thumb_func_end sub_0812FDE0 - thumb_func_start sub_0812FE24 -sub_0812FE24: @ 0x0812FE24 + thumb_func_start CB2_ContestPainting +CB2_ContestPainting: @ 0x0812FE24 push {lr} - bl sub_0812FE90 + bl ShowContestPainting pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812FE24 + thumb_func_end CB2_ContestPainting - thumb_func_start sub_0812FE30 -sub_0812FE30: @ 0x0812FE30 + thumb_func_start CB2_HoldContestPainting +CB2_HoldContestPainting: @ 0x0812FE30 push {lr} - bl sub_08130000 + bl HoldContestPainting bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0812FE30 + thumb_func_end CB2_HoldContestPainting - thumb_func_start sub_0812FE44 -sub_0812FE44: @ 0x0812FE44 + thumb_func_start CB2_QuitContestPainting +CB2_QuitContestPainting: @ 0x0812FE44 push {r4, r5, lr} ldr r0, _0812FE80 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 ldr r4, _0812FE84 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r5, #0 str r5, [r4] ldr r4, _0812FE88 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r0, _0812FE8C ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow movs r0, #1 - bl sub_08002194 - bl sub_08000BF0 - bl sub_0805ECB0 + bl GetBgTilemapBuffer + bl Free + bl FreeMonSpritesGfx pop {r4, r5} pop {r0} bx r0 @@ -625234,10 +625234,10 @@ _0812FE80: .4byte gUnknown_3002360 _0812FE84: .4byte gUnknown_3005F04 _0812FE88: .4byte gUnknown_3005ED0 _0812FE8C: .4byte gUnknown_30011F7 - thumb_func_end sub_0812FE44 + thumb_func_end CB2_QuitContestPainting - thumb_func_start sub_0812FE90 -sub_0812FE90: @ 0x0812FE90 + thumb_func_start ShowContestPainting +ShowContestPainting: @ 0x0812FE90 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r1, _0812FEB0 @@ -625265,16 +625265,16 @@ _0812FEB8: @ jump table .4byte _0812FF62 @ case 3 .4byte _0812FF8C @ case 4 _0812FECC: - bl sub_080B9710 + bl ScanlineEffect_Stop movs r0, #0 - bl sub_080006F0 - bl sub_0805EBD8 + bl SetVBlankCallback + bl AllocateMonSpritesGfx ldr r1, _0812FEF4 ldr r0, _0812FEF8 str r0, [r1] movs r0, #1 bl InitContestPaintingVars - bl sub_08130244 + bl InitContestPaintingBg ldr r1, _0812FEFC movs r0, #0x87 lsls r0, r0, #3 @@ -625323,9 +625323,9 @@ _0812FF44: .4byte 0x040000D4 _0812FF48: .4byte 0x85000400 _0812FF4C: ldrh r0, [r4, #0x20] - bl sub_0806F07C + bl SeedRng bl InitKeys - bl sub_081300D0 + bl InitContestPaintingWindow movs r0, #0x87 lsls r0, r0, #3 adds r1, r4, r0 @@ -625359,7 +625359,7 @@ _0812FF8C: ldr r0, _0812FFE8 movs r1, #0 movs r2, #2 - bl sub_080A1200 + bl LoadPalette movs r1, #0xa0 lsls r1, r1, #0x13 movs r4, #0 @@ -625374,7 +625374,7 @@ _0812FF8C: movs r0, #2 bl BeginFastPaletteFade ldr r0, _0812FFF4 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0812FFF8 strb r4, [r0] movs r1, #0x9a @@ -625382,7 +625382,7 @@ _0812FF8C: movs r0, #0 bl SetGpuReg ldr r0, _0812FFFC - bl sub_08000540 + bl SetMainCallback2 _0812FFD8: add sp, #4 pop {r4, r5, r6, r7} @@ -625394,13 +625394,13 @@ _0812FFE4: .4byte gUnknown_2039BFC _0812FFE8: .4byte gUnknown_858F648 _0812FFEC: .4byte 0x040000D4 _0812FFF0: .4byte 0x85000100 -_0812FFF4: .4byte sub_08130328 +_0812FFF4: .4byte SlotMachineSetup_6_0 _0812FFF8: .4byte gUnknown_30011F0 -_0812FFFC: .4byte sub_0812FE30 - thumb_func_end sub_0812FE90 +_0812FFFC: .4byte CB2_HoldContestPainting + thumb_func_end ShowContestPainting - thumb_func_start sub_08130000 -sub_08130000: @ 0x08130000 + thumb_func_start HoldContestPainting +HoldContestPainting: @ 0x08130000 push {lr} sub sp, #4 ldr r3, _08130018 @@ -625460,7 +625460,7 @@ _08130066: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _08130078: ldr r0, _0813008C ldrb r0, [r0] @@ -625481,7 +625481,7 @@ _08130094: cmp r0, #0 bne _081300A6 ldr r0, _081300C4 - bl sub_08000540 + bl SetMainCallback2 _081300A6: ldr r0, _081300C8 ldrb r0, [r0] @@ -625500,13 +625500,13 @@ _081300BA: bx r0 .align 2, 0 _081300C0: .4byte gUnknown_2037C74 -_081300C4: .4byte sub_0812FE44 +_081300C4: .4byte CB2_QuitContestPainting _081300C8: .4byte gUnknown_30011F6 _081300CC: .4byte gUnknown_30011F4 - thumb_func_end sub_08130000 + thumb_func_end HoldContestPainting - thumb_func_start sub_081300D0 -sub_081300D0: @ 0x081300D0 + thumb_func_start InitContestPaintingWindow +InitContestPaintingWindow: @ 0x081300D0 push {r4, lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -625517,32 +625517,32 @@ sub_081300D0: @ 0x081300D0 movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x80 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r4, _0813013C ldr r0, _08130140 - bl sub_08003250 + bl AddWindow strb r0, [r4] bl sub_08004480 ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_08001B48 + bl ShowBg pop {r4} pop {r0} bx r0 @@ -625550,7 +625550,7 @@ sub_081300D0: @ 0x081300D0 _08130138: .4byte gUnknown_858F5F8 _0813013C: .4byte gUnknown_30011F7 _08130140: .4byte gUnknown_858F5FC - thumb_func_end sub_081300D0 + thumb_func_end InitContestPaintingWindow thumb_func_start sub_08130144 sub_08130144: @ 0x08130144 @@ -625599,7 +625599,7 @@ sub_08130144: @ 0x08130144 ldr r4, _081301E8 ldr r1, _081301EC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _081301F0 ldrb r0, [r0] movs r1, #1 @@ -625634,7 +625634,7 @@ _081301F4: adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08130240 ldrb r0, [r0] movs r1, #1 @@ -625648,7 +625648,7 @@ _081301F4: bl AddTextPrinterParameterized _08130224: movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0813022A: add sp, #0xc pop {r4, r5, r6} @@ -625661,8 +625661,8 @@ _0813023C: .4byte gUnknown_858F604 _08130240: .4byte gUnknown_30011F7 thumb_func_end sub_08130144 - thumb_func_start sub_08130244 -sub_08130244: @ 0x08130244 + thumb_func_start InitContestPaintingBg +InitContestPaintingBg: @ 0x08130244 push {lr} movs r0, #0 movs r1, #0 @@ -625693,7 +625693,7 @@ sub_08130244: @ 0x08130244 _08130284: .4byte 0x04000200 _08130288: .4byte 0x00000C42 _0813028C: .4byte 0x00000A45 - thumb_func_end sub_08130244 + thumb_func_end InitContestPaintingBg thumb_func_start InitContestPaintingVars InitContestPaintingVars: @ 0x08130290 @@ -625732,8 +625732,8 @@ _081302D0: .4byte gUnknown_30011F2 _081302D4: .4byte gUnknown_30011F4 thumb_func_end InitContestPaintingVars - thumb_func_start sub_081302D8 -sub_081302D8: @ 0x081302D8 + thumb_func_start UpdateContestPaintingMosaicEffect +UpdateContestPaintingMosaicEffect: @ 0x081302D8 push {lr} ldr r0, _081302EC ldrb r0, [r0] @@ -625771,19 +625771,19 @@ _08130318: _0813031C: .4byte 0x00000A45 _08130320: .4byte gUnknown_30011F2 _08130324: .4byte gUnknown_30011F4 - thumb_func_end sub_081302D8 + thumb_func_end UpdateContestPaintingMosaicEffect - thumb_func_start sub_08130328 -sub_08130328: @ 0x08130328 + thumb_func_start SlotMachineSetup_6_0 +SlotMachineSetup_6_0: @ 0x08130328 push {lr} - bl sub_081302D8 - bl sub_08006EA0 - bl sub_08007144 + bl UpdateContestPaintingMosaicEffect + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08130328 + thumb_func_end SlotMachineSetup_6_0 thumb_func_start sub_08130340 sub_08130340: @ 0x08130340 @@ -625798,7 +625798,7 @@ sub_08130340: @ 0x08130340 ldr r1, [r0, #4] ldr r2, [r0] adds r0, r5, #0 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality ldr r7, _08130390 ldr r1, [r7] bl sub_0803437C @@ -625966,7 +625966,7 @@ sub_08130488: @ 0x08130488 movs r2, #0x80 lsls r2, r2, #1 movs r1, #0 - bl sub_080A1200 + bl LoadPalette cmp r4, #1 beq _081304A6 b _081305FC @@ -626321,12 +626321,12 @@ sub_08130790: @ 0x08130790 ldr r4, _081307B0 movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r4, _081307B4 movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] pop {r4} pop {r0} @@ -626436,7 +626436,7 @@ _0813089E: lsls r1, r1, #1 movs r2, #0x80 lsls r2, r2, #2 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -626533,7 +626533,7 @@ _0813097C: ble _0813094E _08130982: adds r0, r7, #0 - bl sub_081309A4 + bl BattleAI_SetupAIData pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -626545,8 +626545,8 @@ _0813099C: .4byte gUnknown_203886A _081309A0: .4byte gUnknown_82E3846 thumb_func_end sub_08130920 - thumb_func_start sub_081309A4 -sub_081309A4: @ 0x081309A4 + thumb_func_start BattleAI_SetupAIData +BattleAI_SetupAIData: @ 0x081309A4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -626593,7 +626593,7 @@ _081309EC: ldrb r0, [r6] movs r1, #0 movs r2, #0xff - bl sub_0803FB0C + bl CheckMoveLimitations lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r4, #0 @@ -626648,7 +626648,7 @@ _08130A22: bl Random adds r4, r0, #0 ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide movs r3, #2 adds r1, r3, #0 ands r1, r4 @@ -626743,7 +626743,7 @@ _08130B2C: ands r0, r1 cmp r0, #0 beq _08130B48 - bl sub_081A6D4C + bl GetAiScriptsInBattleFactory _08130B3A: ldr r1, _08130B44 ldr r1, [r1] @@ -626830,7 +626830,7 @@ _08130BDC: .4byte gUnknown_202414C _08130BE0: .4byte gUnknown_82E383C _08130BE4: .4byte gUnknown_203886A _08130BE8: .4byte gUnknown_2022C90 - thumb_func_end sub_081309A4 + thumb_func_end BattleAI_SetupAIData thumb_func_start sub_08130BEC sub_08130BEC: @ 0x08130BEC @@ -626841,12 +626841,12 @@ sub_08130BEC: @ 0x08130BEC ands r0, r1 cmp r0, #0 beq _08130C04 - bl sub_08130D28 + bl ChooseMoveOrAction_Doubles b _08130C08 .align 2, 0 _08130C00: .4byte gUnknown_2022C90 _08130C04: - bl sub_08130C10 + bl ChooseMoveOrAction_Singles _08130C08: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -626854,13 +626854,13 @@ _08130C08: bx r1 thumb_func_end sub_08130BEC - thumb_func_start sub_08130C10 -sub_08130C10: @ 0x08130C10 + thumb_func_start ChooseMoveOrAction_Singles +ChooseMoveOrAction_Singles: @ 0x08130C10 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #8 - bl sub_081310A8 + bl RecordLastUsedMoveByTarget ldr r1, _08130C78 ldr r0, [r1] ldr r0, [r0, #0x14] @@ -626878,7 +626878,7 @@ _08130C2C: cmp r0, #0 beq _08130C40 strb r5, [r2] - bl sub_08130F7C + bl BattleAI_DoAIProcessing _08130C40: ldr r0, [r4] ldr r1, [r0, #0x14] @@ -626999,10 +626999,10 @@ _08130D14: .align 2, 0 _08130D20: .4byte gUnknown_2023D28 _08130D24: .4byte gUnknown_203A808 - thumb_func_end sub_08130C10 + thumb_func_end ChooseMoveOrAction_Singles - thumb_func_start sub_08130D28 -sub_08130D28: @ 0x08130D28 + thumb_func_start ChooseMoveOrAction_Doubles +ChooseMoveOrAction_Doubles: @ 0x08130D28 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -627058,14 +627058,14 @@ _08130D7C: adds r0, #0x92 ldrb r0, [r0] lsrs r0, r0, #4 - bl sub_081309A4 + bl BattleAI_SetupAIData b _08130DAA .align 2, 0 _08130D9C: .4byte gUnknown_2022C90 _08130DA0: .4byte gUnknown_2024140 _08130DA4: movs r0, #0xf - bl sub_081309A4 + bl BattleAI_SetupAIData _08130DAA: ldr r0, _08130E24 mov r1, r8 @@ -627078,7 +627078,7 @@ _08130DAA: ands r1, r0 cmp r2, r1 beq _08130DC4 - bl sub_081310A8 + bl RecordLastUsedMoveByTarget _08130DC4: ldr r2, _08130E2C ldr r0, [r2] @@ -627104,7 +627104,7 @@ _08130DE4: ldr r0, [r5] ldr r0, [r0, #0x14] strb r6, [r0] - bl sub_08130F7C + bl BattleAI_DoAIProcessing _08130DF6: asrs r4, r4, #1 ldr r0, [r5] @@ -627303,10 +627303,10 @@ _08130F6C: .4byte gUnknown_203A808 _08130F70: .4byte gUnknown_2023D34 _08130F74: .4byte 0x0000FFFF _08130F78: .4byte gUnknown_2023EB0 - thumb_func_end sub_08130D28 + thumb_func_end ChooseMoveOrAction_Doubles - thumb_func_start sub_08130F7C -sub_08130F7C: @ 0x08130F7C + thumb_func_start BattleAI_DoAIProcessing +BattleAI_DoAIProcessing: @ 0x08130F7C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -627459,10 +627459,10 @@ _0813109A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08130F7C + thumb_func_end BattleAI_DoAIProcessing - thumb_func_start sub_081310A8 -sub_081310A8: @ 0x081310A8 + thumb_func_start RecordLastUsedMoveByTarget +RecordLastUsedMoveByTarget: @ 0x081310A8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -627526,7 +627526,7 @@ _08131118: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081310A8 + thumb_func_end RecordLastUsedMoveByTarget thumb_func_start ClearBattlerMoveHistory ClearBattlerMoveHistory: @ 0x08131124 @@ -627552,8 +627552,8 @@ _08131130: _08131148: .4byte gUnknown_202414C thumb_func_end ClearBattlerMoveHistory - thumb_func_start sub_0813114C -sub_0813114C: @ 0x0813114C + thumb_func_start RecordAbilityBattle +RecordAbilityBattle: @ 0x0813114C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08131160 @@ -627565,7 +627565,7 @@ sub_0813114C: @ 0x0813114C bx lr .align 2, 0 _08131160: .4byte gUnknown_202414C - thumb_func_end sub_0813114C + thumb_func_end RecordAbilityBattle thumb_func_start ClearBattlerAbilityHistory ClearBattlerAbilityHistory: @ 0x08131164 @@ -627583,8 +627583,8 @@ ClearBattlerAbilityHistory: @ 0x08131164 _08131178: .4byte gUnknown_202414C thumb_func_end ClearBattlerAbilityHistory - thumb_func_start sub_0813117C -sub_0813117C: @ 0x0813117C + thumb_func_start RecordItemEffectBattle +RecordItemEffectBattle: @ 0x0813117C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08131190 @@ -627596,7 +627596,7 @@ sub_0813117C: @ 0x0813117C bx lr .align 2, 0 _08131190: .4byte gUnknown_202414C - thumb_func_end sub_0813117C + thumb_func_end RecordItemEffectBattle thumb_func_start ClearBattlerItemEffectHistory ClearBattlerItemEffectHistory: @ 0x08131194 @@ -627614,8 +627614,8 @@ ClearBattlerItemEffectHistory: @ 0x08131194 _081311A8: .4byte gUnknown_202414C thumb_func_end ClearBattlerItemEffectHistory - thumb_func_start sub_081311AC -sub_081311AC: @ 0x081311AC + thumb_func_start BattleAICmd_if_random_less_than +BattleAICmd_if_random_less_than: @ 0x081311AC push {lr} bl Random lsls r0, r0, #0x10 @@ -627648,10 +627648,10 @@ _081311E4: _081311E8: pop {r0} bx r0 - thumb_func_end sub_081311AC + thumb_func_end BattleAICmd_if_random_less_than - thumb_func_start sub_081311EC -sub_081311EC: @ 0x081311EC + thumb_func_start BattleAICmd_if_random_greater_than +BattleAICmd_if_random_greater_than: @ 0x081311EC push {lr} bl Random lsls r0, r0, #0x10 @@ -627684,10 +627684,10 @@ _08131224: _08131228: pop {r0} bx r0 - thumb_func_end sub_081311EC + thumb_func_end BattleAICmd_if_random_greater_than - thumb_func_start sub_0813122C -sub_0813122C: @ 0x0813122C + thumb_func_start BattleAICmd_if_random_equal +BattleAICmd_if_random_equal: @ 0x0813122C push {lr} bl Random lsls r0, r0, #0x10 @@ -627720,10 +627720,10 @@ _08131264: _08131268: pop {r0} bx r0 - thumb_func_end sub_0813122C + thumb_func_end BattleAICmd_if_random_equal - thumb_func_start sub_0813126C -sub_0813126C: @ 0x0813126C + thumb_func_start BattleAICmd_if_random_not_equal +BattleAICmd_if_random_not_equal: @ 0x0813126C push {lr} bl Random lsls r0, r0, #0x10 @@ -627756,7 +627756,7 @@ _081312A4: _081312A8: pop {r0} bx r0 - thumb_func_end sub_0813126C + thumb_func_end BattleAICmd_if_random_not_equal thumb_func_start BattleAICmd_score BattleAICmd_score: @ 0x081312AC @@ -627796,8 +627796,8 @@ _081312E8: .4byte gUnknown_202414C _081312EC: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_score - thumb_func_start sub_081312F0 -sub_081312F0: @ 0x081312F0 + thumb_func_start BattleAICmd_if_hp_less_than +BattleAICmd_if_hp_less_than: @ 0x081312F0 push {r4, lr} ldr r0, _08131304 ldr r1, [r0] @@ -627850,7 +627850,7 @@ _08131350: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081312F0 + thumb_func_end BattleAICmd_if_hp_less_than thumb_func_start sub_08131358 sub_08131358: @ 0x08131358 @@ -627908,8 +627908,8 @@ _081313B8: .align 2, 0 thumb_func_end sub_08131358 - thumb_func_start sub_081313C0 -sub_081313C0: @ 0x081313C0 + thumb_func_start BattleAICmd_if_hp_equal +BattleAICmd_if_hp_equal: @ 0x081313C0 push {r4, lr} ldr r0, _081313D4 ldr r1, [r0] @@ -627962,10 +627962,10 @@ _08131420: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081313C0 + thumb_func_end BattleAICmd_if_hp_equal - thumb_func_start sub_08131428 -sub_08131428: @ 0x08131428 + thumb_func_start BattleAICmd_if_hp_not_equal +BattleAICmd_if_hp_not_equal: @ 0x08131428 push {r4, lr} ldr r0, _0813143C ldr r1, [r0] @@ -628018,10 +628018,10 @@ _08131488: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131428 + thumb_func_end BattleAICmd_if_hp_not_equal - thumb_func_start sub_08131490 -sub_08131490: @ 0x08131490 + thumb_func_start BattleAICmd_if_status +BattleAICmd_if_status: @ 0x08131490 push {r4, r5, lr} ldr r0, _081314A4 ldr r1, [r0] @@ -628081,10 +628081,10 @@ _081314FE: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08131490 + thumb_func_end BattleAICmd_if_status - thumb_func_start sub_08131504 -sub_08131504: @ 0x08131504 + thumb_func_start BattleAICmd_if_not_status +BattleAICmd_if_not_status: @ 0x08131504 push {r4, r5, lr} ldr r0, _08131518 ldr r1, [r0] @@ -628144,10 +628144,10 @@ _08131572: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08131504 + thumb_func_end BattleAICmd_if_not_status - thumb_func_start sub_08131578 -sub_08131578: @ 0x08131578 + thumb_func_start BattleAICmd_if_status2 +BattleAICmd_if_status2: @ 0x08131578 push {r4, r5, lr} ldr r0, _0813158C ldr r1, [r0] @@ -628207,10 +628207,10 @@ _081315E6: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08131578 + thumb_func_end BattleAICmd_if_status2 - thumb_func_start sub_081315EC -sub_081315EC: @ 0x081315EC + thumb_func_start BattleAICmd_if_not_status2 +BattleAICmd_if_not_status2: @ 0x081315EC push {r4, r5, lr} ldr r0, _08131600 ldr r1, [r0] @@ -628270,10 +628270,10 @@ _0813165A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081315EC + thumb_func_end BattleAICmd_if_not_status2 - thumb_func_start sub_08131660 -sub_08131660: @ 0x08131660 + thumb_func_start DisplayBerryPowderVendorMenu +DisplayBerryPowderVendorMenu: @ 0x08131660 push {r4, r5, lr} ldr r0, _08131674 ldr r1, [r0] @@ -628331,10 +628331,10 @@ _081316CA: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08131660 + thumb_func_end DisplayBerryPowderVendorMenu - thumb_func_start sub_081316D0 -sub_081316D0: @ 0x081316D0 + thumb_func_start BattleAICmd_if_not_status3 +BattleAICmd_if_not_status3: @ 0x081316D0 push {r4, r5, lr} ldr r0, _081316E4 ldr r1, [r0] @@ -628392,10 +628392,10 @@ _0813173A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081316D0 + thumb_func_end BattleAICmd_if_not_status3 - thumb_func_start sub_08131740 -sub_08131740: @ 0x08131740 + thumb_func_start BattleAICmd_if_side_affecting +BattleAICmd_if_side_affecting: @ 0x08131740 push {r4, lr} ldr r0, _08131750 ldr r0, [r0] @@ -628457,10 +628457,10 @@ _081317B6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08131740 + thumb_func_end BattleAICmd_if_side_affecting - thumb_func_start sub_081317BC -sub_081317BC: @ 0x081317BC + thumb_func_start BattleAICmd_if_not_side_affecting +BattleAICmd_if_not_side_affecting: @ 0x081317BC push {r4, lr} ldr r0, _081317CC ldr r0, [r0] @@ -628522,10 +628522,10 @@ _08131832: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081317BC + thumb_func_end BattleAICmd_if_not_side_affecting - thumb_func_start sub_08131838 -sub_08131838: @ 0x08131838 + thumb_func_start BattleAICmd_if_less_than +BattleAICmd_if_less_than: @ 0x08131838 push {lr} ldr r0, _08131864 ldr r0, [r0] @@ -628557,10 +628557,10 @@ _0813186C: _08131870: pop {r0} bx r0 - thumb_func_end sub_08131838 + thumb_func_end BattleAICmd_if_less_than - thumb_func_start sub_08131874 -sub_08131874: @ 0x08131874 + thumb_func_start BattleAICmd_if_more_than +BattleAICmd_if_more_than: @ 0x08131874 push {lr} ldr r0, _081318A0 ldr r0, [r0] @@ -628592,10 +628592,10 @@ _081318A8: _081318AC: pop {r0} bx r0 - thumb_func_end sub_08131874 + thumb_func_end BattleAICmd_if_more_than - thumb_func_start sub_081318B0 -sub_081318B0: @ 0x081318B0 + thumb_func_start BattleAICmd_if_equal +BattleAICmd_if_equal: @ 0x081318B0 push {lr} ldr r0, _081318DC ldr r0, [r0] @@ -628627,10 +628627,10 @@ _081318E4: _081318E8: pop {r0} bx r0 - thumb_func_end sub_081318B0 + thumb_func_end BattleAICmd_if_equal - thumb_func_start sub_081318EC -sub_081318EC: @ 0x081318EC + thumb_func_start BattleAICmd_if_not_equal +BattleAICmd_if_not_equal: @ 0x081318EC push {lr} ldr r0, _08131918 ldr r0, [r0] @@ -628662,10 +628662,10 @@ _08131920: _08131924: pop {r0} bx r0 - thumb_func_end sub_081318EC + thumb_func_end BattleAICmd_if_not_equal - thumb_func_start sub_08131928 -sub_08131928: @ 0x08131928 + thumb_func_start BattleAICmd_if_less_than_ptr +BattleAICmd_if_less_than_ptr: @ 0x08131928 push {lr} ldr r3, _08131968 ldr r2, [r3] @@ -628709,10 +628709,10 @@ _08131976: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131928 + thumb_func_end BattleAICmd_if_less_than_ptr - thumb_func_start sub_0813197C -sub_0813197C: @ 0x0813197C + thumb_func_start BattleAICmd_if_more_than_ptr +BattleAICmd_if_more_than_ptr: @ 0x0813197C push {lr} ldr r3, _081319BC ldr r2, [r3] @@ -628756,10 +628756,10 @@ _081319CA: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813197C + thumb_func_end BattleAICmd_if_more_than_ptr - thumb_func_start sub_081319D0 -sub_081319D0: @ 0x081319D0 + thumb_func_start BattleAICmd_if_equal_ptr +BattleAICmd_if_equal_ptr: @ 0x081319D0 push {lr} ldr r3, _08131A10 ldr r2, [r3] @@ -628803,10 +628803,10 @@ _08131A1E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081319D0 + thumb_func_end BattleAICmd_if_equal_ptr - thumb_func_start sub_08131A24 -sub_08131A24: @ 0x08131A24 + thumb_func_start BattleAICmd_if_not_equal_ptr +BattleAICmd_if_not_equal_ptr: @ 0x08131A24 push {lr} ldr r3, _08131A64 ldr r2, [r3] @@ -628850,10 +628850,10 @@ _08131A72: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131A24 + thumb_func_end BattleAICmd_if_not_equal_ptr - thumb_func_start sub_08131A78 -sub_08131A78: @ 0x08131A78 + thumb_func_start BattleAICmd_if_move +BattleAICmd_if_move: @ 0x08131A78 push {lr} ldr r3, _08131AAC ldr r2, [r3] @@ -628888,10 +628888,10 @@ _08131AB4: _08131AB8: pop {r0} bx r0 - thumb_func_end sub_08131A78 + thumb_func_end BattleAICmd_if_move - thumb_func_start sub_08131ABC -sub_08131ABC: @ 0x08131ABC + thumb_func_start BattleAICmd_if_not_move +BattleAICmd_if_not_move: @ 0x08131ABC push {lr} ldr r3, _08131AF0 ldr r2, [r3] @@ -628926,10 +628926,10 @@ _08131AF8: _08131AFC: pop {r0} bx r0 - thumb_func_end sub_08131ABC + thumb_func_end BattleAICmd_if_not_move - thumb_func_start sub_08131B00 -sub_08131B00: @ 0x08131B00 + thumb_func_start BattleAICmd_if_in_bytes +BattleAICmd_if_in_bytes: @ 0x08131B00 push {r4, lr} ldr r2, _08131B4C ldr r1, [r2] @@ -628984,10 +628984,10 @@ _08131B62: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08131B00 + thumb_func_end BattleAICmd_if_in_bytes - thumb_func_start sub_08131B68 -sub_08131B68: @ 0x08131B68 + thumb_func_start BattleAICmd_if_not_in_bytes +BattleAICmd_if_not_in_bytes: @ 0x08131B68 push {r4, lr} ldr r2, _08131BA4 ldr r1, [r2] @@ -629044,7 +629044,7 @@ _08131BCC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131B68 + thumb_func_end BattleAICmd_if_not_in_bytes thumb_func_start sub_08131BD4 sub_08131BD4: @ 0x08131BD4 @@ -629106,8 +629106,8 @@ _08131C3A: bx r0 thumb_func_end sub_08131BD4 - thumb_func_start sub_08131C40 -sub_08131C40: @ 0x08131C40 + thumb_func_start BattleAICmd_if_not_in_hwords +BattleAICmd_if_not_in_hwords: @ 0x08131C40 push {r4, r5, lr} ldr r2, _08131C7C ldr r1, [r2] @@ -629166,10 +629166,10 @@ _08131CA8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131C40 + thumb_func_end BattleAICmd_if_not_in_hwords - thumb_func_start sub_08131CB0 -sub_08131CB0: @ 0x08131CB0 + thumb_func_start BattleAICmd_if_user_has_attacking_move +BattleAICmd_if_user_has_attacking_move: @ 0x08131CB0 push {r4, r5, lr} movs r3, #0 ldr r4, _08131CF0 @@ -629227,10 +629227,10 @@ _08131D18: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131CB0 + thumb_func_end BattleAICmd_if_user_has_attacking_move - thumb_func_start sub_08131D20 -sub_08131D20: @ 0x08131D20 + thumb_func_start BattleAICmd_if_user_has_no_attacking_moves +BattleAICmd_if_user_has_no_attacking_moves: @ 0x08131D20 push {r4, r5, lr} movs r3, #0 ldr r4, _08131D60 @@ -629288,7 +629288,7 @@ _08131D88: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08131D20 + thumb_func_end BattleAICmd_if_user_has_no_attacking_moves thumb_func_start BattleAICmd_get_turn_count BattleAICmd_get_turn_count: @ 0x08131D90 @@ -629309,8 +629309,8 @@ _08131DAC: .4byte gUnknown_3005A70 _08131DB0: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_get_turn_count - thumb_func_start sub_08131DB4 -sub_08131DB4: @ 0x08131DB4 + thumb_func_start BattleAICmd_get_type +BattleAICmd_get_type: @ 0x08131DB4 push {r4, lr} ldr r1, _08131DCC ldr r0, [r1] @@ -629423,10 +629423,10 @@ _08131E8E: .align 2, 0 _08131E9C: .4byte gUnknown_202414C _08131EA0: .4byte gUnknown_82ED220 - thumb_func_end sub_08131DB4 + thumb_func_end BattleAICmd_get_type - thumb_func_start sub_08131EA4 -sub_08131EA4: @ 0x08131EA4 + thumb_func_start BattleAI_GetWantedBattler +BattleAI_GetWantedBattler: @ 0x08131EA4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -629466,15 +629466,15 @@ _08131EE0: bx r1 .align 2, 0 _08131EE4: .4byte gUnknown_2023EB0 - thumb_func_end sub_08131EA4 + thumb_func_end BattleAI_GetWantedBattler - thumb_func_start sub_08131EE8 -sub_08131EE8: @ 0x08131EE8 + thumb_func_start BattleAICmd_is_of_type +BattleAICmd_is_of_type: @ 0x08131EE8 push {r4, lr} ldr r4, _08131F24 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_08131EA4 + bl BattleAI_GetWantedBattler lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08131F28 @@ -629520,7 +629520,7 @@ _08131F38: .align 2, 0 _08131F48: .4byte gUnknown_202414C _08131F4C: .4byte gUnknown_203A804 - thumb_func_end sub_08131EE8 + thumb_func_end BattleAICmd_is_of_type thumb_func_start BattleAICmd_get_considered_move_power BattleAICmd_get_considered_move_power: @ 0x08131F50 @@ -629546,8 +629546,8 @@ _08131F74: .4byte gUnknown_82ED220 _08131F78: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_get_considered_move_power - thumb_func_start sub_08131F7C -sub_08131F7C: @ 0x08131F7C + thumb_func_start BattleAICmd_get_how_powerful_move_is +BattleAICmd_get_how_powerful_move_is: @ 0x08131F7C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -629687,11 +629687,11 @@ _08132048: ldrb r0, [r7] ldr r4, _081320EC ldrb r1, [r4] - bl sub_08046ABC + bl AI_CalcDmg ldrh r0, [r5] ldrb r1, [r7] ldrb r2, [r4] - bl sub_08047224 + bl TypeCalc mov r4, sp add r4, r8 ldr r2, _081320F0 @@ -629802,10 +629802,10 @@ _08132164: bx r0 .align 2, 0 _0813217C: .4byte gUnknown_203A804 - thumb_func_end sub_08131F7C + thumb_func_end BattleAICmd_get_how_powerful_move_is - thumb_func_start sub_08132180 -sub_08132180: @ 0x08132180 + thumb_func_start BattleAICmd_get_last_used_battler_move +BattleAICmd_get_last_used_battler_move: @ 0x08132180 push {lr} ldr r0, _0813219C ldr r1, [r0] @@ -629845,10 +629845,10 @@ _081321B6: _081321CC: .4byte gUnknown_202414C _081321D0: .4byte gUnknown_2023EEC _081321D4: .4byte gUnknown_2023EB0 - thumb_func_end sub_08132180 + thumb_func_end BattleAICmd_get_last_used_battler_move - thumb_func_start sub_081321D8 -sub_081321D8: @ 0x081321D8 + thumb_func_start BattleAICmd_if_equal_ +BattleAICmd_if_equal_: @ 0x081321D8 push {lr} ldr r3, _08132204 ldr r2, [r3] @@ -629880,10 +629880,10 @@ _0813220C: _08132210: pop {r0} bx r0 - thumb_func_end sub_081321D8 + thumb_func_end BattleAICmd_if_equal_ - thumb_func_start sub_08132214 -sub_08132214: @ 0x08132214 + thumb_func_start BattleAICmd_if_not_equal_ +BattleAICmd_if_not_equal_: @ 0x08132214 push {lr} ldr r3, _08132240 ldr r2, [r3] @@ -629915,17 +629915,17 @@ _08132248: _0813224C: pop {r0} bx r0 - thumb_func_end sub_08132214 + thumb_func_end BattleAICmd_if_not_equal_ - thumb_func_start sub_08132250 -sub_08132250: @ 0x08132250 + thumb_func_start BattleAICmd_if_user_goes +BattleAICmd_if_user_goes: @ 0x08132250 push {lr} ldr r0, _08132288 ldrb r0, [r0] ldr r1, _0813228C ldrb r1, [r1] movs r2, #1 - bl sub_0803CB54 + bl GetWhoStrikesFirst ldr r3, _08132290 ldr r2, [r3] lsls r0, r0, #0x18 @@ -629955,17 +629955,17 @@ _08132294: _08132298: pop {r0} bx r0 - thumb_func_end sub_08132250 + thumb_func_end BattleAICmd_if_user_goes - thumb_func_start sub_0813229C -sub_0813229C: @ 0x0813229C + thumb_func_start BattleAICmd_if_user_doesnt_go +BattleAICmd_if_user_doesnt_go: @ 0x0813229C push {lr} ldr r0, _081322D4 ldrb r0, [r0] ldr r1, _081322D8 ldrb r1, [r1] movs r2, #1 - bl sub_0803CB54 + bl GetWhoStrikesFirst ldr r3, _081322DC ldr r2, [r3] lsls r0, r0, #0x18 @@ -629995,7 +629995,7 @@ _081322E0: _081322E4: pop {r0} bx r0 - thumb_func_end sub_0813229C + thumb_func_end BattleAICmd_if_user_doesnt_go thumb_func_start sub_081322E8 sub_081322E8: @ 0x081322E8 @@ -630009,8 +630009,8 @@ sub_081322EC: @ 0x081322EC .align 2, 0 thumb_func_end sub_081322EC - thumb_func_start sub_081322F0 -sub_081322F0: @ 0x081322F0 + thumb_func_start BattleAICmd_count_usable_party_mons +BattleAICmd_count_usable_party_mons: @ 0x081322F0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -630035,7 +630035,7 @@ _0813231C: _0813231E: ldrb r5, [r0] adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _08132368 mov r8, r1 @@ -630091,17 +630091,17 @@ _08132384: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081323C8 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081323C8 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -630129,7 +630129,7 @@ _081323C8: _081323E0: .4byte gUnknown_2023D12 _081323E4: .4byte gUnknown_202414C _081323E8: .4byte gUnknown_203A804 - thumb_func_end sub_081322F0 + thumb_func_end BattleAICmd_count_usable_party_mons thumb_func_start BattleAICmd_get_considered_move BattleAICmd_get_considered_move: @ 0x081323EC @@ -630172,8 +630172,8 @@ _0813242C: .4byte gUnknown_82ED220 _08132430: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_get_considered_move_effect - thumb_func_start sub_08132434 -sub_08132434: @ 0x08132434 + thumb_func_start BattleAICmd_get_ability +BattleAICmd_get_ability: @ 0x08132434 push {r4, r5, r6, r7, lr} ldr r0, _08132448 ldr r1, [r0] @@ -630317,15 +630317,15 @@ _08132538: .align 2, 0 _08132548: .4byte gUnknown_202414C _0813254C: .4byte gUnknown_2023D28 - thumb_func_end sub_08132434 + thumb_func_end BattleAICmd_get_ability - thumb_func_start sub_08132550 -sub_08132550: @ 0x08132550 + thumb_func_start BattleAICmd_check_ability +BattleAICmd_check_ability: @ 0x08132550 push {r4, r5, r6, lr} ldr r4, _08132588 ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_08131EA4 + bl BattleAI_GetWantedBattler lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, [r4] @@ -630451,10 +630451,10 @@ _0813263C: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08132550 + thumb_func_end BattleAICmd_check_ability - thumb_func_start sub_08132648 -sub_08132648: @ 0x08132648 + thumb_func_start BattleAICmd_get_highest_type_effectiveness +BattleAICmd_get_highest_type_effectiveness: @ 0x08132648 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -630500,7 +630500,7 @@ _0813267E: ldrb r1, [r6] ldr r2, _0813272C ldrb r2, [r2] - bl sub_08047224 + bl TypeCalc ldr r0, [r4] cmp r0, #0x78 bne _081326AE @@ -630568,10 +630568,10 @@ _08132724: .4byte gUnknown_2023D34 _08132728: .4byte gUnknown_203A808 _0813272C: .4byte gUnknown_2023EB0 _08132730: .4byte gUnknown_203A804 - thumb_func_end sub_08132648 + thumb_func_end BattleAICmd_get_highest_type_effectiveness - thumb_func_start sub_08132734 -sub_08132734: @ 0x08132734 + thumb_func_start BattleAICmd_if_type_effectiveness +BattleAICmd_if_type_effectiveness: @ 0x08132734 push {r4, r5, lr} ldr r0, _081327CC movs r1, #0 @@ -630600,7 +630600,7 @@ sub_08132734: @ 0x08132734 ldrb r1, [r1] ldr r2, _081327F0 ldrb r2, [r2] - bl sub_08047224 + bl TypeCalc ldr r0, [r4] cmp r0, #0x78 bne _0813277A @@ -630671,7 +630671,7 @@ _081327FC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08132734 + thumb_func_end BattleAICmd_if_type_effectiveness thumb_func_start sub_08132804 sub_08132804: @ 0x08132804 @@ -630685,8 +630685,8 @@ sub_08132808: @ 0x08132808 .align 2, 0 thumb_func_end sub_08132808 - thumb_func_start sub_0813280C -sub_0813280C: @ 0x0813280C + thumb_func_start BattleAICmd_if_status_in_party +BattleAICmd_if_status_in_party: @ 0x0813280C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -630723,7 +630723,7 @@ _0813284C: ldr r0, _081328DC _0813284E: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _081328E0 mov sb, r1 @@ -630756,17 +630756,17 @@ _08132884: add r4, sb adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData cmp r5, #0 beq _081328BC cmp r5, sl @@ -630798,10 +630798,10 @@ _081328DC: .4byte gUnknown_2023EB0 _081328E0: .4byte gUnknown_20243E8 _081328E4: .4byte gUnknown_2024190 _081328E8: .4byte gUnknown_203A804 - thumb_func_end sub_0813280C + thumb_func_end BattleAICmd_if_status_in_party - thumb_func_start sub_081328EC -sub_081328EC: @ 0x081328EC + thumb_func_start BattleAICmd_if_status_not_in_party +BattleAICmd_if_status_not_in_party: @ 0x081328EC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -630821,7 +630821,7 @@ _0813290C: ldr r0, _081329B8 _0813290E: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r1, _081329BC mov sl, r1 @@ -630852,17 +630852,17 @@ _08132940: add r4, sl adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData cmp r5, #0 beq _08132984 movs r1, #0xce @@ -630908,7 +630908,7 @@ _081329B8: .4byte gUnknown_2023EB0 _081329BC: .4byte gUnknown_20243E8 _081329C0: .4byte gUnknown_2024190 _081329C4: .4byte gUnknown_203A804 - thumb_func_end sub_081328EC + thumb_func_end BattleAICmd_if_status_not_in_party thumb_func_start BattleAICmd_get_weather BattleAICmd_get_weather: @ 0x081329C8 @@ -630970,8 +630970,8 @@ _08132A2C: .4byte gUnknown_202414C _08132A30: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_get_weather - thumb_func_start sub_08132A34 -sub_08132A34: @ 0x08132A34 + thumb_func_start BattleAICmd_if_effect +BattleAICmd_if_effect: @ 0x08132A34 push {lr} ldr r2, _08132A6C ldr r0, _08132A70 @@ -631010,10 +631010,10 @@ _08132A78: _08132A7C: pop {r0} bx r0 - thumb_func_end sub_08132A34 + thumb_func_end BattleAICmd_if_effect - thumb_func_start sub_08132A80 -sub_08132A80: @ 0x08132A80 + thumb_func_start BattleAICmd_if_not_effect +BattleAICmd_if_not_effect: @ 0x08132A80 push {lr} ldr r2, _08132AB8 ldr r0, _08132ABC @@ -631052,10 +631052,10 @@ _08132AC4: _08132AC8: pop {r0} bx r0 - thumb_func_end sub_08132A80 + thumb_func_end BattleAICmd_if_not_effect - thumb_func_start sub_08132ACC -sub_08132ACC: @ 0x08132ACC + thumb_func_start BattleAICmd_if_stat_level_less_than +BattleAICmd_if_stat_level_less_than: @ 0x08132ACC push {r4, lr} ldr r0, _08132AE0 ldr r1, [r0] @@ -631109,10 +631109,10 @@ _08132B2E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08132ACC + thumb_func_end BattleAICmd_if_stat_level_less_than - thumb_func_start sub_08132B34 -sub_08132B34: @ 0x08132B34 + thumb_func_start BattleAICmd_if_stat_level_more_than +BattleAICmd_if_stat_level_more_than: @ 0x08132B34 push {r4, lr} ldr r0, _08132B48 ldr r1, [r0] @@ -631166,10 +631166,10 @@ _08132B96: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08132B34 + thumb_func_end BattleAICmd_if_stat_level_more_than - thumb_func_start sub_08132B9C -sub_08132B9C: @ 0x08132B9C + thumb_func_start BattleAICmd_if_stat_level_equal +BattleAICmd_if_stat_level_equal: @ 0x08132B9C push {r4, lr} ldr r0, _08132BB0 ldr r1, [r0] @@ -631223,10 +631223,10 @@ _08132BFE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08132B9C + thumb_func_end BattleAICmd_if_stat_level_equal - thumb_func_start sub_08132C04 -sub_08132C04: @ 0x08132C04 + thumb_func_start BattleAICmd_if_stat_level_not_equal +BattleAICmd_if_stat_level_not_equal: @ 0x08132C04 push {r4, lr} ldr r0, _08132C18 ldr r1, [r0] @@ -631280,10 +631280,10 @@ _08132C66: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08132C04 + thumb_func_end BattleAICmd_if_stat_level_not_equal - thumb_func_start sub_08132C6C -sub_08132C6C: @ 0x08132C6C + thumb_func_start BattleAICmd_if_can_faint +BattleAICmd_if_can_faint: @ 0x08132C6C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -631323,11 +631323,11 @@ sub_08132C6C: @ 0x08132C6C ldrb r0, [r4] ldr r6, _08132D40 ldrb r1, [r6] - bl sub_08046ABC + bl AI_CalcDmg ldrh r0, [r5] ldrb r1, [r4] ldrb r2, [r6] - bl sub_08047224 + bl TypeCalc ldr r4, _08132D44 mov r1, r8 ldr r0, [r1] @@ -631396,10 +631396,10 @@ _08132D58: bx r0 .align 2, 0 _08132D64: .4byte gUnknown_203A804 - thumb_func_end sub_08132C6C + thumb_func_end BattleAICmd_if_can_faint - thumb_func_start sub_08132D68 -sub_08132D68: @ 0x08132D68 + thumb_func_start BattleAICmd_if_cant_faint +BattleAICmd_if_cant_faint: @ 0x08132D68 push {r4, r5, r6, r7, lr} ldr r2, _08132E04 ldr r7, _08132E08 @@ -631435,11 +631435,11 @@ sub_08132D68: @ 0x08132D68 ldrb r0, [r4] ldr r5, _08132E28 ldrb r1, [r5] - bl sub_08046ABC + bl AI_CalcDmg ldrh r0, [r6] ldrb r1, [r4] ldrb r2, [r5] - bl sub_08047224 + bl TypeCalc ldr r4, _08132E2C ldr r0, [r7] ldr r1, [r0, #0x14] @@ -631500,10 +631500,10 @@ _08132E40: bx r0 .align 2, 0 _08132E48: .4byte gUnknown_203A804 - thumb_func_end sub_08132D68 + thumb_func_end BattleAICmd_if_cant_faint - thumb_func_start sub_08132E4C -sub_08132E4C: @ 0x08132E4C + thumb_func_start BattleAICmd_if_has_move +BattleAICmd_if_has_move: @ 0x08132E4C push {r4, r5, r6, r7, lr} ldr r0, _08132E68 ldr r5, [r0] @@ -631664,10 +631664,10 @@ _08132F74: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08132E4C + thumb_func_end BattleAICmd_if_has_move - thumb_func_start sub_08132F7C -sub_08132F7C: @ 0x08132F7C + thumb_func_start BattleAICmd_if_doesnt_have_move +BattleAICmd_if_doesnt_have_move: @ 0x08132F7C push {r4, r5, r6, r7, lr} ldr r1, _08132F98 ldr r0, [r1] @@ -631783,10 +631783,10 @@ _0813304C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08132F7C + thumb_func_end BattleAICmd_if_doesnt_have_move - thumb_func_start sub_08133054 -sub_08133054: @ 0x08133054 + thumb_func_start BattleAICmd_if_has_move_with_effect +BattleAICmd_if_has_move_with_effect: @ 0x08133054 push {r4, r5, r6, r7, lr} ldr r1, _0813306C ldr r0, [r1] @@ -631916,10 +631916,10 @@ _08133144: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08133054 + thumb_func_end BattleAICmd_if_has_move_with_effect - thumb_func_start sub_0813314C -sub_0813314C: @ 0x0813314C + thumb_func_start BattleAICmd_if_doesnt_have_move_with_effect +BattleAICmd_if_doesnt_have_move_with_effect: @ 0x0813314C push {r4, r5, r6, lr} ldr r1, _08133164 ldr r0, [r1] @@ -632039,10 +632039,10 @@ _08133228: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813314C + thumb_func_end BattleAICmd_if_doesnt_have_move_with_effect - thumb_func_start sub_08133230 -sub_08133230: @ 0x08133230 + thumb_func_start BattleAICmd_if_any_move_disabled_or_encored +BattleAICmd_if_any_move_disabled_or_encored: @ 0x08133230 push {r4, r5, lr} ldr r0, _08133244 ldr r1, [r0] @@ -632115,10 +632115,10 @@ _081332B0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08133230 + thumb_func_end BattleAICmd_if_any_move_disabled_or_encored - thumb_func_start sub_081332B8 -sub_081332B8: @ 0x081332B8 + thumb_func_start BattleAICmd_if_curr_move_disabled_or_encored +BattleAICmd_if_curr_move_disabled_or_encored: @ 0x081332B8 push {r4, lr} ldr r4, _081332CC ldr r3, [r4] @@ -632190,10 +632190,10 @@ _08133340: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081332B8 + thumb_func_end BattleAICmd_if_curr_move_disabled_or_encored - thumb_func_start sub_08133348 -sub_08133348: @ 0x08133348 + thumb_func_start BattleAICmd_flee +BattleAICmd_flee: @ 0x08133348 ldr r0, _08133358 ldr r0, [r0] ldr r2, [r0, #0x14] @@ -632204,10 +632204,10 @@ sub_08133348: @ 0x08133348 bx lr .align 2, 0 _08133358: .4byte gUnknown_202414C - thumb_func_end sub_08133348 + thumb_func_end BattleAICmd_flee - thumb_func_start sub_0813335C -sub_0813335C: @ 0x0813335C + thumb_func_start BattleAICmd_if_random_safari_flee +BattleAICmd_if_random_safari_flee: @ 0x0813335C push {r4, lr} ldr r0, _081333A0 ldr r0, [r0] @@ -632254,10 +632254,10 @@ _081333B0: bx r0 .align 2, 0 _081333B8: .4byte gUnknown_203A804 - thumb_func_end sub_0813335C + thumb_func_end BattleAICmd_if_random_safari_flee - thumb_func_start sub_081333BC -sub_081333BC: @ 0x081333BC + thumb_func_start BattleAICmd_watch +BattleAICmd_watch: @ 0x081333BC ldr r0, _081333CC ldr r0, [r0] ldr r2, [r0, #0x14] @@ -632268,10 +632268,10 @@ sub_081333BC: @ 0x081333BC bx lr .align 2, 0 _081333CC: .4byte gUnknown_202414C - thumb_func_end sub_081333BC + thumb_func_end BattleAICmd_watch - thumb_func_start sub_081333D0 -sub_081333D0: @ 0x081333D0 + thumb_func_start BattleAICmd_get_hold_effect +BattleAICmd_get_hold_effect: @ 0x081333D0 push {r4, lr} ldr r0, _081333E0 ldr r0, [r0] @@ -632329,15 +632329,15 @@ _08133426: _0813343C: .4byte gUnknown_2023D28 _08133440: .4byte gUnknown_202414C _08133444: .4byte gUnknown_203A804 - thumb_func_end sub_081333D0 + thumb_func_end BattleAICmd_get_hold_effect - thumb_func_start sub_08133448 -sub_08133448: @ 0x08133448 + thumb_func_start BattleAICmd_if_holds_item +BattleAICmd_if_holds_item: @ 0x08133448 push {r4, lr} ldr r0, _08133474 ldr r0, [r0] ldrb r0, [r0, #1] - bl sub_08131EA4 + bl BattleAI_GetWantedBattler lsls r0, r0, #0x18 lsrs r3, r0, #0x18 movs r0, #1 @@ -632396,10 +632396,10 @@ _081334C2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08133448 + thumb_func_end BattleAICmd_if_holds_item - thumb_func_start sub_081334C8 -sub_081334C8: @ 0x081334C8 + thumb_func_start BattleAICmd_get_gender +BattleAICmd_get_gender: @ 0x081334C8 push {lr} ldr r0, _081334D8 ldr r0, [r0] @@ -632423,7 +632423,7 @@ _081334E2: adds r2, #0x48 adds r1, r1, r2 ldr r1, [r1] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality ldr r1, _08133518 ldr r1, [r1] ldr r1, [r1, #0x14] @@ -632441,10 +632441,10 @@ _08133510: .4byte gUnknown_2023EB0 _08133514: .4byte gUnknown_2023D28 _08133518: .4byte gUnknown_202414C _0813351C: .4byte gUnknown_203A804 - thumb_func_end sub_081334C8 + thumb_func_end BattleAICmd_get_gender - thumb_func_start sub_08133520 -sub_08133520: @ 0x08133520 + thumb_func_start BattleAICmd_is_first_turn_for +BattleAICmd_is_first_turn_for: @ 0x08133520 push {r4, lr} ldr r0, _08133534 ldr r1, [r0] @@ -632481,10 +632481,10 @@ _0813353E: _08133560: .4byte gUnknown_2023EB0 _08133564: .4byte gUnknown_202414C _08133568: .4byte gUnknown_2023F60 - thumb_func_end sub_08133520 + thumb_func_end BattleAICmd_is_first_turn_for - thumb_func_start sub_0813356C -sub_0813356C: @ 0x0813356C + thumb_func_start BattleAICmd_get_stockpile_count +BattleAICmd_get_stockpile_count: @ 0x0813356C push {r4, lr} ldr r0, _08133580 ldr r1, [r0] @@ -632521,7 +632521,7 @@ _0813358A: _081335AC: .4byte gUnknown_2023EB0 _081335B0: .4byte gUnknown_202414C _081335B4: .4byte gUnknown_2023F60 - thumb_func_end sub_0813356C + thumb_func_end BattleAICmd_get_stockpile_count thumb_func_start BattleAICmd_is_double_battle BattleAICmd_is_double_battle: @ 0x081335B8 @@ -632544,8 +632544,8 @@ _081335D8: .4byte gUnknown_2022C90 _081335DC: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_is_double_battle - thumb_func_start sub_081335E0 -sub_081335E0: @ 0x081335E0 + thumb_func_start BattleAICmd_get_used_held_item +BattleAICmd_get_used_held_item: @ 0x081335E0 push {r4, lr} ldr r0, _081335F4 ldr r1, [r0] @@ -632582,7 +632582,7 @@ _081335FE: _08133620: .4byte gUnknown_2023EB0 _08133624: .4byte gUnknown_202414C _08133628: .4byte gUnknown_2024140 - thumb_func_end sub_081335E0 + thumb_func_end BattleAICmd_get_used_held_item thumb_func_start BattleAICmd_get_move_type_from_result BattleAICmd_get_move_type_from_result: @ 0x0813362C @@ -632656,8 +632656,8 @@ _081336A8: .4byte gUnknown_82ED220 _081336AC: .4byte gUnknown_203A804 thumb_func_end BattleAICmd_get_move_effect_from_result - thumb_func_start sub_081336B0 -sub_081336B0: @ 0x081336B0 + thumb_func_start BattleAICmd_get_protect_count +BattleAICmd_get_protect_count: @ 0x081336B0 push {r4, lr} ldr r0, _081336C4 ldr r1, [r0] @@ -632694,7 +632694,7 @@ _081336CE: _081336F0: .4byte gUnknown_2023EB0 _081336F4: .4byte gUnknown_202414C _081336F8: .4byte gUnknown_2023F60 - thumb_func_end sub_081336B0 + thumb_func_end BattleAICmd_get_protect_count thumb_func_start sub_081336FC sub_081336FC: @ 0x081336FC @@ -632799,8 +632799,8 @@ _0813377E: _08133784: .4byte gUnknown_202414C thumb_func_end BattleAICmd_end - thumb_func_start sub_08133788 -sub_08133788: @ 0x08133788 + thumb_func_start BattleAICmd_if_level_cond +BattleAICmd_if_level_cond: @ 0x08133788 push {r4, r5, lr} ldr r5, _081337A0 ldr r4, [r5] @@ -632907,10 +632907,10 @@ _08133858: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08133788 + thumb_func_end BattleAICmd_if_level_cond - thumb_func_start sub_08133860 -sub_08133860: @ 0x08133860 + thumb_func_start BattleAICmd_if_target_taunted +BattleAICmd_if_target_taunted: @ 0x08133860 push {lr} ldr r2, _08133894 ldr r0, _08133898 @@ -632951,10 +632951,10 @@ _081338A8: bx r0 .align 2, 0 _081338AC: .4byte gUnknown_203A804 - thumb_func_end sub_08133860 + thumb_func_end BattleAICmd_if_target_taunted - thumb_func_start sub_081338B0 -sub_081338B0: @ 0x081338B0 + thumb_func_start BattleAICmd_if_target_not_taunted +BattleAICmd_if_target_not_taunted: @ 0x081338B0 push {lr} ldr r2, _081338E4 ldr r0, _081338E8 @@ -632995,10 +632995,10 @@ _081338F8: bx r0 .align 2, 0 _081338FC: .4byte gUnknown_203A804 - thumb_func_end sub_081338B0 + thumb_func_end BattleAICmd_if_target_not_taunted - thumb_func_start sub_08133900 -sub_08133900: @ 0x08133900 + thumb_func_start BattleAICmd_if_target_is_ally +BattleAICmd_if_target_is_ally: @ 0x08133900 push {lr} ldr r0, _08133934 ldrb r3, [r0] @@ -633038,15 +633038,15 @@ _08133948: bx r0 .align 2, 0 _0813394C: .4byte gUnknown_203A804 - thumb_func_end sub_08133900 + thumb_func_end BattleAICmd_if_target_is_ally - thumb_func_start sub_08133950 -sub_08133950: @ 0x08133950 + thumb_func_start BattleAICmd_if_flash_fired +BattleAICmd_if_flash_fired: @ 0x08133950 push {r4, lr} ldr r4, _0813398C ldr r0, [r4] ldrb r0, [r0, #1] - bl sub_08131EA4 + bl BattleAI_GetWantedBattler lsls r0, r0, #0x18 ldr r1, _08133990 ldr r1, [r1] @@ -633082,7 +633082,7 @@ _0813399A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08133950 + thumb_func_end BattleAICmd_if_flash_fired thumb_func_start sub_081339A0 sub_081339A0: @ 0x081339A0 @@ -633164,8 +633164,8 @@ _08133A22: _08133A28: .4byte gUnknown_203A804 thumb_func_end sub_081339EC - thumb_func_start sub_08133A2C -sub_08133A2C: @ 0x08133A2C + thumb_func_start TraderSetup +TraderSetup: @ 0x08133A2C push {r4, r5, r6, lr} ldr r0, _08133A80 ldr r1, [r0] @@ -633213,7 +633213,7 @@ _08133A84: .4byte 0x00002E28 _08133A88: .4byte 0x00002E59 _08133A8C: .4byte gUnknown_858F7F4 _08133A90: .4byte gUnknown_858F804 - thumb_func_end sub_08133A2C + thumb_func_end TraderSetup thumb_func_start sub_08133A94 sub_08133A94: @ 0x08133A94 @@ -633229,8 +633229,8 @@ _08133AA4: .4byte gUnknown_3005AEC _08133AA8: .4byte 0x00002E59 thumb_func_end sub_08133A94 - thumb_func_start sub_08133AAC -sub_08133AAC: @ 0x08133AAC + thumb_func_start AnimMudSportDirt +AnimMudSportDirt: @ 0x08133AAC push {r4, r5, r6, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -633245,7 +633245,7 @@ sub_08133AAC: @ 0x08133AAC ldr r1, _08133B14 adds r6, r0, r1 ldr r0, _08133B18 - bl sub_08003250 + bl AddWindow strh r0, [r5, #6] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -633253,7 +633253,7 @@ sub_08133AAC: @ 0x08133AAC lsls r2, r2, #2 movs r1, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r4, #0 _08133AE0: adds r0, r6, #1 @@ -633333,7 +633333,7 @@ _08133B48: movs r3, #2 bl sub_081984B0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -633341,7 +633341,7 @@ _08133B48: .align 2, 0 _08133B94: .4byte gUnknown_8580CD1 _08133B98: .4byte gUnknown_85C93C8 - thumb_func_end sub_08133AAC + thumb_func_end AnimMudSportDirt thumb_func_start sub_08133B9C sub_08133B9C: @ 0x08133B9C @@ -633374,14 +633374,14 @@ _08133BD0: movs r1, #0 bl sub_08198134 ldrb r0, [r4, #6] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #6] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r4, r5} pop {r0} bx r0 @@ -633389,8 +633389,8 @@ _08133BD0: _08133BFC: .4byte gUnknown_2037280 thumb_func_end sub_08133B9C - thumb_func_start sub_08133C00 -sub_08133C00: @ 0x08133C00 + thumb_func_start OpponentHandleTrainerSlide +OpponentHandleTrainerSlide: @ 0x08133C00 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -633398,7 +633398,7 @@ sub_08133C00: @ 0x08133C00 ldr r0, [r0] ldr r1, _08133C30 adds r5, r0, r1 - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 lsrs r4, r0, #0x18 asrs r1, r0, #0x18 @@ -633450,10 +633450,10 @@ _08133C70: .align 2, 0 _08133C78: .4byte gUnknown_2037282 _08133C7C: .4byte gUnknown_2021C40 - thumb_func_end sub_08133C00 + thumb_func_end OpponentHandleTrainerSlide - thumb_func_start sub_08133C80 -sub_08133C80: @ 0x08133C80 + thumb_func_start ScrSpecial_GetTraderTradedFlag +ScrSpecial_GetTraderTradedFlag: @ 0x08133C80 ldr r0, _08133C90 ldr r0, [r0] ldr r1, _08133C94 @@ -633466,10 +633466,10 @@ sub_08133C80: @ 0x08133C80 _08133C90: .4byte gUnknown_3005AEC _08133C94: .4byte gUnknown_2037290 _08133C98: .4byte 0x00002E59 - thumb_func_end sub_08133C80 + thumb_func_end ScrSpecial_GetTraderTradedFlag - thumb_func_start sub_08133C9C -sub_08133C9C: @ 0x08133C9C + thumb_func_start ScrSpecial_DoesPlayerHaveNoDecorations +ScrSpecial_DoesPlayerHaveNoDecorations: @ 0x08133C9C push {r4, r5, lr} movs r4, #0 ldr r5, _08133CB4 @@ -633499,7 +633499,7 @@ _08133CC8: bx r0 .align 2, 0 _08133CD0: .4byte gUnknown_2037290 - thumb_func_end sub_08133C9C + thumb_func_end ScrSpecial_DoesPlayerHaveNoDecorations thumb_func_start sub_08133CD4 sub_08133CD4: @ 0x08133CD4 @@ -633525,7 +633525,7 @@ sub_08133CD4: @ 0x08133CD4 cmp r1, r0 beq _08133D26 adds r0, r1, #0 - bl sub_081617D4 + bl GetFirstEmptyDecorSlot lsls r0, r0, #0x18 asrs r0, r0, #0x18 movs r1, #1 @@ -633539,7 +633539,7 @@ sub_08133CD4: @ 0x08133CD4 lsls r1, r1, #2 adds r1, r1, r4 ldrb r1, [r1, #0xe] - bl sub_08127208 + bl CopyDecorationCategoryName movs r0, #1 strh r0, [r6] _08133D26: @@ -633559,19 +633559,19 @@ sub_08133D40: @ 0x08133D40 push {lr} ldr r0, _08133D50 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_08133D50: .4byte sub_081271C0 +_08133D50: .4byte ShowDecorationCategoriesWindow thumb_func_end sub_08133D40 - thumb_func_start sub_08133D54 -sub_08133D54: @ 0x08133D54 + thumb_func_start ResetTrainerHillResults +ResetTrainerHillResults: @ 0x08133D54 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_08127974 + bl IsSelectedDecorInThePC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -633616,34 +633616,34 @@ _08133DB8: strh r0, [r1] _08133DC0: adds r0, r6, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08133DD0: .4byte gUnknown_2037284 _08133DD4: .4byte 0x0000FFFF - thumb_func_end sub_08133D54 + thumb_func_end ResetTrainerHillResults - thumb_func_start sub_08133DD8 -sub_08133DD8: @ 0x08133DD8 + thumb_func_start ExitTraderMenu +ExitTraderMenu: @ 0x08133DD8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08133DF0 movs r1, #0 strh r1, [r2] - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 _08133DF0: .4byte gUnknown_2037284 - thumb_func_end sub_08133DD8 + thumb_func_end ExitTraderMenu - thumb_func_start sub_08133DF4 -sub_08133DF4: @ 0x08133DF4 + thumb_func_start ScrSpecial_TraderDoDecorationTrade +ScrSpecial_TraderDoDecorationTrade: @ 0x08133DF4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -633654,7 +633654,7 @@ sub_08133DF4: @ 0x08133DF4 ldr r1, _08133E5C mov r8, r1 ldrb r0, [r1] - bl sub_081618EC + bl DecorationRemove ldr r0, _08133E60 ldrb r0, [r0] bl sub_08161868 @@ -633699,22 +633699,22 @@ _08133E68: .4byte gUnknown_3005AF0 _08133E6C: .4byte 0x00002E29 _08133E70: .4byte 0x00002E5A _08133E74: .4byte 0x00002E59 - thumb_func_end sub_08133DF4 + thumb_func_end ScrSpecial_TraderDoDecorationTrade - thumb_func_start sub_08133E78 -sub_08133E78: @ 0x08133E78 + thumb_func_start ScrSpecial_TraderMenuGetDecoration +ScrSpecial_TraderMenuGetDecoration: @ 0x08133E78 push {lr} ldr r0, _08133E90 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08133AAC + bl AnimMudSportDirt pop {r0} bx r0 .align 2, 0 -_08133E90: .4byte sub_08133C00 - thumb_func_end sub_08133E78 +_08133E90: .4byte OpponentHandleTrainerSlide + thumb_func_end ScrSpecial_TraderMenuGetDecoration thumb_func_start GetStarterPokemon GetStarterPokemon: @ 0x08133E94 @@ -633735,19 +633735,19 @@ _08133EA0: _08133EAC: .4byte gUnknown_8590C08 thumb_func_end GetStarterPokemon - thumb_func_start sub_08133EB0 -sub_08133EB0: @ 0x08133EB0 + thumb_func_start WallClockVblankCallback +WallClockVblankCallback: @ 0x08133EB0 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08133EB0 + thumb_func_end WallClockVblankCallback - thumb_func_start sub_08133EC4 -sub_08133EC4: @ 0x08133EC4 + thumb_func_start CB2_ChooseStarter +CB2_ChooseStarter: @ 0x08133EC4 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -633755,7 +633755,7 @@ sub_08133EC4: @ 0x08133EC4 push {r4, r5, r6} sub sp, #0xc movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -633774,35 +633774,35 @@ sub_08133EC4: @ 0x08133EC4 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY add r1, sp, #4 movs r0, #0 strh r0, [r1] @@ -633850,7 +633850,7 @@ sub_08133EC4: @ 0x08133EC4 movs r2, #3 bl InitBgsFromTemplates ldr r0, _08134160 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r1, #0xa6 lsls r1, r1, #2 @@ -633858,8 +633858,8 @@ sub_08133EC4: @ 0x08133EC4 movs r2, #0xd0 bl LoadUserWindowBorderGfx bl sub_08199640 - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes @@ -633867,15 +633867,15 @@ sub_08133EC4: @ 0x08133EC4 bl sub_080985EC movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08134164 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r0, _08134168 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0813416C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08134170 bl LoadSpritePalettes movs r0, #1 @@ -633885,13 +633885,13 @@ sub_08133EC4: @ 0x08133EC4 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _08134174 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08134178 - bl sub_08000540 + bl SetMainCallback2 movs r0, #0x48 movs r1, #0x3f bl SetGpuReg @@ -633918,14 +633918,14 @@ sub_08133EC4: @ 0x08133EC4 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r0, _0813417C movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -633942,7 +633942,7 @@ sub_08133EC4: @ 0x08133EC4 movs r1, #0x78 movs r2, #0x38 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _08134188 @@ -633958,7 +633958,7 @@ sub_08133EC4: @ 0x08133EC4 ldrb r2, [r5, #1] adds r0, r6, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -633972,7 +633972,7 @@ sub_08133EC4: @ 0x08133EC4 ldrb r2, [r5, #3] adds r0, r6, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -633986,7 +633986,7 @@ sub_08133EC4: @ 0x08133EC4 ldrb r2, [r5, #5] adds r0, r6, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -634023,32 +634023,32 @@ _08134164: .4byte gUnknown_858F810 _08134168: .4byte gUnknown_8590CE8 _0813416C: .4byte gUnknown_8590CF8 _08134170: .4byte gUnknown_8590D08 -_08134174: .4byte sub_08133EB0 -_08134178: .4byte sub_08134198 -_0813417C: .4byte sub_081341B4 +_08134174: .4byte WallClockVblankCallback +_08134178: .4byte MainCallback2_StarterChoose +_0813417C: .4byte Task_StarterChoose1 _08134180: .4byte gUnknown_3005B60 _08134184: .4byte gUnknown_8590D20 _08134188: .4byte gUnknown_20205AC _0813418C: .4byte gUnknown_8590D38 _08134190: .4byte gUnknown_8590BFC _08134194: .4byte gUnknown_30011F8 - thumb_func_end sub_08133EC4 + thumb_func_end CB2_ChooseStarter - thumb_func_start sub_08134198 -sub_08134198: @ 0x08134198 + thumb_func_start MainCallback2_StarterChoose +MainCallback2_StarterChoose: @ 0x08134198 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08134198 + thumb_func_end MainCallback2_StarterChoose - thumb_func_start sub_081341B4 -sub_081341B4: @ 0x081341B4 + thumb_func_start Task_StarterChoose1 +Task_StarterChoose1: @ 0x081341B4 push {r4, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -634065,7 +634065,7 @@ sub_081341B4: @ 0x081341B4 movs r0, #0 movs r1, #0 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _0813420C movs r0, #2 str r0, [sp] @@ -634076,9 +634076,9 @@ sub_081341B4: @ 0x081341B4 movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _08134210 str r0, [r4] add sp, #0xc @@ -634088,11 +634088,11 @@ sub_081341B4: @ 0x081341B4 .align 2, 0 _08134208: .4byte gUnknown_3005B60 _0813420C: .4byte gUnknown_85C9363 -_08134210: .4byte sub_08134214 - thumb_func_end sub_081341B4 +_08134210: .4byte Task_StarterChoose2 + thumb_func_end Task_StarterChoose1 - thumb_func_start sub_08134214 -sub_08134214: @ 0x08134214 + thumb_func_start Task_StarterChoose2 +Task_StarterChoose2: @ 0x08134214 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -634121,7 +634121,7 @@ sub_08134214: @ 0x08134214 adds r1, r5, #0 adds r2, r4, #0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0xc] @@ -634131,7 +634131,7 @@ sub_08134214: @ 0x08134214 lsrs r0, r0, #0x10 adds r1, r5, #0 adds r2, r4, #0 - bl sub_081346D8 + bl CreatePokemonFrontSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _081342A0 @@ -634197,7 +634197,7 @@ _081342EC: bx r0 .align 2, 0 _081342F4: .4byte Task_MoveStarterChooseCursor - thumb_func_end sub_08134214 + thumb_func_end Task_StarterChoose2 thumb_func_start Task_StarterChoose3 Task_StarterChoose3: @ 0x081342F8 @@ -634238,11 +634238,11 @@ _08134336: .align 2, 0 _0813433C: .4byte gUnknown_20205AC _08134340: .4byte gUnknown_3005B60 -_08134344: .4byte sub_08134348 +_08134344: .4byte Task_StarterChoose4 thumb_func_end Task_StarterChoose3 - thumb_func_start sub_08134348 -sub_08134348: @ 0x08134348 + thumb_func_start Task_StarterChoose4 +Task_StarterChoose4: @ 0x08134348 push {r4, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -634257,10 +634257,10 @@ sub_08134348: @ 0x08134348 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _081343AC movs r0, #2 str r0, [sp] @@ -634271,7 +634271,7 @@ sub_08134348: @ 0x08134348 movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081343B0 movs r2, #0xa6 lsls r2, r2, #2 @@ -634288,11 +634288,11 @@ sub_08134348: @ 0x08134348 _081343A8: .4byte gUnknown_3005B60 _081343AC: .4byte gUnknown_85C9386 _081343B0: .4byte gUnknown_8590BEC -_081343B4: .4byte sub_081343B8 - thumb_func_end sub_08134348 +_081343B4: .4byte Task_StarterChoose5 + thumb_func_end Task_StarterChoose4 - thumb_func_start sub_081343B8 -sub_081343B8: @ 0x081343B8 + thumb_func_start Task_StarterChoose5 +Task_StarterChoose5: @ 0x081343B8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -634324,7 +634324,7 @@ _081343DE: bl ResetAllPicSprites ldr r0, _08134404 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 b _08134452 .align 2, 0 _081343FC: .4byte gUnknown_2037290 @@ -634349,7 +634349,7 @@ _08134408: lsrs r0, r0, #0x1b bl FreeOamMatrix adds r0, r4, #0 - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldrb r0, [r5, #0xc] lsls r4, r0, #4 adds r4, r4, r0 @@ -634371,7 +634371,7 @@ _08134452: _08134458: .4byte gUnknown_3005B60 _0813445C: .4byte gUnknown_20205AC _08134460: .4byte sub_08134464 - thumb_func_end sub_081343B8 + thumb_func_end Task_StarterChoose5 thumb_func_start sub_08134464 sub_08134464: @ 0x08134464 @@ -634387,7 +634387,7 @@ sub_08134464: @ 0x08134464 bx lr .align 2, 0 _08134478: .4byte gUnknown_3005B60 -_0813447C: .4byte sub_081341B4 +_0813447C: .4byte Task_StarterChoose1 thumb_func_end sub_08134464 thumb_func_start sub_08134480 @@ -634533,13 +634533,13 @@ _08134558: orrs r0, r1 str r0, [sp, #0x24] ldr r0, [sp, #0x2c] - bl sub_08003250 + bl AddWindow ldr r4, _08134644 strh r0, [r4] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] ldr r6, _08134648 str r6, [sp] @@ -634550,7 +634550,7 @@ _08134558: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r0, [r4] str r6, [sp] str r5, [sp, #4] @@ -634559,11 +634559,11 @@ _08134558: movs r1, #1 movs r2, #0 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram mov r0, sb ldrb r1, [r0] lsls r0, r1, #0x1b @@ -634616,11 +634616,11 @@ sub_0813464C: @ 0x0813464C ldr r4, _08134684 ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strh r0, [r4] movs r0, #0x40 @@ -634630,7 +634630,7 @@ sub_0813464C: @ 0x0813464C movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -634679,11 +634679,11 @@ sub_081346B0: @ 0x081346B0 bx r0 .align 2, 0 _081346D0: .4byte gUnknown_3005B60 -_081346D4: .4byte sub_08134214 +_081346D4: .4byte Task_StarterChoose2 thumb_func_end sub_081346B0 - thumb_func_start sub_081346D8 -sub_081346D8: @ 0x081346D8 + thumb_func_start CreatePokemonFrontSprite +CreatePokemonFrontSprite: @ 0x081346D8 push {lr} sub sp, #0x10 lsls r0, r0, #0x10 @@ -634701,7 +634701,7 @@ sub_081346D8: @ 0x081346D8 movs r1, #8 movs r2, #0 movs r3, #1 - bl sub_0818D110 + bl CreatePicSprite2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08134720 @@ -634720,7 +634720,7 @@ sub_081346D8: @ 0x081346D8 .align 2, 0 _0813471C: .4byte 0x0000FFFF _08134720: .4byte gUnknown_20205AC - thumb_func_end sub_081346D8 + thumb_func_end CreatePokemonFrontSprite thumb_func_start sub_08134724 sub_08134724: @ 0x08134724 @@ -634846,22 +634846,22 @@ _081347F8: thumb_func_start sub_081347FC sub_081347FC: @ 0x081347FC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081347FC - thumb_func_start sub_08134810 -sub_08134810: @ 0x08134810 + thumb_func_start LoadWallClockGraphics +LoadWallClockGraphics: @ 0x08134810 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #8 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -634880,35 +634880,35 @@ sub_08134810: @ 0x08134810 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r3, #0xc0 lsls r3, r3, #0x13 movs r4, #0xc0 @@ -634983,7 +634983,7 @@ _081348B4: ldr r0, _08134940 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _0813494E .align 2, 0 _08134930: .4byte 0x040000D4 @@ -634995,16 +634995,16 @@ _08134944: ldr r0, _081349BC movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _0813494E: bl sub_080985EC movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _081349C0 movs r1, #0xc0 movs r2, #8 - bl sub_080A1200 + bl LoadPalette movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081349C4 @@ -635012,7 +635012,7 @@ _0813494E: movs r2, #3 bl InitBgsFromTemplates ldr r0, _081349C8 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r1, #0x93 lsls r1, r1, #2 @@ -635020,13 +635020,13 @@ _0813494E: movs r2, #0xd0 bl LoadUserWindowBorderGfx bl sub_08199640 - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes ldr r0, _081349CC - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081349D0 bl LoadSpritePalettes add sp, #8 @@ -635042,10 +635042,10 @@ _081349C4: .4byte gUnknown_8591C48 _081349C8: .4byte gUnknown_8591C28 _081349CC: .4byte gUnknown_8591C54 _081349D0: .4byte gUnknown_8591C64 - thumb_func_end sub_08134810 + thumb_func_end LoadWallClockGraphics - thumb_func_start sub_081349D4 -sub_081349D4: @ 0x081349D4 + thumb_func_start WallClockInit +WallClockInit: @ 0x081349D4 push {lr} sub sp, #4 movs r0, #1 @@ -635054,13 +635054,13 @@ sub_081349D4: @ 0x081349D4 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _08134A34 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08134A38 - bl sub_08000540 + bl SetMainCallback2 movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -635075,34 +635075,34 @@ sub_081349D4: @ 0x081349D4 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg add sp, #4 pop {r0} bx r0 .align 2, 0 _08134A34: .4byte sub_081347FC -_08134A38: .4byte sub_08134CE8 - thumb_func_end sub_081349D4 +_08134A38: .4byte TrySetupDiveDownScript + thumb_func_end WallClockInit - thumb_func_start sub_08134A3C -sub_08134A3C: @ 0x08134A3C + thumb_func_start CB2_StartWallClock +CB2_StartWallClock: @ 0x08134A3C push {r4, r5, r6, lr} mov r6, sl mov r5, sb mov r4, r8 push {r4, r5, r6} sub sp, #0xc - bl sub_08134810 + bl LoadWallClockGraphics ldr r0, _08134B64 ldr r1, _08134B68 bl LZ77UnCompVram ldr r0, _08134B6C movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -635128,7 +635128,7 @@ sub_08134A3C: @ 0x08134A3C movs r1, #0x78 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08134B78 @@ -635158,7 +635158,7 @@ sub_08134A3C: @ 0x08134A3C movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -635180,7 +635180,7 @@ sub_08134A3C: @ 0x08134A3C movs r1, #0x78 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -635194,7 +635194,7 @@ sub_08134A3C: @ 0x08134A3C movs r1, #0x78 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -635204,7 +635204,7 @@ sub_08134A3C: @ 0x08134A3C strh r6, [r1, #0x2e] movs r0, #0x5a strh r0, [r1, #0x30] - bl sub_081349D4 + bl WallClockInit ldr r2, _08134B88 movs r0, #2 str r0, [sp] @@ -635216,9 +635216,9 @@ sub_08134A3C: @ 0x08134A3C movs r3, #0 bl AddTextPrinterParameterized movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -635238,27 +635238,27 @@ _08134B7C: .4byte gUnknown_8591CB4 _08134B80: .4byte gUnknown_8591CEC _08134B84: .4byte gUnknown_8591D04 _08134B88: .4byte gUnknown_8591C15 - thumb_func_end sub_08134A3C + thumb_func_end CB2_StartWallClock - thumb_func_start sub_08134B8C -sub_08134B8C: @ 0x08134B8C + thumb_func_start CB2_ViewWallClock +CB2_ViewWallClock: @ 0x08134B8C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb mov r5, r8 push {r5, r6, r7} sub sp, #0x10 - bl sub_08134810 + bl LoadWallClockGraphics ldr r0, _08134BD4 ldr r1, _08134BD8 bl LZ77UnCompVram ldr r0, _08134BDC movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r7, #0 - bl sub_08135184 + bl InitClockWithRtc ldr r1, _08134BE0 lsls r0, r7, #2 adds r0, r0, r7 @@ -635288,7 +635288,7 @@ _08134BEC: movs r1, #0x78 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r6, _08134CD4 @@ -635319,7 +635319,7 @@ _08134BEC: movs r1, #0x78 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -635341,7 +635341,7 @@ _08134BEC: movs r1, #0x78 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -635355,7 +635355,7 @@ _08134BEC: movs r1, #0x78 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -635366,7 +635366,7 @@ _08134BEC: mov r0, sp ldrh r0, [r0, #0xc] strh r0, [r1, #0x30] - bl sub_081349D4 + bl WallClockInit ldr r2, _08134CE4 movs r0, #2 str r0, [sp] @@ -635378,9 +635378,9 @@ _08134BEC: movs r3, #0 bl AddTextPrinterParameterized movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -635396,20 +635396,20 @@ _08134CD8: .4byte gUnknown_8591CB4 _08134CDC: .4byte gUnknown_8591CEC _08134CE0: .4byte gUnknown_8591D04 _08134CE4: .4byte gUnknown_8591C1A - thumb_func_end sub_08134B8C + thumb_func_end CB2_ViewWallClock - thumb_func_start sub_08134CE8 -sub_08134CE8: @ 0x08134CE8 + thumb_func_start TrySetupDiveDownScript +TrySetupDiveDownScript: @ 0x08134CE8 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08134CE8 + thumb_func_end TrySetupDiveDownScript thumb_func_start sub_08134D04 sub_08134D04: @ 0x08134D04 @@ -635435,11 +635435,11 @@ _08134D24: .align 2, 0 _08134D28: .4byte gUnknown_2037C74 _08134D2C: .4byte gUnknown_3005B60 -_08134D30: .4byte sub_08134D34 +_08134D30: .4byte Task_SetClock2 thumb_func_end sub_08134D04 - thumb_func_start sub_08134D34 -sub_08134D34: @ 0x08134D34 + thumb_func_start Task_SetClock2 +Task_SetClock2: @ 0x08134D34 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -635501,7 +635501,7 @@ _08134D68: b _08134E0A .align 2, 0 _08134DB4: .4byte gUnknown_3002360 -_08134DB8: .4byte sub_08134E10 +_08134DB8: .4byte Task_SetClock3 _08134DBC: strh r1, [r5, #0x10] ldrh r1, [r2, #0x2c] @@ -635540,7 +635540,7 @@ _08134DF0: strh r0, [r5, #8] ldrb r1, [r5, #0x10] adds r0, r6, #0 - bl sub_081350A0 + bl AdvanceClock b _08134E0A _08134E08: strh r0, [r5, #0x14] @@ -635548,10 +635548,10 @@ _08134E0A: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08134D34 + thumb_func_end Task_SetClock2 - thumb_func_start sub_08134E10 -sub_08134E10: @ 0x08134E10 + thumb_func_start Task_SetClock3 +Task_SetClock3: @ 0x08134E10 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -635563,7 +635563,7 @@ sub_08134E10: @ 0x08134E10 movs r1, #0 adds r2, r5, #0 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _08134E74 movs r0, #2 str r0, [sp] @@ -635574,9 +635574,9 @@ sub_08134E10: @ 0x08134E10 movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _08134E78 str r5, [sp] movs r1, #0xd @@ -635601,11 +635601,11 @@ sub_08134E10: @ 0x08134E10 _08134E74: .4byte gUnknown_8591C04 _08134E78: .4byte gUnknown_8591C40 _08134E7C: .4byte gUnknown_3005B60 -_08134E80: .4byte sub_08134E84 - thumb_func_end sub_08134E10 +_08134E80: .4byte Task_SetClock4 + thumb_func_end Task_SetClock3 - thumb_func_start sub_08134E84 -sub_08134E84: @ 0x08134E84 + thumb_func_start Task_SetClock4 +Task_SetClock4: @ 0x08134E84 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -635637,7 +635637,7 @@ _08134EAA: b _08134EE8 .align 2, 0 _08134EC0: .4byte gUnknown_3005B60 -_08134EC4: .4byte sub_08134EF8 +_08134EC4: .4byte Task_SetClock5 _08134EC8: movs r0, #5 bl sub_080A306C @@ -635645,7 +635645,7 @@ _08134EC8: movs r1, #0 bl sub_08198134 movs r0, #0 - bl sub_08003774 + bl ClearWindowTilemap ldr r0, _08134EF0 lsls r1, r4, #2 adds r1, r1, r4 @@ -635660,11 +635660,11 @@ _08134EEA: bx r0 .align 2, 0 _08134EF0: .4byte gUnknown_3005B60 -_08134EF4: .4byte sub_08134D34 - thumb_func_end sub_08134E84 +_08134EF4: .4byte Task_SetClock2 + thumb_func_end Task_SetClock4 - thumb_func_start sub_08134EF8 -sub_08134EF8: @ 0x08134EF8 + thumb_func_start Task_SetClock5 +Task_SetClock5: @ 0x08134EF8 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -635685,7 +635685,7 @@ sub_08134EF8: @ 0x08134EF8 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08134F38 str r0, [r4] add sp, #4 @@ -635694,11 +635694,11 @@ sub_08134EF8: @ 0x08134EF8 bx r0 .align 2, 0 _08134F34: .4byte gUnknown_3005B60 -_08134F38: .4byte sub_08134F3C - thumb_func_end sub_08134EF8 +_08134F38: .4byte Task_SetClock6 + thumb_func_end Task_SetClock5 - thumb_func_start sub_08134F3C -sub_08134F3C: @ 0x08134F3C + thumb_func_start Task_SetClock6 +Task_SetClock6: @ 0x08134F3C push {lr} ldr r0, _08134F5C ldrb r1, [r0, #7] @@ -635706,17 +635706,17 @@ sub_08134F3C: @ 0x08134F3C ands r0, r1 cmp r0, #0 bne _08134F56 - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _08134F60 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _08134F56: pop {r0} bx r0 .align 2, 0 _08134F5C: .4byte gUnknown_2037C74 _08134F60: .4byte gUnknown_3002360 - thumb_func_end sub_08134F3C + thumb_func_end Task_SetClock6 thumb_func_start sub_08134F64 sub_08134F64: @ 0x08134F64 @@ -635751,7 +635751,7 @@ Task_ViewClock2: @ 0x08134F94 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_08135184 + bl InitClockWithRtc ldr r0, _08134FC0 ldrh r1, [r0, #0x2e] movs r0, #3 @@ -635772,11 +635772,11 @@ _08134FBA: .align 2, 0 _08134FC0: .4byte gUnknown_3002360 _08134FC4: .4byte gUnknown_3005B60 -_08134FC8: .4byte sub_08134FCC +_08134FC8: .4byte Task_ViewClock3 thumb_func_end Task_ViewClock2 - thumb_func_start sub_08134FCC -sub_08134FCC: @ 0x08134FCC + thumb_func_start Task_ViewClock3 +Task_ViewClock3: @ 0x08134FCC push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -635788,7 +635788,7 @@ sub_08134FCC: @ 0x08134FCC str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08134FFC lsls r0, r4, #2 adds r0, r0, r4 @@ -635802,11 +635802,11 @@ sub_08134FCC: @ 0x08134FCC bx r0 .align 2, 0 _08134FFC: .4byte gUnknown_3005B60 -_08135000: .4byte sub_08135004 - thumb_func_end sub_08134FCC +_08135000: .4byte Task_ViewClock4 + thumb_func_end Task_ViewClock3 - thumb_func_start sub_08135004 -sub_08135004: @ 0x08135004 + thumb_func_start Task_ViewClock4 +Task_ViewClock4: @ 0x08135004 push {lr} ldr r0, _08135020 ldrb r1, [r0, #7] @@ -635816,14 +635816,14 @@ sub_08135004: @ 0x08135004 bne _0813501A ldr r0, _08135024 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _0813501A: pop {r0} bx r0 .align 2, 0 _08135020: .4byte gUnknown_2037C74 _08135024: .4byte gUnknown_3002360 - thumb_func_end sub_08135004 + thumb_func_end Task_ViewClock4 thumb_func_start CalcMinHandDelta CalcMinHandDelta: @ 0x08135028 @@ -635902,8 +635902,8 @@ _08135098: bx r1 thumb_func_end CalcNewMinHandAngle - thumb_func_start sub_081350A0 -sub_081350A0: @ 0x081350A0 + thumb_func_start AdvanceClock +AdvanceClock: @ 0x081350A0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -635946,7 +635946,7 @@ _081350E8: strh r0, [r1, #0xc] adds r0, r3, #0 adds r1, r4, #0 - bl sub_0813513C + bl UpdateClockPeriod b _08135132 _081350F4: ldr r0, _08135110 @@ -635980,17 +635980,17 @@ _08135128: _0813512A: adds r0, r3, #0 adds r1, r4, #0 - bl sub_0813513C + bl UpdateClockPeriod _08135132: movs r0, #0 pop {r4, r5, r6} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081350A0 + thumb_func_end AdvanceClock - thumb_func_start sub_0813513C -sub_0813513C: @ 0x0813513C + thumb_func_start UpdateClockPeriod +UpdateClockPeriod: @ 0x0813513C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -636033,10 +636033,10 @@ _0813517E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813513C + thumb_func_end UpdateClockPeriod - thumb_func_start sub_08135184 -sub_08135184: @ 0x08135184 + thumb_func_start InitClockWithRtc +InitClockWithRtc: @ 0x08135184 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -636096,10 +636096,10 @@ _081351F6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08135184 + thumb_func_end InitClockWithRtc - thumb_func_start sub_08135200 -sub_08135200: @ 0x08135200 + thumb_func_start SpriteCB_MinuteHand +SpriteCB_MinuteHand: @ 0x08135200 push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r0, #0 @@ -636113,7 +636113,7 @@ sub_08135200: @ 0x08135200 ldrh r4, [r0, #8] adds r7, r4, #0 adds r0, r4, #0 - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -636176,10 +636176,10 @@ _08135284: .align 2, 0 _08135290: .4byte gUnknown_3005B60 _08135294: .4byte gUnknown_8591D1C - thumb_func_end sub_08135200 + thumb_func_end SpriteCB_MinuteHand - thumb_func_start sub_08135298 -sub_08135298: @ 0x08135298 + thumb_func_start SpriteCB_HourHand +SpriteCB_HourHand: @ 0x08135298 push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r0, #0 @@ -636193,7 +636193,7 @@ sub_08135298: @ 0x08135298 ldrh r4, [r0, #0xa] adds r7, r4, #0 adds r0, r4, #0 - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 cmp r0, #0 @@ -636256,10 +636256,10 @@ _0813531C: .align 2, 0 _08135328: .4byte gUnknown_3005B60 _0813532C: .4byte gUnknown_8591D1C - thumb_func_end sub_08135298 + thumb_func_end SpriteCB_HourHand - thumb_func_start sub_08135330 -sub_08135330: @ 0x08135330 + thumb_func_start SpriteCB_AMIndicator +SpriteCB_AMIndicator: @ 0x08135330 push {r4, lr} adds r4, r0, #0 ldr r2, _0813536C @@ -636327,7 +636327,7 @@ _081353A8: asrs r0, r0, #0xc strh r0, [r4, #0x24] ldrh r0, [r4, #0x30] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 lsls r1, r0, #4 @@ -636345,10 +636345,10 @@ _081353C4: bx r0 .align 2, 0 _081353D0: .4byte 0x00000FFF - thumb_func_end sub_08135330 + thumb_func_end SpriteCB_AMIndicator - thumb_func_start sub_081353D4 -sub_081353D4: @ 0x081353D4 + thumb_func_start SpriteCB_PMIndicator +SpriteCB_PMIndicator: @ 0x081353D4 push {r4, lr} adds r4, r0, #0 ldr r2, _08135410 @@ -636416,7 +636416,7 @@ _0813544C: asrs r0, r0, #0xc strh r0, [r4, #0x24] ldrh r0, [r4, #0x30] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 lsls r1, r0, #4 @@ -636434,10 +636434,10 @@ _08135468: bx r0 .align 2, 0 _08135474: .4byte 0x00000FFF - thumb_func_end sub_081353D4 + thumb_func_end SpriteCB_PMIndicator - thumb_func_start sub_08135478 -sub_08135478: @ 0x08135478 + thumb_func_start CheckObjectGraphicsInFrontOfPlayer +CheckObjectGraphicsInFrontOfPlayer: @ 0x08135478 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -636445,13 +636445,13 @@ sub_08135478: @ 0x08135478 ldr r4, _081354B8 adds r1, r4, #2 adds r0, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer bl PlayerGetZCoord strb r0, [r4, #4] ldrh r0, [r4] ldrh r1, [r4, #2] ldrb r2, [r4, #4] - bl sub_0808E5E8 + bl GetEventObjectIdByXYZ lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081354BC @@ -636477,28 +636477,28 @@ _081354C6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08135478 + thumb_func_end CheckObjectGraphicsInFrontOfPlayer - thumb_func_start sub_081354CC -sub_081354CC: @ 0x081354CC + thumb_func_start oei_task_add +oei_task_add: @ 0x081354CC push {lr} ldr r0, _081354E8 adds r1, r0, #2 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer ldr r0, _081354EC movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _081354E8: .4byte gUnknown_203A80C -_081354EC: .4byte sub_081354F0 - thumb_func_end sub_081354CC +_081354EC: .4byte task08_080C9820 + thumb_func_end oei_task_add - thumb_func_start sub_081354F0 -sub_081354F0: @ 0x081354F0 + thumb_func_start task08_080C9820 +task08_080C9820: @ 0x081354F0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -636529,7 +636529,7 @@ _08135526: cmp r0, #5 bne _08135558 movs r0, #0x3b - bl sub_080B5270 + bl FieldEffectStart ldr r0, _08135550 lsls r1, r5, #2 adds r1, r1, r5 @@ -636547,7 +636547,7 @@ _08135558: bl sub_0808BA78 adds r0, r4, #0 movs r1, #0x39 - bl sub_08092B30 + bl EventObjectSetHeldMovement ldr r0, _08135578 lsls r1, r6, #2 adds r1, r1, r6 @@ -636563,7 +636563,7 @@ _08135572: .align 2, 0 _08135578: .4byte gUnknown_3005B60 _0813557C: .4byte sub_08135580 - thumb_func_end sub_081354F0 + thumb_func_end task08_080C9820 thumb_func_start sub_08135580 sub_08135580: @ 0x08135580 @@ -636583,7 +636583,7 @@ sub_08135580: @ 0x08135580 cmp r0, #1 bne _081355B4 movs r0, #0x3b - bl sub_080B5270 + bl FieldEffectStart ldr r0, _081355C4 lsls r1, r4, #2 adds r1, r1, r4 @@ -636645,12 +636645,12 @@ _0813560C: lsls r4, r4, #2 ldr r0, _08135660 adds r4, r4, r0 - bl sub_0808B8D0 + bl GetPlayerAvatarGraphicsIdByCurrentState adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0808DD68 + bl EventObjectSetGraphicsId ldrb r1, [r5, #4] lsls r0, r1, #4 adds r0, r0, r1 @@ -636701,7 +636701,7 @@ sub_08135670: @ 0x08135670 movs r0, #0 strb r0, [r1, #6] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -636710,15 +636710,15 @@ _081356A0: .4byte gUnknown_3005B60 _081356A4: .4byte gUnknown_2037230 thumb_func_end sub_08135670 - thumb_func_start sub_081356A8 -sub_081356A8: @ 0x081356A8 + thumb_func_start SetUpFieldMove_RockSmash +SetUpFieldMove_RockSmash: @ 0x081356A8 push {r4, lr} - bl sub_08179694 + bl ShouldDoBrailleRegirockEffect lsls r0, r0, #0x18 cmp r0, #0 beq _081356E0 ldr r4, _081356CC - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -636731,12 +636731,12 @@ sub_081356A8: @ 0x081356A8 .align 2, 0 _081356CC: .4byte gUnknown_2037290 _081356D0: .4byte gUnknown_3005B10 -_081356D4: .4byte sub_081B53D8 +_081356D4: .4byte FieldCallback_PrepareFadeInFromMenu _081356D8: .4byte gUnknown_203CBB8 _081356DC: .4byte sub_081796EC _081356E0: movs r0, #0x56 - bl sub_08135478 + bl CheckObjectGraphicsInFrontOfPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -636758,15 +636758,15 @@ _08135700: bx r1 .align 2, 0 _08135708: .4byte gUnknown_3005B10 -_0813570C: .4byte sub_081B53D8 +_0813570C: .4byte FieldCallback_PrepareFadeInFromMenu _08135710: .4byte gUnknown_203CBB8 _08135714: .4byte sub_08135718 - thumb_func_end sub_081356A8 + thumb_func_end SetUpFieldMove_RockSmash thumb_func_start sub_08135718 sub_08135718: @ 0x08135718 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _08135730 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -636780,10 +636780,10 @@ _08135730: .4byte gUnknown_20388A8 _08135734: .4byte gUnknown_82566C6 thumb_func_end sub_08135718 - thumb_func_start sub_08135738 -sub_08135738: @ 0x08135738 + thumb_func_start FldEff_UseRockSmash +FldEff_UseRockSmash: @ 0x08135738 push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08135760 @@ -636803,7 +636803,7 @@ sub_08135738: @ 0x08135738 .align 2, 0 _08135760: .4byte gUnknown_3005B60 _08135764: .4byte sub_08135768 - thumb_func_end sub_08135738 + thumb_func_end FldEff_UseRockSmash thumb_func_start sub_08135768 sub_08135768: @ 0x08135768 @@ -636812,16 +636812,16 @@ sub_08135768: @ 0x08135768 bl sub_080A306C movs r0, #0x25 bl FieldEffectActiveListRemove - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08135768 - thumb_func_start sub_08135780 -sub_08135780: @ 0x08135780 + thumb_func_start SetUpFieldMove_Dig +SetUpFieldMove_Dig: @ 0x08135780 push {lr} - bl sub_080FEB64 + bl CanUseEscapeRopeOnCurrMap lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -636841,18 +636841,18 @@ _081357A0: bx r1 .align 2, 0 _081357A4: .4byte gUnknown_3005B10 -_081357A8: .4byte sub_081B53D8 +_081357A8: .4byte FieldCallback_PrepareFadeInFromMenu _081357AC: .4byte gUnknown_203CBB8 -_081357B0: .4byte sub_081357B4 - thumb_func_end sub_08135780 +_081357B0: .4byte hm2_dig + thumb_func_end SetUpFieldMove_Dig - thumb_func_start sub_081357B4 -sub_081357B4: @ 0x081357B4 + thumb_func_start hm2_dig +hm2_dig: @ 0x081357B4 push {lr} bl sub_0808406C movs r0, #0x26 - bl sub_080B5270 - bl sub_081B1024 + bl FieldEffectStart + bl GetCursorSelectionMonId ldr r1, _081357D0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -636861,12 +636861,12 @@ sub_081357B4: @ 0x081357B4 bx r0 .align 2, 0 _081357D0: .4byte gUnknown_20388A8 - thumb_func_end sub_081357B4 + thumb_func_end hm2_dig - thumb_func_start sub_081357D4 -sub_081357D4: @ 0x081357D4 + thumb_func_start FldEff_UseDig +FldEff_UseDig: @ 0x081357D4 push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08135808 @@ -636878,7 +636878,7 @@ sub_081357D4: @ 0x081357D4 lsrs r0, r2, #0x10 strh r0, [r1, #0x18] strh r2, [r1, #0x1a] - bl sub_081794A0 + bl ShouldDoBrailleDigEffect lsls r0, r0, #0x18 cmp r0, #0 bne _08135800 @@ -636891,24 +636891,24 @@ _08135800: .align 2, 0 _08135808: .4byte gUnknown_3005B60 _0813580C: .4byte sub_08135810 - thumb_func_end sub_081357D4 + thumb_func_end FldEff_UseDig thumb_func_start sub_08135810 sub_08135810: @ 0x08135810 push {r4, lr} movs r0, #0x26 bl FieldEffectActiveListRemove - bl sub_081794A0 + bl ShouldDoBrailleDigEffect lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 beq _0813582A - bl sub_081794F4 + bl DoBrailleDigEffect b _08135842 _0813582A: ldr r0, _08135848 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0813584C @@ -637030,7 +637030,7 @@ _08135922: strb r0, [r1] _08135924: ldr r0, _08135940 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6} pop {r0} bx r0 @@ -637039,11 +637039,11 @@ _08135930: .4byte gUnknown_203A81C _08135934: .4byte 0x00000804 _08135938: .4byte gUnknown_85920E4 _0813593C: .4byte 0x00000808 -_08135940: .4byte sub_0813599C +_08135940: .4byte CB2_InitPokeblockMenu thumb_func_end sub_08135850 - thumb_func_start sub_08135944 -sub_08135944: @ 0x08135944 + thumb_func_start SummaryScreen_MainCB2 +SummaryScreen_MainCB2: @ 0x08135944 push {lr} ldr r1, _08135954 movs r0, #1 @@ -637052,10 +637052,10 @@ sub_08135944: @ 0x08135944 bx r0 .align 2, 0 _08135954: .4byte sub_0805996C - thumb_func_end sub_08135944 + thumb_func_end SummaryScreen_MainCB2 - thumb_func_start sub_08135958 -sub_08135958: @ 0x08135958 + thumb_func_start OpenPokeblockCaseOnFeeder +OpenPokeblockCaseOnFeeder: @ 0x08135958 push {lr} ldr r1, _08135968 movs r0, #2 @@ -637064,34 +637064,34 @@ sub_08135958: @ 0x08135958 bx r0 .align 2, 0 _08135968: .4byte sub_08085A30 - thumb_func_end sub_08135958 + thumb_func_end OpenPokeblockCaseOnFeeder - thumb_func_start sub_0813596C -sub_0813596C: @ 0x0813596C + thumb_func_start Mailbox_DoRedrawMailboxMenuAfterReturn +Mailbox_DoRedrawMailboxMenuAfterReturn: @ 0x0813596C push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813596C + thumb_func_end Mailbox_DoRedrawMailboxMenuAfterReturn - thumb_func_start sub_08135988 -sub_08135988: @ 0x08135988 + thumb_func_start VBlankCB_PokeblockMenu +VBlankCB_PokeblockMenu: @ 0x08135988 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08135988 + thumb_func_end VBlankCB_PokeblockMenu - thumb_func_start sub_0813599C -sub_0813599C: @ 0x0813599C + thumb_func_start CB2_InitPokeblockMenu +CB2_InitPokeblockMenu: @ 0x0813599C push {lr} _0813599E: bl sub_081221F8 @@ -637099,7 +637099,7 @@ _0813599E: lsrs r0, r0, #0x18 cmp r0, #1 beq _081359C2 - bl sub_081359C8 + bl InitPokeblockMenu lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -637113,10 +637113,10 @@ _081359C2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813599C + thumb_func_end CB2_InitPokeblockMenu - thumb_func_start sub_081359C8 -sub_081359C8: @ 0x081359C8 + thumb_func_start InitPokeblockMenu +InitPokeblockMenu: @ 0x081359C8 push {r4, lr} sub sp, #4 ldr r0, _081359E8 @@ -637157,11 +637157,11 @@ _081359F0: @ jump table .4byte _08135BBA @ case 17 .4byte _08135BD4 @ case 18 _08135A3C: - bl sub_08121E58 + bl SetVBlankHBlankCallbacksToNull bl sub_08199640 b _08135BEE _08135A46: - bl sub_080B9710 + bl ScanlineEffect_Stop ldr r1, _08135A54 movs r0, #0x87 lsls r0, r0, #3 @@ -637200,7 +637200,7 @@ _08135A86: bne _08135A96 b _08135BEE _08135A96: - bl sub_080A8818 + bl ResetTasks b _08135BEE .align 2, 0 _08135A9C: .4byte gUnknown_203A81C @@ -637218,7 +637218,7 @@ _08135AA4: _08135AB8: .4byte gUnknown_203A81C _08135ABC: .4byte 0x00000D36 _08135AC0: - bl sub_08135C88 + bl LoadPokeblockMenuGfx lsls r0, r0, #0x18 cmp r0, #0 bne _08135ACC @@ -637232,7 +637232,7 @@ _08135ACC: .align 2, 0 _08135AD8: .4byte gUnknown_3002360 _08135ADC: - bl sub_0813629C + bl SetMenuItemsCountAndMaxShowed bl sub_08136320 bl sub_08136384 b _08135BEE @@ -637240,7 +637240,7 @@ _08135AEA: movs r0, #0x38 movs r1, #0x40 movs r2, #0 - bl sub_08136484 + bl CreatePokeblockCaseSprite ldr r1, _08135B08 ldr r1, [r1] ldr r2, _08135B0C @@ -637270,7 +637270,7 @@ _08135B2C: ldr r0, _08135B40 ldrh r0, [r0, #4] ldr r1, _08135B44 - bl sub_08136150 + bl HandlePokeblockMenuCursor ldr r1, _08135B48 movs r0, #0x87 lsls r0, r0, #3 @@ -637298,7 +637298,7 @@ _08135B64: _08135B6A: ldr r0, _08135BA0 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -637306,7 +637306,7 @@ _08135B6A: ldr r2, _08135BA8 ldrh r1, [r2, #6] ldrh r2, [r2, #4] - bl sub_081AE25C + bl ListMenuInit ldr r2, _08135BAC lsls r1, r4, #2 adds r1, r1, r4 @@ -637321,7 +637321,7 @@ _08135B6A: adds r1, r1, r0 b _08135BF6 .align 2, 0 -_08135BA0: .4byte sub_08136608 +_08135BA0: .4byte Task_HandlePokeblockMenuInput _08135BA4: .4byte gUnknown_3006050 _08135BA8: .4byte gUnknown_203A814 _08135BAC: .4byte gUnknown_3005B60 @@ -637334,7 +637334,7 @@ _08135BBA: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r1, _08135BD0 movs r0, #0x87 lsls r0, r0, #3 @@ -637349,7 +637349,7 @@ _08135BD4: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _08135C00 ldrb r1, [r2, #8] movs r0, #0x7f @@ -637370,14 +637370,14 @@ _08135C00: .4byte gUnknown_2037C74 _08135C04: .4byte gUnknown_3002360 _08135C08: ldr r0, _08135C18 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08135C1C - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _08135C22 .align 2, 0 -_08135C18: .4byte sub_08135988 -_08135C1C: .4byte sub_0813596C +_08135C18: .4byte VBlankCB_PokeblockMenu +_08135C1C: .4byte Mailbox_DoRedrawMailboxMenuAfterReturn _08135C20: movs r0, #0 _08135C22: @@ -637386,12 +637386,12 @@ _08135C22: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081359C8 + thumb_func_end InitPokeblockMenu thumb_func_start sub_08135C2C sub_08135C2C: @ 0x08135C2C push {lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _08135C80 @@ -637401,20 +637401,20 @@ sub_08135C2C: @ 0x08135C2C ldr r0, _08135C84 ldr r1, [r0] movs r0, #2 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -637425,8 +637425,8 @@ _08135C80: .4byte gUnknown_859206C _08135C84: .4byte gUnknown_203A81C thumb_func_end sub_08135C2C - thumb_func_start sub_08135C88 -sub_08135C88: @ 0x08135C88 + thumb_func_start LoadPokeblockMenuGfx +LoadPokeblockMenuGfx: @ 0x08135C88 push {r4, lr} sub sp, #4 ldr r0, _08135CA8 @@ -637461,12 +637461,12 @@ _08135CCC: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _08135D2E .align 2, 0 _08135CE4: .4byte gUnknown_8D9B4B4 _08135CE8: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -637484,19 +637484,19 @@ _08135D0C: ldr r0, _08135D18 movs r1, #0 movs r2, #0xc0 - bl sub_080A11BC + bl LoadCompressedPalette b _08135D2E .align 2, 0 _08135D18: .4byte gUnknown_8D9B6BC _08135D1C: ldr r0, _08135D24 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _08135D2E .align 2, 0 _08135D24: .4byte gUnknown_8592140 _08135D28: ldr r0, _08135D40 - bl sub_080343E4 + bl LoadCompressedSpritePalette _08135D2E: ldr r0, _08135D44 ldr r1, [r0] @@ -637532,13 +637532,13 @@ _08135D6A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08135C88 + thumb_func_end LoadPokeblockMenuGfx thumb_func_start sub_08135D74 sub_08135D74: @ 0x08135D74 push {r4, lr} ldr r0, _08135DC4 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #1 @@ -637547,25 +637547,25 @@ sub_08135D74: @ 0x08135D74 movs r0, #0 movs r1, #0xa movs r2, #0xd0 - bl sub_08098104 + bl LoadMessageBoxGfx ldr r0, _08135DC8 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r4, #0 _08135DA0: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0xa bls _08135DA0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -637590,7 +637590,7 @@ sub_08135DCC: @ 0x08135DCC movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r0} bx r0 @@ -637624,7 +637624,7 @@ sub_08135DF8: @ 0x08135DF8 movs r4, #0 _08135E32: adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -637788,7 +637788,7 @@ sub_08135F30: @ 0x08135F30 adds r5, #9 ldr r1, _08135FB0 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders pop {r3, r4} mov r8, r3 mov sb, r4 @@ -637803,8 +637803,8 @@ _08135FAC: .4byte gUnknown_2021C40 _08135FB0: .4byte gUnknown_85C9864 thumb_func_end sub_08135F30 - thumb_func_start sub_08135FB4 -sub_08135FB4: @ 0x08135FB4 + thumb_func_start MovePokeblockMenuCursor +MovePokeblockMenuCursor: @ 0x08135FB4 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -637846,7 +637846,7 @@ _08136000: .4byte gUnknown_203A81C _08136004: .4byte 0x00000D2C _08136008: .4byte sub_081364B0 _0813600C: .4byte 0x00000D35 - thumb_func_end sub_08135FB4 + thumb_func_end MovePokeblockMenuCursor thumb_func_start sub_08136010 sub_08136010: @ 0x08136010 @@ -637857,7 +637857,7 @@ sub_08136010: @ 0x08136010 adds r4, r0, #0 movs r0, #7 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 rsbs r0, r0, #0 cmp r4, r0 @@ -637989,12 +637989,12 @@ _081360EA: bls _081360EA movs r0, #7 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _08136138: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r3} mov r8, r3 @@ -638003,8 +638003,8 @@ _08136138: bx r0 thumb_func_end sub_08136010 - thumb_func_start sub_08136150 -sub_08136150: @ 0x08136150 + thumb_func_start HandlePokeblockMenuCursor +HandlePokeblockMenuCursor: @ 0x08136150 push {lr} sub sp, #8 adds r3, r0, #0 @@ -638022,12 +638022,12 @@ sub_08136150: @ 0x08136150 movs r2, #0xf bl FillBgTilemapBufferRect_Palette0 movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08136150 + thumb_func_end HandlePokeblockMenuCursor thumb_func_start CompactPokeblockSlots CompactPokeblockSlots: @ 0x08136180 @@ -638092,8 +638092,8 @@ _081361E8: .4byte gUnknown_3005AEC _081361EC: .4byte 0x00000848 thumb_func_end CompactPokeblockSlots - thumb_func_start sub_081361F0 -sub_081361F0: @ 0x081361F0 + thumb_func_start SwapSortPokeblocksInternalData +SwapSortPokeblocksInternalData: @ 0x081361F0 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -638168,15 +638168,15 @@ _08136274: str r0, [r2] str r1, [r2, #4] adds r0, r7, #0 - bl sub_08000BF0 + bl Free _08136286: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081361F0 + thumb_func_end SwapSortPokeblocksInternalData - thumb_func_start sub_0813628C -sub_0813628C: @ 0x0813628C + thumb_func_start ResetPokeblockScrollPositions +ResetPokeblockScrollPositions: @ 0x0813628C ldr r1, _08136298 movs r0, #0 strh r0, [r1, #4] @@ -638184,10 +638184,10 @@ sub_0813628C: @ 0x0813628C bx lr .align 2, 0 _08136298: .4byte gUnknown_203A814 - thumb_func_end sub_0813628C + thumb_func_end ResetPokeblockScrollPositions - thumb_func_start sub_0813629C -sub_0813629C: @ 0x0813629C + thumb_func_start SetMenuItemsCountAndMaxShowed +SetMenuItemsCountAndMaxShowed: @ 0x0813629C push {r4, r5, lr} bl CompactPokeblockSlots ldr r0, _081362FC @@ -638252,7 +638252,7 @@ _08136316: bx r0 .align 2, 0 _0813631C: .4byte 0x0000080B - thumb_func_end sub_0813629C + thumb_func_end SetMenuItemsCountAndMaxShowed thumb_func_start sub_08136320 sub_08136320: @ 0x08136320 @@ -638397,7 +638397,7 @@ sub_081363FC: @ 0x081363FC movs r1, #0xb0 movs r2, #8 movs r3, #0x98 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r4] ldr r2, _08136448 adds r1, r1, r2 @@ -638425,7 +638425,7 @@ sub_08136458: @ 0x08136458 ldrb r0, [r1] cmp r0, #0xff beq _08136476 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r1, _08136480 adds r0, r0, r1 @@ -638440,8 +638440,8 @@ _0813647C: .4byte gUnknown_203A81C _08136480: .4byte 0x00000D34 thumb_func_end sub_08136458 - thumb_func_start sub_08136484 -sub_08136484: @ 0x08136484 + thumb_func_start CreatePokeblockCaseSprite +CreatePokeblockCaseSprite: @ 0x08136484 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -638455,7 +638455,7 @@ sub_08136484: @ 0x08136484 asrs r5, r5, #0x10 adds r1, r4, #0 adds r2, r5, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5} @@ -638463,7 +638463,7 @@ sub_08136484: @ 0x08136484 bx r1 .align 2, 0 _081364AC: .4byte gUnknown_8592150 - thumb_func_end sub_08136484 + thumb_func_end CreatePokeblockCaseSprite thumb_func_start sub_081364B0 sub_081364B0: @ 0x081364B0 @@ -638544,7 +638544,7 @@ sub_0813652C: @ 0x0813652C str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0813655C lsls r0, r4, #2 adds r0, r0, r4 @@ -638558,11 +638558,11 @@ sub_0813652C: @ 0x0813652C bx r0 .align 2, 0 _0813655C: .4byte gUnknown_3005B60 -_08136560: .4byte sub_08136564 +_08136560: .4byte Task_FreeDataAndExitPokeblockCase thumb_func_end sub_0813652C - thumb_func_start sub_08136564 -sub_08136564: @ 0x08136564 + thumb_func_start Task_FreeDataAndExitPokeblockCase +Task_FreeDataAndExitPokeblockCase: @ 0x08136564 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -638595,7 +638595,7 @@ _0813659A: ldr r4, _081365E0 subs r2, r4, #2 adds r1, r4, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask bl sub_08136458 bl ResetSpriteData bl FreeAllSpritePalettes @@ -638606,7 +638606,7 @@ _0813659A: ldr r0, [r0] cmp r0, #0 beq _081365E4 - bl sub_08000540 + bl SetMainCallback2 b _081365EC .align 2, 0 _081365C8: .4byte gUnknown_3005B68 @@ -638614,29 +638614,29 @@ _081365CC: .4byte gUnknown_2037C74 _081365D0: .4byte gUnknown_203A81C _081365D4: .4byte 0x00000809 _081365D8: .4byte gUnknown_3005B0C -_081365DC: .4byte sub_080AEA64 +_081365DC: .4byte FieldCallback_ReturnToEventScript2 _081365E0: .4byte gUnknown_203A81A _081365E4: subs r0, r4, #6 ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 _081365EC: - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _08136604 ldr r0, [r0] - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081365FE: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08136604: .4byte gUnknown_203A81C - thumb_func_end sub_08136564 + thumb_func_end Task_FreeDataAndExitPokeblockCase - thumb_func_start sub_08136608 -sub_08136608: @ 0x08136608 + thumb_func_start Task_HandlePokeblockMenuInput +Task_HandlePokeblockMenuInput: @ 0x08136608 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -638697,7 +638697,7 @@ _08136642: bl sub_080A306C ldrh r0, [r4, #4] ldr r1, _081366BC - bl sub_08136150 + bl HandlePokeblockMenuCursor ldrh r0, [r4, #4] ldrh r4, [r4, #6] adds r0, r0, r4 @@ -638722,13 +638722,13 @@ _081366B4: .4byte gUnknown_203A81C _081366B8: .4byte 0x0000080A _081366BC: .4byte 0x00002005 _081366C0: .4byte 0x00000D35 -_081366C4: .4byte sub_0813675C +_081366C4: .4byte Task_HandlePokeblocksSwapInput _081366C8: ldr r5, _08136708 ldrh r2, [r5, #4] mov r8, r2 ldrb r0, [r6] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r4, r0, #0 ldrb r0, [r6] adds r1, r5, #6 @@ -638739,10 +638739,10 @@ _081366C8: beq _081366F6 mov r0, r8 movs r1, #5 - bl sub_08136150 + bl HandlePokeblockMenuCursor ldrh r0, [r5, #4] ldr r1, _0813670C - bl sub_08136150 + bl HandlePokeblockMenuCursor _081366F6: movs r0, #2 rsbs r0, r0, #0 @@ -638789,10 +638789,10 @@ _08136748: bx r0 .align 2, 0 _08136758: .4byte gUnknown_203CB48 - thumb_func_end sub_08136608 + thumb_func_end Task_HandlePokeblockMenuInput - thumb_func_start sub_0813675C -sub_0813675C: @ 0x0813675C + thumb_func_start Task_HandlePokeblocksSwapInput +Task_HandlePokeblocksSwapInput: @ 0x0813675C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -638834,7 +638834,7 @@ _081367AC: ldrh r4, [r6, #6] ldrh r5, [r6, #4] ldrb r0, [r7] - bl sub_081AE2DC + bl ListMenu_ProcessInput mov sb, r0 ldrb r0, [r7] adds r1, r6, #6 @@ -638860,7 +638860,7 @@ _081367D2: bne _081367F8 adds r0, r4, #0 ldr r1, _081367F4 - bl sub_08136150 + bl HandlePokeblockMenuCursor b _08136800 .align 2, 0 _081367F0: .4byte gUnknown_203A814 @@ -638868,7 +638868,7 @@ _081367F4: .4byte 0x00002005 _081367F8: adds r0, r4, #0 movs r1, #5 - bl sub_08136150 + bl HandlePokeblockMenuCursor _08136800: adds r0, r4, #1 lsls r0, r0, #0x10 @@ -638918,21 +638918,21 @@ _08136850: _08136862: mov r0, r8 movs r1, #0 - bl sub_08136894 + bl HandlePokeblocksSwap b _08136888 .align 2, 0 _0813686C: .4byte gUnknown_3002360 _08136870: mov r0, r8 movs r1, #1 - bl sub_08136894 + bl HandlePokeblocksSwap b _08136888 _0813687A: movs r0, #5 bl sub_080A306C mov r0, r8 movs r1, #0 - bl sub_08136894 + bl HandlePokeblocksSwap _08136888: pop {r3, r4} mov r8, r3 @@ -638940,10 +638940,10 @@ _08136888: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0813675C + thumb_func_end Task_HandlePokeblocksSwapInput - thumb_func_start sub_08136894 -sub_08136894: @ 0x08136894 + thumb_func_start HandlePokeblocksSwap +HandlePokeblocksSwap: @ 0x08136894 push {r4, r5, r6, r7, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -638970,7 +638970,7 @@ sub_08136894: @ 0x08136894 ldrb r0, [r6] adds r1, r2, #6 adds r2, #4 - bl sub_081AE3A0 + bl DestroyListMenuTask cmp r4, #0 bne _081368EA movs r0, #4 @@ -638982,7 +638982,7 @@ sub_08136894: @ 0x08136894 beq _081368EA adds r0, r1, #0 adds r1, r5, #0 - bl sub_081361F0 + bl SwapSortPokeblocksInternalData bl sub_08135E60 _081368EA: movs r1, #4 @@ -638998,12 +638998,12 @@ _081368FA: ldr r2, _08136958 ldrh r1, [r2, #6] ldrh r2, [r2, #4] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _0813695C ldr r0, [r0] ldr r1, _08136968 @@ -639016,7 +639016,7 @@ _081368FA: _08136926: adds r0, r4, #0 movs r1, #5 - bl sub_08136150 + bl HandlePokeblockMenuCursor adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -639025,7 +639025,7 @@ _08136926: ldr r0, _08136958 ldrh r0, [r0, #4] ldr r1, _0813696C - bl sub_08136150 + bl HandlePokeblockMenuCursor ldr r1, _08136970 adds r0, r5, r7 lsls r0, r0, #3 @@ -639044,8 +639044,8 @@ _08136964: .4byte gUnknown_3006050 _08136968: .4byte 0x00000D2D _0813696C: .4byte 0x00001005 _08136970: .4byte gUnknown_3005B60 -_08136974: .4byte sub_08136608 - thumb_func_end sub_08136894 +_08136974: .4byte Task_HandlePokeblockMenuInput + thumb_func_end HandlePokeblocksSwap thumb_func_start sub_08136978 sub_08136978: @ 0x08136978 @@ -639084,7 +639084,7 @@ _081369B2: movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldrb r0, [r7, #2] movs r2, #0 mov r8, r2 @@ -639106,7 +639106,7 @@ _081369B2: movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_081989B4 + bl AddItemMenuActionTextPrinters ldrb r0, [r7, #2] str r6, [sp] ldr r1, [r5] @@ -639120,9 +639120,9 @@ _081369B2: movs r3, #2 bl sub_081984B0 ldrb r0, [r7, #2] - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _08136A48 mov r2, sb lsls r0, r2, #2 @@ -639144,11 +639144,11 @@ _08136A3C: .4byte 0x00000808 _08136A40: .4byte gUnknown_85920B4 _08136A44: .4byte 0x00000804 _08136A48: .4byte gUnknown_3005B60 -_08136A4C: .4byte sub_08136A50 +_08136A4C: .4byte Task_HandlePokeblockOptionsInput thumb_func_end sub_08136978 - thumb_func_start sub_08136A50 -sub_08136A50: @ 0x08136A50 + thumb_func_start Task_HandlePokeblockOptionsInput +Task_HandlePokeblockOptionsInput: @ 0x08136A50 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -639158,7 +639158,7 @@ sub_08136A50: @ 0x08136A50 lsrs r0, r0, #0x18 cmp r0, #1 beq _08136AAC - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 @@ -639171,7 +639171,7 @@ sub_08136A50: @ 0x08136A50 movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_08136E58 + bl PokeblockAction_Cancel b _08136AAC _08136A88: movs r0, #5 @@ -639198,10 +639198,10 @@ _08136AAC: _08136AB4: .4byte gUnknown_85920B4 _08136AB8: .4byte gUnknown_203A81C _08136ABC: .4byte 0x00000804 - thumb_func_end sub_08136A50 + thumb_func_end Task_HandlePokeblockOptionsInput - thumb_func_start sub_08136AC0 -sub_08136AC0: @ 0x08136AC0 + thumb_func_start PokeblockAction_UseOnField +PokeblockAction_UseOnField: @ 0x08136AC0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -639218,7 +639218,7 @@ sub_08136AC0: @ 0x08136AC0 .align 2, 0 _08136ADC: .4byte gUnknown_203A81C _08136AE0: .4byte sub_08136AE4 - thumb_func_end sub_08136AC0 + thumb_func_end PokeblockAction_UseOnField thumb_func_start sub_08136AE4 sub_08136AE4: @ 0x08136AE4 @@ -639232,18 +639232,18 @@ sub_08136AE4: @ 0x08136AE4 ldr r0, [r2] adds r0, r0, r1 ldr r1, _08136B0C - bl sub_08166010 + bl ChooseMonToGivePokeblock pop {r0} bx r0 .align 2, 0 _08136B00: .4byte gUnknown_3005AEC _08136B04: .4byte gUnknown_203CB48 _08136B08: .4byte 0x00000848 -_08136B0C: .4byte sub_08136B10 +_08136B0C: .4byte ReturnToPokeblockCaseOnField thumb_func_end sub_08136AE4 - thumb_func_start sub_08136B10 -sub_08136B10: @ 0x08136B10 + thumb_func_start ReturnToPokeblockCaseOnField +ReturnToPokeblockCaseOnField: @ 0x08136B10 push {lr} ldr r0, _08136B20 ldr r1, [r0] @@ -639253,10 +639253,10 @@ sub_08136B10: @ 0x08136B10 bx r0 .align 2, 0 _08136B20: .4byte gUnknown_203A814 - thumb_func_end sub_08136B10 + thumb_func_end ReturnToPokeblockCaseOnField - thumb_func_start sub_08136B24 -sub_08136B24: @ 0x08136B24 + thumb_func_start PokeblockAction_Toss +PokeblockAction_Toss: @ 0x08136B24 push {r4, r5, lr} sub sp, #0x10 adds r4, r0, #0 @@ -639288,7 +639288,7 @@ sub_08136B24: @ 0x08136B24 ldr r5, _08136BAC ldr r1, _08136BB0 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders bl GetPlayerTextSpeedDelay lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -639302,7 +639302,7 @@ sub_08136B24: @ 0x08136B24 movs r1, #0xa movs r2, #0xa movs r3, #0xd - bl sub_08121E6C + bl DisplayMessageAndContinueTask add sp, #0x10 pop {r4, r5} pop {r0} @@ -639316,11 +639316,11 @@ _08136BA4: .4byte gUnknown_203CB48 _08136BA8: .4byte 0x00000848 _08136BAC: .4byte gUnknown_2021C7C _08136BB0: .4byte gUnknown_85C9869 -_08136BB4: .4byte sub_08136BB8 - thumb_func_end sub_08136B24 +_08136BB4: .4byte CreateTossPokeblockYesNoMenu + thumb_func_end PokeblockAction_Toss - thumb_func_start sub_08136BB8 -sub_08136BB8: @ 0x08136BB8 + thumb_func_start CreateTossPokeblockYesNoMenu +CreateTossPokeblockYesNoMenu: @ 0x08136BB8 push {lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -639343,10 +639343,10 @@ sub_08136BB8: @ 0x08136BB8 .align 2, 0 _08136BE0: .4byte gUnknown_85921F4 _08136BE4: .4byte gUnknown_85920F0 - thumb_func_end sub_08136BB8 + thumb_func_end CreateTossPokeblockYesNoMenu - thumb_func_start sub_08136BE8 -sub_08136BE8: @ 0x08136BE8 + thumb_func_start TossPokeblockChoice_Yes +TossPokeblockChoice_Yes: @ 0x08136BE8 push {r4, r5, lr} sub sp, #0x10 adds r4, r0, #0 @@ -639355,7 +639355,7 @@ sub_08136BE8: @ 0x08136BE8 ldr r5, _08136C24 ldr r1, _08136C28 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders bl GetPlayerTextSpeedDelay lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -639369,7 +639369,7 @@ sub_08136BE8: @ 0x08136BE8 movs r1, #0xa movs r2, #0xa movs r3, #0xd - bl sub_08121E6C + bl DisplayMessageAndContinueTask add sp, #0x10 pop {r4, r5} pop {r0} @@ -639377,11 +639377,11 @@ sub_08136BE8: @ 0x08136BE8 .align 2, 0 _08136C24: .4byte gUnknown_2021C7C _08136C28: .4byte gUnknown_85C987B -_08136C2C: .4byte sub_08136C30 - thumb_func_end sub_08136BE8 +_08136C2C: .4byte HandleErasePokeblock + thumb_func_end TossPokeblockChoice_Yes - thumb_func_start sub_08136C30 -sub_08136C30: @ 0x08136C30 + thumb_func_start HandleErasePokeblock +HandleErasePokeblock: @ 0x08136C30 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -639393,7 +639393,7 @@ sub_08136C30: @ 0x08136C30 beq _08136CA6 ldr r0, _08136CB0 ldrb r0, [r0] - bl sub_08136FD8 + bl TryClearPokeblock movs r0, #5 bl sub_080A306C ldr r5, _08136CB4 @@ -639406,27 +639406,27 @@ sub_08136C30: @ 0x08136C30 ldrb r0, [r4] adds r1, r5, #0 adds r2, r6, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrh r0, [r6] movs r1, #5 - bl sub_08136150 - bl sub_0813629C + bl HandlePokeblockMenuCursor + bl SetMenuItemsCountAndMaxShowed bl sub_08136320 bl sub_08135E60 ldr r0, _08136CBC ldrh r1, [r5] ldrh r2, [r6] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] ldrh r0, [r6] ldr r1, _08136CC0 - bl sub_08136150 + bl HandlePokeblockMenuCursor movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r7, #0 bl sub_08136CC4 _08136CA6: @@ -639440,7 +639440,7 @@ _08136CB4: .4byte gUnknown_203A81A _08136CB8: .4byte gUnknown_3005B68 _08136CBC: .4byte gUnknown_3006050 _08136CC0: .4byte 0x00001005 - thumb_func_end sub_08136C30 + thumb_func_end HandleErasePokeblock thumb_func_start sub_08136CC4 sub_08136CC4: @ 0x08136CC4 @@ -639452,7 +639452,7 @@ sub_08136CC4: @ 0x08136CC4 movs r1, #0 bl sub_08197EBC movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram bl sub_081363FC ldr r1, _08136CF4 lsls r0, r4, #2 @@ -639466,11 +639466,11 @@ sub_08136CC4: @ 0x08136CC4 bx r0 .align 2, 0 _08136CF4: .4byte gUnknown_3005B60 -_08136CF8: .4byte sub_08136608 +_08136CF8: .4byte Task_HandlePokeblockMenuInput thumb_func_end sub_08136CC4 - thumb_func_start sub_08136CFC -sub_08136CFC: @ 0x08136CFC + thumb_func_start MachBikeTransition_TrySlowDown +MachBikeTransition_TrySlowDown: @ 0x08136CFC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -639478,7 +639478,7 @@ sub_08136CFC: @ 0x08136CFC lsrs r0, r0, #0x18 mov r8, r0 ldr r0, _08136D68 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _08136D6C @@ -639506,7 +639506,7 @@ sub_08136CFC: @ 0x08136CFC ldr r1, [r1] bl StringCopy ldrb r0, [r7] - bl sub_08136FD8 + bl TryClearPokeblock ldr r1, [r5] ldrh r0, [r7] lsls r0, r0, #3 @@ -639544,17 +639544,17 @@ _08136D8A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08136CFC + thumb_func_end MachBikeTransition_TrySlowDown - thumb_func_start sub_08136D9C -sub_08136D9C: @ 0x08136D9C + thumb_func_start PokeblockAction_UseOnPokeblockFeeder +PokeblockAction_UseOnPokeblockFeeder: @ 0x08136D9C push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r5, _08136DE8 ldrb r0, [r5] - bl sub_080FCC58 + bl SafariZoneActivatePokeblockFeeder ldr r0, _08136DEC ldr r3, _08136DF0 ldr r1, _08136DF4 @@ -639574,7 +639574,7 @@ sub_08136D9C: @ 0x08136D9C strh r0, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08136FD8 + bl TryClearPokeblock movs r0, #0 strh r0, [r5] adds r0, r4, #0 @@ -639589,10 +639589,10 @@ _08136DF0: .4byte gUnknown_8592078 _08136DF4: .4byte gUnknown_3005AEC _08136DF8: .4byte 0x00000848 _08136DFC: .4byte gUnknown_2037290 - thumb_func_end sub_08136D9C + thumb_func_end PokeblockAction_UseOnPokeblockFeeder - thumb_func_start sub_08136E00 -sub_08136E00: @ 0x08136E00 + thumb_func_start PokeblockAction_GiveToContestLady +PokeblockAction_GiveToContestLady: @ 0x08136E00 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -639606,7 +639606,7 @@ sub_08136E00: @ 0x08136E00 adds r1, r1, r2 ldr r0, [r0] adds r0, r0, r1 - bl sub_0818E360 + bl GivePokeblockToContestLady lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6] @@ -639615,7 +639615,7 @@ sub_08136E00: @ 0x08136E00 strh r0, [r1] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08136FD8 + bl TryClearPokeblock movs r0, #0 strh r0, [r5] adds r0, r4, #0 @@ -639629,10 +639629,10 @@ _08136E48: .4byte gUnknown_3005AEC _08136E4C: .4byte gUnknown_203CB48 _08136E50: .4byte 0x00000848 _08136E54: .4byte gUnknown_2037290 - thumb_func_end sub_08136E00 + thumb_func_end PokeblockAction_GiveToContestLady - thumb_func_start sub_08136E58 -sub_08136E58: @ 0x08136E58 + thumb_func_start PokeblockAction_Cancel +PokeblockAction_Cancel: @ 0x08136E58 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -639645,7 +639645,7 @@ sub_08136E58: @ 0x08136E58 movs r1, #0 bl sub_08198134 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram bl sub_081363FC subs r5, #8 adds r4, r4, r5 @@ -639656,8 +639656,8 @@ sub_08136E58: @ 0x08136E58 bx r0 .align 2, 0 _08136E88: .4byte gUnknown_3005B68 -_08136E8C: .4byte sub_08136608 - thumb_func_end sub_08136E58 +_08136E8C: .4byte Task_HandlePokeblockMenuInput + thumb_func_end PokeblockAction_Cancel thumb_func_start ClearPokeblock ClearPokeblock: @ 0x08136E90 @@ -639777,8 +639777,8 @@ _08136F5E: .align 2, 0 thumb_func_end GetPokeblocksFeel - thumb_func_start sub_08136F64 -sub_08136F64: @ 0x08136F64 + thumb_func_start GetFirstFreePokeblockSlot +GetFirstFreePokeblockSlot: @ 0x08136F64 push {lr} movs r1, #0 ldr r0, _08136F80 @@ -639809,13 +639809,13 @@ _08136F96: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08136F64 + thumb_func_end GetFirstFreePokeblockSlot - thumb_func_start sub_08136F9C -sub_08136F9C: @ 0x08136F9C + thumb_func_start AddPokeblock +AddPokeblock: @ 0x08136F9C push {r4, lr} adds r4, r0, #0 - bl sub_08136F64 + bl GetFirstFreePokeblockSlot lsls r0, r0, #0x18 asrs r1, r0, #0x18 movs r0, #1 @@ -639843,10 +639843,10 @@ _08136FD2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08136F9C + thumb_func_end AddPokeblock - thumb_func_start sub_08136FD8 -sub_08136FD8: @ 0x08136FD8 + thumb_func_start TryClearPokeblock +TryClearPokeblock: @ 0x08136FD8 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -639872,7 +639872,7 @@ _08137006: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08136FD8 + thumb_func_end TryClearPokeblock thumb_func_start GetPokeblockData GetPokeblockData: @ 0x0813700C @@ -639975,8 +639975,8 @@ _0813709A: _081370B0: .4byte gUnknown_8591FEC thumb_func_end PokeblockGetGain - thumb_func_start sub_081370B4 -sub_081370B4: @ 0x081370B4 + thumb_func_start PokeblockCopyName +PokeblockCopyName: @ 0x081370B4 push {r4, lr} adds r4, r1, #0 movs r1, #0 @@ -639993,10 +639993,10 @@ sub_081370B4: @ 0x081370B4 bx r0 .align 2, 0 _081370D4: .4byte gUnknown_8592078 - thumb_func_end sub_081370B4 + thumb_func_end PokeblockCopyName - thumb_func_start sub_081370D8 -sub_081370D8: @ 0x081370D8 + thumb_func_start CopyMonFavoritePokeblockName +CopyMonFavoritePokeblockName: @ 0x081370D8 push {r4, r5, r6, r7, lr} adds r6, r1, #0 lsls r0, r0, #0x18 @@ -640035,7 +640035,7 @@ _0813711C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081370D8 + thumb_func_end CopyMonFavoritePokeblockName thumb_func_start GetPokeblocksFlavor GetPokeblocksFlavor: @ 0x08137124 @@ -640077,15 +640077,15 @@ _08137152: .align 2, 0 thumb_func_end GetPokeblocksFlavor - thumb_func_start sub_0813716C -sub_0813716C: @ 0x0813716C + thumb_func_start SetUpFieldMove_Flash +SetUpFieldMove_Flash: @ 0x0813716C push {r4, lr} - bl sub_08179788 + bl ShouldDoBrailleRegisteelEffect lsls r0, r0, #0x18 cmp r0, #0 beq _081371A4 ldr r4, _08137190 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -640098,7 +640098,7 @@ sub_0813716C: @ 0x0813716C .align 2, 0 _08137190: .4byte gUnknown_2037290 _08137194: .4byte gUnknown_3005B10 -_08137198: .4byte sub_081B53D8 +_08137198: .4byte FieldCallback_PrepareFadeInFromMenu _0813719C: .4byte gUnknown_203CBB8 _081371A0: .4byte sub_081797D0 _081371A4: @@ -640124,25 +640124,25 @@ _081371C2: _081371C8: .4byte gUnknown_2036FB8 _081371CC: .4byte 0x00000888 _081371D0: .4byte gUnknown_3005B10 -_081371D4: .4byte sub_081B53D8 +_081371D4: .4byte FieldCallback_PrepareFadeInFromMenu _081371D8: .4byte gUnknown_203CBB8 -_081371DC: .4byte sub_081371E8 +_081371DC: .4byte hm2_flash _081371E0: movs r0, #0 _081371E2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0813716C + thumb_func_end SetUpFieldMove_Flash - thumb_func_start sub_081371E8 -sub_081371E8: @ 0x081371E8 + thumb_func_start hm2_flash +hm2_flash: @ 0x081371E8 push {r4, lr} - bl sub_081354CC + bl oei_task_add adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _08137218 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -640163,7 +640163,7 @@ sub_081371E8: @ 0x081371E8 _08137218: .4byte gUnknown_20388A8 _0813721C: .4byte gUnknown_3005B60 _08137220: .4byte sub_08137224 - thumb_func_end sub_081371E8 + thumb_func_end hm2_flash thumb_func_start sub_08137224 sub_08137224: @ 0x08137224 @@ -640184,10 +640184,10 @@ _08137240: .4byte gUnknown_8257EE2 thumb_func_start sub_08137244 sub_08137244: @ 0x08137244 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -640196,20 +640196,20 @@ sub_08137244: @ 0x08137244 thumb_func_start sub_0813725C sub_0813725C: @ 0x0813725C push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0813725C - thumb_func_start sub_08137270 -sub_08137270: @ 0x08137270 + thumb_func_start c2_change_map +c2_change_map: @ 0x08137270 push {r4, lr} sub sp, #8 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -640271,7 +640271,7 @@ sub_08137270: @ 0x08137270 str r0, [r1, #8] ldr r0, [r1, #8] bl ResetPaletteFade - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData ldr r3, _08137360 ldrh r2, [r3] @@ -640283,16 +640283,16 @@ sub_08137270: @ 0x08137270 strh r0, [r4] strh r2, [r3] ldr r0, _08137368 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0813736C - bl sub_08000540 + bl SetMainCallback2 bl sub_08137374 lsls r0, r0, #0x18 cmp r0, #0 bne _08137342 ldr r0, _08137370 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _08137342: add sp, #8 pop {r4} @@ -640309,12 +640309,12 @@ _08137364: .4byte 0x04000200 _08137368: .4byte sub_0813725C _0813736C: .4byte sub_08137244 _08137370: .4byte gUnknown_3002360 - thumb_func_end sub_08137270 + thumb_func_end c2_change_map thumb_func_start sub_08137374 sub_08137374: @ 0x08137374 push {r4, r5, r6, r7, lr} - bl sub_08085524 + bl GetLastUsedWarpMapType lsls r0, r0, #0x18 lsrs r6, r0, #0x18 bl GetCurrentMapType @@ -640405,8 +640405,8 @@ _08137412: bx r1 thumb_func_end sub_081373D0 - thumb_func_start sub_08137418 -sub_08137418: @ 0x08137418 + thumb_func_start GetMapPairFadeFromType +GetMapPairFadeFromType: @ 0x08137418 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -640446,14 +640446,14 @@ _0813745A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08137418 + thumb_func_end GetMapPairFadeFromType thumb_func_start sub_08137460 sub_08137460: @ 0x08137460 push {lr} ldr r0, _08137470 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -640495,11 +640495,11 @@ sub_08137490: @ 0x08137490 ldr r0, _0813751C movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08137520 movs r1, #0xe0 movs r2, #0x10 - bl sub_080A1200 + bl LoadPalette ldr r1, _08137524 movs r0, #0x50 bl SetGpuReg @@ -640609,7 +640609,7 @@ sub_0813757C: @ 0x0813757C lsls r2, r2, #0x10 lsrs r2, r2, #0x10 movs r1, #0xe0 - bl sub_080A1200 + bl LoadPalette b _081375D6 .align 2, 0 _081375B8: .4byte 0x00001010 @@ -640619,7 +640619,7 @@ _081375C4: ldr r0, _081375DC movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _081375E0 str r0, [r4] movs r0, #8 @@ -640656,7 +640656,7 @@ _08137604: .4byte gUnknown_3005B60 _08137608: ldr r0, _08137614 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _08137610: pop {r0} bx r0 @@ -640664,17 +640664,17 @@ _08137610: _08137614: .4byte gUnknown_3002360 thumb_func_end sub_081375E4 - thumb_func_start sub_08137618 -sub_08137618: @ 0x08137618 + thumb_func_start PartyMenuVBlankCallback +PartyMenuVBlankCallback: @ 0x08137618 push {lr} ldr r0, _08137628 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _08137628: .4byte sub_0813762C - thumb_func_end sub_08137618 + thumb_func_end PartyMenuVBlankCallback thumb_func_start sub_0813762C sub_0813762C: @ 0x0813762C @@ -640727,11 +640727,11 @@ sub_08137648: @ 0x08137648 ldr r0, _081376D8 movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _081376DC movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _081376E0 lsls r0, r4, #2 adds r0, r0, r4 @@ -640783,7 +640783,7 @@ sub_081376E8: @ 0x081376E8 lsls r2, r2, #0x11 lsrs r2, r2, #0x10 movs r1, #0xe0 - bl sub_080A1200 + bl LoadPalette b _08137738 .align 2, 0 _0813771C: .4byte gUnknown_3005B60 @@ -640840,10 +640840,10 @@ _08137784: ldr r0, _0813779C movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _081377A0 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 _08137796: pop {r4, r5} pop {r0} @@ -640853,13 +640853,13 @@ _0813779C: .4byte gUnknown_85922BC _081377A0: .4byte gUnknown_3002360 thumb_func_end sub_0813774C - thumb_func_start sub_081377A4 -sub_081377A4: @ 0x081377A4 + thumb_func_start GameClear +GameClear: @ 0x081377A4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #0x1c - bl sub_080F9A10 + bl HealPlayerParty ldr r4, _081377C8 adds r0, r4, #0 bl FlagGet @@ -640881,7 +640881,7 @@ _081377D0: bl FlagSet _081377DC: movs r0, #1 - bl sub_08084180 + bl GetGameStat cmp r0, #0 bne _081377FE ldr r0, _08137818 @@ -640896,21 +640896,21 @@ _081377DC: movs r0, #1 bl SetGameStat _081377FE: - bl sub_08076750 + bl SetContinueGameWarpStatus ldr r0, _08137818 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 bne _0813781C movs r0, #1 - bl sub_080848D4 + bl SetContinueGameWarpToHealLocation b _08137822 .align 2, 0 _08137814: .4byte gUnknown_203B9B0 _08137818: .4byte gUnknown_3005AF0 _0813781C: movs r0, #2 - bl sub_080848D4 + bl SetContinueGameWarpToHealLocation _08137822: movs r7, #0 movs r6, #0 @@ -640928,17 +640928,17 @@ _0813782C: strb r0, [r5, #1] adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0813787A adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0813787A adds r0, r4, #0 movs r1, #0x43 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0813787A movs r0, #1 @@ -640947,9 +640947,9 @@ _0813782C: adds r0, r4, #0 movs r1, #0x43 add r2, sp, #0x18 - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_080EF0BC + bl GetRibbonCount strb r0, [r5, #1] movs r7, #1 _0813787A: @@ -640994,7 +640994,7 @@ _081378A8: bl sub_080EEFFC _081378CA: ldr r0, _081378E8 - bl sub_08000540 + bl SetMainCallback2 movs r0, #0 add sp, #0x1c pop {r3} @@ -641005,23 +641005,23 @@ _081378CA: .align 2, 0 _081378E0: .4byte gUnknown_2024190 _081378E4: .4byte 0x0000089B -_081378E8: .4byte sub_08173478 - thumb_func_end sub_081377A4 +_081378E8: .4byte CB2_DoHallOfFameScreen + thumb_func_end GameClear - thumb_func_start sub_081378EC -sub_081378EC: @ 0x081378EC + thumb_func_start sp0C8_whiteout_maybe +sp0C8_whiteout_maybe: @ 0x081378EC push {lr} ldr r0, _081378FC - bl sub_08000540 + bl SetMainCallback2 movs r0, #0 pop {r1} bx r1 .align 2, 0 -_081378FC: .4byte sub_080858C0 - thumb_func_end sub_081378EC +_081378FC: .4byte CB2_WhiteOut + thumb_func_end sp0C8_whiteout_maybe - thumb_func_start sub_08137900 -sub_08137900: @ 0x08137900 + thumb_func_start GetMirageRnd +GetMirageRnd: @ 0x08137900 push {r4, lr} ldr r0, _08137924 bl VarGet @@ -641041,10 +641041,10 @@ sub_08137900: @ 0x08137900 .align 2, 0 _08137924: .4byte 0x00004024 _08137928: .4byte 0x00004025 - thumb_func_end sub_08137900 + thumb_func_end GetMirageRnd - thumb_func_start sub_0813792C -sub_0813792C: @ 0x0813792C + thumb_func_start SetMirageRnd +SetMirageRnd: @ 0x0813792C push {r4, lr} adds r4, r0, #0 ldr r0, _0813794C @@ -641061,10 +641061,10 @@ sub_0813792C: @ 0x0813792C .align 2, 0 _0813794C: .4byte 0x00004024 _08137950: .4byte 0x00004025 - thumb_func_end sub_0813792C + thumb_func_end SetMirageRnd - thumb_func_start sub_08137954 -sub_08137954: @ 0x08137954 + thumb_func_start InitMirageRnd +InitMirageRnd: @ 0x08137954 push {r4, lr} bl Random adds r4, r0, #0 @@ -641074,18 +641074,18 @@ sub_08137954: @ 0x08137954 lsrs r0, r0, #0x10 orrs r4, r0 adds r0, r4, #0 - bl sub_0813792C + bl SetMirageRnd pop {r4} pop {r0} bx r0 - thumb_func_end sub_08137954 + thumb_func_end InitMirageRnd thumb_func_start UpdateMirageRnd UpdateMirageRnd: @ 0x08137974 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_08137900 + bl GetMirageRnd adds r1, r0, #0 cmp r4, #0 beq _08137998 @@ -641102,7 +641102,7 @@ _08137988: bne _08137988 _08137998: adds r0, r1, #0 - bl sub_0813792C + bl SetMirageRnd pop {r4} pop {r0} bx r0 @@ -641111,10 +641111,10 @@ _081379A4: .4byte 0x41C64E6D _081379A8: .4byte 0x00003039 thumb_func_end UpdateMirageRnd - thumb_func_start sub_081379AC -sub_081379AC: @ 0x081379AC + thumb_func_start IsMirageIslandPresent +IsMirageIslandPresent: @ 0x081379AC push {r4, r5, r6, lr} - bl sub_08137900 + bl GetMirageRnd lsrs r6, r0, #0x10 movs r5, #0 _081379B6: @@ -641125,12 +641125,12 @@ _081379B6: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081379E8 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _081379E4 ands r1, r0 cmp r1, r6 @@ -641150,12 +641150,12 @@ _081379F0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081379AC + thumb_func_end IsMirageIslandPresent thumb_func_start sub_081379F8 sub_081379F8: @ 0x081379F8 push {lr} - bl sub_08085524 + bl GetLastUsedWarpMapType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl IsMapTypeOutdoors @@ -641198,9 +641198,9 @@ sub_08137A48: @ 0x08137A48 lsls r0, r0, #0x18 cmp r0, #0 beq _08137A62 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08137A62: pop {r4} pop {r0} @@ -641212,34 +641212,34 @@ sub_08137A68: @ 0x08137A68 push {lr} ldr r0, _08137A78 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _08137A78: .4byte sub_08137A48 thumb_func_end sub_08137A68 - thumb_func_start sub_08137A7C -sub_08137A7C: @ 0x08137A7C + thumb_func_start InitBirchState +InitBirchState: @ 0x08137A7C push {lr} ldr r0, _08137A8C - bl sub_0809CF20 + bl GetVarPointer movs r1, #0 strh r1, [r0] pop {r0} bx r0 .align 2, 0 _08137A8C: .4byte 0x00004049 - thumb_func_end sub_08137A7C + thumb_func_end InitBirchState - thumb_func_start sub_08137A90 -sub_08137A90: @ 0x08137A90 + thumb_func_start UpdateBirchState +UpdateBirchState: @ 0x08137A90 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r0, _08137AB8 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 ldrh r0, [r5] adds r4, r4, r0 @@ -641253,21 +641253,21 @@ sub_08137A90: @ 0x08137A90 bx r0 .align 2, 0 _08137AB8: .4byte 0x00004049 - thumb_func_end sub_08137A90 + thumb_func_end UpdateBirchState - thumb_func_start sub_08137ABC -sub_08137ABC: @ 0x08137ABC + thumb_func_start ScriptGetPokedexInfo +ScriptGetPokedexInfo: @ 0x08137ABC push {lr} ldr r0, _08137AD8 ldrh r0, [r0] cmp r0, #0 bne _08137AE0 movs r0, #0 - bl sub_080BFD9C + bl GetHoennPokedexCount ldr r1, _08137ADC strh r0, [r1] movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount b _08137AF0 .align 2, 0 _08137AD8: .4byte gUnknown_2037280 @@ -641282,7 +641282,7 @@ _08137AE0: _08137AF0: ldr r1, _08137B04 strh r0, [r1] - bl sub_0809CD04 + bl IsNationalPokedexEnabled lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} @@ -641290,10 +641290,10 @@ _08137AF0: .align 2, 0 _08137B00: .4byte gUnknown_2037282 _08137B04: .4byte gUnknown_2037284 - thumb_func_end sub_08137ABC + thumb_func_end ScriptGetPokedexInfo - thumb_func_start sub_08137B08 -sub_08137B08: @ 0x08137B08 + thumb_func_start GetPokedexRatingText +GetPokedexRatingText: @ 0x08137B08 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -641436,7 +641436,7 @@ _08137BEC: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 bne _08137C5A @@ -641446,7 +641446,7 @@ _08137BEC: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 bne _08137C5A @@ -641461,7 +641461,7 @@ _08137C28: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _08137C74 @@ -641471,7 +641471,7 @@ _08137C28: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _08137C74 @@ -641496,38 +641496,38 @@ _08137C76: bx r1 .align 2, 0 _08137C7C: .4byte gUnknown_826314F - thumb_func_end sub_08137B08 + thumb_func_end GetPokedexRatingText - thumb_func_start sub_08137C80 -sub_08137C80: @ 0x08137C80 + thumb_func_start ShowPokedexRatingMessage +ShowPokedexRatingMessage: @ 0x08137C80 push {lr} ldr r0, _08137C94 ldrh r0, [r0] - bl sub_08137B08 - bl sub_08097B74 + bl GetPokedexRatingText + bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 _08137C94: .4byte gUnknown_2037280 - thumb_func_end sub_08137C80 + thumb_func_end ShowPokedexRatingMessage thumb_func_start sub_08137C98 sub_08137C98: @ 0x08137C98 push {lr} ldr r0, _08137CA8 - bl sub_08000540 + bl SetMainCallback2 bl sub_080987DC pop {r0} bx r0 .align 2, 0 -_08137CA8: .4byte sub_08173F78 +_08137CA8: .4byte CB2_DoHallOfFamePC thumb_func_end sub_08137C98 - thumb_func_start sub_08137CAC -sub_08137CAC: @ 0x08137CAC + thumb_func_start ReturnFromHallOfFamePC +ReturnFromHallOfFamePC: @ 0x08137CAC push {lr} ldr r0, _08137CC0 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _08137CC4 ldr r0, _08137CC8 str r0, [r1] @@ -641536,33 +641536,33 @@ sub_08137CAC: @ 0x08137CAC .align 2, 0 _08137CC0: .4byte sub_08085A30 _08137CC4: .4byte gUnknown_3005B0C -_08137CC8: .4byte sub_08137CCC - thumb_func_end sub_08137CAC +_08137CC8: .4byte ReshowPCMenuAfterHallOfFamePC + thumb_func_end ReturnFromHallOfFamePC - thumb_func_start sub_08137CCC -sub_08137CCC: @ 0x08137CCC + thumb_func_start ReshowPCMenuAfterHallOfFamePC +ReshowPCMenuAfterHallOfFamePC: @ 0x08137CCC push {lr} sub sp, #4 bl sub_080987DC - bl sub_080850EC + bl Overworld_PlaySpecialMapMusic bl sub_080E1850 - bl sub_080E1A0C + bl ScriptMenu_DisplayPCStartupPrompt movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08137D00 movs r1, #0xa - bl sub_080A8878 + bl CreateTask add sp, #4 pop {r0} bx r0 .align 2, 0 _08137D00: .4byte sub_08137D04 - thumb_func_end sub_08137CCC + thumb_func_end ReshowPCMenuAfterHallOfFamePC thumb_func_start sub_08137D04 sub_08137D04: @ 0x08137D04 @@ -641576,7 +641576,7 @@ sub_08137D04: @ 0x08137D04 cmp r0, #0 bne _08137D1C adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _08137D1C: pop {r0} bx r0 @@ -641588,33 +641588,33 @@ _08137D20: .4byte gUnknown_2037C74 sub_08137D24: @ 0x08137D24 push {lr} ldr r0, _08137D34 - bl sub_08000540 + bl SetMainCallback2 bl sub_080987DC pop {r0} bx r0 .align 2, 0 -_08137D34: .4byte sub_08177714 +_08137D34: .4byte CB2_ShowDiploma thumb_func_end sub_08137D24 - thumb_func_start sub_08137D38 -sub_08137D38: @ 0x08137D38 + thumb_func_start Special_ViewWallClock +Special_ViewWallClock: @ 0x08137D38 push {lr} ldr r0, _08137D50 ldr r1, _08137D54 str r1, [r0, #8] ldr r0, _08137D58 - bl sub_08000540 + bl SetMainCallback2 bl sub_080987DC pop {r0} bx r0 .align 2, 0 _08137D50: .4byte gUnknown_3002360 _08137D54: .4byte sub_08085A30 -_08137D58: .4byte sub_08134B8C - thumb_func_end sub_08137D38 +_08137D58: .4byte CB2_ViewWallClock + thumb_func_end Special_ViewWallClock - thumb_func_start sub_08137D5C -sub_08137D5C: @ 0x08137D5C + thumb_func_start ResetCyclingRoadChallengeData +ResetCyclingRoadChallengeData: @ 0x08137D5C ldr r0, _08137D70 movs r1, #0 strb r1, [r0] @@ -641628,7 +641628,7 @@ sub_08137D5C: @ 0x08137D5C _08137D70: .4byte gUnknown_203A820 _08137D74: .4byte gUnknown_203A821 _08137D78: .4byte gUnknown_203A824 - thumb_func_end sub_08137D5C + thumb_func_end ResetCyclingRoadChallengeData thumb_func_start Special_BeginCyclingRoadChallenge Special_BeginCyclingRoadChallenge: @ 0x08137D7C @@ -641650,11 +641650,11 @@ _08137D9C: .4byte gUnknown_203A824 _08137DA0: .4byte gUnknown_3002360 thumb_func_end Special_BeginCyclingRoadChallenge - thumb_func_start sub_08137DA4 -sub_08137DA4: @ 0x08137DA4 + thumb_func_start GetPlayerAvatarBike +GetPlayerAvatarBike: @ 0x08137DA4 push {lr} movs r0, #4 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _08137DB6 @@ -641662,7 +641662,7 @@ sub_08137DA4: @ 0x08137DA4 b _08137DC8 _08137DB6: movs r0, #2 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 bne _08137DC6 @@ -641673,10 +641673,10 @@ _08137DC6: _08137DC8: pop {r1} bx r1 - thumb_func_end sub_08137DA4 + thumb_func_end GetPlayerAvatarBike - thumb_func_start sub_08137DCC -sub_08137DCC: @ 0x08137DCC + thumb_func_start DetermineCyclingRoadResults +DetermineCyclingRoadResults: @ 0x08137DCC push {r4, r5, r6, r7, lr} adds r7, r0, #0 lsls r1, r1, #0x18 @@ -641808,7 +641808,7 @@ _08137ECC: bx r0 .align 2, 0 _08137ED8: .4byte gUnknown_2037290 - thumb_func_end sub_08137DCC + thumb_func_end DetermineCyclingRoadResults thumb_func_start FinishCyclingRoadChallenge FinishCyclingRoadChallenge: @ 0x08137EDC @@ -641821,10 +641821,10 @@ FinishCyclingRoadChallenge: @ 0x08137EDC ldr r5, _08137F08 ldrb r1, [r5] adds r0, r4, #0 - bl sub_08137DCC + bl DetermineCyclingRoadResults ldrb r1, [r5] adds r0, r4, #0 - bl sub_08137F0C + bl RecordCyclingRoadResults pop {r4, r5} pop {r0} bx r0 @@ -641834,8 +641834,8 @@ _08137F04: .4byte gUnknown_203A824 _08137F08: .4byte gUnknown_203A821 thumb_func_end FinishCyclingRoadChallenge - thumb_func_start sub_08137F0C -sub_08137F0C: @ 0x08137F0C + thumb_func_start RecordCyclingRoadResults +RecordCyclingRoadResults: @ 0x08137F0C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -641879,10 +641879,10 @@ _08137F56: _08137F60: .4byte 0x00004028 _08137F64: .4byte 0x00004029 _08137F68: .4byte 0x00004027 - thumb_func_end sub_08137F0C + thumb_func_end RecordCyclingRoadResults - thumb_func_start sub_08137F6C -sub_08137F6C: @ 0x08137F6C + thumb_func_start GetRecordedCyclingRoadResults +GetRecordedCyclingRoadResults: @ 0x08137F6C push {r4, lr} ldr r0, _08137FA0 bl VarGet @@ -641901,7 +641901,7 @@ sub_08137F6C: @ 0x08137F6C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08137DCC + bl DetermineCyclingRoadResults movs r0, #1 b _08137FAE .align 2, 0 @@ -641914,10 +641914,10 @@ _08137FAE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08137F6C + thumb_func_end GetRecordedCyclingRoadResults - thumb_func_start sub_08137FB4 -sub_08137FB4: @ 0x08137FB4 + thumb_func_start UpdateCyclingRoadState +UpdateCyclingRoadState: @ 0x08137FB4 push {r4, lr} ldr r0, _08137FF4 ldrh r1, [r0] @@ -641942,7 +641942,7 @@ _08137FDE: movs r1, #0 bl VarSet movs r0, #0 - bl sub_0808515C + bl Overworld_SetSavedMusic _08137FEC: pop {r4} pop {r0} @@ -641951,15 +641951,15 @@ _08137FEC: _08137FF4: .4byte gUnknown_2031F7C _08137FF8: .4byte 0x00000C1D _08137FFC: .4byte 0x000040A9 - thumb_func_end sub_08137FB4 + thumb_func_end UpdateCyclingRoadState - thumb_func_start sub_08138000 -sub_08138000: @ 0x08138000 + thumb_func_start SetSSTidalFlag +SetSSTidalFlag: @ 0x08138000 push {lr} ldr r0, _08138018 bl FlagSet ldr r0, _0813801C - bl sub_0809CF20 + bl GetVarPointer movs r1, #0 strh r1, [r0] pop {r0} @@ -641967,10 +641967,10 @@ sub_08138000: @ 0x08138000 .align 2, 0 _08138018: .4byte 0x0000088D _0813801C: .4byte 0x0000404A - thumb_func_end sub_08138000 + thumb_func_end SetSSTidalFlag - thumb_func_start sub_08138020 -sub_08138020: @ 0x08138020 + thumb_func_start ResetSSTidalFlag +ResetSSTidalFlag: @ 0x08138020 push {lr} ldr r0, _0813802C bl FlagClear @@ -641978,10 +641978,10 @@ sub_08138020: @ 0x08138020 bx r0 .align 2, 0 _0813802C: .4byte 0x0000088D - thumb_func_end sub_08138020 + thumb_func_end ResetSSTidalFlag - thumb_func_start sub_08138030 -sub_08138030: @ 0x08138030 + thumb_func_start CountSSTidalStep +CountSSTidalStep: @ 0x08138030 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -641991,7 +641991,7 @@ sub_08138030: @ 0x08138030 cmp r0, #0 beq _08138056 ldr r0, _08138060 - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, r4, r1 strh r1, [r0] @@ -642011,10 +642011,10 @@ _08138066: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08138030 + thumb_func_end CountSSTidalStep - thumb_func_start sub_0813806C -sub_0813806C: @ 0x0813806C + thumb_func_start GetSSTidalLocation +GetSSTidalLocation: @ 0x0813806C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -642023,10 +642023,10 @@ sub_0813806C: @ 0x0813806C adds r6, r2, #0 adds r7, r3, #0 ldr r0, _0813809C - bl sub_0809CF20 + bl GetVarPointer adds r4, r0, #0 ldr r0, _081380A0 - bl sub_0809CF20 + bl GetVarPointer ldrh r0, [r0] subs r0, #1 cmp r0, #9 @@ -642125,7 +642125,7 @@ _0813813E: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0813806C + thumb_func_end GetSSTidalLocation thumb_func_start sub_08138148 sub_08138148: @ 0x08138148 @@ -642145,7 +642145,7 @@ sub_08138148: @ 0x08138148 bne _0813817A _08138166: ldr r0, _08138184 - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -642167,8 +642167,8 @@ _0813818A: .align 2, 0 thumb_func_end sub_08138148 - thumb_func_start sub_08138190 -sub_08138190: @ 0x08138190 + thumb_func_start ShouldDoWinonaCall +ShouldDoWinonaCall: @ 0x08138190 push {lr} movs r0, #0x8a bl FlagGet @@ -642185,7 +642185,7 @@ sub_08138190: @ 0x08138190 bne _081381C2 _081381AE: ldr r0, _081381CC - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -642205,10 +642205,10 @@ _081381D2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08138190 + thumb_func_end ShouldDoWinonaCall - thumb_func_start sub_081381D8 -sub_081381D8: @ 0x081381D8 + thumb_func_start ShouldDoScottCall +ShouldDoScottCall: @ 0x081381D8 push {lr} movs r0, #0x72 bl FlagGet @@ -642225,7 +642225,7 @@ sub_081381D8: @ 0x081381D8 bne _0813820A _081381F6: ldr r0, _08138214 - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -642245,10 +642245,10 @@ _0813821A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081381D8 + thumb_func_end ShouldDoScottCall - thumb_func_start sub_08138220 -sub_08138220: @ 0x08138220 + thumb_func_start ShouldDoRoxanneCall +ShouldDoRoxanneCall: @ 0x08138220 push {lr} movs r0, #0x80 bl FlagGet @@ -642265,7 +642265,7 @@ sub_08138220: @ 0x08138220 bne _08138252 _0813823E: ldr r0, _0813825C - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -642285,10 +642285,10 @@ _08138262: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08138220 + thumb_func_end ShouldDoRoxanneCall - thumb_func_start sub_08138268 -sub_08138268: @ 0x08138268 + thumb_func_start c2_mystery_gift +c2_mystery_gift: @ 0x08138268 push {lr} movs r0, #0x75 bl FlagGet @@ -642305,7 +642305,7 @@ sub_08138268: @ 0x08138268 bne _0813829A _08138286: ldr r0, _081382A4 - bl sub_0809CF20 + bl GetVarPointer ldrh r1, [r0] adds r1, #1 strh r1, [r0] @@ -642325,18 +642325,18 @@ _081382AA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08138268 + thumb_func_end c2_mystery_gift - thumb_func_start sub_081382B0 -sub_081382B0: @ 0x081382B0 + thumb_func_start GetLinkPartnerNames +GetLinkPartnerNames: @ 0x081382B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} movs r6, #0 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r4, #0 @@ -642375,10 +642375,10 @@ _081382FA: .align 2, 0 _08138308: .4byte gUnknown_8568BF0 _0813830C: .4byte gUnknown_20226A8 - thumb_func_end sub_081382B0 + thumb_func_end GetLinkPartnerNames - thumb_func_start sub_08138310 -sub_08138310: @ 0x08138310 + thumb_func_start SpawnLinkPartnerEventObject +SpawnLinkPartnerEventObject: @ 0x08138310 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -642398,7 +642398,7 @@ sub_08138310: @ 0x08138310 adds r0, r4, #0 movs r2, #8 bl memcpy - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -642559,7 +642559,7 @@ _0813840C: adds r0, r5, #0 adds r1, r4, #0 adds r2, r6, #0 - bl sub_0813849C + bl LoadLinkPartnerEventObjectSpritePalette adds r0, r7, #1 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -642585,10 +642585,10 @@ _08138480: bx r0 .align 2, 0 _08138498: .4byte gUnknown_2037280 - thumb_func_end sub_08138310 + thumb_func_end SpawnLinkPartnerEventObject - thumb_func_start sub_0813849C -sub_0813849C: @ 0x0813849C + thumb_func_start LoadLinkPartnerEventObjectSpritePalette +LoadLinkPartnerEventObjectSpritePalette: @ 0x0813849C push {r4, r5, lr} lsls r0, r0, #0x18 lsls r1, r1, #0x18 @@ -642671,7 +642671,7 @@ _08138536: lsls r2, r2, #1 adds r1, r3, r2 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _08138556 .align 2, 0 _08138544: .4byte gUnknown_8470C4C @@ -642681,17 +642681,17 @@ _08138548: lsls r2, r2, #1 adds r1, r3, r2 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _08138556: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0813855C: .4byte gUnknown_847C6CC - thumb_func_end sub_0813849C + thumb_func_end LoadLinkPartnerEventObjectSpritePalette - thumb_func_start sub_08138560 -sub_08138560: @ 0x08138560 + thumb_func_start MauvilleGymSpecial1 +MauvilleGymSpecial1: @ 0x08138560 push {r4, r5, lr} movs r4, #0 ldr r5, _08138580 @@ -642729,10 +642729,10 @@ _0813859A: bx r0 .align 2, 0 _081385AC: .4byte 0x00000205 - thumb_func_end sub_08138560 + thumb_func_end MauvilleGymSpecial1 - thumb_func_start sub_081385B0 -sub_081385B0: @ 0x081385B0 + thumb_func_start MauvilleGymSpecial2 +MauvilleGymSpecial2: @ 0x081385B0 push {r4, r5, r6, lr} movs r5, #0xc _081385B4: @@ -642741,7 +642741,7 @@ _081385B4: _081385B8: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _081385D4 adds r0, r0, r1 cmp r0, #0x37 @@ -642917,7 +642917,7 @@ _0813875C: _08138762: subs r1, r5, #1 adds r0, r4, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt movs r1, #0x90 lsls r1, r1, #2 cmp r0, r1 @@ -642965,10 +642965,10 @@ _081387B4: bx r0 .align 2, 0 _081387BC: .4byte 0x00000251 - thumb_func_end sub_081385B0 + thumb_func_end MauvilleGymSpecial2 - thumb_func_start sub_081387C0 -sub_081387C0: @ 0x081387C0 + thumb_func_start MauvilleGymSpecial3 +MauvilleGymSpecial3: @ 0x081387C0 push {r4, r5, r6, lr} ldr r4, _081387FC movs r5, #3 @@ -642988,7 +642988,7 @@ _081387DA: _081387DE: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08087B88 + bl MapGridGetMetatileIdAt ldr r1, _08138804 adds r0, r0, r1 cmp r0, #0x30 @@ -643133,10 +643133,10 @@ _0813894A: bx r0 .align 2, 0 _08138950: .4byte 0x00000251 - thumb_func_end sub_081387C0 + thumb_func_end MauvilleGymSpecial3 - thumb_func_start sub_08138954 -sub_08138954: @ 0x08138954 + thumb_func_start PetalburgGymSpecial1 +PetalburgGymSpecial1: @ 0x08138954 push {lr} ldr r0, _08138974 movs r1, #0 @@ -643147,17 +643147,17 @@ sub_08138954: @ 0x08138954 bl sub_080A306C ldr r0, _0813897C movs r1, #8 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _08138974: .4byte gUnknown_203A828 _08138978: .4byte gUnknown_203A829 -_0813897C: .4byte sub_08138980 - thumb_func_end sub_08138954 +_0813897C: .4byte Task_PetalburgGym + thumb_func_end PetalburgGymSpecial1 - thumb_func_start sub_08138980 -sub_08138980: @ 0x08138980 + thumb_func_start Task_PetalburgGym +Task_PetalburgGym: @ 0x08138980 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -643176,7 +643176,7 @@ sub_08138980: @ 0x08138980 lsls r1, r1, #1 adds r1, r1, r2 ldrh r1, [r1] - bl sub_081389E8 + bl PetalburgGymFunc movs r0, #0 strb r0, [r4] ldrb r0, [r5] @@ -643187,8 +643187,8 @@ sub_08138980: @ 0x08138980 cmp r0, #5 bne _081389E0 adds r0, r6, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts b _081389E0 .align 2, 0 _081389C8: .4byte gUnknown_85925C4 @@ -643204,10 +643204,10 @@ _081389E0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08138980 + thumb_func_end Task_PetalburgGym - thumb_func_start sub_081389E8 -sub_081389E8: @ 0x081389E8 + thumb_func_start PetalburgGymFunc +PetalburgGymFunc: @ 0x081389E8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -643361,36 +643361,36 @@ _08138B02: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081389E8 + thumb_func_end PetalburgGymFunc - thumb_func_start sub_08138B14 -sub_08138B14: @ 0x08138B14 + thumb_func_start PetalburgGymSpecial2 +PetalburgGymSpecial2: @ 0x08138B14 push {lr} ldr r0, _08138B28 ldrb r0, [r0] ldr r1, _08138B2C ldrh r1, [r1, #8] - bl sub_081389E8 + bl PetalburgGymFunc pop {r0} bx r0 .align 2, 0 _08138B28: .4byte gUnknown_2037280 _08138B2C: .4byte gUnknown_85925CA - thumb_func_end sub_08138B14 + thumb_func_end PetalburgGymSpecial2 - thumb_func_start sub_08138B30 -sub_08138B30: @ 0x08138B30 + thumb_func_start ShowFieldMessageStringVar4 +ShowFieldMessageStringVar4: @ 0x08138B30 push {lr} ldr r0, _08138B3C - bl sub_08097B74 + bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 _08138B3C: .4byte gUnknown_2021C7C - thumb_func_end sub_08138B30 + thumb_func_end ShowFieldMessageStringVar4 - thumb_func_start sub_08138B40 -sub_08138B40: @ 0x08138B40 + thumb_func_start StorePlayerCoordsInVars +StorePlayerCoordsInVars: @ 0x08138B40 ldr r1, _08138B54 ldr r0, _08138B58 ldr r2, [r0] @@ -643404,10 +643404,10 @@ sub_08138B40: @ 0x08138B40 _08138B54: .4byte gUnknown_2037280 _08138B58: .4byte gUnknown_3005AEC _08138B5C: .4byte gUnknown_2037282 - thumb_func_end sub_08138B40 + thumb_func_end StorePlayerCoordsInVars - thumb_func_start sub_08138B60 -sub_08138B60: @ 0x08138B60 + thumb_func_start GetPlayerTrainerIdOnesDigit +GetPlayerTrainerIdOnesDigit: @ 0x08138B60 push {lr} ldr r0, _08138B7C ldr r0, [r0] @@ -643423,7 +643423,7 @@ sub_08138B60: @ 0x08138B60 bx r1 .align 2, 0 _08138B7C: .4byte gUnknown_3005AF0 - thumb_func_end sub_08138B60 + thumb_func_end GetPlayerTrainerIdOnesDigit thumb_func_start sub_08138B80 sub_08138B80: @ 0x08138B80 @@ -643490,8 +643490,8 @@ sub_08138BF0: @ 0x08138BF0 _08138BF8: .4byte gUnknown_2023FDE thumb_func_end sub_08138BF0 - thumb_func_start sub_08138BFC -sub_08138BFC: @ 0x08138BFC + thumb_func_start CableCarWarp +CableCarWarp: @ 0x08138BFC push {lr} sub sp, #4 ldr r0, _08138C1C @@ -643522,10 +643522,10 @@ _08138C32: add sp, #4 pop {r0} bx r0 - thumb_func_end sub_08138BFC + thumb_func_end CableCarWarp - thumb_func_start sub_08138C38 -sub_08138C38: @ 0x08138C38 + thumb_func_start SetFlagInVar +SetFlagInVar: @ 0x08138C38 push {lr} ldr r0, _08138C48 ldrh r0, [r0] @@ -643534,10 +643534,10 @@ sub_08138C38: @ 0x08138C38 bx r0 .align 2, 0 _08138C48: .4byte gUnknown_2037280 - thumb_func_end sub_08138C38 + thumb_func_end SetFlagInVar - thumb_func_start sub_08138C4C -sub_08138C4C: @ 0x08138C4C + thumb_func_start GetWeekCount +GetWeekCount: @ 0x08138C4C push {lr} ldr r0, _08138C6C movs r1, #0 @@ -643556,12 +643556,12 @@ _08138C66: .align 2, 0 _08138C6C: .4byte gUnknown_3005A50 _08138C70: .4byte 0x0000270F - thumb_func_end sub_08138C4C + thumb_func_end GetWeekCount - thumb_func_start sub_08138C74 -sub_08138C74: @ 0x08138C74 + thumb_func_start GetLeadMonFriendshipScore +GetLeadMonFriendshipScore: @ 0x08138C74 push {r4, lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -643570,7 +643570,7 @@ sub_08138C74: @ 0x08138C74 adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData cmp r0, #0xff bne _08138C9C movs r0, #6 @@ -643580,7 +643580,7 @@ _08138C98: .4byte gUnknown_2024190 _08138C9C: adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _08138CAC movs r0, #5 @@ -643588,7 +643588,7 @@ _08138C9C: _08138CAC: adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData cmp r0, #0x95 bls _08138CBC movs r0, #4 @@ -643596,7 +643596,7 @@ _08138CAC: _08138CBC: adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData cmp r0, #0x63 bls _08138CCC movs r0, #3 @@ -643604,7 +643604,7 @@ _08138CBC: _08138CCC: adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData cmp r0, #0x31 bls _08138CDC movs r0, #2 @@ -643612,7 +643612,7 @@ _08138CCC: _08138CDC: adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08138CEC movs r0, #0 @@ -643623,43 +643623,43 @@ _08138CEE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08138C74 + thumb_func_end GetLeadMonFriendshipScore - thumb_func_start sub_08138CF4 -sub_08138CF4: @ 0x08138CF4 + thumb_func_start CB2_FieldShowRegionMap +CB2_FieldShowRegionMap: @ 0x08138CF4 push {lr} ldr r0, _08138D00 - bl sub_0816FF84 + bl FieldInitRegionMap pop {r0} bx r0 .align 2, 0 -_08138D00: .4byte sub_08085B34 - thumb_func_end sub_08138CF4 +_08138D00: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end CB2_FieldShowRegionMap - thumb_func_start sub_08138D04 -sub_08138D04: @ 0x08138D04 + thumb_func_start FieldShowRegionMap +FieldShowRegionMap: @ 0x08138D04 push {lr} ldr r0, _08138D10 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_08138D10: .4byte sub_08138CF4 - thumb_func_end sub_08138D04 +_08138D10: .4byte CB2_FieldShowRegionMap + thumb_func_end FieldShowRegionMap thumb_func_start sub_08138D14 sub_08138D14: @ 0x08138D14 push {r4, lr} ldr r4, _08138D50 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _08138D48 adds r0, r4, #0 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08138D54 @@ -643697,7 +643697,7 @@ sub_08138D58: @ 0x08138D58 cmp r0, #0 bne _08138D76 adds r0, r1, #0 - bl sub_08138D80 + bl PCTurnOnEffect_0 _08138D76: pop {r0} bx r0 @@ -643705,8 +643705,8 @@ _08138D76: _08138D7C: .4byte gUnknown_3005B60 thumb_func_end sub_08138D58 - thumb_func_start sub_08138D80 -sub_08138D80: @ 0x08138D80 + thumb_func_start PCTurnOnEffect_0 +PCTurnOnEffect_0: @ 0x08138D80 push {r4, r5, r6, lr} adds r4, r0, #0 movs r6, #0 @@ -643748,7 +643748,7 @@ _08138DBC: asrs r1, r1, #0x18 lsls r2, r5, #0x18 asrs r2, r2, #0x18 - bl sub_08138DF8 + bl PCTurnOnEffect_1 bl DrawWholeMapView ldrh r0, [r4, #0x10] movs r1, #1 @@ -643762,7 +643762,7 @@ _08138DBC: cmp r0, #5 bne _08138DEC ldrb r0, [r4, #0xa] - bl sub_080A8964 + bl DestroyTask _08138DEC: ldrh r0, [r4, #0xe] adds r0, #1 @@ -643770,10 +643770,10 @@ _08138DEC: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08138D80 + thumb_func_end PCTurnOnEffect_0 - thumb_func_start sub_08138DF8 -sub_08138DF8: @ 0x08138DF8 + thumb_func_start PCTurnOnEffect_1 +PCTurnOnEffect_1: @ 0x08138DF8 push {r4, r5, lr} lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -643852,19 +643852,19 @@ _08138E56: .align 2, 0 _08138E88: .4byte 0x0000027E _08138E8C: .4byte gUnknown_3005AEC - thumb_func_end sub_08138DF8 + thumb_func_end PCTurnOnEffect_1 thumb_func_start sub_08138E90 sub_08138E90: @ 0x08138E90 push {lr} - bl sub_08138E9C + bl PCTurnOffEffect pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08138E90 - thumb_func_start sub_08138E9C -sub_08138E9C: @ 0x08138E9C + thumb_func_start PCTurnOffEffect +PCTurnOffEffect: @ 0x08138E9C push {r4, r5, r6, lr} movs r6, #0 movs r5, #0 @@ -643942,21 +643942,21 @@ _08138EF2: .align 2, 0 _08138F28: .4byte 0x00000259 _08138F2C: .4byte gUnknown_3005AEC - thumb_func_end sub_08138E9C + thumb_func_end PCTurnOffEffect thumb_func_start sub_08138F30 sub_08138F30: @ 0x08138F30 push {r4, lr} ldr r4, _08138F6C adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _08138F64 adds r0, r4, #0 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08138F70 @@ -643994,7 +643994,7 @@ sub_08138F74: @ 0x08138F74 cmp r0, #0 bne _08138F92 adds r0, r1, #0 - bl sub_08138F9C + bl LotteryCornerComputerEffect _08138F92: pop {r0} bx r0 @@ -644002,8 +644002,8 @@ _08138F92: _08138F98: .4byte gUnknown_3005B60 thumb_func_end sub_08138F74 - thumb_func_start sub_08138F9C -sub_08138F9C: @ 0x08138F9C + thumb_func_start LotteryCornerComputerEffect +LotteryCornerComputerEffect: @ 0x08138F9C push {r4, lr} adds r4, r0, #0 movs r1, #0xe @@ -644052,7 +644052,7 @@ _08138FEA: cmp r0, #5 bne _0813900A ldrb r0, [r4, #0xa] - bl sub_080A8964 + bl DestroyTask _0813900A: ldrh r0, [r4, #0xe] adds r0, #1 @@ -644062,10 +644062,10 @@ _0813900A: bx r0 .align 2, 0 _08139018: .4byte 0x00000E58 - thumb_func_end sub_08138F9C + thumb_func_end LotteryCornerComputerEffect - thumb_func_start sub_0813901C -sub_0813901C: @ 0x0813901C + thumb_func_start EndLotteryCornerComputerEffect +EndLotteryCornerComputerEffect: @ 0x0813901C push {lr} ldr r2, _0813903C movs r0, #0x12 @@ -644081,7 +644081,7 @@ sub_0813901C: @ 0x0813901C .align 2, 0 _0813903C: .4byte 0x00000E9D _08139040: .4byte 0x00000EA5 - thumb_func_end sub_0813901C + thumb_func_end EndLotteryCornerComputerEffect thumb_func_start sub_08139044 sub_08139044: @ 0x08139044 @@ -644111,10 +644111,10 @@ _0813906C: .4byte gUnknown_2037280 _08139070: .4byte 0x000001F5 thumb_func_end sub_0813905C - thumb_func_start sub_08139074 -sub_08139074: @ 0x08139074 + thumb_func_start CheckLeadMonCool +CheckLeadMonCool: @ 0x08139074 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644122,7 +644122,7 @@ sub_08139074: @ 0x08139074 ldr r1, _08139094 adds r0, r0, r1 movs r1, #0x16 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _08139098 movs r0, #1 @@ -644135,12 +644135,12 @@ _0813909A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08139074 + thumb_func_end CheckLeadMonCool - thumb_func_start sub_081390A0 -sub_081390A0: @ 0x081390A0 + thumb_func_start CheckLeadMonBeauty +CheckLeadMonBeauty: @ 0x081390A0 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644148,7 +644148,7 @@ sub_081390A0: @ 0x081390A0 ldr r1, _081390C0 adds r0, r0, r1 movs r1, #0x17 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _081390C4 movs r0, #1 @@ -644161,12 +644161,12 @@ _081390C6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081390A0 + thumb_func_end CheckLeadMonBeauty - thumb_func_start sub_081390CC -sub_081390CC: @ 0x081390CC + thumb_func_start CheckLeadMonCute +CheckLeadMonCute: @ 0x081390CC push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644174,7 +644174,7 @@ sub_081390CC: @ 0x081390CC ldr r1, _081390EC adds r0, r0, r1 movs r1, #0x18 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _081390F0 movs r0, #1 @@ -644187,12 +644187,12 @@ _081390F2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081390CC + thumb_func_end CheckLeadMonCute - thumb_func_start sub_081390F8 -sub_081390F8: @ 0x081390F8 + thumb_func_start CheckLeadMonSmart +CheckLeadMonSmart: @ 0x081390F8 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644200,7 +644200,7 @@ sub_081390F8: @ 0x081390F8 ldr r1, _08139118 adds r0, r0, r1 movs r1, #0x21 - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _0813911C movs r0, #1 @@ -644213,12 +644213,12 @@ _0813911E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081390F8 + thumb_func_end CheckLeadMonSmart thumb_func_start sub_08139124 sub_08139124: @ 0x08139124 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644226,7 +644226,7 @@ sub_08139124: @ 0x08139124 ldr r1, _08139144 adds r0, r0, r1 movs r1, #0x2f - bl sub_0806A058 + bl GetMonData cmp r0, #0xc7 bls _08139148 movs r0, #1 @@ -644241,8 +644241,8 @@ _0813914A: .align 2, 0 thumb_func_end sub_08139124 - thumb_func_start sub_08139150 -sub_08139150: @ 0x08139150 + thumb_func_start IsGrassTypeInParty +IsGrassTypeInParty: @ 0x08139150 push {r4, r5, r6, lr} movs r5, #0 ldr r6, _081391A0 @@ -644254,17 +644254,17 @@ _08139156: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081391AC adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081391AC adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 lsls r1, r0, #3 @@ -644300,10 +644300,10 @@ _081391BA: bx r0 .align 2, 0 _081391C4: .4byte gUnknown_2037290 - thumb_func_end sub_08139150 + thumb_func_end IsGrassTypeInParty - thumb_func_start sub_081391C8 -sub_081391C8: @ 0x081391C8 + thumb_func_start SpawnCameraObject +SpawnCameraObject: @ 0x081391C8 push {lr} sub sp, #8 ldr r0, _08139214 @@ -644342,12 +644342,12 @@ sub_081391C8: @ 0x081391C8 .align 2, 0 _08139214: .4byte gUnknown_3005AEC _08139218: .4byte gUnknown_2036FF0 - thumb_func_end sub_081391C8 + thumb_func_end SpawnCameraObject - thumb_func_start sub_0813921C -sub_0813921C: @ 0x0813921C + thumb_func_start RemoveCameraObject +RemoveCameraObject: @ 0x0813921C push {lr} - bl sub_0808B640 + bl GetPlayerAvatarObjectId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl CameraObjectSetFollowedObjectId @@ -644356,28 +644356,28 @@ sub_0813921C: @ 0x0813921C ldrb r1, [r0, #5] ldrb r2, [r0, #4] movs r0, #0x7f - bl sub_0808D234 + bl RemoveEventObjectByLocalIdAndMap pop {r0} bx r0 .align 2, 0 _0813923C: .4byte gUnknown_3005AEC - thumb_func_end sub_0813921C + thumb_func_end RemoveCameraObject - thumb_func_start sub_08139240 -sub_08139240: @ 0x08139240 + thumb_func_start GetPokeblockNameByMonNature +GetPokeblockNameByMonNature: @ 0x08139240 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 muls r0, r1, r0 ldr r1, _08139268 adds r0, r0, r1 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0813926C - bl sub_081370D8 + bl CopyMonFavoritePokeblockName lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -644385,10 +644385,10 @@ sub_08139240: @ 0x08139240 .align 2, 0 _08139268: .4byte gUnknown_2024190 _0813926C: .4byte gUnknown_2021C40 - thumb_func_end sub_08139240 + thumb_func_end GetPokeblockNameByMonNature - thumb_func_start sub_08139270 -sub_08139270: @ 0x08139270 + thumb_func_start GetSecretBaseNearbyMapName +GetSecretBaseNearbyMapName: @ 0x08139270 push {r4, lr} ldr r4, _08139290 ldr r0, _08139294 @@ -644398,25 +644398,25 @@ sub_08139270: @ 0x08139270 lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0 - bl sub_08124578 + bl GetMapName pop {r4} pop {r0} bx r0 .align 2, 0 _08139290: .4byte gUnknown_2021C40 _08139294: .4byte 0x00004026 - thumb_func_end sub_08139270 + thumb_func_end GetSecretBaseNearbyMapName - thumb_func_start sub_08139298 -sub_08139298: @ 0x08139298 + thumb_func_start GetBestBattleTowerStreak +GetBestBattleTowerStreak: @ 0x08139298 push {lr} movs r0, #0x20 - bl sub_08084180 + bl GetGameStat lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_08139298 + thumb_func_end GetBestBattleTowerStreak thumb_func_start sub_081392A8 sub_081392A8: @ 0x081392A8 @@ -644429,8 +644429,8 @@ sub_081392A8: @ 0x081392A8 _081392B4: .4byte gUnknown_2021C40 thumb_func_end sub_081392A8 - thumb_func_start sub_081392B8 -sub_081392B8: @ 0x081392B8 + thumb_func_start GetSlotMachineId +GetSlotMachineId: @ 0x081392B8 push {r4, r5, lr} ldr r0, _081392EC ldr r2, [r0] @@ -644450,7 +644450,7 @@ sub_081392B8: @ 0x081392B8 ldrb r0, [r0] adds r5, r1, r0 movs r0, #2 - bl sub_080EFB3C + bl GetPriceReduction lsls r0, r0, #0x18 cmp r0, #0 bne _08139304 @@ -644476,10 +644476,10 @@ _08139306: bx r1 .align 2, 0 _08139318: .4byte gUnknown_85925EC - thumb_func_end sub_081392B8 + thumb_func_end GetSlotMachineId - thumb_func_start sub_0813931C -sub_0813931C: @ 0x0813931C + thumb_func_start FoundAbandonedShipRoom1Key +FoundAbandonedShipRoom1Key: @ 0x0813931C push {lr} ldr r1, _08139334 ldr r0, _08139338 @@ -644499,10 +644499,10 @@ _0813933E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0813931C + thumb_func_end FoundAbandonedShipRoom1Key - thumb_func_start sub_08139344 -sub_08139344: @ 0x08139344 + thumb_func_start FoundAbandonedShipRoom2Key +FoundAbandonedShipRoom2Key: @ 0x08139344 push {lr} ldr r1, _0813935C movs r0, #0x85 @@ -644522,7 +644522,7 @@ _08139362: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08139344 + thumb_func_end FoundAbandonedShipRoom2Key thumb_func_start sub_08139368 sub_08139368: @ 0x08139368 @@ -644547,8 +644547,8 @@ _0813938A: .align 2, 0 thumb_func_end sub_08139368 - thumb_func_start sub_08139390 -sub_08139390: @ 0x08139390 + thumb_func_start FoundAbandonedShipRoom6Key +FoundAbandonedShipRoom6Key: @ 0x08139390 push {lr} ldr r1, _081393A8 ldr r0, _081393AC @@ -644568,12 +644568,12 @@ _081393B2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08139390 + thumb_func_end FoundAbandonedShipRoom6Key - thumb_func_start sub_081393B8 -sub_081393B8: @ 0x081393B8 + thumb_func_start LeadMonHasEffortRibbon +LeadMonHasEffortRibbon: @ 0x081393B8 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644582,17 +644582,17 @@ sub_081393B8: @ 0x081393B8 adds r0, r0, r1 movs r1, #0x47 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _081393DC: .4byte gUnknown_2024190 - thumb_func_end sub_081393B8 + thumb_func_end LeadMonHasEffortRibbon - thumb_func_start sub_081393E0 -sub_081393E0: @ 0x081393E0 + thumb_func_start GiveLeadMonEffortRibbon +GiveLeadMonEffortRibbon: @ 0x081393E0 push {r4, lr} sub sp, #4 movs r0, #0x2a @@ -644602,7 +644602,7 @@ sub_081393E0: @ 0x081393E0 movs r1, #1 mov r0, sp strb r1, [r0] - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 @@ -644612,9 +644612,9 @@ sub_081393E0: @ 0x081393E0 adds r0, r4, #0 movs r1, #0x47 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_080EF0BC + bl GetRibbonCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #4 @@ -644630,19 +644630,19 @@ _08139426: .align 2, 0 _08139430: .4byte 0x0000089B _08139434: .4byte gUnknown_2024190 - thumb_func_end sub_081393E0 + thumb_func_end GiveLeadMonEffortRibbon - thumb_func_start sub_08139438 -sub_08139438: @ 0x08139438 + thumb_func_start Special_AreLeadMonEVsMaxedOut +Special_AreLeadMonEVsMaxedOut: @ 0x08139438 push {lr} - bl sub_081396F8 + bl GetLeadMonIndex lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x64 muls r0, r1, r0 ldr r1, _0813945C adds r0, r0, r1 - bl sub_0806D720 + bl GetMonEVCount lsls r0, r0, #0x10 ldr r1, _08139460 cmp r0, r1 @@ -644658,10 +644658,10 @@ _08139466: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08139438 + thumb_func_end Special_AreLeadMonEVsMaxedOut - thumb_func_start sub_0813946C -sub_0813946C: @ 0x0813946C + thumb_func_start TryUpdateRusturfTunnelState +TryUpdateRusturfTunnelState: @ 0x0813946C push {lr} movs r0, #0xc7 bl FlagGet @@ -644707,7 +644707,7 @@ _081394C6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0813946C + thumb_func_end TryUpdateRusturfTunnelState thumb_func_start sub_081394CC sub_081394CC: @ 0x081394CC @@ -644720,8 +644720,8 @@ sub_081394CC: @ 0x081394CC _081394D8: .4byte 0x000008BF thumb_func_end sub_081394CC - thumb_func_start sub_081394DC -sub_081394DC: @ 0x081394DC + thumb_func_start PutZigzagoonInPlayerParty +PutZigzagoonInPlayerParty: @ 0x081394DC push {r4, r5, lr} sub sp, #0x14 ldr r5, _08139544 @@ -644735,45 +644735,45 @@ sub_081394DC: @ 0x081394DC adds r0, r5, #0 movs r2, #7 movs r3, #0x20 - bl sub_08067730 + bl CreateMon movs r1, #1 add r0, sp, #0x10 strh r1, [r0] adds r0, r5, #0 movs r1, #0x2e add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r1, sp, #0x10 movs r0, #0x21 strh r0, [r1] adds r0, r5, #0 movs r1, #0xd add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add r0, sp, #0x10 strh r4, [r0] adds r0, r5, #0 movs r1, #0xe add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 movs r1, #0xf add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 movs r1, #0x10 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData add sp, #0x14 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08139544: .4byte gUnknown_2024190 - thumb_func_end sub_081394DC + thumb_func_end PutZigzagoonInPlayerParty - thumb_func_start sub_08139548 -sub_08139548: @ 0x08139548 + thumb_func_start IsStarterInParty +IsStarterInParty: @ 0x08139548 push {r4, r5, r6, lr} ldr r0, _08139584 bl VarGet @@ -644795,7 +644795,7 @@ _0813956A: adds r0, r0, r1 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, r6 bne _0813958C movs r0, #1 @@ -644816,25 +644816,25 @@ _08139598: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08139548 + thumb_func_end IsStarterInParty - thumb_func_start sub_081395A0 -sub_081395A0: @ 0x081395A0 + thumb_func_start ScriptCheckFreePokemonStorageSpace +ScriptCheckFreePokemonStorageSpace: @ 0x081395A0 push {lr} - bl sub_080D1AB8 + bl CheckFreePokemonStorageSpace lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081395A0 + thumb_func_end ScriptCheckFreePokemonStorageSpace thumb_func_start sub_081395B0 sub_081395B0: @ 0x081395B0 push {lr} ldr r0, _081395C4 movs r1, #0x3f - bl sub_0806D810 + bl CheckPartyPokerus lsls r0, r0, #0x18 cmp r0, #0 beq _081395C8 @@ -644855,7 +644855,7 @@ sub_081395D0: @ 0x081395D0 push {lr} ldr r0, _08139614 movs r1, #9 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08139618 @@ -644926,7 +644926,7 @@ sub_0813962C: @ 0x0813962C ldrsh r0, [r4, r1] movs r2, #8 ldrsh r1, [r4, r2] - bl sub_08089C30 + bl SetCameraPanning movs r1, #4 ldrsh r0, [r4, r1] cmp r0, #0 @@ -644947,8 +644947,8 @@ sub_08139690: @ 0x08139690 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 @@ -644970,7 +644970,7 @@ sub_081396A4: @ 0x081396A4 thumb_func_start sub_081396B8 sub_081396B8: @ 0x081396B8 push {lr} - bl sub_08085524 + bl GetLastUsedWarpMapType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl IsMapTypeOutdoors @@ -644985,10 +644985,10 @@ _081396D4: bx r0 thumb_func_end sub_081396B8 - thumb_func_start sub_081396D8 -sub_081396D8: @ 0x081396D8 + thumb_func_start SetRoute123Weather +SetRoute123Weather: @ 0x081396D8 push {lr} - bl sub_08085524 + bl GetLastUsedWarpMapType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl IsMapTypeOutdoors @@ -645001,10 +645001,10 @@ sub_081396D8: @ 0x081396D8 _081396F4: pop {r0} bx r0 - thumb_func_end sub_081396D8 + thumb_func_end SetRoute123Weather - thumb_func_start sub_081396F8 -sub_081396F8: @ 0x081396F8 + thumb_func_start GetLeadMonIndex +GetLeadMonIndex: @ 0x081396F8 push {r4, r5, r6, lr} bl sub_0806B004 lsls r0, r0, #0x18 @@ -645021,7 +645021,7 @@ _08139708: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -645029,7 +645029,7 @@ _08139708: adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0813973C adds r0, r5, #0 @@ -645049,10 +645049,10 @@ _08139748: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081396F8 + thumb_func_end GetLeadMonIndex - thumb_func_start sub_08139750 -sub_08139750: @ 0x08139750 + thumb_func_start ScriptGetPartyMonSpecies +ScriptGetPartyMonSpecies: @ 0x08139750 push {lr} ldr r0, _08139770 ldrh r1, [r0] @@ -645062,7 +645062,7 @@ sub_08139750: @ 0x08139750 adds r0, r0, r1 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} @@ -645070,7 +645070,7 @@ sub_08139750: @ 0x08139750 .align 2, 0 _08139770: .4byte gUnknown_2037280 _08139774: .4byte gUnknown_2024190 - thumb_func_end sub_08139750 + thumb_func_end ScriptGetPartyMonSpecies thumb_func_start sub_08139778 sub_08139778: @ 0x08139778 @@ -645078,8 +645078,8 @@ sub_08139778: @ 0x08139778 .align 2, 0 thumb_func_end sub_08139778 - thumb_func_start sub_0813977C -sub_0813977C: @ 0x0813977C + thumb_func_start GetDaysUntilPacifidlogTMAvailable +GetDaysUntilPacifidlogTMAvailable: @ 0x0813977C push {r4, lr} ldr r0, _0813979C bl VarGet @@ -645116,10 +645116,10 @@ _081397BC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0813977C + thumb_func_end GetDaysUntilPacifidlogTMAvailable - thumb_func_start sub_081397C4 -sub_081397C4: @ 0x081397C4 + thumb_func_start SetPacifidlogTMReceivedDay +SetPacifidlogTMReceivedDay: @ 0x081397C4 push {r4, lr} ldr r0, _081397D8 ldr r4, _081397DC @@ -645132,7 +645132,7 @@ sub_081397C4: @ 0x081397C4 .align 2, 0 _081397D8: .4byte 0x000040C2 _081397DC: .4byte gUnknown_3005A50 - thumb_func_end sub_081397C4 + thumb_func_end SetPacifidlogTMReceivedDay thumb_func_start sub_081397E0 sub_081397E0: @ 0x081397E0 @@ -645146,7 +645146,7 @@ sub_081397E0: @ 0x081397E0 ldr r4, _08139814 movs r1, #7 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData ldr r0, _08139818 ldr r0, [r0] adds r1, r4, #0 @@ -645168,8 +645168,8 @@ _0813981E: bx r1 thumb_func_end sub_081397E0 - thumb_func_start sub_08139824 -sub_08139824: @ 0x08139824 + thumb_func_start BufferLottoTicketNumber +BufferLottoTicketNumber: @ 0x08139824 push {r4, r5, lr} ldr r2, _08139838 ldrh r1, [r2] @@ -645177,7 +645177,7 @@ sub_08139824: @ 0x08139824 cmp r1, r0 bls _08139840 movs r0, #0 - bl sub_080EFE44 + bl TV_PrintIntToStringVar b _081398C2 .align 2, 0 _08139838: .4byte gUnknown_2037290 @@ -645217,7 +645217,7 @@ _0813986C: _0813987C: ldrh r5, [r2] adds r0, r5, #0 - bl sub_080EFE74 + bl CountDigits adds r3, r0, #0 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 @@ -645238,7 +645238,7 @@ _0813989C: adds r4, #4 ldrh r5, [r2] adds r0, r5, #0 - bl sub_080EFE74 + bl CountDigits adds r3, r0, #0 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 @@ -645252,7 +645252,7 @@ _081398C2: bx r0 .align 2, 0 _081398C8: .4byte gUnknown_2021C40 - thumb_func_end sub_08139824 + thumb_func_end BufferLottoTicketNumber thumb_func_start sub_081398CC sub_081398CC: @ 0x081398CC @@ -645330,7 +645330,7 @@ _08139954: .4byte 0xFFFFFEDF _08139958: ldr r4, _08139978 ldrh r0, [r1] - bl sub_081B69B4 + bl ItemIdToBattleMoveId adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0xd @@ -645363,7 +645363,7 @@ _08139990: ldr r1, _081399A8 adds r0, r0, r1 movs r1, #4 - bl sub_0806A058 + bl GetMonData cmp r0, #1 bne _081399AC movs r0, #1 @@ -645385,8 +645385,8 @@ _081399B8: .align 2, 0 thumb_func_end sub_08139980 - thumb_func_start sub_081399C0 -sub_081399C0: @ 0x081399C0 + thumb_func_start InMultiBattleRoom +InMultiBattleRoom: @ 0x081399C0 push {lr} ldr r0, _081399E0 ldr r0, [r0] @@ -645412,7 +645412,7 @@ _081399EE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081399C0 + thumb_func_end InMultiBattleRoom thumb_func_start sub_081399F4 sub_081399F4: @ 0x081399F4 @@ -645421,13 +645421,13 @@ sub_081399F4: @ 0x081399F4 bl sub_08089C24 movs r0, #8 movs r1, #0 - bl sub_08089C30 + bl SetCameraPanning pop {r0} bx r0 thumb_func_end sub_081399F4 - thumb_func_start sub_08139A08 -sub_08139A08: @ 0x08139A08 + thumb_func_start SetDepartmentStoreFloorVar +SetDepartmentStoreFloorVar: @ 0x08139A08 push {lr} ldr r0, _08139A24 ldr r0, [r0] @@ -645476,7 +645476,7 @@ _08139A5A: bx r0 .align 2, 0 _08139A64: .4byte 0x00004043 - thumb_func_end sub_08139A08 + thumb_func_end SetDepartmentStoreFloorVar thumb_func_start sub_08139A68 sub_08139A68: @ 0x08139A68 @@ -645548,12 +645548,12 @@ _08139AE2: .align 2, 0 thumb_func_end sub_08139A68 - thumb_func_start sub_08139AEC -sub_08139AEC: @ 0x08139AEC + thumb_func_start ShakeScreenInElevator +ShakeScreenInElevator: @ 0x08139AEC push {r4, r5, r6, lr} ldr r0, _08139B24 movs r1, #9 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -645608,7 +645608,7 @@ _08139B42: bx r0 .align 2, 0 _08139B64: .4byte gUnknown_8592674 - thumb_func_end sub_08139AEC + thumb_func_end ShakeScreenInElevator thumb_func_start sub_08139B68 sub_08139B68: @ 0x08139B68 @@ -645641,7 +645641,7 @@ sub_08139B68: @ 0x08139B68 movs r2, #8 ldrsh r1, [r4, r2] movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning movs r0, #4 ldrsh r1, [r4, r0] movs r2, #0xa @@ -645651,8 +645651,8 @@ sub_08139B68: @ 0x08139B68 movs r0, #0x49 bl sub_080A306C adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts bl InstallCameraPanAheadCallback _08139BC8: pop {r4, r5} @@ -645668,11 +645668,11 @@ sub_08139BD4: @ 0x08139BD4 sub sp, #0xc ldr r4, _08139C38 ldr r0, _08139C3C - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldrb r0, [r4] ldr r2, _08139C40 movs r1, #2 @@ -645699,10 +645699,10 @@ sub_08139BD4: @ 0x08139BD4 movs r3, #0x13 bl AddTextPrinterParameterized ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -645723,7 +645723,7 @@ sub_08139C4C: @ 0x08139C4C movs r1, #1 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -645740,14 +645740,14 @@ sub_08139C68: @ 0x08139C68 lsrs r5, r1, #0x18 ldr r4, _08139CB0 adds r0, r4, #0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _08139CA8 adds r0, r4, #0 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08139CB4 @@ -645768,13 +645768,13 @@ _08139CA8: pop {r0} bx r0 .align 2, 0 -_08139CB0: .4byte sub_08139CBC +_08139CB0: .4byte MoveElevatorWindowLights _08139CB4: .4byte gUnknown_3005B60 _08139CB8: .4byte gUnknown_859267D thumb_func_end sub_08139C68 - thumb_func_start sub_08139CBC -sub_08139CBC: @ 0x08139CBC + thumb_func_start MoveElevatorWindowLights +MoveElevatorWindowLights: @ 0x08139CBC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -645899,7 +645899,7 @@ _08139D9E: cmp r1, r0 bne _08139DB8 ldr r0, [sp] - bl sub_080A8964 + bl DestroyTask _08139DB8: ldrh r0, [r6, #2] adds r0, #1 @@ -645914,7 +645914,7 @@ _08139DB8: bx r0 .align 2, 0 _08139DD0: .4byte gUnknown_8592662 - thumb_func_end sub_08139CBC + thumb_func_end MoveElevatorWindowLights thumb_func_start sub_08139DD4 sub_08139DD4: @ 0x08139DD4 @@ -645927,37 +645927,37 @@ sub_08139DD4: @ 0x08139DD4 ldr r4, _08139E80 adds r0, r0, r4 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData str r0, [sp] ldrh r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] ldrh r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData str r0, [sp, #8] ldrh r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData str r0, [sp, #0xc] ldrh r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x10] ldrh r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x14] ldr r1, _08139E84 movs r0, #0 @@ -646030,8 +646030,8 @@ _08139EAA: bx r0 thumb_func_end sub_08139DD4 - thumb_func_start sub_08139EBC -sub_08139EBC: @ 0x08139EBC + thumb_func_start warp0_in_pokecenter +warp0_in_pokecenter: @ 0x08139EBC push {r4, lr} ldr r0, _08139EEC movs r1, #0 @@ -646073,7 +646073,7 @@ _08139F04: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08139EBC + thumb_func_end warp0_in_pokecenter thumb_func_start sub_08139F0C sub_08139F0C: @ 0x08139F0C @@ -646104,7 +646104,7 @@ sub_08139F30: @ 0x08139F30 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r0, _08139F58 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 ldrh r0, [r5] adds r4, r4, r0 @@ -646278,7 +646278,7 @@ _0813A09E: lsls r0, r0, #2 adds r0, r0, r7 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -646374,7 +646374,7 @@ sub_0813A164: @ 0x0813A164 push {r4, lr} ldr r0, _0813A194 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 lsls r0, r4, #2 @@ -646583,7 +646583,7 @@ _0813A302: movs r0, #0x7f strh r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0813A30E: pop {r4} pop {r0} @@ -646634,18 +646634,18 @@ sub_0813A318: @ 0x0813A318 str r0, [sp, #0x18] str r1, [sp, #0x1c] add r0, sp, #0x18 - bl sub_08003250 + bl AddWindow movs r4, #0 strh r0, [r5, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldr r6, _0813A41C movs r1, #0xa ldrsh r0, [r5, r1] lsls r0, r0, #3 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] ldr r0, _0813A420 strh r4, [r0] @@ -646691,12 +646691,12 @@ _0813A3CE: ldrh r1, [r5, #0x16] ldrh r2, [r5, #0x18] adds r0, r4, #0 - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x24] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0813A410 lsls r0, r7, #2 adds r0, r0, r7 @@ -646761,7 +646761,7 @@ sub_0813A474: @ 0x0813A474 movs r0, #5 bl sub_080A306C ldr r0, _0813A4E4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -646826,7 +646826,7 @@ sub_0813A4F4: @ 0x0813A4F4 ldrh r0, [r6, #0x24] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r4, r0, #0 movs r0, #2 rsbs r0, r0, #0 @@ -646872,7 +646872,7 @@ _0813A560: bl sub_0813A740 ldr r0, _0813A574 str r0, [r6] - bl sub_080988C4 + bl EnableBothScriptContexts _0813A56E: pop {r4, r5, r6} pop {r0} @@ -646909,10 +646909,10 @@ sub_0813A578: @ 0x0813A578 lsrs r0, r0, #0x18 movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _0813A604 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -646922,19 +646922,19 @@ sub_0813A578: @ 0x0813A578 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts add sp, #4 pop {r4, r5} pop {r0} @@ -646976,12 +646976,12 @@ _0813A634: .4byte sub_0813A66C sub_0813A638: @ 0x0813A638 push {lr} ldr r0, _0813A650 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff bne _0813A654 - bl sub_080988C4 + bl EnableBothScriptContexts b _0813A664 .align 2, 0 _0813A650: .4byte sub_0813A608 @@ -647094,7 +647094,7 @@ sub_0813A69C: @ 0x0813A69C strh r0, [r2, #8] ldr r1, _0813A73C mov r0, sp - bl sub_081AF058 + bl AddScrollIndicatorArrowPair lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] @@ -647128,7 +647128,7 @@ sub_0813A740: @ 0x0813A740 ldrh r0, [r2, #0x20] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair _0813A766: pop {r0} bx r0 @@ -647198,13 +647198,13 @@ _0813A7CE: muls r0, r1, r0 ldr r1, _0813A7F4 adds r0, r0, r1 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 ldr r1, _0813A7F8 lsrs r0, r0, #0x16 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 @@ -647213,14 +647213,14 @@ _0813A7F4: .4byte gUnknown_2024190 _0813A7F8: .4byte gUnknown_8592A9C thumb_func_end sub_0813A7C0 - thumb_func_start sub_0813A7FC -sub_0813A7FC: @ 0x0813A7FC + thumb_func_start UpdateFrontierGambler +UpdateFrontierGambler: @ 0x0813A7FC push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r0, _0813A824 - bl sub_0809CF20 + bl GetVarPointer adds r5, r0, #0 ldrh r0, [r5] adds r4, r4, r0 @@ -647234,7 +647234,7 @@ sub_0813A7FC: @ 0x0813A7FC bx r0 .align 2, 0 _0813A824: .4byte 0x00004030 - thumb_func_end sub_0813A7FC + thumb_func_end UpdateFrontierGambler thumb_func_start sub_0813A828 sub_0813A828: @ 0x0813A828 @@ -647248,7 +647248,7 @@ sub_0813A828: @ 0x0813A828 lsls r0, r4, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage ldr r0, _0813A858 adds r1, r4, #0 bl VarSet @@ -647271,7 +647271,7 @@ sub_0813A85C: @ 0x0813A85C lsrs r0, r0, #0xe adds r0, r0, r4 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage pop {r4} pop {r0} bx r0 @@ -647349,11 +647349,11 @@ sub_0813A904: @ 0x0813A904 sub sp, #0xc ldr r5, _0813A974 ldr r0, _0813A978 - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldrb r0, [r5] ldr r2, _0813A97C movs r4, #0 @@ -647386,7 +647386,7 @@ sub_0813A904: @ 0x0813A904 bl AddTextPrinterParameterized ldrb r0, [r5] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3} mov r8, r3 @@ -647445,7 +647445,7 @@ sub_0813A9D4: @ 0x0813A9D4 movs r1, #1 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -647526,14 +647526,14 @@ sub_0813AA64: @ 0x0813AA64 push {r4, lr} ldr r4, _0813AA88 ldr r0, _0813AA8C - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -647550,7 +647550,7 @@ sub_0813AA90: @ 0x0813AA90 movs r1, #1 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -647612,7 +647612,7 @@ _0813AAF6: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldr r1, _0813AB2C lsls r0, r5, #1 adds r1, r0, r1 @@ -647641,7 +647641,7 @@ _0813AB34: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldr r1, _0813AB70 lsls r0, r5, #1 adds r1, r0, r1 @@ -647670,7 +647670,7 @@ _0813AB78: movs r1, #0x21 movs r2, #0x58 movs r3, #0 - bl sub_081295B4 + bl AddDecorationIconObject ldr r1, _0813ABA4 strb r0, [r1] b _0813AC0E @@ -647693,7 +647693,7 @@ _0813ABA8: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldr r1, _0813ABDC lsls r0, r5, #1 adds r0, r0, r1 @@ -647719,7 +647719,7 @@ _0813ABE0: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldr r1, _0813AC1C lsls r0, r5, #1 adds r0, r0, r1 @@ -647749,7 +647749,7 @@ sub_0813AC20: @ 0x0813AC20 adds r0, r4, #0 adds r1, r4, #0 adds r2, r5, #0 - bl sub_081AFB48 + bl AddItemIconSprite ldr r4, _0813AC88 strb r0, [r4] lsls r0, r0, #0x18 @@ -647823,8 +647823,8 @@ _0813ACC0: .4byte gUnknown_203A838 _0813ACC4: .4byte gUnknown_20205AC thumb_func_end sub_0813AC90 - thumb_func_start sub_0813ACC8 -sub_0813ACC8: @ 0x0813ACC8 + thumb_func_start IsArrowWarpMetatileBehavior +IsArrowWarpMetatileBehavior: @ 0x0813ACC8 push {lr} ldr r0, _0813ACEC ldrh r0, [r0] @@ -647868,7 +647868,7 @@ _0813AD1C: .4byte gUnknown_2021C40 _0813AD20: .4byte gUnknown_8592C54 _0813AD24: .4byte gUnknown_2037280 _0813AD28: .4byte gUnknown_82EACC4 - thumb_func_end sub_0813ACC8 + thumb_func_end IsArrowWarpMetatileBehavior thumb_func_start sub_0813AD2C sub_0813AD2C: @ 0x0813AD2C @@ -647885,11 +647885,11 @@ sub_0813AD2C: @ 0x0813AD2C bhi _0813AD5C ldr r4, _0813AD64 ldr r0, _0813AD68 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle adds r0, r6, #0 adds r1, r5, #0 bl sub_0813AD6C @@ -647977,7 +647977,7 @@ sub_0813ADF0: @ 0x0813ADF0 movs r1, #1 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 @@ -647993,7 +647993,7 @@ sub_0813AE0C: @ 0x0813AE0C push {r6, r7} sub sp, #0x18 ldr r0, _0813AED8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0xff @@ -648015,7 +648015,7 @@ sub_0813AE0C: @ 0x0813AE0C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r5, #0 mov sb, r4 ldr r0, _0813AEE0 @@ -648045,7 +648045,7 @@ _0813AE56: str r4, [sp, #0x10] movs r1, #1 movs r3, #0xa - bl sub_08199C0C + bl AddTextPrinterParameterized5 adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -648069,12 +648069,12 @@ _0813AE56: ldrh r0, [r6, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap ldrh r0, [r6, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0813AEC8: add sp, #0x18 pop {r3, r4} @@ -648169,7 +648169,7 @@ _0813AF7C: .4byte gUnknown_8592C54 sub_0813AF80: @ 0x0813AF80 push {r4, r5, lr} ldr r0, _0813AFF4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0xff @@ -648184,10 +648184,10 @@ sub_0813AF80: @ 0x0813AF80 lsrs r0, r0, #0x18 movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _0813AFFC ldr r0, [r0] - bl sub_08000BF0 + bl Free ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -648197,22 +648197,22 @@ sub_0813AF80: @ 0x0813AF80 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003774 + bl ClearWindowTilemap ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrh r0, [r4, #0x22] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08003444 + bl RemoveWindow adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0813AFEE: pop {r4, r5} pop {r0} @@ -648223,20 +648223,20 @@ _0813AFF8: .4byte gUnknown_3005B60 _0813AFFC: .4byte gUnknown_203A830 thumb_func_end sub_0813AF80 - thumb_func_start sub_0813B000 -sub_0813B000: @ 0x0813B000 + thumb_func_start DoDeoxysRockInteraction +DoDeoxysRockInteraction: @ 0x0813B000 push {lr} ldr r0, _0813B010 movs r1, #8 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_0813B010: .4byte sub_0813B014 - thumb_func_end sub_0813B000 +_0813B010: .4byte Task_DeoxysRockInteraction + thumb_func_end DoDeoxysRockInteraction - thumb_func_start sub_0813B014 -sub_0813B014: @ 0x0813B014 + thumb_func_start Task_DeoxysRockInteraction +Task_DeoxysRockInteraction: @ 0x0813B014 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -648277,7 +648277,7 @@ _0813B03C: cmp r0, r6 bhs _0813B094 movs r0, #0 - bl sub_0813B0EC + bl ChangeDeoxysRockLevel mov r0, r8 movs r1, #0 bl VarSet @@ -648299,10 +648299,10 @@ _0813B094: movs r0, #2 _0813B0A2: strh r0, [r1] - bl sub_080988C4 + bl EnableBothScriptContexts _0813B0A8: adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask b _0813B0DA .align 2, 0 _0813B0B0: .4byte 0x000008D4 @@ -648313,7 +648313,7 @@ _0813B0B8: lsrs r5, r0, #0x10 lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_0813B0EC + bl ChangeDeoxysRockLevel ldr r0, _0813B0E4 adds r1, r5, #0 bl VarSet @@ -648321,7 +648321,7 @@ _0813B0B8: movs r0, #1 strh r0, [r1] adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask _0813B0DA: pop {r3} mov r8, r3 @@ -648331,10 +648331,10 @@ _0813B0DA: .align 2, 0 _0813B0E4: .4byte 0x00004035 _0813B0E8: .4byte gUnknown_2037290 - thumb_func_end sub_0813B014 + thumb_func_end Task_DeoxysRockInteraction - thumb_func_start sub_0813B0EC -sub_0813B0EC: @ 0x0813B0EC + thumb_func_start ChangeDeoxysRockLevel +ChangeDeoxysRockLevel: @ 0x0813B0EC push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -648345,7 +648345,7 @@ sub_0813B0EC: @ 0x0813B0EC movs r1, #0xd0 lsls r1, r1, #1 movs r2, #8 - bl sub_080A1200 + bl LoadPalette ldr r0, _0813B124 ldr r0, [r0] ldrb r1, [r0, #5] @@ -648368,7 +648368,7 @@ _0813B128: _0813B130: ldr r0, _0813B164 movs r1, #8 - bl sub_080A8878 + bl CreateTask ldr r3, _0813B168 movs r0, #1 str r0, [r3] @@ -648391,7 +648391,7 @@ _0813B130: movs r0, #0x3c b _0813B172 .align 2, 0 -_0813B164: .4byte sub_0813B198 +_0813B164: .4byte WaitForDeoxysRockMovement _0813B168: .4byte gUnknown_20388A8 _0813B16C: .4byte gUnknown_8592E3C _0813B170: @@ -648399,7 +648399,7 @@ _0813B170: _0813B172: str r0, [r3, #0x14] movs r0, #0x42 - bl sub_080B5270 + bl FieldEffectStart ldr r0, _0813B194 adds r1, r5, r0 ldrb r1, [r1] @@ -648407,17 +648407,17 @@ _0813B172: adds r0, r5, r0 ldrb r2, [r0] movs r0, #1 - bl sub_08084298 + bl Overworld_SetEventObjTemplateCoords add sp, #4 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0813B194: .4byte gUnknown_8592E3C - thumb_func_end sub_0813B0EC + thumb_func_end ChangeDeoxysRockLevel - thumb_func_start sub_0813B198 -sub_0813B198: @ 0x0813B198 + thumb_func_start WaitForDeoxysRockMovement +WaitForDeoxysRockMovement: @ 0x0813B198 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -648426,18 +648426,18 @@ sub_0813B198: @ 0x0813B198 lsls r0, r0, #0x18 cmp r0, #0 bne _0813B1B4 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0813B1B4: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813B198 + thumb_func_end WaitForDeoxysRockMovement - thumb_func_start sub_0813B1BC -sub_0813B1BC: @ 0x0813B1BC + thumb_func_start IncrementBirthIslandRockStepCount +IncrementBirthIslandRockStepCount: @ 0x0813B1BC push {r4, lr} ldr r4, _0813B1EC adds r0, r4, #0 @@ -648472,7 +648472,7 @@ _0813B200: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813B1BC + thumb_func_end IncrementBirthIslandRockStepCount thumb_func_start sub_0813B208 sub_0813B208: @ 0x0813B208 @@ -648486,12 +648486,12 @@ sub_0813B208: @ 0x0813B208 movs r1, #0xd0 lsls r1, r1, #1 movs r2, #8 - bl sub_080A1200 + bl LoadPalette movs r0, #0x80 lsls r0, r0, #0x13 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes pop {r0} bx r0 .align 2, 0 @@ -648570,7 +648570,7 @@ _0813B2B6: lsls r1, r5, #0x18 lsrs r1, r1, #0x18 lsrs r0, r6, #0x18 - bl sub_080D1934 + bl GetBoxedMonPtr movs r1, #0xb movs r2, #0 bl sub_0806A1B4 @@ -648616,8 +648616,8 @@ _0813B314: .align 2, 0 thumb_func_end sub_0813B298 - thumb_func_start sub_0813B31C -sub_0813B31C: @ 0x0813B31C + thumb_func_start CreateUnusualWeatherEvent +CreateUnusualWeatherEvent: @ 0x0813B31C push {r4, lr} bl Random lsls r0, r0, #0x10 @@ -648682,10 +648682,10 @@ _0813B3A2: bx r0 .align 2, 0 _0813B3A8: .4byte 0x00004037 - thumb_func_end sub_0813B31C + thumb_func_end CreateUnusualWeatherEvent - thumb_func_start sub_0813B3AC -sub_0813B3AC: @ 0x0813B3AC + thumb_func_start GetUnusualWeatherMapNameAndType +GetUnusualWeatherMapNameAndType: @ 0x0813B3AC push {r4, lr} ldr r0, _0813B3D4 bl VarGet @@ -648698,7 +648698,7 @@ sub_0813B3AC: @ 0x0813B3AC adds r1, r1, r2 ldrb r1, [r1] movs r2, #0 - bl sub_08124578 + bl GetMapName cmp r4, #8 bls _0813B3E0 movs r0, #1 @@ -648713,10 +648713,10 @@ _0813B3E2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0813B3AC + thumb_func_end GetUnusualWeatherMapNameAndType - thumb_func_start sub_0813B3E8 -sub_0813B3E8: @ 0x0813B3E8 + thumb_func_start UnusualWeatherHasExpired +UnusualWeatherHasExpired: @ 0x0813B3E8 push {r4, r5, r6, lr} ldr r5, _0813B438 adds r0, r5, #0 @@ -648819,16 +648819,16 @@ _0813B4B6: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0813B3E8 + thumb_func_end UnusualWeatherHasExpired - thumb_func_start sub_0813B4BC -sub_0813B4BC: @ 0x0813B4BC + thumb_func_start Unused_SetWeatherSunny +Unused_SetWeatherSunny: @ 0x0813B4BC push {lr} movs r0, #2 bl SetCurrentAndNextWeather pop {r0} bx r0 - thumb_func_end sub_0813B4BC + thumb_func_end Unused_SetWeatherSunny thumb_func_start sub_0813B4C8 sub_0813B4C8: @ 0x0813B4C8 @@ -648881,7 +648881,7 @@ sub_0813B518: @ 0x0813B518 push {lr} ldr r0, _0813B540 ldrh r0, [r0] - bl sub_081D0CE8 + bl GetRematchIdxByTrainerIdx cmp r0, #0 blt _0813B544 movs r1, #0xae @@ -648906,8 +648906,8 @@ _0813B546: .align 2, 0 thumb_func_end sub_0813B518 - thumb_func_start sub_0813B54C -sub_0813B54C: @ 0x0813B54C + thumb_func_start StartWallClock +StartWallClock: @ 0x0813B54C push {lr} ldr r0, _0813B560 bl VarGet @@ -648924,7 +648924,7 @@ _0813B566: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0813B54C + thumb_func_end StartWallClock thumb_func_start sub_0813B56C sub_0813B56C: @ 0x0813B56C @@ -648941,7 +648941,7 @@ sub_0813B56C: @ 0x0813B56C bne _0813B58A ldr r0, _0813B59C movs r1, #5 - bl sub_080A8878 + bl CreateTask _0813B58A: pop {r0} bx r0 @@ -648957,7 +648957,7 @@ sub_0813B5A0: @ 0x0813B5A0 push {lr} ldr r0, _0813B5B0 movs r1, #5 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -649001,7 +649001,7 @@ _0813B5E0: @ jump table .4byte _0813B7E0 @ case 9 _0813B608: ldr r0, _0813B618 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _0813B616 @@ -649011,14 +649011,14 @@ _0813B616: .align 2, 0 _0813B618: .4byte sub_080B3250 _0813B61C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0813B62A b _0813B7FE _0813B62A: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0813B636 @@ -649029,19 +649029,19 @@ _0813B636: lsrs r0, r0, #0x18 ldr r1, _0813B648 movs r2, #2 - bl sub_0800A070 + bl SendBlock b _0813B740 .align 2, 0 _0813B648: .4byte gUnknown_2037280 _0813B64C: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #2 ands r1, r0 cmp r1, #0 bne _0813B65A b _0813B7FE _0813B65A: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _0813B666 @@ -649055,7 +649055,7 @@ _0813B666: ldrh r0, [r0] strh r0, [r5] movs r0, #1 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag ldr r0, _0813B698 ldrh r0, [r0] cmp r0, #1 @@ -649111,14 +649111,14 @@ _0813B6E4: .align 2, 0 _0813B6E8: .4byte gUnknown_2037290 _0813B6EC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0813B6FA b _0813B7FE _0813B6FA: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0813B7C8 @@ -649127,17 +649127,17 @@ _0813B6FA: lsrs r0, r0, #0x18 ldr r1, _0813B718 movs r2, #2 - bl sub_0800A070 + bl SendBlock b _0813B740 .align 2, 0 _0813B718: .4byte gUnknown_2037290 _0813B71C: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #1 ands r1, r0 cmp r1, #0 beq _0813B7FE - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 beq _0813B7C8 @@ -649146,7 +649146,7 @@ _0813B71C: ldrh r0, [r0] strh r0, [r1] movs r0, #0 - bl sub_0800A1B0 + bl ResetBlockReceivedFlag _0813B740: ldr r1, _0813B75C lsls r0, r4, #2 @@ -649162,7 +649162,7 @@ _0813B754: .4byte gUnknown_2037290 _0813B758: .4byte gUnknown_202207C _0813B75C: .4byte gUnknown_3005B60 _0813B760: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _0813B784 @@ -649171,7 +649171,7 @@ _0813B760: cmp r0, #2 bne _0813B7C8 ldr r0, _0813B780 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage b _0813B7C8 .align 2, 0 _0813B77C: .4byte gUnknown_2037290 @@ -649182,7 +649182,7 @@ _0813B784: cmp r0, #3 bne _0813B7C8 ldr r0, _0813B798 - bl sub_08097C00 + bl ShowFieldAutoScrollMessage b _0813B7C8 .align 2, 0 _0813B794: .4byte gUnknown_2037290 @@ -649195,7 +649195,7 @@ _0813B79C: bne _0813B7FE b _0813B7C8 _0813B7AA: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -649203,7 +649203,7 @@ _0813B7AA: bl sub_0800A8D4 b _0813B7C8 _0813B7BC: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -649231,9 +649231,9 @@ _0813B7EC: ldr r1, _0813B80C ldr r1, [r1] str r1, [r0] - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0813B7FE: pop {r4, r5} pop {r0} @@ -649254,21 +649254,21 @@ sub_0813B810: @ 0x0813B810 ldr r2, _0813B82C movs r0, #0 movs r1, #1 - bl sub_081D605C + bl DoRayquazaScene b _0813B83A .align 2, 0 _0813B828: .4byte gUnknown_2037280 -_0813B82C: .4byte sub_08085B34 +_0813B82C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _0813B830: ldr r2, _0813B840 movs r0, #1 movs r1, #0 - bl sub_081D605C + bl DoRayquazaScene _0813B83A: pop {r0} bx r0 .align 2, 0 -_0813B840: .4byte sub_08085B34 +_0813B840: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_0813B810 thumb_func_start sub_0813B844 @@ -649276,7 +649276,7 @@ sub_0813B844: @ 0x0813B844 push {lr} ldr r0, _0813B858 movs r1, #8 - bl sub_080A8878 + bl CreateTask movs r0, #0x9d bl sub_080A306C pop {r0} @@ -649321,7 +649321,7 @@ _0813B890: cmp r1, r0 bne _0813B8A4 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0813B8A4: pop {r4, r5} pop {r0} @@ -649337,7 +649337,7 @@ sub_0813B8B8: @ 0x0813B8B8 push {lr} ldr r0, _0813B8E0 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0813B8E4 @@ -649435,8 +649435,8 @@ _0813B92C: cmp r0, #3 bne _0813B986 mov r0, sb - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _0813B986: pop {r3, r4, r5} mov r8, r3 @@ -649490,7 +649490,7 @@ sub_0813B9D8: @ 0x0813B9D8 cmp r1, r0 bne _0813B9EE movs r0, #3 - bl sub_08084684 + bl SetLastHealLocationWarp _0813B9EE: pop {r0} bx r0 @@ -649569,7 +649569,7 @@ sub_0813BA68: @ 0x0813BA68 lsls r0, r0, #0x18 cmp r0, #0 beq _0813BA8A - bl sub_0813BD20 + bl UpdateMovedLilycoveFanClubMembers ldr r0, _0813BA90 ldr r1, [r0] ldr r0, _0813BA94 @@ -649912,8 +649912,8 @@ _0813BD18: .4byte gUnknown_3005AEC _0813BD1C: .4byte 0x0000141E thumb_func_end GetNumMovedLilycoveFanClubMembers - thumb_func_start sub_0813BD20 -sub_0813BD20: @ 0x0813BD20 + thumb_func_start UpdateMovedLilycoveFanClubMembers +UpdateMovedLilycoveFanClubMembers: @ 0x0813BD20 push {r4, r5, r6, lr} movs r5, #0 ldr r2, _0813BD34 @@ -649975,7 +649975,7 @@ _0813BD90: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813BD20 + thumb_func_end UpdateMovedLilycoveFanClubMembers thumb_func_start ShouldMoveLilycoveFanClubMember ShouldMoveLilycoveFanClubMember: @ 0x0813BD98 @@ -650022,8 +650022,8 @@ _0813BDE4: .4byte gUnknown_3005AEC _0813BDE8: .4byte 0x0000141E thumb_func_end sub_0813BDBC - thumb_func_start sub_0813BDEC -sub_0813BDEC: @ 0x0813BDEC + thumb_func_start BufferStreakTrainerText +BufferStreakTrainerText: @ 0x0813BDEC push {lr} movs r3, #0 movs r2, #0 @@ -650080,7 +650080,7 @@ _0813BE4C: .align 2, 0 _0813BE60: .4byte gUnknown_3005AEC _0813BE64: .4byte 0x00003150 - thumb_func_end sub_0813BDEC + thumb_func_end BufferStreakTrainerText thumb_func_start sub_0813BE68 sub_0813BE68: @ 0x0813BE68 @@ -650244,8 +650244,8 @@ sub_0813BFA0: @ 0x0813BFA0 _0813BFB4: .4byte gUnknown_2037280 thumb_func_end sub_0813BFA0 - thumb_func_start sub_0813BFB8 -sub_0813BFB8: @ 0x0813BFB8 + thumb_func_start ClearLinkBattleRecord +ClearLinkBattleRecord: @ 0x0813BFB8 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -650269,16 +650269,16 @@ sub_0813BFB8: @ 0x0813BFB8 bx r0 .align 2, 0 _0813BFE4: .4byte 0x01000008 - thumb_func_end sub_0813BFB8 + thumb_func_end ClearLinkBattleRecord - thumb_func_start sub_0813BFE8 -sub_0813BFE8: @ 0x0813BFE8 + thumb_func_start ClearLinkBattleRecords +ClearLinkBattleRecords: @ 0x0813BFE8 push {r4, r5, lr} adds r4, r0, #0 movs r5, #4 _0813BFEE: adds r0, r4, #0 - bl sub_0813BFB8 + bl ClearLinkBattleRecord adds r4, #0x10 subs r5, #1 cmp r5, #0 @@ -650296,10 +650296,10 @@ _0813BFEE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813BFE8 + thumb_func_end ClearLinkBattleRecords - thumb_func_start sub_0813C01C -sub_0813C01C: @ 0x0813C01C + thumb_func_start GetLinkBattleRecordTotalBattles +GetLinkBattleRecordTotalBattles: @ 0x0813C01C adds r1, r0, #0 ldrh r0, [r1, #0xa] ldrh r2, [r1, #0xc] @@ -650308,10 +650308,10 @@ sub_0813C01C: @ 0x0813C01C adds r0, r0, r1 bx lr .align 2, 0 - thumb_func_end sub_0813C01C + thumb_func_end GetLinkBattleRecordTotalBattles - thumb_func_start sub_0813C02C -sub_0813C02C: @ 0x0813C02C + thumb_func_start FindLinkBattleRecord +FindLinkBattleRecord: @ 0x0813C02C push {r4, r5, r6, r7, lr} adds r7, r1, #0 lsls r2, r2, #0x10 @@ -650340,7 +650340,7 @@ _0813C05A: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0813C02C + thumb_func_end FindLinkBattleRecord thumb_func_start sub_0813C060 sub_0813C060: @ 0x0813C060 @@ -650364,10 +650364,10 @@ _0813C06E: _0813C080: adds r0, r6, #0 str r2, [sp, #0x10] - bl sub_0813C01C + bl GetLinkBattleRecordTotalBattles adds r4, r0, #0 adds r0, r5, #0 - bl sub_0813C01C + bl GetLinkBattleRecordTotalBattles ldr r2, [sp, #0x10] cmp r4, r0 ble _0813C0BA @@ -650468,8 +650468,8 @@ _0813C136: _0813C13C: .4byte 0x0000270F thumb_func_end UpdateLinkBattleRecord - thumb_func_start sub_0813C140 -sub_0813C140: @ 0x0813C140 + thumb_func_start UpdateLinkBattleGameStats +UpdateLinkBattleGameStats: @ 0x0813C140 push {r4, lr} cmp r0, #2 beq _0813C15A @@ -650492,7 +650492,7 @@ _0813C15E: movs r4, #0x19 _0813C160: adds r0, r4, #0 - bl sub_08084180 + bl GetGameStat ldr r1, _0813C178 cmp r0, r1 bhi _0813C172 @@ -650504,10 +650504,10 @@ _0813C172: bx r0 .align 2, 0 _0813C178: .4byte 0x0000270E - thumb_func_end sub_0813C140 + thumb_func_end UpdateLinkBattleGameStats - thumb_func_start sub_0813C17C -sub_0813C17C: @ 0x0813C17C + thumb_func_start UpdateLinkBattleRecords +UpdateLinkBattleRecords: @ 0x0813C17C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -650523,13 +650523,13 @@ sub_0813C17C: @ 0x0813C17C lsrs r0, r0, #0x18 mov sb, r0 mov r0, sl - bl sub_0813C140 + bl UpdateLinkBattleGameStats adds r0, r6, #0 bl sub_0813C060 adds r0, r6, #0 mov r1, r8 adds r2, r7, #0 - bl sub_0813C02C + bl FindLinkBattleRecord adds r5, r0, #0 cmp r5, #5 bne _0813C1E0 @@ -650537,7 +650537,7 @@ sub_0813C17C: @ 0x0813C17C adds r4, r6, #0 adds r4, #0x40 adds r0, r4, #0 - bl sub_0813BFB8 + bl ClearLinkBattleRecord adds r0, r4, #0 mov r1, r8 movs r2, #7 @@ -650569,7 +650569,7 @@ _0813C1E0: bx r0 .align 2, 0 _0813C200: .4byte gUnknown_20226A0 - thumb_func_end sub_0813C17C + thumb_func_end UpdateLinkBattleRecords thumb_func_start sub_0813C204 sub_0813C204: @ 0x0813C204 @@ -650578,7 +650578,7 @@ sub_0813C204: @ 0x0813C204 ldr r0, [r0] ldr r1, _0813C21C adds r0, r0, r1 - bl sub_0813BFE8 + bl ClearLinkBattleRecords pop {r0} bx r0 .align 2, 0 @@ -650634,8 +650634,8 @@ _0813C268: .4byte gUnknown_203980E _0813C26C: .4byte 0x0000270F thumb_func_end sub_0813C248 - thumb_func_start sub_0813C270 -sub_0813C270: @ 0x0813C270 + thumb_func_start UpdateTrainerCardWinsLosses +UpdateTrainerCardWinsLosses: @ 0x0813C270 push {r4, lr} adds r4, r0, #0 ldr r0, _0813C284 @@ -650664,10 +650664,10 @@ _0813C2A4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813C270 + thumb_func_end UpdateTrainerCardWinsLosses - thumb_func_start sub_0813C2AC -sub_0813C2AC: @ 0x0813C2AC + thumb_func_start UpdatePlayerLinkBattleRecords +UpdatePlayerLinkBattleRecords: @ 0x0813C2AC push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -650675,7 +650675,7 @@ sub_0813C2AC: @ 0x0813C2AC cmp r0, #1 beq _0813C2E6 adds r0, r4, #0 - bl sub_0813C270 + bl UpdateTrainerCardWinsLosses ldr r0, _0813C2F0 ldr r0, [r0] ldr r1, _0813C2F4 @@ -650693,7 +650693,7 @@ sub_0813C2AC: @ 0x0813C2AC lsls r4, r4, #0x18 lsrs r4, r4, #0x18 str r4, [sp] - bl sub_0813C17C + bl UpdateLinkBattleRecords _0813C2E6: add sp, #4 pop {r4} @@ -650704,15 +650704,15 @@ _0813C2F0: .4byte gUnknown_3005AEC _0813C2F4: .4byte 0x00003150 _0813C2F8: .4byte gUnknown_2039828 _0813C2FC: .4byte gUnknown_2023FDE - thumb_func_end sub_0813C2AC + thumb_func_end UpdatePlayerLinkBattleRecords - thumb_func_start sub_0813C300 -sub_0813C300: @ 0x0813C300 + thumb_func_start PrintLinkBattleWinsLossesDraws +PrintLinkBattleWinsLossesDraws: @ 0x0813C300 push {r4, lr} sub sp, #0xc ldr r4, _0813C36C movs r0, #0x17 - bl sub_08084180 + bl GetGameStat adds r1, r0, #0 adds r0, r4, #0 movs r2, #1 @@ -650720,7 +650720,7 @@ sub_0813C300: @ 0x0813C300 bl sub_080089D8 ldr r4, _0813C370 movs r0, #0x18 - bl sub_08084180 + bl GetGameStat adds r1, r0, #0 adds r0, r4, #0 movs r2, #1 @@ -650728,7 +650728,7 @@ sub_0813C300: @ 0x0813C300 bl sub_080089D8 ldr r4, _0813C374 movs r0, #0x19 - bl sub_08084180 + bl GetGameStat adds r1, r0, #0 adds r0, r4, #0 movs r2, #1 @@ -650737,7 +650737,7 @@ sub_0813C300: @ 0x0813C300 ldr r4, _0813C378 ldr r1, _0813C37C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _0813C380 ldrb r0, [r0] movs r1, #0x12 @@ -650760,10 +650760,10 @@ _0813C374: .4byte gUnknown_2021C68 _0813C378: .4byte gUnknown_2021C7C _0813C37C: .4byte gUnknown_85937EF _0813C380: .4byte gUnknown_203A840 - thumb_func_end sub_0813C300 + thumb_func_end PrintLinkBattleWinsLossesDraws - thumb_func_start sub_0813C384 -sub_0813C384: @ 0x0813C384 + thumb_func_start CrackedFloorPerStepCallback +CrackedFloorPerStepCallback: @ 0x0813C384 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -650827,7 +650827,7 @@ _0813C404: .4byte gUnknown_8593817 _0813C408: ldr r0, _0813C4A8 movs r1, #8 - bl sub_08008E68 + bl StringFillWithTerminator ldr r0, _0813C4A8 adds r1, r6, #0 movs r2, #7 @@ -650899,7 +650899,7 @@ _0813C49A: .align 2, 0 _0813C4A8: .4byte gUnknown_2021C40 _0813C4AC: .4byte gUnknown_203A840 - thumb_func_end sub_0813C384 + thumb_func_end CrackedFloorPerStepCallback thumb_func_start sub_0813C4B0 sub_0813C4B0: @ 0x0813C4B0 @@ -650910,18 +650910,18 @@ sub_0813C4B0: @ 0x0813C4B0 sub sp, #0xc ldr r6, _0813C560 ldr r0, _0813C564 - bl sub_08003250 + bl AddWindow strb r0, [r6] ldrb r0, [r6] movs r1, #0 bl sub_08196FF0 ldrb r0, [r6] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0813C568 ldr r1, _0813C56C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r6] movs r1, #2 str r1, [sp] @@ -650938,10 +650938,10 @@ sub_0813C4B0: @ 0x0813C4B0 ldr r1, _0813C574 mov sb, r1 add r0, sb - bl sub_0813C300 + bl PrintLinkBattleWinsLossesDraws ldr r1, _0813C578 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r6] movs r1, #0x2a str r1, [sp] @@ -650960,7 +650960,7 @@ _0813C52A: ldr r0, [r7] adds r0, r0, r5 lsrs r1, r6, #0x18 - bl sub_0813C384 + bl CrackedFloorPerStepCallback movs r0, #0x80 lsls r0, r0, #0x12 adds r6, r6, r0 @@ -650970,10 +650970,10 @@ _0813C52A: bge _0813C52A ldr r4, _0813C560 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4} mov r8, r3 @@ -650991,21 +650991,21 @@ _0813C574: .4byte 0x00003150 _0813C578: .4byte gUnknown_8593801 thumb_func_end sub_0813C4B0 - thumb_func_start sub_0813C57C -sub_0813C57C: @ 0x0813C57C + thumb_func_start RemoveRecordsWindow +RemoveRecordsWindow: @ 0x0813C57C push {r4, lr} ldr r4, _0813C594 ldrb r0, [r4] movs r1, #0 bl sub_08197060 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 _0813C594: .4byte gUnknown_203A840 - thumb_func_end sub_0813C57C + thumb_func_end RemoveRecordsWindow thumb_func_start sub_0813C598 sub_0813C598: @ 0x0813C598 @@ -651031,11 +651031,11 @@ _0813C5B8: .align 2, 0 _0813C5BC: .4byte gUnknown_2037C74 _0813C5C0: .4byte gUnknown_3005B60 -_0813C5C4: .4byte sub_0813C5C8 +_0813C5C4: .4byte Task_CloseTrainerHillRecordsOnButton thumb_func_end sub_0813C598 - thumb_func_start sub_0813C5C8 -sub_0813C5C8: @ 0x0813C5C8 + thumb_func_start Task_CloseTrainerHillRecordsOnButton +Task_CloseTrainerHillRecordsOnButton: @ 0x0813C5C8 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -651067,7 +651067,7 @@ _0813C5F6: _0813C5FC: .4byte gUnknown_3005B60 _0813C600: .4byte gUnknown_3002360 _0813C604: .4byte sub_0813C608 - thumb_func_end sub_0813C5C8 + thumb_func_end Task_CloseTrainerHillRecordsOnButton thumb_func_start sub_0813C608 sub_0813C608: @ 0x0813C608 @@ -651082,7 +651082,7 @@ sub_0813C608: @ 0x0813C608 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0813C638 lsls r0, r4, #2 adds r0, r0, r4 @@ -651096,11 +651096,11 @@ sub_0813C608: @ 0x0813C608 bx r0 .align 2, 0 _0813C638: .4byte gUnknown_3005B60 -_0813C63C: .4byte sub_0813C640 +_0813C63C: .4byte party_menu_link_mon_pokeball_object thumb_func_end sub_0813C608 - thumb_func_start sub_0813C640 -sub_0813C640: @ 0x0813C640 + thumb_func_start party_menu_link_mon_pokeball_object +party_menu_link_mon_pokeball_object: @ 0x0813C640 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -651111,24 +651111,24 @@ sub_0813C640: @ 0x0813C640 cmp r0, #0 bne _0813C670 ldr r0, _0813C67C - bl sub_08000540 + bl SetMainCallback2 ldr r0, _0813C680 ldr r0, [r0] - bl sub_08000BF0 + bl Free movs r0, #0 bl sub_0813C684 - bl sub_080034D4 + bl FreeAllWindowBuffers adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0813C670: pop {r4} pop {r0} bx r0 .align 2, 0 _0813C678: .4byte gUnknown_2037C74 -_0813C67C: .4byte sub_08085B34 +_0813C67C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _0813C680: .4byte gUnknown_203A844 - thumb_func_end sub_0813C640 + thumb_func_end party_menu_link_mon_pokeball_object thumb_func_start sub_0813C684 sub_0813C684: @ 0x0813C684 @@ -651138,22 +651138,22 @@ sub_0813C684: @ 0x0813C684 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 - bl sub_08003774 + bl ClearWindowTilemap adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0813C684 - thumb_func_start sub_0813C6B0 -sub_0813C6B0: @ 0x0813C6B0 + thumb_func_start ClearVramOamPlttRegs +ClearVramOamPlttRegs: @ 0x0813C6B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -651290,63 +651290,63 @@ _0813C6D6: .align 2, 0 _0813C7E0: .4byte 0x040000D4 _0813C7E4: .4byte 0x81000800 - thumb_func_end sub_0813C6B0 + thumb_func_end ClearVramOamPlttRegs - thumb_func_start sub_0813C7E8 -sub_0813C7E8: @ 0x0813C7E8 + thumb_func_start ClearTasksAndGraphicalStructs +ClearTasksAndGraphicalStructs: @ 0x0813C7E8 push {lr} - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813C7E8 + thumb_func_end ClearTasksAndGraphicalStructs - thumb_func_start sub_0813C804 -sub_0813C804: @ 0x0813C804 + thumb_func_start ResetBgCoordinates +ResetBgCoordinates: @ 0x0813C804 push {lr} movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813C804 + thumb_func_end ResetBgCoordinates - thumb_func_start sub_0813C85C -sub_0813C85C: @ 0x0813C85C + thumb_func_start SetDispcntReg +SetDispcntReg: @ 0x0813C85C push {lr} movs r1, #0x94 lsls r1, r1, #4 @@ -651354,10 +651354,10 @@ sub_0813C85C: @ 0x0813C85C bl SetGpuReg pop {r0} bx r0 - thumb_func_end sub_0813C85C + thumb_func_end SetDispcntReg - thumb_func_start sub_0813C86C -sub_0813C86C: @ 0x0813C86C + thumb_func_start LoadTrainerHillRecordsWindowGfx +LoadTrainerHillRecordsWindowGfx: @ 0x0813C86C push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -651379,7 +651379,7 @@ sub_0813C86C: @ 0x0813C86C ldr r0, _0813C8B0 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette add sp, #8 pop {r4} pop {r0} @@ -651388,46 +651388,46 @@ sub_0813C86C: @ 0x0813C86C _0813C8A8: .4byte gUnknown_8592EE0 _0813C8AC: .4byte gUnknown_8592FC0 _0813C8B0: .4byte gUnknown_8592FA0 - thumb_func_end sub_0813C86C + thumb_func_end LoadTrainerHillRecordsWindowGfx - thumb_func_start sub_0813C8B4 -sub_0813C8B4: @ 0x0813C8B4 + thumb_func_start VblankCB_TrainerHillRecords +VblankCB_TrainerHillRecords: @ 0x0813C8B4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0813C8B4 + thumb_func_end VblankCB_TrainerHillRecords thumb_func_start sub_0813C8C8 sub_0813C8C8: @ 0x0813C8C8 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0813C8C8 - thumb_func_start sub_0813C8E0 -sub_0813C8E0: @ 0x0813C8E0 + thumb_func_start ShowTrainerHillRecords +ShowTrainerHillRecords: @ 0x0813C8E0 push {lr} movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0813C8F4 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_0813C8F4: .4byte sub_0813C8F8 - thumb_func_end sub_0813C8E0 +_0813C8F4: .4byte CB2_ShowTrainerHillRecords + thumb_func_end ShowTrainerHillRecords - thumb_func_start sub_0813C8F8 -sub_0813C8F8: @ 0x0813C8F8 + thumb_func_start CB2_ShowTrainerHillRecords +CB2_ShowTrainerHillRecords: @ 0x0813C8F8 push {r4, lr} sub sp, #4 ldr r0, _0813C918 @@ -651458,17 +651458,17 @@ _0813C920: @ jump table .4byte _0813C9F0 @ case 7 _0813C940: movs r0, #0 - bl sub_080006F0 - bl sub_0813C6B0 + bl SetVBlankCallback + bl ClearVramOamPlttRegs b _0813C9DC _0813C94C: - bl sub_0813C7E8 + bl ClearTasksAndGraphicalStructs b _0813C9DC _0813C952: ldr r4, _0813C97C movs r0, #0x80 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -651478,37 +651478,37 @@ _0813C952: bl InitBgsFromTemplates ldr r1, [r4] movs r0, #3 - bl sub_0800212C - bl sub_0813C804 + bl SetBgTilemapBuffer + bl ResetBgCoordinates b _0813C9DC .align 2, 0 _0813C97C: .4byte gUnknown_203A844 _0813C980: .4byte gUnknown_85937C0 _0813C984: movs r0, #3 - bl sub_0813C86C + bl LoadTrainerHillRecordsWindowGfx movs r0, #0 - bl sub_080985A0 + bl stdpal_get movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _0813C9DC _0813C99A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _0813CA18 movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0813C9DC _0813C9BA: ldr r0, _0813C9C8 - bl sub_08003090 + bl InitWindows bl sub_08004480 b _0813C9DC .align 2, 0 @@ -651520,7 +651520,7 @@ _0813C9CC: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _0813C9DC: ldr r1, _0813C9EC movs r0, #0x87 @@ -651533,15 +651533,15 @@ _0813C9DC: .align 2, 0 _0813C9EC: .4byte gUnknown_3002360 _0813C9F0: - bl sub_0813C85C + bl SetDispcntReg ldr r0, _0813CA20 - bl sub_080006F0 + bl SetVBlankCallback bl sub_081D53CC ldr r0, _0813CA24 movs r1, #8 - bl sub_080A8878 + bl CreateTask ldr r0, _0813CA28 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _0813CA2C movs r1, #0x87 lsls r1, r1, #3 @@ -651554,14 +651554,14 @@ _0813CA18: pop {r0} bx r0 .align 2, 0 -_0813CA20: .4byte sub_0813C8B4 +_0813CA20: .4byte VblankCB_TrainerHillRecords _0813CA24: .4byte sub_0813C598 _0813CA28: .4byte sub_0813C8C8 _0813CA2C: .4byte gUnknown_3002360 - thumb_func_end sub_0813C8F8 + thumb_func_end CB2_ShowTrainerHillRecords - thumb_func_start sub_0813CA30 -sub_0813CA30: @ 0x0813CA30 + thumb_func_start ResetDrawAreaGlowState +ResetDrawAreaGlowState: @ 0x0813CA30 ldr r0, _0813CA40 ldr r0, [r0] movs r1, #0x8a @@ -651572,10 +651572,10 @@ sub_0813CA30: @ 0x0813CA30 bx lr .align 2, 0 _0813CA40: .4byte gUnknown_203A848 - thumb_func_end sub_0813CA30 + thumb_func_end ResetDrawAreaGlowState - thumb_func_start sub_0813CA44 -sub_0813CA44: @ 0x0813CA44 + thumb_func_start DrawAreaGlow +DrawAreaGlow: @ 0x0813CA44 push {lr} sub sp, #4 ldr r0, _0813CA64 @@ -651604,7 +651604,7 @@ _0813CA80: ldr r0, _0813CA8C ldr r0, [r0] ldrh r0, [r0, #0xe] - bl sub_0813CB1C + bl FindMapsWithMon b _0813CB00 .align 2, 0 _0813CA8C: .4byte gUnknown_203A848 @@ -651618,7 +651618,7 @@ _0813CA96: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _0813CAC4 ldr r1, [r0] movs r0, #0x8b @@ -651634,7 +651634,7 @@ _0813CA96: _0813CAC0: .4byte gUnknown_859383C _0813CAC4: .4byte gUnknown_203A848 _0813CAC8: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _0813CB10 @@ -651651,7 +651651,7 @@ _0813CAEC: ldr r1, _0813CAF8 movs r0, #2 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY b _0813CB00 .align 2, 0 _0813CAF8: .4byte 0xFFFFF800 @@ -651675,10 +651675,10 @@ _0813CB12: bx r1 .align 2, 0 _0813CB18: .4byte gUnknown_203A848 - thumb_func_end sub_0813CA44 + thumb_func_end DrawAreaGlow - thumb_func_start sub_0813CB1C -sub_0813CB1C: @ 0x0813CB1C + thumb_func_start FindMapsWithMon +FindMapsWithMon: @ 0x0813CB1C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -651783,7 +651783,7 @@ _0813CBEA: adds r0, r2, r5 ldrh r1, [r0] movs r0, #0 - bl sub_0813CCE0 + bl SetAreaHasMon b _0813CC0A _0813CBF6: adds r1, r3, r6 @@ -651794,7 +651794,7 @@ _0813CBF6: ldrh r0, [r0] adds r1, r1, r5 ldrh r1, [r1] - bl sub_0813CD40 + bl SetSpecialMapHasMon _0813CC0A: adds r0, r6, #1 lsls r0, r0, #0x10 @@ -651820,7 +651820,7 @@ _0813CC2A: adds r5, r0, r1 adds r0, r5, #0 adds r1, r7, #0 - bl sub_0813CE24 + bl MapHasMon lsls r0, r0, #0x18 cmp r0, #0 beq _0813CC78 @@ -651842,7 +651842,7 @@ _0813CC58: _0813CC5E: ldrb r1, [r5, #1] movs r0, #0 - bl sub_0813CCE0 + bl SetAreaHasMon b _0813CC78 _0813CC68: ldr r0, _0813CC90 @@ -651851,7 +651851,7 @@ _0813CC68: adds r1, r1, r0 ldrb r0, [r1] ldrb r1, [r1, #1] - bl sub_0813CD40 + bl SetSpecialMapHasMon _0813CC78: adds r0, r6, #1 lsls r0, r0, #0x10 @@ -651880,7 +651880,7 @@ _0813CC94: adds r0, #0x10 adds r1, r2, #0 adds r1, #0x11 - bl sub_08161E78 + bl GetRoamerLocation ldr r1, [r5] ldrb r0, [r1, #0x10] ldrb r1, [r1, #0x11] @@ -651906,10 +651906,10 @@ _0813CCD4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0813CB1C + thumb_func_end FindMapsWithMon - thumb_func_start sub_0813CCE0 -sub_0813CCE0: @ 0x0813CCE0 + thumb_func_start SetAreaHasMon +SetAreaHasMon: @ 0x0813CCE0 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -651938,7 +651938,7 @@ sub_0813CCE0: @ 0x0813CCE0 adds r1, r3, #0 bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, #0x14] - bl sub_08123FA8 + bl CorrectSpecialMapSecId ldr r2, [r4] movs r1, #0x88 lsls r1, r1, #1 @@ -651956,10 +651956,10 @@ _0813CD34: bx r0 .align 2, 0 _0813CD3C: .4byte gUnknown_203A848 - thumb_func_end sub_0813CCE0 + thumb_func_end SetAreaHasMon - thumb_func_start sub_0813CD40 -sub_0813CD40: @ 0x0813CD40 + thumb_func_start SetSpecialMapHasMon +SetSpecialMapHasMon: @ 0x0813CD40 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -651977,7 +651977,7 @@ sub_0813CD40: @ 0x0813CD40 lsrs r0, r0, #0x18 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_0813CE10 + bl GetRegionMapSectionId lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, #0xd4 @@ -652067,10 +652067,10 @@ _0813CDFE: _0813CE04: .4byte gUnknown_203A848 _0813CE08: .4byte gUnknown_8593972 _0813CE0C: .4byte gUnknown_8593984 - thumb_func_end sub_0813CD40 + thumb_func_end SetSpecialMapHasMon - thumb_func_start sub_0813CE10 -sub_0813CE10: @ 0x0813CE10 + thumb_func_start GetRegionMapSectionId +GetRegionMapSectionId: @ 0x0813CE10 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -652080,17 +652080,17 @@ sub_0813CE10: @ 0x0813CE10 ldrb r0, [r0, #0x14] pop {r1} bx r1 - thumb_func_end sub_0813CE10 + thumb_func_end GetRegionMapSectionId - thumb_func_start sub_0813CE24 -sub_0813CE24: @ 0x0813CE24 + thumb_func_start MapHasMon +MapHasMon: @ 0x0813CE24 push {r4, r5, lr} adds r4, r0, #0 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 ldrb r0, [r4] ldrb r1, [r4, #1] - bl sub_0813CE10 + bl GetRegionMapSectionId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #0xd2 @@ -652151,7 +652151,7 @@ _0813CEAA: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0813CE24 + thumb_func_end MapHasMon thumb_func_start MonListHasMon MonListHasMon: @ 0x0813CEB0 @@ -652711,8 +652711,8 @@ _0813D2B6: _0813D2C8: .4byte 0x0000027F thumb_func_end sub_0813CEE8 - thumb_func_start sub_0813D2CC -sub_0813D2CC: @ 0x0813D2CC + thumb_func_start StartAreaGlow +StartAreaGlow: @ 0x0813D2CC push {lr} ldr r1, _0813D2F8 ldr r2, [r1] @@ -652771,7 +652771,7 @@ _0813D30A: lsls r1, r1, #5 movs r0, #0x52 bl SetGpuReg - bl sub_0813D360 + bl DoAreaGlow pop {r0} bx r0 .align 2, 0 @@ -652780,10 +652780,10 @@ _0813D350: .4byte 0x00000616 _0813D354: .4byte 0x0000061C _0813D358: .4byte 0x0000061F _0813D35C: .4byte 0x00003F44 - thumb_func_end sub_0813D2CC + thumb_func_end StartAreaGlow - thumb_func_start sub_0813D360 -sub_0813D360: @ 0x0813D360 + thumb_func_start DoAreaGlow +DoAreaGlow: @ 0x0813D360 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -652973,10 +652973,10 @@ _0813D4CA: .align 2, 0 _0813D4D4: .4byte 0x00000616 _0813D4D8: .4byte 0x0000061F - thumb_func_end sub_0813D360 + thumb_func_end DoAreaGlow - thumb_func_start sub_0813D4DC -sub_0813D4DC: @ 0x0813D4DC + thumb_func_start ShowPokedexAreaScreen +ShowPokedexAreaScreen: @ 0x0813D4DC push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 @@ -652984,7 +652984,7 @@ sub_0813D4DC: @ 0x0813D4DC lsrs r4, r4, #0x10 ldr r5, _0813D520 ldr r0, _0813D524 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r1, #0 movs r5, #0 @@ -652996,7 +652996,7 @@ sub_0813D4DC: @ 0x0813D4DC strb r1, [r6] ldr r0, _0813D528 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0813D52C @@ -653011,12 +653011,12 @@ sub_0813D4DC: @ 0x0813D4DC .align 2, 0 _0813D520: .4byte gUnknown_203A848 _0813D524: .4byte 0x000015BC -_0813D528: .4byte sub_0813D530 +_0813D528: .4byte Task_PokedexAreaScreen_0 _0813D52C: .4byte gUnknown_3005B60 - thumb_func_end sub_0813D4DC + thumb_func_end ShowPokedexAreaScreen - thumb_func_start sub_0813D530 -sub_0813D530: @ 0x0813D530 + thumb_func_start Task_PokedexAreaScreen_0 +Task_PokedexAreaScreen_0: @ 0x0813D530 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -653058,17 +653058,17 @@ _0813D590: bl ResetSpriteData bl FreeAllSpritePalettes movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #0 - bl sub_08001B5C + bl HideBg b _0813D688 _0813D5AC: movs r0, #3 movs r1, #1 movs r2, #3 - bl sub_08001B70 + bl SetBgAttribute ldr r0, _0813D5D0 bl sub_081C4578 ldr r0, _0813D5D4 @@ -653092,10 +653092,10 @@ _0813D5D8: bl sub_081C46D8 b _0813D688 _0813D5EA: - bl sub_0813CA30 + bl ResetDrawAreaGlowState b _0813D688 _0813D5F0: - bl sub_0813CA44 + bl DrawAreaGlow lsls r0, r0, #0x18 cmp r0, #0 bne _0813D698 @@ -653108,7 +653108,7 @@ _0813D5FC: bl sub_08122D94 movs r0, #1 movs r1, #1 - bl sub_08124294 + bl CreateRegionMapPlayerIcon movs r1, #8 rsbs r1, r1, #0 movs r0, #0 @@ -653118,13 +653118,13 @@ _0813D5FC: _0813D61C: .4byte gUnknown_203A848 _0813D620: .4byte 0x000006EC _0813D624: - bl sub_0813D7D4 + bl CreateAreaMarkerSprites b _0813D688 _0813D62A: - bl sub_0813D9AC + bl LoadAreaUnknownGraphics b _0813D688 _0813D630: - bl sub_0813D9EC + bl CreateAreaUnknownSprites b _0813D688 _0813D636: movs r0, #0x15 @@ -653133,21 +653133,21 @@ _0813D636: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _0813D688 _0813D648: ldr r1, _0813D66C movs r0, #0x50 bl SetGpuReg - bl sub_0813D2CC + bl StartAreaGlow movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r1, #0x80 lsls r1, r1, #5 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits b _0813D688 .align 2, 0 _0813D66C: .4byte 0x00003F41 @@ -653162,7 +653162,7 @@ _0813D670: strh r1, [r0, #8] b _0813D698 .align 2, 0 -_0813D684: .4byte sub_0813D6A4 +_0813D684: .4byte Task_PokedexAreaScreen_1 _0813D688: ldr r0, _0813D6A0 lsls r1, r4, #2 @@ -653179,15 +653179,15 @@ _0813D698: bx r0 .align 2, 0 _0813D6A0: .4byte gUnknown_3005B60 - thumb_func_end sub_0813D530 + thumb_func_end Task_PokedexAreaScreen_0 - thumb_func_start sub_0813D6A4 -sub_0813D6A4: @ 0x0813D6A4 + thumb_func_start Task_PokedexAreaScreen_1 +Task_PokedexAreaScreen_1: @ 0x0813D6A4 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_0813D360 + bl DoAreaGlow ldr r1, _0813D6CC lsls r0, r5, #2 adds r0, r0, r5 @@ -653271,7 +653271,7 @@ _0813D744: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0813D79C _0813D756: ldr r0, _0813D794 @@ -653282,7 +653282,7 @@ _0813D756: lsrs r7, r0, #0x18 cmp r7, #0 bne _0813D7AC - bl sub_0813D928 + bl DestroyAreaMarkerSprites ldr r4, _0813D798 ldr r0, [r4] movs r1, #0xdd @@ -653293,10 +653293,10 @@ _0813D756: strb r0, [r1] bl sub_0813D7B8 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask bl sub_081C46BC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r7, [r4] b _0813D7AC .align 2, 0 @@ -653318,7 +653318,7 @@ _0813D7AC: bx r0 .align 2, 0 _0813D7B4: .4byte gUnknown_3005B60 - thumb_func_end sub_0813D6A4 + thumb_func_end Task_PokedexAreaScreen_1 thumb_func_start sub_0813D7B8 sub_0813D7B8: @ 0x0813D7B8 @@ -653326,25 +653326,25 @@ sub_0813D7B8: @ 0x0813D7B8 movs r0, #3 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #3 movs r1, #4 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0813D7B8 - thumb_func_start sub_0813D7D4 -sub_0813D7D4: @ 0x0813D7D4 + thumb_func_start CreateAreaMarkerSprites +CreateAreaMarkerSprites: @ 0x0813D7D4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb mov r5, r8 push {r5, r6, r7} ldr r0, _0813D8FC - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0813D900 bl LoadSpritePalette ldr r0, _0813D904 @@ -653426,7 +653426,7 @@ _0813D814: ldrsh r2, [r3, r0] ldr r0, _0813D920 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -653497,10 +653497,10 @@ _0813D918: .4byte gUnknown_857CD6C _0813D91C: .4byte gUnknown_30011FE _0813D920: .4byte gUnknown_85939BC _0813D924: .4byte gUnknown_20205AC - thumb_func_end sub_0813D7D4 + thumb_func_end CreateAreaMarkerSprites - thumb_func_start sub_0813D928 -sub_0813D928: @ 0x0813D928 + thumb_func_start DestroyAreaMarkerSprites +DestroyAreaMarkerSprites: @ 0x0813D928 push {r4, r5, lr} movs r0, #2 bl FreeSpriteTilesByTag @@ -653564,10 +653564,10 @@ _0813D996: bx r0 .align 2, 0 _0813D9A8: .4byte gUnknown_203A848 - thumb_func_end sub_0813D928 + thumb_func_end DestroyAreaMarkerSprites - thumb_func_start sub_0813D9AC -sub_0813D9AC: @ 0x0813D9AC + thumb_func_start LoadAreaUnknownGraphics +LoadAreaUnknownGraphics: @ 0x0813D9AC push {lr} sub sp, #8 ldr r0, _0813D9D8 @@ -653580,7 +653580,7 @@ sub_0813D9AC: @ 0x0813D9AC ldr r0, _0813D9E4 bl LZ77UnCompWram mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0813D9E8 bl LoadSpritePalette add sp, #8 @@ -653592,10 +653592,10 @@ _0813D9DC: .4byte 0x00000FBC _0813D9E0: .4byte 0x00030600 _0813D9E4: .4byte gUnknown_8593ABC _0813D9E8: .4byte gUnknown_8593A74 - thumb_func_end sub_0813D9AC + thumb_func_end LoadAreaUnknownGraphics - thumb_func_start sub_0813D9EC -sub_0813D9EC: @ 0x0813D9EC + thumb_func_start CreateAreaUnknownSprites +CreateAreaUnknownSprites: @ 0x0813D9EC push {r4, r5, r6, lr} ldr r1, _0813DA20 ldr r0, [r1] @@ -653636,7 +653636,7 @@ _0813DA28: ldr r0, _0813DA7C movs r2, #0x8c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -653695,20 +653695,20 @@ _0813DAA8: bx r0 .align 2, 0 _0813DAB0: .4byte gUnknown_203A848 - thumb_func_end sub_0813D9EC + thumb_func_end CreateAreaUnknownSprites thumb_func_start sub_0813DAB4 sub_0813DAB4: @ 0x0813DAB4 push {lr} - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0813DAB4 - thumb_func_start sub_0813DAC4 -sub_0813DAC4: @ 0x0813DAC4 + thumb_func_start Task_BeginEvolutionScene +Task_BeginEvolutionScene: @ 0x0813DAC4 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -653735,7 +653735,7 @@ _0813DAEC: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -653757,12 +653757,12 @@ _0813DB04: ldrb r5, [r6, #0xe] ldrb r6, [r6, #0x1c] adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask adds r0, r7, #0 adds r1, r4, #0 adds r2, r5, #0 adds r3, r6, #0 - bl sub_0813DB90 + bl EvolutionScene _0813DB34: add sp, #4 pop {r4, r5, r6, r7} @@ -653771,10 +653771,10 @@ _0813DB34: .align 2, 0 _0813DB3C: .4byte gUnknown_2037C74 _0813DB40: .4byte gUnknown_2024190 - thumb_func_end sub_0813DAC4 + thumb_func_end Task_BeginEvolutionScene - thumb_func_start sub_0813DB44 -sub_0813DB44: @ 0x0813DB44 + thumb_func_start BeginEvolutionScene +BeginEvolutionScene: @ 0x0813DB44 push {r4, r5, r6, lr} adds r4, r1, #0 adds r5, r2, #0 @@ -653787,7 +653787,7 @@ sub_0813DB44: @ 0x0813DB44 lsrs r6, r6, #0x18 ldr r0, _0813DB84 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0813DB88 @@ -653801,18 +653801,18 @@ sub_0813DB44: @ 0x0813DB44 strh r5, [r1, #0xe] strh r6, [r1, #0x1c] ldr r0, _0813DB8C - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 -_0813DB84: .4byte sub_0813DAC4 +_0813DB84: .4byte Task_BeginEvolutionScene _0813DB88: .4byte gUnknown_3005B60 _0813DB8C: .4byte sub_0813DAB4 - thumb_func_end sub_0813DB44 + thumb_func_end BeginEvolutionScene - thumb_func_start sub_0813DB90 -sub_0813DB90: @ 0x0813DB90 + thumb_func_start EvolutionScene +EvolutionScene: @ 0x0813DB90 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -653832,9 +653832,9 @@ sub_0813DB90: @ 0x0813DB90 lsrs r3, r3, #0x18 str r3, [sp, #0x1c] movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r1, #0 str r1, [sp, #0x14] add r0, sp, #0x14 @@ -653891,24 +653891,24 @@ sub_0813DB90: @ 0x0813DB90 bl sub_08035528 bl sub_080358F8 bl ResetSpriteData - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl FreeAllSpritePalettes ldr r0, _0813DE3C movs r2, #4 strb r2, [r0] movs r0, #0x64 - bl sub_08000BDC + bl AllocZeroed ldr r1, _0813DE40 str r0, [r1] - bl sub_0805EBD8 + bl AllocateMonSpritesGfx adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _0813DE44 mov r1, sp - bl sub_08008828 + bl StringCopy10 ldr r0, _0813DE48 mov r2, sb lsls r1, r2, #1 @@ -653919,17 +653919,17 @@ sub_0813DB90: @ 0x0813DB90 bl StringCopy adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x20] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sl, r0 lsls r0, r5, #3 ldr r1, _0813DE50 @@ -653942,15 +653942,15 @@ sub_0813DB90: @ 0x0813DB90 adds r0, r5, #0 ldr r1, [sp, #0x20] mov r2, sl - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality ldr r0, [r0] movs r1, #0x88 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette adds r0, r5, #0 movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0813DE58 mov r8, r0 ldr r1, _0813DE5C @@ -653958,7 +653958,7 @@ sub_0813DB90: @ 0x0813DB90 movs r1, #0x78 movs r2, #0x40 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r1, _0813DE40 ldr r2, [r1] lsls r1, r0, #0x18 @@ -653998,15 +653998,15 @@ sub_0813DB90: @ 0x0813DB90 mov r0, sb ldr r1, [sp, #0x20] mov r2, sl - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality ldr r0, [r0] movs r1, #0x90 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette mov r0, sb movs r1, #3 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0813DE5C mov r1, r8 str r0, [r1, #0x10] @@ -654014,7 +654014,7 @@ sub_0813DB90: @ 0x0813DB90 movs r1, #0x78 movs r2, #0x40 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r1, _0813DE40 ldr r2, [r1] lsls r1, r0, #0x18 @@ -654037,10 +654037,10 @@ sub_0813DB90: @ 0x0813DB90 movs r2, #4 orrs r0, r2 strb r0, [r1] - bl sub_0817BD38 + bl LoadEvoSparkleSpriteAndPal ldr r0, _0813DE68 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r1, _0813DE40 ldr r2, [r1] lsls r1, r0, #0x18 @@ -654077,12 +654077,12 @@ sub_0813DB90: @ 0x0813DB90 movs r0, #0 bl SetGpuReg ldr r0, _0813DE74 - bl sub_080006FC + bl SetHBlankCallback ldr r0, _0813DE78 - bl sub_080006F0 + bl SetVBlankCallback bl m4aMPlayAllStop ldr r0, _0813DE7C - bl sub_08000540 + bl SetMainCallback2 add sp, #0x24 pop {r3, r4, r5} mov r8, r3 @@ -654113,16 +654113,16 @@ _0813DE58: .4byte gUnknown_2024640 _0813DE5C: .4byte gUnknown_82BF310 _0813DE60: .4byte gUnknown_20205AC _0813DE64: .4byte sub_080394FC -_0813DE68: .4byte sub_0813E638 +_0813DE68: .4byte Task_EvolutionScene _0813DE6C: .4byte gUnknown_3005B60 _0813DE70: .4byte gUnknown_20373F4 _0813DE74: .4byte sub_0813FDA0 _0813DE78: .4byte sub_0813FDA4 _0813DE7C: .4byte sub_0813E4A8 - thumb_func_end sub_0813DB90 + thumb_func_end EvolutionScene - thumb_func_start sub_0813DE80 -sub_0813DE80: @ 0x0813DE80 + thumb_func_start CB2_EvolutionSceneLoadGraphics +CB2_EvolutionSceneLoadGraphics: @ 0x0813DE80 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -654147,16 +654147,16 @@ sub_0813DE80: @ 0x0813DE80 ldrh r5, [r0, #0xc] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov sb, r0 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r4, #0 str r4, [sp, #4] movs r1, #0xc0 @@ -654226,22 +654226,22 @@ sub_0813DE80: @ 0x0813DE80 adds r0, r5, #0 mov r1, sb adds r2, r6, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality ldr r0, [r0] movs r1, #0x90 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette adds r0, r5, #0 movs r1, #3 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0813E058 ldr r1, _0813E05C str r1, [r0, #0x10] movs r1, #0x78 movs r2, #0x40 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite mov r2, r8 ldr r1, [r2] lsls r2, r0, #0x18 @@ -654268,26 +654268,26 @@ sub_0813DE80: @ 0x0813DE80 movs r0, #0 bl SetGpuReg ldr r0, _0813E068 - bl sub_080006FC + bl SetHBlankCallback ldr r0, _0813E06C - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0813E070 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 rsbs r0, r0, #0 str r4, [sp] movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg add sp, #8 pop {r3, r4} mov r8, r3 @@ -654319,10 +654319,10 @@ _0813E064: .4byte sub_080394FC _0813E068: .4byte sub_0813FDA0 _0813E06C: .4byte sub_0813FDA4 _0813E070: .4byte sub_0813E4A8 - thumb_func_end sub_0813DE80 + thumb_func_end CB2_EvolutionSceneLoadGraphics - thumb_func_start sub_0813E074 -sub_0813E074: @ 0x0813E074 + thumb_func_start CB2_TradeEvolutionSceneLoadGraphics +CB2_TradeEvolutionSceneLoadGraphics: @ 0x0813E074 push {r4, r5, r6, lr} sub sp, #0xc ldr r2, _0813E0B0 @@ -654374,9 +654374,9 @@ _0813E0E4: movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes ldr r1, _0813E130 @@ -654416,9 +654416,9 @@ _0813E150: .4byte gUnknown_2022AD6 _0813E154: bl ResetPaletteFade ldr r0, _0813E170 - bl sub_080006FC + bl SetHBlankCallback ldr r0, _0813E174 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _0813E178 movs r3, #0x87 lsls r3, r3, #3 @@ -654443,7 +654443,7 @@ _0813E182: movs r3, #0 bl FillBgTilemapBufferRect movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, _0813E1A8 movs r3, #0x87 lsls r3, r3, #3 @@ -654454,11 +654454,11 @@ _0813E1A8: .4byte gUnknown_3002360 _0813E1AC: adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r0, r6, #3 ldr r1, _0813E1EC @@ -654471,12 +654471,12 @@ _0813E1AC: adds r0, r6, #0 adds r1, r5, #0 adds r2, r4, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality ldr r0, [r0] movs r1, #0x90 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _0813E284 .align 2, 0 _0813E1EC: .4byte gUnknown_82DDA1C @@ -654484,14 +654484,14 @@ _0813E1F0: .4byte gUnknown_2024178 _0813E1F4: adds r0, r6, #0 movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0813E24C ldr r1, _0813E250 str r1, [r0, #0x10] movs r1, #0x78 movs r2, #0x40 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r1, _0813E254 ldr r1, [r1] lsls r2, r0, #0x18 @@ -654534,16 +654534,16 @@ _0813E264: ldrb r0, [r0] cmp r0, #0 beq _0813E278 - bl sub_0800DBB4 + bl LoadWirelessStatusIndicatorSpriteGfx movs r0, #0 movs r1, #0 - bl sub_0800DA80 + bl CreateWirelessStatusIndicatorSprite _0813E278: movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes _0813E284: ldr r1, _0813E298 movs r0, #0x87 @@ -654564,14 +654564,14 @@ _0813E29C: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade bl sub_0807AB9C movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg ldr r0, _0813E2D4 - bl sub_08000540 + bl SetMainCallback2 movs r1, #0x9a lsls r1, r1, #5 movs r0, #0 @@ -654583,10 +654583,10 @@ _0813E2CC: bx r0 .align 2, 0 _0813E2D4: .4byte sub_0813E4C4 - thumb_func_end sub_0813E074 + thumb_func_end CB2_TradeEvolutionSceneLoadGraphics - thumb_func_start sub_0813E2D8 -sub_0813E2D8: @ 0x0813E2D8 + thumb_func_start TradeEvolutionScene +TradeEvolutionScene: @ 0x0813E2D8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -654605,10 +654605,10 @@ sub_0813E2D8: @ 0x0813E2D8 str r3, [sp, #0x14] movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _0813E448 mov r1, sp - bl sub_08008828 + bl StringCopy10 ldr r0, _0813E44C lsls r1, r5, #1 adds r1, r1, r5 @@ -654621,23 +654621,23 @@ sub_0813E2D8: @ 0x0813E2D8 strb r0, [r1] adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r7, r0, #0 adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov sl, r0 ldr r1, _0813E458 mov sb, r1 movs r0, #0x64 - bl sub_08000BDC + bl AllocZeroed mov r2, sb str r0, [r2] movs r4, #0 @@ -654653,22 +654653,22 @@ sub_0813E2D8: @ 0x0813E2D8 adds r0, r5, #0 mov r1, sl adds r2, r7, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality ldr r0, [r0] movs r1, #0x90 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette adds r0, r5, #0 movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0813E464 ldr r1, _0813E468 str r1, [r0, #0x10] movs r1, #0x78 movs r2, #0x40 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite mov r1, sb ldr r2, [r1] lsls r1, r0, #0x18 @@ -654695,10 +654695,10 @@ sub_0813E2D8: @ 0x0813E2D8 movs r2, #4 orrs r0, r2 strb r0, [r1] - bl sub_0817BD38 + bl LoadEvoSparkleSpriteAndPal ldr r0, _0813E474 movs r1, #0 - bl sub_080A8878 + bl CreateTask mov r1, sb ldr r2, [r1] lsls r1, r0, #0x18 @@ -654744,9 +654744,9 @@ sub_0813E2D8: @ 0x0813E2D8 orrs r0, r1 strb r0, [r2] ldr r0, _0813E4A0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0813E4A4 - bl sub_08000540 + bl SetMainCallback2 add sp, #0x18 pop {r3, r4, r5} mov r8, r3 @@ -654780,16 +654780,16 @@ _0813E498: .4byte gUnknown_2022AD6 _0813E49C: .4byte gUnknown_30030B4 _0813E4A0: .4byte sub_0813FE2C _0813E4A4: .4byte sub_0813E4C4 - thumb_func_end sub_0813E2D8 + thumb_func_end TradeEvolutionScene thumb_func_start sub_0813E4A8 sub_0813E4A8: @ 0x0813E4A8 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 @@ -654798,11 +654798,11 @@ sub_0813E4A8: @ 0x0813E4A8 thumb_func_start sub_0813E4C4 sub_0813E4C4: @ 0x0813E4C4 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 @@ -654854,7 +654854,7 @@ _0813E514: adds r2, r1, r7 adds r2, #0xc movs r1, #0xb - bl sub_0806A774 + bl SetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 @@ -654866,25 +654866,25 @@ _0813E514: ldr r1, _0813E634 adds r2, r2, r1 movs r1, #2 - bl sub_0806A774 + bl SetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #8 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r6] muls r0, r5, r0 adds r0, r0, r4 movs r1, #0xa mov r2, sp - bl sub_0806A774 + bl SetMonData movs r4, #0x32 ldr r0, [sp, #4] mov r8, r0 @@ -654897,7 +654897,7 @@ _0813E588: adds r0, r0, r1 adds r1, r4, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r4, #1 cmp r4, #0x36 ble _0813E588 @@ -654911,7 +654911,7 @@ _0813E5A4: adds r0, r0, r5 adds r1, r4, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r4, #1 cmp r4, #0x4f ble _0813E5A4 @@ -654921,7 +654921,7 @@ _0813E5A4: adds r0, r0, r5 movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData movs r0, #0xff str r0, [sp] ldrb r0, [r4] @@ -654929,11 +654929,11 @@ _0813E5A4: adds r0, r0, r5 movs r1, #0x40 mov r2, sp - bl sub_0806A774 + bl SetMonData ldrb r0, [r4] muls r0, r6, r0 adds r0, r0, r5 - bl sub_0806884C + bl CalculateMonStats bl sub_0806B004 ldr r0, _0813E628 mov r4, r8 @@ -654945,13 +654945,13 @@ _0813E5A4: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag ldrh r0, [r4, #0xc] bl sub_0806CF68 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #3 - bl sub_080BFBBC + bl GetSetPokedexFlag _0813E616: add sp, #8 pop {r3, r4, r5} @@ -654968,8 +654968,8 @@ _0813E630: .4byte gUnknown_2024190 _0813E634: .4byte gUnknown_82EA31C thumb_func_end sub_0813E4E0 - thumb_func_start sub_0813E638 -sub_0813E638: @ 0x0813E638 + thumb_func_start Task_EvolutionScene +Task_EvolutionScene: @ 0x0813E638 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -655079,7 +655079,7 @@ _0813E738: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _0813E790 ldr r0, _0813E794 ldr r0, [r0] @@ -655103,13 +655103,13 @@ _0813E738: adds r0, #1 strh r0, [r1, #8] movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl _0813F26C .align 2, 0 _0813E790: .4byte gUnknown_20205AC @@ -655127,7 +655127,7 @@ _0813E7AC: ldr r4, _0813E7D0 ldr r1, _0813E7D4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 bl sub_0814FA04 @@ -655166,7 +655166,7 @@ _0813E808: ldr r0, _0813E830 ldr r0, [r0] ldrb r0, [r0] - bl sub_081402D0 + bl EvoScene_IsMonAnimFinished cmp r0, #0 bne _0813E81A bl _0813F26C @@ -655184,7 +655184,7 @@ _0813E81A: _0813E830: .4byte gUnknown_203A84C _0813E834: .4byte gUnknown_3005B60 _0813E838: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -655192,7 +655192,7 @@ _0813E838: bl _0813F26C _0813E848: ldr r0, _0813E870 - bl sub_080A27D8 + bl PlayNewMapMusic ldr r0, _0813E874 mov r3, r8 adds r1, r3, r7 @@ -655206,7 +655206,7 @@ _0813E848: movs r1, #4 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade bl _0813F26C .align 2, 0 _0813E870: .4byte 0x00000179 @@ -655221,9 +655221,9 @@ _0813E878: bl _0813F26C _0813E888: movs r0, #0 - bl sub_081400C8 + bl InitMovingBackgroundTask movs r0, #0x11 - bl sub_0817BD54 + bl LaunchTask_PreEvoSparklesSet1 ldr r1, _0813E8A8 strb r0, [r1, #2] ldr r0, _0813E8AC @@ -655381,7 +655381,7 @@ _0813E9CA: .align 2, 0 _0813E9DC: .4byte gUnknown_2023FD6 _0813E9E0: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813E9EE @@ -655394,14 +655394,14 @@ _0813E9EE: adds r1, #4 movs r2, #0x60 bl memcpy - bl sub_0814023C + bl OpenPokeblockCaseInBattle movs r0, #0 str r0, [sp] movs r0, #0x1c movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0813EA28 mov r3, r8 adds r1, r3, r7 @@ -655434,7 +655434,7 @@ _0813EA3C: _0813EA50: .4byte gUnknown_2037C74 _0813EA54: .4byte gUnknown_203A84C _0813EA58: - bl sub_080A2F40 + bl IsCryFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0813EA66 @@ -655443,12 +655443,12 @@ _0813EA66: ldr r4, _0813EAD4 ldr r1, _0813EAD8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 bl sub_0814FA04 ldr r0, _0813EADC - bl sub_080A3040 + bl PlayBGM ldr r2, _0813EAE0 mov r3, r8 adds r1, r3, r7 @@ -655461,9 +655461,9 @@ _0813EA66: adds r2, #0xc mov r0, sb movs r1, #0xb - bl sub_0806A774 + bl SetMonData mov r0, sb - bl sub_0806884C + bl CalculateMonStats ldrh r1, [r4, #0xa] ldrh r2, [r4, #0xc] mov r0, sb @@ -655473,13 +655473,13 @@ _0813EA66: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag ldrh r0, [r4, #0xc] bl sub_0806CF68 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #3 - bl sub_080BFBBC + bl GetSetPokedexFlag movs r0, #0xe bl IncrementGameStat b _0813F26C @@ -655503,7 +655503,7 @@ _0813EAF2: adds r4, r0, r1 ldrb r1, [r4, #0x10] mov r0, sb - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r6, r0, #0x10 cmp r6, #0 @@ -655517,8 +655517,8 @@ _0813EAF2: ands r0, r1 cmp r0, #0 bne _0813EB26 - bl sub_080A27F8 - bl sub_080850EC + bl StopMapMusic + bl Overworld_PlaySpecialMapMusic _0813EB26: ldrh r0, [r4, #0xe] movs r1, #0x80 @@ -655529,10 +655529,10 @@ _0813EB26: mov r0, sb movs r1, #2 add r2, sp, #4 - bl sub_0806A058 + bl GetMonData ldr r0, _0813EB54 add r1, sp, #4 - bl sub_08008828 + bl StringCopy10 ldr r0, _0813EB58 cmp r6, r0 bne _0813EB5C @@ -655561,7 +655561,7 @@ _0813EB70: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0813EB8C mov r2, r8 adds r1, r2, r7 @@ -655591,8 +655591,8 @@ _0813EBA4: ands r0, r1 cmp r0, #0 bne _0813EBBE - bl sub_080A27F8 - bl sub_080850EC + bl StopMapMusic + bl Overworld_PlaySpecialMapMusic _0813EBBE: movs r1, #0x1a ldrsh r0, [r4, r1] @@ -655603,16 +655603,16 @@ _0813EBBE: bl sub_0813E4E0 _0813EBCE: adds r0, r7, #0 - bl sub_080A8964 - bl sub_0805ECB0 + bl DestroyTask + bl FreeMonSpritesGfx ldr r4, _0813EBF4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r6, [r4] - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0813EBF8 ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 b _0813F26C .align 2, 0 _0813EBF0: .4byte gUnknown_2037C74 @@ -655637,7 +655637,7 @@ _0813EC10: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade mov r2, r8 adds r1, r2, r7 lsls r1, r1, #3 @@ -655666,7 +655666,7 @@ _0813EC4A: _0813EC58: ldrh r1, [r4, #0xa] _0813EC5A: - bl sub_081402A8 + bl EvoScene_DoMonAnimation _0813EC5E: ldrh r0, [r4, #8] adds r0, #1 @@ -655679,7 +655679,7 @@ _0813EC70: ldr r0, _0813EC9C ldr r0, [r0] ldrb r0, [r0] - bl sub_081402D0 + bl EvoScene_IsMonAnimFinished cmp r0, #0 bne _0813EC80 b _0813F26C @@ -655695,7 +655695,7 @@ _0813EC80: beq _0813ECAC ldr r0, _0813ECA4 ldr r1, _0813ECA8 - bl sub_08008BCC + bl StringExpandPlaceholders b _0813ECB4 .align 2, 0 _0813EC9C: .4byte gUnknown_203A84C @@ -655705,7 +655705,7 @@ _0813ECA8: .4byte gUnknown_85ABB3E _0813ECAC: ldr r0, _0813ECCC ldr r1, _0813ECD0 - bl sub_08008BCC + bl StringExpandPlaceholders _0813ECB4: ldr r0, _0813ECCC movs r1, #0 @@ -655730,7 +655730,7 @@ _0813ECD8: beq _0813ECE6 b _0813F26C _0813ECE6: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813ECF2 @@ -655738,10 +655738,10 @@ _0813ECE6: _0813ECF2: bl BufferMoveToLearnIntoBattleTextBuff2 ldr r0, _0813ED24 - bl sub_080A29AC + bl PlayFanfare ldr r0, _0813ED28 ldr r0, [r0, #0xc] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813ED2C movs r1, #0 bl sub_0814FA04 @@ -655770,7 +655770,7 @@ _0813ED34: beq _0813ED42 b _0813F26C _0813ED42: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813ED4E @@ -655834,7 +655834,7 @@ _0813EDC4: beq _0813EDD2 b _0813F26C _0813EDD2: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813EDDE @@ -655843,7 +655843,7 @@ _0813EDDE: bl BufferMoveToLearnIntoBattleTextBuff2 ldr r0, _0813EE04 ldr r0, [r0, #0x10] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813EE08 movs r1, #0 bl sub_0814FA04 @@ -655867,7 +655867,7 @@ _0813EE10: beq _0813EE1E b _0813F26C _0813EE1E: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813EE2A @@ -655875,7 +655875,7 @@ _0813EE1E: _0813EE2A: ldr r0, _0813EE4C ldr r0, [r0, #0x14] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813EE50 movs r1, #0 bl sub_0814FA04 @@ -655897,13 +655897,13 @@ _0813EE58: lsls r0, r0, #0x10 cmp r0, #0 bne _0813EE96 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813EE96 ldr r0, _0813EEE8 ldr r0, [r0, #0x18] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813EEEC movs r1, #0 bl sub_0814FA04 @@ -655927,7 +655927,7 @@ _0813EE96: beq _0813EEA4 b _0813F26C _0813EEA4: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -655939,7 +655939,7 @@ _0813EEB2: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow ldr r0, _0813EEF4 movs r1, #0xc bl sub_0814FA04 @@ -655955,7 +655955,7 @@ _0813EEB2: ldr r0, _0813EEF8 strb r2, [r0, #1] movs r0, #0 - bl sub_08056784 + bl BattleCreateYesNoCursorAt b _0813F26C .align 2, 0 _0813EEE8: .4byte gUnknown_85AB3DC @@ -655977,10 +655977,10 @@ _0813EEFC: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #0 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0813EF24: ldr r0, _0813EF88 ldrh r1, [r0, #0x2e] @@ -655995,10 +655995,10 @@ _0813EF24: movs r0, #5 bl sub_080A306C ldrb r0, [r4, #1] - bl sub_080567BC + bl BattleDestroyYesNoCursorAt movs r0, #1 strb r0, [r4, #1] - bl sub_08056784 + bl BattleCreateYesNoCursorAt _0813EF4C: ldr r0, _0813EF88 ldrh r1, [r0, #0x2e] @@ -656012,7 +656012,7 @@ _0813EF4C: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow movs r0, #5 bl sub_080A306C ldr r0, _0813EF8C @@ -656049,7 +656049,7 @@ _0813EF94: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0813EFBA: ldr r0, _0813EFF4 ldrh r1, [r0, #0x2e] @@ -656065,7 +656065,7 @@ _0813EFC8: movs r1, #8 movs r2, #0x1d movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow movs r0, #5 bl sub_080A306C ldr r1, _0813EFF0 @@ -656088,7 +656088,7 @@ _0813EFF8: beq _0813F006 b _0813F26C _0813F006: - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0813F03C ldr r1, _0813F040 mov r3, r8 @@ -656115,7 +656115,7 @@ _0813F038: .4byte gUnknown_2037C74 _0813F03C: .4byte gUnknown_2024190 _0813F040: .4byte gUnknown_3005B60 _0813F044: .4byte gUnknown_202418D -_0813F048: .4byte sub_0813DE80 +_0813F048: .4byte CB2_EvolutionSceneLoadGraphics _0813F04C: .4byte gUnknown_2024186 _0813F050: ldr r0, _0813F084 @@ -656152,18 +656152,18 @@ _0813F090: adds r1, r6, #0 adds r1, #0xd mov r0, sb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0806E290 + bl IsHMMove2 cmp r0, #0 beq _0813F0DC ldr r0, _0813F0CC ldr r3, _0813F0D0 adds r0, r0, r3 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813F0D4 movs r1, #0 bl sub_0814FA04 @@ -656195,12 +656195,12 @@ _0813F0DC: lsrs r4, r4, #0x18 mov r0, sb adds r1, r4, #0 - bl sub_0806B46C + bl RemoveMonPPBonus ldr r0, _0813F11C ldrh r1, [r0] mov r0, sb adds r2, r4, #0 - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, _0813F120 mov r3, r8 adds r1, r3, r7 @@ -656219,7 +656219,7 @@ _0813F124: lsls r1, r1, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813F150 movs r1, #0 bl sub_0814FA04 @@ -656243,7 +656243,7 @@ _0813F158: beq _0813F166 b _0813F26C _0813F166: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813F172 @@ -656251,7 +656251,7 @@ _0813F166: _0813F172: ldr r0, _0813F194 ldr r0, [r0, #0x1c] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813F198 movs r1, #0 bl sub_0814FA04 @@ -656273,7 +656273,7 @@ _0813F1A0: lsls r0, r0, #0x10 cmp r0, #0 bne _0813F26C - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813F26C @@ -656282,7 +656282,7 @@ _0813F1A0: lsls r1, r1, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813F1E0 movs r1, #0 bl sub_0814FA04 @@ -656301,7 +656301,7 @@ _0813F1E4: .4byte gUnknown_3005B60 _0813F1E8: ldr r0, _0813F210 ldr r0, [r0, #0x20] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813F214 movs r1, #0 bl sub_0814FA04 @@ -656324,7 +656324,7 @@ _0813F218: .4byte gUnknown_3005B60 _0813F21C: ldr r0, _0813F23C ldr r0, [r0, #0x24] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0813F240 movs r1, #0 bl sub_0814FA04 @@ -656347,7 +656347,7 @@ _0813F248: lsls r0, r0, #0x10 cmp r0, #0 bne _0813F26C - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813F26C @@ -656369,7 +656369,7 @@ _0813F26C: bx r0 .align 2, 0 _0813F27C: .4byte gUnknown_3005B60 - thumb_func_end sub_0813E638 + thumb_func_end Task_EvolutionScene thumb_func_start sub_0813F280 sub_0813F280: @ 0x0813F280 @@ -656434,7 +656434,7 @@ _0813F320: ldr r4, _0813F340 ldr r1, _0813F344 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #1 @@ -656464,12 +656464,12 @@ _0813F35C: adds r4, r4, r0 ldrh r0, [r4, #0xa] movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 b _0813F7AE .align 2, 0 _0813F370: .4byte gUnknown_3005B60 _0813F374: - bl sub_080A2F40 + bl IsCryFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0813F382 @@ -656490,7 +656490,7 @@ _0813F382: _0813F39C: .4byte 0x00000179 _0813F3A0: .4byte gUnknown_3005B60 _0813F3A4: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -656498,7 +656498,7 @@ _0813F3A4: bl _0813FD8C _0813F3B4: ldr r0, _0813F3D4 - bl sub_080A3040 + bl PlayBGM ldr r1, _0813F3D8 lsls r0, r7, #2 adds r0, r0, r7 @@ -656524,7 +656524,7 @@ _0813F3DC: bl _0813FD8C _0813F3EC: movs r0, #1 - bl sub_081400C8 + bl InitMovingBackgroundTask ldr r2, _0813F434 ldr r0, _0813F438 ldr r0, [r0] @@ -656538,7 +656538,7 @@ _0813F3EC: adds r6, r0, #0 adds r6, #0x10 adds r0, r6, #0 - bl sub_0817BD54 + bl LaunchTask_PreEvoSparklesSet1 ldr r1, _0813F43C strb r0, [r1, #2] ldr r1, _0813F440 @@ -656693,7 +656693,7 @@ _0813F552: .align 2, 0 _0813F55C: .4byte gUnknown_2023FD6 _0813F560: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813F56E @@ -656708,7 +656708,7 @@ _0813F56E: lsls r4, r4, #3 adds r4, r4, r1 ldrh r1, [r4, #0xc] - bl sub_081402A8 + bl EvoScene_DoMonAnimation ldr r0, _0813F59C ldr r1, [r5] adds r1, #4 @@ -656720,7 +656720,7 @@ _0813F594: .4byte gUnknown_203A84C _0813F598: .4byte gUnknown_3005B60 _0813F59C: .4byte gUnknown_20373F4 _0813F5A0: - bl sub_080A2F40 + bl IsCryFinished lsls r0, r0, #0x18 cmp r0, #0 bne _0813F5AE @@ -656729,13 +656729,13 @@ _0813F5AE: ldr r4, _0813F61C ldr r1, _0813F620 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #1 bl sub_0807EBE0 ldr r0, _0813F624 - bl sub_080A29AC + bl PlayFanfare ldr r2, _0813F628 lsls r1, r7, #2 adds r1, r1, r7 @@ -656748,9 +656748,9 @@ _0813F5AE: adds r2, #0xc mov r0, sb movs r1, #0xb - bl sub_0806A774 + bl SetMonData mov r0, sb - bl sub_0806884C + bl CalculateMonStats ldrh r1, [r4, #0xa] ldrh r2, [r4, #0xc] mov r0, sb @@ -656760,13 +656760,13 @@ _0813F5AE: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag ldrh r0, [r4, #0xc] bl sub_0806CF68 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #3 - bl sub_080BFBBC + bl GetSetPokedexFlag movs r0, #0xe bl IncrementGameStat b _0813FD8C @@ -656783,7 +656783,7 @@ _0813F62C: beq _0813F63A b _0813FD8C _0813F63A: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -656797,7 +656797,7 @@ _0813F648: adds r5, r0, r1 ldrb r1, [r5, #0x10] mov r0, sb - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r6, r0, #0x10 mov r8, r4 @@ -656816,10 +656816,10 @@ _0813F648: mov r0, sb movs r1, #2 add r2, sp, #0xc - bl sub_0806A058 + bl GetMonData ldr r0, _0813F69C add r1, sp, #0xc - bl sub_08008828 + bl StringCopy10 ldr r0, _0813F6A0 cmp r6, r0 bne _0813F6A4 @@ -656843,7 +656843,7 @@ _0813F6AC: _0813F6B4: .4byte 0x0000FFFE _0813F6B8: ldr r0, _0813F6D4 - bl sub_080A3040 + bl PlayBGM ldr r1, _0813F6D8 movs r0, #0 movs r2, #1 @@ -656868,10 +656868,10 @@ _0813F6E0: b _0813FD8C _0813F6F0: adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask ldr r4, _0813F718 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r2, _0813F71C ldrb r1, [r2] @@ -656881,7 +656881,7 @@ _0813F6F0: strb r0, [r2] ldr r0, _0813F720 ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 b _0813FD8C .align 2, 0 _0813F718: .4byte gUnknown_203A84C @@ -656920,7 +656920,7 @@ _0813F738: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _0813F768: lsls r0, r7, #2 adds r0, r0, r7 @@ -656954,7 +656954,7 @@ _0813F79A: lsls r4, r4, #3 adds r4, r4, r5 ldrh r1, [r4, #0xa] - bl sub_081402A8 + bl EvoScene_DoMonAnimation _0813F7AE: ldrh r0, [r4, #8] adds r0, #1 @@ -656967,7 +656967,7 @@ _0813F7C0: ldr r0, _0813F7F4 ldr r0, [r0] ldrb r0, [r0] - bl sub_081402D0 + bl EvoScene_IsMonAnimFinished cmp r0, #0 bne _0813F7D0 b _0813FD8C @@ -656975,7 +656975,7 @@ _0813F7D0: ldr r4, _0813F7F8 ldr r1, _0813F7FC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 adds r1, r4, #0 movs r2, #1 @@ -657001,7 +657001,7 @@ _0813F804: beq _0813F812 b _0813FD8C _0813F812: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813F81E @@ -657009,10 +657009,10 @@ _0813F812: _0813F81E: bl BufferMoveToLearnIntoBattleTextBuff2 ldr r0, _0813F850 - bl sub_080A29AC + bl PlayFanfare ldr r0, _0813F854 ldr r0, [r0, #0xc] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813F858 movs r0, #0 movs r2, #1 @@ -657042,7 +657042,7 @@ _0813F860: beq _0813F86E b _0813FD8C _0813F86E: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -657107,7 +657107,7 @@ _0813F8F4: beq _0813F902 b _0813FD8C _0813F902: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813F90E @@ -657116,7 +657116,7 @@ _0813F90E: bl BufferMoveToLearnIntoBattleTextBuff2 ldr r0, _0813F934 ldr r0, [r0, #0x10] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813F938 movs r0, #0 movs r2, #1 @@ -657141,7 +657141,7 @@ _0813F940: beq _0813F94E b _0813FD8C _0813F94E: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813F95A @@ -657149,7 +657149,7 @@ _0813F94E: _0813F95A: ldr r0, _0813F97C ldr r0, [r0, #0x14] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813F980 movs r0, #0 movs r2, #1 @@ -657172,13 +657172,13 @@ _0813F988: lsls r0, r0, #0x10 cmp r0, #0 bne _0813F9C8 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813F9C8 ldr r0, _0813FA20 ldr r0, [r0, #0x18] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FA24 movs r0, #0 movs r2, #1 @@ -657203,7 +657203,7 @@ _0813F9C8: beq _0813F9D6 b _0813FD8C _0813F9D6: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -657268,7 +657268,7 @@ _0813FA54: lsls r1, r1, #3 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FAA4 movs r0, #0 movs r2, #1 @@ -657293,7 +657293,7 @@ _0813FA88: _0813FA90: movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0813FD8C .align 2, 0 _0813FA9C: .4byte gUnknown_2023FD6 @@ -657309,7 +657309,7 @@ _0813FAAC: lsls r1, r1, #3 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FAE4 movs r0, #0 movs r2, #1 @@ -657340,18 +657340,18 @@ _0813FAFA: ldrb r0, [r0] cmp r0, #0 beq _0813FB06 - bl sub_0800DB50 + bl DestroyWirelessStatusIndicatorSprite _0813FB06: movs r0, #3 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #1 - bl sub_08002194 - bl sub_08000BF0 + bl GetBgTilemapBuffer + bl Free movs r0, #0 - bl sub_08002194 - bl sub_08000BF0 - bl sub_080034D4 + bl GetBgTilemapBuffer + bl Free + bl FreeAllWindowBuffers ldr r0, _0813FB5C ldr r1, _0813FB60 mov r2, r8 @@ -657379,7 +657379,7 @@ _0813FB58: .4byte gUnknown_300319C _0813FB5C: .4byte gUnknown_2024190 _0813FB60: .4byte gUnknown_3005B60 _0813FB64: .4byte gUnknown_202418D -_0813FB68: .4byte sub_0813E074 +_0813FB68: .4byte CB2_TradeEvolutionSceneLoadGraphics _0813FB6C: .4byte gUnknown_2024186 _0813FB70: ldr r0, _0813FBA4 @@ -657418,18 +657418,18 @@ _0813FBB4: adds r1, r6, #0 adds r1, #0xd mov r0, sb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 - bl sub_0806E290 + bl IsHMMove2 cmp r0, #0 beq _0813FC04 ldr r0, _0813FBF4 ldr r1, _0813FBF8 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FBFC movs r0, #0 movs r2, #1 @@ -657462,18 +657462,18 @@ _0813FC04: lsrs r4, r4, #0x18 mov r0, sb adds r1, r4, #0 - bl sub_0806B46C + bl RemoveMonPPBonus ldr r0, _0813FC5C ldrh r1, [r0] mov r0, sb adds r2, r4, #0 - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, _0813FC60 movs r1, #0xcf lsls r1, r1, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FC64 movs r0, #0 movs r2, #1 @@ -657500,7 +657500,7 @@ _0813FC6C: beq _0813FC7A b _0813FD8C _0813FC7A: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _0813FC86 @@ -657508,7 +657508,7 @@ _0813FC7A: _0813FC86: ldr r0, _0813FCA8 ldr r0, [r0, #0x1c] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FCAC movs r0, #0 movs r2, #1 @@ -657531,7 +657531,7 @@ _0813FCB4: lsls r0, r0, #0x10 cmp r0, #0 bne _0813FD8C - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813FD8C @@ -657540,7 +657540,7 @@ _0813FCB4: lsls r1, r1, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FCF8 movs r0, #0 movs r2, #1 @@ -657560,7 +657560,7 @@ _0813FCFC: .4byte gUnknown_3005B60 _0813FD00: ldr r0, _0813FD2C ldr r0, [r0, #0x20] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FD30 movs r0, #0 movs r2, #1 @@ -657584,7 +657584,7 @@ _0813FD34: .4byte gUnknown_3005B60 _0813FD38: ldr r0, _0813FD5C ldr r0, [r0, #0x24] - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _0813FD60 movs r0, #0 movs r2, #1 @@ -657608,7 +657608,7 @@ _0813FD68: lsls r0, r0, #0x10 cmp r0, #0 bne _0813FD8C - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _0813FD8C @@ -657673,10 +657673,10 @@ sub_0813FDA4: @ 0x0813FDA4 ldrh r1, [r0] movs r0, #0x1e bl SetGpuReg - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -657725,10 +657725,10 @@ sub_0813FE2C: @ 0x0813FE2C ldrh r1, [r0] movs r0, #0x1e bl SetGpuReg - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -657818,7 +657818,7 @@ _0813FF3C: adds r0, r0, r1 movs r1, #0xa0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette strh r5, [r4] ldrh r0, [r4, #2] adds r0, #1 @@ -657830,7 +657830,7 @@ _0813FF54: cmp r0, #4 bne _0813FF62 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0813FF62: pop {r4, r5, r6} pop {r0} @@ -657846,7 +657846,7 @@ sub_0813FF6C: @ 0x0813FF6C lsrs r4, r0, #0x18 ldr r0, _0813FF90 movs r1, #7 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r4, #0 @@ -657950,13 +657950,13 @@ _0813FFF4: adds r0, #0x10 strh r0, [r6] ldr r0, _08140084 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 bne _0814006E adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask mov r0, r8 strh r4, [r0] mov r1, sb @@ -658015,8 +658015,8 @@ _081400C0: .4byte gUnknown_85953F0 _081400C4: .4byte gUnknown_8595485 thumb_func_end InitMovingBgValues - thumb_func_start sub_081400C8 -sub_081400C8: @ 0x081400C8 + thumb_func_start InitMovingBackgroundTask +InitMovingBackgroundTask: @ 0x081400C8 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -658024,7 +658024,7 @@ sub_081400C8: @ 0x081400C8 ldr r4, _081400EC movs r0, #0xc8 lsls r0, r0, #3 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] bl InitMovingBgValues cmp r5, #0 @@ -658041,28 +658041,28 @@ _081400F4: ldr r0, _08140174 movs r1, #0xa0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _08140178 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _0814017C movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r1, _08140180 adds r0, r4, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram adds r0, r4, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram cmp r5, #0 bne _0814018C ldr r1, _08140184 @@ -658078,15 +658078,15 @@ _081400F4: adds r0, r6, #0 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute adds r0, r4, #0 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg b _081401A6 .align 2, 0 _08140174: .4byte gUnknown_8594D50 @@ -658109,7 +658109,7 @@ _0814018C: _081401A6: ldr r0, _081401C4 movs r1, #5 - bl sub_080A8878 + bl CreateTask adds r0, r5, #0 bl sub_0813FF6C add sp, #4 @@ -658120,13 +658120,13 @@ _081401A6: _081401BC: .4byte 0x00000842 _081401C0: .4byte 0x00000808 _081401C4: .4byte sub_0813FEB4 - thumb_func_end sub_081400C8 + thumb_func_end InitMovingBackgroundTask thumb_func_start sub_081401C8 sub_081401C8: @ 0x081401C8 push {lr} ldr r0, _081401F4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -658142,7 +658142,7 @@ _081401E6: movs r0, #0 movs r1, #0xa0 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette pop {r0} bx r0 .align 2, 0 @@ -658154,26 +658154,26 @@ _081401F8: .4byte gUnknown_3005B60 sub_081401FC: @ 0x081401FC push {lr} ldr r0, _08140234 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _08140210 - bl sub_080A8964 + bl DestroyTask _08140210: ldr r0, _08140238 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _08140222 - bl sub_080A8964 + bl DestroyTask _08140222: movs r0, #0 movs r1, #0xa0 movs r2, #0x20 - bl sub_080A1238 - bl sub_0814023C + bl FillPalette + bl OpenPokeblockCaseInBattle pop {r0} bx r0 .align 2, 0 @@ -658181,8 +658181,8 @@ _08140234: .4byte sub_0813FEB4 _08140238: .4byte sub_0813FFB0 thumb_func_end sub_081401FC - thumb_func_start sub_0814023C -sub_0814023C: @ 0x0814023C + thumb_func_start OpenPokeblockCaseInBattle +OpenPokeblockCaseInBattle: @ 0x0814023C push {lr} movs r0, #0x50 movs r1, #0 @@ -658202,7 +658202,7 @@ sub_0814023C: @ 0x0814023C lsrs r2, r2, #0x18 movs r0, #1 movs r1, #7 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #5 bl sub_08038E94 @@ -658211,14 +658211,14 @@ sub_0814023C: @ 0x0814023C lsrs r2, r2, #0x18 movs r0, #2 movs r1, #7 - bl sub_08001B70 + bl SetBgAttribute movs r1, #0xca lsls r1, r1, #5 movs r0, #0 bl SetGpuReg ldr r0, _081402A4 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 @@ -658226,10 +658226,10 @@ _08140298: .4byte gUnknown_2022ACC _0814029C: .4byte gUnknown_2022ACE _081402A0: .4byte gUnknown_2022AD0 _081402A4: .4byte gUnknown_203A850 - thumb_func_end sub_0814023C + thumb_func_end OpenPokeblockCaseInBattle - thumb_func_start sub_081402A8 -sub_081402A8: @ 0x081402A8 + thumb_func_start EvoScene_DoMonAnimation +EvoScene_DoMonAnimation: @ 0x081402A8 push {lr} adds r2, r0, #0 lsls r2, r2, #0x18 @@ -658243,15 +658243,15 @@ sub_081402A8: @ 0x081402A8 adds r0, r0, r2 movs r2, #0 movs r3, #0 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation pop {r0} bx r0 .align 2, 0 _081402CC: .4byte gUnknown_20205AC - thumb_func_end sub_081402A8 + thumb_func_end EvoScene_DoMonAnimation - thumb_func_start sub_081402D0 -sub_081402D0: @ 0x081402D0 + thumb_func_start EvoScene_IsMonAnimFinished +EvoScene_IsMonAnimFinished: @ 0x081402D0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -658276,13 +658276,13 @@ _081402FA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081402D0 + thumb_func_end EvoScene_IsMonAnimFinished thumb_func_start sub_08140300 sub_08140300: @ 0x08140300 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer ldr r0, _08140328 ldr r0, [r0] @@ -658304,8 +658304,8 @@ _08140328: .4byte gUnknown_203A854 sub_0814032C: @ 0x0814032C push {r4, lr} sub sp, #4 - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer bl sub_081428DC ldr r4, _081403A0 @@ -658366,9 +658366,9 @@ _081403B4: movs r0, #0 movs r1, #1 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute movs r0, #0 - bl sub_08001B48 + bl ShowBg ldr r1, _081403E0 ldr r2, [r4] movs r3, #0xcf @@ -658407,9 +658407,9 @@ _08140410: movs r0, #0 movs r1, #1 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #0 - bl sub_08001B48 + bl ShowBg mov r1, sp movs r0, #0 strh r0, [r1] @@ -658444,7 +658444,7 @@ sub_08140450: @ 0x08140450 ldr r4, _081404C0 movs r0, #0xe6 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -658457,25 +658457,25 @@ sub_08140450: @ 0x08140450 lsls r0, r0, #1 adds r1, r1, r0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r2, _081404C8 adds r1, r1, r2 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081404CC adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _081404D0 - bl sub_08003090 + bl InitWindows bl sub_08196DF4 ldr r0, _081404D4 strb r5, [r0] ldr r0, _081404D8 mov r1, sp - bl sub_08199858 + bl malloc_and_decompress ldr r1, [r4] ldr r2, _081404DC adds r1, r1, r2 @@ -658503,18 +658503,18 @@ sub_081404E0: @ 0x081404E0 ldr r4, _08140534 adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] adds r0, r0, r4 movs r4, #0 str r4, [r0] - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r0, [r5] @@ -658523,7 +658523,7 @@ sub_081404E0: @ 0x081404E0 movs r1, #0 bl memset ldr r0, [r5] - bl sub_08000BF0 + bl Free str r4, [r5] pop {r4, r5} pop {r0} @@ -658661,7 +658661,7 @@ _08140634: ldr r1, _08140670 adds r0, r0, r1 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0x98 lsls r0, r0, #1 @@ -658734,11 +658734,11 @@ _081406BC: @ jump table .4byte _08140842 @ case 8 _081406E0: movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 - bl sub_08121E58 - bl sub_08121D90 - bl sub_08121E00 + bl SetVBlankCallback + bl ScanlineEffect_Stop + bl SetVBlankHBlankCallbacksToNull + bl ResetVramOamAndBgCntRegs + bl ResetAllBgsCoordinates b _081408C0 _081406F8: bl sub_08140450 @@ -658756,7 +658756,7 @@ _08140714: .4byte 0x0000060A _08140718: bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl reset_temp_tile_data_buffers b _081408C0 _0814072A: @@ -658764,27 +658764,27 @@ _0814072A: movs r2, #0xe0 lsls r2, r2, #1 movs r1, #0 - bl sub_080A1200 + bl LoadPalette ldr r1, _0814075C movs r4, #0 str r4, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _08140760 str r4, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _081408C0 .align 2, 0 _08140758: .4byte gUnknown_85957A8 _0814075C: .4byte gUnknown_8DBC590 _08140760: .4byte gUnknown_8DBCCBC _08140764: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _08140770 @@ -658795,7 +658795,7 @@ _08140770: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer b _081408C0 .align 2, 0 _08140784: .4byte gUnknown_8595B4C @@ -658810,7 +658810,7 @@ _08140788: bl sub_081432B0 b _081408C0 _081407A8: - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl GetCoins lsls r0, r0, #0x10 @@ -658839,7 +658839,7 @@ _081407A8: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08140810 movs r2, #0x3c rsbs r2, r2, #0 @@ -658859,31 +658859,31 @@ _08140818: movs r0, #0 bl SetGpuReg movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg b _081408C0 _08140842: movs r0, #1 bl EnableInterrupts ldr r0, _081408A8 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 str r0, [sp] movs r0, #0xff movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A2078 + bl BeginHardwarePaletteFade ldr r0, _081408AC movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r5, _081408B0 ldr r1, [r5] adds r1, #0xa4 @@ -658902,15 +658902,15 @@ _08140842: bl GetCoins lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080EE9A4 + bl AlertTVThatPlayerPlayedRoulette ldr r0, _081408B8 movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r1, [r5] adds r1, #0xa5 strb r0, [r1] ldr r0, _081408BC - bl sub_08000540 + bl SetMainCallback2 b _081408CE .align 2, 0 _081408A8: .4byte sub_0814032C @@ -658977,7 +658977,7 @@ _08140922: adds r4, r6, #0 ldr r0, [r4] ldrh r0, [r0, #0x24] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, [r4] @@ -659020,7 +659020,7 @@ sub_08140970: @ 0x08140970 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -659087,7 +659087,7 @@ sub_081409DC: @ 0x081409DC bl AddTextPrinterParameterized ldrb r0, [r5] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08140A2C adds r0, r4, #0 bl DoYesNoFuncWithChoice @@ -659135,7 +659135,7 @@ sub_08140A5C: @ 0x08140A5C ldr r0, [r0] adds r0, #0xa5 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask adds r0, r4, #0 bl sub_08141EAC pop {r4} @@ -660969,12 +660969,12 @@ sub_081418C8: @ 0x081418C8 blt _0814192C cmp r0, #2 bgt _0814192C - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _08141950 movs r0, #0x1d - bl sub_08084180 + bl GetGameStat ldrh r1, [r4, #0x1e] adds r1, #1 strh r1, [r4, #0x1e] @@ -660998,7 +660998,7 @@ _08141920: .4byte gUnknown_3005B60 _08141924: .4byte sub_08141AE0 _08141928: .4byte 0x0000FFFF _0814192C: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -661048,7 +661048,7 @@ sub_08141964: @ 0x08141964 cmp r0, #0xc bne _081419B4 ldr r0, _081419A8 - bl sub_080A29AC + bl PlayFanfare ldr r4, _081419AC ldrb r0, [r4] movs r1, #0 @@ -661064,7 +661064,7 @@ _081419B0: .4byte gUnknown_8262D6C _081419B4: movs r0, #0xc3 lsls r0, r0, #1 - bl sub_080A29AC + bl PlayFanfare ldr r4, _081419E8 ldrb r0, [r4] movs r1, #0 @@ -661083,7 +661083,7 @@ _081419CA: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _08141A20 .align 2, 0 _081419E8: .4byte gUnknown_203A858 @@ -661108,7 +661108,7 @@ _081419F0: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08141A20: ldr r1, _08141A44 lsls r0, r5, #2 @@ -661237,7 +661237,7 @@ sub_08141AE0: @ 0x08141AE0 mov r8, r2 ldr r1, _08141B7C mov r0, r8 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r5, _08141B80 ldrb r0, [r5] movs r1, #0 @@ -661255,7 +661255,7 @@ sub_08141AE0: @ 0x08141AE0 bl AddTextPrinterParameterized ldrb r0, [r5] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram mov r1, sb ldr r0, [r1] ldrb r1, [r0, #0x19] @@ -661464,7 +661464,7 @@ _08141C78: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08141D1C b _08141D56 .align 2, 0 @@ -661475,7 +661475,7 @@ _08141D0C: .4byte 0xFFFFFC00 _08141D10: .4byte 0x000003FF _08141D14: .4byte gUnknown_203A858 _08141D18: .4byte gUnknown_8262DB0 -_08141D1C: .4byte sub_08141DD4 +_08141D1C: .4byte dp01t_12_3_battle_menu _08141D20: movs r0, #0x22 ldrsh r1, [r2, r0] @@ -661499,7 +661499,7 @@ _08141D20: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08141D70 _08141D56: ldr r2, _08141D74 @@ -661537,7 +661537,7 @@ _08141D84: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08141DD0 adds r0, r6, #0 movs r2, #0x3c @@ -661556,8 +661556,8 @@ _08141DCC: .4byte gUnknown_8262D96 _08141DD0: .4byte sub_08140A5C thumb_func_end sub_08141C20 - thumb_func_start sub_08141DD4 -sub_08141DD4: @ 0x08141DD4 + thumb_func_start dp01t_12_3_battle_menu +dp01t_12_3_battle_menu: @ 0x08141DD4 push {r4, r5, r6, r7, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -661627,7 +661627,7 @@ _08141E0C: bl AddTextPrinterParameterized ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08141E94 ldr r2, _08141E98 adds r0, r5, #0 @@ -661653,7 +661653,7 @@ _08141EA0: bx r0 .align 2, 0 _08141EA8: .4byte sub_081409DC - thumb_func_end sub_08141DD4 + thumb_func_end dp01t_12_3_battle_menu thumb_func_start sub_08141EAC sub_08141EAC: @ 0x08141EAC @@ -661699,14 +661699,14 @@ _08141F04: bl GetCoins lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080EE898 + bl AlertTVOfNewCoinTotal movs r0, #0 str r0, [sp] movs r0, #0xff movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A2078 + bl BeginHardwarePaletteFade ldr r1, _08141F3C lsls r0, r5, #2 adds r0, r0, r5 @@ -661729,19 +661729,19 @@ sub_08141F44: @ 0x08141F44 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 bne _08141FA6 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _08141FAC ldr r0, _08141FB0 strh r4, [r0] strh r4, [r1] - bl sub_08121D90 - bl sub_08121E00 + bl ResetVramOamAndBgCntRegs + bl ResetAllBgsCoordinates movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -661759,9 +661759,9 @@ sub_08141F44: @ 0x08141F44 ldr r0, _08141FB8 str r0, [r1] ldr r0, _08141FBC - bl sub_08000540 + bl SetMainCallback2 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08141FA6: pop {r4, r5} pop {r0} @@ -661770,7 +661770,7 @@ _08141FA6: _08141FAC: .4byte gUnknown_2021B38 _08141FB0: .4byte gUnknown_2021B3A _08141FB4: .4byte gUnknown_3005B0C -_08141FB8: .4byte sub_080AEA64 +_08141FB8: .4byte FieldCallback_ReturnToEventScript2 _08141FBC: .4byte sub_08085A30 thumb_func_end sub_08141F44 @@ -663065,11 +663065,11 @@ sub_081429AC: @ 0x081429AC cmp r0, #0 bne _081429D0 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081429DC - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081429D0: pop {r4} pop {r0} @@ -663089,15 +663089,15 @@ sub_081429E0: @ 0x081429E0 movs r0, #0 movs r1, #1 bl sub_08197060 - bl sub_08145CD4 - bl sub_080034D4 + bl HideCoinsWindow + bl FreeAllWindowBuffers movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _08142A38 ldrb r1, [r2, #8] lsls r1, r1, #0x1a @@ -663108,7 +663108,7 @@ sub_081429E0: @ 0x081429E0 ands r0, r3 orrs r0, r1 strb r0, [r2, #4] - bl sub_080A12E4 + bl UpdatePaletteFade ldr r1, _08142A3C lsls r0, r4, #2 adds r0, r0, r4 @@ -663135,10 +663135,10 @@ sub_08142A44: @ 0x08142A44 movs r0, #0 movs r1, #0 bl sub_08197060 - bl sub_08145CD4 + bl HideCoinsWindow bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 @@ -663166,13 +663166,13 @@ sub_08142A68: @ 0x08142A68 ldr r1, _08142AB4 movs r0, #1 strh r0, [r1] - bl sub_08145CD4 + bl HideCoinsWindow movs r0, #0 movs r1, #1 bl sub_08197060 bl sub_080987E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08142AA6: pop {r4} pop {r0} @@ -663212,7 +663212,7 @@ sub_08142AB8: @ 0x08142AB8 ldr r4, _08142B40 ldr r1, _08142B44 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 movs r1, #0 bl sub_08196FF0 @@ -663228,7 +663228,7 @@ sub_08142AB8: @ 0x08142AB8 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08142B48 lsls r0, r5, #2 adds r0, r0, r5 @@ -663312,7 +663312,7 @@ sub_08142B50: @ 0x08142B50 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08142BEC str r0, [r6] b _08142C7A @@ -663327,7 +663327,7 @@ _08142BF0: ldr r4, _08142C30 ldr r1, _08142C34 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 movs r1, #0 bl sub_08196FF0 @@ -663343,7 +663343,7 @@ _08142BF0: bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08142C38 lsls r0, r5, #2 adds r0, r0, r5 @@ -663361,7 +663361,7 @@ _08142C40: ldr r5, _08142C88 ldr r1, _08142C8C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 movs r1, #0 bl sub_08196FF0 @@ -663378,7 +663378,7 @@ _08142C40: bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08142C90 str r0, [r6] strh r4, [r6, #0x22] @@ -663396,8 +663396,8 @@ _08142C8C: .4byte gUnknown_8262D18 _08142C90: .4byte sub_08142A68 thumb_func_end sub_08142B50 - thumb_func_start sub_08142C94 -sub_08142C94: @ 0x08142C94 + thumb_func_start PlayRoulette +PlayRoulette: @ 0x08142C94 push {r4, lr} bl sub_080987DC bl GetCoins @@ -663408,7 +663408,7 @@ sub_08142C94: @ 0x08142C94 bl sub_08145C6C ldr r0, _08142CD0 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -663425,7 +663425,7 @@ sub_08142C94: @ 0x08142C94 .align 2, 0 _08142CD0: .4byte sub_08142B50 _08142CD4: .4byte gUnknown_3005B60 - thumb_func_end sub_08142C94 + thumb_func_end PlayRoulette thumb_func_start sub_08142CD8 sub_08142CD8: @ 0x08142CD8 @@ -663437,11 +663437,11 @@ sub_08142CD8: @ 0x08142CD8 ldr r0, _08142D00 bl LoadSpritePalettes ldr r0, _08142D04 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08142D08 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08142D0C - bl sub_08034388 + bl LoadCompressedSpriteSheet b _08142D26 .align 2, 0 _08142D00: .4byte gUnknown_8596F38 @@ -663473,7 +663473,7 @@ sub_08142D2C: @ 0x08142D2C ldrb r3, [r1] movs r1, #0x74 movs r2, #0x50 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r5, r0, #0 @@ -663539,7 +663539,7 @@ sub_08142D9C: @ 0x08142D9C orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet ldr r4, _08142EF0 ldr r0, [r4] adds r1, r5, #0 @@ -663550,7 +663550,7 @@ sub_08142D9C: @ 0x08142D9C ldrh r0, [r4, #6] strh r0, [r6, #6] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet movs r6, #0 ldr r0, _08142EF4 mov r8, r0 @@ -663571,7 +663571,7 @@ _08142DF0: adds r2, r4, #0 adds r2, #0x5c movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r1, _08142EFC ldr r1, [r1] adds r2, r5, #0 @@ -663622,7 +663622,7 @@ _08142E52: asrs r1, r1, #0x10 movs r2, #0x46 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r1, _08142EFC ldr r1, [r1] adds r1, r1, r6 @@ -663657,7 +663657,7 @@ _08142E98: asrs r2, r2, #0x10 movs r1, #0x7e movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r1, _08142EFC ldr r1, [r1] adds r1, r1, r6 @@ -663696,8 +663696,8 @@ _08142F00: .4byte gUnknown_85970BC _08142F04: .4byte gUnknown_859711C thumb_func_end sub_08142D9C - thumb_func_start sub_08142F08 -sub_08142F08: @ 0x08142F08 + thumb_func_start unref_sub_8142E3C +unref_sub_8142E3C: @ 0x08142F08 push {r4, lr} movs r4, #0 _08142F0C: @@ -663723,7 +663723,7 @@ _08142F0C: .align 2, 0 _08142F34: .4byte gUnknown_203A854 _08142F38: .4byte gUnknown_20205AC - thumb_func_end sub_08142F08 + thumb_func_end unref_sub_8142E3C thumb_func_start sub_08142F3C sub_08142F3C: @ 0x08142F3C @@ -663879,7 +663879,7 @@ _08143058: movs r1, #0x74 movs r2, #0x14 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] adds r3, r5, #0 adds r3, #0x31 @@ -664196,7 +664196,7 @@ sub_081432B0: @ 0x081432B0 ldrh r1, [r4, #4] orrs r1, r2 str r1, [r0, #4] - bl sub_08008210 + bl LoadSpriteSheet movs r1, #0xf mov r0, sp strh r1, [r0] @@ -664278,7 +664278,7 @@ sub_0814334C: @ 0x0814334C lsrs r4, r0, #0x10 _0814336E: adds r0, r4, #0 - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r4, #0 @@ -664363,7 +664363,7 @@ _081433EE: orrs r0, r2 str r0, [r6, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -664373,7 +664373,7 @@ _081433EE: movs r1, #0xd0 movs r2, #0x10 movs r3, #4 - bl sub_08006B0C + bl CreateSprite ldr r3, _081435C8 ldr r1, [r3] adds r1, #0x50 @@ -664402,7 +664402,7 @@ _08143458: ldr r0, _081435D0 movs r2, #0x18 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] adds r3, r5, #0 adds r3, #0x15 @@ -664444,7 +664444,7 @@ _08143458: movs r1, #0x78 movs r2, #0x44 movs r3, #4 - bl sub_08006B0C + bl CreateSprite ldr r2, _081435C8 ldr r1, [r2] adds r1, #0x55 @@ -664473,7 +664473,7 @@ _081434E8: ldr r0, _081435D8 movs r2, #0x24 movs r3, #4 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r2, r5, #0 adds r2, #0x1a @@ -664517,7 +664517,7 @@ _081434E8: movs r1, #0x98 movs r2, #0x60 movs r3, #9 - bl sub_08006B0C + bl CreateSprite ldr r3, _081435C8 ldr r1, [r3] adds r1, #0x6c @@ -665120,12 +665120,12 @@ sub_081439E8: @ 0x081439E8 orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _08143A5C movs r1, #0x74 movs r2, #0x50 movs r3, #0x51 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08143A60 @@ -665202,7 +665202,7 @@ _08143A9C: ldr r0, _08143B08 movs r1, #0x74 movs r2, #0x50 - bl sub_08006B0C + bl CreateSprite ldr r1, [r5] adds r1, #0x3c adds r1, r1, r4 @@ -665495,7 +665495,7 @@ _08143CB6: bl __fixsfsi strh r0, [r7, #0x36] ldrh r0, [r7, #0x34] - bl sub_0806EFF4 + bl Sin2 adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -665516,7 +665516,7 @@ _08143CB6: muls r0, r1, r0 asrs r0, r0, #0xc strh r0, [r7, #0x26] - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _08143D40 @@ -665565,7 +665565,7 @@ sub_08143D5C: @ 0x08143D5C strh r0, [r5, #0x34] _08143D7A: ldrh r0, [r5, #0x34] - bl sub_0806EFF4 + bl Sin2 adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -666176,8 +666176,8 @@ _08144268: _08144270: .4byte sub_081441F4 thumb_func_end sub_08144234 - thumb_func_start sub_08144274 -sub_08144274: @ 0x08144274 + thumb_func_start prev_quest_read_x24_hm_usage +prev_quest_read_x24_hm_usage: @ 0x08144274 push {r4, r5, lr} adds r5, r0, #0 bl sub_08143C50 @@ -666264,7 +666264,7 @@ _08144328: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08144274 + thumb_func_end prev_quest_read_x24_hm_usage thumb_func_start sub_08144330 sub_08144330: @ 0x08144330 @@ -666469,7 +666469,7 @@ _081444C4: .align 2, 0 _081444D0: .4byte 0xBFC00000 _081444D4: .4byte 0x3DAE147B -_081444D8: .4byte sub_08144274 +_081444D8: .4byte prev_quest_read_x24_hm_usage thumb_func_end sub_08144330 thumb_func_start sub_081444DC @@ -666824,7 +666824,7 @@ sub_081447A8: @ 0x081447A8 rsbs r2, r2, #0 movs r1, #0x24 movs r3, #0x32 - bl sub_08006B0C + bl CreateSprite ldr r1, [r5] adds r1, #0x73 strb r0, [r1] @@ -666844,7 +666844,7 @@ sub_081447A8: @ 0x081447A8 ldrsh r2, [r0, r3] adds r0, r4, #0 movs r3, #0x3b - bl sub_08006B0C + bl CreateSprite ldr r1, [r5] adds r1, #0x74 strb r0, [r1] @@ -666853,7 +666853,7 @@ sub_081447A8: @ 0x081447A8 movs r1, #0x24 movs r2, #0x8c movs r3, #0x33 - bl sub_08006B0C + bl CreateSprite ldr r1, [r5] adds r1, #0x75 strb r0, [r1] @@ -667065,7 +667065,7 @@ sub_08144984: @ 0x08144984 movs r3, #0 ldrsh r2, [r2, r3] movs r3, #0x32 - bl sub_08006B0C + bl CreateSprite ldr r5, _08144AE0 ldr r1, [r5] adds r1, #0x73 @@ -667094,7 +667094,7 @@ sub_08144984: @ 0x08144984 movs r3, #0 ldrsh r2, [r4, r3] movs r3, #0x33 - bl sub_08006B0C + bl CreateSprite ldr r1, [r5] adds r1, #0x74 strb r0, [r1] @@ -667326,7 +667326,7 @@ _08144BB8: lsls r0, r0, #1 movs r1, #0x3f rsbs r1, r1, #0 - bl sub_080A2B3C + bl PlayCry1 b _08144C3C .align 2, 0 _08144BDC: .4byte gUnknown_203A854 @@ -667367,14 +667367,14 @@ _08144C24: movs r0, #0x98 lsls r0, r0, #1 movs r1, #0x3f - bl sub_080A2B3C + bl PlayCry1 b _08144C3C _08144C30: movs r0, #0x99 lsls r0, r0, #1 movs r1, #0x3f rsbs r1, r1, #0 - bl sub_080A2B3C + bl PlayCry1 _08144C3C: movs r0, #2 mov sl, r0 @@ -668113,7 +668113,7 @@ sub_081451A4: @ 0x081451A4 ldrh r2, [r4, #0x20] adds r0, r0, r2 strh r0, [r4, #0x20] - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 beq _081452D4 @@ -668198,7 +668198,7 @@ _08145288: movs r0, #0x98 lsls r0, r0, #1 movs r1, #0x3f - bl sub_080A2B3C + bl PlayCry1 b _081452B8 .align 2, 0 _081452A8: .4byte gUnknown_203A854 @@ -668207,7 +668207,7 @@ _081452AC: lsls r0, r0, #1 movs r1, #0x3f rsbs r1, r1, #0 - bl sub_080A2B3C + bl PlayCry1 _081452B8: ldr r0, _081452DC ldr r0, [r0] @@ -668423,12 +668423,12 @@ _0814544E: cmp r0, #0 bne _0814546A movs r0, #0x1c - bl sub_08000BDC + bl AllocZeroed str r0, [r5] ldr r4, _081454BC adds r0, r7, #0 movs r1, #7 - bl sub_0800401C + bl GetWindowAttribute str r0, [r4] _0814546A: ldr r1, [r5] @@ -668461,7 +668461,7 @@ _0814549E: ldr r1, _081454C0 movs r2, #0x20 adds r3, r4, #0 - bl sub_08003AC0 + bl CopyToWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -668509,7 +668509,7 @@ _08145500: ldrb r1, [r6, #3] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #1 mov r8, r0 _08145516: @@ -668575,7 +668575,7 @@ _08145584: _0814558E: cmp r0, #8 bls _081455B2 - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -668650,7 +668650,7 @@ sub_08145600: @ 0x08145600 bne _0814564E movs r0, #4 strb r0, [r1, #0x1b] - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -668814,7 +668814,7 @@ _0814574A: adds r0, r6, #0 ldr r1, _08145770 movs r2, #0x20 - bl sub_08003AC0 + bl CopyToWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -669010,7 +669010,7 @@ sub_081458E0: @ 0x081458E0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 thumb_func_end sub_081458E0 @@ -669026,13 +669026,13 @@ sub_081458F0: @ 0x081458F0 cmp r2, #0 bne _08145914 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r4, #0x10 asrs r1, r1, #8 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX _08145914: pop {r4} pop {r0} @@ -669065,19 +669065,19 @@ _08145940: cmp r0, #0 bne _08145950 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] _08145950: ldr r1, _08145974 adds r0, r7, #0 movs r2, #0 movs r3, #0 - bl sub_08003AC0 + bl CopyToWindowPixelBuffer ldr r0, _08145978 ldrb r1, [r4, #3] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r6] adds r0, #1 strb r0, [r6] @@ -669105,7 +669105,7 @@ _0814597C: adds r2, r2, r3 asrs r2, r2, #0x10 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r2, _081459DC ldr r3, [r2] lsls r0, r0, #0x18 @@ -669160,11 +669160,11 @@ sub_081459E0: @ 0x081459E0 bl DestroySprite ldr r4, _08145A34 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r5, #0 str r5, [r4] ldr r0, [r6] - bl sub_08000BF0 + bl Free str r5, [r6] pop {r4, r5, r6} pop {r0} @@ -669446,7 +669446,7 @@ sub_08145C20: @ 0x08145C20 ldr r4, _08145C60 ldr r1, _08145C64 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r0, _08145C68 ldrb r0, [r0] movs r1, #2 @@ -669495,19 +669495,19 @@ sub_08145C6C: @ 0x08145C6C bl SetWindowTemplateFields ldr r4, _08145CD0 add r0, sp, #0x10 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r2, #0x85 lsls r2, r2, #2 movs r1, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette adds r0, r5, #0 bl sub_08145C20 add sp, #0x18 @@ -669518,21 +669518,21 @@ sub_08145C6C: @ 0x08145C6C _08145CD0: .4byte gUnknown_203A868 thumb_func_end sub_08145C6C - thumb_func_start sub_08145CD4 -sub_08145CD4: @ 0x08145CD4 + thumb_func_start HideCoinsWindow +HideCoinsWindow: @ 0x08145CD4 push {r4, lr} ldr r4, _08145CEC ldrb r0, [r4] movs r1, #1 bl sub_08197060 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 _08145CEC: .4byte gUnknown_203A868 - thumb_func_end sub_08145CD4 + thumb_func_end HideCoinsWindow thumb_func_start GetCoins GetCoins: @ 0x08145CF0 @@ -669643,8 +669643,8 @@ _08145DAE: bx r1 thumb_func_end TakeCoins - thumb_func_start sub_08145DB4 -sub_08145DB4: @ 0x08145DB4 + thumb_func_start GetLandmarkName +GetLandmarkName: @ 0x08145DB4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -669652,7 +669652,7 @@ sub_08145DB4: @ 0x08145DB4 lsrs r1, r1, #0x18 lsls r2, r2, #0x18 lsrs r5, r2, #0x18 - bl sub_08145E08 + bl GetLandmarks adds r4, r0, #0 cmp r4, #0 bne _08145DD0 @@ -669692,10 +669692,10 @@ _08145E02: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08145DB4 + thumb_func_end GetLandmarkName - thumb_func_start sub_08145E08 -sub_08145E08: @ 0x08145E08 + thumb_func_start GetLandmarks +GetLandmarks: @ 0x08145E08 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -669764,13 +669764,13 @@ _08145E7A: bx r1 .align 2, 0 _08145E80: .4byte gUnknown_8598C68 - thumb_func_end sub_08145E08 + thumb_func_end GetLandmarks - thumb_func_start sub_08145E84 -sub_08145E84: @ 0x08145E84 + thumb_func_start SetUpFieldMove_Strength +SetUpFieldMove_Strength: @ 0x08145E84 push {r4, lr} movs r0, #0x57 - bl sub_08135478 + bl CheckObjectGraphicsInFrontOfPlayer lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -669779,7 +669779,7 @@ sub_08145E84: @ 0x08145E84 b _08145EB2 _08145E98: ldr r4, _08145EB8 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -669797,15 +669797,15 @@ _08145EB2: .align 2, 0 _08145EB8: .4byte gUnknown_2037290 _08145EBC: .4byte gUnknown_3005B10 -_08145EC0: .4byte sub_081B53D8 +_08145EC0: .4byte FieldCallback_PrepareFadeInFromMenu _08145EC4: .4byte gUnknown_203CBB8 -_08145EC8: .4byte sub_08145ECC - thumb_func_end sub_08145E84 +_08145EC8: .4byte FldEff_UseStrength + thumb_func_end SetUpFieldMove_Strength - thumb_func_start sub_08145ECC -sub_08145ECC: @ 0x08145ECC + thumb_func_start FldEff_UseStrength +FldEff_UseStrength: @ 0x08145ECC push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _08145EE4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -669817,12 +669817,12 @@ sub_08145ECC: @ 0x08145ECC .align 2, 0 _08145EE4: .4byte gUnknown_20388A8 _08145EE8: .4byte gUnknown_8256797 - thumb_func_end sub_08145ECC + thumb_func_end FldEff_UseStrength thumb_func_start sub_08145EEC sub_08145EEC: @ 0x08145EEC push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08145F20 @@ -669841,30 +669841,30 @@ sub_08145EEC: @ 0x08145EEC ldr r1, _08145F2C adds r0, r0, r1 ldr r1, _08145F30 - bl sub_081B1814 + bl GetMonNickname movs r0, #0 pop {r1} bx r1 .align 2, 0 _08145F20: .4byte gUnknown_3005B60 -_08145F24: .4byte sub_08145F34 +_08145F24: .4byte CoordEventWeather_Clouds _08145F28: .4byte gUnknown_20388A8 _08145F2C: .4byte gUnknown_2024190 _08145F30: .4byte gUnknown_2021C40 thumb_func_end sub_08145EEC - thumb_func_start sub_08145F34 -sub_08145F34: @ 0x08145F34 + thumb_func_start CoordEventWeather_Clouds +CoordEventWeather_Clouds: @ 0x08145F34 push {lr} movs r0, #0x28 bl FieldEffectActiveListRemove - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 - thumb_func_end sub_08145F34 + thumb_func_end CoordEventWeather_Clouds - thumb_func_start sub_08145F44 -sub_08145F44: @ 0x08145F44 + thumb_func_start CB2_TestBattleTransition +CB2_TestBattleTransition: @ 0x08145F44 push {r4, lr} ldr r4, _08145F54 ldrb r0, [r4] @@ -669878,7 +669878,7 @@ _08145F54: .4byte gUnknown_300120B _08145F58: ldr r0, _08145F68 ldrb r0, [r0] - bl sub_0814602C + bl LaunchBattleTransitionTask ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -669886,39 +669886,39 @@ _08145F58: .align 2, 0 _08145F68: .4byte gUnknown_300120A _08145F6C: - bl sub_08145FE0 + bl IsBattleTransitionDone lsls r0, r0, #0x18 cmp r0, #0 beq _08145F80 movs r0, #0 strb r0, [r4] ldr r0, _08145F98 - bl sub_08000540 + bl SetMainCallback2 _08145F80: - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r4} pop {r0} bx r0 .align 2, 0 _08145F98: .4byte sub_08085A30 - thumb_func_end sub_08145F44 + thumb_func_end CB2_TestBattleTransition - thumb_func_start sub_08145F9C -sub_08145F9C: @ 0x08145F9C + thumb_func_start TestBattleTransition +TestBattleTransition: @ 0x08145F9C push {lr} ldr r1, _08145FAC strb r0, [r1] ldr r0, _08145FB0 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _08145FAC: .4byte gUnknown_300120A -_08145FB0: .4byte sub_08145F44 - thumb_func_end sub_08145F9C +_08145FB0: .4byte CB2_TestBattleTransition + thumb_func_end TestBattleTransition thumb_func_start BattleTransition_StartOnField BattleTransition_StartOnField: @ 0x08145FB4 @@ -669928,30 +669928,30 @@ BattleTransition_StartOnField: @ 0x08145FB4 ldr r2, _08145FC8 ldr r1, _08145FCC str r1, [r2, #4] - bl sub_0814602C + bl LaunchBattleTransitionTask pop {r0} bx r0 .align 2, 0 _08145FC8: .4byte gUnknown_3002360 -_08145FCC: .4byte sub_080857B8 +_08145FCC: .4byte CB2_OverworldBasic thumb_func_end BattleTransition_StartOnField - thumb_func_start sub_08145FD0 -sub_08145FD0: @ 0x08145FD0 + thumb_func_start BattleTransition_Start +BattleTransition_Start: @ 0x08145FD0 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0814602C + bl LaunchBattleTransitionTask pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08145FD0 + thumb_func_end BattleTransition_Start - thumb_func_start sub_08145FE0 -sub_08145FE0: @ 0x08145FE0 + thumb_func_start IsBattleTransitionDone +IsBattleTransitionDone: @ 0x08145FE0 push {r4, lr} ldr r0, _08146004 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _08146008 @@ -669970,10 +669970,10 @@ _08146004: .4byte sub_08146068 _08146008: .4byte gUnknown_3005B60 _0814600C: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r4, _08146028 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] movs r0, #1 @@ -669983,17 +669983,17 @@ _08146020: bx r1 .align 2, 0 _08146028: .4byte gUnknown_203A86C - thumb_func_end sub_08145FE0 + thumb_func_end IsBattleTransitionDone - thumb_func_start sub_0814602C -sub_0814602C: @ 0x0814602C + thumb_func_start LaunchBattleTransitionTask +LaunchBattleTransitionTask: @ 0x0814602C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _0814605C movs r1, #2 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08146060 @@ -670004,7 +670004,7 @@ sub_0814602C: @ 0x0814602C strh r4, [r1, #0xa] ldr r4, _08146064 movs r0, #0x3c - bl sub_08000BDC + bl AllocZeroed str r0, [r4] pop {r4} pop {r0} @@ -670013,7 +670013,7 @@ sub_0814602C: @ 0x0814602C _0814605C: .4byte sub_08146068 _08146060: .4byte gUnknown_3005B60 _08146064: .4byte gUnknown_203A86C - thumb_func_end sub_0814602C + thumb_func_end LaunchBattleTransitionTask thumb_func_start sub_08146068 sub_08146068: @ 0x08146068 @@ -670045,8 +670045,8 @@ _08146098: .4byte gUnknown_85A8548 _0814609C: .4byte gUnknown_3005B60 thumb_func_end sub_08146068 - thumb_func_start sub_081460A0 -sub_081460A0: @ 0x081460A0 + thumb_func_start Transition_Phase1 +Transition_Phase1: @ 0x081460A0 push {r4, lr} adds r4, r0, #0 bl sub_080ABCCC @@ -670073,7 +670073,7 @@ _081460D4: .4byte 0x04000100 _081460D8: .4byte gUnknown_85A83F8 _081460DC: movs r1, #4 - bl sub_080A8878 + bl CreateTask ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -670082,10 +670082,10 @@ _081460EA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081460A0 + thumb_func_end Transition_Phase1 - thumb_func_start sub_081460F0 -sub_081460F0: @ 0x081460F0 + thumb_func_start Transition_WaitForPhase1 +Transition_WaitForPhase1: @ 0x081460F0 push {r4, lr} adds r4, r0, #0 ldr r1, _08146110 @@ -670094,7 +670094,7 @@ sub_081460F0: @ 0x081460F0 lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -670113,10 +670113,10 @@ _0814611C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081460F0 + thumb_func_end Transition_WaitForPhase1 - thumb_func_start sub_08146124 -sub_08146124: @ 0x08146124 + thumb_func_start Transition_Phase2 +Transition_Phase2: @ 0x08146124 push {r4, lr} adds r4, r0, #0 ldr r1, _08146148 @@ -670126,7 +670126,7 @@ sub_08146124: @ 0x08146124 adds r0, r0, r1 ldr r0, [r0] movs r1, #0 - bl sub_080A8878 + bl CreateTask ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -670136,10 +670136,10 @@ sub_08146124: @ 0x08146124 bx r1 .align 2, 0 _08146148: .4byte gUnknown_85A84A0 - thumb_func_end sub_08146124 + thumb_func_end Transition_Phase2 - thumb_func_start sub_0814614C -sub_0814614C: @ 0x0814614C + thumb_func_start Transition_WaitForPhase2 +Transition_WaitForPhase2: @ 0x0814614C push {r4, lr} adds r4, r0, #0 movs r0, #0 @@ -670150,7 +670150,7 @@ sub_0814614C: @ 0x0814614C lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -670164,10 +670164,10 @@ _08146170: bx r1 .align 2, 0 _08146178: .4byte gUnknown_85A84A0 - thumb_func_end sub_0814614C + thumb_func_end Transition_WaitForPhase2 - thumb_func_start sub_0814617C -sub_0814617C: @ 0x0814617C + thumb_func_start Phase1Task_TransitionAll +Phase1Task_TransitionAll: @ 0x0814617C push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -670196,18 +670196,18 @@ sub_0814617C: @ 0x0814617C .align 2, 0 _081461B0: .4byte gUnknown_3005B60 _081461B4: - bl sub_08149E9C + bl IsPhase1Done lsls r0, r0, #0x18 cmp r0, #0 beq _081461C4 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081461C4: add sp, #4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_0814617C + thumb_func_end Phase1Task_TransitionAll thumb_func_start sub_081461CC sub_081461CC: @ 0x081461CC @@ -670239,8 +670239,8 @@ _081461FC: .4byte gUnknown_85A8558 _08146200: .4byte gUnknown_3005B60 thumb_func_end sub_081461CC - thumb_func_start sub_08146204 -sub_08146204: @ 0x08146204 + thumb_func_start Phase2_Blur_Func1 +Phase2_Blur_Func1: @ 0x08146204 push {r4, lr} adds r4, r0, #0 movs r0, #0x4c @@ -670248,13 +670248,13 @@ sub_08146204: @ 0x08146204 bl SetGpuReg movs r0, #0xa movs r1, #0x40 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0xc movs r1, #0x40 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0xe movs r1, #0x40 - bl sub_08001200 + bl SetGpuRegBits ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -670263,10 +670263,10 @@ sub_08146204: @ 0x08146204 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08146204 + thumb_func_end Phase2_Blur_Func1 - thumb_func_start sub_08146238 -sub_08146238: @ 0x08146238 + thumb_func_start Phase2_Blur_Func2 +Phase2_Blur_Func2: @ 0x08146238 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -670294,7 +670294,7 @@ _0814624E: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _08146270: ldrh r1, [r4, #0xc] movs r0, #0xf @@ -670316,10 +670316,10 @@ _0814628E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08146238 + thumb_func_end Phase2_Blur_Func2 - thumb_func_start sub_08146298 -sub_08146298: @ 0x08146298 + thumb_func_start Phase2_Blur_Func3 +Phase2_Blur_Func3: @ 0x08146298 push {lr} ldr r0, _081462BC ldrb r1, [r0, #7] @@ -670328,10 +670328,10 @@ sub_08146298: @ 0x08146298 cmp r0, #0 bne _081462B4 ldr r0, _081462C0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081462B4: movs r0, #0 pop {r1} @@ -670339,7 +670339,7 @@ _081462B4: .align 2, 0 _081462BC: .4byte gUnknown_2037C74 _081462C0: .4byte sub_081461CC - thumb_func_end sub_08146298 + thumb_func_end Phase2_Blur_Func3 thumb_func_start sub_081462C4 sub_081462C4: @ 0x081462C4 @@ -670371,13 +670371,13 @@ _081462F4: .4byte gUnknown_85A8564 _081462F8: .4byte gUnknown_3005B60 thumb_func_end sub_081462C4 - thumb_func_start sub_081462FC -sub_081462FC: @ 0x081462FC + thumb_func_start Phase2_Swirl_Func1 +Phase2_Swirl_Func1: @ 0x081462FC push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear movs r0, #1 rsbs r0, r0, #0 movs r4, #0 @@ -670385,7 +670385,7 @@ sub_081462FC: @ 0x081462FC movs r1, #4 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08146358 ldr r1, _0814635C ldr r1, [r1] @@ -670398,9 +670398,9 @@ sub_081462FC: @ 0x081462FC movs r3, #2 bl sub_0814A058 ldr r0, _08146360 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08146364 - bl sub_080006FC + bl SetHBlankCallback movs r0, #3 bl EnableInterrupts ldrh r0, [r5, #8] @@ -670416,10 +670416,10 @@ _08146358: .4byte gUnknown_2039048 _0814635C: .4byte gUnknown_203A86C _08146360: .4byte VBlankCB_Phase2_Swirl _08146364: .4byte sub_08146418 - thumb_func_end sub_081462FC + thumb_func_end Phase2_Swirl_Func1 - thumb_func_start sub_08146368 -sub_08146368: @ 0x08146368 + thumb_func_start Phase2_Swirl_Func2 +Phase2_Swirl_Func2: @ 0x08146368 push {r4, r5, lr} sub sp, #8 ldr r4, _081463D0 @@ -670454,10 +670454,10 @@ sub_08146368: @ 0x08146368 cmp r0, #0 bne _081463BA ldr r0, _081463DC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081463BA: ldr r0, [r4] ldrb r1, [r0] @@ -670474,12 +670474,12 @@ _081463D0: .4byte gUnknown_203A86C _081463D4: .4byte gUnknown_20388C8 _081463D8: .4byte gUnknown_2037C74 _081463DC: .4byte sub_081462C4 - thumb_func_end sub_08146368 + thumb_func_end Phase2_Swirl_Func2 thumb_func_start VBlankCB_Phase2_Swirl VBlankCB_Phase2_Swirl: @ 0x081463E0 push {lr} - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r0, _08146408 ldr r0, [r0] ldrb r0, [r0] @@ -670559,13 +670559,13 @@ _08146474: .4byte gUnknown_85A856C _08146478: .4byte gUnknown_3005B60 thumb_func_end sub_08146444 - thumb_func_start sub_0814647C -sub_0814647C: @ 0x0814647C + thumb_func_start Phase2_Shuffle_Func1 +Phase2_Shuffle_Func1: @ 0x0814647C push {r4, lr} sub sp, #4 adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear movs r0, #1 rsbs r0, r0, #0 movs r1, #0 @@ -670573,7 +670573,7 @@ sub_0814647C: @ 0x0814647C movs r1, #4 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081464D0 ldr r1, [r0] ldr r0, _081464D4 @@ -670583,9 +670583,9 @@ sub_0814647C: @ 0x0814647C lsls r2, r2, #1 bl memset ldr r0, _081464D8 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081464DC - bl sub_080006FC + bl SetHBlankCallback movs r0, #3 bl EnableInterrupts ldrh r0, [r4, #8] @@ -670601,10 +670601,10 @@ _081464D0: .4byte gUnknown_203A86C _081464D4: .4byte gUnknown_2039048 _081464D8: .4byte VBlankCB_Phase2_Shuffle _081464DC: .4byte sub_081465A8 - thumb_func_end sub_0814647C + thumb_func_end Phase2_Shuffle_Func1 - thumb_func_start sub_081464E0 -sub_081464E0: @ 0x081464E0 + thumb_func_start Phase2_Shuffle_Func2 +Phase2_Shuffle_Func2: @ 0x081464E0 push {r4, r5, r6, r7, lr} ldr r1, _08146560 ldr r2, [r1] @@ -670654,10 +670654,10 @@ _08146508: cmp r0, #0 bne _0814654E ldr r0, _0814656C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0814654E: ldr r0, [r6] ldrb r1, [r0] @@ -670673,12 +670673,12 @@ _08146560: .4byte gUnknown_203A86C _08146564: .4byte gUnknown_20388C8 _08146568: .4byte gUnknown_2037C74 _0814656C: .4byte sub_08146444 - thumb_func_end sub_081464E0 + thumb_func_end Phase2_Shuffle_Func2 thumb_func_start VBlankCB_Phase2_Shuffle VBlankCB_Phase2_Shuffle: @ 0x08146570 push {lr} - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r0, _08146598 ldr r0, [r0] ldrb r0, [r0] @@ -670943,7 +670943,7 @@ sub_0814675C: @ 0x0814675C push {r4, lr} adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear movs r1, #0 movs r0, #0x10 strh r0, [r4, #0xa] @@ -670980,7 +670980,7 @@ _081467A2: cmp r1, #0 bge _081467A2 ldr r0, _081467C8 - bl sub_080006F0 + bl SetVBlankCallback pop {r4} pop {r0} bx r0 @@ -670992,8 +670992,8 @@ _081467C4: .4byte 0x000008BE _081467C8: .4byte VBlankCB0_Phase2_BigPokeball thumb_func_end sub_0814675C - thumb_func_start sub_081467CC -sub_081467CC: @ 0x081467CC + thumb_func_start Phase2_Aqua_Func1 +Phase2_Aqua_Func1: @ 0x081467CC push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -671016,7 +671016,7 @@ sub_081467CC: @ 0x081467CC ldr r0, _0814681C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -671029,10 +671029,10 @@ sub_081467CC: @ 0x081467CC _08146814: .4byte 0x01000400 _08146818: .4byte gUnknown_859A980 _0814681C: .4byte gUnknown_859A960 - thumb_func_end sub_081467CC + thumb_func_end Phase2_Aqua_Func1 - thumb_func_start sub_08146820 -sub_08146820: @ 0x08146820 + thumb_func_start Phase2_Magma_Func1 +Phase2_Magma_Func1: @ 0x08146820 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -671055,7 +671055,7 @@ sub_08146820: @ 0x08146820 ldr r0, _08146870 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -671068,10 +671068,10 @@ sub_08146820: @ 0x08146820 _08146868: .4byte 0x01000400 _0814686C: .4byte gUnknown_859AF54 _08146870: .4byte gUnknown_859A960 - thumb_func_end sub_08146820 + thumb_func_end Phase2_Magma_Func1 - thumb_func_start sub_08146874 -sub_08146874: @ 0x08146874 + thumb_func_start Phase2_Regi_Func1 +Phase2_Regi_Func1: @ 0x08146874 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -671104,10 +671104,10 @@ sub_08146874: @ 0x08146874 .align 2, 0 _081468B8: .4byte 0x01000400 _081468BC: .4byte gUnknown_859B6C4 - thumb_func_end sub_08146874 + thumb_func_end Phase2_Regi_Func1 - thumb_func_start sub_081468C0 -sub_081468C0: @ 0x081468C0 + thumb_func_start Phase2_BigPokeball_Func1 +Phase2_BigPokeball_Func1: @ 0x081468C0 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -671130,7 +671130,7 @@ sub_081468C0: @ 0x081468C0 ldr r0, _08146910 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -671143,7 +671143,7 @@ sub_081468C0: @ 0x081468C0 _08146908: .4byte 0x01000400 _0814690C: .4byte gUnknown_8598DE0 _08146910: .4byte gUnknown_85A8984 - thumb_func_end sub_081468C0 + thumb_func_end Phase2_BigPokeball_Func1 thumb_func_start Phase2_BigPokeball_Func2 Phase2_BigPokeball_Func2: @ 0x08146914 @@ -671220,8 +671220,8 @@ _0814699C: .4byte gUnknown_85A8AD0 _081469A0: .4byte gUnknown_20388C8 thumb_func_end Phase2_BigPokeball_Func2 - thumb_func_start sub_081469A4 -sub_081469A4: @ 0x081469A4 + thumb_func_start Phase2_Aqua_Func2 +Phase2_Aqua_Func2: @ 0x081469A4 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -671253,10 +671253,10 @@ sub_081469A4: @ 0x081469A4 .align 2, 0 _081469E4: .4byte gUnknown_859ACF8 _081469E8: .4byte gUnknown_20388C8 - thumb_func_end sub_081469A4 + thumb_func_end Phase2_Aqua_Func2 - thumb_func_start sub_081469EC -sub_081469EC: @ 0x081469EC + thumb_func_start Phase2_Magma_Func2 +Phase2_Magma_Func2: @ 0x081469EC push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -671288,10 +671288,10 @@ sub_081469EC: @ 0x081469EC .align 2, 0 _08146A2C: .4byte gUnknown_859B3E0 _08146A30: .4byte gUnknown_20388C8 - thumb_func_end sub_081469EC + thumb_func_end Phase2_Magma_Func2 - thumb_func_start sub_08146A34 -sub_08146A34: @ 0x08146A34 + thumb_func_start Phase2_Regice_Func2 +Phase2_Regice_Func2: @ 0x08146A34 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -671301,7 +671301,7 @@ sub_08146A34: @ 0x08146A34 ldr r0, _08146A80 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08146A84 ldr r1, [sp, #8] movs r2, #0xa0 @@ -671330,10 +671330,10 @@ sub_08146A34: @ 0x08146A34 _08146A80: .4byte gUnknown_859BD64 _08146A84: .4byte gUnknown_859BDC4 _08146A88: .4byte gUnknown_20388C8 - thumb_func_end sub_08146A34 + thumb_func_end Phase2_Regice_Func2 - thumb_func_start sub_08146A8C -sub_08146A8C: @ 0x08146A8C + thumb_func_start Phase2_Registeel_Func2 +Phase2_Registeel_Func2: @ 0x08146A8C push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -671343,7 +671343,7 @@ sub_08146A8C: @ 0x08146A8C ldr r0, _08146AD8 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08146ADC ldr r1, [sp, #8] movs r2, #0xa0 @@ -671372,10 +671372,10 @@ sub_08146A8C: @ 0x08146A8C _08146AD8: .4byte gUnknown_859BD84 _08146ADC: .4byte gUnknown_859C5C4 _08146AE0: .4byte gUnknown_20388C8 - thumb_func_end sub_08146A8C + thumb_func_end Phase2_Registeel_Func2 - thumb_func_start sub_08146AE4 -sub_08146AE4: @ 0x08146AE4 + thumb_func_start Phase2_Regirock_Func2 +Phase2_Regirock_Func2: @ 0x08146AE4 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -671385,7 +671385,7 @@ sub_08146AE4: @ 0x08146AE4 ldr r0, _08146B30 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08146B34 ldr r1, [sp, #8] movs r2, #0xa0 @@ -671414,10 +671414,10 @@ sub_08146AE4: @ 0x08146AE4 _08146B30: .4byte gUnknown_859BDA4 _08146B34: .4byte gUnknown_859CDC4 _08146B38: .4byte gUnknown_20388C8 - thumb_func_end sub_08146AE4 + thumb_func_end Phase2_Regirock_Func2 - thumb_func_start sub_08146B3C -sub_08146B3C: @ 0x08146B3C + thumb_func_start Phase2_Kyogre_Func3 +Phase2_Kyogre_Func3: @ 0x08146B3C push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -671449,10 +671449,10 @@ sub_08146B3C: @ 0x08146B3C _08146B7C: .4byte 0x01000400 _08146B80: .4byte gUnknown_859D5E4 _08146B84: .4byte gUnknown_859DC98 - thumb_func_end sub_08146B3C + thumb_func_end Phase2_Kyogre_Func3 - thumb_func_start sub_08146B88 -sub_08146B88: @ 0x08146B88 + thumb_func_start Phase2_Kyogre_Func4 +Phase2_Kyogre_Func4: @ 0x08146B88 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa @@ -671476,7 +671476,7 @@ sub_08146B88: @ 0x08146B88 adds r0, r0, r1 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _08146BC0: ldrh r0, [r4, #0xa] adds r0, #1 @@ -671497,7 +671497,7 @@ _08146BD8: bx r1 .align 2, 0 _08146BE0: .4byte gUnknown_859E850 - thumb_func_end sub_08146B88 + thumb_func_end Phase2_Kyogre_Func4 thumb_func_start sub_08146BE4 sub_08146BE4: @ 0x08146BE4 @@ -671520,7 +671520,7 @@ sub_08146BE4: @ 0x08146BE4 adds r0, r0, r1 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _08146C12: ldrh r0, [r4, #0xa] adds r0, #1 @@ -671556,7 +671556,7 @@ sub_08146C3C: @ 0x08146C3C movs r1, #1 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -671569,8 +671569,8 @@ sub_08146C3C: @ 0x08146C3C _08146C64: .4byte 0xFFFF8000 thumb_func_end sub_08146C3C - thumb_func_start sub_08146C68 -sub_08146C68: @ 0x08146C68 + thumb_func_start Phase2_WeatherDuo_Func7 +Phase2_WeatherDuo_Func7: @ 0x08146C68 push {r4, lr} adds r4, r0, #0 ldr r0, _08146CA8 @@ -671591,10 +671591,10 @@ sub_08146C68: @ 0x08146C68 ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _08146C9E: movs r0, #0 pop {r4} @@ -671605,7 +671605,7 @@ _08146CA8: .4byte gUnknown_2037C74 _08146CAC: .4byte 0x040000B0 _08146CB0: .4byte 0x0000C5FF _08146CB4: .4byte 0x00007FFF - thumb_func_end sub_08146C68 + thumb_func_end Phase2_WeatherDuo_Func7 thumb_func_start Phase2_BigPokeball_Func3 Phase2_BigPokeball_Func3: @ 0x08146CB8 @@ -671849,7 +671849,7 @@ sub_08146E6C: @ 0x08146E6C movs r1, #1 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -671883,8 +671883,8 @@ _08146EAE: _08146EB4: .4byte gUnknown_2037C74 thumb_func_end Phase2_WaitPaletteFade - thumb_func_start sub_08146EB8 -sub_08146EB8: @ 0x08146EB8 + thumb_func_start Phase2_BigPokeball_Func6 +Phase2_BigPokeball_Func6: @ 0x08146EB8 push {r4, lr} adds r4, r0, #0 ldr r0, _08146F38 @@ -671928,7 +671928,7 @@ _08146EF4: cmp r0, #0 bne _08146F50 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _08146F44 ldrh r2, [r1, #0xa] ldr r0, _08146F48 @@ -671941,10 +671941,10 @@ _08146EF4: ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _08146F70 .align 2, 0 _08146F38: .4byte gUnknown_203A86C @@ -671962,7 +671962,7 @@ _08146F50: adds r0, r1, #1 strh r0, [r4, #0xe] ldr r0, _08146F78 - bl sub_080006F0 + bl SetVBlankCallback _08146F64: ldr r0, _08146F7C ldr r1, [r0] @@ -671978,7 +671978,7 @@ _08146F70: .align 2, 0 _08146F78: .4byte VBlankCB1_Phase2_BigPokeball _08146F7C: .4byte gUnknown_203A86C - thumb_func_end sub_08146EB8 + thumb_func_end Phase2_BigPokeball_Func6 thumb_func_start Transition_BigPokeball_Vblank Transition_BigPokeball_Vblank: @ 0x08146F80 @@ -671993,7 +671993,7 @@ Transition_BigPokeball_Vblank: @ 0x08146F80 ands r0, r2 strh r0, [r1, #0xa] ldrh r0, [r1, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r2, _08146FE8 ldr r0, [r2] ldrb r0, [r0] @@ -672111,8 +672111,8 @@ _08147084: .4byte gUnknown_85A862C _08147088: .4byte gUnknown_3005B60 thumb_func_end sub_08147054 - thumb_func_start sub_0814708C -sub_0814708C: @ 0x0814708C + thumb_func_start Phase2_PokeballsTrail_Func1 +Phase2_PokeballsTrail_Func1: @ 0x0814708C push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -672132,7 +672132,7 @@ sub_0814708C: @ 0x0814708C ldr r0, _081470D4 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -672145,10 +672145,10 @@ sub_0814708C: @ 0x0814708C _081470CC: .4byte gUnknown_8599360 _081470D0: .4byte 0x05000200 _081470D4: .4byte gUnknown_85A8984 - thumb_func_end sub_0814708C + thumb_func_end Phase2_PokeballsTrail_Func1 - thumb_func_start sub_081470D8 -sub_081470D8: @ 0x081470D8 + thumb_func_start Phase2_PokeballsTrail_Func2 +Phase2_PokeballsTrail_Func2: @ 0x081470D8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -672189,7 +672189,7 @@ _08147106: ldrsh r0, [r0, r1] str r0, [r6, #0xc] movs r0, #0x2d - bl sub_080B5270 + bl FieldEffectStart adds r4, #1 lsls r4, r4, #0x10 movs r0, #1 @@ -672214,10 +672214,10 @@ _08147106: _08147158: .4byte gUnknown_85A8638 _0814715C: .4byte gUnknown_85A863C _08147160: .4byte gUnknown_20388A8 - thumb_func_end sub_081470D8 + thumb_func_end Phase2_PokeballsTrail_Func2 - thumb_func_start sub_08147164 -sub_08147164: @ 0x08147164 + thumb_func_start Phase2_PokeballsTrail_Func3 +Phase2_PokeballsTrail_Func3: @ 0x08147164 push {lr} movs r0, #0x2d bl FieldEffectActiveListContains @@ -672226,20 +672226,20 @@ sub_08147164: @ 0x08147164 bne _08147184 bl sub_0814A044 ldr r0, _0814718C - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _08147184: movs r0, #0 pop {r1} bx r1 .align 2, 0 _0814718C: .4byte sub_08147054 - thumb_func_end sub_08147164 + thumb_func_end Phase2_PokeballsTrail_Func3 - thumb_func_start sub_08147190 -sub_08147190: @ 0x08147190 + thumb_func_start FldEff_Pokeball +FldEff_Pokeball: @ 0x08147190 push {r4, r5, lr} ldr r0, _081471EC ldr r5, _081471F0 @@ -672248,7 +672248,7 @@ sub_08147190: @ 0x08147190 movs r3, #4 ldrsh r2, [r5, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081471F4 @@ -672288,10 +672288,10 @@ _081471EC: .4byte gUnknown_85A8918 _081471F0: .4byte gUnknown_20388A8 _081471F4: .4byte gUnknown_20205AC _081471F8: .4byte 0x0000FFFF - thumb_func_end sub_08147190 + thumb_func_end FldEff_Pokeball - thumb_func_start sub_081471FC -sub_081471FC: @ 0x081471FC + thumb_func_start berry_fix_gpu_set +berry_fix_gpu_set: @ 0x081471FC push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 @@ -672391,7 +672391,7 @@ _081472B2: .align 2, 0 _081472BC: .4byte 0x04000008 _081472C0: .4byte 0x0000F001 - thumb_func_end sub_081471FC + thumb_func_end berry_fix_gpu_set thumb_func_start sub_081472C4 sub_081472C4: @ 0x081472C4 @@ -672423,12 +672423,12 @@ _081472F4: .4byte gUnknown_85A864C _081472F8: .4byte gUnknown_3005B60 thumb_func_end sub_081472C4 - thumb_func_start sub_081472FC -sub_081472FC: @ 0x081472FC + thumb_func_start Phase2_Clockwise_BlackFade_Func1 +Phase2_Clockwise_BlackFade_Func1: @ 0x081472FC push {r4, lr} adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _08147350 ldr r1, [r0] movs r0, #0 @@ -672452,7 +672452,7 @@ _08147322: cmp r1, #0x9f bls _08147322 ldr r0, _08147360 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08147350 ldr r1, [r0] movs r0, #0x78 @@ -672470,7 +672470,7 @@ _08147354: .4byte 0x0000F0F1 _08147358: .4byte gUnknown_2039048 _0814735C: .4byte 0x0000F3F4 _08147360: .4byte VBlankCB_Phase2_Clockwise_BlackFade - thumb_func_end sub_081472FC + thumb_func_end Phase2_Clockwise_BlackFade_Func1 thumb_func_start Phase2_Clockwise_BlackFade_Func2 Phase2_Clockwise_BlackFade_Func2: @ 0x08147364 @@ -672547,8 +672547,8 @@ _081473EC: .4byte gUnknown_203A86C _081473F0: .4byte gUnknown_20388C8 thumb_func_end Phase2_Clockwise_BlackFade_Func2 - thumb_func_start sub_081473F4 -sub_081473F4: @ 0x081473F4 + thumb_func_start Phase2_Clockwise_BlackFade_Func3 +Phase2_Clockwise_BlackFade_Func3: @ 0x081473F4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -672672,7 +672672,7 @@ _081474C6: bx r1 .align 2, 0 _081474E4: .4byte gUnknown_203A86C - thumb_func_end sub_081473F4 + thumb_func_end Phase2_Clockwise_BlackFade_Func3 thumb_func_start Phase2_Clockwise_BlackFade_Func4 Phase2_Clockwise_BlackFade_Func4: @ 0x081474E8 @@ -672745,8 +672745,8 @@ _08147568: .4byte gUnknown_203A86C _0814756C: .4byte gUnknown_20388C8 thumb_func_end Phase2_Clockwise_BlackFade_Func4 - thumb_func_start sub_08147570 -sub_08147570: @ 0x08147570 + thumb_func_start Phase2_Clockwise_BlackFade_Func5 +Phase2_Clockwise_BlackFade_Func5: @ 0x08147570 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -672876,7 +672876,7 @@ _08147648: .align 2, 0 _08147668: .4byte gUnknown_20388C8 _0814766C: .4byte gUnknown_203A86C - thumb_func_end sub_08147570 + thumb_func_end Phase2_Clockwise_BlackFade_Func5 thumb_func_start Phase2_Clockwise_BlackFade_Func6 Phase2_Clockwise_BlackFade_Func6: @ 0x08147670 @@ -672957,8 +672957,8 @@ _08147700: .4byte gUnknown_203A86C _08147704: .4byte gUnknown_20388C8 thumb_func_end Phase2_Clockwise_BlackFade_Func6 - thumb_func_start sub_08147708 -sub_08147708: @ 0x08147708 + thumb_func_start Phase2_Clockwise_BlackFade_Func7 +Phase2_Clockwise_BlackFade_Func7: @ 0x08147708 push {lr} ldr r1, _08147738 ldrh r2, [r1, #0xa] @@ -672972,10 +672972,10 @@ sub_08147708: @ 0x08147708 ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, _08147744 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 @@ -672984,7 +672984,7 @@ _08147738: .4byte 0x040000B0 _0814773C: .4byte 0x0000C5FF _08147740: .4byte 0x00007FFF _08147744: .4byte sub_081472C4 - thumb_func_end sub_08147708 + thumb_func_end Phase2_Clockwise_BlackFade_Func7 thumb_func_start VBlankCB_Phase2_Clockwise_BlackFade VBlankCB_Phase2_Clockwise_BlackFade: @ 0x08147748 @@ -672999,7 +672999,7 @@ VBlankCB_Phase2_Clockwise_BlackFade: @ 0x08147748 ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r3, _081477C0 ldr r0, [r3] ldrb r0, [r0] @@ -673083,12 +673083,12 @@ _08147808: .4byte gUnknown_85A8668 _0814780C: .4byte gUnknown_3005B60 thumb_func_end sub_081477D8 - thumb_func_start sub_08147810 -sub_08147810: @ 0x08147810 + thumb_func_start Phase2_Ripple_Func1 +Phase2_Ripple_Func1: @ 0x08147810 push {r4, r5, lr} adds r5, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear movs r2, #0 ldr r4, _08147858 ldr r3, _0814785C @@ -673104,9 +673104,9 @@ _08147822: cmp r2, #0x9f bls _08147822 ldr r0, _08147860 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08147864 - bl sub_080006FC + bl SetHBlankCallback movs r0, #2 bl EnableInterrupts ldrh r0, [r5, #8] @@ -673121,10 +673121,10 @@ _08147858: .4byte gUnknown_2039048 _0814785C: .4byte gUnknown_203A86C _08147860: .4byte VBlankCB_Phase2_Ripple _08147864: .4byte sub_08147980 - thumb_func_end sub_08147810 + thumb_func_end Phase2_Ripple_Func1 - thumb_func_start sub_08147868 -sub_08147868: @ 0x08147868 + thumb_func_start Phase2_Ripple_Func2 +Phase2_Ripple_Func2: @ 0x08147868 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -673196,7 +673196,7 @@ _081478A8: movs r2, #0 str r2, [sp] movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _081478F8: movs r5, #0x10 ldrsh r0, [r6, r5] @@ -673209,10 +673209,10 @@ _081478F8: cmp r0, #0 bne _0814791A ldr r0, _08147944 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0814791A: ldr r0, _08147934 ldr r1, [r0] @@ -673233,12 +673233,12 @@ _08147938: .4byte 0x1FFF0000 _0814793C: .4byte gUnknown_20388C8 _08147940: .4byte gUnknown_2037C74 _08147944: .4byte sub_081477D8 - thumb_func_end sub_08147868 + thumb_func_end Phase2_Ripple_Func2 thumb_func_start VBlankCB_Phase2_Ripple VBlankCB_Phase2_Ripple: @ 0x08147948 push {lr} - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r0, _08147970 ldr r0, [r0] ldrb r0, [r0] @@ -673318,12 +673318,12 @@ _081479DC: .4byte gUnknown_85A8670 _081479E0: .4byte gUnknown_3005B60 thumb_func_end sub_081479AC - thumb_func_start sub_081479E4 -sub_081479E4: @ 0x081479E4 + thumb_func_start Phase2_Wave_Func1 +Phase2_Wave_Func1: @ 0x081479E4 push {r4, lr} adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _08147A30 ldr r1, [r0] movs r2, #0 @@ -673347,7 +673347,7 @@ _08147A0A: cmp r1, #0x9f bls _08147A0A ldr r0, _08147A38 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -673359,10 +673359,10 @@ _08147A0A: _08147A30: .4byte gUnknown_203A86C _08147A34: .4byte gUnknown_2039048 _08147A38: .4byte VBlankCB_Phase2_Wave - thumb_func_end sub_081479E4 + thumb_func_end Phase2_Wave_Func1 - thumb_func_start sub_08147A3C -sub_08147A3C: @ 0x08147A3C + thumb_func_start Phase2_Wave_Func2 +Phase2_Wave_Func2: @ 0x08147A3C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -673443,10 +673443,10 @@ _08147AB6: .align 2, 0 _08147AD0: .4byte gUnknown_203A86C _08147AD4: .4byte gUnknown_20388C8 - thumb_func_end sub_08147A3C + thumb_func_end Phase2_Wave_Func2 - thumb_func_start sub_08147AD8 -sub_08147AD8: @ 0x08147AD8 + thumb_func_start Phase2_Wave_Func3 +Phase2_Wave_Func3: @ 0x08147AD8 push {lr} ldr r1, _08147B08 ldrh r2, [r1, #0xa] @@ -673460,10 +673460,10 @@ sub_08147AD8: @ 0x08147AD8 ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, _08147B14 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 @@ -673472,7 +673472,7 @@ _08147B08: .4byte 0x040000B0 _08147B0C: .4byte 0x0000C5FF _08147B10: .4byte 0x00007FFF _08147B14: .4byte sub_081479AC - thumb_func_end sub_08147AD8 + thumb_func_end Phase2_Wave_Func3 thumb_func_start VBlankCB_Phase2_Wave VBlankCB_Phase2_Wave: @ 0x08147B18 @@ -673487,7 +673487,7 @@ VBlankCB_Phase2_Wave: @ 0x08147B18 ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r3, _08147B84 ldr r0, [r3] ldrb r0, [r0] @@ -673663,14 +673663,14 @@ _08147C74: .4byte gUnknown_85A867C _08147C78: .4byte gUnknown_3005B60 thumb_func_end sub_08147C44 - thumb_func_start sub_08147C7C -sub_08147C7C: @ 0x08147C7C + thumb_func_start Phase2_Mugshot_Func1 +Phase2_Mugshot_Func1: @ 0x08147C7C push {r4, lr} adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear adds r0, r4, #0 - bl sub_081482D8 + bl Mugshots_CreateOpponentPlayerSprites movs r0, #0 strh r0, [r4, #0xa] movs r0, #1 @@ -673698,7 +673698,7 @@ _08147CB0: cmp r1, #0x9f bls _08147CB0 ldr r0, _08147CE0 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -673711,10 +673711,10 @@ _08147CD4: .4byte gUnknown_203A86C _08147CD8: .4byte gUnknown_2039048 _08147CDC: .4byte 0x0000F0F1 _08147CE0: .4byte VBlankCB0_Phase2_Mugshots - thumb_func_end sub_08147C7C + thumb_func_end Phase2_Mugshot_Func1 - thumb_func_start sub_08147CE4 -sub_08147CE4: @ 0x08147CE4 + thumb_func_start Phase2_Mugshot_Func2 +Phase2_Mugshot_Func2: @ 0x08147CE4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -673737,7 +673737,7 @@ sub_08147CE4: @ 0x08147CE4 ldr r0, [r0] movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _08147D98 ldr r0, _08147D9C ldr r0, [r0] @@ -673747,7 +673747,7 @@ sub_08147CE4: @ 0x08147CE4 ldr r0, [r0] movs r1, #0xfa movs r2, #0xc - bl sub_080A1200 + bl LoadPalette movs r1, #0 ldr r5, [sp] movs r0, #0xf0 @@ -673783,7 +673783,7 @@ _08147D3E: movs r0, #2 bl EnableInterrupts ldr r0, _08147DA0 - bl sub_080006FC + bl SetHBlankCallback mov r2, r8 ldrh r0, [r2, #8] adds r0, #1 @@ -673801,11 +673801,11 @@ _08147D90: .4byte gUnknown_85995A0 _08147D94: .4byte gUnknown_85A8A8C _08147D98: .4byte gUnknown_85A8AA0 _08147D9C: .4byte gUnknown_3005AF0 -_08147DA0: .4byte sub_081482A0 - thumb_func_end sub_08147CE4 +_08147DA0: .4byte HBlankCB_Phase2_Mugshots + thumb_func_end Phase2_Mugshot_Func2 - thumb_func_start sub_08147DA4 -sub_08147DA4: @ 0x08147DA4 + thumb_func_start Phase2_Mugshot_Func3 +Phase2_Mugshot_Func3: @ 0x08147DA4 push {r4, r5, r6, r7, lr} adds r4, r0, #0 ldr r0, _08147E88 @@ -673930,10 +673930,10 @@ _08147E66: .align 2, 0 _08147E88: .4byte gUnknown_203A86C _08147E8C: .4byte gUnknown_20388C8 - thumb_func_end sub_08147DA4 + thumb_func_end Phase2_Mugshot_Func3 - thumb_func_start sub_08147E90 -sub_08147E90: @ 0x08147E90 + thumb_func_start Phase2_Mugshot_Func4 +Phase2_Mugshot_Func4: @ 0x08147E90 push {r4, r5, lr} adds r4, r0, #0 ldr r2, _08147F04 @@ -673991,7 +673991,7 @@ _08147EA4: .align 2, 0 _08147F04: .4byte gUnknown_203A86C _08147F08: .4byte gUnknown_20388C8 - thumb_func_end sub_08147E90 + thumb_func_end Phase2_Mugshot_Func4 thumb_func_start Phase2_Mugshot_Func5 Phase2_Mugshot_Func5: @ 0x08147F0C @@ -674026,8 +674026,8 @@ _08147F3C: _08147F44: .4byte gUnknown_203A86C thumb_func_end Phase2_Mugshot_Func5 - thumb_func_start sub_08147F48 -sub_08147F48: @ 0x08147F48 + thumb_func_start Phase2_Mugshot_Func6 +Phase2_Mugshot_Func6: @ 0x08147F48 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -674053,7 +674053,7 @@ sub_08147F48: @ 0x08147F48 movs r0, #0 strb r0, [r1] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _08147FEC ldrh r2, [r1, #0xa] ldr r0, _08147FF0 @@ -674094,7 +674094,7 @@ sub_08147F48: @ 0x08147F48 movs r0, #0xbf strh r0, [r1, #0xe] ldr r0, _08147FFC - bl sub_080006F0 + bl SetVBlankCallback _08147FDC: movs r0, #0 pop {r3} @@ -674109,7 +674109,7 @@ _08147FF0: .4byte 0x0000C5FF _08147FF4: .4byte 0x00007FFF _08147FF8: .4byte gUnknown_20388C8 _08147FFC: .4byte VBlankCB1_Phase2_Mugshots - thumb_func_end sub_08147F48 + thumb_func_end Phase2_Mugshot_Func6 thumb_func_start Phase2_Mugshot_Func7 Phase2_Mugshot_Func7: @ 0x08148000 @@ -674220,8 +674220,8 @@ _081480C0: .4byte gUnknown_203A86C _081480C4: .4byte gUnknown_20388C8 thumb_func_end Phase2_Mugshot_Func7 - thumb_func_start sub_081480C8 -sub_081480C8: @ 0x081480C8 + thumb_func_start Phase2_Mugshot_Func8 +Phase2_Mugshot_Func8: @ 0x081480C8 push {r4, r5, r6, lr} adds r4, r0, #0 ldr r5, _081480F8 @@ -674233,7 +674233,7 @@ sub_081480C8: @ 0x081480C8 rsbs r0, r0, #0 ldr r2, _081480FC movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes ldr r1, [r5] movs r0, #0xff strh r0, [r1, #0xe] @@ -674248,10 +674248,10 @@ sub_081480C8: @ 0x081480C8 .align 2, 0 _081480F8: .4byte gUnknown_203A86C _081480FC: .4byte 0x00007FFF - thumb_func_end sub_081480C8 + thumb_func_end Phase2_Mugshot_Func8 - thumb_func_start sub_08148100 -sub_08148100: @ 0x08148100 + thumb_func_start Phase2_Mugshot_Func9 +Phase2_Mugshot_Func9: @ 0x08148100 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _08148144 @@ -674288,10 +674288,10 @@ _08148130: .align 2, 0 _08148144: .4byte gUnknown_203A86C _08148148: .4byte gUnknown_20388C8 - thumb_func_end sub_08148100 + thumb_func_end Phase2_Mugshot_Func9 - thumb_func_start sub_0814814C -sub_0814814C: @ 0x0814814C + thumb_func_start Phase2_RectangularSpiral_Func3 +Phase2_RectangularSpiral_Func3: @ 0x0814814C push {r4, lr} adds r4, r0, #0 ldr r1, _08148180 @@ -674306,10 +674306,10 @@ sub_0814814C: @ 0x0814814C ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r4} pop {r1} @@ -674318,7 +674318,7 @@ sub_0814814C: @ 0x0814814C _08148180: .4byte 0x040000B0 _08148184: .4byte 0x0000C5FF _08148188: .4byte 0x00007FFF - thumb_func_end sub_0814814C + thumb_func_end Phase2_RectangularSpiral_Func3 thumb_func_start VBlankCB0_Phase2_Mugshots VBlankCB0_Phase2_Mugshots: @ 0x0814818C @@ -674333,7 +674333,7 @@ VBlankCB0_Phase2_Mugshots: @ 0x0814818C ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r3, _08148200 ldr r0, [r3] ldrb r0, [r0] @@ -674400,7 +674400,7 @@ VBlankCB1_Phase2_Mugshots: @ 0x08148220 ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r2, _08148280 ldr r0, [r2] ldrb r0, [r0] @@ -674445,8 +674445,8 @@ _08148298: .4byte 0x04000054 _0814829C: .4byte 0xA2400001 thumb_func_end VBlankCB1_Phase2_Mugshots - thumb_func_start sub_081482A0 -sub_081482A0: @ 0x081482A0 + thumb_func_start HBlankCB_Phase2_Mugshots +HBlankCB_Phase2_Mugshots: @ 0x081482A0 push {lr} ldr r0, _081482B4 ldrh r0, [r0] @@ -674473,10 +674473,10 @@ _081482C8: .align 2, 0 _081482D0: .4byte 0x04000010 _081482D4: .4byte gUnknown_203A86C - thumb_func_end sub_081482A0 + thumb_func_end HBlankCB_Phase2_Mugshots - thumb_func_start sub_081482D8 -sub_081482D8: @ 0x081482D8 + thumb_func_start Mugshots_CreateOpponentPlayerSprites +Mugshots_CreateOpponentPlayerSprites: @ 0x081482D8 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -674506,7 +674506,7 @@ sub_081482D8: @ 0x081482D8 ldr r5, _08148428 str r5, [sp] movs r3, #0 - bl sub_080B55C4 + bl CreateTrainerSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -674521,7 +674521,7 @@ sub_081482D8: @ 0x081482D8 str r5, [sp] movs r2, #0x6a movs r3, #0 - bl sub_080B55C4 + bl CreateTrainerSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x24] @@ -674615,7 +674615,7 @@ sub_081482D8: @ 0x081482D8 movs r4, #0 ldrsh r2, [r3, r4] movs r3, #0 - bl sub_08008190 + bl SetOamMatrixRotationScaling ldrb r0, [r6, #3] lsls r0, r0, #0x1a lsrs r0, r0, #0x1b @@ -674623,7 +674623,7 @@ sub_081482D8: @ 0x081482D8 movs r2, #0x80 lsls r2, r2, #2 movs r3, #0 - bl sub_08008190 + bl SetOamMatrixRotationScaling add sp, #4 pop {r3, r4} mov r8, r3 @@ -674640,7 +674640,7 @@ _08148430: .4byte gUnknown_20205AC _08148434: .4byte sub_08148440 _08148438: .4byte gUnknown_85A86AA _0814843C: .4byte 0xFFFFFE00 - thumb_func_end sub_081482D8 + thumb_func_end Mugshots_CreateOpponentPlayerSprites thumb_func_start sub_08148440 sub_08148440: @ 0x08148440 @@ -674875,12 +674875,12 @@ _081485C0: .4byte gUnknown_85A86F8 _081485C4: .4byte gUnknown_3005B60 thumb_func_end sub_08148590 - thumb_func_start sub_081485C8 -sub_081485C8: @ 0x081485C8 + thumb_func_start Phase2_Slice_Func1 +Phase2_Slice_Func1: @ 0x081485C8 push {r4, r5, r6, lr} adds r5, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear movs r4, #0 movs r3, #0 movs r0, #0x80 @@ -674920,11 +674920,11 @@ _081485FA: bl EnableInterrupts movs r0, #4 movs r1, #0x10 - bl sub_08001200 + bl SetGpuRegBits ldr r0, _08148648 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0814864C - bl sub_080006FC + bl SetHBlankCallback ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -674937,10 +674937,10 @@ _08148640: .4byte gUnknown_203A86C _08148644: .4byte gUnknown_2039048 _08148648: .4byte VBlankCB_Phase2_Slice _0814864C: .4byte HBlankCB_Phase2_Slice - thumb_func_end sub_081485C8 + thumb_func_end Phase2_Slice_Func1 - thumb_func_start sub_08148650 -sub_08148650: @ 0x08148650 + thumb_func_start Phase2_Slice_Func2 +Phase2_Slice_Func2: @ 0x08148650 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -675047,10 +675047,10 @@ _08148704: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08148650 + thumb_func_end Phase2_Slice_Func2 - thumb_func_start sub_0814871C -sub_0814871C: @ 0x0814871C + thumb_func_start Phase2_Slice_Func3 +Phase2_Slice_Func3: @ 0x0814871C push {lr} ldr r1, _0814874C ldrh r2, [r1, #0xa] @@ -675064,10 +675064,10 @@ sub_0814871C: @ 0x0814871C ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, _08148758 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 @@ -675076,7 +675076,7 @@ _0814874C: .4byte 0x040000B0 _08148750: .4byte 0x0000C5FF _08148754: .4byte 0x00007FFF _08148758: .4byte sub_08148590 - thumb_func_end sub_0814871C + thumb_func_end Phase2_Slice_Func3 thumb_func_start VBlankCB_Phase2_Slice VBlankCB_Phase2_Slice: @ 0x0814875C @@ -675091,7 +675091,7 @@ VBlankCB_Phase2_Slice: @ 0x0814875C ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r2, _081487C8 ldr r0, _081487CC ldr r1, [r0] @@ -675201,15 +675201,15 @@ _08148850: .4byte gUnknown_85A8704 _08148854: .4byte gUnknown_3005B60 thumb_func_end sub_08148820 - thumb_func_start sub_08148858 -sub_08148858: @ 0x08148858 + thumb_func_start Phase2_ShredSplit_Func1 +Phase2_ShredSplit_Func1: @ 0x08148858 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} adds r6, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _08148914 ldr r1, [r0] movs r2, #0 @@ -675280,9 +675280,9 @@ _0814888C: movs r0, #2 bl EnableInterrupts ldr r0, _0814891C - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08148920 - bl sub_080006FC + bl SetHBlankCallback ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -675298,10 +675298,10 @@ _08148914: .4byte gUnknown_203A86C _08148918: .4byte gUnknown_20388C8 _0814891C: .4byte VBlankCB_Phase2_Slice _08148920: .4byte HBlankCB_Phase2_Slice - thumb_func_end sub_08148858 + thumb_func_end Phase2_ShredSplit_Func1 - thumb_func_start sub_08148924 -sub_08148924: @ 0x08148924 + thumb_func_start Phase2_ShredSplit_Func2 +Phase2_ShredSplit_Func2: @ 0x08148924 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -675619,7 +675619,7 @@ _08148B84: .4byte 0x00000FFF _08148B88: .4byte gUnknown_20388C8 _08148B8C: .4byte gUnknown_2038A08 _08148B90: .4byte gUnknown_203A86C - thumb_func_end sub_08148924 + thumb_func_end Phase2_ShredSplit_Func2 thumb_func_start Phase2_ShredSplit_Func3 Phase2_ShredSplit_Func3: @ 0x08148B94 @@ -675659,8 +675659,8 @@ _08148BCC: .4byte 0x0000FF10 _08148BD0: .4byte gUnknown_2039048 thumb_func_end Phase2_ShredSplit_Func3 - thumb_func_start sub_08148BD4 -sub_08148BD4: @ 0x08148BD4 + thumb_func_start Phase2_ShredSplit_Func4 +Phase2_ShredSplit_Func4: @ 0x08148BD4 push {lr} ldr r1, _08148C04 ldrh r2, [r1, #0xa] @@ -675674,10 +675674,10 @@ sub_08148BD4: @ 0x08148BD4 ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, _08148C10 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r1} bx r1 @@ -675686,7 +675686,7 @@ _08148C04: .4byte 0x040000B0 _08148C08: .4byte 0x0000C5FF _08148C0C: .4byte 0x00007FFF _08148C10: .4byte sub_08148820 - thumb_func_end sub_08148BD4 + thumb_func_end Phase2_ShredSplit_Func4 thumb_func_start sub_08148C14 sub_08148C14: @ 0x08148C14 @@ -675748,12 +675748,12 @@ _08148C7C: .4byte gUnknown_85A8728 _08148C80: .4byte gUnknown_3005B60 thumb_func_end sub_08148C4C - thumb_func_start sub_08148C84 -sub_08148C84: @ 0x08148C84 + thumb_func_start Phase2_Blackhole_Func1 +Phase2_Blackhole_Func1: @ 0x08148C84 push {r4, r5, lr} adds r5, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _08148CD8 ldr r1, [r0] movs r0, #0 @@ -675777,7 +675777,7 @@ _08148CAE: bge _08148CAE movs r4, #0 ldr r0, _08148CE4 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -675795,10 +675795,10 @@ _08148CD8: .4byte gUnknown_203A86C _08148CDC: .4byte gUnknown_20388C8 _08148CE0: .4byte 0x000008BE _08148CE4: .4byte VBlankCB1_Phase2_BigPokeball - thumb_func_end sub_08148C84 + thumb_func_end Phase2_Blackhole_Func1 - thumb_func_start sub_08148CE8 -sub_08148CE8: @ 0x08148CE8 + thumb_func_start Phase2_Blackhole1_Func3 +Phase2_Blackhole1_Func3: @ 0x08148CE8 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x16 @@ -675816,12 +675816,12 @@ sub_08148CE8: @ 0x08148CE8 strh r0, [r1, #0xa] ldrh r0, [r1, #0xa] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _08148D9E .align 2, 0 _08148D20: .4byte 0x040000B0 @@ -675891,7 +675891,7 @@ _08148D9E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08148CE8 + thumb_func_end Phase2_Blackhole1_Func3 thumb_func_start Phase2_Blackhole1_Func2 Phase2_Blackhole1_Func2: @ 0x08148DA8 @@ -675961,8 +675961,8 @@ _08148E24: .4byte gUnknown_85A8730 _08148E28: .4byte gUnknown_20388C8 thumb_func_end Phase2_Blackhole1_Func2 - thumb_func_start sub_08148E2C -sub_08148E2C: @ 0x08148E2C + thumb_func_start Phase2_Blackhole2_Func2 +Phase2_Blackhole2_Func2: @ 0x08148E2C push {r4, lr} adds r4, r0, #0 ldr r0, _08148EA8 @@ -676010,10 +676010,10 @@ _08148E5A: ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _08148E96: ldrh r2, [r4, #0x12] ldrb r0, [r4, #0x12] @@ -676076,7 +676076,7 @@ _08148EFC: bx r1 .align 2, 0 _08148F10: .4byte gUnknown_203A86C - thumb_func_end sub_08148E2C + thumb_func_end Phase2_Blackhole2_Func2 thumb_func_start sub_08148F14 sub_08148F14: @ 0x08148F14 @@ -676108,8 +676108,8 @@ _08148F44: .4byte gUnknown_85A8734 _08148F48: .4byte gUnknown_3005B60 thumb_func_end sub_08148F14 - thumb_func_start sub_08148F4C -sub_08148F4C: @ 0x08148F4C + thumb_func_start Phase2_RectangularSpiral_Func1 +Phase2_RectangularSpiral_Func1: @ 0x08148F4C push {r4, r5, lr} sub sp, #0xc adds r5, r0, #0 @@ -676141,7 +676141,7 @@ sub_08148F4C: @ 0x08148F4C ldr r0, _08148FF8 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r1, #0 movs r4, #1 movs r0, #1 @@ -676195,7 +676195,7 @@ _08148FFC: .4byte gUnknown_3001210 _08149000: .4byte 0x0000FFFF _08149004: .4byte 0x0000FFFD _08149008: .4byte 0x00000133 - thumb_func_end sub_08148F4C + thumb_func_end Phase2_RectangularSpiral_Func1 thumb_func_start Phase2_RectangularSpiral_Func2 Phase2_RectangularSpiral_Func2: @ 0x0814900C @@ -676311,10 +676311,10 @@ sub_081490C8: @ 0x081490C8 ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 pop {r4} pop {r1} @@ -676495,8 +676495,8 @@ _08149230: .4byte gUnknown_85A87F0 _08149234: .4byte gUnknown_3005B60 thumb_func_end sub_08149200 - thumb_func_start sub_08149238 -sub_08149238: @ 0x08149238 + thumb_func_start Phase2_Groudon_Func3 +Phase2_Groudon_Func3: @ 0x08149238 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -676530,7 +676530,7 @@ sub_08149238: @ 0x08149238 _0814927C: .4byte 0x01000400 _08149280: .4byte gUnknown_859DFCC _08149284: .4byte gUnknown_859E538 - thumb_func_end sub_08149238 + thumb_func_end Phase2_Groudon_Func3 thumb_func_start sub_08149288 sub_08149288: @ 0x08149288 @@ -676557,7 +676557,7 @@ sub_08149288: @ 0x08149288 adds r0, r0, r1 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _081492C0: ldrh r0, [r4, #0xa] adds r0, #1 @@ -676601,7 +676601,7 @@ sub_081492E4: @ 0x081492E4 adds r0, r0, r1 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _08149312: ldrh r0, [r4, #0xa] adds r0, #1 @@ -676656,13 +676656,13 @@ _0814936C: .4byte gUnknown_85A8810 _08149370: .4byte gUnknown_3005B60 thumb_func_end sub_0814933C - thumb_func_start sub_08149374 -sub_08149374: @ 0x08149374 + thumb_func_start Phase2_Rayquaza_Func3 +Phase2_Rayquaza_Func3: @ 0x08149374 push {r4, r5, r6, lr} sub sp, #0xc adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r1, _081493FC movs r0, #8 bl SetGpuReg @@ -676691,7 +676691,7 @@ sub_08149374: @ 0x08149374 ldr r0, _0814940C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r2, #0 ldr r3, _08149410 movs r6, #0 @@ -676712,7 +676712,7 @@ _081493D6: cmp r2, #0x9f bls _081493D6 ldr r0, _08149414 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 add sp, #0xc pop {r4, r5, r6} @@ -676725,11 +676725,11 @@ _08149404: .4byte gUnknown_859F150 _08149408: .4byte gUnknown_203A86C _0814940C: .4byte gUnknown_859EFF0 _08149410: .4byte gUnknown_20388C8 -_08149414: .4byte sub_081495C8 - thumb_func_end sub_08149374 +_08149414: .4byte VBlankCB_Phase2_Rayquaza + thumb_func_end Phase2_Rayquaza_Func3 - thumb_func_start sub_08149418 -sub_08149418: @ 0x08149418 + thumb_func_start Phase2_Rayquaza_Func4 +Phase2_Rayquaza_Func4: @ 0x08149418 push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -676751,10 +676751,10 @@ sub_08149418: @ 0x08149418 bx r1 .align 2, 0 _08149444: .4byte gUnknown_85A6690 - thumb_func_end sub_08149418 + thumb_func_end Phase2_Rayquaza_Func4 - thumb_func_start sub_08149448 -sub_08149448: @ 0x08149448 + thumb_func_start Phase2_Rayquaza_Func5 +Phase2_Rayquaza_Func5: @ 0x08149448 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0xa] @@ -676776,7 +676776,7 @@ _08149460: adds r0, r0, r1 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _08149474: ldrh r0, [r4, #0xa] adds r0, #1 @@ -676797,10 +676797,10 @@ _0814948C: bx r1 .align 2, 0 _08149494: .4byte gUnknown_859EF50 - thumb_func_end sub_08149448 + thumb_func_end Phase2_Rayquaza_Func5 - thumb_func_start sub_08149498 -sub_08149498: @ 0x08149498 + thumb_func_start Phase2_Rayquaza_Func6 +Phase2_Rayquaza_Func6: @ 0x08149498 push {lr} sub sp, #4 adds r1, r0, #0 @@ -676820,7 +676820,7 @@ sub_08149498: @ 0x08149498 str r2, [sp] movs r1, #2 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _081494C2: movs r0, #0 add sp, #4 @@ -676828,7 +676828,7 @@ _081494C2: bx r1 .align 2, 0 _081494CC: .4byte 0xFFFF8000 - thumb_func_end sub_08149498 + thumb_func_end Phase2_Rayquaza_Func6 thumb_func_start Phase2_Rayquaza_Func7 Phase2_Rayquaza_Func7: @ 0x081494D0 @@ -676863,11 +676863,11 @@ sub_081494FC: @ 0x081494FC ldr r0, _08149524 movs r1, #8 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _08149528 movs r1, #0 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -676880,8 +676880,8 @@ _08149524: .4byte 0x00007FFF _08149528: .4byte 0xFFFF8000 thumb_func_end sub_081494FC - thumb_func_start sub_0814952C -sub_0814952C: @ 0x0814952C + thumb_func_start Phase2_Rayquaza_Func9 +Phase2_Rayquaza_Func9: @ 0x0814952C push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa @@ -676901,7 +676901,7 @@ sub_0814952C: @ 0x0814952C adds r0, r0, r1 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _0814955A: ldrh r0, [r4, #0xa] adds r0, #1 @@ -676934,7 +676934,7 @@ _08149584: cmp r1, #0x9f bls _08149584 adds r0, r5, #0 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r4, #8] adds r0, #1 movs r2, #0 @@ -676944,7 +676944,7 @@ _08149584: strh r1, [r4, #0xc] strh r2, [r4, #0x16] movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits _081495B0: movs r0, #0 pop {r4, r5} @@ -676955,10 +676955,10 @@ _081495B8: .4byte gUnknown_859EF50 _081495BC: .4byte gUnknown_203A86C _081495C0: .4byte VBlankCB1_Phase2_BigPokeball _081495C4: .4byte gUnknown_2039048 - thumb_func_end sub_0814952C + thumb_func_end Phase2_Rayquaza_Func9 - thumb_func_start sub_081495C8 -sub_081495C8: @ 0x081495C8 + thumb_func_start VBlankCB_Phase2_Rayquaza +VBlankCB_Phase2_Rayquaza: @ 0x081495C8 push {lr} ldr r1, _081495F4 ldrh r2, [r1, #0xa] @@ -676970,7 +676970,7 @@ sub_081495C8: @ 0x081495C8 ands r0, r2 strh r0, [r1, #0xa] ldrh r0, [r1, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r0, _08149600 ldr r0, [r0] movs r1, #0x20 @@ -677007,7 +677007,7 @@ _08149628: .4byte gUnknown_20388C8 _0814962C: .4byte 0x040000B0 _08149630: .4byte 0x04000012 _08149634: .4byte 0xA2400001 - thumb_func_end sub_081495C8 + thumb_func_end VBlankCB_Phase2_Rayquaza thumb_func_start sub_08149638 sub_08149638: @ 0x08149638 @@ -677039,12 +677039,12 @@ _08149668: .4byte gUnknown_85A883C _0814966C: .4byte gUnknown_3005B60 thumb_func_end sub_08149638 - thumb_func_start sub_08149670 -sub_08149670: @ 0x08149670 + thumb_func_start Phase2_WhiteFade_Func1 +Phase2_WhiteFade_Func1: @ 0x08149670 push {r4, r5, lr} adds r5, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _081496D8 ldr r1, [r0] movs r2, #0 @@ -677078,9 +677078,9 @@ _0814969C: movs r0, #2 bl EnableInterrupts ldr r0, _081496E0 - bl sub_080006FC + bl SetHBlankCallback ldr r0, _081496E4 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -677093,10 +677093,10 @@ _081496D8: .4byte gUnknown_203A86C _081496DC: .4byte gUnknown_2039048 _081496E0: .4byte HBlankCB_Phase2_WhiteFade _081496E4: .4byte VBlankCB0_Phase2_WhiteFade - thumb_func_end sub_08149670 + thumb_func_end Phase2_WhiteFade_Func1 - thumb_func_start sub_081496E8 -sub_081496E8: @ 0x081496E8 + thumb_func_start Phase2_WhiteFade_Func2 +Phase2_WhiteFade_Func2: @ 0x081496E8 push {r4, r5, r6, lr} sub sp, #0x10 adds r6, r0, #0 @@ -677108,7 +677108,7 @@ sub_081496E8: @ 0x081496E8 movs r4, #0 _081496FC: ldr r0, _08149754 - bl sub_08006BCC + bl CreateInvisibleSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -677151,10 +677151,10 @@ _081496FC: _08149750: .4byte gUnknown_85A8850 _08149754: .4byte sub_08149924 _08149758: .4byte gUnknown_20205AC - thumb_func_end sub_081496E8 + thumb_func_end Phase2_WhiteFade_Func2 - thumb_func_start sub_0814975C -sub_0814975C: @ 0x0814975C + thumb_func_start Phase2_WhiteFade_Func3 +Phase2_WhiteFade_Func3: @ 0x0814975C push {r4, lr} adds r4, r0, #0 ldr r2, _08149790 @@ -677171,7 +677171,7 @@ sub_0814975C: @ 0x0814975C rsbs r0, r0, #0 ldr r2, _08149794 movs r1, #0x10 - bl sub_080A22E8 + bl BlendPalettes ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -677183,10 +677183,10 @@ _08149786: .align 2, 0 _08149790: .4byte gUnknown_203A86C _08149794: .4byte 0x00007FFF - thumb_func_end sub_0814975C + thumb_func_end Phase2_WhiteFade_Func3 - thumb_func_start sub_08149798 -sub_08149798: @ 0x08149798 + thumb_func_start Phase2_WhiteFade_Func4 +Phase2_WhiteFade_Func4: @ 0x08149798 push {r4, r5, r6, lr} adds r6, r0, #0 ldr r4, _081497EC @@ -677205,9 +677205,9 @@ sub_08149798: @ 0x08149798 strh r0, [r1, #0xa] ldrh r0, [r1, #0xa] movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback ldr r1, [r4] movs r0, #0xf0 strh r0, [r1, #6] @@ -677217,7 +677217,7 @@ sub_08149798: @ 0x08149798 movs r0, #0x3f strh r0, [r1, #2] ldr r0, _081497FC - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r6, #8] adds r0, #1 strh r0, [r6, #8] @@ -677231,10 +677231,10 @@ _081497F0: .4byte 0x040000B0 _081497F4: .4byte 0x0000C5FF _081497F8: .4byte 0x00007FFF _081497FC: .4byte VBlankCB1_Phase2_WhiteFade - thumb_func_end sub_08149798 + thumb_func_end Phase2_WhiteFade_Func4 - thumb_func_start sub_08149800 -sub_08149800: @ 0x08149800 + thumb_func_start Phase2_WhiteFade_Func5 +Phase2_WhiteFade_Func5: @ 0x08149800 push {lr} ldr r0, _0814982C ldr r1, [r0] @@ -677247,10 +677247,10 @@ sub_08149800: @ 0x08149800 bls _08149826 bl sub_0814A044 ldr r0, _08149830 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _08149826: movs r0, #0 pop {r1} @@ -677258,7 +677258,7 @@ _08149826: .align 2, 0 _0814982C: .4byte gUnknown_203A86C _08149830: .4byte sub_08149638 - thumb_func_end sub_08149800 + thumb_func_end Phase2_WhiteFade_Func5 thumb_func_start VBlankCB0_Phase2_WhiteFade VBlankCB0_Phase2_WhiteFade: @ 0x08149834 @@ -677273,7 +677273,7 @@ VBlankCB0_Phase2_WhiteFade: @ 0x08149834 ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r2, _081498A4 ldr r0, _081498A8 ldr r1, [r0] @@ -677329,7 +677329,7 @@ _081498C0: .4byte 0xA2400001 thumb_func_start VBlankCB1_Phase2_WhiteFade VBlankCB1_Phase2_WhiteFade: @ 0x081498C4 push {lr} - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r1, _081498F8 ldr r0, _081498FC ldr r2, [r0] @@ -677539,8 +677539,8 @@ _08149A4C: .4byte gUnknown_85A8860 _08149A50: .4byte gUnknown_3005B60 thumb_func_end sub_08149A1C - thumb_func_start sub_08149A54 -sub_08149A54: @ 0x08149A54 + thumb_func_start Phase2_GridSquares_Func1 +Phase2_GridSquares_Func1: @ 0x08149A54 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -677563,7 +677563,7 @@ sub_08149A54: @ 0x08149A54 ldr r0, _08149AA4 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -677576,10 +677576,10 @@ sub_08149A54: @ 0x08149A54 _08149A9C: .4byte gUnknown_859A780 _08149AA0: .4byte 0x01000400 _08149AA4: .4byte gUnknown_85A8984 - thumb_func_end sub_08149A54 + thumb_func_end Phase2_GridSquares_Func1 - thumb_func_start sub_08149AA8 -sub_08149AA8: @ 0x08149AA8 + thumb_func_start ItemId_GetImportance +ItemId_GetImportance: @ 0x08149AA8 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -677622,10 +677622,10 @@ _08149AEA: bx r1 .align 2, 0 _08149AFC: .4byte gUnknown_859A780 - thumb_func_end sub_08149AA8 + thumb_func_end ItemId_GetImportance - thumb_func_start sub_08149B00 -sub_08149B00: @ 0x08149B00 + thumb_func_start Phase2_GridSquares_Func3 +Phase2_GridSquares_Func3: @ 0x08149B00 push {lr} ldrh r1, [r0, #0xa] subs r1, #1 @@ -677635,17 +677635,17 @@ sub_08149B00: @ 0x08149B00 bne _08149B20 bl sub_0814A044 ldr r0, _08149B28 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _08149B20: movs r0, #0 pop {r1} bx r1 .align 2, 0 _08149B28: .4byte sub_08149A1C - thumb_func_end sub_08149B00 + thumb_func_end Phase2_GridSquares_Func3 thumb_func_start sub_08149B2C sub_08149B2C: @ 0x08149B2C @@ -677677,12 +677677,12 @@ _08149B5C: .4byte gUnknown_85A886C _08149B60: .4byte gUnknown_3005B60 thumb_func_end sub_08149B2C - thumb_func_start sub_08149B64 -sub_08149B64: @ 0x08149B64 + thumb_func_start Phase2_Shards_Func1 +Phase2_Shards_Func1: @ 0x08149B64 push {r4, r5, lr} adds r5, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _08149BBC ldr r1, [r0] movs r2, #0 @@ -677711,7 +677711,7 @@ _08149B88: movs r2, #0xa0 bl CpuSet ldr r0, _08149BC4 - bl sub_080006F0 + bl SetVBlankCallback ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -677723,7 +677723,7 @@ _08149B88: _08149BBC: .4byte gUnknown_203A86C _08149BC0: .4byte gUnknown_20388C8 _08149BC4: .4byte VBlankCB_Phase2_Shards - thumb_func_end sub_08149B64 + thumb_func_end Phase2_Shards_Func1 thumb_func_start Phase2_Shards_Func2 Phase2_Shards_Func2: @ 0x08149BC8 @@ -677788,8 +677788,8 @@ _08149C3C: .4byte gUnknown_203A86C _08149C40: .4byte gUnknown_85A8880 thumb_func_end Phase2_Shards_Func2 - thumb_func_start sub_08149C44 -sub_08149C44: @ 0x08149C44 + thumb_func_start Phase2_Shards_Func3 +Phase2_Shards_Func3: @ 0x08149C44 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -677904,10 +677904,10 @@ _08149D00: bx r1 .align 2, 0 _08149D1C: .4byte gUnknown_203A86C - thumb_func_end sub_08149C44 + thumb_func_end Phase2_Shards_Func3 - thumb_func_start sub_08149D20 -sub_08149D20: @ 0x08149D20 + thumb_func_start Phase2_Shards_Func4 +Phase2_Shards_Func4: @ 0x08149D20 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0xa] @@ -677929,10 +677929,10 @@ sub_08149D20: @ 0x08149D20 ldrh r0, [r1, #0xa] bl sub_0814A044 ldr r0, _08149D68 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 b _08149D84 .align 2, 0 @@ -677958,7 +677958,7 @@ _08149D84: bx r1 .align 2, 0 _08149D88: .4byte gUnknown_85A88C6 - thumb_func_end sub_08149D20 + thumb_func_end Phase2_Shards_Func4 thumb_func_start Phase2_Shards_Func5 Phase2_Shards_Func5: @ 0x08149D8C @@ -677993,7 +677993,7 @@ VBlankCB_Phase2_Shards: @ 0x08149DA8 ands r0, r1 strh r0, [r4, #0xa] ldrh r0, [r4, #0xa] - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r3, _08149E20 ldr r0, [r3] ldrb r0, [r0] @@ -678072,7 +678072,7 @@ sub_08149E38: @ 0x08149E38 ldr r0, _08149E94 movs r1, #3 str r3, [sp] - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08149E98 @@ -678095,15 +678095,15 @@ sub_08149E38: @ 0x08149E38 pop {r0} bx r0 .align 2, 0 -_08149E94: .4byte sub_08149EBC +_08149E94: .4byte Phase2Task_Magma _08149E98: .4byte gUnknown_3005B60 thumb_func_end sub_08149E38 - thumb_func_start sub_08149E9C -sub_08149E9C: @ 0x08149E9C + thumb_func_start IsPhase1Done +IsPhase1Done: @ 0x08149E9C push {lr} ldr r0, _08149EB0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -678111,17 +678111,17 @@ sub_08149E9C: @ 0x08149E9C movs r0, #0 b _08149EB6 .align 2, 0 -_08149EB0: .4byte sub_08149EBC +_08149EB0: .4byte Phase2Task_Magma _08149EB4: movs r0, #1 _08149EB6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08149E9C + thumb_func_end IsPhase1Done - thumb_func_start sub_08149EBC -sub_08149EBC: @ 0x08149EBC + thumb_func_start Phase2Task_Magma +Phase2Task_Magma: @ 0x08149EBC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -678148,7 +678148,7 @@ _08149ECE: .align 2, 0 _08149EEC: .4byte gUnknown_85A88D4 _08149EF0: .4byte gUnknown_3005B60 - thumb_func_end sub_08149EBC + thumb_func_end Phase2Task_Magma thumb_func_start sub_08149EF4 sub_08149EF4: @ 0x08149EF4 @@ -678182,7 +678182,7 @@ _08149F24: rsbs r0, r0, #0 ldrb r1, [r4, #0x16] ldr r2, _08149F4C - bl sub_080A22E8 + bl BlendPalettes _08149F30: movs r2, #0x16 ldrsh r0, [r4, r2] @@ -678202,8 +678202,8 @@ _08149F42: _08149F4C: .4byte 0x00002D6B thumb_func_end sub_08149EF4 - thumb_func_start sub_08149F50 -sub_08149F50: @ 0x08149F50 + thumb_func_start Phase1_TransitionAll_Func2 +Phase1_TransitionAll_Func2: @ 0x08149F50 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x14] @@ -678233,7 +678233,7 @@ _08149F7E: rsbs r0, r0, #0 ldrb r1, [r4, #0x16] ldr r2, _08149FB0 - bl sub_080A22E8 + bl BlendPalettes _08149F8A: movs r0, #0x16 ldrsh r1, [r4, r0] @@ -678246,14 +678246,14 @@ _08149F8A: cmp r0, #0 bne _08149FB8 ldr r0, _08149FB4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _08149FBE .align 2, 0 _08149FB0: .4byte 0x00002D6B -_08149FB4: .4byte sub_08149EBC +_08149FB4: .4byte Phase2Task_Magma _08149FB8: ldrh r0, [r4, #0xa] strh r0, [r4, #0x14] @@ -678264,7 +678264,7 @@ _08149FBE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08149F50 + thumb_func_end Phase1_TransitionAll_Func2 thumb_func_start sub_08149FC8 sub_08149FC8: @ 0x08149FC8 @@ -678286,16 +678286,16 @@ sub_08149FC8: @ 0x08149FC8 _08149FE8: .4byte gUnknown_203A86C thumb_func_end sub_08149FC8 - thumb_func_start sub_08149FEC -sub_08149FEC: @ 0x08149FEC + thumb_func_start VBlankCB_BattleTransition +VBlankCB_BattleTransition: @ 0x08149FEC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08149FEC + thumb_func_end VBlankCB_BattleTransition thumb_func_start sub_0814A000 sub_0814A000: @ 0x0814A000 @@ -678345,7 +678345,7 @@ sub_0814A044: @ 0x0814A044 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes pop {r0} bx r0 .align 2, 0 @@ -678845,8 +678845,8 @@ _0814A3D6: bx r1 thumb_func_end sub_0814A2E8 - thumb_func_start sub_0814A3E4 -sub_0814A3E4: @ 0x0814A3E4 + thumb_func_start Phase2_29_Func1 +Phase2_29_Func1: @ 0x0814A3E4 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -678867,7 +678867,7 @@ sub_0814A3E4: @ 0x0814A3E4 ldr r0, _0814A430 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -678880,10 +678880,10 @@ sub_0814A3E4: @ 0x0814A3E4 _0814A428: .4byte 0x01000400 _0814A42C: .4byte gUnknown_85A76B0 _0814A430: .4byte gUnknown_85A7690 - thumb_func_end sub_0814A3E4 + thumb_func_end Phase2_29_Func1 - thumb_func_start sub_0814A434 -sub_0814A434: @ 0x0814A434 + thumb_func_start Phase2_29_Func2 +Phase2_29_Func2: @ 0x0814A434 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -678915,7 +678915,7 @@ sub_0814A434: @ 0x0814A434 .align 2, 0 _0814A474: .4byte gUnknown_85A7D3C _0814A478: .4byte gUnknown_20388C8 - thumb_func_end sub_0814A434 + thumb_func_end Phase2_29_Func2 thumb_func_start sub_0814A47C sub_0814A47C: @ 0x0814A47C @@ -678977,17 +678977,17 @@ _0814A4E4: .4byte gUnknown_85A9498 _0814A4E8: .4byte gUnknown_3005B60 thumb_func_end sub_0814A4B4 - thumb_func_start sub_0814A4EC -sub_0814A4EC: @ 0x0814A4EC + thumb_func_start Phase2_30_Func1 +Phase2_30_Func1: @ 0x0814A4EC push {r4, r5, r6, lr} sub sp, #0xc adds r4, r0, #0 bl sub_08149FC8 - bl sub_080B9750 + bl ScanlineEffect_Clear movs r1, #0xc0 lsls r1, r1, #7 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r5, #0 movs r0, #0x80 lsls r0, r0, #6 @@ -679028,7 +679028,7 @@ sub_0814A4EC: @ 0x0814A4EC ldr r0, _0814A590 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, [r6] strh r5, [r0, #0x16] ldrh r0, [r4, #8] @@ -679048,10 +679048,10 @@ _0814A584: .4byte 0x04000052 _0814A588: .4byte 0x01000400 _0814A58C: .4byte gUnknown_85A76B0 _0814A590: .4byte gUnknown_85A7690 - thumb_func_end sub_0814A4EC + thumb_func_end Phase2_30_Func1 - thumb_func_start sub_0814A594 -sub_0814A594: @ 0x0814A594 + thumb_func_start Phase2_30_Func2 +Phase2_30_Func2: @ 0x0814A594 push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -679071,10 +679071,10 @@ sub_0814A594: @ 0x0814A594 bx r1 .align 2, 0 _0814A5BC: .4byte gUnknown_85A7D3C - thumb_func_end sub_0814A594 + thumb_func_end Phase2_30_Func2 - thumb_func_start sub_0814A5C0 -sub_0814A5C0: @ 0x0814A5C0 + thumb_func_start Phase2_30_Func3 +Phase2_30_Func3: @ 0x0814A5C0 push {r4, r5, r6, lr} adds r5, r0, #0 movs r2, #0 @@ -679093,9 +679093,9 @@ _0814A5CC: cmp r2, #0x9f bls _0814A5CC adds r0, r6, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0814A60C - bl sub_080006FC + bl SetHBlankCallback movs r0, #2 bl EnableInterrupts ldrh r0, [r5, #8] @@ -679110,10 +679110,10 @@ _0814A600: .4byte VBlankCB_Phase2_30 _0814A604: .4byte gUnknown_2039048 _0814A608: .4byte gUnknown_203A86C _0814A60C: .4byte HBlankCB_Phase2_30 - thumb_func_end sub_0814A5C0 + thumb_func_end Phase2_30_Func3 - thumb_func_start sub_0814A610 -sub_0814A610: @ 0x0814A610 + thumb_func_start Phase2_30_Func4 +Phase2_30_Func4: @ 0x0814A610 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -679228,7 +679228,7 @@ _0814A6A4: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0814A6F2: movs r2, #0x10 ldrsh r0, [r4, r2] @@ -679241,10 +679241,10 @@ _0814A6F2: cmp r0, #0 bne _0814A714 ldr r0, _0814A740 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _0814A714: ldrh r0, [r4, #0x16] subs r0, #0x11 @@ -679267,12 +679267,12 @@ _0814A734: .4byte gUnknown_20388C8 _0814A738: .4byte gUnknown_203A86C _0814A73C: .4byte gUnknown_2037C74 _0814A740: .4byte sub_0814A4B4 - thumb_func_end sub_0814A610 + thumb_func_end Phase2_30_Func4 thumb_func_start VBlankCB_Phase2_30 VBlankCB_Phase2_30: @ 0x0814A744 push {lr} - bl sub_08149FEC + bl VBlankCB_BattleTransition ldr r2, _0814A778 ldr r0, _0814A77C ldr r1, [r0] @@ -679325,8 +679325,8 @@ _0814A7A8: .4byte 0x04000006 _0814A7AC: .4byte 0x04000012 thumb_func_end HBlankCB_Phase2_30 - thumb_func_start sub_0814A7B0 -sub_0814A7B0: @ 0x0814A7B0 + thumb_func_start Phase2Task_37 +Phase2Task_37: @ 0x0814A7B0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -679353,7 +679353,7 @@ _0814A7C2: .align 2, 0 _0814A7E0: .4byte gUnknown_85A94A8 _0814A7E4: .4byte gUnknown_3005B60 - thumb_func_end sub_0814A7B0 + thumb_func_end Phase2Task_37 thumb_func_start sub_0814A7E8 sub_0814A7E8: @ 0x0814A7E8 @@ -679415,8 +679415,8 @@ _0814A850: .4byte gUnknown_85A94CC _0814A854: .4byte gUnknown_3005B60 thumb_func_end sub_0814A820 - thumb_func_start sub_0814A858 -sub_0814A858: @ 0x0814A858 + thumb_func_start Phase2_31_Func1 +Phase2_31_Func1: @ 0x0814A858 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -679455,11 +679455,11 @@ sub_0814A858: @ 0x0814A858 movs r3, #0 bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0814A8E4 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 mov r1, r8 strh r6, [r1, #0xc] @@ -679480,10 +679480,10 @@ sub_0814A858: @ 0x0814A858 .align 2, 0 _0814A8E0: .4byte gUnknown_85A8048 _0814A8E4: .4byte gUnknown_85A8028 - thumb_func_end sub_0814A858 + thumb_func_end Phase2_31_Func1 - thumb_func_start sub_0814A8E8 -sub_0814A8E8: @ 0x0814A8E8 + thumb_func_start Phase2_31_Func2 +Phase2_31_Func2: @ 0x0814A8E8 push {r4, r5, lr} sub sp, #0x24 adds r4, r0, #0 @@ -679505,9 +679505,9 @@ sub_0814A8E8: @ 0x0814A8E8 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrh r0, [r4, #0xc] adds r0, #4 strh r0, [r4, #0xc] @@ -679539,10 +679539,10 @@ _0814A94A: bx r1 .align 2, 0 _0814A954: .4byte gUnknown_85A83D8 - thumb_func_end sub_0814A8E8 + thumb_func_end Phase2_31_Func2 - thumb_func_start sub_0814A958 -sub_0814A958: @ 0x0814A958 + thumb_func_start Phase2_31_Func3 +Phase2_31_Func3: @ 0x0814A958 push {r4, r5, r6, lr} sub sp, #0x10 adds r4, r0, #0 @@ -679597,7 +679597,7 @@ _0814A9BC: ldr r0, _0814A9CC movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _0814A9D0 b _0814A9DE .align 2, 0 @@ -679626,7 +679626,7 @@ _0814A9EC: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -679643,10 +679643,10 @@ _0814AA16: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0814A958 + thumb_func_end Phase2_31_Func3 - thumb_func_start sub_0814AA20 -sub_0814AA20: @ 0x0814AA20 + thumb_func_start Phase2_33_Func1 +Phase2_33_Func1: @ 0x0814AA20 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -679685,16 +679685,16 @@ sub_0814AA20: @ 0x0814AA20 movs r3, #0 bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r4, _0814AAC0 adds r0, r4, #0 movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0xe0 movs r1, #0x10 movs r2, #8 @@ -679718,10 +679718,10 @@ sub_0814AA20: @ 0x0814AA20 .align 2, 0 _0814AABC: .4byte gUnknown_85A8048 _0814AAC0: .4byte gUnknown_85A8028 - thumb_func_end sub_0814AA20 + thumb_func_end Phase2_33_Func1 - thumb_func_start sub_0814AAC4 -sub_0814AAC4: @ 0x0814AAC4 + thumb_func_start Phase2_33_Func2 +Phase2_33_Func2: @ 0x0814AAC4 push {r4, r5, r6, lr} sub sp, #0x24 adds r6, r0, #0 @@ -679760,9 +679760,9 @@ sub_0814AAC4: @ 0x0814AAC4 str r0, [sp, #0x20] movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrh r0, [r6, #0xc] subs r0, #1 strh r0, [r6, #0xc] @@ -679781,10 +679781,10 @@ _0814AB30: .align 2, 0 _0814AB3C: .4byte gUnknown_85A94E0 _0814AB40: .4byte gUnknown_85A83D8 - thumb_func_end sub_0814AAC4 + thumb_func_end Phase2_33_Func2 - thumb_func_start sub_0814AB44 -sub_0814AB44: @ 0x0814AB44 + thumb_func_start Phase2_33_Func3 +Phase2_33_Func3: @ 0x0814AB44 push {r4, lr} adds r4, r0, #0 movs r0, #0xe0 @@ -679795,7 +679795,7 @@ sub_0814AB44: @ 0x0814AB44 ldr r0, _0814AB74 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 strh r0, [r4, #0xc] strh r0, [r4, #0xe] @@ -679808,10 +679808,10 @@ sub_0814AB44: @ 0x0814AB44 bx r1 .align 2, 0 _0814AB74: .4byte 0xFFFF3FFF - thumb_func_end sub_0814AB44 + thumb_func_end Phase2_33_Func3 - thumb_func_start sub_0814AB78 -sub_0814AB78: @ 0x0814AB78 + thumb_func_start Phase2_33_Func4 +Phase2_33_Func4: @ 0x0814AB78 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -679861,7 +679861,7 @@ sub_0814AB78: @ 0x0814AB78 mov r1, r8 movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect b _0814AC38 .align 2, 0 _0814ABE4: .4byte gUnknown_85A83D8 @@ -679913,7 +679913,7 @@ _0814AC38: strh r0, [r7, #8] _0814AC46: movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 add sp, #0x24 pop {r3} @@ -679923,10 +679923,10 @@ _0814AC46: bx r1 .align 2, 0 _0814AC5C: .4byte gUnknown_85A94E0 - thumb_func_end sub_0814AB78 + thumb_func_end Phase2_33_Func4 - thumb_func_start sub_0814AC60 -sub_0814AC60: @ 0x0814AC60 + thumb_func_start ItemId_GetFieldFunc +ItemId_GetFieldFunc: @ 0x0814AC60 push {r4, lr} sub sp, #8 adds r4, r0, #0 @@ -679939,24 +679939,24 @@ sub_0814AC60: @ 0x0814AC60 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, [r4] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 add sp, #8 pop {r4} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0814AC60 + thumb_func_end ItemId_GetFieldFunc thumb_func_start sub_0814ACA4 sub_0814ACA4: @ 0x0814ACA4 @@ -680000,8 +680000,8 @@ _0814ACF0: .4byte gUnknown_2022AC8 _0814ACF4: .4byte gUnknown_2022ACA thumb_func_end sub_0814ACA4 - thumb_func_start sub_0814ACF8 -sub_0814ACF8: @ 0x0814ACF8 + thumb_func_start Phase2_32_Func1 +Phase2_32_Func1: @ 0x0814ACF8 push {r4, r5, r6, lr} sub sp, #0x10 adds r6, r0, #0 @@ -680021,11 +680021,11 @@ sub_0814ACF8: @ 0x0814ACF8 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _0814AD78 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0814AD7C strh r5, [r0] ldr r4, _0814AD80 @@ -680039,7 +680039,7 @@ sub_0814ACF8: @ 0x0814ACF8 strh r5, [r6, #0xc] ldr r0, _0814AD84 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 bl Random @@ -680127,10 +680127,10 @@ _0814ADEE: .align 2, 0 _0814AE00: .4byte gUnknown_3005B60 _0814AE04: .4byte 0x0000FFFF - thumb_func_end sub_0814ACF8 + thumb_func_end Phase2_32_Func1 - thumb_func_start sub_0814AE08 -sub_0814AE08: @ 0x0814AE08 + thumb_func_start Phase2_32_Func2 +Phase2_32_Func2: @ 0x0814AE08 push {r4, lr} sub sp, #0x24 adds r4, r0, #0 @@ -680160,9 +680160,9 @@ sub_0814AE08: @ 0x0814AE08 str r0, [sp, #0x20] movs r2, #0 movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrh r0, [r4, #0xc] adds r0, #1 strh r0, [r4, #0xc] @@ -680182,16 +680182,16 @@ _0814AE60: .align 2, 0 _0814AE6C: .4byte gUnknown_85A9503 _0814AE70: .4byte gUnknown_85A83D8 - thumb_func_end sub_0814AE08 + thumb_func_end Phase2_32_Func2 - thumb_func_start sub_0814AE74 -sub_0814AE74: @ 0x0814AE74 + thumb_func_start Phase2_32_Func3 +Phase2_32_Func3: @ 0x0814AE74 push {r4, lr} adds r4, r0, #0 ldr r0, _0814AE94 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 strh r0, [r4, #0xc] ldrh r0, [r4, #8] @@ -680203,10 +680203,10 @@ sub_0814AE74: @ 0x0814AE74 bx r1 .align 2, 0 _0814AE94: .4byte 0xFFFF7FFF - thumb_func_end sub_0814AE74 + thumb_func_end Phase2_32_Func3 - thumb_func_start sub_0814AE98 -sub_0814AE98: @ 0x0814AE98 + thumb_func_start Phase2_32_Func4 +Phase2_32_Func4: @ 0x0814AE98 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -680230,7 +680230,7 @@ sub_0814AE98: @ 0x0814AE98 movs r1, #1 bl FillBgTilemapBufferRect movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldrh r0, [r4, #0xc] adds r0, #1 strh r0, [r4, #0xc] @@ -680239,10 +680239,10 @@ sub_0814AE98: @ 0x0814AE98 cmp r0, #0x3f ble _0814AEEE ldr r0, _0814AEFC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -680255,10 +680255,10 @@ _0814AEEE: .align 2, 0 _0814AEF8: .4byte gUnknown_85A9503 _0814AEFC: .4byte sub_0814ACA4 - thumb_func_end sub_0814AE98 + thumb_func_end Phase2_32_Func4 - thumb_func_start sub_0814AF00 -sub_0814AF00: @ 0x0814AF00 + thumb_func_start Phase2_32_Func5 +Phase2_32_Func5: @ 0x0814AF00 push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -680282,17 +680282,17 @@ sub_0814AF00: @ 0x0814AF00 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, [r5] - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -680304,7 +680304,7 @@ sub_0814AF00: @ 0x0814AF00 .align 2, 0 _0814AF64: .4byte gUnknown_2022AC8 _0814AF68: .4byte gUnknown_2022ACA - thumb_func_end sub_0814AF00 + thumb_func_end Phase2_32_Func5 thumb_func_start sub_0814AF6C sub_0814AF6C: @ 0x0814AF6C @@ -680325,11 +680325,11 @@ sub_0814AF70: @ 0x0814AF70 .align 2, 0 _0814AF80: .4byte gUnknown_3005AC0 _0814AF84: .4byte gUnknown_2023D08 -_0814AF88: .4byte sub_0814AF8C +_0814AF88: .4byte LinkPartnerBufferRunCommand thumb_func_end sub_0814AF70 - thumb_func_start sub_0814AF8C -sub_0814AF8C: @ 0x0814AF8C + thumb_func_start LinkPartnerBufferRunCommand +LinkPartnerBufferRunCommand: @ 0x0814AF8C push {lr} ldr r2, _0814AFC0 ldr r1, _0814AFC4 @@ -680362,11 +680362,11 @@ _0814AFC8: .4byte gUnknown_2023D08 _0814AFCC: .4byte gUnknown_2022D08 _0814AFD0: .4byte gUnknown_85A9544 _0814AFD4: - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814AFD8: pop {r0} bx r0 - thumb_func_end sub_0814AF8C + thumb_func_end LinkPartnerBufferRunCommand thumb_func_start sub_0814AFDC sub_0814AFDC: @ 0x0814AFDC @@ -680386,7 +680386,7 @@ sub_0814AFDC: @ 0x0814AFDC ldr r0, _0814B010 cmp r1, r0 bne _0814B000 - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B000: pop {r0} bx r0 @@ -680434,7 +680434,7 @@ sub_0814B014: @ 0x0814B014 lsls r0, r0, #2 adds r0, r0, r6 bl DestroySprite - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B064: pop {r4, r5, r6} pop {r0} @@ -680474,7 +680474,7 @@ sub_0814B07C: @ 0x0814B07C adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B0B4: pop {r4} pop {r0} @@ -680488,11 +680488,11 @@ _0814B0C0: .4byte gUnknown_2023D08 sub_0814B0C4: @ 0x0814B0C4 push {r4, r5, r6, lr} movs r6, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0814B0E8 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0814B11C @@ -680556,7 +680556,7 @@ _0814B11C: _0814B152: movs r6, #1 _0814B154: - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 beq _0814B160 @@ -680680,7 +680680,7 @@ _0814B1F6: lsls r0, r0, #2 adds r0, r0, r2 strb r6, [r0, #9] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0814B2B0 @@ -680715,7 +680715,7 @@ _0814B1F6: ldr r2, _0814B344 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] mov r1, r8 eors r0, r1 @@ -680751,7 +680751,7 @@ _0814B2B0: ldr r2, _0814B344 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -680818,7 +680818,7 @@ sub_0814B350: @ 0x0814B350 ldrsh r0, [r1, r2] cmp r0, #0 bne _0814B37E - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B37E: pop {r0} bx r0 @@ -680838,7 +680838,7 @@ sub_0814B390: @ 0x0814B390 ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -680871,8 +680871,8 @@ _0814B3D8: muls r0, r2, r0 ldr r2, _0814B3FC adds r0, r0, r2 - bl sub_0805E5AC - bl sub_0814B800 + bl HandleLowHpMusicChange + bl LinkPartnerBufferExecCompleted _0814B3F2: pop {r4, r5, r6} pop {r0} @@ -680911,7 +680911,7 @@ sub_0814B400: @ 0x0814B400 ldr r1, _0814B494 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0805DB50 @@ -680939,7 +680939,7 @@ sub_0814B400: @ 0x0814B400 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B47C: pop {r4, r5, r6} pop {r0} @@ -680992,7 +680992,7 @@ sub_0814B49C: @ 0x0814B49C adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B4F0: pop {r4, r5, r6} pop {r0} @@ -681013,7 +681013,7 @@ sub_0814B50C: @ 0x0814B50C lsls r0, r0, #0x10 cmp r0, #0 bne _0814B51E - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B51E: pop {r0} bx r0 @@ -681048,7 +681048,7 @@ sub_0814B524: @ 0x0814B524 strb r0, [r2] ldr r0, _0814B56C strb r3, [r0] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted b _0814B59A .align 2, 0 _0814B560: .4byte gUnknown_2023E88 @@ -681118,7 +681118,7 @@ sub_0814B5A0: @ 0x0814B5A0 adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0814B5E6: ldr r0, _0814B60C ldrb r1, [r4] @@ -681170,7 +681170,7 @@ sub_0814B614: @ 0x0814B614 ldr r0, _0814B664 cmp r1, r0 bne _0814B650 - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B650: pop {r0} bx r0 @@ -681224,7 +681224,7 @@ sub_0814B668: @ 0x0814B668 bl FreeSpritePaletteByTag ldr r0, _0814B73C movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r0, _0814B740 mov r8, r0 ldrb r1, [r7] @@ -681235,7 +681235,7 @@ sub_0814B668: @ 0x0814B668 muls r0, r6, r0 ldr r5, _0814B744 adds r0, r0, r5 - bl sub_0805E5AC + bl HandleLowHpMusicChange ldr r1, _0814B748 ldrb r0, [r7] adds r0, r0, r1 @@ -681257,7 +681257,7 @@ sub_0814B668: @ 0x0814B668 muls r1, r6, r1 adds r1, r1, r5 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] bl sub_08076320 ldrb r0, [r7] @@ -681367,8 +681367,8 @@ _0814B7F8: .4byte gUnknown_3005AC0 _0814B7FC: .4byte sub_0814B668 thumb_func_end sub_0814B75C - thumb_func_start sub_0814B800 -sub_0814B800: @ 0x0814B800 + thumb_func_start LinkPartnerBufferExecCompleted +LinkPartnerBufferExecCompleted: @ 0x0814B800 push {r4, lr} sub sp, #4 ldr r1, _0814B840 @@ -681384,7 +681384,7 @@ sub_0814B800: @ 0x0814B800 ands r0, r1 cmp r0, #0 beq _0814B854 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -681401,7 +681401,7 @@ sub_0814B800: @ 0x0814B800 .align 2, 0 _0814B840: .4byte gUnknown_3005AC0 _0814B844: .4byte gUnknown_2023D08 -_0814B848: .4byte sub_0814AF8C +_0814B848: .4byte LinkPartnerBufferRunCommand _0814B84C: .4byte gUnknown_2022C90 _0814B850: .4byte gUnknown_2022D08 _0814B854: @@ -681422,7 +681422,7 @@ _0814B866: .align 2, 0 _0814B870: .4byte gUnknown_2023D0C _0814B874: .4byte gUnknown_82FACB4 - thumb_func_end sub_0814B800 + thumb_func_end LinkPartnerBufferExecCompleted thumb_func_start sub_0814B878 sub_0814B878: @ 0x0814B878 @@ -681441,7 +681441,7 @@ sub_0814B878: @ 0x0814B878 ands r0, r1 cmp r0, #0 bne _0814B89A - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B89A: pop {r0} bx r0 @@ -681467,7 +681467,7 @@ sub_0814B8A8: @ 0x0814B8A8 ands r0, r1 cmp r0, #0 bne _0814B8CA - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814B8CA: pop {r0} bx r0 @@ -681495,7 +681495,7 @@ sub_0814B8D8: @ 0x0814B8D8 adds r1, r1, r0 ldrb r0, [r1] mov r1, sp - bl sub_0814B94C + bl CopyLinkPartnerMonData adds r6, r0, #0 b _0814B932 .align 2, 0 @@ -681514,7 +681514,7 @@ _0814B914: lsrs r0, r0, #0x18 mov r2, sp adds r1, r2, r6 - bl sub_0814B94C + bl CopyLinkPartnerMonData adds r6, r6, r0 _0814B92A: lsrs r4, r4, #1 @@ -681526,8 +681526,8 @@ _0814B932: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_0814B800 + bl BtlController_EmitDataTransfer + bl LinkPartnerBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} @@ -681535,8 +681535,8 @@ _0814B932: .align 2, 0 thumb_func_end sub_0814B8D8 - thumb_func_start sub_0814B94C -sub_0814B94C: @ 0x0814B94C + thumb_func_start CopyLinkPartnerMonData +CopyLinkPartnerMonData: @ 0x0814B94C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -681636,12 +681636,12 @@ _0814BA7C: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -681669,12 +681669,12 @@ _0814BAC8: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -681689,21 +681689,21 @@ _0814BAC8: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -681715,7 +681715,7 @@ _0814BAC8: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -681727,7 +681727,7 @@ _0814BAC8: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -681739,7 +681739,7 @@ _0814BAC8: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -681750,7 +681750,7 @@ _0814BAC8: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -681761,7 +681761,7 @@ _0814BAC8: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -681773,55 +681773,55 @@ _0814BAC8: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -681834,7 +681834,7 @@ _0814BAC8: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -681844,19 +681844,19 @@ _0814BAC8: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _0814BC80: @@ -681907,13 +681907,13 @@ _0814BCD6: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -681927,7 +681927,7 @@ _0814BCD6: ldr r1, _0814BD24 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -681969,7 +681969,7 @@ _0814BD50: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -681980,7 +681980,7 @@ _0814BD50: ldr r1, _0814BD7C adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -682017,7 +682017,7 @@ _0814BDAC: adds r0, r0, r1 movs r1, #0x19 _0814BDB6: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -682150,27 +682150,27 @@ _0814BE9C: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _0814C0E2 @@ -682255,7 +682255,7 @@ _0814BF6C: adds r0, r0, r1 movs r1, #0x37 _0814BF76: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -682344,7 +682344,7 @@ _0814C010: adds r0, r0, r1 movs r1, #0x3f _0814C01A: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -682451,7 +682451,7 @@ _0814C0D0: adds r0, r0, r1 movs r1, #0x36 _0814C0DA: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _0814C0E2: @@ -682466,12 +682466,12 @@ _0814C0E2: bx r1 .align 2, 0 _0814C0F4: .4byte gUnknown_2024190 - thumb_func_end sub_0814B94C + thumb_func_end CopyLinkPartnerMonData thumb_func_start sub_0814C0F8 sub_0814C0F8: @ 0x0814C0F8 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -682493,7 +682493,7 @@ sub_0814C104: @ 0x0814C104 lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_0814C15C + bl SetLinkPartnerMonData b _0814C152 .align 2, 0 _0814C128: .4byte gUnknown_2022D08 @@ -682508,7 +682508,7 @@ _0814C138: cmp r0, #0 beq _0814C146 adds r0, r5, #0 - bl sub_0814C15C + bl SetLinkPartnerMonData _0814C146: lsrs r4, r4, #1 adds r0, r5, #1 @@ -682517,14 +682517,14 @@ _0814C146: cmp r5, #5 bls _0814C138 _0814C152: - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_0814C104 - thumb_func_start sub_0814C15C -sub_0814C15C: @ 0x0814C15C + thumb_func_start SetLinkPartnerMonData +SetLinkPartnerMonData: @ 0x0814C15C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -682626,12 +682626,12 @@ _0814C290: adds r0, r4, #0 movs r1, #0xb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -682672,12 +682672,12 @@ _0814C2F6: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r7, #1 adds r4, #2 movs r0, #1 @@ -682693,15 +682693,15 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -682710,7 +682710,7 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x14] lsls r0, r0, #0x16 @@ -682719,7 +682719,7 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x15] lsls r0, r0, #0x19 @@ -682728,7 +682728,7 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r6, #0x14] lsls r0, r0, #0xc @@ -682737,7 +682737,7 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x16] lsls r0, r0, #0x17 @@ -682746,7 +682746,7 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x17] lsls r0, r0, #0x1a @@ -682755,47 +682755,47 @@ _0814C2F6: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C424: .4byte gUnknown_2024190 @@ -682809,7 +682809,7 @@ _0814C428: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C440: .4byte gUnknown_2024190 @@ -682824,7 +682824,7 @@ _0814C448: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C460: .4byte gUnknown_2024190 @@ -682848,12 +682848,12 @@ _0814C482: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -682867,7 +682867,7 @@ _0814C482: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C4BC: .4byte gUnknown_2024190 @@ -682901,35 +682901,35 @@ _0814C4E8: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x11 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C544: .4byte gUnknown_2024190 @@ -682950,7 +682950,7 @@ _0814C54C: _0814C564: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C570: .4byte gUnknown_2024190 @@ -682966,7 +682966,7 @@ _0814C57C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C594: .4byte gUnknown_2024190 @@ -682981,7 +682981,7 @@ _0814C59C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C5B4: .4byte gUnknown_2024190 @@ -682996,7 +682996,7 @@ _0814C5BC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C5D4: .4byte gUnknown_2024190 @@ -683011,7 +683011,7 @@ _0814C5DC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C5F4: .4byte gUnknown_2024190 @@ -683026,7 +683026,7 @@ _0814C5FC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C614: .4byte gUnknown_2024190 @@ -683041,7 +683041,7 @@ _0814C61C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C634: .4byte gUnknown_2024190 @@ -683056,7 +683056,7 @@ _0814C63C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C654: .4byte gUnknown_2024190 @@ -683071,7 +683071,7 @@ _0814C65C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C674: .4byte gUnknown_2024190 @@ -683086,7 +683086,7 @@ _0814C67C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C694: .4byte gUnknown_2024190 @@ -683101,7 +683101,7 @@ _0814C69C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C6B4: .4byte gUnknown_2024190 @@ -683116,7 +683116,7 @@ _0814C6BC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C6D4: .4byte gUnknown_2024190 @@ -683131,7 +683131,7 @@ _0814C6DC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C6F4: .4byte gUnknown_2024190 @@ -683146,7 +683146,7 @@ _0814C6FC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C714: .4byte gUnknown_2024190 @@ -683161,7 +683161,7 @@ _0814C71C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C734: .4byte gUnknown_2024190 @@ -683178,35 +683178,35 @@ _0814C73C: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #5 @@ -683226,7 +683226,7 @@ _0814C7AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C7C4: .4byte gUnknown_2024190 @@ -683241,7 +683241,7 @@ _0814C7CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C7E4: .4byte gUnknown_2024190 @@ -683256,7 +683256,7 @@ _0814C7EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C804: .4byte gUnknown_2024190 @@ -683271,7 +683271,7 @@ _0814C80C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C824: .4byte gUnknown_2024190 @@ -683286,7 +683286,7 @@ _0814C82C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C844: .4byte gUnknown_2024190 @@ -683302,7 +683302,7 @@ _0814C84C: adds r2, r2, r7 _0814C85C: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C864: .4byte gUnknown_2024190 @@ -683317,7 +683317,7 @@ _0814C86C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C884: .4byte gUnknown_2024190 @@ -683332,7 +683332,7 @@ _0814C88C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C8A4: .4byte gUnknown_2024190 @@ -683347,7 +683347,7 @@ _0814C8AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C8C4: .4byte gUnknown_2024190 @@ -683362,7 +683362,7 @@ _0814C8CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C8E4: .4byte gUnknown_2024190 @@ -683377,7 +683377,7 @@ _0814C8EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C904: .4byte gUnknown_2024190 @@ -683392,7 +683392,7 @@ _0814C90C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C924: .4byte gUnknown_2024190 @@ -683407,7 +683407,7 @@ _0814C92C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C944: .4byte gUnknown_2024190 @@ -683422,7 +683422,7 @@ _0814C94C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C964: .4byte gUnknown_2024190 @@ -683437,7 +683437,7 @@ _0814C96C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C984: .4byte gUnknown_2024190 @@ -683452,7 +683452,7 @@ _0814C98C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C9A4: .4byte gUnknown_2024190 @@ -683467,7 +683467,7 @@ _0814C9AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C9C4: .4byte gUnknown_2024190 @@ -683482,7 +683482,7 @@ _0814C9CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814C9E4: .4byte gUnknown_2024190 @@ -683497,7 +683497,7 @@ _0814C9EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CA04: .4byte gUnknown_2024190 @@ -683512,7 +683512,7 @@ _0814CA0C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CA24: .4byte gUnknown_2024190 @@ -683527,7 +683527,7 @@ _0814CA2C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CA44: .4byte gUnknown_2024190 @@ -683542,7 +683542,7 @@ _0814CA4C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CA64: .4byte gUnknown_2024190 @@ -683557,7 +683557,7 @@ _0814CA6C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CA84: .4byte gUnknown_2024190 @@ -683572,7 +683572,7 @@ _0814CA8C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CAA4: .4byte gUnknown_2024190 @@ -683587,7 +683587,7 @@ _0814CAAC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CAC4: .4byte gUnknown_2024190 @@ -683602,7 +683602,7 @@ _0814CACC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CAE4: .4byte gUnknown_2024190 @@ -683617,7 +683617,7 @@ _0814CAEC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _0814CB22 .align 2, 0 _0814CB04: .4byte gUnknown_2024190 @@ -683632,7 +683632,7 @@ _0814CB0C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _0814CB22: ldr r2, _0814CB54 ldr r0, _0814CB50 @@ -683644,7 +683644,7 @@ _0814CB22: muls r0, r2, r0 ldr r2, _0814CB4C adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange add sp, #0x34 pop {r3, r4, r5} mov r8, r3 @@ -683657,7 +683657,7 @@ _0814CB22: _0814CB4C: .4byte gUnknown_2024190 _0814CB50: .4byte gUnknown_2023D08 _0814CB54: .4byte gUnknown_2023D12 - thumb_func_end sub_0814C15C + thumb_func_end SetLinkPartnerMonData thumb_func_start sub_0814CB58 sub_0814CB58: @ 0x0814CB58 @@ -683707,7 +683707,7 @@ _0814CB8E: cmp r3, r0 blo _0814CB8E _0814CBB0: - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -683718,8 +683718,8 @@ _0814CBC4: .4byte gUnknown_2022D08 _0814CBC8: .4byte gUnknown_2024190 thumb_func_end sub_0814CB58 - thumb_func_start sub_0814CBCC -sub_0814CBCC: @ 0x0814CBCC + thumb_func_start LinkPartnerHandleLoadMonSprite +LinkPartnerHandleLoadMonSprite: @ 0x0814CBCC push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -683734,7 +683734,7 @@ sub_0814CBCC: @ 0x0814CBCC muls r0, r5, r0 ldr r4, _0814CCC8 adds r0, r0, r4 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r6] lsls r0, r0, #1 add r0, r8 @@ -683742,7 +683742,7 @@ sub_0814CBCC: @ 0x0814CBCC muls r0, r5, r0 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -683752,12 +683752,12 @@ sub_0814CBCC: @ 0x0814CBCC lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0814CCCC mov r8, r0 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -683774,7 +683774,7 @@ sub_0814CBCC: @ 0x0814CBCC mov r0, r8 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0814CCD0 ldrb r1, [r6] adds r1, r1, r4 @@ -683843,7 +683843,7 @@ _0814CCD8: .4byte 0x0000FF10 _0814CCDC: .4byte gUnknown_2024188 _0814CCE0: .4byte gUnknown_3005AC0 _0814CCE4: .4byte sub_0814B350 - thumb_func_end sub_0814CBCC + thumb_func_end LinkPartnerHandleLoadMonSprite thumb_func_start sub_0814CCE8 sub_0814CCE8: @ 0x0814CCE8 @@ -683873,7 +683873,7 @@ sub_0814CCE8: @ 0x0814CCE8 muls r0, r2, r0 ldr r2, _0814CD4C adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r5] lsls r1, r0, #9 adds r1, r1, r6 @@ -683926,13 +683926,13 @@ sub_0814CD58: @ 0x0814CD58 ldr r1, _0814CEB4 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _0814CEB8 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _0814CEBC mov sb, r1 add sb, r6 @@ -683944,12 +683944,12 @@ sub_0814CD58: @ 0x0814CD58 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0814CEC0 mov sl, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -683966,7 +683966,7 @@ sub_0814CD58: @ 0x0814CD58 mov r0, sl adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0814CEC4 adds r4, r6, r4 strb r0, [r4] @@ -684040,7 +684040,7 @@ sub_0814CD58: @ 0x0814CD58 str r1, [r0] movs r0, #0 movs r1, #0xff - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sb ldrb r2, [r1] lsls r1, r2, #4 @@ -684070,8 +684070,8 @@ _0814CECC: .4byte gUnknown_2024188 _0814CED0: .4byte sub_08007140 thumb_func_end sub_0814CD58 - thumb_func_start sub_0814CED4 -sub_0814CED4: @ 0x0814CED4 + thumb_func_start LinkPartnerHandleReturnMonToBall +LinkPartnerHandleReturnMonToBall: @ 0x0814CED4 push {r4, r5, r6, lr} ldr r1, _0814CF08 ldr r6, _0814CF0C @@ -684126,7 +684126,7 @@ _0814CF1C: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814CF52: pop {r4, r5, r6} pop {r0} @@ -684135,7 +684135,7 @@ _0814CF52: _0814CF58: .4byte gUnknown_2023E88 _0814CF5C: .4byte gUnknown_20205AC _0814CF60: .4byte gUnknown_3005AD0 - thumb_func_end sub_0814CED4 + thumb_func_end LinkPartnerHandleReturnMonToBall thumb_func_start sub_0814CF64 sub_0814CF64: @ 0x0814CF64 @@ -684170,7 +684170,7 @@ _0814CF8C: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0814CFA6: ldr r0, [r6] ldrb r1, [r5] @@ -684195,7 +684195,7 @@ _0814CFBA: adds r0, r2, #0 adds r1, r2, #0 movs r3, #1 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _0814CFE8 ldrb r0, [r5] lsls r0, r0, #2 @@ -684211,8 +684211,8 @@ _0814CFE8: .4byte gUnknown_3005AC0 _0814CFEC: .4byte sub_0814B49C thumb_func_end sub_0814CF64 - thumb_func_start sub_0814CFF0 -sub_0814CFF0: @ 0x0814CFF0 + thumb_func_start LinkPartnerHandleDrawTrainerPic +LinkPartnerHandleDrawTrainerPic: @ 0x0814CFF0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -684240,7 +684240,7 @@ _0814D020: _0814D022: ldr r5, _0814D068 ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId ldr r6, _0814D06C lsls r1, r0, #3 subs r1, r1, r0 @@ -684251,7 +684251,7 @@ _0814D022: cmp r0, #4 beq _0814D054 ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -684263,7 +684263,7 @@ _0814D022: bne _0814D070 _0814D054: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -684276,7 +684276,7 @@ _0814D068: .4byte gUnknown_2023D08 _0814D06C: .4byte gUnknown_20226A0 _0814D070: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -684287,7 +684287,7 @@ _0814D070: cmp r0, #2 beq _0814D09E ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -684298,7 +684298,7 @@ _0814D070: bne _0814D0B2 _0814D09E: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -684308,7 +684308,7 @@ _0814D09E: b _0814D0C2 _0814D0B2: ldrb r0, [r5] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -684318,14 +684318,14 @@ _0814D0C2: ldr r5, _0814D180 ldrb r1, [r5] adds r0, r4, #0 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _0814D184 mov r8, r7 ldr r0, _0814D188 @@ -684347,7 +684347,7 @@ _0814D0C2: adds r0, r6, #0 mov r1, r8 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _0814D18C ldrb r1, [r5] adds r1, r1, r6 @@ -684415,19 +684415,19 @@ _0814D194: .4byte 0x0000FFFE _0814D198: .4byte sub_0805D3C8 _0814D19C: .4byte gUnknown_3005AC0 _0814D1A0: .4byte sub_0814AFDC - thumb_func_end sub_0814CFF0 + thumb_func_end LinkPartnerHandleDrawTrainerPic - thumb_func_start sub_0814D1A4 -sub_0814D1A4: @ 0x0814D1A4 + thumb_func_start LinkPartnerHandleTrainerSlide +LinkPartnerHandleTrainerSlide: @ 0x0814D1A4 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D1A4 + thumb_func_end LinkPartnerHandleTrainerSlide - thumb_func_start sub_0814D1B0 -sub_0814D1B0: @ 0x0814D1B0 + thumb_func_start LinkPartnerHandleTrainerSlideBack +LinkPartnerHandleTrainerSlideBack: @ 0x0814D1B0 push {r4, r5, r6, lr} ldr r6, _0814D23C ldr r4, _0814D240 @@ -684486,7 +684486,7 @@ sub_0814D1B0: @ 0x0814D1B0 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _0814D250 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _0814D254 ldrb r0, [r4] lsls r0, r0, #2 @@ -684505,7 +684505,7 @@ _0814D24C: .4byte sub_080A67B4 _0814D250: .4byte sub_08007140 _0814D254: .4byte gUnknown_3005AC0 _0814D258: .4byte sub_0814B014 - thumb_func_end sub_0814D1B0 + thumb_func_end LinkPartnerHandleTrainerSlideBack thumb_func_start sub_0814D25C sub_0814D25C: @ 0x0814D25C @@ -684533,7 +684533,7 @@ sub_0814D25C: @ 0x0814D25C adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0814D290: ldr r0, [r6] ldrb r1, [r5] @@ -684567,11 +684567,11 @@ _0814D2B0: muls r0, r2, r0 ldr r2, _0814D330 adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange movs r1, #0x40 rsbs r1, r1, #0 movs r0, #0x10 - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _0814D334 ldr r3, _0814D338 ldrb r0, [r5] @@ -684621,41 +684621,41 @@ _0814D340: .4byte gUnknown_3005AC0 _0814D344: .4byte sub_0814B400 thumb_func_end sub_0814D25C - thumb_func_start sub_0814D348 -sub_0814D348: @ 0x0814D348 + thumb_func_start LinkPartnerHandlePaletteFade +LinkPartnerHandlePaletteFade: @ 0x0814D348 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D348 + thumb_func_end LinkPartnerHandlePaletteFade - thumb_func_start sub_0814D354 -sub_0814D354: @ 0x0814D354 + thumb_func_start LinkPartnerHandleSuccessBallThrowAnim +LinkPartnerHandleSuccessBallThrowAnim: @ 0x0814D354 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D354 + thumb_func_end LinkPartnerHandleSuccessBallThrowAnim - thumb_func_start sub_0814D360 -sub_0814D360: @ 0x0814D360 + thumb_func_start LinkPartnerHandleBallThrowAnim +LinkPartnerHandleBallThrowAnim: @ 0x0814D360 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D360 + thumb_func_end LinkPartnerHandleBallThrowAnim - thumb_func_start sub_0814D36C -sub_0814D36C: @ 0x0814D36C + thumb_func_start LinkPartnerHandlePause +LinkPartnerHandlePause: @ 0x0814D36C push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D36C + thumb_func_end LinkPartnerHandlePause thumb_func_start sub_0814D378 sub_0814D378: @ 0x0814D378 @@ -684664,7 +684664,7 @@ sub_0814D378: @ 0x0814D378 push {r7} ldr r5, _0814D468 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _0814D38E @@ -684774,7 +684774,7 @@ _0814D38E: lsrs r3, r0, #0x18 cmp r3, #0 beq _0814D48C - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted b _0814D4B4 .align 2, 0 _0814D468: .4byte gUnknown_2023D08 @@ -684805,7 +684805,7 @@ _0814D48C: ldrh r1, [r4] ldr r2, [r7] adds r0, r6, #0 - bl sub_0817DFA8 + bl BattleTv_SetDataBasedOnMove _0814D4B4: pop {r3} mov r8, r3 @@ -684884,7 +684884,7 @@ _0814D52E: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0814D550: ldr r0, [r7] ldrb r1, [r6] @@ -684942,7 +684942,7 @@ _0814D58E: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -684998,7 +684998,7 @@ _0814D604: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814D640: pop {r3, r4, r5} mov r8, r3 @@ -685010,8 +685010,8 @@ _0814D640: .align 2, 0 thumb_func_end sub_0814D4CC - thumb_func_start sub_0814D650 -sub_0814D650: @ 0x0814D650 + thumb_func_start LinkPartnerHandlePrintString +LinkPartnerHandlePrintString: @ 0x0814D650 push {r4, r5, lr} ldr r0, _0814D68C movs r1, #0 @@ -685024,7 +685024,7 @@ sub_0814D650: @ 0x0814D650 ldr r0, _0814D698 adds r4, r4, r0 ldrh r0, [r4] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _0814D69C movs r1, #0 bl sub_0814FA04 @@ -685035,7 +685035,7 @@ sub_0814D650: @ 0x0814D650 ldr r1, _0814D6A4 str r1, [r0] ldrh r0, [r4] - bl sub_0817C808 + bl BattleTv_SetDataBasedOnString pop {r4, r5} pop {r0} bx r0 @@ -685047,30 +685047,30 @@ _0814D698: .4byte gUnknown_2022D0A _0814D69C: .4byte gUnknown_2022AE0 _0814D6A0: .4byte gUnknown_3005AC0 _0814D6A4: .4byte sub_0814B50C - thumb_func_end sub_0814D650 + thumb_func_end LinkPartnerHandlePrintString - thumb_func_start sub_0814D6A8 -sub_0814D6A8: @ 0x0814D6A8 + thumb_func_start LinkPartnerHandlePrintSelectionString +LinkPartnerHandlePrintSelectionString: @ 0x0814D6A8 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D6A8 + thumb_func_end LinkPartnerHandlePrintSelectionString - thumb_func_start sub_0814D6B4 -sub_0814D6B4: @ 0x0814D6B4 + thumb_func_start LinkPartnerHandleChooseAction +LinkPartnerHandleChooseAction: @ 0x0814D6B4 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D6B4 + thumb_func_end LinkPartnerHandleChooseAction thumb_func_start sub_0814D6C0 sub_0814D6C0: @ 0x0814D6C0 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -685079,48 +685079,48 @@ sub_0814D6C0: @ 0x0814D6C0 thumb_func_start sub_0814D6CC sub_0814D6CC: @ 0x0814D6CC push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0814D6CC - thumb_func_start sub_0814D6D8 -sub_0814D6D8: @ 0x0814D6D8 + thumb_func_start LinkPartnerHandleChooseItem +LinkPartnerHandleChooseItem: @ 0x0814D6D8 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D6D8 + thumb_func_end LinkPartnerHandleChooseItem - thumb_func_start sub_0814D6E4 -sub_0814D6E4: @ 0x0814D6E4 + thumb_func_start LinkPartnerHandleChoosePokemon +LinkPartnerHandleChoosePokemon: @ 0x0814D6E4 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D6E4 + thumb_func_end LinkPartnerHandleChoosePokemon - thumb_func_start sub_0814D6F0 -sub_0814D6F0: @ 0x0814D6F0 + thumb_func_start LinkPartnerHandleCmd23 +LinkPartnerHandleCmd23: @ 0x0814D6F0 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D6F0 + thumb_func_end LinkPartnerHandleCmd23 - thumb_func_start sub_0814D6FC -sub_0814D6FC: @ 0x0814D6FC + thumb_func_start LinkPartnerHandleHealthBarUpdate +LinkPartnerHandleHealthBarUpdate: @ 0x0814D6FC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _0814D774 ldr r0, _0814D778 mov sb, r0 @@ -685148,7 +685148,7 @@ sub_0814D6FC: @ 0x0814D6FC ldr r4, _0814D784 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -685158,7 +685158,7 @@ sub_0814D6FC: @ 0x0814D6FC muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -685186,7 +685186,7 @@ _0814D78C: ldr r1, _0814D7D8 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -685218,23 +685218,23 @@ _0814D7DC: .4byte gUnknown_3005AD0 _0814D7E0: .4byte gUnknown_3005AC0 _0814D7E4: .4byte gUnknown_2023D08 _0814D7E8: .4byte sub_0814B390 - thumb_func_end sub_0814D6FC + thumb_func_end LinkPartnerHandleHealthBarUpdate - thumb_func_start sub_0814D7EC -sub_0814D7EC: @ 0x0814D7EC + thumb_func_start LinkPartnerHandleExpUpdate +LinkPartnerHandleExpUpdate: @ 0x0814D7EC push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D7EC + thumb_func_end LinkPartnerHandleExpUpdate thumb_func_start sub_0814D7F8 sub_0814D7F8: @ 0x0814D7F8 push {r4, lr} ldr r4, _0814D854 ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0814D84C @@ -685251,7 +685251,7 @@ sub_0814D7F8: @ 0x0814D7F8 ldr r2, _0814D860 adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _0814D864 ldr r0, [r0] @@ -685290,7 +685290,7 @@ sub_0814D870: @ 0x0814D870 push {r4, r5, lr} ldr r5, _0814D8C8 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0814D8C0 @@ -685318,7 +685318,7 @@ sub_0814D870: @ 0x0814D870 ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _0814D8D0 ldrb r0, [r5] lsls r0, r0, #2 @@ -685336,86 +685336,86 @@ _0814D8D0: .4byte gUnknown_3005AC0 _0814D8D4: .4byte sub_0814B878 thumb_func_end sub_0814D870 - thumb_func_start sub_0814D8D8 -sub_0814D8D8: @ 0x0814D8D8 + thumb_func_start LinkPartnerHandleStatusXor +LinkPartnerHandleStatusXor: @ 0x0814D8D8 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D8D8 + thumb_func_end LinkPartnerHandleStatusXor - thumb_func_start sub_0814D8E4 -sub_0814D8E4: @ 0x0814D8E4 + thumb_func_start LinkPartnerHandleDataTransfer +LinkPartnerHandleDataTransfer: @ 0x0814D8E4 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D8E4 + thumb_func_end LinkPartnerHandleDataTransfer - thumb_func_start sub_0814D8F0 -sub_0814D8F0: @ 0x0814D8F0 + thumb_func_start LinkPartnerHandleDMA3Transfer +LinkPartnerHandleDMA3Transfer: @ 0x0814D8F0 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D8F0 + thumb_func_end LinkPartnerHandleDMA3Transfer - thumb_func_start sub_0814D8FC -sub_0814D8FC: @ 0x0814D8FC + thumb_func_start LinkPartnerHandlePlayBGM +LinkPartnerHandlePlayBGM: @ 0x0814D8FC push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D8FC + thumb_func_end LinkPartnerHandlePlayBGM - thumb_func_start sub_0814D908 -sub_0814D908: @ 0x0814D908 + thumb_func_start LinkPartnerHandleCmd32 +LinkPartnerHandleCmd32: @ 0x0814D908 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D908 + thumb_func_end LinkPartnerHandleCmd32 - thumb_func_start sub_0814D914 -sub_0814D914: @ 0x0814D914 + thumb_func_start LinkPartnerHandleTwoReturnValues +LinkPartnerHandleTwoReturnValues: @ 0x0814D914 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D914 + thumb_func_end LinkPartnerHandleTwoReturnValues - thumb_func_start sub_0814D920 -sub_0814D920: @ 0x0814D920 + thumb_func_start LinkPartnerHandleChosenMonReturnValue +LinkPartnerHandleChosenMonReturnValue: @ 0x0814D920 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D920 + thumb_func_end LinkPartnerHandleChosenMonReturnValue - thumb_func_start sub_0814D92C -sub_0814D92C: @ 0x0814D92C + thumb_func_start LinkPartnerHandleOneReturnValue +LinkPartnerHandleOneReturnValue: @ 0x0814D92C push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D92C + thumb_func_end LinkPartnerHandleOneReturnValue - thumb_func_start sub_0814D938 -sub_0814D938: @ 0x0814D938 + thumb_func_start LinkPartnerHandleOneReturnValue_Duplicate +LinkPartnerHandleOneReturnValue_Duplicate: @ 0x0814D938 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814D938 + thumb_func_end LinkPartnerHandleOneReturnValue_Duplicate thumb_func_start LinkPartnerHandleCmd37 LinkPartnerHandleCmd37: @ 0x0814D944 @@ -685426,7 +685426,7 @@ LinkPartnerHandleCmd37: @ 0x0814D944 rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -685452,7 +685452,7 @@ LinkPartnerHandleCmd38: @ 0x0814D960 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -685469,7 +685469,7 @@ LinkPartnerHandleCmd39: @ 0x0814D998 movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -685491,7 +685491,7 @@ LinkPartnerHandleCmd40: @ 0x0814D9B0 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -685516,7 +685516,7 @@ sub_0814D9D8: @ 0x0814D9D8 lsls r0, r0, #0x1d cmp r0, #0 bge _0814DA0C - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted b _0814DA36 .align 2, 0 _0814DA00: .4byte gUnknown_20205AC @@ -685553,21 +685553,21 @@ _0814DA40: .4byte gUnknown_3005AC0 _0814DA44: .4byte sub_0814B524 thumb_func_end sub_0814D9D8 - thumb_func_start sub_0814DA48 -sub_0814DA48: @ 0x0814DA48 + thumb_func_start LinkPartnerHandleCmd42 +LinkPartnerHandleCmd42: @ 0x0814DA48 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814DA48 + thumb_func_end LinkPartnerHandleCmd42 thumb_func_start sub_0814DA54 sub_0814DA54: @ 0x0814DA54 push {r4, lr} ldr r4, _0814DA90 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -685587,8 +685587,8 @@ _0814DA68: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_0814B800 + bl PlaySE12WithPanning + bl LinkPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -685597,8 +685597,8 @@ _0814DA90: .4byte gUnknown_2023D08 _0814DA94: .4byte gUnknown_2022D08 thumb_func_end sub_0814DA54 - thumb_func_start sub_0814DA98 -sub_0814DA98: @ 0x0814DA98 + thumb_func_start LinkPartnerHandlePlayFanfareOrBGM +LinkPartnerHandlePlayFanfareOrBGM: @ 0x0814DA98 push {r4, r5, lr} ldr r4, _0814DACC ldr r5, _0814DAD0 @@ -685609,7 +685609,7 @@ sub_0814DA98: @ 0x0814DA98 ldrb r0, [r0] cmp r0, #0 beq _0814DAD4 - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -685620,7 +685620,7 @@ sub_0814DA98: @ 0x0814DA98 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _0814DAE8 .align 2, 0 _0814DACC: .4byte gUnknown_2022D08 @@ -685634,17 +685634,17 @@ _0814DAD4: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _0814DAE8: - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814DA98 + thumb_func_end LinkPartnerHandlePlayFanfareOrBGM - thumb_func_start sub_0814DAF4 -sub_0814DAF4: @ 0x0814DAF4 + thumb_func_start LinkPartnerHandleFaintingCry +LinkPartnerHandleFaintingCry: @ 0x0814DAF4 push {lr} ldr r1, _0814DB28 ldr r0, _0814DB2C @@ -685657,24 +685657,24 @@ sub_0814DAF4: @ 0x0814DAF4 ldr r1, _0814DB30 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 rsbs r1, r1, #0 movs r2, #5 - bl sub_080A2BAC - bl sub_0814B800 + bl PlayCry3 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0814DB28: .4byte gUnknown_2023D12 _0814DB2C: .4byte gUnknown_2023D08 _0814DB30: .4byte gUnknown_2024190 - thumb_func_end sub_0814DAF4 + thumb_func_end LinkPartnerHandleFaintingCry - thumb_func_start sub_0814DB34 -sub_0814DB34: @ 0x0814DB34 + thumb_func_start LinkPartnerHandleIntroSlide +LinkPartnerHandleIntroSlide: @ 0x0814DB34 push {lr} ldr r1, _0814DB5C ldr r0, _0814DB60 @@ -685683,23 +685683,23 @@ sub_0814DB34: @ 0x0814DB34 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _0814DB64 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0814DB5C: .4byte gUnknown_2022D08 _0814DB60: .4byte gUnknown_2023D08 _0814DB64: .4byte gUnknown_20240A0 - thumb_func_end sub_0814DB34 + thumb_func_end LinkPartnerHandleIntroSlide - thumb_func_start sub_0814DB68 -sub_0814DB68: @ 0x0814DB68 + thumb_func_start LinkPartnerHandleIntroTrainerBallThrow +LinkPartnerHandleIntroTrainerBallThrow: @ 0x0814DB68 push {r4, r5, r6, r7, lr} ldr r5, _0814DC54 ldr r6, _0814DC58 @@ -685766,7 +685766,7 @@ sub_0814DB68: @ 0x0814DB68 lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _0814DC68 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r0, [r6] adds r0, r0, r5 ldrb r1, [r0] @@ -685781,7 +685781,7 @@ sub_0814DB68: @ 0x0814DB68 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId ldr r4, _0814DC70 lsls r1, r0, #3 subs r1, r1, r0 @@ -685792,7 +685792,7 @@ sub_0814DB68: @ 0x0814DB68 cmp r0, #4 beq _0814DC40 ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -685804,7 +685804,7 @@ sub_0814DB68: @ 0x0814DB68 bne _0814DC74 _0814DC40: ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -685823,7 +685823,7 @@ _0814DC6C: .4byte 0x0000D6F9 _0814DC70: .4byte gUnknown_20226A0 _0814DC74: ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -685834,7 +685834,7 @@ _0814DC74: cmp r0, #2 beq _0814DCA2 ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -685845,7 +685845,7 @@ _0814DC74: bne _0814DCB6 _0814DCA2: ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -685855,7 +685855,7 @@ _0814DCA2: b _0814DCC6 _0814DCB6: ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -685871,7 +685871,7 @@ _0814DCC6: lsls r2, r2, #1 adds r1, r4, r2 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r2, _0814DD64 ldr r1, _0814DD68 ldr r5, _0814DD6C @@ -685889,7 +685889,7 @@ _0814DCC6: strb r0, [r1, #5] ldr r0, _0814DD70 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _0814DD74 @@ -685946,10 +685946,10 @@ _0814DD70: .4byte sub_0814DD8C _0814DD74: .4byte gUnknown_3005B60 _0814DD78: .4byte gUnknown_2024174 _0814DD7C: .4byte gUnknown_2024158 -_0814DD80: .4byte sub_0807352C +_0814DD80: .4byte Task_HidePartyStatusSummary _0814DD84: .4byte gUnknown_3005AC0 _0814DD88: .4byte sub_0814AF6C - thumb_func_end sub_0814DB68 + thumb_func_end LinkPartnerHandleIntroTrainerBallThrow thumb_func_start sub_0814DD8C sub_0814DD8C: @ 0x0814DD8C @@ -685981,7 +685981,7 @@ _0814DDB8: mov sb, r0 ldrh r0, [r1, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0814DDD8 @@ -686044,7 +686044,7 @@ _0814DE08: muls r0, r2, r0 ldr r2, _0814DE88 adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r7] movs r1, #0 bl sub_0814CD58 @@ -686062,7 +686062,7 @@ _0814DE5C: mov r3, sb strb r3, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _0814DE74: pop {r3, r4} mov r8, r3 @@ -686079,8 +686079,8 @@ _0814DE90: .4byte gUnknown_2023D08 _0814DE94: .4byte sub_0814B1A8 thumb_func_end sub_0814DD8C - thumb_func_start sub_0814DE98 -sub_0814DE98: @ 0x0814DE98 + thumb_func_start LinkPartnerHandleDrawPartyStatusSummary +LinkPartnerHandleDrawPartyStatusSummary: @ 0x0814DE98 push {r4, r5, r6, lr} ldr r1, _0814DEC0 ldr r0, _0814DEC4 @@ -686092,11 +686092,11 @@ sub_0814DE98: @ 0x0814DE98 cmp r0, #0 beq _0814DEC8 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814DEC8 - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted b _0814DF3C .align 2, 0 _0814DEC0: .4byte gUnknown_2022D08 @@ -686125,7 +686125,7 @@ _0814DEC8: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _0814DF50 ldrb r1, [r5] adds r1, r1, r2 @@ -686171,7 +686171,7 @@ _0814DF4C: .4byte gUnknown_2022D0C _0814DF50: .4byte gUnknown_2024158 _0814DF54: .4byte gUnknown_3005AC0 _0814DF58: .4byte sub_0814DF5C - thumb_func_end sub_0814DE98 + thumb_func_end LinkPartnerHandleDrawPartyStatusSummary thumb_func_start sub_0814DF5C sub_0814DF5C: @ 0x0814DF5C @@ -686201,7 +686201,7 @@ sub_0814DF5C: @ 0x0814DF5C adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted _0814DF94: pop {r4} pop {r0} @@ -686239,7 +686239,7 @@ LinkPartnerHandleHidePartyStatusSummary: @ 0x0814DFA4 ldr r1, _0814DFF0 str r1, [r0] _0814DFD6: - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -686247,24 +686247,24 @@ _0814DFE0: .4byte gUnknown_2024174 _0814DFE4: .4byte gUnknown_2023D08 _0814DFE8: .4byte gUnknown_3005B60 _0814DFEC: .4byte gUnknown_2024158 -_0814DFF0: .4byte sub_0807352C +_0814DFF0: .4byte Task_HidePartyStatusSummary thumb_func_end LinkPartnerHandleHidePartyStatusSummary - thumb_func_start sub_0814DFF4 -sub_0814DFF4: @ 0x0814DFF4 + thumb_func_start LinkPartnerHandleEndBounceEffect +LinkPartnerHandleEndBounceEffect: @ 0x0814DFF4 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814DFF4 + thumb_func_end LinkPartnerHandleEndBounceEffect - thumb_func_start sub_0814E000 -sub_0814E000: @ 0x0814E000 + thumb_func_start LinkPartnerHandleSpriteInvisibility +LinkPartnerHandleSpriteInvisibility: @ 0x0814E000 push {r4, lr} ldr r4, _0814E050 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _0814E046 @@ -686295,7 +686295,7 @@ sub_0814E000: @ 0x0814E000 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _0814E046: - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -686304,15 +686304,15 @@ _0814E050: .4byte gUnknown_2023D08 _0814E054: .4byte gUnknown_20205AC _0814E058: .4byte gUnknown_2023E88 _0814E05C: .4byte gUnknown_2022D08 - thumb_func_end sub_0814E000 + thumb_func_end LinkPartnerHandleSpriteInvisibility - thumb_func_start sub_0814E060 -sub_0814E060: @ 0x0814E060 + thumb_func_start LinkPartnerHandleBattleAnimation +LinkPartnerHandleBattleAnimation: @ 0x0814E060 push {r4, r5, r6, lr} sub sp, #4 ldr r5, _0814E0A8 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0814E0C2 @@ -686334,11 +686334,11 @@ sub_0814E060: @ 0x0814E060 adds r0, r2, #0 adds r1, r2, #0 adds r3, r6, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _0814E0B0 - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted b _0814E0BC .align 2, 0 _0814E0A8: .4byte gUnknown_2023D08 @@ -686352,7 +686352,7 @@ _0814E0B0: str r0, [r1] _0814E0BC: adds r0, r6, #0 - bl sub_0817E1D8 + bl BattleTv_SetDataBasedOnAnimation _0814E0C2: add sp, #4 pop {r4, r5, r6} @@ -686361,10 +686361,10 @@ _0814E0C2: .align 2, 0 _0814E0CC: .4byte gUnknown_3005AC0 _0814E0D0: .4byte sub_0814B8A8 - thumb_func_end sub_0814E060 + thumb_func_end LinkPartnerHandleBattleAnimation - thumb_func_start sub_0814E0D4 -sub_0814E0D4: @ 0x0814E0D4 + thumb_func_start LinkPartnerHandleLinkStandbyMsg +LinkPartnerHandleLinkStandbyMsg: @ 0x0814E0D4 push {lr} ldr r0, _0814E0EC ldrb r0, [r0] @@ -686372,25 +686372,25 @@ sub_0814E0D4: @ 0x0814E0D4 ldr r1, _0814E0F0 adds r0, r0, r1 bl sub_08185008 - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0814E0EC: .4byte gUnknown_2023D08 _0814E0F0: .4byte gUnknown_2022D0A - thumb_func_end sub_0814E0D4 + thumb_func_end LinkPartnerHandleLinkStandbyMsg - thumb_func_start sub_0814E0F4 -sub_0814E0F4: @ 0x0814E0F4 + thumb_func_start LinkPartnerHandleResetActionMoveSelection +LinkPartnerHandleResetActionMoveSelection: @ 0x0814E0F4 push {lr} - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814E0F4 + thumb_func_end LinkPartnerHandleResetActionMoveSelection - thumb_func_start sub_0814E100 -sub_0814E100: @ 0x0814E100 + thumb_func_start LinkPartnerHandleCmd55 +LinkPartnerHandleCmd55: @ 0x0814E100 push {r4, r5, lr} ldr r5, _0814E164 ldrb r0, [r5] @@ -686427,7 +686427,7 @@ sub_0814E100: @ 0x0814E100 bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_0814B800 + bl LinkPartnerBufferExecCompleted ldr r1, _0814E178 ldrb r0, [r5] lsls r0, r0, #2 @@ -686445,7 +686445,7 @@ _0814E170: .4byte gUnknown_3005AF0 _0814E174: .4byte 0x00000CA9 _0814E178: .4byte gUnknown_3005AC0 _0814E17C: .4byte sub_080583C0 - thumb_func_end sub_0814E100 + thumb_func_end LinkPartnerHandleCmd55 thumb_func_start sub_0814E180 sub_0814E180: @ 0x0814E180 @@ -686453,8 +686453,8 @@ sub_0814E180: @ 0x0814E180 .align 2, 0 thumb_func_end sub_0814E180 - thumb_func_start sub_0814E184 -sub_0814E184: @ 0x0814E184 + thumb_func_start PrintOnTrainerHillRecordsWindow +PrintOnTrainerHillRecordsWindow: @ 0x0814E184 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -686677,7 +686677,7 @@ _0814E350: .4byte gUnknown_85AAE36 _0814E354: mov r1, ip ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814E3B8 @@ -686795,7 +686795,7 @@ _0814E438: .4byte gUnknown_85AAEA7 _0814E43C: mov r1, ip ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814E494 @@ -686874,7 +686874,7 @@ _0814E4D4: .4byte gUnknown_85AAFD8 _0814E4D8: mov r4, r8 ldrb r0, [r4, #0x17] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814E530 @@ -686976,7 +686976,7 @@ _0814E59A: _0814E59C: .4byte gUnknown_85ABDE1 _0814E5A0: mov r0, sb - bl sub_0814F910 + bl ChooseMoveUsedParticle ldr r0, _0814E5CC ldr r2, [r0] ldrh r1, [r2] @@ -687009,7 +687009,7 @@ _0814E5DC: bl StringCopy _0814E5EA: ldr r0, _0814E5F4 - bl sub_0814F968 + bl ChooseTypeOfMoveUsedString ldr r7, _0814E5FC b _0814E788 .align 2, 0 @@ -687028,7 +687028,7 @@ _0814E600: strb r0, [r4] mov r1, ip ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -687077,7 +687077,7 @@ _0814E670: .4byte gUnknown_85AAA36 _0814E674: mov r1, ip ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -687222,7 +687222,7 @@ _0814E77C: ldr r7, [r0] _0814E788: adds r0, r7, #0 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString _0814E78E: pop {r3, r4} mov r8, r3 @@ -687232,21 +687232,21 @@ _0814E78E: bx r0 .align 2, 0 _0814E79C: .4byte gUnknown_85AB3DC - thumb_func_end sub_0814E184 + thumb_func_end PrintOnTrainerHillRecordsWindow - thumb_func_start sub_0814E7A0 -sub_0814E7A0: @ 0x0814E7A0 + thumb_func_start BattleStringExpandPlaceholdersToDisplayedString +BattleStringExpandPlaceholdersToDisplayedString: @ 0x0814E7A0 push {lr} ldr r1, _0814E7AC - bl sub_0814E7B0 + bl BattleStringExpandPlaceholders pop {r1} bx r1 .align 2, 0 _0814E7AC: .4byte gUnknown_2022AE0 - thumb_func_end sub_0814E7A0 + thumb_func_end BattleStringExpandPlaceholdersToDisplayedString - thumb_func_start sub_0814E7B0 -sub_0814E7B0: @ 0x0814E7B0 + thumb_func_start BattleStringExpandPlaceholders +BattleStringExpandPlaceholders: @ 0x0814E7B0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -687270,14 +687270,14 @@ sub_0814E7B0: @ 0x0814E7B0 _0814E7D8: .4byte gUnknown_2022C90 _0814E7DC: .4byte gUnknown_203C480 _0814E7E0: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 _0814E7E8: mov r0, sb ldrb r1, [r0] bl sub_0814F63C - thumb_func_end sub_0814E7B0 + thumb_func_end BattleStringExpandPlaceholders thumb_func_start sub_0814E7F0 sub_0814E7F0: @ 0x0814E7F0 @@ -687372,7 +687372,7 @@ _0814E8FC: _0814E906: adds r0, r1, #0 adds r1, r4, #0 - bl sub_0814F664 + bl ExpandBattleTextBuffPlaceholders bl _0814F5DC .align 2, 0 _0814E914: .4byte gUnknown_2022C1C @@ -687409,9 +687409,9 @@ _0814E944: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814E970: .4byte gUnknown_2023D12 @@ -687430,9 +687430,9 @@ _0814E978: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814E9A4: .4byte gUnknown_2023D12 @@ -687451,9 +687451,9 @@ _0814E9AC: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814E9D8: .4byte gUnknown_2023D12 @@ -687472,9 +687472,9 @@ _0814E9E0: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EA0C: .4byte gUnknown_2023D12 @@ -687496,9 +687496,9 @@ _0814EA14: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EA44: .4byte gUnknown_2023D12 @@ -687523,9 +687523,9 @@ _0814EA50: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EA84: .4byte gUnknown_2023D12 @@ -687550,9 +687550,9 @@ _0814EA90: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EAC4: .4byte gUnknown_2023D12 @@ -687577,9 +687577,9 @@ _0814EAD0: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EB04: .4byte gUnknown_2023D12 @@ -687588,7 +687588,7 @@ _0814EB0C: .4byte gUnknown_20243E8 _0814EB10: ldr r4, _0814EB34 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 adds r2, r4, #0 cmp r0, #0 @@ -687635,7 +687635,7 @@ _0814EB4E: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814EBB6 .align 2, 0 _0814EB84: .4byte gUnknown_2023D12 @@ -687658,10 +687658,10 @@ _0814EB8C: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814EBB6: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EBC0: .4byte gUnknown_2023D12 @@ -687669,7 +687669,7 @@ _0814EBC4: .4byte gUnknown_2024190 _0814EBC8: ldr r4, _0814EC04 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814EC10 @@ -687691,7 +687691,7 @@ _0814EBC8: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814EC3C .align 2, 0 _0814EC04: .4byte gUnknown_2023EAF @@ -687716,10 +687716,10 @@ _0814EC10: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814EC3C: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EC48: .4byte gUnknown_2023D12 @@ -687727,7 +687727,7 @@ _0814EC4C: .4byte gUnknown_20243E8 _0814EC50: ldr r5, _0814ECA8 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0814ECC0 @@ -687768,7 +687768,7 @@ _0814EC90: add r0, ip movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814ECDA .align 2, 0 _0814ECA8: .4byte gUnknown_2023EAF @@ -687789,10 +687789,10 @@ _0814ECC0: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814ECDA: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814ECE4: .4byte gUnknown_2023D12 @@ -687800,7 +687800,7 @@ _0814ECE8: .4byte gUnknown_2024190 _0814ECEC: ldr r5, _0814ED44 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0814ED5C @@ -687841,7 +687841,7 @@ _0814ED2C: add r0, ip movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814ED76 .align 2, 0 _0814ED44: .4byte gUnknown_2023EB0 @@ -687862,10 +687862,10 @@ _0814ED5C: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814ED76: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814ED80: .4byte gUnknown_2023D12 @@ -687873,7 +687873,7 @@ _0814ED84: .4byte gUnknown_2024190 _0814ED88: ldr r5, _0814EDE0 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0814EDF8 @@ -687914,7 +687914,7 @@ _0814EDC8: add r0, ip movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814EE12 .align 2, 0 _0814EDE0: .4byte gUnknown_2023EB2 @@ -687935,10 +687935,10 @@ _0814EDF8: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814EE12: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 bl _0814F5DA .align 2, 0 _0814EE1C: .4byte gUnknown_2023D12 @@ -687946,7 +687946,7 @@ _0814EE20: .4byte gUnknown_2024190 _0814EE24: ldr r5, _0814EE7C ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0814EE94 @@ -687987,7 +687987,7 @@ _0814EE64: add r0, ip movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814EEAE .align 2, 0 _0814EE7C: .4byte gUnknown_2023D08 @@ -688008,10 +688008,10 @@ _0814EE94: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814EEAE: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 b _0814F5DA .align 2, 0 _0814EEB8: .4byte gUnknown_2023D12 @@ -688019,7 +688019,7 @@ _0814EEBC: .4byte gUnknown_2024190 _0814EEC0: ldr r5, _0814EF18 ldrb r0, [r5, #0x17] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0814EF30 @@ -688060,7 +688060,7 @@ _0814EF00: add r0, ip movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814EF4A .align 2, 0 _0814EF18: .4byte gUnknown_2024118 @@ -688081,10 +688081,10 @@ _0814EF30: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814EF4A: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 b _0814F5DA .align 2, 0 _0814EF54: .4byte gUnknown_2023D12 @@ -688331,7 +688331,7 @@ _0814F144: cmp r0, #0 beq _0814F156 ldrh r0, [r3] - bl sub_081D4B90 + bl GetTrainerHillOpponentClass b _0814F5B8 _0814F156: movs r0, #0x80 @@ -688419,7 +688419,7 @@ _0814F1F4: cmp r2, r0 bne _0814F208 mov r0, sp - bl sub_081A4944 + bl CopyFrontierBrainTrainerName b _0814F5DA .align 2, 0 _0814F204: .4byte 0x000003FE @@ -688440,7 +688440,7 @@ _0814F218: beq _0814F22C ldrh r1, [r3] mov r0, sp - bl sub_081D4BB4 + bl ScrCmd_showmonpic b _0814F5DA _0814F22C: movs r0, #0x80 @@ -688495,7 +688495,7 @@ _0814F27C: movs r0, #3 _0814F28A: eors r0, r1 - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -688507,7 +688507,7 @@ _0814F29C: .4byte gUnknown_20226A0 _0814F2A0: ldr r0, _0814F2B4 ldrb r0, [r0, #0x17] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -688564,7 +688564,7 @@ _0814F304: .align 2, 0 _0814F318: .4byte gUnknown_203886A _0814F31C: - bl sub_080B1590 + bl GetTrainerALoseText adds r4, r0, #0 b _0814F5DC _0814F324: @@ -688595,7 +688595,7 @@ _0814F350: .4byte gUnknown_203886A _0814F354: ldr r0, _0814F3A8 ldrb r0, [r0, #0x17] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0814F3C0 @@ -688634,7 +688634,7 @@ _0814F392: add r0, ip movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814F3D8 .align 2, 0 _0814F3A8: .4byte gUnknown_2024118 @@ -688654,10 +688654,10 @@ _0814F3C0: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814F3D8: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 b _0814F5DA .align 2, 0 _0814F3E0: .4byte gUnknown_2024140 @@ -688686,7 +688686,7 @@ _0814F410: ldr r0, _0814F428 _0814F412: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r4, _0814F42C cmp r0, #0 @@ -688708,7 +688708,7 @@ _0814F43C: ldr r0, _0814F454 _0814F43E: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r4, _0814F458 cmp r0, #0 @@ -688730,7 +688730,7 @@ _0814F468: ldr r0, _0814F480 _0814F46A: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r4, _0814F484 cmp r0, #0 @@ -688764,7 +688764,7 @@ _0814F4A8: beq _0814F4C0 ldr r0, _0814F4BC ldrh r0, [r0] - bl sub_081D4B90 + bl GetTrainerHillOpponentClass b _0814F5B8 .align 2, 0 _0814F4BC: .4byte gUnknown_203886C @@ -688802,7 +688802,7 @@ _0814F4F4: ldr r0, _0814F50C ldrh r1, [r0] mov r0, sp - bl sub_081D4BB4 + bl ScrCmd_showmonpic b _0814F5DA .align 2, 0 _0814F50C: .4byte gUnknown_203886C @@ -688845,7 +688845,7 @@ _0814F544: .align 2, 0 _0814F558: .4byte gUnknown_203886C _0814F55C: - bl sub_080B15CC + bl GetTrainerBLoseText adds r4, r0, #0 b _0814F5DC _0814F564: @@ -688860,7 +688860,7 @@ _0814F572: ldrh r1, [r0] movs r0, #1 _0814F576: - bl sub_081A3460 + bl CopyFrontierTrainerText ldr r4, _0814F58C b _0814F5DC .align 2, 0 @@ -688879,7 +688879,7 @@ _0814F59C: ldrh r1, [r0] movs r0, #3 _0814F5A0: - bl sub_081D4D80 + bl CopyTrainerHillTrainerText ldr r4, _0814F5AC b _0814F5DC .align 2, 0 @@ -688890,7 +688890,7 @@ _0814F5B0: _0814F5B2: ldrh r0, [r0] _0814F5B4: - bl sub_08162ADC + bl GetFrontierOpponentClass _0814F5B8: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -688996,8 +688996,8 @@ _0814F646: .align 2, 0 thumb_func_end sub_0814F63C - thumb_func_start sub_0814F664 -sub_0814F664: @ 0x0814F664 + thumb_func_start ExpandBattleTextBuffPlaceholders +ExpandBattleTextBuffPlaceholders: @ 0x0814F664 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -689125,7 +689125,7 @@ _0814F750: _0814F75C: .4byte gUnknown_82EBC88 _0814F760: ldrb r0, [r4, #1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814F784 @@ -689136,7 +689136,7 @@ _0814F760: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData b _0814F7C0 .align 2, 0 _0814F780: .4byte gUnknown_2024190 @@ -689167,10 +689167,10 @@ _0814F7AC: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData _0814F7C0: mov r0, sp - bl sub_0800885C + bl StringGetEnd10 adds r0, r6, #0 mov r1, sp bl StringAppend @@ -689200,7 +689200,7 @@ _0814F7EC: _0814F7FE: adds r4, r5, r7 ldrb r0, [r4, #1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0814F824 @@ -689211,7 +689211,7 @@ _0814F7FE: adds r0, r0, r1 movs r1, #2 adds r2, r6, #0 - bl sub_0806A058 + bl GetMonData b _0814F836 .align 2, 0 _0814F820: .4byte gUnknown_2024190 @@ -689223,10 +689223,10 @@ _0814F824: adds r0, r0, r1 movs r1, #2 adds r2, r6, #0 - bl sub_0806A058 + bl GetMonData _0814F836: adds r0, r6, #0 - bl sub_0800885C + bl StringGetEnd10 b _0814F8F6 .align 2, 0 _0814F840: .4byte gUnknown_20243E8 @@ -689331,10 +689331,10 @@ _0814F902: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0814F664 + thumb_func_end ExpandBattleTextBuffPlaceholders - thumb_func_start sub_0814F910 -sub_0814F910: @ 0x0814F910 + thumb_func_start ChooseMoveUsedParticle +ChooseMoveUsedParticle: @ 0x0814F910 push {r4, r5, lr} adds r4, r0, #0 movs r2, #0 @@ -689378,10 +689378,10 @@ _0814F95C: bx r0 .align 2, 0 _0814F964: .4byte gUnknown_85ABC98 - thumb_func_end sub_0814F910 + thumb_func_end ChooseMoveUsedParticle - thumb_func_start sub_0814F968 -sub_0814F968: @ 0x0814F968 + thumb_func_start ChooseTypeOfMoveUsedString +ChooseTypeOfMoveUsedString: @ 0x0814F968 push {r4, r5, lr} adds r3, r0, #0 movs r4, #0 @@ -689461,7 +689461,7 @@ _0814F9F8: bx r0 .align 2, 0 _0814FA00: .4byte gUnknown_85AB055 - thumb_func_end sub_0814F968 + thumb_func_end ChooseTypeOfMoveUsedString thumb_func_start sub_0814FA04 sub_0814FA04: @ 0x0814FA04 @@ -689497,12 +689497,12 @@ _0814FA38: add r0, r8 ldrb r1, [r0] adds r0, r7, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r7, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r7, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0814FA56: str r4, [sp] mov r0, sp @@ -689649,7 +689649,7 @@ _0814FB6A: mov r0, sp adds r1, r6, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r3} mov r8, r3 @@ -689765,8 +689765,8 @@ _0814FC46: .align 2, 0 thumb_func_end GetCurrentPpToMaxPpState - thumb_func_start sub_0814FC4C -sub_0814FC4C: @ 0x0814FC4C + thumb_func_start CableCarTask1 +CableCarTask1: @ 0x0814FC4C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -689777,17 +689777,17 @@ sub_0814FC4C: @ 0x0814FC4C cmp r0, #0 bne _0814FC6A ldr r0, _0814FC74 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0814FC6A: pop {r4} pop {r0} bx r0 .align 2, 0 _0814FC70: .4byte gUnknown_2037C74 -_0814FC74: .4byte sub_0814FCA4 - thumb_func_end sub_0814FC4C +_0814FC74: .4byte CableCarMainCallback_Setup + thumb_func_end CableCarTask1 thumb_func_start sub_0814FC78 sub_0814FC78: @ 0x0814FC78 @@ -689796,23 +689796,23 @@ sub_0814FC78: @ 0x0814FC78 bl sub_080987DC ldr r0, _0814FCA0 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 .align 2, 0 -_0814FCA0: .4byte sub_0814FC4C +_0814FCA0: .4byte CableCarTask1 thumb_func_end sub_0814FC78 - thumb_func_start sub_0814FCA4 -sub_0814FCA4: @ 0x0814FCA4 + thumb_func_start CableCarMainCallback_Setup +CableCarMainCallback_Setup: @ 0x0814FCA4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -689849,10 +689849,10 @@ _0814FCD4: @ jump table .4byte _081501A4 @ case 9 _0814FCFC: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl sub_08150B48 - bl sub_080B9710 + bl ScanlineEffect_Stop movs r3, #0xc0 lsls r3, r3, #0x13 movs r4, #0xc0 @@ -689918,7 +689918,7 @@ _0814FD2A: ldr r0, [r2, #8] ldr r4, _0814FDA8 ldr r0, _0814FDAC - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _0814FDB0 movs r2, #0x87 @@ -689935,11 +689935,11 @@ _0814FDAC: .4byte 0x00004110 _0814FDB0: .4byte gUnknown_3002360 _0814FDB4: bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl FreeAllSpritePalettes bl ResetPaletteFade bl reset_temp_tile_data_buffers - bl sub_080AA8A0 + bl StartWeather movs r4, #0 ldr r0, _0814FE48 ldr r0, [r0] @@ -689955,7 +689955,7 @@ _0814FDD8: lsrs r4, r0, #0x18 cmp r4, #0x13 bls _0814FDD8 - bl sub_080A269C + bl InitMapMusic bl ResetMapMusic movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -689967,22 +689967,22 @@ _0814FDD8: ldr r1, [r4] adds r1, #0xfc movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r3, _0814FE54 adds r1, r1, r3 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _0814FE58 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r2, _0814FE5C adds r1, r1, r2 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r2, _0814FE60 ldr r1, _0814FE64 movs r0, #0 @@ -690012,7 +690012,7 @@ _0814FE6C: _0814FE72: lsls r0, r4, #3 adds r0, r0, r6 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -690022,7 +690022,7 @@ _0814FE72: bl LoadSpritePalettes ldr r0, _0814FEFC adds r1, r5, #0 - bl sub_08199858 + bl malloc_and_decompress ldr r4, _0814FF00 ldr r1, [r4] ldr r2, _0814FF04 @@ -690030,7 +690030,7 @@ _0814FE72: str r0, [r1] ldr r0, _0814FF08 adds r1, r5, #0 - bl sub_08199858 + bl malloc_and_decompress ldr r1, [r4] movs r3, #0x82 lsls r3, r3, #7 @@ -690038,14 +690038,14 @@ _0814FE72: str r0, [r1] ldr r0, _0814FF0C adds r1, r5, #0 - bl sub_08199858 + bl malloc_and_decompress ldr r1, [r4] ldr r2, _0814FF10 adds r1, r1, r2 str r0, [r1] ldr r0, _0814FF14 adds r1, r5, #0 - bl sub_08199858 + bl malloc_and_decompress ldr r1, [r4] ldr r3, _0814FF18 adds r2, r1, r3 @@ -690059,7 +690059,7 @@ _0814FE72: str r0, [sp] movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _0814FF28 movs r2, #0x87 lsls r2, r2, #3 @@ -690083,7 +690083,7 @@ _0814FF20: .4byte gUnknown_85AC924 _0814FF24: .4byte gUnknown_8DBA860 _0814FF28: .4byte gUnknown_3002360 _0814FF2C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _0814FF38 @@ -690092,7 +690092,7 @@ _0814FF38: ldr r0, _0814FF50 movs r1, #0 movs r2, #0x80 - bl sub_080A1200 + bl LoadPalette ldr r1, _0814FF54 movs r3, #0x87 lsls r3, r3, #3 @@ -690104,8 +690104,8 @@ _0814FF38: _0814FF50: .4byte gUnknown_8DBA7C0 _0814FF54: .4byte gUnknown_3002360 _0814FF58: - bl sub_08150D04 - bl sub_080A89D4 + bl LoadCableCarSprites + bl RunTasks ldr r1, _0814FF70 movs r0, #0x87 lsls r0, r0, #3 @@ -690361,10 +690361,10 @@ _0815016C: movs r1, #3 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0815019C movs r1, #1 - bl sub_080A2A5C + bl FadeInNewBGM movs r0, #1 bl sub_08150B48 ldr r1, _081501A0 @@ -690389,12 +690389,12 @@ _081501A4: strh r0, [r4] strh r2, [r3] ldr r0, _081501E0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081501E4 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _081501E8 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _081501EC ldrh r0, [r0] cmp r0, #0 @@ -690404,7 +690404,7 @@ _081501A4: .align 2, 0 _081501D8: .4byte 0x04000208 _081501DC: .4byte 0x04000200 -_081501E0: .4byte sub_081507DC +_081501E0: .4byte CableCarVblankCallback _081501E4: .4byte sub_08150218 _081501E8: .4byte sub_081503C0 _081501EC: .4byte gUnknown_2037280 @@ -690413,7 +690413,7 @@ _081501F4: ldr r0, _08150210 _081501F6: movs r1, #1 - bl sub_080A8878 + bl CreateTask ldr r1, _08150214 ldr r1, [r1] _08150200: @@ -690429,36 +690429,36 @@ _08150202: .align 2, 0 _08150210: .4byte sub_08150640 _08150214: .4byte gUnknown_203A878 - thumb_func_end sub_0814FCA4 + thumb_func_end CableCarMainCallback_Setup thumb_func_start sub_08150218 sub_08150218: @ 0x08150218 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 - bl sub_080A26B0 + bl UpdatePaletteFade + bl MapMusicMain pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08150218 - thumb_func_start sub_08150234 -sub_08150234: @ 0x08150234 + thumb_func_start CleanupCableCar +CleanupCableCar: @ 0x08150234 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} sub sp, #8 movs r4, #0 movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #0 bl sub_08150B48 ldr r0, _08150394 @@ -690481,17 +690481,17 @@ _08150274: lsrs r4, r0, #0x18 cmp r4, #0x13 bls _08150274 - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #2 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #3 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r6, _0815039C @@ -690503,14 +690503,14 @@ _08150274: ldr r4, _081503A4 adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r4, r0, r4 str r5, [r4] ldr r4, _081503A8 adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r4, r0, r4 str r5, [r4] @@ -690518,18 +690518,18 @@ _08150274: lsls r4, r4, #7 adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r4, r0, r4 str r5, [r4] ldr r4, _081503AC adds r0, r0, r4 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r6] adds r4, r0, r4 str r5, [r4] - bl sub_08000BF0 + bl Free str r5, [r6] movs r2, #0xc0 lsls r2, r2, #0x13 @@ -690592,11 +690592,11 @@ _0815031C: orrs r3, r0 str r3, [r2, #8] ldr r0, [r2, #8] - bl sub_08084540 + bl WarpIntoMap ldr r0, _081503B8 str r4, [r0] ldr r0, _081503BC - bl sub_08000540 + bl SetMainCallback2 add sp, #8 pop {r3} mov r8, r3 @@ -690614,8 +690614,8 @@ _081503AC: .4byte 0x000040FC _081503B0: .4byte 0x040000D4 _081503B4: .4byte 0x81000800 _081503B8: .4byte gUnknown_3005B0C -_081503BC: .4byte sub_08085934 - thumb_func_end sub_08150234 +_081503BC: .4byte CB2_LoadMap + thumb_func_end CleanupCableCar thumb_func_start sub_081503C0 sub_081503C0: @ 0x081503C0 @@ -690661,7 +690661,7 @@ _081503FE: b _0815051E _0815040A: ldrb r0, [r3, #2] - bl sub_080AA994 + bl SetNextWeather ldr r1, [r5] movs r0, #1 strb r0, [r1, #1] @@ -690772,7 +690772,7 @@ _081504C6: movs r1, #3 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #4 bl sub_080A2B08 b _0815051E @@ -690792,21 +690792,21 @@ _081504EC: _08150500: .4byte gUnknown_2037C74 _08150504: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, [r5] ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask ldr r0, _08150528 - bl sub_08000540 + bl SetMainCallback2 _0815051E: add sp, #4 pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 -_08150528: .4byte sub_08150234 +_08150528: .4byte CleanupCableCar thumb_func_end sub_081503C0 thumb_func_start sub_0815052C @@ -691154,13 +691154,13 @@ _081507D4: .4byte gUnknown_8526DE8 _081507D8: .4byte 0x000006FC thumb_func_end sub_08150640 - thumb_func_start sub_081507DC -sub_081507DC: @ 0x081507DC + thumb_func_start CableCarVblankCallback +CableCarVblankCallback: @ 0x081507DC push {r4, lr} movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r4, _0815083C ldr r0, [r4] ldrb r1, [r0, #0x14] @@ -691186,15 +691186,15 @@ sub_081507DC: @ 0x081507DC ldrb r1, [r0, #9] movs r0, #0x12 bl SetGpuReg - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r4} pop {r0} bx r0 .align 2, 0 _0815083C: .4byte gUnknown_203A878 - thumb_func_end sub_081507DC + thumb_func_end CableCarVblankCallback thumb_func_start sub_08150840 sub_08150840: @ 0x08150840 @@ -691747,17 +691747,17 @@ _08150C68: movs r0, #0 bl SetGpuReg movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r1, #0xfc lsls r1, r1, #6 movs r0, #0x50 @@ -691770,8 +691770,8 @@ _08150CF8: _08150D00: .4byte gUnknown_203A878 thumb_func_end sub_08150B48 - thumb_func_start sub_08150D04 -sub_08150D04: @ 0x08150D04 + thumb_func_start LoadCableCarSprites +LoadCableCarSprites: @ 0x08150D04 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -691826,7 +691826,7 @@ _08150D62: str r2, [sp] movs r2, #0xc8 movs r3, #0x49 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -691857,7 +691857,7 @@ _08150DAC: movs r1, #0xb0 movs r2, #0x2b movs r3, #0x67 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r5, _08150E38 @@ -691877,7 +691877,7 @@ _08150DAC: movs r1, #0xc8 movs r2, #0x63 movs r3, #0x65 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r0, r6, #4 @@ -691943,7 +691943,7 @@ _08150E44: str r2, [sp] movs r2, #0x80 movs r3, #0x27 - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -691974,7 +691974,7 @@ _08150EB0: movs r1, #0x68 movs r2, #9 movs r3, #0x67 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r5, _08150FF4 @@ -691994,7 +691994,7 @@ _08150EB0: movs r1, #0x80 movs r2, #0x41 movs r3, #0x65 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r0, r6, #4 @@ -692032,7 +692032,7 @@ _08150F1A: asrs r2, r2, #0x10 ldr r0, _08151004 movs r3, #0x68 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r0, r6, #4 @@ -692076,7 +692076,7 @@ _08150F1A: ldrsh r3, [r3, r4] movs r4, #0x6a str r4, [sp] - bl sub_0808D6D8 + bl AddPseudoEventObject lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -692179,7 +692179,7 @@ _08151050: bx r0 .align 2, 0 _08151060: .4byte gUnknown_20205AC - thumb_func_end sub_08150D04 + thumb_func_end LoadCableCarSprites thumb_func_start sub_08151064 sub_08151064: @ 0x08151064 @@ -693658,8 +693658,8 @@ _08151B0C: .align 2, 0 thumb_func_end sub_08151A78 - thumb_func_start sub_08151B18 -sub_08151B18: @ 0x08151B18 + thumb_func_start InitPulseBlend +InitPulseBlend: @ 0x08151B18 push {r4, r5, lr} adds r5, r0, #0 movs r4, #0 @@ -693682,7 +693682,7 @@ _08151B2A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08151B18 + thumb_func_end InitPulseBlend thumb_func_start InitPulseBlendPaletteSettings InitPulseBlendPaletteSettings: @ 0x08151B44 @@ -693746,8 +693746,8 @@ _08151BA8: .align 2, 0 thumb_func_end InitPulseBlendPaletteSettings - thumb_func_start sub_08151BB0 -sub_08151BB0: @ 0x08151BB0 + thumb_func_start ClearPulseBlendPalettesSettings +ClearPulseBlendPalettesSettings: @ 0x08151BB0 push {r4, r5, lr} adds r4, r0, #0 ldrb r1, [r4, #1] @@ -693810,7 +693810,7 @@ _08151BF2: .align 2, 0 _08151C24: .4byte gUnknown_20377B4 _08151C28: .4byte gUnknown_20373B4 - thumb_func_end sub_08151BB0 + thumb_func_end ClearPulseBlendPalettesSettings thumb_func_start UnloadUsedPulseBlendPalettes UnloadUsedPulseBlendPalettes: @ 0x08151C2C @@ -693829,7 +693829,7 @@ UnloadUsedPulseBlendPalettes: @ 0x08151C2C lsls r0, r0, #2 adds r0, #4 adds r0, r6, r0 - bl sub_08151BB0 + bl ClearPulseBlendPalettesSettings b _08151C7C _08151C50: movs r0, #1 @@ -693846,7 +693846,7 @@ _08151C50: beq _08151C70 adds r0, r1, #4 adds r0, r6, r0 - bl sub_08151BB0 + bl ClearPulseBlendPalettesSettings _08151C70: lsrs r4, r4, #1 adds r0, r5, #1 @@ -693935,8 +693935,8 @@ _08151CFC: .align 2, 0 thumb_func_end MarkUsedPulseBlendPalettes - thumb_func_start sub_08151D04 -sub_08151D04: @ 0x08151D04 + thumb_func_start UnmarkUsedPulseBlendPalettes +UnmarkUsedPulseBlendPalettes: @ 0x08151D04 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -694092,10 +694092,10 @@ _08151E16: .align 2, 0 _08151E24: .4byte gUnknown_20377B4 _08151E28: .4byte gUnknown_20373B4 - thumb_func_end sub_08151D04 + thumb_func_end UnmarkUsedPulseBlendPalettes - thumb_func_start sub_08151E2C -sub_08151E2C: @ 0x08151E2C + thumb_func_start UpdatePulseBlend +UpdatePulseBlend: @ 0x08151E2C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -694308,7 +694308,7 @@ _08151FAC: ldrb r1, [r4] ldr r0, [sp] movs r2, #0 - bl sub_08151D04 + bl UnmarkUsedPulseBlendPalettes _08151FC2: mov r0, sl adds r0, #1 @@ -694328,7 +694328,7 @@ _08151FD2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08151E2C + thumb_func_end UpdatePulseBlend thumb_func_start sub_08151FE4 sub_08151FE4: @ 0x08151FE4 @@ -694598,20 +694598,20 @@ sub_0815219C: @ 0x0815219C _081521B2: ldr r6, _081521E0 movs r0, #8 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] cmp r0, #0 beq _081521DA lsls r0, r4, #1 adds r0, r0, r4 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r6] str r0, [r1, #4] cmp r0, #0 bne _081521E4 adds r0, r1, #0 - bl sub_08000BF0 + bl Free str r5, [r6] _081521DA: movs r0, #0 @@ -694706,7 +694706,7 @@ _0815226E: bl memset ldr r0, [r5] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free ldr r0, [r5] movs r4, #0 str r4, [r0, #4] @@ -694714,7 +694714,7 @@ _0815226E: movs r2, #8 bl memset ldr r0, [r5] - bl sub_08000BF0 + bl Free str r4, [r5] movs r0, #1 _081522A0: @@ -695098,7 +695098,7 @@ _0815253E: ldrh r3, [r3, #8] strh r3, [r5, #0xa] mov r0, r8 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #4 ldrb r1, [r5, #5] movs r4, #0xf @@ -695205,8 +695205,8 @@ _08152624: .4byte gUnknown_3002598 _08152628: .4byte gUnknown_82BF2F8 thumb_func_end sub_081525AC - thumb_func_start sub_0815262C -sub_0815262C: @ 0x0815262C + thumb_func_start ClearSaveData +ClearSaveData: @ 0x0815262C push {r4, r5, lr} movs r4, #0 ldr r5, _08152658 @@ -695230,10 +695230,10 @@ _08152632: bx r0 .align 2, 0 _08152658: .4byte gUnknown_3007600 - thumb_func_end sub_0815262C + thumb_func_end ClearSaveData - thumb_func_start sub_0815265C -sub_0815265C: @ 0x0815265C + thumb_func_start Save_ResetSaveCounters +Save_ResetSaveCounters: @ 0x0815265C ldr r0, _0815266C movs r1, #0 str r1, [r0] @@ -695246,10 +695246,10 @@ sub_0815265C: @ 0x0815265C _0815266C: .4byte gUnknown_3005F40 _08152670: .4byte gUnknown_3005F30 _08152674: .4byte gUnknown_3005F3C - thumb_func_end sub_0815265C + thumb_func_end Save_ResetSaveCounters - thumb_func_start sub_08152678 -sub_08152678: @ 0x08152678 + thumb_func_start SetDamagedSectorBits +SetDamagedSectorBits: @ 0x08152678 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -695303,7 +695303,7 @@ _081526D0: bx r1 .align 2, 0 _081526D8: .4byte gUnknown_3005F3C - thumb_func_end sub_08152678 + thumb_func_end SetDamagedSectorBits thumb_func_start sub_081526DC sub_081526DC: @ 0x081526DC @@ -695319,7 +695319,7 @@ sub_081526DC: @ 0x081526DC beq _0815270C adds r0, r2, #0 adds r1, r7, #0 - bl sub_0815277C + bl HandleWriteSector lsls r0, r0, #0x18 lsrs r5, r0, #0x18 b _0815275E @@ -695349,7 +695349,7 @@ _0815270C: _08152732: adds r0, r4, #0 adds r1, r7, #0 - bl sub_0815277C + bl HandleWriteSector adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -695381,8 +695381,8 @@ _08152774: .4byte gUnknown_3005F40 _08152778: .4byte gUnknown_3005F3C thumb_func_end sub_081526DC - thumb_func_start sub_0815277C -sub_0815277C: @ 0x0815277C + thumb_func_start HandleWriteSector +HandleWriteSector: @ 0x0815277C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -695474,7 +695474,7 @@ _0815281C: adds r2, r1, r7 strh r0, [r2] lsrs r0, r5, #0x18 - bl sub_081528E4 + bl TryWriteSector lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r3, r4, r5} @@ -695494,10 +695494,10 @@ _0815285C: .4byte 0x00000FF8 _08152860: .4byte 0x08012025 _08152864: .4byte 0x00000FFC _08152868: .4byte 0x00000FF6 - thumb_func_end sub_0815277C + thumb_func_end HandleWriteSector - thumb_func_start sub_0815286C -sub_0815286C: @ 0x0815286C + thumb_func_start HandleWriteSectorNBytes +HandleWriteSectorNBytes: @ 0x0815286C push {r4, r5, r6, r7, lr} adds r5, r1, #0 lsls r0, r0, #0x18 @@ -695542,7 +695542,7 @@ _081528AE: strh r0, [r1] adds r0, r7, #0 adds r1, r4, #0 - bl sub_081528E4 + bl TryWriteSector lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4, r5, r6, r7} @@ -695554,10 +695554,10 @@ _081528D4: .4byte 0x00000FFF _081528D8: .4byte 0x00000FF8 _081528DC: .4byte 0x08012025 _081528E0: .4byte 0x00000FF4 - thumb_func_end sub_0815286C + thumb_func_end HandleWriteSectorNBytes - thumb_func_start sub_081528E4 -sub_081528E4: @ 0x081528E4 + thumb_func_start TryWriteSector +TryWriteSector: @ 0x081528E4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -695567,22 +695567,22 @@ sub_081528E4: @ 0x081528E4 bne _08152900 movs r0, #1 adds r1, r4, #0 - bl sub_08152678 + bl SetDamagedSectorBits movs r0, #1 b _0815290A _08152900: movs r0, #0 adds r1, r4, #0 - bl sub_08152678 + bl SetDamagedSectorBits movs r0, #0xff _0815290A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081528E4 + thumb_func_end TryWriteSector - thumb_func_start sub_08152910 -sub_08152910: @ 0x08152910 + thumb_func_start RestoreSaveBackupVarsAndIncrement +RestoreSaveBackupVarsAndIncrement: @ 0x08152910 push {r4, r5, r6, lr} ldr r1, _0815294C ldr r0, _08152950 @@ -695621,7 +695621,7 @@ _0815295C: .4byte gUnknown_3005F34 _08152960: .4byte gUnknown_3005F40 _08152964: .4byte gUnknown_3005F48 _08152968: .4byte gUnknown_3005F3C - thumb_func_end sub_08152910 + thumb_func_end RestoreSaveBackupVarsAndIncrement thumb_func_start RestoreSaveBackupVars RestoreSaveBackupVars: @ 0x0815296C @@ -695666,7 +695666,7 @@ sub_081529B0: @ 0x081529B0 bge _08152A04 movs r5, #1 adds r0, r2, #0 - bl sub_0815277C + bl HandleWriteSector ldrh r0, [r4] adds r0, #1 strh r0, [r4] @@ -695709,7 +695709,7 @@ sub_08152A10: @ 0x08152A10 ldr r2, _08152A44 adds r0, r0, r2 lsrs r0, r0, #0x10 - bl sub_08152A5C + bl ClearSaveData_2 ldr r0, _08152A48 ldr r0, [r0] cmp r0, #0 @@ -695737,8 +695737,8 @@ _08152A54: .4byte gUnknown_3005F40 _08152A58: .4byte gUnknown_3005F34 thumb_func_end sub_08152A10 - thumb_func_start sub_08152A5C -sub_08152A5C: @ 0x08152A5C + thumb_func_start ClearSaveData_2 +ClearSaveData_2: @ 0x08152A5C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -695917,7 +695917,7 @@ _08152BC8: mov r2, r8 lsrs r1, r2, #0x18 movs r0, #1 - bl sub_08152678 + bl SetDamagedSectorBits movs r0, #1 b _08152BEC .align 2, 0 @@ -695927,7 +695927,7 @@ _08152BE0: lsrs r1, r6, #0x18 _08152BE4: movs r0, #0 - bl sub_08152678 + bl SetDamagedSectorBits movs r0, #0xff _08152BEC: pop {r3, r4, r5} @@ -695938,7 +695938,7 @@ _08152BEC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08152A5C + thumb_func_end ClearSaveData_2 thumb_func_start sub_08152BFC sub_08152BFC: @ 0x08152BFC @@ -695981,7 +695981,7 @@ sub_08152BFC: @ 0x08152BFC lsls r1, r4, #0x18 lsrs r1, r1, #0x18 movs r0, #1 - bl sub_08152678 + bl SetDamagedSectorBits movs r0, #1 b _08152C84 .align 2, 0 @@ -695994,7 +695994,7 @@ _08152C6C: lsls r1, r4, #0x18 lsrs r1, r1, #0x18 movs r0, #0 - bl sub_08152678 + bl SetDamagedSectorBits ldr r0, _08152C8C ldrh r0, [r0] strh r0, [r6] @@ -696049,7 +696049,7 @@ sub_08152C94: @ 0x08152C94 lsls r1, r4, #0x18 lsrs r1, r1, #0x18 movs r0, #1 - bl sub_08152678 + bl SetDamagedSectorBits movs r0, #1 b _08152D10 .align 2, 0 @@ -696061,7 +696061,7 @@ _08152CF8: lsls r1, r4, #0x18 lsrs r1, r1, #0x18 movs r0, #0 - bl sub_08152678 + bl SetDamagedSectorBits ldr r0, _08152D18 ldrh r0, [r0] strh r0, [r6] @@ -696098,7 +696098,7 @@ _08152D3C: .4byte gUnknown_203A888 _08152D40: .4byte 0x0000FFFF _08152D44: adds r0, r6, #0 - bl sub_08152E18 + bl GetSaveValidStatus lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 @@ -696133,7 +696133,7 @@ _08152D7C: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [r6] - bl sub_0815309C + bl DoReadFlashWholeSection ldr r0, [r6] ldr r1, _08152E04 adds r0, r0, r1 @@ -696204,8 +696204,8 @@ _08152E10: .4byte 0x08012025 _08152E14: .4byte 0x00000FF6 thumb_func_end sub_08152D60 - thumb_func_start sub_08152E18 -sub_08152E18: @ 0x08152E18 + thumb_func_start GetSaveValidStatus +GetSaveValidStatus: @ 0x08152E18 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -696224,7 +696224,7 @@ _08152E34: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 ldr r1, [r7] - bl sub_0815309C + bl DoReadFlashWholeSection ldr r2, [r7] ldr r1, _08152EA8 adds r0, r2, r1 @@ -696297,7 +696297,7 @@ _08152ECC: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [r7] - bl sub_0815309C + bl DoReadFlashWholeSection ldr r2, [r7] ldr r1, _08152F40 adds r0, r2, r1 @@ -696471,7 +696471,7 @@ _08153014: .align 2, 0 _08153024: .4byte gUnknown_3005F40 _08153028: .4byte gUnknown_3005F30 - thumb_func_end sub_08152E18 + thumb_func_end GetSaveValidStatus thumb_func_start sub_0815302C sub_0815302C: @ 0x0815302C @@ -696483,7 +696483,7 @@ sub_0815302C: @ 0x0815302C lsrs r4, r2, #0x10 ldr r5, _08153080 adds r1, r5, #0 - bl sub_0815309C + bl DoReadFlashWholeSection ldr r1, _08153084 adds r0, r5, r1 ldr r1, [r0] @@ -696532,8 +696532,8 @@ _08153096: bx r1 thumb_func_end sub_0815302C - thumb_func_start sub_0815309C -sub_0815309C: @ 0x0815309C + thumb_func_start DoReadFlashWholeSection +DoReadFlashWholeSection: @ 0x0815309C push {lr} adds r2, r1, #0 lsls r0, r0, #0x18 @@ -696545,7 +696545,7 @@ sub_0815309C: @ 0x0815309C movs r0, #1 pop {r1} bx r1 - thumb_func_end sub_0815309C + thumb_func_end DoReadFlashWholeSection thumb_func_start CalculateChecksum CalculateChecksum: @ 0x081530B4 @@ -696634,8 +696634,8 @@ _0815314C: .4byte gUnknown_3005AEC _08153150: .4byte gUnknown_3005AF4 thumb_func_end UpdateSaveAddresses - thumb_func_start sub_08153154 -sub_08153154: @ 0x08153154 + thumb_func_start HandleSavingData +HandleSavingData: @ 0x08153154 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -696675,14 +696675,14 @@ _08153198: bls _08153198 _081531AA: movs r0, #0xa - bl sub_08084180 + bl GetGameStat ldr r1, _081531EC cmp r0, r1 bhi _081531BC movs r0, #0xa bl IncrementGameStat _081531BC: - bl sub_080768B4 + bl SaveSerializedGame ldr r0, _081531F0 ldr r1, _081531F4 bl sub_081526DC @@ -696692,12 +696692,12 @@ _081531BC: movs r0, #0x1c adds r1, r4, #0 adds r2, r5, #0 - bl sub_0815286C + bl HandleWriteSectorNBytes adds r4, r4, r5 movs r0, #0x1d adds r1, r4, #0 adds r2, r5, #0 - bl sub_0815286C + bl HandleWriteSectorNBytes b _08153256 .align 2, 0 _081531E8: .4byte gUnknown_3007600 @@ -696706,7 +696706,7 @@ _081531F0: .4byte 0x0000FFFF _081531F4: .4byte gUnknown_3005F60 _081531F8: .4byte gUnknown_201C000 _081531FC: - bl sub_080768B4 + bl SaveSerializedGame ldr r0, _0815320C ldr r1, _08153210 bl sub_081526DC @@ -696715,7 +696715,7 @@ _081531FC: _0815320C: .4byte 0x0000FFFF _08153210: .4byte gUnknown_3005F60 _08153214: - bl sub_080768B4 + bl SaveSerializedGame movs r4, #0 _0815321A: adds r0, r4, #0 @@ -696741,7 +696741,7 @@ _08153238: lsrs r4, r0, #0x18 cmp r4, #0x1f bls _08153238 - bl sub_080768B4 + bl SaveSerializedGame ldr r0, _08153268 ldr r1, _0815326C bl sub_081526DC @@ -696757,10 +696757,10 @@ _08153264: .4byte gUnknown_3007600 _08153268: .4byte 0x0000FFFF _0815326C: .4byte gUnknown_3005F60 _08153270: .4byte gUnknown_203CC28 - thumb_func_end sub_08153154 + thumb_func_end HandleSavingData - thumb_func_start sub_08153274 -sub_08153274: @ 0x08153274 + thumb_func_start TrySavingData +TrySavingData: @ 0x08153274 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -696769,13 +696769,13 @@ sub_08153274: @ 0x08153274 cmp r4, #1 bne _08153296 adds r0, r5, #0 - bl sub_08153154 + bl HandleSavingData ldr r0, _081532A4 ldr r0, [r0] cmp r0, #0 beq _081532AC adds r0, r5, #0 - bl sub_08178E48 + bl DoSaveFailedScreen _08153296: ldr r1, _081532A8 movs r0, #0xff @@ -696796,7 +696796,7 @@ _081532B2: bx r1 .align 2, 0 _081532B8: .4byte gUnknown_3005FD4 - thumb_func_end sub_08153274 + thumb_func_end TrySavingData thumb_func_start sub_081532BC sub_081532BC: @ 0x081532BC @@ -696806,9 +696806,9 @@ sub_081532BC: @ 0x081532BC cmp r0, #1 bne _081532E0 bl UpdateSaveAddresses - bl sub_080768B4 + bl SaveSerializedGame ldr r0, _081532DC - bl sub_08152910 + bl RestoreSaveBackupVarsAndIncrement movs r0, #0 b _081532E2 .align 2, 0 @@ -696835,7 +696835,7 @@ sub_081532E8: @ 0x081532E8 cmp r0, #0 beq _08153304 movs r0, #0 - bl sub_08178E48 + bl DoSaveFailedScreen _08153304: cmp r4, #0xff beq _08153314 @@ -696863,7 +696863,7 @@ sub_0815331C: @ 0x0815331C cmp r0, #0 beq _08153334 movs r0, #0 - bl sub_08178E48 + bl DoSaveFailedScreen _08153334: movs r0, #0 pop {r1} @@ -696884,7 +696884,7 @@ sub_08153344: @ 0x08153344 cmp r0, #0 beq _0815335C movs r0, #0 - bl sub_08178E48 + bl DoSaveFailedScreen _0815335C: movs r0, #0 pop {r1} @@ -696902,7 +696902,7 @@ sub_0815336C: @ 0x0815336C cmp r0, #1 bne _081533A8 bl UpdateSaveAddresses - bl sub_080768B4 + bl SaveSerializedGame ldr r4, _081533A0 adds r0, r4, #0 bl RestoreSaveBackupVars @@ -696927,8 +696927,8 @@ _081533AA: bx r1 thumb_func_end sub_0815336C - thumb_func_start sub_081533B0 -sub_081533B0: @ 0x081533B0 + thumb_func_start CheckSaveFile +CheckSaveFile: @ 0x081533B0 push {r4, r5, r6, lr} movs r6, #0 ldr r0, _081533DC @@ -696963,7 +696963,7 @@ _081533EE: cmp r0, #0 beq _081533FC movs r0, #1 - bl sub_08178E48 + bl DoSaveFailedScreen _081533FC: adds r0, r6, #0 pop {r4, r5, r6} @@ -696972,10 +696972,10 @@ _081533FC: .align 2, 0 _08153404: .4byte gUnknown_3005F60 _08153408: .4byte gUnknown_3005F3C - thumb_func_end sub_081533B0 + thumb_func_end CheckSaveFile - thumb_func_start sub_0815340C -sub_0815340C: @ 0x0815340C + thumb_func_start Save_LoadGameData +Save_LoadGameData: @ 0x0815340C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -697003,7 +697003,7 @@ _08153438: bl sub_08152D20 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080768C4 + bl LoadSerializedGame ldr r0, _0815345C strh r4, [r0] ldr r1, _08153460 @@ -697041,7 +697041,7 @@ _0815348C: bx r1 .align 2, 0 _08153494: .4byte gUnknown_201C000 - thumb_func_end sub_0815340C + thumb_func_end Save_LoadGameData thumb_func_start sub_08153498 sub_08153498: @ 0x08153498 @@ -697071,7 +697071,7 @@ _081534B8: _081534C8: bl UpdateSaveAddresses ldr r0, _0815350C - bl sub_08152E18 + bl GetSaveValidStatus ldr r0, _08153510 ldr r1, [r0] ands r1, r4 @@ -697085,7 +697085,7 @@ _081534E2: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, [r5] - bl sub_0815309C + bl DoReadFlashWholeSection ldr r0, [r5] ldr r1, _08153514 adds r0, r0, r1 @@ -697109,8 +697109,8 @@ _08153510: .4byte gUnknown_3005F40 _08153514: .4byte 0x00000FF4 thumb_func_end sub_08153498 - thumb_func_start sub_08153518 -sub_08153518: @ 0x08153518 + thumb_func_start TryReadSpecialSaveSection +TryReadSpecialSaveSection: @ 0x08153518 push {r4, r5, r6, lr} adds r6, r1, #0 lsls r0, r0, #0x18 @@ -697157,10 +697157,10 @@ _08153566: bx r1 .align 2, 0 _0815356C: .4byte 0x00000FFB - thumb_func_end sub_08153518 + thumb_func_end TryReadSpecialSaveSection - thumb_func_start sub_08153570 -sub_08153570: @ 0x08153570 + thumb_func_start TryWriteSpecialSaveSection +TryWriteSpecialSaveSection: @ 0x08153570 push {r4, r5, r6, r7, lr} adds r5, r1, #0 lsls r0, r0, #0x18 @@ -697202,7 +697202,7 @@ _081535BE: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08153570 + thumb_func_end TryWriteSpecialSaveSection thumb_func_start sub_081535C4 sub_081535C4: @ 0x081535C4 @@ -697256,7 +697256,7 @@ _08153630: strh r0, [r4] b _081536FE _0815363A: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081536FE @@ -697274,7 +697274,7 @@ _08153656: ldrsh r0, [r4, r1] cmp r0, #0 bne _08153662 - bl sub_08076764 + bl SetContinueGameWarpStatusToDynamicWarp _08153662: bl sub_081532BC b _0815368E @@ -697319,7 +697319,7 @@ _081536AA: strh r0, [r4] b _081536FE _081536B4: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081536FE @@ -697333,7 +697333,7 @@ _081536C8: strh r0, [r4] b _081536FE _081536D2: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081536FE @@ -697353,7 +697353,7 @@ _081536E4: movs r0, #0 strb r0, [r1] adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _081536FE: pop {r4} pop {r0} @@ -697396,23 +697396,23 @@ _0815373A: bx r1 thumb_func_end CheckCompatibility - thumb_func_start sub_08153740 -sub_08153740: @ 0x08153740 + thumb_func_start SetIncompatible +SetIncompatible: @ 0x08153740 push {lr} ldr r0, _08153754 ldr r1, _08153758 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #3 - bl sub_08153800 + bl SetMysteryEventScriptStatus pop {r0} bx r0 .align 2, 0 _08153754: .4byte gUnknown_2021C7C _08153758: .4byte gUnknown_85FCBDE - thumb_func_end sub_08153740 + thumb_func_end SetIncompatible - thumb_func_start sub_0815375C -sub_0815375C: @ 0x0815375C + thumb_func_start InitMysteryEventScript +InitMysteryEventScript: @ 0x0815375C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -697421,7 +697421,7 @@ sub_0815375C: @ 0x0815375C bl InitScriptContext adds r0, r4, #0 adds r1, r5, #0 - bl sub_0809867C + bl SetupBytecodeScript str r5, [r4, #0x64] movs r0, #0 str r0, [r4, #0x68] @@ -697433,13 +697433,13 @@ sub_0815375C: @ 0x0815375C .align 2, 0 _08153784: .4byte gUnknown_828D2B4 _08153788: .4byte gUnknown_828D2F8 - thumb_func_end sub_0815375C + thumb_func_end InitMysteryEventScript - thumb_func_start sub_0815378C -sub_0815378C: @ 0x0815378C + thumb_func_start RunMysteryEventScriptCommand +RunMysteryEventScriptCommand: @ 0x0815378C push {r4, lr} adds r4, r0, #0 - bl sub_08098698 + bl RunScriptCommand lsls r0, r0, #0x18 cmp r0, #0 beq _081537A4 @@ -697454,14 +697454,14 @@ _081537A6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0815378C + thumb_func_end RunMysteryEventScriptCommand thumb_func_start sub_081537AC sub_081537AC: @ 0x081537AC push {lr} adds r1, r0, #0 ldr r0, _081537BC - bl sub_0815375C + bl InitMysteryEventScript pop {r0} bx r0 .align 2, 0 @@ -697474,7 +697474,7 @@ sub_081537C0: @ 0x081537C0 adds r5, r0, #0 ldr r4, _081537D8 adds r0, r4, #0 - bl sub_0815378C + bl RunMysteryEventScriptCommand ldr r1, [r4, #0x6c] str r1, [r5] pop {r4, r5} @@ -697490,10 +697490,10 @@ RunMysteryEventScript: @ 0x081537DC adds r1, r0, #0 ldr r4, _081537FC adds r0, r4, #0 - bl sub_0815375C + bl InitMysteryEventScript _081537E8: adds r0, r4, #0 - bl sub_0815378C + bl RunMysteryEventScriptCommand cmp r0, #0 bne _081537E8 ldr r0, [r4, #0x6c] @@ -697504,14 +697504,14 @@ _081537E8: _081537FC: .4byte gUnknown_203B88C thumb_func_end RunMysteryEventScript - thumb_func_start sub_08153800 -sub_08153800: @ 0x08153800 + thumb_func_start SetMysteryEventScriptStatus +SetMysteryEventScriptStatus: @ 0x08153800 ldr r1, _08153808 str r0, [r1, #0x6c] bx lr .align 2, 0 _08153808: .4byte gUnknown_203B88C - thumb_func_end sub_08153800 + thumb_func_end SetMysteryEventScriptStatus thumb_func_start CalcRecordMixingGiftChecksum CalcRecordMixingGiftChecksum: @ 0x0815380C @@ -697537,8 +697537,8 @@ _0815382C: .4byte gUnknown_3005AEC _08153830: .4byte 0x00003B18 thumb_func_end CalcRecordMixingGiftChecksum - thumb_func_start sub_08153834 -sub_08153834: @ 0x08153834 + thumb_func_start IsRecordMixingGiftValid +IsRecordMixingGiftValid: @ 0x08153834 push {r4, r5, lr} ldr r5, _0815386C ldr r0, [r5] @@ -697576,7 +697576,7 @@ _0815387A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08153834 + thumb_func_end IsRecordMixingGiftValid thumb_func_start sub_08153880 sub_08153880: @ 0x08153880 @@ -697652,14 +697652,14 @@ _08153908: .4byte 0x00003B19 _0815390C: .4byte 0x00003B14 thumb_func_end SetRecordMixingGift - thumb_func_start sub_08153910 -sub_08153910: @ 0x08153910 + thumb_func_start GetRecordMixingGift +GetRecordMixingGift: @ 0x08153910 push {r4, r5, r6, lr} ldr r6, _0815392C ldr r0, [r6] ldr r1, _08153930 adds r4, r0, r1 - bl sub_08153834 + bl IsRecordMixingGiftValid cmp r0, #0 bne _08153934 bl sub_08153880 @@ -697692,19 +697692,19 @@ _08153956: bx r1 .align 2, 0 _0815395C: .4byte 0x00003B14 - thumb_func_end sub_08153910 + thumb_func_end GetRecordMixingGift thumb_func_start sub_08153960 sub_08153960: @ 0x08153960 push {lr} - bl sub_08098690 + bl StopScript movs r0, #1 pop {r1} bx r1 thumb_func_end sub_08153960 - thumb_func_start sub_0815396C -sub_0815396C: @ 0x0815396C + thumb_func_start MEScrCmd_checkcompat +MEScrCmd_checkcompat: @ 0x0815396C push {r4, r5, r6, r7, lr} adds r7, r0, #0 bl ScriptReadWord @@ -697734,13 +697734,13 @@ sub_0815396C: @ 0x0815396C str r0, [r7, #0x70] b _081539B4 _081539B0: - bl sub_08153740 + bl SetIncompatible _081539B4: movs r0, #1 pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0815396C + thumb_func_end MEScrCmd_checkcompat thumb_func_start sub_081539BC sub_081539BC: @ 0x081539BC @@ -697748,8 +697748,8 @@ sub_081539BC: @ 0x081539BC bx lr thumb_func_end sub_081539BC - thumb_func_start sub_081539C0 -sub_081539C0: @ 0x081539C0 + thumb_func_start MEScrCmd_setstatus +MEScrCmd_setstatus: @ 0x081539C0 ldr r1, [r0, #8] ldrb r2, [r1] adds r1, #1 @@ -697758,10 +697758,10 @@ sub_081539C0: @ 0x081539C0 movs r0, #0 bx lr .align 2, 0 - thumb_func_end sub_081539C0 + thumb_func_end MEScrCmd_setstatus - thumb_func_start sub_081539D0 -sub_081539D0: @ 0x081539D0 + thumb_func_start MEScrCmd_setmsg +MEScrCmd_setmsg: @ 0x081539D0 push {r4, r5, lr} adds r4, r0, #0 ldr r0, [r4, #8] @@ -697781,7 +697781,7 @@ sub_081539D0: @ 0x081539D0 bne _081539FA _081539F4: ldr r0, _08153A04 - bl sub_08008BCC + bl StringExpandPlaceholders _081539FA: movs r0, #0 pop {r4, r5} @@ -697789,10 +697789,10 @@ _081539FA: bx r1 .align 2, 0 _08153A04: .4byte gUnknown_2021C7C - thumb_func_end sub_081539D0 + thumb_func_end MEScrCmd_setmsg - thumb_func_start sub_08153A08 -sub_08153A08: @ 0x08153A08 + thumb_func_start MEScrCmd_runscript +MEScrCmd_runscript: @ 0x08153A08 push {r4, lr} adds r4, r0, #0 bl ScriptReadWord @@ -697805,16 +697805,16 @@ sub_08153A08: @ 0x08153A08 pop {r4} pop {r1} bx r1 - thumb_func_end sub_08153A08 + thumb_func_end MEScrCmd_runscript - thumb_func_start sub_08153A24 -sub_08153A24: @ 0x08153A24 + thumb_func_start MEScrCmd_setenigmaberry +MEScrCmd_setenigmaberry: @ 0x08153A24 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} adds r7, r0, #0 - bl sub_080E0B78 + bl IsEnigmaBerryValid mov r8, r0 adds r0, r7, #0 bl ScriptReadWord @@ -697868,10 +697868,10 @@ _08153AAC: ldr r0, _08153ACC ldr r1, _08153AD0 _08153AB0: - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [r7, #0x6c] - bl sub_080E0B78 + bl IsEnigmaBerryValid cmp r0, #1 bne _08153AD8 ldr r0, _08153AD4 @@ -697894,10 +697894,10 @@ _08153ADC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08153A24 + thumb_func_end MEScrCmd_setenigmaberry - thumb_func_start sub_08153AEC -sub_08153AEC: @ 0x08153AEC + thumb_func_start MEScrCmd_giveribbon +MEScrCmd_giveribbon: @ 0x08153AEC push {r4, lr} adds r4, r0, #0 ldr r2, [r4, #8] @@ -697907,10 +697907,10 @@ sub_08153AEC: @ 0x08153AEC ldrb r1, [r2] adds r2, #1 str r2, [r4, #8] - bl sub_080FA3A0 + bl GiveGiftRibbonToParty ldr r0, _08153B18 ldr r1, _08153B1C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [r4, #0x6c] movs r0, #0 @@ -697920,10 +697920,10 @@ sub_08153AEC: @ 0x08153AEC .align 2, 0 _08153B18: .4byte gUnknown_2021C7C _08153B1C: .4byte gUnknown_85FCB3D - thumb_func_end sub_08153AEC + thumb_func_end MEScrCmd_giveribbon - thumb_func_start sub_08153B20 -sub_08153B20: @ 0x08153B20 + thumb_func_start MEScrCmd_initramscript +MEScrCmd_initramscript: @ 0x08153B20 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -697963,7 +697963,7 @@ sub_08153B20: @ 0x08153B20 adds r0, r5, #0 mov r2, sb mov r3, r8 - bl sub_08098A84 + bl InitRamScript movs r0, #0 add sp, #4 pop {r3, r4} @@ -697973,16 +697973,16 @@ sub_08153B20: @ 0x08153B20 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08153B20 + thumb_func_end MEScrCmd_initramscript thumb_func_start sub_08153B88 sub_08153B88: @ 0x08153B88 push {r4, lr} adds r4, r0, #0 - bl sub_0809CCC0 + bl EnableNationalPokedex ldr r0, _08153BA4 ldr r1, _08153BA8 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [r4, #0x6c] movs r0, #0 @@ -697994,8 +697994,8 @@ _08153BA4: .4byte gUnknown_2021C7C _08153BA8: .4byte gUnknown_85FCB59 thumb_func_end sub_08153B88 - thumb_func_start sub_08153BAC -sub_08153BAC: @ 0x08153BAC + thumb_func_start MEScrCmd_addrareword +MEScrCmd_addrareword: @ 0x08153BAC push {r4, lr} adds r4, r0, #0 ldr r1, [r4, #8] @@ -698005,7 +698005,7 @@ sub_08153BAC: @ 0x08153BAC bl sub_0811F4A0 ldr r0, _08153BD0 ldr r1, _08153BD4 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [r4, #0x6c] movs r0, #0 @@ -698015,10 +698015,10 @@ sub_08153BAC: @ 0x08153BAC .align 2, 0 _08153BD0: .4byte gUnknown_2021C7C _08153BD4: .4byte gUnknown_85FCB70 - thumb_func_end sub_08153BAC + thumb_func_end MEScrCmd_addrareword - thumb_func_start sub_08153BD8 -sub_08153BD8: @ 0x08153BD8 + thumb_func_start MEScrCmd_setrecordmixinggift +MEScrCmd_setrecordmixinggift: @ 0x08153BD8 push {r4, r5, lr} ldr r1, [r0, #8] ldrb r5, [r1] @@ -698039,10 +698039,10 @@ sub_08153BD8: @ 0x08153BD8 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08153BD8 + thumb_func_end MEScrCmd_setrecordmixinggift - thumb_func_start sub_08153C04 -sub_08153C04: @ 0x08153C04 + thumb_func_start MEScrCmd_givepokemon +MEScrCmd_givepokemon: @ 0x08153C04 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -698063,7 +698063,7 @@ sub_08153C04: @ 0x08153C04 bl memcpy adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #0xce @@ -698090,7 +698090,7 @@ _08153C5E: bne _08153C88 ldr r0, _08153C80 ldr r1, _08153C84 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #3 b _08153CF2 .align 2, 0 @@ -698120,14 +698120,14 @@ _08153C88: lsrs r4, r4, #0x10 adds r0, r4, #0 movs r1, #2 - bl sub_080BFBBC + bl GetSetPokedexFlag adds r0, r4, #0 movs r1, #3 - bl sub_080BFBBC + bl GetSetPokedexFlag _08153CC2: adds r0, r7, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl ItemIsMail @@ -698136,13 +698136,13 @@ _08153CC2: beq _08153CE0 adds r0, r7, #0 mov r1, sp - bl sub_080D3E90 + bl GiveMailToMon2 _08153CE0: - bl sub_080CE188 + bl CompactPartySlots bl sub_0806B004 ldr r0, _08153D08 ldr r1, _08153D0C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 _08153CF2: str r0, [r6, #0x6c] @@ -698157,10 +698157,10 @@ _08153CF2: _08153D04: .4byte gUnknown_2024384 _08153D08: .4byte gUnknown_2021C7C _08153D0C: .4byte gUnknown_85FCB83 - thumb_func_end sub_08153C04 + thumb_func_end MEScrCmd_givepokemon - thumb_func_start sub_08153D10 -sub_08153D10: @ 0x08153D10 + thumb_func_start MEScrCmd_addtrainer +MEScrCmd_addtrainer: @ 0x08153D10 push {r4, lr} adds r4, r0, #0 bl ScriptReadWord @@ -698175,10 +698175,10 @@ sub_08153D10: @ 0x08153D10 adds r0, r0, r2 movs r2, #0xbc bl memcpy - bl sub_08165130 + bl ValidateEReaderTrainer ldr r0, _08153D50 ldr r1, _08153D54 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [r4, #0x6c] movs r0, #0 @@ -698190,7 +698190,7 @@ _08153D48: .4byte gUnknown_3005AF0 _08153D4C: .4byte 0x00000BEC _08153D50: .4byte gUnknown_2021C7C _08153D54: .4byte gUnknown_85FCBAA - thumb_func_end sub_08153D10 + thumb_func_end MEScrCmd_addtrainer thumb_func_start sub_08153D58 sub_08153D58: @ 0x08153D58 @@ -698199,7 +698199,7 @@ sub_08153D58: @ 0x08153D58 bl EnableResetRTC ldr r0, _08153D74 ldr r1, _08153D78 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [r4, #0x6c] movs r0, #0 @@ -698211,8 +698211,8 @@ _08153D74: .4byte gUnknown_2021C7C _08153D78: .4byte gUnknown_85CBF86 thumb_func_end sub_08153D58 - thumb_func_start sub_08153D7C -sub_08153D7C: @ 0x08153D7C + thumb_func_start MEScrCmd_checksum +MEScrCmd_checksum: @ 0x08153D7C push {r4, r5, r6, lr} adds r6, r0, #0 bl ScriptReadWord @@ -698246,7 +698246,7 @@ _08153DBA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08153D7C + thumb_func_end MEScrCmd_checksum thumb_func_start sub_08153DC4 sub_08153DC4: @ 0x08153DC4 @@ -698287,8 +698287,8 @@ _08153E06: .align 2, 0 thumb_func_end sub_08153DC4 - thumb_func_start sub_08153E10 -sub_08153E10: @ 0x08153E10 + thumb_func_start SetUpReflection +SetUpReflection: @ 0x08153E10 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -698302,7 +698302,7 @@ sub_08153E10: @ 0x08153E10 ldrsh r2, [r4, r0] adds r0, r4, #0 movs r3, #0x98 - bl sub_0808E8C0 + bl CreateCopySpriteAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -698359,7 +698359,7 @@ sub_08153E10: @ 0x08153E10 strh r5, [r7, #0x3c] adds r0, r6, #0 adds r1, r7, #0 - bl sub_08153EE8 + bl LoadObjectReflectionPalette cmp r5, #0 bne _08153EB6 ldrb r0, [r7, #1] @@ -698377,27 +698377,27 @@ _08153EB6: bx r0 .align 2, 0 _08153EC0: .4byte gUnknown_20205AC -_08153EC4: .4byte sub_08153FE4 +_08153EC4: .4byte UpdateObjectReflectionSprite _08153EC8: .4byte gUnknown_846FA18 _08153ECC: .4byte gUnknown_82BF304 _08153ED0: .4byte gUnknown_82BF310 - thumb_func_end sub_08153E10 + thumb_func_end SetUpReflection - thumb_func_start sub_08153ED4 -sub_08153ED4: @ 0x08153ED4 + thumb_func_start GetReflectionVerticalOffset +GetReflectionVerticalOffset: @ 0x08153ED4 push {lr} ldrb r0, [r0, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrh r0, [r0, #0xa] subs r0, #2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_08153ED4 + thumb_func_end GetReflectionVerticalOffset - thumb_func_start sub_08153EE8 -sub_08153EE8: @ 0x08153EE8 + thumb_func_start LoadObjectReflectionPalette +LoadObjectReflectionPalette: @ 0x08153EE8 push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -698409,7 +698409,7 @@ sub_08153EE8: @ 0x08153EE8 movs r0, #0 strh r0, [r4, #0x32] ldrb r0, [r5, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrb r1, [r0, #0xc] movs r0, #0x80 ands r0, r1 @@ -698436,7 +698436,7 @@ _08153F2A: ldrb r1, [r4, #5] lsrs r1, r1, #4 adds r0, r5, #0 - bl sub_08153FB4 + bl LoadObjectHighBridgeReflectionPalette b _08153F4E .align 2, 0 _08153F40: .4byte gUnknown_85ACA40 @@ -698444,22 +698444,22 @@ _08153F44: ldrb r1, [r4, #5] lsrs r1, r1, #4 adds r0, r5, #0 - bl sub_08153F58 + bl LoadObjectRegularReflectionPalette _08153F4E: add sp, #8 pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08153EE8 + thumb_func_end LoadObjectReflectionPalette - thumb_func_start sub_08153F58 -sub_08153F58: @ 0x08153F58 + thumb_func_start LoadObjectRegularReflectionPalette +LoadObjectRegularReflectionPalette: @ 0x08153F58 push {r4, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 ldrb r0, [r0, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r2, r0, #0 ldrh r1, [r2, #4] ldr r0, _08153F84 @@ -698472,7 +698472,7 @@ sub_08153F58: @ 0x08153F58 bne _08153F88 ldrh r0, [r2, #2] adds r1, r4, #0 - bl sub_0808E338 + bl LoadPlayerObjectReflectionPalette b _08153FA6 .align 2, 0 _08153F84: .4byte 0x000011FF @@ -698481,32 +698481,32 @@ _08153F88: bne _08153F96 ldrh r0, [r2, #2] adds r1, r4, #0 - bl sub_0808E3A8 + bl LoadSpecialObjectReflectionPalette b _08153FA6 _08153F96: adds r0, r4, #0 - bl sub_0808ECD0 + bl GetObjectPaletteTag lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r4, #0 - bl sub_0808E28C + bl PatchObjectPalette _08153FA6: adds r0, r4, #0 - bl sub_080AB714 + bl UpdateSpritePaletteWithWeather _08153FAC: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08153F58 + thumb_func_end LoadObjectRegularReflectionPalette - thumb_func_start sub_08153FB4 -sub_08153FB4: @ 0x08153FB4 + thumb_func_start LoadObjectHighBridgeReflectionPalette +LoadObjectHighBridgeReflectionPalette: @ 0x08153FB4 push {r4, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 ldrb r0, [r0, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r2, r0, #0 ldrh r1, [r2, #4] ldr r0, _08153FE0 @@ -698514,19 +698514,19 @@ sub_08153FB4: @ 0x08153FB4 beq _08153FD8 adds r0, r1, #0 adds r1, r4, #0 - bl sub_0808E28C + bl PatchObjectPalette adds r0, r4, #0 - bl sub_080AB714 + bl UpdateSpritePaletteWithWeather _08153FD8: pop {r4} pop {r0} bx r0 .align 2, 0 _08153FE0: .4byte 0x000011FF - thumb_func_end sub_08153FB4 + thumb_func_end LoadObjectHighBridgeReflectionPalette - thumb_func_start sub_08153FE4 -sub_08153FE4: @ 0x08153FE4 + thumb_func_start UpdateObjectReflectionSprite +UpdateObjectReflectionSprite: @ 0x08153FE4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -698649,7 +698649,7 @@ _08154038: ldrh r0, [r5, #0x20] strh r0, [r4, #0x20] adds r0, r7, #0 - bl sub_08153ED4 + bl GetReflectionVerticalOffset ldrh r1, [r5, #0x22] adds r0, r0, r1 ldrh r1, [r4, #0x32] @@ -698719,17 +698719,17 @@ _08154150: .align 2, 0 _0815415C: .4byte gUnknown_846FA18 _08154160: .4byte 0xFFFFFC00 - thumb_func_end sub_08153FE4 + thumb_func_end UpdateObjectReflectionSprite - thumb_func_start sub_08154164 -sub_08154164: @ 0x08154164 + thumb_func_start CreateWarpArrowSprite +CreateWarpArrowSprite: @ 0x08154164 push {r4, lr} ldr r0, _081541AC ldr r0, [r0, #0x20] movs r1, #0 movs r2, #0 movs r3, #0x52 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r4, r0, #0 @@ -698761,7 +698761,7 @@ _081541A2: .align 2, 0 _081541AC: .4byte gUnknown_84DDE4C _081541B0: .4byte gUnknown_20205AC - thumb_func_end sub_08154164 + thumb_func_end CreateWarpArrowSprite thumb_func_start SetSpriteInvisible SetSpriteInvisible: @ 0x081541B4 @@ -698782,8 +698782,8 @@ SetSpriteInvisible: @ 0x081541B4 _081541D0: .4byte gUnknown_20205AC thumb_func_end SetSpriteInvisible - thumb_func_start sub_081541D4 -sub_081541D4: @ 0x081541D4 + thumb_func_start ShowWarpArrowSprite +ShowWarpArrowSprite: @ 0x081541D4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -698867,10 +698867,10 @@ _0815426A: bx r0 .align 2, 0 _08154278: .4byte gUnknown_20205AC - thumb_func_end sub_081541D4 + thumb_func_end ShowWarpArrowSprite - thumb_func_start sub_0815427C -sub_0815427C: @ 0x0815427C + thumb_func_start FldEff_Shadow +FldEff_Shadow: @ 0x0815427C push {r4, r5, lr} ldr r5, _08154308 ldrb r0, [r5] @@ -698885,7 +698885,7 @@ sub_0815427C: @ 0x0815427C lsls r1, r1, #2 adds r1, r1, r2 ldrb r0, [r1, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r4, r0, #0 ldr r2, _08154310 ldr r1, _08154314 @@ -698900,7 +698900,7 @@ sub_0815427C: @ 0x0815427C movs r1, #0 movs r2, #0 movs r3, #0x94 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -698946,10 +698946,10 @@ _08154310: .4byte gUnknown_84DDE4C _08154314: .4byte gUnknown_85ACA46 _08154318: .4byte gUnknown_20205AC _0815431C: .4byte gUnknown_85ACA4A - thumb_func_end sub_0815427C + thumb_func_end FldEff_Shadow - thumb_func_start sub_08154320 -sub_08154320: @ 0x08154320 + thumb_func_start UpdateShadowFieldEffect +UpdateShadowFieldEffect: @ 0x08154320 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -699011,12 +699011,12 @@ _0815434E: cmp r0, #0 bne _081543CC ldrb r0, [r4, #0x1e] - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _081543CC ldrb r0, [r4, #0x1f] - bl sub_080888EC + bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, r0, #0x18 cmp r0, #0 bne _081543CC @@ -699043,10 +699043,10 @@ _081543D4: _081543DC: .4byte gUnknown_2036FF0 _081543E0: .4byte gUnknown_20205AC _081543E4: .4byte 0x00400001 - thumb_func_end sub_08154320 + thumb_func_end UpdateShadowFieldEffect - thumb_func_start sub_081543E8 -sub_081543E8: @ 0x081543E8 + thumb_func_start FldEff_TallGrass +FldEff_TallGrass: @ 0x081543E8 push {r4, r5, lr} sub sp, #4 ldr r5, _08154480 @@ -699070,7 +699070,7 @@ sub_081543E8: @ 0x081543E8 movs r3, #0 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -699124,10 +699124,10 @@ _08154474: _08154480: .4byte gUnknown_20388A8 _08154484: .4byte gUnknown_84DDE4C _08154488: .4byte gUnknown_20205AC - thumb_func_end sub_081543E8 + thumb_func_end FldEff_TallGrass - thumb_func_start sub_0815448C -sub_0815448C: @ 0x0815448C + thumb_func_start UpdateTallGrassFieldEffect +UpdateTallGrassFieldEffect: @ 0x0815448C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -699243,7 +699243,7 @@ _08154560: _0815456E: adds r0, r5, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility ldrh r1, [r5, #0x2e] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -699259,10 +699259,10 @@ _08154584: bx r0 .align 2, 0 _08154590: .4byte gUnknown_2036FF0 - thumb_func_end sub_0815448C + thumb_func_end UpdateTallGrassFieldEffect - thumb_func_start sub_08154594 -sub_08154594: @ 0x08154594 + thumb_func_start FldEff_JumpTallGrass +FldEff_JumpTallGrass: @ 0x08154594 push {r4, lr} ldr r4, _081545F8 adds r1, r4, #4 @@ -699277,7 +699277,7 @@ sub_08154594: @ 0x08154594 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -699316,10 +699316,10 @@ _081545F0: _081545F8: .4byte gUnknown_20388A8 _081545FC: .4byte gUnknown_84DDE4C _08154600: .4byte gUnknown_20205AC - thumb_func_end sub_08154594 + thumb_func_end FldEff_JumpTallGrass - thumb_func_start sub_08154604 -sub_08154604: @ 0x08154604 + thumb_func_start FindTallGrassFieldEffectSpriteId +FindTallGrassFieldEffectSpriteId: @ 0x08154604 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -699378,7 +699378,7 @@ _08154628: b _08154688 .align 2, 0 _08154674: .4byte gUnknown_20205AC -_08154678: .4byte sub_0815448C +_08154678: .4byte UpdateTallGrassFieldEffect _0815467C: adds r0, r5, #1 lsls r0, r0, #0x18 @@ -699393,10 +699393,10 @@ _08154688: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08154604 + thumb_func_end FindTallGrassFieldEffectSpriteId - thumb_func_start sub_08154694 -sub_08154694: @ 0x08154694 + thumb_func_start FldEff_LongGrass +FldEff_LongGrass: @ 0x08154694 push {r4, r5, lr} sub sp, #4 ldr r5, _08154730 @@ -699420,7 +699420,7 @@ sub_08154694: @ 0x08154694 movs r3, #0 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -699475,10 +699475,10 @@ _08154724: _08154730: .4byte gUnknown_20388A8 _08154734: .4byte gUnknown_84DDE4C _08154738: .4byte gUnknown_20205AC - thumb_func_end sub_08154694 + thumb_func_end FldEff_LongGrass - thumb_func_start sub_0815473C -sub_0815473C: @ 0x0815473C + thumb_func_start UpdateLongGrassFieldEffect +UpdateLongGrassFieldEffect: @ 0x0815473C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -699586,7 +699586,7 @@ _081547F0: _08154810: adds r0, r5, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility ldrh r1, [r5, #0x2e] lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -699602,10 +699602,10 @@ _08154826: bx r0 .align 2, 0 _08154834: .4byte gUnknown_2036FF0 - thumb_func_end sub_0815473C + thumb_func_end UpdateLongGrassFieldEffect - thumb_func_start sub_08154838 -sub_08154838: @ 0x08154838 + thumb_func_start FldEff_JumpLongGrass +FldEff_JumpLongGrass: @ 0x08154838 push {r4, lr} ldr r4, _0815489C adds r1, r4, #4 @@ -699620,7 +699620,7 @@ sub_08154838: @ 0x08154838 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -699659,10 +699659,10 @@ _08154894: _0815489C: .4byte gUnknown_20388A8 _081548A0: .4byte gUnknown_84DDE4C _081548A4: .4byte gUnknown_20205AC - thumb_func_end sub_08154838 + thumb_func_end FldEff_JumpLongGrass - thumb_func_start sub_081548A8 -sub_081548A8: @ 0x081548A8 + thumb_func_start FldEff_ShortGrass +FldEff_ShortGrass: @ 0x081548A8 push {r4, r5, r6, lr} ldr r6, _0815493C ldrb r0, [r6] @@ -699681,7 +699681,7 @@ sub_081548A8: @ 0x081548A8 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -699741,10 +699741,10 @@ _0815493C: .4byte gUnknown_20388A8 _08154940: .4byte gUnknown_2036FF0 _08154944: .4byte gUnknown_84DDE4C _08154948: .4byte gUnknown_20205AC - thumb_func_end sub_081548A8 + thumb_func_end FldEff_ShortGrass - thumb_func_start sub_0815494C -sub_0815494C: @ 0x0815494C + thumb_func_start UpdateShortGrassFieldEffect +UpdateShortGrassFieldEffect: @ 0x0815494C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -699784,7 +699784,7 @@ _0815498A: _08154994: .4byte gUnknown_2036FF0 _08154998: ldrb r0, [r1, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo mov r8, r0 mov r0, sp ldrb r1, [r0] @@ -699856,7 +699856,7 @@ _081549EE: lsls r1, r1, #0x1d lsrs r1, r1, #0x1f adds r0, r4, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility _08154A2E: add sp, #4 pop {r3} @@ -699866,10 +699866,10 @@ _08154A2E: bx r0 .align 2, 0 _08154A3C: .4byte gUnknown_20205AC - thumb_func_end sub_0815494C + thumb_func_end UpdateShortGrassFieldEffect - thumb_func_start sub_08154A40 -sub_08154A40: @ 0x08154A40 + thumb_func_start FldEff_SandFootprints +FldEff_SandFootprints: @ 0x08154A40 push {r4, lr} ldr r4, _08154AA8 adds r1, r4, #4 @@ -699884,7 +699884,7 @@ sub_08154A40: @ 0x08154A40 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -699923,10 +699923,10 @@ _08154A9E: _08154AA8: .4byte gUnknown_20388A8 _08154AAC: .4byte gUnknown_84DDE4C _08154AB0: .4byte gUnknown_20205AC - thumb_func_end sub_08154A40 + thumb_func_end FldEff_SandFootprints - thumb_func_start sub_08154AB4 -sub_08154AB4: @ 0x08154AB4 + thumb_func_start FldEff_DeepSandFootprints +FldEff_DeepSandFootprints: @ 0x08154AB4 push {r4, r5, lr} ldr r4, _08154B1C adds r1, r4, #4 @@ -699941,7 +699941,7 @@ sub_08154AB4: @ 0x08154AB4 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r5, r1, #0 @@ -699981,10 +699981,10 @@ _08154B14: _08154B1C: .4byte gUnknown_20388A8 _08154B20: .4byte gUnknown_84DDE4C _08154B24: .4byte gUnknown_20205AC - thumb_func_end sub_08154AB4 + thumb_func_end FldEff_DeepSandFootprints - thumb_func_start sub_08154B28 -sub_08154B28: @ 0x08154B28 + thumb_func_start FldEff_BikeTireTracks +FldEff_BikeTireTracks: @ 0x08154B28 push {r4, r5, lr} ldr r4, _08154B90 adds r1, r4, #4 @@ -699999,7 +699999,7 @@ sub_08154B28: @ 0x08154B28 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r5, r1, #0 @@ -700039,7 +700039,7 @@ _08154B88: _08154B90: .4byte gUnknown_20388A8 _08154B94: .4byte gUnknown_84DDE4C _08154B98: .4byte gUnknown_20205AC - thumb_func_end sub_08154B28 + thumb_func_end FldEff_BikeTireTracks thumb_func_start sub_08154B9C sub_08154B9C: @ 0x08154B9C @@ -700057,8 +700057,8 @@ sub_08154B9C: @ 0x08154B9C _08154BB4: .4byte gUnknown_85ACA54 thumb_func_end sub_08154B9C - thumb_func_start sub_08154BB8 -sub_08154BB8: @ 0x08154BB8 + thumb_func_start FadeFootprintsTireTracks_Step0 +FadeFootprintsTireTracks_Step0: @ 0x08154BB8 push {lr} adds r1, r0, #0 ldrh r0, [r1, #0x30] @@ -700073,14 +700073,14 @@ sub_08154BB8: @ 0x08154BB8 _08154BCE: adds r0, r1, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08154BB8 + thumb_func_end FadeFootprintsTireTracks_Step0 - thumb_func_start sub_08154BDC -sub_08154BDC: @ 0x08154BDC + thumb_func_start FadeFootprintsTireTracks_Step1 +FadeFootprintsTireTracks_Step1: @ 0x08154BDC push {r4, lr} adds r4, r0, #0 adds r3, r4, #0 @@ -700103,7 +700103,7 @@ sub_08154BDC: @ 0x08154BDC lsls r1, r1, #0x1d lsrs r1, r1, #0x1f adds r0, r4, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility movs r1, #0x30 ldrsh r0, [r4, r1] cmp r0, #0x38 @@ -700118,10 +700118,10 @@ _08154C20: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08154BDC + thumb_func_end FadeFootprintsTireTracks_Step1 - thumb_func_start sub_08154C28 -sub_08154C28: @ 0x08154C28 + thumb_func_start FldEff_Splash +FldEff_Splash: @ 0x08154C28 push {r4, r5, r6, lr} ldr r6, _08154CBC ldrb r0, [r6] @@ -700140,13 +700140,13 @@ sub_08154C28: @ 0x08154C28 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x40 beq _08154CB2 ldrb r0, [r5, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo lsls r3, r4, #4 adds r3, r3, r4 lsls r3, r3, #2 @@ -700197,10 +700197,10 @@ _08154CBC: .4byte gUnknown_20388A8 _08154CC0: .4byte gUnknown_2036FF0 _08154CC4: .4byte gUnknown_84DDE4C _08154CC8: .4byte gUnknown_20205AC - thumb_func_end sub_08154C28 + thumb_func_end FldEff_Splash - thumb_func_start sub_08154CCC -sub_08154CCC: @ 0x08154CCC + thumb_func_start UpdateSplashFieldEffect +UpdateSplashFieldEffect: @ 0x08154CCC push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -700260,7 +700260,7 @@ _08154D06: strh r0, [r4, #0x22] adds r0, r4, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility _08154D46: add sp, #4 pop {r4} @@ -700269,10 +700269,10 @@ _08154D46: .align 2, 0 _08154D50: .4byte gUnknown_20205AC _08154D54: .4byte gUnknown_2036FF0 - thumb_func_end sub_08154CCC + thumb_func_end UpdateSplashFieldEffect - thumb_func_start sub_08154D58 -sub_08154D58: @ 0x08154D58 + thumb_func_start FldEff_JumpSmallSplash +FldEff_JumpSmallSplash: @ 0x08154D58 push {r4, lr} ldr r4, _08154DBC adds r1, r4, #4 @@ -700287,7 +700287,7 @@ sub_08154D58: @ 0x08154D58 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700326,10 +700326,10 @@ _08154DB4: _08154DBC: .4byte gUnknown_20388A8 _08154DC0: .4byte gUnknown_84DDE4C _08154DC4: .4byte gUnknown_20205AC - thumb_func_end sub_08154D58 + thumb_func_end FldEff_JumpSmallSplash - thumb_func_start sub_08154DC8 -sub_08154DC8: @ 0x08154DC8 + thumb_func_start FldEff_JumpBigSplash +FldEff_JumpBigSplash: @ 0x08154DC8 push {r4, lr} ldr r4, _08154E2C adds r1, r4, #4 @@ -700344,7 +700344,7 @@ sub_08154DC8: @ 0x08154DC8 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700383,10 +700383,10 @@ _08154E24: _08154E2C: .4byte gUnknown_20388A8 _08154E30: .4byte gUnknown_84DDE4C _08154E34: .4byte gUnknown_20205AC - thumb_func_end sub_08154DC8 + thumb_func_end FldEff_JumpBigSplash - thumb_func_start sub_08154E38 -sub_08154E38: @ 0x08154E38 + thumb_func_start FldEff_FeetInFlowingWater +FldEff_FeetInFlowingWater: @ 0x08154E38 push {r4, r5, r6, r7, lr} ldr r7, _08154ED8 ldrb r0, [r7] @@ -700405,13 +700405,13 @@ sub_08154E38: @ 0x08154E38 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0x40 beq _08154ECE ldrb r0, [r6, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r4, r0, #0 lsls r0, r5, #4 adds r0, r0, r5 @@ -700468,12 +700468,12 @@ _08154ED8: .4byte gUnknown_20388A8 _08154EDC: .4byte gUnknown_2036FF0 _08154EE0: .4byte gUnknown_84DDE4C _08154EE4: .4byte gUnknown_20205AC -_08154EE8: .4byte sub_08154EF0 +_08154EE8: .4byte UpdateFeetInFlowingWaterFieldEffect _08154EEC: .4byte 0x0000FFFF - thumb_func_end sub_08154E38 + thumb_func_end FldEff_FeetInFlowingWater - thumb_func_start sub_08154EF0 -sub_08154EF0: @ 0x08154EF0 + thumb_func_start UpdateFeetInFlowingWaterFieldEffect +UpdateFeetInFlowingWaterFieldEffect: @ 0x08154EF0 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -700527,7 +700527,7 @@ _08154F38: strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility ldr r1, [r5, #0x10] ldr r0, [r4, #0x34] cmp r1, r0 @@ -700552,10 +700552,10 @@ _08154F82: bx r0 .align 2, 0 _08154F8C: .4byte gUnknown_20205AC - thumb_func_end sub_08154EF0 + thumb_func_end UpdateFeetInFlowingWaterFieldEffect - thumb_func_start sub_08154F90 -sub_08154F90: @ 0x08154F90 + thumb_func_start FldEff_Ripple +FldEff_Ripple: @ 0x08154F90 push {r4, lr} ldr r0, _08154FE4 ldr r0, [r0, #0x14] @@ -700565,7 +700565,7 @@ sub_08154F90: @ 0x08154F90 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700602,10 +700602,10 @@ _08154FDC: _08154FE4: .4byte gUnknown_84DDE4C _08154FE8: .4byte gUnknown_20388A8 _08154FEC: .4byte gUnknown_20205AC - thumb_func_end sub_08154F90 + thumb_func_end FldEff_Ripple - thumb_func_start sub_08154FF0 -sub_08154FF0: @ 0x08154FF0 + thumb_func_start FldEff_HotSpringsWater +FldEff_HotSpringsWater: @ 0x08154FF0 push {r4, r5, r6, lr} ldr r6, _08155084 ldrb r0, [r6] @@ -700624,7 +700624,7 @@ sub_08154FF0: @ 0x08154FF0 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700684,10 +700684,10 @@ _08155084: .4byte gUnknown_20388A8 _08155088: .4byte gUnknown_2036FF0 _0815508C: .4byte gUnknown_84DDE4C _08155090: .4byte gUnknown_20205AC - thumb_func_end sub_08154FF0 + thumb_func_end FldEff_HotSpringsWater - thumb_func_start sub_08155094 -sub_08155094: @ 0x08155094 + thumb_func_start UpdateHotSpringsWaterFieldEffect +UpdateHotSpringsWaterFieldEffect: @ 0x08155094 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -700725,7 +700725,7 @@ _081550CE: _081550D8: .4byte gUnknown_2036FF0 _081550DC: ldrb r0, [r1, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, #3 @@ -700755,7 +700755,7 @@ _081550DC: strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility _08155120: add sp, #4 pop {r4, r5} @@ -700763,10 +700763,10 @@ _08155120: bx r0 .align 2, 0 _08155128: .4byte gUnknown_20205AC - thumb_func_end sub_08155094 + thumb_func_end UpdateHotSpringsWaterFieldEffect - thumb_func_start sub_0815512C -sub_0815512C: @ 0x0815512C + thumb_func_start FldEff_Unknown19 +FldEff_Unknown19: @ 0x0815512C push {r4, lr} ldr r4, _0815518C adds r1, r4, #4 @@ -700781,7 +700781,7 @@ sub_0815512C: @ 0x0815512C movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700818,10 +700818,10 @@ _08155184: _0815518C: .4byte gUnknown_20388A8 _08155190: .4byte gUnknown_84DDE4C _08155194: .4byte gUnknown_20205AC - thumb_func_end sub_0815512C + thumb_func_end FldEff_Unknown19 - thumb_func_start sub_08155198 -sub_08155198: @ 0x08155198 + thumb_func_start FldEff_Unknown20 +FldEff_Unknown20: @ 0x08155198 push {r4, lr} ldr r4, _081551F8 adds r1, r4, #4 @@ -700836,7 +700836,7 @@ sub_08155198: @ 0x08155198 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700873,10 +700873,10 @@ _081551F0: _081551F8: .4byte gUnknown_20388A8 _081551FC: .4byte gUnknown_84DDE4C _08155200: .4byte gUnknown_20205AC - thumb_func_end sub_08155198 + thumb_func_end FldEff_Unknown20 - thumb_func_start sub_08155204 -sub_08155204: @ 0x08155204 + thumb_func_start FldEff_Unknown21 +FldEff_Unknown21: @ 0x08155204 push {r4, lr} ldr r4, _08155264 adds r1, r4, #4 @@ -700891,7 +700891,7 @@ sub_08155204: @ 0x08155204 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700928,10 +700928,10 @@ _0815525C: _08155264: .4byte gUnknown_20388A8 _08155268: .4byte gUnknown_84DDE4C _0815526C: .4byte gUnknown_20205AC - thumb_func_end sub_08155204 + thumb_func_end FldEff_Unknown21 - thumb_func_start sub_08155270 -sub_08155270: @ 0x08155270 + thumb_func_start FldEff_Unknown22 +FldEff_Unknown22: @ 0x08155270 push {r4, lr} ldr r4, _081552D0 adds r1, r4, #4 @@ -700946,7 +700946,7 @@ sub_08155270: @ 0x08155270 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -700983,10 +700983,10 @@ _081552C8: _081552D0: .4byte gUnknown_20388A8 _081552D4: .4byte gUnknown_84DDE4C _081552D8: .4byte gUnknown_20205AC - thumb_func_end sub_08155270 + thumb_func_end FldEff_Unknown22 - thumb_func_start sub_081552DC -sub_081552DC: @ 0x081552DC + thumb_func_start StartAshFieldEffect +StartAshFieldEffect: @ 0x081552DC push {r4, lr} lsls r2, r2, #0x10 lsrs r2, r2, #0x10 @@ -701006,16 +701006,16 @@ sub_081552DC: @ 0x081552DC asrs r3, r3, #0x10 str r3, [r4, #0x14] movs r0, #7 - bl sub_080B5270 + bl FieldEffectStart pop {r4} pop {r0} bx r0 .align 2, 0 _0815530C: .4byte gUnknown_20388A8 - thumb_func_end sub_081552DC + thumb_func_end StartAshFieldEffect - thumb_func_start sub_08155310 -sub_08155310: @ 0x08155310 + thumb_func_start FldEff_Ash +FldEff_Ash: @ 0x08155310 push {r4, r5, lr} sub sp, #4 ldr r5, _08155390 @@ -701039,7 +701039,7 @@ sub_08155310: @ 0x08155310 movs r3, #0 ldrsh r2, [r4, r3] ldrb r3, [r5, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -701083,10 +701083,10 @@ _08155386: _08155390: .4byte gUnknown_20388A8 _08155394: .4byte gUnknown_84DDE4C _08155398: .4byte gUnknown_20205AC - thumb_func_end sub_08155310 + thumb_func_end FldEff_Ash - thumb_func_start sub_0815539C -sub_0815539C: @ 0x0815539C + thumb_func_start CallBattlePikeFunction +CallBattlePikeFunction: @ 0x0815539C push {lr} ldr r2, _081553B4 movs r3, #0x2e @@ -701099,7 +701099,7 @@ sub_0815539C: @ 0x0815539C bx r0 .align 2, 0 _081553B4: .4byte gUnknown_85ACA5C - thumb_func_end sub_0815539C + thumb_func_end CallBattlePikeFunction thumb_func_start UpdateAshFieldEffect_Step0 UpdateAshFieldEffect_Step0: @ 0x081553B8 @@ -701130,8 +701130,8 @@ _081553E2: .align 2, 0 thumb_func_end UpdateAshFieldEffect_Step0 - thumb_func_start sub_081553E8 -sub_081553E8: @ 0x081553E8 + thumb_func_start UpdateAshFieldEffect_Step1 +UpdateAshFieldEffect_Step1: @ 0x081553E8 push {r4, lr} adds r4, r0, #0 adds r2, r4, #0 @@ -701177,14 +701177,14 @@ sub_081553E8: @ 0x081553E8 .align 2, 0 _08155440: .4byte gUnknown_2036FF0 _08155444: .4byte gUnknown_2037230 - thumb_func_end sub_081553E8 + thumb_func_end UpdateAshFieldEffect_Step1 - thumb_func_start sub_08155448 -sub_08155448: @ 0x08155448 + thumb_func_start UpdateAshFieldEffect_Step2 +UpdateAshFieldEffect_Step2: @ 0x08155448 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility adds r0, r4, #0 adds r0, #0x3f ldrb r1, [r0] @@ -701200,10 +701200,10 @@ _08155468: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08155448 + thumb_func_end UpdateAshFieldEffect_Step2 - thumb_func_start sub_08155470 -sub_08155470: @ 0x08155470 + thumb_func_start FldEff_SurfBlob +FldEff_SurfBlob: @ 0x08155470 push {r4, r5, lr} ldr r4, _081554D8 adds r1, r4, #4 @@ -701218,7 +701218,7 @@ sub_08155470: @ 0x08155470 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0x96 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r5, r0, #0 @@ -701259,7 +701259,7 @@ _081554D8: .4byte gUnknown_20388A8 _081554DC: .4byte gUnknown_84DDE4C _081554E0: .4byte gUnknown_20205AC _081554E4: .4byte 0x0000FFFF - thumb_func_end sub_08155470 + thumb_func_end FldEff_SurfBlob thumb_func_start sub_081554E8 sub_081554E8: @ 0x081554E8 @@ -701387,14 +701387,14 @@ UpdateSurfBlobFieldEffect: @ 0x08155594 adds r5, r5, r0 adds r0, r4, #0 adds r1, r6, #0 - bl sub_081555EC + bl SynchroniseSurfAnim adds r0, r4, #0 adds r1, r6, #0 bl sub_08155624 adds r0, r4, #0 adds r1, r5, #0 adds r2, r6, #0 - bl sub_081556B8 + bl CreateBobbingEffect ldrb r0, [r5, #5] movs r1, #0xc ands r1, r0 @@ -701412,8 +701412,8 @@ _081555E4: .4byte gUnknown_2036FF0 _081555E8: .4byte gUnknown_20205AC thumb_func_end UpdateSurfBlobFieldEffect - thumb_func_start sub_081555EC -sub_081555EC: @ 0x081555EC + thumb_func_start SynchroniseSurfAnim +SynchroniseSurfAnim: @ 0x081555EC push {r4, r5, lr} sub sp, #0xc adds r5, r0, #0 @@ -701440,7 +701440,7 @@ _08155618: bx r0 .align 2, 0 _08155620: .4byte gUnknown_85ACA68 - thumb_func_end sub_081555EC + thumb_func_end SynchroniseSurfAnim thumb_func_start sub_08155624 sub_08155624: @ 0x08155624 @@ -701493,7 +701493,7 @@ _08155672: ldrsh r0, [r6, r1] movs r2, #0 ldrsh r1, [r7, r2] - bl sub_08087AA8 + bl MapGridGetZCoordAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -701522,8 +701522,8 @@ _081556AC: bx r0 thumb_func_end sub_08155624 - thumb_func_start sub_081556B8 -sub_081556B8: @ 0x081556B8 + thumb_func_start CreateBobbingEffect +CreateBobbingEffect: @ 0x081556B8 push {r4, r5, lr} sub sp, #4 adds r5, r1, #0 @@ -701592,7 +701592,7 @@ _08155732: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081556B8 + thumb_func_end CreateBobbingEffect thumb_func_start sub_0815573C sub_0815573C: @ 0x0815573C @@ -701604,7 +701604,7 @@ sub_0815573C: @ 0x0815573C movs r1, #0 movs r2, #0 movs r3, #0xff - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -701672,8 +701672,8 @@ _081557C4: _081557C8: .4byte gUnknown_20205AC thumb_func_end sub_0815578C - thumb_func_start sub_081557CC -sub_081557CC: @ 0x081557CC + thumb_func_start FldEff_Dust +FldEff_Dust: @ 0x081557CC push {r4, lr} ldr r4, _08155830 adds r1, r4, #4 @@ -701688,7 +701688,7 @@ sub_081557CC: @ 0x081557CC movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -701727,10 +701727,10 @@ _08155828: _08155830: .4byte gUnknown_20388A8 _08155834: .4byte gUnknown_84DDE4C _08155838: .4byte gUnknown_20205AC - thumb_func_end sub_081557CC + thumb_func_end FldEff_Dust - thumb_func_start sub_0815583C -sub_0815583C: @ 0x0815583C + thumb_func_start FldEff_SandPile +FldEff_SandPile: @ 0x0815583C push {r4, r5, r6, r7, lr} ldr r7, _081558E8 ldrb r0, [r7] @@ -701749,13 +701749,13 @@ sub_0815583C: @ 0x0815583C movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x40 beq _081558E0 ldrb r0, [r6, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo adds r5, r0, #0 lsls r0, r4, #4 adds r0, r0, r4 @@ -701819,10 +701819,10 @@ _081558E8: .4byte gUnknown_20388A8 _081558EC: .4byte gUnknown_2036FF0 _081558F0: .4byte gUnknown_84DDE4C _081558F4: .4byte gUnknown_20205AC - thumb_func_end sub_0815583C + thumb_func_end FldEff_SandPile - thumb_func_start sub_081558F8 -sub_081558F8: @ 0x081558F8 + thumb_func_start UpdateSandPileFieldEffect +UpdateSandPileFieldEffect: @ 0x081558F8 push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 @@ -701915,7 +701915,7 @@ _08155982: strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility _081559B2: add sp, #4 pop {r4, r5, r6} @@ -701924,10 +701924,10 @@ _081559B2: .align 2, 0 _081559BC: .4byte gUnknown_20205AC _081559C0: .4byte gUnknown_2036FF0 - thumb_func_end sub_081558F8 + thumb_func_end UpdateSandPileFieldEffect - thumb_func_start sub_081559C4 -sub_081559C4: @ 0x081559C4 + thumb_func_start FldEff_Bubbles +FldEff_Bubbles: @ 0x081559C4 push {r4, lr} ldr r4, _08155A1C adds r1, r4, #4 @@ -701943,7 +701943,7 @@ sub_081559C4: @ 0x081559C4 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0x52 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -701975,10 +701975,10 @@ _08155A14: _08155A1C: .4byte gUnknown_20388A8 _08155A20: .4byte gUnknown_84DDE4C _08155A24: .4byte gUnknown_20205AC - thumb_func_end sub_081559C4 + thumb_func_end FldEff_Bubbles - thumb_func_start sub_08155A28 -sub_08155A28: @ 0x08155A28 + thumb_func_start UpdateBubblesFieldEffect +UpdateBubblesFieldEffect: @ 0x08155A28 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -701994,7 +701994,7 @@ sub_08155A28: @ 0x08155A28 strh r1, [r4, #0x22] adds r0, r4, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility ldrh r1, [r4, #0x3e] ldr r0, _08155A64 ands r0, r1 @@ -702009,10 +702009,10 @@ _08155A5C: bx r0 .align 2, 0 _08155A64: .4byte 0x00001004 - thumb_func_end sub_08155A28 + thumb_func_end UpdateBubblesFieldEffect - thumb_func_start sub_08155A68 -sub_08155A68: @ 0x08155A68 + thumb_func_start FldEff_BerryTreeGrowthSparkle +FldEff_BerryTreeGrowthSparkle: @ 0x08155A68 push {r4, lr} ldr r4, _08155AD0 adds r1, r4, #4 @@ -702027,7 +702027,7 @@ sub_08155A68: @ 0x08155A68 movs r3, #4 ldrsh r2, [r4, r3] ldrb r3, [r4, #8] - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -702068,43 +702068,43 @@ _08155AC8: _08155AD0: .4byte gUnknown_20388A8 _08155AD4: .4byte gUnknown_84DDE4C _08155AD8: .4byte gUnknown_20205AC - thumb_func_end sub_08155A68 + thumb_func_end FldEff_BerryTreeGrowthSparkle - thumb_func_start sub_08155ADC -sub_08155ADC: @ 0x08155ADC + thumb_func_start ShowTreeDisguiseFieldEffect +ShowTreeDisguiseFieldEffect: @ 0x08155ADC push {lr} movs r0, #0x1c movs r1, #0x18 movs r2, #4 - bl sub_08155B0C + bl ShowDisguiseFieldEffect pop {r1} bx r1 - thumb_func_end sub_08155ADC + thumb_func_end ShowTreeDisguiseFieldEffect - thumb_func_start sub_08155AEC -sub_08155AEC: @ 0x08155AEC + thumb_func_start ShowMountainDisguiseFieldEffect +ShowMountainDisguiseFieldEffect: @ 0x08155AEC push {lr} movs r0, #0x1d movs r1, #0x19 movs r2, #3 - bl sub_08155B0C + bl ShowDisguiseFieldEffect pop {r1} bx r1 - thumb_func_end sub_08155AEC + thumb_func_end ShowMountainDisguiseFieldEffect - thumb_func_start sub_08155AFC -sub_08155AFC: @ 0x08155AFC + thumb_func_start ShowSandDisguiseFieldEffect +ShowSandDisguiseFieldEffect: @ 0x08155AFC push {lr} movs r0, #0x24 movs r1, #0x1c movs r2, #2 - bl sub_08155B0C + bl ShowDisguiseFieldEffect pop {r1} bx r1 - thumb_func_end sub_08155AFC + thumb_func_end ShowSandDisguiseFieldEffect - thumb_func_start sub_08155B0C -sub_08155B0C: @ 0x08155B0C + thumb_func_start ShowDisguiseFieldEffect +ShowDisguiseFieldEffect: @ 0x08155B0C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -702139,7 +702139,7 @@ _08155B44: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B60 + bl CreateSpriteAtEnd mov r1, sp strb r0, [r1] lsls r0, r0, #0x18 @@ -702196,10 +702196,10 @@ _08155BB0: .align 2, 0 _08155BBC: .4byte gUnknown_84DDE4C _08155BC0: .4byte gUnknown_20205AC - thumb_func_end sub_08155B0C + thumb_func_end ShowDisguiseFieldEffect - thumb_func_start sub_08155BC4 -sub_08155BC4: @ 0x08155BC4 + thumb_func_start UpdateDisguiseFieldEffect +UpdateDisguiseFieldEffect: @ 0x08155BC4 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -702231,7 +702231,7 @@ _08155BF4: lsls r0, r0, #2 adds r0, r0, r4 ldrb r0, [r0, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, #3 @@ -702318,7 +702318,7 @@ _08155CA4: .align 2, 0 _08155CAC: .4byte gUnknown_2036FF0 _08155CB0: .4byte gUnknown_20205AC - thumb_func_end sub_08155BC4 + thumb_func_end UpdateDisguiseFieldEffect thumb_func_start sub_08155CB4 sub_08155CB4: @ 0x08155CB4 @@ -702381,8 +702381,8 @@ _08155D14: bx r1 thumb_func_end sub_08155CDC - thumb_func_start sub_08155D18 -sub_08155D18: @ 0x08155D18 + thumb_func_start FldEff_Sparkle +FldEff_Sparkle: @ 0x08155D18 push {r4, lr} ldr r4, _08155D80 ldr r0, [r4] @@ -702404,7 +702404,7 @@ sub_08155D18: @ 0x08155D18 movs r3, #4 ldrsh r2, [r4, r3] movs r3, #0x52 - bl sub_08006B60 + bl CreateSpriteAtEnd lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -702438,10 +702438,10 @@ _08155D78: _08155D80: .4byte gUnknown_20388A8 _08155D84: .4byte gUnknown_84DDE4C _08155D88: .4byte gUnknown_20205AC - thumb_func_end sub_08155D18 + thumb_func_end FldEff_Sparkle - thumb_func_start sub_08155D8C -sub_08155D8C: @ 0x08155D8C + thumb_func_start UpdateSparkleFieldEffect +UpdateSparkleFieldEffect: @ 0x08155D8C push {lr} adds r2, r0, #0 movs r1, #0x2e @@ -702484,7 +702484,7 @@ _08155DD6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08155D8C + thumb_func_end UpdateSparkleFieldEffect thumb_func_start sub_08155DDC sub_08155DDC: @ 0x08155DDC @@ -702904,7 +702904,7 @@ sub_081560D0: @ 0x081560D0 _081560EE: adds r0, r4, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility ldrh r0, [r4, #0x2e] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -702918,8 +702918,8 @@ _08156104: .align 2, 0 thumb_func_end sub_081560D0 - thumb_func_start sub_0815610C -sub_0815610C: @ 0x0815610C + thumb_func_start WaitFieldEffectSpriteAnim +WaitFieldEffectSpriteAnim: @ 0x0815610C push {lr} adds r2, r0, #0 adds r0, #0x3f @@ -702937,12 +702937,12 @@ sub_0815610C: @ 0x0815610C _0815612A: adds r0, r2, #0 movs r1, #0 - bl sub_08097344 + bl UpdateEventObjectSpriteVisibility _08156132: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815610C + thumb_func_end WaitFieldEffectSpriteAnim thumb_func_start sub_08156138 sub_08156138: @ 0x08156138 @@ -702967,7 +702967,7 @@ _0815614E: cmp r0, #0 beq _081561F0 ldrb r0, [r4, #5] - bl sub_0808E004 + bl GetEventObjectGraphicsInfo ldrb r1, [r4, #4] lsls r0, r1, #4 adds r0, r0, r1 @@ -703048,8 +703048,8 @@ _081561FA: bx r0 thumb_func_end sub_08156138 - thumb_func_start sub_08156200 -sub_08156200: @ 0x08156200 + thumb_func_start ContestAI_ResetAI +ContestAI_ResetAI: @ 0x08156200 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -703097,10 +703097,10 @@ _0815621A: .align 2, 0 _08156258: .4byte gUnknown_2039BD4 _0815625C: .4byte gUnknown_2039AA0 - thumb_func_end sub_08156200 + thumb_func_end ContestAI_ResetAI - thumb_func_start sub_08156260 -sub_08156260: @ 0x08156260 + thumb_func_start ContestAI_GetActionToUse +ContestAI_GetActionToUse: @ 0x08156260 push {r4, r5, r6, lr} ldr r1, _081562E8 ldr r0, [r1] @@ -703119,7 +703119,7 @@ _08156272: cmp r0, #0 beq _08156286 strb r5, [r2] - bl sub_081562EC + bl ContestAI_DoAIProcessing _08156286: ldr r0, [r4] ldr r1, [r0, #0xc] @@ -703174,10 +703174,10 @@ _081562DA: bx r1 .align 2, 0 _081562E8: .4byte gUnknown_2039BD4 - thumb_func_end sub_08156260 + thumb_func_end ContestAI_GetActionToUse - thumb_func_start sub_081562EC -sub_081562EC: @ 0x081562EC + thumb_func_start ContestAI_DoAIProcessing +ContestAI_DoAIProcessing: @ 0x081562EC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -703308,7 +703308,7 @@ _081563DC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081562EC + thumb_func_end ContestAI_DoAIProcessing thumb_func_start sub_081563E8 sub_081563E8: @ 0x081563E8 @@ -703341,8 +703341,8 @@ _0815640E: .align 2, 0 thumb_func_end sub_081563E8 - thumb_func_start sub_08156418 -sub_08156418: @ 0x08156418 + thumb_func_start ContestAICmd_score +ContestAICmd_score: @ 0x08156418 push {r4, lr} ldr r3, _08156444 ldr r0, [r3] @@ -703385,7 +703385,7 @@ _08156452: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08156418 + thumb_func_end ContestAICmd_score thumb_func_start ContestAICmd_get_turn ContestAICmd_get_turn: @ 0x0815646C @@ -703405,8 +703405,8 @@ _08156484: .4byte gUnknown_2039BD4 _08156488: .4byte gUnknown_203A804 thumb_func_end ContestAICmd_get_turn - thumb_func_start sub_0815648C -sub_0815648C: @ 0x0815648C + thumb_func_start ContestAICmd_if_turn_less_than +ContestAICmd_if_turn_less_than: @ 0x0815648C push {lr} bl ContestAICmd_get_turn ldr r0, _081564C0 @@ -703440,10 +703440,10 @@ _081564C8: _081564CC: pop {r0} bx r0 - thumb_func_end sub_0815648C + thumb_func_end ContestAICmd_if_turn_less_than - thumb_func_start sub_081564D0 -sub_081564D0: @ 0x081564D0 + thumb_func_start ContestAICmd_if_turn_more_than +ContestAICmd_if_turn_more_than: @ 0x081564D0 push {lr} bl ContestAICmd_get_turn ldr r0, _08156504 @@ -703477,10 +703477,10 @@ _0815650C: _08156510: pop {r0} bx r0 - thumb_func_end sub_081564D0 + thumb_func_end ContestAICmd_if_turn_more_than - thumb_func_start sub_08156514 -sub_08156514: @ 0x08156514 + thumb_func_start ContestAICmd_if_turn_eq +ContestAICmd_if_turn_eq: @ 0x08156514 push {lr} bl ContestAICmd_get_turn ldr r0, _08156548 @@ -703514,10 +703514,10 @@ _08156550: _08156554: pop {r0} bx r0 - thumb_func_end sub_08156514 + thumb_func_end ContestAICmd_if_turn_eq - thumb_func_start sub_08156558 -sub_08156558: @ 0x08156558 + thumb_func_start ContestAICmd_if_turn_not_eq +ContestAICmd_if_turn_not_eq: @ 0x08156558 push {lr} bl ContestAICmd_get_turn ldr r0, _0815658C @@ -703551,7 +703551,7 @@ _08156594: _08156598: pop {r0} bx r0 - thumb_func_end sub_08156558 + thumb_func_end ContestAICmd_if_turn_not_eq thumb_func_start ContestAICmd_get_excitement ContestAICmd_get_excitement: @ 0x0815659C @@ -703573,8 +703573,8 @@ _081565B8: .4byte gUnknown_2039BD4 _081565BC: .4byte gUnknown_203A804 thumb_func_end ContestAICmd_get_excitement - thumb_func_start sub_081565C0 -sub_081565C0: @ 0x081565C0 + thumb_func_start ContestAICmd_if_excitement_less_than +ContestAICmd_if_excitement_less_than: @ 0x081565C0 push {lr} bl ContestAICmd_get_excitement ldr r0, _081565F4 @@ -703608,10 +703608,10 @@ _081565FC: _08156600: pop {r0} bx r0 - thumb_func_end sub_081565C0 + thumb_func_end ContestAICmd_if_excitement_less_than - thumb_func_start sub_08156604 -sub_08156604: @ 0x08156604 + thumb_func_start ContestAICmd_if_excitement_more_than +ContestAICmd_if_excitement_more_than: @ 0x08156604 push {lr} bl ContestAICmd_get_excitement ldr r0, _08156638 @@ -703645,10 +703645,10 @@ _08156640: _08156644: pop {r0} bx r0 - thumb_func_end sub_08156604 + thumb_func_end ContestAICmd_if_excitement_more_than - thumb_func_start sub_08156648 -sub_08156648: @ 0x08156648 + thumb_func_start ContestAICmd_if_excitement_eq +ContestAICmd_if_excitement_eq: @ 0x08156648 push {lr} bl ContestAICmd_get_excitement ldr r0, _0815667C @@ -703682,10 +703682,10 @@ _08156684: _08156688: pop {r0} bx r0 - thumb_func_end sub_08156648 + thumb_func_end ContestAICmd_if_excitement_eq - thumb_func_start sub_0815668C -sub_0815668C: @ 0x0815668C + thumb_func_start ContestAICmd_if_excitement_not_eq +ContestAICmd_if_excitement_not_eq: @ 0x0815668C push {lr} bl ContestAICmd_get_excitement ldr r0, _081566C0 @@ -703719,7 +703719,7 @@ _081566C8: _081566CC: pop {r0} bx r0 - thumb_func_end sub_0815668C + thumb_func_end ContestAICmd_if_excitement_not_eq thumb_func_start ContestAICmd_get_user_order ContestAICmd_get_user_order: @ 0x081566D0 @@ -703743,8 +703743,8 @@ _081566F0: .4byte gUnknown_2039BD4 _081566F4: .4byte gUnknown_203A804 thumb_func_end ContestAICmd_get_user_order - thumb_func_start sub_081566F8 -sub_081566F8: @ 0x081566F8 + thumb_func_start ContestAICmd_if_user_order_less_than +ContestAICmd_if_user_order_less_than: @ 0x081566F8 push {lr} bl ContestAICmd_get_user_order ldr r0, _0815672C @@ -703778,10 +703778,10 @@ _08156734: _08156738: pop {r0} bx r0 - thumb_func_end sub_081566F8 + thumb_func_end ContestAICmd_if_user_order_less_than - thumb_func_start sub_0815673C -sub_0815673C: @ 0x0815673C + thumb_func_start ContestAICmd_if_user_order_more_than +ContestAICmd_if_user_order_more_than: @ 0x0815673C push {lr} bl ContestAICmd_get_user_order ldr r0, _08156770 @@ -703815,10 +703815,10 @@ _08156778: _0815677C: pop {r0} bx r0 - thumb_func_end sub_0815673C + thumb_func_end ContestAICmd_if_user_order_more_than - thumb_func_start sub_08156780 -sub_08156780: @ 0x08156780 + thumb_func_start ContestAICmd_if_user_order_eq +ContestAICmd_if_user_order_eq: @ 0x08156780 push {lr} bl ContestAICmd_get_user_order ldr r0, _081567B4 @@ -703852,10 +703852,10 @@ _081567BC: _081567C0: pop {r0} bx r0 - thumb_func_end sub_08156780 + thumb_func_end ContestAICmd_if_user_order_eq - thumb_func_start sub_081567C4 -sub_081567C4: @ 0x081567C4 + thumb_func_start ContestAICmd_if_user_order_not_eq +ContestAICmd_if_user_order_not_eq: @ 0x081567C4 push {lr} bl ContestAICmd_get_user_order ldr r0, _081567F8 @@ -703889,10 +703889,10 @@ _08156800: _08156804: pop {r0} bx r0 - thumb_func_end sub_081567C4 + thumb_func_end ContestAICmd_if_user_order_not_eq - thumb_func_start sub_08156808 -sub_08156808: @ 0x08156808 + thumb_func_start ContestAICmd_get_user_condition +ContestAICmd_get_user_condition: @ 0x08156808 push {r4, lr} ldr r0, _08156840 ldr r0, [r0] @@ -703923,12 +703923,12 @@ sub_08156808: @ 0x08156808 .align 2, 0 _08156840: .4byte gUnknown_2039BD4 _08156844: .4byte gUnknown_203A804 - thumb_func_end sub_08156808 + thumb_func_end ContestAICmd_get_user_condition - thumb_func_start sub_08156848 -sub_08156848: @ 0x08156848 + thumb_func_start ContestAICmd_if_user_condition_less_than +ContestAICmd_if_user_condition_less_than: @ 0x08156848 push {lr} - bl sub_08156808 + bl ContestAICmd_get_user_condition ldr r0, _0815687C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -703960,12 +703960,12 @@ _08156884: _08156888: pop {r0} bx r0 - thumb_func_end sub_08156848 + thumb_func_end ContestAICmd_if_user_condition_less_than - thumb_func_start sub_0815688C -sub_0815688C: @ 0x0815688C + thumb_func_start ContestAICmd_if_user_condition_more_than +ContestAICmd_if_user_condition_more_than: @ 0x0815688C push {lr} - bl sub_08156808 + bl ContestAICmd_get_user_condition ldr r0, _081568C0 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -703997,12 +703997,12 @@ _081568C8: _081568CC: pop {r0} bx r0 - thumb_func_end sub_0815688C + thumb_func_end ContestAICmd_if_user_condition_more_than - thumb_func_start sub_081568D0 -sub_081568D0: @ 0x081568D0 + thumb_func_start ContestAICmd_if_user_condition_eq +ContestAICmd_if_user_condition_eq: @ 0x081568D0 push {lr} - bl sub_08156808 + bl ContestAICmd_get_user_condition ldr r0, _08156904 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -704034,12 +704034,12 @@ _0815690C: _08156910: pop {r0} bx r0 - thumb_func_end sub_081568D0 + thumb_func_end ContestAICmd_if_user_condition_eq - thumb_func_start sub_08156914 -sub_08156914: @ 0x08156914 + thumb_func_start ContestAICmd_if_user_condition_not_eq +ContestAICmd_if_user_condition_not_eq: @ 0x08156914 push {lr} - bl sub_08156808 + bl ContestAICmd_get_user_condition ldr r0, _08156948 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -704071,7 +704071,7 @@ _08156950: _08156954: pop {r0} bx r0 - thumb_func_end sub_08156914 + thumb_func_end ContestAICmd_if_user_condition_not_eq thumb_func_start ContestAICmd_unk_15 ContestAICmd_unk_15: @ 0x08156958 @@ -704493,8 +704493,8 @@ _08156C4C: .4byte gUnknown_2039BCC _08156C50: .4byte gUnknown_203A804 thumb_func_end ContestAICmd_get_contest_type - thumb_func_start sub_08156C54 -sub_08156C54: @ 0x08156C54 + thumb_func_start ContestAICmd_if_contest_type_eq +ContestAICmd_if_contest_type_eq: @ 0x08156C54 push {lr} bl ContestAICmd_get_contest_type ldr r0, _08156C88 @@ -704528,10 +704528,10 @@ _08156C90: _08156C94: pop {r0} bx r0 - thumb_func_end sub_08156C54 + thumb_func_end ContestAICmd_if_contest_type_eq - thumb_func_start sub_08156C98 -sub_08156C98: @ 0x08156C98 + thumb_func_start ContestAICmd_if_contest_type_not_eq +ContestAICmd_if_contest_type_not_eq: @ 0x08156C98 push {lr} bl ContestAICmd_get_contest_type ldr r0, _08156CCC @@ -704565,10 +704565,10 @@ _08156CD4: _08156CD8: pop {r0} bx r0 - thumb_func_end sub_08156C98 + thumb_func_end ContestAICmd_if_contest_type_not_eq - thumb_func_start sub_08156CDC -sub_08156CDC: @ 0x08156CDC + thumb_func_start ContestAICmd_get_move_excitement +ContestAICmd_get_move_excitement: @ 0x08156CDC push {r4, lr} ldr r2, _08156D14 ldr r4, _08156D18 @@ -704600,12 +704600,12 @@ sub_08156CDC: @ 0x08156CDC _08156D14: .4byte gUnknown_2039AA0 _08156D18: .4byte gUnknown_2039BD4 _08156D1C: .4byte gUnknown_203A804 - thumb_func_end sub_08156CDC + thumb_func_end ContestAICmd_get_move_excitement - thumb_func_start sub_08156D20 -sub_08156D20: @ 0x08156D20 + thumb_func_start ContestAICmd_if_move_excitement_less_than +ContestAICmd_if_move_excitement_less_than: @ 0x08156D20 push {r4, lr} - bl sub_08156CDC + bl ContestAICmd_get_move_excitement ldr r0, _08156D54 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -704640,12 +704640,12 @@ _08156D60: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08156D20 + thumb_func_end ContestAICmd_if_move_excitement_less_than - thumb_func_start sub_08156D68 -sub_08156D68: @ 0x08156D68 + thumb_func_start ContestAICmd_if_move_excitement_greater_than +ContestAICmd_if_move_excitement_greater_than: @ 0x08156D68 push {r4, lr} - bl sub_08156CDC + bl ContestAICmd_get_move_excitement ldr r0, _08156D9C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -704680,12 +704680,12 @@ _08156DA8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08156D68 + thumb_func_end ContestAICmd_if_move_excitement_greater_than - thumb_func_start sub_08156DB0 -sub_08156DB0: @ 0x08156DB0 + thumb_func_start ContestAICmd_if_move_excitement_eq +ContestAICmd_if_move_excitement_eq: @ 0x08156DB0 push {r4, lr} - bl sub_08156CDC + bl ContestAICmd_get_move_excitement ldr r0, _08156DE4 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -704720,12 +704720,12 @@ _08156DF0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08156DB0 + thumb_func_end ContestAICmd_if_move_excitement_eq - thumb_func_start sub_08156DF8 -sub_08156DF8: @ 0x08156DF8 + thumb_func_start ContestAICmd_if_move_excitement_not_eq +ContestAICmd_if_move_excitement_not_eq: @ 0x08156DF8 push {r4, lr} - bl sub_08156CDC + bl ContestAICmd_get_move_excitement ldr r0, _08156E2C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -704760,7 +704760,7 @@ _08156E38: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08156DF8 + thumb_func_end ContestAICmd_if_move_excitement_not_eq thumb_func_start ContestAICmd_get_move_effect ContestAICmd_get_move_effect: @ 0x08156E40 @@ -704795,8 +704795,8 @@ _08156E78: .4byte gUnknown_8565FCC _08156E7C: .4byte gUnknown_203A804 thumb_func_end ContestAICmd_get_move_effect - thumb_func_start sub_08156E80 -sub_08156E80: @ 0x08156E80 + thumb_func_start PrintPlayerBerryPowderAmount +PrintPlayerBerryPowderAmount: @ 0x08156E80 push {lr} bl ContestAICmd_get_move_effect ldr r0, _08156EB4 @@ -704830,10 +704830,10 @@ _08156EBC: _08156EC0: pop {r0} bx r0 - thumb_func_end sub_08156E80 + thumb_func_end PrintPlayerBerryPowderAmount - thumb_func_start sub_08156EC4 -sub_08156EC4: @ 0x08156EC4 + thumb_func_start ContestAICmd_if_move_effect_not_eq +ContestAICmd_if_move_effect_not_eq: @ 0x08156EC4 push {lr} bl ContestAICmd_get_move_effect ldr r0, _08156EF8 @@ -704867,7 +704867,7 @@ _08156F00: _08156F04: pop {r0} bx r0 - thumb_func_end sub_08156EC4 + thumb_func_end ContestAICmd_if_move_effect_not_eq thumb_func_start ContestAICmd_get_move_effect_type ContestAICmd_get_move_effect_type: @ 0x08156F08 @@ -704907,8 +704907,8 @@ _08156F4C: .4byte gUnknown_8565FCC _08156F50: .4byte gUnknown_203A804 thumb_func_end ContestAICmd_get_move_effect_type - thumb_func_start sub_08156F54 -sub_08156F54: @ 0x08156F54 + thumb_func_start ContestAICmd_if_move_effect_type_eq +ContestAICmd_if_move_effect_type_eq: @ 0x08156F54 push {lr} bl ContestAICmd_get_move_effect_type ldr r0, _08156F88 @@ -704942,10 +704942,10 @@ _08156F90: _08156F94: pop {r0} bx r0 - thumb_func_end sub_08156F54 + thumb_func_end ContestAICmd_if_move_effect_type_eq - thumb_func_start sub_08156F98 -sub_08156F98: @ 0x08156F98 + thumb_func_start ContestAICmd_if_move_effect_type_not_eq +ContestAICmd_if_move_effect_type_not_eq: @ 0x08156F98 push {lr} bl ContestAICmd_get_move_effect_type ldr r0, _08156FCC @@ -704979,10 +704979,10 @@ _08156FD4: _08156FD8: pop {r0} bx r0 - thumb_func_end sub_08156F98 + thumb_func_end ContestAICmd_if_move_effect_type_not_eq - thumb_func_start sub_08156FDC -sub_08156FDC: @ 0x08156FDC + thumb_func_start ContestAICmd_check_most_appealing_move +ContestAICmd_check_most_appealing_move: @ 0x08156FDC push {r4, r5, r6, r7, lr} ldr r2, _0815703C ldr r5, _08157040 @@ -705053,12 +705053,12 @@ _08157056: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08156FDC + thumb_func_end ContestAICmd_check_most_appealing_move - thumb_func_start sub_08157068 -sub_08157068: @ 0x08157068 + thumb_func_start ContestAICmd_if_most_appealing_move +ContestAICmd_if_most_appealing_move: @ 0x08157068 push {lr} - bl sub_08156FDC + bl ContestAICmd_check_most_appealing_move ldr r0, _08157098 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705093,10 +705093,10 @@ _081570A8: bx r0 .align 2, 0 _081570AC: .4byte gUnknown_203A804 - thumb_func_end sub_08157068 + thumb_func_end ContestAICmd_if_most_appealing_move - thumb_func_start sub_081570B0 -sub_081570B0: @ 0x081570B0 + thumb_func_start ContestAICmd_unk_2F +ContestAICmd_unk_2F: @ 0x081570B0 push {r4, r5, r6, r7, lr} ldr r2, _08157110 ldr r5, _08157114 @@ -705167,12 +705167,12 @@ _0815712A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081570B0 + thumb_func_end ContestAICmd_unk_2F - thumb_func_start sub_0815713C -sub_0815713C: @ 0x0815713C + thumb_func_start ContestAICmd_unk_30 +ContestAICmd_unk_30: @ 0x0815713C push {lr} - bl sub_081570B0 + bl ContestAICmd_unk_2F ldr r0, _0815716C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705207,10 +705207,10 @@ _0815717C: bx r0 .align 2, 0 _08157180: .4byte gUnknown_203A804 - thumb_func_end sub_0815713C + thumb_func_end ContestAICmd_unk_30 - thumb_func_start sub_08157184 -sub_08157184: @ 0x08157184 + thumb_func_start ContestAICmd_unk_31 +ContestAICmd_unk_31: @ 0x08157184 push {r4, lr} ldr r2, _081571CC ldr r0, _081571D0 @@ -705252,12 +705252,12 @@ _081571D0: .4byte gUnknown_2039BD4 _081571D4: .4byte gUnknown_8566AE4 _081571D8: .4byte gUnknown_8565FCC _081571DC: .4byte gUnknown_203A804 - thumb_func_end sub_08157184 + thumb_func_end ContestAICmd_unk_31 thumb_func_start sub_081571E0 sub_081571E0: @ 0x081571E0 push {lr} - bl sub_08157184 + bl ContestAICmd_unk_31 ldr r0, _08157214 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705294,7 +705294,7 @@ _08157220: thumb_func_start sub_08157224 sub_08157224: @ 0x08157224 push {lr} - bl sub_08157184 + bl ContestAICmd_unk_31 ldr r0, _08157258 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705331,7 +705331,7 @@ _08157264: thumb_func_start sub_08157268 sub_08157268: @ 0x08157268 push {lr} - bl sub_08157184 + bl ContestAICmd_unk_31 ldr r0, _0815729C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705368,7 +705368,7 @@ _081572A8: thumb_func_start sub_081572AC sub_081572AC: @ 0x081572AC push {lr} - bl sub_08157184 + bl ContestAICmd_unk_31 ldr r0, _081572E0 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705402,8 +705402,8 @@ _081572EC: bx r0 thumb_func_end sub_081572AC - thumb_func_start sub_081572F0 -sub_081572F0: @ 0x081572F0 + thumb_func_start ContestAICmd_unk_36 +ContestAICmd_unk_36: @ 0x081572F0 push {r4, lr} ldr r2, _08157338 ldr r0, _0815733C @@ -705445,12 +705445,12 @@ _0815733C: .4byte gUnknown_2039BD4 _08157340: .4byte gUnknown_8566AE4 _08157344: .4byte gUnknown_8565FCC _08157348: .4byte gUnknown_203A804 - thumb_func_end sub_081572F0 + thumb_func_end ContestAICmd_unk_36 thumb_func_start sub_0815734C sub_0815734C: @ 0x0815734C push {lr} - bl sub_081572F0 + bl ContestAICmd_unk_36 ldr r0, _08157380 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705487,7 +705487,7 @@ _0815738C: thumb_func_start sub_08157390 sub_08157390: @ 0x08157390 push {lr} - bl sub_081572F0 + bl ContestAICmd_unk_36 ldr r0, _081573C4 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705524,7 +705524,7 @@ _081573D0: thumb_func_start sub_081573D4 sub_081573D4: @ 0x081573D4 push {lr} - bl sub_081572F0 + bl ContestAICmd_unk_36 ldr r0, _08157408 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705561,7 +705561,7 @@ _08157414: thumb_func_start sub_08157418 sub_08157418: @ 0x08157418 push {lr} - bl sub_081572F0 + bl ContestAICmd_unk_36 ldr r0, _0815744C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705595,8 +705595,8 @@ _08157458: bx r0 thumb_func_end sub_08157418 - thumb_func_start sub_0815745C -sub_0815745C: @ 0x0815745C + thumb_func_start ContestAICmd_get_move_used_count +ContestAICmd_get_move_used_count: @ 0x0815745C push {r4, r5, lr} ldr r3, _0815748C ldr r5, _08157490 @@ -705642,12 +705642,12 @@ _0815749C: bx r0 .align 2, 0 _081574B0: .4byte gUnknown_203A804 - thumb_func_end sub_0815745C + thumb_func_end ContestAICmd_get_move_used_count - thumb_func_start sub_081574B4 -sub_081574B4: @ 0x081574B4 + thumb_func_start ContestAICmd_if_most_used_count_less_than +ContestAICmd_if_most_used_count_less_than: @ 0x081574B4 push {lr} - bl sub_0815745C + bl ContestAICmd_get_move_used_count ldr r0, _081574E8 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705679,12 +705679,12 @@ _081574F0: _081574F4: pop {r0} bx r0 - thumb_func_end sub_081574B4 + thumb_func_end ContestAICmd_if_most_used_count_less_than - thumb_func_start sub_081574F8 -sub_081574F8: @ 0x081574F8 + thumb_func_start ContestAICmd_if_most_used_count_more_than +ContestAICmd_if_most_used_count_more_than: @ 0x081574F8 push {lr} - bl sub_0815745C + bl ContestAICmd_get_move_used_count ldr r0, _0815752C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705716,12 +705716,12 @@ _08157534: _08157538: pop {r0} bx r0 - thumb_func_end sub_081574F8 + thumb_func_end ContestAICmd_if_most_used_count_more_than - thumb_func_start sub_0815753C -sub_0815753C: @ 0x0815753C + thumb_func_start ContestAICmd_if_most_used_count_eq +ContestAICmd_if_most_used_count_eq: @ 0x0815753C push {lr} - bl sub_0815745C + bl ContestAICmd_get_move_used_count ldr r0, _08157570 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705753,12 +705753,12 @@ _08157578: _0815757C: pop {r0} bx r0 - thumb_func_end sub_0815753C + thumb_func_end ContestAICmd_if_most_used_count_eq - thumb_func_start sub_08157580 -sub_08157580: @ 0x08157580 + thumb_func_start ContestAICmd_if_most_used_count_not_eq +ContestAICmd_if_most_used_count_not_eq: @ 0x08157580 push {lr} - bl sub_0815745C + bl ContestAICmd_get_move_used_count ldr r0, _081575B4 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705790,10 +705790,10 @@ _081575BC: _081575C0: pop {r0} bx r0 - thumb_func_end sub_08157580 + thumb_func_end ContestAICmd_if_most_used_count_not_eq - thumb_func_start sub_081575C4 -sub_081575C4: @ 0x081575C4 + thumb_func_start ContestAICmd_check_combo_starter +ContestAICmd_check_combo_starter: @ 0x081575C4 push {r4, r5, r6, lr} movs r3, #0 ldr r2, _08157630 @@ -705826,7 +705826,7 @@ _081575E6: beq _0815760E adds r1, r0, #0 adds r0, r5, #0 - bl sub_080E4BF0 + bl AreMovesContestCombo lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -705855,12 +705855,12 @@ _0815761A: _08157630: .4byte gUnknown_2039AA0 _08157634: .4byte gUnknown_2039BD4 _08157638: .4byte gUnknown_203A804 - thumb_func_end sub_081575C4 + thumb_func_end ContestAICmd_check_combo_starter thumb_func_start sub_0815763C sub_0815763C: @ 0x0815763C push {lr} - bl sub_081575C4 + bl ContestAICmd_check_combo_starter ldr r0, _0815766C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705900,7 +705900,7 @@ _08157680: .4byte gUnknown_203A804 thumb_func_start sub_08157684 sub_08157684: @ 0x08157684 push {lr} - bl sub_081575C4 + bl ContestAICmd_check_combo_starter ldr r0, _081576B4 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -705937,8 +705937,8 @@ _081576C4: _081576C8: .4byte gUnknown_203A804 thumb_func_end sub_08157684 - thumb_func_start sub_081576CC -sub_081576CC: @ 0x081576CC + thumb_func_start ContestAICmd_check_combo_finisher +ContestAICmd_check_combo_finisher: @ 0x081576CC push {r4, r5, r6, lr} movs r3, #0 ldr r2, _08157738 @@ -705970,7 +705970,7 @@ _081576EE: cmp r0, #0 beq _08157714 adds r1, r5, #0 - bl sub_080E4BF0 + bl AreMovesContestCombo lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0 @@ -705999,12 +705999,12 @@ _08157720: _08157738: .4byte gUnknown_2039AA0 _0815773C: .4byte gUnknown_2039BD4 _08157740: .4byte gUnknown_203A804 - thumb_func_end sub_081576CC + thumb_func_end ContestAICmd_check_combo_finisher thumb_func_start sub_08157744 sub_08157744: @ 0x08157744 push {lr} - bl sub_081576CC + bl ContestAICmd_check_combo_finisher ldr r0, _08157774 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706044,7 +706044,7 @@ _08157788: .4byte gUnknown_203A804 thumb_func_start sub_0815778C sub_0815778C: @ 0x0815778C push {lr} - bl sub_081576CC + bl ContestAICmd_check_combo_finisher ldr r0, _081577BC ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706081,8 +706081,8 @@ _081577CC: _081577D0: .4byte gUnknown_203A804 thumb_func_end sub_0815778C - thumb_func_start sub_081577D4 -sub_081577D4: @ 0x081577D4 + thumb_func_start ContestAICmd_check_would_finish_combo +ContestAICmd_check_would_finish_combo: @ 0x081577D4 push {r4, r5, r6, lr} movs r5, #0 ldr r3, _08157828 @@ -706107,7 +706107,7 @@ sub_081577D4: @ 0x081577D4 cmp r0, #0 beq _0815780C adds r1, r3, #0 - bl sub_080E4BF0 + bl AreMovesContestCombo lsls r0, r0, #0x18 lsrs r5, r0, #0x18 _0815780C: @@ -706129,12 +706129,12 @@ _08157812: _08157828: .4byte gUnknown_2039AA0 _0815782C: .4byte gUnknown_2039BD4 _08157830: .4byte gUnknown_203A804 - thumb_func_end sub_081577D4 + thumb_func_end ContestAICmd_check_would_finish_combo - thumb_func_start sub_08157834 -sub_08157834: @ 0x08157834 + thumb_func_start ContestAICmd_if_would_finish_combo +ContestAICmd_if_would_finish_combo: @ 0x08157834 push {lr} - bl sub_081577D4 + bl ContestAICmd_check_would_finish_combo ldr r0, _08157864 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706169,12 +706169,12 @@ _08157874: bx r0 .align 2, 0 _08157878: .4byte gUnknown_203A804 - thumb_func_end sub_08157834 + thumb_func_end ContestAICmd_if_would_finish_combo - thumb_func_start sub_0815787C -sub_0815787C: @ 0x0815787C + thumb_func_start ContestAICmd_if_would_not_finish_combo +ContestAICmd_if_would_not_finish_combo: @ 0x0815787C push {lr} - bl sub_081577D4 + bl ContestAICmd_check_would_finish_combo ldr r0, _081578AC ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706209,10 +706209,10 @@ _081578BC: bx r0 .align 2, 0 _081578C0: .4byte gUnknown_203A804 - thumb_func_end sub_0815787C + thumb_func_end ContestAICmd_if_would_not_finish_combo - thumb_func_start sub_081578C4 -sub_081578C4: @ 0x081578C4 + thumb_func_start ContestAICmd_get_condition +ContestAICmd_get_condition: @ 0x081578C4 push {r4, r5, lr} ldr r4, _08157900 ldr r0, [r4] @@ -706244,12 +706244,12 @@ sub_081578C4: @ 0x081578C4 .align 2, 0 _08157900: .4byte gUnknown_203A804 _08157904: .4byte gUnknown_2039BD4 - thumb_func_end sub_081578C4 + thumb_func_end ContestAICmd_get_condition - thumb_func_start sub_08157908 -sub_08157908: @ 0x08157908 + thumb_func_start ContestAICmd_if_condition_less_than +ContestAICmd_if_condition_less_than: @ 0x08157908 push {lr} - bl sub_081578C4 + bl ContestAICmd_get_condition ldr r0, _0815793C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706281,12 +706281,12 @@ _08157944: _08157948: pop {r0} bx r0 - thumb_func_end sub_08157908 + thumb_func_end ContestAICmd_if_condition_less_than - thumb_func_start sub_0815794C -sub_0815794C: @ 0x0815794C + thumb_func_start ContestAICmd_if_condition_more_than +ContestAICmd_if_condition_more_than: @ 0x0815794C push {lr} - bl sub_081578C4 + bl ContestAICmd_get_condition ldr r0, _08157980 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706318,12 +706318,12 @@ _08157988: _0815798C: pop {r0} bx r0 - thumb_func_end sub_0815794C + thumb_func_end ContestAICmd_if_condition_more_than - thumb_func_start sub_08157990 -sub_08157990: @ 0x08157990 + thumb_func_start ContestAICmd_if_condition_eq +ContestAICmd_if_condition_eq: @ 0x08157990 push {lr} - bl sub_081578C4 + bl ContestAICmd_get_condition ldr r0, _081579C4 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706355,12 +706355,12 @@ _081579CC: _081579D0: pop {r0} bx r0 - thumb_func_end sub_08157990 + thumb_func_end ContestAICmd_if_condition_eq - thumb_func_start sub_081579D4 -sub_081579D4: @ 0x081579D4 + thumb_func_start ContestAICmd_if_condition_not_eq +ContestAICmd_if_condition_not_eq: @ 0x081579D4 push {lr} - bl sub_081578C4 + bl ContestAICmd_get_condition ldr r0, _08157A08 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706392,10 +706392,10 @@ _08157A10: _08157A14: pop {r0} bx r0 - thumb_func_end sub_081579D4 + thumb_func_end ContestAICmd_if_condition_not_eq - thumb_func_start sub_08157A18 -sub_08157A18: @ 0x08157A18 + thumb_func_start ContestAICmd_get_used_combo_starter +ContestAICmd_get_used_combo_starter: @ 0x08157A18 push {r4, r5, r6, lr} movs r6, #0 ldr r5, _08157A68 @@ -706439,12 +706439,12 @@ _08157A54: _08157A68: .4byte gUnknown_203A804 _08157A6C: .4byte gUnknown_8565FCC _08157A70: .4byte gUnknown_2039BD4 - thumb_func_end sub_08157A18 + thumb_func_end ContestAICmd_get_used_combo_starter thumb_func_start sub_08157A74 sub_08157A74: @ 0x08157A74 push {lr} - bl sub_08157A18 + bl ContestAICmd_get_used_combo_starter ldr r0, _08157AA8 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706481,7 +706481,7 @@ _08157AB4: thumb_func_start sub_08157AB8 sub_08157AB8: @ 0x08157AB8 push {lr} - bl sub_08157A18 + bl ContestAICmd_get_used_combo_starter ldr r0, _08157AEC ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706518,7 +706518,7 @@ _08157AF8: thumb_func_start sub_08157AFC sub_08157AFC: @ 0x08157AFC push {lr} - bl sub_08157A18 + bl ContestAICmd_get_used_combo_starter ldr r0, _08157B30 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706555,7 +706555,7 @@ _08157B3C: thumb_func_start sub_08157B40 sub_08157B40: @ 0x08157B40 push {lr} - bl sub_08157A18 + bl ContestAICmd_get_used_combo_starter ldr r0, _08157B74 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706589,8 +706589,8 @@ _08157B80: bx r0 thumb_func_end sub_08157B40 - thumb_func_start sub_08157B84 -sub_08157B84: @ 0x08157B84 + thumb_func_start ContestAICmd_check_can_participate +ContestAICmd_check_can_participate: @ 0x08157B84 push {lr} ldr r0, _08157BA8 ldr r0, [r0] @@ -706598,7 +706598,7 @@ sub_08157B84: @ 0x08157B84 bl sub_081563E8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080DB40C + bl Contest_IsMonsTurnDisabled lsls r0, r0, #0x18 cmp r0, #0 beq _08157BB0 @@ -706626,12 +706626,12 @@ _08157BB8: .align 2, 0 _08157BC8: .4byte gUnknown_2039BD4 _08157BCC: .4byte gUnknown_203A804 - thumb_func_end sub_08157B84 + thumb_func_end ContestAICmd_check_can_participate - thumb_func_start sub_08157BD0 -sub_08157BD0: @ 0x08157BD0 + thumb_func_start ContestAICmd_if_can_participate +ContestAICmd_if_can_participate: @ 0x08157BD0 push {lr} - bl sub_08157B84 + bl ContestAICmd_check_can_participate ldr r0, _08157C00 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706666,12 +706666,12 @@ _08157C10: bx r0 .align 2, 0 _08157C14: .4byte gUnknown_203A804 - thumb_func_end sub_08157BD0 + thumb_func_end ContestAICmd_if_can_participate - thumb_func_start sub_08157C18 -sub_08157C18: @ 0x08157C18 + thumb_func_start ContestAICmd_if_cannot_participate +ContestAICmd_if_cannot_participate: @ 0x08157C18 push {lr} - bl sub_08157B84 + bl ContestAICmd_check_can_participate ldr r0, _08157C48 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -706706,7 +706706,7 @@ _08157C58: bx r0 .align 2, 0 _08157C5C: .4byte gUnknown_203A804 - thumb_func_end sub_08157C18 + thumb_func_end ContestAICmd_if_cannot_participate thumb_func_start ContestAICmd_get_val_812A188 ContestAICmd_get_val_812A188: @ 0x08157C60 @@ -706740,8 +706740,8 @@ _08157C94: .4byte gUnknown_203A804 _08157C98: .4byte gUnknown_2039BD4 thumb_func_end ContestAICmd_get_val_812A188 - thumb_func_start sub_08157C9C -sub_08157C9C: @ 0x08157C9C + thumb_func_start ContestAICmd_unk_57 +ContestAICmd_unk_57: @ 0x08157C9C push {lr} bl ContestAICmd_get_val_812A188 ldr r0, _08157CCC @@ -706778,10 +706778,10 @@ _08157CDC: bx r0 .align 2, 0 _08157CE0: .4byte gUnknown_203A804 - thumb_func_end sub_08157C9C + thumb_func_end ContestAICmd_unk_57 - thumb_func_start sub_08157CE4 -sub_08157CE4: @ 0x08157CE4 + thumb_func_start ContestAICmd_contest_58 +ContestAICmd_contest_58: @ 0x08157CE4 push {lr} bl ContestAICmd_get_val_812A188 ldr r0, _08157D14 @@ -706818,7 +706818,7 @@ _08157D24: bx r0 .align 2, 0 _08157D28: .4byte gUnknown_203A804 - thumb_func_end sub_08157CE4 + thumb_func_end ContestAICmd_contest_58 thumb_func_start ContestAICmd_unk_59 ContestAICmd_unk_59: @ 0x08157D2C @@ -706859,8 +706859,8 @@ _08157D70: .4byte gUnknown_203A804 _08157D74: .4byte gUnknown_2039BD4 thumb_func_end ContestAICmd_unk_59 - thumb_func_start sub_08157D78 -sub_08157D78: @ 0x08157D78 + thumb_func_start ContestAICmd_unk_5A +ContestAICmd_unk_5A: @ 0x08157D78 push {lr} bl ContestAICmd_unk_59 ldr r0, _08157DA8 @@ -706897,7 +706897,7 @@ _08157DB8: bx r0 .align 2, 0 _08157DBC: .4byte gUnknown_203A804 - thumb_func_end sub_08157D78 + thumb_func_end ContestAICmd_unk_5A thumb_func_start sub_08157DC0 sub_08157DC0: @ 0x08157DC0 @@ -706939,8 +706939,8 @@ _08157E00: _08157E04: .4byte gUnknown_203A804 thumb_func_end sub_08157DC0 - thumb_func_start sub_08157E08 -sub_08157E08: @ 0x08157E08 + thumb_func_start ContestAICmd_unk_5C +ContestAICmd_unk_5C: @ 0x08157E08 push {lr} bl ContestAICmd_unk_59 ldr r0, _08157E38 @@ -706977,10 +706977,10 @@ _08157E48: bx r0 .align 2, 0 _08157E4C: .4byte gUnknown_203A804 - thumb_func_end sub_08157E08 + thumb_func_end ContestAICmd_unk_5C - thumb_func_start sub_08157E50 -sub_08157E50: @ 0x08157E50 + thumb_func_start ContestAICmd_unk_5D +ContestAICmd_unk_5D: @ 0x08157E50 push {lr} bl ContestAICmd_unk_59 ldr r0, _08157E80 @@ -707017,7 +707017,7 @@ _08157E90: bx r0 .align 2, 0 _08157E94: .4byte gUnknown_203A804 - thumb_func_end sub_08157E50 + thumb_func_end ContestAICmd_unk_5D thumb_func_start ContestAICmd_unk_5E ContestAICmd_unk_5E: @ 0x08157E98 @@ -707054,8 +707054,8 @@ _08157ED4: .4byte gUnknown_2039BD4 _08157ED8: .4byte gUnknown_2039BA0 thumb_func_end ContestAICmd_unk_5E - thumb_func_start sub_08157EDC -sub_08157EDC: @ 0x08157EDC + thumb_func_start ContestAICmd_unk_5F +ContestAICmd_unk_5F: @ 0x08157EDC push {lr} bl ContestAICmd_unk_5E ldr r0, _08157F0C @@ -707092,10 +707092,10 @@ _08157F1C: bx r0 .align 2, 0 _08157F20: .4byte gUnknown_203A804 - thumb_func_end sub_08157EDC + thumb_func_end ContestAICmd_unk_5F - thumb_func_start sub_08157F24 -sub_08157F24: @ 0x08157F24 + thumb_func_start ContestAICmd_unk_60 +ContestAICmd_unk_60: @ 0x08157F24 push {lr} bl ContestAICmd_unk_5E ldr r0, _08157F54 @@ -707132,10 +707132,10 @@ _08157F64: bx r0 .align 2, 0 _08157F68: .4byte gUnknown_203A804 - thumb_func_end sub_08157F24 + thumb_func_end ContestAICmd_unk_60 - thumb_func_start sub_08157F6C -sub_08157F6C: @ 0x08157F6C + thumb_func_start ContestAICmd_unk_61 +ContestAICmd_unk_61: @ 0x08157F6C push {lr} bl ContestAICmd_unk_5E ldr r0, _08157F9C @@ -707172,10 +707172,10 @@ _08157FAC: bx r0 .align 2, 0 _08157FB0: .4byte gUnknown_203A804 - thumb_func_end sub_08157F6C + thumb_func_end ContestAICmd_unk_61 - thumb_func_start sub_08157FB4 -sub_08157FB4: @ 0x08157FB4 + thumb_func_start ContestAICmd_unk_62 +ContestAICmd_unk_62: @ 0x08157FB4 push {lr} bl ContestAICmd_unk_5E ldr r0, _08157FE4 @@ -707212,7 +707212,7 @@ _08157FF4: bx r0 .align 2, 0 _08157FF8: .4byte gUnknown_203A804 - thumb_func_end sub_08157FB4 + thumb_func_end ContestAICmd_unk_62 thumb_func_start ContestAICmd_unk_63 ContestAICmd_unk_63: @ 0x08157FFC @@ -707250,8 +707250,8 @@ _0815803C: .4byte gUnknown_2039BD4 _08158040: .4byte gUnknown_8565FCC thumb_func_end ContestAICmd_unk_63 - thumb_func_start sub_08158044 -sub_08158044: @ 0x08158044 + thumb_func_start ContestAICmd_unk_64 +ContestAICmd_unk_64: @ 0x08158044 push {lr} bl ContestAICmd_unk_63 ldr r0, _08158078 @@ -707285,10 +707285,10 @@ _08158080: _08158084: pop {r0} bx r0 - thumb_func_end sub_08158044 + thumb_func_end ContestAICmd_unk_64 - thumb_func_start sub_08158088 -sub_08158088: @ 0x08158088 + thumb_func_start ContestAICmd_unk_65 +ContestAICmd_unk_65: @ 0x08158088 push {lr} bl ContestAICmd_unk_63 ldr r0, _081580BC @@ -707322,10 +707322,10 @@ _081580C4: _081580C8: pop {r0} bx r0 - thumb_func_end sub_08158088 + thumb_func_end ContestAICmd_unk_65 - thumb_func_start sub_081580CC -sub_081580CC: @ 0x081580CC + thumb_func_start ContestAICmd_unk_66 +ContestAICmd_unk_66: @ 0x081580CC push {lr} bl ContestAICmd_unk_63 ldr r0, _08158100 @@ -707359,10 +707359,10 @@ _08158108: _0815810C: pop {r0} bx r0 - thumb_func_end sub_081580CC + thumb_func_end ContestAICmd_unk_66 - thumb_func_start sub_08158110 -sub_08158110: @ 0x08158110 + thumb_func_start ContestAICmd_unk_67 +ContestAICmd_unk_67: @ 0x08158110 push {lr} bl ContestAICmd_unk_63 ldr r0, _08158144 @@ -707396,7 +707396,7 @@ _0815814C: _08158150: pop {r0} bx r0 - thumb_func_end sub_08158110 + thumb_func_end ContestAICmd_unk_67 thumb_func_start ContestAICmd_unk_68 ContestAICmd_unk_68: @ 0x08158154 @@ -707430,8 +707430,8 @@ _08158188: .4byte gUnknown_203A804 _0815818C: .4byte gUnknown_2039BD4 thumb_func_end ContestAICmd_unk_68 - thumb_func_start sub_08158190 -sub_08158190: @ 0x08158190 + thumb_func_start ContestAICmd_unk_69 +ContestAICmd_unk_69: @ 0x08158190 push {lr} bl ContestAICmd_unk_68 ldr r0, _081581C4 @@ -707465,10 +707465,10 @@ _081581CC: _081581D0: pop {r0} bx r0 - thumb_func_end sub_08158190 + thumb_func_end ContestAICmd_unk_69 - thumb_func_start sub_081581D4 -sub_081581D4: @ 0x081581D4 + thumb_func_start ContestAICmd_unk_6A +ContestAICmd_unk_6A: @ 0x081581D4 push {lr} bl ContestAICmd_unk_68 ldr r0, _08158208 @@ -707502,10 +707502,10 @@ _08158210: _08158214: pop {r0} bx r0 - thumb_func_end sub_081581D4 + thumb_func_end ContestAICmd_unk_6A - thumb_func_start sub_08158218 -sub_08158218: @ 0x08158218 + thumb_func_start ContestAICmd_unk_6B +ContestAICmd_unk_6B: @ 0x08158218 push {lr} bl ContestAICmd_unk_68 ldr r0, _0815824C @@ -707539,10 +707539,10 @@ _08158254: _08158258: pop {r0} bx r0 - thumb_func_end sub_08158218 + thumb_func_end ContestAICmd_unk_6B - thumb_func_start sub_0815825C -sub_0815825C: @ 0x0815825C + thumb_func_start ContestAICmd_unk_6C +ContestAICmd_unk_6C: @ 0x0815825C push {lr} bl ContestAICmd_unk_68 ldr r0, _08158290 @@ -707576,7 +707576,7 @@ _08158298: _0815829C: pop {r0} bx r0 - thumb_func_end sub_0815825C + thumb_func_end ContestAICmd_unk_6C thumb_func_start ContestAICmd_unk_6D ContestAICmd_unk_6D: @ 0x081582A0 @@ -707619,8 +707619,8 @@ _081582EC: .4byte gUnknown_8566AE4 _081582F0: .4byte gUnknown_8565FCC thumb_func_end ContestAICmd_unk_6D - thumb_func_start sub_081582F4 -sub_081582F4: @ 0x081582F4 + thumb_func_start ContestAICmd_unk_6E +ContestAICmd_unk_6E: @ 0x081582F4 push {lr} bl ContestAICmd_unk_6D ldr r0, _08158328 @@ -707654,10 +707654,10 @@ _08158330: _08158334: pop {r0} bx r0 - thumb_func_end sub_081582F4 + thumb_func_end ContestAICmd_unk_6E - thumb_func_start sub_08158338 -sub_08158338: @ 0x08158338 + thumb_func_start ContestAICmd_unk_6F +ContestAICmd_unk_6F: @ 0x08158338 push {lr} bl ContestAICmd_unk_6D ldr r0, _0815836C @@ -707691,7 +707691,7 @@ _08158374: _08158378: pop {r0} bx r0 - thumb_func_end sub_08158338 + thumb_func_end ContestAICmd_unk_6F thumb_func_start ContestAICmd_unk_70 ContestAICmd_unk_70: @ 0x0815837C @@ -707833,8 +707833,8 @@ _08158470: .4byte gUnknown_2039BD4 _08158474: .4byte gUnknown_203A804 thumb_func_end sub_08158444 - thumb_func_start sub_08158478 -sub_08158478: @ 0x08158478 + thumb_func_start ContestAICmd_unk_75 +ContestAICmd_unk_75: @ 0x08158478 push {r4, lr} ldr r0, _081584B4 ldr r0, [r0] @@ -707876,10 +707876,10 @@ _081584C2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08158478 + thumb_func_end ContestAICmd_unk_75 - thumb_func_start sub_081584C8 -sub_081584C8: @ 0x081584C8 + thumb_func_start ContestAICmd_unk_76 +ContestAICmd_unk_76: @ 0x081584C8 push {r4, lr} ldr r0, _08158504 ldr r0, [r0] @@ -707921,10 +707921,10 @@ _08158512: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081584C8 + thumb_func_end ContestAICmd_unk_76 - thumb_func_start sub_08158518 -sub_08158518: @ 0x08158518 + thumb_func_start ContestAICmd_unk_77 +ContestAICmd_unk_77: @ 0x08158518 push {r4, lr} ldr r0, _08158554 ldr r0, [r0] @@ -707966,10 +707966,10 @@ _08158562: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08158518 + thumb_func_end ContestAICmd_unk_77 - thumb_func_start sub_08158568 -sub_08158568: @ 0x08158568 + thumb_func_start ContestAICmd_unk_78 +ContestAICmd_unk_78: @ 0x08158568 push {r4, lr} ldr r0, _081585A4 ldr r0, [r0] @@ -708011,10 +708011,10 @@ _081585B2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08158568 + thumb_func_end ContestAICmd_unk_78 - thumb_func_start sub_081585B8 -sub_081585B8: @ 0x081585B8 + thumb_func_start ContestAICmd_unk_79 +ContestAICmd_unk_79: @ 0x081585B8 push {r4, r5, lr} ldr r0, _081585F8 ldr r0, [r0] @@ -708057,10 +708057,10 @@ _08158604: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081585B8 + thumb_func_end ContestAICmd_unk_79 - thumb_func_start sub_0815860C -sub_0815860C: @ 0x0815860C + thumb_func_start ContestAICmd_unk_7A +ContestAICmd_unk_7A: @ 0x0815860C push {r4, r5, lr} ldr r0, _0815864C ldr r0, [r0] @@ -708103,10 +708103,10 @@ _08158658: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815860C + thumb_func_end ContestAICmd_unk_7A - thumb_func_start sub_08158660 -sub_08158660: @ 0x08158660 + thumb_func_start ContestAICmd_unk_7B +ContestAICmd_unk_7B: @ 0x08158660 push {r4, r5, lr} ldr r0, _081586A0 ldr r0, [r0] @@ -708149,10 +708149,10 @@ _081586AC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08158660 + thumb_func_end ContestAICmd_unk_7B - thumb_func_start sub_081586B4 -sub_081586B4: @ 0x081586B4 + thumb_func_start ContestAICmd_unk_7C +ContestAICmd_unk_7C: @ 0x081586B4 push {r4, r5, lr} ldr r0, _081586F4 ldr r0, [r0] @@ -708195,10 +708195,10 @@ _08158700: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081586B4 + thumb_func_end ContestAICmd_unk_7C - thumb_func_start sub_08158708 -sub_08158708: @ 0x08158708 + thumb_func_start ContestAICmd_if_random +ContestAICmd_if_random: @ 0x08158708 push {r4, r5, lr} bl Random movs r2, #0xff @@ -708239,10 +708239,10 @@ _08158750: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08158708 + thumb_func_end ContestAICmd_if_random - thumb_func_start sub_08158758 -sub_08158758: @ 0x08158758 + thumb_func_start ContestAICmd_unk_7E +ContestAICmd_unk_7E: @ 0x08158758 push {r4, r5, lr} bl Random movs r2, #0xff @@ -708283,7 +708283,7 @@ _081587A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08158758 + thumb_func_end ContestAICmd_unk_7E thumb_func_start sub_081587A8 sub_081587A8: @ 0x081587A8 @@ -708334,7 +708334,7 @@ _081587F4: .4byte gUnknown_203A804 thumb_func_start ContestAICmd_end ContestAICmd_end: @ 0x081587F8 push {lr} - bl sub_08158844 + bl AIStackPop lsls r0, r0, #0x18 cmp r0, #0 bne _08158812 @@ -708375,8 +708375,8 @@ AIStackPushVar: @ 0x0815881C _08158840: .4byte gUnknown_2039BD4 thumb_func_end AIStackPushVar - thumb_func_start sub_08158844 -sub_08158844: @ 0x08158844 + thumb_func_start AIStackPop +AIStackPop: @ 0x08158844 push {lr} ldr r3, _0815885C ldr r0, [r3] @@ -708410,10 +708410,10 @@ _0815887C: bx r1 .align 2, 0 _08158880: .4byte gUnknown_203A804 - thumb_func_end sub_08158844 + thumb_func_end AIStackPop - thumb_func_start sub_08158884 -sub_08158884: @ 0x08158884 + thumb_func_start ContestAICmd_check_user_has_exciting_move +ContestAICmd_check_user_has_exciting_move: @ 0x08158884 push {r4, r5, r6, lr} movs r5, #0 movs r4, #0 @@ -708460,12 +708460,12 @@ _081588C2: .align 2, 0 _081588D8: .4byte gUnknown_2039BD4 _081588DC: .4byte gUnknown_203A804 - thumb_func_end sub_08158884 + thumb_func_end ContestAICmd_check_user_has_exciting_move - thumb_func_start sub_081588E0 -sub_081588E0: @ 0x081588E0 + thumb_func_start ContestAICmd_if_user_has_exciting_move +ContestAICmd_if_user_has_exciting_move: @ 0x081588E0 push {lr} - bl sub_08158884 + bl ContestAICmd_check_user_has_exciting_move ldr r0, _08158910 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -708500,12 +708500,12 @@ _08158920: bx r0 .align 2, 0 _08158924: .4byte gUnknown_203A804 - thumb_func_end sub_081588E0 + thumb_func_end ContestAICmd_if_user_has_exciting_move - thumb_func_start sub_08158928 -sub_08158928: @ 0x08158928 + thumb_func_start ContestAICmd_if_user_doesnt_have_exciting_move +ContestAICmd_if_user_doesnt_have_exciting_move: @ 0x08158928 push {lr} - bl sub_08158884 + bl ContestAICmd_check_user_has_exciting_move ldr r0, _08158958 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -708540,10 +708540,10 @@ _08158968: bx r0 .align 2, 0 _0815896C: .4byte gUnknown_203A804 - thumb_func_end sub_08158928 + thumb_func_end ContestAICmd_if_user_doesnt_have_exciting_move - thumb_func_start sub_08158970 -sub_08158970: @ 0x08158970 + thumb_func_start ContestAICmd_unk_85 +ContestAICmd_unk_85: @ 0x08158970 push {r4, r5, r6, lr} movs r6, #0 ldr r3, _0815899C @@ -708599,12 +708599,12 @@ _081589CA: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08158970 + thumb_func_end ContestAICmd_unk_85 - thumb_func_start sub_081589DC -sub_081589DC: @ 0x081589DC + thumb_func_start ContestAICmd_unk_86 +ContestAICmd_unk_86: @ 0x081589DC push {lr} - bl sub_08158970 + bl ContestAICmd_unk_85 ldr r0, _08158A0C ldr r0, [r0] ldr r0, [r0, #0xc] @@ -708639,12 +708639,12 @@ _08158A1C: bx r0 .align 2, 0 _08158A20: .4byte gUnknown_203A804 - thumb_func_end sub_081589DC + thumb_func_end ContestAICmd_unk_86 - thumb_func_start sub_08158A24 -sub_08158A24: @ 0x08158A24 + thumb_func_start ContestAICmd_if_effect_in_user_moveset +ContestAICmd_if_effect_in_user_moveset: @ 0x08158A24 push {lr} - bl sub_08158970 + bl ContestAICmd_unk_85 ldr r0, _08158A54 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -708679,7 +708679,7 @@ _08158A64: bx r0 .align 2, 0 _08158A68: .4byte gUnknown_203A804 - thumb_func_end sub_08158A24 + thumb_func_end ContestAICmd_if_effect_in_user_moveset thumb_func_start sub_08158A6C sub_08158A6C: @ 0x08158A6C @@ -708698,12 +708698,12 @@ sub_08158A6C: @ 0x08158A6C strh r0, [r6, #0xa] movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r5, r0, #0 lsls r4, r4, #0x18 asrs r4, r4, #0x18 @@ -708772,7 +708772,7 @@ _08158B0C: ldrh r0, [r4, #8] lsls r1, r5, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C + bl PlaySE12WithPanning _08158B26: lsls r1, r6, #0x18 asrs r1, r1, #0x18 @@ -708809,12 +708809,12 @@ sub_08158B40: @ 0x08158B40 movs r0, #0 strh r0, [r4, #0x1c] movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 ldrh r0, [r4, #0xa] lsls r1, r1, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C + bl PlaySE12WithPanning ldrh r0, [r4, #0x1e] adds r0, #1 strh r0, [r4, #0x1e] @@ -708857,14 +708857,14 @@ sub_08158B94: @ 0x08158B94 ldrb r0, [r0, #2] lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r5, r5, #0x18 asrs r5, r5, #0x18 adds r0, r5, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r5, r0, #0 lsls r4, r4, #0x18 asrs r4, r4, #0x18 @@ -708945,7 +708945,7 @@ sub_08158C44: @ 0x08158C44 ldrh r0, [r4, #8] movs r1, #0x1e ldrsb r1, [r4, r1] - bl sub_080A307C + bl PlaySE12WithPanning ldrh r0, [r4, #0x10] subs r0, #1 strh r0, [r4, #0x10] @@ -708998,10 +708998,10 @@ sub_08158CC8: @ 0x08158CC8 movs r4, #0 movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08158D0C @@ -709066,7 +709066,7 @@ _08158D4E: bne _08158D74 _08158D5A: adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _08158D74 @@ -709077,7 +709077,7 @@ _08158D5A: _08158D70: .4byte gUnknown_20380D7 _08158D74: adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08158D98 @@ -709103,7 +709103,7 @@ _08158D98: _08158DA6: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 _08158DB2: @@ -709113,7 +709113,7 @@ _08158DB2: asrs r1, r1, #0x18 adds r0, r4, #0 movs r2, #3 - bl sub_080A2BAC + bl PlayCry3 _08158DC2: adds r0, r5, #0 bl DestroyAnimVisualTask @@ -709134,10 +709134,10 @@ sub_08158DD8: @ 0x08158DD8 movs r4, #0 movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08158E1C @@ -709202,7 +709202,7 @@ _08158E5E: bne _08158E84 _08158E6A: adds r0, r4, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 bne _08158E84 @@ -709213,7 +709213,7 @@ _08158E6A: _08158E80: .4byte gUnknown_20380D7 _08158E84: adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08158EA8 @@ -709239,7 +709239,7 @@ _08158EA8: _08158EB6: adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 _08158EC2: @@ -709264,7 +709264,7 @@ _08158EC2: bne _08158F04 adds r0, r4, #0 movs r2, #9 - bl sub_080A2BAC + bl PlayCry3 b _08158F0C .align 2, 0 _08158EF4: .4byte gUnknown_2023D12 @@ -709274,7 +709274,7 @@ _08158F00: .4byte gUnknown_20380BE _08158F04: adds r0, r4, #0 movs r2, #7 - bl sub_080A2BAC + bl PlayCry3 _08158F0C: ldr r0, _08158F1C adds r1, r5, r6 @@ -709328,7 +709328,7 @@ _08158F64: ldrsh r0, [r1, r2] cmp r0, #0xff bne _08158F8A - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08158FA6 @@ -709336,12 +709336,12 @@ _08158F64: asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #0xa - bl sub_080A2BAC + bl PlayCry3 adds r0, r4, #0 bl DestroyAnimVisualTask b _08158FA6 _08158F8A: - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08158FA6 @@ -709349,7 +709349,7 @@ _08158F8A: asrs r1, r1, #0x18 mov r0, r8 movs r2, #8 - bl sub_080A2BAC + bl PlayCry3 mov r0, sb bl DestroyAnimVisualTask _08158FA6: @@ -709384,7 +709384,7 @@ sub_08158FB4: @ 0x08158FB4 .align 2, 0 _08158FD8: .4byte gUnknown_3005B60 _08158FDC: - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08158FEC @@ -709412,10 +709412,10 @@ sub_08158FF4: @ 0x08158FF4 strh r1, [r0, #0x1c] movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _08159034 @@ -709504,7 +709504,7 @@ _081590C8: asrs r1, r1, #0x18 mov r0, r8 movs r2, #4 - bl sub_080A2C70 + bl PlayCry6 ldr r1, _081590E0 lsls r0, r4, #2 adds r0, r0, r4 @@ -709524,7 +709524,7 @@ _081590EC: strh r1, [r0, #0x1a] b _08159140 _081590F4: - bl sub_080A2FB4 + bl IsCryPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08159140 @@ -709550,14 +709550,14 @@ _08159118: asrs r1, r1, #0x18 adds r0, r6, #0 movs r2, #6 - bl sub_080A2C70 + bl PlayCry6 b _0815913A _0815912E: lsls r1, r5, #0x18 asrs r1, r1, #0x18 mov r0, r8 movs r2, #6 - bl sub_080A2BAC + bl PlayCry3 _0815913A: adds r0, r4, #0 bl DestroyAnimVisualTask @@ -709581,7 +709581,7 @@ sub_0815914C: @ 0x0815914C ldrb r0, [r0, #2] lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 @@ -709607,7 +709607,7 @@ sub_08159180: @ 0x08159180 ldrb r0, [r0, #2] lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 @@ -709640,14 +709640,14 @@ sub_081591B4: @ 0x081591B4 ldrb r0, [r0] lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r5, r5, #0x18 asrs r5, r5, #0x18 adds r0, r5, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r5, r0, #0 lsls r4, r4, #0x18 asrs r4, r4, #0x18 @@ -709765,11 +709765,11 @@ sub_081592A8: @ 0x081592A8 .align 2, 0 _081592B8: .4byte gUnknown_3005AC0 _081592BC: .4byte gUnknown_2023D08 -_081592C0: .4byte sub_081592C4 +_081592C0: .4byte SafariBufferRunCommand thumb_func_end sub_081592A8 - thumb_func_start sub_081592C4 -sub_081592C4: @ 0x081592C4 + thumb_func_start SafariBufferRunCommand +SafariBufferRunCommand: @ 0x081592C4 push {lr} ldr r2, _081592F8 ldr r1, _081592FC @@ -709802,14 +709802,14 @@ _08159300: .4byte gUnknown_2023D08 _08159304: .4byte gUnknown_2022D08 _08159308: .4byte gUnknown_85ACD28 _0815930C: - bl sub_08159640 + bl SafariBufferExecCompleted _08159310: pop {r0} bx r0 - thumb_func_end sub_081592C4 + thumb_func_end SafariBufferRunCommand - thumb_func_start sub_08159314 -sub_08159314: @ 0x08159314 + thumb_func_start HandleInputChooseAction +HandleInputChooseAction: @ 0x08159314 push {r4, r5, lr} ldr r0, _08159344 ldrh r1, [r0, #0x2e] @@ -709855,15 +709855,15 @@ _08159366: movs r1, #7 _0815936A: movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _0815937C _08159372: movs r0, #1 movs r1, #8 movs r2, #0 - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _0815937C: - bl sub_08159640 + bl SafariBufferExecCompleted b _0815948A _08159382: movs r0, #0x20 @@ -709884,7 +709884,7 @@ _08159382: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -709912,7 +709912,7 @@ _081593C0: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -709940,7 +709940,7 @@ _081593FC: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -709952,7 +709952,7 @@ _0815942E: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt b _0815948A .align 2, 0 _08159440: .4byte gUnknown_2024150 @@ -709976,7 +709976,7 @@ _08159448: ldrb r0, [r4] adds r0, r0, r5 ldrb r0, [r0] - bl sub_08059910 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r1, r5 ldrb r0, [r1] @@ -709987,7 +709987,7 @@ _08159448: adds r0, r0, r5 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt _0815948A: pop {r4, r5} pop {r0} @@ -709995,7 +709995,7 @@ _0815948A: .align 2, 0 _08159490: .4byte gUnknown_2024150 _08159494: .4byte gUnknown_2023D08 - thumb_func_end sub_08159314 + thumb_func_end HandleInputChooseAction thumb_func_start sub_08159498 sub_08159498: @ 0x08159498 @@ -710015,7 +710015,7 @@ sub_08159498: @ 0x08159498 ldr r0, _081594CC cmp r1, r0 bne _081594BC - bl sub_08159640 + bl SafariBufferExecCompleted _081594BC: pop {r0} bx r0 @@ -710034,7 +710034,7 @@ sub_081594D0: @ 0x081594D0 lsls r0, r0, #0x10 cmp r0, #0 bne _081594E2 - bl sub_08159640 + bl SafariBufferExecCompleted _081594E2: pop {r0} bx r0 @@ -710059,7 +710059,7 @@ CompleteOnHealthboxSpriteCallbackDummy: @ 0x081594E8 ldr r0, _0815951C cmp r1, r0 bne _0815950C - bl sub_08159640 + bl SafariBufferExecCompleted _0815950C: pop {r0} bx r0 @@ -710091,7 +710091,7 @@ sub_08159520: @ 0x08159520 ldr r0, [r0] str r0, [r2] ldr r0, [r2, #8] - bl sub_08000540 + bl SetMainCallback2 _0815954A: pop {r0} bx r0 @@ -710124,7 +710124,7 @@ CompleteOnSpecialAnimDone: @ 0x08159560 cmp r0, #0 bne _0815958A _08159586: - bl sub_08159640 + bl SafariBufferExecCompleted _0815958A: pop {r0} bx r0 @@ -710134,8 +710134,8 @@ _08159594: .4byte gUnknown_2024174 _08159598: .4byte gUnknown_2023D08 thumb_func_end CompleteOnSpecialAnimDone - thumb_func_start sub_0815959C -sub_0815959C: @ 0x0815959C + thumb_func_start SafariOpenPokeblockCase +SafariOpenPokeblockCase: @ 0x0815959C push {lr} ldr r0, _081595C4 ldrb r1, [r0, #7] @@ -710150,8 +710150,8 @@ sub_0815959C: @ 0x0815959C adds r0, r0, r1 ldr r1, _081595D0 str r1, [r0] - bl sub_080034D4 - bl sub_08135944 + bl FreeAllWindowBuffers + bl SummaryScreen_MainCB2 _081595C0: pop {r0} bx r0 @@ -710160,7 +710160,7 @@ _081595C4: .4byte gUnknown_2037C74 _081595C8: .4byte gUnknown_3005AC0 _081595CC: .4byte gUnknown_2023D08 _081595D0: .4byte sub_081595D4 - thumb_func_end sub_0815959C + thumb_func_end SafariOpenPokeblockCase thumb_func_start sub_081595D4 sub_081595D4: @ 0x081595D4 @@ -710179,14 +710179,14 @@ sub_081595D4: @ 0x081595D4 ldr r0, _0815960C ldrh r1, [r0] movs r0, #1 - bl sub_08034014 - bl sub_08159640 + bl BtlController_EmitOneReturnValue + bl SafariBufferExecCompleted _081595FA: pop {r0} bx r0 .align 2, 0 _08159600: .4byte gUnknown_3002360 -_08159604: .4byte sub_080380FC +_08159604: .4byte BattleMainCB2 _08159608: .4byte gUnknown_2037C74 _0815960C: .4byte gUnknown_203CB48 thumb_func_end sub_081595D4 @@ -710208,7 +710208,7 @@ sub_08159610: @ 0x08159610 ands r0, r1 cmp r0, #0 bne _08159632 - bl sub_08159640 + bl SafariBufferExecCompleted _08159632: pop {r0} bx r0 @@ -710217,8 +710217,8 @@ _08159638: .4byte gUnknown_2024174 _0815963C: .4byte gUnknown_2023D08 thumb_func_end sub_08159610 - thumb_func_start sub_08159640 -sub_08159640: @ 0x08159640 + thumb_func_start SafariBufferExecCompleted +SafariBufferExecCompleted: @ 0x08159640 push {r4, lr} sub sp, #4 ldr r1, _08159680 @@ -710234,7 +710234,7 @@ sub_08159640: @ 0x08159640 ands r0, r1 cmp r0, #0 beq _08159694 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -710251,7 +710251,7 @@ sub_08159640: @ 0x08159640 .align 2, 0 _08159680: .4byte gUnknown_3005AC0 _08159684: .4byte gUnknown_2023D08 -_08159688: .4byte sub_081592C4 +_08159688: .4byte SafariBufferRunCommand _0815968C: .4byte gUnknown_2022C90 _08159690: .4byte gUnknown_2022D08 _08159694: @@ -710272,7 +710272,7 @@ _081596A6: .align 2, 0 _081596B0: .4byte gUnknown_2023D0C _081596B4: .4byte gUnknown_82FACB4 - thumb_func_end sub_08159640 + thumb_func_end SafariBufferExecCompleted thumb_func_start sub_081596B8 sub_081596B8: @ 0x081596B8 @@ -710291,7 +710291,7 @@ sub_081596B8: @ 0x081596B8 ands r0, r1 cmp r0, #0 bne _081596DA - bl sub_08159640 + bl SafariBufferExecCompleted _081596DA: pop {r0} bx r0 @@ -710300,78 +710300,78 @@ _081596E0: .4byte gUnknown_2024174 _081596E4: .4byte gUnknown_2023D08 thumb_func_end sub_081596B8 - thumb_func_start sub_081596E8 -sub_081596E8: @ 0x081596E8 + thumb_func_start SafariHandleGetMonData +SafariHandleGetMonData: @ 0x081596E8 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081596E8 + thumb_func_end SafariHandleGetMonData - thumb_func_start sub_081596F4 -sub_081596F4: @ 0x081596F4 + thumb_func_start SafariHandleGetRawMonData +SafariHandleGetRawMonData: @ 0x081596F4 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081596F4 + thumb_func_end SafariHandleGetRawMonData - thumb_func_start sub_08159700 -sub_08159700: @ 0x08159700 + thumb_func_start SafariHandleSetMonData +SafariHandleSetMonData: @ 0x08159700 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159700 + thumb_func_end SafariHandleSetMonData - thumb_func_start sub_0815970C -sub_0815970C: @ 0x0815970C + thumb_func_start SafariHandleSetRawMonData +SafariHandleSetRawMonData: @ 0x0815970C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815970C + thumb_func_end SafariHandleSetRawMonData thumb_func_start sub_08159718 sub_08159718: @ 0x08159718 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08159718 - thumb_func_start sub_08159724 -sub_08159724: @ 0x08159724 + thumb_func_start SafariHandleSwitchInAnim +SafariHandleSwitchInAnim: @ 0x08159724 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159724 + thumb_func_end SafariHandleSwitchInAnim - thumb_func_start sub_08159730 -sub_08159730: @ 0x08159730 + thumb_func_start SafariHandleReturnMonToBall +SafariHandleReturnMonToBall: @ 0x08159730 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159730 + thumb_func_end SafariHandleReturnMonToBall - thumb_func_start sub_0815973C -sub_0815973C: @ 0x0815973C + thumb_func_start SafariHandleDrawTrainerPic +SafariHandleDrawTrainerPic: @ 0x0815973C push {r4, r5, r6, lr} ldr r4, _081597F4 ldr r0, [r4] ldrb r0, [r0, #8] ldr r5, _081597F8 ldrb r1, [r5] - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldr r0, [r4] ldrb r6, [r0, #8] ldrb r0, [r5] @@ -710380,7 +710380,7 @@ sub_0815973C: @ 0x0815973C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r6, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r0, _081597FC ldr r2, _08159800 ldr r1, [r4] @@ -710397,7 +710397,7 @@ sub_0815973C: @ 0x0815973C asrs r2, r2, #0x10 movs r1, #0x50 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r6, _08159804 ldrb r1, [r5] adds r1, r1, r6 @@ -710464,43 +710464,43 @@ _0815980C: .4byte 0x0000FFFE _08159810: .4byte sub_0805D3C8 _08159814: .4byte gUnknown_3005AC0 _08159818: .4byte sub_08159498 - thumb_func_end sub_0815973C + thumb_func_end SafariHandleDrawTrainerPic - thumb_func_start sub_0815981C -sub_0815981C: @ 0x0815981C + thumb_func_start SafariHandleTrainerSlide +SafariHandleTrainerSlide: @ 0x0815981C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815981C + thumb_func_end SafariHandleTrainerSlide - thumb_func_start sub_08159828 -sub_08159828: @ 0x08159828 + thumb_func_start SafariHandleTrainerSlideBack +SafariHandleTrainerSlideBack: @ 0x08159828 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159828 + thumb_func_end SafariHandleTrainerSlideBack - thumb_func_start sub_08159834 -sub_08159834: @ 0x08159834 + thumb_func_start SafariHandleFaintAnimation +SafariHandleFaintAnimation: @ 0x08159834 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159834 + thumb_func_end SafariHandleFaintAnimation - thumb_func_start sub_08159840 -sub_08159840: @ 0x08159840 + thumb_func_start SafariHandlePaletteFade +SafariHandlePaletteFade: @ 0x08159840 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159840 + thumb_func_end SafariHandlePaletteFade thumb_func_start sub_0815984C sub_0815984C: @ 0x0815984C @@ -710523,7 +710523,7 @@ sub_0815984C: @ 0x0815984C adds r0, r4, #0 adds r1, r4, #0 movs r3, #4 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _08159898 ldrb r0, [r5] lsls r0, r0, #2 @@ -710567,7 +710567,7 @@ sub_081598A0: @ 0x081598A0 adds r0, r4, #0 adds r1, r4, #0 movs r3, #4 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _081598F8 ldrb r0, [r5] lsls r0, r0, #2 @@ -710586,23 +710586,23 @@ _081598F8: .4byte gUnknown_3005AC0 _081598FC: .4byte CompleteOnSpecialAnimDone thumb_func_end sub_081598A0 - thumb_func_start sub_08159900 -sub_08159900: @ 0x08159900 + thumb_func_start SafariHandlePause +SafariHandlePause: @ 0x08159900 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159900 + thumb_func_end SafariHandlePause - thumb_func_start sub_0815990C -sub_0815990C: @ 0x0815990C + thumb_func_start SafariHandleMoveAnimation +SafariHandleMoveAnimation: @ 0x0815990C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815990C + thumb_func_end SafariHandleMoveAnimation thumb_func_start sub_08159918 sub_08159918: @ 0x08159918 @@ -710618,7 +710618,7 @@ sub_08159918: @ 0x08159918 ldr r1, _0815995C adds r0, r0, r1 ldrh r0, [r0] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _08159960 movs r1, #0 bl sub_0814FA04 @@ -710641,12 +710641,12 @@ _08159964: .4byte gUnknown_3005AC0 _08159968: .4byte sub_081594D0 thumb_func_end sub_08159918 - thumb_func_start sub_0815996C -sub_0815996C: @ 0x0815996C + thumb_func_start SafariHandlePrintSelectionString +SafariHandlePrintSelectionString: @ 0x0815996C push {lr} ldr r0, _08159984 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _08159988 @@ -710655,16 +710655,16 @@ sub_0815996C: @ 0x0815996C .align 2, 0 _08159984: .4byte gUnknown_2023D08 _08159988: - bl sub_08159640 + bl SafariBufferExecCompleted _0815998C: pop {r0} bx r0 - thumb_func_end sub_0815996C + thumb_func_end SafariHandlePrintSelectionString thumb_func_start sub_08159990 sub_08159990: @ 0x08159990 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -710689,11 +710689,11 @@ _081599BC: .4byte gUnknown_2022AC8 _081599C0: .4byte gUnknown_2022ACA _081599C4: .4byte gUnknown_3005AC0 _081599C8: .4byte gUnknown_2023D08 -_081599CC: .4byte sub_08159314 +_081599CC: .4byte HandleInputChooseAction thumb_func_end sub_08159990 - thumb_func_start sub_081599D0 -sub_081599D0: @ 0x081599D0 + thumb_func_start SafariHandleChooseAction +SafariHandleChooseAction: @ 0x081599D0 push {r4, lr} ldr r1, _08159A1C ldr r0, _08159A20 @@ -710709,7 +710709,7 @@ sub_081599D0: @ 0x081599D0 _081599EA: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_08059910 + bl MoveSelectionDestroyCursorAt adds r4, #1 cmp r4, #3 ble _081599EA @@ -710719,9 +710719,9 @@ _081599EA: adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt ldr r0, _08159A30 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _08159A34 movs r1, #1 bl sub_0814FA04 @@ -710736,28 +710736,28 @@ _08159A28: .4byte gUnknown_85ABB86 _08159A2C: .4byte gUnknown_2024150 _08159A30: .4byte gUnknown_85ABB4D _08159A34: .4byte gUnknown_2022AE0 - thumb_func_end sub_081599D0 + thumb_func_end SafariHandleChooseAction - thumb_func_start sub_08159A38 -sub_08159A38: @ 0x08159A38 + thumb_func_start SafariHandleUnknownYesNoBox +SafariHandleUnknownYesNoBox: @ 0x08159A38 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159A38 + thumb_func_end SafariHandleUnknownYesNoBox - thumb_func_start sub_08159A44 -sub_08159A44: @ 0x08159A44 + thumb_func_start SafariHandleChooseMove +SafariHandleChooseMove: @ 0x08159A44 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159A44 + thumb_func_end SafariHandleChooseMove - thumb_func_start sub_08159A50 -sub_08159A50: @ 0x08159A50 + thumb_func_start SafariHandleChooseItem +SafariHandleChooseItem: @ 0x08159A50 push {lr} sub sp, #4 movs r0, #1 @@ -710766,7 +710766,7 @@ sub_08159A50: @ 0x08159A50 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08159A80 ldr r2, _08159A84 ldrb r0, [r2] @@ -710783,48 +710783,48 @@ sub_08159A50: @ 0x08159A50 .align 2, 0 _08159A80: .4byte gUnknown_3005AC0 _08159A84: .4byte gUnknown_2023D08 -_08159A88: .4byte sub_0815959C +_08159A88: .4byte SafariOpenPokeblockCase _08159A8C: .4byte gUnknown_202415C - thumb_func_end sub_08159A50 + thumb_func_end SafariHandleChooseItem - thumb_func_start sub_08159A90 -sub_08159A90: @ 0x08159A90 + thumb_func_start SafariHandleChoosePokemon +SafariHandleChoosePokemon: @ 0x08159A90 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159A90 + thumb_func_end SafariHandleChoosePokemon - thumb_func_start sub_08159A9C -sub_08159A9C: @ 0x08159A9C + thumb_func_start SafariHandleCmd23 +SafariHandleCmd23: @ 0x08159A9C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159A9C + thumb_func_end SafariHandleCmd23 - thumb_func_start sub_08159AA8 -sub_08159AA8: @ 0x08159AA8 + thumb_func_start SafariHandleHealthBarUpdate +SafariHandleHealthBarUpdate: @ 0x08159AA8 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159AA8 + thumb_func_end SafariHandleHealthBarUpdate - thumb_func_start sub_08159AB4 -sub_08159AB4: @ 0x08159AB4 + thumb_func_start SafariHandleExpUpdate +SafariHandleExpUpdate: @ 0x08159AB4 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159AB4 + thumb_func_end SafariHandleExpUpdate - thumb_func_start sub_08159AC0 -sub_08159AC0: @ 0x08159AC0 + thumb_func_start SafariHandleStatusIconUpdate +SafariHandleStatusIconUpdate: @ 0x08159AC0 push {lr} ldr r0, _08159AEC ldr r1, _08159AF0 @@ -710840,8 +710840,8 @@ sub_08159AC0: @ 0x08159AC0 ldr r2, _08159AF8 adds r1, r1, r2 movs r2, #0xb - bl sub_080743F0 - bl sub_08159640 + bl UpdateHealthboxAttribute + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -710849,158 +710849,158 @@ _08159AEC: .4byte gUnknown_3005AD0 _08159AF0: .4byte gUnknown_2023D08 _08159AF4: .4byte gUnknown_2023D12 _08159AF8: .4byte gUnknown_2024190 - thumb_func_end sub_08159AC0 + thumb_func_end SafariHandleStatusIconUpdate thumb_func_start sub_08159AFC sub_08159AFC: @ 0x08159AFC push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08159AFC - thumb_func_start sub_08159B08 -sub_08159B08: @ 0x08159B08 + thumb_func_start SafariHandleStatusXor +SafariHandleStatusXor: @ 0x08159B08 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B08 + thumb_func_end SafariHandleStatusXor - thumb_func_start sub_08159B14 -sub_08159B14: @ 0x08159B14 + thumb_func_start SafariHandleDataTransfer +SafariHandleDataTransfer: @ 0x08159B14 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B14 + thumb_func_end SafariHandleDataTransfer - thumb_func_start sub_08159B20 -sub_08159B20: @ 0x08159B20 + thumb_func_start SafariHandleDMA3Transfer +SafariHandleDMA3Transfer: @ 0x08159B20 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B20 + thumb_func_end SafariHandleDMA3Transfer - thumb_func_start sub_08159B2C -sub_08159B2C: @ 0x08159B2C + thumb_func_start SafariHandlePlayBGM +SafariHandlePlayBGM: @ 0x08159B2C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B2C + thumb_func_end SafariHandlePlayBGM - thumb_func_start sub_08159B38 -sub_08159B38: @ 0x08159B38 + thumb_func_start SafariHandleCmd32 +SafariHandleCmd32: @ 0x08159B38 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B38 + thumb_func_end SafariHandleCmd32 - thumb_func_start sub_08159B44 -sub_08159B44: @ 0x08159B44 + thumb_func_start SafariHandleTwoReturnValues +SafariHandleTwoReturnValues: @ 0x08159B44 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B44 + thumb_func_end SafariHandleTwoReturnValues - thumb_func_start sub_08159B50 -sub_08159B50: @ 0x08159B50 + thumb_func_start SafariHandleChosenMonReturnValue +SafariHandleChosenMonReturnValue: @ 0x08159B50 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B50 + thumb_func_end SafariHandleChosenMonReturnValue - thumb_func_start sub_08159B5C -sub_08159B5C: @ 0x08159B5C + thumb_func_start SafariHandleOneReturnValue +SafariHandleOneReturnValue: @ 0x08159B5C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B5C + thumb_func_end SafariHandleOneReturnValue - thumb_func_start sub_08159B68 -sub_08159B68: @ 0x08159B68 + thumb_func_start SafariHandleOneReturnValue_Duplicate +SafariHandleOneReturnValue_Duplicate: @ 0x08159B68 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B68 + thumb_func_end SafariHandleOneReturnValue_Duplicate - thumb_func_start sub_08159B74 -sub_08159B74: @ 0x08159B74 + thumb_func_start SafariHandleCmd37 +SafariHandleCmd37: @ 0x08159B74 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B74 + thumb_func_end SafariHandleCmd37 - thumb_func_start sub_08159B80 -sub_08159B80: @ 0x08159B80 + thumb_func_start SafariHandleCmd38 +SafariHandleCmd38: @ 0x08159B80 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B80 + thumb_func_end SafariHandleCmd38 - thumb_func_start sub_08159B8C -sub_08159B8C: @ 0x08159B8C + thumb_func_start SafariHandleCmd39 +SafariHandleCmd39: @ 0x08159B8C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B8C + thumb_func_end SafariHandleCmd39 - thumb_func_start sub_08159B98 -sub_08159B98: @ 0x08159B98 + thumb_func_start SafariHandleCmd40 +SafariHandleCmd40: @ 0x08159B98 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159B98 + thumb_func_end SafariHandleCmd40 - thumb_func_start sub_08159BA4 -sub_08159BA4: @ 0x08159BA4 + thumb_func_start SafariHandleHitAnimation +SafariHandleHitAnimation: @ 0x08159BA4 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159BA4 + thumb_func_end SafariHandleHitAnimation - thumb_func_start sub_08159BB0 -sub_08159BB0: @ 0x08159BB0 + thumb_func_start SafariHandleCmd42 +SafariHandleCmd42: @ 0x08159BB0 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159BB0 + thumb_func_end SafariHandleCmd42 - thumb_func_start sub_08159BBC -sub_08159BBC: @ 0x08159BBC + thumb_func_start SafariHandlePlaySE +SafariHandlePlaySE: @ 0x08159BBC push {r4, lr} ldr r4, _08159BF8 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -711020,15 +711020,15 @@ _08159BD0: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_08159640 + bl PlaySE12WithPanning + bl SafariBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _08159BF8: .4byte gUnknown_2023D08 _08159BFC: .4byte gUnknown_2022D08 - thumb_func_end sub_08159BBC + thumb_func_end SafariHandlePlaySE thumb_func_start sub_08159C00 sub_08159C00: @ 0x08159C00 @@ -711042,7 +711042,7 @@ sub_08159C00: @ 0x08159C00 ldrb r0, [r0] cmp r0, #0 beq _08159C3C - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -711053,7 +711053,7 @@ sub_08159C00: @ 0x08159C00 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _08159C50 .align 2, 0 _08159C34: .4byte gUnknown_2022D08 @@ -711067,17 +711067,17 @@ _08159C3C: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _08159C50: - bl sub_08159640 + bl SafariBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08159C00 - thumb_func_start sub_08159C5C -sub_08159C5C: @ 0x08159C5C + thumb_func_start SafariHandleFaintingCry +SafariHandleFaintingCry: @ 0x08159C5C push {lr} ldr r1, _08159C8C ldr r0, _08159C90 @@ -711090,22 +711090,22 @@ sub_08159C5C: @ 0x08159C5C ldr r1, _08159C94 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 - bl sub_080A2B3C - bl sub_08159640 + bl PlayCry1 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08159C8C: .4byte gUnknown_2023D12 _08159C90: .4byte gUnknown_2023D08 _08159C94: .4byte gUnknown_2024190 - thumb_func_end sub_08159C5C + thumb_func_end SafariHandleFaintingCry - thumb_func_start sub_08159C98 -sub_08159C98: @ 0x08159C98 + thumb_func_start SafariHandleIntroSlide +SafariHandleIntroSlide: @ 0x08159C98 push {lr} ldr r1, _08159CC0 ldr r0, _08159CC4 @@ -711114,23 +711114,23 @@ sub_08159C98: @ 0x08159C98 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _08159CC8 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08159CC0: .4byte gUnknown_2022D08 _08159CC4: .4byte gUnknown_2023D08 _08159CC8: .4byte gUnknown_20240A0 - thumb_func_end sub_08159C98 + thumb_func_end SafariHandleIntroSlide - thumb_func_start sub_08159CCC -sub_08159CCC: @ 0x08159CCC + thumb_func_start SafariHandleIntroTrainerBallThrow +SafariHandleIntroTrainerBallThrow: @ 0x08159CCC push {r4, r5, lr} ldr r5, _08159D10 ldr r4, _08159D14 @@ -711146,7 +711146,7 @@ sub_08159CCC: @ 0x08159CCC ldr r2, _08159D1C adds r1, r1, r2 movs r2, #0xa - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -711169,46 +711169,46 @@ _08159D18: .4byte gUnknown_2023D12 _08159D1C: .4byte gUnknown_2024190 _08159D20: .4byte gUnknown_3005AC0 _08159D24: .4byte CompleteOnHealthboxSpriteCallbackDummy - thumb_func_end sub_08159CCC + thumb_func_end SafariHandleIntroTrainerBallThrow thumb_func_start sub_08159D28 sub_08159D28: @ 0x08159D28 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08159D28 - thumb_func_start sub_08159D34 -sub_08159D34: @ 0x08159D34 + thumb_func_start SafariHandleHidePartyStatusSummary +SafariHandleHidePartyStatusSummary: @ 0x08159D34 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159D34 + thumb_func_end SafariHandleHidePartyStatusSummary - thumb_func_start sub_08159D40 -sub_08159D40: @ 0x08159D40 + thumb_func_start SafariHandleEndBounceEffect +SafariHandleEndBounceEffect: @ 0x08159D40 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159D40 + thumb_func_end SafariHandleEndBounceEffect - thumb_func_start sub_08159D4C -sub_08159D4C: @ 0x08159D4C + thumb_func_start SafariHandleSpriteInvisibility +SafariHandleSpriteInvisibility: @ 0x08159D4C push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159D4C + thumb_func_end SafariHandleSpriteInvisibility - thumb_func_start sub_08159D58 -sub_08159D58: @ 0x08159D58 + thumb_func_start SafariHandleBattleAnimation +SafariHandleBattleAnimation: @ 0x08159D58 push {r4, r5, r6, lr} sub sp, #4 ldr r5, _08159D90 @@ -711229,11 +711229,11 @@ sub_08159D58: @ 0x08159D58 str r4, [sp] adds r0, r2, #0 adds r1, r2, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _08159D98 - bl sub_08159640 + bl SafariBufferExecCompleted b _08159DA4 .align 2, 0 _08159D90: .4byte gUnknown_2022D08 @@ -711253,25 +711253,25 @@ _08159DA4: .align 2, 0 _08159DAC: .4byte gUnknown_3005AC0 _08159DB0: .4byte sub_08159610 - thumb_func_end sub_08159D58 + thumb_func_end SafariHandleBattleAnimation - thumb_func_start sub_08159DB4 -sub_08159DB4: @ 0x08159DB4 + thumb_func_start SafariHandleLinkStandbyMsg +SafariHandleLinkStandbyMsg: @ 0x08159DB4 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159DB4 + thumb_func_end SafariHandleLinkStandbyMsg - thumb_func_start sub_08159DC0 -sub_08159DC0: @ 0x08159DC0 + thumb_func_start SafariHandleResetActionMoveSelection +SafariHandleResetActionMoveSelection: @ 0x08159DC0 push {lr} - bl sub_08159640 + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08159DC0 + thumb_func_end SafariHandleResetActionMoveSelection thumb_func_start sub_08159DCC sub_08159DCC: @ 0x08159DCC @@ -711289,7 +711289,7 @@ sub_08159DCC: @ 0x08159DCC bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_08159640 + bl SafariBufferExecCompleted ldr r0, _08159E1C ldr r0, [r0] movs r1, #6 @@ -711321,8 +711321,8 @@ sub_08159E28: @ 0x08159E28 .align 2, 0 thumb_func_end sub_08159E28 - thumb_func_start sub_08159E2C -sub_08159E2C: @ 0x08159E2C + thumb_func_start SetUpFieldMove_SweetScent +SetUpFieldMove_SweetScent: @ 0x08159E2C ldr r1, _08159E3C ldr r0, _08159E40 str r0, [r1] @@ -711333,17 +711333,17 @@ sub_08159E2C: @ 0x08159E2C bx lr .align 2, 0 _08159E3C: .4byte gUnknown_3005B10 -_08159E40: .4byte sub_081B53D8 +_08159E40: .4byte FieldCallback_PrepareFadeInFromMenu _08159E44: .4byte gUnknown_203CBB8 -_08159E48: .4byte sub_08159E4C - thumb_func_end sub_08159E2C +_08159E48: .4byte FieldCallback_SweetScent + thumb_func_end SetUpFieldMove_SweetScent - thumb_func_start sub_08159E4C -sub_08159E4C: @ 0x08159E4C + thumb_func_start FieldCallback_SweetScent +FieldCallback_SweetScent: @ 0x08159E4C push {lr} movs r0, #0x33 - bl sub_080B5270 - bl sub_081B1024 + bl FieldEffectStart + bl GetCursorSelectionMonId ldr r1, _08159E64 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -711352,13 +711352,13 @@ sub_08159E4C: @ 0x08159E4C bx r0 .align 2, 0 _08159E64: .4byte gUnknown_20388A8 - thumb_func_end sub_08159E4C + thumb_func_end FieldCallback_SweetScent - thumb_func_start sub_08159E68 -sub_08159E68: @ 0x08159E68 + thumb_func_start FldEff_SweetScent +FldEff_SweetScent: @ 0x08159E68 push {lr} bl sub_080ABCCC - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08159E90 @@ -711376,7 +711376,7 @@ sub_08159E68: @ 0x08159E68 .align 2, 0 _08159E90: .4byte gUnknown_3005B60 _08159E94: .4byte sub_08159E98 - thumb_func_end sub_08159E68 + thumb_func_end FldEff_SweetScent thumb_func_start sub_08159E98 sub_08159E98: @ 0x08159E98 @@ -711395,7 +711395,7 @@ sub_08159E98: @ 0x08159E98 adds r1, r5, #0 adds r2, r4, #0 bl CpuFastSet - bl sub_0808B640 + bl GetPlayerAvatarObjectId ldr r2, _08159F1C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -711414,10 +711414,10 @@ sub_08159E98: @ 0x08159E98 movs r1, #4 movs r2, #0 movs r3, #8 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08159F20 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08159F24 @@ -711438,12 +711438,12 @@ _08159F10: .4byte gUnknown_20373B4 _08159F14: .4byte gUnknown_2037C88 _08159F18: .4byte gUnknown_20377B4 _08159F1C: .4byte gUnknown_20205AC -_08159F20: .4byte sub_08159F28 +_08159F20: .4byte TrySweetScentEncounter _08159F24: .4byte gUnknown_3005B60 thumb_func_end sub_08159E98 - thumb_func_start sub_08159F28 -sub_08159F28: @ 0x08159F28 + thumb_func_start TrySweetScentEncounter +TrySweetScentEncounter: @ 0x08159F28 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -711456,11 +711456,11 @@ sub_08159F28: @ 0x08159F28 lsrs r6, r0, #0x18 cmp r6, #0 bne _08159FC4 - bl sub_081BE3C8 + bl ClearMirageTowerPulseBlendEffect movs r0, #0x40 movs r1, #8 movs r2, #0x1f - bl sub_080A22E8 + bl BlendPalettes ldr r0, _08159F7C lsls r1, r5, #2 adds r1, r1, r5 @@ -711472,13 +711472,13 @@ sub_08159F28: @ 0x08159F28 cmp r0, #0x40 bne _08159FC0 strh r6, [r4, #8] - bl sub_080B4CD0 + bl SweetScentWildEncounter lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _08159F80 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _08159FC4 .align 2, 0 _08159F78: .4byte gUnknown_2037C74 @@ -711486,7 +711486,7 @@ _08159F7C: .4byte gUnknown_3005B60 _08159F80: ldr r0, _08159FB8 str r0, [r4] - bl sub_0808B640 + bl GetPlayerAvatarObjectId ldr r2, _08159FBC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -711505,11 +711505,11 @@ _08159F80: movs r1, #4 movs r2, #8 movs r3, #0 - bl sub_080A139C - bl sub_081BE354 + bl BeginNormalPaletteFade + bl TryStartMirageTowerPulseBlendEffect b _08159FC4 .align 2, 0 -_08159FB8: .4byte sub_08159FCC +_08159FB8: .4byte FailSweetScentEncounter _08159FBC: .4byte gUnknown_20205AC _08159FC0: adds r0, r1, #1 @@ -711519,10 +711519,10 @@ _08159FC4: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08159F28 + thumb_func_end TrySweetScentEncounter - thumb_func_start sub_08159FCC -sub_08159FCC: @ 0x08159FCC + thumb_func_start FailSweetScentEncounter +FailSweetScentEncounter: @ 0x08159FCC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -711541,7 +711541,7 @@ sub_08159FCC: @ 0x08159FCC ldr r0, _0815A00C bl ScriptContext1_SetupScript adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08159FFA: pop {r4} pop {r0} @@ -711551,7 +711551,7 @@ _0815A000: .4byte gUnknown_2037C74 _0815A004: .4byte gUnknown_2037C88 _0815A008: .4byte gUnknown_20373B4 _0815A00C: .4byte gUnknown_8256A14 - thumb_func_end sub_08159FCC + thumb_func_end FailSweetScentEncounter thumb_func_start sub_0815A010 sub_0815A010: @ 0x0815A010 @@ -711625,7 +711625,7 @@ sub_0815A050: @ 0x0815A050 b _0815A096 _0815A090: adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815A096: pop {r0} bx r0 @@ -711641,7 +711641,7 @@ sub_0815A09C: @ 0x0815A09C ldr r6, _0815A0E8 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #8 @@ -711651,7 +711651,7 @@ sub_0815A09C: @ 0x0815A09C asrs r4, r4, #0x10 ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #8 @@ -711683,7 +711683,7 @@ sub_0815A0EC: @ 0x0815A0EC strh r0, [r4, #0x30] ldr r1, _0815A12C adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 movs r1, #0xfd lsls r1, r1, #6 movs r0, #0x50 @@ -711751,7 +711751,7 @@ sub_0815A170: @ 0x0815A170 movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -711765,13 +711765,13 @@ sub_0815A190: @ 0x0815A190 ldr r4, _0815A21C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r7, r0, #0 ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r6, r0, #0 @@ -711792,7 +711792,7 @@ sub_0815A190: @ 0x0815A190 lsls r1, r1, #0x17 adds r0, r0, r1 lsrs r4, r0, #0x10 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815A1EE @@ -711808,7 +711808,7 @@ _0815A1EE: adds r0, r5, #0 movs r1, #0 adds r2, r3, #0 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldr r0, _0815A220 ldrh r0, [r0, #4] strh r0, [r5, #0x2e] @@ -711818,7 +711818,7 @@ _0815A1EE: str r0, [r5, #0x1c] ldr r1, _0815A228 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 add sp, #4 pop {r4, r5, r6, r7} pop {r0} @@ -711827,7 +711827,7 @@ _0815A1EE: _0815A21C: .4byte gUnknown_20380D7 _0815A220: .4byte gUnknown_20380BE _0815A224: .4byte sub_080A67B4 -_0815A228: .4byte sub_080A34C4 +_0815A228: .4byte DestroyAnimSprite thumb_func_end sub_0815A190 thumb_func_start sub_0815A22C @@ -712102,7 +712102,7 @@ _0815A41C: movs r1, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815A43A: pop {r4} pop {r0} @@ -712196,7 +712196,7 @@ _0815A4D8: cmp r1, r0 bne _0815A4E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0815A4E8: pop {r3, r4} mov r8, r3 @@ -712324,7 +712324,7 @@ _0815A5CE: cmp r1, r0 bne _0815A5DE mov r0, r8 - bl sub_080A8964 + bl DestroyTask _0815A5DE: pop {r3, r4, r5} mov r8, r3 @@ -712347,7 +712347,7 @@ sub_0815A600: @ 0x0815A600 sub sp, #4 adds r4, r0, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0815A664 ldrb r0, [r0] mov r5, sp @@ -712358,7 +712358,7 @@ sub_0815A600: @ 0x0815A600 bl SetAverageBattlerPositions ldr r0, _0815A668 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815A634 @@ -712382,7 +712382,7 @@ _0815A634: ldr r0, _0815A670 strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _0815A674 str r0, [r4, #0x1c] add sp, #4 @@ -712401,7 +712401,7 @@ _0815A674: .4byte sub_0815A678 sub_0815A678: @ 0x0815A678 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _0815A69A @@ -712413,7 +712413,7 @@ sub_0815A678: @ 0x0815A678 str r0, [r4, #0x1c] ldr r1, _0815A6A4 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 _0815A69A: pop {r4} pop {r0} @@ -712456,7 +712456,7 @@ _0815A6D4: cmp r0, #0x10 bne _0815A6E8 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815A6E8: pop {r0} bx r0 @@ -712471,7 +712471,7 @@ sub_0815A6EC: @ 0x0815A6EC movs r0, #0 ldrsh r1, [r5, r0] adds r0, r4, #0 - bl sub_080A612C + bl SetAnimSpriteInitialXOffset ldrh r0, [r5, #2] ldrh r1, [r4, #0x22] adds r0, r0, r1 @@ -712480,14 +712480,14 @@ sub_0815A6EC: @ 0x0815A6EC str r0, [r4, #0x1c] ldr r1, _0815A724 adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0815A71C: .4byte gUnknown_20380BE _0815A720: .4byte RunStoredCallbackWhenAnimEnds -_0815A724: .4byte sub_080A34C4 +_0815A724: .4byte DestroyAnimSprite thumb_func_end sub_0815A6EC thumb_func_start sub_0815A728 @@ -712504,14 +712504,14 @@ sub_0815A728: @ 0x0815A728 movs r2, #0 ldrsh r1, [r5, r2] adds r0, r4, #0 - bl sub_080A612C - bl sub_080A46B8 + bl SetAnimSpriteInitialXOffset + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815A77C ldr r0, _0815A768 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815A76C @@ -712580,7 +712580,7 @@ _0815A788: cmp r0, #0xf0 bls _0815A7E0 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815A7E0: pop {r4, r5} pop {r0} @@ -712599,21 +712599,21 @@ sub_0815A7E8: @ 0x0815A7E8 cmp r0, #0 beq _0815A7FE adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815A7FE: pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0815A7E8 - thumb_func_start sub_0815A804 -sub_0815A804: @ 0x0815A804 + thumb_func_start AnimTask_IsTargetPlayerSide +AnimTask_IsTargetPlayerSide: @ 0x0815A804 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _0815A820 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -712636,10 +712636,10 @@ _0815A82C: bx r0 .align 2, 0 _0815A83C: .4byte gUnknown_20380BE - thumb_func_end sub_0815A804 + thumb_func_end AnimTask_IsTargetPlayerSide - thumb_func_start sub_0815A840 -sub_0815A840: @ 0x0815A840 + thumb_func_start AnimTask_IsHealingMove +AnimTask_IsHealingMove: @ 0x0815A840 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -712664,7 +712664,7 @@ _0815A860: bx r0 .align 2, 0 _0815A86C: .4byte gUnknown_20380BE - thumb_func_end sub_0815A840 + thumb_func_end AnimTask_IsHealingMove thumb_func_start sub_0815A870 sub_0815A870: @ 0x0815A870 @@ -712676,7 +712676,7 @@ sub_0815A870: @ 0x0815A870 movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r0, _0815A8D0 movs r1, #0 strh r1, [r0] @@ -712840,7 +712840,7 @@ sub_0815A9A8: @ 0x0815A9A8 movs r0, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -712860,13 +712860,13 @@ sub_0815A9E0: @ 0x0815A9E0 ldr r4, _0815AA58 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -712963,7 +712963,7 @@ sub_0815AA98: @ 0x0815AA98 bne _0815AAF6 movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 @@ -712994,7 +712994,7 @@ _0815AAF6: cmp r0, #0 bne _0815AB04 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815AB04: pop {r4} pop {r0} @@ -713019,12 +713019,12 @@ sub_0815AB0C: @ 0x0815AB0C bx r0 thumb_func_end sub_0815AB0C - thumb_func_start sub_0815AB28 -sub_0815AB28: @ 0x0815AB28 + thumb_func_start StartSweetScentFieldEffect +StartSweetScentFieldEffect: @ 0x0815AB28 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815AB7C @@ -713074,7 +713074,7 @@ _0815AB7C: movs r1, #0x80 lsls r1, r1, #7 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits _0815ABAC: adds r0, r5, #0 bl DestroyAnimVisualTask @@ -713086,7 +713086,7 @@ _0815ABB8: .4byte 0x00001F3F _0815ABBC: .4byte gUnknown_2022ADC _0815ABC0: .4byte gUnknown_2022ADE _0815ABC4: .4byte 0x000078A0 - thumb_func_end sub_0815AB28 + thumb_func_end StartSweetScentFieldEffect thumb_func_start sub_0815ABC8 sub_0815ABC8: @ 0x0815ABC8 @@ -713101,14 +713101,14 @@ sub_0815ABC8: @ 0x0815ABC8 strh r1, [r0] ldr r0, _0815AC08 strh r1, [r0] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815ABF4 movs r1, #0x80 lsls r1, r1, #7 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits _0815ABF4: adds r0, r4, #0 bl DestroyAnimVisualTask @@ -713140,7 +713140,7 @@ _0815AC28: _0815AC2A: ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #2] @@ -713148,7 +713148,7 @@ _0815AC2A: strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -713218,7 +713218,7 @@ sub_0815AC88: @ 0x0815AC88 cmp r0, r1 bge _0815ACE6 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite b _0815ACE6 .align 2, 0 _0815ACD0: .4byte gUnknown_82FA8CC @@ -713230,7 +713230,7 @@ _0815ACD4: cmp r0, r1 ble _0815ACE6 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815ACE6: pop {r0} bx r0 @@ -713263,7 +713263,7 @@ _0815AD18: ldr r4, _0815AD60 _0815AD1A: ldrb r0, [r4] - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldrb r0, [r4] @@ -713373,7 +713373,7 @@ _0815ADDE: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _0815AE10 str r0, [r5] add sp, #0xc @@ -713556,13 +713556,13 @@ sub_0815AF2C: @ 0x0815AF2C ldr r6, _0815AF84 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xc] ldrb r0, [r6] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xe] @@ -713572,7 +713572,7 @@ sub_0815AF2C: @ 0x0815AF2C strh r0, [r4, #0x12] strh r5, [r4, #0x14] movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -713654,17 +713654,17 @@ _0815AFF8: subs r3, r3, r4 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xba - bl sub_080A307C + bl PlaySE12WithPanning cmp r4, #0x40 beq _0815B05C ldr r5, _0815B090 @@ -713718,7 +713718,7 @@ _0815B094: .4byte sub_08007140 _0815B098: .4byte gUnknown_85AD0A8 _0815B09C: adds r0, r6, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -713880,7 +713880,7 @@ sub_0815B1B8: @ 0x0815B1B8 bne _0815B1CC adds r0, r5, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker _0815B1CC: ldrh r0, [r5, #0x2e] adds r0, #1 @@ -713928,7 +713928,7 @@ _0815B214: bne _0815B260 ldr r1, _0815B268 adds r0, r5, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrh r0, [r5, #0x24] ldrh r2, [r5, #0x20] adds r0, r0, r2 @@ -713945,13 +713945,13 @@ _0815B214: ldr r4, _0815B26C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x32] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x36] @@ -713962,7 +713962,7 @@ _0815B260: pop {r0} bx r0 .align 2, 0 -_0815B268: .4byte sub_080A34C4 +_0815B268: .4byte DestroyAnimSprite _0815B26C: .4byte gUnknown_20380D7 _0815B270: .4byte sub_080A67B4 thumb_func_end sub_0815B1B8 @@ -713988,7 +713988,7 @@ sub_0815B274: @ 0x0815B274 _0815B294: .4byte gUnknown_3005B60 _0815B298: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -714003,7 +714003,7 @@ _0815B298: _0815B2B4: .4byte gUnknown_85AD158 _0815B2B8: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _0815B2CA @@ -714020,7 +714020,7 @@ sub_0815B2D0: @ 0x0815B2D0 push {r4, r5, r6, lr} adds r5, r0, #0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r1, #0x2e @@ -714042,19 +714042,19 @@ _0815B2FA: ldr r4, _0815B32C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] adds r0, r6, #0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale movs r0, #0x80 lsls r0, r0, #1 strh r0, [r5, #0x30] @@ -714075,7 +714075,7 @@ _0815B330: ldrsh r2, [r5, r0] adds r0, r6, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r5, #0x34] adds r0, #1 strh r0, [r5, #0x34] @@ -714099,7 +714099,7 @@ _0815B360: ldrsh r2, [r5, r0] adds r0, r6, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r5, #0x34] adds r0, #1 strh r0, [r5, #0x34] @@ -714120,7 +714120,7 @@ _0815B360: orrs r1, r2 strb r1, [r0] adds r0, r6, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale _0815B3A8: ldrh r0, [r5, #0x2e] adds r0, #1 @@ -714142,7 +714142,7 @@ _0815B3B4: cmp r0, r1 bge _0815B3D2 adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815B3D2: pop {r4, r5, r6} pop {r0} @@ -714155,7 +714155,7 @@ sub_0815B3D8: @ 0x0815B3D8 adds r4, r0, #0 ldr r0, _0815B3F0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815B3F8 @@ -714189,7 +714189,7 @@ sub_0815B410: @ 0x0815B410 strh r0, [r4, #0x2e] ldr r0, _0815B430 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815B434 @@ -714240,7 +714240,7 @@ _0815B43C: adds r3, #1 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08006D6C + bl CreateSpriteAndAnimate _0815B488: movs r1, #0x20 ldrsh r0, [r4, r1] @@ -714253,7 +714253,7 @@ _0815B488: cmp r0, r1 bls _0815B4A2 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815B4A2: pop {r4, r5} pop {r0} @@ -714262,8 +714262,8 @@ _0815B4A2: _0815B4A8: .4byte gUnknown_85AD1A8 thumb_func_end sub_0815B410 - thumb_func_start sub_0815B4AC -sub_0815B4AC: @ 0x0815B4AC + thumb_func_start AnimMiniTwinklingStar +AnimMiniTwinklingStar: @ 0x0815B4AC push {r4, lr} adds r4, r0, #0 bl sub_0806F0A4 @@ -714311,7 +714311,7 @@ _0815B4F0: _0815B500: .4byte 0x000003FF _0815B504: .4byte 0xFFFFFC00 _0815B508: .4byte sub_0815B50C - thumb_func_end sub_0815B4AC + thumb_func_end AnimMiniTwinklingStar thumb_func_start sub_0815B50C sub_0815B50C: @ 0x0815B50C @@ -714408,7 +714408,7 @@ sub_0815B598: @ 0x0815B598 cmp r0, #0 bne _0815B5D8 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -714424,7 +714424,7 @@ _0815B5D0: .4byte gUnknown_3005B60 _0815B5D4: .4byte gUnknown_85AD1C0 _0815B5D8: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _0815B5EA @@ -714436,8 +714436,8 @@ _0815B5EA: bx r0 thumb_func_end sub_0815B598 - thumb_func_start sub_0815B5F0 -sub_0815B5F0: @ 0x0815B5F0 + thumb_func_start AnimTask_StrongFrustrationGrowAndShrink +AnimTask_StrongFrustrationGrowAndShrink: @ 0x0815B5F0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -714452,7 +714452,7 @@ sub_0815B5F0: @ 0x0815B5F0 cmp r0, #0 bne _0815B630 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -714468,7 +714468,7 @@ _0815B628: .4byte gUnknown_3005B60 _0815B62C: .4byte gUnknown_85AD1E8 _0815B630: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _0815B642 @@ -714478,7 +714478,7 @@ _0815B642: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815B5F0 + thumb_func_end AnimTask_StrongFrustrationGrowAndShrink thumb_func_start sub_0815B648 sub_0815B648: @ 0x0815B648 @@ -714494,14 +714494,14 @@ sub_0815B648: @ 0x0815B648 _0815B65A: adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker movs r0, #0x90 lsls r0, r0, #4 strh r0, [r4, #0x30] ldr r0, _0815B680 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x32] @@ -714530,7 +714530,7 @@ _0815B684: cmp r0, r1 ble _0815B6AC adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815B6AC: pop {r4} pop {r0} @@ -714554,7 +714554,7 @@ sub_0815B6B4: @ 0x0815B6B4 cmp r0, #0 bne _0815B6F4 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -714570,7 +714570,7 @@ _0815B6EC: .4byte gUnknown_3005B60 _0815B6F0: .4byte gUnknown_85AD238 _0815B6F4: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _0815B706 @@ -714632,7 +714632,7 @@ _0815B758: movs r0, #1 movs r1, #2 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute b _0815B78A .align 2, 0 _0815B77C: .4byte gUnknown_20380D6 @@ -714640,7 +714640,7 @@ _0815B780: movs r0, #2 movs r1, #2 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _0815B78A: ldr r0, _0815B7A0 mov r6, r8 @@ -714698,11 +714698,11 @@ _0815B7E4: lsls r2, r2, #3 adds r2, r2, r3 ldrb r2, [r2, #0x1c] - bl sub_0805E064 + bl HandleSpeciesGfxDataChange ldrb r1, [r5] mov r0, sp bl sub_080A64C4 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 mov sb, r4 cmp r0, #0 @@ -714741,7 +714741,7 @@ _0815B826: ldrh r3, [r0, #0xa] movs r0, #1 bl LoadBgTiles - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815B958 @@ -714926,7 +714926,7 @@ _0815B9BE: movs r0, #1 movs r1, #2 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute b _0815B9F2 .align 2, 0 _0815B9E4: .4byte gUnknown_20380D6 @@ -714934,15 +714934,15 @@ _0815B9E8: movs r0, #2 movs r1, #2 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _0815B9F2: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815BA32 ldr r4, _0815BA48 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -714964,7 +714964,7 @@ _0815B9F2: lsls r1, r0, #2 adds r1, r1, r2 ldrh r1, [r1, #2] - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback _0815BA32: mov r0, r8 bl DestroyAnimVisualTask @@ -715025,7 +715025,7 @@ sub_0815BA94: @ 0x0815BA94 ldr r1, _0815BABC ldrb r1, [r1] movs r2, #1 - bl sub_0805E064 + bl HandleSpeciesGfxDataChange adds r0, r4, #0 bl DestroyAnimVisualTask pop {r4} @@ -715079,19 +715079,19 @@ _0815BB04: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815BB3E movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _0815BB3E: mov r0, sp bl sub_080A63F8 @@ -715099,7 +715099,7 @@ _0815BB3E: mov r0, sp movs r2, #0 bl sub_080A6628 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815BB70 @@ -715114,7 +715114,7 @@ _0815BB6C: .4byte 0x0000FFC8 _0815BB70: ldr r0, _0815BB88 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815BB94 @@ -715141,13 +715141,13 @@ _0815BB9A: ldr r1, _0815BBE8 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _0815BBEC mov r1, sp ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _0815BBF0 lsls r1, r4, #2 adds r1, r1, r4 @@ -715284,12 +715284,12 @@ _0815BCCA: strh r0, [r1, #8] movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xe4 - bl sub_080A307C + bl PlaySE12WithPanning b _0815BD2E _0815BCE2: mov r0, sp @@ -715297,19 +715297,19 @@ _0815BCE2: mov r0, sp ldrb r0, [r0, #9] bl sub_080A6530 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815BD04 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _0815BD04: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _0815BD38 movs r1, #0 strh r1, [r0] @@ -715359,14 +715359,14 @@ _0815BD6A: ldr r4, _0815BE64 ldrb r0, [r4] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, r0, r5 strh r0, [r7, #0x20] ldrb r0, [r4] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x20 @@ -715388,7 +715388,7 @@ _0815BD6A: lsls r3, r3, #0x18 lsrs r3, r3, #0x18 adds r0, r4, #0 - bl sub_08006B0C + bl CreateSprite mov sb, r0 mov r1, sb lsls r1, r1, #0x18 @@ -715403,7 +715403,7 @@ _0815BD6A: lsls r3, r3, #0x18 lsrs r3, r3, #0x18 adds r0, r4, #0 - bl sub_08006B0C + bl CreateSprite mov r8, r0 mov r1, r8 lsls r1, r1, #0x18 @@ -715614,7 +715614,7 @@ sub_0815BF30: @ 0x0815BF30 adds r0, r0, r5 bl DestroySprite adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815BF7C: pop {r4, r5, r6} pop {r0} @@ -715714,19 +715714,19 @@ _0815C028: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C - bl sub_080A46B8 + bl SetAnimBgAttribute + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815C060 movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute _0815C060: mov r0, sp bl sub_080A63F8 @@ -715734,7 +715734,7 @@ _0815C060: mov r0, sp movs r2, #0 bl sub_080A6628 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815C098 @@ -715754,7 +715754,7 @@ _0815C098: bl sub_080A630C lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -715815,13 +715815,13 @@ _0815C108: ldr r1, _0815C154 mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _0815C158 mov r1, sp ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _0815C15C lsls r1, r6, #2 adds r1, r1, r6 @@ -715852,7 +715852,7 @@ _0815C160: strh r0, [r5, #0xe] ldr r0, _0815C198 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -715995,19 +715995,19 @@ _0815C286: mov r0, sp ldrb r0, [r0, #9] bl sub_080A6530 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815C2A8 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _0815C2A8: movs r0, #1 movs r1, #4 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _0815C2DC movs r1, #0 strh r1, [r0] @@ -716047,7 +716047,7 @@ sub_0815C2E4: @ 0x0815C2E4 cmp r0, #0 bne _0815C324 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -716063,7 +716063,7 @@ _0815C31C: .4byte gUnknown_3005B60 _0815C320: .4byte gUnknown_85AD2B8 _0815C324: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _0815C336 @@ -716075,8 +716075,8 @@ _0815C336: bx r0 thumb_func_end sub_0815C2E4 - thumb_func_start sub_0815C33C -sub_0815C33C: @ 0x0815C33C + thumb_func_start AnimWeakFrustrationAngerMark +AnimWeakFrustrationAngerMark: @ 0x0815C33C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -716086,7 +716086,7 @@ sub_0815C33C: @ 0x0815C33C bne _0815C35A adds r0, r4, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldrh r0, [r4, #0x2e] adds r0, #1 strh r0, [r4, #0x2e] @@ -716104,7 +716104,7 @@ _0815C35A: strh r0, [r4, #0x32] ldr r0, _0815C388 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815C38C @@ -716132,15 +716132,15 @@ _0815C392: cmp r0, #0x40 ble _0815C3AE adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815C3AE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0815C33C + thumb_func_end AnimWeakFrustrationAngerMark - thumb_func_start sub_0815C3B4 -sub_0815C3B4: @ 0x0815C3B4 + thumb_func_start AnimTask_RockMonBackAndForth +AnimTask_RockMonBackAndForth: @ 0x0815C3B4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -716199,7 +716199,7 @@ _0815C3F8: subs r0, #1 strh r0, [r4, #0x14] ldrb r0, [r5] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -716215,7 +716215,7 @@ _0815C444: ldr r0, _0815C47C _0815C446: ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -716233,7 +716233,7 @@ _0815C464: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r0, _0815C480 str r0, [r4] _0815C474: @@ -716242,11 +716242,11 @@ _0815C474: bx r0 .align 2, 0 _0815C47C: .4byte gUnknown_20380D7 -_0815C480: .4byte sub_0815C484 - thumb_func_end sub_0815C3B4 +_0815C480: .4byte AnimTask_RockMonBackAndForthStep + thumb_func_end AnimTask_RockMonBackAndForth - thumb_func_start sub_0815C484 -sub_0815C484: @ 0x0815C484 + thumb_func_start AnimTask_RockMonBackAndForthStep +AnimTask_RockMonBackAndForthStep: @ 0x0815C484 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -716297,7 +716297,7 @@ _0815C4B8: lsls r2, r2, #1 ldrh r3, [r4, #0xc] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -716338,7 +716338,7 @@ _0815C50C: lsls r2, r2, #1 ldrh r3, [r4, #0xc] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -716382,7 +716382,7 @@ _0815C564: lsls r2, r2, #1 ldrh r3, [r4, #0xc] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -716417,7 +716417,7 @@ _0815C5D4: ldrh r0, [r4, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r5, #0 bl DestroyAnimVisualTask _0815C5E4: @@ -716425,15 +716425,15 @@ _0815C5E4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815C484 + thumb_func_end AnimTask_RockMonBackAndForthStep - thumb_func_start sub_0815C5EC -sub_0815C5EC: @ 0x0815C5EC + thumb_func_start AnimSweetScentPetal +AnimSweetScentPetal: @ 0x0815C5EC push {r4, lr} adds r4, r0, #0 ldr r0, _0815C608 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -716465,11 +716465,11 @@ _0815C61A: bx r0 .align 2, 0 _0815C634: .4byte gUnknown_20380BE -_0815C638: .4byte sub_0815C63C - thumb_func_end sub_0815C5EC +_0815C638: .4byte AnimSweetScentPetalStep + thumb_func_end AnimSweetScentPetal - thumb_func_start sub_0815C63C -sub_0815C63C: @ 0x0815C63C + thumb_func_start AnimSweetScentPetalStep +AnimSweetScentPetalStep: @ 0x0815C63C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -716477,7 +716477,7 @@ sub_0815C63C: @ 0x0815C63C strh r0, [r4, #0x2e] ldr r0, _0815C67C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815C680 @@ -716492,7 +716492,7 @@ sub_0815C63C: @ 0x0815C63C cmp r1, #0xf0 ble _0815C66E adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815C66E: ldrh r1, [r4, #0x2e] movs r0, #0xff @@ -716513,7 +716513,7 @@ _0815C680: cmp r1, #0 bge _0815C698 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815C698: ldrh r1, [r4, #0x2e] movs r0, #0xff @@ -716525,10 +716525,10 @@ _0815C6A4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0815C63C + thumb_func_end AnimSweetScentPetalStep - thumb_func_start sub_0815C6AC -sub_0815C6AC: @ 0x0815C6AC + thumb_func_start AnimTask_FlailMovement +AnimTask_FlailMovement: @ 0x0815C6AC push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -716551,12 +716551,12 @@ sub_0815C6AC: @ 0x0815C6AC strh r0, [r4, #0x24] ldr r0, _0815C6F8 ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale ldr r0, _0815C6FC str r0, [r4] pop {r4} @@ -716565,11 +716565,11 @@ sub_0815C6AC: @ 0x0815C6AC .align 2, 0 _0815C6F4: .4byte gUnknown_3005B60 _0815C6F8: .4byte gUnknown_20380BE -_0815C6FC: .4byte sub_0815C700 - thumb_func_end sub_0815C6AC +_0815C6FC: .4byte AnimTask_FlailMovementStep + thumb_func_end AnimTask_FlailMovement - thumb_func_start sub_0815C700 -sub_0815C700: @ 0x0815C700 + thumb_func_start AnimTask_FlailMovementStep +AnimTask_FlailMovementStep: @ 0x0815C700 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -716705,7 +716705,7 @@ _0815C804: ldrh r0, [r7, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A6C0C + bl ResetSpriteRotScale adds r0, r4, #0 bl DestroyAnimVisualTask b _0815C88C @@ -716717,7 +716717,7 @@ _0815C816: lsls r2, r2, #1 ldrh r3, [r7, #0xc] adds r1, r2, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r7, #0x26] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -716775,10 +716775,10 @@ _0815C88C: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0815C700 + thumb_func_end AnimTask_FlailMovementStep - thumb_func_start sub_0815C898 -sub_0815C898: @ 0x0815C898 + thumb_func_start AnimPainSplitProjectile +AnimPainSplitProjectile: @ 0x0815C898 push {r4, r5, r6, lr} adds r5, r0, #0 movs r1, #0x2e @@ -716793,13 +716793,13 @@ sub_0815C898: @ 0x0815C898 ldr r4, _0815C8F4 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -716871,15 +716871,15 @@ _0815C936: cmp r0, #0 beq _0815C956 adds r0, r5, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815C956: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0815C898 + thumb_func_end AnimPainSplitProjectile - thumb_func_start sub_0815C95C -sub_0815C95C: @ 0x0815C95C + thumb_func_start AnimTask_PainSplitMovement +AnimTask_PainSplitMovement: @ 0x0815C95C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -716914,7 +716914,7 @@ _0815C99A: strh r0, [r2, #0x1e] mov r1, r8 ldrb r0, [r1] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r1, _0815C9D8 @@ -716925,7 +716925,7 @@ _0815C99A: strh r5, [r6, #0x1c] adds r0, r5, #0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale mov r2, r8 movs r3, #2 ldrsh r0, [r2, r3] @@ -716951,9 +716951,9 @@ _0815C9E4: adds r0, r5, #0 movs r1, #0xe0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale adds r0, r5, #0 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale lsls r2, r5, #4 b _0815CA44 _0815C9FC: @@ -716970,15 +716970,15 @@ _0815CA06: _0815CA0E: adds r0, r5, #0 movs r1, #0xd0 - bl sub_080A6A7C + bl SetSpriteRotScale adds r0, r5, #0 - bl sub_080A7734 - bl sub_080A46B8 + bl SetBattlerSpriteYOffsetFromYScale + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815CA34 ldrb r0, [r6, #0x1e] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsls r2, r5, #4 cmp r0, #0 @@ -717038,7 +717038,7 @@ _0815CA8C: cmp r0, #0xd bne _0815CAB4 adds r0, r5, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r1, _0815CAC0 lsls r0, r5, #4 adds r0, r0, r5 @@ -717056,10 +717056,10 @@ _0815CAB4: bx r0 .align 2, 0 _0815CAC0: .4byte gUnknown_20205AC - thumb_func_end sub_0815C95C + thumb_func_end AnimTask_PainSplitMovement - thumb_func_start sub_0815CAC4 -sub_0815CAC4: @ 0x0815CAC4 + thumb_func_start AnimFlatterConfetti +AnimFlatterConfetti: @ 0x0815CAC4 push {r4, r5, lr} adds r4, r0, #0 bl sub_0806F0A4 @@ -717143,11 +717143,11 @@ _0815CB5A: pop {r0} bx r0 .align 2, 0 -_0815CB6C: .4byte sub_0815CB70 - thumb_func_end sub_0815CAC4 +_0815CB6C: .4byte AnimFlatterConfettiStep + thumb_func_end AnimFlatterConfetti - thumb_func_start sub_0815CB70 -sub_0815CB70: @ 0x0815CB70 + thumb_func_start AnimFlatterConfettiStep +AnimFlatterConfettiStep: @ 0x0815CB70 push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -717194,15 +717194,15 @@ _0815CBB6: cmp r0, #0x1f bne _0815CBCA adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815CBCA: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0815CB70 + thumb_func_end AnimFlatterConfettiStep - thumb_func_start sub_0815CBD0 -sub_0815CBD0: @ 0x0815CBD0 + thumb_func_start AnimFlatterSpotlight +AnimFlatterSpotlight: @ 0x0815CBD0 push {r4, r5, lr} adds r5, r0, #0 ldr r1, _0815CC34 @@ -717211,7 +717211,7 @@ sub_0815CBD0: @ 0x0815CBD0 movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r0, _0815CC38 movs r1, #0 strh r1, [r0] @@ -717252,11 +717252,11 @@ _0815CC34: .4byte 0x00001F3F _0815CC38: .4byte gUnknown_2022AD8 _0815CC3C: .4byte gUnknown_2022ADA _0815CC40: .4byte gUnknown_20380BE -_0815CC44: .4byte sub_0815CC48 - thumb_func_end sub_0815CBD0 +_0815CC44: .4byte AnimFlatterSpotlightStep + thumb_func_end AnimFlatterSpotlight - thumb_func_start sub_0815CC48 -sub_0815CC48: @ 0x0815CC48 + thumb_func_start AnimFlatterSpotlightStep +AnimFlatterSpotlightStep: @ 0x0815CC48 push {r4, lr} adds r4, r0, #0 movs r1, #0x30 @@ -717336,29 +717336,29 @@ _0815CCBE: movs r0, #0 bl SetGpuReg adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815CCE6: pop {r4} pop {r0} bx r0 .align 2, 0 _0815CCEC: .4byte 0x00003F3F - thumb_func_end sub_0815CC48 + thumb_func_end AnimFlatterSpotlightStep - thumb_func_start sub_0815CCF0 -sub_0815CCF0: @ 0x0815CCF0 + thumb_func_start AnimReversalOrb +AnimReversalOrb: @ 0x0815CCF0 push {r4, r5, lr} adds r4, r0, #0 ldr r5, _0815CD2C ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x20] ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -717377,11 +717377,11 @@ sub_0815CCF0: @ 0x0815CCF0 .align 2, 0 _0815CD2C: .4byte gUnknown_20380D6 _0815CD30: .4byte gUnknown_20380BE -_0815CD34: .4byte sub_0815CD38 - thumb_func_end sub_0815CCF0 +_0815CD34: .4byte AnimReversalOrbStep + thumb_func_end AnimReversalOrb - thumb_func_start sub_0815CD38 -sub_0815CD38: @ 0x0815CD38 + thumb_func_start AnimReversalOrbStep +AnimReversalOrbStep: @ 0x0815CD38 push {r4, lr} adds r4, r0, #0 movs r1, #0x30 @@ -717480,7 +717480,7 @@ _0815CDD4: cmp r0, r1 bne _0815CE04 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815CE04: pop {r4} pop {r0} @@ -717488,10 +717488,10 @@ _0815CE04: .align 2, 0 _0815CE0C: .4byte 0xFFFFFC00 _0815CE10: .4byte 0xFFFFFF00 - thumb_func_end sub_0815CD38 + thumb_func_end AnimReversalOrbStep - thumb_func_start sub_0815CE14 -sub_0815CE14: @ 0x0815CE14 + thumb_func_start AnimTask_RolePlaySilhouette +AnimTask_RolePlaySilhouette: @ 0x0815CE14 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -717502,8 +717502,8 @@ sub_0815CE14: @ 0x0815CE14 lsrs r0, r0, #0x18 str r0, [sp, #0x18] movs r0, #0 - bl sub_080A5B08 - bl sub_080A46B8 + bl GetAnimBattlerSpriteId + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815CE54 @@ -717524,7 +717524,7 @@ _0815CE50: .4byte gUnknown_2039BD4 _0815CE54: ldr r0, _0815CEC4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815CF00 @@ -717541,7 +717541,7 @@ _0815CE54: ldr r7, _0815CED0 adds r0, r0, r7 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 ldrb r0, [r4] lsls r0, r0, #1 @@ -717550,7 +717550,7 @@ _0815CE54: muls r0, r5, r0 adds r0, r0, r7 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov r8, r0 ldr r0, _0815CED4 ldr r0, [r0] @@ -717562,7 +717562,7 @@ _0815CE54: cmp r0, #0 bne _0815CEF8 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815CED8 @@ -717589,7 +717589,7 @@ _0815CED8: adds r0, r0, r1 _0815CEE6: movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 b _0815CEFA @@ -717615,7 +717615,7 @@ _0815CF00: ldr r7, _0815CF6C adds r0, r0, r7 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 ldrb r0, [r4] lsls r0, r0, #1 @@ -717624,7 +717624,7 @@ _0815CF00: muls r0, r5, r0 adds r0, r0, r7 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov r8, r0 ldr r0, _0815CF70 ldr r0, [r0] @@ -717636,7 +717636,7 @@ _0815CF00: cmp r0, #0 bne _0815CF90 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815CF78 @@ -717663,7 +717663,7 @@ _0815CF78: adds r0, r0, r7 _0815CF84: movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 b _0815CF92 @@ -717676,19 +717676,19 @@ _0815CF94: _0815CF96: ldr r0, _0815D084 ldrb r0, [r0] - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r5, _0815D084 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 mov r2, sl lsls r1, r2, #0x10 @@ -717748,7 +717748,7 @@ _0815CF96: adds r2, r3, #0 orrs r1, r2 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette ldrb r0, [r5, #5] ands r4, r0 mov r0, r8 @@ -717791,11 +717791,11 @@ _0815D088: .4byte gUnknown_20380D7 _0815D08C: .4byte gUnknown_20205AC _0815D090: .4byte 0x00007FFF _0815D094: .4byte gUnknown_3005B60 -_0815D098: .4byte sub_0815D09C - thumb_func_end sub_0815CE14 +_0815D098: .4byte AnimTask_RolePlaySilhouetteStep1 + thumb_func_end AnimTask_RolePlaySilhouette - thumb_func_start sub_0815D09C -sub_0815D09C: @ 0x0815D09C + thumb_func_start AnimTask_RolePlaySilhouetteStep1 +AnimTask_RolePlaySilhouetteStep1: @ 0x0815D09C push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -717840,11 +717840,11 @@ _0815D0EA: bx r0 .align 2, 0 _0815D0F0: .4byte gUnknown_3005B60 -_0815D0F4: .4byte sub_0815D0F8 - thumb_func_end sub_0815D09C +_0815D0F4: .4byte AnimTask_RolePlaySilhouetteStep2 + thumb_func_end AnimTask_RolePlaySilhouetteStep1 - thumb_func_start sub_0815D0F8 -sub_0815D0F8: @ 0x0815D0F8 + thumb_func_start AnimTask_RolePlaySilhouetteStep2 +AnimTask_RolePlaySilhouetteStep2: @ 0x0815D0F8 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -717883,7 +717883,7 @@ sub_0815D0F8: @ 0x0815D0F8 str r4, [sp] adds r0, r6, #0 movs r1, #1 - bl sub_080A6CA8 + bl TrySetSpriteRotScale ldrh r0, [r5, #0x20] adds r0, #1 strh r0, [r5, #0x20] @@ -717894,7 +717894,7 @@ sub_0815D0F8: @ 0x0815D0F8 adds r0, r6, #0 bl sub_080A6D64 adds r0, r6, #0 - bl sub_080A7ED8 + bl DestroySpriteAndFreeResources_ ldr r0, _0815D178 str r0, [r5] _0815D166: @@ -717905,11 +717905,11 @@ _0815D166: .align 2, 0 _0815D170: .4byte gUnknown_3005B60 _0815D174: .4byte gUnknown_20205AC -_0815D178: .4byte sub_080A60DC - thumb_func_end sub_0815D0F8 +_0815D178: .4byte DestroyAnimVisualTaskAndDisableBlend + thumb_func_end AnimTask_RolePlaySilhouetteStep2 - thumb_func_start sub_0815D17C -sub_0815D17C: @ 0x0815D17C + thumb_func_start AnimTask_AcidArmor +AnimTask_AcidArmor: @ 0x0815D17C push {r4, r5, r6, r7, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -717948,7 +717948,7 @@ _0815D1AA: movs r0, #0x18 strh r0, [r4, #0x18] adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -717959,7 +717959,7 @@ _0815D1AA: strh r0, [r4, #0x18] _0815D1DC: adds r0, r5, #0 - bl sub_080A5A58 + bl GetBattlerYCoordWithElevation lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0x22 @@ -717973,7 +717973,7 @@ _0815D1F0: strh r0, [r4, #0x24] ldr r0, _0815D22C ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x26] @@ -718053,7 +718053,7 @@ _0815D262: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _0815D2D0 str r0, [r4] add sp, #0xc @@ -718067,11 +718067,11 @@ _0815D2C0: .4byte gUnknown_2022AD0 _0815D2C4: .4byte gUnknown_2022AD2 _0815D2C8: .4byte gUnknown_20388C8 _0815D2CC: .4byte 0xA6600001 -_0815D2D0: .4byte sub_0815D2D4 - thumb_func_end sub_0815D17C +_0815D2D0: .4byte AnimTask_AcidArmorStep + thumb_func_end AnimTask_AcidArmor - thumb_func_start sub_0815D2D4 -sub_0815D2D4: @ 0x0815D2D4 + thumb_func_start AnimTask_AcidArmorStep +AnimTask_AcidArmorStep: @ 0x0815D2D4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -718424,10 +718424,10 @@ _0815D578: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0815D2D4 + thumb_func_end AnimTask_AcidArmorStep - thumb_func_start sub_0815D588 -sub_0815D588: @ 0x0815D588 + thumb_func_start AnimTask_DeepInhale +AnimTask_DeepInhale: @ 0x0815D588 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -718440,7 +718440,7 @@ sub_0815D588: @ 0x0815D588 strh r0, [r4, #8] ldr r0, _0815D5C4 ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -718457,11 +718457,11 @@ sub_0815D588: @ 0x0815D588 _0815D5C0: .4byte gUnknown_3005B60 _0815D5C4: .4byte gUnknown_20380BE _0815D5C8: .4byte gUnknown_85AD3F8 -_0815D5CC: .4byte sub_0815D5D0 - thumb_func_end sub_0815D588 +_0815D5CC: .4byte AnimTask_DeepInhaleStep + thumb_func_end AnimTask_DeepInhale - thumb_func_start sub_0815D5D0 -sub_0815D5D0: @ 0x0815D5D0 + thumb_func_start AnimTask_DeepInhaleStep +AnimTask_DeepInhaleStep: @ 0x0815D5D0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -718523,7 +718523,7 @@ _0815D644: adds r0, r0, r4 lsls r0, r0, #3 adds r0, r0, r6 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _0815D65C @@ -718535,10 +718535,10 @@ _0815D65C: bx r0 .align 2, 0 _0815D664: .4byte gUnknown_20205AC - thumb_func_end sub_0815D5D0 + thumb_func_end AnimTask_DeepInhaleStep - thumb_func_start sub_0815D668 -sub_0815D668: @ 0x0815D668 + thumb_func_start InitYawnCloudPosition +InitYawnCloudPosition: @ 0x0815D668 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -718589,7 +718589,7 @@ sub_0815D668: @ 0x0815D668 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0815D668 + thumb_func_end InitYawnCloudPosition thumb_func_start UpdateYawnCloudPosition UpdateYawnCloudPosition: @ 0x0815D6D0 @@ -718611,8 +718611,8 @@ UpdateYawnCloudPosition: @ 0x0815D6D0 .align 2, 0 thumb_func_end UpdateYawnCloudPosition - thumb_func_start sub_0815D6F0 -sub_0815D6F0: @ 0x0815D6F0 + thumb_func_start AnimYawnCloud +AnimYawnCloud: @ 0x0815D6F0 push {r4, r5, r6, lr} sub sp, #8 adds r4, r0, #0 @@ -718636,7 +718636,7 @@ sub_0815D6F0: @ 0x0815D6F0 str r0, [sp, #4] adds r0, r4, #0 adds r3, r6, #0 - bl sub_0815D668 + bl InitYawnCloudPosition movs r0, #0 strh r0, [r4, #0x2e] ldr r0, _0815D73C @@ -718647,11 +718647,11 @@ sub_0815D6F0: @ 0x0815D6F0 bx r0 .align 2, 0 _0815D738: .4byte gUnknown_20380BE -_0815D73C: .4byte sub_0815D740 - thumb_func_end sub_0815D6F0 +_0815D73C: .4byte AnimYawnCloudStep + thumb_func_end AnimYawnCloud - thumb_func_start sub_0815D740 -sub_0815D740: @ 0x0815D740 + thumb_func_start AnimYawnCloudStep +AnimYawnCloudStep: @ 0x0815D740 push {r4, r5, lr} adds r5, r0, #0 ldrh r0, [r5, #0x2e] @@ -718699,15 +718699,15 @@ sub_0815D740: @ 0x0815D740 cmp r0, #3 ble _0815D7A6 adds r0, r5, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _0815D7A6: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815D740 + thumb_func_end AnimYawnCloudStep - thumb_func_start sub_0815D7AC -sub_0815D7AC: @ 0x0815D7AC + thumb_func_start AnimSmokeBallEscapeCloud +AnimSmokeBallEscapeCloud: @ 0x0815D7AC push {r4, r5, r6, lr} adds r5, r0, #0 ldr r6, _0815D804 @@ -718718,7 +718718,7 @@ sub_0815D7AC: @ 0x0815D7AC bl StartSpriteAffineAnim ldr r0, _0815D808 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815D7D2 @@ -718729,7 +718729,7 @@ _0815D7D2: ldr r4, _0815D80C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r6, #2] @@ -718737,7 +718737,7 @@ _0815D7D2: strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r6, [r6, #4] @@ -718753,7 +718753,7 @@ _0815D804: .4byte gUnknown_20380BE _0815D808: .4byte gUnknown_20380D7 _0815D80C: .4byte gUnknown_20380D6 _0815D810: .4byte sub_0810EB18 - thumb_func_end sub_0815D7AC + thumb_func_end AnimSmokeBallEscapeCloud thumb_func_start sub_0815D814 sub_0815D814: @ 0x0815D814 @@ -718915,7 +718915,7 @@ _0815D92E: cmp r0, #0 bgt _0815D94E adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, _0815D958 ldrb r0, [r1] subs r0, #1 @@ -719163,7 +719163,7 @@ sub_0815DACC: @ 0x0815DACC strh r0, [r4, #0x14] _0815DB10: ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815DB40 @@ -719260,8 +719260,8 @@ _0815DBD8: .4byte 0xFFFF8000 _0815DBDC: .4byte sub_0815D95C thumb_func_end sub_0815DACC - thumb_func_start sub_0815DBE0 -sub_0815DBE0: @ 0x0815DBE0 + thumb_func_start AnimTask_SquishAndSweatDroplets +AnimTask_SquishAndSweatDroplets: @ 0x0815DBE0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -719300,13 +719300,13 @@ _0815DC26: ldrb r4, [r0] adds r0, r4, #0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x10] adds r0, r4, #0 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x12] @@ -719317,7 +719317,7 @@ _0815DC26: strh r0, [r5, #0x14] ldr r0, _0815DC78 ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -719334,11 +719334,11 @@ _0815DC26: _0815DC74: .4byte gUnknown_20380D7 _0815DC78: .4byte gUnknown_20380BE _0815DC7C: .4byte gUnknown_85AD554 -_0815DC80: .4byte sub_0815DC84 - thumb_func_end sub_0815DBE0 +_0815DC80: .4byte AnimTask_SquishAndSweatDropletsStep + thumb_func_end AnimTask_SquishAndSweatDroplets - thumb_func_start sub_0815DC84 -sub_0815DC84: @ 0x0815DC84 + thumb_func_start AnimTask_SquishAndSweatDropletsStep +AnimTask_SquishAndSweatDropletsStep: @ 0x0815DC84 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -719366,7 +719366,7 @@ _0815DCA8: bne _0815DCBE adds r0, r5, #0 movs r1, #1 - bl sub_0815DD1C + bl CreateSweatDroplets _0815DCBE: movs r1, #0xa ldrsh r0, [r4, r1] @@ -719374,10 +719374,10 @@ _0815DCBE: bne _0815DCCE adds r0, r5, #0 movs r1, #0 - bl sub_0815DD1C + bl CreateSweatDroplets _0815DCCE: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -719414,10 +719414,10 @@ _0815DD16: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815DC84 + thumb_func_end AnimTask_SquishAndSweatDropletsStep - thumb_func_start sub_0815DD1C -sub_0815DD1C: @ 0x0815DD1C + thumb_func_start CreateSweatDroplets +CreateSweatDroplets: @ 0x0815DD1C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -719485,7 +719485,7 @@ _0815DD80: lsls r3, r3, #0x18 lsrs r3, r3, #0x18 ldr r0, _0815DDF0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -719528,7 +719528,7 @@ _0815DDD4: _0815DDEC: .4byte gUnknown_20205AC _0815DDF0: .4byte gUnknown_85AD574 _0815DDF4: .4byte 0x0000FFFF - thumb_func_end sub_0815DD1C + thumb_func_end CreateSweatDroplets thumb_func_start sub_0815DDF8 sub_0815DDF8: @ 0x0815DDF8 @@ -719574,8 +719574,8 @@ _0815DE3E: _0815DE44: .4byte gUnknown_3005B60 thumb_func_end sub_0815DDF8 - thumb_func_start sub_0815DE48 -sub_0815DE48: @ 0x0815DE48 + thumb_func_start AnimTask_FacadeColorBlend +AnimTask_FacadeColorBlend: @ 0x0815DE48 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -719590,7 +719590,7 @@ sub_0815DE48: @ 0x0815DE48 ldrh r0, [r1, #2] strh r0, [r4, #0xa] ldrb r0, [r1] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0815DE98 @@ -719615,11 +719615,11 @@ sub_0815DE48: @ 0x0815DE48 _0815DE90: .4byte gUnknown_3005B60 _0815DE94: .4byte gUnknown_20380BE _0815DE98: .4byte gUnknown_20205AC -_0815DE9C: .4byte sub_0815DEA0 - thumb_func_end sub_0815DE48 +_0815DE9C: .4byte AnimTask_FacadeColorBlendStep + thumb_func_end AnimTask_FacadeColorBlend - thumb_func_start sub_0815DEA0 -sub_0815DEA0: @ 0x0815DEA0 + thumb_func_start AnimTask_FacadeColorBlendStep +AnimTask_FacadeColorBlendStep: @ 0x0815DEA0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -719671,7 +719671,7 @@ _0815DF02: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815DEA0 + thumb_func_end AnimTask_FacadeColorBlendStep thumb_func_start sub_0815DF08 sub_0815DF08: @ 0x0815DF08 @@ -719710,13 +719710,13 @@ _0815DF4C: .4byte gUnknown_8C2DD0C _0815DF50: .4byte gUnknown_8C2DE68 thumb_func_end sub_0815DF08 - thumb_func_start sub_0815DF54 -sub_0815DF54: @ 0x0815DF54 + thumb_func_start AnimRoarNoiseLine +AnimRoarNoiseLine: @ 0x0815DF54 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r6, _0815DFAC ldrb r0, [r6] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -719728,7 +719728,7 @@ sub_0815DF54: @ 0x0815DF54 _0815DF70: ldrb r0, [r6] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r4, _0815DFB0 lsrs r0, r0, #0x18 @@ -719737,7 +719737,7 @@ _0815DF70: strh r0, [r5, #0x20] ldrb r0, [r6] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -719781,7 +719781,7 @@ _0815DFD2: _0815DFE0: ldr r0, _0815E00C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815E000 @@ -719802,11 +719802,11 @@ _0815E000: bx r0 .align 2, 0 _0815E00C: .4byte gUnknown_20380D6 -_0815E010: .4byte sub_0815E014 - thumb_func_end sub_0815DF54 +_0815E010: .4byte AnimRoarNoiseLineStep + thumb_func_end AnimRoarNoiseLine - thumb_func_start sub_0815E014 -sub_0815E014: @ 0x0815E014 + thumb_func_start AnimRoarNoiseLineStep +AnimRoarNoiseLineStep: @ 0x0815E014 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x2e] @@ -719831,14 +719831,14 @@ sub_0815E014: @ 0x0815E014 cmp r0, #0xe bne _0815E048 adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815E048: pop {r0} bx r0 - thumb_func_end sub_0815E014 + thumb_func_end AnimRoarNoiseLineStep - thumb_func_start sub_0815E04C -sub_0815E04C: @ 0x0815E04C + thumb_func_start AnimTask_GlareEyeDots +AnimTask_GlareEyeDots: @ 0x0815E04C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -719847,7 +719847,7 @@ sub_0815E04C: @ 0x0815E04C lsls r1, r1, #3 ldr r0, _0815E078 adds r6, r1, r0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -719870,17 +719870,17 @@ _0815E07C: _0815E086: ldr r5, _0815E0BC ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815E0C0 ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 ldrb r0, [r5] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x10 @@ -719897,11 +719897,11 @@ _0815E0BC: .4byte gUnknown_20380D6 _0815E0C0: ldrb r0, [r5] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 ldrb r0, [r5] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x10 @@ -719917,11 +719917,11 @@ _0815E0E4: ldr r5, _0815E138 ldrb r0, [r5] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 ldrb r0, [r5] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x10 @@ -719936,13 +719936,13 @@ _0815E108: ldr r4, _0815E13C ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x22] ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x24] @@ -719954,11 +719954,11 @@ _0815E108: .align 2, 0 _0815E138: .4byte gUnknown_20380D6 _0815E13C: .4byte gUnknown_20380D7 -_0815E140: .4byte sub_0815E144 - thumb_func_end sub_0815E04C +_0815E140: .4byte AnimTask_GlareEyeDotsStep + thumb_func_end AnimTask_GlareEyeDots - thumb_func_start sub_0815E144 -sub_0815E144: @ 0x0815E144 + thumb_func_start AnimTask_GlareEyeDotsStep +AnimTask_GlareEyeDotsStep: @ 0x0815E144 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -720006,7 +720006,7 @@ _0815E170: str r4, [sp, #8] adds r4, #2 str r4, [sp, #0xc] - bl sub_0815E284 + bl GetGlareEyeDotCoords movs r6, #0 mov r8, r4 ldr r4, _0815E1E4 @@ -720019,7 +720019,7 @@ _0815E1AA: ldrsh r2, [r3, r0] ldr r0, _0815E1E8 movs r3, #0x23 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -720125,10 +720125,10 @@ _0815E276: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815E144 + thumb_func_end AnimTask_GlareEyeDotsStep - thumb_func_start sub_0815E284 -sub_0815E284: @ 0x0815E284 + thumb_func_start GetGlareEyeDotCoords +GetGlareEyeDotCoords: @ 0x0815E284 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -720222,10 +720222,10 @@ _0815E32A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815E284 + thumb_func_end GetGlareEyeDotCoords - thumb_func_start sub_0815E33C -sub_0815E33C: @ 0x0815E33C + thumb_func_start AnimGlareEyeDot +AnimGlareEyeDot: @ 0x0815E33C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x2e] @@ -720258,10 +720258,10 @@ _0815E372: bx r0 .align 2, 0 _0815E378: .4byte gUnknown_3005B60 - thumb_func_end sub_0815E33C + thumb_func_end AnimGlareEyeDot - thumb_func_start sub_0815E37C -sub_0815E37C: @ 0x0815E37C + thumb_func_start AnimAssistPawprint +AnimAssistPawprint: @ 0x0815E37C push {r4, lr} adds r4, r0, #0 ldr r1, _0815E3A8 @@ -720277,7 +720277,7 @@ sub_0815E37C: @ 0x0815E37C strh r0, [r4, #0x2e] ldr r1, _0815E3AC adds r0, r4, #0 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _0815E3B0 str r0, [r4, #0x1c] pop {r4} @@ -720285,12 +720285,12 @@ sub_0815E37C: @ 0x0815E37C bx r0 .align 2, 0 _0815E3A8: .4byte gUnknown_20380BE -_0815E3AC: .4byte sub_080A34C4 +_0815E3AC: .4byte DestroyAnimSprite _0815E3B0: .4byte sub_080A6988 - thumb_func_end sub_0815E37C + thumb_func_end AnimAssistPawprint - thumb_func_start sub_0815E3B4 -sub_0815E3B4: @ 0x0815E3B4 + thumb_func_start AnimTask_BarrageBall +AnimTask_BarrageBall: @ 0x0815E3B4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -720308,14 +720308,14 @@ sub_0815E3B4: @ 0x0815E3B4 mov sl, r0 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x1e] mov r1, sl ldrb r0, [r1] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x20] @@ -720323,19 +720323,19 @@ sub_0815E3B4: @ 0x0815E3B4 mov r8, r0 ldrb r0, [r0] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x22] mov r1, r8 ldrb r0, [r1] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 mov r1, r8 ldrb r0, [r1] movs r1, #0 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr lsls r4, r4, #0x18 lsrs r4, r4, #0x18 lsls r0, r0, #0x10 @@ -720362,7 +720362,7 @@ _0815E426: adds r0, r4, #0 adds r1, r5, #0 adds r2, r6, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x26] @@ -720407,10 +720407,10 @@ _0815E426: adds r0, r0, r1 lsls r0, r0, #2 adds r0, r0, r4 - bl sub_080A619C + bl InitAnimArcTranslation mov r1, sl ldrb r0, [r1] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -720434,7 +720434,7 @@ _0815E4DC: .4byte gUnknown_20380D7 _0815E4E0: .4byte gUnknown_85AD654 _0815E4E4: .4byte gUnknown_20205AC _0815E4E8: .4byte 0x0000FFE0 -_0815E4EC: .4byte sub_0815E504 +_0815E4EC: .4byte AnimTask_BarrageBallStep _0815E4F0: mov r0, sb bl DestroyAnimVisualTask @@ -720446,10 +720446,10 @@ _0815E4F6: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0815E3B4 + thumb_func_end AnimTask_BarrageBall - thumb_func_start sub_0815E504 -sub_0815E504: @ 0x0815E504 + thumb_func_start AnimTask_BarrageBallStep +AnimTask_BarrageBallStep: @ 0x0815E504 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -720491,7 +720491,7 @@ _0815E536: lsls r0, r0, #2 ldr r1, _0815E568 adds r0, r0, r1 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc ldrh r0, [r4, #0xc] adds r0, #1 strh r0, [r4, #0xc] @@ -720510,7 +720510,7 @@ _0815E56C: lsls r0, r0, #2 ldr r1, _0815E58C adds r0, r0, r1 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _0815E60A @@ -720584,10 +720584,10 @@ _0815E60A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815E504 + thumb_func_end AnimTask_BarrageBallStep - thumb_func_start sub_0815E610 -sub_0815E610: @ 0x0815E610 + thumb_func_start AnimSmellingSaltsHand +AnimSmellingSaltsHand: @ 0x0815E610 push {r4, r5, r6, lr} adds r4, r0, #0 ldr r0, _0815E624 @@ -720631,7 +720631,7 @@ _0815E65C: strh r1, [r4, #0x3c] adds r0, r5, #0 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x22] @@ -720651,7 +720651,7 @@ _0815E65C: strb r0, [r4, #3] adds r0, r5, #0 movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #8 b _0815E6AA .align 2, 0 @@ -720661,7 +720661,7 @@ _0815E69C: .4byte 0xFFFFFC00 _0815E6A0: adds r0, r5, #0 movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #8 _0815E6AA: strh r0, [r4, #0x20] @@ -720672,7 +720672,7 @@ _0815E6AA: bx r0 .align 2, 0 _0815E6B8: .4byte sub_0815E6BC - thumb_func_end sub_0815E610 + thumb_func_end AnimSmellingSaltsHand thumb_func_start sub_0815E6BC sub_0815E6BC: @ 0x0815E6BC @@ -720774,14 +720774,14 @@ _0815E73A: b _0815E774 _0815E76E: adds r0, r2, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815E774: pop {r0} bx r0 thumb_func_end sub_0815E6BC - thumb_func_start sub_0815E778 -sub_0815E778: @ 0x0815E778 + thumb_func_start AnimTask_SmellingSaltsSquish +AnimTask_SmellingSaltsSquish: @ 0x0815E778 push {r4, lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -720804,7 +720804,7 @@ _0815E794: ldrh r0, [r2, #2] strh r0, [r4, #8] ldrb r0, [r2] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -720821,11 +720821,11 @@ _0815E7BC: .align 2, 0 _0815E7C4: .4byte gUnknown_3005B60 _0815E7C8: .4byte gUnknown_85AD684 -_0815E7CC: .4byte sub_0815E7D0 - thumb_func_end sub_0815E778 +_0815E7CC: .4byte AnimTask_SmellingSaltsSquishStep + thumb_func_end AnimTask_SmellingSaltsSquish - thumb_func_start sub_0815E7D0 -sub_0815E7D0: @ 0x0815E7D0 + thumb_func_start AnimTask_SmellingSaltsSquishStep +AnimTask_SmellingSaltsSquishStep: @ 0x0815E7D0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -720873,7 +720873,7 @@ _0815E828: strh r1, [r0, #0x24] _0815E82A: adds r0, r4, #0 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -720917,10 +720917,10 @@ _0815E886: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0815E7D0 + thumb_func_end AnimTask_SmellingSaltsSquishStep - thumb_func_start sub_0815E88C -sub_0815E88C: @ 0x0815E88C + thumb_func_start AnimSmellingSaltExclamation +AnimSmellingSaltExclamation: @ 0x0815E88C push {r4, r5, lr} adds r5, r0, #0 ldr r0, _0815E8A0 @@ -720938,13 +720938,13 @@ _0815E8A8: _0815E8AA: ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr strh r0, [r5, #0x22] movs r1, #0x22 ldrsh r0, [r5, r1] @@ -720969,11 +720969,11 @@ _0815E8CE: .align 2, 0 _0815E8E8: .4byte gUnknown_20380D7 _0815E8EC: .4byte gUnknown_20380BE -_0815E8F0: .4byte sub_0815E8F4 - thumb_func_end sub_0815E88C +_0815E8F0: .4byte AnimSmellingSaltExclamationStep + thumb_func_end AnimSmellingSaltExclamation - thumb_func_start sub_0815E8F4 -sub_0815E8F4: @ 0x0815E8F4 + thumb_func_start AnimSmellingSaltExclamationStep +AnimSmellingSaltExclamationStep: @ 0x0815E8F4 push {lr} adds r3, r0, #0 ldrh r0, [r3, #0x2e] @@ -721014,14 +721014,14 @@ sub_0815E8F4: @ 0x0815E8F4 cmp r0, #0 bne _0815E948 adds r0, r3, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815E948: pop {r0} bx r0 - thumb_func_end sub_0815E8F4 + thumb_func_end AnimSmellingSaltExclamationStep - thumb_func_start sub_0815E94C -sub_0815E94C: @ 0x0815E94C + thumb_func_start AnimHelpingHandClap +AnimHelpingHandClap: @ 0x0815E94C push {lr} adds r3, r0, #0 ldr r0, _0815E978 @@ -721059,11 +721059,11 @@ _0815E982: bx r0 .align 2, 0 _0815E990: .4byte 0x0000FFFF -_0815E994: .4byte sub_0815E998 - thumb_func_end sub_0815E94C +_0815E994: .4byte AnimHelpingHandClapStep + thumb_func_end AnimHelpingHandClap - thumb_func_start sub_0815E998 -sub_0815E998: @ 0x0815E998 + thumb_func_start AnimHelpingHandClapStep +AnimHelpingHandClapStep: @ 0x0815E998 push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -721307,16 +721307,16 @@ _0815EB56: cmp r0, #5 bne _0815EB78 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815EB78: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0815E998 + thumb_func_end AnimHelpingHandClapStep - thumb_func_start sub_0815EB80 -sub_0815EB80: @ 0x0815EB80 + thumb_func_start AnimTask_HelpingHandAttackerMovement +AnimTask_HelpingHandAttackerMovement: @ 0x0815EB80 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -721326,15 +721326,15 @@ sub_0815EB80: @ 0x0815EB80 ldr r0, _0815EBDC adds r6, r1, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x26] - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815EC08 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r7, r0, #0x18 cmp r7, #1 @@ -721342,7 +721342,7 @@ sub_0815EB80: @ 0x0815EB80 ldr r5, _0815EBE0 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -721350,7 +721350,7 @@ sub_0815EB80: @ 0x0815EB80 movs r0, #2 eors r0, r1 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -721368,7 +721368,7 @@ _0815EBE8: .4byte 0x0000FFFF _0815EBEC: ldr r0, _0815EC00 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815EC08 @@ -721388,11 +721388,11 @@ _0815EC0C: pop {r0} bx r0 .align 2, 0 -_0815EC18: .4byte sub_0815EC1C - thumb_func_end sub_0815EB80 +_0815EC18: .4byte AnimTask_HelpingHandAttackerMovementStep + thumb_func_end AnimTask_HelpingHandAttackerMovement - thumb_func_start sub_0815EC1C -sub_0815EC1C: @ 0x0815EC1C + thumb_func_start AnimTask_HelpingHandAttackerMovementStep +AnimTask_HelpingHandAttackerMovementStep: @ 0x0815EC1C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -721605,10 +721605,10 @@ _0815EDB0: bx r0 .align 2, 0 _0815EDB8: .4byte gUnknown_20205AC - thumb_func_end sub_0815EC1C + thumb_func_end AnimTask_HelpingHandAttackerMovementStep - thumb_func_start sub_0815EDBC -sub_0815EDBC: @ 0x0815EDBC + thumb_func_start AnimForesightMagnifyingGlass +AnimForesightMagnifyingGlass: @ 0x0815EDBC push {r4, lr} adds r4, r0, #0 ldr r0, _0815EDD8 @@ -721618,7 +721618,7 @@ sub_0815EDBC: @ 0x0815EDBC bne _0815EDE0 adds r0, r4, #0 movs r1, #1 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker ldr r0, _0815EDDC b _0815EDE2 .align 2, 0 @@ -721632,7 +721632,7 @@ _0815EDE2: ldrh r0, [r4, #0x3c] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -721648,7 +721648,7 @@ _0815EE06: ldrh r0, [r4, #0x3c] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A7BF0 + bl GetBattlerSpriteBGPriority movs r2, #3 ands r2, r0 lsls r2, r2, #2 @@ -721671,11 +721671,11 @@ _0815EE06: bx r0 .align 2, 0 _0815EE38: .4byte gUnknown_20380D7 -_0815EE3C: .4byte sub_0815EE40 - thumb_func_end sub_0815EDBC +_0815EE3C: .4byte AnimForesightMagnifyingGlassStep + thumb_func_end AnimForesightMagnifyingGlass - thumb_func_start sub_0815EE40 -sub_0815EE40: @ 0x0815EE40 + thumb_func_start AnimForesightMagnifyingGlassStep +AnimForesightMagnifyingGlassStep: @ 0x0815EE40 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x38 @@ -721724,7 +721724,7 @@ _0815EEA4: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #4 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -721738,7 +721738,7 @@ _0815EEC0: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #5 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #4 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -721746,7 +721746,7 @@ _0815EEC0: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #4 b _0815EF1E _0815EEE2: @@ -721754,7 +721754,7 @@ _0815EEE2: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #4 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -721768,7 +721768,7 @@ _0815EEFE: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #4 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr adds r0, #4 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -721777,7 +721777,7 @@ _0815EEFE: lsrs r0, r0, #0x18 movs r1, #2 _0815EF18: - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr subs r0, #4 _0815EF1E: lsls r0, r0, #0x10 @@ -721788,14 +721788,14 @@ _0815EF24: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldrh r0, [r4, #0x3c] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r1, r0, #0x18 _0815EF44: @@ -721821,7 +721821,7 @@ _0815EF5A: strh r0, [r4, #0x34] strh r1, [r4, #0x36] adds r0, r4, #0 - bl sub_080A671C + bl InitAnimLinearTranslation b _0815F030 _0815EF70: adds r0, r4, #0 @@ -721932,15 +721932,15 @@ _0815F030: b _0815F03E _0815F038: adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815F03E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815EE40 + thumb_func_end AnimForesightMagnifyingGlassStep - thumb_func_start sub_0815F044 -sub_0815F044: @ 0x0815F044 + thumb_func_start AnimMeteorMashStarStep +AnimMeteorMashStarStep: @ 0x0815F044 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x32 @@ -721984,7 +721984,7 @@ sub_0815F044: @ 0x0815F044 lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #5 - bl sub_08006B0C + bl CreateSprite _0815F0A2: movs r0, #0x38 ldrsh r1, [r4, r0] @@ -721993,7 +721993,7 @@ _0815F0A2: cmp r1, r0 bne _0815F0B4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815F0B4: ldrh r0, [r4, #0x38] adds r0, #1 @@ -722003,25 +722003,25 @@ _0815F0B4: bx r0 .align 2, 0 _0815F0C0: .4byte gUnknown_85AD1A8 - thumb_func_end sub_0815F044 + thumb_func_end AnimMeteorMashStarStep - thumb_func_start sub_0815F0C4 -sub_0815F0C4: @ 0x0815F0C4 + thumb_func_start AnimMeteorMashStar +AnimMeteorMashStar: @ 0x0815F0C4 push {r4, r5, lr} adds r5, r0, #0 ldr r4, _0815F100 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord ldrb r0, [r4] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _0815F0F0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815F108 @@ -722067,11 +722067,11 @@ _0815F116: bx r0 .align 2, 0 _0815F13C: .4byte gUnknown_20380BE -_0815F140: .4byte sub_0815F044 - thumb_func_end sub_0815F0C4 +_0815F140: .4byte AnimMeteorMashStarStep + thumb_func_end AnimMeteorMashStar - thumb_func_start sub_0815F144 -sub_0815F144: @ 0x0815F144 + thumb_func_start AnimTask_MonToSubstitute +AnimTask_MonToSubstitute: @ 0x0815F144 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -722079,7 +722079,7 @@ sub_0815F144: @ 0x0815F144 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r2, r5, #0 @@ -722097,7 +722097,7 @@ sub_0815F144: @ 0x0815F144 bne _0815F18C adds r0, r5, #0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale movs r0, #0x80 lsls r0, r0, #1 strh r0, [r4, #0xa] @@ -722120,7 +722120,7 @@ _0815F18C: ldrsh r2, [r4, r0] adds r0, r5, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r4, #0xe] adds r0, #1 strh r0, [r4, #0xe] @@ -722131,7 +722131,7 @@ _0815F18C: movs r0, #0 strh r0, [r4, #0xe] adds r0, r5, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r1, _0815F1E0 lsls r0, r5, #4 adds r0, r0, r5 @@ -722153,8 +722153,8 @@ _0815F1E4: ldr r4, _0815F254 ldrb r0, [r4] movs r1, #0 - bl sub_0805E510 - bl sub_080A46B8 + bl LoadBattleMonGfxAndAnimate + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815F226 @@ -722211,16 +722211,16 @@ _0815F254: .4byte gUnknown_20380D6 _0815F258: .4byte gUnknown_20205AC _0815F25C: .4byte gUnknown_2023E88 _0815F260: .4byte gUnknown_82D2F50 -_0815F264: .4byte sub_0815F268 - thumb_func_end sub_0815F144 +_0815F264: .4byte AnimTask_MonToSubstituteDoll + thumb_func_end AnimTask_MonToSubstitute - thumb_func_start sub_0815F268 -sub_0815F268: @ 0x0815F268 + thumb_func_start AnimTask_MonToSubstituteDoll +AnimTask_MonToSubstituteDoll: @ 0x0815F268 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r1, _0815F294 @@ -722303,12 +722303,12 @@ _0815F306: bne _0815F3BA movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x7d - bl sub_080A307C + bl PlaySE12WithPanning ldr r1, _0815F334 adds r0, r1, #0 ldrh r2, [r4, #0x1c] @@ -722376,12 +722376,12 @@ _0815F398: bne _0815F3BA movs r0, #0x40 rsbs r0, r0, #0 - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x7d - bl sub_080A307C + bl PlaySE12WithPanning adds r0, r6, #0 bl DestroyAnimVisualTask _0815F3BA: @@ -722390,15 +722390,15 @@ _0815F3BA: bx r0 .align 2, 0 _0815F3C0: .4byte gUnknown_20205AC - thumb_func_end sub_0815F268 + thumb_func_end AnimTask_MonToSubstituteDoll - thumb_func_start sub_0815F3C4 -sub_0815F3C4: @ 0x0815F3C4 + thumb_func_start AnimBlockX +AnimBlockX: @ 0x0815F3C4 push {r4, r5, lr} adds r5, r0, #0 ldr r4, _0815F3E8 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815F3F0 @@ -722425,7 +722425,7 @@ _0815F400: ldr r0, _0815F420 ldrb r0, [r0] movs r1, #3 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x22] @@ -722438,11 +722438,11 @@ _0815F400: .align 2, 0 _0815F41C: .4byte 0x0000FFA0 _0815F420: .4byte gUnknown_20380D7 -_0815F424: .4byte sub_0815F428 - thumb_func_end sub_0815F3C4 +_0815F424: .4byte AnimBlockXStep + thumb_func_end AnimBlockX - thumb_func_start sub_0815F428 -sub_0815F428: @ 0x0815F428 + thumb_func_start AnimBlockXStep +AnimBlockXStep: @ 0x0815F428 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x2e @@ -722472,12 +722472,12 @@ _0815F458: cmp r0, #0 blt _0815F552 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xcd - bl sub_080A307C + bl PlaySE12WithPanning movs r0, #0 strh r0, [r4, #0x26] b _0815F510 @@ -722501,12 +722501,12 @@ _0815F47C: cmp r1, #0x7f ble _0815F552 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xcd - bl sub_080A307C + bl PlaySE12WithPanning strh r5, [r4, #0x30] strh r5, [r4, #0x26] b _0815F510 @@ -722545,12 +722545,12 @@ _0815F4EC: cmp r0, #8 ble _0815F552 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0xc0 - bl sub_080A307C + bl PlaySE12WithPanning movs r0, #0 strh r0, [r4, #0x30] _0815F510: @@ -722586,15 +722586,15 @@ _0815F518: cmp r0, #7 bne _0815F552 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815F552: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0815F428 + thumb_func_end AnimBlockXStep - thumb_func_start sub_0815F558 -sub_0815F558: @ 0x0815F558 + thumb_func_start AnimTask_OdorSleuthMovement +AnimTask_OdorSleuthMovement: @ 0x0815F558 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -722603,13 +722603,13 @@ sub_0815F558: @ 0x0815F558 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 lsrs r7, r0, #0x18 cmp r7, #0 bne _0815F5A6 movs r0, #1 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend lsls r0, r0, #0x10 lsrs r1, r0, #0x10 mov sl, r1 @@ -722617,7 +722617,7 @@ sub_0815F558: @ 0x0815F558 cmp r6, #0 blt _0815F5A6 movs r0, #1 - bl sub_080A72B0 + bl CloneBattlerSpriteWithBlend lsls r0, r0, #0x10 lsrs r1, r0, #0x10 mov sb, r1 @@ -722629,7 +722629,7 @@ sub_0815F558: @ 0x0815F558 lsls r0, r0, #2 ldr r1, _0815F5B0 adds r0, r0, r1 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram _0815F5A6: mov r0, r8 bl DestroyAnimVisualTask @@ -722774,13 +722774,13 @@ _0815F6B8: pop {r0} bx r0 .align 2, 0 -_0815F6C8: .4byte sub_0815F6FC +_0815F6C8: .4byte MoveOdorSleuthClone _0815F6CC: .4byte gUnknown_3005B60 -_0815F6D0: .4byte sub_0815F6D4 - thumb_func_end sub_0815F558 +_0815F6D0: .4byte AnimTask_OdorSleuthMovementWaitFinish + thumb_func_end AnimTask_OdorSleuthMovement - thumb_func_start sub_0815F6D4 -sub_0815F6D4: @ 0x0815F6D4 + thumb_func_start AnimTask_OdorSleuthMovementWaitFinish +AnimTask_OdorSleuthMovementWaitFinish: @ 0x0815F6D4 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -722800,10 +722800,10 @@ _0815F6F2: bx r0 .align 2, 0 _0815F6F8: .4byte gUnknown_3005B60 - thumb_func_end sub_0815F6D4 + thumb_func_end AnimTask_OdorSleuthMovementWaitFinish - thumb_func_start sub_0815F6FC -sub_0815F6FC: @ 0x0815F6FC + thumb_func_start MoveOdorSleuthClone +MoveOdorSleuthClone: @ 0x0815F6FC push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x30] @@ -722908,17 +722908,17 @@ _0815F790: subs r0, #1 strh r0, [r1] adds r0, r4, #0 - bl sub_080A7324 + bl obj_delete_but_dont_free_vram _0815F7CE: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0815F7D4: .4byte gUnknown_3005B60 - thumb_func_end sub_0815F6FC + thumb_func_end MoveOdorSleuthClone - thumb_func_start sub_0815F7D8 -sub_0815F7D8: @ 0x0815F7D8 + thumb_func_start AnimTask_GetReturnPowerLevel +AnimTask_GetReturnPowerLevel: @ 0x0815F7D8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -722962,10 +722962,10 @@ _0815F818: .align 2, 0 _0815F824: .4byte gUnknown_20380BE _0815F828: .4byte gUnknown_20380BA - thumb_func_end sub_0815F7D8 + thumb_func_end AnimTask_GetReturnPowerLevel - thumb_func_start sub_0815F82C -sub_0815F82C: @ 0x0815F82C + thumb_func_start AnimTask_SnatchOpposingMonMove +AnimTask_SnatchOpposingMonMove: @ 0x0815F82C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -723002,7 +723002,7 @@ _0815F864: @ jump table .4byte _0815FCC4 @ case 4 _0815F878: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _0815F8C4 @@ -723019,7 +723019,7 @@ _0815F878: strh r0, [r6, #0xa] ldr r0, _0815F8C8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 mov sb, r4 cmp r0, #0 @@ -723088,7 +723088,7 @@ _0815F916: _0815F924: .4byte gUnknown_20205AC _0815F928: .4byte gUnknown_3005B60 _0815F92C: - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 beq _0815F960 @@ -723113,7 +723113,7 @@ _0815F95C: .4byte gUnknown_20380D6 _0815F960: ldr r4, _0815F9C4 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815FA00 @@ -723127,7 +723127,7 @@ _0815F960: ldr r5, _0815F9CC adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sl, r0 ldrb r0, [r4] lsls r0, r0, #1 @@ -723136,7 +723136,7 @@ _0815F960: muls r0, r6, r0 adds r0, r0, r5 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov sb, r0 ldr r0, _0815F9D0 ldr r0, [r0] @@ -723153,7 +723153,7 @@ _0815F960: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 b _0815F9D6 @@ -723166,7 +723166,7 @@ _0815F9D4: ldrh r6, [r1, #2] _0815F9D6: movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0815F9FC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -723196,7 +723196,7 @@ _0815FA00: ldr r5, _0815FA5C adds r0, r0, r5 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov sl, r0 ldrb r0, [r4] lsls r0, r0, #1 @@ -723205,7 +723205,7 @@ _0815FA00: muls r0, r6, r0 adds r0, r0, r5 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov sb, r0 ldr r0, _0815FA60 ldr r0, [r0] @@ -723222,7 +723222,7 @@ _0815FA00: muls r0, r6, r0 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 b _0815FA66 @@ -723234,7 +723234,7 @@ _0815FA64: ldrh r6, [r1, #2] _0815FA66: movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0815FB04 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -723254,7 +723254,7 @@ _0815FA88: ldr r0, _0815FB0C ldrb r0, [r0] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r3, r5, #0x10 @@ -723336,7 +723336,7 @@ _0815FB20: strh r0, [r6, #0xa] ldr r0, _0815FB70 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 mov sb, r4 cmp r0, #0 @@ -723393,7 +723393,7 @@ _0815FB8E: bne _0815FC0E ldr r0, _0815FBE4 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815FBEC @@ -723402,7 +723402,7 @@ _0815FB8E: ldr r0, _0815FBE8 ldrb r0, [r0] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -723419,7 +723419,7 @@ _0815FBEC: ldr r0, _0815FC30 ldrb r0, [r0] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r4, r0 @@ -723457,7 +723457,7 @@ _0815FC38: .4byte 0x0000FFFF _0815FC3C: .4byte gUnknown_3005B60 _0815FC40: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _0815FC8C @@ -723474,10 +723474,10 @@ _0815FC40: lsls r0, r0, #2 ldr r5, _0815FC90 adds r0, r0, r5 - bl sub_080A7ED8 + bl DestroySpriteAndFreeResources_ ldr r0, _0815FC94 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 mov sb, r4 cmp r0, #0 @@ -723521,7 +723521,7 @@ _0815FCB6: _0815FCC0: .4byte gUnknown_3005B60 _0815FCC4: movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _0815FD38 @@ -723540,7 +723540,7 @@ _0815FCC4: mov sl, r0 ldrb r0, [r0] str r2, [sp, #0x18] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 mov sb, r4 ldr r2, [sp, #0x18] @@ -723565,7 +723565,7 @@ _0815FCC4: mov r1, sl ldrb r0, [r1] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r3, r5, #0 @@ -723598,7 +723598,7 @@ _0815FD44: mov r2, sl ldrb r0, [r2] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r3, r5, #0 @@ -723636,7 +723636,7 @@ _0815FDA0: .align 2, 0 _0815FDB0: .4byte gUnknown_20205AC _0815FDB4: .4byte gUnknown_3005B60 - thumb_func_end sub_0815F82C + thumb_func_end AnimTask_SnatchOpposingMonMove thumb_func_start sub_0815FDB8 sub_0815FDB8: @ 0x0815FDB8 @@ -723658,16 +723658,16 @@ _0815FDCA: cmp r1, r0 bne _0815FE64 movs r0, #0x3f - bl sub_080A4A40 + bl BattleAnimAdjustPanning adds r1, r0, #0 lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x7a - bl sub_080A307C + bl PlaySE12WithPanning ldr r0, _0815FE54 ldrb r0, [r0] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -723686,17 +723686,17 @@ _0815FDCA: strb r0, [r2] ldr r0, _0815FE5C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _0815FEF4 - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _0815FEF4 movs r0, #1 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId ldr r2, _0815FE60 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -723760,7 +723760,7 @@ _0815FEA6: strh r0, [r4, #0x32] ldr r0, _0815FED0 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0815FED4 @@ -723790,7 +723790,7 @@ _0815FEE0: cmp r0, #2 bne _0815FEF4 adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0815FEF4: pop {r4} pop {r0} @@ -723798,8 +723798,8 @@ _0815FEF4: .align 2, 0 thumb_func_end sub_0815FDB8 - thumb_func_start sub_0815FEFC -sub_0815FEFC: @ 0x0815FEFC + thumb_func_start AnimTask_SnatchPartnerMove +AnimTask_SnatchPartnerMove: @ 0x0815FEFC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -723833,14 +723833,14 @@ _0815FF40: ldr r0, _0815FF84 ldrb r0, [r0] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r5, r0, #0 ldr r0, _0815FF88 ldrb r0, [r0] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r2, r0, #0 @@ -724001,10 +724001,10 @@ _08160088: _08160090: .4byte gUnknown_2023E88 _08160094: .4byte gUnknown_20380D6 _08160098: .4byte gUnknown_20205AC - thumb_func_end sub_0815FEFC + thumb_func_end AnimTask_SnatchPartnerMove - thumb_func_start sub_0816009C -sub_0816009C: @ 0x0816009C + thumb_func_start AnimTask_TeeterDanceMovement +AnimTask_TeeterDanceMovement: @ 0x0816009C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -724014,14 +724014,14 @@ sub_0816009C: @ 0x0816009C ldr r0, _08160104 adds r4, r1, r0 movs r0, #0 - bl sub_080A5B08 + bl GetAnimBattlerSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r5, #0 strh r0, [r4, #0xe] ldr r0, _08160108 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r2, #1 rsbs r2, r2, #0 @@ -724060,11 +724060,11 @@ _081600D0: _08160104: .4byte gUnknown_3005B60 _08160108: .4byte gUnknown_20380D6 _0816010C: .4byte gUnknown_20205AC -_08160110: .4byte sub_08160114 - thumb_func_end sub_0816009C +_08160110: .4byte AnimTask_TeeterDanceMovementStep + thumb_func_end AnimTask_TeeterDanceMovement - thumb_func_start sub_08160114 -sub_08160114: @ 0x08160114 + thumb_func_start AnimTask_TeeterDanceMovementStep +AnimTask_TeeterDanceMovementStep: @ 0x08160114 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -724196,15 +724196,15 @@ _08160212: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08160114 + thumb_func_end AnimTask_TeeterDanceMovementStep - thumb_func_start sub_08160218 -sub_08160218: @ 0x08160218 + thumb_func_start AnimKnockOffStrikeStep +AnimKnockOffStrikeStep: @ 0x08160218 push {r4, lr} adds r4, r0, #0 ldr r0, _0816026C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldrh r0, [r4, #0x2e] ldrh r1, [r4, #0x30] @@ -724230,7 +724230,7 @@ sub_08160218: @ 0x08160218 cmp r0, #0 beq _0816025E adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0816025E: ldrh r0, [r4, #0x32] adds r0, #1 @@ -724240,15 +724240,15 @@ _0816025E: bx r0 .align 2, 0 _0816026C: .4byte gUnknown_20380D7 - thumb_func_end sub_08160218 + thumb_func_end AnimKnockOffStrikeStep - thumb_func_start sub_08160270 -sub_08160270: @ 0x08160270 + thumb_func_start AnimKnockOffStrike +AnimKnockOffStrike: @ 0x08160270 push {r4, lr} adds r4, r0, #0 ldr r0, _081602A8 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081602B4 @@ -724295,23 +724295,23 @@ _081602CE: bx r0 .align 2, 0 _081602D8: .4byte gUnknown_20380BE -_081602DC: .4byte sub_08160218 - thumb_func_end sub_08160270 +_081602DC: .4byte AnimKnockOffStrikeStep + thumb_func_end AnimKnockOffStrike - thumb_func_start sub_081602E0 -sub_081602E0: @ 0x081602E0 + thumb_func_start AnimRecycle +AnimRecycle: @ 0x081602E0 push {r4, r5, lr} adds r5, r0, #0 ldr r4, _08160324 ldrb r0, [r4] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0x20] ldrb r0, [r4] movs r1, #2 - bl sub_080A7EE4 + bl GetBattlerSpriteCoordAttr strh r0, [r5, #0x22] lsls r0, r0, #0x10 asrs r0, r0, #0x10 @@ -724334,11 +724334,11 @@ _0816030A: bx r0 .align 2, 0 _08160324: .4byte gUnknown_20380D6 -_08160328: .4byte sub_0816032C - thumb_func_end sub_081602E0 +_08160328: .4byte AnimRecycleStep + thumb_func_end AnimRecycle - thumb_func_start sub_0816032C -sub_0816032C: @ 0x0816032C + thumb_func_start AnimRecycleStep +AnimRecycleStep: @ 0x0816032C push {r4, lr} adds r4, r0, #0 movs r0, #0x32 @@ -724467,16 +724467,16 @@ _08160412: b _08160420 _0816041A: adds r0, r4, #0 - bl sub_080A6014 + bl DestroySpriteAndMatrix _08160420: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816032C + thumb_func_end AnimRecycleStep - thumb_func_start sub_08160428 -sub_08160428: @ 0x08160428 + thumb_func_start AnimTask_GetWeather +AnimTask_GetWeather: @ 0x08160428 push {lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -724522,7 +724522,7 @@ _08160470: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08160428 + thumb_func_end AnimTask_GetWeather thumb_func_start sub_0816047C sub_0816047C: @ 0x0816047C @@ -724538,7 +724538,7 @@ sub_0816047C: @ 0x0816047C strh r0, [r4, #8] ldr r0, _081604B8 ldrb r0, [r0] - bl sub_080A5B08 + bl GetAnimBattlerSpriteId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -724555,11 +724555,11 @@ sub_0816047C: @ 0x0816047C _081604B4: .4byte gUnknown_3005B60 _081604B8: .4byte gUnknown_20380BE _081604BC: .4byte gUnknown_85AD7D0 -_081604C0: .4byte sub_081604C4 +_081604C0: .4byte AnimTask_SlackOffSquishStep thumb_func_end sub_0816047C - thumb_func_start sub_081604C4 -sub_081604C4: @ 0x081604C4 + thumb_func_start AnimTask_SlackOffSquishStep +AnimTask_SlackOffSquishStep: @ 0x081604C4 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -724621,7 +724621,7 @@ _08160538: adds r0, r0, r4 lsls r0, r0, #3 adds r0, r0, r6 - bl sub_080A75FC + bl RunAffineAnimFromTaskData lsls r0, r0, #0x18 cmp r0, #0 bne _08160550 @@ -724633,40 +724633,40 @@ _08160550: bx r0 .align 2, 0 _08160558: .4byte gUnknown_20205AC - thumb_func_end sub_081604C4 + thumb_func_end AnimTask_SlackOffSquishStep - thumb_func_start sub_0816055C -sub_0816055C: @ 0x0816055C + thumb_func_start VBlankCB_MoveRelearner +VBlankCB_MoveRelearner: @ 0x0816055C push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816055C + thumb_func_end VBlankCB_MoveRelearner - thumb_func_start sub_08160570 -sub_08160570: @ 0x08160570 + thumb_func_start TeachMoveRelearnerMove +TeachMoveRelearnerMove: @ 0x08160570 push {lr} sub sp, #4 bl sub_080987DC ldr r0, _08160598 movs r1, #0xa - bl sub_080A8878 + bl CreateTask movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 .align 2, 0 _08160598: .4byte sub_0816059C - thumb_func_end sub_08160570 + thumb_func_end TeachMoveRelearnerMove thumb_func_start sub_0816059C sub_0816059C: @ 0x0816059C @@ -724680,34 +724680,34 @@ sub_0816059C: @ 0x0816059C cmp r0, #0 bne _081605C0 ldr r0, _081605CC - bl sub_08000540 + bl SetMainCallback2 ldr r1, _081605D0 ldr r0, _081605D4 str r0, [r1] adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081605C0: pop {r4} pop {r0} bx r0 .align 2, 0 _081605C8: .4byte gUnknown_2037C74 -_081605CC: .4byte sub_081605D8 +_081605CC: .4byte CB2_InitLearnMove _081605D0: .4byte gUnknown_3005B0C -_081605D4: .4byte sub_080AEA64 +_081605D4: .4byte FieldCallback_ReturnToEventScript2 thumb_func_end sub_0816059C - thumb_func_start sub_081605D8 -sub_081605D8: @ 0x081605D8 + thumb_func_start CB2_InitLearnMove +CB2_InitLearnMove: @ 0x081605D8 push {r4, r5, r6, lr} bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks bl sub_08199640 ldr r6, _08160658 movs r0, #0x8c lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] ldr r1, _0816065C ldrh r1, [r1] @@ -724715,8 +724715,8 @@ sub_081605D8: @ 0x081605D8 movs r5, #0 strb r1, [r0] ldr r0, _08160660 - bl sub_080006F0 - bl sub_08160724 + bl SetVBlankCallback + bl InitMoveRelearnerBackgroundLayers movs r0, #0 bl sub_081D1E40 ldr r4, _08160664 @@ -724726,14 +724726,14 @@ sub_081605D8: @ 0x081605D8 strb r0, [r4, #4] bl sub_08161198 ldr r0, _08160668 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _0816066C bl LoadSpritePalette - bl sub_08160FD0 + bl CreateUISprites ldr r0, _08160670 ldrh r1, [r4] ldrh r2, [r4, #2] - bl sub_081AE25C + bl ListMenuInit ldr r1, [r6] movs r2, #0x89 lsls r2, r2, #1 @@ -724742,34 +724742,34 @@ sub_081605D8: @ 0x081605D8 movs r0, #0 movs r1, #0 movs r2, #2 - bl sub_080A1238 + bl FillPalette ldr r0, _08160674 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08160658: .4byte gUnknown_203B900 _0816065C: .4byte gUnknown_2037280 -_08160660: .4byte sub_0816055C +_08160660: .4byte VBlankCB_MoveRelearner _08160664: .4byte gUnknown_203B904 _08160668: .4byte gUnknown_85ADAF4 _0816066C: .4byte gUnknown_85ADAFC _08160670: .4byte gUnknown_3006050 _08160674: .4byte sub_08160764 - thumb_func_end sub_081605D8 + thumb_func_end CB2_InitLearnMove - thumb_func_start sub_08160678 -sub_08160678: @ 0x08160678 + thumb_func_start CB2_InitLearnMoveReturnFromSelectMove +CB2_InitLearnMoveReturnFromSelectMove: @ 0x08160678 push {r4, r5, lr} bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks bl sub_08199640 ldr r5, _08160700 movs r0, #0x8c lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r1, #0x1c strb r1, [r0] @@ -724784,21 +724784,21 @@ sub_08160678: @ 0x08160678 adds r0, #0x45 strb r1, [r0] ldr r0, _0816070C - bl sub_080006F0 - bl sub_08160724 + bl SetVBlankCallback + bl InitMoveRelearnerBackgroundLayers ldr r4, _08160710 ldrb r0, [r4, #4] bl sub_081D1E40 bl sub_08161198 ldr r0, _08160714 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _08160718 bl LoadSpritePalette - bl sub_08160FD0 + bl CreateUISprites ldr r0, _0816071C ldrh r1, [r4] ldrh r2, [r4, #2] - bl sub_081AE25C + bl ListMenuInit ldr r1, [r5] movs r2, #0x89 lsls r2, r2, #1 @@ -724807,9 +724807,9 @@ sub_08160678: @ 0x08160678 movs r0, #0 movs r1, #0 movs r2, #2 - bl sub_080A1238 + bl FillPalette ldr r0, _08160720 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 @@ -724817,33 +724817,33 @@ sub_08160678: @ 0x08160678 _08160700: .4byte gUnknown_203B900 _08160704: .4byte gUnknown_2037280 _08160708: .4byte gUnknown_2037282 -_0816070C: .4byte sub_0816055C +_0816070C: .4byte VBlankCB_MoveRelearner _08160710: .4byte gUnknown_203B904 _08160714: .4byte gUnknown_85ADAF4 _08160718: .4byte gUnknown_85ADAFC _0816071C: .4byte gUnknown_3006050 _08160720: .4byte sub_08160764 - thumb_func_end sub_08160678 + thumb_func_end CB2_InitLearnMoveReturnFromSelectMove - thumb_func_start sub_08160724 -sub_08160724: @ 0x08160724 + thumb_func_start InitMoveRelearnerBackgroundLayers +InitMoveRelearnerBackgroundLayers: @ 0x08160724 push {lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _08160760 movs r0, #0 movs r2, #2 bl InitBgsFromTemplates - bl sub_08121E00 + bl ResetAllBgsCoordinates movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -724851,37 +724851,37 @@ sub_08160724: @ 0x08160724 bx r0 .align 2, 0 _08160760: .4byte gUnknown_85ADB6C - thumb_func_end sub_08160724 + thumb_func_end InitMoveRelearnerBackgroundLayers thumb_func_start sub_08160764 sub_08160764: @ 0x08160764 push {lr} bl sub_081607A0 - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08160764 - thumb_func_start sub_08160784 -sub_08160784: @ 0x08160784 + thumb_func_start FormatAndPrintText +FormatAndPrintText: @ 0x08160784 push {r4, lr} adds r1, r0, #0 ldr r4, _0816079C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 - bl sub_081D2208 + bl MoveRelearnerPrintText pop {r4} pop {r0} bx r0 .align 2, 0 _0816079C: .4byte gUnknown_2021C7C - thumb_func_end sub_08160784 + thumb_func_end FormatAndPrintText thumb_func_start sub_081607A0 sub_081607A0: @ 0x081607A0 @@ -724945,7 +724945,7 @@ _0816084C: movs r4, #0 strb r0, [r1] movs r0, #0 - bl sub_08160E08 + bl HideHeartSpritesAndShowTeachMoveText movs r0, #1 rsbs r0, r0, #0 str r4, [sp] @@ -724972,7 +724972,7 @@ _08160880: b _08160DB4 _08160888: movs r0, #0 - bl sub_08160E08 + bl HideHeartSpritesAndShowTeachMoveText b _0816089E _08160890: movs r0, #0 @@ -724987,7 +724987,7 @@ _0816089E: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - bl sub_081610C4 + bl AddScrollArrows b _08160DB6 .align 2, 0 _081608B0: .4byte gUnknown_203B900 @@ -724996,13 +724996,13 @@ _081608B4: bl sub_08160E70 b _08160DB6 _081608BC: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 beq _081608C8 b _08160DB6 _081608C8: - bl sub_081D2264 + bl MoveRelearnerCreateYesNoMenu ldr r0, _081608D8 ldr r1, [r0] ldrb r0, [r1] @@ -725030,13 +725030,13 @@ _081608DC: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 ldr r1, _0816092C cmp r0, r1 beq _08160938 ldr r0, _08160930 - bl sub_08160784 + bl FormatAndPrintText ldr r1, _08160934 movs r0, #1 strh r0, [r1] @@ -725085,13 +725085,13 @@ _0816096A: .align 2, 0 _08160974: .4byte gUnknown_203B900 _08160978: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 beq _08160984 b _08160DB6 _08160984: - bl sub_081D2264 + bl MoveRelearnerCreateYesNoMenu ldr r0, _08160994 ldr r1, [r0] ldrb r0, [r1] @@ -725143,7 +725143,7 @@ _081609DE: _081609E8: .4byte gUnknown_203B900 _081609EC: ldr r0, _081609FC - bl sub_08160784 + bl FormatAndPrintText ldr r0, _08160A00 ldr r1, [r0] ldrb r0, [r1] @@ -725153,13 +725153,13 @@ _081609EC: _081609FC: .4byte gUnknown_85AD9D4 _08160A00: .4byte gUnknown_203B900 _08160A04: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 beq _08160A10 b _08160DB6 _08160A10: - bl sub_081D2264 + bl MoveRelearnerCreateYesNoMenu ldr r0, _08160A1C ldr r1, [r0] movs r0, #0x12 @@ -725173,7 +725173,7 @@ _08160A20: cmp r1, #0 bne _08160A44 ldr r0, _08160A3C - bl sub_08160784 + bl FormatAndPrintText ldr r0, _08160A40 ldr r1, [r0] movs r0, #0x13 @@ -725206,7 +725206,7 @@ _08160A60: adds r0, r4, #0 bl StringCopy ldr r0, _08160A8C - bl sub_08160784 + bl FormatAndPrintText ldr r0, _08160A90 ldr r1, [r0] ldrb r0, [r1] @@ -725218,13 +725218,13 @@ _08160A88: .4byte gUnknown_82EACC4 _08160A8C: .4byte gUnknown_85ADA27 _08160A90: .4byte gUnknown_203B900 _08160A94: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 beq _08160AA0 b _08160DB6 _08160AA0: - bl sub_081D2264 + bl MoveRelearnerCreateYesNoMenu ldr r0, _08160AB0 ldr r1, [r0] ldrb r0, [r1] @@ -725280,7 +725280,7 @@ _08160B04: .align 2, 0 _08160B0C: .4byte gUnknown_203B900 _08160B10: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 beq _08160B1C @@ -725288,7 +725288,7 @@ _08160B10: _08160B1C: movs r0, #3 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _08160B34 ldrb r0, [r0, #4] cmp r0, #0 @@ -725312,7 +725312,7 @@ _08160B42: .align 2, 0 _08160B4C: .4byte gUnknown_203B900 _08160B50: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 lsrs r2, r0, #0x10 cmp r2, #0 @@ -725328,7 +725328,7 @@ _08160B5E: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08160DB6 .align 2, 0 _08160B78: .4byte gUnknown_203B900 @@ -725358,16 +725358,16 @@ _08160B8A: str r0, [sp] adds r0, r4, #0 bl ShowSelectMovePokemonSummaryScreen - bl sub_08160DC8 + bl FreeMoveRelearnerResources b _08160DB6 .align 2, 0 _08160BB8: .4byte gUnknown_2037C74 _08160BBC: .4byte gUnknown_2024190 _08160BC0: .4byte gUnknown_203B900 _08160BC4: .4byte gUnknown_202418D -_08160BC8: .4byte sub_08160678 +_08160BC8: .4byte CB2_InitLearnMoveReturnFromSelectMove _08160BCC: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 beq _08160BD8 @@ -725382,7 +725382,7 @@ _08160BDA: _08160BE2: movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _08160DB6 _08160BEC: movs r0, #1 @@ -725391,7 +725391,7 @@ _08160BEC: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08160C08 ldr r1, [r0] ldrb r0, [r1] @@ -725408,9 +725408,9 @@ _08160C0C: beq _08160C1A b _08160DB6 _08160C1A: - bl sub_08160DC8 + bl FreeMoveRelearnerResources ldr r0, _08160C2C - bl sub_08000540 + bl SetMainCallback2 b _08160DB6 .align 2, 0 _08160C28: .4byte gUnknown_2037C74 @@ -725422,7 +725422,7 @@ _08160C30: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08160C5C ldr r1, [r0] ldrb r0, [r1] @@ -725433,7 +725433,7 @@ _08160C30: cmp r0, #0 bne _08160C64 movs r0, #1 - bl sub_08160E08 + bl HideHeartSpritesAndShowTeachMoveText b _08160C6E .align 2, 0 _08160C5C: .4byte gUnknown_203B900 @@ -725444,10 +725444,10 @@ _08160C64: movs r0, #1 bl sub_08160F94 _08160C6E: - bl sub_0816114C + bl RemoveScrollArrows movs r0, #3 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _08160DB6 _08160C7C: ldr r0, _08160C9C @@ -725478,7 +725478,7 @@ _08160CA0: adds r0, r0, r5 ldrb r1, [r2] adds r1, #0xd - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 ldr r0, _08160D24 @@ -725494,7 +725494,7 @@ _08160CA0: adds r0, r0, r5 adds r1, #0x45 ldrb r1, [r1] - bl sub_0806B46C + bl RemoveMonPPBonus ldr r0, [r7] adds r0, #0x44 ldrb r0, [r0] @@ -725508,7 +725508,7 @@ _08160CA0: adds r0, #0x45 ldrb r2, [r0] adds r0, r4, #0 - bl sub_08068D34 + bl SetMonMoveSlot ldr r4, _08160D2C bl GetCurrentSelectedMove adds r1, r0, #0 @@ -725517,7 +725517,7 @@ _08160CA0: adds r0, r4, #0 bl StringCopy ldr r0, _08160D30 - bl sub_08160784 + bl FormatAndPrintText ldr r1, [r7] movs r0, #0x1e strb r0, [r1] @@ -725533,30 +725533,30 @@ _08160D2C: .4byte gUnknown_2021C54 _08160D30: .4byte gUnknown_85ADA42 _08160D34: .4byte gUnknown_2037280 _08160D38: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 bne _08160DB6 ldr r0, _08160D58 - bl sub_08160784 + bl FormatAndPrintText ldr r0, _08160D5C ldr r1, [r0] movs r0, #0x1f strb r0, [r1] ldr r0, _08160D60 - bl sub_080A29AC + bl PlayFanfare b _08160DB6 .align 2, 0 _08160D58: .4byte gUnknown_85ADA67 _08160D5C: .4byte gUnknown_203B900 _08160D60: .4byte 0x0000016F _08160D64: - bl sub_081D2250 + bl MoveRelearnerRunTextPrinters lsls r0, r0, #0x10 cmp r0, #0 bne _08160DB6 ldr r0, _08160D7C - bl sub_080A29AC + bl PlayFanfare ldr r0, _08160D80 ldr r1, [r0] movs r0, #0x20 @@ -725565,7 +725565,7 @@ _08160D64: _08160D7C: .4byte 0x0000016F _08160D80: .4byte gUnknown_203B900 _08160D84: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _08160DB6 @@ -725600,10 +725600,10 @@ _08160DC0: .4byte gUnknown_3002360 _08160DC4: .4byte gUnknown_203B900 thumb_func_end sub_081607A0 - thumb_func_start sub_08160DC8 -sub_08160DC8: @ 0x08160DC8 + thumb_func_start FreeMoveRelearnerResources +FreeMoveRelearnerResources: @ 0x08160DC8 push {r4, lr} - bl sub_0816114C + bl RemoveScrollArrows ldr r4, _08160E00 ldr r0, [r4] movs r1, #0x89 @@ -725612,10 +725612,10 @@ sub_08160DC8: @ 0x08160DC8 ldrb r0, [r0] ldr r1, _08160E04 adds r2, r1, #2 - bl sub_081AE3A0 - bl sub_080034D4 + bl DestroyListMenuTask + bl FreeAllWindowBuffers ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] bl ResetSpriteData @@ -725626,10 +725626,10 @@ sub_08160DC8: @ 0x08160DC8 .align 2, 0 _08160E00: .4byte gUnknown_203B900 _08160E04: .4byte gUnknown_203B904 - thumb_func_end sub_08160DC8 + thumb_func_end FreeMoveRelearnerResources - thumb_func_start sub_08160E08 -sub_08160E08: @ 0x08160E08 + thumb_func_start HideHeartSpritesAndShowTeachMoveText +HideHeartSpritesAndShowTeachMoveText: @ 0x08160E08 push {r4, r5, r6, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -725659,7 +725659,7 @@ _08160E18: ldr r4, _08160E68 ldr r1, _08160E6C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [sp] str r5, [sp, #4] @@ -725679,7 +725679,7 @@ _08160E60: .4byte gUnknown_20205AC _08160E64: .4byte gUnknown_203B900 _08160E68: .4byte gUnknown_2021C7C _08160E6C: .4byte gUnknown_85AD9A0 - thumb_func_end sub_08160E08 + thumb_func_end HideHeartSpritesAndShowTeachMoveText thumb_func_start sub_08160E70 sub_08160E70: @ 0x08160E70 @@ -725692,7 +725692,7 @@ sub_08160E70: @ 0x08160E70 lsls r4, r4, #1 adds r0, r0, r4 ldrb r0, [r0] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r5, r0, #0 ldr r0, [r6] adds r0, r0, r4 @@ -725714,7 +725714,7 @@ sub_08160E70: @ 0x08160E70 ands r0, r1 cmp r0, #0 bne _08160EBC - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 cmp r0, #0 beq _08160F5C @@ -725724,7 +725724,7 @@ _08160EBC: cmp r7, #0 bne _08160EE4 movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] movs r1, #5 strb r1, [r0] @@ -725737,7 +725737,7 @@ _08160EDC: .4byte gUnknown_203B904 _08160EE0: .4byte gUnknown_3002360 _08160EE4: movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] movs r2, #0 movs r1, #3 @@ -725745,23 +725745,23 @@ _08160EE4: strb r2, [r4, #4] _08160EF4: movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram bl GetCurrentSelectedMove - bl sub_08161280 + bl MoveRelearnerShowHideHearts b _08160F5C _08160F04: movs r0, #5 bl sub_080A306C - bl sub_0816114C + bl RemoveScrollArrows ldr r1, [r6] movs r0, #0xc strb r0, [r1] ldr r4, _08160F28 ldr r1, _08160F2C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 - bl sub_081D2208 + bl MoveRelearnerPrintText b _08160F5C .align 2, 0 _08160F28: .4byte gUnknown_2021C7C @@ -725769,7 +725769,7 @@ _08160F2C: .4byte gUnknown_85ADAAF _08160F30: movs r0, #5 bl sub_080A306C - bl sub_0816114C + bl RemoveScrollArrows ldr r1, [r6] movs r0, #8 strb r0, [r1] @@ -725781,9 +725781,9 @@ _08160F30: ldr r4, _08160F6C ldr r1, _08160F70 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 - bl sub_081D2208 + bl MoveRelearnerPrintText _08160F5C: pop {r4, r5, r6, r7} pop {r0} @@ -725824,7 +725824,7 @@ sub_08160F94: @ 0x08160F94 ldr r4, _08160FC8 ldr r1, _08160FCC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [sp] str r5, [sp, #4] @@ -725844,8 +725844,8 @@ _08160FC8: .4byte gUnknown_2021C7C _08160FCC: .4byte gUnknown_85AD9A0 thumb_func_end sub_08160F94 - thumb_func_start sub_08160FD0 -sub_08160FD0: @ 0x08160FD0 + thumb_func_start CreateUISprites +CreateUISprites: @ 0x08160FD0 push {r4, r5, r6, r7, lr} ldr r2, _081610B4 ldr r0, [r2] @@ -725860,7 +725860,7 @@ sub_08160FD0: @ 0x08160FD0 movs r0, #1 rsbs r0, r0, #0 strb r0, [r1] - bl sub_081610C4 + bl AddScrollArrows movs r4, #0 ldr r5, _081610BC _08160FF4: @@ -725884,7 +725884,7 @@ _08160FFC: asrs r2, r2, #0x10 adds r0, r5, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r2, _081610B4 ldr r1, [r2] adds r1, #1 @@ -725917,7 +725917,7 @@ _0816103C: asrs r2, r2, #0x10 adds r0, r7, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] adds r2, r4, #0 adds r2, #8 @@ -725965,10 +725965,10 @@ _081610B4: .4byte gUnknown_203B900 _081610B8: .4byte 0x00000113 _081610BC: .4byte gUnknown_85ADB54 _081610C0: .4byte gUnknown_20205AC - thumb_func_end sub_08160FD0 + thumb_func_end CreateUISprites - thumb_func_start sub_081610C4 -sub_081610C4: @ 0x081610C4 + thumb_func_start AddScrollArrows +AddScrollArrows: @ 0x081610C4 push {r4, r5, r6, lr} ldr r4, _08161130 ldr r1, [r4] @@ -725982,7 +725982,7 @@ sub_081610C4: @ 0x081610C4 movs r3, #0x8b lsls r3, r3, #1 adds r1, r1, r3 - bl sub_081AF058 + bl AddScrollIndicatorArrowPair ldr r1, [r4] movs r5, #0x8a lsls r5, r5, #1 @@ -726013,7 +726013,7 @@ _081610EC: subs r1, r1, r2 strh r1, [r0, #8] ldr r1, _08161148 - bl sub_081AF058 + bl AddScrollIndicatorArrowPair ldr r1, [r4] ldr r6, _08161138 adds r1, r1, r6 @@ -726030,10 +726030,10 @@ _0816113C: .4byte gUnknown_203CB58 _08161140: .4byte gUnknown_85ADB14 _08161144: .4byte 0x00000111 _08161148: .4byte gUnknown_203B904 - thumb_func_end sub_081610C4 + thumb_func_end AddScrollArrows - thumb_func_start sub_0816114C -sub_0816114C: @ 0x0816114C + thumb_func_start RemoveScrollArrows +RemoveScrollArrows: @ 0x0816114C push {r4, lr} ldr r4, _08161190 ldr r0, [r4] @@ -726043,7 +726043,7 @@ sub_0816114C: @ 0x0816114C ldrb r0, [r1] cmp r0, #0xff beq _0816116E - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] movs r1, #0x8a lsls r1, r1, #1 @@ -726057,7 +726057,7 @@ _0816116E: ldrb r0, [r1] cmp r0, #0xff beq _08161188 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r2, _08161194 adds r1, r0, r2 @@ -726070,7 +726070,7 @@ _08161188: .align 2, 0 _08161190: .4byte gUnknown_203B900 _08161194: .4byte 0x00000113 - thumb_func_end sub_0816114C + thumb_func_end RemoveScrollArrows thumb_func_start sub_08161198 sub_08161198: @ 0x08161198 @@ -726086,7 +726086,7 @@ sub_08161198: @ 0x08161198 ldr r2, _0816126C adds r0, r0, r2 adds r1, #0x12 - bl sub_0806DB48 + bl GetMoveRelearnerMoves ldr r1, [r4] movs r6, #0x88 lsls r6, r6, #1 @@ -726136,10 +726136,10 @@ _081611FE: adds r0, r0, r1 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData ldr r0, _08161274 mov r1, sp - bl sub_08008828 + bl StringCopy10 ldr r2, [r4] movs r5, #0x88 lsls r5, r5, #1 @@ -726166,7 +726166,7 @@ _081611FE: adds r0, #0x48 adds r1, r1, r5 ldrb r1, [r1] - bl sub_081D1FD8 + bl LoadMoveRelearnerMovesList ldr r1, [r4] ldr r2, _0816127C adds r1, r1, r2 @@ -726184,8 +726184,8 @@ _08161278: .4byte gUnknown_85C93C4 _0816127C: .4byte 0x00000111 thumb_func_end sub_08161198 - thumb_func_start sub_08161280 -sub_08161280: @ 0x08161280 + thumb_func_start MoveRelearnerShowHideHearts +MoveRelearnerShowHideHearts: @ 0x08161280 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -726381,12 +726381,12 @@ _08161402: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08161280 + thumb_func_end MoveRelearnerShowHideHearts - thumb_func_start sub_0816140C -sub_0816140C: @ 0x0816140C + thumb_func_start SetUpFieldMove_SoftBoiled +SetUpFieldMove_SoftBoiled: @ 0x0816140C push {r4, r5, r6, lr} - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r6, #0x64 @@ -726394,17 +726394,17 @@ sub_0816140C: @ 0x0816140C ldr r4, _08161458 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r6, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -726425,7 +726425,7 @@ _0816145E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_0816140C + thumb_func_end SetUpFieldMove_SoftBoiled thumb_func_start sub_08161464 sub_08161464: @ 0x08161464 @@ -726438,13 +726438,13 @@ sub_08161464: @ 0x08161464 strb r1, [r0, #0xb] ldrb r1, [r0, #9] strb r1, [r0, #0xa] - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 bl sub_081B0C9C movs r0, #5 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r1, _081614A4 lsls r0, r4, #2 adds r0, r0, r4 @@ -726481,7 +726481,7 @@ sub_081614AC: @ 0x081614AC bls _081614F0 movs r0, #0 strb r0, [r1, #0xb] - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r1, _081614E8 lsls r0, r4, #2 adds r0, r0, r4 @@ -726504,7 +726504,7 @@ _081614F0: adds r6, r0, r1 adds r0, r6, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 @@ -726513,7 +726513,7 @@ _081614F0: beq _0816151E adds r0, r6, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData cmp r0, r4 bne _0816152C _0816151E: @@ -726530,7 +726530,7 @@ _0816152C: muls r0, r1, r0 add r0, sb movs r1, #0x3a - bl sub_0806A058 + bl GetMonData movs r1, #5 bl __udivsi3 adds r3, r0, #0 @@ -726573,7 +726573,7 @@ sub_08161570: @ 0x08161570 ldr r1, _081615BC adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData movs r1, #5 bl __udivsi3 adds r3, r0, #0 @@ -726609,16 +726609,16 @@ sub_081615C4: @ 0x081615C4 ldr r1, _08161610 adds r0, r0, r1 ldr r1, _08161614 - bl sub_081B1814 + bl GetMonNickname ldr r4, _08161618 ldr r1, _0816161C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _08161620 lsls r0, r5, #2 adds r0, r0, r5 @@ -726644,7 +726644,7 @@ sub_08161628: @ 0x08161628 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -726664,9 +726664,9 @@ sub_08161628: @ 0x08161628 movs r1, #0 bl sub_08198134 movs r0, #6 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r1, _08161680 lsls r0, r5, #2 adds r0, r0, r5 @@ -726689,13 +726689,13 @@ sub_08161688: @ 0x08161688 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _081616AE movs r0, #5 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081616B4 lsls r1, r4, #2 adds r1, r1, r4 @@ -726724,7 +726724,7 @@ sub_081616BC: @ 0x081616BC movs r1, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081616F0 lsls r0, r4, #2 adds r0, r0, r4 @@ -726741,8 +726741,8 @@ _081616F0: .4byte gUnknown_3005B60 _081616F4: .4byte sub_08161688 thumb_func_end sub_081616BC - thumb_func_start sub_081616F8 -sub_081616F8: @ 0x081616F8 + thumb_func_start SetDecorationInventoriesPointers +SetDecorationInventoriesPointers: @ 0x081616F8 push {r4, lr} ldr r0, _0816176C mov ip, r0 @@ -726806,7 +726806,7 @@ _08161774: .4byte 0x00002734 _08161778: .4byte 0x00002748 _0816177C: .4byte 0x0000278E _08161780: .4byte 0x00002798 - thumb_func_end sub_081616F8 + thumb_func_end SetDecorationInventoriesPointers thumb_func_start ClearDecorationInventory ClearDecorationInventory: @ 0x08161784 @@ -726858,8 +726858,8 @@ _081617BC: .align 2, 0 thumb_func_end ClearDecorationInventories - thumb_func_start sub_081617D4 -sub_081617D4: @ 0x081617D4 + thumb_func_start GetFirstEmptyDecorSlot +GetFirstEmptyDecorSlot: @ 0x081617D4 push {r4, lr} lsls r0, r0, #0x18 movs r2, #0 @@ -726899,7 +726899,7 @@ _08161814: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081617D4 + thumb_func_end GetFirstEmptyDecorSlot thumb_func_start sub_0816181C sub_0816181C: @ 0x0816181C @@ -726960,7 +726960,7 @@ sub_08161868: @ 0x08161868 adds r0, r0, r1 ldrb r5, [r0, #0xe] adds r0, r5, #0 - bl sub_081617D4 + bl GetFirstEmptyDecorSlot lsls r0, r0, #0x18 asrs r2, r0, #0x18 movs r0, #1 @@ -726999,7 +726999,7 @@ sub_081618B4: @ 0x081618B4 lsls r0, r0, #2 adds r0, r0, r1 ldrb r0, [r0, #0xe] - bl sub_081617D4 + bl GetFirstEmptyDecorSlot lsls r0, r0, #0x18 asrs r0, r0, #0x18 movs r1, #1 @@ -727018,8 +727018,8 @@ _081618E6: .align 2, 0 thumb_func_end sub_081618B4 - thumb_func_start sub_081618EC -sub_081618EC: @ 0x081618EC + thumb_func_start DecorationRemove +DecorationRemove: @ 0x081618EC push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -727070,7 +727070,7 @@ _0816193C: .align 2, 0 _08161944: .4byte gUnknown_203B90C _08161948: .4byte gUnknown_8580CD0 - thumb_func_end sub_081618EC + thumb_func_end DecorationRemove thumb_func_start CondenseDecorationsInCategory CondenseDecorationsInCategory: @ 0x0816194C @@ -727219,8 +727219,8 @@ _08161A2A: bx r1 thumb_func_end GetNumOwnedDecorations - thumb_func_start sub_08161A48 -sub_08161A48: @ 0x08161A48 + thumb_func_start ClearRoamerData +ClearRoamerData: @ 0x08161A48 push {r4, r5, lr} ldr r5, _08161A68 ldr r0, [r5] @@ -727240,7 +727240,7 @@ sub_08161A48: @ 0x08161A48 _08161A68: .4byte gUnknown_3005AEC _08161A6C: .4byte 0x000031DC _08161A70: .4byte 0x00000197 - thumb_func_end sub_08161A48 + thumb_func_end ClearRoamerData thumb_func_start ClearRoamerLocationData ClearRoamerLocationData: @ 0x08161A74 @@ -727272,8 +727272,8 @@ _08161AA0: .4byte gUnknown_203B952 _08161AA4: .4byte gUnknown_203B94C thumb_func_end ClearRoamerLocationData - thumb_func_start sub_08161AA8 -sub_08161AA8: @ 0x08161AA8 + thumb_func_start CreateInitialRoamerMon +CreateInitialRoamerMon: @ 0x08161AA8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -727314,7 +727314,7 @@ _08161ADC: adds r0, r6, #0 movs r2, #0x28 movs r3, #0x20 - bl sub_08067730 + bl CreateMon ldr r0, [r7] adds r0, r0, r5 movs r1, #0x28 @@ -727328,19 +727328,19 @@ _08161ADC: strb r1, [r0, #0x13] adds r0, r6, #0 movs r1, #0x42 - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 str r0, [r1] adds r0, r6, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 str r0, [r1, #4] adds r0, r6, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 movs r2, #0 @@ -727348,31 +727348,31 @@ _08161ADC: strh r0, [r1, #0xa] adds r0, r6, #0 movs r1, #0x16 - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 strb r0, [r1, #0xe] adds r0, r6, #0 movs r1, #0x17 - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 strb r0, [r1, #0xf] adds r0, r6, #0 movs r1, #0x18 - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 strb r0, [r1, #0x10] adds r0, r6, #0 movs r1, #0x21 - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 strb r0, [r1, #0x11] adds r0, r6, #0 movs r1, #0x2f - bl sub_0806A058 + bl GetMonData ldr r1, [r7] adds r1, r1, r5 strb r0, [r1, #0x12] @@ -727405,16 +727405,16 @@ _08161BC0: .4byte 0x000031DC _08161BC4: .4byte gUnknown_20243E8 _08161BC8: .4byte gUnknown_203B952 _08161BCC: .4byte gUnknown_85ADB74 - thumb_func_end sub_08161AA8 + thumb_func_end CreateInitialRoamerMon thumb_func_start InitRoamer InitRoamer: @ 0x08161BD0 push {lr} - bl sub_08161A48 + bl ClearRoamerData bl ClearRoamerLocationData ldr r0, _08161BE8 ldrh r0, [r0] - bl sub_08161AA8 + bl CreateInitialRoamerMon pop {r0} bx r0 .align 2, 0 @@ -727444,8 +727444,8 @@ _08161C0C: .4byte gUnknown_203B94C _08161C10: .4byte gUnknown_3005AEC thumb_func_end UpdateLocationHistoryForRoamer - thumb_func_start sub_08161C14 -sub_08161C14: @ 0x08161C14 + thumb_func_start RoamerMoveToOtherLocationSet +RoamerMoveToOtherLocationSet: @ 0x08161C14 push {r4, r5, lr} movs r1, #0 ldr r0, _08161C58 @@ -727485,10 +727485,10 @@ _08161C58: .4byte gUnknown_3005AEC _08161C5C: .4byte 0x000031DC _08161C60: .4byte gUnknown_203B952 _08161C64: .4byte gUnknown_85ADB74 - thumb_func_end sub_08161C14 + thumb_func_end RoamerMoveToOtherLocationSet - thumb_func_start sub_08161C68 -sub_08161C68: @ 0x08161C68 + thumb_func_start RoamerMove +RoamerMove: @ 0x08161C68 push {r4, r5, r6, r7, lr} movs r4, #0 bl Random @@ -727498,7 +727498,7 @@ sub_08161C68: @ 0x08161C68 ands r1, r0 cmp r1, #0 bne _08161C82 - bl sub_08161C14 + bl RoamerMoveToOtherLocationSet b _08161CF6 _08161C82: ldr r0, _08161CD8 @@ -727560,10 +727560,10 @@ _08161CF6: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08161C68 + thumb_func_end RoamerMove - thumb_func_start sub_08161CFC -sub_08161CFC: @ 0x08161CFC + thumb_func_start IsRoamerAt +IsRoamerAt: @ 0x08161CFC push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -727595,10 +727595,10 @@ _08161D36: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08161CFC + thumb_func_end IsRoamerAt - thumb_func_start sub_08161D3C -sub_08161D3C: @ 0x08161D3C + thumb_func_start CreateRoamerMonInstance +CreateRoamerMonInstance: @ 0x08161D3C push {r4, r5, lr} sub sp, #4 ldr r5, _08161DC8 @@ -727613,49 +727613,49 @@ sub_08161D3C: @ 0x08161D3C ldr r0, [r0, #4] str r0, [sp] adds r0, r5, #0 - bl sub_08067C44 + bl CreateMonWithIVsPersonality ldr r2, [r4] ldr r0, _08161DD4 adds r2, r2, r0 adds r0, r5, #0 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] ldr r1, _08161DD8 adds r2, r2, r1 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] ldr r0, _08161DDC adds r2, r2, r0 adds r0, r5, #0 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] ldr r1, _08161DE0 adds r2, r2, r1 adds r0, r5, #0 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] ldr r0, _08161DE4 adds r2, r2, r0 adds r0, r5, #0 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] ldr r1, _08161DE8 adds r2, r2, r1 adds r0, r5, #0 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData ldr r2, [r4] ldr r0, _08161DEC adds r2, r2, r0 adds r0, r5, #0 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData add sp, #4 pop {r4, r5} pop {r0} @@ -727671,16 +727671,16 @@ _08161DE0: .4byte 0x000031EB _08161DE4: .4byte 0x000031EC _08161DE8: .4byte 0x000031ED _08161DEC: .4byte 0x000031EE - thumb_func_end sub_08161D3C + thumb_func_end CreateRoamerMonInstance - thumb_func_start sub_08161DF0 -sub_08161DF0: @ 0x08161DF0 + thumb_func_start TryStartRoamerEncounter +TryStartRoamerEncounter: @ 0x08161DF0 push {lr} ldr r0, _08161E20 ldr r1, [r0] ldrb r0, [r1, #4] ldrb r1, [r1, #5] - bl sub_08161CFC + bl IsRoamerAt lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -727692,7 +727692,7 @@ sub_08161DF0: @ 0x08161DF0 ands r1, r0 cmp r1, #0 bne _08161E24 - bl sub_08161D3C + bl CreateRoamerMonInstance movs r0, #1 b _08161E26 .align 2, 0 @@ -727703,14 +727703,14 @@ _08161E26: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08161DF0 + thumb_func_end TryStartRoamerEncounter - thumb_func_start sub_08161E2C -sub_08161E2C: @ 0x08161E2C + thumb_func_start UpdateRoamerHPStatus +UpdateRoamerHPStatus: @ 0x08161E2C push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData ldr r5, _08161E58 ldr r1, [r5] ldr r4, _08161E5C @@ -727718,21 +727718,21 @@ sub_08161E2C: @ 0x08161E2C strh r0, [r1, #0xa] adds r0, r6, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData ldr r1, [r5] adds r1, r1, r4 strb r0, [r1, #0xd] - bl sub_08161C14 + bl RoamerMoveToOtherLocationSet pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08161E58: .4byte gUnknown_3005AEC _08161E5C: .4byte 0x000031DC - thumb_func_end sub_08161E2C + thumb_func_end UpdateRoamerHPStatus - thumb_func_start sub_08161E60 -sub_08161E60: @ 0x08161E60 + thumb_func_start SetRoamerInactive +SetRoamerInactive: @ 0x08161E60 ldr r0, _08161E70 ldr r0, [r0] ldr r1, _08161E74 @@ -727743,10 +727743,10 @@ sub_08161E60: @ 0x08161E60 .align 2, 0 _08161E70: .4byte gUnknown_3005AEC _08161E74: .4byte 0x000031DC - thumb_func_end sub_08161E60 + thumb_func_end SetRoamerInactive - thumb_func_start sub_08161E78 -sub_08161E78: @ 0x08161E78 + thumb_func_start GetRoamerLocation +GetRoamerLocation: @ 0x08161E78 ldr r3, _08161E84 ldrb r2, [r3] strb r2, [r0] @@ -727755,7 +727755,7 @@ sub_08161E78: @ 0x08161E78 bx lr .align 2, 0 _08161E84: .4byte gUnknown_203B952 - thumb_func_end sub_08161E78 + thumb_func_end GetRoamerLocation thumb_func_start sub_08161E88 sub_08161E88: @ 0x08161E88 @@ -728060,7 +728060,7 @@ sub_081620D4: @ 0x081620D4 ldr r0, [r0] ldr r1, _0816212C adds r0, r0, r1 - bl sub_081651C8 + bl ClearEReaderTrainer _081620EE: ldr r5, _08162128 ldr r0, [r5] @@ -728079,7 +728079,7 @@ _08162102: ldrh r0, [r1] adds r0, #1 strh r0, [r1] - bl sub_08163DB8 + bl SaveCurrentWinStreak ldr r1, _0816213C ldr r0, [r5] adds r0, r0, r4 @@ -728098,8 +728098,8 @@ _08162138: .4byte 0x00000CB2 _0816213C: .4byte gUnknown_2037290 thumb_func_end sub_081620D4 - thumb_func_start sub_08162140 -sub_08162140: @ 0x08162140 + thumb_func_start ChooseSpecialBattleTowerTrainer +ChooseSpecialBattleTowerTrainer: @ 0x08162140 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -728323,10 +728323,10 @@ _081622EE: bx r1 .align 2, 0 _08162300: .4byte gUnknown_203886A - thumb_func_end sub_08162140 + thumb_func_end ChooseSpecialBattleTowerTrainer - thumb_func_start sub_08162304 -sub_08162304: @ 0x08162304 + thumb_func_start ChooseNextBattleTowerTrainer +ChooseNextBattleTowerTrainer: @ 0x08162304 push {r4, r5, r6, r7, lr} ldr r6, _08162320 ldr r0, [r6] @@ -728348,14 +728348,14 @@ _08162328: adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_081A375C + bl GetCurrentFacilityWinStreak lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #7 bl __udivsi3 lsls r0, r0, #0x10 lsrs r5, r0, #0x10 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel subs r4, #2 cmp r4, #1 bhi _0816239C @@ -728391,7 +728391,7 @@ _08162390: .4byte gUnknown_203886A _08162394: .4byte 0x00000CB4 _08162398: .4byte gUnknown_203886C _0816239C: - bl sub_08162140 + bl ChooseSpecialBattleTowerTrainer lsls r0, r0, #0x18 cmp r0, #0 beq _081623C8 @@ -728483,7 +728483,7 @@ _0816244C: .4byte 0x00000CB2 _08162450: .4byte 0x00000CB4 _08162454: .4byte gUnknown_3005AF0 _08162458: .4byte gUnknown_203886A - thumb_func_end sub_08162304 + thumb_func_end ChooseNextBattleTowerTrainer thumb_func_start sub_0816245C sub_0816245C: @ 0x0816245C @@ -728605,7 +728605,7 @@ sub_08162528: @ 0x08162528 adds r6, r4, #0 lsls r1, r1, #0x18 lsrs r5, r1, #0x18 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r4, r0 @@ -728621,7 +728621,7 @@ _08162550: ldr r0, _0816255C cmp r4, r0 bne _08162560 - bl sub_081A49C8 + bl SetFrontierBrainEventObjGfx_2 b _08162694 .align 2, 0 _0816255C: .4byte 0x000003FE @@ -728788,8 +728788,8 @@ _08162694: _0816269C: .4byte 0x0000401E thumb_func_end sub_08162528 - thumb_func_start sub_081626A0 -sub_081626A0: @ 0x081626A0 + thumb_func_start SetEReaderTrainerGfxId +SetEReaderTrainerGfxId: @ 0x081626A0 push {lr} movs r0, #0xfa lsls r0, r0, #1 @@ -728797,15 +728797,15 @@ sub_081626A0: @ 0x081626A0 bl sub_08162528 pop {r0} bx r0 - thumb_func_end sub_081626A0 + thumb_func_end SetEReaderTrainerGfxId - thumb_func_start sub_081626B0 -sub_081626B0: @ 0x081626B0 + thumb_func_start IsFrontierTrainerFemale +IsFrontierTrainerFemale: @ 0x081626B0 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r4, r0 @@ -728926,10 +728926,10 @@ _0816279A: bx r1 .align 2, 0 _081627A0: .4byte gUnknown_85BBE70 - thumb_func_end sub_081626B0 + thumb_func_end IsFrontierTrainerFemale - thumb_func_start sub_081627A4 -sub_081627A4: @ 0x081627A4 + thumb_func_start PutNewBattleTowerRecord +PutNewBattleTowerRecord: @ 0x081627A4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -729194,15 +729194,15 @@ _0816298E: bx r0 .align 2, 0 _081629A0: .4byte gUnknown_3005AF0 - thumb_func_end sub_081627A4 + thumb_func_end PutNewBattleTowerRecord - thumb_func_start sub_081629A4 -sub_081629A4: @ 0x081629A4 + thumb_func_start GetFrontierTrainerFrontSpriteId +GetFrontierTrainerFrontSpriteId: @ 0x081629A4 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r4, r0 @@ -729342,15 +729342,15 @@ _08162ACE: .align 2, 0 _08162AD4: .4byte gUnknown_82EFF00 _08162AD8: .4byte gUnknown_85DC21C - thumb_func_end sub_081629A4 + thumb_func_end GetFrontierTrainerFrontSpriteId - thumb_func_start sub_08162ADC -sub_08162ADC: @ 0x08162ADC + thumb_func_start GetFrontierOpponentClass +GetFrontierOpponentClass: @ 0x08162ADC push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r4, r0 @@ -729506,7 +729506,7 @@ _08162C28: .4byte gUnknown_82EFF52 _08162C2C: .4byte gUnknown_85DC21C _08162C30: .4byte gUnknown_3005AF0 _08162C34: .4byte 0xFFFFFE70 - thumb_func_end sub_08162ADC + thumb_func_end GetFrontierOpponentClass thumb_func_start sub_08162C38 sub_08162C38: @ 0x08162C38 @@ -729514,7 +729514,7 @@ sub_08162C38: @ 0x08162C38 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r4, r0 @@ -729630,7 +729630,7 @@ sub_08162D24: @ 0x08162D24 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 movs r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r5, r0 @@ -729656,7 +729656,7 @@ _08162D58: cmp r5, r0 bne _08162D6C adds r0, r6, #0 - bl sub_081A4944 + bl CopyFrontierBrainTrainerName b _08162E7C .align 2, 0 _08162D68: .4byte 0x000003FE @@ -729814,7 +729814,7 @@ sub_08162E90: @ 0x08162E90 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r5, r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r4, r0 @@ -729830,7 +729830,7 @@ _08162EB4: ldr r0, _08162EC4 cmp r4, r0 bne _08162EC8 - bl sub_081A49A8 + bl IsFrontierBrainFemale lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08162F62 @@ -729920,8 +729920,8 @@ _08162F62: bx r1 thumb_func_end sub_08162E90 - thumb_func_start sub_08162F68 -sub_08162F68: @ 0x08162F68 + thumb_func_start FillFrontierTrainerParty +FillFrontierTrainerParty: @ 0x08162F68 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -729931,16 +729931,16 @@ sub_08162F68: @ 0x08162F68 ldrh r0, [r0] movs r1, #0 adds r2, r4, #0 - bl sub_08162FE4 + bl FillTrainerParty pop {r4} pop {r0} bx r0 .align 2, 0 _08162F88: .4byte gUnknown_203886A - thumb_func_end sub_08162F68 + thumb_func_end FillFrontierTrainerParty - thumb_func_start sub_08162F8C -sub_08162F8C: @ 0x08162F8C + thumb_func_start FillFrontierTrainersParties +FillFrontierTrainersParties: @ 0x08162F8C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -729950,22 +729950,22 @@ sub_08162F8C: @ 0x08162F8C ldrh r0, [r0] movs r1, #0 adds r2, r4, #0 - bl sub_08162FE4 + bl FillTrainerParty ldr r0, _08162FBC ldrh r0, [r0] movs r1, #3 adds r2, r4, #0 - bl sub_08162FE4 + bl FillTrainerParty pop {r4} pop {r0} bx r0 .align 2, 0 _08162FB8: .4byte gUnknown_203886A _08162FBC: .4byte gUnknown_203886C - thumb_func_end sub_08162F8C + thumb_func_end FillFrontierTrainersParties - thumb_func_start sub_08162FC0 -sub_08162FC0: @ 0x08162FC0 + thumb_func_start FillTentTrainerParty +FillTentTrainerParty: @ 0x08162FC0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -729975,16 +729975,16 @@ sub_08162FC0: @ 0x08162FC0 ldrh r0, [r0] movs r1, #0 adds r2, r4, #0 - bl sub_08165CB0 + bl FillTentTrainerParty_ pop {r4} pop {r0} bx r0 .align 2, 0 _08162FE0: .4byte gUnknown_203886A - thumb_func_end sub_08162FC0 + thumb_func_end FillTentTrainerParty - thumb_func_start sub_08162FE4 -sub_08162FE4: @ 0x08162FE4 + thumb_func_start FillTrainerParty +FillTrainerParty: @ 0x08162FE4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -730002,7 +730002,7 @@ sub_08162FE4: @ 0x08162FE4 add r4, sp, #0x14 movs r0, #0xff strb r0, [r4] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x20] @@ -730078,7 +730078,7 @@ _081630A0: ldr r0, _081630AC cmp r5, r0 bne _081630B0 - bl sub_081A49F4 + bl CreateFrontierBrainPokemon b _08163346 .align 2, 0 _081630AC: .4byte 0x000003FE @@ -730131,7 +730131,7 @@ _081630D6: adds r2, #0x34 adds r1, r1, r2 movs r2, #0 - bl sub_08067ED0 + bl CreateBattleTowerMon2 _08163110: adds r6, #1 adds r7, #1 @@ -730252,7 +730252,7 @@ _081631F2: adds r0, r0, r2 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0816335C ldr r2, [r1] lsls r1, r4, #4 @@ -730278,14 +730278,14 @@ _08163228: movs r1, #0xc movs r2, #0 str r3, [sp, #0x38] - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x38] cmp r0, #0 beq _0816325E adds r0, r5, #0 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _0816335C ldr r2, [r1] lsls r1, r4, #4 @@ -730346,7 +730346,7 @@ _08163288: ldr r2, [sp, #0x30] str r2, [sp, #8] ldr r2, [sp, #0x20] - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID movs r0, #0xff mov r6, sp strb r0, [r6, #0x14] @@ -730374,7 +730374,7 @@ _081632D8: mov r7, sl adds r0, r3, r7 str r3, [sp, #0x38] - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, [r5] ldr r1, [sp, #0x3c] adds r0, r1, r0 @@ -730399,7 +730399,7 @@ _0816330C: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #0x14 - bl sub_0806A774 + bl SetMonData ldr r0, _0816335C ldr r0, [r0] add r0, sb @@ -730409,7 +730409,7 @@ _0816330C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData ldr r7, [sp, #0x34] _0816333E: ldr r0, [sp, #0x1c] @@ -730429,10 +730429,10 @@ _08163346: _08163358: .4byte gUnknown_20243E8 _0816335C: .4byte gUnknown_203B958 _08163360: .4byte gUnknown_85ADBF4 - thumb_func_end sub_08162FE4 + thumb_func_end FillTrainerParty - thumb_func_start sub_08163364 -sub_08163364: @ 0x08163364 + thumb_func_start Unused_CreateApprenticeMons +Unused_CreateApprenticeMons: @ 0x08163364 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -730492,7 +730492,7 @@ _081633B4: str r2, [sp] ldr r2, [sp, #0xc] ldr r3, [sp, #0x10] - bl sub_08067CF8 + bl CreateMonWithEVSpread movs r0, #0xff mov r1, sb strb r0, [r1] @@ -730521,14 +730521,14 @@ _081633F4: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #4 - bl sub_0806A774 + bl SetMonData adds r2, r5, r7 lsls r2, r2, #2 add r2, sl adds r2, #0xe adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r7, r8 cmp r7, #3 bne _081633B4 @@ -730544,15 +730544,15 @@ _081633F4: _08163438: .4byte gUnknown_3005AF0 _0816343C: .4byte 0x00000CA9 _08163440: .4byte gUnknown_20243E8 - thumb_func_end sub_08163364 + thumb_func_end Unused_CreateApprenticeMons - thumb_func_start sub_08163444 -sub_08163444: @ 0x08163444 + thumb_func_start RandomizeFacilityTrainerMonSet +RandomizeFacilityTrainerMonSet: @ 0x08163444 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _08163468 @@ -730602,10 +730602,10 @@ _081634A0: .align 2, 0 _081634A8: .4byte 0x0000FFFF _081634AC: .4byte 0x00000351 - thumb_func_end sub_08163444 + thumb_func_end RandomizeFacilityTrainerMonSet - thumb_func_start sub_081634B0 -sub_081634B0: @ 0x081634B0 + thumb_func_start FillFactoryTrainerParty +FillFactoryTrainerParty: @ 0x081634B0 push {lr} bl ZeroEnemyPartyMons ldr r0, _081634D4 @@ -730620,7 +730620,7 @@ sub_081634B0: @ 0x081634B0 ldr r0, _081634DC ldrh r0, [r0] movs r1, #0 - bl sub_081634F4 + bl FillFactoryFrontierTrainerParty b _081634EA .align 2, 0 _081634D4: .4byte gUnknown_3005AF0 @@ -730630,16 +730630,16 @@ _081634E0: ldr r0, _081634F0 ldrh r0, [r0] movs r1, #0 - bl sub_081636BC + bl FillFactoryTentTrainerParty _081634EA: pop {r0} bx r0 .align 2, 0 _081634F0: .4byte gUnknown_203886A - thumb_func_end sub_081634B0 + thumb_func_end FillFactoryTrainerParty - thumb_func_start sub_081634F4 -sub_081634F4: @ 0x081634F4 + thumb_func_start FillFactoryFrontierTrainerParty +FillFactoryFrontierTrainerParty: @ 0x081634F4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -730735,7 +730735,7 @@ _081635B4: ldr r0, _081635C0 cmp r3, r0 bne _081635C4 - bl sub_081A6A68 + bl FillFactoryBrainParty b _08163696 .align 2, 0 _081635C0: .4byte 0x000003FE @@ -730743,7 +730743,7 @@ _081635C4: movs r0, #0x1f _081635C6: str r0, [sp, #0x18] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x14] @@ -730790,7 +730790,7 @@ _081635EE: str r2, [sp, #8] ldr r2, [sp, #0x14] mov r3, sl - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID movs r1, #0 add r0, sp, #0xc strb r1, [r0] @@ -730812,7 +730812,7 @@ _08163638: adds r0, r6, r2 adds r2, r3, #0 str r3, [sp, #0x1c] - bl sub_081A6DBC + bl SetMonMoveAvoidReturn ldr r3, [sp, #0x1c] adds r0, r3, #1 lsls r0, r0, #0x18 @@ -730827,7 +730827,7 @@ _08163638: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #0xc - bl sub_0806A774 + bl SetMonData ldr r1, _081636B4 ldr r0, [r1] adds r0, r7, r0 @@ -730837,7 +730837,7 @@ _08163638: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r2, sl lsls r0, r2, #0x18 lsrs r7, r0, #0x18 @@ -730858,10 +730858,10 @@ _081636AC: .4byte gUnknown_3005FD8 _081636B0: .4byte gUnknown_20243E8 _081636B4: .4byte gUnknown_203B958 _081636B8: .4byte gUnknown_85ADBF4 - thumb_func_end sub_081634F4 + thumb_func_end FillFactoryFrontierTrainerParty - thumb_func_start sub_081636BC -sub_081636BC: @ 0x081636BC + thumb_func_start FillFactoryTentTrainerParty +FillFactoryTentTrainerParty: @ 0x081636BC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -730914,7 +730914,7 @@ _081636F0: mov r2, sb str r2, [sp, #8] movs r2, #0x1e - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID movs r1, #0 add r0, sp, #0xc strb r1, [r0] @@ -730935,7 +730935,7 @@ _08163738: ldr r2, _081637C0 adds r0, r6, r2 adds r2, r7, #0 - bl sub_081A6DBC + bl SetMonMoveAvoidReturn ldr r1, _081637C4 ldr r0, [r1] adds r0, r5, r0 @@ -730961,7 +730961,7 @@ _08163766: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #0xc - bl sub_0806A774 + bl SetMonData ldr r1, _081637C4 ldr r0, [r1] add r0, r8 @@ -730971,7 +730971,7 @@ _08163766: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData ldr r2, [sp, #0x14] lsls r0, r2, #0x18 lsrs r0, r0, #0x18 @@ -730992,10 +730992,10 @@ _081637BC: .4byte gUnknown_3005FD8 _081637C0: .4byte gUnknown_20243E8 _081637C4: .4byte gUnknown_203B958 _081637C8: .4byte gUnknown_85ADBF4 - thumb_func_end sub_081636BC + thumb_func_end FillFactoryTentTrainerParty - thumb_func_start sub_081637CC -sub_081637CC: @ 0x081637CC + thumb_func_start FrontierSpeechToString +FrontierSpeechToString: @ 0x081637CC push {r4, r5, lr} adds r4, r0, #0 movs r1, #3 @@ -731054,12 +731054,12 @@ _08163830: bx r0 .align 2, 0 _08163838: .4byte gUnknown_2021C7C - thumb_func_end sub_081637CC + thumb_func_end FrontierSpeechToString thumb_func_start sub_0816383C sub_0816383C: @ 0x0816383C push {lr} - bl sub_08165A4C + bl SetFacilityPtrsGetLevel ldr r0, _08163850 ldrh r0, [r0] cmp r0, #0 @@ -731096,7 +731096,7 @@ _08163878: ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString b _081638D0 .align 2, 0 _08163894: .4byte 0x0000012B @@ -731113,7 +731113,7 @@ _0816389C: ldr r1, _081638C0 _081638AE: adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString b _081638D0 .align 2, 0 _081638B8: .4byte 0x0000018F @@ -731124,14 +731124,14 @@ _081638C4: adds r0, #0x70 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0819F888 + bl CopyFriendsApprenticeChallengeText _081638D0: pop {r0} bx r0 thumb_func_end sub_0816383C - thumb_func_start sub_081638D4 -sub_081638D4: @ 0x081638D4 + thumb_func_start HandleSpecialTrainerBattleEnd +HandleSpecialTrainerBattleEnd: @ 0x081638D4 push {r4, r5, r6, lr} sub sp, #4 bl sub_081861F8 @@ -731175,7 +731175,7 @@ _08163924: bl __umodsi3 cmp r0, #0 bne _081639A0 - bl sub_081D9DCC + bl UpdateGymLeaderRematch b _081639A0 .align 2, 0 _08163948: .4byte gUnknown_3005AF0 @@ -731200,7 +731200,7 @@ _08163964: ldr r0, [r6] adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] ldr r0, _08163998 @@ -731208,7 +731208,7 @@ _08163964: adds r0, r4, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r5, #1 cmp r5, #5 ble _08163964 @@ -731217,24 +731217,24 @@ _08163964: _08163994: .4byte gUnknown_3005AEC _08163998: .4byte gUnknown_2024190 _0816399C: - bl sub_081651F8 + bl CopyEReaderTrainerFarewellMessage _081639A0: ldr r0, _081639B0 - bl sub_08000540 + bl SetMainCallback2 add sp, #4 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 -_081639B0: .4byte sub_08085B34 - thumb_func_end sub_081638D4 +_081639B0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic + thumb_func_end HandleSpecialTrainerBattleEnd - thumb_func_start sub_081639B4 -sub_081639B4: @ 0x081639B4 + thumb_func_start Task_StartBattleAfterTransition +Task_StartBattleAfterTransition: @ 0x081639B4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08145FE0 + bl IsBattleTransitionDone lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -731243,21 +731243,21 @@ sub_081639B4: @ 0x081639B4 ldr r1, _081639E4 str r1, [r0, #8] ldr r0, _081639E8 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081639D8: pop {r4} pop {r0} bx r0 .align 2, 0 _081639E0: .4byte gUnknown_3002360 -_081639E4: .4byte sub_081638D4 -_081639E8: .4byte sub_080365B4 - thumb_func_end sub_081639B4 +_081639E4: .4byte HandleSpecialTrainerBattleEnd +_081639E8: .4byte CB2_InitBattle + thumb_func_end Task_StartBattleAfterTransition - thumb_func_start sub_081639EC -sub_081639EC: @ 0x081639EC + thumb_func_start DoSpecialTrainerBattle +DoSpecialTrainerBattle: @ 0x081639EC push {r4, r5, r6, lr} sub sp, #4 ldr r0, _08163A0C @@ -731318,18 +731318,18 @@ _08163A6C: b _08163ACE _08163A76: movs r0, #3 - bl sub_08162F68 + bl FillFrontierTrainerParty b _08163ACE _08163A7E: movs r0, #4 - bl sub_08162F68 + bl FillFrontierTrainerParty ldr r0, [r5] orrs r0, r4 str r0, [r5] b _08163ACE _08163A8C: movs r0, #2 - bl sub_08162F8C + bl FillFrontierTrainersParties ldr r1, _08163AB0 ldr r0, _08163AB4 ldr r0, [r0] @@ -731338,7 +731338,7 @@ _08163A8C: ldrh r0, [r0] strh r0, [r1] ldrh r0, [r1] - bl sub_08165280 + bl FillPartnerParty ldr r0, [r5] ldr r1, _08163ABC orrs r0, r1 @@ -731355,18 +731355,18 @@ _08163AC0: orrs r0, r1 str r0, [r5] movs r0, #2 - bl sub_08162F8C + bl FillFrontierTrainersParties _08163ACE: ldr r0, _08163AE4 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #0 b _08163D38 .align 2, 0 _08163AE0: .4byte 0x00800043 -_08163AE4: .4byte sub_081639B4 +_08163AE4: .4byte Task_StartBattleAfterTransition _08163AE8: movs r5, #0 ldr r6, _08163B2C @@ -731377,7 +731377,7 @@ _08163AEC: ldr r0, _08163B30 adds r0, r4, r0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] movs r0, #0x8e @@ -731387,21 +731387,21 @@ _08163AEC: adds r0, r0, r4 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r5, #1 cmp r5, #5 ble _08163AEC ldr r0, _08163B34 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #0xc b _08163D38 .align 2, 0 _08163B2C: .4byte gUnknown_3005AEC _08163B30: .4byte gUnknown_2024190 -_08163B34: .4byte sub_081639B4 +_08163B34: .4byte Task_StartBattleAfterTransition _08163B38: bl ZeroEnemyPartyMons movs r5, #0 @@ -731431,9 +731431,9 @@ _08163B40: strh r0, [r1] ldr r0, _08163B94 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #0xd b _08163D38 .align 2, 0 @@ -731442,7 +731442,7 @@ _08163B84: .4byte gUnknown_20243E8 _08163B88: .4byte gUnknown_2022C90 _08163B8C: .4byte 0x00000808 _08163B90: .4byte gUnknown_203886A -_08163B94: .4byte sub_081639B4 +_08163B94: .4byte Task_StartBattleAfterTransition _08163B98: ldr r4, _08163BD4 ldr r0, _08163BD8 @@ -731463,11 +731463,11 @@ _08163BB2: cmp r1, r0 bne _08163BC2 movs r0, #2 - bl sub_08162F68 + bl FillFrontierTrainerParty _08163BC2: ldr r0, _08163BE8 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 bl sub_0806E120 movs r0, #3 @@ -731478,7 +731478,7 @@ _08163BD8: .4byte 0x00010008 _08163BDC: .4byte 0x000040CE _08163BE0: .4byte gUnknown_203886A _08163BE4: .4byte 0x000003FE -_08163BE8: .4byte sub_081639B4 +_08163BE8: .4byte Task_StartBattleAfterTransition _08163BEC: ldr r4, _08163C20 ldr r0, _08163C24 @@ -731503,7 +731503,7 @@ _08163C06: cmp r0, #2 beq _08163C34 movs r0, #3 - bl sub_08162F68 + bl FillFrontierTrainerParty b _08163C3A .align 2, 0 _08163C20: .4byte gUnknown_2022C90 @@ -731513,17 +731513,17 @@ _08163C2C: .4byte gUnknown_3005AF0 _08163C30: .4byte 0x00000CA9 _08163C34: movs r0, #3 - bl sub_08162FC0 + bl FillTentTrainerParty _08163C3A: ldr r0, _08163C4C movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #4 b _08163D38 .align 2, 0 -_08163C4C: .4byte sub_081639B4 +_08163C4C: .4byte Task_StartBattleAfterTransition _08163C50: ldr r1, _08163C70 ldr r0, _08163C74 @@ -731538,7 +731538,7 @@ _08163C50: cmp r0, #2 beq _08163C80 movs r0, #3 - bl sub_08162F68 + bl FillFrontierTrainerParty b _08163C86 .align 2, 0 _08163C70: .4byte gUnknown_2022C90 @@ -731547,17 +731547,17 @@ _08163C78: .4byte gUnknown_3005AF0 _08163C7C: .4byte 0x00000CA9 _08163C80: movs r0, #3 - bl sub_08162FC0 + bl FillTentTrainerParty _08163C86: ldr r0, _08163C98 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #5 b _08163D38 .align 2, 0 -_08163C98: .4byte sub_081639B4 +_08163C98: .4byte Task_StartBattleAfterTransition _08163C9C: ldr r4, _08163CCC ldr r0, _08163CD0 @@ -731572,26 +731572,26 @@ _08163C9C: orrs r0, r1 str r0, [r4] _08163CB6: - bl sub_081634B0 + bl FillFactoryTrainerParty ldr r0, _08163CD8 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #6 b _08163D38 .align 2, 0 _08163CCC: .4byte gUnknown_2022C90 _08163CD0: .4byte 0x00080008 _08163CD4: .4byte 0x000040CE -_08163CD8: .4byte sub_081639B4 +_08163CD8: .4byte Task_StartBattleAfterTransition _08163CDC: ldr r1, _08163CEC movs r0, #0x84 lsls r0, r0, #1 str r0, [r1] movs r0, #3 - bl sub_08162F68 + bl FillFrontierTrainerParty b _08163D28 .align 2, 0 _08163CEC: .4byte gUnknown_2022C90 @@ -731600,30 +731600,30 @@ _08163CF0: ldr r0, _08163D14 str r0, [r1] movs r0, #3 - bl sub_08162F68 + bl FillFrontierTrainerParty ldr r0, _08163D18 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #0xa b _08163D38 .align 2, 0 _08163D10: .4byte gUnknown_2022C90 _08163D14: .4byte 0x00200008 -_08163D18: .4byte sub_081639B4 +_08163D18: .4byte Task_StartBattleAfterTransition _08163D1C: ldr r1, _08163D48 ldr r0, _08163D4C str r0, [r1] movs r0, #1 - bl sub_08162F8C + bl FillFrontierTrainersParties _08163D28: ldr r0, _08163D50 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #7 _08163D38: bl sub_080B08F8 @@ -731634,30 +731634,30 @@ _08163D38: .align 2, 0 _08163D48: .4byte gUnknown_2022C90 _08163D4C: .4byte 0x00008109 -_08163D50: .4byte sub_081639B4 +_08163D50: .4byte Task_StartBattleAfterTransition _08163D54: ldr r1, _08163D98 ldr r0, _08163D9C str r0, [r1] ldr r5, _08163DA0 adds r0, r5, #0 - bl sub_08165280 + bl FillPartnerParty ldr r4, _08163DA4 movs r0, #0 strb r0, [r4] ldr r0, _08163DA8 - bl sub_080B0D1C + bl BattleSetup_ConfigureTrainerBattle movs r0, #1 strb r0, [r4] ldr r0, _08163DAC - bl sub_080B0D1C + bl BattleSetup_ConfigureTrainerBattle ldr r0, _08163DB0 strh r5, [r0] ldr r0, _08163DB4 movs r1, #1 - bl sub_080A8878 + bl CreateTask movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM movs r0, #0x12 bl BattleTransition_StartOnField _08163D90: @@ -731673,11 +731673,11 @@ _08163DA4: .4byte gUnknown_203889C _08163DA8: .4byte gUnknown_820DA82 _08163DAC: .4byte gUnknown_820DA91 _08163DB0: .4byte gUnknown_203886E -_08163DB4: .4byte sub_081639B4 - thumb_func_end sub_081639EC +_08163DB4: .4byte Task_StartBattleAfterTransition + thumb_func_end DoSpecialTrainerBattle - thumb_func_start sub_08163DB8 -sub_08163DB8: @ 0x08163DB8 + thumb_func_start SaveCurrentWinStreak +SaveCurrentWinStreak: @ 0x08163DB8 push {r4, r5, r6, lr} ldr r6, _08163E00 ldr r0, [r6] @@ -731716,7 +731716,7 @@ _08163DF8: _08163E00: .4byte gUnknown_3005AF0 _08163E04: .4byte 0x00000CA9 _08163E08: .4byte 0x000040CE - thumb_func_end sub_08163DB8 + thumb_func_end SaveCurrentWinStreak thumb_func_start sub_08163E0C sub_08163E0C: @ 0x08163E0C @@ -731729,7 +731729,7 @@ sub_08163E0C: @ 0x08163E0C ldr r1, _08163E58 adds r5, r0, r1 adds r0, r5, #0 - bl sub_08164E84 + bl ClearBattleTowerRecord ldr r0, [r4] ldr r2, _08163E5C adds r0, r0, r2 @@ -731784,7 +731784,7 @@ _08163E7A: bl CopyTrainerId adds r0, r5, #4 ldr r1, [r4] - bl sub_08008888 + bl StringCopy7 adds r0, r6, #0 adds r1, r7, #0 bl GetCurrentBattleTowerWinStreak @@ -731861,7 +731861,7 @@ _08163F1C: ldr r1, _08163F64 adds r0, r0, r1 bl CalcEmeraldBattleTowerChecksum - bl sub_08163DB8 + bl SaveCurrentWinStreak pop {r3, r4} mov r8, r3 mov sb, r4 @@ -731880,8 +731880,8 @@ _08163F60: .4byte gUnknown_829BDA5 _08163F64: .4byte 0x0000064C thumb_func_end sub_08163E0C - thumb_func_start sub_08163F68 -sub_08163F68: @ 0x08163F68 + thumb_func_start SaveBattleTowerProgress +SaveBattleTowerProgress: @ 0x08163F68 push {r4, r5, lr} ldr r5, _08163FE8 ldr r0, [r5] @@ -731949,7 +731949,7 @@ _08163FF0: .4byte 0x000040CE _08163FF4: .4byte gUnknown_2037282 _08163FF8: .4byte 0x00000CB2 _08163FFC: .4byte 0x00000CA8 - thumb_func_end sub_08163F68 + thumb_func_end SaveBattleTowerProgress thumb_func_start sub_08164000 sub_08164000: @ 0x08164000 @@ -731974,14 +731974,14 @@ sub_08164008: @ 0x08164008 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r4, #0x64 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r6, #0 @@ -732068,7 +732068,7 @@ sub_081640B0: @ 0x081640B0 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x10] @@ -732076,7 +732076,7 @@ sub_081640B0: @ 0x081640B0 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x14] @@ -732224,15 +732224,15 @@ sub_081641C8: @ 0x081641C8 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x1c] adds r4, #0x64 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x20] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r7, #0 ldr r0, [sp, #0x18] lsls r0, r0, #0x18 @@ -732308,7 +732308,7 @@ _081642B4: adds r0, r0, r1 ldrh r0, [r0] mov r8, r0 - bl sub_081626B0 + bl IsFrontierTrainerFemale ldr r4, [sp, #0x40] strb r0, [r4, #0x19] movs r7, #0 @@ -732327,7 +732327,7 @@ _081642D0: str r0, [sp, #0x28] _081642E8: mov r0, r8 - bl sub_08163444 + bl RandomizeFacilityTrainerMonSet lsls r0, r0, #0x10 lsrs r6, r0, #0x10 movs r0, #1 @@ -732499,7 +732499,7 @@ _08164408: adds r4, r4, r5 strh r0, [r4] ldrh r0, [r4] - bl sub_081626B0 + bl IsFrontierTrainerFemale ldr r1, [sp, #0x24] adds r1, #0xa8 strb r0, [r1, #1] @@ -732673,7 +732673,7 @@ _08164588: adds r4, r4, r5 strh r0, [r4] ldrh r0, [r4] - bl sub_081626B0 + bl IsFrontierTrainerFemale ldr r1, [sp, #0x24] adds r1, #0xc0 strb r0, [r1, #1] @@ -732710,7 +732710,7 @@ sub_081645E4: @ 0x081645E4 lsrs r4, r1, #0x10 movs r7, #0 movs r6, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r0, #0xfa lsls r0, r0, #1 cmp r5, r0 @@ -732852,8 +732852,8 @@ sub_08164718: @ 0x08164718 mov r5, r8 push {r5, r6, r7} sub sp, #0xc - bl sub_08165A4C - bl sub_081A375C + bl SetFacilityPtrsGetLevel + bl GetCurrentFacilityWinStreak lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #7 @@ -733192,7 +733192,7 @@ _081649E4: lsls r0, r0, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage b _08164A34 .align 2, 0 _081649FC: .4byte 0x0000018F @@ -733219,7 +733219,7 @@ _08164A08: lsls r1, r1, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_08097B74 + bl ShowFieldMessage _08164A34: add sp, #0xc pop {r3, r4, r5} @@ -733258,7 +733258,7 @@ sub_08164A54: @ 0x08164A54 ldr r2, _08164AA4 adds r0, r0, r2 ldrh r6, [r0] - bl sub_0800A02C + bl GetMultiplayerId ldr r0, _08164AA8 ldrh r0, [r0] cmp r0, #6 @@ -733302,7 +733302,7 @@ _08164AD2: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp] - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 bne _08164AF8 @@ -733313,7 +733313,7 @@ _08164AF8: lsrs r0, r0, #0x18 mov r1, sp movs r2, #4 - bl sub_0800A070 + bl SendBlock ldr r1, _08164B18 movs r0, #1 b _08164C94 @@ -733322,14 +733322,14 @@ _08164B10: .4byte gUnknown_3005AF0 _08164B14: .4byte 0x00000CEC _08164B18: .4byte gUnknown_2037290 _08164B1C: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 beq _08164B2A b _08164C96 _08164B2A: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r1, _08164BB0 movs r0, #0x80 lsls r0, r0, #1 @@ -733404,7 +733404,7 @@ _08164BB4: .4byte gUnknown_3005AF0 _08164BB8: .4byte 0x00000CB4 _08164BBC: .4byte gUnknown_2037290 _08164BC0: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _08164C96 @@ -733416,7 +733416,7 @@ _08164BC0: ldr r3, _08164BEC adds r1, r1, r3 movs r2, #0x28 - bl sub_0800A070 + bl SendBlock ldr r1, _08164BF0 movs r0, #3 b _08164C94 @@ -733425,12 +733425,12 @@ _08164BE8: .4byte gUnknown_3005AF0 _08164BEC: .4byte 0x00000CB4 _08164BF0: .4byte gUnknown_2037290 _08164BF4: - bl sub_0800A114 + bl GetBlockReceivedStatus movs r1, #3 ands r1, r0 cmp r1, #3 bne _08164C96 - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r4, _08164C58 ldr r0, [r4] ldr r5, _08164C5C @@ -733559,7 +733559,7 @@ sub_08164CE4: @ 0x08164CE4 ldr r2, _08164D80 adds r0, r0, r2 ldrh r1, [r4] - bl sub_081659C4 + bl GetBattleTowerTrainerLanguage ldr r6, _08164D84 ldrh r0, [r6, #2] movs r4, #0x64 @@ -733568,7 +733568,7 @@ sub_08164CE4: @ 0x08164CE4 adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [r5] ldr r2, _08164D8C adds r1, r1, r2 @@ -733579,7 +733579,7 @@ sub_08164CE4: @ 0x08164CE4 adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [r5] ldr r2, _08164D94 adds r1, r1, r2 @@ -733651,7 +733651,7 @@ _08164DB6: beq _08164DD6 ldr r3, _08164E34 adds r0, r1, r3 - bl sub_08164E84 + bl ClearBattleTowerRecord _08164DD6: movs r4, #0 adds r7, r5, #0 @@ -733689,7 +733689,7 @@ _08164DF2: lsls r3, r3, #3 adds r0, r1, r3 adds r0, r2, r0 - bl sub_08164E84 + bl ClearBattleTowerRecord _08164E1E: adds r4, r5, #0 cmp r4, #4 @@ -733751,8 +733751,8 @@ _08164E6E: .align 2, 0 thumb_func_end CalcRubyBattleTowerChecksum - thumb_func_start sub_08164E84 -sub_08164E84: @ 0x08164E84 + thumb_func_start ClearBattleTowerRecord +ClearBattleTowerRecord: @ 0x08164E84 push {lr} movs r1, #0 movs r2, #0 @@ -733764,7 +733764,7 @@ _08164E8A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08164E84 + thumb_func_end ClearBattleTowerRecord thumb_func_start GetCurrentBattleTowerWinStreak GetCurrentBattleTowerWinStreak: @ 0x08164E98 @@ -733852,7 +733852,7 @@ _08164F14: ldr r0, [r7] adds r0, r0, r4 mov r1, sb - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08164F5C movs r0, #1 @@ -733861,10 +733861,10 @@ _08164F14: ldr r0, [r7] adds r0, r0, r4 mov r1, sb - bl sub_0806A774 + bl SetMonData ldr r0, [r7] adds r0, r0, r4 - bl sub_080EF0BC + bl GetRibbonCount strb r0, [r5, #1] _08164F5C: adds r5, #4 @@ -733928,8 +733928,8 @@ _08164FD0: .4byte gUnknown_3005AEC _08164FD4: .4byte 0x00000CAA thumb_func_end sub_08164EC8 - thumb_func_start sub_08164FD8 -sub_08164FD8: @ 0x08164FD8 + thumb_func_start FillEReaderTrainerWithPlayerData +FillEReaderTrainerWithPlayerData: @ 0x08164FD8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -733978,7 +733978,7 @@ _08165022: bl CopyTrainerId adds r0, r7, #4 ldr r1, [r5] - bl sub_08008888 + bl StringCopy7 movs r0, #1 strh r0, [r7, #2] movs r6, #7 @@ -734039,7 +734039,7 @@ _081650B0: .4byte gUnknown_85BBE20 _081650B4: .4byte gUnknown_3005AEC _081650B8: .4byte 0x00002BBC _081650BC: .4byte gUnknown_2024190 - thumb_func_end sub_08164FD8 + thumb_func_end FillEReaderTrainerWithPlayerData thumb_func_start sub_081650C0 sub_081650C0: @ 0x081650C0 @@ -734103,8 +734103,8 @@ _08165110: _0816512C: .4byte gUnknown_3005AF0 thumb_func_end GetEreaderTrainerName - thumb_func_start sub_08165130 -sub_08165130: @ 0x08165130 + thumb_func_start ValidateEReaderTrainer +ValidateEReaderTrainer: @ 0x08165130 push {r4, r5, r6, lr} ldr r2, _0816515C movs r0, #0 @@ -734150,7 +734150,7 @@ _0816516E: beq _08165192 ldr r3, _0816519C adds r0, r1, r3 - bl sub_081651C8 + bl ClearEReaderTrainer ldr r1, _081651A0 movs r0, #1 strh r0, [r1] @@ -734162,7 +734162,7 @@ _08165192: _08165198: .4byte 0x00000CA4 _0816519C: .4byte 0x00000BEC _081651A0: .4byte gUnknown_2037290 - thumb_func_end sub_08165130 + thumb_func_end ValidateEReaderTrainer thumb_func_start SetEReaderTrainerChecksum SetEReaderTrainerChecksum: @ 0x081651A4 @@ -734187,8 +734187,8 @@ _081651B2: .align 2, 0 thumb_func_end SetEReaderTrainerChecksum - thumb_func_start sub_081651C8 -sub_081651C8: @ 0x081651C8 + thumb_func_start ClearEReaderTrainer +ClearEReaderTrainer: @ 0x081651C8 push {lr} movs r1, #0 movs r2, #0 @@ -734200,25 +734200,25 @@ _081651CE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081651C8 + thumb_func_end ClearEReaderTrainer - thumb_func_start sub_081651DC -sub_081651DC: @ 0x081651DC + thumb_func_start CopyEReaderTrainerGreeting +CopyEReaderTrainerGreeting: @ 0x081651DC push {lr} ldr r0, _081651F0 ldr r0, [r0] ldr r1, _081651F4 adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString pop {r0} bx r0 .align 2, 0 _081651F0: .4byte gUnknown_3005AF0 _081651F4: .4byte 0x00000BFC - thumb_func_end sub_081651DC + thumb_func_end CopyEReaderTrainerGreeting - thumb_func_start sub_081651F8 -sub_081651F8: @ 0x081651F8 + thumb_func_start CopyEReaderTrainerFarewellMessage +CopyEReaderTrainerFarewellMessage: @ 0x081651F8 push {lr} ldr r0, _0816520C ldrb r0, [r0] @@ -734238,7 +734238,7 @@ _08165214: ldr r0, [r0] ldr r1, _0816522C adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString b _0816523C .align 2, 0 _08165228: .4byte gUnknown_3005AF0 @@ -734248,14 +734248,14 @@ _08165230: ldr r0, [r0] ldr r1, _08165244 adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString _0816523C: pop {r0} bx r0 .align 2, 0 _08165240: .4byte gUnknown_3005AF0 _08165244: .4byte 0x00000C08 - thumb_func_end sub_081651F8 + thumb_func_end CopyEReaderTrainerFarewellMessage thumb_func_start sub_08165248 sub_08165248: @ 0x08165248 @@ -734286,8 +734286,8 @@ _08165278: .4byte gUnknown_3005AF0 _0816527C: .4byte 0x00000CA8 thumb_func_end sub_08165248 - thumb_func_start sub_08165280 -sub_08165280: @ 0x08165280 + thumb_func_start FillPartnerParty +FillPartnerParty: @ 0x08165280 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -734296,7 +734296,7 @@ sub_08165280: @ 0x08165280 sub sp, #0x40 lsls r0, r0, #0x10 lsrs r7, r0, #0x10 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel ldr r0, _081653AC cmp r7, r0 beq _0816529C @@ -734336,7 +734336,7 @@ _081652BC: cmp r7, #0 bne _081652BC ldr r0, [sp, #0x18] - bl sub_0806CB4C + bl GetNatureFromPersonality ldrb r1, [r5, #4] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -734365,7 +734365,7 @@ _081652BC: ldr r4, _081653B4 str r4, [sp, #0xc] mov r3, ip - bl sub_08067730 + bl CreateMon str r7, [sp, #0x18] movs r3, #0 mov r4, r8 @@ -734376,7 +734376,7 @@ _0816532C: adds r1, #0x1a adds r2, r5, r3 adds r0, r6, r4 - bl sub_0806A774 + bl SetMonData ldr r0, [sp, #0x18] adds r0, #1 str r0, [sp, #0x18] @@ -734402,7 +734402,7 @@ _0816535A: ldr r3, [sp, #0x30] ldrb r2, [r3] adds r0, r4, r6 - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, [sp, #0x18] adds r0, #1 str r0, [sp, #0x18] @@ -734417,15 +734417,15 @@ _0816535A: adds r0, r4, #0 movs r1, #7 ldr r2, _081653C4 - bl sub_0806A774 + bl SetMonData movs r0, #0 str r0, [sp, #0x18] adds r0, r4, #0 movs r1, #0x31 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats ldr r1, [sp, #0x38] mov sl, r1 cmp r1, #2 @@ -734459,7 +734459,7 @@ _081653E0: bls _081653E8 b _08165564 _081653E8: - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x24] @@ -734520,7 +734520,7 @@ _08165422: str r4, [sp, #8] lsrs r2, r2, #0x18 mov r3, ip - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID movs r0, #0xff str r0, [sp, #0x1c] movs r0, #0 @@ -734542,7 +734542,7 @@ _08165480: lsrs r2, r2, #0x18 adds r0, r4, r3 str r3, [sp, #0x3c] - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, [r6] adds r0, r5, r0 ldr r2, [sp, #0x18] @@ -734569,7 +734569,7 @@ _081654B0: adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldr r0, _08165558 ldr r1, [r0] ldr r2, [sp, #0x28] @@ -734581,7 +734581,7 @@ _081654B0: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 str r0, [sp, #0x18] movs r2, #0 @@ -734612,7 +734612,7 @@ _081654FA: adds r0, r4, #0 movs r1, #7 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 bl sub_08162E90 lsls r0, r0, #0x18 @@ -734621,7 +734621,7 @@ _081654FA: adds r0, r4, #0 movs r1, #0x31 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData ldr r4, [sp, #0x38] mov sl, r4 cmp r4, #1 @@ -734677,7 +734677,7 @@ _08165588: adds r2, #0x34 adds r1, r1, r2 movs r2, #1 - bl sub_08067ED0 + bl CreateBattleTowerMon2 movs r0, #0 str r0, [sp, #0x18] movs r2, #0 @@ -734712,7 +734712,7 @@ _081655CC: adds r0, r4, #0 movs r1, #7 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData movs r1, #0x96 lsls r1, r1, #1 adds r0, r7, r1 @@ -734725,7 +734725,7 @@ _081655CC: adds r0, r4, #0 movs r1, #0x31 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData ldr r2, [sp, #0x38] mov sl, r2 cmp r2, #1 @@ -734783,7 +734783,7 @@ _0816565E: adds r0, r4, #0 movs r1, #0x31 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r5, #2 movs r2, #1 add sl, r2 @@ -734804,7 +734804,7 @@ _081656B8: .4byte 0xFFFFFE70 _081656BC: .4byte gUnknown_3005AF0 _081656C0: .4byte gUnknown_20242BC _081656C4: .4byte 0x00000CB4 - thumb_func_end sub_08165280 + thumb_func_end FillPartnerParty thumb_func_start sub_081656C8 sub_081656C8: @ 0x081656C8 @@ -735155,8 +735155,8 @@ _08165930: bx r0 thumb_func_end CalcApprenticeChecksum - thumb_func_start sub_08165944 -sub_08165944: @ 0x08165944 + thumb_func_start ClearApprentice +ClearApprentice: @ 0x08165944 push {lr} movs r1, #0 movs r3, #0 @@ -735169,7 +735169,7 @@ _0816594C: bl ResetApprenticeStruct pop {r0} bx r0 - thumb_func_end sub_08165944 + thumb_func_end ClearApprentice thumb_func_start ValidateApprenticesChecksums ValidateApprenticesChecksums: @ 0x0816595C @@ -735213,7 +735213,7 @@ _08165982: adds r0, r1, #0 adds r0, #0xdc adds r0, r2, r0 - bl sub_08165944 + bl ClearApprentice _081659AC: adds r5, r7, #0 cmp r5, #3 @@ -735228,8 +735228,8 @@ _081659AC: _081659C0: .4byte gUnknown_3005AF0 thumb_func_end ValidateApprenticesChecksums - thumb_func_start sub_081659C4 -sub_081659C4: @ 0x081659C4 + thumb_func_start GetBattleTowerTrainerLanguage +GetBattleTowerTrainerLanguage: @ 0x081659C4 push {r4, lr} adds r3, r0, #0 lsls r1, r1, #0x10 @@ -735292,10 +735292,10 @@ _08165A34: _08165A40: .4byte gUnknown_3005AF0 _08165A44: .4byte 0xFFFFFE70 _08165A48: .4byte 0x0000011B - thumb_func_end sub_081659C4 + thumb_func_end GetBattleTowerTrainerLanguage - thumb_func_start sub_08165A4C -sub_08165A4C: @ 0x08165A4C + thumb_func_start SetFacilityPtrsGetLevel +SetFacilityPtrsGetLevel: @ 0x08165A4C push {lr} ldr r0, _08165A78 ldr r0, [r0] @@ -735325,13 +735325,13 @@ _08165A84: .4byte gUnknown_85B4A10 _08165A88: .4byte gUnknown_203B958 _08165A8C: .4byte gUnknown_85B8700 _08165A90: - bl sub_08165B84 + bl SetTentPtrsGetLevel _08165A94: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_08165A4C + thumb_func_end SetFacilityPtrsGetLevel thumb_func_start GetFrontierEnemyMonLevel GetFrontierEnemyMonLevel: @ 0x08165A9C @@ -735346,7 +735346,7 @@ _08165AAA: movs r0, #0x32 b _08165ABC _08165AAE: - bl sub_08165AC0 + bl GetHighestLevelInPlayerParty lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x3b @@ -735357,8 +735357,8 @@ _08165ABC: bx r1 thumb_func_end GetFrontierEnemyMonLevel - thumb_func_start sub_08165AC0 -sub_08165AC0: @ 0x08165AC0 + thumb_func_start GetHighestLevelInPlayerParty +GetHighestLevelInPlayerParty: @ 0x08165AC0 push {r4, r5, r6, lr} movs r6, #0 movs r5, #0 @@ -735371,13 +735371,13 @@ _08165AC6: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _08165B00 adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0xce lsls r1, r1, #1 cmp r0, r1 @@ -735385,7 +735385,7 @@ _08165AC6: adds r0, r4, #0 movs r1, #0x38 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, r6 ble _08165B00 adds r6, r0, #0 @@ -735399,7 +735399,7 @@ _08165B00: bx r1 .align 2, 0 _08165B10: .4byte gUnknown_2024190 - thumb_func_end sub_08165AC0 + thumb_func_end GetHighestLevelInPlayerParty thumb_func_start sub_08165B14 sub_08165B14: @ 0x08165B14 @@ -735466,8 +735466,8 @@ _08165B7E: .align 2, 0 thumb_func_end sub_08165B4C - thumb_func_start sub_08165B84 -sub_08165B84: @ 0x08165B84 + thumb_func_start SetTentPtrsGetLevel +SetTentPtrsGetLevel: @ 0x08165B84 push {lr} ldr r0, _08165BA0 bl VarGet @@ -735523,7 +735523,7 @@ _08165BF4: ldr r0, _08165C20 _08165BFE: str r0, [r1] - bl sub_08165AC0 + bl GetHighestLevelInPlayerParty lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x1d @@ -735537,7 +735537,7 @@ _08165C14: .4byte gUnknown_203B954 _08165C18: .4byte gUnknown_85B4A10 _08165C1C: .4byte gUnknown_203B958 _08165C20: .4byte gUnknown_85B8700 - thumb_func_end sub_08165B84 + thumb_func_end SetTentPtrsGetLevel thumb_func_start sub_08165C24 sub_08165C24: @ 0x08165C24 @@ -735611,8 +735611,8 @@ _08165CA8: .4byte 0x00000CB4 _08165CAC: .4byte gUnknown_203886A thumb_func_end sub_08165C24 - thumb_func_start sub_08165CB0 -sub_08165CB0: @ 0x08165CB0 + thumb_func_start FillTentTrainerParty_ +FillTentTrainerParty_: @ 0x08165CB0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -735625,7 +735625,7 @@ sub_08165CB0: @ 0x08165CB0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 str r2, [sp, #0x1c] - bl sub_08165B84 + bl SetTentPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x20] @@ -735699,7 +735699,7 @@ _08165D50: adds r0, r0, r2 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _08165EBC ldr r2, [r1] lsls r1, r4, #4 @@ -735725,14 +735725,14 @@ _08165D86: movs r1, #0xc movs r2, #0 str r3, [sp, #0x34] - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x34] cmp r0, #0 beq _08165DBC adds r0, r5, #0 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _08165EBC ldr r2, [r1] lsls r1, r4, #4 @@ -735794,7 +735794,7 @@ _08165DE6: ldr r2, [sp, #0x2c] str r2, [sp, #8] ldr r2, [sp, #0x20] - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID add r1, sp, #0x14 movs r0, #0xff strb r0, [r1] @@ -735822,7 +735822,7 @@ _08165E3A: mov r0, r8 add r0, sl str r3, [sp, #0x34] - bl sub_08068D34 + bl SetMonMoveSlot ldr r3, [sp, #0x34] ldr r0, [r3] adds r0, r5, r0 @@ -735846,7 +735846,7 @@ _08165E6A: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #0x14 - bl sub_0806A774 + bl SetMonData ldr r0, _08165EBC ldr r0, [r0] add r0, sb @@ -735856,7 +735856,7 @@ _08165E6A: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData ldr r0, [sp, #0x30] mov r8, r0 _08165E9E: @@ -735877,10 +735877,10 @@ _08165EA6: _08165EB8: .4byte gUnknown_20243E8 _08165EBC: .4byte gUnknown_203B958 _08165EC0: .4byte gUnknown_85ADBF4 - thumb_func_end sub_08165CB0 + thumb_func_end FillTentTrainerParty_ - thumb_func_start sub_08165EC4 -sub_08165EC4: @ 0x08165EC4 + thumb_func_start FacilityClassToGraphicsId +FacilityClassToGraphicsId: @ 0x08165EC4 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -735940,10 +735940,10 @@ _08165F26: bx r1 .align 2, 0 _08165F2C: .4byte gUnknown_85BBE70 - thumb_func_end sub_08165EC4 + thumb_func_end FacilityClassToGraphicsId - thumb_func_start sub_08165F30 -sub_08165F30: @ 0x08165F30 + thumb_func_start ValidateBattleTowerRecord +ValidateBattleTowerRecord: @ 0x08165F30 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -735990,14 +735990,14 @@ _08165F80: lsls r3, r3, #3 adds r0, r1, r3 adds r0, r2, r0 - bl sub_08164E84 + bl ClearBattleTowerRecord _08165F8C: movs r0, #0 _08165F8E: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08165F30 + thumb_func_end ValidateBattleTowerRecord thumb_func_start sub_08165F94 sub_08165F94: @ 0x08165F94 @@ -736008,7 +736008,7 @@ sub_08165F94: @ 0x08165F94 ands r0, r1 cmp r0, #0 beq _08165FF4 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 movs r5, #0 ldr r7, _08166004 @@ -736024,7 +736024,7 @@ _08165FB2: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r1, #0 beq _08165FEE @@ -736040,9 +736040,9 @@ _08165FB2: adds r2, r2, r6 adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats _08165FEE: adds r5, #1 cmp r5, #5 @@ -736059,14 +736059,14 @@ _08166008: .4byte gUnknown_82F00B4 _0816600C: .4byte gUnknown_20243E8 thumb_func_end sub_08165F94 - thumb_func_start sub_08166010 -sub_08166010: @ 0x08166010 + thumb_func_start ChooseMonToGivePokeblock +ChooseMonToGivePokeblock: @ 0x08166010 push {r4, r5, r6, lr} adds r5, r0, #0 adds r6, r1, #0 ldr r4, _08166040 ldr r0, _08166044 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _08166048 ldr r2, _0816604C @@ -736077,7 +736077,7 @@ sub_08166010: @ 0x08166010 ldr r0, _08166050 bl sub_08166178 ldr r0, _08166054 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6} pop {r0} bx r0 @@ -736088,14 +736088,14 @@ _08166048: .4byte gUnknown_203B95C _0816604C: .4byte 0x00007FD0 _08166050: .4byte sub_0816618C _08166054: .4byte sub_08166128 - thumb_func_end sub_08166010 + thumb_func_end ChooseMonToGivePokeblock - thumb_func_start sub_08166058 -sub_08166058: @ 0x08166058 + thumb_func_start CB2_ReturnAndChooseMonToGivePokeblock +CB2_ReturnAndChooseMonToGivePokeblock: @ 0x08166058 push {r4, r5, lr} ldr r4, _081660A8 ldr r0, _081660AC - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r5, _081660B0 ldr r1, _081660B4 @@ -736125,7 +736125,7 @@ _08166090: ldr r0, _081660C4 bl sub_08166178 ldr r0, _081660C8 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 @@ -736139,7 +736139,7 @@ _081660BC: .4byte gUnknown_203B960 _081660C0: .4byte gUnknown_203B968 _081660C4: .4byte sub_0816618C _081660C8: .4byte sub_081660CC - thumb_func_end sub_08166058 + thumb_func_end CB2_ReturnAndChooseMonToGivePokeblock thumb_func_start sub_081660CC sub_081660CC: @ 0x081660CC @@ -736148,13 +736148,13 @@ sub_081660CC: @ 0x081660CC ldr r0, [r4] ldr r0, [r0] bl _call_via_r0 - bl sub_080066D8 + bl AnimateSprites thumb_func_end sub_081660CC thumb_func_start sub_081660DC sub_081660DC: @ 0x081660DC bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade ldr r4, [r4] ldr r1, [r4] ldr r0, _08166108 @@ -736165,7 +736165,7 @@ sub_081660DC: @ 0x081660DC movs r1, #0 strb r1, [r0] ldr r0, _0816610C - bl sub_08000540 + bl SetMainCallback2 _081660FC: pop {r4} pop {r0} @@ -736180,9 +736180,9 @@ _0816610C: .4byte sub_08166110 sub_08166110: @ 0x08166110 push {lr} bl sub_08166704 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -736195,14 +736195,14 @@ sub_08166128: @ 0x08166128 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 - bl sub_080066D8 + bl AnimateSprites thumb_func_end sub_08166128 thumb_func_start sub_08166138 sub_08166138: @ 0x08166138 bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -736212,15 +736212,15 @@ _08166148: .4byte gUnknown_203B95C thumb_func_start sub_0816614C sub_0816614C: @ 0x0816614C push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer ldr r0, _08166170 ldr r0, [r0] ldr r1, _08166174 adds r0, r0, r1 bl sub_081D1750 - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -736301,7 +736301,7 @@ _08166218: b _08166348 _08166222: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 str r0, [sp] movs r1, #0xc0 @@ -736320,7 +736320,7 @@ _08166240: movs r2, #4 bl InitBgsFromTemplates ldr r0, _0816626C - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #0x91 @@ -736425,9 +736425,9 @@ _08166334: movs r1, #1 bl sub_081679A4 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap _08166348: ldr r0, _08166358 ldr r1, [r0] @@ -736473,17 +736473,17 @@ _0816638C: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081663C8 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r1, [r4] adds r1, #0x50 ldrb r0, [r1] @@ -736729,7 +736729,7 @@ _081665D2: bne _0816661A b _08166610 _081665D8: - bl sub_0816706C + bl IsSheenMaxed lsls r0, r0, #0x18 cmp r0, #0 beq _081665F4 @@ -736807,7 +736807,7 @@ _08166644: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, [r5] adds r1, #0x50 ldrb r0, [r1] @@ -736830,28 +736830,28 @@ _08166694: cmp r5, #0 bne _081666E0 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _081666EC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _081666F0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _081666F4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _081666F8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r1, _081666FC ldr r0, _08166700 str r0, [r1, #8] - bl sub_08179C28 + bl CB2_PreparePokeblockFeedScene _081666E0: add sp, #4 pop {r4, r5} @@ -736864,7 +736864,7 @@ _081666F0: .4byte gUnknown_203B970 _081666F4: .4byte gUnknown_203B974 _081666F8: .4byte gUnknown_203B978 _081666FC: .4byte gUnknown_3002360 -_08166700: .4byte sub_08166058 +_08166700: .4byte CB2_ReturnAndChooseMonToGivePokeblock thumb_func_end sub_08166628 thumb_func_start sub_08166704 @@ -736947,28 +736947,28 @@ _081667AC: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes b _081667EA _081667BA: movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg b _081667EA _081667D4: ldr r0, _081667F8 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _081667EA: ldr r0, _081667FC ldr r1, [r0] @@ -736996,7 +736996,7 @@ _08166800: ldr r0, _08166838 bl sub_08166178 ldr r0, _0816683C - bl sub_08000540 + bl SetMainCallback2 _08166824: add sp, #4 pop {r4} @@ -737198,7 +737198,7 @@ _081669C2: bne _081669E6 ldr r0, _081669F0 ldrb r0, [r0] - bl sub_08136FD8 + bl TryClearPokeblock ldr r0, _081669F4 bl sub_08166178 _081669E6: @@ -737242,7 +737242,7 @@ _08166A22: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08166A56 _08166A34: ldr r0, _08166A48 @@ -737260,7 +737260,7 @@ _08166A4C: ldr r1, _08166A64 movs r0, #3 strb r0, [r1, #0x15] - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer _08166A56: ldr r1, [r4] adds r1, #0x50 @@ -737272,7 +737272,7 @@ _08166A56: _08166A64: .4byte gUnknown_20397C8 _08166A68: ldr r0, [r0, #4] - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08166B2C ldr r0, [r0] ldr r1, _08166B30 @@ -737335,24 +737335,24 @@ _08166ABA: bl DestroySprite _08166AF2: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _08166B44 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r5, #0 str r5, [r4] ldr r4, _08166B48 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _08166B4C ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r0, [r6] - bl sub_08000BF0 + bl Free str r5, [r6] - bl sub_080034D4 + bl FreeAllWindowBuffers _08166B24: add sp, #4 pop {r4, r5, r6} @@ -737388,9 +737388,9 @@ sub_08166B50: @ 0x08166B50 adds r0, r0, r1 movs r1, #2 add r2, sp, #0xc - bl sub_0806A058 + bl GetMonData add r0, sp, #0xc - bl sub_0800885C + bl StringGetEnd10 ldr r1, _08166BE4 add r0, sp, #0xc bl StringAppend @@ -737400,11 +737400,11 @@ sub_08166B50: @ 0x08166B50 bl StringCopy movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 movs r1, #0x91 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #2 str r0, [sp] movs r0, #0 @@ -737417,9 +737417,9 @@ sub_08166B50: @ 0x08166B50 bl AddTextPrinterParameterized movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _08166BEC movs r1, #1 movs r2, #0x91 @@ -737461,9 +737461,9 @@ _08166C12: movs r0, #5 bl sub_080A306C movs r0, #2 - bl sub_08098504 + bl rbox_fill_rectangle movs r0, #2 - bl sub_08003774 + bl ClearWindowTilemap _08166C24: lsls r0, r4, #0x18 asrs r0, r0, #0x18 @@ -737479,10 +737479,10 @@ sub_08166C30: @ 0x08166C30 movs r0, #2 movs r1, #0x91 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r3, _08166CAC ldr r0, [r3] adds r0, #0x53 @@ -737534,7 +737534,7 @@ _08166C90: adds r2, #0x61 adds r2, r2, r1 ldrb r2, [r2] - bl sub_08166DD8 + bl Pokeblock_BufferEnhancedStatText b _08166CC4 .align 2, 0 _08166CAC: .4byte gUnknown_203B95C @@ -737546,15 +737546,15 @@ _08166CB4: adds r1, #0x53 ldrb r1, [r1] movs r2, #0 - bl sub_08166DD8 + bl Pokeblock_BufferEnhancedStatText _08166CC4: ldr r0, _08166CE0 - bl sub_08166DB4 + bl Pokeblock_MenuWindowTextPrint movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap pop {r4} pop {r0} bx r0 @@ -737568,7 +737568,7 @@ sub_08166CE8: @ 0x08166CE8 push {r4, r5, lr} movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _08166D20 adds r3, r5, #0 movs r4, #5 @@ -737608,12 +737608,12 @@ _08166D2A: adds r0, r0, r1 ldrb r2, [r0] adds r0, r4, #0 - bl sub_08166DD8 + bl Pokeblock_BufferEnhancedStatText adds r0, r4, #0 - bl sub_08166DB4 + bl Pokeblock_MenuWindowTextPrint movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 _08166D50: pop {r4, r5} @@ -737630,7 +737630,7 @@ sub_08166D5C: @ 0x08166D5C movs r0, #2 movs r1, #0x91 movs r2, #0xe - bl sub_080981E0 + bl DrawTextBorderOuter ldr r2, _08166D94 movs r0, #2 str r0, [sp] @@ -737643,9 +737643,9 @@ sub_08166D5C: @ 0x08166D5C bl AddTextPrinterParameterized movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap add sp, #0xc pop {r0} bx r0 @@ -737657,19 +737657,19 @@ _08166D94: .4byte gUnknown_85CBD57 sub_08166D98: @ 0x08166D98 push {lr} movs r0, #2 - bl sub_08098504 + bl rbox_fill_rectangle movs r0, #2 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08166D98 - thumb_func_start sub_08166DB4 -sub_08166DB4: @ 0x08166DB4 + thumb_func_start Pokeblock_MenuWindowTextPrint +Pokeblock_MenuWindowTextPrint: @ 0x08166DB4 push {lr} sub sp, #0xc ldr r2, _08166DD4 @@ -737687,10 +737687,10 @@ sub_08166DB4: @ 0x08166DB4 bx r0 .align 2, 0 _08166DD4: .4byte gUnknown_2021C7C - thumb_func_end sub_08166DB4 + thumb_func_end Pokeblock_MenuWindowTextPrint - thumb_func_start sub_08166DD8 -sub_08166DD8: @ 0x08166DD8 + thumb_func_start Pokeblock_BufferEnhancedStatText +Pokeblock_BufferEnhancedStatText: @ 0x08166DD8 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -737728,10 +737728,10 @@ _08166E1C: bx r0 .align 2, 0 _08166E24: .4byte gUnknown_85CBD4A - thumb_func_end sub_08166DD8 + thumb_func_end Pokeblock_BufferEnhancedStatText - thumb_func_start sub_08166E28 -sub_08166E28: @ 0x08166E28 + thumb_func_start Pokeblock_GetMonContestStats +Pokeblock_GetMonContestStats: @ 0x08166E28 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r5, r1, #0 @@ -737742,7 +737742,7 @@ _08166E32: adds r0, r0, r7 ldr r1, [r0] adds r0, r6, #0 - bl sub_0806A058 + bl GetMonData adds r1, r5, r4 strb r0, [r1] adds r0, r4, #1 @@ -737755,7 +737755,7 @@ _08166E32: bx r0 .align 2, 0 _08166E54: .4byte gUnknown_85C0994 - thumb_func_end sub_08166E28 + thumb_func_end Pokeblock_GetMonContestStats thumb_func_start sub_08166E58 sub_08166E58: @ 0x08166E58 @@ -737767,7 +737767,7 @@ sub_08166E58: @ 0x08166E58 adds r5, r1, #0 adds r0, r5, #0 movs r1, #0x30 - bl sub_0806A058 + bl GetMonData cmp r0, #0xff beq _08166EF4 mov r0, r8 @@ -737782,7 +737782,7 @@ _08166E7C: ldr r6, [r0] adds r0, r5, #0 adds r1, r6, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strb r0, [r7] @@ -737809,7 +737809,7 @@ _08166EB4: adds r0, r5, #0 adds r1, r6, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -737817,7 +737817,7 @@ _08166EB4: bls _08166E7C adds r0, r5, #0 movs r1, #0x30 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r2, r8 @@ -737834,7 +737834,7 @@ _08166EE6: adds r0, r5, #0 movs r1, #0x30 mov r2, sp - bl sub_0806A774 + bl SetMonData _08166EF4: add sp, #4 pop {r3} @@ -737868,7 +737868,7 @@ sub_08166F08: @ 0x08166F08 ldr r1, [r4] adds r1, #0x57 adds r0, r5, #0 - bl sub_08166E28 + bl Pokeblock_GetMonContestStats ldr r0, [r4] ldr r0, [r0, #8] adds r1, r5, #0 @@ -737876,7 +737876,7 @@ sub_08166F08: @ 0x08166F08 ldr r1, [r4] adds r1, #0x5c adds r0, r5, #0 - bl sub_08166E28 + bl Pokeblock_GetMonContestStats movs r3, #0 _08166F48: ldr r0, [r4] @@ -738025,8 +738025,8 @@ _08167064: .4byte gUnknown_203B95C _08167068: .4byte gUnknown_85C09A8 thumb_func_end sub_08166F88 - thumb_func_start sub_0816706C -sub_0816706C: @ 0x0816706C + thumb_func_start IsSheenMaxed +IsSheenMaxed: @ 0x0816706C push {lr} ldr r0, _08167098 ldr r1, [r0] @@ -738043,7 +738043,7 @@ sub_0816706C: @ 0x0816706C ldrb r1, [r1] movs r2, #0x30 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData cmp r0, #0xff beq _081670A0 movs r0, #0 @@ -738057,7 +738057,7 @@ _081670A2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0816706C + thumb_func_end IsSheenMaxed thumb_func_start sub_081670A8 sub_081670A8: @ 0x081670A8 @@ -738071,7 +738071,7 @@ _081670B0: ldr r1, _081670CC adds r0, r0, r1 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081670D6 cmp r5, #0 @@ -738112,7 +738112,7 @@ _081670F6: ldr r1, _08167124 adds r0, r0, r1 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0816710E adds r0, r6, #1 @@ -738154,7 +738154,7 @@ sub_0816713C: @ 0x0816713C mov r7, r8 push {r7} ldr r0, _081671C4 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _081671C8 bl LoadSpritePalette ldr r2, _081671CC @@ -738184,7 +738184,7 @@ _08167164: ldrsh r2, [r2, r0] ldr r0, _081671D8 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -738284,7 +738284,7 @@ _08167234: ldr r1, _081672A4 adds r0, r0, r1 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 cmp r3, #0 bne _08167270 @@ -738546,7 +738546,7 @@ sub_0816740C: @ 0x0816740C adds r1, r1, r2 strh r0, [r1] adds r0, r5, #0 - bl sub_08008210 + bl LoadSpriteSheet ldr r1, [r7] ldr r3, _081674AC adds r1, r1, r3 @@ -738555,7 +738555,7 @@ sub_0816740C: @ 0x0816740C movs r1, #0x26 movs r2, #0x68 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r0, [r7] @@ -738649,7 +738649,7 @@ _08167518: adds r1, r3, r2 ldrh r1, [r1] movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _08167546: add sp, #0x28 pop {r3} @@ -738712,7 +738712,7 @@ _081675B0: adds r0, r6, #0 movs r1, #0xe2 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -738773,7 +738773,7 @@ _0816762C: adds r0, r6, #0 movs r1, #0xe6 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -738825,7 +738825,7 @@ _0816768E: adds r0, r6, #0 movs r1, #0xde movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -738872,7 +738872,7 @@ _08167706: mov r1, sl bl sub_081D28E0 mov r0, sb - bl sub_08008210 + bl LoadSpriteSheet mov r0, sl bl LoadSpritePalette add sp, #0x60 @@ -738927,36 +738927,36 @@ _08167790: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r1, #0x88 lsls r1, r1, #6 movs r0, #3 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r1, _08167800 movs r0, #0 bl SetGpuReg @@ -739023,7 +739023,7 @@ _08167878: ldr r0, _08167890 movs r1, #0xd0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08167894 ldr r0, [r0] ldr r1, _08167898 @@ -739054,7 +739054,7 @@ _081678B4: ldr r0, _081678D4 movs r1, #0x20 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _08167982 .align 2, 0 _081678CC: .4byte gUnknown_85C0230 @@ -739076,7 +739076,7 @@ _081678F0: ldr r0, _08167918 ldr r1, [r0] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _0816791C movs r0, #0xb str r0, [sp] @@ -739087,7 +739087,7 @@ _081678F0: movs r3, #0xd bl CopyToBgTilemapBufferRect movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _08167982 .align 2, 0 _08167918: .4byte gUnknown_203B96C @@ -739117,11 +739117,11 @@ _0816793C: ldr r0, _08167974 movs r1, #0x30 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08167978 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #2 bl sub_081D1824 b _08167982 @@ -739166,10 +739166,10 @@ sub_081679A4: @ 0x081679A4 mov r8, r1 movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r7, _08167A68 ldr r3, [r7] ldr r1, _08167A6C @@ -739205,7 +739205,7 @@ sub_081679A4: @ 0x081679A4 muls r0, r1, r0 ldr r1, _08167A78 adds r0, r0, r1 - bl sub_0806CB34 + bl GetNature adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -739231,17 +739231,17 @@ sub_081679A4: @ 0x081679A4 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _08167A4E: mov r2, r8 cmp r2, #0 beq _08167A8C movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _08167A9C .align 2, 0 _08167A68: .4byte gUnknown_203B978 @@ -739256,10 +739256,10 @@ _08167A88: .4byte gUnknown_85C09AD _08167A8C: movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _08167A9C: add sp, #0xc pop {r3} @@ -739935,7 +739935,7 @@ _08167FE0: .4byte 0x00008041 _08167FE4: movs r0, #0x66 _08167FE6: - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #4 ldrb r2, [r4, #5] movs r1, #0xf @@ -739957,7 +739957,7 @@ sub_08167FFC: @ 0x08167FFC ldr r1, _08168038 adds r0, r0, r1 movs r1, #0x30 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _0816803C @@ -740013,7 +740013,7 @@ sub_08168050: @ 0x08168050 orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08034388 + bl LoadCompressedSpriteSheet add r0, sp, #8 bl LoadSpritePalette add sp, #0x10 @@ -740057,7 +740057,7 @@ _081680BE: mov r0, sl asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0x40 @@ -740251,14 +740251,14 @@ _08168238: .4byte gUnknown_2023D08 _0816823C: .4byte gUnknown_2022D08 _08168240: .4byte gUnknown_85C0AA4 _08168244: - bl sub_08168900 + bl WallyBufferExecCompleted _08168248: pop {r0} bx r0 thumb_func_end sub_081681FC - thumb_func_start sub_0816824C -sub_0816824C: @ 0x0816824C + thumb_func_start WallyHandleActions +WallyHandleActions: @ 0x0816824C push {r4, r5, lr} ldr r1, _08168268 ldr r0, [r1] @@ -740338,8 +740338,8 @@ _081682D6: movs r1, #9 _081682EC: movs r2, #0 - bl sub_08033FB0 - bl sub_08168900 + bl BtlController_EmitTwoReturnValues + bl WallyBufferExecCompleted ldr r1, [r4] adds r1, #0x94 ldrb r0, [r1] @@ -740365,10 +740365,10 @@ _08168310: movs r0, #5 bl sub_080A306C movs r0, #0 - bl sub_08059910 + bl MoveSelectionDestroyCursorAt movs r0, #1 movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt ldr r0, [r4] adds r0, #0x96 movs r1, #0x40 @@ -740393,14 +740393,14 @@ _08168348: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_08033FB0 - bl sub_08168900 + bl BtlController_EmitTwoReturnValues + bl WallyBufferExecCompleted _0816836C: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816824C + thumb_func_end WallyHandleActions thumb_func_start sub_08168374 sub_08168374: @ 0x08168374 @@ -740420,7 +740420,7 @@ sub_08168374: @ 0x08168374 ldr r0, _081683A8 cmp r1, r0 bne _08168398 - bl sub_08168900 + bl WallyBufferExecCompleted _08168398: pop {r0} bx r0 @@ -740439,30 +740439,30 @@ sub_081683AC: @ 0x081683AC lsls r0, r0, #0x10 cmp r0, #0 bne _081683BE - bl sub_08168900 + bl WallyBufferExecCompleted _081683BE: pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081683AC - thumb_func_start sub_081683C4 -sub_081683C4: @ 0x081683C4 + thumb_func_start CompleteOnFinishedAnimation +CompleteOnFinishedAnimation: @ 0x081683C4 push {lr} ldr r0, _081683D8 ldrb r0, [r0] cmp r0, #0 bne _081683D2 - bl sub_08168900 + bl WallyBufferExecCompleted _081683D2: pop {r0} bx r0 .align 2, 0 _081683D8: .4byte gUnknown_202415D - thumb_func_end sub_081683C4 + thumb_func_end CompleteOnFinishedAnimation - thumb_func_start sub_081683DC -sub_081683DC: @ 0x081683DC + thumb_func_start OpenBagAfterPaletteFade +OpenBagAfterPaletteFade: @ 0x081683DC push {lr} ldr r0, _08168408 ldrb r1, [r0, #7] @@ -740478,8 +740478,8 @@ sub_081683DC: @ 0x081683DC ldr r1, _08168414 str r1, [r0] bl sub_080A8BBC - bl sub_080034D4 - bl sub_081ADB7C + bl FreeAllWindowBuffers + bl DoWallyTutorialBagMenu _08168404: pop {r0} bx r0 @@ -740487,11 +740487,11 @@ _08168404: _08168408: .4byte gUnknown_2037C74 _0816840C: .4byte gUnknown_3005AC0 _08168410: .4byte gUnknown_2023D08 -_08168414: .4byte sub_08168418 - thumb_func_end sub_081683DC +_08168414: .4byte CompleteOnChosenItem + thumb_func_end OpenBagAfterPaletteFade - thumb_func_start sub_08168418 -sub_08168418: @ 0x08168418 + thumb_func_start CompleteOnChosenItem +CompleteOnChosenItem: @ 0x08168418 push {lr} ldr r0, _08168444 ldr r1, [r0, #4] @@ -740507,17 +740507,17 @@ sub_08168418: @ 0x08168418 ldr r0, _08168450 ldrh r1, [r0] movs r0, #1 - bl sub_08034014 - bl sub_08168900 + bl BtlController_EmitOneReturnValue + bl WallyBufferExecCompleted _0816843E: pop {r0} bx r0 .align 2, 0 _08168444: .4byte gUnknown_3002360 -_08168448: .4byte sub_080380FC +_08168448: .4byte BattleMainCB2 _0816844C: .4byte gUnknown_2037C74 _08168450: .4byte gUnknown_203CB48 - thumb_func_end sub_08168418 + thumb_func_end CompleteOnChosenItem thumb_func_start sub_08168454 sub_08168454: @ 0x08168454 @@ -740625,7 +740625,7 @@ _081684DA: ldr r0, [r0] cmp r0, r3 bne _081685E4 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08168582 @@ -740659,7 +740659,7 @@ _081684DA: ldr r2, _081685FC adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r5] eors r0, r6 bl sub_08076320 @@ -740693,7 +740693,7 @@ _08168582: ldr r2, _081685FC adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -740838,7 +740838,7 @@ _0816864A: bl FreeSpritePaletteByTag ldr r0, _08168730 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r2, _08168734 mov r0, r8 ldrb r1, [r0] @@ -740849,8 +740849,8 @@ _0816864A: muls r0, r2, r0 ldr r2, _08168738 adds r0, r0, r2 - bl sub_0805E5AC - bl sub_08168900 + bl HandleLowHpMusicChange + bl WallyBufferExecCompleted _0816870C: pop {r3} mov r8, r3 @@ -740869,8 +740869,8 @@ _08168734: .4byte gUnknown_2023D12 _08168738: .4byte gUnknown_2024190 thumb_func_end sub_08168620 - thumb_func_start sub_0816873C -sub_0816873C: @ 0x0816873C + thumb_func_start CompleteOnHealthbarDone +CompleteOnHealthbarDone: @ 0x0816873C push {r4, r5, r6, lr} ldr r5, _0816877C ldrb r0, [r5] @@ -740879,7 +740879,7 @@ sub_0816873C: @ 0x0816873C ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -740912,8 +740912,8 @@ _08168784: muls r0, r2, r0 ldr r2, _081687A8 adds r0, r0, r2 - bl sub_0805E5AC - bl sub_08168900 + bl HandleLowHpMusicChange + bl WallyBufferExecCompleted _0816879E: pop {r4, r5, r6} pop {r0} @@ -740921,10 +740921,10 @@ _0816879E: .align 2, 0 _081687A4: .4byte gUnknown_2023D12 _081687A8: .4byte gUnknown_2024190 - thumb_func_end sub_0816873C + thumb_func_end CompleteOnHealthbarDone - thumb_func_start sub_081687AC -sub_081687AC: @ 0x081687AC + thumb_func_start DoHitAnimBlinkSpriteEffect +DoHitAnimBlinkSpriteEffect: @ 0x081687AC push {r4, lr} ldr r1, _081687E8 ldr r0, _081687EC @@ -740951,7 +740951,7 @@ sub_081687AC: @ 0x081687AC strb r0, [r2] ldr r0, _081687F4 strb r3, [r0] - bl sub_08168900 + bl WallyBufferExecCompleted b _08168822 .align 2, 0 _081687E8: .4byte gUnknown_2023E88 @@ -740985,7 +740985,7 @@ _08168822: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081687AC + thumb_func_end DoHitAnimBlinkSpriteEffect thumb_func_start sub_08168828 sub_08168828: @ 0x08168828 @@ -741026,7 +741026,7 @@ sub_08168828: @ 0x08168828 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08168900 + bl WallyBufferExecCompleted _0816887C: pop {r4, r5, r6} pop {r0} @@ -741057,7 +741057,7 @@ sub_08168898: @ 0x08168898 ldr r0, _081688CC cmp r1, r0 bne _081688BC - bl sub_08168900 + bl WallyBufferExecCompleted _081688BC: pop {r0} bx r0 @@ -741085,7 +741085,7 @@ sub_081688D0: @ 0x081688D0 ands r0, r1 cmp r0, #0 bne _081688F2 - bl sub_08168900 + bl WallyBufferExecCompleted _081688F2: pop {r0} bx r0 @@ -741094,8 +741094,8 @@ _081688F8: .4byte gUnknown_2024174 _081688FC: .4byte gUnknown_2023D08 thumb_func_end sub_081688D0 - thumb_func_start sub_08168900 -sub_08168900: @ 0x08168900 + thumb_func_start WallyBufferExecCompleted +WallyBufferExecCompleted: @ 0x08168900 push {r4, lr} sub sp, #4 ldr r1, _08168940 @@ -741111,7 +741111,7 @@ sub_08168900: @ 0x08168900 ands r0, r1 cmp r0, #0 beq _08168954 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -741149,7 +741149,7 @@ _08168966: .align 2, 0 _08168970: .4byte gUnknown_2023D0C _08168974: .4byte gUnknown_82FACB4 - thumb_func_end sub_08168900 + thumb_func_end WallyBufferExecCompleted thumb_func_start sub_08168978 sub_08168978: @ 0x08168978 @@ -741168,7 +741168,7 @@ sub_08168978: @ 0x08168978 ands r0, r1 cmp r0, #0 bne _0816899A - bl sub_08168900 + bl WallyBufferExecCompleted _0816899A: pop {r0} bx r0 @@ -741177,8 +741177,8 @@ _081689A0: .4byte gUnknown_2024174 _081689A4: .4byte gUnknown_2023D08 thumb_func_end sub_08168978 - thumb_func_start sub_081689A8 -sub_081689A8: @ 0x081689A8 + thumb_func_start WallyHandleGetMonData +WallyHandleGetMonData: @ 0x081689A8 push {r4, r5, r6, lr} sub sp, #0x100 movs r6, #0 @@ -741196,7 +741196,7 @@ sub_081689A8: @ 0x081689A8 adds r1, r1, r0 ldrb r0, [r1] mov r1, sp - bl sub_08168A1C + bl CopyWallyMonData adds r6, r0, #0 b _08168A02 .align 2, 0 @@ -741215,7 +741215,7 @@ _081689E4: lsrs r0, r0, #0x18 mov r2, sp adds r1, r2, r6 - bl sub_08168A1C + bl CopyWallyMonData adds r6, r6, r0 _081689FA: lsrs r4, r4, #1 @@ -741227,17 +741227,17 @@ _08168A02: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_08168900 + bl BtlController_EmitDataTransfer + bl WallyBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081689A8 + thumb_func_end WallyHandleGetMonData - thumb_func_start sub_08168A1C -sub_08168A1C: @ 0x08168A1C + thumb_func_start CopyWallyMonData +CopyWallyMonData: @ 0x08168A1C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -741337,12 +741337,12 @@ _08168B4C: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -741370,12 +741370,12 @@ _08168B98: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -741390,21 +741390,21 @@ _08168B98: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -741416,7 +741416,7 @@ _08168B98: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -741428,7 +741428,7 @@ _08168B98: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -741440,7 +741440,7 @@ _08168B98: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -741451,7 +741451,7 @@ _08168B98: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -741462,7 +741462,7 @@ _08168B98: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -741474,55 +741474,55 @@ _08168B98: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -741535,7 +741535,7 @@ _08168B98: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -741545,19 +741545,19 @@ _08168B98: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _08168D50: @@ -741608,13 +741608,13 @@ _08168DA6: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -741628,7 +741628,7 @@ _08168DA6: ldr r1, _08168DF4 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -741670,7 +741670,7 @@ _08168E20: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -741681,7 +741681,7 @@ _08168E20: ldr r1, _08168E4C adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -741718,7 +741718,7 @@ _08168E7C: adds r0, r0, r1 movs r1, #0x19 _08168E86: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -741851,27 +741851,27 @@ _08168F6C: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _081691B2 @@ -741956,7 +741956,7 @@ _0816903C: adds r0, r0, r1 movs r1, #0x37 _08169046: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -742045,7 +742045,7 @@ _081690E0: adds r0, r0, r1 movs r1, #0x3f _081690EA: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -742152,7 +742152,7 @@ _081691A0: adds r0, r0, r1 movs r1, #0x36 _081691AA: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _081691B2: @@ -742167,19 +742167,19 @@ _081691B2: bx r1 .align 2, 0 _081691C4: .4byte gUnknown_2024190 - thumb_func_end sub_08168A1C + thumb_func_end CopyWallyMonData thumb_func_start sub_081691C8 sub_081691C8: @ 0x081691C8 push {lr} - bl sub_0805A230 + bl PlayerHandleGetRawMonData pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081691C8 - thumb_func_start sub_081691D4 -sub_081691D4: @ 0x081691D4 + thumb_func_start WallyHandleSetMonData +WallyHandleSetMonData: @ 0x081691D4 push {r4, r5, lr} ldr r1, _081691F8 ldr r0, _081691FC @@ -742194,7 +742194,7 @@ sub_081691D4: @ 0x081691D4 lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_0816922C + bl SetWallyMonData b _08169222 .align 2, 0 _081691F8: .4byte gUnknown_2022D08 @@ -742209,7 +742209,7 @@ _08169208: cmp r0, #0 beq _08169216 adds r0, r5, #0 - bl sub_0816922C + bl SetWallyMonData _08169216: lsrs r4, r4, #1 adds r0, r5, #1 @@ -742218,14 +742218,14 @@ _08169216: cmp r5, #5 bls _08169208 _08169222: - bl sub_08168900 + bl WallyBufferExecCompleted pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081691D4 + thumb_func_end WallyHandleSetMonData - thumb_func_start sub_0816922C -sub_0816922C: @ 0x0816922C + thumb_func_start SetWallyMonData +SetWallyMonData: @ 0x0816922C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -742327,12 +742327,12 @@ _08169360: adds r0, r4, #0 movs r1, #0xb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -742373,12 +742373,12 @@ _081693C6: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r7, #1 adds r4, #2 movs r0, #1 @@ -742394,15 +742394,15 @@ _081693C6: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -742411,7 +742411,7 @@ _081693C6: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x14] lsls r0, r0, #0x16 @@ -742420,7 +742420,7 @@ _081693C6: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x15] lsls r0, r0, #0x19 @@ -742429,7 +742429,7 @@ _081693C6: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r6, #0x14] lsls r0, r0, #0xc @@ -742438,7 +742438,7 @@ _081693C6: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x16] lsls r0, r0, #0x17 @@ -742447,7 +742447,7 @@ _081693C6: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x17] lsls r0, r0, #0x1a @@ -742456,47 +742456,47 @@ _081693C6: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081694F4: .4byte gUnknown_2024190 @@ -742510,7 +742510,7 @@ _081694F8: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169510: .4byte gUnknown_2024190 @@ -742525,7 +742525,7 @@ _08169518: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169530: .4byte gUnknown_2024190 @@ -742549,12 +742549,12 @@ _08169552: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -742568,7 +742568,7 @@ _08169552: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _0816958C: .4byte gUnknown_2024190 @@ -742602,35 +742602,35 @@ _081695B8: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x11 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169614: .4byte gUnknown_2024190 @@ -742651,7 +742651,7 @@ _0816961C: _08169634: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169640: .4byte gUnknown_2024190 @@ -742667,7 +742667,7 @@ _0816964C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169664: .4byte gUnknown_2024190 @@ -742682,7 +742682,7 @@ _0816966C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169684: .4byte gUnknown_2024190 @@ -742697,7 +742697,7 @@ _0816968C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081696A4: .4byte gUnknown_2024190 @@ -742712,7 +742712,7 @@ _081696AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081696C4: .4byte gUnknown_2024190 @@ -742727,7 +742727,7 @@ _081696CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081696E4: .4byte gUnknown_2024190 @@ -742742,7 +742742,7 @@ _081696EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169704: .4byte gUnknown_2024190 @@ -742757,7 +742757,7 @@ _0816970C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169724: .4byte gUnknown_2024190 @@ -742772,7 +742772,7 @@ _0816972C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169744: .4byte gUnknown_2024190 @@ -742787,7 +742787,7 @@ _0816974C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169764: .4byte gUnknown_2024190 @@ -742802,7 +742802,7 @@ _0816976C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169784: .4byte gUnknown_2024190 @@ -742817,7 +742817,7 @@ _0816978C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081697A4: .4byte gUnknown_2024190 @@ -742832,7 +742832,7 @@ _081697AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081697C4: .4byte gUnknown_2024190 @@ -742847,7 +742847,7 @@ _081697CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081697E4: .4byte gUnknown_2024190 @@ -742862,7 +742862,7 @@ _081697EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169804: .4byte gUnknown_2024190 @@ -742879,35 +742879,35 @@ _0816980C: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #5 @@ -742927,7 +742927,7 @@ _0816987C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169894: .4byte gUnknown_2024190 @@ -742942,7 +742942,7 @@ _0816989C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081698B4: .4byte gUnknown_2024190 @@ -742957,7 +742957,7 @@ _081698BC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081698D4: .4byte gUnknown_2024190 @@ -742972,7 +742972,7 @@ _081698DC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081698F4: .4byte gUnknown_2024190 @@ -742987,7 +742987,7 @@ _081698FC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169914: .4byte gUnknown_2024190 @@ -743003,7 +743003,7 @@ _0816991C: adds r2, r2, r7 _0816992C: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169934: .4byte gUnknown_2024190 @@ -743018,7 +743018,7 @@ _0816993C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169954: .4byte gUnknown_2024190 @@ -743033,7 +743033,7 @@ _0816995C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169974: .4byte gUnknown_2024190 @@ -743048,7 +743048,7 @@ _0816997C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169994: .4byte gUnknown_2024190 @@ -743063,7 +743063,7 @@ _0816999C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081699B4: .4byte gUnknown_2024190 @@ -743078,7 +743078,7 @@ _081699BC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081699D4: .4byte gUnknown_2024190 @@ -743093,7 +743093,7 @@ _081699DC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _081699F4: .4byte gUnknown_2024190 @@ -743108,7 +743108,7 @@ _081699FC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169A14: .4byte gUnknown_2024190 @@ -743123,7 +743123,7 @@ _08169A1C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169A34: .4byte gUnknown_2024190 @@ -743138,7 +743138,7 @@ _08169A3C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169A54: .4byte gUnknown_2024190 @@ -743153,7 +743153,7 @@ _08169A5C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169A74: .4byte gUnknown_2024190 @@ -743168,7 +743168,7 @@ _08169A7C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169A94: .4byte gUnknown_2024190 @@ -743183,7 +743183,7 @@ _08169A9C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169AB4: .4byte gUnknown_2024190 @@ -743198,7 +743198,7 @@ _08169ABC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169AD4: .4byte gUnknown_2024190 @@ -743213,7 +743213,7 @@ _08169ADC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169AF4: .4byte gUnknown_2024190 @@ -743228,7 +743228,7 @@ _08169AFC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169B14: .4byte gUnknown_2024190 @@ -743243,7 +743243,7 @@ _08169B1C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169B34: .4byte gUnknown_2024190 @@ -743258,7 +743258,7 @@ _08169B3C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169B54: .4byte gUnknown_2024190 @@ -743273,7 +743273,7 @@ _08169B5C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169B74: .4byte gUnknown_2024190 @@ -743288,7 +743288,7 @@ _08169B7C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169B94: .4byte gUnknown_2024190 @@ -743303,7 +743303,7 @@ _08169B9C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169BB4: .4byte gUnknown_2024190 @@ -743318,7 +743318,7 @@ _08169BBC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _08169BF2 .align 2, 0 _08169BD4: .4byte gUnknown_2024190 @@ -743333,7 +743333,7 @@ _08169BDC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _08169BF2: ldr r2, _08169C24 ldr r0, _08169C20 @@ -743345,7 +743345,7 @@ _08169BF2: muls r0, r2, r0 ldr r2, _08169C1C adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange add sp, #0x34 pop {r3, r4, r5} mov r8, r3 @@ -743358,37 +743358,37 @@ _08169BF2: _08169C1C: .4byte gUnknown_2024190 _08169C20: .4byte gUnknown_2023D08 _08169C24: .4byte gUnknown_2023D12 - thumb_func_end sub_0816922C + thumb_func_end SetWallyMonData - thumb_func_start sub_08169C28 -sub_08169C28: @ 0x08169C28 + thumb_func_start WallyHandleSetRawMonData +WallyHandleSetRawMonData: @ 0x08169C28 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169C28 + thumb_func_end WallyHandleSetRawMonData - thumb_func_start sub_08169C34 -sub_08169C34: @ 0x08169C34 + thumb_func_start WallyHandleLoadMonSprite +WallyHandleLoadMonSprite: @ 0x08169C34 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169C34 + thumb_func_end WallyHandleLoadMonSprite - thumb_func_start sub_08169C40 -sub_08169C40: @ 0x08169C40 + thumb_func_start WallyHandleSwitchInAnim +WallyHandleSwitchInAnim: @ 0x08169C40 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169C40 + thumb_func_end WallyHandleSwitchInAnim - thumb_func_start sub_08169C4C -sub_08169C4C: @ 0x08169C4C + thumb_func_start WallyHandleReturnMonToBall +WallyHandleReturnMonToBall: @ 0x08169C4C push {r4, r5, r6, lr} ldr r0, _08169C78 ldr r6, _08169C7C @@ -743402,7 +743402,7 @@ sub_08169C4C: @ 0x08169C4C adds r0, r2, #0 adds r1, r2, #0 movs r3, #1 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, _08169C80 ldrb r1, [r6] lsls r1, r1, #2 @@ -743438,7 +743438,7 @@ _08169C88: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08168900 + bl WallyBufferExecCompleted _08169CBE: pop {r4, r5, r6} pop {r0} @@ -743447,22 +743447,22 @@ _08169CBE: _08169CC4: .4byte gUnknown_2023E88 _08169CC8: .4byte gUnknown_20205AC _08169CCC: .4byte gUnknown_3005AD0 - thumb_func_end sub_08169C4C + thumb_func_end WallyHandleReturnMonToBall - thumb_func_start sub_08169CD0 -sub_08169CD0: @ 0x08169CD0 + thumb_func_start WallyHandleDrawTrainerPic +WallyHandleDrawTrainerPic: @ 0x08169CD0 push {r4, r5, r6, lr} ldr r4, _08169D78 ldrb r1, [r4] movs r0, #6 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r4] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #6 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r0, _08169D7C ldr r1, _08169D80 ldrb r1, [r1, #0x18] @@ -743475,7 +743475,7 @@ sub_08169CD0: @ 0x08169CD0 asrs r2, r2, #0x10 movs r1, #0x50 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r6, _08169D84 ldrb r1, [r4] adds r1, r1, r6 @@ -743541,22 +743541,22 @@ _08169D8C: .4byte 0x0000FFFE _08169D90: .4byte sub_0805D3C8 _08169D94: .4byte gUnknown_3005AC0 _08169D98: .4byte sub_08168374 - thumb_func_end sub_08169CD0 + thumb_func_end WallyHandleDrawTrainerPic - thumb_func_start sub_08169D9C -sub_08169D9C: @ 0x08169D9C + thumb_func_start WallyHandleTrainerSlide +WallyHandleTrainerSlide: @ 0x08169D9C push {r4, r5, r6, lr} ldr r4, _08169E44 ldrb r1, [r4] movs r0, #6 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r4] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #6 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r0, _08169E48 ldr r1, _08169E4C ldrb r1, [r1, #0x18] @@ -743569,7 +743569,7 @@ sub_08169D9C: @ 0x08169D9C asrs r2, r2, #0x10 movs r1, #0x50 movs r3, #0x1e - bl sub_08006B0C + bl CreateSprite ldr r6, _08169E50 ldrb r1, [r4] adds r1, r1, r6 @@ -743635,37 +743635,37 @@ _08169E58: .4byte 0x0000FFA0 _08169E5C: .4byte sub_0805D3C8 _08169E60: .4byte gUnknown_3005AC0 _08169E64: .4byte sub_08168898 - thumb_func_end sub_08169D9C + thumb_func_end WallyHandleTrainerSlide - thumb_func_start sub_08169E68 -sub_08169E68: @ 0x08169E68 + thumb_func_start WallyHandleTrainerSlideBack +WallyHandleTrainerSlideBack: @ 0x08169E68 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169E68 + thumb_func_end WallyHandleTrainerSlideBack - thumb_func_start sub_08169E74 -sub_08169E74: @ 0x08169E74 + thumb_func_start WallyHandleFaintAnimation +WallyHandleFaintAnimation: @ 0x08169E74 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169E74 + thumb_func_end WallyHandleFaintAnimation - thumb_func_start sub_08169E80 -sub_08169E80: @ 0x08169E80 + thumb_func_start WallyHandlePaletteFade +WallyHandlePaletteFade: @ 0x08169E80 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169E80 + thumb_func_end WallyHandlePaletteFade - thumb_func_start sub_08169E8C -sub_08169E8C: @ 0x08169E8C + thumb_func_start WallyHandleSuccessBallThrowAnim +WallyHandleSuccessBallThrowAnim: @ 0x08169E8C push {r4, r5, lr} ldr r0, _08169ECC ldr r0, [r0] @@ -743685,7 +743685,7 @@ sub_08169E8C: @ 0x08169E8C adds r0, r4, #0 adds r1, r4, #0 movs r3, #4 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _08169ED8 ldrb r0, [r5] lsls r0, r0, #2 @@ -743700,11 +743700,11 @@ _08169ECC: .4byte gUnknown_2024174 _08169ED0: .4byte gUnknown_202415D _08169ED4: .4byte gUnknown_2023D08 _08169ED8: .4byte gUnknown_3005AC0 -_08169EDC: .4byte sub_081683C4 - thumb_func_end sub_08169E8C +_08169EDC: .4byte CompleteOnFinishedAnimation + thumb_func_end WallyHandleSuccessBallThrowAnim - thumb_func_start sub_08169EE0 -sub_08169EE0: @ 0x08169EE0 + thumb_func_start WallyHandleBallThrowAnim +WallyHandleBallThrowAnim: @ 0x08169EE0 push {r4, r5, lr} ldr r1, _08169F28 ldr r5, _08169F2C @@ -743729,7 +743729,7 @@ sub_08169EE0: @ 0x08169EE0 adds r0, r4, #0 adds r1, r4, #0 movs r3, #4 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _08169F38 ldrb r0, [r5] lsls r0, r0, #2 @@ -743745,20 +743745,20 @@ _08169F2C: .4byte gUnknown_2023D08 _08169F30: .4byte gUnknown_2024174 _08169F34: .4byte gUnknown_202415D _08169F38: .4byte gUnknown_3005AC0 -_08169F3C: .4byte sub_081683C4 - thumb_func_end sub_08169EE0 +_08169F3C: .4byte CompleteOnFinishedAnimation + thumb_func_end WallyHandleBallThrowAnim - thumb_func_start sub_08169F40 -sub_08169F40: @ 0x08169F40 + thumb_func_start WallyHandlePause +WallyHandlePause: @ 0x08169F40 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08169F40 + thumb_func_end WallyHandlePause - thumb_func_start sub_08169F4C -sub_08169F4C: @ 0x08169F4C + thumb_func_start WallyHandleMoveAnimation +WallyHandleMoveAnimation: @ 0x08169F4C push {r4, r5, r6, lr} ldr r0, _0816A020 mov ip, r0 @@ -743861,7 +743861,7 @@ sub_08169F4C: @ 0x08169F4C lsrs r3, r0, #0x18 cmp r3, #0 beq _0816A044 - bl sub_08168900 + bl WallyBufferExecCompleted b _0816A062 .align 2, 0 _0816A020: .4byte gUnknown_2022D08 @@ -743896,11 +743896,11 @@ _0816A062: .align 2, 0 _0816A068: .4byte gUnknown_2024174 _0816A06C: .4byte gUnknown_3005AC0 -_0816A070: .4byte sub_0816A074 - thumb_func_end sub_08169F4C +_0816A070: .4byte WallyDoMoveAnimation + thumb_func_end WallyHandleMoveAnimation - thumb_func_start sub_0816A074 -sub_0816A074: @ 0x0816A074 + thumb_func_start WallyDoMoveAnimation +WallyDoMoveAnimation: @ 0x0816A074 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -743957,7 +743957,7 @@ _0816A0CE: adds r1, r3, #0 adds r2, r3, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0816A0EA: ldr r0, [r7] ldrb r1, [r6] @@ -744012,7 +744012,7 @@ _0816A128: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0816A15C: ldr r0, [r7] ldrb r1, [r6] @@ -744054,7 +744054,7 @@ _0816A178: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_08168900 + bl WallyBufferExecCompleted _0816A1B4: pop {r3, r4} mov r8, r3 @@ -744062,10 +744062,10 @@ _0816A1B4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0816A074 + thumb_func_end WallyDoMoveAnimation - thumb_func_start sub_0816A1C0 -sub_0816A1C0: @ 0x0816A1C0 + thumb_func_start WallyHandlePrintString +WallyHandlePrintString: @ 0x0816A1C0 push {r4, lr} ldr r0, _0816A1F8 movs r1, #0 @@ -744078,7 +744078,7 @@ sub_0816A1C0: @ 0x0816A1C0 ldr r1, _0816A204 adds r0, r0, r1 ldrh r0, [r0] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _0816A208 movs r1, #0 bl sub_0814FA04 @@ -744099,32 +744099,32 @@ _0816A204: .4byte gUnknown_2022D0A _0816A208: .4byte gUnknown_2022AE0 _0816A20C: .4byte gUnknown_3005AC0 _0816A210: .4byte sub_081683AC - thumb_func_end sub_0816A1C0 + thumb_func_end WallyHandlePrintString - thumb_func_start sub_0816A214 -sub_0816A214: @ 0x0816A214 + thumb_func_start WallyHandlePrintSelectionString +WallyHandlePrintSelectionString: @ 0x0816A214 push {lr} ldr r0, _0816A22C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0816A230 - bl sub_0816A1C0 + bl WallyHandlePrintString b _0816A234 .align 2, 0 _0816A22C: .4byte gUnknown_2023D08 _0816A230: - bl sub_08168900 + bl WallyBufferExecCompleted _0816A234: pop {r0} bx r0 - thumb_func_end sub_0816A214 + thumb_func_end WallyHandlePrintSelectionString - thumb_func_start sub_0816A238 -sub_0816A238: @ 0x0816A238 + thumb_func_start HandleChooseActionAfterDma3 +HandleChooseActionAfterDma3: @ 0x0816A238 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -744149,11 +744149,11 @@ _0816A264: .4byte gUnknown_2022AC8 _0816A268: .4byte gUnknown_2022ACA _0816A26C: .4byte gUnknown_3005AC0 _0816A270: .4byte gUnknown_2023D08 -_0816A274: .4byte sub_0816824C - thumb_func_end sub_0816A238 +_0816A274: .4byte WallyHandleActions + thumb_func_end HandleChooseActionAfterDma3 - thumb_func_start sub_0816A278 -sub_0816A278: @ 0x0816A278 + thumb_func_start WallyHandleChooseAction +WallyHandleChooseAction: @ 0x0816A278 push {r4, lr} ldr r1, _0816A2C4 ldr r0, _0816A2C8 @@ -744169,7 +744169,7 @@ sub_0816A278: @ 0x0816A278 _0816A292: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_08059910 + bl MoveSelectionDestroyCursorAt adds r4, #1 cmp r4, #3 ble _0816A292 @@ -744179,9 +744179,9 @@ _0816A292: adds r0, r0, r1 ldrb r0, [r0] movs r1, #0 - bl sub_080598C8 + bl ActionSelectionCreateCursorAt ldr r0, _0816A2D8 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _0816A2DC movs r1, #1 bl sub_0814FA04 @@ -744191,24 +744191,24 @@ _0816A292: .align 2, 0 _0816A2C4: .4byte gUnknown_3005AC0 _0816A2C8: .4byte gUnknown_2023D08 -_0816A2CC: .4byte sub_0816A238 +_0816A2CC: .4byte HandleChooseActionAfterDma3 _0816A2D0: .4byte gUnknown_85ABB72 _0816A2D4: .4byte gUnknown_2024150 _0816A2D8: .4byte gUnknown_85ABB57 _0816A2DC: .4byte gUnknown_2022AE0 - thumb_func_end sub_0816A278 + thumb_func_end WallyHandleChooseAction - thumb_func_start sub_0816A2E0 -sub_0816A2E0: @ 0x0816A2E0 + thumb_func_start WallyHandleUnknownYesNoBox +WallyHandleUnknownYesNoBox: @ 0x0816A2E0 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A2E0 + thumb_func_end WallyHandleUnknownYesNoBox - thumb_func_start sub_0816A2EC -sub_0816A2EC: @ 0x0816A2EC + thumb_func_start WallyHandleChooseMove +WallyHandleChooseMove: @ 0x0816A2EC push {r4, lr} ldr r4, _0816A308 ldr r1, [r4] @@ -744229,7 +744229,7 @@ _0816A30C: beq _0816A358 b _0816A37C _0816A312: - bl sub_0805BE2C + bl InitMoveSelectionsVarsAndStrings ldr r1, [r4] adds r1, #0x95 ldrb r0, [r1] @@ -744241,7 +744241,7 @@ _0816A312: strb r1, [r0] b _0816A37C _0816A32A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -744276,17 +744276,17 @@ _0816A358: lsls r2, r2, #1 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 - bl sub_08168900 + bl BtlController_EmitTwoReturnValues + bl WallyBufferExecCompleted _0816A37C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A2EC + thumb_func_end WallyHandleChooseMove - thumb_func_start sub_0816A384 -sub_0816A384: @ 0x0816A384 + thumb_func_start WallyHandleChooseItem +WallyHandleChooseItem: @ 0x0816A384 push {lr} sub sp, #4 movs r0, #1 @@ -744295,7 +744295,7 @@ sub_0816A384: @ 0x0816A384 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0816A3B4 ldr r2, _0816A3B8 ldrb r0, [r2] @@ -744312,37 +744312,37 @@ sub_0816A384: @ 0x0816A384 .align 2, 0 _0816A3B4: .4byte gUnknown_3005AC0 _0816A3B8: .4byte gUnknown_2023D08 -_0816A3BC: .4byte sub_081683DC +_0816A3BC: .4byte OpenBagAfterPaletteFade _0816A3C0: .4byte gUnknown_202415C - thumb_func_end sub_0816A384 + thumb_func_end WallyHandleChooseItem - thumb_func_start sub_0816A3C4 -sub_0816A3C4: @ 0x0816A3C4 + thumb_func_start WallyHandleChoosePokemon +WallyHandleChoosePokemon: @ 0x0816A3C4 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A3C4 + thumb_func_end WallyHandleChoosePokemon - thumb_func_start sub_0816A3D0 -sub_0816A3D0: @ 0x0816A3D0 + thumb_func_start WallyHandleCmd23 +WallyHandleCmd23: @ 0x0816A3D0 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A3D0 + thumb_func_end WallyHandleCmd23 - thumb_func_start sub_0816A3DC -sub_0816A3DC: @ 0x0816A3DC + thumb_func_start WallyHandleHealthBarUpdate +WallyHandleHealthBarUpdate: @ 0x0816A3DC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _0816A454 ldr r0, _0816A458 mov sb, r0 @@ -744370,7 +744370,7 @@ sub_0816A3DC: @ 0x0816A3DC ldr r4, _0816A464 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -744380,7 +744380,7 @@ sub_0816A3DC: @ 0x0816A3DC muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -744408,7 +744408,7 @@ _0816A46C: ldr r1, _0816A4C8 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -744446,85 +744446,85 @@ _0816A4C8: .4byte gUnknown_2024190 _0816A4CC: .4byte gUnknown_3005AD0 _0816A4D0: .4byte gUnknown_3005AC0 _0816A4D4: .4byte gUnknown_2023D08 -_0816A4D8: .4byte sub_0816873C - thumb_func_end sub_0816A3DC +_0816A4D8: .4byte CompleteOnHealthbarDone + thumb_func_end WallyHandleHealthBarUpdate - thumb_func_start sub_0816A4DC -sub_0816A4DC: @ 0x0816A4DC + thumb_func_start WallyHandleExpUpdate +WallyHandleExpUpdate: @ 0x0816A4DC push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A4DC + thumb_func_end WallyHandleExpUpdate thumb_func_start sub_0816A4E8 sub_0816A4E8: @ 0x0816A4E8 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0816A4E8 - thumb_func_start sub_0816A4F4 -sub_0816A4F4: @ 0x0816A4F4 + thumb_func_start WallyHandleStatusAnimation +WallyHandleStatusAnimation: @ 0x0816A4F4 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A4F4 + thumb_func_end WallyHandleStatusAnimation - thumb_func_start sub_0816A500 -sub_0816A500: @ 0x0816A500 + thumb_func_start WallyHandleStatusXor +WallyHandleStatusXor: @ 0x0816A500 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A500 + thumb_func_end WallyHandleStatusXor - thumb_func_start sub_0816A50C -sub_0816A50C: @ 0x0816A50C + thumb_func_start WallyHandleDataTransfer +WallyHandleDataTransfer: @ 0x0816A50C push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A50C + thumb_func_end WallyHandleDataTransfer - thumb_func_start sub_0816A518 -sub_0816A518: @ 0x0816A518 + thumb_func_start WallyHandleDMA3Transfer +WallyHandleDMA3Transfer: @ 0x0816A518 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A518 + thumb_func_end WallyHandleDMA3Transfer - thumb_func_start sub_0816A524 -sub_0816A524: @ 0x0816A524 + thumb_func_start WallyHandlePlayBGM +WallyHandlePlayBGM: @ 0x0816A524 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A524 + thumb_func_end WallyHandlePlayBGM - thumb_func_start sub_0816A530 -sub_0816A530: @ 0x0816A530 + thumb_func_start WallyHandleCmd32 +WallyHandleCmd32: @ 0x0816A530 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A530 + thumb_func_end WallyHandleCmd32 thumb_func_start sub_0816A53C sub_0816A53C: @ 0x0816A53C push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744533,7 +744533,7 @@ sub_0816A53C: @ 0x0816A53C thumb_func_start sub_0816A548 sub_0816A548: @ 0x0816A548 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744542,7 +744542,7 @@ sub_0816A548: @ 0x0816A548 thumb_func_start sub_0816A554 sub_0816A554: @ 0x0816A554 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744551,25 +744551,25 @@ sub_0816A554: @ 0x0816A554 thumb_func_start sub_0816A560 sub_0816A560: @ 0x0816A560 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0816A560 - thumb_func_start sub_0816A56C -sub_0816A56C: @ 0x0816A56C + thumb_func_start WallyHandleCmd37 +WallyHandleCmd37: @ 0x0816A56C push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A56C + thumb_func_end WallyHandleCmd37 thumb_func_start sub_0816A578 sub_0816A578: @ 0x0816A578 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744578,7 +744578,7 @@ sub_0816A578: @ 0x0816A578 thumb_func_start sub_0816A584 sub_0816A584: @ 0x0816A584 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744587,14 +744587,14 @@ sub_0816A584: @ 0x0816A584 thumb_func_start sub_0816A590 sub_0816A590: @ 0x0816A590 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0816A590 - thumb_func_start sub_0816A59C -sub_0816A59C: @ 0x0816A59C + thumb_func_start WallyHandleHitAnimation +WallyHandleHitAnimation: @ 0x0816A59C push {r4, lr} ldr r3, _0816A5C4 ldr r2, _0816A5C8 @@ -744611,7 +744611,7 @@ sub_0816A59C: @ 0x0816A59C lsls r0, r0, #0x1d cmp r0, #0 bge _0816A5D0 - bl sub_08168900 + bl WallyBufferExecCompleted b _0816A5FA .align 2, 0 _0816A5C4: .4byte gUnknown_20205AC @@ -744645,20 +744645,20 @@ _0816A5FA: .align 2, 0 _0816A600: .4byte gUnknown_202415D _0816A604: .4byte gUnknown_3005AC0 -_0816A608: .4byte sub_081687AC - thumb_func_end sub_0816A59C +_0816A608: .4byte DoHitAnimBlinkSpriteEffect + thumb_func_end WallyHandleHitAnimation - thumb_func_start sub_0816A60C -sub_0816A60C: @ 0x0816A60C + thumb_func_start WallyHandleCmd42 +WallyHandleCmd42: @ 0x0816A60C push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816A60C + thumb_func_end WallyHandleCmd42 - thumb_func_start sub_0816A618 -sub_0816A618: @ 0x0816A618 + thumb_func_start WallyHandlePlaySE +WallyHandlePlaySE: @ 0x0816A618 push {lr} ldr r2, _0816A640 ldr r0, _0816A644 @@ -744673,13 +744673,13 @@ sub_0816A618: @ 0x0816A618 lsls r1, r1, #8 orrs r0, r1 bl sub_080A306C - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0816A640: .4byte gUnknown_2022D08 _0816A644: .4byte gUnknown_2023D08 - thumb_func_end sub_0816A618 + thumb_func_end WallyHandlePlaySE thumb_func_start sub_0816A648 sub_0816A648: @ 0x0816A648 @@ -744693,7 +744693,7 @@ sub_0816A648: @ 0x0816A648 ldrb r0, [r0] cmp r0, #0 beq _0816A684 - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -744704,7 +744704,7 @@ sub_0816A648: @ 0x0816A648 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _0816A698 .align 2, 0 _0816A67C: .4byte gUnknown_2022D08 @@ -744718,9 +744718,9 @@ _0816A684: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _0816A698: - bl sub_08168900 + bl WallyBufferExecCompleted pop {r4, r5} pop {r0} bx r0 @@ -744741,12 +744741,12 @@ sub_0816A6A4: @ 0x0816A6A4 ldr r1, _0816A6DC adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 - bl sub_080A2B3C - bl sub_08168900 + bl PlayCry1 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744765,13 +744765,13 @@ sub_0816A6E0: @ 0x0816A6E0 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _0816A710 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -744780,8 +744780,8 @@ _0816A70C: .4byte gUnknown_2023D08 _0816A710: .4byte gUnknown_20240A0 thumb_func_end sub_0816A6E0 - thumb_func_start sub_0816A714 -sub_0816A714: @ 0x0816A714 + thumb_func_start WallyHandleIntroTrainerBallThrow +WallyHandleIntroTrainerBallThrow: @ 0x0816A714 push {r4, r5, r6, r7, lr} ldr r6, _0816A84C ldr r7, _0816A850 @@ -744848,7 +744848,7 @@ sub_0816A714: @ 0x0816A714 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _0816A860 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r0, [r7] adds r0, r0, r6 ldrb r1, [r0] @@ -744869,7 +744869,7 @@ sub_0816A714: @ 0x0816A714 lsls r2, r2, #1 adds r1, r4, r2 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldrb r0, [r7] adds r0, r0, r6 ldrb r0, [r0] @@ -744884,7 +744884,7 @@ sub_0816A714: @ 0x0816A714 strb r0, [r1, #5] ldr r0, _0816A86C movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _0816A870 @@ -744945,10 +744945,10 @@ _0816A86C: .4byte sub_0816AA0C _0816A870: .4byte gUnknown_3005B60 _0816A874: .4byte gUnknown_2024174 _0816A878: .4byte gUnknown_2024158 -_0816A87C: .4byte sub_0807352C +_0816A87C: .4byte Task_HidePartyStatusSummary _0816A880: .4byte gUnknown_3005AC0 _0816A884: .4byte sub_08057068 - thumb_func_end sub_0816A714 + thumb_func_end WallyHandleIntroTrainerBallThrow thumb_func_start sub_0816A888 sub_0816A888: @ 0x0816A888 @@ -744982,13 +744982,13 @@ sub_0816A888: @ 0x0816A888 ldr r1, _0816A9EC adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _0816A9F0 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _0816A9F4 mov sb, r1 add sb, r6 @@ -745000,12 +745000,12 @@ sub_0816A888: @ 0x0816A888 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0816A9F8 mov sl, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -745022,7 +745022,7 @@ sub_0816A888: @ 0x0816A888 mov r0, sl adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0816A9FC adds r4, r6, r4 strb r0, [r4] @@ -745096,7 +745096,7 @@ sub_0816A888: @ 0x0816A888 str r1, [r0] movs r0, #0 movs r1, #0xff - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sb ldrb r2, [r1] lsls r1, r2, #4 @@ -745172,7 +745172,7 @@ _0816AA30: str r1, [r0] strb r5, [r4] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0816AA66: pop {r4, r5, r6} pop {r0} @@ -745185,8 +745185,8 @@ _0816AA78: .4byte gUnknown_3005AC0 _0816AA7C: .4byte sub_08168454 thumb_func_end sub_0816AA0C - thumb_func_start sub_0816AA80 -sub_0816AA80: @ 0x0816AA80 + thumb_func_start WallyHandleDrawPartyStatusSummary +WallyHandleDrawPartyStatusSummary: @ 0x0816AA80 push {r4, r5, lr} ldr r1, _0816AAA8 ldr r0, _0816AAAC @@ -745198,11 +745198,11 @@ sub_0816AA80: @ 0x0816AA80 cmp r0, #0 beq _0816AAB0 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0816AAB0 - bl sub_08168900 + bl WallyBufferExecCompleted b _0816AAEE .align 2, 0 _0816AAA8: .4byte gUnknown_2022D08 @@ -745231,12 +745231,12 @@ _0816AAB0: subs r3, #2 adds r4, r4, r3 ldrb r3, [r4] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _0816AB00 ldrb r1, [r5] adds r1, r1, r2 strb r0, [r1] - bl sub_08168900 + bl WallyBufferExecCompleted _0816AAEE: pop {r4, r5} pop {r0} @@ -745246,37 +745246,37 @@ _0816AAF4: .4byte gUnknown_2024174 _0816AAF8: .4byte gUnknown_2023D08 _0816AAFC: .4byte gUnknown_2022D0C _0816AB00: .4byte gUnknown_2024158 - thumb_func_end sub_0816AA80 + thumb_func_end WallyHandleDrawPartyStatusSummary - thumb_func_start sub_0816AB04 -sub_0816AB04: @ 0x0816AB04 + thumb_func_start WallyHandleHidePartyStatusSummary +WallyHandleHidePartyStatusSummary: @ 0x0816AB04 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816AB04 + thumb_func_end WallyHandleHidePartyStatusSummary - thumb_func_start sub_0816AB10 -sub_0816AB10: @ 0x0816AB10 + thumb_func_start WallyHandleEndBounceEffect +WallyHandleEndBounceEffect: @ 0x0816AB10 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816AB10 + thumb_func_end WallyHandleEndBounceEffect - thumb_func_start sub_0816AB1C -sub_0816AB1C: @ 0x0816AB1C + thumb_func_start WallyHandleSpriteInvisibility +WallyHandleSpriteInvisibility: @ 0x0816AB1C push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816AB1C + thumb_func_end WallyHandleSpriteInvisibility - thumb_func_start sub_0816AB28 -sub_0816AB28: @ 0x0816AB28 + thumb_func_start WallyHandleBattleAnimation +WallyHandleBattleAnimation: @ 0x0816AB28 push {r4, r5, r6, lr} sub sp, #4 ldr r5, _0816AB60 @@ -745297,11 +745297,11 @@ sub_0816AB28: @ 0x0816AB28 str r4, [sp] adds r0, r2, #0 adds r1, r2, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _0816AB68 - bl sub_08168900 + bl WallyBufferExecCompleted b _0816AB74 .align 2, 0 _0816AB60: .4byte gUnknown_2022D08 @@ -745321,28 +745321,28 @@ _0816AB74: .align 2, 0 _0816AB7C: .4byte gUnknown_3005AC0 _0816AB80: .4byte sub_081688D0 - thumb_func_end sub_0816AB28 + thumb_func_end WallyHandleBattleAnimation - thumb_func_start sub_0816AB84 -sub_0816AB84: @ 0x0816AB84 + thumb_func_start WallyHandleLinkStandbyMsg +WallyHandleLinkStandbyMsg: @ 0x0816AB84 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816AB84 + thumb_func_end WallyHandleLinkStandbyMsg - thumb_func_start sub_0816AB90 -sub_0816AB90: @ 0x0816AB90 + thumb_func_start WallyHandleResetActionMoveSelection +WallyHandleResetActionMoveSelection: @ 0x0816AB90 push {lr} - bl sub_08168900 + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816AB90 + thumb_func_end WallyHandleResetActionMoveSelection - thumb_func_start sub_0816AB9C -sub_0816AB9C: @ 0x0816AB9C + thumb_func_start WallyHandleCmd55 +WallyHandleCmd55: @ 0x0816AB9C push {r4, lr} ldr r2, _0816ABE0 ldr r1, _0816ABE4 @@ -745357,7 +745357,7 @@ sub_0816AB9C: @ 0x0816AB9C bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_08168900 + bl WallyBufferExecCompleted ldr r0, _0816ABEC ldr r0, [r0] movs r1, #6 @@ -745381,7 +745381,7 @@ _0816ABE8: .4byte gUnknown_2023D08 _0816ABEC: .4byte gUnknown_2022C90 _0816ABF0: .4byte gUnknown_3005AC0 _0816ABF4: .4byte sub_080583C0 - thumb_func_end sub_0816AB9C + thumb_func_end WallyHandleCmd55 thumb_func_start sub_0816ABF8 sub_0816ABF8: @ 0x0816ABF8 @@ -745389,8 +745389,8 @@ sub_0816ABF8: @ 0x0816ABF8 .align 2, 0 thumb_func_end sub_0816ABF8 - thumb_func_start sub_0816ABFC -sub_0816ABFC: @ 0x0816ABFC + thumb_func_start NewGameInitPCItems +NewGameInitPCItems: @ 0x0816ABFC push {r4, r5, r6, lr} movs r4, #0 ldr r0, _0816AC58 @@ -745399,7 +745399,7 @@ sub_0816ABFC: @ 0x0816ABFC lsls r1, r1, #3 adds r0, r0, r1 movs r1, #0x32 - bl sub_080D6494 + bl ClearItemSlots ldr r1, _0816AC5C ldrh r0, [r1] cmp r0, #0 @@ -745415,7 +745415,7 @@ _0816AC22: ldrh r0, [r0] adds r1, r1, r6 ldrh r1, [r1] - bl sub_080D6588 + bl AddPCItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -745439,10 +745439,10 @@ _0816AC50: .align 2, 0 _0816AC58: .4byte gUnknown_3005AEC _0816AC5C: .4byte gUnknown_85C0BE0 - thumb_func_end sub_0816ABFC + thumb_func_end NewGameInitPCItems - thumb_func_start sub_0816AC60 -sub_0816AC60: @ 0x0816AC60 + thumb_func_start BedroomPC +BedroomPC: @ 0x0816AC60 push {lr} ldr r1, _0816AC88 ldr r0, _0816AC8C @@ -745452,12 +745452,12 @@ sub_0816AC60: @ 0x0816AC60 strb r0, [r1] ldr r0, _0816AC94 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0816AC98 ldr r2, _0816AC9C - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r0} bx r0 .align 2, 0 @@ -745467,10 +745467,10 @@ _0816AC90: .4byte gUnknown_203B980 _0816AC94: .4byte sub_080A8A40 _0816AC98: .4byte gUnknown_85C942E _0816AC9C: .4byte sub_0816ACE0 - thumb_func_end sub_0816AC60 + thumb_func_end BedroomPC - thumb_func_start sub_0816ACA0 -sub_0816ACA0: @ 0x0816ACA0 + thumb_func_start PlayerPC +PlayerPC: @ 0x0816ACA0 push {lr} ldr r1, _0816ACC8 ldr r0, _0816ACCC @@ -745480,12 +745480,12 @@ sub_0816ACA0: @ 0x0816ACA0 strb r0, [r1] ldr r0, _0816ACD4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0816ACD8 ldr r2, _0816ACDC - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r0} bx r0 .align 2, 0 @@ -745495,7 +745495,7 @@ _0816ACD0: .4byte gUnknown_203B980 _0816ACD4: .4byte sub_080A8A40 _0816ACD8: .4byte gUnknown_85C942E _0816ACDC: .4byte sub_0816ACE0 - thumb_func_end sub_0816ACA0 + thumb_func_end PlayerPC thumb_func_start sub_0816ACE0 sub_0816ACE0: @ 0x0816ACE0 @@ -745524,20 +745524,20 @@ _0816AD0C: .4byte gUnknown_85C0C08 _0816AD10: ldr r0, _0816AD98 _0816AD12: - bl sub_08003250 + bl AddWindow strh r0, [r7, #8] ldrb r0, [r7, #8] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r7, #8] @@ -745556,7 +745556,7 @@ _0816AD12: movs r1, #1 adds r2, r4, #0 movs r3, #2 - bl sub_081989B4 + bl AddItemMenuActionTextPrinters ldrb r0, [r7, #8] str r6, [sp] ldrb r1, [r5] @@ -745568,7 +745568,7 @@ _0816AD12: movs r3, #2 bl sub_081984B0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0816ADA8 mov r2, r8 lsls r0, r2, #2 @@ -745589,11 +745589,11 @@ _0816AD9C: .4byte gUnknown_203B980 _0816ADA0: .4byte gUnknown_85C0B98 _0816ADA4: .4byte gUnknown_203B97C _0816ADA8: .4byte gUnknown_3005B60 -_0816ADAC: .4byte sub_0816ADB0 +_0816ADAC: .4byte PlayerPCProcessMenuInput thumb_func_end sub_0816ACE0 - thumb_func_start sub_0816ADB0 -sub_0816ADB0: @ 0x0816ADB0 + thumb_func_start PlayerPCProcessMenuInput +PlayerPCProcessMenuInput: @ 0x0816ADB0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -745606,13 +745606,13 @@ sub_0816ADB0: @ 0x0816ADB0 ldrb r0, [r0] cmp r0, #3 bls _0816ADD8 - bl sub_0819867C + bl Menu_ProcessInput b _0816ADDC .align 2, 0 _0816ADD0: .4byte gUnknown_3005B68 _0816ADD4: .4byte gUnknown_203B980 _0816ADD8: - bl sub_081986E8 + bl Menu_ProcessInputNoWrap _0816ADDC: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -745631,11 +745631,11 @@ _0816ADDC: movs r1, #0 bl sub_08198134 ldrb r0, [r4, #8] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0816AE24 lsls r0, r6, #2 adds r0, r0, r6 @@ -745646,17 +745646,17 @@ _0816ADDC: b _0816AE64 .align 2, 0 _0816AE24: .4byte gUnknown_3005B60 -_0816AE28: .4byte sub_0816AF60 +_0816AE28: .4byte PlayerPC_TurnOff _0816AE2C: ldrb r0, [r4, #8] movs r1, #0 bl sub_08198134 ldrb r0, [r4, #8] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _0816AE6C lsls r1, r6, #2 adds r1, r1, r6 @@ -745680,22 +745680,22 @@ _0816AE64: _0816AE6C: .4byte gUnknown_3005B60 _0816AE70: .4byte gUnknown_85C0B98 _0816AE74: .4byte gUnknown_203B97C - thumb_func_end sub_0816ADB0 + thumb_func_end PlayerPCProcessMenuInput - thumb_func_start sub_0816AE78 -sub_0816AE78: @ 0x0816AE78 + thumb_func_start ReshowPlayerPC +ReshowPlayerPC: @ 0x0816AE78 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0816AE8C ldr r2, _0816AE90 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r0} bx r0 .align 2, 0 _0816AE8C: .4byte gUnknown_85C942E _0816AE90: .4byte sub_0816ACE0 - thumb_func_end sub_0816AE78 + thumb_func_end ReshowPlayerPC thumb_func_start PlayerPC_ItemStorage PlayerPC_ItemStorage: @ 0x0816AE94 @@ -745718,11 +745718,11 @@ PlayerPC_ItemStorage: @ 0x0816AE94 bx r0 .align 2, 0 _0816AEB8: .4byte gUnknown_3005B60 -_0816AEBC: .4byte sub_0816B06C +_0816AEBC: .4byte ItemStorageMenuProcessInput thumb_func_end PlayerPC_ItemStorage - thumb_func_start sub_0816AEC0 -sub_0816AEC0: @ 0x0816AEC0 + thumb_func_start PlayerPC_Mailbox +PlayerPC_Mailbox: @ 0x0816AEC0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -745737,12 +745737,12 @@ sub_0816AEC0: @ 0x0816AEC0 ldr r1, _0816AEE8 ldr r2, _0816AEEC adds r0, r4, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _0816AF42 .align 2, 0 _0816AEE4: .4byte gUnknown_203B984 _0816AEE8: .4byte gUnknown_85CA976 -_0816AEEC: .4byte sub_0816AE78 +_0816AEEC: .4byte ReshowPlayerPC _0816AEF0: strh r1, [r5] strh r1, [r5, #2] @@ -745750,7 +745750,7 @@ _0816AEF0: strb r0, [r5, #9] bl Mailbox_UpdateMailList adds r0, r4, #0 - bl sub_0816B2E4 + bl ItemStorage_SetItemAndMailCount ldrb r0, [r5, #5] bl sub_081D1340 lsls r0, r0, #0x18 @@ -745772,23 +745772,23 @@ _0816AEF0: b _0816AF42 .align 2, 0 _0816AF30: .4byte gUnknown_3005B60 -_0816AF34: .4byte sub_0816B488 +_0816AF34: .4byte Mailbox_ProcessInput _0816AF38: ldr r1, _0816AF48 ldr r2, _0816AF4C adds r0, r6, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _0816AF42: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _0816AF48: .4byte gUnknown_85CA976 -_0816AF4C: .4byte sub_0816AE78 - thumb_func_end sub_0816AEC0 +_0816AF4C: .4byte ReshowPlayerPC + thumb_func_end PlayerPC_Mailbox - thumb_func_start sub_0816AF50 -sub_0816AF50: @ 0x0816AF50 + thumb_func_start PlayerPC_Decoration +PlayerPC_Decoration: @ 0x0816AF50 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -745796,10 +745796,10 @@ sub_0816AF50: @ 0x0816AF50 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816AF50 + thumb_func_end PlayerPC_Decoration - thumb_func_start sub_0816AF60 -sub_0816AF60: @ 0x0816AF60 + thumb_func_start PlayerPC_TurnOff +PlayerPC_TurnOff: @ 0x0816AF60 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -745826,14 +745826,14 @@ _0816AF8C: .align 2, 0 _0816AF94: .4byte gUnknown_81F0DDB _0816AF98: - bl sub_080988C4 + bl EnableBothScriptContexts _0816AF9C: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 - thumb_func_end sub_0816AF60 + thumb_func_end PlayerPC_TurnOff thumb_func_start sub_0816AFA8 sub_0816AFA8: @ 0x0816AFA8 @@ -745852,15 +745852,15 @@ sub_0816AFA8: @ 0x0816AFA8 ldr r0, _0816B030 adds r4, r4, r0 ldr r0, _0816B034 - bl sub_08003250 + bl AddWindow strh r0, [r4, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -745874,7 +745874,7 @@ sub_0816AFA8: @ 0x0816AFA8 str r1, [sp, #8] movs r1, #1 movs r3, #2 - bl sub_08198850 + bl PrintTextArray ldrb r0, [r4, #8] mov r1, r8 str r1, [sp] @@ -745885,12 +745885,12 @@ sub_0816AFA8: @ 0x0816AFA8 movs r3, #2 bl sub_081984B0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _0816B03C lsls r5, r5, #2 adds r5, r5, r0 ldr r0, [r5] - bl sub_0816B040 + bl ItemStorageMenuPrint add sp, #0xc pop {r3} mov r8, r3 @@ -745904,8 +745904,8 @@ _0816B038: .4byte gUnknown_85C0BC0 _0816B03C: .4byte gUnknown_85C0B88 thumb_func_end sub_0816AFA8 - thumb_func_start sub_0816B040 -sub_0816B040: @ 0x0816B040 + thumb_func_start ItemStorageMenuPrint +ItemStorageMenuPrint: @ 0x0816B040 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -745926,21 +745926,21 @@ sub_0816B040: @ 0x0816B040 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816B040 + thumb_func_end ItemStorageMenuPrint - thumb_func_start sub_0816B06C -sub_0816B06C: @ 0x0816B06C + thumb_func_start ItemStorageMenuProcessInput +ItemStorageMenuProcessInput: @ 0x0816B06C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_0819867C + bl Menu_ProcessInput adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r4, r4, #0x18 @@ -745974,7 +745974,7 @@ _0816B0BC: lsls r1, r2, #2 adds r1, r1, r0 ldr r0, [r1] - bl sub_0816B040 + bl ItemStorageMenuPrint b _0816B0E4 .align 2, 0 _0816B0D4: .4byte gUnknown_85C0B88 @@ -745982,16 +745982,16 @@ _0816B0D8: movs r0, #5 bl sub_080A306C adds r0, r6, #0 - bl sub_0816B2C8 + bl ItemStorage_Exit _0816B0E4: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816B06C + thumb_func_end ItemStorageMenuProcessInput - thumb_func_start sub_0816B0EC -sub_0816B0EC: @ 0x0816B0EC + thumb_func_start ItemStorage_Deposit +ItemStorage_Deposit: @ 0x0816B0EC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -746004,16 +746004,16 @@ sub_0816B0EC: @ 0x0816B0EC str r0, [r1] movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 _0816B10C: .4byte gUnknown_3005B60 -_0816B110: .4byte sub_0816B114 - thumb_func_end sub_0816B0EC +_0816B110: .4byte Task_ItemStorage_Deposit + thumb_func_end ItemStorage_Deposit - thumb_func_start sub_0816B114 -sub_0816B114: @ 0x0816B114 + thumb_func_start Task_ItemStorage_Deposit +Task_ItemStorage_Deposit: @ 0x0816B114 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -746023,17 +746023,17 @@ sub_0816B114: @ 0x0816B114 ands r0, r1 cmp r0, #0 bne _0816B134 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps bl sub_081AA98C adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0816B134: pop {r4} pop {r0} bx r0 .align 2, 0 _0816B13C: .4byte gUnknown_2037C74 - thumb_func_end sub_0816B114 + thumb_func_end Task_ItemStorage_Deposit thumb_func_start sub_0816B140 sub_0816B140: @ 0x0816B140 @@ -746042,7 +746042,7 @@ sub_0816B140: @ 0x0816B140 ldr r1, _0816B158 str r1, [r0] ldr r0, _0816B15C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -746060,12 +746060,12 @@ sub_0816B160: @ 0x0816B160 bl sub_08196FB8 ldr r0, _0816B188 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 bl sub_0816AFA8 - bl sub_080AE99C + bl pal_fill_black pop {r0} bx r0 .align 2, 0 @@ -746095,11 +746095,11 @@ _0816B1AC: bx r0 .align 2, 0 _0816B1B4: .4byte gUnknown_3005B60 -_0816B1B8: .4byte sub_0816B06C +_0816B1B8: .4byte ItemStorageMenuProcessInput thumb_func_end sub_0816B18C - thumb_func_start sub_0816B1BC -sub_0816B1BC: @ 0x0816B1BC + thumb_func_start ItemStorage_Withdraw +ItemStorage_Withdraw: @ 0x0816B1BC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -746116,7 +746116,7 @@ sub_0816B1BC: @ 0x0816B1BC beq _0816B1E8 adds r0, r5, #0 movs r1, #0 - bl sub_0816B254 + bl ItemStorage_WithdrawToss_Helper b _0816B1F8 .align 2, 0 _0816B1E4: .4byte gUnknown_3005B68 @@ -746126,7 +746126,7 @@ _0816B1E8: ldr r1, _0816B200 ldr r2, _0816B204 adds r0, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _0816B1F8: pop {r4, r5} pop {r0} @@ -746134,10 +746134,10 @@ _0816B1F8: .align 2, 0 _0816B200: .4byte gUnknown_85CA918 _0816B204: .4byte PlayerPC_ItemStorage - thumb_func_end sub_0816B1BC + thumb_func_end ItemStorage_Withdraw - thumb_func_start sub_0816B208 -sub_0816B208: @ 0x0816B208 + thumb_func_start ItemStorage_Toss +ItemStorage_Toss: @ 0x0816B208 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -746154,7 +746154,7 @@ sub_0816B208: @ 0x0816B208 beq _0816B234 adds r0, r5, #0 movs r1, #1 - bl sub_0816B254 + bl ItemStorage_WithdrawToss_Helper b _0816B244 .align 2, 0 _0816B230: .4byte gUnknown_3005B68 @@ -746164,7 +746164,7 @@ _0816B234: ldr r1, _0816B24C ldr r2, _0816B250 adds r0, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField _0816B244: pop {r4, r5} pop {r0} @@ -746172,10 +746172,10 @@ _0816B244: .align 2, 0 _0816B24C: .4byte gUnknown_85CA918 _0816B250: .4byte PlayerPC_ItemStorage - thumb_func_end sub_0816B208 + thumb_func_end ItemStorage_Toss - thumb_func_start sub_0816B254 -sub_0816B254: @ 0x0816B254 + thumb_func_start ItemStorage_WithdrawToss_Helper +ItemStorage_WithdrawToss_Helper: @ 0x0816B254 push {r4, r5, r6, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -746197,9 +746197,9 @@ sub_0816B254: @ 0x0816B254 movs r0, #0xff strb r0, [r1, #9] adds r0, r4, #0 - bl sub_0816B2E4 + bl ItemStorage_SetItemAndMailCount bl sub_0816BA54 - bl sub_0808E1F0 + bl UpdateShoalTideFlag bl sub_08122334 ldr r0, _0816B2C0 ldr r0, [r0] @@ -746223,10 +746223,10 @@ _0816B2B8: .4byte gUnknown_3005B68 _0816B2BC: .4byte gUnknown_203B984 _0816B2C0: .4byte gUnknown_203B990 _0816B2C4: .4byte sub_0816BF8C - thumb_func_end sub_0816B254 + thumb_func_end ItemStorage_WithdrawToss_Helper - thumb_func_start sub_0816B2C8 -sub_0816B2C8: @ 0x0816B2C8 + thumb_func_start ItemStorage_Exit +ItemStorage_Exit: @ 0x0816B2C8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -746234,15 +746234,15 @@ sub_0816B2C8: @ 0x0816B2C8 adds r0, r4, #0 bl sub_0816B300 adds r0, r4, #0 - bl sub_0816AE78 + bl ReshowPlayerPC pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816B2C8 + thumb_func_end ItemStorage_Exit - thumb_func_start sub_0816B2E4 -sub_0816B2E4: @ 0x0816B2E4 + thumb_func_start ItemStorage_SetItemAndMailCount +ItemStorage_SetItemAndMailCount: @ 0x0816B2E4 push {lr} ldr r1, _0816B2F4 ldrb r0, [r1, #5] @@ -746258,7 +746258,7 @@ _0816B2FA: strb r0, [r1, #4] pop {r0} bx r0 - thumb_func_end sub_0816B2E4 + thumb_func_end ItemStorage_SetItemAndMailCount thumb_func_start sub_0816B300 sub_0816B300: @ 0x0816B300 @@ -746274,11 +746274,11 @@ sub_0816B300: @ 0x0816B300 movs r1, #0 bl sub_08198134 ldrb r0, [r4, #8] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -746421,12 +746421,12 @@ sub_0816B41C: @ 0x0816B41C lsls r5, r5, #0x18 lsrs r5, r5, #0x18 movs r0, #0 - bl sub_081D1380 + bl UpdateWorldOfMastersAndPutItOnTheAir adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 - bl sub_081D1380 + bl UpdateWorldOfMastersAndPutItOnTheAir ldr r2, _0816B47C movs r0, #2 str r0, [sp] @@ -746438,7 +746438,7 @@ sub_0816B41C: @ 0x0816B41C movs r3, #2 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r4, _0816B480 adds r0, r4, #0 bl sub_081D13F4 @@ -746462,8 +746462,8 @@ _0816B480: .4byte gUnknown_203B984 _0816B484: .4byte gUnknown_3005B60 thumb_func_end sub_0816B41C - thumb_func_start sub_0816B488 -sub_0816B488: @ 0x0816B488 + thumb_func_start Mailbox_ProcessInput +Mailbox_ProcessInput: @ 0x0816B488 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -746486,7 +746486,7 @@ sub_0816B488: @ 0x0816B488 cmp r0, #0 bne _0816B532 ldrb r0, [r4, #0xa] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r6, r0, #0 ldrb r0, [r4, #0xa] ldr r7, _0816B4E4 @@ -746512,9 +746512,9 @@ _0816B4E8: bl sub_080A306C mov r1, r8 ldrb r0, [r1, #9] - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair adds r0, r5, #0 - bl sub_0816B5A4 + bl Mailbox_ReturnToPlayerPC b _0816B532 _0816B4FE: movs r0, #5 @@ -746526,12 +746526,12 @@ _0816B4FE: ldrb r0, [r4, #0xa] adds r1, r7, #0 mov r2, r8 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram mov r1, r8 ldrb r0, [r1, #9] - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair mov r0, sl subs r0, #8 add r0, sb @@ -746547,7 +746547,7 @@ _0816B532: bx r0 .align 2, 0 _0816B540: .4byte sub_0816B544 - thumb_func_end sub_0816B488 + thumb_func_end Mailbox_ProcessInput thumb_func_start sub_0816B544 sub_0816B544: @ 0x0816B544 @@ -746573,11 +746573,11 @@ sub_0816B544: @ 0x0816B544 ldr r5, _0816B598 ldr r1, _0816B59C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _0816B5A0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r4, r5} pop {r0} bx r0 @@ -746591,8 +746591,8 @@ _0816B59C: .4byte gUnknown_85CA988 _0816B5A0: .4byte sub_0816B5E8 thumb_func_end sub_0816B544 - thumb_func_start sub_0816B5A4 -sub_0816B5A4: @ 0x0816B5A4 + thumb_func_start Mailbox_ReturnToPlayerPC +Mailbox_ReturnToPlayerPC: @ 0x0816B5A4 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -746609,18 +746609,18 @@ sub_0816B5A4: @ 0x0816B5A4 ldrb r0, [r4, #0xa] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram bl sub_081D1508 adds r0, r5, #0 - bl sub_0816AE78 + bl ReshowPlayerPC pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0816B5E4: .4byte gUnknown_3005B68 - thumb_func_end sub_0816B5A4 + thumb_func_end Mailbox_ReturnToPlayerPC thumb_func_start sub_0816B5E8 sub_0816B5E8: @ 0x0816B5E8 @@ -746632,13 +746632,13 @@ sub_0816B5E8: @ 0x0816B5E8 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 movs r0, #2 - bl sub_081D1380 + bl UpdateWorldOfMastersAndPutItOnTheAir adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -746652,7 +746652,7 @@ sub_0816B5E8: @ 0x0816B5E8 adds r0, r4, #0 movs r1, #1 movs r3, #2 - bl sub_08198850 + bl PrintTextArray mov r0, r8 str r0, [sp] str r6, [sp, #4] @@ -746664,7 +746664,7 @@ sub_0816B5E8: @ 0x0816B5E8 movs r3, #2 bl sub_081984B0 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0816B664 lsls r0, r5, #2 adds r0, r0, r5 @@ -746681,16 +746681,16 @@ sub_0816B5E8: @ 0x0816B5E8 .align 2, 0 _0816B660: .4byte gUnknown_85C0BE8 _0816B664: .4byte gUnknown_3005B60 -_0816B668: .4byte sub_0816B66C +_0816B668: .4byte Mailbox_MailOptionsProcessInput thumb_func_end sub_0816B5E8 - thumb_func_start sub_0816B66C -sub_0816B66C: @ 0x0816B66C + thumb_func_start Mailbox_MailOptionsProcessInput +Mailbox_MailOptionsProcessInput: @ 0x0816B66C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r6, r5, #0 - bl sub_08198768 + bl ProcessMenuInput_other lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 @@ -746703,7 +746703,7 @@ sub_0816B66C: @ 0x0816B66C movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_0816BA14 + bl Mailbox_Cancel b _0816B6AE _0816B698: movs r0, #5 @@ -746721,17 +746721,17 @@ _0816B6AE: bx r0 .align 2, 0 _0816B6B4: .4byte gUnknown_85C0BE8 - thumb_func_end sub_0816B66C + thumb_func_end Mailbox_MailOptionsProcessInput - thumb_func_start sub_0816B6B8 -sub_0816B6B8: @ 0x0816B6B8 + thumb_func_start Mailbox_DoMailRead +Mailbox_DoMailRead: @ 0x0816B6B8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r1, _0816B6DC lsls r0, r4, #2 adds r0, r0, r4 @@ -746744,11 +746744,11 @@ sub_0816B6B8: @ 0x0816B6B8 bx r0 .align 2, 0 _0816B6DC: .4byte gUnknown_3005B60 -_0816B6E0: .4byte sub_0816B6E4 - thumb_func_end sub_0816B6B8 +_0816B6E0: .4byte Mailbox_FadeAndReadMail + thumb_func_end Mailbox_DoMailRead - thumb_func_start sub_0816B6E4 -sub_0816B6E4: @ 0x0816B6E4 + thumb_func_start Mailbox_FadeAndReadMail +Mailbox_FadeAndReadMail: @ 0x0816B6E4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -746759,7 +746759,7 @@ sub_0816B6E4: @ 0x0816B6E4 cmp r0, #0 bne _0816B726 bl sub_081D1508 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r2, _0816B730 ldr r1, _0816B734 ldrh r0, [r1] @@ -746777,7 +746777,7 @@ sub_0816B6E4: @ 0x0816B6E4 movs r2, #1 bl sub_08121568 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0816B726: pop {r4} pop {r0} @@ -746788,7 +746788,7 @@ _0816B730: .4byte gUnknown_3005AEC _0816B734: .4byte gUnknown_203B984 _0816B738: .4byte 0x00002BE0 _0816B73C: .4byte sub_0816B740 - thumb_func_end sub_0816B6E4 + thumb_func_end Mailbox_FadeAndReadMail thumb_func_start sub_0816B740 sub_0816B740: @ 0x0816B740 @@ -746797,22 +746797,22 @@ sub_0816B740: @ 0x0816B740 ldr r1, _0816B758 str r1, [r0] ldr r0, _0816B75C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _0816B754: .4byte gUnknown_3005B0C -_0816B758: .4byte sub_0816B760 +_0816B758: .4byte pal_fill_for_maplights_or_black _0816B75C: .4byte sub_08085A30 thumb_func_end sub_0816B740 - thumb_func_start sub_0816B760 -sub_0816B760: @ 0x0816B760 + thumb_func_start pal_fill_for_maplights_or_black +pal_fill_for_maplights_or_black: @ 0x0816B760 push {r4, lr} bl sub_08196F98 ldr r0, _0816B78C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _0816B790 @@ -746830,13 +746830,13 @@ _0816B78C: .4byte sub_0816B7A4 _0816B790: .4byte gUnknown_203B984 _0816B794: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0816B79A: - bl sub_080AE99C + bl pal_fill_black pop {r4} pop {r0} bx r0 - thumb_func_end sub_0816B760 + thumb_func_end pal_fill_for_maplights_or_black thumb_func_start sub_0816B7A4 sub_0816B7A4: @ 0x0816B7A4 @@ -746861,7 +746861,7 @@ _0816B7C4: bx r0 .align 2, 0 _0816B7CC: .4byte gUnknown_3005B60 -_0816B7D0: .4byte sub_0816B488 +_0816B7D0: .4byte Mailbox_ProcessInput thumb_func_end sub_0816B7A4 thumb_func_start sub_0816B7D4 @@ -746871,16 +746871,16 @@ sub_0816B7D4: @ 0x0816B7D4 lsrs r0, r0, #0x18 ldr r1, _0816B7E8 ldr r2, _0816B7EC - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r0} bx r0 .align 2, 0 _0816B7E8: .4byte gUnknown_85CA99A -_0816B7EC: .4byte sub_0816B7F0 +_0816B7EC: .4byte Mailbox_DrawYesNoBeforeMove thumb_func_end sub_0816B7D4 - thumb_func_start sub_0816B7F0 -sub_0816B7F0: @ 0x0816B7F0 + thumb_func_start Mailbox_DrawYesNoBeforeMove +Mailbox_DrawYesNoBeforeMove: @ 0x0816B7F0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -746898,11 +746898,11 @@ sub_0816B7F0: @ 0x0816B7F0 bx r0 .align 2, 0 _0816B810: .4byte gUnknown_3005B60 -_0816B814: .4byte sub_0816B818 - thumb_func_end sub_0816B7F0 +_0816B814: .4byte Mailbox_MoveToBagYesNoPrompt + thumb_func_end Mailbox_DrawYesNoBeforeMove - thumb_func_start sub_0816B818 -sub_0816B818: @ 0x0816B818 + thumb_func_start Mailbox_MoveToBagYesNoPrompt +Mailbox_MoveToBagYesNoPrompt: @ 0x0816B818 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -746922,23 +746922,23 @@ sub_0816B818: @ 0x0816B818 b _0816B850 _0816B83C: adds r0, r4, #0 - bl sub_0816B858 + bl Mailbox_DoMailMoveToBag b _0816B850 _0816B844: movs r0, #5 bl sub_080A306C _0816B84A: adds r0, r4, #0 - bl sub_0816B8EC + bl Mailbox_CancelMoveToBag _0816B850: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816B818 + thumb_func_end Mailbox_MoveToBagYesNoPrompt - thumb_func_start sub_0816B858 -sub_0816B858: @ 0x0816B858 + thumb_func_start Mailbox_DoMailMoveToBag +Mailbox_DoMailMoveToBag: @ 0x0816B858 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -746957,26 +746957,26 @@ sub_0816B858: @ 0x0816B858 adds r5, r1, r0 ldrh r0, [r5, #0x20] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 bne _0816B8A8 ldr r1, _0816B8A0 ldr r2, _0816B8A4 adds r0, r6, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField b _0816B8DC .align 2, 0 _0816B894: .4byte gUnknown_3005AEC _0816B898: .4byte gUnknown_203B984 _0816B89C: .4byte 0x00002BE0 _0816B8A0: .4byte gUnknown_85CA9B3 -_0816B8A4: .4byte sub_0816BA14 +_0816B8A4: .4byte Mailbox_Cancel _0816B8A8: ldr r1, _0816B8E4 ldr r2, _0816B8E8 adds r0, r6, #0 - bl sub_081976D0 + bl DisplayItemMessageOnField adds r0, r5, #0 bl ClearMailStruct bl Mailbox_UpdateMailList @@ -746995,29 +746995,29 @@ _0816B8A8: strh r0, [r4, #2] _0816B8D6: adds r0, r6, #0 - bl sub_0816B2E4 + bl ItemStorage_SetItemAndMailCount _0816B8DC: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _0816B8E4: .4byte gUnknown_85CA9C2 -_0816B8E8: .4byte sub_0816BA14 - thumb_func_end sub_0816B858 +_0816B8E8: .4byte Mailbox_Cancel + thumb_func_end Mailbox_DoMailMoveToBag - thumb_func_start sub_0816B8EC -sub_0816B8EC: @ 0x0816B8EC + thumb_func_start Mailbox_CancelMoveToBag +Mailbox_CancelMoveToBag: @ 0x0816B8EC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0816BA14 + bl Mailbox_Cancel pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816B8EC + thumb_func_end Mailbox_CancelMoveToBag - thumb_func_start sub_0816B8FC -sub_0816B8FC: @ 0x0816B8FC + thumb_func_start Mailbox_Give +Mailbox_Give: @ 0x0816B8FC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -747031,7 +747031,7 @@ sub_0816B8FC: @ 0x0816B8FC _0816B914: movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _0816B930 lsls r1, r4, #2 adds r1, r1, r4 @@ -747046,7 +747046,7 @@ _0816B92A: .align 2, 0 _0816B930: .4byte gUnknown_3005B60 _0816B934: .4byte sub_0816B938 - thumb_func_end sub_0816B8FC + thumb_func_end Mailbox_Give thumb_func_start sub_0816B938 sub_0816B938: @ 0x0816B938 @@ -747060,10 +747060,10 @@ sub_0816B938: @ 0x0816B938 cmp r0, #0 bne _0816B95C bl sub_081D1508 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps bl sub_081B80E8 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0816B95C: pop {r4} pop {r0} @@ -747079,21 +747079,21 @@ sub_0816B968: @ 0x0816B968 ldr r1, _0816B980 str r1, [r0] ldr r0, _0816B984 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _0816B97C: .4byte gUnknown_3005B0C -_0816B980: .4byte sub_0816B988 +_0816B980: .4byte Mailbox_UpdateMailListAfterDeposit _0816B984: .4byte sub_08085A30 thumb_func_end sub_0816B968 - thumb_func_start sub_0816B988 -sub_0816B988: @ 0x0816B988 + thumb_func_start Mailbox_UpdateMailListAfterDeposit +Mailbox_UpdateMailListAfterDeposit: @ 0x0816B988 push {r4, r5, r6, lr} ldr r0, _0816B9E0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r5, _0816B9E4 @@ -747116,7 +747116,7 @@ sub_0816B988: @ 0x0816B988 strh r0, [r5, #2] _0816B9BE: adds r0, r6, #0 - bl sub_0816B2E4 + bl ItemStorage_SetItemAndMailCount bl sub_08196F98 ldr r0, _0816B9E4 ldrb r0, [r0, #5] @@ -747133,13 +747133,13 @@ _0816B9E0: .4byte sub_0816B7A4 _0816B9E4: .4byte gUnknown_203B984 _0816B9E8: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0816B9EE: - bl sub_080AE99C + bl pal_fill_black pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0816B988 + thumb_func_end Mailbox_UpdateMailListAfterDeposit thumb_func_start sub_0816B9F8 sub_0816B9F8: @ 0x0816B9F8 @@ -747148,16 +747148,16 @@ sub_0816B9F8: @ 0x0816B9F8 lsrs r0, r0, #0x18 ldr r1, _0816BA0C ldr r2, _0816BA10 - bl sub_081976D0 + bl DisplayItemMessageOnField pop {r0} bx r0 .align 2, 0 _0816BA0C: .4byte gUnknown_85C9472 -_0816BA10: .4byte sub_0816BA14 +_0816BA10: .4byte Mailbox_Cancel thumb_func_end sub_0816B9F8 - thumb_func_start sub_0816BA14 -sub_0816BA14: @ 0x0816BA14 + thumb_func_start Mailbox_Cancel +Mailbox_Cancel: @ 0x0816BA14 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -747170,7 +747170,7 @@ sub_0816BA14: @ 0x0816BA14 adds r0, r4, #0 bl sub_0816B41C movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0816BA4C lsls r0, r4, #2 adds r0, r0, r4 @@ -747183,8 +747183,8 @@ sub_0816BA14: @ 0x0816BA14 bx r0 .align 2, 0 _0816BA4C: .4byte gUnknown_3005B60 -_0816BA50: .4byte sub_0816B488 - thumb_func_end sub_0816BA14 +_0816BA50: .4byte Mailbox_ProcessInput + thumb_func_end Mailbox_Cancel thumb_func_start sub_0816BA54 sub_0816BA54: @ 0x0816BA54 @@ -747192,7 +747192,7 @@ sub_0816BA54: @ 0x0816BA54 ldr r4, _0816BA8C movs r0, #0xce lsls r0, r0, #3 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r1, #0xcc lsls r1, r1, #3 @@ -747220,8 +747220,8 @@ _0816BA90: .4byte 0x00000666 _0816BA94: .4byte 0x00000667 thumb_func_end sub_0816BA54 - thumb_func_start sub_0816BA98 -sub_0816BA98: @ 0x0816BA98 + thumb_func_start AnimTask_LoadPokeblockGfx +AnimTask_LoadPokeblockGfx: @ 0x0816BA98 push {r4, lr} movs r4, #0 _0816BA9C: @@ -747233,13 +747233,13 @@ _0816BA9C: bls _0816BA9C ldr r0, _0816BAB8 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r4} pop {r0} bx r0 .align 2, 0 _0816BAB8: .4byte gUnknown_203B990 - thumb_func_end sub_0816BA98 + thumb_func_end AnimTask_LoadPokeblockGfx thumb_func_start sub_0816BABC sub_0816BABC: @ 0x0816BABC @@ -747258,16 +747258,16 @@ sub_0816BABC: @ 0x0816BABC lsls r0, r2, #3 ldr r1, _0816BB00 adds r0, r0, r1 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r2, #0x85 lsls r2, r2, #2 movs r1, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _0816BAF4: ldrb r0, [r4] pop {r4} @@ -747295,11 +747295,11 @@ sub_0816BB04: @ 0x0816BB04 movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] _0816BB38: @@ -747310,8 +747310,8 @@ _0816BB38: _0816BB40: .4byte gUnknown_203B990 thumb_func_end sub_0816BB04 - thumb_func_start sub_0816BB44 -sub_0816BB44: @ 0x0816BB44 + thumb_func_start ItemStorage_RefreshListMenu +ItemStorage_RefreshListMenu: @ 0x0816BB44 push {r4, r5, r6, lr} movs r6, #0 ldr r0, _0816BBF0 @@ -747337,7 +747337,7 @@ _0816BB54: lsls r2, r2, #3 adds r1, r1, r2 ldrh r1, [r1] - bl sub_0816BC08 + bl CopyItemName_PlayerPC ldr r0, [r5] lsls r2, r6, #3 adds r1, r0, r2 @@ -747403,10 +747403,10 @@ _0816BBF8: .4byte gUnknown_3005AEC _0816BBFC: .4byte gUnknown_85C93C8 _0816BC00: .4byte gUnknown_3006050 _0816BC04: .4byte gUnknown_85C0C28 - thumb_func_end sub_0816BB44 + thumb_func_end ItemStorage_RefreshListMenu - thumb_func_start sub_0816BC08 -sub_0816BC08: @ 0x0816BC08 + thumb_func_start CopyItemName_PlayerPC +CopyItemName_PlayerPC: @ 0x0816BC08 push {lr} adds r2, r0, #0 lsls r0, r1, #0x10 @@ -747416,10 +747416,10 @@ sub_0816BC08: @ 0x0816BC08 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816BC08 + thumb_func_end CopyItemName_PlayerPC - thumb_func_start sub_0816BC1C -sub_0816BC1C: @ 0x0816BC1C + thumb_func_start ItemStorage_MoveCursor +ItemStorage_MoveCursor: @ 0x0816BC1C push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -747467,10 +747467,10 @@ _0816BC78: bx r0 .align 2, 0 _0816BC80: .4byte 0x0000FFFF - thumb_func_end sub_0816BC1C + thumb_func_end ItemStorage_MoveCursor - thumb_func_start sub_0816BC84 -sub_0816BC84: @ 0x0816BC84 + thumb_func_start fish4_goto_x5_or_x6 +fish4_goto_x5_or_x6: @ 0x0816BC84 push {r4, r5, r6, lr} sub sp, #0xc adds r4, r1, #0 @@ -747521,7 +747521,7 @@ _0816BCCE: ldr r4, _0816BD1C ldr r1, _0816BD20 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders str r5, [sp] movs r0, #0xff str r0, [sp, #4] @@ -747543,7 +747543,7 @@ _0816BD14: .4byte gUnknown_3005AEC _0816BD18: .4byte 0x0000049A _0816BD1C: .4byte gUnknown_2021C7C _0816BD20: .4byte gUnknown_85C943C - thumb_func_end sub_0816BC84 + thumb_func_end fish4_goto_x5_or_x6 thumb_func_start sub_0816BD24 sub_0816BD24: @ 0x0816BD24 @@ -747575,12 +747575,12 @@ _0816BD58: .4byte 0x00000661 _0816BD5C: .4byte gUnknown_3005AEC _0816BD60: ldr r0, _0816BD90 - bl sub_0816C070 + bl ItemStorage_GetItemPcResponse _0816BD66: adds r4, r0, #0 adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -747599,8 +747599,8 @@ _0816BD66: _0816BD90: .4byte 0x0000FFFF thumb_func_end sub_0816BD24 - thumb_func_start sub_0816BD94 -sub_0816BD94: @ 0x0816BD94 + thumb_func_start ItemStorage_StartScrollIndicator +ItemStorage_StartScrollIndicator: @ 0x0816BD94 push {r4, lr} sub sp, #0x10 ldr r4, _0816BDC8 @@ -747620,7 +747620,7 @@ sub_0816BD94: @ 0x0816BD94 movs r1, #0xb0 movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized strb r0, [r4, #9] _0816BDC0: add sp, #0x10 @@ -747630,16 +747630,16 @@ _0816BDC0: .align 2, 0 _0816BDC8: .4byte gUnknown_203B984 _0816BDCC: .4byte 0x000013F8 - thumb_func_end sub_0816BD94 + thumb_func_end ItemStorage_StartScrollIndicator - thumb_func_start sub_0816BDD0 -sub_0816BDD0: @ 0x0816BDD0 + thumb_func_start ItemStorage_RemoveScrollIndicator +ItemStorage_RemoveScrollIndicator: @ 0x0816BDD0 push {r4, lr} ldr r4, _0816BDE8 ldrb r0, [r4, #9] cmp r0, #0xff beq _0816BDE2 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair movs r0, #0xff strb r0, [r4, #9] _0816BDE2: @@ -747648,7 +747648,7 @@ _0816BDE2: bx r0 .align 2, 0 _0816BDE8: .4byte gUnknown_203B984 - thumb_func_end sub_0816BDD0 + thumb_func_end ItemStorage_RemoveScrollIndicator thumb_func_start sub_0816BDEC sub_0816BDEC: @ 0x0816BDEC @@ -747661,7 +747661,7 @@ sub_0816BDEC: @ 0x0816BDEC lsrs r4, r4, #0x18 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 - bl sub_081AE564 + bl ListMenuGetYCoordForPrintingArrowCursor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -747726,7 +747726,7 @@ _0816BE64: movs r1, #1 movs r2, #0 adds r3, r6, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 _0816BE84: add sp, #0x14 pop {r4, r5, r6} @@ -747757,7 +747757,7 @@ sub_0816BE94: @ 0x0816BE94 adds r0, r4, #0 adds r1, r4, #0 adds r2, r6, #0 - bl sub_081AFB48 + bl AddItemIconSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -747925,21 +747925,21 @@ _0816C002: adds r0, r0, r1 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram bl sub_0816BF44 bl sub_0816BF74 - bl sub_0816BB44 + bl ItemStorage_RefreshListMenu ldr r0, _0816C060 ldr r2, _0816C064 ldrh r1, [r2, #2] ldrh r2, [r2] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0xa] - bl sub_0816BD94 + bl ItemStorage_StartScrollIndicator movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0816C068 lsls r0, r5, #2 adds r0, r0, r5 @@ -747959,11 +747959,11 @@ _0816C05C: .4byte 0x00000662 _0816C060: .4byte gUnknown_3006050 _0816C064: .4byte gUnknown_203B984 _0816C068: .4byte gUnknown_3005B60 -_0816C06C: .4byte sub_0816C154 +_0816C06C: .4byte ItemStorage_ProcessInput thumb_func_end sub_0816BF8C - thumb_func_start sub_0816C070 -sub_0816C070: @ 0x0816C070 + thumb_func_start ItemStorage_GetItemPcResponse +ItemStorage_GetItemPcResponse: @ 0x0816C070 push {lr} lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -748041,10 +748041,10 @@ _0816C102: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0816C070 + thumb_func_end ItemStorage_GetItemPcResponse - thumb_func_start sub_0816C108 -sub_0816C108: @ 0x0816C108 + thumb_func_start ItemStorage_PrintItemPcResponse +ItemStorage_PrintItemPcResponse: @ 0x0816C108 push {r4, r5, r6, lr} sub sp, #0xc adds r6, r0, #0 @@ -748055,11 +748055,11 @@ sub_0816C108: @ 0x0816C108 ldrb r5, [r0] adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _0816C150 adds r0, r4, #0 adds r1, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [sp] movs r0, #0 @@ -748078,10 +748078,10 @@ sub_0816C108: @ 0x0816C108 _0816C148: .4byte gUnknown_203B990 _0816C14C: .4byte 0x00000661 _0816C150: .4byte gUnknown_2021C7C - thumb_func_end sub_0816C108 + thumb_func_end ItemStorage_PrintItemPcResponse - thumb_func_start sub_0816C154 -sub_0816C154: @ 0x0816C154 + thumb_func_start ItemStorage_ProcessInput +ItemStorage_ProcessInput: @ 0x0816C154 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -748111,7 +748111,7 @@ sub_0816C154: @ 0x0816C154 movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_0816C268 + bl ItemStorage_ItemSwapChoosePrompt b _0816C1E6 .align 2, 0 _0816C198: .4byte gUnknown_3005B68 @@ -748119,7 +748119,7 @@ _0816C19C: .4byte gUnknown_3002360 _0816C1A0: .4byte gUnknown_203B986 _0816C1A4: ldrb r0, [r4, #0xa] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r6, r0, #0 ldrb r0, [r4, #0xa] ldr r1, _0816C1C8 @@ -748145,12 +748145,12 @@ _0816C1DA: movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_0816C534 + bl ItemStorage_DoItemAction _0816C1E6: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0816C154 + thumb_func_end ItemStorage_ProcessInput thumb_func_start sub_0816C1EC sub_0816C1EC: @ 0x0816C1EC @@ -748163,11 +748163,11 @@ sub_0816C1EC: @ 0x0816C1EC ldr r0, _0816C23C adds r4, r4, r0 bl sub_0816BEFC - bl sub_0816BDD0 + bl ItemStorage_RemoveScrollIndicator ldrb r0, [r4, #0xa] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _0816C240 ldr r0, [r0] movs r1, #0xcd @@ -748175,7 +748175,7 @@ sub_0816C1EC: @ 0x0816C1EC adds r0, r0, r1 movs r1, #7 bl sub_081223BC - bl sub_0816BA98 + bl AnimTask_LoadPokeblockGfx movs r0, #0 movs r1, #0 bl sub_08196FB8 @@ -748207,11 +748207,11 @@ _0816C24C: bx r0 .align 2, 0 _0816C260: .4byte gUnknown_3005B60 -_0816C264: .4byte sub_0816B06C +_0816C264: .4byte ItemStorageMenuProcessInput thumb_func_end sub_0816C1EC - thumb_func_start sub_0816C268 -sub_0816C268: @ 0x0816C268 + thumb_func_start ItemStorage_ItemSwapChoosePrompt +ItemStorage_ItemSwapChoosePrompt: @ 0x0816C268 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -748229,7 +748229,7 @@ sub_0816C268: @ 0x0816C268 ldrb r0, [r1, #0xa] movs r1, #0x10 movs r2, #1 - bl sub_081AEE34 + bl ListMenuSetUnkIndicatorsStructField ldr r6, _0816C2F8 ldr r2, [r6] ldr r1, _0816C2FC @@ -748262,8 +748262,8 @@ sub_0816C268: @ 0x0816C268 ldr r1, _0816C308 bl sub_080D5EC8 ldr r0, _0816C30C - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse movs r1, #8 rsbs r1, r1, #0 add r8, r1 @@ -748285,7 +748285,7 @@ _0816C304: .4byte gUnknown_3005AEC _0816C308: .4byte gUnknown_2021C40 _0816C30C: .4byte 0x0000FFF7 _0816C310: .4byte sub_0816C314 - thumb_func_end sub_0816C268 + thumb_func_end ItemStorage_ItemSwapChoosePrompt thumb_func_start sub_0816C314 sub_0816C314: @ 0x0816C314 @@ -748314,7 +748314,7 @@ _0816C340: .4byte gUnknown_3002360 _0816C344: .4byte gUnknown_203B986 _0816C348: ldrb r0, [r4, #0xa] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r6, r0, #0 ldrb r0, [r4, #0xa] ldr r1, _0816C384 @@ -748351,25 +748351,25 @@ _0816C38C: _0816C396: adds r0, r5, #0 movs r1, #0 - bl sub_0816C3B8 + bl ItemStorage_DoItemSwap b _0816C3B2 _0816C3A0: adds r0, r5, #0 movs r1, #1 - bl sub_0816C3B8 + bl ItemStorage_DoItemSwap b _0816C3B2 _0816C3AA: adds r0, r5, #0 movs r1, #0 - bl sub_0816C3B8 + bl ItemStorage_DoItemSwap _0816C3B2: pop {r4, r5, r6, r7} pop {r0} bx r0 thumb_func_end sub_0816C314 - thumb_func_start sub_0816C3B8 -sub_0816C3B8: @ 0x0816C3B8 + thumb_func_start ItemStorage_DoItemSwap +ItemStorage_DoItemSwap: @ 0x0816C3B8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -748396,7 +748396,7 @@ sub_0816C3B8: @ 0x0816C3B8 ldrb r0, [r2, #0xa] adds r1, r4, #2 adds r2, r4, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask cmp r5, #0 bne _0816C422 ldr r1, _0816C490 @@ -748418,7 +748418,7 @@ sub_0816C3B8: @ 0x0816C3B8 adds r1, r2, #0 adds r2, r6, #0 bl MoveItemSlotInList - bl sub_0816BB44 + bl ItemStorage_RefreshListMenu _0816C422: ldr r0, _0816C490 ldr r1, [r0] @@ -748449,13 +748449,13 @@ _0816C43A: ldr r2, _0816C48C ldrh r1, [r2, #2] ldrh r2, [r2] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 strh r0, [r1, #0xa] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _0816C4A0 lsls r0, r7, #2 adds r0, r0, r7 @@ -748476,8 +748476,8 @@ _0816C494: .4byte 0x00000666 _0816C498: .4byte gUnknown_3005AEC _0816C49C: .4byte gUnknown_3006050 _0816C4A0: .4byte gUnknown_3005B60 -_0816C4A4: .4byte sub_0816C154 - thumb_func_end sub_0816C3B8 +_0816C4A4: .4byte ItemStorage_ProcessInput + thumb_func_end ItemStorage_DoItemSwap thumb_func_start sub_0816C4A8 sub_0816C4A8: @ 0x0816C4A8 @@ -748528,7 +748528,7 @@ sub_0816C4D4: @ 0x0816C4D4 ldr r0, _0816C52C mov r8, r0 ldr r1, _0816C530 - bl sub_08008BCC + bl StringExpandPlaceholders str r4, [sp] movs r0, #0 str r0, [sp, #4] @@ -748550,8 +748550,8 @@ _0816C52C: .4byte gUnknown_2021C7C _0816C530: .4byte gUnknown_85C943C thumb_func_end sub_0816C4D4 - thumb_func_start sub_0816C534 -sub_0816C534: @ 0x0816C534 + thumb_func_start ItemStorage_DoItemAction +ItemStorage_DoItemAction: @ 0x0816C534 push {r4, r5, r6, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -748567,7 +748567,7 @@ sub_0816C534: @ 0x0816C534 adds r0, r0, r1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_0816BDD0 + bl ItemStorage_RemoveScrollIndicator movs r0, #1 strh r0, [r6, #4] movs r1, #6 @@ -748584,7 +748584,7 @@ sub_0816C534: @ 0x0816C534 cmp r0, #1 bne _0816C58C adds r0, r5, #0 - bl sub_0816C70C + bl ItemStorage_DoItemWithdraw b _0816C616 .align 2, 0 _0816C57C: .4byte gUnknown_3005B68 @@ -748599,8 +748599,8 @@ _0816C58C: ldr r1, _0816C5A8 bl sub_080D5EC8 ldr r0, _0816C5AC - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse b _0816C5EC .align 2, 0 _0816C5A8: .4byte gUnknown_2021C40 @@ -748616,7 +748616,7 @@ _0816C5B0: cmp r0, #1 bne _0816C5D4 adds r0, r5, #0 - bl sub_0816C7C8 + bl ItemStorage_DoItemToss b _0816C616 .align 2, 0 _0816C5CC: .4byte gUnknown_3005AEC @@ -748629,8 +748629,8 @@ _0816C5D4: ldr r1, _0816C620 bl sub_080D5EC8 ldr r0, _0816C624 - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse _0816C5EC: movs r0, #4 bl sub_0816BABC @@ -748661,7 +748661,7 @@ _0816C620: .4byte gUnknown_2021C40 _0816C624: .4byte 0x0000FFFC _0816C628: .4byte gUnknown_3005B60 _0816C62C: .4byte sub_0816C630 - thumb_func_end sub_0816C534 + thumb_func_end ItemStorage_DoItemAction thumb_func_start sub_0816C630 sub_0816C630: @ 0x0816C630 @@ -748690,7 +748690,7 @@ sub_0816C630: @ 0x0816C630 ldr r2, _0816C698 adds r1, r1, r2 ldrh r1, [r1] - bl sub_08122040 + bl AdjustQuantityAccordingToDPadInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -748729,13 +748729,13 @@ _0816C69C: cmp r0, #0 bne _0816C6C8 adds r0, r4, #0 - bl sub_0816C70C + bl ItemStorage_DoItemWithdraw b _0816C6FE .align 2, 0 _0816C6C4: .4byte gUnknown_3002360 _0816C6C8: adds r0, r4, #0 - bl sub_0816C7C8 + bl ItemStorage_DoItemToss b _0816C6FE _0816C6D0: movs r0, #2 @@ -748752,8 +748752,8 @@ _0816C6D0: lsls r2, r2, #3 adds r0, r0, r2 ldrh r0, [r0] - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse mov r0, r8 bl sub_0816C9D0 _0816C6FE: @@ -748766,8 +748766,8 @@ _0816C6FE: .align 2, 0 thumb_func_end sub_0816C630 - thumb_func_start sub_0816C70C -sub_0816C70C: @ 0x0816C70C + thumb_func_start ItemStorage_DoItemWithdraw +ItemStorage_DoItemWithdraw: @ 0x0816C70C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -748793,7 +748793,7 @@ sub_0816C70C: @ 0x0816C70C adds r0, r0, r1 ldrh r0, [r0] ldrh r1, [r4, #4] - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -748813,8 +748813,8 @@ sub_0816C70C: @ 0x0816C70C movs r3, #3 bl sub_080089D8 ldr r0, _0816C794 - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse mov r0, r8 subs r0, #8 adds r0, r6, r0 @@ -748827,13 +748827,13 @@ _0816C788: .4byte gUnknown_3005AEC _0816C78C: .4byte gUnknown_2021C40 _0816C790: .4byte gUnknown_2021C54 _0816C794: .4byte 0x0000FFFD -_0816C798: .4byte sub_0816C914 +_0816C798: .4byte ItemStorage_HandleRemoveItem _0816C79C: movs r0, #0 strh r0, [r4, #4] ldr r0, _0816C7C0 - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse mov r0, r8 subs r0, #8 adds r0, r6, r0 @@ -748847,11 +748847,11 @@ _0816C7B2: bx r0 .align 2, 0 _0816C7C0: .4byte 0x0000FFFA -_0816C7C4: .4byte sub_0816C984 - thumb_func_end sub_0816C70C +_0816C7C4: .4byte ItemStorage_WaitPressHandleResumeProcessInput + thumb_func_end ItemStorage_DoItemWithdraw - thumb_func_start sub_0816C7C8 -sub_0816C7C8: @ 0x0816C7C8 + thumb_func_start ItemStorage_DoItemToss +ItemStorage_DoItemToss: @ 0x0816C7C8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -748899,8 +748899,8 @@ sub_0816C7C8: @ 0x0816C7C8 movs r3, #3 bl sub_080089D8 ldr r0, _0816C868 - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse ldr r1, _0816C86C movs r0, #2 str r0, [sp] @@ -748929,8 +748929,8 @@ _0816C874: movs r0, #0 strh r0, [r7, #4] ldr r0, _0816C89C - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse mov r0, sb subs r0, #8 add r0, r8 @@ -748946,18 +748946,18 @@ _0816C88C: bx r0 .align 2, 0 _0816C89C: .4byte 0x0000FFF9 -_0816C8A0: .4byte sub_0816C984 - thumb_func_end sub_0816C7C8 +_0816C8A0: .4byte ItemStorage_WaitPressHandleResumeProcessInput + thumb_func_end ItemStorage_DoItemToss - thumb_func_start sub_0816C8A4 -sub_0816C8A4: @ 0x0816C8A4 + thumb_func_start ItemStorage_ResumeInputFromYesToss +ItemStorage_ResumeInputFromYesToss: @ 0x0816C8A4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _0816C8CC - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse ldr r1, _0816C8D0 lsls r0, r4, #2 adds r0, r0, r4 @@ -748971,11 +748971,11 @@ sub_0816C8A4: @ 0x0816C8A4 .align 2, 0 _0816C8CC: .4byte 0x0000FFFB _0816C8D0: .4byte gUnknown_3005B60 -_0816C8D4: .4byte sub_0816C914 - thumb_func_end sub_0816C8A4 +_0816C8D4: .4byte ItemStorage_HandleRemoveItem + thumb_func_end ItemStorage_ResumeInputFromYesToss - thumb_func_start sub_0816C8D8 -sub_0816C8D8: @ 0x0816C8D8 + thumb_func_start ItemStorage_ResumeInputFromNoToss +ItemStorage_ResumeInputFromNoToss: @ 0x0816C8D8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -748992,8 +748992,8 @@ sub_0816C8D8: @ 0x0816C8D8 lsls r0, r0, #3 adds r2, r2, r0 ldrh r0, [r2] - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse adds r0, r4, #0 bl sub_0816C9D0 pop {r4} @@ -749002,10 +749002,10 @@ sub_0816C8D8: @ 0x0816C8D8 .align 2, 0 _0816C90C: .4byte gUnknown_3005AEC _0816C910: .4byte gUnknown_203B984 - thumb_func_end sub_0816C8D8 + thumb_func_end ItemStorage_ResumeInputFromNoToss - thumb_func_start sub_0816C914 -sub_0816C914: @ 0x0816C914 + thumb_func_start ItemStorage_HandleRemoveItem +ItemStorage_HandleRemoveItem: @ 0x0816C914 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -749031,14 +749031,14 @@ sub_0816C914: @ 0x0816C914 ldrb r0, [r5, #0xa] adds r1, r4, #2 adds r2, r4, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask bl sub_0816BF44 bl sub_0816BF74 - bl sub_0816BB44 + bl ItemStorage_RefreshListMenu ldr r0, _0816C980 ldrh r1, [r4, #2] ldrh r2, [r4] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #0xa] @@ -749053,10 +749053,10 @@ _0816C974: .4byte gUnknown_3005B68 _0816C978: .4byte gUnknown_3002360 _0816C97C: .4byte gUnknown_203B984 _0816C980: .4byte gUnknown_3006050 - thumb_func_end sub_0816C914 + thumb_func_end ItemStorage_HandleRemoveItem - thumb_func_start sub_0816C984 -sub_0816C984: @ 0x0816C984 + thumb_func_start ItemStorage_WaitPressHandleResumeProcessInput +ItemStorage_WaitPressHandleResumeProcessInput: @ 0x0816C984 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -749078,8 +749078,8 @@ sub_0816C984: @ 0x0816C984 lsls r0, r0, #3 adds r2, r2, r0 ldrh r0, [r2] - bl sub_0816C070 - bl sub_0816C108 + bl ItemStorage_GetItemPcResponse + bl ItemStorage_PrintItemPcResponse adds r0, r4, #0 bl sub_0816C9D0 _0816C9BC: @@ -749090,7 +749090,7 @@ _0816C9BC: _0816C9C4: .4byte gUnknown_3002360 _0816C9C8: .4byte gUnknown_3005AEC _0816C9CC: .4byte gUnknown_203B984 - thumb_func_end sub_0816C984 + thumb_func_end ItemStorage_WaitPressHandleResumeProcessInput thumb_func_start sub_0816C9D0 sub_0816C9D0: @ 0x0816C9D0 @@ -749098,7 +749098,7 @@ sub_0816C9D0: @ 0x0816C9D0 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0816BD94 + bl ItemStorage_StartScrollIndicator ldr r1, _0816C9F0 lsls r0, r4, #2 adds r0, r0, r4 @@ -749111,28 +749111,28 @@ sub_0816C9D0: @ 0x0816C9D0 bx r0 .align 2, 0 _0816C9F0: .4byte gUnknown_3005B60 -_0816C9F4: .4byte sub_0816C154 +_0816C9F4: .4byte ItemStorage_ProcessInput thumb_func_end sub_0816C9D0 - thumb_func_start sub_0816C9F8 -sub_0816C9F8: @ 0x0816C9F8 + thumb_func_start VBlankCB_Intro +VBlankCB_Intro: @ 0x0816C9F8 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816C9F8 + thumb_func_end VBlankCB_Intro - thumb_func_start sub_0816CA10 -sub_0816CA10: @ 0x0816CA10 + thumb_func_start MainCB2_Intro +MainCB2_Intro: @ 0x0816CA10 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0816CA40 ldrh r0, [r0, #0x2e] cmp r0, #0 @@ -749144,12 +749144,12 @@ sub_0816CA10: @ 0x0816CA10 cmp r0, #0 bne _0816CA4C ldr r0, _0816CA48 - bl sub_08000540 + bl SetMainCallback2 b _0816CA5C .align 2, 0 _0816CA40: .4byte gUnknown_3002360 _0816CA44: .4byte gUnknown_2037C74 -_0816CA48: .4byte sub_0816CA64 +_0816CA48: .4byte MainCB2_EndIntro _0816CA4C: ldr r2, _0816CA60 ldr r1, [r2] @@ -749164,26 +749164,26 @@ _0816CA5C: bx r0 .align 2, 0 _0816CA60: .4byte gUnknown_3005FE0 - thumb_func_end sub_0816CA10 + thumb_func_end MainCB2_Intro - thumb_func_start sub_0816CA64 -sub_0816CA64: @ 0x0816CA64 + thumb_func_start MainCB2_EndIntro +MainCB2_EndIntro: @ 0x0816CA64 push {lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0816CA76 ldr r0, _0816CA7C - bl sub_08000540 + bl SetMainCallback2 _0816CA76: pop {r0} bx r0 .align 2, 0 _0816CA7C: .4byte sub_080AA06C - thumb_func_end sub_0816CA64 + thumb_func_end MainCB2_EndIntro - thumb_func_start sub_0816CA80 -sub_0816CA80: @ 0x0816CA80 + thumb_func_start LoadCopyrightGraphics +LoadCopyrightGraphics: @ 0x0816CA80 push {r4, r5, r6, lr} adds r3, r0, #0 adds r4, r1, #0 @@ -749207,7 +749207,7 @@ sub_0816CA80: @ 0x0816CA80 ldr r0, _0816CAC4 adds r1, r5, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4, r5, r6} pop {r0} bx r0 @@ -749215,7 +749215,7 @@ sub_0816CA80: @ 0x0816CA80 _0816CABC: .4byte gUnknown_85C0C94 _0816CAC0: .4byte gUnknown_85C0EF8 _0816CAC4: .4byte gUnknown_85C0C74 - thumb_func_end sub_0816CA80 + thumb_func_end LoadCopyrightGraphics thumb_func_start sub_0816CAC8 sub_0816CAC8: @ 0x0816CAC8 @@ -749228,8 +749228,8 @@ sub_0816CAC8: @ 0x0816CAC8 _0816CAD4: .4byte gUnknown_3005FF0 thumb_func_end sub_0816CAC8 - thumb_func_start sub_0816CAD8 -sub_0816CAD8: @ 0x0816CAD8 + thumb_func_start task00_08081A90 +task00_08081A90: @ 0x0816CAD8 push {r4, r5, lr} sub sp, #0x10 ldr r0, _0816CAF8 @@ -749256,7 +749256,7 @@ _0816CB02: b _0816CBCC _0816CB04: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -749302,9 +749302,9 @@ _0816CB04: lsls r1, r1, #6 movs r0, #0 movs r2, #0 - bl sub_0816CA80 - bl sub_080B9710 - bl sub_080A8818 + bl LoadCopyrightGraphics + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes movs r0, #1 @@ -749314,7 +749314,7 @@ _0816CB04: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r1, #0xe0 lsls r1, r1, #3 movs r0, #8 @@ -749322,7 +749322,7 @@ _0816CB04: movs r0, #1 bl EnableInterrupts ldr r0, _0816CC00 - bl sub_080006F0 + bl SetVBlankCallback movs r1, #0x80 lsls r1, r1, #0x13 movs r2, #0xa0 @@ -749330,11 +749330,11 @@ _0816CB04: adds r0, r2, #0 strh r0, [r1] ldr r0, _0816CC04 - bl sub_0800072C + bl SetSerialCallback ldr r0, _0816CC08 bl GameCubeMultiBoot_Init _0816CBCC: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0816CC0C movs r1, #0x87 lsls r1, r1, #3 @@ -749352,7 +749352,7 @@ _0816CBF0: .4byte 0x05000100 _0816CBF4: .4byte 0x05000002 _0816CBF8: .4byte 0x010001FF _0816CBFC: .4byte 0x0000FFFF -_0816CC00: .4byte sub_0816C9F8 +_0816CC00: .4byte VBlankCB_Intro _0816CC04: .4byte sub_0816CAC8 _0816CC08: .4byte gUnknown_3005FF0 _0816CC0C: .4byte gUnknown_3002360 @@ -749369,7 +749369,7 @@ _0816CC10: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrb r0, [r5] adds r0, #1 strb r0, [r5] @@ -749377,15 +749377,15 @@ _0816CC10: .align 2, 0 _0816CC38: .4byte gUnknown_3005FF0 _0816CC3C: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0816CC84 ldr r0, _0816CC64 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _0816CC68 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _0816CC6C ldrb r0, [r1, #2] cmp r0, #0 @@ -749394,18 +749394,18 @@ _0816CC3C: bl GameCubeMultiBoot_ExecuteProgram b _0816CC7A .align 2, 0 -_0816CC64: .4byte sub_0816CCFC -_0816CC68: .4byte sub_0816CA10 +_0816CC64: .4byte Task_IntroLoadPart1Graphics +_0816CC68: .4byte MainCB2_Intro _0816CC6C: .4byte gUnknown_3005FF0 _0816CC70: bl GameCubeMultiBoot_Quit ldr r0, _0816CC80 - bl sub_0800072C + bl SetSerialCallback _0816CC7A: movs r0, #0 b _0816CC86 .align 2, 0 -_0816CC80: .4byte sub_0800B4F4 +_0816CC80: .4byte SerialCB _0816CC84: movs r0, #1 _0816CC86: @@ -749414,23 +749414,23 @@ _0816CC86: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0816CAD8 + thumb_func_end task00_08081A90 - thumb_func_start sub_0816CC90 -sub_0816CC90: @ 0x0816CC90 + thumb_func_start CB2_InitCopyrightScreenAfterBootup +CB2_InitCopyrightScreenAfterBootup: @ 0x0816CC90 push {lr} - bl sub_0816CAD8 + bl task00_08081A90 lsls r0, r0, #0x18 cmp r0, #0 bne _0816CCDE bl sub_08153498 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080765E4 - bl sub_08083E04 - bl sub_0815265C + bl SetSaveBlocksPointers + bl ResetMenuAndMonGlobals + bl Save_ResetSaveCounters movs r0, #0 - bl sub_0815340C + bl Save_LoadGameData ldr r0, _0816CCE4 ldrh r0, [r0] cmp r0, #0 @@ -749438,7 +749438,7 @@ sub_0816CC90: @ 0x0816CC90 cmp r0, #2 bne _0816CCC6 _0816CCC2: - bl sub_08083DF4 + bl Sav2_ClearSetDefault _0816CCC6: ldr r0, _0816CCE8 ldr r0, [r0] @@ -749449,7 +749449,7 @@ _0816CCC6: ldr r0, _0816CCEC movs r1, #0xe0 lsls r1, r1, #9 - bl sub_08000BAC + bl InitHeap _0816CCDE: pop {r0} bx r0 @@ -749457,19 +749457,19 @@ _0816CCDE: _0816CCE4: .4byte gUnknown_3005F50 _0816CCE8: .4byte gUnknown_3005AF0 _0816CCEC: .4byte gUnknown_2000000 - thumb_func_end sub_0816CC90 + thumb_func_end CB2_InitCopyrightScreenAfterBootup thumb_func_start sub_0816CCF0 sub_0816CCF0: @ 0x0816CCF0 push {lr} - bl sub_0816CAD8 + bl task00_08081A90 pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0816CCF0 - thumb_func_start sub_0816CCFC -sub_0816CCFC: @ 0x0816CCFC + thumb_func_start Task_IntroLoadPart1Graphics +Task_IntroLoadPart1Graphics: @ 0x0816CCFC push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -749479,13 +749479,13 @@ sub_0816CCFC: @ 0x0816CCFC lsrs r0, r0, #0x18 mov r8, r0 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _0816CEA0 bl Random movs r1, #1 ands r1, r0 strh r1, [r4] - bl sub_0816EEA4 + bl intro_reset_and_hide_bgs movs r0, #0x1e movs r1, #0 bl SetGpuReg @@ -749550,7 +749550,7 @@ sub_0816CCFC: @ 0x0816CCFC lsls r5, r5, #2 movs r1, #0 adds r2, r5, #0 - bl sub_080A1200 + bl LoadPalette ldr r1, _0816CEE4 movs r0, #0xe bl SetGpuReg @@ -749565,13 +749565,13 @@ sub_0816CCFC: @ 0x0816CCFC movs r0, #8 bl SetGpuReg ldr r0, _0816CEF0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0816CEF4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0816CEF8 bl LoadSpritePalettes ldr r0, _0816CEFC - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0816CF00 bl LoadSpritePalettes ldr r4, _0816CF04 @@ -749620,7 +749620,7 @@ sub_0816CCFC: @ 0x0816CCFC movs r0, #0x78 movs r1, #0x50 movs r2, #0 - bl sub_0816FBB0 + bl CreatePart1Animations movs r1, #0xe rsbs r1, r1, #0 movs r0, #0x78 @@ -749630,7 +749630,7 @@ sub_0816CCFC: @ 0x0816CCFC movs r0, #0xec adds r2, r5, #0 movs r3, #1 - bl sub_0816F5B4 + bl CreateWaterDrop ldr r2, _0816CF08 mov r3, r8 lsls r1, r3, #2 @@ -749676,11 +749676,11 @@ _0816CEFC: .4byte gUnknown_85C5B28 _0816CF00: .4byte gUnknown_85C5B38 _0816CF04: .4byte gUnknown_20375B4 _0816CF08: .4byte gUnknown_3005B60 -_0816CF0C: .4byte sub_0816CF10 - thumb_func_end sub_0816CCFC +_0816CF0C: .4byte Task_IntroFadeIn + thumb_func_end Task_IntroLoadPart1Graphics - thumb_func_start sub_0816CF10 -sub_0816CF10: @ 0x0816CF10 + thumb_func_start Task_IntroFadeIn +Task_IntroFadeIn: @ 0x0816CF10 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 @@ -749693,9 +749693,9 @@ sub_0816CF10: @ 0x0816CF10 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0816CF64 - bl sub_080006F0 + bl SetVBlankCallback movs r1, #0xfa lsls r1, r1, #5 movs r0, #0 @@ -749712,20 +749712,20 @@ sub_0816CF10: @ 0x0816CF10 movs r0, #0xcf lsls r0, r0, #1 bl m4aSongNumStart - bl sub_0800B0E4 + bl ResetSerial add sp, #4 pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0816CF64: .4byte sub_0816C9F8 +_0816CF64: .4byte VBlankCB_Intro _0816CF68: .4byte gUnknown_3005B60 -_0816CF6C: .4byte sub_0816CF74 +_0816CF6C: .4byte Task_IntroWaterDrops _0816CF70: .4byte gUnknown_3005FE0 - thumb_func_end sub_0816CF10 + thumb_func_end Task_IntroFadeIn - thumb_func_start sub_0816CF74 -sub_0816CF74: @ 0x0816CF74 + thumb_func_start Task_IntroWaterDrops +Task_IntroWaterDrops: @ 0x0816CF74 push {r4, r5, r6, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -749755,7 +749755,7 @@ _0816CFA2: bne _0816CFB0 ldr r0, _0816D074 movs r1, #0 - bl sub_080A8878 + bl CreateTask _0816CFB0: ldr r0, [r5] cmp r0, #0xfb @@ -749782,7 +749782,7 @@ _0816CFD2: bne _0816CFE4 ldr r0, _0816D078 movs r1, #0 - bl sub_080A8878 + bl CreateTask _0816CFE4: ldr r1, [r5] movs r0, #0xb8 @@ -749798,7 +749798,7 @@ _0816CFE4: movs r0, #0x30 movs r1, #0 movs r3, #5 - bl sub_0816F5B4 + bl CreateWaterDrop _0816D004: ldr r1, [r5] movs r0, #0xc0 @@ -749814,7 +749814,7 @@ _0816D004: movs r0, #0xc8 movs r1, #0x3c movs r3, #9 - bl sub_0816F5B4 + bl CreateWaterDrop _0816D024: ldr r0, [r5] movs r4, #0x8c @@ -749823,7 +749823,7 @@ _0816D024: bne _0816D036 ldr r0, _0816D07C movs r1, #0 - bl sub_080A8878 + bl CreateTask _0816D036: ldr r0, [r5] cmp r0, r4 @@ -749854,14 +749854,14 @@ _0816D05E: _0816D068: .4byte gUnknown_3005FE0 _0816D06C: .4byte gUnknown_20205AC _0816D070: .4byte gUnknown_3005B60 -_0816D074: .4byte sub_0816EF0C +_0816D074: .4byte Task_IntroWaterDrops_1 _0816D078: .4byte sub_0816EFC4 -_0816D07C: .4byte sub_0816D084 -_0816D080: .4byte sub_0816D138 - thumb_func_end sub_0816CF74 +_0816D07C: .4byte Task_IntroWaterDrops_3 +_0816D080: .4byte Task_IntroScrollDownAndShowFlygon + thumb_func_end Task_IntroWaterDrops - thumb_func_start sub_0816D084 -sub_0816D084: @ 0x0816D084 + thumb_func_start Task_IntroWaterDrops_3 +Task_IntroWaterDrops_3: @ 0x0816D084 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -749906,7 +749906,7 @@ _0816D0BC: lsls r2, r2, #0x10 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldrh r0, [r4] adds r0, #1 strh r0, [r4] @@ -749934,12 +749934,12 @@ _0816D108: cmp r0, #0x3c ble _0816D116 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0816D116: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0816D084 + thumb_func_end Task_IntroWaterDrops_3 thumb_func_start sub_0816D11C sub_0816D11C: @ 0x0816D11C @@ -749959,8 +749959,8 @@ _0816D134: bx r0 thumb_func_end sub_0816D11C - thumb_func_start sub_0816D138 -sub_0816D138: @ 0x0816D138 + thumb_func_start Task_IntroScrollDownAndShowFlygon +Task_IntroScrollDownAndShowFlygon: @ 0x0816D138 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -750024,7 +750024,7 @@ sub_0816D138: @ 0x0816D138 movs r1, #0x78 movs r2, #0xa0 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0816D1F8 @@ -750058,7 +750058,7 @@ _0816D1FC: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0816D234 lsls r0, r4, #2 adds r0, r0, r4 @@ -750076,7 +750076,7 @@ _0816D22C: .4byte 0x000003EF _0816D230: .4byte 0x0000FFFF _0816D234: .4byte gUnknown_3005B60 _0816D238: .4byte sub_0816D23C - thumb_func_end sub_0816D138 + thumb_func_end Task_IntroScrollDownAndShowFlygon thumb_func_start sub_0816D23C sub_0816D23C: @ 0x0816D23C @@ -750102,18 +750102,18 @@ _0816D25A: _0816D260: .4byte gUnknown_3005FE0 _0816D264: .4byte 0x00000402 _0816D268: .4byte gUnknown_3005B60 -_0816D26C: .4byte sub_0816D270 +_0816D26C: .4byte Task_IntroLoadPart2Graphics thumb_func_end sub_0816D23C - thumb_func_start sub_0816D270 -sub_0816D270: @ 0x0816D270 + thumb_func_start Task_IntroLoadPart2Graphics +Task_IntroLoadPart2Graphics: @ 0x0816D270 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0816EEA4 + bl intro_reset_and_hide_bgs movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes ldr r0, _0816D2B4 @@ -750124,7 +750124,7 @@ sub_0816D270: @ 0x0816D270 ldr r0, _0816D2BC strh r1, [r0] movs r0, #1 - bl sub_0817AF24 + bl load_intro_part2_graphics ldr r1, _0816D2C0 lsls r0, r4, #2 adds r0, r0, r4 @@ -750140,11 +750140,11 @@ _0816D2B4: .4byte gUnknown_203B9F0 _0816D2B8: .4byte gUnknown_203B9F2 _0816D2BC: .4byte gUnknown_203B998 _0816D2C0: .4byte gUnknown_3005B60 -_0816D2C4: .4byte sub_0816D2C8 - thumb_func_end sub_0816D270 +_0816D2C4: .4byte Task_IntroStartBikeRide + thumb_func_end Task_IntroLoadPart2Graphics - thumb_func_start sub_0816D2C8 -sub_0816D2C8: @ 0x0816D2C8 + thumb_func_start Task_IntroStartBikeRide +Task_IntroStartBikeRide: @ 0x0816D2C8 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -750154,26 +750154,26 @@ sub_0816D2C8: @ 0x0816D2C8 cmp r0, #0 bne _0816D2E8 ldr r0, _0816D2E4 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _0816D2EE .align 2, 0 _0816D2E0: .4byte gUnknown_203B994 _0816D2E4: .4byte gUnknown_85D278C _0816D2E8: ldr r0, _0816D350 - bl sub_08034388 + bl LoadCompressedSpriteSheet _0816D2EE: ldr r0, _0816D354 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0816D358 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r6, #0 lsls r7, r4, #2 ldr r5, _0816D35C _0816D300: lsls r0, r6, #3 adds r0, r0, r5 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -750189,13 +750189,13 @@ _0816D300: adds r1, r5, #0 movs r2, #0x80 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r0, _0816D36C movs r1, #0x90 lsls r1, r1, #1 movs r2, #0x6e movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r0, _0816D370 ldrh r0, [r0] cmp r0, #0 @@ -750244,7 +750244,7 @@ _0816D37C: lsls r1, r1, #1 movs r2, #0x50 movs r3, #4 - bl sub_08006B0C + bl CreateSprite movs r0, #0x40 rsbs r0, r0, #0 movs r1, #0x3c @@ -750265,9 +750265,9 @@ _0816D37C: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0816D42C - bl sub_080006F0 + bl SetVBlankCallback movs r1, #0x80 lsls r1, r1, #7 movs r2, #0x80 @@ -750279,7 +750279,7 @@ _0816D37C: lsrs r0, r0, #0x18 strh r0, [r4, #8] movs r0, #1 - bl sub_0817B010 + bl LinkPartnerHandleChooseMove ldr r0, _0816D430 str r0, [r4] add sp, #4 @@ -750288,18 +750288,18 @@ _0816D37C: bx r0 .align 2, 0 _0816D410: .4byte gUnknown_20205AC -_0816D414: .4byte sub_0816F7B8 +_0816D414: .4byte SpriteCB_IntroGraphicsBicycle _0816D418: .4byte gUnknown_85C5E78 _0816D41C: .4byte gUnknown_3005B60 _0816D420: .4byte gUnknown_85C5BF4 -_0816D424: .4byte sub_0816F894 +_0816D424: .4byte SpriteCB_IntroGraphicsFlygon _0816D428: .4byte 0x0000FFFF -_0816D42C: .4byte sub_0816C9F8 -_0816D430: .4byte sub_0816D434 - thumb_func_end sub_0816D2C8 +_0816D42C: .4byte VBlankCB_Intro +_0816D430: .4byte Task_IntroHandleBikeAndFlygonMovement + thumb_func_end Task_IntroStartBikeRide - thumb_func_start sub_0816D434 -sub_0816D434: @ 0x0816D434 + thumb_func_start Task_IntroHandleBikeAndFlygonMovement +Task_IntroHandleBikeAndFlygonMovement: @ 0x0816D434 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -750320,7 +750320,7 @@ sub_0816D434: @ 0x0816D434 lsls r0, r0, #3 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_080A8964 + bl DestroyTask _0816D460: ldr r1, [r5] ldr r0, _0816D5A0 @@ -750333,7 +750333,7 @@ _0816D460: movs r1, #8 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0816D59C lsls r0, r4, #2 adds r0, r0, r4 @@ -750495,7 +750495,7 @@ _0816D5BC: .4byte 0x00000576 _0816D5C0: .4byte 0x000006BF _0816D5C4: .4byte gUnknown_203B998 _0816D5C8: .4byte 0x000001FF - thumb_func_end sub_0816D434 + thumb_func_end Task_IntroHandleBikeAndFlygonMovement thumb_func_start sub_0816D5CC sub_0816D5CC: @ 0x0816D5CC @@ -750521,7 +750521,7 @@ _0816D5EA: _0816D5F0: .4byte gUnknown_3005FE0 _0816D5F4: .4byte 0x00000814 _0816D5F8: .4byte gUnknown_3005B60 -_0816D5FC: .4byte sub_0816D990 +_0816D5FC: .4byte Task_IntroLoadPart3Graphics thumb_func_end sub_0816D5CC thumb_func_start sub_0816D600 @@ -751002,14 +751002,14 @@ _0816D988: .align 2, 0 thumb_func_end sub_0816D8CC - thumb_func_start sub_0816D990 -sub_0816D990: @ 0x0816D990 + thumb_func_start Task_IntroLoadPart3Graphics +Task_IntroLoadPart3Graphics: @ 0x0816D990 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 - bl sub_0816EEA4 + bl intro_reset_and_hide_bgs ldr r0, _0816DA20 movs r1, #0xc0 lsls r1, r1, #0x13 @@ -751021,7 +751021,7 @@ sub_0816D990: @ 0x0816D990 movs r2, #0x80 lsls r2, r2, #2 movs r1, #0 - bl sub_080A1200 + bl LoadPalette ldr r0, _0816DA30 lsls r4, r5, #2 adds r4, r4, r5 @@ -751036,7 +751036,7 @@ sub_0816D990: @ 0x0816D990 movs r1, #0x50 movs r2, #0 movs r3, #0 - bl sub_0816F08C + bl PanFadeAndZoomScreen bl ResetSpriteData bl FreeAllSpritePalettes movs r0, #1 @@ -751046,7 +751046,7 @@ sub_0816D990: @ 0x0816D990 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0816DA38 movs r0, #0xc bl SetGpuReg @@ -751073,12 +751073,12 @@ _0816DA30: .4byte gUnknown_3005B60 _0816DA34: .4byte 0x0000FFFF _0816DA38: .4byte 0x00004883 _0816DA3C: .4byte 0x00001441 -_0816DA40: .4byte sub_0816DA48 +_0816DA40: .4byte Task_IntroSpinAndZoomPokeball _0816DA44: .4byte gUnknown_3005FE0 - thumb_func_end sub_0816D990 + thumb_func_end Task_IntroLoadPart3Graphics - thumb_func_start sub_0816DA48 -sub_0816DA48: @ 0x0816DA48 + thumb_func_start Task_IntroSpinAndZoomPokeball +Task_IntroSpinAndZoomPokeball: @ 0x0816DA48 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -751128,7 +751128,7 @@ _0816DA8C: ldrh r3, [r4, #8] movs r0, #0x78 movs r1, #0x50 - bl sub_0816F08C + bl PanFadeAndZoomScreen ldr r0, _0816DAD8 ldr r0, [r0] cmp r0, #0x1c @@ -751140,7 +751140,7 @@ _0816DA8C: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0816DACA: add sp, #4 pop {r4, r5} @@ -751150,7 +751150,7 @@ _0816DACA: _0816DAD4: .4byte Task_IntroWaitToSetupPart3LegendsFight _0816DAD8: .4byte gUnknown_3005FE0 _0816DADC: .4byte 0x0000FFFF - thumb_func_end sub_0816DA48 + thumb_func_end Task_IntroSpinAndZoomPokeball thumb_func_start Task_IntroWaitToSetupPart3LegendsFight Task_IntroWaitToSetupPart3LegendsFight: @ 0x0816DAE0 @@ -751174,11 +751174,11 @@ _0816DAFC: .align 2, 0 _0816DB00: .4byte gUnknown_3005FE0 _0816DB04: .4byte gUnknown_3005B60 -_0816DB08: .4byte sub_0816DB0C +_0816DB08: .4byte Task_IntroLoadGroudonScene thumb_func_end Task_IntroWaitToSetupPart3LegendsFight - thumb_func_start sub_0816DB0C -sub_0816DB0C: @ 0x0816DB0C + thumb_func_start Task_IntroLoadGroudonScene +Task_IntroLoadGroudonScene: @ 0x0816DB0C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -751188,7 +751188,7 @@ sub_0816DB0C: @ 0x0816DB0C ands r0, r1 cmp r0, #0 bne _0816DB78 - bl sub_0816EEA4 + bl intro_reset_and_hide_bgs bl ResetSpriteData bl FreeAllSpritePalettes ldr r1, _0816DB84 @@ -751208,9 +751208,9 @@ sub_0816DB0C: @ 0x0816DB0C ldr r1, _0816DBA0 bl sub_0803437C ldr r0, _0816DBA4 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _0816DBA8 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap ldr r0, _0816DBAC ldr r1, _0816DBB0 movs r2, #0x80 @@ -751242,11 +751242,11 @@ _0816DBA8: .4byte gUnknown_84FDD28 _0816DBAC: .4byte gUnknown_8D85CB4 _0816DBB0: .4byte gUnknown_20373B4 _0816DBB4: .4byte gUnknown_3005B60 -_0816DBB8: .4byte sub_0816DBBC - thumb_func_end sub_0816DB0C +_0816DBB8: .4byte Task_IntroLoadPart3Graphics1 + thumb_func_end Task_IntroLoadGroudonScene - thumb_func_start sub_0816DBBC -sub_0816DBBC: @ 0x0816DBBC + thumb_func_start Task_IntroLoadPart3Graphics1 +Task_IntroLoadPart3Graphics1: @ 0x0816DBBC push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -751280,7 +751280,7 @@ sub_0816DBBC: @ 0x0816DBBC movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0816DC50 lsls r4, r5, #2 adds r4, r4, r5 @@ -751296,7 +751296,7 @@ sub_0816DBBC: @ 0x0816DBBC lsls r2, r2, #1 strh r2, [r4, #0xe] movs r3, #0 - bl sub_0816F08C + bl PanFadeAndZoomScreen ldr r0, _0816DC5C str r0, [r4] add sp, #4 @@ -751311,11 +751311,11 @@ _0816DC4C: .4byte 0x0000FFFF _0816DC50: .4byte gUnknown_3005B60 _0816DC54: .4byte 0x0000FFA0 _0816DC58: .4byte 0x0000FF51 -_0816DC5C: .4byte sub_0816DC60 - thumb_func_end sub_0816DBBC +_0816DC5C: .4byte Task_IntroLoadPart3Graphics2 + thumb_func_end Task_IntroLoadPart3Graphics1 - thumb_func_start sub_0816DC60 -sub_0816DC60: @ 0x0816DC60 + thumb_func_start Task_IntroLoadPart3Graphics2 +Task_IntroLoadPart3Graphics2: @ 0x0816DC60 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -751357,7 +751357,7 @@ _0816DCAA: bx r0 .align 2, 0 _0816DCB0: .4byte sub_0816DCB4 - thumb_func_end sub_0816DC60 + thumb_func_end Task_IntroLoadPart3Graphics2 thumb_func_start sub_0816DCB4 sub_0816DCB4: @ 0x0816DCB4 @@ -751373,11 +751373,11 @@ sub_0816DCB4: @ 0x0816DCB4 bx lr .align 2, 0 _0816DCC8: .4byte gUnknown_3005B60 -_0816DCCC: .4byte sub_0816DCD0 +_0816DCCC: .4byte Task_IntroLoadPart3Graphics4 thumb_func_end sub_0816DCB4 - thumb_func_start sub_0816DCD0 -sub_0816DCD0: @ 0x0816DCD0 + thumb_func_start Task_IntroLoadPart3Graphics4 +Task_IntroLoadPart3Graphics4: @ 0x0816DCD0 push {lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -751400,17 +751400,17 @@ sub_0816DCD0: @ 0x0816DCD0 movs r1, #0xa0 movs r2, #4 movs r3, #4 - bl sub_080B9ADC + bl ScanlineEffect_InitWave add sp, #0xc pop {r0} bx r0 .align 2, 0 _0816DD08: .4byte gUnknown_3005B60 -_0816DD0C: .4byte sub_0816DD10 - thumb_func_end sub_0816DCD0 +_0816DD0C: .4byte Task_IntroGroudonScene + thumb_func_end Task_IntroLoadPart3Graphics4 - thumb_func_start sub_0816DD10 -sub_0816DD10: @ 0x0816DD10 + thumb_func_start Task_IntroGroudonScene +Task_IntroGroudonScene: @ 0x0816DD10 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -751447,7 +751447,7 @@ _0816DD46: lsrs r1, r1, #0x10 ldrh r2, [r4, #6] movs r3, #0 - bl sub_0816F08C + bl PanFadeAndZoomScreen movs r1, #0 ldrsh r0, [r4, r1] cmp r0, #9 @@ -751493,7 +751493,7 @@ _0816DDB0: adds r0, r2, #0 strh r0, [r4, #0xe] adds r0, r5, #0 - bl sub_0816DF74 + bl CreateGroudonRockSprites b _0816DF5A _0816DDCA: ldrh r0, [r4, #0xc] @@ -751608,7 +751608,7 @@ _0816DE7E: movs r1, #0 movs r2, #0x64 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal b _0816DF32 .align 2, 0 _0816DEA8: .4byte 0x00000195 @@ -751660,7 +751660,7 @@ _0816DEC2: movs r1, #3 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade strh r5, [r4, #6] movs r0, #0 strh r0, [r4, #8] @@ -751708,12 +751708,12 @@ _0816DF5A: .align 2, 0 _0816DF64: .4byte gUnknown_2037C74 _0816DF68: .4byte gUnknown_3005B60 -_0816DF6C: .4byte sub_0816E084 +_0816DF6C: .4byte Task_IntroLoadKyogreScene _0816DF70: .4byte gUnknown_20397C8 - thumb_func_end sub_0816DD10 + thumb_func_end Task_IntroGroudonScene - thumb_func_start sub_0816DF74 -sub_0816DF74: @ 0x0816DF74 + thumb_func_start CreateGroudonRockSprites +CreateGroudonRockSprites: @ 0x0816DF74 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -751727,7 +751727,7 @@ _0816DF80: lsrs r3, r3, #0x18 ldr r0, _0816DFD4 movs r2, #0xa0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -751761,11 +751761,11 @@ _0816DF80: _0816DFCC: .4byte gUnknown_20205AC _0816DFD0: .4byte gUnknown_85C5D18 _0816DFD4: .4byte gUnknown_85727F4 -_0816DFD8: .4byte sub_0816DFDC - thumb_func_end sub_0816DF74 +_0816DFD8: .4byte SpriteCB_IntroGroudonRocks + thumb_func_end CreateGroudonRockSprites - thumb_func_start sub_0816DFDC -sub_0816DFDC: @ 0x0816DFDC + thumb_func_start SpriteCB_IntroGroudonRocks +SpriteCB_IntroGroudonRocks: @ 0x0816DFDC push {lr} adds r3, r0, #0 ldrh r0, [r3, #0x34] @@ -751857,10 +751857,10 @@ _0816E07E: _0816E080: pop {r0} bx r0 - thumb_func_end sub_0816DFDC + thumb_func_end SpriteCB_IntroGroudonRocks - thumb_func_start sub_0816E084 -sub_0816E084: @ 0x0816E084 + thumb_func_start Task_IntroLoadKyogreScene +Task_IntroLoadKyogreScene: @ 0x0816E084 push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -751878,7 +751878,7 @@ sub_0816E084: @ 0x0816E084 ldr r1, _0816E124 bl sub_0803437C ldr r0, _0816E128 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0816E12C bl LoadSpritePalette movs r0, #2 @@ -751888,7 +751888,7 @@ sub_0816E084: @ 0x0816E084 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0816E134 lsls r1, r4, #2 adds r1, r1, r4 @@ -751909,7 +751909,7 @@ sub_0816E084: @ 0x0816E084 strh r2, [r1, #0xe] movs r1, #0x50 movs r3, #0 - bl sub_0816F08C + bl PanFadeAndZoomScreen movs r0, #1 str r0, [sp] movs r0, #6 @@ -751919,7 +751919,7 @@ sub_0816E084: @ 0x0816E084 movs r1, #0xa0 movs r2, #4 movs r3, #4 - bl sub_080B9ADC + bl ScanlineEffect_InitWave add sp, #0xc pop {r4} pop {r0} @@ -751934,11 +751934,11 @@ _0816E128: .4byte gUnknown_85C5D3C _0816E12C: .4byte gUnknown_85C5D4C _0816E130: .4byte 0x0000FFFF _0816E134: .4byte gUnknown_3005B60 -_0816E138: .4byte sub_0816E13C - thumb_func_end sub_0816E084 +_0816E138: .4byte Task_IntroKyogreScene + thumb_func_end Task_IntroLoadKyogreScene - thumb_func_start sub_0816E13C -sub_0816E13C: @ 0x0816E13C + thumb_func_start Task_IntroKyogreScene +Task_IntroKyogreScene: @ 0x0816E13C push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -751952,7 +751952,7 @@ sub_0816E13C: @ 0x0816E13C ldrh r1, [r5, #4] ldrh r2, [r5, #6] movs r3, #0 - bl sub_0816F08C + bl PanFadeAndZoomScreen movs r1, #0 ldrsh r0, [r5, r1] cmp r0, #0xd @@ -752034,7 +752034,7 @@ _0816E204: adds r0, #1 strh r0, [r5] movs r0, #0 - bl sub_0816E4B8 + bl CreateKyogreBubbleSprites_0 b _0816E4A0 .align 2, 0 _0816E21C: .4byte gUnknown_3005B60 @@ -752069,8 +752069,8 @@ _0816E22E: adds r0, #1 strh r0, [r5] movs r0, #0 - bl sub_0816E4B8 - bl sub_0816E530 + bl CreateKyogreBubbleSprites_0 + bl CreateKyogreBubbleSprites_1 b _0816E4A0 .align 2, 0 _0816E264: .4byte gUnknown_3005B60 @@ -752171,7 +752171,7 @@ _0816E30C: movs r1, #0 movs r2, #0x78 movs r3, #0xa - bl sub_080A2D14 + bl PlayCryInternal b _0816E4A0 _0816E328: ldrh r0, [r5, #0xc] @@ -752280,7 +752280,7 @@ _0816E3E0: adds r0, #1 strh r0, [r5] adds r0, r6, #0 - bl sub_0816E4B8 + bl CreateKyogreBubbleSprites_0 b _0816E4A0 _0816E3FE: ldrh r0, [r5, #0xc] @@ -752311,7 +752311,7 @@ _0816E3FE: movs r1, #3 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _0816E474 .align 2, 0 _0816E440: .4byte gUnknown_3005B60 @@ -752370,12 +752370,12 @@ _0816E4A0: .align 2, 0 _0816E4A8: .4byte gUnknown_2037C74 _0816E4AC: .4byte gUnknown_3005B60 -_0816E4B0: .4byte sub_0816E66C +_0816E4B0: .4byte Task_IntroLoadClouds1 _0816E4B4: .4byte gUnknown_20397C8 - thumb_func_end sub_0816E13C + thumb_func_end Task_IntroKyogreScene - thumb_func_start sub_0816E4B8 -sub_0816E4B8: @ 0x0816E4B8 + thumb_func_start CreateKyogreBubbleSprites_0 +CreateKyogreBubbleSprites_0: @ 0x0816E4B8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -752399,7 +752399,7 @@ _0816E4D2: lsls r3, r5, #0x18 lsrs r3, r3, #0x18 ldr r0, _0816E52C - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -752433,10 +752433,10 @@ _0816E4D2: _0816E524: .4byte gUnknown_85C5D5C _0816E528: .4byte gUnknown_20205AC _0816E52C: .4byte gUnknown_85C5DC8 - thumb_func_end sub_0816E4B8 + thumb_func_end CreateKyogreBubbleSprites_0 - thumb_func_start sub_0816E530 -sub_0816E530: @ 0x0816E530 + thumb_func_start CreateKyogreBubbleSprites_1 +CreateKyogreBubbleSprites_1: @ 0x0816E530 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -752456,7 +752456,7 @@ _0816E542: lsls r3, r5, #0x18 lsrs r3, r3, #0x18 ldr r0, _0816E594 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -752487,10 +752487,10 @@ _0816E542: _0816E58C: .4byte gUnknown_85C5D5C _0816E590: .4byte gUnknown_20205AC _0816E594: .4byte gUnknown_85C5DC8 - thumb_func_end sub_0816E530 + thumb_func_end CreateKyogreBubbleSprites_1 - thumb_func_start sub_0816E598 -sub_0816E598: @ 0x0816E598 + thumb_func_start SpriteCB_IntroKyogreBubbles +SpriteCB_IntroKyogreBubbles: @ 0x0816E598 push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -752602,10 +752602,10 @@ _0816E666: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0816E598 + thumb_func_end SpriteCB_IntroKyogreBubbles - thumb_func_start sub_0816E66C -sub_0816E66C: @ 0x0816E66C + thumb_func_start Task_IntroLoadClouds1 +Task_IntroLoadClouds1: @ 0x0816E66C push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -752682,11 +752682,11 @@ _0816E724: .4byte 0x06004000 _0816E728: .4byte gUnknown_8D8B6CC _0816E72C: .4byte 0x0600E000 _0816E730: .4byte gUnknown_3005B60 -_0816E734: .4byte sub_0816E738 - thumb_func_end sub_0816E66C +_0816E734: .4byte Task_IntroLoadClouds2 + thumb_func_end Task_IntroLoadClouds1 - thumb_func_start sub_0816E738 -sub_0816E738: @ 0x0816E738 + thumb_func_start Task_IntroLoadClouds2 +Task_IntroLoadClouds2: @ 0x0816E738 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -752713,11 +752713,11 @@ _0816E768: .4byte 0x0600C000 _0816E76C: .4byte gUnknown_8D8B424 _0816E770: .4byte 0x0600D000 _0816E774: .4byte gUnknown_3005B60 -_0816E778: .4byte sub_0816E77C - thumb_func_end sub_0816E738 +_0816E778: .4byte Task_IntroLoadClouds3 + thumb_func_end Task_IntroLoadClouds2 - thumb_func_start sub_0816E77C -sub_0816E77C: @ 0x0816E77C + thumb_func_start Task_IntroLoadClouds3 +Task_IntroLoadClouds3: @ 0x0816E77C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -752747,11 +752747,11 @@ sub_0816E77C: @ 0x0816E77C bx r0 .align 2, 0 _0816E7B8: .4byte gUnknown_3005B60 -_0816E7BC: .4byte sub_0816E7C0 - thumb_func_end sub_0816E77C +_0816E7BC: .4byte Task_IntroCloudScene + thumb_func_end Task_IntroLoadClouds3 - thumb_func_start sub_0816E7C0 -sub_0816E7C0: @ 0x0816E7C0 + thumb_func_start Task_IntroCloudScene +Task_IntroCloudScene: @ 0x0816E7C0 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -752799,7 +752799,7 @@ _0816E808: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r2, #0xa0 lsls r2, r2, #7 adds r0, r2, #0 @@ -752823,7 +752823,7 @@ _0816E83C: movs r1, #3 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0816E858: ldrh r1, [r4, #0xc] movs r2, #0xc @@ -752856,11 +752856,11 @@ _0816E88A: bx r0 .align 2, 0 _0816E894: .4byte gUnknown_2037C74 -_0816E898: .4byte sub_0816E89C - thumb_func_end sub_0816E7C0 +_0816E898: .4byte Task_IntroLoadRayquazaLightningScene + thumb_func_end Task_IntroCloudScene - thumb_func_start sub_0816E89C -sub_0816E89C: @ 0x0816E89C + thumb_func_start Task_IntroLoadRayquazaLightningScene +Task_IntroLoadRayquazaLightningScene: @ 0x0816E89C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -752895,7 +752895,7 @@ sub_0816E89C: @ 0x0816E89C strh r1, [r0, #0x14] strh r2, [r0, #0x16] ldr r0, _0816E920 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _0816E924 bl LoadSpritePalettes pop {r4} @@ -752910,13 +752910,13 @@ _0816E90C: .4byte gUnknown_8D8BA58 _0816E910: .4byte 0x06004000 _0816E914: .4byte gUnknown_8D8C81C _0816E918: .4byte gUnknown_3005B60 -_0816E91C: .4byte sub_0816E928 +_0816E91C: .4byte Task_IntroRayquazaLightningScene _0816E920: .4byte gUnknown_85C5CA8 _0816E924: .4byte gUnknown_85C5CB8 - thumb_func_end sub_0816E89C + thumb_func_end Task_IntroLoadRayquazaLightningScene - thumb_func_start sub_0816E928 -sub_0816E928: @ 0x0816E928 + thumb_func_start Task_IntroRayquazaLightningScene +Task_IntroRayquazaLightningScene: @ 0x0816E928 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -752952,12 +752952,12 @@ _0816E956: movs r1, #0xc8 movs r2, #0x30 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r0, r4, #0 movs r1, #0xc8 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -752971,7 +752971,7 @@ _0816E956: movs r1, #0xc8 movs r2, #0x70 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -753001,12 +753001,12 @@ _0816E9C4: movs r1, #0x28 movs r2, #0x30 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r0, r4, #0 movs r1, #0x28 movs r2, #0x50 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -753020,7 +753020,7 @@ _0816E9C4: movs r1, #0x28 movs r2, #0x70 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -753055,11 +753055,11 @@ _0816EA46: pop {r0} bx r0 .align 2, 0 -_0816EA4C: .4byte sub_0816EB04 - thumb_func_end sub_0816E928 +_0816EA4C: .4byte Task_IntroLoadRayquazaGlowScene + thumb_func_end Task_IntroRayquazaLightningScene - thumb_func_start sub_0816EA50 -sub_0816EA50: @ 0x0816EA50 + thumb_func_start SpriteCB_IntroRayquazaLightning +SpriteCB_IntroRayquazaLightning: @ 0x0816EA50 push {r4, lr} adds r4, r0, #0 adds r0, #0x3f @@ -753152,17 +753152,17 @@ _0816EAF6: .align 2, 0 _0816EAFC: .4byte gUnknown_8D85CB4 _0816EB00: .4byte gUnknown_203786E - thumb_func_end sub_0816EA50 + thumb_func_end SpriteCB_IntroRayquazaLightning - thumb_func_start sub_0816EB04 -sub_0816EB04: @ 0x0816EB04 + thumb_func_start Task_IntroLoadRayquazaGlowScene +Task_IntroLoadRayquazaGlowScene: @ 0x0816EB04 push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 ldr r0, _0816EB74 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0816EB78 bl LoadSpritePalettes movs r1, #0xd5 @@ -753182,7 +753182,7 @@ sub_0816EB04: @ 0x0816EB04 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 strh r0, [r4, #8] movs r0, #0xa8 @@ -753194,7 +753194,7 @@ sub_0816EB04: @ 0x0816EB04 strh r1, [r4, #0x10] ldr r0, _0816EB94 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -753210,16 +753210,16 @@ sub_0816EB04: @ 0x0816EB04 _0816EB74: .4byte gUnknown_85C60FC _0816EB78: .4byte gUnknown_85C610C _0816EB7C: .4byte gUnknown_3005B60 -_0816EB80: .4byte sub_0816EB98 +_0816EB80: .4byte Task_IntroRayquazaGlowScene_0 _0816EB84: .4byte 0x0000FFDE _0816EB88: .4byte 0x00002949 _0816EB8C: .4byte 0x0000FFF0 _0816EB90: .4byte 0x0000FF78 -_0816EB94: .4byte sub_0816EC8C - thumb_func_end sub_0816EB04 +_0816EB94: .4byte Task_IntroRayquazaGlowScene_1 + thumb_func_end Task_IntroLoadRayquazaGlowScene - thumb_func_start sub_0816EB98 -sub_0816EB98: @ 0x0816EB98 + thumb_func_start Task_IntroRayquazaGlowScene_0 +Task_IntroRayquazaGlowScene_0: @ 0x0816EB98 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -753335,25 +753335,25 @@ _0816EC6A: pop {r0} bx r0 .align 2, 0 -_0816EC70: .4byte sub_0816EC74 - thumb_func_end sub_0816EB98 +_0816EC70: .4byte Task_EndIntroMovie + thumb_func_end Task_IntroRayquazaGlowScene_0 - thumb_func_start sub_0816EC74 -sub_0816EC74: @ 0x0816EC74 + thumb_func_start Task_EndIntroMovie +Task_EndIntroMovie: @ 0x0816EC74 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask ldr r0, _0816EC88 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_0816EC88: .4byte sub_0816CA64 - thumb_func_end sub_0816EC74 +_0816EC88: .4byte MainCB2_EndIntro + thumb_func_end Task_EndIntroMovie - thumb_func_start sub_0816EC8C -sub_0816EC8C: @ 0x0816EC8C + thumb_func_start Task_IntroRayquazaGlowScene_1 +Task_IntroRayquazaGlowScene_1: @ 0x0816EC8C push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -753492,7 +753492,7 @@ _0816ED9A: movs r1, #0x78 movs r2, #0x58 movs r3, #0xf - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -753588,7 +753588,7 @@ _0816EE58: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r5] adds r0, #1 strh r0, [r5] @@ -753603,7 +753603,7 @@ _0816EE84: cmp r0, #0 bne _0816EE96 adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _0816EE96: add sp, #4 pop {r4, r5} @@ -753611,10 +753611,10 @@ _0816EE96: bx r0 .align 2, 0 _0816EEA0: .4byte gUnknown_2037C74 - thumb_func_end sub_0816EC8C + thumb_func_end Task_IntroRayquazaGlowScene_1 - thumb_func_start sub_0816EEA4 -sub_0816EEA4: @ 0x0816EEA4 + thumb_func_start intro_reset_and_hide_bgs +intro_reset_and_hide_bgs: @ 0x0816EEA4 push {lr} movs r0, #0 movs r1, #0 @@ -753655,10 +753655,10 @@ sub_0816EEA4: @ 0x0816EEA4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0816EEA4 + thumb_func_end intro_reset_and_hide_bgs - thumb_func_start sub_0816EF0C -sub_0816EF0C: @ 0x0816EF0C + thumb_func_start Task_IntroWaterDrops_1 +Task_IntroWaterDrops_1: @ 0x0816EF0C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -753740,12 +753740,12 @@ _0816EFA0: movs r1, #0 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0816EFBE: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0816EF0C + thumb_func_end Task_IntroWaterDrops_1 thumb_func_start sub_0816EFC4 sub_0816EFC4: @ 0x0816EFC4 @@ -753839,15 +753839,15 @@ _0816F068: movs r1, #0 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0816F086: pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_0816EFC4 - thumb_func_start sub_0816F08C -sub_0816F08C: @ 0x0816F08C + thumb_func_start PanFadeAndZoomScreen +PanFadeAndZoomScreen: @ 0x0816F08C push {r4, lr} sub sp, #0x24 lsls r2, r2, #0x10 @@ -753895,7 +753895,7 @@ sub_0816F08C: @ 0x0816F08C pop {r4} pop {r0} bx r0 - thumb_func_end sub_0816F08C + thumb_func_end PanFadeAndZoomScreen thumb_func_start sub_0816F0FC sub_0816F0FC: @ 0x0816F0FC @@ -754540,8 +754540,8 @@ _0816F5A8: _0816F5B0: .4byte sub_0816F0FC thumb_func_end sub_0816F534 - thumb_func_start sub_0816F5B4 -sub_0816F5B4: @ 0x0816F5B4 + thumb_func_start CreateWaterDrop +CreateWaterDrop: @ 0x0816F5B4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -754577,7 +754577,7 @@ sub_0816F5B4: @ 0x0816F5B4 adds r1, r4, #0 adds r2, r5, #0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r2, _0816F674 @@ -754656,7 +754656,7 @@ _0816F684: mov r1, sl mov r2, r8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r5, _0816F7AC @@ -754698,7 +754698,7 @@ _0816F684: mov r1, sl mov r2, r8 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r4, r7, #4 @@ -754784,10 +754784,10 @@ _0816F7A8: .4byte gUnknown_85C5E18 _0816F7AC: .4byte gUnknown_20205AC _0816F7B0: .4byte gUnknown_20205C8 _0816F7B4: .4byte sub_0816F188 - thumb_func_end sub_0816F5B4 + thumb_func_end CreateWaterDrop - thumb_func_start sub_0816F7B8 -sub_0816F7B8: @ 0x0816F7B8 + thumb_func_start SpriteCB_IntroGraphicsBicycle +SpriteCB_IntroGraphicsBicycle: @ 0x0816F7B8 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x2e @@ -754902,10 +754902,10 @@ _0816F88E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0816F7B8 + thumb_func_end SpriteCB_IntroGraphicsBicycle - thumb_func_start sub_0816F894 -sub_0816F894: @ 0x0816F894 + thumb_func_start SpriteCB_IntroGraphicsFlygon +SpriteCB_IntroGraphicsFlygon: @ 0x0816F894 push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -754979,7 +754979,7 @@ _0816F8F6: bx r0 .align 2, 0 _0816F918: .4byte gUnknown_203B998 - thumb_func_end sub_0816F894 + thumb_func_end SpriteCB_IntroGraphicsFlygon thumb_func_start sub_0816F91C sub_0816F91C: @ 0x0816F91C @@ -755307,8 +755307,8 @@ _0816FBA8: .align 2, 0 thumb_func_end sub_0816FB3C - thumb_func_start sub_0816FBB0 -sub_0816FBB0: @ 0x0816FBB0 + thumb_func_start CreatePart1Animations +CreatePart1Animations: @ 0x0816FBB0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -755343,7 +755343,7 @@ _0816FBCA: ldr r0, _0816FCC4 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r4, r6, #4 @@ -755401,7 +755401,7 @@ _0816FBCA: asrs r2, r2, #0x10 movs r1, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r0, r6, #4 @@ -755445,7 +755445,7 @@ _0816FCC4: .4byte gUnknown_85C6010 _0816FCC8: .4byte gUnknown_20205AC _0816FCCC: .4byte gUnknown_85C6058 _0816FCD0: .4byte gUnknown_85C6040 - thumb_func_end sub_0816FBB0 + thumb_func_end CreatePart1Animations thumb_func_start sub_0816FCD4 sub_0816FCD4: @ 0x0816FCD4 @@ -755631,8 +755631,8 @@ _0816FE30: bx r0 thumb_func_end sub_0816FCD4 - thumb_func_start sub_0816FE38 -sub_0816FE38: @ 0x0816FE38 + thumb_func_start SpriteCB_IntroRayquazaHyperbeam +SpriteCB_IntroRayquazaHyperbeam: @ 0x0816FE38 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -755726,7 +755726,7 @@ _0816FEB6: bx r0 .align 2, 0 _0816FEEC: .4byte gUnknown_82FA8CC - thumb_func_end sub_0816FE38 + thumb_func_end SpriteCB_IntroRayquazaHyperbeam thumb_func_start sub_0816FEF0 sub_0816FEF0: @ 0x0816FEF0 @@ -755739,7 +755739,7 @@ sub_0816FEF0: @ 0x0816FEF0 bl RegisterRamReset movs r0, #0 movs r1, #0x80 - bl sub_08001220 + bl ClearGpuRegBits strh r4, [r5] ldr r1, _0816FF6C ldr r0, _0816FF70 @@ -755752,11 +755752,11 @@ sub_0816FEF0: @ 0x0816FEF0 bl sub_08153498 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_080765E4 - bl sub_08083E04 - bl sub_0815265C + bl SetSaveBlocksPointers + bl ResetMenuAndMonGlobals + bl Save_ResetSaveCounters movs r0, #0 - bl sub_0815340C + bl Save_LoadGameData ldr r0, _0816FF74 ldrh r0, [r0] cmp r0, #0 @@ -755764,7 +755764,7 @@ sub_0816FEF0: @ 0x0816FEF0 cmp r0, #2 bne _0816FF44 _0816FF40: - bl sub_08083DF4 + bl Sav2_ClearSetDefault _0816FF44: ldr r0, _0816FF78 ldr r0, [r0] @@ -755775,9 +755775,9 @@ _0816FF44: ldr r0, _0816FF7C movs r1, #0xe0 lsls r1, r1, #9 - bl sub_08000BAC + bl InitHeap ldr r0, _0816FF80 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 @@ -755788,15 +755788,15 @@ _0816FF70: .4byte 0x00000439 _0816FF74: .4byte gUnknown_3005F50 _0816FF78: .4byte gUnknown_3005AF0 _0816FF7C: .4byte gUnknown_2000000 -_0816FF80: .4byte sub_08085B98 +_0816FF80: .4byte CB2_ContinueSavedGame thumb_func_end sub_0816FEF0 - thumb_func_start sub_0816FF84 -sub_0816FF84: @ 0x0816FF84 + thumb_func_start FieldInitRegionMap +FieldInitRegionMap: @ 0x0816FF84 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _0816FFB0 movs r0, #0x89 lsls r0, r0, #4 @@ -755808,18 +755808,18 @@ sub_0816FF84: @ 0x0816FF84 strh r1, [r2] str r5, [r0] ldr r0, _0816FFB8 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0816FFB0: .4byte gUnknown_203B99C _0816FFB4: .4byte 0x0000088C -_0816FFB8: .4byte sub_0816FFBC - thumb_func_end sub_0816FF84 +_0816FFB8: .4byte MCB2_InitRegionMapRegisters + thumb_func_end FieldInitRegionMap - thumb_func_start sub_0816FFBC -sub_0816FFBC: @ 0x0816FFBC + thumb_func_start MCB2_InitRegionMapRegisters +MCB2_InitRegionMapRegisters: @ 0x0816FFBC push {lr} movs r0, #0 movs r1, #0 @@ -755857,7 +755857,7 @@ sub_0816FFBC: @ 0x0816FFBC movs r2, #2 bl InitBgsFromTemplates ldr r0, _0817004C - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #0x23 @@ -755865,41 +755865,41 @@ sub_0816FFBC: @ 0x0816FFBC bl LoadUserWindowBorderGfx bl sub_08199640 ldr r0, _08170050 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08170054 - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 _08170048: .4byte gUnknown_85C6124 _0817004C: .4byte gUnknown_85C612C -_08170050: .4byte sub_0817006C -_08170054: .4byte sub_08170058 - thumb_func_end sub_0816FFBC +_08170050: .4byte MCB2_FieldUpdateRegionMap +_08170054: .4byte VBCB_FieldUpdateRegionMap + thumb_func_end MCB2_InitRegionMapRegisters - thumb_func_start sub_08170058 -sub_08170058: @ 0x08170058 + thumb_func_start VBCB_FieldUpdateRegionMap +VBCB_FieldUpdateRegionMap: @ 0x08170058 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08170058 + thumb_func_end VBCB_FieldUpdateRegionMap - thumb_func_start sub_0817006C -sub_0817006C: @ 0x0817006C + thumb_func_start MCB2_FieldUpdateRegionMap +MCB2_FieldUpdateRegionMap: @ 0x0817006C push {lr} bl sub_08170088 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 - bl sub_08199668 + bl UpdatePaletteFade + bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817006C + thumb_func_end MCB2_FieldUpdateRegionMap thumb_func_start sub_08170088 sub_08170088: @ 0x08170088 @@ -755939,10 +755939,10 @@ _081700D0: bl InitRegionMap movs r0, #0 movs r1, #0 - bl sub_08124294 + bl CreateRegionMapPlayerIcon movs r0, #1 movs r1, #1 - bl sub_081240E0 + bl CreateRegionMapCursor ldr r1, [r4] ldr r0, _081700F4 adds r1, r1, r0 @@ -755954,7 +755954,7 @@ _081700F8: movs r1, #0 movs r2, #0x23 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _08170140 movs r0, #2 str r0, [sp] @@ -755966,13 +755966,13 @@ _081700F8: movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0 movs r1, #0 movs r2, #0x23 movs r3, #0xd - bl sub_08197F44 - bl sub_08170214 + bl DrawStdFrameWithCustomTileAndPalette + bl StartMirageTowerShake movs r0, #1 rsbs r0, r0, #0 str r4, [sp] @@ -755986,11 +755986,11 @@ _08170144: movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r0, _08170164 ldr r1, [r0] ldr r0, _08170168 @@ -756016,7 +756016,7 @@ _08170180: lsrs r0, r0, #0x18 cmp r0, #3 bne _08170192 - bl sub_08170214 + bl StartMirageTowerShake b _08170202 _08170192: cmp r0, #3 @@ -756039,7 +756039,7 @@ _081701AC: movs r2, #0 movs r3, #0x10 _081701B8: - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081701CC ldr r1, [r0] _081701C0: @@ -756062,18 +756062,18 @@ _081701D4: lsrs r5, r0, #0x18 cmp r5, #0 bne _08170202 - bl sub_08123068 + bl FreeRegionMapIconResources ldr r4, _08170210 ldr r0, [r4] ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 ldr r0, [r4] cmp r0, #0 beq _081701FE - bl sub_08000BF0 + bl Free str r5, [r4] _081701FE: - bl sub_080034D4 + bl FreeAllWindowBuffers _08170202: add sp, #0xc pop {r4, r5} @@ -756084,8 +756084,8 @@ _0817020C: .4byte gUnknown_2037C74 _08170210: .4byte gUnknown_203B99C thumb_func_end sub_08170088 - thumb_func_start sub_08170214 -sub_08170214: @ 0x08170214 + thumb_func_start StartMirageTowerShake +StartMirageTowerShake: @ 0x08170214 push {lr} sub sp, #0xc ldr r0, _08170240 @@ -756103,26 +756103,26 @@ sub_08170214: @ 0x08170214 movs r3, #0 bl AddTextPrinterParameterized movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _08170254 .align 2, 0 _08170240: .4byte gUnknown_203B99C _08170244: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08170254: add sp, #0xc pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08170214 + thumb_func_end StartMirageTowerShake - thumb_func_start sub_0817025C -sub_0817025C: @ 0x0817025C + thumb_func_start unref_sub_8170478 +unref_sub_8170478: @ 0x0817025C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -756148,7 +756148,7 @@ sub_0817025C: @ 0x0817025C movs r1, #0x80 lsls r1, r1, #8 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldr r1, _08170418 movs r0, #0x50 bl SetGpuReg @@ -756159,19 +756159,19 @@ sub_0817025C: @ 0x0817025C movs r0, #1 movs r1, #4 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #1 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute movs r0, #1 movs r1, #3 movs r2, #1 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _0817041C adds r4, r4, r0 ldrb r0, [r4] @@ -756186,12 +756186,12 @@ sub_0817025C: @ 0x0817025C lsls r6, r6, #0x18 lsrs r6, r6, #0x18 ldr r0, _08170424 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x14] ldr r0, _08170424 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback mov sl, r0 mov r2, sl lsls r2, r2, #0x18 @@ -756271,19 +756271,19 @@ sub_0817025C: @ 0x0817025C mov r0, sp ldrb r0, [r0, #9] ldr r1, _08170428 - bl sub_080A6610 + bl AnimLoadCompressedBgTilemap mov r0, sp ldrb r0, [r0, #9] ldr r1, _0817042C mov r2, sp ldrh r2, [r2, #0xa] - bl sub_080A6588 + bl AnimLoadCompressedBgGfx ldr r0, _08170430 mov r1, sp ldrb r1, [r1, #8] lsls r1, r1, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r1, _08170434 ldrh r0, [r7, #0x20] rsbs r0, r0, #0 @@ -756335,7 +756335,7 @@ _08170434: .4byte gUnknown_2022ACC _08170438: .4byte gUnknown_2022ACE _0817043C: .4byte gUnknown_3005B60 _08170440: .4byte sub_08170444 - thumb_func_end sub_0817025C + thumb_func_end unref_sub_8170478 thumb_func_start sub_08170444 sub_08170444: @ 0x08170444 @@ -756463,14 +756463,14 @@ _081704EC: movs r0, #0x4a adds r1, r4, #0 bl SetGpuReg - bl sub_080A46B8 + bl IsContest lsls r0, r0, #0x18 cmp r0, #0 bne _08170550 movs r0, #1 movs r1, #3 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute _08170550: movs r0, #0 bl GetGpuReg @@ -756507,7 +756507,7 @@ _08170550: movs r0, #1 movs r1, #1 movs r2, #0 - bl sub_0811887C + bl SetAnimBgAttribute ldr r0, _08170614 add r0, r8 ldrb r0, [r0] @@ -756620,7 +756620,7 @@ sub_08170618: @ 0x08170618 adds r1, r3, r1 movs r2, #0x20 str r3, [sp] - bl sub_080A1200 + bl LoadPalette lsls r4, r4, #1 add r4, r8 ldrb r0, [r7] @@ -756630,7 +756630,7 @@ sub_08170618: @ 0x08170618 adds r0, r4, #0 adds r1, r3, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette mov r0, sb ldrb r1, [r0] lsls r1, r1, #4 @@ -756726,12 +756726,12 @@ sub_08170730: @ 0x08170730 ldr r0, _081707C4 bl FreeSpritePaletteByTag ldr r0, _081707C8 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _081707CC - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsls r4, r4, #4 ldrb r2, [r5, #5] @@ -756838,7 +756838,7 @@ sub_0817081C: @ 0x0817081C blt _081708DC strh r6, [r4, #8] ldr r0, _0817086C - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r3, #0x1c @@ -756955,7 +756955,7 @@ _08170920: _08170926: adds r0, r5, #0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale movs r0, #0x80 lsls r0, r0, #1 strh r0, [r4, #0x1c] @@ -756969,9 +756969,9 @@ _08170936: adds r0, r5, #0 adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale adds r0, r5, #0 - bl sub_080A7734 + bl SetBattlerSpriteYOffsetFromYScale movs r0, #0x1c ldrsh r1, [r4, r0] ldr r0, _08170964 @@ -756986,7 +756986,7 @@ _0817095A: _08170964: .4byte 0x000002CF _08170968: adds r0, r5, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r1, _08170990 lsls r0, r5, #4 adds r0, r0, r5 @@ -757022,7 +757022,7 @@ sub_08170994: @ 0x08170994 adds r1, r0, r1 ldrb r1, [r1] mov sb, r1 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081709DC @@ -757052,10 +757052,10 @@ _081709DC: _081709EC: adds r0, r0, r1 movs r1, #0x26 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08170B68 + bl ItemIdToBallId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -757079,13 +757079,13 @@ _08170A28: ldr r5, _08170AA0 ldrb r0, [r5] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r1, r0, #0 lsls r1, r1, #0x18 ldr r2, _08170AA4 @@ -757106,7 +757106,7 @@ _08170A28: mov r0, r8 str r0, [sp] adds r0, r4, #0 - bl sub_08171B7C + bl AnimateBallOpenParticles lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x1c] @@ -757122,7 +757122,7 @@ _08170A28: ldrb r1, [r5] movs r0, #0 mov r3, r8 - bl sub_081727CC + bl LaunchBallFadeMonTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x1e] @@ -757172,10 +757172,10 @@ sub_08170AE0: @ 0x08170AE0 lsrs r4, r4, #0x18 ldr r0, _08170B04 ldrh r0, [r0] - bl sub_08170B68 + bl ItemIdToBallId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08076480 + bl LoadBallGfx adds r0, r4, #0 bl DestroyAnimVisualTask pop {r4} @@ -757193,10 +757193,10 @@ sub_08170B08: @ 0x08170B08 lsrs r4, r4, #0x18 ldr r0, _08170B2C ldrh r0, [r0] - bl sub_08170B68 + bl ItemIdToBallId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080764F0 + bl FreeBallGfx adds r0, r4, #0 bl DestroyAnimVisualTask pop {r4} @@ -757206,8 +757206,8 @@ sub_08170B08: @ 0x08170B08 _08170B2C: .4byte gUnknown_2023EAC thumb_func_end sub_08170B08 - thumb_func_start sub_08170B30 -sub_08170B30: @ 0x08170B30 + thumb_func_start AnimTask_IsBallBlockedByTrainer +AnimTask_IsBallBlockedByTrainer: @ 0x08170B30 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -757235,10 +757235,10 @@ _08170B58: bx r0 .align 2, 0 _08170B64: .4byte gUnknown_20380BE - thumb_func_end sub_08170B30 + thumb_func_end AnimTask_IsBallBlockedByTrainer - thumb_func_start sub_08170B68 -sub_08170B68: @ 0x08170B68 + thumb_func_start ItemIdToBallId +ItemIdToBallId: @ 0x08170B68 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -757304,7 +757304,7 @@ _08170BE2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08170B68 + thumb_func_end ItemIdToBallId thumb_func_start sub_08170BE8 sub_08170BE8: @ 0x08170BE8 @@ -757319,7 +757319,7 @@ sub_08170BE8: @ 0x08170BE8 mov sl, r0 ldr r0, _08170CB0 ldrh r0, [r0] - bl sub_08170B68 + bl ItemIdToBallId adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -757331,7 +757331,7 @@ sub_08170BE8: @ 0x08170BE8 movs r1, #0x20 movs r2, #0x50 movs r3, #0x1d - bl sub_08006B0C + bl CreateSprite adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -757347,14 +757347,14 @@ sub_08170BE8: @ 0x08170BE8 mov r8, r2 ldrb r0, [r2] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x30] mov r1, r8 ldrb r0, [r1] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0x10 @@ -757472,7 +757472,7 @@ _08170D34: _08170D38: ldr r0, _08170DF0 ldrh r0, [r0] - bl sub_08170B68 + bl ItemIdToBallId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -757495,7 +757495,7 @@ _08170D38: movs r2, #0x50 orrs r5, r2 adds r2, r5, #0 - bl sub_08006B0C + bl CreateSprite adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -757511,14 +757511,14 @@ _08170D38: mov r8, r1 ldrb r0, [r1] movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #0x30] mov r1, r8 ldrb r0, [r1] movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #0x10 @@ -757590,7 +757590,7 @@ sub_08170E14: @ 0x08170E14 bne _08170E6E movs r0, #0x3d movs r1, #0 - bl sub_080A307C + bl PlaySE12WithPanning ldr r0, _08170E7C lsls r4, r5, #2 adds r4, r4, r5 @@ -757608,7 +757608,7 @@ sub_08170E14: @ 0x08170E14 str r1, [r0] ldr r0, _08170E84 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r0, _08170E88 str r0, [r4] _08170E6E: @@ -757659,7 +757659,7 @@ sub_08170E8C: @ 0x08170E8C movs r1, #0 bl StartSpriteAnim adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08170ED8: pop {r4, r5, r6} pop {r0} @@ -757684,7 +757684,7 @@ sub_08170EE8: @ 0x08170EE8 ldr r0, _08170F10 strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r0, _08170F14 str r0, [r4, #0x1c] pop {r4} @@ -757700,7 +757700,7 @@ sub_08170F18: @ 0x08170F18 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _08170FB6 @@ -757747,7 +757747,7 @@ _08170F6C: str r0, [r4, #0x1c] ldr r0, _08170FC4 ldrh r0, [r0] - bl sub_08170B68 + bl ItemIdToBallId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0xb @@ -757764,13 +757764,13 @@ _08170F6C: str r5, [sp] movs r2, #1 movs r3, #0x1c - bl sub_08171B7C + bl AnimateBallOpenParticles ldr r0, _08170FC8 ldrb r1, [r0] movs r0, #0 movs r2, #0xe adds r3, r5, #0 - bl sub_081727CC + bl LaunchBallFadeMonTask _08170FB6: add sp, #4 pop {r4, r5} @@ -757795,7 +757795,7 @@ sub_08170FCC: @ 0x08170FCC bne _08171008 ldr r0, _08171010 movs r1, #0x32 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x38] @@ -757872,7 +757872,7 @@ _08171074: _0817107A: adds r0, r4, #0 movs r1, #0 - bl sub_080A6B38 + bl PrepareBattlerSpriteForRotScale movs r0, #0x80 lsls r0, r0, #1 strh r0, [r5, #0x1c] @@ -757915,7 +757915,7 @@ _081710CC: adds r0, r4, #0 adds r1, r2, #0 movs r3, #0 - bl sub_080A6A7C + bl SetSpriteRotScale ldrh r0, [r5, #0xc] ldrh r1, [r5, #0xe] adds r0, r0, r1 @@ -757941,7 +757941,7 @@ _08171108: .4byte gUnknown_20205AC _0817110C: .4byte 0x0000047F _08171110: adds r0, r4, #0 - bl sub_080A6C0C + bl ResetSpriteRotScale ldr r1, _08171134 lsls r0, r4, #4 adds r0, r0, r4 @@ -757970,7 +757970,7 @@ _08171138: cmp r0, #0xa ble _08171160 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask adds r0, r7, #0 movs r1, #2 bl StartSpriteAnim @@ -758604,7 +758604,7 @@ sub_081715DC: @ 0x081715DC lsls r0, r1 movs r1, #6 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes adds r0, r6, #0 bl sub_081717D0 b _081716A0 @@ -758623,7 +758623,7 @@ _08171620: movs r1, #2 movs r2, #6 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _081716A0 _0817163E: cmp r1, #0x5f @@ -758720,7 +758720,7 @@ _081716DA: bl SetGpuReg ldr r0, [r4, #0x14] ldrh r0, [r0, #2] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r0, #0x10 @@ -758732,7 +758732,7 @@ _081716DA: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08171766 .align 2, 0 _08171724: .4byte 0x00007FFF @@ -758866,7 +758866,7 @@ _0817180A: ldrsh r2, [r6, r0] ldr r0, _08171880 mov r3, r8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -758895,7 +758895,7 @@ _0817180A: ldrsb r0, [r1, r0] strh r0, [r5, #0x38] adds r0, r5, #0 - bl sub_080A619C + bl InitAnimArcTranslation add r4, sl ldr r0, _08171888 str r0, [r4] @@ -758940,7 +758940,7 @@ sub_08171890: @ 0x08171890 orrs r0, r1 strb r0, [r3] adds r0, r4, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _081718C0 @@ -758967,7 +758967,7 @@ sub_081718C8: @ 0x081718C8 str r0, [r4, #0x1c] ldr r0, _08171980 ldrh r0, [r0] - bl sub_08170B68 + bl ItemIdToBallId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0xb @@ -758984,13 +758984,13 @@ sub_081718C8: @ 0x081718C8 str r5, [sp] movs r2, #1 movs r3, #0x1c - bl sub_08171B7C + bl AnimateBallOpenParticles ldr r0, _08171984 ldrb r1, [r0] movs r0, #1 movs r2, #0xe adds r3, r5, #0 - bl sub_081727CC + bl LaunchBallFadeMonTask _0817191A: ldr r6, _08171988 ldr r5, _0817198C @@ -759024,7 +759024,7 @@ _0817191A: adds r0, r0, r1 lsls r0, r0, #2 adds r0, r0, r6 - bl sub_08007358 + bl AnimateSprite ldrb r0, [r4] adds r0, r0, r5 ldrb r1, [r0] @@ -759284,10 +759284,10 @@ sub_08171B44: @ 0x08171B44 cmp r0, r1 bne _08171B6A adds r0, r4, #0 - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _08171B78 adds r0, r5, r0 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap _08171B6A: pop {r4, r5} pop {r0} @@ -759298,8 +759298,8 @@ _08171B74: .4byte 0xFFFF0000 _08171B78: .4byte gUnknown_85C61B0 thumb_func_end sub_08171B44 - thumb_func_start sub_08171B7C -sub_08171B7C: @ 0x08171B7C + thumb_func_start AnimateBallOpenParticles +AnimateBallOpenParticles: @ 0x08171B7C push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -759333,7 +759333,7 @@ sub_08171B7C: @ 0x08171B7C adds r0, r0, r1 ldr r0, [r0] movs r1, #5 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -759363,7 +759363,7 @@ sub_08171B7C: @ 0x08171B7C .align 2, 0 _08171BFC: .4byte gUnknown_85C627C _08171C00: .4byte gUnknown_3005B60 - thumb_func_end sub_08171B7C + thumb_func_end AnimateBallOpenParticles thumb_func_start sub_08171C04 sub_08171C04: @ 0x08171C04 @@ -759391,8 +759391,8 @@ _08171C2C: .4byte 0x00000439 _08171C30: .4byte gUnknown_2024174 thumb_func_end sub_08171C04 - thumb_func_start sub_08171C34 -sub_08171C34: @ 0x08171C34 + thumb_func_start PokeBallOpenParticleAnimation +PokeBallOpenParticleAnimation: @ 0x08171C34 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -759427,7 +759427,7 @@ sub_08171C34: @ 0x08171C34 lsls r0, r0, #3 ldr r4, _08171D14 adds r0, r0, r4 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -759499,14 +759499,14 @@ _08171CD0: strh r0, [r1, #0x3c] _08171D06: mov r0, r8 - bl sub_080A8964 + bl DestroyTask b _08171D3C .align 2, 0 _08171D10: .4byte gUnknown_3005B60 _08171D14: .4byte gUnknown_85C62AC _08171D18: .4byte gUnknown_20205AC _08171D1C: .4byte gUnknown_85C6270 -_08171D20: .4byte sub_08171D4C +_08171D20: .4byte PokeBallOpenParticleAnimation_Step1 _08171D24: .4byte gUnknown_3002360 _08171D28: .4byte 0x00000439 _08171D2C: @@ -759527,10 +759527,10 @@ _08171D3C: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08171C34 + thumb_func_end PokeBallOpenParticleAnimation - thumb_func_start sub_08171D4C -sub_08171D4C: @ 0x08171D4C + thumb_func_start PokeBallOpenParticleAnimation_Step1 +PokeBallOpenParticleAnimation_Step1: @ 0x08171D4C push {lr} adds r1, r0, #0 ldrh r2, [r1, #0x30] @@ -759542,17 +759542,17 @@ sub_08171D4C: @ 0x08171D4C str r0, [r1, #0x1c] b _08171D68 .align 2, 0 -_08171D60: .4byte sub_08171D6C +_08171D60: .4byte PokeBallOpenParticleAnimation_Step2 _08171D64: subs r0, r2, #1 strh r0, [r1, #0x30] _08171D68: pop {r0} bx r0 - thumb_func_end sub_08171D4C + thumb_func_end PokeBallOpenParticleAnimation_Step1 - thumb_func_start sub_08171D6C -sub_08171D6C: @ 0x08171D6C + thumb_func_start PokeBallOpenParticleAnimation_Step2 +PokeBallOpenParticleAnimation_Step2: @ 0x08171D6C push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -759575,13 +759575,13 @@ sub_08171D6C: @ 0x08171D6C cmp r0, #0x32 bne _08171DA0 adds r0, r4, #0 - bl sub_08172728 + bl DestroyBallOpenAnimationParticle _08171DA0: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08171D6C + thumb_func_end PokeBallOpenParticleAnimation_Step2 thumb_func_start sub_08171DA8 sub_08171DA8: @ 0x08171DA8 @@ -759627,7 +759627,7 @@ _08171DEE: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -759689,7 +759689,7 @@ _08171E4E: strh r0, [r1, #0x3c] _08171E76: mov r0, sb - bl sub_080A8964 + bl DestroyTask add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -759704,13 +759704,13 @@ _08171E90: .4byte gUnknown_20205AC _08171E94: .4byte gUnknown_85C62AC _08171E98: .4byte gUnknown_85C6270 _08171E9C: .4byte gUnknown_20205C8 -_08171EA0: .4byte sub_081722EC +_08171EA0: .4byte FanOutBallOpenParticles_Step1 _08171EA4: .4byte gUnknown_3002360 _08171EA8: .4byte 0x00000439 thumb_func_end sub_08171DA8 - thumb_func_start sub_08171EAC -sub_08171EAC: @ 0x08171EAC + thumb_func_start DiveBallOpenParticleAnimation +DiveBallOpenParticleAnimation: @ 0x08171EAC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -759753,7 +759753,7 @@ _08171EF2: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -759815,7 +759815,7 @@ _08171F52: strh r0, [r1, #0x3c] _08171F7A: mov r0, sb - bl sub_080A8964 + bl DestroyTask add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -759830,13 +759830,13 @@ _08171F94: .4byte gUnknown_20205AC _08171F98: .4byte gUnknown_85C62AC _08171F9C: .4byte gUnknown_85C6270 _08171FA0: .4byte gUnknown_20205C8 -_08171FA4: .4byte sub_081722EC +_08171FA4: .4byte FanOutBallOpenParticles_Step1 _08171FA8: .4byte gUnknown_3002360 _08171FAC: .4byte 0x00000439 - thumb_func_end sub_08171EAC + thumb_func_end DiveBallOpenParticleAnimation - thumb_func_start sub_08171FB0 -sub_08171FB0: @ 0x08171FB0 + thumb_func_start SafariBallOpenParticleAnimation +SafariBallOpenParticleAnimation: @ 0x08171FB0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -759879,7 +759879,7 @@ _08171FF6: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -759939,7 +759939,7 @@ _08172052: strh r0, [r1, #0x3c] _0817207A: mov r0, sb - bl sub_080A8964 + bl DestroyTask add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -759954,13 +759954,13 @@ _08172094: .4byte gUnknown_20205AC _08172098: .4byte gUnknown_85C6270 _0817209C: .4byte gUnknown_85C62AC _081720A0: .4byte gUnknown_20205C8 -_081720A4: .4byte sub_081722EC +_081720A4: .4byte FanOutBallOpenParticles_Step1 _081720A8: .4byte gUnknown_3002360 _081720AC: .4byte 0x00000439 - thumb_func_end sub_08171FB0 + thumb_func_end SafariBallOpenParticleAnimation - thumb_func_start sub_081720B0 -sub_081720B0: @ 0x081720B0 + thumb_func_start UltraBallOpenParticleAnimation +UltraBallOpenParticleAnimation: @ 0x081720B0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -760003,7 +760003,7 @@ _081720F6: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -760067,7 +760067,7 @@ _0817215A: strh r0, [r1, #0x3c] _08172182: mov r0, sb - bl sub_080A8964 + bl DestroyTask add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -760082,13 +760082,13 @@ _0817219C: .4byte gUnknown_20205AC _081721A0: .4byte gUnknown_85C62AC _081721A4: .4byte gUnknown_85C6270 _081721A8: .4byte gUnknown_20205C8 -_081721AC: .4byte sub_081722EC +_081721AC: .4byte FanOutBallOpenParticles_Step1 _081721B0: .4byte gUnknown_3002360 _081721B4: .4byte 0x00000439 - thumb_func_end sub_081720B0 + thumb_func_end UltraBallOpenParticleAnimation - thumb_func_start sub_081721B8 -sub_081721B8: @ 0x081721B8 + thumb_func_start GreatBallOpenParticleAnimation +GreatBallOpenParticleAnimation: @ 0x081721B8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -760143,7 +760143,7 @@ _08172214: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -760217,7 +760217,7 @@ _08172270: strh r0, [r1, #0x3c] _081722B4: mov r0, r8 - bl sub_080A8964 + bl DestroyTask _081722BA: add sp, #0x18 pop {r3, r4, r5} @@ -760232,14 +760232,14 @@ _081722CC: .4byte gUnknown_20205AC _081722D0: .4byte gUnknown_85C6270 _081722D4: .4byte gUnknown_85C62AC _081722D8: .4byte gUnknown_20205C8 -_081722DC: .4byte sub_081722EC +_081722DC: .4byte FanOutBallOpenParticles_Step1 _081722E0: .4byte gUnknown_3005B60 _081722E4: .4byte gUnknown_3002360 _081722E8: .4byte 0x00000439 - thumb_func_end sub_081721B8 + thumb_func_end GreatBallOpenParticleAnimation - thumb_func_start sub_081722EC -sub_081722EC: @ 0x081722EC + thumb_func_start FanOutBallOpenParticles_Step1 +FanOutBallOpenParticles_Step1: @ 0x081722EC push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -760276,16 +760276,16 @@ sub_081722EC: @ 0x081722EC cmp r0, #0x33 bne _0817233C adds r0, r4, #0 - bl sub_08172728 + bl DestroyBallOpenAnimationParticle _0817233C: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081722EC + thumb_func_end FanOutBallOpenParticles_Step1 - thumb_func_start sub_08172344 -sub_08172344: @ 0x08172344 + thumb_func_start RepeatBallOpenParticleAnimation +RepeatBallOpenParticleAnimation: @ 0x08172344 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -760328,7 +760328,7 @@ _0817238A: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -760386,7 +760386,7 @@ _081723E2: strh r0, [r1, #0x3c] _0817240A: mov r0, sb - bl sub_080A8964 + bl DestroyTask add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -760401,13 +760401,13 @@ _08172424: .4byte gUnknown_20205AC _08172428: .4byte gUnknown_85C6270 _0817242C: .4byte gUnknown_85C62AC _08172430: .4byte gUnknown_20205C8 -_08172434: .4byte sub_08172440 +_08172434: .4byte RepeatBallOpenParticleAnimation_Step1 _08172438: .4byte gUnknown_3002360 _0817243C: .4byte 0x00000439 - thumb_func_end sub_08172344 + thumb_func_end RepeatBallOpenParticleAnimation - thumb_func_start sub_08172440 -sub_08172440: @ 0x08172440 + thumb_func_start RepeatBallOpenParticleAnimation_Step1 +RepeatBallOpenParticleAnimation_Step1: @ 0x08172440 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x2e @@ -760447,16 +760447,16 @@ sub_08172440: @ 0x08172440 cmp r0, #0x33 bne _08172498 adds r0, r5, #0 - bl sub_08172728 + bl DestroyBallOpenAnimationParticle _08172498: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08172440 + thumb_func_end RepeatBallOpenParticleAnimation_Step1 - thumb_func_start sub_081724A0 -sub_081724A0: @ 0x081724A0 + thumb_func_start MasterBallOpenParticleAnimation +MasterBallOpenParticleAnimation: @ 0x081724A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -760503,7 +760503,7 @@ _081724EC: ldr r1, [sp, #4] ldr r2, [sp, #8] ldr r3, [sp, #0x10] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -760551,7 +760551,7 @@ _08172558: .4byte gUnknown_85C62AC _0817255C: .4byte gUnknown_20205AC _08172560: .4byte gUnknown_85C6270 _08172564: .4byte gUnknown_20205C8 -_08172568: .4byte sub_081722EC +_08172568: .4byte FanOutBallOpenParticles_Step1 _0817256C: movs r0, #1 strh r0, [r5, #0x38] @@ -760587,7 +760587,7 @@ _08172574: strh r0, [r1, #0x3c] _081725A8: ldr r0, [sp] - bl sub_080A8964 + bl DestroyTask add sp, #0x18 pop {r3, r4, r5} mov r8, r3 @@ -760600,10 +760600,10 @@ _081725A8: _081725C0: .4byte gUnknown_3002360 _081725C4: .4byte 0x00000439 _081725C8: .4byte gUnknown_20205AC - thumb_func_end sub_081724A0 + thumb_func_end MasterBallOpenParticleAnimation - thumb_func_start sub_081725CC -sub_081725CC: @ 0x081725CC + thumb_func_start PremierBallOpenParticleAnimation +PremierBallOpenParticleAnimation: @ 0x081725CC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -760646,7 +760646,7 @@ _08172612: ldr r1, [sp] ldr r2, [sp, #4] ldr r3, [sp, #0xc] - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0x40 @@ -760701,7 +760701,7 @@ _08172664: strh r0, [r1, #0x3c] _0817268C: mov r0, sb - bl sub_080A8964 + bl DestroyTask add sp, #0x14 pop {r3, r4, r5} mov r8, r3 @@ -760716,13 +760716,13 @@ _081726A8: .4byte gUnknown_20205AC _081726AC: .4byte gUnknown_85C6270 _081726B0: .4byte gUnknown_85C62AC _081726B4: .4byte gUnknown_20205C8 -_081726B8: .4byte sub_081726C4 +_081726B8: .4byte PremierBallOpenParticleAnimation_Step1 _081726BC: .4byte gUnknown_3002360 _081726C0: .4byte 0x00000439 - thumb_func_end sub_081725CC + thumb_func_end PremierBallOpenParticleAnimation - thumb_func_start sub_081726C4 -sub_081726C4: @ 0x081726C4 + thumb_func_start PremierBallOpenParticleAnimation_Step1 +PremierBallOpenParticleAnimation_Step1: @ 0x081726C4 push {r4, r5, lr} adds r5, r0, #0 movs r1, #0x2e @@ -760764,16 +760764,16 @@ sub_081726C4: @ 0x081726C4 cmp r0, #0x33 bne _08172720 adds r0, r5, #0 - bl sub_08172728 + bl DestroyBallOpenAnimationParticle _08172720: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081726C4 + thumb_func_end PremierBallOpenParticleAnimation_Step1 - thumb_func_start sub_08172728 -sub_08172728: @ 0x08172728 + thumb_func_start DestroyBallOpenAnimationParticle +DestroyBallOpenAnimationParticle: @ 0x08172728 push {r4, r5, r6, r7, lr} adds r7, r0, #0 ldr r0, _0817274C @@ -760819,7 +760819,7 @@ _0817277C: cmp r4, #0xb bgt _0817278E ldr r0, [r5] - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -760854,10 +760854,10 @@ _081727C6: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08172728 + thumb_func_end DestroyBallOpenAnimationParticle - thumb_func_start sub_081727CC -sub_081727CC: @ 0x081727CC + thumb_func_start LaunchBallFadeMonTask +LaunchBallFadeMonTask: @ 0x081727CC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -760873,7 +760873,7 @@ sub_081727CC: @ 0x081727CC lsrs r7, r3, #0x18 ldr r0, _08172830 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -760936,7 +760936,7 @@ _08172862: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade mov r0, r8 add sp, #4 pop {r3, r4} @@ -760950,7 +760950,7 @@ _08172884: .4byte gUnknown_85C63CC _08172888: .4byte 0x0000FFFF _0817288C: .4byte sub_08172924 _08172890: .4byte 0x00007FFF - thumb_func_end sub_081727CC + thumb_func_end LaunchBallFadeMonTask thumb_func_start sub_08172894 sub_08172894: @ 0x08172894 @@ -761012,9 +761012,9 @@ _081728EC: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08172914: add sp, #4 pop {r4, r5} @@ -761051,7 +761051,7 @@ sub_08172924: @ 0x08172924 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08172970 str r0, [r4] _0817295C: @@ -761110,7 +761110,7 @@ _081729C0: .4byte gUnknown_3005B60 _081729C4: .4byte gUnknown_85C63CC _081729C8: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _081729CE: pop {r4} pop {r0} @@ -761164,7 +761164,7 @@ _08172A1A: adds r0, r0, r4 strh r0, [r5, #8] ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08172A5C @@ -761229,7 +761229,7 @@ _08172AAC: ldrb r1, [r5, #0x1e] adds r0, r2, #0 adds r2, r6, #0 - bl sub_0805E510 + bl LoadBattleMonGfxAndAnimate ldrh r0, [r5, #0x1c] adds r0, #1 strh r0, [r5, #0x1c] @@ -761242,7 +761242,7 @@ _08172ABE: adds r0, r0, r2 strh r0, [r5, #8] ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 beq _08172AF4 @@ -761284,7 +761284,7 @@ _08172B0C: strh r1, [r0, #8] ldr r0, _08172B48 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -761458,8 +761458,8 @@ _08172C78: .4byte gUnknown_20205AC _08172C7C: .4byte 0x06010000 thumb_func_end sub_08172B7C - thumb_func_start sub_08172C80 -sub_08172C80: @ 0x08172C80 + thumb_func_start AnimTask_IsAttackerBehindSubstitute +AnimTask_IsAttackerBehindSubstitute: @ 0x08172C80 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -761482,10 +761482,10 @@ sub_08172C80: @ 0x08172C80 _08172CA8: .4byte gUnknown_20380BE _08172CAC: .4byte gUnknown_2024174 _08172CB0: .4byte gUnknown_20380D6 - thumb_func_end sub_08172C80 + thumb_func_end AnimTask_IsAttackerBehindSubstitute - thumb_func_start sub_08172CB4 -sub_08172CB4: @ 0x08172CB4 + thumb_func_start AnimTask_TargetToEffectBattler +AnimTask_TargetToEffectBattler: @ 0x08172CB4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -761499,7 +761499,7 @@ sub_08172CB4: @ 0x08172CB4 .align 2, 0 _08172CCC: .4byte gUnknown_20380D7 _08172CD0: .4byte gUnknown_2023EB2 - thumb_func_end sub_08172CB4 + thumb_func_end AnimTask_TargetToEffectBattler thumb_func_start sub_08172CD4 sub_08172CD4: @ 0x08172CD4 @@ -761524,14 +761524,14 @@ sub_08172CD4: @ 0x08172CD4 strb r1, [r0] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r0, r6, #0 - bl sub_080A3BD8 + bl IsBattlerSpriteVisible lsls r0, r0, #0x18 cmp r0, #0 beq _08172DAC @@ -761558,20 +761558,20 @@ _08172D32: cmp r0, r7 bne _08172D52 ldr r0, _08172D9C - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _08172DA0 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap _08172D52: ldr r5, _08172DA4 adds r0, r5, #0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _08172DA8 @@ -761666,12 +761666,12 @@ _08172E1E: ldrb r0, [r4, #8] mov r8, r0 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r5, r0, #0x18 mov r0, r8 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r2, r0, #0x18 movs r1, #0x1e @@ -761681,7 +761681,7 @@ _08172E1E: ldr r0, _08172E54 adds r1, r5, #0 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 b _08172EBA @@ -761696,7 +761696,7 @@ _08172E58: ldr r0, _08172E84 adds r1, r5, #0 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _08172E88 @@ -761716,7 +761716,7 @@ _08172E8C: ldr r0, _08172EE4 adds r1, r5, #0 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _08172EE8 @@ -761789,7 +761789,7 @@ _08172EFC: cmp r0, #0 bne _08172F44 mov r0, r8 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r1, #0x3f cmp r0, #0 @@ -761799,7 +761799,7 @@ _08172F3A: lsls r1, r1, #0x18 asrs r1, r1, #0x18 movs r0, #0x66 - bl sub_080A307C + bl PlaySE12WithPanning _08172F44: ldr r1, _08172F80 adds r0, r4, r5 @@ -761874,7 +761874,7 @@ sub_08172F94: @ 0x08172F94 strb r1, [r0, #1] _08172FCE: adds r0, r3, #0 - bl sub_080A8964 + bl DestroyTask _08172FD4: pop {r0} bx r0 @@ -761985,11 +761985,11 @@ sub_08173094: @ 0x08173094 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _081730BC - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _081730C0 - bl sub_0803481C + bl LoadCompressedSpritePaletteUsingHeap ldr r0, _081730C4 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r0, r4, #0 bl DestroyAnimVisualTask pop {r4} @@ -762001,8 +762001,8 @@ _081730C0: .4byte gUnknown_84FE3C0 _081730C4: .4byte 0x0000281D thumb_func_end sub_08173094 - thumb_func_start sub_081730C8 -sub_081730C8: @ 0x081730C8 + thumb_func_start AnimTask_FreePokeblockGfx +AnimTask_FreePokeblockGfx: @ 0x081730C8 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -762019,14 +762019,14 @@ sub_081730C8: @ 0x081730C8 bx r0 .align 2, 0 _081730EC: .4byte 0x0000281D - thumb_func_end sub_081730C8 + thumb_func_end AnimTask_FreePokeblockGfx thumb_func_start sub_081730F0 sub_081730F0: @ 0x081730F0 push {r4, r5, lr} adds r4, r0, #0 movs r1, #0 - bl sub_080A6294 + bl InitSpritePosToAnimAttacker movs r0, #0x1e strh r0, [r4, #0x2e] movs r0, #1 @@ -762034,7 +762034,7 @@ sub_081730F0: @ 0x081730F0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 ldr r5, _08173164 lsrs r0, r0, #0x18 @@ -762046,7 +762046,7 @@ sub_081730F0: @ 0x081730F0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 - bl sub_080A5534 + bl GetBattlerSpriteCoord lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r5, [r5, #6] @@ -762055,7 +762055,7 @@ sub_081730F0: @ 0x081730F0 ldr r0, _08173168 strh r0, [r4, #0x38] adds r0, r4, #0 - bl sub_080A619C + bl InitAnimArcTranslation ldr r2, _0817316C ldr r1, _08173170 ldr r0, _08173174 @@ -762118,7 +762118,7 @@ _081731B4: .4byte sub_081731B8 sub_081731B8: @ 0x081731B8 push {r4, lr} adds r4, r0, #0 - bl sub_080A61C8 + bl TranslateAnimHorizontalArc lsls r0, r0, #0x18 cmp r0, #0 beq _081731DA @@ -762175,7 +762175,7 @@ sub_081731E4: @ 0x081731E4 movs r1, #0 bl StartSpriteAnim adds r0, r4, #0 - bl sub_080A34C4 + bl DestroyAnimSprite _0817322C: pop {r4, r5} pop {r0} @@ -762231,8 +762231,8 @@ _08173290: .4byte gUnknown_20380D6 _08173294: .4byte gUnknown_20380D7 thumb_func_end sub_08173240 - thumb_func_start sub_08173298 -sub_08173298: @ 0x08173298 + thumb_func_start AnimTask_GetTrappedMoveAnimId +AnimTask_GetTrappedMoveAnimId: @ 0x08173298 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -762285,10 +762285,10 @@ _081732F0: bx r0 .align 2, 0 _081732FC: .4byte gUnknown_20380BE - thumb_func_end sub_08173298 + thumb_func_end AnimTask_GetTrappedMoveAnimId - thumb_func_start sub_08173300 -sub_08173300: @ 0x08173300 + thumb_func_start AnimTask_GetBattlersFromArg +AnimTask_GetBattlersFromArg: @ 0x08173300 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -762310,34 +762310,34 @@ sub_08173300: @ 0x08173300 _08173324: .4byte gUnknown_20380D6 _08173328: .4byte gUnknown_2024174 _0817332C: .4byte gUnknown_20380D7 - thumb_func_end sub_08173300 + thumb_func_end AnimTask_GetBattlersFromArg - thumb_func_start sub_08173330 -sub_08173330: @ 0x08173330 + thumb_func_start VBlankCB_HallOfFame +VBlankCB_HallOfFame: @ 0x08173330 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08173330 + thumb_func_end VBlankCB_HallOfFame - thumb_func_start sub_08173344 -sub_08173344: @ 0x08173344 + thumb_func_start CB2_HallOfFame +CB2_HallOfFame: @ 0x08173344 push {lr} - bl sub_080A89D4 + bl RunTasks bl sub_08004630 - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08173344 + thumb_func_end CB2_HallOfFame - thumb_func_start sub_08173360 -sub_08173360: @ 0x08173360 + thumb_func_start InitHallOfFameScreen +InitHallOfFameScreen: @ 0x08173360 push {r4, lr} sub sp, #4 ldr r0, _08173380 @@ -762365,11 +762365,11 @@ _08173388: @ jump table .4byte _08173440 @ case 4 _0817339C: movs r0, #0 - bl sub_080006F0 - bl sub_08174DC8 + bl SetVBlankCallback + bl ClearVramOamPltt_LoadHofPal ldr r4, _081733C0 ldr r0, _081733C4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r0, _081733C8 movs r1, #0x87 @@ -762412,14 +762412,14 @@ _08173404: cmp r4, #0 bne _0817346C ldr r0, _08173438 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 rsbs r0, r0, #0 str r4, [sp] movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _08173426: ldr r1, _0817343C movs r0, #0x87 @@ -762430,10 +762430,10 @@ _08173426: strb r0, [r1] b _0817346C .align 2, 0 -_08173438: .4byte sub_08173330 +_08173438: .4byte VBlankCB_HallOfFame _0817343C: .4byte gUnknown_3002360 _08173440: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _08173464 ldrb r1, [r0, #7] movs r0, #0x80 @@ -762441,15 +762441,15 @@ _08173440: cmp r0, #0 bne _0817346C ldr r0, _08173468 - bl sub_08000540 + bl SetMainCallback2 movs r0, #0xda lsls r0, r0, #1 - bl sub_080A3040 + bl PlayBGM movs r0, #0 b _0817346E .align 2, 0 _08173464: .4byte gUnknown_2037C74 -_08173468: .4byte sub_08173344 +_08173468: .4byte CB2_HallOfFame _0817346C: movs r0, #1 _0817346E: @@ -762458,19 +762458,19 @@ _0817346E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08173360 + thumb_func_end InitHallOfFameScreen - thumb_func_start sub_08173478 -sub_08173478: @ 0x08173478 + thumb_func_start CB2_DoHallOfFameScreen +CB2_DoHallOfFameScreen: @ 0x08173478 push {r4, lr} - bl sub_08173360 + bl InitHallOfFameScreen lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 bne _081734A8 ldr r0, _081734B0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081734B4 @@ -762481,28 +762481,28 @@ sub_08173478: @ 0x08173478 strh r4, [r1, #8] ldr r4, _081734B8 movs r0, #0x78 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _081734A8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081734B0: .4byte sub_08173500 +_081734B0: .4byte Task_Hof_InitMonData _081734B4: .4byte gUnknown_3005B60 _081734B8: .4byte gUnknown_203B9A4 - thumb_func_end sub_08173478 + thumb_func_end CB2_DoHallOfFameScreen - thumb_func_start sub_081734BC -sub_081734BC: @ 0x081734BC + thumb_func_start CB2_DoHallOfFameScreenDontSaveData +CB2_DoHallOfFameScreenDontSaveData: @ 0x081734BC push {r4, lr} - bl sub_08173360 + bl InitHallOfFameScreen lsls r0, r0, #0x18 cmp r0, #0 bne _081734EC ldr r0, _081734F4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081734F8 @@ -762514,20 +762514,20 @@ sub_081734BC: @ 0x081734BC strh r0, [r1, #8] ldr r4, _081734FC movs r0, #0x78 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _081734EC: pop {r4} pop {r0} bx r0 .align 2, 0 -_081734F4: .4byte sub_08173500 +_081734F4: .4byte Task_Hof_InitMonData _081734F8: .4byte gUnknown_3005B60 _081734FC: .4byte gUnknown_203B9A4 - thumb_func_end sub_081734BC + thumb_func_end CB2_DoHallOfFameScreenDontSaveData - thumb_func_start sub_08173500 -sub_08173500: @ 0x08173500 + thumb_func_start Task_Hof_InitMonData +Task_Hof_InitMonData: @ 0x08173500 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -762554,13 +762554,13 @@ _08173524: adds r6, r1, r0 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 cmp r5, #0 beq _081735F0 adds r0, r6, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData mov r1, sb ldr r3, [r1] lsls r4, r7, #2 @@ -762578,14 +762578,14 @@ _08173524: strh r1, [r3, #8] adds r0, r6, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData mov r2, sb ldr r1, [r2] adds r1, r1, r4 str r0, [r1] adds r0, r6, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData mov r5, sb ldr r1, [r5] adds r1, #4 @@ -762593,7 +762593,7 @@ _08173524: str r0, [r1] adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r2, [r5] adds r2, r2, r4 lsls r0, r0, #1 @@ -762605,7 +762605,7 @@ _08173524: adds r0, r6, #0 movs r1, #2 mov r2, sp - bl sub_0806A058 + bl GetMonData movs r2, #0 mov r6, r8 lsls r5, r6, #2 @@ -762727,11 +762727,11 @@ _0817368A: pop {r0} bx r0 .align 2, 0 -_0817369C: .4byte sub_081736A0 - thumb_func_end sub_08173500 +_0817369C: .4byte Task_Hof_InitTeamSaveData + thumb_func_end Task_Hof_InitMonData - thumb_func_start sub_081736A0 -sub_081736A0: @ 0x081736A0 + thumb_func_start Task_Hof_InitTeamSaveData +Task_Hof_InitTeamSaveData: @ 0x081736A0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -762756,7 +762756,7 @@ _081736C8: .4byte gUnknown_201C000 _081736CC: .4byte gUnknown_203B9B0 _081736D0: movs r0, #3 - bl sub_0815340C + bl Save_LoadGameData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -762831,10 +762831,10 @@ _0817373A: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _081737A0 mov r0, r8 add r0, sb @@ -762855,11 +762855,11 @@ _08173794: .4byte gUnknown_201C000 _08173798: .4byte gUnknown_203B9A4 _0817379C: .4byte gUnknown_8277071 _081737A0: .4byte gUnknown_3005B60 -_081737A4: .4byte sub_081737A8 - thumb_func_end sub_081736A0 +_081737A4: .4byte Task_Hof_TrySaveData + thumb_func_end Task_Hof_InitTeamSaveData - thumb_func_start sub_081737A8 -sub_081737A8: @ 0x081737A8 + thumb_func_start Task_Hof_TrySaveData +Task_Hof_TrySaveData: @ 0x081737A8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -762867,7 +762867,7 @@ sub_081737A8: @ 0x081737A8 ldr r0, _08173808 str r0, [r1] movs r0, #3 - bl sub_08153274 + bl TrySavingData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -762877,15 +762877,15 @@ sub_081737A8: @ 0x081737A8 cmp r0, #0 beq _08173818 movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #3 - bl sub_08002160 - bl sub_080034D4 + bl UnsetBgTilemapBuffer + bl FreeAllWindowBuffers ldr r5, _08173810 ldr r0, [r5] cmp r0, #0 beq _081737EA - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r5] _081737EA: @@ -762893,16 +762893,16 @@ _081737EA: ldr r0, [r5] cmp r0, #0 beq _081737FA - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r5] _081737FA: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask b _08173830 .align 2, 0 _08173804: .4byte gUnknown_3005F54 -_08173808: .4byte sub_081734BC +_08173808: .4byte CB2_DoHallOfFameScreenDontSaveData _0817380C: .4byte gUnknown_3005F3C _08173810: .4byte gUnknown_203B9A8 _08173814: .4byte gUnknown_203B9A4 @@ -762924,11 +762924,11 @@ _08173830: bx r0 .align 2, 0 _08173838: .4byte gUnknown_3005B60 -_0817383C: .4byte sub_08173840 - thumb_func_end sub_081737A8 +_0817383C: .4byte Task_Hof_WaitForFrames + thumb_func_end Task_Hof_TrySaveData - thumb_func_start sub_08173840 -sub_08173840: @ 0x08173840 + thumb_func_start Task_Hof_WaitForFrames +Task_Hof_WaitForFrames: @ 0x08173840 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -762955,7 +762955,7 @@ _08173868: bx r0 .align 2, 0 _0817386C: .4byte sub_08173870 - thumb_func_end sub_08173840 + thumb_func_end Task_Hof_WaitForFrames thumb_func_start sub_08173870 sub_08173870: @ 0x08173870 @@ -762971,11 +762971,11 @@ sub_08173870: @ 0x08173870 bx lr .align 2, 0 _08173884: .4byte gUnknown_3005B60 -_08173888: .4byte sub_0817388C +_08173888: .4byte Task_Hof_DisplayMon thumb_func_end sub_08173870 - thumb_func_start sub_0817388C -sub_0817388C: @ 0x0817388C + thumb_func_start Task_Hof_DisplayMon +Task_Hof_DisplayMon: @ 0x0817388C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -763052,7 +763052,7 @@ _08173904: ldr r3, _08173990 str r3, [sp, #0xc] movs r3, #1 - bl sub_0818D110 + bl CreatePicSprite2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _08173994 @@ -763105,13 +763105,13 @@ _08173988: .4byte gUnknown_85C64A0 _0817398C: .4byte 0x000001FF _08173990: .4byte 0x0000FFFF _08173994: .4byte gUnknown_20205AC -_08173998: .4byte sub_08175024 +_08173998: .4byte SpriteCB_GetOnScreenAndAnimate _0817399C: .4byte gUnknown_3005B60 -_081739A0: .4byte sub_081739A4 - thumb_func_end sub_0817388C +_081739A0: .4byte Task_Hof_PrintMonInfoAfterAnimating + thumb_func_end Task_Hof_DisplayMon - thumb_func_start sub_081739A4 -sub_081739A4: @ 0x081739A4 + thumb_func_start Task_Hof_PrintMonInfoAfterAnimating +Task_Hof_PrintMonInfoAfterAnimating: @ 0x081739A4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -763165,11 +763165,11 @@ _08173A04: .4byte gUnknown_3005B60 _08173A08: .4byte gUnknown_203B9A4 _08173A0C: .4byte gUnknown_20205AC _08173A10: .4byte sub_08007140 -_08173A14: .4byte sub_08173A18 - thumb_func_end sub_081739A4 +_08173A14: .4byte Task_Hof_TryDisplayAnotherMon + thumb_func_end Task_Hof_PrintMonInfoAfterAnimating - thumb_func_start sub_08173A18 -sub_08173A18: @ 0x08173A18 + thumb_func_start Task_Hof_TryDisplayAnotherMon +Task_Hof_TryDisplayAnotherMon: @ 0x08173A18 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -763245,7 +763245,7 @@ _08173A5C: movs r1, #0 movs r2, #0xc movs r3, #0xc - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 ldrsh r1, [r6, r0] lsls r0, r1, #4 @@ -763267,7 +763267,7 @@ _08173AD4: .4byte gUnknown_203B9A0 _08173AD8: .4byte gUnknown_20205AC _08173ADC: .4byte 0x000001FF _08173AE0: .4byte 0x000063B0 -_08173AE4: .4byte sub_0817388C +_08173AE4: .4byte Task_Hof_DisplayMon _08173AE8: lsls r0, r5, #2 adds r0, r0, r5 @@ -763284,11 +763284,11 @@ _08173AF4: pop {r0} bx r0 .align 2, 0 -_08173B04: .4byte sub_08173B08 - thumb_func_end sub_08173A18 +_08173B04: .4byte Task_Hof_PaletteFadeAndPrintWelcomeText + thumb_func_end Task_Hof_TryDisplayAnotherMon - thumb_func_start sub_08173B08 -sub_08173B08: @ 0x08173B08 + thumb_func_start Task_Hof_PaletteFadeAndPrintWelcomeText +Task_Hof_PaletteFadeAndPrintWelcomeText: @ 0x08173B08 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -763300,7 +763300,7 @@ sub_08173B08: @ 0x08173B08 str r1, [sp] movs r2, #0 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r3, #0 lsls r1, r4, #2 adds r0, r1, r4 @@ -763362,7 +763362,7 @@ _08173B94: .4byte gUnknown_3005B68 _08173B98: .4byte gUnknown_20205AC _08173B9C: .4byte gUnknown_3005B60 _08173BA0: .4byte sub_08173BA4 - thumb_func_end sub_08173B08 + thumb_func_end Task_Hof_PaletteFadeAndPrintWelcomeText thumb_func_start sub_08173BA4 sub_08173BA4: @ 0x08173BA4 @@ -763443,13 +763443,13 @@ _08173C24: movs r1, #0 movs r2, #0xc movs r3, #0xc - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _08173C80 mov r2, sb adds r0, r2, r6 @@ -763524,16 +763524,16 @@ sub_08173CC8: @ 0x08173CC8 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r6, _08173D50 ldr r0, [r6] ldrb r0, [r0, #8] movs r1, #1 - bl sub_0818D6A8 + bl PlayerGenderToFrontTrainerPicId_Debug lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #6 @@ -763551,19 +763551,19 @@ sub_08173CC8: @ 0x08173CC8 adds r4, r4, r1 strh r0, [r4, #0x10] ldr r0, _08173D5C - bl sub_08003250 + bl AddWindow ldr r0, [r6] ldrb r1, [r0, #0x14] lsrs r1, r1, #3 ldr r2, _08173D60 movs r0, #1 movs r3, #0xd0 - bl sub_0809815C + bl LoadWindowGfx movs r0, #1 - bl sub_080985A0 + bl stdpal_get movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0x78 strh r0, [r4, #0xe] ldr r0, _08173D64 @@ -763578,11 +763578,11 @@ _08173D54: .4byte 0x0000FFFF _08173D58: .4byte gUnknown_3005B60 _08173D5C: .4byte gUnknown_85C643C _08173D60: .4byte 0x0000021D -_08173D64: .4byte sub_08173D68 +_08173D64: .4byte Task_Hof_WaitAndPrintPlayerInfo thumb_func_end sub_08173CC8 - thumb_func_start sub_08173D68 -sub_08173D68: @ 0x08173D68 + thumb_func_start Task_Hof_WaitAndPrintPlayerInfo +Task_Hof_WaitAndPrintPlayerInfo: @ 0x08173D68 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -763631,7 +763631,7 @@ _08173DB4: bl FillBgTilemapBufferRect_Palette0 movs r0, #1 movs r1, #2 - bl sub_08174B74 + bl NewGameBirchSpeech_CreateDialogueWindowBorder movs r0, #0 movs r1, #0 bl sub_08196FB8 @@ -763646,10 +763646,10 @@ _08173DB4: movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08173E08 str r0, [r4] _08173DFC: @@ -763659,11 +763659,11 @@ _08173DFC: bx r0 .align 2, 0 _08173E04: .4byte gUnknown_85C9337 -_08173E08: .4byte sub_08173E0C - thumb_func_end sub_08173D68 +_08173E08: .4byte Task_Hof_ExitOnKeyPressed + thumb_func_end Task_Hof_WaitAndPrintPlayerInfo - thumb_func_start sub_08173E0C -sub_08173E0C: @ 0x08173E0C + thumb_func_start Task_Hof_ExitOnKeyPressed +Task_Hof_ExitOnKeyPressed: @ 0x08173E0C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -763689,11 +763689,11 @@ _08173E32: .align 2, 0 _08173E38: .4byte gUnknown_3002360 _08173E3C: .4byte gUnknown_3005B60 -_08173E40: .4byte sub_08173E44 - thumb_func_end sub_08173E0C +_08173E40: .4byte Task_Hof_HandlePaletteOnExit + thumb_func_end Task_Hof_ExitOnKeyPressed - thumb_func_start sub_08173E44 -sub_08173E44: @ 0x08173E44 + thumb_func_start Task_Hof_HandlePaletteOnExit +Task_Hof_HandlePaletteOnExit: @ 0x08173E44 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -763711,7 +763711,7 @@ sub_08173E44: @ 0x08173E44 movs r1, #8 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08173E8C lsls r0, r4, #2 adds r0, r0, r4 @@ -763727,11 +763727,11 @@ sub_08173E44: @ 0x08173E44 _08173E84: .4byte gUnknown_20377B4 _08173E88: .4byte gUnknown_20373B4 _08173E8C: .4byte gUnknown_3005B60 -_08173E90: .4byte sub_08173E94 - thumb_func_end sub_08173E44 +_08173E90: .4byte Task_Hof_HandleExit + thumb_func_end Task_Hof_HandlePaletteOnExit - thumb_func_start sub_08173E94 -sub_08173E94: @ 0x08173E94 + thumb_func_start Task_Hof_HandleExit +Task_Hof_HandleExit: @ 0x08173E94 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -763767,7 +763767,7 @@ _08173EC0: lsrs r0, r0, #0x1b bl FreeOamMatrix adds r0, r4, #0 - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite _08173EDE: adds r5, #2 subs r6, #1 @@ -763779,27 +763779,27 @@ _08173EDE: lsls r1, r1, #3 adds r1, r1, r0 ldrh r0, [r1, #0x10] - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C - bl sub_080034D4 + bl HideBg + bl FreeAllWindowBuffers movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #3 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #0 bl ResetBgsAndClearDma3BusyFlags adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask ldr r4, _08173F60 ldr r0, [r4] cmp r0, #0 beq _08173F34 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08173F34: @@ -763807,11 +763807,11 @@ _08173F34: ldr r0, [r4] cmp r0, #0 beq _08173F44 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08173F44: - bl sub_08173F68 + bl SetCallback2AfterHallOfFameDisplay _08173F48: pop {r3, r4} mov r8, r3 @@ -763825,21 +763825,21 @@ _08173F58: .4byte gUnknown_3005B60 _08173F5C: .4byte gUnknown_20205AC _08173F60: .4byte gUnknown_203B9A8 _08173F64: .4byte gUnknown_203B9A4 - thumb_func_end sub_08173E94 + thumb_func_end Task_Hof_HandleExit - thumb_func_start sub_08173F68 -sub_08173F68: @ 0x08173F68 + thumb_func_start SetCallback2AfterHallOfFameDisplay +SetCallback2AfterHallOfFameDisplay: @ 0x08173F68 push {lr} ldr r0, _08173F74 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _08173F74: .4byte sub_0817553C - thumb_func_end sub_08173F68 + thumb_func_end SetCallback2AfterHallOfFameDisplay - thumb_func_start sub_08173F78 -sub_08173F78: @ 0x08173F78 + thumb_func_start CB2_DoHallOfFamePC +CB2_DoHallOfFamePC: @ 0x08173F78 push {r4, lr} ldr r0, _08173F94 movs r1, #0x87 @@ -763865,11 +763865,11 @@ _08173F9C: @ jump table .4byte _08174094 @ case 5 _08173FB4: movs r0, #0 - bl sub_080006F0 - bl sub_08174DC8 + bl SetVBlankCallback + bl ClearVramOamPltt_LoadHofPal ldr r4, _08173FD8 ldr r0, _08173FDC - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r0, _08173FE0 movs r2, #0x87 @@ -763925,7 +763925,7 @@ _08174024: movs r2, #0 bl sub_080FA43C ldr r0, _0817405C - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _08174060 movs r4, #0x87 lsls r4, r4, #3 @@ -763934,13 +763934,13 @@ _08174024: .align 2, 0 _08174054: .4byte gUnknown_201C000 _08174058: .4byte gUnknown_85C6790 -_0817405C: .4byte sub_08173330 +_0817405C: .4byte VBlankCB_HallOfFame _08174060: .4byte gUnknown_3002360 _08174064: - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade bl sub_080FA48C lsls r0, r0, #0x18 cmp r0, #0 @@ -763969,7 +763969,7 @@ _08174094: bl SetGpuReg ldr r0, _081740F8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r2, #0 @@ -763992,24 +763992,24 @@ _081740C6: ldr r4, _08174100 movs r0, #0x80 lsls r0, r0, #6 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r0, _08174104 - bl sub_08000540 + bl SetMainCallback2 _081740EC: pop {r4} pop {r0} bx r0 .align 2, 0 _081740F4: .4byte 0x00003F42 -_081740F8: .4byte sub_08174108 +_081740F8: .4byte Task_HofPC_CopySaveData _081740FC: .4byte gUnknown_3005B68 _08174100: .4byte gUnknown_203B9A4 -_08174104: .4byte sub_08173344 - thumb_func_end sub_08173F78 +_08174104: .4byte CB2_HallOfFame + thumb_func_end CB2_DoHallOfFamePC - thumb_func_start sub_08174108 -sub_08174108: @ 0x08174108 + thumb_func_start Task_HofPC_CopySaveData +Task_HofPC_CopySaveData: @ 0x08174108 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -764022,7 +764022,7 @@ sub_08174108: @ 0x08174108 movs r3, #0xc bl sub_081981B4 movs r0, #3 - bl sub_0815340C + bl Save_LoadGameData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -764037,7 +764037,7 @@ sub_08174108: @ 0x08174108 .align 2, 0 _0817413C: .4byte 0x00000226 _08174140: .4byte gUnknown_3005B60 -_08174144: .4byte sub_08174784 +_08174144: .4byte Task_HofPC_PrintDataIsCorrupted _08174148: ldr r0, _08174190 ldr r4, _08174194 @@ -764089,7 +764089,7 @@ _081741A0: _081741AA: strh r0, [r1, #8] movs r0, #0xa - bl sub_08084180 + bl GetGameStat ldr r2, _081741C8 adds r1, r5, r6 lsls r1, r1, #3 @@ -764104,11 +764104,11 @@ _081741BE: bx r0 .align 2, 0 _081741C8: .4byte gUnknown_3005B60 -_081741CC: .4byte sub_081741D0 - thumb_func_end sub_08174108 +_081741CC: .4byte Task_HofPC_DrawSpritesPrintText + thumb_func_end Task_HofPC_CopySaveData - thumb_func_start sub_081741D0 -sub_081741D0: @ 0x081741D0 + thumb_func_start Task_HofPC_DrawSpritesPrintText +Task_HofPC_DrawSpritesPrintText: @ 0x081741D0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -764295,7 +764295,7 @@ _08174332: ldr r0, _08174388 ldr r2, _0817438C movs r1, #0xc - bl sub_080A22E8 + bl BlendPalettes ldr r0, _08174390 ldr r1, _08174394 ldr r4, [sp, #0x14] @@ -764310,7 +764310,7 @@ _08174332: ldr r5, _08174398 ldr r1, _0817439C adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r1, #8 ldrsh r0, [r4, r1] cmp r0, #0 @@ -764359,11 +764359,11 @@ _081743B4: .align 2, 0 _081743D4: .4byte gUnknown_85C8E68 _081743D8: .4byte gUnknown_3005B60 -_081743DC: .4byte sub_081743E0 - thumb_func_end sub_081741D0 +_081743DC: .4byte Task_HofPC_PrintMonInfo + thumb_func_end Task_HofPC_DrawSpritesPrintText - thumb_func_start sub_081743E0 -sub_081743E0: @ 0x081743E0 + thumb_func_start Task_HofPC_PrintMonInfo +Task_HofPC_PrintMonInfo: @ 0x081743E0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -764481,7 +764481,7 @@ _08174450: lsls r0, r0, #0x17 lsrs r0, r0, #0x17 movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 _081744CA: adds r0, r4, #0 movs r1, #0 @@ -764505,11 +764505,11 @@ _081744F8: .4byte 0xFFFF0000 _081744FC: .4byte gUnknown_203B9A0 _08174500: .4byte 0x000063B0 _08174504: .4byte 0x000001FF -_08174508: .4byte sub_0817450C - thumb_func_end sub_081743E0 +_08174508: .4byte Task_HofPC_HandleInput + thumb_func_end Task_HofPC_PrintMonInfo - thumb_func_start sub_0817450C -sub_0817450C: @ 0x0817450C + thumb_func_start Task_HofPC_HandleInput +Task_HofPC_HandleInput: @ 0x0817450C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -764552,7 +764552,7 @@ _0817454E: ldrb r0, [r4] cmp r0, #0xff beq _08174566 - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite movs r0, #0xff strh r0, [r4] _08174566: @@ -764580,9 +764580,9 @@ _08174588: .align 2, 0 _08174590: .4byte gUnknown_3002360 _08174594: .4byte gUnknown_3005B60 -_08174598: .4byte sub_081741D0 +_08174598: .4byte Task_HofPC_DrawSpritesPrintText _0817459C: - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 beq _081745B6 @@ -764599,13 +764599,13 @@ _081745B6: .align 2, 0 _081745BC: .4byte gUnknown_30074D0 _081745C0: .4byte 0x0000FFFF -_081745C4: .4byte sub_0817467C +_081745C4: .4byte Task_HofPC_HandlePaletteOnExit _081745C8: movs r0, #2 ands r0, r2 cmp r0, #0 beq _0817460C - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 beq _081745EA @@ -764628,7 +764628,7 @@ _081745EA: _081745FC: .4byte gUnknown_30074D0 _08174600: .4byte 0x0000FFFF _08174604: .4byte gUnknown_3005B60 -_08174608: .4byte sub_0817467C +_08174608: .4byte Task_HofPC_HandlePaletteOnExit _0817460C: movs r0, #0x40 ands r0, r2 @@ -764651,7 +764651,7 @@ _0817460C: b _08174668 .align 2, 0 _08174634: .4byte gUnknown_3005B60 -_08174638: .4byte sub_081743E0 +_08174638: .4byte Task_HofPC_PrintMonInfo _0817463C: ldrh r1, [r3, #0x2e] movs r0, #0x80 @@ -764684,11 +764684,11 @@ _08174668: bx r0 .align 2, 0 _08174674: .4byte gUnknown_3005B60 -_08174678: .4byte sub_081743E0 - thumb_func_end sub_0817450C +_08174678: .4byte Task_HofPC_PrintMonInfo + thumb_func_end Task_HofPC_HandleInput - thumb_func_start sub_0817467C -sub_0817467C: @ 0x0817467C + thumb_func_start Task_HofPC_HandlePaletteOnExit +Task_HofPC_HandlePaletteOnExit: @ 0x0817467C push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -764724,17 +764724,17 @@ _081746C0: .4byte gUnknown_20373B4 _081746C4: .4byte gUnknown_201C000 _081746C8: .4byte gUnknown_85C6790 _081746CC: .4byte gUnknown_3005B60 -_081746D0: .4byte sub_081746D4 - thumb_func_end sub_0817467C +_081746D0: .4byte Task_HofPC_HandleExit + thumb_func_end Task_HofPC_HandlePaletteOnExit - thumb_func_start sub_081746D4 -sub_081746D4: @ 0x081746D4 + thumb_func_start Task_HofPC_HandleExit +Task_HofPC_HandleExit: @ 0x081746D4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_080FA4A0 + bl FldEffPoison_IsActive lsls r0, r0, #0x18 cmp r0, #0 bne _0817476C @@ -764753,7 +764753,7 @@ _081746F4: ldrh r0, [r4] cmp r0, #0xff beq _0817470C - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite movs r0, #0xff strh r0, [r4] _0817470C: @@ -764763,26 +764763,26 @@ _0817470C: cmp r5, #5 bls _081746F4 movs r0, #0 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C + bl HideBg bl sub_08198418 - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #1 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #3 - bl sub_08002160 + bl UnsetBgTilemapBuffer movs r0, #0 bl ResetBgsAndClearDma3BusyFlags adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask ldr r4, _0817477C ldr r0, [r4] cmp r0, #0 beq _08174758 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08174758: @@ -764790,11 +764790,11 @@ _08174758: ldr r0, [r4] cmp r0, #0 beq _08174768 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _08174768: - bl sub_08137CAC + bl ReturnFromHallOfFamePC _0817476C: pop {r3} mov r8, r3 @@ -764805,10 +764805,10 @@ _0817476C: _08174778: .4byte gUnknown_3005B68 _0817477C: .4byte gUnknown_203B9A8 _08174780: .4byte gUnknown_203B9A4 - thumb_func_end sub_081746D4 + thumb_func_end Task_HofPC_HandleExit - thumb_func_start sub_08174784 -sub_08174784: @ 0x08174784 + thumb_func_start Task_HofPC_PrintDataIsCorrupted +Task_HofPC_PrintDataIsCorrupted: @ 0x08174784 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 @@ -764833,10 +764833,10 @@ sub_08174784: @ 0x08174784 movs r0, #0 movs r1, #1 movs r3, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r1, _081747E4 lsls r0, r4, #2 adds r0, r0, r4 @@ -764853,7 +764853,7 @@ _081747DC: .4byte gUnknown_85C8E8C _081747E0: .4byte gUnknown_85C9311 _081747E4: .4byte gUnknown_3005B60 _081747E8: .4byte Task_HofPC_ExitOnButtonPress - thumb_func_end sub_08174784 + thumb_func_end Task_HofPC_PrintDataIsCorrupted thumb_func_start Task_HofPC_ExitOnButtonPress Task_HofPC_ExitOnButtonPress: @ 0x081747EC @@ -764879,7 +764879,7 @@ _0817480C: .align 2, 0 _08174810: .4byte gUnknown_3002360 _08174814: .4byte gUnknown_3005B60 -_08174818: .4byte sub_0817467C +_08174818: .4byte Task_HofPC_HandlePaletteOnExit thumb_func_end Task_HofPC_ExitOnButtonPress thumb_func_start sub_0817481C @@ -764888,12 +764888,12 @@ sub_0817481C: @ 0x0817481C sub sp, #0xc movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r4, r0, #0 ldr r5, _08174874 movs r2, #1 @@ -764914,10 +764914,10 @@ sub_0817481C: @ 0x0817481C movs r1, #1 adds r2, r4, #0 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -764934,9 +764934,9 @@ sub_0817487C: @ 0x0817487C adds r7, r0, #0 movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap ldrh r0, [r7, #8] ldr r1, _08174904 ands r1, r0 @@ -764954,11 +764954,11 @@ sub_0817487C: @ 0x0817487C movs r1, #0 movs r2, #4 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrh r0, [r7, #8] lsls r0, r0, #0x17 lsrs r0, r0, #0x17 - bl sub_0806DE54 + bl SpeciesToPokedexNum lsls r0, r0, #0x10 lsrs r6, r0, #0x10 ldr r0, _08174910 @@ -765014,7 +765014,7 @@ _08174922: movs r1, #0 movs r2, #0x1c movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0817493C: movs r4, #0 adds r1, r7, #0 @@ -765056,7 +765056,7 @@ _0817496E: bne _081749D0 movs r0, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r4, r0, #0 movs r2, #1 rsbs r2, r2, #0 @@ -765078,10 +765078,10 @@ _0817496E: movs r1, #1 adds r2, r4, #0 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _08174B58 .align 2, 0 _081749C8: .4byte gUnknown_85C6444 @@ -765105,7 +765105,7 @@ _081749D0: movs r0, #0 movs r1, #1 movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add r1, sp, #0xc movs r0, #0xba strb r0, [r1] @@ -765162,7 +765162,7 @@ _08174A52: lsls r0, r0, #0x17 lsrs r0, r0, #0x17 ldr r1, [r7, #4] - bl sub_08069B60 + bl GetGenderFromSpeciesAndPersonality lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xfe @@ -765218,7 +765218,7 @@ _08174AAC: movs r1, #1 movs r2, #0x7a movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r6, [sp] str r4, [sp, #4] ldr r0, _08174B64 @@ -765227,7 +765227,7 @@ _08174AAC: movs r1, #0 movs r2, #0x18 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r5, _08174B68 ldrb r1, [r7, #9] lsrs r1, r1, #1 @@ -765242,7 +765242,7 @@ _08174AAC: movs r1, #0 movs r2, #0x28 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r6, [sp] str r4, [sp, #4] ldr r0, _08174B6C @@ -765251,7 +765251,7 @@ _08174AAC: movs r1, #0 movs r2, #0x52 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r6, [sp] str r4, [sp, #4] ldr r0, _08174B70 @@ -765260,7 +765260,7 @@ _08174AAC: movs r1, #1 movs r2, #0x7a movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrh r1, [r7] adds r0, r5, #0 movs r2, #2 @@ -765273,10 +765273,10 @@ _08174AAC: movs r1, #0 movs r2, #0x84 movs r3, #0x11 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08174B58: add sp, #0x1c pop {r4, r5, r6, r7} @@ -765290,8 +765290,8 @@ _08174B6C: .4byte gUnknown_85C935D _08174B70: .4byte gUnknown_85C93FF thumb_func_end sub_0817487C - thumb_func_start sub_08174B74 -sub_08174B74: @ 0x08174B74 + thumb_func_start NewGameBirchSpeech_CreateDialogueWindowBorder +NewGameBirchSpeech_CreateDialogueWindowBorder: @ 0x08174B74 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -765300,14 +765300,14 @@ sub_08174B74: @ 0x08174B74 movs r4, #0 movs r0, #1 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r2, _08174C04 movs r0, #1 movs r1, #0 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette str r4, [sp] str r4, [sp, #4] ldr r0, _08174C08 @@ -765319,7 +765319,7 @@ sub_08174B74: @ 0x08174B74 movs r1, #1 movs r2, #4 movs r3, #3 - bl sub_08199B84 + bl AddTextPrinterParameterized4 movs r2, #0 ldr r0, _08174C10 ldr r3, [r0] @@ -765359,7 +765359,7 @@ _08174BD2: movs r1, #1 movs r2, #0x3c movs r3, #3 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _08174C2E .align 2, 0 _08174C04: .4byte 0x0000021D @@ -765378,7 +765378,7 @@ _08174C14: movs r1, #1 movs r2, #0x3c movs r3, #3 - bl sub_08199B84 + bl AddTextPrinterParameterized4 _08174C2E: ldr r0, _08174DB4 mov sb, r0 @@ -765398,7 +765398,7 @@ _08174C2E: movs r1, #0 movs r2, #4 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add r6, sp, #0x14 ldr r1, _08174DBC adds r0, r4, #0 @@ -765457,7 +765457,7 @@ _08174C2E: movs r1, #0 movs r2, #0x3c movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 mov r1, r8 str r1, [sp] str r7, [sp, #4] @@ -765467,7 +765467,7 @@ _08174C2E: movs r1, #1 movs r2, #4 movs r3, #0x20 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add r5, sp, #0x14 mov r0, sb ldr r4, [r0] @@ -765542,10 +765542,10 @@ _08174D4C: movs r1, #0 movs r2, #0x3c movs r3, #0x20 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x28 pop {r3, r4} mov r8, r3 @@ -765560,10 +765560,10 @@ _08174DB8: .4byte gUnknown_85C935D _08174DBC: .4byte 0x000186A0 _08174DC0: .4byte 0x00002710 _08174DC4: .4byte gUnknown_85C8DEC - thumb_func_end sub_08174B74 + thumb_func_end NewGameBirchSpeech_CreateDialogueWindowBorder - thumb_func_start sub_08174DC8 -sub_08174DC8: @ 0x08174DC8 + thumb_func_start ClearVramOamPltt_LoadHofPal +ClearVramOamPltt_LoadHofPal: @ 0x08174DC8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -765635,7 +765635,7 @@ _08174DEE: ldr r0, _08174E70 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette add sp, #8 pop {r3} mov r8, r3 @@ -765646,13 +765646,13 @@ _08174DEE: _08174E68: .4byte 0x040000D4 _08174E6C: .4byte 0x81000800 _08174E70: .4byte gUnknown_85C65A4 - thumb_func_end sub_08174DC8 + thumb_func_end ClearVramOamPltt_LoadHofPal thumb_func_start sub_08174E74 sub_08174E74: @ 0x08174E74 push {lr} - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl reset_temp_tile_data_buffers bl ResetAllPicSprites @@ -765661,9 +765661,9 @@ sub_08174E74: @ 0x08174E74 movs r0, #8 strb r0, [r1] ldr r0, _08174EA8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08174EAC - bl sub_080343E4 + bl LoadCompressedSpritePalette pop {r0} bx r0 .align 2, 0 @@ -765685,36 +765685,36 @@ sub_08174EB0: @ 0x08174EB0 ldr r1, [r4] adds r1, #0x12 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _08174F24 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r4} pop {r0} bx r0 @@ -765754,12 +765754,12 @@ _08174F5C: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _0817500C .align 2, 0 _08174F70: .4byte gUnknown_85C65C4 _08174F74: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _0817500C @@ -765798,12 +765798,12 @@ _08174F80: movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0817500C _08174FD6: - bl sub_08196DC4 + bl InitStandardTextBoxWindows bl sub_08196DF4 b _0817500C _08174FE0: @@ -765812,11 +765812,11 @@ _08174FE0: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r0, _08175008 ldr r1, [r0] movs r0, #0 @@ -765841,8 +765841,8 @@ _08175018: _08175020: .4byte gUnknown_203B9A8 thumb_func_end sub_08174F28 - thumb_func_start sub_08175024 -sub_08175024: @ 0x08175024 + thumb_func_start SpriteCB_GetOnScreenAndAnimate +SpriteCB_GetOnScreenAndAnimate: @ 0x08175024 push {r4, lr} adds r2, r0, #0 ldr r1, [r2, #0x20] @@ -765900,20 +765900,20 @@ _0817507A: adds r0, r2, #0 movs r2, #1 movs r3, #3 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation b _081750A0 _08175094: lsrs r1, r1, #0x10 adds r0, r2, #0 movs r2, #0 movs r3, #3 - bl sub_0806E7CC + bl DoMonFrontSpriteAnimation _081750A0: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08175024 + thumb_func_end SpriteCB_GetOnScreenAndAnimate thumb_func_start sub_081750A8 sub_081750A8: @ 0x081750A8 @@ -765989,7 +765989,7 @@ sub_08175100: @ 0x08175100 asrs r2, r2, #0x10 adds r1, r4, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -766035,7 +766035,7 @@ sub_08175184: @ 0x08175184 strh r0, [r4] ldr r0, _081751B8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -766060,16 +766060,16 @@ _081751BC: .4byte gUnknown_3005B60 _081751C0: .4byte gUnknown_2037282 thumb_func_end sub_08175184 - thumb_func_start sub_081751C4 -sub_081751C4: @ 0x081751C4 + thumb_func_start Task_RayDescendsEnd +Task_RayDescendsEnd: @ 0x081751C4 push {r4, lr} ldr r0, _081751F0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _081751D8 - bl sub_080A8964 + bl DestroyTask _081751D8: bl sub_08152230 ldr r4, _081751F4 @@ -766083,7 +766083,7 @@ _081751D8: .align 2, 0 _081751F0: .4byte sub_08175268 _081751F4: .4byte 0x000003E9 - thumb_func_end sub_081751C4 + thumb_func_end Task_RayDescendsEnd thumb_func_start sub_081751F8 sub_081751F8: @ 0x081751F8 @@ -766181,7 +766181,7 @@ _081752A0: cmp r0, #0 bne _081752BC adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _081752D0 strh r7, [r0] ldr r1, _081752D4 @@ -766190,9 +766190,9 @@ _081752A0: strh r0, [r1] _081752BC: ldr r0, _081752DC - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081752E0 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldrh r0, [r6] adds r0, #1 strh r0, [r6] @@ -766290,7 +766290,7 @@ _08175398: strh r0, [r6] b _081753B4 _081753A4: - bl sub_081751C4 + bl Task_RayDescendsEnd ldr r0, _081753C0 strh r7, [r0] ldr r1, _081753C4 @@ -766313,8 +766313,8 @@ _081753C8: .4byte 0x0000FFFF thumb_func_start sub_081753CC sub_081753CC: @ 0x081753CC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -766324,8 +766324,8 @@ sub_081753CC: @ 0x081753CC thumb_func_start sub_081753E0 sub_081753E0: @ 0x081753E0 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites ldr r0, _08175434 ldrh r1, [r0, #0x2c] movs r0, #2 @@ -766348,14 +766348,14 @@ sub_081753E0: @ 0x081753E0 cmp r1, r0 bne _08175426 bl sub_081753CC - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites ldr r1, _08175448 movs r0, #1 strb r0, [r1] _08175426: bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -766378,24 +766378,24 @@ sub_0817544C: @ 0x0817544C bl InitBgsFromTemplates movs r0, #0x80 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _081754A0 movs r1, #0x80 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r0, _081754A4 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg pop {r0} bx r0 .align 2, 0 @@ -766407,12 +766407,12 @@ _081754A4: .4byte gUnknown_85C7918 thumb_func_start sub_081754A8 sub_081754A8: @ 0x081754A8 push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 - bl sub_08002194 + bl GetBgTilemapBuffer cmp r0, #0 beq _081754BC - bl sub_08000BF0 + bl Free _081754BC: pop {r0} bx r0 @@ -766479,7 +766479,7 @@ _081754FE: str r4, [sp, #0x10] movs r0, #0 movs r1, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4} pop {r0} @@ -766493,17 +766493,17 @@ sub_0817553C: @ 0x0817553C sub sp, #4 bl sub_08175BF0 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08175620 movs r1, #0xe0 lsls r1, r1, #9 - bl sub_08000BAC + bl InitHeap bl ResetPaletteFade - bl sub_080A8818 + bl ResetTasks bl sub_0817544C ldr r0, _08175624 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r1, _08175628 @@ -766544,7 +766544,7 @@ _08175582: bl SetGpuReg ldr r0, _08175630 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #2 @@ -766558,21 +766558,21 @@ _08175582: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _08175634 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08175638 bl m4aSongNumStart ldr r0, _0817563C - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08175640 strb r6, [r0] ldr r4, _08175644 movs r0, #0xe5 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] bl sub_08177214 ldr r0, [r4] @@ -766592,7 +766592,7 @@ _08175620: .4byte gUnknown_2000000 _08175624: .4byte sub_0817564C _08175628: .4byte gUnknown_3005B60 _0817562C: .4byte 0x0000FFFC -_08175630: .4byte sub_08175CAC +_08175630: .4byte EvolutionRenameMon _08175634: .4byte sub_081753CC _08175638: .4byte 0x000001C7 _0817563C: .4byte sub_081753E0 @@ -766675,7 +766675,7 @@ _081756B8: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081756E4 b _08175702 .align 2, 0 @@ -766692,7 +766692,7 @@ _081756E8: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0817570C _08175702: str r0, [r4] @@ -766735,18 +766735,18 @@ _0817573E: .align 2, 0 _08175744: .4byte gUnknown_2037C74 _08175748: .4byte gUnknown_3005B60 -_0817574C: .4byte sub_08175750 +_0817574C: .4byte c2_080C9BFC thumb_func_end sub_08175710 - thumb_func_start sub_08175750 -sub_08175750: @ 0x08175750 + thumb_func_start c2_080C9BFC +c2_080C9BFC: @ 0x08175750 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _081757A0 lsls r0, r4, #2 adds r0, r0, r4 @@ -766764,11 +766764,11 @@ sub_08175750: @ 0x08175750 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _081757A4 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081757A8 str r0, [r5] _08175798: @@ -766780,7 +766780,7 @@ _08175798: _081757A0: .4byte gUnknown_3005B60 _081757A4: .4byte sub_081753CC _081757A8: .4byte sub_0817564C - thumb_func_end sub_08175750 + thumb_func_end c2_080C9BFC thumb_func_start sub_081757AC sub_081757AC: @ 0x081757AC @@ -766851,7 +766851,7 @@ _0817580E: ldr r0, _081758CC movs r1, #1 movs r2, #0x3e - bl sub_080A1200 + bl LoadPalette movs r1, #0 ldr r4, _081758D0 movs r3, #0x11 @@ -766903,7 +766903,7 @@ _08175876: adds r0, r1, #0 strh r0, [r2, #6] adds r0, r6, #0 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _081758F4 bl LoadSpritePalette ldr r1, _081758B8 @@ -766934,7 +766934,7 @@ _081758F4: .4byte gUnknown_85C79D8 _081758F8: ldr r0, _08175990 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r2, _08175994 lsls r4, r6, #2 adds r4, r4, r6 @@ -766974,7 +766974,7 @@ _081758F8: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #0x1c movs r1, #0 bl SetGpuReg @@ -767039,7 +767039,7 @@ _081759CC: movs r1, #0xc movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081759E8 str r0, [r4] _081759E0: @@ -767104,7 +767104,7 @@ sub_08175A24: @ 0x08175A24 movs r1, #8 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r1, #0xe0 lsls r1, r1, #3 movs r0, #8 @@ -767162,7 +767162,7 @@ _08175AC4: movs r1, #6 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08175AE0 str r0, [r4] _08175AD8: @@ -767198,7 +767198,7 @@ sub_08175AE4: @ 0x08175AE4 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08175B38 lsls r0, r5, #2 adds r0, r0, r5 @@ -767255,7 +767255,7 @@ _08175B6E: movs r1, #8 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08175B9C str r0, [r4] b _08175BC4 @@ -767393,8 +767393,8 @@ _08175CA4: .4byte 0x05000002 _08175CA8: .4byte 0x810001FF thumb_func_end sub_08175BF0 - thumb_func_start sub_08175CAC -sub_08175CAC: @ 0x08175CAC + thumb_func_start EvolutionRenameMon +EvolutionRenameMon: @ 0x08175CAC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -767519,7 +767519,7 @@ _08175D8A: ble _08175D8A movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r2, _08175DF0 mov r3, r8 adds r1, r3, r6 @@ -767559,7 +767559,7 @@ _08175DFE: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _08175F0A .align 2, 0 _08175E0C: .4byte 0x00001967 @@ -767639,7 +767639,7 @@ _08175E96: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _08175F0A .align 2, 0 _08175EA4: .4byte 0x00001967 @@ -767652,10 +767652,10 @@ _08175EA8: bne _08175F0A movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _08175ED8 lsls r1, r6, #2 adds r1, r1, r6 @@ -767682,11 +767682,11 @@ _08175EDC: movs r1, #1 strh r1, [r0, #0x10] adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask bl sub_081754A8 ldr r4, _08175F18 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] _08175F0A: add sp, #4 @@ -767697,7 +767697,7 @@ _08175F0A: bx r0 .align 2, 0 _08175F18: .4byte gUnknown_203B9B4 - thumb_func_end sub_08175CAC + thumb_func_end EvolutionRenameMon thumb_func_start sub_08175F1C sub_08175F1C: @ 0x08175F1C @@ -768835,7 +768835,7 @@ _08176810: _0817681C: ldr r0, _081768B0 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r5, _081768AC lsls r4, r7, #2 adds r4, r4, r7 @@ -768855,7 +768855,7 @@ _0817681C: strh r1, [r0, #8] ldr r0, _081768B4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xa] @@ -768987,11 +768987,11 @@ _0817695C: cmp r0, #0 bne _081769E0 ldr r0, _081769C0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081769C4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081769C8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081769CC bl LoadSpritePalettes movs r0, #0x78 @@ -769035,11 +769035,11 @@ _081769D8: .4byte sub_08176D74 _081769DC: .4byte gUnknown_85C797C _081769E0: ldr r0, _08176A5C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08176A60 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08176A64 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08176A68 bl LoadSpritePalettes movs r0, #0x78 @@ -769139,7 +769139,7 @@ sub_08176AA8: @ 0x08176AA8 beq _08176ACE lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 strh r0, [r4, #8] _08176ACE: @@ -769150,7 +769150,7 @@ _08176ACE: beq _08176AE4 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 strh r0, [r4, #0xa] _08176AE4: @@ -769161,7 +769161,7 @@ _08176AE4: beq _08176AFA lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 strh r0, [r4, #0xc] _08176AFA: @@ -769172,7 +769172,7 @@ _08176AFA: beq _08176B10 lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask movs r0, #0 strh r0, [r4, #0xe] _08176B10: @@ -769207,7 +769207,7 @@ sub_08176B24: @ 0x08176B24 ldr r0, _08176BEC adds r1, r5, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette lsrs r4, r4, #0x14 lsls r4, r4, #0x1c lsrs r4, r4, #0x10 @@ -769688,7 +769688,7 @@ sub_08176EDC: @ 0x08176EDC cmp r0, #0 beq _08176EF8 ldrh r0, [r5, #0x3a] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite b _081770A8 .align 2, 0 _08176EF4: .4byte gUnknown_203B9F4 @@ -769903,7 +769903,7 @@ _08177092: movs r1, #0 bl SetGpuReg ldrh r0, [r5, #0x3a] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite _081770A8: add sp, #4 pop {r4, r5} @@ -769924,7 +769924,7 @@ sub_081770B0: @ 0x081770B0 lsls r2, r2, #0x10 asrs r2, r2, #0x10 adds r3, r5, #0 - bl sub_080C03F4 + bl CreateMonSpriteFromNationalDexNumber adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -769961,7 +769961,7 @@ sub_081770B0: @ 0x081770B0 movs r3, #0x22 ldrsh r2, [r2, r3] movs r3, #1 - bl sub_08006B0C + bl CreateSprite adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -770117,7 +770117,7 @@ sub_08177214: @ 0x08177214 _08177240: adds r0, r4, #0 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _08177260 @@ -770337,8 +770337,8 @@ _081773CA: .align 2, 0 thumb_func_end sub_08177214 - thumb_func_start sub_081773E4 -sub_081773E4: @ 0x081773E4 + thumb_func_start ResetLotteryCorner +ResetLotteryCorner: @ 0x081773E4 push {r4, lr} bl Random adds r4, r0, #0 @@ -770347,7 +770347,7 @@ sub_081773E4: @ 0x081773E4 bl Random lsls r0, r0, #0x10 orrs r0, r4 - bl sub_081776A0 + bl SetLotteryNumber ldr r0, _0817740C movs r1, #0 bl VarSet @@ -770356,10 +770356,10 @@ sub_081773E4: @ 0x081773E4 bx r0 .align 2, 0 _0817740C: .4byte 0x00004045 - thumb_func_end sub_081773E4 + thumb_func_end ResetLotteryCorner - thumb_func_start sub_08177410 -sub_08177410: @ 0x08177410 + thumb_func_start SetRandomLotteryNumber +SetRandomLotteryNumber: @ 0x08177410 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -770386,7 +770386,7 @@ _08177430: bne _08177430 _08177440: adds r0, r1, #0 - bl sub_081776A0 + bl SetLotteryNumber pop {r4, r5} pop {r0} bx r0 @@ -770394,22 +770394,22 @@ _08177440: _0817744C: .4byte 0x0000FFFF _08177450: .4byte 0x41C64E6D _08177454: .4byte 0x00003039 - thumb_func_end sub_08177410 + thumb_func_end SetRandomLotteryNumber - thumb_func_start sub_08177458 -sub_08177458: @ 0x08177458 + thumb_func_start RetrieveLotteryNumber +RetrieveLotteryNumber: @ 0x08177458 push {lr} - bl sub_081776C8 + bl GetLotteryNumber ldr r1, _08177468 strh r0, [r1] pop {r0} bx r0 .align 2, 0 _08177468: .4byte gUnknown_2037290 - thumb_func_end sub_08177458 + thumb_func_end RetrieveLotteryNumber - thumb_func_start sub_0817746C -sub_0817746C: @ 0x0817746C + thumb_func_start PickLotteryCornerTicket +PickLotteryCornerTicket: @ 0x0817746C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -770432,23 +770432,23 @@ _08177488: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081774E4 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081774DA adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 ldr r0, _081775B0 ldrh r0, [r0] lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_08177618 + bl GetMatchingDigits lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081775A8 @@ -770515,7 +770515,7 @@ _081774F6: ldrh r0, [r0] lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_08177618 + bl GetMatchingDigits lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081775A8 @@ -770563,7 +770563,7 @@ _0817755E: adds r0, r0, r1 ldr r2, _081775C4 movs r1, #2 - bl sub_0806A058 + bl GetMonData b _081775F4 .align 2, 0 _081775A8: .4byte gUnknown_2037280 @@ -770598,7 +770598,7 @@ _081775C8: bl sub_0806A1B4 _081775F4: ldr r0, _08177614 - bl sub_0800885C + bl StringGetEnd10 _081775FA: add sp, #8 pop {r3, r4, r5} @@ -770612,10 +770612,10 @@ _081775FA: _0817760C: .4byte gUnknown_2037284 _08177610: .4byte gUnknown_3005AF4 _08177614: .4byte gUnknown_2021C40 - thumb_func_end sub_0817746C + thumb_func_end PickLotteryCornerTicket - thumb_func_start sub_08177618 -sub_08177618: @ 0x08177618 + thumb_func_start GetMatchingDigits +GetMatchingDigits: @ 0x08177618 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -770680,10 +770680,10 @@ _08177686: .align 2, 0 _08177698: .4byte gUnknown_203B9B8 _0817769C: .4byte gUnknown_203B9BA - thumb_func_end sub_08177618 + thumb_func_end GetMatchingDigits - thumb_func_start sub_081776A0 -sub_081776A0: @ 0x081776A0 + thumb_func_start SetLotteryNumber +SetLotteryNumber: @ 0x081776A0 push {r4, lr} adds r1, r0, #0 lsrs r4, r1, #0x10 @@ -770700,10 +770700,10 @@ sub_081776A0: @ 0x081776A0 .align 2, 0 _081776C0: .4byte 0x0000404B _081776C4: .4byte 0x0000404C - thumb_func_end sub_081776A0 + thumb_func_end SetLotteryNumber - thumb_func_start sub_081776C8 -sub_081776C8: @ 0x081776C8 + thumb_func_start GetLotteryNumber +GetLotteryNumber: @ 0x081776C8 push {r4, lr} ldr r0, _081776E8 bl VarGet @@ -770720,36 +770720,36 @@ sub_081776C8: @ 0x081776C8 .align 2, 0 _081776E8: .4byte 0x0000404B _081776EC: .4byte 0x0000404C - thumb_func_end sub_081776C8 + thumb_func_end GetLotteryNumber - thumb_func_start sub_081776F0 -sub_081776F0: @ 0x081776F0 + thumb_func_start SetLotteryNumber16_Unused +SetLotteryNumber16_Unused: @ 0x081776F0 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_081776A0 + bl SetLotteryNumber pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081776F0 + thumb_func_end SetLotteryNumber16_Unused - thumb_func_start sub_08177700 -sub_08177700: @ 0x08177700 + thumb_func_start VblankCB +VblankCB: @ 0x08177700 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08177700 + thumb_func_end VblankCB - thumb_func_start sub_08177714 -sub_08177714: @ 0x08177714 + thumb_func_start CB2_ShowDiploma +CB2_ShowDiploma: @ 0x08177714 push {r4, r5, lr} sub sp, #0xc movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -770820,31 +770820,31 @@ sub_08177714: @ 0x08177714 ldr r0, _08177874 str r0, [r1, #8] ldr r0, [r1, #8] - bl sub_080B9710 - bl sub_080A8818 + bl ScanlineEffect_Stop + bl ResetTasks bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes ldr r0, _08177878 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r4, _0817787C movs r0, #0x80 lsls r0, r0, #5 bl sub_08000BC8 str r0, [r4] - bl sub_08177A2C - bl sub_08177A84 + bl InitDiplomaBg + bl InitDiplomaWindow bl reset_temp_tile_data_buffers ldr r1, _08177880 str r5, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _08177808: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -770854,29 +770854,29 @@ _08177808: ldr r1, [r1] bl sub_08034370 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram bl sub_08177960 movs r4, #1 rsbs r4, r4, #0 adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes str r5, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _08177888 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0817788C - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08177890 movs r1, #0 - bl sub_080A8878 + bl CreateTask add sp, #0xc pop {r4, r5} pop {r0} @@ -770890,22 +770890,22 @@ _08177878: .4byte gUnknown_85C7A34 _0817787C: .4byte gUnknown_203B9BC _08177880: .4byte gUnknown_85C81B0 _08177884: .4byte gUnknown_85C7A74 -_08177888: .4byte sub_08177700 -_0817788C: .4byte sub_08177894 +_08177888: .4byte VblankCB +_0817788C: .4byte LinkPartnerHandleUnknownYesNoBox _08177890: .4byte sub_081778AC - thumb_func_end sub_08177714 + thumb_func_end CB2_ShowDiploma - thumb_func_start sub_08177894 -sub_08177894: @ 0x08177894 + thumb_func_start LinkPartnerHandleUnknownYesNoBox +LinkPartnerHandleUnknownYesNoBox: @ 0x08177894 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08177894 + thumb_func_end LinkPartnerHandleUnknownYesNoBox thumb_func_start sub_081778AC sub_081778AC: @ 0x081778AC @@ -770931,11 +770931,11 @@ _081778CC: .align 2, 0 _081778D0: .4byte gUnknown_2037C74 _081778D4: .4byte gUnknown_3005B60 -_081778D8: .4byte sub_081778DC +_081778D8: .4byte Task_DiplomaWaitForKeyPress thumb_func_end sub_081778AC - thumb_func_start sub_081778DC -sub_081778DC: @ 0x081778DC + thumb_func_start Task_DiplomaWaitForKeyPress +Task_DiplomaWaitForKeyPress: @ 0x081778DC push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -770952,7 +770952,7 @@ sub_081778DC: @ 0x081778DC str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0817791C lsls r0, r4, #2 adds r0, r0, r4 @@ -770968,11 +770968,11 @@ _0817790E: .align 2, 0 _08177918: .4byte gUnknown_3002360 _0817791C: .4byte gUnknown_3005B60 -_08177920: .4byte sub_08177924 - thumb_func_end sub_081778DC +_08177920: .4byte Task_DiplomaFadeOut + thumb_func_end Task_DiplomaWaitForKeyPress - thumb_func_start sub_08177924 -sub_08177924: @ 0x08177924 + thumb_func_start Task_DiplomaFadeOut +Task_DiplomaFadeOut: @ 0x08177924 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -770984,12 +770984,12 @@ sub_08177924: @ 0x08177924 bne _0817794E ldr r0, _08177958 ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _0817795C - bl sub_08000540 + bl SetMainCallback2 _0817794E: pop {r4} pop {r0} @@ -770998,7 +770998,7 @@ _0817794E: _08177954: .4byte gUnknown_2037C74 _08177958: .4byte gUnknown_203B9BC _0817795C: .4byte sub_08085B50 - thumb_func_end sub_08177924 + thumb_func_end Task_DiplomaFadeOut thumb_func_start sub_08177960 sub_08177960: @ 0x08177960 @@ -771007,7 +771007,7 @@ sub_08177960: @ 0x08177960 ldr r0, _081779D8 movs r1, #0 movs r2, #2 - bl sub_08177AB4 + bl PrintDiplomaText ldr r1, _081779DC mov r0, sp bl StringCopy @@ -771033,15 +771033,15 @@ _0817797C: mov r0, sp movs r1, #0x30 movs r2, #2 - bl sub_08177AB4 + bl PrintDiplomaText ldr r0, _081779E4 movs r1, #0x58 movs r2, #2 - bl sub_08177AB4 + bl PrintDiplomaText ldr r0, _081779E8 movs r1, #0 movs r2, #0x22 - bl sub_08177AB4 + bl PrintDiplomaText bl sub_080BFE9C lsls r0, r0, #0x10 cmp r0, #0 @@ -771053,7 +771053,7 @@ _0817797C: ldr r0, _081779EC movs r1, #0 movs r2, #0x22 - bl sub_08177AB4 + bl PrintDiplomaText b _08177A02 .align 2, 0 _081779D8: .4byte gUnknown_85C8BA8 @@ -771069,17 +771069,17 @@ _081779F0: ldr r0, _08177A24 movs r1, #0 movs r2, #0x22 - bl sub_08177AB4 + bl PrintDiplomaText _08177A02: ldr r0, _08177A28 movs r1, #0x30 movs r2, #0x72 - bl sub_08177AB4 + bl PrintDiplomaText movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} @@ -771089,8 +771089,8 @@ _08177A24: .4byte gUnknown_85C8BB1 _08177A28: .4byte gUnknown_85C8BF2 thumb_func_end sub_08177960 - thumb_func_start sub_08177A2C -sub_08177A2C: @ 0x08177A2C + thumb_func_start InitDiplomaBg +InitDiplomaBg: @ 0x08177A2C push {lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -771101,15 +771101,15 @@ sub_08177A2C: @ 0x08177A2C ldr r0, _08177A80 ldr r1, [r0] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -771124,32 +771124,32 @@ sub_08177A2C: @ 0x08177A2C .align 2, 0 _08177A7C: .4byte gUnknown_85C8C08 _08177A80: .4byte gUnknown_203B9BC - thumb_func_end sub_08177A2C + thumb_func_end InitDiplomaBg - thumb_func_start sub_08177A84 -sub_08177A84: @ 0x08177A84 + thumb_func_start InitDiplomaWindow +InitDiplomaWindow: @ 0x08177A84 push {lr} ldr r0, _08177AAC - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r0, _08177AB0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap pop {r0} bx r0 .align 2, 0 _08177AAC: .4byte gUnknown_85C8C10 _08177AB0: .4byte gUnknown_85D7B04 - thumb_func_end sub_08177A84 + thumb_func_end InitDiplomaWindow - thumb_func_start sub_08177AB4 -sub_08177AB4: @ 0x08177AB4 + thumb_func_start PrintDiplomaText +PrintDiplomaText: @ 0x08177AB4 push {r4, r5, r6, lr} sub sp, #0x18 adds r6, r0, #0 @@ -771176,21 +771176,21 @@ sub_08177AB4: @ 0x08177AB4 movs r1, #1 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08177AF8: .4byte gUnknown_85C8C20 - thumb_func_end sub_08177AB4 + thumb_func_end PrintDiplomaText - thumb_func_start sub_08177AFC -sub_08177AFC: @ 0x08177AFC + thumb_func_start DoBerryTagScreen +DoBerryTagScreen: @ 0x08177AFC push {r4, lr} ldr r4, _08177B2C ldr r0, _08177B30 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r0, _08177B34 ldrh r0, [r0] @@ -771203,7 +771203,7 @@ sub_08177AFC: @ 0x08177AFC adds r1, r1, r2 strh r0, [r1] ldr r0, _08177B38 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 @@ -771211,17 +771211,17 @@ sub_08177AFC: @ 0x08177AFC _08177B2C: .4byte gUnknown_203B9C0 _08177B30: .4byte 0x0000180C _08177B34: .4byte gUnknown_203CB48 -_08177B38: .4byte sub_08177B6C - thumb_func_end sub_08177AFC +_08177B38: .4byte CB2_InitBerryTagScreen + thumb_func_end DoBerryTagScreen thumb_func_start sub_08177B3C sub_08177B3C: @ 0x08177B3C push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -771230,16 +771230,16 @@ sub_08177B3C: @ 0x08177B3C thumb_func_start sub_08177B58 sub_08177B58: @ 0x08177B58 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08177B58 - thumb_func_start sub_08177B6C -sub_08177B6C: @ 0x08177B6C + thumb_func_start CB2_InitBerryTagScreen +CB2_InitBerryTagScreen: @ 0x08177B6C push {lr} _08177B6E: bl sub_081221F8 @@ -771247,7 +771247,7 @@ _08177B6E: lsrs r0, r0, #0x18 cmp r0, #1 beq _08177B92 - bl sub_08177B98 + bl InitBerryTagScreen lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -771261,10 +771261,10 @@ _08177B92: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08177B6C + thumb_func_end CB2_InitBerryTagScreen - thumb_func_start sub_08177B98 -sub_08177B98: @ 0x08177B98 + thumb_func_start InitBerryTagScreen +InitBerryTagScreen: @ 0x08177B98 push {lr} sub sp, #4 ldr r0, _08177BB8 @@ -771302,12 +771302,12 @@ _08177BC0: @ jump table .4byte _08177C9C @ case 14 .4byte _08177CAA @ case 15 _08177C00: - bl sub_08121E58 - bl sub_08121D90 + bl SetVBlankHBlankCallbacksToNull + bl ResetVramOamAndBgCntRegs bl sub_08199640 b _08177CC4 _08177C0E: - bl sub_080B9710 + bl ScanlineEffect_Stop b _08177CC4 _08177C14: bl ResetPaletteFade @@ -771329,7 +771329,7 @@ _08177C34: lsls r0, r0, #0x18 cmp r0, #0 bne _08177CC4 - bl sub_080A8818 + bl ResetTasks b _08177CC4 _08177C44: bl sub_08177CFC @@ -771344,7 +771344,7 @@ _08177C44: _08177C58: .4byte gUnknown_203B9C0 _08177C5C: .4byte 0x00001808 _08177C60: - bl sub_08177D70 + bl LoadBerryTagGfx lsls r0, r0, #0x18 cmp r0, #0 beq _08177CF4 @@ -771356,28 +771356,28 @@ _08177C72: bl sub_08177F78 b _08177CC4 _08177C78: - bl sub_08177FCC + bl PrintAllBerryData b _08177CC4 _08177C7E: - bl sub_081781F0 + bl CreateBerrySprite b _08177CC4 _08177C84: - bl sub_08178254 - bl sub_081782BC + bl CreateFlavorCircleSprites + bl SetFlavorCirclesVisiblity b _08177CC4 _08177C8E: ldr r0, _08177C98 movs r1, #0 - bl sub_080A8878 + bl CreateTask b _08177CC4 .align 2, 0 -_08177C98: .4byte sub_0817850C +_08177C98: .4byte Task_HandleInput _08177C9C: movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes b _08177CC4 _08177CAA: movs r0, #1 @@ -771386,7 +771386,7 @@ _08177CAA: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _08177CD4 ldrb r1, [r2, #8] movs r0, #0x7f @@ -771407,9 +771407,9 @@ _08177CD4: .4byte gUnknown_2037C74 _08177CD8: .4byte gUnknown_3002360 _08177CDC: ldr r0, _08177CEC - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08177CF0 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _08177CF6 .align 2, 0 @@ -771421,7 +771421,7 @@ _08177CF6: add sp, #4 pop {r1} bx r1 - thumb_func_end sub_08177B98 + thumb_func_end InitBerryTagScreen thumb_func_start sub_08177CFC sub_08177CFC: @ 0x08177CFC @@ -771435,18 +771435,18 @@ sub_08177CFC: @ 0x08177CFC ldr r4, _08177D6C ldr r1, [r4] movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] movs r0, #0x80 lsls r0, r0, #4 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 @@ -771455,13 +771455,13 @@ sub_08177CFC: @ 0x08177CFC movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg pop {r4} pop {r0} bx r0 @@ -771470,8 +771470,8 @@ _08177D68: .4byte gUnknown_85CD068 _08177D6C: .4byte gUnknown_203B9C0 thumb_func_end sub_08177CFC - thumb_func_start sub_08177D70 -sub_08177D70: @ 0x08177D70 + thumb_func_start LoadBerryTagGfx +LoadBerryTagGfx: @ 0x08177D70 push {r4, r5, r6, r7, lr} sub sp, #4 ldr r1, _08177D90 @@ -771508,7 +771508,7 @@ _08177DB4: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _08177DD8 ldr r1, [r0] ldr r0, _08177DDC @@ -771519,7 +771519,7 @@ _08177DD4: .4byte gUnknown_8D9BD90 _08177DD8: .4byte gUnknown_203B9C0 _08177DDC: .4byte 0x00001808 _08177DE0: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -771607,7 +771607,7 @@ _08177E90: ldr r0, _08177EA4 movs r1, #0 movs r2, #0xc0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _08177EA8 ldr r1, [r0] ldr r0, _08177EAC @@ -771619,7 +771619,7 @@ _08177EA8: .4byte gUnknown_203B9C0 _08177EAC: .4byte 0x00001808 _08177EB0: ldr r0, _08177EC8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08177ECC ldr r1, [r0] _08177EBA: @@ -771636,7 +771636,7 @@ _08177ECC: .4byte gUnknown_203B9C0 _08177ED0: .4byte 0x00001808 _08177ED4: ldr r0, _08177EE0 - bl sub_080343E4 + bl LoadCompressedSpritePalette movs r0, #1 b _08177EE6 .align 2, 0 @@ -771649,32 +771649,32 @@ _08177EE6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08177D70 + thumb_func_end LoadBerryTagGfx thumb_func_start sub_08177EF0 sub_08177EF0: @ 0x08177EF0 push {r4, lr} ldr r0, _08177F2C - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r0, _08177F30 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r4, #0 _08177F08: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #1 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #3 bls _08177F08 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -771683,8 +771683,8 @@ _08177F2C: .4byte gUnknown_85CD0A0 _08177F30: .4byte gUnknown_85CD078 thumb_func_end sub_08177EF0 - thumb_func_start sub_08177F34 -sub_08177F34: @ 0x08177F34 + thumb_func_start PrintTextInBerryTagScreen +PrintTextInBerryTagScreen: @ 0x08177F34 push {r4, r5, r6, lr} sub sp, #0x14 ldr r6, [sp, #0x24] @@ -771710,21 +771710,21 @@ sub_08177F34: @ 0x08177F34 str r6, [sp, #0xc] str r1, [sp, #0x10] movs r1, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08177F74: .4byte gUnknown_85CD098 - thumb_func_end sub_08177F34 + thumb_func_end PrintTextInBerryTagScreen thumb_func_start sub_08177F78 sub_08177F78: @ 0x08177F78 push {lr} sub sp, #8 movs r0, #0 - bl sub_08002194 + bl GetBgTilemapBuffer ldr r1, _08177FC4 ldr r1, [r1] movs r2, #0x80 @@ -771735,7 +771735,7 @@ sub_08177F78: @ 0x08177F78 bl memcpy movs r0, #3 movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _08177FC8 movs r0, #0 str r0, [sp] @@ -771744,11 +771744,11 @@ sub_08177F78: @ 0x08177F78 movs r0, #3 movs r2, #0 movs r3, #2 - bl sub_08177F34 + bl PrintTextInBerryTagScreen movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r0} bx r0 @@ -771757,21 +771757,21 @@ _08177FC4: .4byte gUnknown_203B9C0 _08177FC8: .4byte gUnknown_85C97BD thumb_func_end sub_08177F78 - thumb_func_start sub_08177FCC -sub_08177FCC: @ 0x08177FCC + thumb_func_start PrintAllBerryData +PrintAllBerryData: @ 0x08177FCC push {lr} - bl sub_08177FE8 + bl PrintBerryNumberAndName bl sub_0817804C - bl sub_08178108 - bl sub_08178188 - bl sub_081781BC + bl PrintBerryFirmness + bl PrintBerryDescription1 + bl PrintBerryDescription2 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08177FCC + thumb_func_end PrintAllBerryData - thumb_func_start sub_08177FE8 -sub_08177FE8: @ 0x08177FE8 + thumb_func_start PrintBerryNumberAndName +PrintBerryNumberAndName: @ 0x08177FE8 push {r4, r5, r6, lr} sub sp, #8 ldr r5, _08178038 @@ -771780,7 +771780,7 @@ sub_08177FE8: @ 0x08177FE8 lsls r4, r4, #5 adds r0, r0, r4 ldrb r0, [r0] - bl sub_080E0BC8 + bl GetBerryInfo adds r6, r0, #0 ldr r0, _0817803C ldr r1, [r5] @@ -771795,14 +771795,14 @@ sub_08177FE8: @ 0x08177FE8 ldr r4, _08178044 ldr r1, _08178048 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0 str r0, [sp] str r0, [sp, #4] adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_08177F34 + bl PrintTextInBerryTagScreen add sp, #8 pop {r4, r5, r6} pop {r0} @@ -771813,7 +771813,7 @@ _0817803C: .4byte gUnknown_2021C40 _08178040: .4byte gUnknown_2021C54 _08178044: .4byte gUnknown_2021C7C _08178048: .4byte gUnknown_85C97B5 - thumb_func_end sub_08177FE8 + thumb_func_end PrintBerryNumberAndName thumb_func_start sub_0817804C sub_0817804C: @ 0x0817804C @@ -771825,7 +771825,7 @@ sub_0817804C: @ 0x0817804C lsls r1, r1, #5 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080E0BC8 + bl GetBerryInfo adds r5, r0, #0 ldr r2, _081780D4 movs r7, #2 @@ -771865,7 +771865,7 @@ sub_0817804C: @ 0x0817804C ldr r4, _081780E0 ldr r1, _081780E4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders str r7, [sp] str r6, [sp, #4] str r6, [sp, #8] @@ -771900,8 +771900,8 @@ _081780FA: _08178104: .4byte gUnknown_85C93F5 thumb_func_end sub_0817804C - thumb_func_start sub_08178108 -sub_08178108: @ 0x08178108 + thumb_func_start PrintBerryFirmness +PrintBerryFirmness: @ 0x08178108 push {r4, r5, r6, lr} sub sp, #0xc ldr r0, _0817815C @@ -771910,7 +771910,7 @@ sub_08178108: @ 0x08178108 lsls r1, r1, #5 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080E0BC8 + bl GetBerryInfo adds r6, r0, #0 ldr r2, _08178160 movs r5, #0x12 @@ -771960,10 +771960,10 @@ _0817817A: bx r0 .align 2, 0 _08178184: .4byte gUnknown_85C93F5 - thumb_func_end sub_08178108 + thumb_func_end PrintBerryFirmness - thumb_func_start sub_08178188 -sub_08178188: @ 0x08178188 + thumb_func_start PrintBerryDescription1 +PrintBerryDescription1: @ 0x08178188 push {lr} sub sp, #0xc ldr r0, _081781B8 @@ -771972,7 +771972,7 @@ sub_08178188: @ 0x08178188 lsls r1, r1, #5 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080E0BC8 + bl GetBerryInfo ldr r2, [r0, #0xc] movs r0, #2 str r0, [sp] @@ -771988,10 +771988,10 @@ sub_08178188: @ 0x08178188 bx r0 .align 2, 0 _081781B8: .4byte gUnknown_203B9C0 - thumb_func_end sub_08178188 + thumb_func_end PrintBerryDescription1 - thumb_func_start sub_081781BC -sub_081781BC: @ 0x081781BC + thumb_func_start PrintBerryDescription2 +PrintBerryDescription2: @ 0x081781BC push {lr} sub sp, #0xc ldr r0, _081781EC @@ -772000,7 +772000,7 @@ sub_081781BC: @ 0x081781BC lsls r1, r1, #5 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080E0BC8 + bl GetBerryInfo ldr r2, [r0, #0x10] movs r0, #0x12 str r0, [sp] @@ -772016,10 +772016,10 @@ sub_081781BC: @ 0x081781BC bx r0 .align 2, 0 _081781EC: .4byte gUnknown_203B9C0 - thumb_func_end sub_081781BC + thumb_func_end PrintBerryDescription2 - thumb_func_start sub_081781F0 -sub_081781F0: @ 0x081781F0 + thumb_func_start CreateBerrySprite +CreateBerrySprite: @ 0x081781F0 push {r4, lr} ldr r4, _0817821C ldr r0, [r4] @@ -772032,7 +772032,7 @@ sub_081781F0: @ 0x081781F0 lsrs r0, r0, #0x18 movs r1, #0x38 movs r2, #0x40 - bl sub_080D4958 + bl CreateBerryTagSprite ldr r1, [r4] ldr r2, _08178220 adds r1, r1, r2 @@ -772043,10 +772043,10 @@ sub_081781F0: @ 0x081781F0 .align 2, 0 _0817821C: .4byte gUnknown_203B9C0 _08178220: .4byte 0x00001802 - thumb_func_end sub_081781F0 + thumb_func_end CreateBerrySprite - thumb_func_start sub_08178224 -sub_08178224: @ 0x08178224 + thumb_func_start DestroyBerrySprite +DestroyBerrySprite: @ 0x08178224 push {lr} ldr r0, _08178248 ldr r0, [r0] @@ -772059,45 +772059,45 @@ sub_08178224: @ 0x08178224 ldr r1, _08178250 adds r0, r0, r1 bl DestroySprite - bl sub_080D4990 + bl FreeBerryTagSpritePalette pop {r0} bx r0 .align 2, 0 _08178248: .4byte gUnknown_203B9C0 _0817824C: .4byte 0x00001802 _08178250: .4byte gUnknown_20205AC - thumb_func_end sub_08178224 + thumb_func_end DestroyBerrySprite - thumb_func_start sub_08178254 -sub_08178254: @ 0x08178254 + thumb_func_start CreateFlavorCircleSprites +CreateFlavorCircleSprites: @ 0x08178254 push {r4, lr} movs r0, #0x3c - bl sub_080D4A10 + bl CreateBerryFlavorCircleSprite ldr r4, _081782A4 ldr r1, [r4] ldr r2, _081782A8 adds r1, r1, r2 strb r0, [r1] movs r0, #0x5c - bl sub_080D4A10 + bl CreateBerryFlavorCircleSprite ldr r1, [r4] ldr r2, _081782AC adds r1, r1, r2 strb r0, [r1] movs r0, #0x7c - bl sub_080D4A10 + bl CreateBerryFlavorCircleSprite ldr r1, [r4] ldr r2, _081782B0 adds r1, r1, r2 strb r0, [r1] movs r0, #0x9c - bl sub_080D4A10 + bl CreateBerryFlavorCircleSprite ldr r1, [r4] ldr r2, _081782B4 adds r1, r1, r2 strb r0, [r1] movs r0, #0xbc - bl sub_080D4A10 + bl CreateBerryFlavorCircleSprite ldr r1, [r4] ldr r2, _081782B8 adds r1, r1, r2 @@ -772112,10 +772112,10 @@ _081782AC: .4byte 0x00001804 _081782B0: .4byte 0x00001805 _081782B4: .4byte 0x00001806 _081782B8: .4byte 0x00001807 - thumb_func_end sub_08178254 + thumb_func_end CreateFlavorCircleSprites - thumb_func_start sub_081782BC -sub_081782BC: @ 0x081782BC + thumb_func_start SetFlavorCirclesVisiblity +SetFlavorCirclesVisiblity: @ 0x081782BC push {r4, r5, lr} ldr r4, _081782F4 ldr r0, [r4] @@ -772123,7 +772123,7 @@ sub_081782BC: @ 0x081782BC lsls r1, r1, #5 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080E0BC8 + bl GetBerryInfo adds r5, r0, #0 ldrb r0, [r5, #0x15] cmp r0, #0 @@ -772314,10 +772314,10 @@ _08178440: bx r0 .align 2, 0 _08178448: .4byte 0x00001807 - thumb_func_end sub_081782BC + thumb_func_end SetFlavorCirclesVisiblity - thumb_func_start sub_0817844C -sub_0817844C: @ 0x0817844C + thumb_func_start DestroyFlavorCircleSprites +DestroyFlavorCircleSprites: @ 0x0817844C push {r4, lr} movs r4, #0 _08178450: @@ -772345,10 +772345,10 @@ _08178450: _0817847C: .4byte gUnknown_203B9C0 _08178480: .4byte 0x00001803 _08178484: .4byte gUnknown_20205AC - thumb_func_end sub_0817844C + thumb_func_end DestroyFlavorCircleSprites - thumb_func_start sub_08178488 -sub_08178488: @ 0x08178488 + thumb_func_start PrepareToCloseBerryTagScreen +PrepareToCloseBerryTagScreen: @ 0x08178488 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -772362,7 +772362,7 @@ sub_08178488: @ 0x08178488 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081784C0 lsls r0, r4, #2 adds r0, r0, r4 @@ -772376,11 +772376,11 @@ sub_08178488: @ 0x08178488 bx r0 .align 2, 0 _081784C0: .4byte gUnknown_3005B60 -_081784C4: .4byte sub_081784C8 - thumb_func_end sub_08178488 +_081784C4: .4byte Task_CloseBerryTagScreen + thumb_func_end PrepareToCloseBerryTagScreen - thumb_func_start sub_081784C8 -sub_081784C8: @ 0x081784C8 + thumb_func_start Task_CloseBerryTagScreen +Task_CloseBerryTagScreen: @ 0x081784C8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -772390,16 +772390,16 @@ sub_081784C8: @ 0x081784C8 ands r0, r1 cmp r0, #0 bne _081784FA - bl sub_08178224 - bl sub_0817844C + bl DestroyBerrySprite + bl DestroyFlavorCircleSprites ldr r0, _08178504 ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers ldr r0, _08178508 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081784FA: pop {r4} pop {r0} @@ -772407,11 +772407,11 @@ _081784FA: .align 2, 0 _08178500: .4byte gUnknown_2037C74 _08178504: .4byte gUnknown_203B9C0 -_08178508: .4byte sub_081AD204 - thumb_func_end sub_081784C8 +_08178508: .4byte bag_menu_mail_related + thumb_func_end Task_CloseBerryTagScreen - thumb_func_start sub_0817850C -sub_0817850C: @ 0x0817850C + thumb_func_start Task_HandleInput +Task_HandleInput: @ 0x0817850C push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -772431,7 +772431,7 @@ sub_0817850C: @ 0x0817850C movs r1, #1 rsbs r1, r1, #0 adds r0, r2, #0 - bl sub_08178564 + bl TryChangeDisplayedBerry b _0817855E .align 2, 0 _08178538: .4byte gUnknown_2037C74 @@ -772441,7 +772441,7 @@ _08178540: bne _0817854E adds r0, r2, #0 movs r1, #1 - bl sub_08178564 + bl TryChangeDisplayedBerry b _0817855E _0817854E: ldrh r1, [r3, #0x2e] @@ -772450,15 +772450,15 @@ _0817854E: cmp r0, #0 beq _0817855E adds r0, r4, #0 - bl sub_08178488 + bl PrepareToCloseBerryTagScreen _0817855E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0817850C + thumb_func_end Task_HandleInput - thumb_func_start sub_08178564 -sub_08178564: @ 0x08178564 + thumb_func_start TryChangeDisplayedBerry +TryChangeDisplayedBerry: @ 0x08178564 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -772503,7 +772503,7 @@ _081785AE: bl sub_080A306C lsls r0, r7, #0x18 asrs r0, r0, #0x18 - bl sub_081785E0 + bl HandleBagCursorPositionChange ldr r1, _081785D8 lsls r0, r5, #2 adds r0, r0, r5 @@ -772517,11 +772517,11 @@ _081785D0: bx r0 .align 2, 0 _081785D8: .4byte gUnknown_3005B60 -_081785DC: .4byte sub_08178664 - thumb_func_end sub_08178564 +_081785DC: .4byte Task_DisplayAnotherBerry + thumb_func_end TryChangeDisplayedBerry - thumb_func_start sub_081785E0 -sub_081785E0: @ 0x081785E0 + thumb_func_start HandleBagCursorPositionChange +HandleBagCursorPositionChange: @ 0x081785E0 push {r4, r5, r6, lr} ldr r5, _08178614 adds r6, r5, #0 @@ -772590,10 +772590,10 @@ _08178632: bx r0 .align 2, 0 _08178660: .4byte gUnknown_203B9C0 - thumb_func_end sub_081785E0 + thumb_func_end HandleBagCursorPositionChange - thumb_func_start sub_08178664 -sub_08178664: @ 0x08178664 + thumb_func_start Task_DisplayAnotherBerry +Task_DisplayAnotherBerry: @ 0x08178664 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -772652,7 +772652,7 @@ _081786C8: beq _08178724 b _0817875E _081786D2: - bl sub_08177FE8 + bl PrintBerryNumberAndName b _0817875E _081786D8: movs r0, #1 @@ -772700,35 +772700,35 @@ _08178720: movs r0, #2 b _08178752 _08178724: - bl sub_081781BC + bl PrintBerryDescription2 b _0817875E _0817872A: - bl sub_08178188 + bl PrintBerryDescription1 b _0817875E _08178730: - bl sub_081782BC + bl SetFlavorCirclesVisiblity b _0817875E _08178736: movs r0, #1 b _08178752 _0817873A: - bl sub_08178108 + bl PrintBerryFirmness b _0817875E _08178740: bl sub_0817804C b _0817875E _08178746: - bl sub_08178224 - bl sub_081781F0 + bl DestroyBerrySprite + bl CreateBerrySprite b _0817875E _08178750: movs r0, #0 _08178752: movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer b _0817875E _0817875A: - bl sub_08177FE8 + bl PrintBerryNumberAndName _0817875E: movs r2, #2 ldrsh r0, [r6, r2] @@ -772776,11 +772776,11 @@ _0817878E: ldrb r2, [r6, #2] movs r0, #1 adds r1, r4, #0 - bl sub_08001E94 + bl ChangeBgY ldrb r2, [r6, #2] movs r0, #2 adds r1, r4, #0 - bl sub_08001E94 + bl ChangeBgY movs r2, #0 ldrsh r0, [r6, r2] cmp r0, #0 @@ -772805,14 +772805,14 @@ _081787E8: .4byte gUnknown_203B9C0 _081787EC: .4byte 0x00001802 _081787F0: .4byte 0x00001803 _081787F4: .4byte gUnknown_3005B60 -_081787F8: .4byte sub_0817850C - thumb_func_end sub_08178664 +_081787F8: .4byte Task_HandleInput + thumb_func_end Task_DisplayAnotherBerry thumb_func_start sub_081787FC sub_081787FC: @ 0x081787FC push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -772837,15 +772837,15 @@ _08178820: _08178828: .4byte gUnknown_20226A0 thumb_func_end CheckLanguageMatch - thumb_func_start sub_0817882C -sub_0817882C: @ 0x0817882C + thumb_func_start CB2_InitMysteryEventMenu +CB2_InitMysteryEventMenu: @ 0x0817882C push {r4, lr} sub sp, #8 bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080A8818 + bl ResetTasks ldr r0, _081788E4 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081788E8 @@ -772853,7 +772853,7 @@ sub_0817882C: @ 0x0817882C movs r2, #1 bl InitBgsFromTemplates ldr r0, _081788EC - bl sub_08003090 + bl InitWindows lsls r0, r0, #0x10 cmp r0, #0 beq _081788DA @@ -772863,7 +772863,7 @@ _08178864: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r4, #1 cmp r4, #1 ble _08178864 @@ -772881,7 +772881,7 @@ _08178864: movs r2, #0xd0 bl LoadUserWindowBorderGfx movs r0, #0xe0 - bl sub_08197694 + bl Menu_LoadStdPalAt movs r1, #0xa0 lsls r1, r1, #1 movs r0, #0 @@ -772891,19 +772891,19 @@ _08178864: bl SetGpuReg ldr r0, _081788F0 movs r1, #0 - bl sub_080A8878 - bl sub_080A27F8 - bl sub_080A89D4 - bl sub_080066D8 + bl CreateTask + bl StopMapMusic + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade movs r0, #0 movs r1, #0 movs r2, #2 - bl sub_080A1238 + bl FillPalette ldr r0, _081788F4 - bl sub_08000540 + bl SetMainCallback2 _081788DA: add sp, #8 pop {r4} @@ -772913,12 +772913,12 @@ _081788DA: _081788E4: .4byte sub_081787FC _081788E8: .4byte gUnknown_85CD204 _081788EC: .4byte gUnknown_85CD208 -_081788F0: .4byte sub_08008FA0 -_081788F4: .4byte sub_08178930 - thumb_func_end sub_0817882C +_081788F0: .4byte Task_DestroySelf +_081788F4: .4byte CB2_MysteryEventMenu + thumb_func_end CB2_InitMysteryEventMenu - thumb_func_start sub_081788F8 -sub_081788F8: @ 0x081788F8 + thumb_func_start GetEventLoadMessage +GetEventLoadMessage: @ 0x081788F8 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -772946,10 +772946,10 @@ _0817891E: .align 2, 0 _08178928: .4byte gUnknown_85CD159 _0817892C: .4byte gUnknown_85CD19F - thumb_func_end sub_081788F8 + thumb_func_end GetEventLoadMessage - thumb_func_start sub_08178930 -sub_08178930: @ 0x08178930 + thumb_func_start CB2_MysteryEventMenu +CB2_MysteryEventMenu: @ 0x08178930 push {r4, r5, r6, lr} sub sp, #8 ldr r1, _08178950 @@ -772993,14 +772993,14 @@ _0817899C: movs r1, #1 movs r2, #1 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 rsbs r0, r0, #0 movs r1, #0 @@ -773023,7 +773023,7 @@ _081789D8: movs r0, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText ldr r1, _081789FC movs r2, #0x87 lsls r2, r2, #3 @@ -773052,7 +773052,7 @@ _08178A0E: ldr r2, _08178A34 adds r0, r2, #0 strh r0, [r1] - bl sub_080092D0 + bl OpenLink b _08178D10 .align 2, 0 _08178A2C: .4byte gUnknown_3002360 @@ -773081,7 +773081,7 @@ _08178A50: movs r0, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText ldr r1, _08178A80 movs r0, #0x87 lsls r0, r0, #3 @@ -773104,7 +773104,7 @@ _08178A84: _08178A92: b _08178CEC _08178A94: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #2 @@ -773122,19 +773122,19 @@ _08178A94: movs r1, #1 movs r2, #1 movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r1, _08178AEC movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r2, #0x87 lsls r2, r2, #3 adds r1, r4, r2 @@ -773151,13 +773151,13 @@ _08178AF0: _08178AFA: movs r0, #5 bl sub_080A306C - bl sub_08009384 + bl CloseLink movs r0, #0x87 lsls r0, r0, #3 adds r1, r4, r0 b _08178BD6 _08178B0C: - bl sub_0800ADFC + bl IsLinkConnectionEstablished lsls r0, r0, #0x18 cmp r0, #0 beq _08178BB8 @@ -773169,7 +773169,7 @@ _08178B0C: _08178B20: movs r0, #2 movs r1, #2 - bl sub_08009C8C + bl GetLinkPlayerDataExchangeStatusTimed lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #3 @@ -773178,14 +773178,14 @@ _08178B20: ldr r4, _08178B5C adds r0, r4, #0 movs r1, #1 - bl sub_081788F8 + bl GetEventLoadMessage movs r0, #1 str r0, [sp] movs r0, #0 adds r1, r4, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText ldr r0, _08178B60 movs r2, #0x87 lsls r2, r2, #3 @@ -773206,24 +773206,24 @@ _08178B64: movs r0, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText b _08178CEC .align 2, 0 _08178B80: .4byte gUnknown_85CD133 _08178B84: - bl sub_08009384 + bl CloseLink _08178B88: ldr r4, _08178BB0 adds r0, r4, #0 movs r1, #1 - bl sub_081788F8 + bl GetEventLoadMessage movs r0, #1 str r0, [sp] movs r0, #0 adds r1, r4, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText ldr r0, _08178BB4 movs r1, #0x87 lsls r1, r1, #3 @@ -773246,7 +773246,7 @@ _08178BB8: _08178BC6: movs r0, #5 bl sub_080A306C - bl sub_08009384 + bl CloseLink movs r2, #0x87 lsls r2, r2, #3 adds r1, r4, r2 @@ -773266,13 +773266,13 @@ _08178BE0: _08178BEE: b _08178CEC _08178BF0: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 cmp r0, #0 bne _08178BFC b _08178D10 _08178BFC: - bl sub_0800A178 + bl ResetBlockReceivedFlags ldr r1, _08178C0C movs r2, #0x87 lsls r2, r2, #3 @@ -773312,12 +773312,12 @@ _08178C2C: bl CpuSet ldr r0, _08178C70 adds r1, r4, #0 - bl sub_081788F8 + bl GetEventLoadMessage lsls r0, r0, #0x18 cmp r0, #0 bne _08178CEC movs r0, #0 - bl sub_08153274 + bl TrySavingData b _08178CEC .align 2, 0 _08178C64: .4byte gUnknown_30031C4 @@ -773331,7 +773331,7 @@ _08178C74: movs r0, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText ldr r1, _08178C94 movs r2, #0x87 lsls r2, r2, #3 @@ -773380,7 +773380,7 @@ _08178CDC: movs r2, #0 movs r3, #0x10 _08178CE8: - bl sub_080A139C + bl BeginNormalPaletteFade _08178CEC: ldr r1, _08178CFC movs r0, #0x87 @@ -773400,7 +773400,7 @@ _08178D00: ands r0, r1 cmp r0, #0 bne _08178D10 - bl sub_080008F4 + bl DoSoftReset _08178D10: ldr r0, _08178D70 ldr r0, [r0] @@ -773408,22 +773408,22 @@ _08178D10: ands r0, r1 cmp r0, #0 beq _08178D50 - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 bne _08178D50 - bl sub_08009384 + bl CloseLink ldr r4, _08178D74 adds r0, r4, #0 movs r1, #1 - bl sub_081788F8 + bl GetEventLoadMessage movs r0, #1 str r0, [sp] movs r0, #0 adds r1, r4, #0 movs r2, #1 movs r3, #2 - bl sub_08178D7C + bl PrintMysteryMenuText ldr r0, _08178D78 movs r1, #0x87 lsls r1, r1, #3 @@ -773431,11 +773431,11 @@ _08178D10: movs r1, #0xd strb r1, [r0] _08178D50: - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 + bl UpdatePaletteFade add sp, #8 pop {r4, r5, r6} pop {r0} @@ -773445,10 +773445,10 @@ _08178D6C: .4byte gUnknown_2037C74 _08178D70: .4byte gUnknown_3003180 _08178D74: .4byte gUnknown_2021C7C _08178D78: .4byte gUnknown_3002360 - thumb_func_end sub_08178930 + thumb_func_end CB2_MysteryEventMenu - thumb_func_start sub_08178D7C -sub_08178D7C: @ 0x08178D7C + thumb_func_start PrintMysteryMenuText +PrintMysteryMenuText: @ 0x08178D7C push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -773485,7 +773485,7 @@ sub_08178D7C: @ 0x08178D7C lsrs r1, r1, #0x18 adds r0, r5, #0 str r3, [sp, #0x18] - bl sub_08003B18 + bl FillWindowPixelBuffer mov r0, sb str r0, [sp] mov r1, r8 @@ -773501,7 +773501,7 @@ sub_08178D7C: @ 0x08178D7C movs r1, #1 adds r2, r6, #0 ldr r3, [sp, #0x18] - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x1c pop {r3, r4, r5} mov r8, r3 @@ -773511,10 +773511,10 @@ sub_08178D7C: @ 0x08178D7C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08178D7C + thumb_func_end PrintMysteryMenuText - thumb_func_start sub_08178DFC -sub_08178DFC: @ 0x08178DFC + thumb_func_start SaveFailedScreenTextPrint +SaveFailedScreenTextPrint: @ 0x08178DFC push {r4, r5, lr} sub sp, #0x18 adds r5, r0, #0 @@ -773544,23 +773544,23 @@ sub_08178DFC: @ 0x08178DFC str r5, [sp, #0x10] movs r1, #1 adds r2, r4, #0 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x18 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08178E44: .4byte gUnknown_203B9DA - thumb_func_end sub_08178DFC + thumb_func_end SaveFailedScreenTextPrint - thumb_func_start sub_08178E48 -sub_08178E48: @ 0x08178E48 + thumb_func_start DoSaveFailedScreen +DoSaveFailedScreen: @ 0x08178E48 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _08178E70 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _08178E74 strh r4, [r0] ldr r1, _08178E78 @@ -773575,25 +773575,25 @@ sub_08178E48: @ 0x08178E48 pop {r0} bx r0 .align 2, 0 -_08178E70: .4byte sub_08178E94 +_08178E70: .4byte CB2_SaveFailedScreen _08178E74: .4byte gUnknown_203B9C8 _08178E78: .4byte gUnknown_203B9CA _08178E7C: .4byte gUnknown_203B9DA - thumb_func_end sub_08178E48 + thumb_func_end DoSaveFailedScreen thumb_func_start sub_08178E80 sub_08178E80: @ 0x08178E80 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08178E80 - thumb_func_start sub_08178E94 -sub_08178E94: @ 0x08178E94 + thumb_func_start CB2_SaveFailedScreen +CB2_SaveFailedScreen: @ 0x08178E94 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -773610,7 +773610,7 @@ sub_08178E94: @ 0x08178E94 b _08179114 _08178EB0: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -773702,7 +773702,7 @@ _08178EB0: ldr r5, _081790E0 movs r0, #0 adds r1, r5, #0 - bl sub_0800212C + bl SetBgTilemapBuffer mov r0, r8 str r0, [sp, #8] ldr r2, _081790E4 @@ -773718,9 +773718,9 @@ _08178EB0: adds r3, r6, #0 bl LoadBgTiles ldr r0, _081790EC - bl sub_08003090 + bl InitWindows ldr r0, _081790F0 - bl sub_080033A8 + bl AddWindowWithoutTileMap ldr r4, _081790F4 strb r0, [r4] ldrb r0, [r4] @@ -773728,9 +773728,9 @@ _08178EB0: lsls r1, r1, #4 adds r2, r5, r1 movs r1, #7 - bl sub_08003F78 + bl SetWindowAttribute ldr r0, _081790F8 - bl sub_080033A8 + bl AddWindowWithoutTileMap strb r0, [r4, #1] ldrb r0, [r4, #1] movs r3, #0xe8 @@ -773738,54 +773738,54 @@ _08178EB0: adds r5, r5, r3 movs r1, #7 adds r2, r5, #0 - bl sub_08003F78 + bl SetWindowAttribute bl sub_08004480 bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl ResetPaletteFade ldr r0, _081790FC movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r0, _08179100 movs r1, #0x80 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08179104 movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08179108 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r4] movs r1, #0 adds r2, r6, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldrb r0, [r4, #1] movs r1, #0 adds r2, r6, #0 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldrb r0, [r4, #1] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #1] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0817910C movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint movs r0, #1 rsbs r0, r0, #0 mov r1, r8 @@ -773793,21 +773793,21 @@ _08178EB0: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _08179110 - bl sub_080006F0 + bl SetVBlankCallback movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldrb r0, [r7] adds r0, #1 strb r0, [r7] @@ -773840,14 +773840,14 @@ _08179108: .4byte gUnknown_85D7B04 _0817910C: .4byte gUnknown_85CBD6B _08179110: .4byte sub_08178E80 _08179114: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 cmp r0, #0 bne _0817912A ldr r0, _08179138 - bl sub_08000540 + bl SetMainCallback2 ldr r0, _0817913C - bl sub_080006F0 + bl SetVBlankCallback _0817912A: add sp, #0xc pop {r3} @@ -773856,12 +773856,12 @@ _0817912A: pop {r0} bx r0 .align 2, 0 -_08179138: .4byte sub_08179140 -_0817913C: .4byte sub_0817930C - thumb_func_end sub_08178E94 +_08179138: .4byte CB2_WipeSave +_0817913C: .4byte VBlankCB_UpdateClockGraphics + thumb_func_end CB2_SaveFailedScreen - thumb_func_start sub_08179140 -sub_08179140: @ 0x08179140 + thumb_func_start CB2_WipeSave +CB2_WipeSave: @ 0x08179140 push {r4, r5, r6, lr} movs r5, #0 ldr r0, _081791B8 @@ -773881,24 +773881,24 @@ _08179154: ldr r4, _081791C0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081791C4 movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint ldr r0, _081791C8 ldrb r0, [r0] - bl sub_08153154 + bl HandleSavingData ldr r0, [r6] cmp r0, #0 beq _08179194 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081791CC movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint _08179194: adds r0, r5, #1 lsls r0, r0, #0x18 @@ -773914,7 +773914,7 @@ _081791A4: ldr r0, _081791C0 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081791D0 b _081791E8 .align 2, 0 @@ -773929,7 +773929,7 @@ _081791D4: ldr r0, _081791F4 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081791F8 ldr r0, [r0] cmp r0, #0 @@ -773938,7 +773938,7 @@ _081791D4: _081791E8: movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint b _08179232 .align 2, 0 _081791F4: .4byte gUnknown_203B9DA @@ -773948,37 +773948,37 @@ _08179200: ldr r0, _0817921C ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _08179220 movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint ldr r0, _08179224 - bl sub_08000540 + bl SetMainCallback2 b _08179238 .align 2, 0 _0817921C: .4byte gUnknown_203B9DA _08179220: .4byte gUnknown_85CBDB2 -_08179224: .4byte sub_08179248 +_08179224: .4byte CB2_GameplayCannotBeContinued _08179228: ldr r0, _08179240 movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint _08179232: ldr r0, _08179244 - bl sub_08000540 + bl SetMainCallback2 _08179238: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _08179240: .4byte gUnknown_85CBE90 -_08179244: .4byte sub_08179298 - thumb_func_end sub_08179140 +_08179244: .4byte CB2_FadeAndReturnToTitleScreen + thumb_func_end CB2_WipeSave - thumb_func_start sub_08179248 -sub_08179248: @ 0x08179248 + thumb_func_start CB2_GameplayCannotBeContinued +CB2_GameplayCannotBeContinued: @ 0x08179248 push {lr} ldr r1, _08179280 movs r0, #0 @@ -773992,15 +773992,15 @@ sub_08179248: @ 0x08179248 ldr r0, _08179288 ldrb r0, [r0] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0817928C movs r1, #1 movs r2, #0 - bl sub_08178DFC + bl SaveFailedScreenTextPrint ldr r0, _08179290 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08179294 - bl sub_08000540 + bl SetMainCallback2 _0817927C: pop {r0} bx r0 @@ -774010,11 +774010,11 @@ _08179284: .4byte gUnknown_3002360 _08179288: .4byte gUnknown_203B9DA _0817928C: .4byte gUnknown_85CBDF7 _08179290: .4byte sub_08178E80 -_08179294: .4byte sub_08179298 - thumb_func_end sub_08179248 +_08179294: .4byte CB2_FadeAndReturnToTitleScreen + thumb_func_end CB2_GameplayCannotBeContinued - thumb_func_start sub_08179298 -sub_08179298: @ 0x08179298 + thumb_func_start CB2_FadeAndReturnToTitleScreen +CB2_FadeAndReturnToTitleScreen: @ 0x08179298 push {lr} sub sp, #4 ldr r0, _081792D0 @@ -774031,11 +774031,11 @@ sub_08179298: @ 0x08179298 str r2, [sp] movs r1, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081792D8 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081792DC - bl sub_08000540 + bl SetMainCallback2 _081792C8: add sp, #4 pop {r0} @@ -774044,13 +774044,13 @@ _081792C8: _081792D0: .4byte gUnknown_203B9CA _081792D4: .4byte gUnknown_3002360 _081792D8: .4byte sub_08178E80 -_081792DC: .4byte sub_081792E0 - thumb_func_end sub_08179298 +_081792DC: .4byte CB2_ReturnToTitleScreen + thumb_func_end CB2_FadeAndReturnToTitleScreen - thumb_func_start sub_081792E0 -sub_081792E0: @ 0x081792E0 + thumb_func_start CB2_ReturnToTitleScreen +CB2_ReturnToTitleScreen: @ 0x081792E0 push {r4, r5, lr} - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -774059,21 +774059,21 @@ sub_081792E0: @ 0x081792E0 ldr r0, [r5] cmp r0, #0 bne _08179300 - bl sub_080008F4 + bl DoSoftReset b _08179306 .align 2, 0 _081792FC: .4byte gUnknown_3005F54 _08179300: - bl sub_08000540 + bl SetMainCallback2 str r4, [r5] _08179306: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081792E0 + thumb_func_end CB2_ReturnToTitleScreen - thumb_func_start sub_0817930C -sub_0817930C: @ 0x0817930C + thumb_func_start VBlankCB_UpdateClockGraphics +VBlankCB_UpdateClockGraphics: @ 0x0817930C push {r4, r5, lr} ldr r5, _0817937C ldr r0, [r5, #0x24] @@ -774164,10 +774164,10 @@ _081793B8: _081793C0: .4byte 0xFFFFFC00 _081793C4: .4byte gUnknown_3002398 _081793C8: .4byte gUnknown_203B9CA - thumb_func_end sub_0817930C + thumb_func_end VBlankCB_UpdateClockGraphics - thumb_func_start sub_081793CC -sub_081793CC: @ 0x081793CC + thumb_func_start VerifySectorWipe +VerifySectorWipe: @ 0x081793CC push {r4, lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -774200,10 +774200,10 @@ _08179406: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081793CC + thumb_func_end VerifySectorWipe - thumb_func_start sub_0817940C -sub_0817940C: @ 0x0817940C + thumb_func_start WipeSector +WipeSector: @ 0x0817940C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -774228,7 +774228,7 @@ _08179422: cmp r4, r8 bls _08179422 adds r0, r6, #0 - bl sub_081793CC + bl VerifySectorWipe lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r5, #0x10 @@ -774247,7 +774247,7 @@ _0817944E: .align 2, 0 _0817945C: .4byte 0x00000FFF _08179460: .4byte gUnknown_30075F4 - thumb_func_end sub_0817940C + thumb_func_end WipeSector thumb_func_start WipeSectors WipeSectors: @ 0x08179464 @@ -774262,7 +774262,7 @@ _0817946A: cmp r0, #0 beq _08179484 adds r0, r6, #0 - bl sub_0817940C + bl WipeSector lsls r0, r0, #0x18 cmp r0, #0 bne _08179484 @@ -774286,8 +774286,8 @@ _08179498: .align 2, 0 thumb_func_end WipeSectors - thumb_func_start sub_081794A0 -sub_081794A0: @ 0x081794A0 + thumb_func_start ShouldDoBrailleDigEffect +ShouldDoBrailleDigEffect: @ 0x081794A0 push {lr} ldr r0, _081794D4 bl FlagGet @@ -774326,10 +774326,10 @@ _081794EE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081794A0 + thumb_func_end ShouldDoBrailleDigEffect - thumb_func_start sub_081794F4 -sub_081794F4: @ 0x081794F4 + thumb_func_start DoBrailleDigEffect +DoBrailleDigEffect: @ 0x081794F4 push {lr} ldr r2, _0817954C movs r0, #0x10 @@ -774371,16 +774371,16 @@ _08179554: .4byte 0x00000E32 _08179558: .4byte 0x00000233 _0817955C: .4byte 0x00000E34 _08179560: .4byte 0x000008AF - thumb_func_end sub_081794F4 + thumb_func_end DoBrailleDigEffect - thumb_func_start sub_08179564 -sub_08179564: @ 0x08179564 + thumb_func_start CheckRelicanthWailord +CheckRelicanthWailord: @ 0x08179564 push {r4, lr} ldr r4, _081795A0 adds r0, r4, #0 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #0x9d lsls r1, r1, #1 cmp r0, r1 @@ -774395,7 +774395,7 @@ sub_08179564: @ 0x08179564 adds r0, r0, r1 movs r1, #0x41 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, _081795A8 cmp r0, r1 bne _081795AC @@ -774411,7 +774411,7 @@ _081795AE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08179564 + thumb_func_end CheckRelicanthWailord thumb_func_start sub_081795B4 sub_081795B4: @ 0x081795B4 @@ -774419,12 +774419,12 @@ sub_081795B4: @ 0x081795B4 .align 2, 0 thumb_func_end sub_081795B4 - thumb_func_start sub_081795B8 -sub_081795B8: @ 0x081795B8 + thumb_func_start DoSealedChamberShakingEffect1 +DoSealedChamberShakingEffect1: @ 0x081795B8 push {lr} ldr r0, _081795EC movs r1, #9 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081795F0 @@ -774446,16 +774446,16 @@ sub_081795B8: @ 0x081795B8 pop {r0} bx r0 .align 2, 0 -_081795EC: .4byte sub_08179630 +_081795EC: .4byte SealedChamberShakingEffect _081795F0: .4byte gUnknown_3005B60 - thumb_func_end sub_081795B8 + thumb_func_end DoSealedChamberShakingEffect1 - thumb_func_start sub_081795F4 -sub_081795F4: @ 0x081795F4 + thumb_func_start DoSealedChamberShakingEffect2 +DoSealedChamberShakingEffect2: @ 0x081795F4 push {lr} ldr r0, _08179628 movs r1, #9 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817962C @@ -774477,12 +774477,12 @@ sub_081795F4: @ 0x081795F4 pop {r0} bx r0 .align 2, 0 -_08179628: .4byte sub_08179630 +_08179628: .4byte SealedChamberShakingEffect _0817962C: .4byte gUnknown_3005B60 - thumb_func_end sub_081795F4 + thumb_func_end DoSealedChamberShakingEffect2 - thumb_func_start sub_08179630 -sub_08179630: @ 0x08179630 + thumb_func_start SealedChamberShakingEffect +SealedChamberShakingEffect: @ 0x08179630 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -774511,7 +774511,7 @@ sub_08179630: @ 0x08179630 movs r0, #0x10 ldrsh r1, [r4, r0] movs r0, #0 - bl sub_08089C30 + bl SetCameraPanning movs r2, #0xc ldrsh r1, [r4, r2] movs r2, #0x14 @@ -774519,8 +774519,8 @@ sub_08179630: @ 0x08179630 cmp r1, r0 bne _08179688 adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts bl InstallCameraPanAheadCallback _08179688: pop {r4, r5} @@ -774528,10 +774528,10 @@ _08179688: bx r0 .align 2, 0 _08179690: .4byte gUnknown_3005B60 - thumb_func_end sub_08179630 + thumb_func_end SealedChamberShakingEffect - thumb_func_start sub_08179694 -sub_08179694: @ 0x08179694 + thumb_func_start ShouldDoBrailleRegirockEffect +ShouldDoBrailleRegirockEffect: @ 0x08179694 push {lr} movs r0, #0x8b lsls r0, r0, #4 @@ -774574,18 +774574,18 @@ _081796E6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08179694 + thumb_func_end ShouldDoBrailleRegirockEffect thumb_func_start sub_081796EC sub_081796EC: @ 0x081796EC push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _08179704 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r1] movs r0, #0x3c - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 @@ -774597,13 +774597,13 @@ sub_08179708: @ 0x08179708 push {lr} movs r0, #0x3c bl FieldEffectActiveListRemove - bl sub_08179718 + bl DoBrailleRegirockEffect pop {r0} bx r0 thumb_func_end sub_08179708 - thumb_func_start sub_08179718 -sub_08179718: @ 0x08179718 + thumb_func_start DoBrailleRegirockEffect +DoBrailleRegirockEffect: @ 0x08179718 push {lr} ldr r2, _08179774 movs r0, #0xe @@ -774645,10 +774645,10 @@ _08179778: .4byte 0x0000022B _0817977C: .4byte 0x00000E32 _08179780: .4byte 0x00000233 _08179784: .4byte 0x00000E34 - thumb_func_end sub_08179718 + thumb_func_end DoBrailleRegirockEffect - thumb_func_start sub_08179788 -sub_08179788: @ 0x08179788 + thumb_func_start ShouldDoBrailleRegisteelEffect +ShouldDoBrailleRegisteelEffect: @ 0x08179788 push {lr} ldr r0, _081797B4 bl FlagGet @@ -774682,18 +774682,18 @@ _081797CA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08179788 + thumb_func_end ShouldDoBrailleRegisteelEffect thumb_func_start sub_081797D0 sub_081797D0: @ 0x081797D0 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _081797E8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r1] movs r0, #0x3c - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 @@ -774705,13 +774705,13 @@ sub_081797EC: @ 0x081797EC push {lr} movs r0, #0x3c bl FieldEffectActiveListRemove - bl sub_081797FC + bl DoBrailleRegisteelEffect pop {r0} bx r0 thumb_func_end sub_081797EC - thumb_func_start sub_081797FC -sub_081797FC: @ 0x081797FC + thumb_func_start DoBrailleRegisteelEffect +DoBrailleRegisteelEffect: @ 0x081797FC push {lr} ldr r2, _08179854 movs r0, #0xe @@ -774753,7 +774753,7 @@ _0817985C: .4byte 0x00000E32 _08179860: .4byte 0x00000233 _08179864: .4byte 0x00000E34 _08179868: .4byte 0x000008B2 - thumb_func_end sub_081797FC + thumb_func_end DoBrailleRegisteelEffect thumb_func_start sub_0817986C sub_0817986C: @ 0x0817986C @@ -774761,10 +774761,10 @@ sub_0817986C: @ 0x0817986C .align 2, 0 thumb_func_end sub_0817986C - thumb_func_start sub_08179870 -sub_08179870: @ 0x08179870 + thumb_func_start FldEff_UsePuzzleEffect +FldEff_UsePuzzleEffect: @ 0x08179870 push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _08179890 @@ -774799,10 +774799,10 @@ _081798A8: .align 2, 0 _081798B4: .4byte gUnknown_3005B60 _081798B8: .4byte sub_08179708 - thumb_func_end sub_08179870 + thumb_func_end FldEff_UsePuzzleEffect - thumb_func_start sub_081798BC -sub_081798BC: @ 0x081798BC + thumb_func_start ShouldDoBrailleRegicePuzzle +ShouldDoBrailleRegicePuzzle: @ 0x081798BC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -774968,34 +774968,34 @@ _08179A14: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081798BC + thumb_func_end ShouldDoBrailleRegicePuzzle - thumb_func_start sub_08179A20 -sub_08179A20: @ 0x08179A20 + thumb_func_start CB2_PokeblockFeed +CB2_PokeblockFeed: @ 0x08179A20 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08179A20 + thumb_func_end CB2_PokeblockFeed - thumb_func_start sub_08179A3C -sub_08179A3C: @ 0x08179A3C + thumb_func_start VBlankCB_PokeblockFeed +VBlankCB_PokeblockFeed: @ 0x08179A3C push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08179A3C + thumb_func_end VBlankCB_PokeblockFeed - thumb_func_start sub_08179A50 -sub_08179A50: @ 0x08179A50 + thumb_func_start TransitionToPokeblockFeedScene +TransitionToPokeblockFeedScene: @ 0x08179A50 push {r4, lr} sub sp, #4 ldr r0, _08179A70 @@ -775033,9 +775033,9 @@ _08179A78: @ jump table _08179AB0: ldr r4, _08179ACC ldr r0, _08179AD0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] - bl sub_08121E58 + bl SetVBlankHBlankCallbacksToNull bl sub_08199640 ldr r1, _08179AD4 movs r2, #0x87 @@ -775068,7 +775068,7 @@ _08179B00: bl FreeAllSpritePalettes b _08179BEA _08179B06: - bl sub_0805EBD8 + bl AllocateMonSpritesGfx ldr r1, _08179B14 movs r2, #0x87 lsls r2, r2, #3 @@ -775077,10 +775077,10 @@ _08179B06: .align 2, 0 _08179B14: .4byte gUnknown_3002360 _08179B18: - bl sub_08179C54 + bl HandleInitBackgrounds b _08179BEA _08179B1E: - bl sub_08179E64 + bl HandleInitWindows ldr r1, _08179B2C movs r2, #0x87 lsls r2, r2, #3 @@ -775095,7 +775095,7 @@ _08179B30: muls r0, r1, r0 ldr r1, _08179B4C adds r0, r0, r1 - bl sub_08179CAC + bl LoadMonAndSceneGfx lsls r0, r0, #0x18 cmp r0, #0 beq _08179C1C @@ -775104,7 +775104,7 @@ _08179B30: _08179B48: .4byte gUnknown_203B968 _08179B4C: .4byte gUnknown_2024190 _08179B50: - bl sub_0817A35C + bl CreatePokeblockCaseSpriteForFeeding ldr r1, _08179B60 ldr r1, [r1] ldr r2, _08179B64 @@ -775121,7 +775121,7 @@ _08179B68: muls r0, r1, r0 ldr r1, _08179B88 adds r0, r0, r1 - bl sub_0817A210 + bl CreateMonSprite ldr r1, _08179B8C ldr r1, [r1] ldr r2, _08179B90 @@ -775138,7 +775138,7 @@ _08179B94: movs r1, #1 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r1, _08179BAC movs r2, #0x87 lsls r2, r2, #3 @@ -775147,14 +775147,14 @@ _08179B94: .align 2, 0 _08179BAC: .4byte gUnknown_3002360 _08179BB0: - bl sub_0817A020 + bl LaunchPokeblockFeedTask b _08179BEA _08179BB6: movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r1, _08179BCC movs r2, #0x87 lsls r2, r2, #3 @@ -775169,7 +775169,7 @@ _08179BD0: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _08179BFC ldrb r1, [r2, #8] movs r0, #0x7f @@ -775191,14 +775191,14 @@ _08179BFC: .4byte gUnknown_2037C74 _08179C00: .4byte gUnknown_3002360 _08179C04: ldr r0, _08179C14 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _08179C18 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _08179C1E .align 2, 0 -_08179C14: .4byte sub_08179A3C -_08179C18: .4byte sub_08179A20 +_08179C14: .4byte VBlankCB_PokeblockFeed +_08179C18: .4byte CB2_PokeblockFeed _08179C1C: movs r0, #0 _08179C1E: @@ -775207,10 +775207,10 @@ _08179C1E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08179A50 + thumb_func_end TransitionToPokeblockFeedScene - thumb_func_start sub_08179C28 -sub_08179C28: @ 0x08179C28 + thumb_func_start CB2_PreparePokeblockFeedScene +CB2_PreparePokeblockFeedScene: @ 0x08179C28 push {lr} _08179C2A: bl sub_081221F8 @@ -775218,7 +775218,7 @@ _08179C2A: lsrs r0, r0, #0x18 cmp r0, #1 beq _08179C4E - bl sub_08179A50 + bl TransitionToPokeblockFeedScene lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -775232,12 +775232,12 @@ _08179C4E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08179C28 + thumb_func_end CB2_PreparePokeblockFeedScene - thumb_func_start sub_08179C54 -sub_08179C54: @ 0x08179C54 + thumb_func_start HandleInitBackgrounds +HandleInitBackgrounds: @ 0x08179C54 push {lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _08179CA4 @@ -775248,18 +775248,18 @@ sub_08179C54: @ 0x08179C54 ldr r1, [r0] adds r1, #0x48 movs r0, #1 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -775268,10 +775268,10 @@ sub_08179C54: @ 0x08179C54 .align 2, 0 _08179CA4: .4byte gUnknown_85CD9F0 _08179CA8: .4byte gUnknown_203B9E4 - thumb_func_end sub_08179C54 + thumb_func_end HandleInitBackgrounds - thumb_func_start sub_08179CAC -sub_08179CAC: @ 0x08179CAC + thumb_func_start LoadMonAndSceneGfx +LoadMonAndSceneGfx: @ 0x08179CAC push {r4, r5, r6, lr} sub sp, #4 adds r6, r0, #0 @@ -775307,12 +775307,12 @@ _08179CDC: @ jump table _08179D00: adds r0, r6, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r6, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r0, r5, #3 ldr r1, _08179D30 @@ -775333,25 +775333,25 @@ _08179D38: .4byte gUnknown_203B9E4 _08179D3C: adds r0, r6, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r6, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r0, r6, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r5, #0 adds r2, r4, #0 - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality adds r4, r0, #0 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldrh r0, [r4, #4] movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _08179D78 ldr r1, [r0] b _08179E16 @@ -775359,7 +775359,7 @@ _08179D3C: _08179D78: .4byte gUnknown_203B9E4 _08179D7C: ldr r0, _08179D88 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08179D8C ldr r1, [r0] b _08179E16 @@ -775368,7 +775368,7 @@ _08179D88: .4byte gUnknown_8592140 _08179D8C: .4byte gUnknown_203B9E4 _08179D90: ldr r0, _08179D9C - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _08179DA0 ldr r1, [r0] b _08179E16 @@ -775377,7 +775377,7 @@ _08179D9C: .4byte gUnknown_8592148 _08179DA0: .4byte gUnknown_203B9E4 _08179DA4: ldr r0, _08179DB0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08179DB4 ldr r1, [r0] b _08179E16 @@ -775387,9 +775387,9 @@ _08179DB4: .4byte gUnknown_203B9E4 _08179DB8: ldr r0, _08179DCC ldrb r0, [r0] - bl sub_08179EA4 + bl SetPokeblockSpritePal ldr r0, _08179DD0 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _08179DD4 ldr r1, [r0] b _08179E16 @@ -775405,7 +775405,7 @@ _08179DD8: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _08179DF8 ldr r1, [r0] b _08179E16 @@ -775413,7 +775413,7 @@ _08179DD8: _08179DF4: .4byte gUnknown_8D7C4E4 _08179DF8: .4byte gUnknown_203B9E4 _08179DFC: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -775439,7 +775439,7 @@ _08179E30: ldr r0, _08179E4C movs r1, #0x20 movs r2, #0x60 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _08179E50 ldr r0, [r0] ldr r1, _08179E54 @@ -775460,13 +775460,13 @@ _08179E5A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08179CAC + thumb_func_end LoadMonAndSceneGfx - thumb_func_start sub_08179E64 -sub_08179E64: @ 0x08179E64 + thumb_func_start HandleInitWindows +HandleInitWindows: @ 0x08179E64 push {lr} ldr r0, _08179E9C - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #1 @@ -775475,23 +775475,23 @@ sub_08179E64: @ 0x08179E64 ldr r0, _08179EA0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 .align 2, 0 _08179E9C: .4byte gUnknown_85CD9F8 _08179EA0: .4byte gUnknown_85D7B04 - thumb_func_end sub_08179E64 + thumb_func_end HandleInitWindows - thumb_func_start sub_08179EA4 -sub_08179EA4: @ 0x08179EA4 + thumb_func_start SetPokeblockSpritePal +SetPokeblockSpritePal: @ 0x08179EA4 push {lr} lsls r0, r0, #0x18 ldr r1, _08179ED4 @@ -775521,10 +775521,10 @@ _08179ED8: .4byte 0x00000848 _08179EDC: .4byte gUnknown_203B9E8 _08179EE0: .4byte gUnknown_85CDA08 _08179EE4: .4byte 0x000039E2 - thumb_func_end sub_08179EA4 + thumb_func_end SetPokeblockSpritePal - thumb_func_start sub_08179EE8 -sub_08179EE8: @ 0x08179EE8 + thumb_func_start Task_HandlePokeblockFeed +Task_HandlePokeblockFeed: @ 0x08179EE8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -775591,13 +775591,13 @@ _08179F64: adds r0, r0, r2 ldrb r0, [r0] ldrb r1, [r1, #0xa] - bl sub_0817A3B0 + bl DoPokeblockCaseThrowEffect b _08179FBC .align 2, 0 _08179F78: .4byte gUnknown_203B9E4 _08179F7C: .4byte 0x0000105E _08179F80: - bl sub_0817A424 + bl CreatePokeblockSprite ldr r1, _08179F90 ldr r1, [r1] ldr r2, _08179F94 @@ -775623,7 +775623,7 @@ _08179FB0: str r0, [r1] b _0817A00C .align 2, 0 -_08179FB8: .4byte sub_0817A07C +_08179FB8: .4byte Task_HandleMonAtePokeblock _08179FBC: ldr r0, _08179FD8 ldr r0, [r0] @@ -775672,14 +775672,14 @@ _0817A00C: _0817A014: .4byte gUnknown_3005B60 _0817A018: .4byte gUnknown_203B9E4 _0817A01C: .4byte 0x00001058 - thumb_func_end sub_08179EE8 + thumb_func_end Task_HandlePokeblockFeed - thumb_func_start sub_0817A020 -sub_0817A020: @ 0x0817A020 + thumb_func_start LaunchPokeblockFeedTask +LaunchPokeblockFeedTask: @ 0x0817A020 push {lr} ldr r0, _0817A044 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817A048 @@ -775694,17 +775694,17 @@ sub_0817A020: @ 0x0817A020 pop {r0} bx r0 .align 2, 0 -_0817A044: .4byte sub_08179EE8 +_0817A044: .4byte Task_HandlePokeblockFeed _0817A048: .4byte gUnknown_3005B60 - thumb_func_end sub_0817A020 + thumb_func_end LaunchPokeblockFeedTask - thumb_func_start sub_0817A04C -sub_0817A04C: @ 0x0817A04C + thumb_func_start Task_WaitForAtePokeblockText +Task_WaitForAtePokeblockText: @ 0x0817A04C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0 - bl sub_08121F10 + bl RunTextPrintersRetIsActive lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -775722,11 +775722,11 @@ _0817A06E: bx r0 .align 2, 0 _0817A074: .4byte gUnknown_3005B60 -_0817A078: .4byte sub_0817A1D8 - thumb_func_end sub_0817A04C +_0817A078: .4byte Task_PaletteFadeToReturn + thumb_func_end Task_WaitForAtePokeblockText - thumb_func_start sub_0817A07C -sub_0817A07C: @ 0x0817A07C + thumb_func_start Task_HandleMonAtePokeblock +Task_HandleMonAtePokeblock: @ 0x0817A07C push {r4, r5, r6, r7, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -775747,7 +775747,7 @@ sub_0817A07C: @ 0x0817A07C ldr r4, [r1] adds r4, r4, r0 adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -775756,17 +775756,17 @@ sub_0817A07C: @ 0x0817A07C strh r0, [r6] ldr r1, _0817A0F0 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r1, _0817A0F4 adds r0, r4, #0 - bl sub_081370B4 + bl PokeblockCopyName movs r1, #0 ldrsh r0, [r6, r1] cmp r0, #0 bne _0817A100 ldr r0, _0817A0F8 ldr r1, _0817A0FC - bl sub_08008BCC + bl StringExpandPlaceholders b _0817A120 .align 2, 0 _0817A0D8: .4byte gUnknown_203B968 @@ -775784,7 +775784,7 @@ _0817A100: ble _0817A118 ldr r0, _0817A110 ldr r1, _0817A114 - bl sub_08008BCC + bl StringExpandPlaceholders b _0817A120 .align 2, 0 _0817A110: .4byte gUnknown_2021C7C @@ -775792,7 +775792,7 @@ _0817A114: .4byte gUnknown_85C9894 _0817A118: ldr r0, _0817A164 ldr r1, _0817A168 - bl sub_08008BCC + bl StringExpandPlaceholders _0817A120: ldr r2, _0817A16C ldrb r0, [r2] @@ -775814,7 +775814,7 @@ _0817A120: str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 ldr r1, _0817A170 lsls r0, r7, #2 adds r0, r0, r7 @@ -775831,11 +775831,11 @@ _0817A164: .4byte gUnknown_2021C7C _0817A168: .4byte gUnknown_85C98A9 _0817A16C: .4byte gUnknown_30030B4 _0817A170: .4byte gUnknown_3005B60 -_0817A174: .4byte sub_0817A04C - thumb_func_end sub_0817A07C +_0817A174: .4byte Task_WaitForAtePokeblockText + thumb_func_end Task_HandleMonAtePokeblock - thumb_func_start sub_0817A178 -sub_0817A178: @ 0x0817A178 + thumb_func_start Task_ReturnAfterPaletteFade +Task_ReturnAfterPaletteFade: @ 0x0817A178 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -775854,14 +775854,14 @@ sub_0817A178: @ 0x0817A178 bl m4aMPlayVolumeControl ldr r0, _0817A1D0 ldr r0, [r0, #8] - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 - bl sub_080034D4 + bl DestroyTask + bl FreeAllWindowBuffers ldr r0, _0817A1D4 ldr r0, [r0] - bl sub_08000BF0 - bl sub_0805ECB0 + bl Free + bl FreeMonSpritesGfx _0817A1BC: pop {r4} pop {r0} @@ -775872,10 +775872,10 @@ _0817A1C8: .4byte gUnknown_30074D0 _0817A1CC: .4byte 0x0000FFFF _0817A1D0: .4byte gUnknown_3002360 _0817A1D4: .4byte gUnknown_203B9E4 - thumb_func_end sub_0817A178 + thumb_func_end Task_ReturnAfterPaletteFade - thumb_func_start sub_0817A1D8 -sub_0817A1D8: @ 0x0817A1D8 + thumb_func_start Task_PaletteFadeToReturn +Task_PaletteFadeToReturn: @ 0x0817A1D8 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -775887,7 +775887,7 @@ sub_0817A1D8: @ 0x0817A1D8 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0817A208 lsls r0, r4, #2 adds r0, r0, r4 @@ -775901,18 +775901,18 @@ sub_0817A1D8: @ 0x0817A1D8 bx r0 .align 2, 0 _0817A208: .4byte gUnknown_3005B60 -_0817A20C: .4byte sub_0817A178 - thumb_func_end sub_0817A1D8 +_0817A20C: .4byte Task_ReturnAfterPaletteFade + thumb_func_end Task_PaletteFadeToReturn - thumb_func_start sub_0817A210 -sub_0817A210: @ 0x0817A210 + thumb_func_start CreateMonSprite +CreateMonSprite: @ 0x0817A210 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} adds r5, r0, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -775920,7 +775920,7 @@ sub_0817A210: @ 0x0817A210 movs r1, #0x30 movs r2, #0x50 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -775935,7 +775935,7 @@ sub_0817A210: @ 0x0817A210 mov r2, r8 strb r2, [r0] adds r0, r5, #0 - bl sub_0806CB34 + bl GetNature mov r2, sb ldr r1, [r2] ldr r2, _0817A2D8 @@ -776004,7 +776004,7 @@ _0817A2DC: .4byte gUnknown_20205AC _0817A2E0: .4byte sub_08007140 _0817A2E4: .4byte 0x00001053 _0817A2E8: .4byte gUnknown_85CDA50 - thumb_func_end sub_0817A210 + thumb_func_end CreateMonSprite thumb_func_start PrepareMonToMoveToPokeblock PrepareMonToMoveToPokeblock: @ 0x0817A2EC @@ -776053,7 +776053,7 @@ sub_0817A320: @ 0x0817A320 bne _0817A346 ldrh r0, [r4, #0x32] movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 _0817A346: movs r1, #0x2e ldrsh r0, [r4, r1] @@ -776069,13 +776069,13 @@ _0817A352: _0817A358: .4byte sub_08007140 thumb_func_end sub_0817A320 - thumb_func_start sub_0817A35C -sub_0817A35C: @ 0x0817A35C + thumb_func_start CreatePokeblockCaseSpriteForFeeding +CreatePokeblockCaseSpriteForFeeding: @ 0x0817A35C push {r4, r5, lr} movs r0, #0xbc movs r1, #0x64 movs r2, #2 - bl sub_08136484 + bl CreatePokeblockCaseSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -776109,10 +776109,10 @@ sub_0817A35C: @ 0x0817A35C _0817A3A4: .4byte gUnknown_20205AC _0817A3A8: .4byte gUnknown_85CDB04 _0817A3AC: .4byte sub_08007140 - thumb_func_end sub_0817A35C + thumb_func_end CreatePokeblockCaseSpriteForFeeding - thumb_func_start sub_0817A3B0 -sub_0817A3B0: @ 0x0817A3B0 + thumb_func_start DoPokeblockCaseThrowEffect +DoPokeblockCaseThrowEffect: @ 0x0817A3B0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -776167,16 +776167,16 @@ _0817A400: .align 2, 0 _0817A41C: .4byte gUnknown_85CDB0C _0817A420: .4byte gUnknown_20205AC - thumb_func_end sub_0817A3B0 + thumb_func_end DoPokeblockCaseThrowEffect - thumb_func_start sub_0817A424 -sub_0817A424: @ 0x0817A424 + thumb_func_start CreatePokeblockSprite +CreatePokeblockSprite: @ 0x0817A424 push {lr} ldr r0, _0817A44C movs r1, #0xae movs r2, #0x54 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817A450 @@ -776194,10 +776194,10 @@ sub_0817A424: @ 0x0817A424 _0817A44C: .4byte gUnknown_85CDB48 _0817A450: .4byte gUnknown_20205AC _0817A454: .4byte 0x0000FFF4 - thumb_func_end sub_0817A424 + thumb_func_end CreatePokeblockSprite - thumb_func_start sub_0817A458 -sub_0817A458: @ 0x0817A458 + thumb_func_start SpriteCB_ThrownPokeblock +SpriteCB_ThrownPokeblock: @ 0x0817A458 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x20] @@ -776220,7 +776220,7 @@ _0817A47E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817A458 + thumb_func_end SpriteCB_ThrownPokeblock thumb_func_start sub_0817A484 sub_0817A484: @ 0x0817A484 @@ -776531,7 +776531,7 @@ _0817A798: .align 2, 0 _0817A7B0: .4byte 0x00001050 _0817A7B4: - bl sub_0817A8F4 + bl FreeMonSpriteOamMatrix ldr r3, _0817A7CC adds r0, r4, r3 movs r1, #0 @@ -776692,8 +776692,8 @@ _0817A8EE: bx r1 thumb_func_end sub_0817A89C - thumb_func_start sub_0817A8F4 -sub_0817A8F4: @ 0x0817A8F4 + thumb_func_start FreeMonSpriteOamMatrix +FreeMonSpriteOamMatrix: @ 0x0817A8F4 push {lr} ldr r0, _0817A908 ldr r0, [r0] @@ -776704,7 +776704,7 @@ sub_0817A8F4: @ 0x0817A8F4 bx r1 .align 2, 0 _0817A908: .4byte gUnknown_203B9E4 - thumb_func_end sub_0817A8F4 + thumb_func_end FreeMonSpriteOamMatrix thumb_func_start sub_0817A90C sub_0817A90C: @ 0x0817A90C @@ -777016,22 +777016,22 @@ _0817AB70: bx r0 thumb_func_end sub_0817AA20 - thumb_func_start sub_0817AB80 -sub_0817AB80: @ 0x0817AB80 + thumb_func_start CB2_InitClearSaveDataScreen +CB2_InitClearSaveDataScreen: @ 0x0817AB80 push {lr} - bl sub_0817ACC0 + bl SetupClearSaveDataScreen lsls r0, r0, #0x18 cmp r0, #0 beq _0817AB94 ldr r0, _0817AB98 movs r1, #0 - bl sub_080A8878 + bl CreateTask _0817AB94: pop {r0} bx r0 .align 2, 0 _0817AB98: .4byte sub_0817AB9C - thumb_func_end sub_0817AB80 + thumb_func_end CB2_InitClearSaveDataScreen thumb_func_start sub_0817AB9C sub_0817AB9C: @ 0x0817AB9C @@ -777044,7 +777044,7 @@ sub_0817AB9C: @ 0x0817AB9C movs r1, #0 movs r2, #2 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _0817ABF0 movs r5, #2 str r5, [sp] @@ -777078,11 +777078,11 @@ sub_0817AB9C: @ 0x0817AB9C _0817ABF0: .4byte gUnknown_85CDB60 _0817ABF4: .4byte gUnknown_85CDBA8 _0817ABF8: .4byte gUnknown_3005B60 -_0817ABFC: .4byte sub_0817AC00 +_0817ABFC: .4byte Task_ClearSaveDataScreenYesNoChoice thumb_func_end sub_0817AB9C - thumb_func_start sub_0817AC00 -sub_0817AC00: @ 0x0817AC00 + thumb_func_start Task_ClearSaveDataScreenYesNoChoice +Task_ClearSaveDataScreenYesNoChoice: @ 0x0817AC00 push {r4, r5, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -777106,7 +777106,7 @@ _0817AC22: _0817AC28: movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0817AC54 movs r0, #2 str r0, [sp] @@ -777127,62 +777127,62 @@ _0817AC28: .align 2, 0 _0817AC54: .4byte gUnknown_85CDB7A _0817AC58: .4byte gUnknown_3005B60 -_0817AC5C: .4byte sub_0817AC80 +_0817AC5C: .4byte Task_ClearSaveData _0817AC60: movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _0817AC7C - bl sub_08000540 + bl SetMainCallback2 _0817AC72: add sp, #0xc pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0817AC7C: .4byte sub_0817AE94 - thumb_func_end sub_0817AC00 +_0817AC7C: .4byte CB2_FadeAndDoReset + thumb_func_end Task_ClearSaveDataScreenYesNoChoice - thumb_func_start sub_0817AC80 -sub_0817AC80: @ 0x0817AC80 + thumb_func_start Task_ClearSaveData +Task_ClearSaveData: @ 0x0817AC80 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0815262C + bl ClearSaveData adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _0817ACA0 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_0817ACA0: .4byte sub_0817AE94 - thumb_func_end sub_0817AC80 +_0817ACA0: .4byte CB2_FadeAndDoReset + thumb_func_end Task_ClearSaveData thumb_func_start sub_0817ACA4 sub_0817ACA4: @ 0x0817ACA4 push {lr} - bl sub_080A89D4 - bl sub_080A12E4 + bl RunTasks + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0817ACA4 - thumb_func_start sub_0817ACB4 -sub_0817ACB4: @ 0x0817ACB4 + thumb_func_start VBlankCB +VBlankCB: @ 0x0817ACB4 push {lr} bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817ACB4 + thumb_func_end VBlankCB - thumb_func_start sub_0817ACC0 -sub_0817ACC0: @ 0x0817ACC0 + thumb_func_start SetupClearSaveDataScreen +SetupClearSaveDataScreen: @ 0x0817ACC0 push {r4, lr} sub sp, #0xc ldr r0, _0817AE20 @@ -777197,7 +777197,7 @@ sub_0817ACC0: @ 0x0817ACC0 b _0817AE64 _0817ACD8: movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 movs r1, #0 bl SetGpuReg @@ -777298,7 +777298,7 @@ _0817ADAC: lsrs r1, r0, #0x10 cmp r1, r2 bls _0817ADAC - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -777311,23 +777311,23 @@ _0817ADAC: movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg - bl sub_0817AEEC + bl InitClearSaveDataScreenWindows ldr r0, _0817AE5C str r0, [sp] movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 bl EnableInterrupts ldr r0, _0817AE60 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _0817AE20 movs r1, #0x87 lsls r1, r1, #3 @@ -777352,9 +777352,9 @@ _0817AE50: .4byte 0x0600F000 _0817AE54: .4byte 0x000003FF _0817AE58: .4byte gUnknown_85CDB90 _0817AE5C: .4byte 0x0000FFFF -_0817AE60: .4byte sub_0817ACB4 +_0817AE60: .4byte VBlankCB _0817AE64: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0817AE80 ldrb r1, [r0, #7] movs r0, #0x80 @@ -777362,7 +777362,7 @@ _0817AE64: cmp r0, #0 bne _0817AE88 ldr r0, _0817AE84 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _0817AE8A .align 2, 0 @@ -777376,10 +777376,10 @@ _0817AE8A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0817ACC0 + thumb_func_end SetupClearSaveDataScreen - thumb_func_start sub_0817AE94 -sub_0817AE94: @ 0x0817AE94 + thumb_func_start CB2_FadeAndDoReset +CB2_FadeAndDoReset: @ 0x0817AE94 push {r4, lr} sub sp, #4 ldr r0, _0817AEC0 @@ -777397,7 +777397,7 @@ _0817AEAA: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #1 strb r0, [r4] b _0817AEE0 @@ -777405,15 +777405,15 @@ _0817AEAA: _0817AEC0: .4byte gUnknown_3002360 _0817AEC4: .4byte 0x0000FFFF _0817AEC8: - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _0817AEE8 ldrb r1, [r0, #7] movs r0, #0x80 ands r0, r1 cmp r0, #0 bne _0817AEE0 - bl sub_080034D4 - bl sub_080008F4 + bl FreeAllWindowBuffers + bl DoSoftReset _0817AEE0: add sp, #4 pop {r4} @@ -777421,35 +777421,35 @@ _0817AEE0: bx r0 .align 2, 0 _0817AEE8: .4byte gUnknown_2037C74 - thumb_func_end sub_0817AE94 + thumb_func_end CB2_FadeAndDoReset - thumb_func_start sub_0817AEEC -sub_0817AEEC: @ 0x0817AEEC + thumb_func_start InitClearSaveDataScreenWindows +InitClearSaveDataScreenWindows: @ 0x0817AEEC push {lr} ldr r0, _0817AF1C - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 movs r1, #0 movs r2, #2 movs r3, #0xe0 - bl sub_0809815C + bl LoadWindowGfx ldr r0, _0817AF20 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 _0817AF1C: .4byte gUnknown_85CDB98 _0817AF20: .4byte gUnknown_85D7B04 - thumb_func_end sub_0817AEEC + thumb_func_end InitClearSaveDataScreenWindows - thumb_func_start sub_0817AF24 -sub_0817AF24: @ 0x0817AF24 + thumb_func_start load_intro_part2_graphics +load_intro_part2_graphics: @ 0x0817AF24 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -777462,7 +777462,7 @@ sub_0817AF24: @ 0x0817AF24 ldr r0, _0817AF90 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette cmp r4, #0 beq _0817AF4C cmp r4, #1 @@ -777478,14 +777478,14 @@ _0817AF4C: ldr r0, _0817AFA0 movs r1, #0 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817AFA4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0817AFA8 movs r1, #0x80 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_0817B62C b _0817AFDE .align 2, 0 @@ -777511,14 +777511,14 @@ _0817AFAC: ldr r0, _0817AFFC movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B000 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0817B004 movs r1, #0x80 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_0817B648 _0817AFDE: ldr r1, _0817B008 @@ -777539,10 +777539,10 @@ _0817B000: .4byte gUnknown_85D25BC _0817B004: .4byte gUnknown_85CF680 _0817B008: .4byte gUnknown_203B9F4 _0817B00C: .4byte gUnknown_30030BC - thumb_func_end sub_0817AF24 + thumb_func_end load_intro_part2_graphics - thumb_func_start sub_0817B010 -sub_0817B010: @ 0x0817B010 + thumb_func_start LinkPartnerHandleChooseMove +LinkPartnerHandleChooseMove: @ 0x0817B010 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -777592,7 +777592,7 @@ _0817B076: _0817B07C: .4byte 0x00000603 _0817B080: .4byte 0x00000702 _0817B084: .4byte 0x00000F05 - thumb_func_end sub_0817B010 + thumb_func_end LinkPartnerHandleChooseMove thumb_func_start sub_0817B088 sub_0817B088: @ 0x0817B088 @@ -777628,7 +777628,7 @@ _0817B0D4: ldr r0, _0817B10C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B110 movs r1, #0xc0 lsls r1, r1, #0x13 @@ -777639,9 +777639,9 @@ _0817B0D4: ldr r0, _0817B11C movs r1, #0 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B120 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0817B124 ldr r1, _0817B128 bl LZ77UnCompVram @@ -777661,7 +777661,7 @@ _0817B130: ldr r0, _0817B178 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B17C movs r1, #0xc0 lsls r1, r1, #0x13 @@ -777672,9 +777672,9 @@ _0817B130: ldr r0, _0817B188 movs r1, #0 movs r2, #0x60 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B18C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0817B190 ldr r1, _0817B194 bl LZ77UnCompVram @@ -777683,7 +777683,7 @@ _0817B166: movs r1, #0x80 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_0817B62C b _0817B230 .align 2, 0 @@ -777700,7 +777700,7 @@ _0817B19C: ldr r0, _0817B1DC movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B1E0 movs r1, #0xc0 lsls r1, r1, #0x13 @@ -777712,14 +777712,14 @@ _0817B19C: adds r0, r4, #0 movs r1, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B1F0 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r1, #0x80 lsls r1, r1, #1 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_0817B648 b _0817B230 .align 2, 0 @@ -777733,7 +777733,7 @@ _0817B1F4: ldr r0, _0817B244 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B248 movs r1, #0xc0 lsls r1, r1, #0x13 @@ -777744,14 +777744,14 @@ _0817B1F4: ldr r0, _0817B254 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r0, _0817B258 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0817B25C movs r1, #0x80 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette bl sub_0817B664 _0817B230: ldr r1, _0817B260 @@ -777824,7 +777824,7 @@ sub_0817B29C: @ 0x0817B29C mov r0, sb movs r1, #0 str r3, [sp] - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -778027,11 +778027,11 @@ _0817B456: mov r0, sp movs r1, #9 movs r2, #2 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xa movs r2, #2 - bl sub_080A1200 + bl LoadPalette b _0817B4E0 .align 2, 0 _0817B474: .4byte gUnknown_20373B4 @@ -778079,11 +778079,11 @@ _0817B4C6: mov r0, sp movs r1, #0xc movs r2, #2 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xd movs r2, #2 - bl sub_080A1200 + bl LoadPalette _0817B4E0: add sp, #4 pop {r4} @@ -778183,7 +778183,7 @@ _0817B582: ldrb r2, [r6, #2] ldrb r3, [r6, #3] ldr r0, _0817B624 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r5, r0, #4 @@ -778381,7 +778381,7 @@ sub_0817B6F4: @ 0x0817B6F4 adds r1, r5, #0 adds r2, r4, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -778392,7 +778392,7 @@ sub_0817B6F4: @ 0x0817B6F4 adds r1, r5, #0 adds r2, r4, #0 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817B748 @@ -778424,7 +778424,7 @@ sub_0817B74C: @ 0x0817B74C adds r1, r5, #0 adds r2, r4, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -778435,7 +778435,7 @@ sub_0817B74C: @ 0x0817B74C adds r1, r5, #0 adds r2, r4, #0 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817B7A0 @@ -778532,7 +778532,7 @@ sub_0817B808: @ 0x0817B808 adds r1, r2, #0 adds r2, r5, #0 movs r3, #5 - bl sub_08006B0C + bl CreateSprite adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -778543,7 +778543,7 @@ sub_0817B808: @ 0x0817B808 adds r1, r4, #0 adds r2, r5, #0 movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _0817B87C @@ -778591,7 +778591,7 @@ sub_0817B884: @ 0x0817B884 adds r1, r2, #0 adds r2, r5, #0 movs r3, #5 - bl sub_08006B0C + bl CreateSprite adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -778602,7 +778602,7 @@ sub_0817B884: @ 0x0817B884 adds r1, r4, #0 adds r2, r5, #0 movs r3, #6 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r5, _0817B8F8 @@ -778636,8 +778636,8 @@ sub_0817B900: @ 0x0817B900 .align 2, 0 thumb_func_end sub_0817B900 - thumb_func_start sub_0817B904 -sub_0817B904: @ 0x0817B904 + thumb_func_start SetEvoSparklesMatrices +SetEvoSparklesMatrices: @ 0x0817B904 push {r4, r5, lr} sub sp, #4 movs r4, #0 @@ -778665,10 +778665,10 @@ _0817B90C: bx r0 .align 2, 0 _0817B938: .4byte gUnknown_85D2928 - thumb_func_end sub_0817B904 + thumb_func_end SetEvoSparklesMatrices - thumb_func_start sub_0817B93C -sub_0817B93C: @ 0x0817B93C + thumb_func_start SpriteCB_PreEvoSparkleSet1 +SpriteCB_PreEvoSparkleSet1: @ 0x0817B93C push {r4, lr} adds r4, r0, #0 movs r1, #0x22 @@ -778767,10 +778767,10 @@ _0817B9F0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817B93C + thumb_func_end SpriteCB_PreEvoSparkleSet1 - thumb_func_start sub_0817B9F8 -sub_0817B9F8: @ 0x0817B9F8 + thumb_func_start CreatePreEvoSparkleSet1 +CreatePreEvoSparkleSet1: @ 0x0817B9F8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -778778,7 +778778,7 @@ sub_0817B9F8: @ 0x0817B9F8 movs r1, #0x78 movs r2, #0x58 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -778814,11 +778814,11 @@ _0817BA42: .align 2, 0 _0817BA48: .4byte gUnknown_85D2910 _0817BA4C: .4byte gUnknown_20205AC -_0817BA50: .4byte sub_0817B93C - thumb_func_end sub_0817B9F8 +_0817BA50: .4byte SpriteCB_PreEvoSparkleSet1 + thumb_func_end CreatePreEvoSparkleSet1 - thumb_func_start sub_0817BA54 -sub_0817BA54: @ 0x0817BA54 + thumb_func_start SpriteCB_PreEvoSparkleSet2 +SpriteCB_PreEvoSparkleSet2: @ 0x0817BA54 push {r4, lr} adds r4, r0, #0 movs r1, #0x22 @@ -778875,10 +778875,10 @@ _0817BAC0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817BA54 + thumb_func_end SpriteCB_PreEvoSparkleSet2 - thumb_func_start sub_0817BAC8 -sub_0817BAC8: @ 0x0817BAC8 + thumb_func_start CreatePreEvoSparkleSet2 +CreatePreEvoSparkleSet2: @ 0x0817BAC8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -778886,7 +778886,7 @@ sub_0817BAC8: @ 0x0817BAC8 movs r1, #0x78 movs r2, #8 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -778928,11 +778928,11 @@ _0817BB1E: .align 2, 0 _0817BB24: .4byte gUnknown_85D2910 _0817BB28: .4byte gUnknown_20205AC -_0817BB2C: .4byte sub_0817BA54 - thumb_func_end sub_0817BAC8 +_0817BB2C: .4byte SpriteCB_PreEvoSparkleSet2 + thumb_func_end CreatePreEvoSparkleSet2 - thumb_func_start sub_0817BB30 -sub_0817BB30: @ 0x0817BB30 + thumb_func_start SpriteCB_PostEvoSparkleSet1 +SpriteCB_PostEvoSparkleSet1: @ 0x0817BB30 push {r4, lr} adds r4, r0, #0 movs r1, #0x38 @@ -778968,10 +778968,10 @@ _0817BB72: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0817BB30 + thumb_func_end SpriteCB_PostEvoSparkleSet1 - thumb_func_start sub_0817BB78 -sub_0817BB78: @ 0x0817BB78 + thumb_func_start CreatePostEvoSparkleSet1 +CreatePostEvoSparkleSet1: @ 0x0817BB78 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -778981,7 +778981,7 @@ sub_0817BB78: @ 0x0817BB78 movs r1, #0x78 movs r2, #0x38 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x40 @@ -779021,11 +779021,11 @@ _0817BBCE: .align 2, 0 _0817BBD4: .4byte gUnknown_85D2910 _0817BBD8: .4byte gUnknown_20205AC -_0817BBDC: .4byte sub_0817BB30 - thumb_func_end sub_0817BB78 +_0817BBDC: .4byte SpriteCB_PostEvoSparkleSet1 + thumb_func_end CreatePostEvoSparkleSet1 - thumb_func_start sub_0817BBE0 -sub_0817BBE0: @ 0x0817BBE0 + thumb_func_start SpriteCB_PostEvoSparkleSet2 +SpriteCB_PostEvoSparkleSet2: @ 0x0817BBE0 push {r4, r5, lr} adds r4, r0, #0 ldrh r1, [r4, #0x3c] @@ -779134,10 +779134,10 @@ _0817BCAA: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0817BBE0 + thumb_func_end SpriteCB_PostEvoSparkleSet2 - thumb_func_start sub_0817BCB0 -sub_0817BCB0: @ 0x0817BCB0 + thumb_func_start CreatePostEvoSparkleSet2 +CreatePostEvoSparkleSet2: @ 0x0817BCB0 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -779145,7 +779145,7 @@ sub_0817BCB0: @ 0x0817BCB0 movs r1, #0x78 movs r2, #0x38 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0x40 @@ -779199,14 +779199,14 @@ _0817BD20: .align 2, 0 _0817BD2C: .4byte gUnknown_85D2910 _0817BD30: .4byte gUnknown_20205AC -_0817BD34: .4byte sub_0817BBE0 - thumb_func_end sub_0817BCB0 +_0817BD34: .4byte SpriteCB_PostEvoSparkleSet2 + thumb_func_end CreatePostEvoSparkleSet2 - thumb_func_start sub_0817BD38 -sub_0817BD38: @ 0x0817BD38 + thumb_func_start LoadEvoSparkleSpriteAndPal +LoadEvoSparkleSpriteAndPal: @ 0x0817BD38 push {lr} ldr r0, _0817BD4C - bl sub_080347E0 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _0817BD50 bl LoadSpritePalettes pop {r0} @@ -779214,17 +779214,17 @@ sub_0817BD38: @ 0x0817BD38 .align 2, 0 _0817BD4C: .4byte gUnknown_85D28DC _0817BD50: .4byte gUnknown_85D28EC - thumb_func_end sub_0817BD38 + thumb_func_end LoadEvoSparkleSpriteAndPal - thumb_func_start sub_0817BD54 -sub_0817BD54: @ 0x0817BD54 + thumb_func_start LaunchTask_PreEvoSparklesSet1 +LaunchTask_PreEvoSparklesSet1: @ 0x0817BD54 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r0, _0817BD7C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817BD80 @@ -779237,18 +779237,18 @@ sub_0817BD54: @ 0x0817BD54 pop {r1} bx r1 .align 2, 0 -_0817BD7C: .4byte sub_0817BD84 +_0817BD7C: .4byte EvoTask_BeginPreSet1_FadeAndPlaySE _0817BD80: .4byte gUnknown_3005B60 - thumb_func_end sub_0817BD54 + thumb_func_end LaunchTask_PreEvoSparklesSet1 - thumb_func_start sub_0817BD84 -sub_0817BD84: @ 0x0817BD84 + thumb_func_start EvoTask_BeginPreSet1_FadeAndPlaySE +EvoTask_BeginPreSet1_FadeAndPlaySE: @ 0x0817BD84 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0817B904 + bl SetEvoSparklesMatrices ldr r0, _0817BDC8 lsls r5, r4, #2 adds r5, r5, r4 @@ -779265,7 +779265,7 @@ sub_0817BD84: @ 0x0817BD84 movs r1, #0xa movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0817BDD0 str r0, [r5] movs r0, #0x8c @@ -779277,11 +779277,11 @@ sub_0817BD84: @ 0x0817BD84 .align 2, 0 _0817BDC8: .4byte gUnknown_3005B60 _0817BDCC: .4byte 0x00007FFF -_0817BDD0: .4byte sub_0817BDD4 - thumb_func_end sub_0817BD84 +_0817BDD0: .4byte EvoTask_CreatePreEvoSparkleSet1 + thumb_func_end EvoTask_BeginPreSet1_FadeAndPlaySE - thumb_func_start sub_0817BDD4 -sub_0817BDD4: @ 0x0817BDD4 + thumb_func_start EvoTask_CreatePreEvoSparkleSet1 +EvoTask_CreatePreEvoSparkleSet1: @ 0x0817BDD4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -779311,7 +779311,7 @@ _0817BDFC: adds r0, r0, r1 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0817B9F8 + bl CreatePreEvoSparkleSet1 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -779338,11 +779338,11 @@ _0817BE38: pop {r0} bx r0 .align 2, 0 -_0817BE40: .4byte sub_0817BE44 - thumb_func_end sub_0817BDD4 +_0817BE40: .4byte EvoTask_WaitForPre1SparklesToGoUp + thumb_func_end EvoTask_CreatePreEvoSparkleSet1 - thumb_func_start sub_0817BE44 -sub_0817BE44: @ 0x0817BE44 + thumb_func_start EvoTask_WaitForPre1SparklesToGoUp +EvoTask_WaitForPre1SparklesToGoUp: @ 0x0817BE44 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -779363,34 +779363,34 @@ sub_0817BE44: @ 0x0817BE44 _0817BE64: .4byte gUnknown_3005B60 _0817BE68: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _0817BE6E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0817BE44 + thumb_func_end EvoTask_WaitForPre1SparklesToGoUp thumb_func_start sub_0817BE74 sub_0817BE74: @ 0x0817BE74 push {lr} ldr r0, _0817BE88 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0817BE88: .4byte sub_0817BE8C +_0817BE88: .4byte EvoTask_BeginPreSparklesSet2 thumb_func_end sub_0817BE74 - thumb_func_start sub_0817BE8C -sub_0817BE8C: @ 0x0817BE8C + thumb_func_start EvoTask_BeginPreSparklesSet2 +EvoTask_BeginPreSparklesSet2: @ 0x0817BE8C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0817B904 + bl SetEvoSparklesMatrices ldr r1, _0817BEB8 lsls r0, r4, #2 adds r0, r0, r4 @@ -779407,11 +779407,11 @@ sub_0817BE8C: @ 0x0817BE8C bx r0 .align 2, 0 _0817BEB8: .4byte gUnknown_3005B60 -_0817BEBC: .4byte sub_0817BEC0 - thumb_func_end sub_0817BE8C +_0817BEBC: .4byte EvoTask_CreatePreEvoSparklesSet2 + thumb_func_end EvoTask_BeginPreSparklesSet2 - thumb_func_start sub_0817BEC0 -sub_0817BEC0: @ 0x0817BEC0 + thumb_func_start EvoTask_CreatePreEvoSparklesSet2 +EvoTask_CreatePreEvoSparklesSet2: @ 0x0817BEC0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -779431,7 +779431,7 @@ sub_0817BEC0: @ 0x0817BEC0 _0817BEE0: lsls r0, r4, #0x1c lsrs r0, r0, #0x18 - bl sub_0817BAC8 + bl CreatePreEvoSparkleSet2 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -779457,14 +779457,14 @@ _0817BF0C: bx r0 .align 2, 0 _0817BF14: .4byte sub_0817BF18 - thumb_func_end sub_0817BEC0 + thumb_func_end EvoTask_CreatePreEvoSparklesSet2 thumb_func_start sub_0817BF18 sub_0817BF18: @ 0x0817BF18 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 @@ -779475,22 +779475,22 @@ sub_0817BF28: @ 0x0817BF28 push {lr} ldr r0, _0817BF3C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_0817BF3C: .4byte sub_0817BF40 +_0817BF3C: .4byte EvoTask_BeginPostSparklesSet1 thumb_func_end sub_0817BF28 - thumb_func_start sub_0817BF40 -sub_0817BF40: @ 0x0817BF40 + thumb_func_start EvoTask_BeginPostSparklesSet1 +EvoTask_BeginPostSparklesSet1: @ 0x0817BF40 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0817B904 + bl SetEvoSparklesMatrices ldr r1, _0817BF6C lsls r0, r4, #2 adds r0, r0, r4 @@ -779507,11 +779507,11 @@ sub_0817BF40: @ 0x0817BF40 bx r0 .align 2, 0 _0817BF6C: .4byte gUnknown_3005B60 -_0817BF70: .4byte sub_0817BF74 - thumb_func_end sub_0817BF40 +_0817BF70: .4byte EvoTask_CreatePostEvoSparklesSet1 + thumb_func_end EvoTask_BeginPostSparklesSet1 - thumb_func_start sub_0817BF74 -sub_0817BF74: @ 0x0817BF74 + thumb_func_start EvoTask_CreatePostEvoSparklesSet1 +EvoTask_CreatePostEvoSparklesSet1: @ 0x0817BF74 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -779532,7 +779532,7 @@ _0817BF94: lsls r0, r4, #0x1c lsrs r0, r0, #0x18 movs r1, #4 - bl sub_0817BB78 + bl CreatePostEvoSparkleSet1 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -779552,7 +779552,7 @@ _0817BFBA: lsls r0, r4, #0x1c lsrs r0, r0, #0x18 movs r1, #8 - bl sub_0817BB78 + bl CreatePostEvoSparkleSet1 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -779577,19 +779577,19 @@ _0817BFE8: pop {r0} bx r0 .align 2, 0 -_0817BFF0: .4byte sub_0817BFF4 - thumb_func_end sub_0817BF74 +_0817BFF0: .4byte EvoTask_DestroyPostSet1Task + thumb_func_end EvoTask_CreatePostEvoSparklesSet1 - thumb_func_start sub_0817BFF4 -sub_0817BFF4: @ 0x0817BFF4 + thumb_func_start EvoTask_DestroyPostSet1Task +EvoTask_DestroyPostSet1Task: @ 0x0817BFF4 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817BFF4 + thumb_func_end EvoTask_DestroyPostSet1Task thumb_func_start sub_0817C004 sub_0817C004: @ 0x0817C004 @@ -779599,7 +779599,7 @@ sub_0817C004: @ 0x0817C004 lsrs r4, r4, #0x10 ldr r0, _0817C02C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817C030 @@ -779612,18 +779612,18 @@ sub_0817C004: @ 0x0817C004 pop {r1} bx r1 .align 2, 0 -_0817C02C: .4byte sub_0817C034 +_0817C02C: .4byte EvoTask_BeginPostSparklesSet2_AndFlash _0817C030: .4byte gUnknown_3005B60 thumb_func_end sub_0817C004 - thumb_func_start sub_0817C034 -sub_0817C034: @ 0x0817C034 + thumb_func_start EvoTask_BeginPostSparklesSet2_AndFlash +EvoTask_BeginPostSparklesSet2_AndFlash: @ 0x0817C034 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0817B904 + bl SetEvoSparklesMatrices ldr r0, _0817C07C lsls r5, r4, #2 adds r5, r5, r4 @@ -779641,7 +779641,7 @@ sub_0817C034: @ 0x0817C034 movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0817C090 str r0, [r5] movs r0, #0xca @@ -779656,11 +779656,11 @@ _0817C080: .4byte gUnknown_20377F4 _0817C084: .4byte gUnknown_20373F4 _0817C088: .4byte 0xFFF9041C _0817C08C: .4byte 0x00007FFF -_0817C090: .4byte sub_0817C094 - thumb_func_end sub_0817C034 +_0817C090: .4byte EvoTask_CreatePostEvoSparklesSet2_AndFlash + thumb_func_end EvoTask_BeginPostSparklesSet2_AndFlash - thumb_func_start sub_0817C094 -sub_0817C094: @ 0x0817C094 + thumb_func_start EvoTask_CreatePostEvoSparklesSet2_AndFlash +EvoTask_CreatePostEvoSparklesSet2_AndFlash: @ 0x0817C094 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -779684,7 +779684,7 @@ sub_0817C094: @ 0x0817C094 bl Random movs r1, #7 ands r0, r1 - bl sub_0817BCB0 + bl CreatePostEvoSparkleSet2 b _0817C0F4 .align 2, 0 _0817C0CC: .4byte gUnknown_3005B60 @@ -779692,7 +779692,7 @@ _0817C0D0: movs r4, #0 _0817C0D2: adds r0, r4, #0 - bl sub_0817BCB0 + bl CreatePostEvoSparkleSet2 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -779706,7 +779706,7 @@ _0817C0E4: movs r1, #0x10 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _0817C0F4: ldr r0, _0817C10C adds r1, r5, r6 @@ -779729,11 +779729,11 @@ _0817C114: pop {r0} bx r0 .align 2, 0 -_0817C11C: .4byte sub_0817C120 - thumb_func_end sub_0817C094 +_0817C11C: .4byte EvoTask_DestroyPostSet2AndFlashTask + thumb_func_end EvoTask_CreatePostEvoSparklesSet2_AndFlash - thumb_func_start sub_0817C120 -sub_0817C120: @ 0x0817C120 + thumb_func_start EvoTask_DestroyPostSet2AndFlashTask +EvoTask_DestroyPostSet2AndFlashTask: @ 0x0817C120 push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -779744,13 +779744,13 @@ sub_0817C120: @ 0x0817C120 cmp r0, #0 bne _0817C138 adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask _0817C138: pop {r0} bx r0 .align 2, 0 _0817C13C: .4byte gUnknown_2037C74 - thumb_func_end sub_0817C120 + thumb_func_end EvoTask_DestroyPostSet2AndFlashTask thumb_func_start sub_0817C140 sub_0817C140: @ 0x0817C140 @@ -779760,7 +779760,7 @@ sub_0817C140: @ 0x0817C140 lsrs r4, r4, #0x10 ldr r0, _0817C168 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817C16C @@ -779773,18 +779773,18 @@ sub_0817C140: @ 0x0817C140 pop {r1} bx r1 .align 2, 0 -_0817C168: .4byte sub_0817C170 +_0817C168: .4byte EvoTask_BeginPostSparklesSet2_AndFlash_Trade _0817C16C: .4byte gUnknown_3005B60 thumb_func_end sub_0817C140 - thumb_func_start sub_0817C170 -sub_0817C170: @ 0x0817C170 + thumb_func_start EvoTask_BeginPostSparklesSet2_AndFlash_Trade +EvoTask_BeginPostSparklesSet2_AndFlash_Trade: @ 0x0817C170 push {r4, r5, lr} sub sp, #4 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_0817B904 + bl SetEvoSparklesMatrices ldr r0, _0817C1B8 lsls r5, r4, #2 adds r5, r5, r4 @@ -779802,7 +779802,7 @@ sub_0817C170: @ 0x0817C170 movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _0817C1CC str r0, [r5] movs r0, #0xca @@ -779817,11 +779817,11 @@ _0817C1BC: .4byte gUnknown_20377F4 _0817C1C0: .4byte gUnknown_20373F4 _0817C1C4: .4byte 0xFFF90400 _0817C1C8: .4byte 0x00007FFF -_0817C1CC: .4byte sub_0817C1D0 - thumb_func_end sub_0817C170 +_0817C1CC: .4byte EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade + thumb_func_end EvoTask_BeginPostSparklesSet2_AndFlash_Trade - thumb_func_start sub_0817C1D0 -sub_0817C1D0: @ 0x0817C1D0 + thumb_func_start EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade +EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade: @ 0x0817C1D0 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -779845,7 +779845,7 @@ sub_0817C1D0: @ 0x0817C1D0 bl Random movs r1, #7 ands r0, r1 - bl sub_0817BCB0 + bl CreatePostEvoSparkleSet2 b _0817C230 .align 2, 0 _0817C208: .4byte gUnknown_3005B60 @@ -779853,7 +779853,7 @@ _0817C20C: movs r4, #0 _0817C20E: adds r0, r4, #0 - bl sub_0817BCB0 + bl CreatePostEvoSparkleSet2 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -779867,7 +779867,7 @@ _0817C220: movs r1, #0x10 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _0817C230: ldr r0, _0817C248 adds r1, r5, r6 @@ -779890,8 +779890,8 @@ _0817C250: pop {r0} bx r0 .align 2, 0 -_0817C258: .4byte sub_0817C120 - thumb_func_end sub_0817C1D0 +_0817C258: .4byte EvoTask_DestroyPostSet2AndFlashTask + thumb_func_end EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade thumb_func_start sub_0817C25C sub_0817C25C: @ 0x0817C25C @@ -779926,7 +779926,7 @@ _0817C27A: bls _0817C27A adds r0, r3, #0 movs r1, #0 - bl sub_080A8878 + bl CreateTask mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -780095,7 +780095,7 @@ sub_0817C3D0: @ 0x0817C3D0 cmp r0, #0 beq _0817C3F4 adds r0, r3, #0 - bl sub_0817C5EC + bl PreEvoVisible_PostEvoInvisible_KillTask b _0817C416 .align 2, 0 _0817C3F0: .4byte gUnknown_3005B60 @@ -780106,7 +780106,7 @@ _0817C3F4: cmp r0, #0x80 bne _0817C406 adds r0, r3, #0 - bl sub_0817C53C + bl PreEvoInvisible_PostEvoVisible_KillTask b _0817C416 _0817C406: adds r0, r1, #2 @@ -780146,7 +780146,7 @@ sub_0817C420: @ 0x0817C420 b _0817C530 .align 2, 0 _0817C444: .4byte gUnknown_3005B60 -_0817C448: .4byte sub_0817C5EC +_0817C448: .4byte PreEvoVisible_PostEvoInvisible_KillTask _0817C44C: movs r6, #0 movs r7, #0x12 @@ -780276,8 +780276,8 @@ _0817C530: _0817C538: .4byte sub_0817C3D0 thumb_func_end sub_0817C420 - thumb_func_start sub_0817C53C -sub_0817C53C: @ 0x0817C53C + thumb_func_start PreEvoInvisible_PostEvoVisible_KillTask +PreEvoInvisible_PostEvoVisible_KillTask: @ 0x0817C53C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -780355,7 +780355,7 @@ sub_0817C53C: @ 0x0817C53C rsbs r2, r2, #0 ands r2, r3 strb r2, [r1] - bl sub_080A8964 + bl DestroyTask pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -780364,10 +780364,10 @@ sub_0817C53C: @ 0x0817C53C .align 2, 0 _0817C5E4: .4byte gUnknown_20205AC _0817C5E8: .4byte gUnknown_3005B60 - thumb_func_end sub_0817C53C + thumb_func_end PreEvoInvisible_PostEvoVisible_KillTask - thumb_func_start sub_0817C5EC -sub_0817C5EC: @ 0x0817C5EC + thumb_func_start PreEvoVisible_PostEvoInvisible_KillTask +PreEvoVisible_PostEvoInvisible_KillTask: @ 0x0817C5EC push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -780445,7 +780445,7 @@ sub_0817C5EC: @ 0x0817C5EC movs r3, #4 orrs r2, r3 strb r2, [r1] - bl sub_080A8964 + bl DestroyTask pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -780454,7 +780454,7 @@ sub_0817C5EC: @ 0x0817C5EC .align 2, 0 _0817C694: .4byte gUnknown_20205AC _0817C698: .4byte gUnknown_3005B60 - thumb_func_end sub_0817C5EC + thumb_func_end PreEvoVisible_PostEvoInvisible_KillTask thumb_func_start sub_0817C69C sub_0817C69C: @ 0x0817C69C @@ -780568,8 +780568,8 @@ _0817C760: .4byte 0x0000FFFF _0817C764: .4byte gUnknown_85D2AC0 thumb_func_end sub_0817C704 - thumb_func_start sub_0817C768 -sub_0817C768: @ 0x0817C768 + thumb_func_start SetUpFieldMove_Teleport +SetUpFieldMove_Teleport: @ 0x0817C768 push {lr} ldr r0, _0817C780 ldrb r0, [r0, #0x17] @@ -780595,18 +780595,18 @@ _0817C792: bx r1 .align 2, 0 _0817C798: .4byte gUnknown_3005B10 -_0817C79C: .4byte sub_081B53D8 +_0817C79C: .4byte FieldCallback_PrepareFadeInFromMenu _0817C7A0: .4byte gUnknown_203CBB8 -_0817C7A4: .4byte sub_0817C7A8 - thumb_func_end sub_0817C768 +_0817C7A4: .4byte FieldCallback_Teleport + thumb_func_end SetUpFieldMove_Teleport - thumb_func_start sub_0817C7A8 -sub_0817C7A8: @ 0x0817C7A8 + thumb_func_start FieldCallback_Teleport +FieldCallback_Teleport: @ 0x0817C7A8 push {lr} - bl sub_08084024 + bl Overworld_ResetStateAfterTeleport movs r0, #0x3f - bl sub_080B5270 - bl sub_081B1024 + bl FieldEffectStart + bl GetCursorSelectionMonId ldr r1, _0817C7C4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -780615,12 +780615,12 @@ sub_0817C7A8: @ 0x0817C7A8 bx r0 .align 2, 0 _0817C7C4: .4byte gUnknown_20388A8 - thumb_func_end sub_0817C7A8 + thumb_func_end FieldCallback_Teleport - thumb_func_start sub_0817C7C8 -sub_0817C7C8: @ 0x0817C7C8 + thumb_func_start FldEff_UseTeleport +FldEff_UseTeleport: @ 0x0817C7C8 push {lr} - bl sub_081354CC + bl oei_task_add lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817C7F0 @@ -780639,21 +780639,21 @@ sub_0817C7C8: @ 0x0817C7C8 bx r1 .align 2, 0 _0817C7F0: .4byte gUnknown_3005B60 -_0817C7F4: .4byte sub_0817C7F8 - thumb_func_end sub_0817C7C8 +_0817C7F4: .4byte StartTeleportFieldEffect + thumb_func_end FldEff_UseTeleport - thumb_func_start sub_0817C7F8 -sub_0817C7F8: @ 0x0817C7F8 + thumb_func_start StartTeleportFieldEffect +StartTeleportFieldEffect: @ 0x0817C7F8 push {lr} movs r0, #0x3f bl FieldEffectActiveListRemove bl sub_080B7720 pop {r0} bx r0 - thumb_func_end sub_0817C7F8 + thumb_func_end StartTeleportFieldEffect - thumb_func_start sub_0817C808 -sub_0817C808: @ 0x0817C808 + thumb_func_start BattleTv_SetDataBasedOnString +BattleTv_SetDataBasedOnString: @ 0x0817C808 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -780683,24 +780683,24 @@ _0817C834: adds r7, r0, r1 ldr r5, _0817C894 ldrb r0, [r5] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _0817C898 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r0, _0817C89C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 ldr r0, _0817C8A0 ldr r0, [r0] ldrb r0, [r0, #7] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #4] @@ -780769,7 +780769,7 @@ _0817C8F8: ldr r1, _0817C944 ldr r1, [r1] ldrh r1, [r1] - bl sub_0817F1E8 + bl GetBattlerMoveSlotId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -781199,7 +781199,7 @@ _0817CF1C: beq _0817CF38 bl _0817DF52 _0817CF38: - bl sub_0817ED78 + bl TrySetBattleSeminarShow bl _0817DF52 .align 2, 0 _0817CF40: .4byte gUnknown_2022C90 @@ -781220,12 +781220,12 @@ _0817CF60: ldr r0, [sp, #0xc] movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817CF72 bl _0817DF52 _0817CF72: - bl sub_0817ED78 + bl TrySetBattleSeminarShow bl _0817DF52 .align 2, 0 _0817CF7C: .4byte gUnknown_2022C90 @@ -781740,7 +781740,7 @@ _0817D38C: ldr r0, [sp, #8] movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817D39E bl _0817DF52 @@ -781883,7 +781883,7 @@ _0817D4B4: ldr r0, [sp, #8] movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817D4C6 bl _0817DF52 @@ -781953,7 +781953,7 @@ _0817D544: ldr r0, [sp, #8] movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817D556 bl _0817DF52 @@ -782054,7 +782054,7 @@ _0817D618: ldr r0, [sp, #8] movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817D62A bl _0817DF52 @@ -782205,7 +782205,7 @@ _0817D750: ldr r0, [sp, #8] movs r1, #0x39 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817D762 bl _0817DF52 @@ -782510,7 +782510,7 @@ _0817D9AE: lsls r3, r3, #0x1c lsrs r3, r3, #0x1e movs r0, #9 - thumb_func_end sub_0817C808 + thumb_func_end BattleTv_SetDataBasedOnString thumb_func_start sub_0817D9BC sub_0817D9BC: @ 0x0817D9BC @@ -783293,8 +783293,8 @@ _0817DFA2: bx r1 thumb_func_end sub_0817DF64 - thumb_func_start sub_0817DFA8 -sub_0817DFA8: @ 0x0817DFA8 + thumb_func_start BattleTv_SetDataBasedOnMove +BattleTv_SetDataBasedOnMove: @ 0x0817DFA8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -783324,19 +783324,19 @@ _0817DFCE: ldr r2, _0817E028 mov sl, r2 ldrb r0, [r2] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 ldr r0, _0817E02C ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 mov r1, sl ldrb r0, [r1] adds r1, r7, #0 - bl sub_0817F1E8 + bl GetBattlerMoveSlotId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #3 @@ -783565,10 +783565,10 @@ _0817E1BC: _0817E1CC: .4byte gUnknown_2023D12 _0817E1D0: .4byte gUnknown_82ED220 _0817E1D4: .4byte 0x00000111 - thumb_func_end sub_0817DFA8 + thumb_func_end BattleTv_SetDataBasedOnMove - thumb_func_start sub_0817E1D8 -sub_0817E1D8: @ 0x0817E1D8 + thumb_func_start BattleTv_SetDataBasedOnAnimation +BattleTv_SetDataBasedOnAnimation: @ 0x0817E1D8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -783585,7 +783585,7 @@ sub_0817E1D8: @ 0x0817E1D8 adds r4, r0, r1 ldr r0, _0817E214 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r5, #0x12 @@ -783667,10 +783667,10 @@ _0817E29A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0817E1D8 + thumb_func_end BattleTv_SetDataBasedOnAnimation - thumb_func_start sub_0817E2A0 -sub_0817E2A0: @ 0x0817E2A0 + thumb_func_start TryPutLinkBattleTvShowOnAir +TryPutLinkBattleTvShowOnAir: @ 0x0817E2A0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -783712,7 +783712,7 @@ _0817E2E0: adds r0, r4, r0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0817E300 mov r0, r8 @@ -783725,7 +783725,7 @@ _0817E300: adds r0, r4, r5 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _0817E316 adds r0, r7, #1 @@ -783760,7 +783760,7 @@ _0817E33A: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r6, #1 @@ -783770,7 +783770,7 @@ _0817E33A: adds r0, r4, #0 movs r1, #0x2d movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817E39A movs r4, #0 @@ -783808,7 +783808,7 @@ _0817E39A: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldr r3, [sp, #8] @@ -783819,7 +783819,7 @@ _0817E39A: adds r0, r4, #0 movs r1, #0x2d movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _0817E44C movs r4, #0 @@ -783856,7 +783856,7 @@ _0817E3E0: adds r0, r0, r1 movs r1, #0x19 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 ldr r2, [sp, #0x14] mov r0, r8 @@ -783865,7 +783865,7 @@ _0817E3E0: adds r0, r0, r3 movs r1, #0x19 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 bls _0817E44C b _0817E440 @@ -783920,7 +783920,7 @@ _0817E474: adds r1, r6, #0 adds r1, #0xd movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r2, [sp, #0x1c] @@ -783940,7 +783940,7 @@ _0817E474: ldr r0, _0817E4C8 adds r0, #0x25 ldrb r0, [r0] - bl sub_0806D2C8 + bl GetLinkTrainerFlankId lsls r0, r0, #0x10 cmp r0, #0 beq _0817E4DC @@ -783953,7 +783953,7 @@ _0817E4CC: ldr r0, _0817E504 adds r0, #0x25 ldrb r0, [r0] - bl sub_0806D2C8 + bl GetLinkTrainerFlankId lsls r0, r0, #0x10 cmp r0, #0 beq _0817E51C @@ -784000,7 +784000,7 @@ _0817E51C: bx r0 .align 2, 0 _0817E52C: .4byte gUnknown_2024118 - thumb_func_end sub_0817E2A0 + thumb_func_end TryPutLinkBattleTvShowOnAir thumb_func_start AddMovePoints AddMovePoints: @ 0x0817E530 @@ -784030,12 +784030,12 @@ AddMovePoints: @ 0x0817E530 adds r7, r0, r2 ldr r0, _0817E590 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _0817E594 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r3, r0, #0x18 mov r0, sl @@ -784514,12 +784514,12 @@ AddPointsOnFainting: @ 0x0817E92C ldr r3, _0817E98C mov r8, r3 ldrb r0, [r3] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r0, _0817E990 ldrb r0, [r0] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r2, r0, #0x18 lsls r0, r4, #1 @@ -785064,8 +785064,8 @@ _0817ED68: _0817ED74: .4byte gUnknown_2023D12 thumb_func_end AddPointsOnFainting - thumb_func_start sub_0817ED78 -sub_0817ED78: @ 0x0817ED78 + thumb_func_start TrySetBattleSeminarShow +TrySetBattleSeminarShow: @ 0x0817ED78 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -785082,7 +785082,7 @@ sub_0817ED78: @ 0x0817ED78 _0817ED92: ldr r4, _0817F03C ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -785218,7 +785218,7 @@ _0817EE6E: ldrh r0, [r3] adds r1, r7, #0 mov r2, sl - bl sub_0817F0C8 + bl ShouldCalculateDamage lsls r0, r0, #0x18 cmp r0, #0 beq _0817EF60 @@ -785254,7 +785254,7 @@ _0817EE6E: mov r6, sb ldrb r4, [r6] str r4, [sp, #0xc] - bl sub_080690BC + bl CalculateBaseDamage adds r3, r0, #0 ldr r4, _0817F060 str r3, [r4] @@ -785304,7 +785304,7 @@ _0817EF38: ldrb r1, [r6] mov r3, sb ldrb r2, [r3] - bl sub_08047224 + bl TypeCalc lsls r0, r0, #0x18 lsrs r1, r0, #0x18 ldr r0, _0817F060 @@ -785389,7 +785389,7 @@ _0817EFC6: adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 @@ -785405,7 +785405,7 @@ _0817EFC6: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 @@ -785482,10 +785482,10 @@ _0817F0B8: .4byte gUnknown_2023E94 _0817F0BC: .4byte gUnknown_2024154 _0817F0C0: .4byte gUnknown_2023EAF _0817F0C4: .4byte gUnknown_2023E8E - thumb_func_end sub_0817ED78 + thumb_func_end TrySetBattleSeminarShow - thumb_func_start sub_0817F0C8 -sub_0817F0C8: @ 0x0817F0C8 + thumb_func_start ShouldCalculateDamage +ShouldCalculateDamage: @ 0x0817F0C8 push {r4, r5, r6, r7, lr} adds r6, r1, #0 mov ip, r2 @@ -785560,7 +785560,7 @@ _0817F14C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0817F0C8 + thumb_func_end ShouldCalculateDamage thumb_func_start BattleTv_ClearExplosionFaintCause BattleTv_ClearExplosionFaintCause: @ 0x0817F154 @@ -785637,15 +785637,15 @@ _0817F1E0: .4byte 0x0000025B _0817F1E4: .4byte 0x00000267 thumb_func_end BattleTv_ClearExplosionFaintCause - thumb_func_start sub_0817F1E8 -sub_0817F1E8: @ 0x0817F1E8 + thumb_func_start GetBattlerMoveSlotId +GetBattlerMoveSlotId: @ 0x0817F1E8 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 lsls r1, r1, #0x10 lsrs r7, r1, #0x10 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 ldr r6, _0817F20C cmp r0, #0 @@ -785673,7 +785673,7 @@ _0817F21A: adds r1, r4, #0 adds r1, #0xd movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r0, r7 bne _0817F218 _0817F234: @@ -785683,7 +785683,7 @@ _0817F234: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0817F1E8 + thumb_func_end GetBattlerMoveSlotId thumb_func_start AddPointsBasedOnWeather AddPointsBasedOnWeather: @ 0x0817F240 @@ -785808,8 +785808,8 @@ sub_0817F29C: @ 0x0817F29C bx r0 thumb_func_end sub_0817F29C - thumb_func_start sub_0817F320 -sub_0817F320: @ 0x0817F320 + thumb_func_start GetSpeciesBackAnimSet +GetSpeciesBackAnimSet: @ 0x0817F320 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -785830,10 +785830,10 @@ _0817F33E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0817F320 + thumb_func_end GetSpeciesBackAnimSet - thumb_func_start sub_0817F344 -sub_0817F344: @ 0x0817F344 + thumb_func_start Task_HandleMonAnimation +Task_HandleMonAnimation: @ 0x0817F344 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -785906,7 +785906,7 @@ _0817F3B4: strh r0, [r3, #0x32] strh r2, [r3, #0x30] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _0817F3D4: pop {r3} mov r8, r3 @@ -785918,17 +785918,17 @@ _0817F3E0: .4byte gUnknown_3005B60 _0817F3E4: .4byte sub_08007140 _0817F3E8: .4byte gUnknown_85D34E8 _0817F3EC: .4byte gUnknown_3001274 - thumb_func_end sub_0817F344 + thumb_func_end Task_HandleMonAnimation - thumb_func_start sub_0817F3F0 -sub_0817F3F0: @ 0x0817F3F0 + thumb_func_start LaunchAnimationTaskForFrontSprite +LaunchAnimationTaskForFrontSprite: @ 0x0817F3F0 push {r4, r5, lr} adds r5, r0, #0 lsls r4, r1, #0x18 lsrs r4, r4, #0x18 ldr r0, _0817F41C movs r1, #0x80 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0817F420 @@ -785944,9 +785944,9 @@ sub_0817F3F0: @ 0x0817F3F0 pop {r0} bx r0 .align 2, 0 -_0817F41C: .4byte sub_0817F344 +_0817F41C: .4byte Task_HandleMonAnimation _0817F420: .4byte gUnknown_3005B60 - thumb_func_end sub_0817F3F0 + thumb_func_end LaunchAnimationTaskForFrontSprite thumb_func_start StartMonSummaryAnimation StartMonSummaryAnimation: @ 0x0817F424 @@ -785965,15 +785965,15 @@ _0817F438: .4byte gUnknown_3001274 _0817F43C: .4byte gUnknown_85D34E8 thumb_func_end StartMonSummaryAnimation - thumb_func_start sub_0817F440 -sub_0817F440: @ 0x0817F440 + thumb_func_start LaunchAnimationTaskForBackSprite +LaunchAnimationTaskForBackSprite: @ 0x0817F440 push {r4, r5, r6, lr} adds r5, r0, #0 lsls r6, r1, #0x18 lsrs r6, r6, #0x18 ldr r0, _0817F4A0 movs r1, #0x80 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _0817F4A4 @@ -785994,7 +785994,7 @@ sub_0817F440: @ 0x0817F440 muls r0, r1, r0 ldr r1, _0817F4AC adds r0, r0, r1 - bl sub_0806CB34 + bl GetNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r6, #1 @@ -786013,13 +786013,13 @@ sub_0817F440: @ 0x0817F440 pop {r0} bx r0 .align 2, 0 -_0817F4A0: .4byte sub_0817F344 +_0817F4A0: .4byte Task_HandleMonAnimation _0817F4A4: .4byte gUnknown_3005B60 _0817F4A8: .4byte gUnknown_2023D12 _0817F4AC: .4byte gUnknown_2024190 _0817F4B0: .4byte gUnknown_85D378F _0817F4B4: .4byte gUnknown_85D3744 - thumb_func_end sub_0817F440 + thumb_func_end LaunchAnimationTaskForBackSprite thumb_func_start sub_0817F4B8 sub_0817F4B8: @ 0x0817F4B8 @@ -786030,8 +786030,8 @@ sub_0817F4B8: @ 0x0817F4B8 _0817F4C0: .4byte sub_0817F298 thumb_func_end sub_0817F4B8 - thumb_func_start sub_0817F4C4 -sub_0817F4C4: @ 0x0817F4C4 + thumb_func_start SetAffineData +SetAffineData: @ 0x0817F4C4 push {r4, r5, lr} sub sp, #0x10 lsls r1, r1, #0x10 @@ -786073,10 +786073,10 @@ sub_0817F4C4: @ 0x0817F4C4 .align 2, 0 _0817F514: .4byte 0xFFFF0000 _0817F518: .4byte gUnknown_2021B3C - thumb_func_end sub_0817F4C4 + thumb_func_end SetAffineData - thumb_func_start sub_0817F51C -sub_0817F51C: @ 0x0817F51C + thumb_func_start HandleStartAffineAnim +HandleStartAffineAnim: @ 0x0817F51C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #1] @@ -786125,7 +786125,7 @@ _0817F55C: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0817F51C + thumb_func_end HandleStartAffineAnim thumb_func_start HandleSetAffineData HandleSetAffineData: @ 0x0817F580 @@ -786153,7 +786153,7 @@ _0817F5A4: lsls r2, r2, #0x10 asrs r2, r2, #0x10 adds r0, r4, #0 - bl sub_0817F4C4 + bl SetAffineData pop {r4, r5} pop {r0} bx r0 @@ -786303,8 +786303,8 @@ _0817F6AC: .align 2, 0 thumb_func_end sub_0817F628 - thumb_func_start sub_0817F6B4 -sub_0817F6B4: @ 0x0817F6B4 + thumb_func_start pokemonanimfunc_01 +pokemonanimfunc_01: @ 0x0817F6B4 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #0x32 @@ -786312,7 +786312,7 @@ sub_0817F6B4: @ 0x0817F6B4 cmp r0, #0 bne _0817F6C6 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _0817F6C6: movs r1, #0x32 ldrsh r0, [r6, r1] @@ -786374,7 +786374,7 @@ _0817F738: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0817F6B4 + thumb_func_end pokemonanimfunc_01 thumb_func_start sub_0817F744 sub_0817F744: @ 0x0817F744 @@ -786651,8 +786651,8 @@ pokemonanimfunc_1E: @ 0x0817F918 _0817F930: .4byte sub_0817F8A0 thumb_func_end pokemonanimfunc_1E - thumb_func_start sub_0817F934 -sub_0817F934: @ 0x0817F934 + thumb_func_start pokemonanimfunc_06 +pokemonanimfunc_06: @ 0x0817F934 push {r4, lr} adds r4, r0, #0 movs r0, #0x32 @@ -786772,10 +786772,10 @@ _0817FA02: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0817F934 + thumb_func_end pokemonanimfunc_06 - thumb_func_start sub_0817FA10 -sub_0817FA10: @ 0x0817FA10 + thumb_func_start pokemonanimfunc_09 +pokemonanimfunc_09: @ 0x0817FA10 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #0x32 @@ -786783,7 +786783,7 @@ sub_0817FA10: @ 0x0817FA10 cmp r0, #0 bne _0817FA22 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _0817FA22: movs r1, #0x32 ldrsh r0, [r6, r1] @@ -786868,7 +786868,7 @@ _0817FABE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0817FA10 + thumb_func_end pokemonanimfunc_09 thumb_func_start sub_0817FACC sub_0817FACC: @ 0x0817FACC @@ -786957,8 +786957,8 @@ _0817FB6A: bx r0 thumb_func_end sub_0817FACC - thumb_func_start sub_0817FB70 -sub_0817FB70: @ 0x0817FB70 + thumb_func_start pokemonanimfunc_0A +pokemonanimfunc_0A: @ 0x0817FB70 push {r4, lr} adds r4, r0, #0 bl sub_0817FACC @@ -786969,7 +786969,7 @@ sub_0817FB70: @ 0x0817FB70 bx r0 .align 2, 0 _0817FB84: .4byte sub_0817FACC - thumb_func_end sub_0817FB70 + thumb_func_end pokemonanimfunc_0A thumb_func_start sub_0817FB88 sub_0817FB88: @ 0x0817FB88 @@ -787089,8 +787089,8 @@ pokemonanimfunc_10: @ 0x0817FC34 _0817FC4C: .4byte sub_0817FBF0 thumb_func_end pokemonanimfunc_10 - thumb_func_start sub_0817FC50 -sub_0817FC50: @ 0x0817FC50 + thumb_func_start pokemonanimfunc_11 +pokemonanimfunc_11: @ 0x0817FC50 push {r4, r5, r6, r7, lr} adds r7, r0, #0 ldrh r2, [r7, #0x32] @@ -787162,7 +787162,7 @@ _0817FCD0: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0817FC50 + thumb_func_end pokemonanimfunc_11 thumb_func_start sub_0817FCDC sub_0817FCDC: @ 0x0817FCDC @@ -787194,7 +787194,7 @@ _0817FD00: cmp r0, #0 bne _0817FD1C adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r5, #8] adds r0, #1 strh r0, [r5, #8] @@ -787316,7 +787316,7 @@ sub_0817FDE8: @ 0x0817FDE8 cmp r0, #0 bne _0817FE00 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _0817FE00: movs r2, #0x32 ldrsh r6, [r4, r2] @@ -787507,8 +787507,8 @@ _0817FF74: .4byte gUnknown_3001240 _0817FF78: .4byte sub_0817FE9C thumb_func_end pokemonanimfunc_14 - thumb_func_start sub_0817FF7C -sub_0817FF7C: @ 0x0817FF7C + thumb_func_start pokemonanimfunc_15 +pokemonanimfunc_15: @ 0x0817FF7C push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -787558,10 +787558,10 @@ _0817FFD4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0817FF7C + thumb_func_end pokemonanimfunc_15 - thumb_func_start sub_0817FFE0 -sub_0817FFE0: @ 0x0817FFE0 + thumb_func_start pokemonanimfunc_16 +pokemonanimfunc_16: @ 0x0817FFE0 push {r4, r5, r6, r7, lr} adds r6, r0, #0 movs r7, #0 @@ -787570,7 +787570,7 @@ sub_0817FFE0: @ 0x0817FFE0 cmp r0, #0 bne _0817FFF4 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _0817FFF4: ldrh r5, [r6, #0x32] movs r2, #0x32 @@ -787659,7 +787659,7 @@ _08180090: ldrsh r2, [r6, r0] adds r0, r6, #0 movs r3, #0 - bl sub_0817F4C4 + bl SetAffineData _081800B0: ldrh r0, [r6, #0x32] adds r0, #1 @@ -787667,10 +787667,10 @@ _081800B0: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0817FFE0 + thumb_func_end pokemonanimfunc_16 - thumb_func_start sub_081800BC -sub_081800BC: @ 0x081800BC + thumb_func_start pokemonanimfunc_17 +pokemonanimfunc_17: @ 0x081800BC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -787683,7 +787683,7 @@ sub_081800BC: @ 0x081800BC cmp r0, #0 bne _081800D8 adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _081800D8: ldrh r6, [r5, #0x32] movs r2, #0x32 @@ -787792,7 +787792,7 @@ _0818019C: ldrsh r2, [r5, r0] adds r0, r5, #0 movs r3, #0 - bl sub_0817F4C4 + bl SetAffineData _081801B6: ldrh r0, [r5, #0x32] adds r0, #1 @@ -787803,7 +787803,7 @@ _081801B6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081800BC + thumb_func_end pokemonanimfunc_17 thumb_func_start sub_081801C8 sub_081801C8: @ 0x081801C8 @@ -787893,8 +787893,8 @@ pokemonanimfunc_19: @ 0x0818024C _08180264: .4byte sub_081801C8 thumb_func_end pokemonanimfunc_19 - thumb_func_start sub_08180268 -sub_08180268: @ 0x08180268 + thumb_func_start pokemonanimfunc_1A +pokemonanimfunc_1A: @ 0x08180268 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -787907,7 +787907,7 @@ sub_08180268: @ 0x08180268 cmp r0, #0 bne _08180286 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _08180286: movs r1, #0x32 ldrsh r0, [r4, r1] @@ -787983,10 +787983,10 @@ _0818030A: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08180268 + thumb_func_end pokemonanimfunc_1A - thumb_func_start sub_08180320 -sub_08180320: @ 0x08180320 + thumb_func_start pokemonanimfunc_1B +pokemonanimfunc_1B: @ 0x08180320 push {r4, r5, r6, lr} adds r6, r0, #0 movs r1, #0x32 @@ -787994,7 +787994,7 @@ sub_08180320: @ 0x08180320 cmp r0, #0 bne _08180332 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _08180332: movs r1, #0x32 ldrsh r0, [r6, r1] @@ -788049,7 +788049,7 @@ _08180394: bx r0 .align 2, 0 _081803A0: .4byte 0x00000CCC - thumb_func_end sub_08180320 + thumb_func_end pokemonanimfunc_1B thumb_func_start sub_081803A4 sub_081803A4: @ 0x081803A4 @@ -788061,7 +788061,7 @@ sub_081803A4: @ 0x081803A4 cmp r0, #0 bne _081803B8 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _081803B8: movs r1, #0x32 ldrsh r0, [r6, r1] @@ -788154,7 +788154,7 @@ sub_0818045C: @ 0x0818045C cmp r0, #0 bne _08180470 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _08180470: movs r2, #0x32 ldrsh r0, [r6, r2] @@ -788242,8 +788242,8 @@ pokemonanimfunc_18: @ 0x08180500 _08180518: .4byte sub_0818045C thumb_func_end pokemonanimfunc_18 - thumb_func_start sub_0818051C -sub_0818051C: @ 0x0818051C + thumb_func_start pokemonanimfunc_1D +pokemonanimfunc_1D: @ 0x0818051C push {r4, r5, r6, lr} adds r6, r0, #0 bl sub_0817F5B8 @@ -788253,7 +788253,7 @@ sub_0818051C: @ 0x0818051C cmp r0, #0 bne _08180534 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _08180534: movs r1, #0x32 ldrsh r0, [r6, r1] @@ -788318,7 +788318,7 @@ _081805A8: bx r0 .align 2, 0 _081805BC: .4byte 0x00000CCC - thumb_func_end sub_0818051C + thumb_func_end pokemonanimfunc_1D thumb_func_start sub_081805C0 sub_081805C0: @ 0x081805C0 @@ -788330,7 +788330,7 @@ sub_081805C0: @ 0x081805C0 cmp r0, #0 bne _081805D6 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r6, [r4, #0x34] _081805D6: adds r0, r4, #0 @@ -788558,7 +788558,7 @@ pokemonanimfunc_13: @ 0x08180784 cmp r0, #0 bne _0818079E adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #3 strh r0, [r4, #0x3c] movs r0, #8 @@ -788622,7 +788622,7 @@ sub_081807AC: @ 0x081807AC cmp r0, #0 bne _08180818 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -788824,8 +788824,8 @@ _08180994: _081809A0: .4byte 0x000002DF thumb_func_end sub_08180938 - thumb_func_start sub_081809A4 -sub_081809A4: @ 0x081809A4 + thumb_func_start pokemonanimfunc_21 +pokemonanimfunc_21: @ 0x081809A4 push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -788875,10 +788875,10 @@ _081809FC: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081809A4 + thumb_func_end pokemonanimfunc_21 - thumb_func_start sub_08180A08 -sub_08180A08: @ 0x08180A08 + thumb_func_start pokemonanimfunc_22 +pokemonanimfunc_22: @ 0x08180A08 push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -788931,7 +788931,7 @@ _08180A62: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08180A08 + thumb_func_end pokemonanimfunc_22 thumb_func_start sub_08180A70 sub_08180A70: @ 0x08180A70 @@ -788989,8 +788989,8 @@ _08180ACC: _08180AD8: .4byte 0x000003FF thumb_func_end sub_08180A70 - thumb_func_start sub_08180ADC -sub_08180ADC: @ 0x08180ADC + thumb_func_start pokemonanimfunc_24 +pokemonanimfunc_24: @ 0x08180ADC push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -789043,13 +789043,13 @@ _08180B38: bx r0 .align 2, 0 _08180B44: .4byte 0x00006018 - thumb_func_end sub_08180ADC + thumb_func_end pokemonanimfunc_24 - thumb_func_start sub_08180B48 -sub_08180B48: @ 0x08180B48 + thumb_func_start pokemonanimfunc_25 +pokemonanimfunc_25: @ 0x08180B48 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldr r0, _08180B5C str r0, [r4, #0x1c] pop {r4} @@ -789057,7 +789057,7 @@ sub_08180B48: @ 0x08180B48 bx r0 .align 2, 0 _08180B5C: .4byte sub_08180B60 - thumb_func_end sub_08180B48 + thumb_func_end pokemonanimfunc_25 thumb_func_start sub_08180B60 sub_08180B60: @ 0x08180B60 @@ -789285,7 +789285,7 @@ _08180D04: .4byte sub_08184C34 pokemonanimfunc_26: @ 0x08180D08 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0 strh r0, [r4, #0x34] ldr r0, _08180D20 @@ -789508,11 +789508,11 @@ _08180EAA: _08180EB4: .4byte sub_08184C34 thumb_func_end pokemonanimfunc_27 - thumb_func_start sub_08180EB8 -sub_08180EB8: @ 0x08180EB8 + thumb_func_start pokemonanimfunc_28 +pokemonanimfunc_28: @ 0x08180EB8 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldr r0, _08180ECC str r0, [r4, #0x1c] pop {r4} @@ -789520,7 +789520,7 @@ sub_08180EB8: @ 0x08180EB8 bx r0 .align 2, 0 _08180ECC: .4byte sub_08180ED0 - thumb_func_end sub_08180EB8 + thumb_func_end pokemonanimfunc_28 thumb_func_start sub_08180ED0 sub_08180ED0: @ 0x08180ED0 @@ -789631,11 +789631,11 @@ _08180F94: _08180FA0: .4byte sub_08184C34 thumb_func_end sub_08180F70 - thumb_func_start sub_08180FA4 -sub_08180FA4: @ 0x08180FA4 + thumb_func_start pokemonanimfunc_29 +pokemonanimfunc_29: @ 0x08180FA4 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldr r0, _08180FB8 str r0, [r4, #0x1c] pop {r4} @@ -789643,7 +789643,7 @@ sub_08180FA4: @ 0x08180FA4 bx r0 .align 2, 0 _08180FB8: .4byte sub_08180FBC - thumb_func_end sub_08180FA4 + thumb_func_end pokemonanimfunc_29 thumb_func_start sub_08180FBC sub_08180FBC: @ 0x08180FBC @@ -789811,7 +789811,7 @@ _081810E4: adds r0, #1 strh r0, [r4, #0x32] adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r2, #0x2e ldrsh r1, [r4, r2] lsls r0, r1, #1 @@ -789950,7 +789950,7 @@ _081811FC: .4byte sub_08184C34 pokemonanimfunc_2B: @ 0x08181200 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0 strh r0, [r4, #0x3a] strh r0, [r4, #0x3c] @@ -790047,8 +790047,8 @@ _081812BC: .4byte 0xFFFFFF00 _081812C0: .4byte sub_08184C34 thumb_func_end sub_0818121C - thumb_func_start sub_081812C4 -sub_081812C4: @ 0x081812C4 + thumb_func_start pokemonanimfunc_2C +pokemonanimfunc_2C: @ 0x081812C4 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x32] @@ -790143,7 +790143,7 @@ _0818137A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081812C4 + thumb_func_end pokemonanimfunc_2C thumb_func_start sub_08181380 sub_08181380: @ 0x08181380 @@ -790154,7 +790154,7 @@ sub_08181380: @ 0x08181380 cmp r0, #0 bne _08181392 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _08181392: adds r0, r6, #0 bl sub_0817F5B8 @@ -790280,7 +790280,7 @@ sub_08181480: @ 0x08181480 cmp r0, #0 bne _08181492 adds r0, r6, #0 - bl sub_0817F51C + bl HandleStartAffineAnim _08181492: adds r0, r6, #0 bl sub_0817F5B8 @@ -790398,11 +790398,11 @@ _08181578: .4byte gUnknown_3001240 _0818157C: .4byte sub_08181480 thumb_func_end pokemonanimfunc_2E - thumb_func_start sub_08181580 -sub_08181580: @ 0x08181580 + thumb_func_start pokemonanimfunc_2F +pokemonanimfunc_2F: @ 0x08181580 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim adds r0, r4, #0 adds r0, #0x28 movs r1, #0 @@ -790423,7 +790423,7 @@ sub_08181580: @ 0x08181580 bx r0 .align 2, 0 _081815B0: .4byte sub_081815B4 - thumb_func_end sub_08181580 + thumb_func_end pokemonanimfunc_2F thumb_func_start sub_081815B4 sub_081815B4: @ 0x081815B4 @@ -790585,7 +790585,7 @@ _081816E0: cmp r0, #0 bne _081816F6 adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r6, [r5, #0x36] strh r6, [r5, #0x38] movs r0, #1 @@ -790751,8 +790751,8 @@ _08181838: .4byte gUnknown_3001240 _0818183C: .4byte sub_081816BC thumb_func_end pokemonanimfunc_30 - thumb_func_start sub_08181840 -sub_08181840: @ 0x08181840 + thumb_func_start pokemonanimfunc_31 +pokemonanimfunc_31: @ 0x08181840 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x32 @@ -790883,7 +790883,7 @@ _0818190E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08181840 + thumb_func_end pokemonanimfunc_31 thumb_func_start pokemonanimfunc_32 pokemonanimfunc_32: @ 0x08181924 @@ -790902,7 +790902,7 @@ pokemonanimfunc_32: @ 0x08181924 ldr r0, _08181960 strh r0, [r1, #8] adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r5, [r4, #0x34] adds r0, r4, #0 bl sub_08181968 @@ -791216,7 +791216,7 @@ sub_08181B94: @ 0x08181B94 cmp r0, #0 bne _08181BAC adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -791333,8 +791333,8 @@ _08181C88: .4byte gUnknown_3001240 _08181C8C: .4byte sub_08181B94 thumb_func_end pokemonanimfunc_33 - thumb_func_start sub_08181C90 -sub_08181C90: @ 0x08181C90 + thumb_func_start pokemonanimfunc_34 +pokemonanimfunc_34: @ 0x08181C90 push {r4, lr} adds r4, r0, #0 movs r1, #0x32 @@ -791342,7 +791342,7 @@ sub_08181C90: @ 0x08181C90 cmp r0, #0 bne _08181CA8 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -791415,7 +791415,7 @@ _08181D36: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08181C90 + thumb_func_end pokemonanimfunc_34 thumb_func_start pokemonanimfunc_35 pokemonanimfunc_35: @ 0x08181D3C @@ -791481,7 +791481,7 @@ _08181DA0: .4byte sub_08184C34 pokemonanimfunc_36: @ 0x08181DA4 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0 strh r0, [r4, #0x3c] ldr r0, _08181DBC @@ -791633,8 +791633,8 @@ _08181EAA: bx r0 thumb_func_end sub_08181E6C - thumb_func_start sub_08181EC8 -sub_08181EC8: @ 0x08181EC8 + thumb_func_start pokemonanimfunc_37 +pokemonanimfunc_37: @ 0x08181EC8 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x32 @@ -791642,7 +791642,7 @@ sub_08181EC8: @ 0x08181EC8 cmp r5, #0 bne _08181EE2 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -791730,13 +791730,13 @@ _08181F5E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08181EC8 + thumb_func_end pokemonanimfunc_37 thumb_func_start pokemonanimfunc_38 pokemonanimfunc_38: @ 0x08181F8C push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0 strh r0, [r4, #0x3c] strh r0, [r4, #0x36] @@ -791968,8 +791968,8 @@ _0818213A: .align 2, 0 thumb_func_end sub_081820F4 - thumb_func_start sub_0818215C -sub_0818215C: @ 0x0818215C + thumb_func_start pokemonanimfunc_39 +pokemonanimfunc_39: @ 0x0818215C push {r4, r5, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -792068,10 +792068,10 @@ _08182208: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818215C + thumb_func_end pokemonanimfunc_39 - thumb_func_start sub_0818221C -sub_0818221C: @ 0x0818221C + thumb_func_start pokemonanimfunc_3A +pokemonanimfunc_3A: @ 0x0818221C push {r4, r5, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -792080,7 +792080,7 @@ sub_0818221C: @ 0x0818221C cmp r5, #0 bne _0818223E adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r5, [r4, #0x38] strh r5, [r4, #0x3a] strh r5, [r4, #0x3c] @@ -792222,10 +792222,10 @@ _08182340: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0818221C + thumb_func_end pokemonanimfunc_3A - thumb_func_start sub_0818234C -sub_0818234C: @ 0x0818234C + thumb_func_start pokemonanimfunc_3B +pokemonanimfunc_3B: @ 0x0818234C push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x32 @@ -792233,7 +792233,7 @@ sub_0818234C: @ 0x0818234C cmp r5, #0 bne _08182366 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -792309,10 +792309,10 @@ _081823EC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818234C + thumb_func_end pokemonanimfunc_3B - thumb_func_start sub_081823F4 -sub_081823F4: @ 0x081823F4 + thumb_func_start pokemonanimfunc_3C +pokemonanimfunc_3C: @ 0x081823F4 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x32 @@ -792320,7 +792320,7 @@ sub_081823F4: @ 0x081823F4 cmp r5, #0 bne _0818240E adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -792384,13 +792384,13 @@ _08182480: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081823F4 + thumb_func_end pokemonanimfunc_3C thumb_func_start pokemonanimfunc_3D pokemonanimfunc_3D: @ 0x08182488 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldr r0, _081824A0 str r0, [r4, #0x1c] movs r0, #0 @@ -792678,7 +792678,7 @@ pokemonanimfunc_3E: @ 0x081826A8 cmp r5, #0 bne _081826CE adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -792785,7 +792785,7 @@ pokemonanimfunc_3F: @ 0x08182774 cmp r5, #0 bne _0818279A adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -792805,8 +792805,8 @@ _0818279A: .align 2, 0 thumb_func_end pokemonanimfunc_3F - thumb_func_start sub_081827A8 -sub_081827A8: @ 0x081827A8 + thumb_func_start pokemonanimfunc_40 +pokemonanimfunc_40: @ 0x081827A8 push {r4, r5, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -792815,7 +792815,7 @@ sub_081827A8: @ 0x081827A8 cmp r5, #0 bne _081827C6 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -792892,10 +792892,10 @@ _0818284A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081827A8 + thumb_func_end pokemonanimfunc_40 - thumb_func_start sub_08182858 -sub_08182858: @ 0x08182858 + thumb_func_start pokemonanimfunc_41 +pokemonanimfunc_41: @ 0x08182858 push {r4, r5, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -792904,7 +792904,7 @@ sub_08182858: @ 0x08182858 cmp r5, #0 bne _08182876 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -792989,10 +792989,10 @@ _0818290A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08182858 + thumb_func_end pokemonanimfunc_41 - thumb_func_start sub_08182918 -sub_08182918: @ 0x08182918 + thumb_func_start pokemonanimfunc_42 +pokemonanimfunc_42: @ 0x08182918 push {r4, r5, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -793001,7 +793001,7 @@ sub_08182918: @ 0x08182918 cmp r5, #0 bne _08182936 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -793082,10 +793082,10 @@ _081829C2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08182918 + thumb_func_end pokemonanimfunc_42 - thumb_func_start sub_081829D0 -sub_081829D0: @ 0x081829D0 + thumb_func_start pokemonanimfunc_43 +pokemonanimfunc_43: @ 0x081829D0 push {r4, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -793219,10 +793219,10 @@ _08182AB4: bx r0 .align 2, 0 _08182AC0: .4byte 0x000001FF - thumb_func_end sub_081829D0 + thumb_func_end pokemonanimfunc_43 - thumb_func_start sub_08182AC4 -sub_08182AC4: @ 0x08182AC4 + thumb_func_start pokemonanimfunc_44 +pokemonanimfunc_44: @ 0x08182AC4 push {r4, r5, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -793351,7 +793351,7 @@ _08182BBE: bx r0 .align 2, 0 _08182BCC: .4byte sub_08184C34 - thumb_func_end sub_08182AC4 + thumb_func_end pokemonanimfunc_44 thumb_func_start pokemonanimfunc_45 pokemonanimfunc_45: @ 0x08182BD0 @@ -793445,8 +793445,8 @@ sub_08182C60: @ 0x08182C60 .align 2, 0 thumb_func_end sub_08182C60 - thumb_func_start sub_08182C70 -sub_08182C70: @ 0x08182C70 + thumb_func_start pokemonanimfunc_4A +pokemonanimfunc_4A: @ 0x08182C70 push {lr} movs r1, #1 strh r1, [r0, #0x3a] @@ -793454,7 +793454,7 @@ sub_08182C70: @ 0x08182C70 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08182C70 + thumb_func_end pokemonanimfunc_4A thumb_func_start pokemonanimfunc_4B pokemonanimfunc_4B: @ 0x08182C80 @@ -793741,7 +793741,7 @@ pokemonanimfunc_56: @ 0x08182E64 movs r0, #2 strh r0, [r1, #4] adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r5, [r4, #0x34] adds r0, r4, #0 bl sub_08181968 @@ -794009,8 +794009,8 @@ pokemonanimfunc_58: @ 0x08183060 _0818307C: .4byte sub_08182FEC thumb_func_end pokemonanimfunc_58 - thumb_func_start sub_08183080 -sub_08183080: @ 0x08183080 + thumb_func_start pokemonanimfunc_66 +pokemonanimfunc_66: @ 0x08183080 push {r4, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -794143,7 +794143,7 @@ _08183168: pop {r4} pop {r0} bx r0 - thumb_func_end sub_08183080 + thumb_func_end pokemonanimfunc_66 thumb_func_start sub_08183174 sub_08183174: @ 0x08183174 @@ -794278,7 +794278,7 @@ _0818323E: asrs r2, r2, #0x10 adds r0, r6, #0 movs r3, #0 - bl sub_0817F4C4 + bl SetAffineData ldrh r0, [r6, #0x38] adds r0, #1 strh r0, [r6, #0x38] @@ -794302,7 +794302,7 @@ pokemonanimfunc_5A: @ 0x08183294 movs r4, #1 strh r4, [r5, #0x32] adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r4, [r5, #0x36] movs r0, #0x28 strh r0, [r5, #0x3a] @@ -794454,7 +794454,7 @@ _081833CE: lsls r2, r2, #1 adds r0, r6, #0 movs r3, #0 - bl sub_0817F4C4 + bl SetAffineData ldrh r0, [r6, #0x38] adds r0, #1 strh r0, [r6, #0x38] @@ -794478,7 +794478,7 @@ pokemonanimfunc_5B: @ 0x081833F0 movs r4, #1 strh r4, [r5, #0x32] adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r4, [r5, #0x36] movs r0, #0x28 strh r0, [r5, #0x3a] @@ -794693,8 +794693,8 @@ _08183576: bx r0 thumb_func_end sub_08183520 - thumb_func_start sub_08183584 -sub_08183584: @ 0x08183584 + thumb_func_start pokemonanimfunc_60 +pokemonanimfunc_60: @ 0x08183584 push {r4, r5, lr} adds r4, r0, #0 ldrh r1, [r4, #0x32] @@ -794746,7 +794746,7 @@ _081835DA: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08183584 + thumb_func_end pokemonanimfunc_60 thumb_func_start pokemonanimfunc_61 pokemonanimfunc_61: @ 0x081835E8 @@ -794995,7 +794995,7 @@ _08183796: asrs r2, r2, #0x10 adds r0, r7, #0 movs r3, #0 - bl sub_0817F4C4 + bl SetAffineData ldrh r0, [r7, #0x38] adds r0, #1 strh r0, [r7, #0x38] @@ -795021,7 +795021,7 @@ pokemonanimfunc_65: @ 0x081837E8 movs r4, #1 strh r4, [r5, #0x32] adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r4, [r5, #0x36] movs r0, #0x28 strh r0, [r5, #0x3a] @@ -795173,8 +795173,8 @@ _08183900: bx r0 thumb_func_end sub_08183818 - thumb_func_start sub_0818390C -sub_0818390C: @ 0x0818390C + thumb_func_start pokemonanimfunc_67 +pokemonanimfunc_67: @ 0x0818390C push {r4, lr} adds r4, r0, #0 bl sub_0817F5B8 @@ -795301,7 +795301,7 @@ _081839EC: pop {r4} pop {r0} bx r0 - thumb_func_end sub_0818390C + thumb_func_end pokemonanimfunc_67 thumb_func_start sub_081839F8 sub_081839F8: @ 0x081839F8 @@ -795536,7 +795536,7 @@ pokemonanimfunc_6B: @ 0x08183B9C cmp r5, #0 bne _08183BC2 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -795565,7 +795565,7 @@ pokemonanimfunc_6C: @ 0x08183BD4 cmp r5, #0 bne _08183BFA adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -795593,7 +795593,7 @@ pokemonanimfunc_6D: @ 0x08183C0C cmp r5, #0 bne _08183C34 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -795622,7 +795622,7 @@ pokemonanimfunc_6E: @ 0x08183C40 cmp r5, #0 bne _08183C66 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -795651,7 +795651,7 @@ pokemonanimfunc_6F: @ 0x08183C74 cmp r5, #0 bne _08183C9C adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -795680,7 +795680,7 @@ pokemonanimfunc_70: @ 0x08183CA8 cmp r5, #0 bne _08183CCE adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x32] adds r0, #1 strh r0, [r4, #0x32] @@ -795709,7 +795709,7 @@ pokemonanimfunc_71: @ 0x08183CDC cmp r0, #0 bne _08183CF6 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #5 strh r0, [r4, #0x3c] movs r0, #8 @@ -795732,7 +795732,7 @@ pokemonanimfunc_72: @ 0x08183D04 cmp r0, #0 bne _08183D1E adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #3 strh r0, [r4, #0x3c] movs r0, #4 @@ -795757,7 +795757,7 @@ pokemonanimfunc_73: @ 0x08183D2C movs r4, #1 strh r4, [r5, #0x32] adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r4, [r5, #0x36] movs r0, #0x1e strh r0, [r5, #0x3a] @@ -795784,7 +795784,7 @@ pokemonanimfunc_74: @ 0x08183D5C movs r0, #1 strh r0, [r4, #0x32] adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #2 strh r0, [r4, #0x36] movs r0, #0x14 @@ -795811,7 +795811,7 @@ pokemonanimfunc_75: @ 0x08183D8C movs r0, #1 strh r0, [r4, #0x32] adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #2 strh r0, [r4, #0x36] movs r0, #0x14 @@ -795840,7 +795840,7 @@ pokemonanimfunc_76: @ 0x08183DC0 movs r4, #1 strh r4, [r5, #0x32] adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r4, [r5, #0x36] movs r0, #0x1e strh r0, [r5, #0x3a] @@ -795867,7 +795867,7 @@ pokemonanimfunc_77: @ 0x08183DF0 movs r0, #1 strh r0, [r4, #0x32] adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #2 strh r0, [r4, #0x36] movs r0, #0x14 @@ -795896,7 +795896,7 @@ pokemonanimfunc_78: @ 0x08183E24 movs r4, #1 strh r4, [r5, #0x32] adds r0, r5, #0 - bl sub_0817F51C + bl HandleStartAffineAnim strh r4, [r5, #0x36] movs r0, #0x1e strh r0, [r5, #0x3a] @@ -796375,8 +796375,8 @@ sub_0818413C: @ 0x0818413C .align 2, 0 thumb_func_end sub_0818413C - thumb_func_start sub_08184188 -sub_08184188: @ 0x08184188 + thumb_func_start pokemonanimfunc_82 +pokemonanimfunc_82: @ 0x08184188 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x32 @@ -796384,7 +796384,7 @@ sub_08184188: @ 0x08184188 cmp r5, #0 bne _081841AC adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0x3c strh r0, [r4, #0x3c] movs r0, #8 @@ -796442,10 +796442,10 @@ _08184204: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08184188 + thumb_func_end pokemonanimfunc_82 - thumb_func_start sub_0818420C -sub_0818420C: @ 0x0818420C + thumb_func_start pokemonanimfunc_83 +pokemonanimfunc_83: @ 0x0818420C push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x32 @@ -796453,7 +796453,7 @@ sub_0818420C: @ 0x0818420C cmp r5, #0 bne _08184230 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0x5a strh r0, [r4, #0x3c] movs r0, #8 @@ -796511,10 +796511,10 @@ _08184288: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818420C + thumb_func_end pokemonanimfunc_83 - thumb_func_start sub_08184290 -sub_08184290: @ 0x08184290 + thumb_func_start pokemonanimfunc_84 +pokemonanimfunc_84: @ 0x08184290 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x32 @@ -796522,7 +796522,7 @@ sub_08184290: @ 0x08184290 cmp r5, #0 bne _081842B4 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r0, #0x1e strh r0, [r4, #0x3c] movs r0, #8 @@ -796580,7 +796580,7 @@ _0818430C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08184290 + thumb_func_end pokemonanimfunc_84 thumb_func_start sub_08184314 sub_08184314: @ 0x08184314 @@ -796706,7 +796706,7 @@ pokemonanimfunc_85: @ 0x081843FC cmp r0, #0 bne _0818441C adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x26] adds r0, #2 strh r0, [r4, #0x26] @@ -796731,7 +796731,7 @@ pokemonanimfunc_86: @ 0x08184428 cmp r0, #0 bne _08184446 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x26] adds r0, #2 strh r0, [r4, #0x26] @@ -796756,7 +796756,7 @@ pokemonanimfunc_87: @ 0x08184454 cmp r0, #0 bne _08184472 adds r0, r4, #0 - bl sub_0817F51C + bl HandleStartAffineAnim ldrh r0, [r4, #0x26] adds r0, #2 strh r0, [r4, #0x26] @@ -796928,7 +796928,7 @@ _08184594: .4byte sub_08184C34 pokemonanimfunc_88: @ 0x08184598 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r2, #0 movs r1, #4 strh r1, [r4, #0x3c] @@ -796953,7 +796953,7 @@ _081845C0: .4byte sub_08184480 pokemonanimfunc_89: @ 0x081845C4 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r2, #0 movs r1, #2 strh r1, [r4, #0x3c] @@ -796978,7 +796978,7 @@ _081845EC: .4byte sub_08184480 pokemonanimfunc_8A: @ 0x081845F0 push {r4, lr} adds r4, r0, #0 - bl sub_0817F51C + bl HandleStartAffineAnim movs r1, #0 strh r1, [r4, #0x3c] movs r0, #6 @@ -797024,8 +797024,8 @@ _0818463C: .align 2, 0 thumb_func_end sub_0818461C - thumb_func_start sub_08184644 -sub_08184644: @ 0x08184644 + thumb_func_start BackAnimBlendYellow +BackAnimBlendYellow: @ 0x08184644 push {r4, r5, lr} adds r4, r0, #0 ldr r1, _08184674 @@ -797104,7 +797104,7 @@ _081846DA: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_08184644 + thumb_func_end BackAnimBlendYellow thumb_func_start pokemonanimfunc_8B pokemonanimfunc_8B: @ 0x081846E0 @@ -797132,7 +797132,7 @@ pokemonanimfunc_8B: @ 0x081846E0 strh r3, [r2, #0x34] _0818470C: adds r0, r2, #0 - bl sub_08184644 + bl BackAnimBlendYellow pop {r4} pop {r0} bx r0 @@ -797164,7 +797164,7 @@ pokemonanimfunc_8C: @ 0x08184718 strh r4, [r2, #0x34] _08184744: adds r0, r2, #0 - bl sub_08184644 + bl BackAnimBlendYellow pop {r4, r5} pop {r0} bx r0 @@ -797197,15 +797197,15 @@ pokemonanimfunc_8D: @ 0x08184750 strh r0, [r2, #0x34] _0818477E: adds r0, r2, #0 - bl sub_08184644 + bl BackAnimBlendYellow pop {r4} pop {r0} bx r0 .align 2, 0 thumb_func_end pokemonanimfunc_8D - thumb_func_start sub_0818478C -sub_0818478C: @ 0x0818478C + thumb_func_start BackAnimBlend +BackAnimBlend: @ 0x0818478C push {r4, r5, lr} adds r4, r0, #0 movs r1, #0x32 @@ -797246,7 +797246,7 @@ _081847D6: bx r0 .align 2, 0 _081847DC: .4byte gUnknown_85D38E8 - thumb_func_end sub_0818478C + thumb_func_end BackAnimBlend thumb_func_start sub_081847E0 sub_081847E0: @ 0x081847E0 @@ -797363,7 +797363,7 @@ _081848AA: cmp r0, #0 bne _081848BA adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _081848BA: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797420,7 +797420,7 @@ _08184912: cmp r0, #0 bne _08184922 adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _08184922: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797477,7 +797477,7 @@ _0818497A: cmp r0, #0 bne _0818498A adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _0818498A: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797535,7 +797535,7 @@ _081849E4: cmp r0, #0 bne _081849F4 adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _081849F4: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797593,7 +797593,7 @@ _08184A4E: cmp r0, #0 bne _08184A5E adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _08184A5E: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797650,7 +797650,7 @@ _08184AB6: cmp r0, #0 bne _08184AC6 adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _08184AC6: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797707,7 +797707,7 @@ _08184B1E: cmp r0, #0 bne _08184B2E adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _08184B2E: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797765,7 +797765,7 @@ _08184B88: cmp r0, #0 bne _08184B98 adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _08184B98: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797824,7 +797824,7 @@ _08184BF4: cmp r0, #0 bne _08184C04 adds r0, r4, #0 - bl sub_0818478C + bl BackAnimBlend _08184C04: movs r0, #0x32 ldrsh r2, [r4, r0] @@ -797975,7 +797975,7 @@ sub_08184D04: @ 0x08184D04 bl VarGet strb r0, [r4] ldr r4, _08184D40 - bl sub_081A4D2C + bl GetFronterBrainSymbol strb r0, [r4] b _08184D50 .align 2, 0 @@ -797999,7 +797999,7 @@ _08184D50: ands r5, r0 cmp r5, #0 beq _08184DCC - bl sub_0800A02C + bl GetMultiplayerId ldr r1, _08184DC0 strb r0, [r1] movs r5, #0 @@ -798174,8 +798174,8 @@ _08184EAC: .4byte gUnknown_203C460 _08184EB0: .4byte gUnknown_203BA00 thumb_func_end RecordedBattle_ClearBattlerAction - thumb_func_start sub_08184EB4 -sub_08184EB4: @ 0x08184EB4 + thumb_func_start RecordedBattle_GetBattlerAction +RecordedBattle_GetBattlerAction: @ 0x08184EB4 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -798209,9 +798209,9 @@ _08184EDA: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _08184F18 - bl sub_08000540 + bl SetMainCallback2 movs r0, #0xff b _08184F26 .align 2, 0 @@ -798220,7 +798220,7 @@ _08184F08: .4byte 0x00000297 _08184F0C: .4byte gUnknown_203BA00 _08184F10: .4byte gUnknown_2037290 _08184F14: .4byte gUnknown_2023FDE -_08184F18: .4byte sub_080381C0 +_08184F18: .4byte CB2_QuitRecordedBattle _08184F1C: adds r0, r1, #1 strh r0, [r2] @@ -798233,7 +798233,7 @@ _08184F26: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08184EB4 + thumb_func_end RecordedBattle_GetBattlerAction thumb_func_start sub_08184F30 sub_08184F30: @ 0x08184F30 @@ -798380,7 +798380,7 @@ _08185030: adds r4, #0x1c adds r5, #1 _0818503A: - bl sub_08009B64 + bl GetLinkPlayerCount lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -798474,25 +798474,25 @@ sub_081850D8: @ 0x081850D8 .align 2, 0 thumb_func_end sub_081850D8 - thumb_func_start sub_081850F0 -sub_081850F0: @ 0x081850F0 + thumb_func_start CanCopyRecordedBattleSaveData +CanCopyRecordedBattleSaveData: @ 0x081850F0 push {r4, r5, lr} movs r0, #0xf8 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 - bl sub_08185844 + bl CopyRecordedBattleFromSave adds r5, r0, #0 adds r0, r4, #0 - bl sub_08000BF0 + bl Free adds r0, r5, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081850F0 + thumb_func_end CanCopyRecordedBattleSaveData - thumb_func_start sub_08185110 -sub_08185110: @ 0x08185110 + thumb_func_start IsRecordedBattleSaveValid +IsRecordedBattleSaveValid: @ 0x08185110 push {r4, r5, lr} adds r5, r0, #0 ldr r1, _0818513C @@ -798524,10 +798524,10 @@ _0818514A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08185110 + thumb_func_end IsRecordedBattleSaveValid - thumb_func_start sub_08185150 -sub_08185150: @ 0x08185150 + thumb_func_start RecordedBattleToSave +RecordedBattleToSave: @ 0x08185150 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -798549,7 +798549,7 @@ sub_08185150: @ 0x08185150 str r0, [r4] movs r0, #0x1f adds r1, r5, #0 - bl sub_08153570 + bl TryWriteSpecialSaveSection cmp r0, #1 bne _08185190 movs r0, #1 @@ -798562,10 +798562,10 @@ _08185192: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08185150 + thumb_func_end RecordedBattleToSave - thumb_func_start sub_08185198 -sub_08185198: @ 0x08185198 + thumb_func_start MoveRecordedBattleToSaveData +MoveRecordedBattleToSaveData: @ 0x08185198 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -798576,11 +798576,11 @@ sub_08185198: @ 0x08185198 str r0, [sp, #4] movs r0, #0xf8 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r7, r0, #0 movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed str r0, [sp] movs r6, #0 _081851BE: @@ -799324,7 +799324,7 @@ _081857AA: _081857BE: adds r0, r7, #0 ldr r1, [sp] - bl sub_08185150 + bl RecordedBattleToSave adds r4, r0, #0 cmp r4, #1 beq _081857DA @@ -799337,9 +799337,9 @@ _081857BE: bls _081857BE _081857DA: adds r0, r7, #0 - bl sub_08000BF0 + bl Free ldr r0, [sp] - bl sub_08000BF0 + bl Free adds r0, r4, #0 add sp, #0xc pop {r3, r4, r5} @@ -799356,15 +799356,15 @@ _08185800: .4byte 0x0000050D _08185804: .4byte 0x00000297 _08185808: .4byte gUnknown_203BA00 _0818580C: .4byte 0x0000051C - thumb_func_end sub_08185198 + thumb_func_end MoveRecordedBattleToSaveData - thumb_func_start sub_08185810 -sub_08185810: @ 0x08185810 + thumb_func_start TryCopyRecordedBattleSaveData +TryCopyRecordedBattleSaveData: @ 0x08185810 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 movs r0, #0x1f - bl sub_08153518 + bl TryReadSpecialSaveSection cmp r0, #1 bne _0818583A movs r2, #0xf8 @@ -799373,7 +799373,7 @@ sub_08185810: @ 0x08185810 adds r1, r4, #0 bl memcpy adds r0, r5, #0 - bl sub_08185110 + bl IsRecordedBattleSaveValid cmp r0, #0 beq _0818583A movs r0, #1 @@ -799385,31 +799385,31 @@ _0818583C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08185810 + thumb_func_end TryCopyRecordedBattleSaveData - thumb_func_start sub_08185844 -sub_08185844: @ 0x08185844 + thumb_func_start CopyRecordedBattleFromSave +CopyRecordedBattleFromSave: @ 0x08185844 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08185810 + bl TryCopyRecordedBattleSaveData adds r4, r0, #0 adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r4, #0 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08185844 + thumb_func_end CopyRecordedBattleFromSave - thumb_func_start sub_0818586C -sub_0818586C: @ 0x0818586C + thumb_func_start CB2_RecordedBattleEnd +CB2_RecordedBattleEnd: @ 0x0818586C push {lr} ldr r0, _081858B4 ldr r2, [r0] @@ -799440,7 +799440,7 @@ sub_0818586C: @ 0x0818586C bl sub_08185C54 ldr r0, _081858D4 ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -799453,10 +799453,10 @@ _081858C8: .4byte gUnknown_203886A _081858CC: .4byte gUnknown_203886C _081858D0: .4byte gUnknown_203886E _081858D4: .4byte gUnknown_203C47C - thumb_func_end sub_0818586C + thumb_func_end CB2_RecordedBattleEnd - thumb_func_start sub_081858D8 -sub_081858D8: @ 0x081858D8 + thumb_func_start Task_StartAfterCountdown +Task_StartAfterCountdown: @ 0x081858D8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -799475,9 +799475,9 @@ sub_081858D8: @ 0x081858D8 ldr r1, _08185914 str r1, [r0, #8] ldr r0, _08185918 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _08185906: pop {r4} pop {r0} @@ -799485,9 +799485,9 @@ _08185906: .align 2, 0 _0818590C: .4byte gUnknown_3005B60 _08185910: .4byte gUnknown_3002360 -_08185914: .4byte sub_0818586C -_08185918: .4byte sub_080365B4 - thumb_func_end sub_081858D8 +_08185914: .4byte CB2_RecordedBattleEnd +_08185918: .4byte CB2_InitBattle + thumb_func_end Task_StartAfterCountdown thumb_func_start sub_0818591C sub_0818591C: @ 0x0818591C @@ -799771,15 +799771,15 @@ _08185B74: .4byte gUnknown_203BA00 _08185B78: .4byte 0x0000051C thumb_func_end sub_0818591C - thumb_func_start sub_08185B7C -sub_08185B7C: @ 0x08185B7C + thumb_func_start PlayRecordedBattle +PlayRecordedBattle: @ 0x08185B7C push {r4, r5, lr} adds r5, r0, #0 movs r0, #0xf8 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 - bl sub_08185844 + bl CopyRecordedBattleFromSave cmp r0, #1 bne _08185BC6 bl sub_08185C10 @@ -799787,7 +799787,7 @@ sub_08185B7C: @ 0x08185B7C bl sub_0818591C ldr r0, _08185BD4 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08185BD8 @@ -799800,32 +799800,32 @@ sub_08185B7C: @ 0x08185B7C ldr r0, _08185BDC str r5, [r0] movs r0, #0 - bl sub_0806E0F4 + bl PlayMapChosenOrBattleBGM ldr r0, _08185BE0 - bl sub_08000540 + bl SetMainCallback2 _08185BC6: adds r0, r4, #0 - bl sub_08000BF0 + bl Free pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08185BD4: .4byte sub_081858D8 +_08185BD4: .4byte Task_StartAfterCountdown _08185BD8: .4byte gUnknown_3005B60 _08185BDC: .4byte gUnknown_203C47C -_08185BE0: .4byte sub_08185BE4 - thumb_func_end sub_08185B7C +_08185BE0: .4byte CB2_RecordedBattle + thumb_func_end PlayRecordedBattle - thumb_func_start sub_08185BE4 -sub_08185BE4: @ 0x08185BE4 + thumb_func_start CB2_RecordedBattle +CB2_RecordedBattle: @ 0x08185BE4 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer - bl sub_080A89D4 + bl RunTasks pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08185BE4 + thumb_func_end CB2_RecordedBattle thumb_func_start sub_08185BF8 sub_08185BF8: @ 0x08185BF8 @@ -799913,8 +799913,8 @@ _08185C90: .4byte gUnknown_20243E8 _08185C94: .4byte gUnknown_203C6E4 thumb_func_end sub_08185C54 - thumb_func_start sub_08185C98 -sub_08185C98: @ 0x08185C98 + thumb_func_start GetActiveBattlerLinkPlayerGender +GetActiveBattlerLinkPlayerGender: @ 0x08185C98 push {r4, r5, lr} movs r2, #0 ldr r0, _08185CC4 @@ -799952,7 +799952,7 @@ _08185CD6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08185C98 + thumb_func_end GetActiveBattlerLinkPlayerGender thumb_func_start sub_08185CDC sub_08185CDC: @ 0x08185CDC @@ -800009,12 +800009,12 @@ sub_08185D1C: @ 0x08185D1C _08185D24: .4byte gUnknown_203C483 thumb_func_end sub_08185D1C - thumb_func_start sub_08185D28 -sub_08185D28: @ 0x08185D28 + thumb_func_start RecordedBattle_CopyBattlerMoves +RecordedBattle_CopyBattlerMoves: @ 0x08185D28 push {r4, r5, r6, r7, lr} ldr r4, _08185D7C ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -800060,7 +800060,7 @@ _08185D84: .4byte gUnknown_2000002 _08185D88: .4byte gUnknown_203C478 _08185D8C: .4byte gUnknown_203C93C _08185D90: .4byte gUnknown_2023D34 - thumb_func_end sub_08185D28 + thumb_func_end RecordedBattle_CopyBattlerMoves thumb_func_start sub_08185D94 sub_08185D94: @ 0x08185D94 @@ -800092,7 +800092,7 @@ _08185DC4: lsls r4, r1, #0x18 lsrs r5, r4, #0x18 adds r0, r5, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r4, [sp, #0x4c] @@ -800201,7 +800201,7 @@ _08185E76: b _08186146 _08185E9A: adds r0, r5, #0 - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction movs r5, #0 mov r0, sp adds r0, #4 @@ -800253,7 +800253,7 @@ _08185ED6: _08185EFE: ldr r3, [sp, #0x4c] lsrs r0, r3, #0x18 - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction strb r0, [r4] ldrb r0, [r4] lsls r0, r0, #1 @@ -800407,7 +800407,7 @@ _08186022: adds r0, r0, r4 movs r1, #0x15 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp adds r3, r1, r5 lsls r2, r5, #1 @@ -800437,7 +800437,7 @@ _0818605C: ldrb r1, [r4] adds r1, #0xd movs r2, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r6] ldrh r0, [r7] mov r2, sb @@ -800447,7 +800447,7 @@ _0818605C: ldrb r1, [r4] adds r1, #0x11 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x34] adds r1, r3, r5 strb r0, [r1] @@ -800482,7 +800482,7 @@ _081860B8: adds r1, r5, #0 adds r1, #0xd adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrh r0, [r7] mov r2, sb muls r2, r0, r2 @@ -800491,7 +800491,7 @@ _081860B8: adds r1, r5, #0 adds r1, #0x11 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 adds r5, #1 @@ -800524,7 +800524,7 @@ _081860FA: adds r0, r0, r6 movs r1, #0x15 ldr r2, [sp, #0x40] - bl sub_0806A774 + bl SetMonData _08186122: ldr r2, _08186184 ldr r3, [sp, #0x44] @@ -800727,7 +800727,7 @@ _08186270: .4byte gUnknown_2023D08 _08186274: .4byte gUnknown_2022D08 _08186278: .4byte gUnknown_85D38F0 _0818627C: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186280: pop {r0} bx r0 @@ -800751,7 +800751,7 @@ sub_08186284: @ 0x08186284 ldr r0, _081862B8 cmp r1, r0 bne _081862A8 - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _081862A8: pop {r0} bx r0 @@ -800780,7 +800780,7 @@ CompleteOnBankSpriteCallbackDummy2: @ 0x081862BC ldr r0, _081862F0 cmp r1, r0 bne _081862E0 - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _081862E0: pop {r0} bx r0 @@ -800812,7 +800812,7 @@ sub_081862F4: @ 0x081862F4 bne _08186346 adds r0, r2, r5 ldrh r0, [r0, #6] - bl sub_0805DC00 + bl FreeTrainerFrontPicPalette ldrb r0, [r4] adds r0, r0, r6 ldrb r1, [r0] @@ -800829,7 +800829,7 @@ sub_081862F4: @ 0x081862F4 lsls r0, r0, #2 adds r0, r0, r5 bl DestroySprite - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186346: pop {r4, r5, r6} pop {r0} @@ -800869,7 +800869,7 @@ sub_0818635C: @ 0x0818635C adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186394: pop {r4} pop {r0} @@ -800887,11 +800887,11 @@ sub_081863A4: @ 0x081863A4 push {r6, r7} movs r0, #0 mov sb, r0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081863D0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08186424 @@ -801208,7 +801208,7 @@ _0818660A: ands r0, r1 cmp r0, #0 bne _081866C0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08186690 @@ -801233,7 +801233,7 @@ _0818660A: ldr r2, _0818675C adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] eors r0, r6 bl sub_08076320 @@ -801257,7 +801257,7 @@ _08186690: ldr r2, _0818675C adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -801304,7 +801304,7 @@ _081866DA: ands r0, r1 cmp r0, #0 bne _08186796 - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08186796 @@ -801366,7 +801366,7 @@ _08186778: movs r0, #1 mov sb, r0 _08186796: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _081867F4 @@ -801461,7 +801461,7 @@ _08186852: mov r0, r8 cmp r0, #0 beq _0818693C - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081868B6 @@ -801495,12 +801495,12 @@ _08186852: ldr r1, _08186964 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback _081868B6: ldr r1, _0818694C ldr r4, _08186950 @@ -801523,12 +801523,12 @@ _081868B6: ldr r1, _08186964 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r3, _08186968 ldr r0, [r3] ldr r2, [r0, #8] @@ -801667,7 +801667,7 @@ _081869EC: bl FreeSpriteTilesByTag adds r0, r4, #0 bl FreeSpritePaletteByTag - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186A26: pop {r4, r5, r6, r7} pop {r0} @@ -801686,7 +801686,7 @@ sub_08186A30: @ 0x08186A30 ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -801710,7 +801710,7 @@ sub_08186A30: @ 0x08186A30 _08186A70: .4byte gUnknown_2023D08 _08186A74: .4byte gUnknown_3005AD0 _08186A78: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186A7C: pop {r4, r5, r6} pop {r0} @@ -801740,7 +801740,7 @@ sub_08186A84: @ 0x08186A84 adds r0, r3, r0 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186AB2: pop {r0} bx r0 @@ -801792,7 +801792,7 @@ sub_08186AC8: @ 0x08186AC8 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186B22: pop {r4, r5, r6} pop {r0} @@ -801813,7 +801813,7 @@ sub_08186B3C: @ 0x08186B3C lsls r0, r0, #0x10 cmp r0, #0 bne _08186B4E - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186B4E: pop {r0} bx r0 @@ -801848,7 +801848,7 @@ sub_08186B54: @ 0x08186B54 strb r0, [r2] ldr r0, _08186B9C strb r3, [r0] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted b _08186BCA .align 2, 0 _08186B90: .4byte gUnknown_2023E88 @@ -801916,7 +801916,7 @@ sub_08186BD0: @ 0x08186BD0 adds r1, r3, #0 adds r2, r3, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08186C10: ldr r0, _08186C38 ldrb r1, [r4] @@ -801955,7 +801955,7 @@ sub_08186C40: @ 0x08186C40 ands r0, r1 cmp r0, #0 bne _08186C9A - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08186C9A @@ -801982,7 +801982,7 @@ _08186C8A: movs r2, #0x80 lsls r2, r2, #1 bl m4aMPlayVolumeControl - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186C9A: pop {r4} pop {r0} @@ -802072,7 +802072,7 @@ sub_08186CC0: @ 0x08186CC0 ldr r2, _08186DA4 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r5] bl sub_08076320 ldrb r0, [r5] @@ -802170,12 +802170,12 @@ _08186DE2: ldr r1, _08186E60 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r1, _08186E70 ldrb r0, [r5] lsls r0, r0, #2 @@ -802215,7 +802215,7 @@ sub_08186E78: @ 0x08186E78 ands r0, r1 cmp r0, #0 bne _08186E9A - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186E9A: pop {r0} bx r0 @@ -802241,7 +802241,7 @@ sub_08186EA8: @ 0x08186EA8 ands r0, r1 cmp r0, #0 bne _08186ECA - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08186ECA: pop {r0} bx r0 @@ -802250,8 +802250,8 @@ _08186ED0: .4byte gUnknown_2024174 _08186ED4: .4byte gUnknown_2023D08 thumb_func_end sub_08186EA8 - thumb_func_start sub_08186ED8 -sub_08186ED8: @ 0x08186ED8 + thumb_func_start RecordedOpponentBufferExecCompleted +RecordedOpponentBufferExecCompleted: @ 0x08186ED8 push {r4, lr} sub sp, #4 ldr r1, _08186F18 @@ -802267,7 +802267,7 @@ sub_08186ED8: @ 0x08186ED8 ands r0, r1 cmp r0, #0 beq _08186F2C - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -802305,10 +802305,10 @@ _08186F3E: .align 2, 0 _08186F48: .4byte gUnknown_2023D0C _08186F4C: .4byte gUnknown_82FACB4 - thumb_func_end sub_08186ED8 + thumb_func_end RecordedOpponentBufferExecCompleted - thumb_func_start sub_08186F50 -sub_08186F50: @ 0x08186F50 + thumb_func_start RecordedOpponentHandleGetMonData +RecordedOpponentHandleGetMonData: @ 0x08186F50 push {r4, r5, r6, lr} sub sp, #0x100 movs r6, #0 @@ -802357,14 +802357,14 @@ _08186FAA: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_08186ED8 + bl BtlController_EmitDataTransfer + bl RecordedOpponentBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08186F50 + thumb_func_end RecordedOpponentHandleGetMonData thumb_func_start sub_08186FC4 sub_08186FC4: @ 0x08186FC4 @@ -802467,12 +802467,12 @@ _081870F4: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -802500,12 +802500,12 @@ _08187140: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -802520,21 +802520,21 @@ _08187140: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -802546,7 +802546,7 @@ _08187140: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -802558,7 +802558,7 @@ _08187140: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -802570,7 +802570,7 @@ _08187140: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -802581,7 +802581,7 @@ _08187140: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -802592,7 +802592,7 @@ _08187140: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -802604,55 +802604,55 @@ _08187140: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -802665,7 +802665,7 @@ _08187140: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -802675,19 +802675,19 @@ _08187140: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _081872F8: @@ -802738,13 +802738,13 @@ _0818734E: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -802758,7 +802758,7 @@ _0818734E: ldr r1, _0818739C adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -802800,7 +802800,7 @@ _081873C8: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -802811,7 +802811,7 @@ _081873C8: ldr r1, _081873F4 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -802848,7 +802848,7 @@ _08187424: adds r0, r0, r1 movs r1, #0x19 _0818742E: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -802981,27 +802981,27 @@ _08187514: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _0818775A @@ -803086,7 +803086,7 @@ _081875E4: adds r0, r0, r1 movs r1, #0x37 _081875EE: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -803175,7 +803175,7 @@ _08187688: adds r0, r0, r1 movs r1, #0x3f _08187692: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -803282,7 +803282,7 @@ _08187748: adds r0, r0, r1 movs r1, #0x36 _08187752: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _0818775A: @@ -803302,7 +803302,7 @@ _0818776C: .4byte gUnknown_20243E8 thumb_func_start sub_08187770 sub_08187770: @ 0x08187770 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -803324,7 +803324,7 @@ sub_0818777C: @ 0x0818777C lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_081877D4 + bl SetRecordedOpponentMonData b _081877CA .align 2, 0 _081877A0: .4byte gUnknown_2022D08 @@ -803339,7 +803339,7 @@ _081877B0: cmp r0, #0 beq _081877BE adds r0, r5, #0 - bl sub_081877D4 + bl SetRecordedOpponentMonData _081877BE: lsrs r4, r4, #1 adds r0, r5, #1 @@ -803348,14 +803348,14 @@ _081877BE: cmp r5, #5 bls _081877B0 _081877CA: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_0818777C - thumb_func_start sub_081877D4 -sub_081877D4: @ 0x081877D4 + thumb_func_start SetRecordedOpponentMonData +SetRecordedOpponentMonData: @ 0x081877D4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -803458,12 +803458,12 @@ _08187908: adds r0, r4, #0 movs r1, #0xb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r2, r7, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -803504,12 +803504,12 @@ _0818796E: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -803525,15 +803525,15 @@ _0818796E: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r7, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -803542,7 +803542,7 @@ _0818796E: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r7, #0x14] lsls r0, r0, #0x16 @@ -803551,7 +803551,7 @@ _0818796E: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r7, #0x15] lsls r0, r0, #0x19 @@ -803560,7 +803560,7 @@ _0818796E: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r7, #0x14] lsls r0, r0, #0xc @@ -803569,7 +803569,7 @@ _0818796E: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r7, #0x16] lsls r0, r0, #0x17 @@ -803578,7 +803578,7 @@ _0818796E: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r7, #0x17] lsls r0, r0, #0x1a @@ -803587,47 +803587,47 @@ _0818796E: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187A9C: .4byte gUnknown_20243E8 @@ -803640,7 +803640,7 @@ _08187AA0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187AB8: .4byte gUnknown_20243E8 @@ -803653,7 +803653,7 @@ _08187ABC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187AD4: .4byte gUnknown_20243E8 @@ -803675,12 +803675,12 @@ _08187AF0: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -803694,7 +803694,7 @@ _08187AF0: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187B28: .4byte gUnknown_20243E8 @@ -803726,7 +803726,7 @@ _08187B4C: adds r0, r4, #0 movs r1, #0x11 str r3, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -803734,7 +803734,7 @@ _08187B4C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -803742,7 +803742,7 @@ _08187B4C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -803750,7 +803750,7 @@ _08187B4C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -803758,7 +803758,7 @@ _08187B4C: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187BB0: .4byte gUnknown_20243E8 @@ -803777,7 +803777,7 @@ _08187BB4: _08187BCA: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187BD4: .4byte gUnknown_20243E8 @@ -803791,7 +803791,7 @@ _08187BDC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187BF4: .4byte gUnknown_20243E8 @@ -803804,7 +803804,7 @@ _08187BF8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187C10: .4byte gUnknown_20243E8 @@ -803817,7 +803817,7 @@ _08187C14: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187C2C: .4byte gUnknown_20243E8 @@ -803830,7 +803830,7 @@ _08187C30: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187C48: .4byte gUnknown_20243E8 @@ -803843,7 +803843,7 @@ _08187C4C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187C64: .4byte gUnknown_20243E8 @@ -803856,7 +803856,7 @@ _08187C68: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187C80: .4byte gUnknown_20243E8 @@ -803869,7 +803869,7 @@ _08187C84: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187C9C: .4byte gUnknown_20243E8 @@ -803882,7 +803882,7 @@ _08187CA0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187CB8: .4byte gUnknown_20243E8 @@ -803895,7 +803895,7 @@ _08187CBC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187CD4: .4byte gUnknown_20243E8 @@ -803908,7 +803908,7 @@ _08187CD8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187CF0: .4byte gUnknown_20243E8 @@ -803921,7 +803921,7 @@ _08187CF4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187D0C: .4byte gUnknown_20243E8 @@ -803934,7 +803934,7 @@ _08187D10: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187D28: .4byte gUnknown_20243E8 @@ -803947,7 +803947,7 @@ _08187D2C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187D44: .4byte gUnknown_20243E8 @@ -803960,7 +803960,7 @@ _08187D48: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187D60: .4byte gUnknown_20243E8 @@ -803976,7 +803976,7 @@ _08187D64: adds r0, r4, #0 movs r1, #0x27 str r3, [sp, #0x34] - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -803984,7 +803984,7 @@ _08187D64: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -803992,7 +803992,7 @@ _08187D64: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -804000,7 +804000,7 @@ _08187D64: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -804008,7 +804008,7 @@ _08187D64: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r6] lsls r2, r2, #9 ldr r3, [sp, #0x34] @@ -804027,7 +804027,7 @@ _08187DD8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187DF0: .4byte gUnknown_20243E8 @@ -804040,7 +804040,7 @@ _08187DF4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187E0C: .4byte gUnknown_20243E8 @@ -804053,7 +804053,7 @@ _08187E10: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187E28: .4byte gUnknown_20243E8 @@ -804066,7 +804066,7 @@ _08187E2C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187E44: .4byte gUnknown_20243E8 @@ -804079,7 +804079,7 @@ _08187E48: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187E60: .4byte gUnknown_20243E8 @@ -804093,7 +804093,7 @@ _08187E64: adds r2, r2, r3 _08187E72: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187E7C: .4byte gUnknown_20243E8 @@ -804106,7 +804106,7 @@ _08187E80: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187E98: .4byte gUnknown_20243E8 @@ -804119,7 +804119,7 @@ _08187E9C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187EB4: .4byte gUnknown_20243E8 @@ -804132,7 +804132,7 @@ _08187EB8: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187ED0: .4byte gUnknown_20243E8 @@ -804145,7 +804145,7 @@ _08187ED4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187EEC: .4byte gUnknown_20243E8 @@ -804158,7 +804158,7 @@ _08187EF0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187F08: .4byte gUnknown_20243E8 @@ -804171,7 +804171,7 @@ _08187F0C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187F24: .4byte gUnknown_20243E8 @@ -804184,7 +804184,7 @@ _08187F28: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187F40: .4byte gUnknown_20243E8 @@ -804197,7 +804197,7 @@ _08187F44: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187F5C: .4byte gUnknown_20243E8 @@ -804210,7 +804210,7 @@ _08187F60: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187F78: .4byte gUnknown_20243E8 @@ -804223,7 +804223,7 @@ _08187F7C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187F94: .4byte gUnknown_20243E8 @@ -804236,7 +804236,7 @@ _08187F98: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187FB0: .4byte gUnknown_20243E8 @@ -804249,7 +804249,7 @@ _08187FB4: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187FCC: .4byte gUnknown_20243E8 @@ -804262,7 +804262,7 @@ _08187FD0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08187FE8: .4byte gUnknown_20243E8 @@ -804275,7 +804275,7 @@ _08187FEC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08188004: .4byte gUnknown_20243E8 @@ -804288,7 +804288,7 @@ _08188008: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08188020: .4byte gUnknown_20243E8 @@ -804301,7 +804301,7 @@ _08188024: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _0818803C: .4byte gUnknown_20243E8 @@ -804314,7 +804314,7 @@ _08188040: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08188058: .4byte gUnknown_20243E8 @@ -804327,7 +804327,7 @@ _0818805C: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08188074: .4byte gUnknown_20243E8 @@ -804340,7 +804340,7 @@ _08188078: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _08188090: .4byte gUnknown_20243E8 @@ -804353,7 +804353,7 @@ _08188094: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _081880AC: .4byte gUnknown_20243E8 @@ -804366,7 +804366,7 @@ _081880B0: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _081880E0 .align 2, 0 _081880C8: .4byte gUnknown_20243E8 @@ -804379,7 +804379,7 @@ _081880CC: lsls r2, r2, #9 adds r2, r2, r3 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _081880E0: add sp, #0x38 pop {r3, r4, r5} @@ -804391,7 +804391,7 @@ _081880E0: bx r0 .align 2, 0 _081880F0: .4byte gUnknown_20243E8 - thumb_func_end sub_081877D4 + thumb_func_end SetRecordedOpponentMonData thumb_func_start sub_081880F4 sub_081880F4: @ 0x081880F4 @@ -804441,7 +804441,7 @@ _0818812A: cmp r3, r0 blo _0818812A _0818814C: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -804452,8 +804452,8 @@ _08188160: .4byte gUnknown_2022D08 _08188164: .4byte gUnknown_20243E8 thumb_func_end sub_081880F4 - thumb_func_start sub_08188168 -sub_08188168: @ 0x08188168 + thumb_func_start RecordedOpponentHandleLoadMonSprite +RecordedOpponentHandleLoadMonSprite: @ 0x08188168 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -804474,7 +804474,7 @@ sub_08188168: @ 0x08188168 mov sb, r1 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -804486,19 +804486,19 @@ sub_08188168: @ 0x08188168 muls r2, r0, r2 adds r0, r2, #0 add r0, sb - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0818829C mov r8, r0 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -804515,7 +804515,7 @@ sub_08188168: @ 0x08188168 mov r0, r8 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _081882A0 ldrb r1, [r6] adds r1, r1, r4 @@ -804571,12 +804571,12 @@ sub_08188168: @ 0x08188168 adds r0, r1, #0 add r0, sb movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 - bl sub_0805EA70 + bl SetBattlerShadowSpriteCallback ldr r1, _081882B0 ldrb r0, [r6] lsls r0, r0, #2 @@ -804601,7 +804601,7 @@ _081882A8: .4byte 0x0000FF10 _081882AC: .4byte gUnknown_2024188 _081882B0: .4byte gUnknown_3005AC0 _081882B4: .4byte sub_08186974 - thumb_func_end sub_08188168 + thumb_func_end RecordedOpponentHandleLoadMonSprite thumb_func_start sub_081882B8 sub_081882B8: @ 0x081882B8 @@ -804672,13 +804672,13 @@ sub_08188304: @ 0x08188304 ldr r5, _08188474 adds r0, r0, r5 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _08188478 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _0818847C mov sl, r1 add sl, r6 @@ -804690,19 +804690,19 @@ sub_08188304: @ 0x08188304 adds r0, r1, #0 adds r0, r0, r5 adds r1, r6, #0 - bl sub_0805D828 + bl BattleLoadOpponentMonSpriteGfx adds r0, r6, #0 bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _08188480 mov sb, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -804719,7 +804719,7 @@ sub_08188304: @ 0x08188304 mov r0, sb adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _08188484 adds r4, r6, r4 strb r0, [r4] @@ -804793,7 +804793,7 @@ sub_08188304: @ 0x08188304 str r1, [r0] movs r0, #0 movs r1, #0xfe - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sl ldrb r2, [r1] lsls r1, r2, #4 @@ -804881,7 +804881,7 @@ _081884DC: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08188518: pop {r4, r5, r6} pop {r0} @@ -804925,7 +804925,7 @@ _08188554: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0818856E: ldr r0, [r6] ldrb r1, [r5] @@ -804950,7 +804950,7 @@ _08188582: adds r0, r2, #0 adds r1, r2, #0 movs r3, #2 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _081885B0 ldrb r0, [r5] lsls r0, r0, #2 @@ -804966,8 +804966,8 @@ _081885B0: .4byte gUnknown_3005AC0 _081885B4: .4byte sub_08186AC8 thumb_func_end sub_0818852C - thumb_func_start sub_081885B8 -sub_081885B8: @ 0x081885B8 + thumb_func_start RecordedOpponentHandleDrawTrainerPic +RecordedOpponentHandleDrawTrainerPic: @ 0x081885B8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -805007,14 +805007,14 @@ _08188604: ldr r0, _08188614 _08188606: ldrh r0, [r0] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08188658 .align 2, 0 _08188614: .4byte gUnknown_203886C _08188618: - bl sub_08185C98 + bl GetActiveBattlerLinkPlayerGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08188650 @@ -805050,14 +805050,14 @@ _08188658: mov r8, r0 ldr r5, _08188744 ldrb r1, [r5] - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _08188748 mov sb, r7 ldr r1, _0818874C @@ -805080,7 +805080,7 @@ _08188658: adds r0, r6, #0 mov r1, sb adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _08188750 ldrb r1, [r5] adds r1, r1, r6 @@ -805109,7 +805109,7 @@ _08188658: lsls r0, r2, #3 adds r0, r0, r1 ldrh r0, [r0, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldrb r1, [r5] adds r1, r1, r6 ldrb r1, [r1] @@ -805167,19 +805167,19 @@ _0818875C: .4byte gUnknown_82D91CC _08188760: .4byte sub_0805D3C8 _08188764: .4byte gUnknown_3005AC0 _08188768: .4byte sub_08186284 - thumb_func_end sub_081885B8 + thumb_func_end RecordedOpponentHandleDrawTrainerPic - thumb_func_start sub_0818876C -sub_0818876C: @ 0x0818876C + thumb_func_start RecordedOpponentHandleTrainerSlide +RecordedOpponentHandleTrainerSlide: @ 0x0818876C push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818876C + thumb_func_end RecordedOpponentHandleTrainerSlide - thumb_func_start sub_08188778 -sub_08188778: @ 0x08188778 + thumb_func_start RecordedOpponentHandleTrainerSlideBack +RecordedOpponentHandleTrainerSlideBack: @ 0x08188778 push {r4, r5, r6, lr} ldr r6, _08188808 ldr r4, _0818880C @@ -805239,7 +805239,7 @@ sub_08188778: @ 0x08188778 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _08188818 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _0818881C ldrb r0, [r4] lsls r0, r0, #2 @@ -805257,10 +805257,10 @@ _08188814: .4byte sub_080A67B4 _08188818: .4byte sub_08007140 _0818881C: .4byte gUnknown_3005AC0 _08188820: .4byte sub_081862F4 - thumb_func_end sub_08188778 + thumb_func_end RecordedOpponentHandleTrainerSlideBack - thumb_func_start sub_08188824 -sub_08188824: @ 0x08188824 + thumb_func_start RecordedOpponentHandleFaintAnimation +RecordedOpponentHandleFaintAnimation: @ 0x08188824 push {r4, r5, r6, lr} ldr r6, _08188870 ldr r4, [r6] @@ -805285,7 +805285,7 @@ sub_08188824: @ 0x08188824 adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08188858: ldr r0, [r6] ldrb r1, [r5] @@ -805312,7 +805312,7 @@ _08188878: strb r0, [r3, #4] movs r0, #0x10 movs r1, #0x3f - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _081888BC ldr r1, _081888C0 ldrb r0, [r5] @@ -805338,53 +805338,53 @@ _081888B4: .align 2, 0 _081888BC: .4byte gUnknown_20205AC _081888C0: .4byte gUnknown_2023E88 -_081888C4: .4byte sub_08039578 +_081888C4: .4byte SpriteCB_FaintOpponentMon _081888C8: .4byte gUnknown_3005AC0 _081888CC: .4byte sub_08186A84 - thumb_func_end sub_08188824 + thumb_func_end RecordedOpponentHandleFaintAnimation - thumb_func_start sub_081888D0 -sub_081888D0: @ 0x081888D0 + thumb_func_start RecordedOpponentHandlePaletteFade +RecordedOpponentHandlePaletteFade: @ 0x081888D0 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081888D0 + thumb_func_end RecordedOpponentHandlePaletteFade - thumb_func_start sub_081888DC -sub_081888DC: @ 0x081888DC + thumb_func_start RecordedOpponentHandleSuccessBallThrowAnim +RecordedOpponentHandleSuccessBallThrowAnim: @ 0x081888DC push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081888DC + thumb_func_end RecordedOpponentHandleSuccessBallThrowAnim - thumb_func_start sub_081888E8 -sub_081888E8: @ 0x081888E8 + thumb_func_start RecordedOpponentHandleBallThrowAnim +RecordedOpponentHandleBallThrowAnim: @ 0x081888E8 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081888E8 + thumb_func_end RecordedOpponentHandleBallThrowAnim - thumb_func_start sub_081888F4 -sub_081888F4: @ 0x081888F4 + thumb_func_start RecordedOpponentHandlePause +RecordedOpponentHandlePause: @ 0x081888F4 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081888F4 + thumb_func_end RecordedOpponentHandlePause - thumb_func_start sub_08188900 -sub_08188900: @ 0x08188900 + thumb_func_start RecordedOpponentHandleMoveAnimation +RecordedOpponentHandleMoveAnimation: @ 0x08188900 push {r4, r5, r6, lr} ldr r6, _081889E4 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _08188912 @@ -805490,7 +805490,7 @@ _08188912: lsrs r3, r0, #0x18 cmp r3, #0 beq _08188A08 - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted b _08188A26 .align 2, 0 _081889E4: .4byte gUnknown_2023D08 @@ -805526,7 +805526,7 @@ _08188A26: _08188A2C: .4byte gUnknown_2024174 _08188A30: .4byte gUnknown_3005AC0 _08188A34: .4byte sub_08188A38 - thumb_func_end sub_08188900 + thumb_func_end RecordedOpponentHandleMoveAnimation thumb_func_start sub_08188A38 sub_08188A38: @ 0x08188A38 @@ -805594,7 +805594,7 @@ _08188A9A: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _08188ABC: ldr r0, [r7] ldrb r1, [r6] @@ -805652,7 +805652,7 @@ _08188AFA: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -805708,7 +805708,7 @@ _08188B70: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _08188BAC: pop {r3, r4, r5} mov r8, r3 @@ -805720,8 +805720,8 @@ _08188BAC: .align 2, 0 thumb_func_end sub_08188A38 - thumb_func_start sub_08188BBC -sub_08188BBC: @ 0x08188BBC + thumb_func_start RecordedOpponentHandlePrintString +RecordedOpponentHandlePrintString: @ 0x08188BBC push {r4, lr} ldr r0, _08188BF4 movs r1, #0 @@ -805734,7 +805734,7 @@ sub_08188BBC: @ 0x08188BBC ldr r1, _08188C00 adds r0, r0, r1 ldrh r0, [r0] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _08188C04 movs r1, #0 bl sub_0814FA04 @@ -805755,47 +805755,47 @@ _08188C00: .4byte gUnknown_2022D0A _08188C04: .4byte gUnknown_2022AE0 _08188C08: .4byte gUnknown_3005AC0 _08188C0C: .4byte sub_08186B3C - thumb_func_end sub_08188BBC + thumb_func_end RecordedOpponentHandlePrintString - thumb_func_start sub_08188C10 -sub_08188C10: @ 0x08188C10 + thumb_func_start RecordedOpponentHandlePrintSelectionString +RecordedOpponentHandlePrintSelectionString: @ 0x08188C10 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188C10 + thumb_func_end RecordedOpponentHandlePrintSelectionString - thumb_func_start sub_08188C1C -sub_08188C1C: @ 0x08188C1C + thumb_func_start RecordedOpponentHandleChooseAction +RecordedOpponentHandleChooseAction: @ 0x08188C1C push {lr} ldr r0, _08188C3C ldrb r0, [r0] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #1 movs r2, #0 - bl sub_08033FB0 - bl sub_08186ED8 + bl BtlController_EmitTwoReturnValues + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08188C3C: .4byte gUnknown_2023D08 - thumb_func_end sub_08188C1C + thumb_func_end RecordedOpponentHandleChooseAction - thumb_func_start sub_08188C40 -sub_08188C40: @ 0x08188C40 + thumb_func_start RecordedOpponentHandleUnknownYesNoBox +RecordedOpponentHandleUnknownYesNoBox: @ 0x08188C40 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188C40 + thumb_func_end RecordedOpponentHandleUnknownYesNoBox - thumb_func_start sub_08188C4C -sub_08188C4C: @ 0x08188C4C + thumb_func_start RecordedOpponentHandleChooseMove +RecordedOpponentHandleChooseMove: @ 0x08188C4C push {r4, r5, lr} ldr r0, _08188C70 ldr r0, [r0] @@ -805804,56 +805804,56 @@ sub_08188C4C: @ 0x08188C4C ands r0, r1 cmp r0, #0 beq _08188C74 - bl sub_0805CDB8 + bl ChooseMoveAndTargetInBattlePalace adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _08188C98 .align 2, 0 _08188C70: .4byte gUnknown_2022C90 _08188C74: ldr r5, _08188CA4 ldrb r0, [r5] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x10 orrs r2, r4 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _08188C98: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 _08188CA4: .4byte gUnknown_2023D08 - thumb_func_end sub_08188C4C + thumb_func_end RecordedOpponentHandleChooseMove - thumb_func_start sub_08188CA8 -sub_08188CA8: @ 0x08188CA8 + thumb_func_start RecordedOpponentHandleChooseItem +RecordedOpponentHandleChooseItem: @ 0x08188CA8 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188CA8 + thumb_func_end RecordedOpponentHandleChooseItem - thumb_func_start sub_08188CB4 -sub_08188CB4: @ 0x08188CB4 + thumb_func_start RecordedOpponentHandleChoosePokemon +RecordedOpponentHandleChoosePokemon: @ 0x08188CB4 push {r4, lr} ldr r4, _08188CE8 ldrb r0, [r4] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction ldrb r1, [r4] ldr r3, _08188CEC ldr r2, [r3] @@ -805867,34 +805867,34 @@ sub_08188CB4: @ 0x08188CB4 ldrb r1, [r0] movs r0, #1 movs r2, #0 - bl sub_08033FDC - bl sub_08186ED8 + bl BtlController_EmitChosenMonReturnValue + bl RecordedOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _08188CE8: .4byte gUnknown_2023D08 _08188CEC: .4byte gUnknown_2024140 - thumb_func_end sub_08188CB4 + thumb_func_end RecordedOpponentHandleChoosePokemon - thumb_func_start sub_08188CF0 -sub_08188CF0: @ 0x08188CF0 + thumb_func_start RecordedOpponentHandleCmd23 +RecordedOpponentHandleCmd23: @ 0x08188CF0 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188CF0 + thumb_func_end RecordedOpponentHandleCmd23 - thumb_func_start sub_08188CFC -sub_08188CFC: @ 0x08188CFC + thumb_func_start RecordedOpponentHandleHealthBarUpdate +RecordedOpponentHandleHealthBarUpdate: @ 0x08188CFC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _08188D74 ldr r0, _08188D78 mov sb, r0 @@ -805922,7 +805922,7 @@ sub_08188CFC: @ 0x08188CFC ldr r4, _08188D84 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -805932,7 +805932,7 @@ sub_08188CFC: @ 0x08188CFC muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -805960,7 +805960,7 @@ _08188D8C: ldr r1, _08188DD8 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -805992,23 +805992,23 @@ _08188DDC: .4byte gUnknown_3005AD0 _08188DE0: .4byte gUnknown_3005AC0 _08188DE4: .4byte gUnknown_2023D08 _08188DE8: .4byte sub_08186A30 - thumb_func_end sub_08188CFC + thumb_func_end RecordedOpponentHandleHealthBarUpdate thumb_func_start sub_08188DEC sub_08188DEC: @ 0x08188DEC push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08188DEC - thumb_func_start sub_08188DF8 -sub_08188DF8: @ 0x08188DF8 + thumb_func_start RecordedOpponentHandleStatusIconUpdate +RecordedOpponentHandleStatusIconUpdate: @ 0x08188DF8 push {r4, lr} ldr r4, _08188E54 ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _08188E4C @@ -806025,7 +806025,7 @@ sub_08188DF8: @ 0x08188DF8 ldr r2, _08188E60 adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _08188E64 ldr r0, [r0] @@ -806057,14 +806057,14 @@ _08188E60: .4byte gUnknown_20243E8 _08188E64: .4byte gUnknown_2024174 _08188E68: .4byte gUnknown_3005AC0 _08188E6C: .4byte sub_08186E78 - thumb_func_end sub_08188DF8 + thumb_func_end RecordedOpponentHandleStatusIconUpdate - thumb_func_start sub_08188E70 -sub_08188E70: @ 0x08188E70 + thumb_func_start RecordedOpponentHandleStatusAnimation +RecordedOpponentHandleStatusAnimation: @ 0x08188E70 push {r4, r5, lr} ldr r5, _08188EC8 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _08188EC0 @@ -806092,7 +806092,7 @@ sub_08188E70: @ 0x08188E70 ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _08188ED0 ldrb r0, [r5] lsls r0, r0, #2 @@ -806108,88 +806108,88 @@ _08188EC8: .4byte gUnknown_2023D08 _08188ECC: .4byte gUnknown_2022D08 _08188ED0: .4byte gUnknown_3005AC0 _08188ED4: .4byte sub_08186E78 - thumb_func_end sub_08188E70 + thumb_func_end RecordedOpponentHandleStatusAnimation - thumb_func_start sub_08188ED8 -sub_08188ED8: @ 0x08188ED8 + thumb_func_start RecordedOpponentHandleStatusXor +RecordedOpponentHandleStatusXor: @ 0x08188ED8 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188ED8 + thumb_func_end RecordedOpponentHandleStatusXor - thumb_func_start sub_08188EE4 -sub_08188EE4: @ 0x08188EE4 + thumb_func_start RecordedOpponentHandleDataTransfer +RecordedOpponentHandleDataTransfer: @ 0x08188EE4 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188EE4 + thumb_func_end RecordedOpponentHandleDataTransfer thumb_func_start sub_08188EF0 sub_08188EF0: @ 0x08188EF0 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08188EF0 - thumb_func_start sub_08188EFC -sub_08188EFC: @ 0x08188EFC + thumb_func_start RecordedOpponentHandlePlayBGM +RecordedOpponentHandlePlayBGM: @ 0x08188EFC push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188EFC + thumb_func_end RecordedOpponentHandlePlayBGM - thumb_func_start sub_08188F08 -sub_08188F08: @ 0x08188F08 + thumb_func_start RecordedOpponentHandleCmd32 +RecordedOpponentHandleCmd32: @ 0x08188F08 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188F08 + thumb_func_end RecordedOpponentHandleCmd32 - thumb_func_start sub_08188F14 -sub_08188F14: @ 0x08188F14 + thumb_func_start RecordedOpponentHandleTwoReturnValues +RecordedOpponentHandleTwoReturnValues: @ 0x08188F14 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188F14 + thumb_func_end RecordedOpponentHandleTwoReturnValues - thumb_func_start sub_08188F20 -sub_08188F20: @ 0x08188F20 + thumb_func_start RecordedOpponentHandleChosenMonReturnValue +RecordedOpponentHandleChosenMonReturnValue: @ 0x08188F20 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188F20 + thumb_func_end RecordedOpponentHandleChosenMonReturnValue - thumb_func_start sub_08188F2C -sub_08188F2C: @ 0x08188F2C + thumb_func_start RecordedOpponentHandleOneReturnValue +RecordedOpponentHandleOneReturnValue: @ 0x08188F2C push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188F2C + thumb_func_end RecordedOpponentHandleOneReturnValue - thumb_func_start sub_08188F38 -sub_08188F38: @ 0x08188F38 + thumb_func_start RecordedOpponentHandleOneReturnValue_Duplicate +RecordedOpponentHandleOneReturnValue_Duplicate: @ 0x08188F38 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08188F38 + thumb_func_end RecordedOpponentHandleOneReturnValue_Duplicate thumb_func_start RecordedOpponentHandleCmd37 RecordedOpponentHandleCmd37: @ 0x08188F44 @@ -806200,7 +806200,7 @@ RecordedOpponentHandleCmd37: @ 0x08188F44 rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -806226,7 +806226,7 @@ RecordedOpponentHandleCmd38: @ 0x08188F60 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -806243,7 +806243,7 @@ RecordedOpponentHandleCmd39: @ 0x08188F98 movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -806265,15 +806265,15 @@ RecordedOpponentHandleCmd40: @ 0x08188FB0 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08188FD4: .4byte gUnknown_20229C0 thumb_func_end RecordedOpponentHandleCmd40 - thumb_func_start sub_08188FD8 -sub_08188FD8: @ 0x08188FD8 + thumb_func_start RecordedOpponentHandleHitAnimation +RecordedOpponentHandleHitAnimation: @ 0x08188FD8 push {r4, lr} ldr r3, _08189000 ldr r2, _08189004 @@ -806290,7 +806290,7 @@ sub_08188FD8: @ 0x08188FD8 lsls r0, r0, #0x1d cmp r0, #0 bge _0818900C - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted b _08189036 .align 2, 0 _08189000: .4byte gUnknown_20205AC @@ -806325,23 +806325,23 @@ _08189036: _0818903C: .4byte gUnknown_202415D _08189040: .4byte gUnknown_3005AC0 _08189044: .4byte sub_08186B54 - thumb_func_end sub_08188FD8 + thumb_func_end RecordedOpponentHandleHitAnimation - thumb_func_start sub_08189048 -sub_08189048: @ 0x08189048 + thumb_func_start RecordedOpponentHandleCmd42 +RecordedOpponentHandleCmd42: @ 0x08189048 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08189048 + thumb_func_end RecordedOpponentHandleCmd42 - thumb_func_start sub_08189054 -sub_08189054: @ 0x08189054 + thumb_func_start RecordedOpponentHandlePlaySE +RecordedOpponentHandlePlaySE: @ 0x08189054 push {r4, lr} ldr r4, _08189090 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -806361,18 +806361,18 @@ _08189068: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_08186ED8 + bl PlaySE12WithPanning + bl RecordedOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _08189090: .4byte gUnknown_2023D08 _08189094: .4byte gUnknown_2022D08 - thumb_func_end sub_08189054 + thumb_func_end RecordedOpponentHandlePlaySE - thumb_func_start sub_08189098 -sub_08189098: @ 0x08189098 + thumb_func_start RecordedOpponentHandlePlayFanfareOrBGM +RecordedOpponentHandlePlayFanfareOrBGM: @ 0x08189098 push {r4, r5, lr} ldr r4, _081890CC ldr r5, _081890D0 @@ -806383,7 +806383,7 @@ sub_08189098: @ 0x08189098 ldrb r0, [r0] cmp r0, #0 beq _081890D4 - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -806394,7 +806394,7 @@ sub_08189098: @ 0x08189098 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _081890E8 .align 2, 0 _081890CC: .4byte gUnknown_2022D08 @@ -806408,17 +806408,17 @@ _081890D4: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _081890E8: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08189098 + thumb_func_end RecordedOpponentHandlePlayFanfareOrBGM - thumb_func_start sub_081890F4 -sub_081890F4: @ 0x081890F4 + thumb_func_start RecordedOpponentHandleFaintingCry +RecordedOpponentHandleFaintingCry: @ 0x081890F4 push {lr} ldr r1, _08189124 ldr r0, _08189128 @@ -806431,20 +806431,20 @@ sub_081890F4: @ 0x081890F4 ldr r1, _0818912C adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 movs r2, #5 - bl sub_080A2BAC - bl sub_08186ED8 + bl PlayCry3 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08189124: .4byte gUnknown_2023D12 _08189128: .4byte gUnknown_2023D08 _0818912C: .4byte gUnknown_20243E8 - thumb_func_end sub_081890F4 + thumb_func_end RecordedOpponentHandleFaintingCry thumb_func_start sub_08189130 sub_08189130: @ 0x08189130 @@ -806456,13 +806456,13 @@ sub_08189130: @ 0x08189130 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _08189160 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -806471,8 +806471,8 @@ _0818915C: .4byte gUnknown_2023D08 _08189160: .4byte gUnknown_20240A0 thumb_func_end sub_08189130 - thumb_func_start sub_08189164 -sub_08189164: @ 0x08189164 + thumb_func_start RecordedOpponentHandleIntroTrainerBallThrow +RecordedOpponentHandleIntroTrainerBallThrow: @ 0x08189164 push {r4, r5, r6, lr} ldr r5, _08189244 ldr r6, _08189248 @@ -806532,10 +806532,10 @@ sub_08189164: @ 0x08189164 lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _08189254 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r0, _08189258 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _0818925C @@ -806593,10 +806593,10 @@ _08189258: .4byte sub_08189274 _0818925C: .4byte gUnknown_3005B60 _08189260: .4byte gUnknown_2024174 _08189264: .4byte gUnknown_2024158 -_08189268: .4byte sub_0807352C +_08189268: .4byte Task_HidePartyStatusSummary _0818926C: .4byte gUnknown_3005AC0 _08189270: .4byte sub_08186214 - thumb_func_end sub_08189164 + thumb_func_end RecordedOpponentHandleIntroTrainerBallThrow thumb_func_start sub_08189274 sub_08189274: @ 0x08189274 @@ -806618,7 +806618,7 @@ sub_08189274: @ 0x08189274 adds r0, r0, r1 ldrh r0, [r0, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081892AE @@ -806691,7 +806691,7 @@ _08189320: mov r0, sb strb r0, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask pop {r3, r4} mov r8, r3 mov sb, r4 @@ -806711,7 +806711,7 @@ sub_08189358: @ 0x08189358 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #6] - bl sub_0805DC00 + bl FreeTrainerFrontPicPalette adds r0, r4, #0 bl FreeSpriteOamMatrix adds r0, r4, #0 @@ -806734,11 +806734,11 @@ sub_08189374: @ 0x08189374 cmp r0, #0 beq _081893A4 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081893A4 - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted b _0818946E .align 2, 0 _0818939C: .4byte gUnknown_2022D08 @@ -806808,7 +806808,7 @@ _08189410: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _08189478 ldrb r1, [r5] adds r1, r1, r2 @@ -806884,7 +806884,7 @@ sub_08189488: @ 0x08189488 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted _081894C0: pop {r4} pop {r0} @@ -806922,7 +806922,7 @@ RecordedOpponentHandleHidePartyStatusSummary: @ 0x081894D0 ldr r1, _0818951C str r1, [r0] _08189502: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -806930,24 +806930,24 @@ _0818950C: .4byte gUnknown_2024174 _08189510: .4byte gUnknown_2023D08 _08189514: .4byte gUnknown_3005B60 _08189518: .4byte gUnknown_2024158 -_0818951C: .4byte sub_0807352C +_0818951C: .4byte Task_HidePartyStatusSummary thumb_func_end RecordedOpponentHandleHidePartyStatusSummary - thumb_func_start sub_08189520 -sub_08189520: @ 0x08189520 + thumb_func_start RecordedOpponentHandleEndBounceEffect +RecordedOpponentHandleEndBounceEffect: @ 0x08189520 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08189520 + thumb_func_end RecordedOpponentHandleEndBounceEffect thumb_func_start sub_0818952C sub_0818952C: @ 0x0818952C push {r4, lr} ldr r4, _0818957C ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _08189572 @@ -806978,7 +806978,7 @@ sub_0818952C: @ 0x0818952C ldrb r0, [r4] bl CopyBattleSpriteInvisibility _08189572: - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -806989,13 +806989,13 @@ _08189584: .4byte gUnknown_2023E88 _08189588: .4byte gUnknown_2022D08 thumb_func_end sub_0818952C - thumb_func_start sub_0818958C -sub_0818958C: @ 0x0818958C + thumb_func_start RecordedOpponentHandleBattleAnimation +RecordedOpponentHandleBattleAnimation: @ 0x0818958C push {r4, r5, r6, lr} sub sp, #4 ldr r6, _081895D0 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _081895E4 @@ -807016,11 +807016,11 @@ sub_0818958C: @ 0x0818958C str r4, [sp] adds r0, r2, #0 adds r1, r2, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _081895D8 - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted b _081895E4 .align 2, 0 _081895D0: .4byte gUnknown_2023D08 @@ -807040,28 +807040,28 @@ _081895E4: .align 2, 0 _081895EC: .4byte gUnknown_3005AC0 _081895F0: .4byte sub_08186EA8 - thumb_func_end sub_0818958C + thumb_func_end RecordedOpponentHandleBattleAnimation - thumb_func_start sub_081895F4 -sub_081895F4: @ 0x081895F4 + thumb_func_start RecordedOpponentHandleLinkStandbyMsg +RecordedOpponentHandleLinkStandbyMsg: @ 0x081895F4 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081895F4 + thumb_func_end RecordedOpponentHandleLinkStandbyMsg - thumb_func_start sub_08189600 -sub_08189600: @ 0x08189600 + thumb_func_start RecordedOpponentHandleResetActionMoveSelection +RecordedOpponentHandleResetActionMoveSelection: @ 0x08189600 push {lr} - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08189600 + thumb_func_end RecordedOpponentHandleResetActionMoveSelection - thumb_func_start sub_0818960C -sub_0818960C: @ 0x0818960C + thumb_func_start RecordedOpponentHandleCmd55 +RecordedOpponentHandleCmd55: @ 0x0818960C push {lr} ldr r1, _08189628 ldr r0, _0818962C @@ -807089,7 +807089,7 @@ _0818963C: bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_08186ED8 + bl RecordedOpponentBufferExecCompleted ldr r1, _08189664 ldr r0, _08189668 ldrb r0, [r0] @@ -807104,7 +807104,7 @@ _08189660: .4byte gUnknown_2023FDE _08189664: .4byte gUnknown_3005AC0 _08189668: .4byte gUnknown_2023D08 _0818966C: .4byte sub_080583C0 - thumb_func_end sub_0818960C + thumb_func_end RecordedOpponentHandleCmd55 thumb_func_start sub_08189670 sub_08189670: @ 0x08189670 @@ -807168,7 +807168,7 @@ _081896D0: .4byte gUnknown_2023D08 _081896D4: .4byte gUnknown_2022D08 _081896D8: .4byte gUnknown_85D39D4 _081896DC: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _081896E0: pop {r0} bx r0 @@ -807192,7 +807192,7 @@ sub_081896E4: @ 0x081896E4 ldr r0, _08189718 cmp r1, r0 bne _08189708 - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _08189708: pop {r0} bx r0 @@ -807240,7 +807240,7 @@ sub_0818971C: @ 0x0818971C lsls r0, r0, #2 adds r0, r0, r6 bl DestroySprite - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818976C: pop {r4, r5, r6} pop {r0} @@ -807280,7 +807280,7 @@ sub_08189784: @ 0x08189784 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _081897BC: pop {r4} pop {r0} @@ -807305,11 +807305,11 @@ sub_081897CC: @ 0x081897CC beq _081897E6 b _0818998C _081897E6: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08189806 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08189838 @@ -807466,8 +807466,8 @@ _081898B2: muls r0, r6, r0 ldr r4, _08189984 adds r0, r0, r4 - bl sub_0805E5AC - bl sub_080A63E8 + bl HandleLowHpMusicChange + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0818994E @@ -807479,7 +807479,7 @@ _081898B2: ldrh r0, [r0] muls r0, r6, r0 adds r0, r0, r4 - bl sub_0805E5AC + bl HandleLowHpMusicChange _0818994E: mov r1, sb ldr r0, [r1] @@ -807505,11 +807505,11 @@ _08189980: .4byte gUnknown_2023D12 _08189984: .4byte gUnknown_2024190 _08189988: .4byte gUnknown_3005AC0 _0818998C: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081899AC - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081899DC @@ -807570,7 +807570,7 @@ _081899DC: _08189A10: movs r6, #1 _08189A12: - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 beq _08189A1E @@ -807711,7 +807711,7 @@ _08189AEA: ands r0, r1 cmp r0, #0 bne _08189BB0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08189B80 @@ -807737,7 +807737,7 @@ _08189AEA: ldr r2, _08189C54 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute mov r1, sb ldrb r0, [r1] eors r0, r7 @@ -807763,7 +807763,7 @@ _08189B80: ldr r2, _08189C54 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -807812,7 +807812,7 @@ _08189BCE: ands r0, r1 cmp r0, #0 bne _08189C8E - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 bne _08189C8E @@ -807904,7 +807904,7 @@ _08189C8E: ldr r0, [r0] cmp r0, r2 bne _08189D56 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _08189CF4 @@ -808018,7 +808018,7 @@ sub_08189D90: @ 0x08189D90 ldrsh r0, [r1, r2] cmp r0, #0 bne _08189DBE - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _08189DBE: pop {r0} bx r0 @@ -808038,7 +808038,7 @@ sub_08189DD0: @ 0x08189DD0 ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -808071,8 +808071,8 @@ _08189E18: muls r0, r2, r0 ldr r2, _08189E3C adds r0, r0, r2 - bl sub_0805E5AC - bl sub_0818A240 + bl HandleLowHpMusicChange + bl RecordedPlayerBufferExecCompleted _08189E32: pop {r4, r5, r6} pop {r0} @@ -808111,7 +808111,7 @@ sub_08189E40: @ 0x08189E40 ldr r1, _08189ED4 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0805DB50 @@ -808139,7 +808139,7 @@ sub_08189E40: @ 0x08189E40 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _08189EBC: pop {r4, r5, r6} pop {r0} @@ -808192,7 +808192,7 @@ sub_08189EDC: @ 0x08189EDC adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _08189F30: pop {r4, r5, r6} pop {r0} @@ -808213,7 +808213,7 @@ sub_08189F4C: @ 0x08189F4C lsls r0, r0, #0x10 cmp r0, #0 bne _08189F5E - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _08189F5E: pop {r0} bx r0 @@ -808248,7 +808248,7 @@ sub_08189F64: @ 0x08189F64 strb r0, [r2] ldr r0, _08189FAC strb r3, [r0] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted b _08189FDA .align 2, 0 _08189FA0: .4byte gUnknown_2023E88 @@ -808318,7 +808318,7 @@ sub_08189FE0: @ 0x08189FE0 adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0818A026: ldr r0, _0818A04C ldrb r1, [r4] @@ -808370,7 +808370,7 @@ sub_0818A054: @ 0x0818A054 ldr r0, _0818A0A4 cmp r1, r0 bne _0818A090 - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818A090: pop {r0} bx r0 @@ -808424,7 +808424,7 @@ sub_0818A0A8: @ 0x0818A0A8 bl FreeSpritePaletteByTag ldr r0, _0818A17C movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r0, _0818A180 mov r8, r0 ldrb r1, [r7] @@ -808435,7 +808435,7 @@ sub_0818A0A8: @ 0x0818A0A8 muls r0, r6, r0 ldr r5, _0818A184 adds r0, r0, r5 - bl sub_0805E5AC + bl HandleLowHpMusicChange ldr r1, _0818A188 ldrb r0, [r7] adds r0, r0, r1 @@ -808457,7 +808457,7 @@ sub_0818A0A8: @ 0x0818A0A8 muls r1, r6, r1 adds r1, r1, r5 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] bl sub_08076320 ldrb r0, [r7] @@ -808567,8 +808567,8 @@ _0818A238: .4byte gUnknown_3005AC0 _0818A23C: .4byte sub_0818A0A8 thumb_func_end sub_0818A19C - thumb_func_start sub_0818A240 -sub_0818A240: @ 0x0818A240 + thumb_func_start RecordedPlayerBufferExecCompleted +RecordedPlayerBufferExecCompleted: @ 0x0818A240 push {r4, lr} sub sp, #4 ldr r1, _0818A280 @@ -808584,7 +808584,7 @@ sub_0818A240: @ 0x0818A240 ands r0, r1 cmp r0, #0 beq _0818A294 - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -808622,7 +808622,7 @@ _0818A2A6: .align 2, 0 _0818A2B0: .4byte gUnknown_2023D0C _0818A2B4: .4byte gUnknown_82FACB4 - thumb_func_end sub_0818A240 + thumb_func_end RecordedPlayerBufferExecCompleted thumb_func_start CompleteOnFinishedStatusAnimation CompleteOnFinishedStatusAnimation: @ 0x0818A2B8 @@ -808641,7 +808641,7 @@ CompleteOnFinishedStatusAnimation: @ 0x0818A2B8 ands r0, r1 cmp r0, #0 bne _0818A2DA - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818A2DA: pop {r0} bx r0 @@ -808667,7 +808667,7 @@ CompleteOnFinishedBattleAnimation: @ 0x0818A2E8 ands r0, r1 cmp r0, #0 bne _0818A30A - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818A30A: pop {r0} bx r0 @@ -808676,8 +808676,8 @@ _0818A310: .4byte gUnknown_2024174 _0818A314: .4byte gUnknown_2023D08 thumb_func_end CompleteOnFinishedBattleAnimation - thumb_func_start sub_0818A318 -sub_0818A318: @ 0x0818A318 + thumb_func_start RecordedPlayerHandleGetMonData +RecordedPlayerHandleGetMonData: @ 0x0818A318 push {r4, r5, r6, lr} sub sp, #0x100 movs r6, #0 @@ -808726,14 +808726,14 @@ _0818A372: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_0818A240 + bl BtlController_EmitDataTransfer + bl RecordedPlayerBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818A318 + thumb_func_end RecordedPlayerHandleGetMonData thumb_func_start sub_0818A38C sub_0818A38C: @ 0x0818A38C @@ -808836,12 +808836,12 @@ _0818A4BC: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -808869,12 +808869,12 @@ _0818A508: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -808889,21 +808889,21 @@ _0818A508: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -808915,7 +808915,7 @@ _0818A508: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -808927,7 +808927,7 @@ _0818A508: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -808939,7 +808939,7 @@ _0818A508: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -808950,7 +808950,7 @@ _0818A508: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -808961,7 +808961,7 @@ _0818A508: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -808973,55 +808973,55 @@ _0818A508: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -809034,7 +809034,7 @@ _0818A508: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -809044,19 +809044,19 @@ _0818A508: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _0818A6C0: @@ -809107,13 +809107,13 @@ _0818A716: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -809127,7 +809127,7 @@ _0818A716: ldr r1, _0818A764 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -809169,7 +809169,7 @@ _0818A790: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -809180,7 +809180,7 @@ _0818A790: ldr r1, _0818A7BC adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -809217,7 +809217,7 @@ _0818A7EC: adds r0, r0, r1 movs r1, #0x19 _0818A7F6: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -809350,27 +809350,27 @@ _0818A8DC: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _0818AB22 @@ -809455,7 +809455,7 @@ _0818A9AC: adds r0, r0, r1 movs r1, #0x37 _0818A9B6: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -809544,7 +809544,7 @@ _0818AA50: adds r0, r0, r1 movs r1, #0x3f _0818AA5A: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -809651,7 +809651,7 @@ _0818AB10: adds r0, r0, r1 movs r1, #0x36 _0818AB1A: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _0818AB22: @@ -809671,7 +809671,7 @@ _0818AB34: .4byte gUnknown_2024190 thumb_func_start sub_0818AB38 sub_0818AB38: @ 0x0818AB38 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -809693,7 +809693,7 @@ sub_0818AB44: @ 0x0818AB44 lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_0818AB9C + bl SetRecordedPlayerMonData b _0818AB92 .align 2, 0 _0818AB68: .4byte gUnknown_2022D08 @@ -809708,7 +809708,7 @@ _0818AB78: cmp r0, #0 beq _0818AB86 adds r0, r5, #0 - bl sub_0818AB9C + bl SetRecordedPlayerMonData _0818AB86: lsrs r4, r4, #1 adds r0, r5, #1 @@ -809717,14 +809717,14 @@ _0818AB86: cmp r5, #5 bls _0818AB78 _0818AB92: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_0818AB44 - thumb_func_start sub_0818AB9C -sub_0818AB9C: @ 0x0818AB9C + thumb_func_start SetRecordedPlayerMonData +SetRecordedPlayerMonData: @ 0x0818AB9C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -809826,12 +809826,12 @@ _0818ACD0: adds r0, r4, #0 movs r1, #0xb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -809872,12 +809872,12 @@ _0818AD36: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r7, #1 adds r4, #2 movs r0, #1 @@ -809893,15 +809893,15 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -809910,7 +809910,7 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x14] lsls r0, r0, #0x16 @@ -809919,7 +809919,7 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x15] lsls r0, r0, #0x19 @@ -809928,7 +809928,7 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r6, #0x14] lsls r0, r0, #0xc @@ -809937,7 +809937,7 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x16] lsls r0, r0, #0x17 @@ -809946,7 +809946,7 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x17] lsls r0, r0, #0x1a @@ -809955,47 +809955,47 @@ _0818AD36: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AE64: .4byte gUnknown_2024190 @@ -810009,7 +810009,7 @@ _0818AE68: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AE80: .4byte gUnknown_2024190 @@ -810024,7 +810024,7 @@ _0818AE88: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AEA0: .4byte gUnknown_2024190 @@ -810048,12 +810048,12 @@ _0818AEC2: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -810067,7 +810067,7 @@ _0818AEC2: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AEFC: .4byte gUnknown_2024190 @@ -810101,35 +810101,35 @@ _0818AF28: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x11 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AF84: .4byte gUnknown_2024190 @@ -810150,7 +810150,7 @@ _0818AF8C: _0818AFA4: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AFB0: .4byte gUnknown_2024190 @@ -810166,7 +810166,7 @@ _0818AFBC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AFD4: .4byte gUnknown_2024190 @@ -810181,7 +810181,7 @@ _0818AFDC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818AFF4: .4byte gUnknown_2024190 @@ -810196,7 +810196,7 @@ _0818AFFC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B014: .4byte gUnknown_2024190 @@ -810211,7 +810211,7 @@ _0818B01C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B034: .4byte gUnknown_2024190 @@ -810226,7 +810226,7 @@ _0818B03C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B054: .4byte gUnknown_2024190 @@ -810241,7 +810241,7 @@ _0818B05C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B074: .4byte gUnknown_2024190 @@ -810256,7 +810256,7 @@ _0818B07C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B094: .4byte gUnknown_2024190 @@ -810271,7 +810271,7 @@ _0818B09C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B0B4: .4byte gUnknown_2024190 @@ -810286,7 +810286,7 @@ _0818B0BC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B0D4: .4byte gUnknown_2024190 @@ -810301,7 +810301,7 @@ _0818B0DC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B0F4: .4byte gUnknown_2024190 @@ -810316,7 +810316,7 @@ _0818B0FC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B114: .4byte gUnknown_2024190 @@ -810331,7 +810331,7 @@ _0818B11C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B134: .4byte gUnknown_2024190 @@ -810346,7 +810346,7 @@ _0818B13C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B154: .4byte gUnknown_2024190 @@ -810361,7 +810361,7 @@ _0818B15C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B174: .4byte gUnknown_2024190 @@ -810378,35 +810378,35 @@ _0818B17C: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #5 @@ -810426,7 +810426,7 @@ _0818B1EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B204: .4byte gUnknown_2024190 @@ -810441,7 +810441,7 @@ _0818B20C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B224: .4byte gUnknown_2024190 @@ -810456,7 +810456,7 @@ _0818B22C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B244: .4byte gUnknown_2024190 @@ -810471,7 +810471,7 @@ _0818B24C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B264: .4byte gUnknown_2024190 @@ -810486,7 +810486,7 @@ _0818B26C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B284: .4byte gUnknown_2024190 @@ -810502,7 +810502,7 @@ _0818B28C: adds r2, r2, r7 _0818B29C: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B2A4: .4byte gUnknown_2024190 @@ -810517,7 +810517,7 @@ _0818B2AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B2C4: .4byte gUnknown_2024190 @@ -810532,7 +810532,7 @@ _0818B2CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B2E4: .4byte gUnknown_2024190 @@ -810547,7 +810547,7 @@ _0818B2EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B304: .4byte gUnknown_2024190 @@ -810562,7 +810562,7 @@ _0818B30C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B324: .4byte gUnknown_2024190 @@ -810577,7 +810577,7 @@ _0818B32C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B344: .4byte gUnknown_2024190 @@ -810592,7 +810592,7 @@ _0818B34C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B364: .4byte gUnknown_2024190 @@ -810607,7 +810607,7 @@ _0818B36C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B384: .4byte gUnknown_2024190 @@ -810622,7 +810622,7 @@ _0818B38C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B3A4: .4byte gUnknown_2024190 @@ -810637,7 +810637,7 @@ _0818B3AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B3C4: .4byte gUnknown_2024190 @@ -810652,7 +810652,7 @@ _0818B3CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B3E4: .4byte gUnknown_2024190 @@ -810667,7 +810667,7 @@ _0818B3EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B404: .4byte gUnknown_2024190 @@ -810682,7 +810682,7 @@ _0818B40C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B424: .4byte gUnknown_2024190 @@ -810697,7 +810697,7 @@ _0818B42C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B444: .4byte gUnknown_2024190 @@ -810712,7 +810712,7 @@ _0818B44C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B464: .4byte gUnknown_2024190 @@ -810727,7 +810727,7 @@ _0818B46C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B484: .4byte gUnknown_2024190 @@ -810742,7 +810742,7 @@ _0818B48C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B4A4: .4byte gUnknown_2024190 @@ -810757,7 +810757,7 @@ _0818B4AC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B4C4: .4byte gUnknown_2024190 @@ -810772,7 +810772,7 @@ _0818B4CC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B4E4: .4byte gUnknown_2024190 @@ -810787,7 +810787,7 @@ _0818B4EC: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B504: .4byte gUnknown_2024190 @@ -810802,7 +810802,7 @@ _0818B50C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B524: .4byte gUnknown_2024190 @@ -810817,7 +810817,7 @@ _0818B52C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _0818B562 .align 2, 0 _0818B544: .4byte gUnknown_2024190 @@ -810832,7 +810832,7 @@ _0818B54C: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _0818B562: ldr r2, _0818B594 ldr r0, _0818B590 @@ -810844,7 +810844,7 @@ _0818B562: muls r0, r2, r0 ldr r2, _0818B58C adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange add sp, #0x34 pop {r3, r4, r5} mov r8, r3 @@ -810857,7 +810857,7 @@ _0818B562: _0818B58C: .4byte gUnknown_2024190 _0818B590: .4byte gUnknown_2023D08 _0818B594: .4byte gUnknown_2023D12 - thumb_func_end sub_0818AB9C + thumb_func_end SetRecordedPlayerMonData thumb_func_start sub_0818B598 sub_0818B598: @ 0x0818B598 @@ -810907,7 +810907,7 @@ _0818B5CE: cmp r3, r0 blo _0818B5CE _0818B5F0: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -810918,8 +810918,8 @@ _0818B604: .4byte gUnknown_2022D08 _0818B608: .4byte gUnknown_2024190 thumb_func_end sub_0818B598 - thumb_func_start sub_0818B60C -sub_0818B60C: @ 0x0818B60C + thumb_func_start RecordedPlayerHandleLoadMonSprite +RecordedPlayerHandleLoadMonSprite: @ 0x0818B60C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -810934,7 +810934,7 @@ sub_0818B60C: @ 0x0818B60C muls r0, r5, r0 ldr r4, _0818B708 adds r0, r0, r4 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r6] lsls r0, r0, #1 add r0, r8 @@ -810942,7 +810942,7 @@ sub_0818B60C: @ 0x0818B60C muls r0, r5, r0 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -810952,12 +810952,12 @@ sub_0818B60C: @ 0x0818B60C lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0818B70C mov r8, r0 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -810974,7 +810974,7 @@ sub_0818B60C: @ 0x0818B60C mov r0, r8 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0818B710 ldrb r1, [r6] adds r1, r1, r4 @@ -811043,10 +811043,10 @@ _0818B718: .4byte 0x0000FF10 _0818B71C: .4byte gUnknown_2024188 _0818B720: .4byte gUnknown_3005AC0 _0818B724: .4byte sub_08189D90 - thumb_func_end sub_0818B60C + thumb_func_end RecordedPlayerHandleLoadMonSprite - thumb_func_start sub_0818B728 -sub_0818B728: @ 0x0818B728 + thumb_func_start RecordedPlayerHandleSwitchInAnim +RecordedPlayerHandleSwitchInAnim: @ 0x0818B728 push {r4, r5, r6, lr} ldr r5, _0818B780 ldrb r0, [r5] @@ -811073,7 +811073,7 @@ sub_0818B728: @ 0x0818B728 muls r0, r2, r0 ldr r2, _0818B78C adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r5] lsls r1, r0, #9 adds r1, r1, r6 @@ -811095,7 +811095,7 @@ _0818B788: .4byte gUnknown_2023D12 _0818B78C: .4byte gUnknown_2024190 _0818B790: .4byte gUnknown_3005AC0 _0818B794: .4byte sub_0818A19C - thumb_func_end sub_0818B728 + thumb_func_end RecordedPlayerHandleSwitchInAnim thumb_func_start sub_0818B798 sub_0818B798: @ 0x0818B798 @@ -811126,13 +811126,13 @@ sub_0818B798: @ 0x0818B798 ldr r1, _0818B8F4 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _0818B8F8 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _0818B8FC mov sb, r1 add sb, r6 @@ -811144,12 +811144,12 @@ sub_0818B798: @ 0x0818B798 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _0818B900 mov sl, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -811166,7 +811166,7 @@ sub_0818B798: @ 0x0818B798 mov r0, sl adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0818B904 adds r4, r6, r4 strb r0, [r4] @@ -811240,7 +811240,7 @@ sub_0818B798: @ 0x0818B798 str r1, [r0] movs r0, #0 movs r1, #0xff - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sb ldrb r2, [r1] lsls r1, r2, #4 @@ -811302,7 +811302,7 @@ _0818B948: .4byte gUnknown_2022D08 _0818B94C: .4byte gUnknown_2023D08 _0818B950: .4byte gUnknown_2024174 _0818B954: .4byte gUnknown_3005AC0 -_0818B958: .4byte sub_0818B9A4 +_0818B958: .4byte DoSwitchOutAnimation _0818B95C: ldr r5, _0818B998 adds r0, r2, r5 @@ -811326,7 +811326,7 @@ _0818B95C: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818B992: pop {r4, r5, r6} pop {r0} @@ -811337,8 +811337,8 @@ _0818B99C: .4byte gUnknown_20205AC _0818B9A0: .4byte gUnknown_3005AD0 thumb_func_end sub_0818B914 - thumb_func_start sub_0818B9A4 -sub_0818B9A4: @ 0x0818B9A4 + thumb_func_start DoSwitchOutAnimation +DoSwitchOutAnimation: @ 0x0818B9A4 push {r4, r5, r6, lr} ldr r6, _0818B9C4 ldr r4, [r6] @@ -811370,7 +811370,7 @@ _0818B9CC: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0818B9E6: ldr r0, [r6] ldrb r1, [r5] @@ -811395,7 +811395,7 @@ _0818B9FA: adds r0, r2, #0 adds r1, r2, #0 movs r3, #1 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _0818BA28 ldrb r0, [r5] lsls r0, r0, #2 @@ -811409,10 +811409,10 @@ _0818BA22: .align 2, 0 _0818BA28: .4byte gUnknown_3005AC0 _0818BA2C: .4byte sub_08189EDC - thumb_func_end sub_0818B9A4 + thumb_func_end DoSwitchOutAnimation - thumb_func_start sub_0818BA30 -sub_0818BA30: @ 0x0818BA30 + thumb_func_start RecordedPlayerHandleDrawTrainerPic +RecordedPlayerHandleDrawTrainerPic: @ 0x0818BA30 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -811428,7 +811428,7 @@ sub_0818BA30: @ 0x0818BA30 ands r1, r0 cmp r1, #0 beq _0818BA5C - bl sub_08185C98 + bl GetActiveBattlerLinkPlayerGender lsls r0, r0, #0x18 lsrs r4, r0, #0x18 b _0818BA78 @@ -811519,14 +811519,14 @@ _0818BAEC: ldr r6, _0818BBEC ldrb r1, [r6] adds r0, r5, #0 - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08069D00 + bl SetMultiuseSpriteTemplateToTrainerFront ldr r0, _0818BBF0 mov r8, r0 lsls r4, r7, #0x10 @@ -811539,7 +811539,7 @@ _0818BAEC: mov r0, r8 mov r1, sb adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _0818BBF4 ldrb r1, [r6] adds r1, r1, r4 @@ -811548,7 +811548,7 @@ _0818BAEC: lsls r5, r5, #3 adds r5, r5, r0 ldrh r0, [r5, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r5, _0818BBFC ldrb r1, [r6] adds r1, r1, r4 @@ -811640,14 +811640,14 @@ _0818BC08: ldr r5, _0818BCB8 ldrb r1, [r5] adds r0, r4, #0 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _0818BCBC mov r8, sb lsls r4, r7, #0x10 @@ -811660,7 +811660,7 @@ _0818BC08: adds r0, r6, #0 mov r1, r8 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _0818BCC0 ldrb r1, [r5] adds r1, r1, r6 @@ -811730,16 +811730,16 @@ _0818BCC8: .4byte 0x0000FFFE _0818BCCC: .4byte sub_0805D3C8 _0818BCD0: .4byte gUnknown_3005AC0 _0818BCD4: .4byte sub_081896E4 - thumb_func_end sub_0818BA30 + thumb_func_end RecordedPlayerHandleDrawTrainerPic - thumb_func_start sub_0818BCD8 -sub_0818BCD8: @ 0x0818BCD8 + thumb_func_start RecordedPlayerHandleTrainerSlide +RecordedPlayerHandleTrainerSlide: @ 0x0818BCD8 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818BCD8 + thumb_func_end RecordedPlayerHandleTrainerSlide thumb_func_start sub_0818BCE4 sub_0818BCE4: @ 0x0818BCE4 @@ -811801,7 +811801,7 @@ sub_0818BCE4: @ 0x0818BCE4 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _0818BD84 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _0818BD88 ldrb r0, [r4] lsls r0, r0, #2 @@ -811822,8 +811822,8 @@ _0818BD88: .4byte gUnknown_3005AC0 _0818BD8C: .4byte sub_0818971C thumb_func_end sub_0818BCE4 - thumb_func_start sub_0818BD90 -sub_0818BD90: @ 0x0818BD90 + thumb_func_start RecordedPlayerHandleFaintAnimation +RecordedPlayerHandleFaintAnimation: @ 0x0818BD90 push {r4, r5, r6, lr} ldr r6, _0818BDDC ldr r4, [r6] @@ -811848,7 +811848,7 @@ sub_0818BD90: @ 0x0818BD90 adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0818BDC4: ldr r0, [r6] ldrb r1, [r5] @@ -811882,11 +811882,11 @@ _0818BDE4: muls r0, r2, r0 ldr r2, _0818BE64 adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange movs r1, #0x40 rsbs r1, r1, #0 movs r0, #0x10 - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _0818BE68 ldr r3, _0818BE6C ldrb r0, [r5] @@ -811934,12 +811934,12 @@ _0818BE6C: .4byte gUnknown_2023E88 _0818BE70: .4byte sub_08039844 _0818BE74: .4byte gUnknown_3005AC0 _0818BE78: .4byte sub_08189E40 - thumb_func_end sub_0818BD90 + thumb_func_end RecordedPlayerHandleFaintAnimation thumb_func_start sub_0818BE7C sub_0818BE7C: @ 0x0818BE7C push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -811948,7 +811948,7 @@ sub_0818BE7C: @ 0x0818BE7C thumb_func_start sub_0818BE88 sub_0818BE88: @ 0x0818BE88 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -811957,7 +811957,7 @@ sub_0818BE88: @ 0x0818BE88 thumb_func_start sub_0818BE94 sub_0818BE94: @ 0x0818BE94 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -811966,18 +811966,18 @@ sub_0818BE94: @ 0x0818BE94 thumb_func_start sub_0818BEA0 sub_0818BEA0: @ 0x0818BEA0 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0818BEA0 - thumb_func_start sub_0818BEAC -sub_0818BEAC: @ 0x0818BEAC + thumb_func_start RecordedPlayerHandleMoveAnimation +RecordedPlayerHandleMoveAnimation: @ 0x0818BEAC push {r4, r5, r6, lr} ldr r6, _0818BF90 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _0818BEBE @@ -812083,7 +812083,7 @@ _0818BEBE: lsrs r3, r0, #0x18 cmp r3, #0 beq _0818BFB4 - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted b _0818BFD2 .align 2, 0 _0818BF90: .4byte gUnknown_2023D08 @@ -812118,11 +812118,11 @@ _0818BFD2: .align 2, 0 _0818BFD8: .4byte gUnknown_2024174 _0818BFDC: .4byte gUnknown_3005AC0 -_0818BFE0: .4byte sub_0818BFE4 - thumb_func_end sub_0818BEAC +_0818BFE0: .4byte RecordedPlayerDoMoveAnimation + thumb_func_end RecordedPlayerHandleMoveAnimation - thumb_func_start sub_0818BFE4 -sub_0818BFE4: @ 0x0818BFE4 + thumb_func_start RecordedPlayerDoMoveAnimation +RecordedPlayerDoMoveAnimation: @ 0x0818BFE4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -812187,7 +812187,7 @@ _0818C046: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _0818C068: ldr r0, [r7] ldrb r1, [r6] @@ -812245,7 +812245,7 @@ _0818C0A6: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -812301,7 +812301,7 @@ _0818C11C: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818C158: pop {r3, r4, r5} mov r8, r3 @@ -812311,7 +812311,7 @@ _0818C158: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818BFE4 + thumb_func_end RecordedPlayerDoMoveAnimation thumb_func_start sub_0818C168 sub_0818C168: @ 0x0818C168 @@ -812327,7 +812327,7 @@ sub_0818C168: @ 0x0818C168 ldr r1, _0818C1AC adds r0, r0, r1 ldrh r0, [r0] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _0818C1B0 movs r1, #0 bl sub_0814FA04 @@ -812350,17 +812350,17 @@ _0818C1B4: .4byte gUnknown_3005AC0 _0818C1B8: .4byte sub_08189F4C thumb_func_end sub_0818C168 - thumb_func_start sub_0818C1BC -sub_0818C1BC: @ 0x0818C1BC + thumb_func_start RecordedPlayerHandlePrintSelectionString +RecordedPlayerHandlePrintSelectionString: @ 0x0818C1BC push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C1BC + thumb_func_end RecordedPlayerHandlePrintSelectionString - thumb_func_start sub_0818C1C8 -sub_0818C1C8: @ 0x0818C1C8 + thumb_func_start ChooseActionInBattlePalace +ChooseActionInBattlePalace: @ 0x0818C1C8 push {lr} ldr r1, _0818C1F8 ldr r0, _0818C1FC @@ -812371,14 +812371,14 @@ sub_0818C1C8: @ 0x0818C1C8 blo _0818C1F2 ldr r0, _0818C200 ldrb r0, [r0] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #1 movs r2, #0 - bl sub_08033FB0 - bl sub_0818A240 + bl BtlController_EmitTwoReturnValues + bl RecordedPlayerBufferExecCompleted _0818C1F2: pop {r0} bx r0 @@ -812386,10 +812386,10 @@ _0818C1F2: _0818C1F8: .4byte gUnknown_2023FD6 _0818C1FC: .4byte gUnknown_2023D10 _0818C200: .4byte gUnknown_2023D08 - thumb_func_end sub_0818C1C8 + thumb_func_end ChooseActionInBattlePalace - thumb_func_start sub_0818C204 -sub_0818C204: @ 0x0818C204 + thumb_func_start RecordedPlayerHandleChooseAction +RecordedPlayerHandleChooseAction: @ 0x0818C204 push {lr} ldr r0, _0818C224 ldr r0, [r0] @@ -812410,36 +812410,36 @@ sub_0818C204: @ 0x0818C204 _0818C224: .4byte gUnknown_2022C90 _0818C228: .4byte gUnknown_3005AC0 _0818C22C: .4byte gUnknown_2023D08 -_0818C230: .4byte sub_0818C1C8 +_0818C230: .4byte ChooseActionInBattlePalace _0818C234: ldr r0, _0818C254 ldrb r0, [r0] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 movs r0, #1 movs r2, #0 - bl sub_08033FB0 - bl sub_0818A240 + bl BtlController_EmitTwoReturnValues + bl RecordedPlayerBufferExecCompleted _0818C24E: pop {r0} bx r0 .align 2, 0 _0818C254: .4byte gUnknown_2023D08 - thumb_func_end sub_0818C204 + thumb_func_end RecordedPlayerHandleChooseAction thumb_func_start sub_0818C258 sub_0818C258: @ 0x0818C258 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0818C258 - thumb_func_start sub_0818C264 -sub_0818C264: @ 0x0818C264 + thumb_func_start RecordedPlayerHandleChooseMove +RecordedPlayerHandleChooseMove: @ 0x0818C264 push {r4, r5, lr} ldr r0, _0818C288 ldr r0, [r0] @@ -812448,56 +812448,56 @@ sub_0818C264: @ 0x0818C264 ands r0, r1 cmp r0, #0 beq _0818C28C - bl sub_0805CDB8 + bl ChooseMoveAndTargetInBattlePalace adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues b _0818C2B0 .align 2, 0 _0818C288: .4byte gUnknown_2022C90 _0818C28C: ldr r5, _0818C2BC ldrb r0, [r5] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x10 orrs r2, r4 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues _0818C2B0: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0818C2BC: .4byte gUnknown_2023D08 - thumb_func_end sub_0818C264 + thumb_func_end RecordedPlayerHandleChooseMove - thumb_func_start sub_0818C2C0 -sub_0818C2C0: @ 0x0818C2C0 + thumb_func_start RecordedPlayerHandleChooseItem +RecordedPlayerHandleChooseItem: @ 0x0818C2C0 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C2C0 + thumb_func_end RecordedPlayerHandleChooseItem - thumb_func_start sub_0818C2CC -sub_0818C2CC: @ 0x0818C2CC + thumb_func_start RecordedPlayerHandleChoosePokemon +RecordedPlayerHandleChoosePokemon: @ 0x0818C2CC push {r4, lr} ldr r4, _0818C300 ldrb r0, [r4] - bl sub_08184EB4 + bl RecordedBattle_GetBattlerAction ldrb r1, [r4] ldr r3, _0818C304 ldr r2, [r3] @@ -812511,34 +812511,34 @@ sub_0818C2CC: @ 0x0818C2CC ldrb r1, [r0] movs r0, #1 movs r2, #0 - bl sub_08033FDC - bl sub_0818A240 + bl BtlController_EmitChosenMonReturnValue + bl RecordedPlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _0818C300: .4byte gUnknown_2023D08 _0818C304: .4byte gUnknown_2024140 - thumb_func_end sub_0818C2CC + thumb_func_end RecordedPlayerHandleChoosePokemon - thumb_func_start sub_0818C308 -sub_0818C308: @ 0x0818C308 + thumb_func_start RecordedPlayerHandleCmd23 +RecordedPlayerHandleCmd23: @ 0x0818C308 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C308 + thumb_func_end RecordedPlayerHandleCmd23 - thumb_func_start sub_0818C314 -sub_0818C314: @ 0x0818C314 + thumb_func_start RecordedPlayerHandleHealthBarUpdate +RecordedPlayerHandleHealthBarUpdate: @ 0x0818C314 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _0818C38C ldr r0, _0818C390 mov sb, r0 @@ -812566,7 +812566,7 @@ sub_0818C314: @ 0x0818C314 ldr r4, _0818C39C adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -812576,7 +812576,7 @@ sub_0818C314: @ 0x0818C314 muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -812604,7 +812604,7 @@ _0818C3A4: ldr r1, _0818C400 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -812643,23 +812643,23 @@ _0818C404: .4byte gUnknown_3005AD0 _0818C408: .4byte gUnknown_3005AC0 _0818C40C: .4byte gUnknown_2023D08 _0818C410: .4byte sub_08189DD0 - thumb_func_end sub_0818C314 + thumb_func_end RecordedPlayerHandleHealthBarUpdate - thumb_func_start sub_0818C414 -sub_0818C414: @ 0x0818C414 + thumb_func_start RecordedPlayerHandleExpUpdate +RecordedPlayerHandleExpUpdate: @ 0x0818C414 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C414 + thumb_func_end RecordedPlayerHandleExpUpdate - thumb_func_start sub_0818C420 -sub_0818C420: @ 0x0818C420 + thumb_func_start RecordedPlayerHandleStatusIconUpdate +RecordedPlayerHandleStatusIconUpdate: @ 0x0818C420 push {r4, lr} ldr r4, _0818C47C ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0818C474 @@ -812676,7 +812676,7 @@ sub_0818C420: @ 0x0818C420 ldr r2, _0818C488 adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _0818C48C ldr r0, [r0] @@ -812708,14 +812708,14 @@ _0818C488: .4byte gUnknown_2024190 _0818C48C: .4byte gUnknown_2024174 _0818C490: .4byte gUnknown_3005AC0 _0818C494: .4byte CompleteOnFinishedStatusAnimation - thumb_func_end sub_0818C420 + thumb_func_end RecordedPlayerHandleStatusIconUpdate - thumb_func_start sub_0818C498 -sub_0818C498: @ 0x0818C498 + thumb_func_start RecordedPlayerHandleStatusAnimation +RecordedPlayerHandleStatusAnimation: @ 0x0818C498 push {r4, r5, lr} ldr r5, _0818C4F0 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0818C4E8 @@ -812743,7 +812743,7 @@ sub_0818C498: @ 0x0818C498 ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _0818C4F8 ldrb r0, [r5] lsls r0, r0, #2 @@ -812759,48 +812759,48 @@ _0818C4F0: .4byte gUnknown_2023D08 _0818C4F4: .4byte gUnknown_2022D08 _0818C4F8: .4byte gUnknown_3005AC0 _0818C4FC: .4byte CompleteOnFinishedStatusAnimation - thumb_func_end sub_0818C498 + thumb_func_end RecordedPlayerHandleStatusAnimation - thumb_func_start sub_0818C500 -sub_0818C500: @ 0x0818C500 + thumb_func_start RecordedPlayerHandleStatusXor +RecordedPlayerHandleStatusXor: @ 0x0818C500 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C500 + thumb_func_end RecordedPlayerHandleStatusXor - thumb_func_start sub_0818C50C -sub_0818C50C: @ 0x0818C50C + thumb_func_start RecordedPlayerHandleDataTransfer +RecordedPlayerHandleDataTransfer: @ 0x0818C50C push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C50C + thumb_func_end RecordedPlayerHandleDataTransfer - thumb_func_start sub_0818C518 -sub_0818C518: @ 0x0818C518 + thumb_func_start RecordedPlayerHandleDMA3Transfer +RecordedPlayerHandleDMA3Transfer: @ 0x0818C518 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C518 + thumb_func_end RecordedPlayerHandleDMA3Transfer - thumb_func_start sub_0818C524 -sub_0818C524: @ 0x0818C524 + thumb_func_start RecordedPlayerHandlePlayBGM +RecordedPlayerHandlePlayBGM: @ 0x0818C524 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C524 + thumb_func_end RecordedPlayerHandlePlayBGM thumb_func_start sub_0818C530 sub_0818C530: @ 0x0818C530 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812809,7 +812809,7 @@ sub_0818C530: @ 0x0818C530 thumb_func_start sub_0818C53C sub_0818C53C: @ 0x0818C53C push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812818,7 +812818,7 @@ sub_0818C53C: @ 0x0818C53C thumb_func_start sub_0818C548 sub_0818C548: @ 0x0818C548 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812827,7 +812827,7 @@ sub_0818C548: @ 0x0818C548 thumb_func_start sub_0818C554 sub_0818C554: @ 0x0818C554 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812836,7 +812836,7 @@ sub_0818C554: @ 0x0818C554 thumb_func_start sub_0818C560 sub_0818C560: @ 0x0818C560 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812851,7 +812851,7 @@ RecordedPlayerHandleCmd37: @ 0x0818C56C rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812877,7 +812877,7 @@ RecordedPlayerHandleCmd38: @ 0x0818C588 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812894,7 +812894,7 @@ RecordedPlayerHandleCmd39: @ 0x0818C5C0 movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812916,7 +812916,7 @@ RecordedPlayerHandleCmd40: @ 0x0818C5D8 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -812941,7 +812941,7 @@ sub_0818C600: @ 0x0818C600 lsls r0, r0, #0x1d cmp r0, #0 bge _0818C634 - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted b _0818C65E .align 2, 0 _0818C628: .4byte gUnknown_20205AC @@ -812978,21 +812978,21 @@ _0818C668: .4byte gUnknown_3005AC0 _0818C66C: .4byte sub_08189F64 thumb_func_end sub_0818C600 - thumb_func_start sub_0818C670 -sub_0818C670: @ 0x0818C670 + thumb_func_start RecordedPlayerHandleCmd42 +RecordedPlayerHandleCmd42: @ 0x0818C670 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C670 + thumb_func_end RecordedPlayerHandleCmd42 thumb_func_start sub_0818C67C sub_0818C67C: @ 0x0818C67C push {r4, lr} ldr r4, _0818C6B8 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -813012,8 +813012,8 @@ _0818C690: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_0818A240 + bl PlaySE12WithPanning + bl RecordedPlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -813022,8 +813022,8 @@ _0818C6B8: .4byte gUnknown_2023D08 _0818C6BC: .4byte gUnknown_2022D08 thumb_func_end sub_0818C67C - thumb_func_start sub_0818C6C0 -sub_0818C6C0: @ 0x0818C6C0 + thumb_func_start RecordedPlayerHandlePlayFanfareOrBGM +RecordedPlayerHandlePlayFanfareOrBGM: @ 0x0818C6C0 push {r4, r5, lr} ldr r4, _0818C6F4 ldr r5, _0818C6F8 @@ -813034,7 +813034,7 @@ sub_0818C6C0: @ 0x0818C6C0 ldrb r0, [r0] cmp r0, #0 beq _0818C6FC - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -813045,7 +813045,7 @@ sub_0818C6C0: @ 0x0818C6C0 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _0818C710 .align 2, 0 _0818C6F4: .4byte gUnknown_2022D08 @@ -813059,17 +813059,17 @@ _0818C6FC: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _0818C710: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818C6C0 + thumb_func_end RecordedPlayerHandlePlayFanfareOrBGM - thumb_func_start sub_0818C71C -sub_0818C71C: @ 0x0818C71C + thumb_func_start RecordedPlayerHandleFaintingCry +RecordedPlayerHandleFaintingCry: @ 0x0818C71C push {lr} ldr r1, _0818C750 ldr r0, _0818C754 @@ -813082,21 +813082,21 @@ sub_0818C71C: @ 0x0818C71C ldr r1, _0818C758 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 rsbs r1, r1, #0 movs r2, #5 - bl sub_080A2BAC - bl sub_0818A240 + bl PlayCry3 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _0818C750: .4byte gUnknown_2023D12 _0818C754: .4byte gUnknown_2023D08 _0818C758: .4byte gUnknown_2024190 - thumb_func_end sub_0818C71C + thumb_func_end RecordedPlayerHandleFaintingCry thumb_func_start sub_0818C75C sub_0818C75C: @ 0x0818C75C @@ -813108,13 +813108,13 @@ sub_0818C75C: @ 0x0818C75C adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _0818C78C ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -813123,8 +813123,8 @@ _0818C788: .4byte gUnknown_2023D08 _0818C78C: .4byte gUnknown_20240A0 thumb_func_end sub_0818C75C - thumb_func_start sub_0818C790 -sub_0818C790: @ 0x0818C790 + thumb_func_start RecordedPlayerHandleIntroTrainerBallThrow +RecordedPlayerHandleIntroTrainerBallThrow: @ 0x0818C790 push {r4, r5, r6, lr} ldr r5, _0818C85C ldr r6, _0818C860 @@ -813191,7 +813191,7 @@ sub_0818C790: @ 0x0818C790 lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _0818C870 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r0, [r6] adds r0, r0, r5 ldrb r1, [r0] @@ -813214,7 +813214,7 @@ sub_0818C790: @ 0x0818C790 beq _0818C880 ldr r4, _0818C87C ldrb r0, [r6] - bl sub_0806D300 + bl GetBattlerMultiplayerId lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -813245,7 +813245,7 @@ _0818C886: lsls r2, r2, #1 adds r1, r4, r2 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r2, _0818C928 ldr r1, _0818C92C ldr r5, _0818C930 @@ -813263,7 +813263,7 @@ _0818C886: strb r0, [r1, #5] ldr r0, _0818C934 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _0818C938 @@ -813321,10 +813321,10 @@ _0818C934: .4byte sub_0818C950 _0818C938: .4byte gUnknown_3005B60 _0818C93C: .4byte gUnknown_2024174 _0818C940: .4byte gUnknown_2024158 -_0818C944: .4byte sub_0807352C +_0818C944: .4byte Task_HidePartyStatusSummary _0818C948: .4byte gUnknown_3005AC0 _0818C94C: .4byte sub_08189674 - thumb_func_end sub_0818C790 + thumb_func_end RecordedPlayerHandleIntroTrainerBallThrow thumb_func_start sub_0818C950 sub_0818C950: @ 0x0818C950 @@ -813356,7 +813356,7 @@ _0818C97C: mov sb, r0 ldrh r0, [r1, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _0818C99C @@ -813419,7 +813419,7 @@ _0818C9CC: muls r0, r2, r0 ldr r2, _0818CA4C adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r7] movs r1, #0 bl sub_0818B798 @@ -813437,7 +813437,7 @@ _0818CA20: mov r3, sb strb r3, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _0818CA38: pop {r3, r4} mov r8, r3 @@ -813454,8 +813454,8 @@ _0818CA54: .4byte gUnknown_2023D08 _0818CA58: .4byte sub_08189A6C thumb_func_end sub_0818C950 - thumb_func_start sub_0818CA5C -sub_0818CA5C: @ 0x0818CA5C + thumb_func_start RecordedPlayerHandleDrawPartyStatusSummary +RecordedPlayerHandleDrawPartyStatusSummary: @ 0x0818CA5C push {r4, r5, r6, lr} ldr r1, _0818CA84 ldr r0, _0818CA88 @@ -813467,11 +813467,11 @@ sub_0818CA5C: @ 0x0818CA5C cmp r0, #0 beq _0818CA8C adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _0818CA8C - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted b _0818CB00 .align 2, 0 _0818CA84: .4byte gUnknown_2022D08 @@ -813500,7 +813500,7 @@ _0818CA8C: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _0818CB14 ldrb r1, [r5] adds r1, r1, r2 @@ -813546,7 +813546,7 @@ _0818CB10: .4byte gUnknown_2022D0C _0818CB14: .4byte gUnknown_2024158 _0818CB18: .4byte gUnknown_3005AC0 _0818CB1C: .4byte sub_0818CB20 - thumb_func_end sub_0818CA5C + thumb_func_end RecordedPlayerHandleDrawPartyStatusSummary thumb_func_start sub_0818CB20 sub_0818CB20: @ 0x0818CB20 @@ -813576,7 +813576,7 @@ sub_0818CB20: @ 0x0818CB20 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted _0818CB58: pop {r4} pop {r0} @@ -813614,7 +813614,7 @@ RecordedPlayerHandleHidePartyStatusSummary: @ 0x0818CB68 ldr r1, _0818CBB4 str r1, [r0] _0818CB9A: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -813622,24 +813622,24 @@ _0818CBA4: .4byte gUnknown_2024174 _0818CBA8: .4byte gUnknown_2023D08 _0818CBAC: .4byte gUnknown_3005B60 _0818CBB0: .4byte gUnknown_2024158 -_0818CBB4: .4byte sub_0807352C +_0818CBB4: .4byte Task_HidePartyStatusSummary thumb_func_end RecordedPlayerHandleHidePartyStatusSummary - thumb_func_start sub_0818CBB8 -sub_0818CBB8: @ 0x0818CBB8 + thumb_func_start RecordedPlayerHandleEndBounceEffect +RecordedPlayerHandleEndBounceEffect: @ 0x0818CBB8 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818CBB8 + thumb_func_end RecordedPlayerHandleEndBounceEffect - thumb_func_start sub_0818CBC4 -sub_0818CBC4: @ 0x0818CBC4 + thumb_func_start RecordedPlayerHandleSpriteInvisibility +RecordedPlayerHandleSpriteInvisibility: @ 0x0818CBC4 push {r4, lr} ldr r4, _0818CC14 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _0818CC0A @@ -813670,7 +813670,7 @@ sub_0818CBC4: @ 0x0818CBC4 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _0818CC0A: - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -813679,15 +813679,15 @@ _0818CC14: .4byte gUnknown_2023D08 _0818CC18: .4byte gUnknown_20205AC _0818CC1C: .4byte gUnknown_2023E88 _0818CC20: .4byte gUnknown_2022D08 - thumb_func_end sub_0818CBC4 + thumb_func_end RecordedPlayerHandleSpriteInvisibility - thumb_func_start sub_0818CC24 -sub_0818CC24: @ 0x0818CC24 + thumb_func_start RecordedPlayerHandleBattleAnimation +RecordedPlayerHandleBattleAnimation: @ 0x0818CC24 push {r4, r5, r6, lr} sub sp, #4 ldr r6, _0818CC68 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _0818CC7C @@ -813708,11 +813708,11 @@ sub_0818CC24: @ 0x0818CC24 str r4, [sp] adds r0, r2, #0 adds r1, r2, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _0818CC70 - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted b _0818CC7C .align 2, 0 _0818CC68: .4byte gUnknown_2023D08 @@ -813732,28 +813732,28 @@ _0818CC7C: .align 2, 0 _0818CC84: .4byte gUnknown_3005AC0 _0818CC88: .4byte CompleteOnFinishedBattleAnimation - thumb_func_end sub_0818CC24 + thumb_func_end RecordedPlayerHandleBattleAnimation - thumb_func_start sub_0818CC8C -sub_0818CC8C: @ 0x0818CC8C + thumb_func_start RecordedPlayerHandleLinkStandbyMsg +RecordedPlayerHandleLinkStandbyMsg: @ 0x0818CC8C push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818CC8C + thumb_func_end RecordedPlayerHandleLinkStandbyMsg - thumb_func_start sub_0818CC98 -sub_0818CC98: @ 0x0818CC98 + thumb_func_start RecordedPlayerHandleResetActionMoveSelection +RecordedPlayerHandleResetActionMoveSelection: @ 0x0818CC98 push {lr} - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818CC98 + thumb_func_end RecordedPlayerHandleResetActionMoveSelection - thumb_func_start sub_0818CCA4 -sub_0818CCA4: @ 0x0818CCA4 + thumb_func_start RecordedPlayerHandleCmd55 +RecordedPlayerHandleCmd55: @ 0x0818CCA4 push {r4, lr} ldr r2, _0818CCDC ldr r1, _0818CCE0 @@ -813768,7 +813768,7 @@ sub_0818CCA4: @ 0x0818CCA4 bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_0818A240 + bl RecordedPlayerBufferExecCompleted ldr r1, _0818CCE8 ldrb r0, [r4] lsls r0, r0, #2 @@ -813784,7 +813784,7 @@ _0818CCE0: .4byte gUnknown_2022D08 _0818CCE4: .4byte gUnknown_2023D08 _0818CCE8: .4byte gUnknown_3005AC0 _0818CCEC: .4byte sub_080583C0 - thumb_func_end sub_0818CCA4 + thumb_func_end RecordedPlayerHandleCmd55 thumb_func_start sub_0818CCF0 sub_0818CCF0: @ 0x0818CCF0 @@ -813822,8 +813822,8 @@ _0818CD18: .4byte gUnknown_85D3AB8 _0818CD1C: .4byte gUnknown_203C9D0 thumb_func_end ResetAllPicSprites - thumb_func_start sub_0818CD20 -sub_0818CD20: @ 0x0818CD20 + thumb_func_start DecompressPic +DecompressPic: @ 0x0818CD20 push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r1, #0 @@ -813880,7 +813880,7 @@ _0818CD80: adds r1, r5, #0 adds r2, r4, #0 adds r3, r6, #0 - bl sub_080349D4 + bl LoadSpecialPokePic_DontHandleDeoxys b _0818CDBA .align 2, 0 _0818CD90: .4byte gUnknown_82D6148 @@ -813892,7 +813892,7 @@ _0818CD94: adds r0, r0, r1 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08034448 + bl DecompressPicFromTable b _0818CDBA .align 2, 0 _0818CDA8: .4byte gUnknown_82D8EE4 @@ -813902,7 +813902,7 @@ _0818CDAC: adds r0, r0, r1 adds r1, r5, #0 adds r2, r7, #0 - bl sub_08034448 + bl DecompressPicFromTable _0818CDBA: movs r0, #0 add sp, #4 @@ -813911,7 +813911,7 @@ _0818CDBA: bx r1 .align 2, 0 _0818CDC4: .4byte gUnknown_82D95DC - thumb_func_end sub_0818CD20 + thumb_func_end DecompressPic thumb_func_start DecompressPic_HandleDeoxys DecompressPic_HandleDeoxys: @ 0x0818CDC8 @@ -813927,7 +813927,7 @@ DecompressPic_HandleDeoxys: @ 0x0818CDC8 str r4, [sp] movs r4, #0 str r4, [sp, #4] - bl sub_0818CD20 + bl DecompressPic lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #8 @@ -813936,8 +813936,8 @@ DecompressPic_HandleDeoxys: @ 0x0818CDC8 bx r1 thumb_func_end DecompressPic_HandleDeoxys - thumb_func_start sub_0818CDF0 -sub_0818CDF0: @ 0x0818CDF0 + thumb_func_start LoadPicPaletteByTagOrSlot +LoadPicPaletteByTagOrSlot: @ 0x0818CDF0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -813968,7 +813968,7 @@ sub_0818CDF0: @ 0x0818CDF0 adds r0, r4, #0 adds r1, r7, #0 mov r2, r8 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality lsls r1, r5, #0x14 b _0818CE70 .align 2, 0 @@ -813980,8 +813980,8 @@ _0818CE3C: adds r0, r4, #0 adds r1, r7, #0 mov r2, r8 - bl sub_0806E258 - bl sub_080343E4 + bl GetMonSpritePalStructFromOtIdPersonality + bl LoadCompressedSpritePalette b _0818CE9A .align 2, 0 _0818CE50: .4byte gUnknown_203C9B8 @@ -814006,7 +814006,7 @@ _0818CE70: adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _0818CE9A .align 2, 0 _0818CE80: .4byte 0x0000FFFF @@ -814018,7 +814018,7 @@ _0818CE8C: lsls r0, r6, #3 ldr r1, _0818CEA8 adds r0, r0, r1 - bl sub_080343E4 + bl LoadCompressedSpritePalette _0818CE9A: pop {r3} mov r8, r3 @@ -814028,10 +814028,10 @@ _0818CE9A: .align 2, 0 _0818CEA4: .4byte gUnknown_203C9B8 _0818CEA8: .4byte gUnknown_82D91CC - thumb_func_end sub_0818CDF0 + thumb_func_end LoadPicPaletteByTagOrSlot - thumb_func_start sub_0818CEAC -sub_0818CEAC: @ 0x0818CEAC + thumb_func_start LoadPicPaletteBySlot +LoadPicPaletteBySlot: @ 0x0818CEAC push {r4, r5, lr} adds r5, r1, #0 ldr r1, [sp, #0xc] @@ -814043,10 +814043,10 @@ sub_0818CEAC: @ 0x0818CEAC cmp r1, #0 bne _0818CED0 adds r1, r5, #0 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality lsls r1, r4, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _0818CEE0 _0818CED0: ldr r1, _0818CEE8 @@ -814055,17 +814055,17 @@ _0818CED0: ldr r0, [r0] lsls r1, r4, #4 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette _0818CEE0: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0818CEE8: .4byte gUnknown_82D91CC - thumb_func_end sub_0818CEAC + thumb_func_end LoadPicPaletteBySlot - thumb_func_start sub_0818CEEC -sub_0818CEEC: @ 0x0818CEEC + thumb_func_start AssignSpriteAnimsTable +AssignSpriteAnimsTable: @ 0x0818CEEC push {lr} lsls r0, r0, #0x18 cmp r0, #0 @@ -814088,10 +814088,10 @@ _0818CF0C: .align 2, 0 _0818CF10: .4byte gUnknown_203C9B8 _0818CF14: .4byte gUnknown_82D8BFC - thumb_func_end sub_0818CEEC + thumb_func_end AssignSpriteAnimsTable - thumb_func_start sub_0818CF18 -sub_0818CF18: @ 0x0818CF18 + thumb_func_start CreatePicSprite +CreatePicSprite: @ 0x0818CF18 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -814164,7 +814164,7 @@ _0818CF88: cmp r0, #0 bne _0818CFB8 adds r0, r7, #0 - bl sub_08000BF0 + bl Free _0818CFAC: ldr r0, _0818CFB4 b _0818D082 @@ -814179,7 +814179,7 @@ _0818CFB8: ldr r1, [sp, #0x10] ldr r2, [sp, #0x14] adds r3, r7, #0 - bl sub_0818CD20 + bl DecompressPic lsls r0, r0, #0x10 cmp r0, #0 bne _0818CFAC @@ -814213,7 +814213,7 @@ _0818CFF2: mov r0, ip str r0, [r5, #4] mov r0, sb - bl sub_0818CEEC + bl AssignSpriteAnimsTable mov r1, r8 str r1, [r5, #0xc] ldr r0, _0818D0A0 @@ -814228,14 +814228,14 @@ _0818CFF2: ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] ldr r3, [sp, #0x20] - bl sub_0818CDF0 + bl LoadPicPaletteByTagOrSlot ldr r2, [sp, #0x24] asrs r1, r2, #0x10 ldr r0, [sp, #0x28] asrs r2, r0, #0x10 adds r0, r5, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r6, r2, #0 @@ -814288,7 +814288,7 @@ _0818D0A0: .4byte gUnknown_82BF310 _0818D0A4: .4byte sub_0818CCF4 _0818D0A8: .4byte gUnknown_20205AC _0818D0AC: .4byte gUnknown_203C9D0 - thumb_func_end sub_0818CF18 + thumb_func_end CreatePicSprite thumb_func_start CreatePicSprite_HandleDeoxys CreatePicSprite_HandleDeoxys: @ 0x0818D0B0 @@ -814329,7 +814329,7 @@ CreatePicSprite_HandleDeoxys: @ 0x0818D0B0 str r7, [sp, #0x10] movs r4, #0 str r4, [sp, #0x14] - bl sub_0818CF18 + bl CreatePicSprite lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #0x18 @@ -814341,8 +814341,8 @@ CreatePicSprite_HandleDeoxys: @ 0x0818D0B0 bx r1 thumb_func_end CreatePicSprite_HandleDeoxys - thumb_func_start sub_0818D110 -sub_0818D110: @ 0x0818D110 + thumb_func_start CreatePicSprite2 +CreatePicSprite2: @ 0x0818D110 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -814419,7 +814419,7 @@ _0818D196: cmp r0, #0 bne _0818D1B0 adds r0, r7, #0 - bl sub_08000BF0 + bl Free _0818D1A8: ldr r0, _0818D1AC b _0818D2B4 @@ -814433,7 +814433,7 @@ _0818D1B0: ldr r1, [sp, #0xc] adds r2, r6, #0 adds r3, r7, #0 - bl sub_0818CD20 + bl DecompressPic lsls r0, r0, #0x10 cmp r0, #0 bne _0818D1A8 @@ -814510,14 +814510,14 @@ _0818D244: ldr r1, [sp, #8] ldr r2, [sp, #0xc] ldr r3, [sp, #0x18] - bl sub_0818CDF0 + bl LoadPicPaletteByTagOrSlot ldr r2, [sp, #0x20] asrs r1, r2, #0x10 ldr r0, [sp, #0x24] asrs r2, r0, #0x10 adds r0, r4, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 adds r6, r2, #0 @@ -814571,10 +814571,10 @@ _0818D2CC: .4byte sub_0818CCF4 _0818D2D0: .4byte 0x0000FFFF _0818D2D4: .4byte gUnknown_20205AC _0818D2D8: .4byte gUnknown_203C9D0 - thumb_func_end sub_0818D110 + thumb_func_end CreatePicSprite2 - thumb_func_start sub_0818D2DC -sub_0818D2DC: @ 0x0818D2DC + thumb_func_start FreeAndDestroyPicSpriteInternal +FreeAndDestroyPicSpriteInternal: @ 0x0818D2DC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -814640,9 +814640,9 @@ _0818D350: adds r0, r0, r1 bl DestroySprite mov r0, r8 - bl sub_08000BF0 + bl Free adds r0, r7, #0 - bl sub_08000BF0 + bl Free adds r1, r5, #0 ldr r0, _0818D384 ldm r0!, {r2, r3, r4} @@ -814658,7 +814658,7 @@ _0818D372: _0818D37C: .4byte 0x0000FFFF _0818D380: .4byte gUnknown_20205AC _0818D384: .4byte gUnknown_85D3AB8 - thumb_func_end sub_0818D2DC + thumb_func_end FreeAndDestroyPicSpriteInternal thumb_func_start sub_0818D388 sub_0818D388: @ 0x0818D388 @@ -814686,7 +814686,7 @@ sub_0818D388: @ 0x0818D388 lsrs r6, r3, #0x18 adds r0, r2, #0 movs r1, #7 - bl sub_0800401C + bl GetWindowAttribute adds r3, r0, #0 movs r0, #0 str r0, [sp] @@ -814702,7 +814702,7 @@ sub_0818D388: @ 0x0818D388 mov r1, sb adds r2, r7, #0 mov r3, r8 - bl sub_0818CEAC + bl LoadPicPaletteBySlot movs r0, #0 b _0818D3E6 _0818D3E4: @@ -814780,15 +814780,15 @@ sub_0818D3F8: @ 0x0818D3F8 adds r1, r4, #0 movs r2, #0 movs r3, #0 - bl sub_080038AC + bl BlitBitmapRectToWindow str r6, [sp] mov r0, sb ldr r1, [sp, #0x18] ldr r2, [sp, #0x1c] ldr r3, [sp, #0x20] - bl sub_0818CEAC + bl LoadPicPaletteBySlot adds r0, r4, #0 - bl sub_08000BF0 + bl Free movs r0, #0 b _0818D490 _0818D48E: @@ -814845,7 +814845,7 @@ CreateMonPicSprite: @ 0x0818D4A4 movs r4, #0 str r4, [sp, #0x10] str r7, [sp, #0x14] - bl sub_0818CF18 + bl CreatePicSprite lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #0x18 @@ -814896,18 +814896,18 @@ CreateMonPicSprite_HandleDeoxys: @ 0x0818D504 bx r1 thumb_func_end CreateMonPicSprite_HandleDeoxys - thumb_func_start sub_0818D54C -sub_0818D54C: @ 0x0818D54C + thumb_func_start FreeAndDestroyMonPicSprite +FreeAndDestroyMonPicSprite: @ 0x0818D54C push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0818D2DC + bl FreeAndDestroyPicSpriteInternal lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0818D54C + thumb_func_end FreeAndDestroyMonPicSprite thumb_func_start sub_0818D560 sub_0818D560: @ 0x0818D560 @@ -815012,18 +815012,18 @@ CreateTrainerPicSprite: @ 0x0818D5D8 bx r1 thumb_func_end CreateTrainerPicSprite - thumb_func_start sub_0818D61C -sub_0818D61C: @ 0x0818D61C + thumb_func_start FreeAndDestroyTrainerPicSprite +FreeAndDestroyTrainerPicSprite: @ 0x0818D61C push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0818D2DC + bl FreeAndDestroyPicSpriteInternal lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0818D61C + thumb_func_end FreeAndDestroyTrainerPicSprite thumb_func_start sub_0818D630 sub_0818D630: @ 0x0818D630 @@ -815091,8 +815091,8 @@ sub_0818D664: @ 0x0818D664 bx r1 thumb_func_end sub_0818D664 - thumb_func_start sub_0818D6A8 -sub_0818D6A8: @ 0x0818D6A8 + thumb_func_start PlayerGenderToFrontTrainerPicId_Debug +PlayerGenderToFrontTrainerPicId_Debug: @ 0x0818D6A8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -815117,7 +815117,7 @@ _0818D6CE: bx r1 .align 2, 0 _0818D6D4: .4byte gUnknown_82EFF00 - thumb_func_end sub_0818D6A8 + thumb_func_end PlayerGenderToFrontTrainerPicId_Debug thumb_func_start sub_0818D6D8 sub_0818D6D8: @ 0x0818D6D8 @@ -815183,8 +815183,8 @@ _0818D750: _0818D758: .4byte gUnknown_2037290 thumb_func_end sub_0818D6EC - thumb_func_start sub_0818D75C -sub_0818D75C: @ 0x0818D75C + thumb_func_start SetLilycoveLady +SetLilycoveLady: @ 0x0818D75C push {lr} ldr r0, _0818D784 ldr r0, [r0] @@ -815222,7 +815222,7 @@ _0818D79E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818D75C + thumb_func_end SetLilycoveLady thumb_func_start sub_0818D7A4 sub_0818D7A4: @ 0x0818D7A4 @@ -815255,8 +815255,8 @@ _0818D7D2: .align 2, 0 thumb_func_end sub_0818D7A4 - thumb_func_start sub_0818D7D8 -sub_0818D7D8: @ 0x0818D7D8 + thumb_func_start SetLilycoveLadyRandomly +SetLilycoveLadyRandomly: @ 0x0818D7D8 push {lr} bl Random lsls r0, r0, #0x10 @@ -815289,7 +815289,7 @@ _0818D812: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818D7D8 + thumb_func_end SetLilycoveLadyRandomly thumb_func_start sub_0818D818 sub_0818D818: @ 0x0818D818 @@ -815516,7 +815516,7 @@ _0818D9B0: ldr r0, _0818D9C0 ldr r3, _0818D9C4 adds r1, r2, r3 - bl sub_08008888 + bl StringCopy7 movs r0, #1 _0818D9BC: pop {r1} @@ -815574,15 +815574,15 @@ sub_0818DA10: @ 0x0818DA10 bl memset adds r0, r4, #0 adds r1, r5, #0 - bl sub_08008888 + bl StringCopy7 pop {r4, r5} pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0818DA10 - thumb_func_start sub_0818DA30 -sub_0818DA30: @ 0x0818DA30 + thumb_func_start SetRainStrengthFromSoundEffect +SetRainStrengthFromSoundEffect: @ 0x0818DA30 push {lr} ldr r2, _0818DA4C ldr r0, _0818DA50 @@ -815602,7 +815602,7 @@ _0818DA50: .4byte gUnknown_3005AEC _0818DA54: .4byte 0x00003B58 _0818DA58: .4byte 0x00003B5C _0818DA5C: .4byte gUnknown_2021C68 - thumb_func_end sub_0818DA30 + thumb_func_end SetRainStrengthFromSoundEffect thumb_func_start sub_0818DA60 sub_0818DA60: @ 0x0818DA60 @@ -815821,14 +815821,14 @@ sub_0818DBE8: @ 0x0818DBE8 _0818DBFC: .4byte gUnknown_203CA30 thumb_func_end sub_0818DBE8 - thumb_func_start sub_0818DC00 -sub_0818DC00: @ 0x0818DC00 + thumb_func_start CB2_ReturnToField +CB2_ReturnToField: @ 0x0818DC00 push {lr} - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818DC00 + thumb_func_end CB2_ReturnToField thumb_func_start sub_0818DC0C sub_0818DC0C: @ 0x0818DC0C @@ -816061,7 +816061,7 @@ sub_0818DDA4: @ 0x0818DDA4 bne _0818DDDC ldr r0, _0818DDD4 ldr r1, _0818DDD8 - bl sub_08008888 + bl StringCopy7 movs r7, #0 b _0818DE36 .align 2, 0 @@ -816074,7 +816074,7 @@ _0818DDDC: ldr r0, _0818DE40 ldr r2, _0818DE44 adds r1, r1, r2 - bl sub_08008888 + bl StringCopy7 ldr r0, [r5] adds r0, #0x18 bl sub_0818DEB4 @@ -816275,7 +816275,7 @@ _0818DF54: .4byte 0x00003B82 thumb_func_start sub_0818DF58 sub_0818DF58: @ 0x0818DF58 push {lr} - bl sub_0811AD40 + bl ShowEasyChatScreen pop {r0} bx r0 .align 2, 0 @@ -816293,12 +816293,12 @@ sub_0818DF64: @ 0x0818DF64 ldr r6, _0818DFAC ldrh r1, [r0, #0x14] adds r0, r6, #0 - bl sub_0811F180 + bl CopyEasyChatWord ldr r4, _0818DFB0 ldr r0, [r5] ldrh r1, [r0, #0x16] adds r0, r4, #0 - bl sub_0811F180 + bl CopyEasyChatWord adds r0, r6, #0 adds r1, r4, #0 bl StringCompare @@ -816481,7 +816481,7 @@ sub_0818E0D8: @ 0x0818E0D8 ldr r1, _0818E0E8 movs r0, #0x11 strh r0, [r1] - bl sub_0811AD40 + bl ShowEasyChatScreen pop {r0} bx r0 .align 2, 0 @@ -816494,7 +816494,7 @@ sub_0818E0EC: @ 0x0818E0EC ldr r0, _0818E0FC ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem pop {r0} bx r0 .align 2, 0 @@ -816536,7 +816536,7 @@ _0818E11E: ldr r0, [r4] adds r0, #0x18 ldr r1, [r6] - bl sub_08008888 + bl StringCopy7 ldr r0, [r4] ldr r1, _0818E168 ldrb r1, [r1] @@ -816585,7 +816585,7 @@ sub_0818E194: @ 0x0818E194 str r1, [r2] ldr r0, _0818E1BC ldrh r1, [r1, #0x14] - bl sub_0811F180 + bl CopyEasyChatWord pop {r0} bx r0 .align 2, 0 @@ -816595,14 +816595,14 @@ _0818E1B8: .4byte 0x00003B58 _0818E1BC: .4byte gUnknown_2021C68 thumb_func_end sub_0818E194 - thumb_func_start sub_0818E1C0 -sub_0818E1C0: @ 0x0818E1C0 + thumb_func_start MainCB2 +MainCB2: @ 0x0818E1C0 push {lr} - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818E1C0 + thumb_func_end MainCB2 thumb_func_start sub_0818E1CC sub_0818E1CC: @ 0x0818E1CC @@ -816812,8 +816812,8 @@ _0818E358: .4byte gUnknown_3005AF0 _0818E35C: .4byte gUnknown_829BDA5 thumb_func_end sub_0818E30C - thumb_func_start sub_0818E360 -sub_0818E360: @ 0x0818E360 + thumb_func_start GivePokeblockToContestLady +GivePokeblockToContestLady: @ 0x0818E360 push {r4, r5, lr} adds r2, r0, #0 movs r3, #0 @@ -816886,7 +816886,7 @@ _0818E3E8: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0818E360 + thumb_func_end GivePokeblockToContestLady thumb_func_start sub_0818E3F0 sub_0818E3F0: @ 0x0818E3F0 @@ -816911,7 +816911,7 @@ sub_0818E3F0: @ 0x0818E3F0 adds r0, r0, r1 ldr r1, [r0] adds r0, r5, #0 - bl sub_08008828 + bl StringCopy10 pop {r4, r5} pop {r0} bx r0 @@ -817281,8 +817281,8 @@ _0818E6D8: .4byte gUnknown_3005AEC _0818E6DC: .4byte gUnknown_203886A thumb_func_end sub_0818E628 - thumb_func_start sub_0818E6E0 -sub_0818E6E0: @ 0x0818E6E0 + thumb_func_start GetDomeData +GetDomeData: @ 0x0818E6E0 push {r4, r5, r6, lr} ldr r0, _0818E710 ldr r0, [r0] @@ -817586,10 +817586,10 @@ _0818E974: .4byte gUnknown_2037290 _0818E978: .4byte gUnknown_3005AF0 _0818E97C: .4byte 0x00000D0A _0818E980: .4byte 0x0000FFFD - thumb_func_end sub_0818E6E0 + thumb_func_end GetDomeData - thumb_func_start sub_0818E984 -sub_0818E984: @ 0x0818E984 + thumb_func_start SetDomeData +SetDomeData: @ 0x0818E984 push {r4, r5, lr} ldr r0, _0818E9B4 ldr r0, [r0] @@ -817941,10 +817941,10 @@ _0818EC7A: .align 2, 0 _0818EC80: .4byte gUnknown_3005AF0 _0818EC84: .4byte gUnknown_203CBC4 - thumb_func_end sub_0818E984 + thumb_func_end SetDomeData - thumb_func_start sub_0818EC88 -sub_0818EC88: @ 0x0818EC88 + thumb_func_start InitDomeTrainers +InitDomeTrainers: @ 0x0818EC88 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -817956,10 +817956,10 @@ sub_0818EC88: @ 0x0818EC88 str r0, [sp, #0xc] str r0, [sp, #0x10] movs r0, #0x20 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0x18] movs r0, #0x18 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0x1c] ldr r4, _0818EE48 ldr r1, [r4] @@ -818025,7 +818025,7 @@ _0818ED16: add r0, sb movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r5, r8 ldr r1, [r5] ldr r7, _0818EE70 @@ -818049,7 +818049,7 @@ _0818ED44: adds r1, r5, #0 adds r1, #0xd movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r2, r8 ldr r1, [r2] ldr r3, _0818EE74 @@ -818074,7 +818074,7 @@ _0818ED78: adds r1, r5, #0 adds r1, #0x1a movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [r6] adds r2, r5, r7 ldr r3, _0818EE78 @@ -818093,7 +818093,7 @@ _0818ED78: movs r2, #0x64 muls r0, r2, r0 add r0, sb - bl sub_0806CB34 + bl GetNature ldr r1, [r5] adds r1, r1, r7 ldr r3, _0818EE7C @@ -818115,7 +818115,7 @@ _0818EDDA: cmp r2, #5 ble _0818EE88 _0818EDE0: - bl sub_081A375C + bl GetCurrentFacilityWinStreak lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -818184,7 +818184,7 @@ _0818EE7C: .4byte 0x00000F0A _0818EE80: .4byte 0x00000D28 _0818EE84: .4byte 0xFFFFFC00 _0818EE88: - bl sub_081A375C + bl GetCurrentFacilityWinStreak adds r0, #1 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -818254,7 +818254,7 @@ _0818EEFE: _0818EF0A: ldr r3, [sp, #0x2c] lsrs r0, r3, #0x10 - bl sub_08163444 + bl RandomizeFacilityTrainerMonSet lsls r0, r0, #0x10 lsrs r6, r0, #0x10 movs r7, #0 @@ -818381,7 +818381,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0x3b movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x18] ldrh r1, [r2] adds r1, r1, r0 @@ -818389,7 +818389,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0x3c movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x18] ldrh r1, [r3] adds r1, r1, r0 @@ -818397,7 +818397,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0x3e movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x18] ldrh r1, [r2] adds r1, r1, r0 @@ -818405,7 +818405,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0x3f movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x18] ldrh r1, [r3] adds r1, r1, r0 @@ -818413,7 +818413,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0x3d movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x18] ldrh r1, [r2] adds r1, r1, r0 @@ -818421,7 +818421,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x18] ldrh r1, [r3] adds r1, r1, r0 @@ -818429,7 +818429,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -818442,7 +818442,7 @@ _0818EFE6: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r1, r0, #3 subs r1, r1, r0 lsls r1, r1, #2 @@ -818471,7 +818471,7 @@ _0818F0BE: subs r5, #1 cmp r5, #0 bge _0818F0B4 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x14] @@ -818533,7 +818533,7 @@ _0818F118: str r1, [sp, #4] ldr r1, [sp, #0x14] mov r2, r8 - bl sub_0818F37C + bl CalcDomeMonStats ldr r2, [sp, #0x1c] ldr r1, [r2, #4] ldrh r0, [r6] @@ -818770,7 +818770,7 @@ _0818F328: mov r1, sl lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_081A4BE0 + bl GetFrontierBrainMonSpecies ldr r1, _0818F374 ldr r1, [r1] ldr r2, _0818F378 @@ -818785,9 +818785,9 @@ _0818F328: ble _0818F328 _0818F34A: ldr r0, [sp, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [sp, #0x1c] - bl sub_08000BF0 + bl Free add sp, #0x3c pop {r3, r4, r5} mov r8, r3 @@ -818802,10 +818802,10 @@ _0818F36C: .4byte 0xFFFFFC00 _0818F370: .4byte 0x000003FE _0818F374: .4byte gUnknown_3005AF0 _0818F378: .4byte 0x00000D64 - thumb_func_end sub_0818EC88 + thumb_func_end InitDomeTrainers - thumb_func_start sub_0818F37C -sub_0818F37C: @ 0x0818F37C + thumb_func_start CalcDomeMonStats +CalcDomeMonStats: @ 0x0818F37C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -818924,7 +818924,7 @@ _0818F444: lsrs r1, r1, #0x10 ldr r0, [sp, #0x18] movs r2, #1 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -818951,7 +818951,7 @@ _0818F47C: lsrs r1, r1, #0x10 ldr r0, [sp, #0x18] movs r2, #2 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -818978,7 +818978,7 @@ _0818F4B4: lsrs r1, r1, #0x10 ldr r0, [sp, #0x18] movs r2, #3 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -819005,7 +819005,7 @@ _0818F4EC: lsrs r1, r1, #0x10 ldr r0, [sp, #0x18] movs r2, #4 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -819032,7 +819032,7 @@ _0818F524: lsrs r1, r1, #0x10 ldr r0, [sp, #0x18] movs r2, #5 - bl sub_0806D36C + bl ModifyStatByNature lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -819047,7 +819047,7 @@ _0818F524: bx r0 .align 2, 0 _0818F55C: .4byte gUnknown_82F0D54 - thumb_func_end sub_0818F37C + thumb_func_end CalcDomeMonStats thumb_func_start SwapDomeTrainers SwapDomeTrainers: @ 0x0818F560 @@ -819136,8 +819136,8 @@ _0818F604: .4byte 0xFFFFFC00 _0818F608: .4byte 0x00000D64 thumb_func_end SwapDomeTrainers - thumb_func_start sub_0818F60C -sub_0818F60C: @ 0x0818F60C + thumb_func_start BufferDomeRoundText +BufferDomeRoundText: @ 0x0818F60C push {lr} ldr r0, _0818F62C ldr r2, _0818F630 @@ -819157,10 +819157,10 @@ _0818F62C: .4byte gUnknown_2021C40 _0818F630: .4byte gUnknown_85ABD3C _0818F634: .4byte gUnknown_3005AF0 _0818F638: .4byte 0x00000CB2 - thumb_func_end sub_0818F60C + thumb_func_end BufferDomeRoundText - thumb_func_start sub_0818F63C -sub_0818F63C: @ 0x0818F63C + thumb_func_start BufferDomeOpponentName +BufferDomeOpponentName: @ 0x0818F63C push {lr} ldr r0, _0818F664 ldr r2, _0818F668 @@ -819176,7 +819176,7 @@ sub_0818F63C: @ 0x0818F63C ldr r0, _0818F674 ldr r1, _0818F678 ldrh r1, [r1] - bl sub_08195498 + bl CopyDomeTrainerName pop {r0} bx r0 .align 2, 0 @@ -819186,10 +819186,10 @@ _0818F66C: .4byte gUnknown_3005AF0 _0818F670: .4byte 0x00000CB2 _0818F674: .4byte gUnknown_2021C54 _0818F678: .4byte gUnknown_203886A - thumb_func_end sub_0818F63C + thumb_func_end BufferDomeOpponentName - thumb_func_start sub_0818F67C -sub_0818F67C: @ 0x0818F67C + thumb_func_start InitDomeOpponentParty +InitDomeOpponentParty: @ 0x0818F67C push {r4, r5, lr} ldr r1, _0818F6C0 movs r0, #0 @@ -819198,14 +819198,14 @@ sub_0818F67C: @ 0x0818F67C adds r0, r4, #0 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r5, _0818F6C8 str r0, [r5] adds r4, #0x64 adds r0, r4, #0 movs r1, #0x3a movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r1, [r5] adds r1, r1, r0 str r1, [r5] @@ -819215,7 +819215,7 @@ sub_0818F67C: @ 0x0818F67C bl sub_08194F58 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0818F838 + bl CreateDomeOpponentMons pop {r4, r5} pop {r0} bx r0 @@ -819224,10 +819224,10 @@ _0818F6C0: .4byte gUnknown_203CA3C _0818F6C4: .4byte gUnknown_2024190 _0818F6C8: .4byte gUnknown_203CA40 _0818F6CC: .4byte gUnknown_203886A - thumb_func_end sub_0818F67C + thumb_func_end InitDomeOpponentParty - thumb_func_start sub_0818F6D0 -sub_0818F6D0: @ 0x0818F6D0 + thumb_func_start CreateDomeOpponentMon +CreateDomeOpponentMon: @ 0x0818F6D0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -819254,7 +819254,7 @@ sub_0818F6D0: @ 0x0818F6D0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 str r6, [sp, #0x2c] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -819293,7 +819293,7 @@ sub_0818F6D0: @ 0x0818F6D0 str r4, [sp, #4] ldr r7, [sp, #0x14] str r7, [sp, #8] - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID add r0, sp, #0xc movs r1, #1 rsbs r1, r1, #0 @@ -819335,7 +819335,7 @@ _0818F774: adds r0, r7, r2 mov r2, ip str r3, [sp, #0x24] - bl sub_08068D34 + bl SetMonMoveSlot ldr r7, _0818F828 ldr r0, [r7] add r0, sb @@ -819366,7 +819366,7 @@ _0818F7D0: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #0xc - bl sub_0806A774 + bl SetMonData ldr r0, _0818F828 ldr r0, [r0] ldr r1, [sp, #0x20] @@ -819385,7 +819385,7 @@ _0818F7D0: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData add sp, #0x30 pop {r3, r4, r5} mov r8, r3 @@ -819400,10 +819400,10 @@ _0818F828: .4byte gUnknown_3005AF0 _0818F82C: .4byte 0x00000D64 _0818F830: .4byte gUnknown_203B958 _0818F834: .4byte gUnknown_85ADBF4 - thumb_func_end sub_0818F6D0 + thumb_func_end CreateDomeOpponentMon - thumb_func_start sub_0818F838 -sub_0818F838: @ 0x0818F838 + thumb_func_start CreateDomeOpponentMons +CreateDomeOpponentMons: @ 0x0818F838 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -819413,7 +819413,7 @@ sub_0818F838: @ 0x0818F838 movs r6, #0 bl ZeroEnemyPartyMons mov r0, r8 - bl sub_0818F8D4 + bl GetDomeTrainerMonCountInBits adds r5, r0, #0 bl Random adds r4, r0, #0 @@ -819442,7 +819442,7 @@ _0818F87C: adds r0, r6, #0 mov r1, r8 adds r3, r7, #0 - bl sub_0818F6D0 + bl CreateDomeOpponentMon adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -819464,7 +819464,7 @@ _0818F8A4: adds r0, r6, #0 mov r1, r8 adds r3, r7, #0 - bl sub_0818F6D0 + bl CreateDomeOpponentMon adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -819480,10 +819480,10 @@ _0818F8C8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0818F838 + thumb_func_end CreateDomeOpponentMons - thumb_func_start sub_0818F8D4 -sub_0818F8D4: @ 0x0818F8D4 + thumb_func_start GetDomeTrainerMonCountInBits +GetDomeTrainerMonCountInBits: @ 0x0818F8D4 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -819515,7 +819515,7 @@ _0818F912: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0818F8D4 + thumb_func_end GetDomeTrainerMonCountInBits thumb_func_start sub_0818F918 sub_0818F918: @ 0x0818F918 @@ -819573,7 +819573,7 @@ _0818F95C: lsls r1, r7, #0x18 lsrs r0, r0, #0x18 lsrs r1, r1, #0x18 - bl sub_081A4C50 + bl GetFrontierBrainMonMove adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -819608,11 +819608,11 @@ _0818F9BC: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r4, #0 movs r2, #0 - bl sub_0818FC1C + bl GetTypeEffectivenessPoints ldr r1, [r5] adds r1, r1, r0 str r1, [r5] @@ -819699,7 +819699,7 @@ _0818FA58: lsls r1, r7, #0x18 lsrs r0, r0, #0x18 lsrs r1, r1, #0x18 - bl sub_081A4C50 + bl GetFrontierBrainMonMove adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -819734,11 +819734,11 @@ _0818FAB8: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r4, #0 movs r2, #1 - bl sub_0818FC1C + bl GetTypeEffectivenessPoints ldr r1, [r5] adds r1, r1, r0 str r1, [r5] @@ -819916,8 +819916,8 @@ _0818FC06: _0818FC18: .4byte gUnknown_82FACB4 thumb_func_end sub_0818FB10 - thumb_func_start sub_0818FC1C -sub_0818FC1C: @ 0x0818FC1C + thumb_func_start GetTypeEffectivenessPoints +GetTypeEffectivenessPoints: @ 0x0818FC1C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -820156,7 +820156,7 @@ _0818FDB2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0818FC1C + thumb_func_end GetTypeEffectivenessPoints thumb_func_start sub_0818FDC4 sub_0818FDC4: @ 0x0818FDC4 @@ -820191,8 +820191,8 @@ _0818FDF6: bx r1 thumb_func_end sub_0818FDC4 - thumb_func_start sub_0818FDFC -sub_0818FDFC: @ 0x0818FDFC + thumb_func_start TournamentIdOfOpponent +TournamentIdOfOpponent: @ 0x0818FDFC push {r4, r5, r6, r7, lr} adds r3, r0, #0 adds r2, r1, #0 @@ -820320,10 +820320,10 @@ _0818FEEE: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0818FDFC + thumb_func_end TournamentIdOfOpponent - thumb_func_start sub_0818FEF4 -sub_0818FEF4: @ 0x0818FEF4 + thumb_func_start SetDomeOpponentId +SetDomeOpponentId: @ 0x0818FEF4 push {lr} bl TrainerIdOfPlayerOpponent ldr r1, _0818FF04 @@ -820332,7 +820332,7 @@ sub_0818FEF4: @ 0x0818FEF4 bx r0 .align 2, 0 _0818FF04: .4byte gUnknown_203886A - thumb_func_end sub_0818FEF4 + thumb_func_end SetDomeOpponentId thumb_func_start TrainerIdOfPlayerOpponent TrainerIdOfPlayerOpponent: @ 0x0818FF08 @@ -820343,7 +820343,7 @@ TrainerIdOfPlayerOpponent: @ 0x0818FF08 adds r0, r4, r1 ldrh r0, [r0] ldr r1, _0818FF38 - bl sub_0818FDFC + bl TournamentIdOfOpponent lsls r0, r0, #2 adds r4, r4, r0 ldr r0, _0818FF3C @@ -820361,8 +820361,8 @@ _0818FF38: .4byte 0x000003FF _0818FF3C: .4byte 0x00000D24 thumb_func_end TrainerIdOfPlayerOpponent - thumb_func_start sub_0818FF40 -sub_0818FF40: @ 0x0818FF40 + thumb_func_start SetDomeOpponentGraphicsId +SetDomeOpponentGraphicsId: @ 0x0818FF40 push {lr} ldr r0, _0818FF50 ldrh r0, [r0] @@ -820372,7 +820372,7 @@ sub_0818FF40: @ 0x0818FF40 bx r0 .align 2, 0 _0818FF50: .4byte gUnknown_203886A - thumb_func_end sub_0818FF40 + thumb_func_end SetDomeOpponentGraphicsId thumb_func_start sub_0818FF54 sub_0818FF54: @ 0x0818FF54 @@ -820406,8 +820406,8 @@ _0818FF90: .4byte 0x00000CA8 _0818FF94: .4byte 0x00000CA9 thumb_func_end sub_0818FF54 - thumb_func_start sub_0818FF98 -sub_0818FF98: @ 0x0818FF98 + thumb_func_start UpdateDomeStreaks +UpdateDomeStreaks: @ 0x0818FF98 push {r4, r5, lr} ldr r5, _0818FFF8 ldr r0, [r5] @@ -820466,14 +820466,14 @@ _08190004: .4byte 0x00000D0C _08190008: .4byte 0x000003E6 _0819000C: .4byte 0x00000D1C _08190010: .4byte 0x00000D14 - thumb_func_end sub_0818FF98 + thumb_func_end UpdateDomeStreaks - thumb_func_start sub_08190014 -sub_08190014: @ 0x08190014 + thumb_func_start ShowDomeOpponentInfo +ShowDomeOpponentInfo: @ 0x08190014 push {r4, r5, lr} ldr r0, _08190050 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08190054 @@ -820491,18 +820491,18 @@ sub_08190014: @ 0x08190014 strh r5, [r4, #0xc] strh r5, [r4, #0xe] ldr r0, _08190058 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08190050: .4byte sub_0819005C +_08190050: .4byte Task_ShowOpponentInfo _08190054: .4byte gUnknown_3005B60 -_08190058: .4byte sub_08194754 - thumb_func_end sub_08190014 +_08190058: .4byte CB2_BattleDome + thumb_func_end ShowDomeOpponentInfo - thumb_func_start sub_0819005C -sub_0819005C: @ 0x0819005C + thumb_func_start Task_ShowOpponentInfo +Task_ShowOpponentInfo: @ 0x0819005C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -820547,9 +820547,9 @@ _081900A8: b _081903CE _081900AA: movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 bl EnableInterrupts str r4, [sp, #4] @@ -820565,7 +820565,7 @@ _081900AA: movs r2, #4 bl InitBgsFromTemplates ldr r0, _08190114 - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r0, _08190118 strh r4, [r0] @@ -820669,45 +820669,45 @@ _081901CC: movs r0, #2 adds r2, r5, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _0819026C movs r4, #1 str r4, [sp] movs r0, #2 adds r2, r5, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _08190270 movs r2, #0x80 lsls r2, r2, #4 str r4, [sp] movs r0, #3 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r0, _08190274 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _08190278 movs r4, #0x80 lsls r4, r4, #2 movs r1, #0 adds r2, r4, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _0819027C movs r1, #0x80 lsls r1, r1, #1 adds r2, r4, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _08190280 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette mov r0, sb cmp r0, #2 bne _0819023A ldr r0, _08190284 movs r1, #0x50 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette _0819023A: str r7, [sp, #8] add r0, sp, #8 @@ -820715,13 +820715,13 @@ _0819023A: ldr r2, _0819028C bl CpuSet movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg _0819025E: ldrh r0, [r6, #8] adds r0, #1 @@ -820740,10 +820740,10 @@ _08190288: .4byte gUnknown_20377B4 _0819028C: .4byte 0x05000100 _08190290: ldr r0, _081902F4 - bl sub_080006F0 + bl SetVBlankCallback ldr r4, _081902F8 movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r6, #0 lsls r5, r5, #0x18 @@ -820757,10 +820757,10 @@ _081902A6: adds r6, #1 cmp r6, #0xf ble _081902A6 - bl sub_080D27A4 + bl LoadMonIconPalettes ldr r0, _081902FC movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r1, _08190300 @@ -820779,21 +820779,21 @@ _081902A6: bne _08190304 lsrs r1, r5, #0x18 movs r0, #0 - bl sub_08192D7C + bl DisplayMatchInfoOnCard ldr r0, _081902F8 ldr r1, [r0] movs r0, #1 strb r0, [r1, #0x10] b _0819030C .align 2, 0 -_081902F4: .4byte sub_08194770 +_081902F4: .4byte VblankCb0_BattleDome _081902F8: .4byte gUnknown_203CA44 _081902FC: .4byte sub_08190930 _08190300: .4byte gUnknown_3005B60 _08190304: lsrs r1, r5, #0x18 movs r0, #0 - bl sub_0819213C + bl DisplayTrainerInfoOnCard _0819030C: movs r1, #0xfa lsls r1, r1, #5 @@ -820807,7 +820807,7 @@ _0819030C: movs r1, #0x78 movs r2, #4 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r4, r7, #4 @@ -820824,7 +820824,7 @@ _0819030C: movs r1, #0x78 movs r2, #0x9c movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r4, r7, #4 @@ -820840,7 +820840,7 @@ _0819030C: movs r1, #6 movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r0, r7, #4 @@ -820868,7 +820868,7 @@ _081903A2: movs r1, #0xea movs r2, #0x50 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r7, r0, #0x18 lsls r4, r7, #4 @@ -820883,7 +820883,7 @@ _081903A2: strh r0, [r4, #0x30] _081903C8: mov r0, sl - bl sub_080A8964 + bl DestroyTask _081903CE: add sp, #0xc pop {r3, r4, r5} @@ -820897,10 +820897,10 @@ _081903CE: _081903E0: .4byte gUnknown_85D5AE4 _081903E4: .4byte gUnknown_20205AC _081903E8: .4byte gUnknown_85D5ACC - thumb_func_end sub_0819005C + thumb_func_end Task_ShowOpponentInfo - thumb_func_start sub_081903EC -sub_081903EC: @ 0x081903EC + thumb_func_start SpriteCb_TrainerIconCardScrollUp +SpriteCb_TrainerIconCardScrollUp: @ 0x081903EC push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x22] @@ -820949,16 +820949,16 @@ _08190430: movs r1, #0xff strb r1, [r0] ldrh r0, [r2, #0x34] - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite _0819044C: pop {r0} bx r0 .align 2, 0 _08190450: .4byte gUnknown_203CA44 - thumb_func_end sub_081903EC + thumb_func_end SpriteCb_TrainerIconCardScrollUp - thumb_func_start sub_08190454 -sub_08190454: @ 0x08190454 + thumb_func_start SpriteCb_TrainerIconCardScrollDown +SpriteCb_TrainerIconCardScrollDown: @ 0x08190454 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x22] @@ -821007,16 +821007,16 @@ _08190494: movs r1, #0xff strb r1, [r0] ldrh r0, [r2, #0x34] - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite _081904B4: pop {r0} bx r0 .align 2, 0 _081904B8: .4byte gUnknown_203CA44 - thumb_func_end sub_08190454 + thumb_func_end SpriteCb_TrainerIconCardScrollDown - thumb_func_start sub_081904BC -sub_081904BC: @ 0x081904BC + thumb_func_start SpriteCb_TrainerIconCardScrollLeft +SpriteCb_TrainerIconCardScrollLeft: @ 0x081904BC push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x20] @@ -821065,17 +821065,17 @@ _08190500: movs r1, #0xff strb r1, [r0] ldrh r0, [r2, #0x34] - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite _0819051C: pop {r0} bx r0 .align 2, 0 _08190520: .4byte 0x010F0000 _08190524: .4byte gUnknown_203CA44 - thumb_func_end sub_081904BC + thumb_func_end SpriteCb_TrainerIconCardScrollLeft - thumb_func_start sub_08190528 -sub_08190528: @ 0x08190528 + thumb_func_start SpriteCb_TrainerIconCardScrollRight +SpriteCb_TrainerIconCardScrollRight: @ 0x08190528 push {lr} adds r2, r0, #0 ldrh r0, [r2, #0x20] @@ -821125,16 +821125,16 @@ _0819056C: movs r1, #0xff strb r1, [r0] ldrh r0, [r2, #0x34] - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite _0819058C: pop {r0} bx r0 .align 2, 0 _08190590: .4byte gUnknown_203CA44 - thumb_func_end sub_08190528 + thumb_func_end SpriteCb_TrainerIconCardScrollRight - thumb_func_start sub_08190594 -sub_08190594: @ 0x08190594 + thumb_func_start SpriteCb_MonIcon +SpriteCb_MonIcon: @ 0x08190594 push {lr} adds r1, r0, #0 movs r2, #0x34 @@ -821142,15 +821142,15 @@ sub_08190594: @ 0x08190594 cmp r0, #0 bne _081905A6 adds r0, r1, #0 - bl sub_080D297C + bl UpdateMonIconFrame _081905A6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08190594 + thumb_func_end SpriteCb_MonIcon - thumb_func_start sub_081905AC -sub_081905AC: @ 0x081905AC + thumb_func_start SpriteCb_MonIconCardScrollUp +SpriteCb_MonIconCardScrollUp: @ 0x081905AC push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -821158,7 +821158,7 @@ sub_081905AC: @ 0x081905AC cmp r0, #0 bne _081905BE adds r0, r4, #0 - bl sub_080D297C + bl UpdateMonIconFrame _081905BE: ldrh r0, [r4, #0x22] adds r1, r0, #4 @@ -821192,7 +821192,7 @@ _081905E6: str r0, [r4, #0x1c] b _0819061C .align 2, 0 -_081905FC: .4byte sub_08190594 +_081905FC: .4byte SpriteCb_MonIcon _08190600: lsls r0, r1, #0x10 asrs r0, r0, #0x10 @@ -821213,10 +821213,10 @@ _0819061C: bx r0 .align 2, 0 _08190624: .4byte gUnknown_203CA44 - thumb_func_end sub_081905AC + thumb_func_end SpriteCb_MonIconCardScrollUp - thumb_func_start sub_08190628 -sub_08190628: @ 0x08190628 + thumb_func_start SpriteCb_MonIconCardScrollDown +SpriteCb_MonIconCardScrollDown: @ 0x08190628 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -821224,7 +821224,7 @@ sub_08190628: @ 0x08190628 cmp r0, #0 bne _0819063A adds r0, r4, #0 - bl sub_080D297C + bl UpdateMonIconFrame _0819063A: ldrh r0, [r4, #0x22] subs r1, r0, #4 @@ -821256,7 +821256,7 @@ _0819065E: str r0, [r4, #0x1c] b _08190698 .align 2, 0 -_08190674: .4byte sub_08190594 +_08190674: .4byte SpriteCb_MonIcon _08190678: lsls r0, r1, #0x10 asrs r0, r0, #0x10 @@ -821279,10 +821279,10 @@ _08190698: bx r0 .align 2, 0 _081906A0: .4byte gUnknown_203CA44 - thumb_func_end sub_08190628 + thumb_func_end SpriteCb_MonIconCardScrollDown - thumb_func_start sub_081906A4 -sub_081906A4: @ 0x081906A4 + thumb_func_start SpriteCb_MonIconCardScrollLeft +SpriteCb_MonIconCardScrollLeft: @ 0x081906A4 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -821290,7 +821290,7 @@ sub_081906A4: @ 0x081906A4 cmp r0, #0 bne _081906B6 adds r0, r4, #0 - bl sub_080D297C + bl UpdateMonIconFrame _081906B6: ldrh r0, [r4, #0x20] adds r1, r0, #4 @@ -821324,7 +821324,7 @@ _081906DE: str r0, [r4, #0x1c] b _08190714 .align 2, 0 -_081906F4: .4byte sub_08190594 +_081906F4: .4byte SpriteCb_MonIcon _081906F8: lsls r0, r1, #0x10 asrs r0, r0, #0x10 @@ -821345,10 +821345,10 @@ _08190714: bx r0 .align 2, 0 _0819071C: .4byte gUnknown_203CA44 - thumb_func_end sub_081906A4 + thumb_func_end SpriteCb_MonIconCardScrollLeft - thumb_func_start sub_08190720 -sub_08190720: @ 0x08190720 + thumb_func_start SpriteCb_MonIconCardScrollRight +SpriteCb_MonIconCardScrollRight: @ 0x08190720 push {r4, lr} adds r4, r0, #0 movs r1, #0x34 @@ -821356,7 +821356,7 @@ sub_08190720: @ 0x08190720 cmp r0, #0 bne _08190732 adds r0, r4, #0 - bl sub_080D297C + bl UpdateMonIconFrame _08190732: ldrh r0, [r4, #0x20] subs r1, r0, #4 @@ -821389,7 +821389,7 @@ _08190758: str r0, [r4, #0x1c] b _08190790 .align 2, 0 -_0819076C: .4byte sub_08190594 +_0819076C: .4byte SpriteCb_MonIcon _08190770: lsls r0, r1, #0x10 asrs r0, r0, #0x10 @@ -821412,7 +821412,7 @@ _08190790: bx r0 .align 2, 0 _08190798: .4byte gUnknown_203CA44 - thumb_func_end sub_08190720 + thumb_func_end SpriteCb_MonIconCardScrollRight thumb_func_start sub_0819079C sub_0819079C: @ 0x0819079C @@ -821690,7 +821690,7 @@ _081909AC: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081909D4 mov r6, r8 lsls r0, r6, #2 @@ -821745,7 +821745,7 @@ _08190A22: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08190A48 mov r3, r8 lsls r0, r3, #2 @@ -821784,10 +821784,10 @@ _08190A74: lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r6, #1 cmp r6, r5 blt _08190A74 @@ -821903,7 +821903,7 @@ _08190B42: movs r0, #0x10 orrs r0, r2 ldrb r1, [r1] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08190CE0 .align 2, 0 _08190B88: .4byte gUnknown_2022AC8 @@ -821941,7 +821941,7 @@ _08190BAC: movs r0, #0x10 orrs r0, r2 ldrb r1, [r1] - bl sub_0819213C + bl DisplayTrainerInfoOnCard ldr r0, [r5] strb r4, [r0, #0x10] b _08190CE0 @@ -821985,7 +821985,7 @@ _08190BF8: movs r0, #0x10 orrs r0, r1 ldrb r1, [r2, #0x11] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08190CE0 .align 2, 0 _08190C44: .4byte gUnknown_203CA44 @@ -822025,7 +822025,7 @@ _08190C54: movs r0, #0x10 orrs r0, r1 ldrb r1, [r2, #0x12] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08190CE0 .align 2, 0 _08190C9C: .4byte gUnknown_3005B60 @@ -822058,7 +822058,7 @@ _08190CA8: orrs r0, r1 lsls r1, r2, #0x18 lsrs r1, r1, #0x18 - bl sub_08192D7C + bl DisplayMatchInfoOnCard _08190CE0: movs r6, #0 ldr r5, _08190D5C @@ -822123,7 +822123,7 @@ _08190D54: .4byte gUnknown_2022AD2 _08190D58: .4byte gUnknown_3005B60 _08190D5C: .4byte gUnknown_203CA44 _08190D60: .4byte gUnknown_20205AC -_08190D64: .4byte sub_081903EC +_08190D64: .4byte SpriteCb_TrainerIconCardScrollUp _08190D68: mov r2, sl ldr r0, [r2] @@ -822218,11 +822218,11 @@ _08190DCA: strh r1, [r0, #0x34] b _08190E70 .align 2, 0 -_08190E1C: .4byte sub_081905AC +_08190E1C: .4byte SpriteCb_MonIconCardScrollUp _08190E20: .4byte gUnknown_203CA44 _08190E24: .4byte gUnknown_20205AC _08190E28: .4byte gUnknown_3005B60 -_08190E2C: .4byte sub_081903EC +_08190E2C: .4byte SpriteCb_TrainerIconCardScrollUp _08190E30: mov r2, ip ldr r0, [r2] @@ -822269,7 +822269,7 @@ _08190E70: movs r1, #4 bl _08191C44 .align 2, 0 -_08190E88: .4byte sub_081905AC +_08190E88: .4byte SpriteCb_MonIconCardScrollUp _08190E8C: .4byte gUnknown_3005B60 _08190E90: mov r0, sb @@ -822341,7 +822341,7 @@ _08190EE8: movs r0, #4 orrs r0, r2 ldrb r1, [r1] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08191078 .align 2, 0 _08190F28: .4byte gUnknown_2022AC8 @@ -822377,7 +822377,7 @@ _08190F50: movs r0, #4 orrs r0, r2 ldrb r1, [r1] - bl sub_0819213C + bl DisplayTrainerInfoOnCard ldr r0, [r5] strb r4, [r0, #0x10] b _08191078 @@ -822419,7 +822419,7 @@ _08190F98: movs r0, #4 orrs r0, r1 ldrb r1, [r2, #0x11] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08191078 .align 2, 0 _08190FE0: .4byte gUnknown_203CA44 @@ -822457,7 +822457,7 @@ _08190FF0: movs r0, #4 orrs r0, r1 ldrb r1, [r2, #0x12] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08191078 .align 2, 0 _08191034: .4byte gUnknown_3005B60 @@ -822490,7 +822490,7 @@ _08191040: orrs r0, r1 lsls r1, r2, #0x18 lsrs r1, r1, #0x18 - bl sub_08192D7C + bl DisplayMatchInfoOnCard _08191078: movs r6, #0 ldr r0, _081910F4 @@ -822555,7 +822555,7 @@ _081910EC: .4byte gUnknown_2022AD2 _081910F0: .4byte gUnknown_3005B60 _081910F4: .4byte gUnknown_203CA44 _081910F8: .4byte gUnknown_20205AC -_081910FC: .4byte sub_08190454 +_081910FC: .4byte SpriteCb_TrainerIconCardScrollDown _08191100: mov r2, sl ldr r0, [r2] @@ -822650,11 +822650,11 @@ _08191162: strh r1, [r0, #0x34] b _08191208 .align 2, 0 -_081911B4: .4byte sub_08190628 +_081911B4: .4byte SpriteCb_MonIconCardScrollDown _081911B8: .4byte gUnknown_203CA44 _081911BC: .4byte gUnknown_20205AC _081911C0: .4byte gUnknown_3005B60 -_081911C4: .4byte sub_08190454 +_081911C4: .4byte SpriteCb_TrainerIconCardScrollDown _081911C8: mov r2, ip ldr r0, [r2] @@ -822701,7 +822701,7 @@ _08191208: movs r1, #5 bl _08191C44 .align 2, 0 -_08191220: .4byte sub_08190628 +_08191220: .4byte SpriteCb_MonIconCardScrollDown _08191224: .4byte gUnknown_3005B60 _08191228: mov r0, sb @@ -822775,7 +822775,7 @@ _0819127E: movs r0, #8 orrs r0, r2 ldrb r1, [r1] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08191322 .align 2, 0 _081912C0: .4byte gUnknown_2022AC8 @@ -822817,7 +822817,7 @@ _081912E4: movs r0, #8 orrs r0, r2 ldrb r1, [r1] - bl sub_08192D7C + bl DisplayMatchInfoOnCard _08191322: movs r6, #0 ldr r0, _081913A4 @@ -822883,7 +822883,7 @@ _0819139C: .4byte gUnknown_85D5BD8 _081913A0: .4byte gUnknown_3005B60 _081913A4: .4byte gUnknown_203CA44 _081913A8: .4byte gUnknown_20205AC -_081913AC: .4byte sub_081904BC +_081913AC: .4byte SpriteCb_TrainerIconCardScrollLeft _081913B0: mov r2, sl ldr r0, [r2] @@ -822978,11 +822978,11 @@ _08191412: strh r1, [r0, #0x34] b _081914B8 .align 2, 0 -_08191464: .4byte sub_081906A4 +_08191464: .4byte SpriteCb_MonIconCardScrollLeft _08191468: .4byte gUnknown_203CA44 _0819146C: .4byte gUnknown_20205AC _08191470: .4byte gUnknown_3005B60 -_08191474: .4byte sub_081904BC +_08191474: .4byte SpriteCb_TrainerIconCardScrollLeft _08191478: mov r2, ip ldr r0, [r2] @@ -823029,7 +823029,7 @@ _081914B8: movs r1, #6 b _08191C44 .align 2, 0 -_081914D0: .4byte sub_081906A4 +_081914D0: .4byte SpriteCb_MonIconCardScrollLeft _081914D4: .4byte gUnknown_3005B60 _081914D8: mov r0, sb @@ -823095,7 +823095,7 @@ _0819152E: movs r0, #8 orrs r0, r1 ldrb r1, [r2, #0x11] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _081915B4 .align 2, 0 _08191560: .4byte gUnknown_2022AC8 @@ -823131,7 +823131,7 @@ _08191580: orrs r0, r1 lsls r1, r2, #0x18 lsrs r1, r1, #0x18 - bl sub_08192D7C + bl DisplayMatchInfoOnCard _081915B4: movs r6, #0 ldr r0, _08191630 @@ -823196,7 +823196,7 @@ _08191628: .4byte gUnknown_2022AD2 _0819162C: .4byte gUnknown_3005B60 _08191630: .4byte gUnknown_203CA44 _08191634: .4byte gUnknown_20205AC -_08191638: .4byte sub_081904BC +_08191638: .4byte SpriteCb_TrainerIconCardScrollLeft _0819163C: mov r2, sl ldr r0, [r2] @@ -823291,11 +823291,11 @@ _0819169E: strh r1, [r0, #0x34] b _08191744 .align 2, 0 -_081916F0: .4byte sub_081906A4 +_081916F0: .4byte SpriteCb_MonIconCardScrollLeft _081916F4: .4byte gUnknown_203CA44 _081916F8: .4byte gUnknown_20205AC _081916FC: .4byte gUnknown_3005B60 -_08191700: .4byte sub_081904BC +_08191700: .4byte SpriteCb_TrainerIconCardScrollLeft _08191704: mov r2, ip ldr r0, [r2] @@ -823342,7 +823342,7 @@ _08191744: movs r1, #6 b _08191C44 .align 2, 0 -_0819175C: .4byte sub_081906A4 +_0819175C: .4byte SpriteCb_MonIconCardScrollLeft _08191760: .4byte gUnknown_3005B60 _08191764: mov r0, sb @@ -823436,7 +823436,7 @@ _081917FA: movs r0, #2 orrs r0, r2 ldrb r1, [r1] - bl sub_08192D7C + bl DisplayMatchInfoOnCard movs r6, #0 ldr r7, _081918A4 mov ip, r6 @@ -823495,7 +823495,7 @@ _08191898: .4byte gUnknown_85D5BD8 _0819189C: .4byte gUnknown_203CA44 _081918A0: .4byte gUnknown_3005B60 _081918A4: .4byte gUnknown_20205AC -_081918A8: .4byte sub_08190528 +_081918A8: .4byte SpriteCb_TrainerIconCardScrollRight _081918AC: mov r3, sl ldr r0, [r3] @@ -823591,11 +823591,11 @@ _08191910: strh r1, [r0, #0x34] b _081919B8 .align 2, 0 -_08191964: .4byte sub_08190720 +_08191964: .4byte SpriteCb_MonIconCardScrollRight _08191968: .4byte gUnknown_203CA44 _0819196C: .4byte gUnknown_20205AC _08191970: .4byte gUnknown_3005B60 -_08191974: .4byte sub_08190528 +_08191974: .4byte SpriteCb_TrainerIconCardScrollRight _08191978: mov r2, ip ldr r0, [r2] @@ -823635,7 +823635,7 @@ _081919B8: ble _08191910 b _08191C36 .align 2, 0 -_081919C0: .4byte sub_08190720 +_081919C0: .4byte SpriteCb_MonIconCardScrollRight _081919C4: mov r0, sb add r0, r8 @@ -823700,7 +823700,7 @@ _08191A1A: movs r0, #2 orrs r0, r1 ldrb r1, [r2, #0x12] - bl sub_0819213C + bl DisplayTrainerInfoOnCard b _08191AA0 .align 2, 0 _08191A4C: .4byte gUnknown_2022AC8 @@ -823736,7 +823736,7 @@ _08191A6C: orrs r0, r1 lsls r1, r2, #0x18 lsrs r1, r1, #0x18 - bl sub_08192D7C + bl DisplayMatchInfoOnCard _08191AA0: movs r6, #0 ldr r0, _08191B1C @@ -823801,7 +823801,7 @@ _08191B14: .4byte gUnknown_2022AD2 _08191B18: .4byte gUnknown_3005B60 _08191B1C: .4byte gUnknown_203CA44 _08191B20: .4byte gUnknown_20205AC -_08191B24: .4byte sub_08190528 +_08191B24: .4byte SpriteCb_TrainerIconCardScrollRight _08191B28: mov r2, sl ldr r0, [r2] @@ -823896,11 +823896,11 @@ _08191B8A: strh r1, [r0, #0x34] b _08191C30 .align 2, 0 -_08191BDC: .4byte sub_08190720 +_08191BDC: .4byte SpriteCb_MonIconCardScrollRight _08191BE0: .4byte gUnknown_203CA44 _08191BE4: .4byte gUnknown_20205AC _08191BE8: .4byte gUnknown_3005B60 -_08191BEC: .4byte sub_08190528 +_08191BEC: .4byte SpriteCb_TrainerIconCardScrollRight _08191BF0: mov r2, ip ldr r0, [r2] @@ -823951,7 +823951,7 @@ _08191C44: strh r2, [r0, #0x12] b _08191E5E .align 2, 0 -_08191C4C: .4byte sub_08190720 +_08191C4C: .4byte SpriteCb_MonIconCardScrollRight _08191C50: .4byte gUnknown_3005B60 _08191C54: mov r4, r8 @@ -824098,7 +824098,7 @@ _08191D72: ldrb r0, [r1] cmp r0, #0xff beq _08191DAA - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite b _08191DAA .align 2, 0 _08191D88: .4byte gUnknown_2037C74 @@ -824130,7 +824130,7 @@ _08191DB4: ldrb r0, [r1] cmp r0, #0xff beq _08191DEA - bl sub_0818D61C + bl FreeAndDestroyTrainerPicSprite b _08191DEA .align 2, 0 _08191DC8: .4byte gUnknown_20205AC @@ -824152,27 +824152,27 @@ _08191DEA: adds r6, #1 cmp r6, #0xf ble _08191DB4 - bl sub_080D283C + bl FreeMonIconPalettes ldr r4, _08191E18 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r5, #0 str r5, [r4] - bl sub_080034D4 + bl FreeAllWindowBuffers mov r0, sb cmp r0, #0 bne _08191E20 ldr r0, _08191E1C - bl sub_08000540 + bl SetMainCallback2 b _08191E58 .align 2, 0 _08191E14: .4byte gUnknown_20205AC _08191E18: .4byte gUnknown_203CA44 -_08191E1C: .4byte sub_08085B34 +_08191E1C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _08191E20: ldr r0, _08191E70 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r2, _08191E74 @@ -824199,7 +824199,7 @@ _08191E20: strh r0, [r1, #0x10] _08191E58: mov r0, r8 - bl sub_080A8964 + bl DestroyTask _08191E5E: add sp, #4 pop {r3, r4, r5} @@ -824210,7 +824210,7 @@ _08191E5E: pop {r0} bx r0 .align 2, 0 -_08191E70: .4byte sub_08193E00 +_08191E70: .4byte Task_ShowTourneyTree _08191E74: .4byte gUnknown_3005B60 thumb_func_end sub_08190930 @@ -824582,8 +824582,8 @@ _08192128: _08192138: .4byte gUnknown_3005B60 thumb_func_end sub_08191E78 - thumb_func_start sub_0819213C -sub_0819213C: @ 0x0819213C + thumb_func_start DisplayTrainerInfoOnCard +DisplayTrainerInfoOnCard: @ 0x0819213C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -824605,7 +824605,7 @@ sub_0819213C: @ 0x0819213C str r2, [sp, #0x30] movs r4, #0 movs r0, #0x24 - bl sub_08000BDC + bl AllocZeroed mov r8, r0 ldr r0, _081921E4 ldr r1, [r0] @@ -824687,7 +824687,7 @@ _081921F4: _08192204: .4byte 0x000003FE _08192208: ldr r0, [sp, #0x24] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId _0819220E: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -824823,7 +824823,7 @@ _0819230C: movs r1, #1 str r1, [sp, #8] ldr r1, _081923D4 - bl sub_080D2564 + bl CreateMonIcon ldr r1, [r6] adds r1, r1, r4 strb r0, [r1] @@ -824908,7 +824908,7 @@ _081923C4: .4byte 0x00000D64 _081923C8: .4byte gUnknown_203B958 _081923CC: .4byte gUnknown_85D5DBC _081923D0: .4byte gUnknown_85D5DBF -_081923D4: .4byte sub_08190594 +_081923D4: .4byte SpriteCb_MonIcon _081923D8: .4byte 0x000003FF _081923DC: .4byte gUnknown_82EFF52 _081923E0: @@ -824922,7 +824922,7 @@ _081923E0: _081923F0: .4byte 0x000003FE _081923F4: ldr r0, [sp, #0x24] - bl sub_08162ADC + bl GetFrontierOpponentClass _081923FA: lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -824990,7 +824990,7 @@ _08192480: ldr r4, _081924F4 ldr r1, [sp, #0x24] adds r0, r4, #0 - bl sub_08195498 + bl CopyDomeTrainerName adds r0, r5, #0 adds r1, r4, #0 bl StringAppend @@ -825005,14 +825005,14 @@ _08192492: ldr r0, [sp, #0x44] lsrs r4, r0, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add r0, sp, #0xc movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add r0, sp, #0xc strb r5, [r0, #0xa] movs r7, #0 @@ -825093,23 +825093,23 @@ _0819254A: lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add r0, sp, #0xc movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter adds r7, r5, #0 cmp r7, #2 ble _081924D2 ldr r4, [sp, #0x40] adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _081925B0 ldr r1, [sp, #0x24] cmp r1, r0 @@ -825143,7 +825143,7 @@ _081925C2: strb r1, [r0, #9] movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter movs r7, #0 ldr r3, _0819262C _081925E4: @@ -825170,7 +825170,7 @@ _081925FA: lsrs r1, r1, #0x18 str r2, [sp, #0x48] str r3, [sp, #0x4c] - bl sub_081A4C50 + bl GetFrontierBrainMonMove lsls r0, r0, #0x10 lsrs r0, r0, #0xc adds r0, r6, r0 @@ -825291,7 +825291,7 @@ _081926E6: strb r1, [r0, #9] movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter movs r1, #0 mov r0, r8 adds r0, #0x22 @@ -825322,7 +825322,7 @@ _08192724: lsls r1, r5, #0x18 lsrs r1, r1, #0x18 lsrs r0, r6, #0x18 - bl sub_081A4CE0 + bl GetFrontierBrainMonEvs lsls r0, r0, #0x18 lsrs r0, r0, #0x18 b _08192768 @@ -825363,7 +825363,7 @@ _08192780: bne _081927A4 mov r2, sb lsrs r0, r2, #0x18 - bl sub_081A4CA0 + bl GetFrontierBrainMonNature lsls r0, r0, #0x18 lsrs r2, r0, #0x18 b _081927B2 @@ -825841,9 +825841,9 @@ _08192B06: strb r1, [r0, #9] movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter mov r0, r8 - bl sub_08000BF0 + bl Free add sp, #0x58 pop {r3, r4, r5} mov r8, r3 @@ -825854,7 +825854,7 @@ _08192B06: bx r0 .align 2, 0 _08192B38: .4byte gUnknown_85D5D10 - thumb_func_end sub_0819213C + thumb_func_end DisplayTrainerInfoOnCard thumb_func_start sub_08192B3C sub_08192B3C: @ 0x08192B3C @@ -825937,7 +825937,7 @@ _08192BE0: .4byte gUnknown_2021C40 _08192BE4: lsrs r1, r1, #0x16 ldr r0, _08192C14 - bl sub_08195498 + bl CopyDomeTrainerName _08192BEC: movs r2, #1 add r8, r2 @@ -826094,7 +826094,7 @@ _08192D24: .4byte gUnknown_2021C40 _08192D28: lsrs r1, r1, #0x16 ldr r0, _08192D60 - bl sub_08195498 + bl CopyDomeTrainerName _08192D30: mov r0, r8 cmp r0, #2 @@ -826138,8 +826138,8 @@ _08192D6C: bx r1 thumb_func_end sub_08192B3C - thumb_func_start sub_08192D7C -sub_08192D7C: @ 0x08192D7C + thumb_func_start DisplayMatchInfoOnCard +DisplayMatchInfoOnCard: @ 0x08192D7C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -826346,7 +826346,7 @@ _08192F10: .4byte 0x000003FE _08192F14: lsls r0, r1, #0x10 lsrs r0, r0, #0x10 - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId _08192F1C: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -826440,7 +826440,7 @@ _08192FD0: .4byte 0x000003FE _08192FD4: lsls r0, r1, #0x10 lsrs r0, r0, #0x10 - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 _08192FE0: @@ -826586,7 +826586,7 @@ _081930E0: mov r1, sl str r1, [sp, #8] ldr r1, _081931CC - bl sub_080D2564 + bl CreateMonIcon ldr r1, [r6] adds r1, r1, r4 strb r0, [r1] @@ -826687,7 +826687,7 @@ _081931BC: .4byte 0x00000D64 _081931C0: .4byte gUnknown_203B958 _081931C4: .4byte gUnknown_85D5E24 _081931C8: .4byte gUnknown_85D5E27 -_081931CC: .4byte sub_08190594 +_081931CC: .4byte SpriteCb_MonIcon _081931D0: .4byte gUnknown_203CA44 _081931D4: .4byte gUnknown_20205AC _081931D8: .4byte 0x000003FF @@ -826746,7 +826746,7 @@ _0819322A: movs r1, #1 str r1, [sp, #8] ldr r1, _08193370 - bl sub_080D2564 + bl CreateMonIcon ldr r1, [r6] adds r1, r1, r4 strb r0, [r1] @@ -826853,7 +826853,7 @@ _081932D0: adds r0, r7, r0 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders str r4, [sp, #0xc] add r0, sp, #0xc add r1, sp, #0x70 @@ -826864,14 +826864,14 @@ _081932D0: strb r0, [r1, #5] ldr r4, [sp, #0x70] adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add r0, sp, #0xc movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter ldr r1, [sp, #0x24] ldr r0, _0819337C cmp r1, r0 @@ -826887,7 +826887,7 @@ _08193360: .4byte 0x00000D64 _08193364: .4byte gUnknown_203B958 _08193368: .4byte gUnknown_85D5E2A _0819336C: .4byte gUnknown_85D5E2D -_08193370: .4byte sub_08190594 +_08193370: .4byte SpriteCb_MonIcon _08193374: .4byte gUnknown_2021C7C _08193378: .4byte gUnknown_85D5E08 _0819337C: .4byte 0x000003FF @@ -826906,7 +826906,7 @@ _0819339C: ldr r0, _081933E8 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 - bl sub_08195498 + bl CopyDomeTrainerName _081933A6: add r0, sp, #0xc movs r1, #2 @@ -826919,14 +826919,14 @@ _081933A6: strb r2, [r0, #4] ldr r4, [sp, #0x68] adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add r0, sp, #0xc movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter ldr r3, [sp, #0x50] ldr r1, [r3, #4] ldr r0, _081933EC @@ -826954,7 +826954,7 @@ _08193408: lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r5, #0 - bl sub_08195498 + bl CopyDomeTrainerName _08193412: ldr r0, _0819347C str r0, [sp, #0xc] @@ -826965,14 +826965,14 @@ _08193412: strb r7, [r0, #4] ldr r4, [sp, #0x6c] adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add r0, sp, #0xc movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add r0, sp, #0xc strb r5, [r0, #0xa] ldr r0, _08193480 @@ -826986,14 +826986,14 @@ _08193412: strb r2, [r0, #4] ldr r4, [sp, #0x64] adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add r0, sp, #0xc movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x80 pop {r3, r4, r5} mov r8, r3 @@ -827005,14 +827005,14 @@ _08193412: .align 2, 0 _0819347C: .4byte gUnknown_2021C40 _08193480: .4byte gUnknown_85D5DCC - thumb_func_end sub_08192D7C + thumb_func_end DisplayMatchInfoOnCard - thumb_func_start sub_08193484 -sub_08193484: @ 0x08193484 + thumb_func_start ShowDomeTourneyTree +ShowDomeTourneyTree: @ 0x08193484 push {lr} ldr r0, _081934B4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081934B8 @@ -827027,19 +827027,19 @@ sub_08193484: @ 0x08193484 strh r0, [r1, #0xc] strh r2, [r1, #0x10] ldr r0, _081934BC - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_081934B4: .4byte sub_08193E00 +_081934B4: .4byte Task_ShowTourneyTree _081934B8: .4byte gUnknown_3005B60 -_081934BC: .4byte sub_08194754 - thumb_func_end sub_08193484 +_081934BC: .4byte CB2_BattleDome + thumb_func_end ShowDomeTourneyTree - thumb_func_start sub_081934C0 -sub_081934C0: @ 0x081934C0 + thumb_func_start ShowPreviousDomeResultsTourneyTree +ShowPreviousDomeResultsTourneyTree: @ 0x081934C0 push {r4, lr} - bl sub_08194948 + bl InitDomeFacilityTrainersAndMons ldr r4, _08193520 ldr r2, [r4] ldr r1, _08193524 @@ -827064,7 +827064,7 @@ sub_081934C0: @ 0x081934C0 strh r1, [r0] ldr r0, _08193530 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08193534 @@ -827079,7 +827079,7 @@ sub_081934C0: @ 0x081934C0 movs r0, #1 strh r0, [r1, #0x10] ldr r0, _08193538 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 @@ -827088,10 +827088,10 @@ _08193520: .4byte gUnknown_3005AF0 _08193524: .4byte 0x00000D0A _08193528: .4byte 0x00000CA9 _0819352C: .4byte 0x00000CB2 -_08193530: .4byte sub_08193E00 +_08193530: .4byte Task_ShowTourneyTree _08193534: .4byte gUnknown_3005B60 -_08193538: .4byte sub_08194754 - thumb_func_end sub_081934C0 +_08193538: .4byte CB2_BattleDome + thumb_func_end ShowPreviousDomeResultsTourneyTree thumb_func_start sub_0819353C sub_0819353C: @ 0x0819353C @@ -827147,7 +827147,7 @@ _081935A2: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081935D8 lsls r0, r5, #2 adds r0, r0, r5 @@ -827187,7 +827187,7 @@ _081935EE: _081935FC: .4byte gUnknown_2037C74 _08193600: adds r0, r5, #0 - bl sub_081937BC + bl UpdateTourneyTreeCursor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -827207,7 +827207,7 @@ _0819361C: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _0819363C lsls r0, r5, #2 adds r0, r0, r5 @@ -827225,7 +827225,7 @@ _08193640: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08193660 lsls r0, r5, #2 adds r0, r0, r5 @@ -827243,7 +827243,7 @@ _08193664: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08193684 lsls r0, r5, #2 adds r0, r0, r5 @@ -827265,15 +827265,15 @@ _08193688: beq _0819369A b _081937A2 _0819369A: - bl sub_080034D4 - bl sub_080B9710 + bl FreeAllWindowBuffers + bl ScanlineEffect_Stop ldr r4, _081936EC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r6, [r4] ldr r0, _081936F0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r2, _081936F4 @@ -827303,7 +827303,7 @@ _0819369A: .align 2, 0 _081936E8: .4byte gUnknown_2037C74 _081936EC: .4byte gUnknown_203CA48 -_081936F0: .4byte sub_0819005C +_081936F0: .4byte Task_ShowOpponentInfo _081936F4: .4byte gUnknown_3005B60 _081936F8: .4byte gUnknown_85D5AFC _081936FC: .4byte gUnknown_203CA44 @@ -827316,15 +827316,15 @@ _08193700: lsrs r6, r0, #0x18 cmp r6, #0 bne _081937A2 - bl sub_080034D4 - bl sub_080B9710 + bl FreeAllWindowBuffers + bl ScanlineEffect_Stop ldr r4, _08193758 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r6, [r4] ldr r0, _0819375C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r2, _08193760 @@ -827349,7 +827349,7 @@ _08193700: .align 2, 0 _08193754: .4byte gUnknown_2037C74 _08193758: .4byte gUnknown_203CA48 -_0819375C: .4byte sub_0819005C +_0819375C: .4byte Task_ShowOpponentInfo _08193760: .4byte gUnknown_3005B60 _08193764: ldr r0, _081937AC @@ -827360,23 +827360,23 @@ _08193764: lsrs r6, r0, #0x18 cmp r6, #0 bne _081937A2 - bl sub_080034D4 - bl sub_080B9710 + bl FreeAllWindowBuffers + bl ScanlineEffect_Stop ldr r4, _081937B0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r6, [r4] ldr r0, _081937B4 - bl sub_08000540 + bl SetMainCallback2 ldr r1, _081937B8 lsls r0, r5, #2 adds r0, r0, r5 lsls r0, r0, #3 adds r0, r0, r1 ldrb r0, [r0, #0x16] - bl sub_080A8964 + bl DestroyTask adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081937A2: add sp, #4 pop {r4, r5, r6, r7} @@ -827385,12 +827385,12 @@ _081937A2: .align 2, 0 _081937AC: .4byte gUnknown_2037C74 _081937B0: .4byte gUnknown_203CA48 -_081937B4: .4byte sub_08085B34 +_081937B4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _081937B8: .4byte gUnknown_3005B60 thumb_func_end sub_0819353C - thumb_func_start sub_081937BC -sub_081937BC: @ 0x081937BC + thumb_func_start UpdateTourneyTreeCursor +UpdateTourneyTreeCursor: @ 0x081937BC push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -827567,14 +827567,14 @@ _08193906: _08193914: .4byte gUnknown_85D5695 _08193918: .4byte gUnknown_20205AC _0819391C: .4byte gUnknown_3005B60 - thumb_func_end sub_081937BC + thumb_func_end UpdateTourneyTreeCursor - thumb_func_start sub_08193920 -sub_08193920: @ 0x08193920 + thumb_func_start ShowNonInteractiveDomeTourneyTree +ShowNonInteractiveDomeTourneyTree: @ 0x08193920 push {lr} ldr r0, _08193950 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _08193954 @@ -827590,17 +827590,17 @@ sub_08193920: @ 0x08193920 strh r0, [r1, #0xc] strh r2, [r1, #0x10] ldr r0, _08193958 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_08193950: .4byte sub_08193E00 +_08193950: .4byte Task_ShowTourneyTree _08193954: .4byte gUnknown_3005B60 -_08193958: .4byte sub_08194754 - thumb_func_end sub_08193920 +_08193958: .4byte CB2_BattleDome + thumb_func_end ShowNonInteractiveDomeTourneyTree - thumb_func_start sub_0819395C -sub_0819395C: @ 0x0819395C + thumb_func_start ResolveDomeRoundWinners +ResolveDomeRoundWinners: @ 0x0819395C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -827657,7 +827657,7 @@ sub_0819395C: @ 0x0819395C bhi _08193A8E lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08195038 + bl DecideRoundWinners b _08193A8E .align 2, 0 _081939D8: .4byte gUnknown_2037282 @@ -827740,7 +827740,7 @@ _08193A72: _08193A80: lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_08195038 + bl DecideRoundWinners adds r4, #1 cmp r4, #3 ble _08193A80 @@ -827757,10 +827757,10 @@ _08193AA0: .4byte 0x00000D25 _08193AA4: .4byte 0x00000CB2 _08193AA8: .4byte gUnknown_3005A70 _08193AAC: .4byte gUnknown_2023FDE - thumb_func_end sub_0819395C + thumb_func_end ResolveDomeRoundWinners - thumb_func_start sub_08193AB0 -sub_08193AB0: @ 0x08193AB0 + thumb_func_start GetWinningMove +GetWinningMove: @ 0x08193AB0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -827775,7 +827775,7 @@ sub_08193AB0: @ 0x08193AB0 str r0, [sp, #0x54] movs r1, #0 str r1, [sp, #0x58] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel movs r2, #0 str r2, [sp, #0x50] add r3, sp, #0x30 @@ -827822,7 +827822,7 @@ _08193AF8: lsls r1, r5, #0x18 lsrs r1, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_081A4C50 + bl GetFrontierBrainMonMove lsls r1, r4, #1 add r1, sl strh r0, [r1] @@ -827927,7 +827927,7 @@ _08193BCE: adds r0, r5, #0 str r2, [sp, #0x7c] str r3, [sp, #0x80] - bl sub_0806CB4C + bl GetNatureFromPersonality ldrb r1, [r4, #0xc] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -827975,7 +827975,7 @@ _08193C54: lsls r0, r4, #1 add r0, sl ldrh r0, [r0] - bl sub_080473FC + bl AI_TypeCalc lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #6 @@ -828202,10 +828202,10 @@ _08193DE4: bx r1 .align 2, 0 _08193DFC: .4byte gUnknown_3005AF0 - thumb_func_end sub_08193AB0 + thumb_func_end GetWinningMove - thumb_func_start sub_08193E00 -sub_08193E00: @ 0x08193E00 + thumb_func_start Task_ShowTourneyTree +Task_ShowTourneyTree: @ 0x08193E00 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -828248,9 +828248,9 @@ _08193E44: @ jump table .4byte _0819436C @ case 5 _08193E5C: movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #3 bl EnableInterrupts movs r4, #0 @@ -828267,7 +828267,7 @@ _08193E5C: movs r2, #4 bl InitBgsFromTemplates ldr r0, _08193EE4 - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r0, _08193EE8 strh r4, [r0] @@ -828280,20 +828280,20 @@ _08193E5C: movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r1, #0xb0 lsls r1, r1, #4 movs r0, #3 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r1, _08193EF8 mov r2, r8 lsls r0, r2, #2 @@ -828353,16 +828353,16 @@ _08193F6C: ldr r4, _0819402C movs r0, #0x80 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed adds r1, r0, #0 str r1, [r4] ldr r0, _08194030 bl sub_08034370 ldr r1, [r4] movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r1, _08194034 movs r5, #0x80 lsls r5, r5, #6 @@ -828371,54 +828371,54 @@ _08193F6C: movs r0, #1 adds r2, r5, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _08194038 str r6, [sp] movs r0, #2 adds r2, r5, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _0819403C movs r4, #1 str r4, [sp] movs r0, #2 adds r2, r5, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r1, _08194040 str r4, [sp] movs r0, #3 adds r2, r5, #0 movs r3, #0 - bl sub_081997A0 + bl DecompressAndLoadBgGfxUsingHeap ldr r0, _08194044 movs r4, #0x80 lsls r4, r4, #2 movs r1, #0 adds r2, r4, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _08194048 movs r1, #0x80 lsls r1, r1, #1 adds r2, r4, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _0819404C movs r1, #0xf0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette str r6, [sp, #0x18] add r0, sp, #0x18 ldr r1, _08194050 ldr r2, _08194054 bl CpuSet movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r1, _08194058 mov r4, r8 lsls r0, r4, #2 @@ -828445,7 +828445,7 @@ _08194054: .4byte 0x05000100 _08194058: .4byte gUnknown_3005B60 _0819405C: ldr r0, _0819409C - bl sub_08034388 + bl LoadCompressedSpriteSheet mov r0, r8 lsls r0, r0, #2 str r0, [sp, #0x1c] @@ -828459,7 +828459,7 @@ _08194072: ldrb r2, [r4, #1] ldr r0, _081940A4 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r4, #2 adds r5, #1 cmp r5, #0x1e @@ -828468,7 +828468,7 @@ _08194072: movs r1, #0xda movs r2, #0xc movs r3, #0 - bl sub_08006B0C + bl CreateSprite _08194092: ldr r1, _081940AC movs r0, #0 @@ -828513,7 +828513,7 @@ _081940B0: adds r0, r1, #0 movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter mov r2, r8 lsls r2, r2, #2 str r2, [sp, #0x1c] @@ -828536,7 +828536,7 @@ _0819410C: lsls r1, r1, #0x16 lsrs r1, r1, #0x16 ldr r0, _08194158 - bl sub_08195498 + bl CopyDomeTrainerName mov r0, sl cmp r0, #1 bne _08194164 @@ -828798,7 +828798,7 @@ _0819430E: add r0, sp, #4 movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter ldr r3, [sp, #0x20] adds r3, #2 str r3, [sp, #0x20] @@ -828829,24 +828829,24 @@ _08194364: .4byte gUnknown_85D5E6E _08194368: .4byte gUnknown_3005B60 _0819436C: movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _081943D8 - bl sub_080006FC + bl SetHBlankCallback ldr r0, _081943DC - bl sub_080006F0 + bl SetVBlankCallback cmp r4, #2 bne _08194400 mov r2, sl @@ -828854,7 +828854,7 @@ _0819436C: bne _081943E8 ldr r0, _081943E0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r2, _081943E4 @@ -828875,13 +828875,13 @@ _0819436C: b _0819441C .align 2, 0 _081943D8: .4byte HblankCb_BattleDome -_081943DC: .4byte sub_081948E4 +_081943DC: .4byte VblankCb1_BattleDome _081943E0: .4byte sub_0819353C _081943E4: .4byte gUnknown_3005B60 _081943E8: ldr r0, _081943F8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r1, _081943FC @@ -828906,7 +828906,7 @@ _08194410: movs r1, #0 strh r1, [r0, #8] _0819441C: - bl sub_080B9750 + bl ScanlineEffect_Clear ldr r0, _0819447C ldr r2, _08194480 movs r4, #0xf0 @@ -828939,9 +828939,9 @@ _08194448: ldr r0, [r3] ldr r1, [r3, #4] ldr r2, [r3, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams mov r0, r8 - bl sub_080A8964 + bl DestroyTask _08194466: add sp, #0x28 pop {r3, r4, r5} @@ -828958,7 +828958,7 @@ _08194480: .4byte 0x00001F0A _08194484: .4byte gUnknown_85D59F0 _08194488: .4byte 0x00001F09 _0819448C: .4byte 0x00000836 - thumb_func_end sub_08193E00 + thumb_func_end Task_ShowTourneyTree thumb_func_start sub_08194490 sub_08194490: @ 0x08194490 @@ -829002,7 +829002,7 @@ _081944BE: bne _081944BE _081944DC: movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -829055,7 +829055,7 @@ _08194540: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08194560 lsls r0, r4, #2 adds r0, r0, r4 @@ -829121,7 +829121,7 @@ _081945B8: lsls r1, r1, #0x16 lsrs r1, r1, #0x16 ldr r0, _0819461C - bl sub_08195498 + bl CopyDomeTrainerName ldr r0, _08194614 ldr r1, [r0] adds r0, r1, r4 @@ -829206,7 +829206,7 @@ _0819466A: add r0, sp, #4 movs r1, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter _0819468A: ldr r0, _081946CC ldr r1, [r0] @@ -829268,7 +829268,7 @@ _081946EE: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _08194720 lsls r0, r4, #2 adds r0, r0, r4 @@ -829288,9 +829288,9 @@ _08194724: cmp r0, #0 bne _0819473C ldr r0, _08194750 - bl sub_08000540 + bl SetMainCallback2 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0819473C: add sp, #0x14 pop {r3, r4, r5} @@ -829302,33 +829302,33 @@ _0819473C: bx r0 .align 2, 0 _0819474C: .4byte gUnknown_2037C74 -_08194750: .4byte sub_08085B34 +_08194750: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_081944F4 - thumb_func_start sub_08194754 -sub_08194754: @ 0x08194754 + thumb_func_start CB2_BattleDome +CB2_BattleDome: @ 0x08194754 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08194754 + thumb_func_end CB2_BattleDome - thumb_func_start sub_08194770 -sub_08194770: @ 0x08194770 + thumb_func_start VblankCb0_BattleDome +VblankCb0_BattleDome: @ 0x08194770 push {lr} movs r0, #3 movs r1, #0x80 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0x80 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY ldr r0, _081947D4 ldrh r1, [r0] movs r0, #0x10 @@ -829353,8 +829353,8 @@ sub_08194770: @ 0x08194770 ldrh r1, [r0] movs r0, #0x1a bl SetGpuReg - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -829365,7 +829365,7 @@ _081947DC: .4byte gUnknown_2022ACC _081947E0: .4byte gUnknown_2022ACE _081947E4: .4byte gUnknown_2022AD0 _081947E8: .4byte gUnknown_2022AD2 - thumb_func_end sub_08194770 + thumb_func_end VblankCb0_BattleDome thumb_func_start HblankCb_BattleDome HblankCb_BattleDome: @ 0x081947EC @@ -829481,8 +829481,8 @@ _081948DC: .4byte 0x04000048 _081948E0: .4byte 0x00003F3F thumb_func_end HblankCb_BattleDome - thumb_func_start sub_081948E4 -sub_081948E4: @ 0x081948E4 + thumb_func_start VblankCb1_BattleDome +VblankCb1_BattleDome: @ 0x081948E4 push {lr} ldr r0, _08194938 ldrh r1, [r0] @@ -829503,15 +829503,15 @@ sub_081948E4: @ 0x081948E4 movs r0, #2 movs r1, #0x80 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0x80 movs r2, #1 - bl sub_08001E94 - bl sub_08006EA0 - bl sub_08007144 + bl ChangeBgY + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -829519,10 +829519,10 @@ _08194938: .4byte gUnknown_2022AC8 _0819493C: .4byte gUnknown_2022ACA _08194940: .4byte gUnknown_2022ACC _08194944: .4byte gUnknown_2022ACE - thumb_func_end sub_081948E4 + thumb_func_end VblankCb1_BattleDome - thumb_func_start sub_08194948 -sub_08194948: @ 0x08194948 + thumb_func_start InitDomeFacilityTrainersAndMons +InitDomeFacilityTrainersAndMons: @ 0x08194948 ldr r1, _08194958 ldr r0, _0819495C str r0, [r1] @@ -829535,10 +829535,10 @@ _08194958: .4byte gUnknown_203B958 _0819495C: .4byte gUnknown_85B8700 _08194960: .4byte gUnknown_203B954 _08194964: .4byte gUnknown_85B4A10 - thumb_func_end sub_08194948 + thumb_func_end InitDomeFacilityTrainersAndMons - thumb_func_start sub_08194968 -sub_08194968: @ 0x08194968 + thumb_func_start RestoreDomePlayerParty +RestoreDomePlayerParty: @ 0x08194968 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -829593,14 +829593,14 @@ _081949BE: adds r1, #0xd movs r2, #0 str r3, [sp, #4] - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r1, r6, #0 adds r1, #0xd ldr r2, _08194A40 adds r0, r7, r2 movs r2, #0 - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #4] cmp r4, r0 bne _081949BC @@ -829613,7 +829613,7 @@ _081949EA: adds r0, r7, r1 movs r1, #0xa6 str r3, [sp, #4] - bl sub_08068D34 + bl SetMonMoveSlot ldr r3, [sp, #4] _08194A00: mov r6, r8 @@ -829648,10 +829648,10 @@ _08194A00: .align 2, 0 _08194A3C: .4byte gUnknown_3005AEC _08194A40: .4byte gUnknown_2024190 - thumb_func_end sub_08194968 + thumb_func_end RestoreDomePlayerParty - thumb_func_start sub_08194A44 -sub_08194A44: @ 0x08194A44 + thumb_func_start RestoreDomePlayerPartyHeldItems +RestoreDomePlayerPartyHeldItems: @ 0x08194A44 push {r4, r5, r6, r7, lr} sub sp, #4 movs r4, #0 @@ -829680,14 +829680,14 @@ _08194A50: adds r0, r0, r1 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] ldr r0, _08194AB0 adds r0, r5, r0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r5, #0x64 adds r4, #1 cmp r4, #1 @@ -829702,19 +829702,19 @@ _08194AA4: .4byte gUnknown_3005AF0 _08194AA8: .4byte gUnknown_203CBC4 _08194AAC: .4byte 0x00000CAA _08194AB0: .4byte gUnknown_2024190 - thumb_func_end sub_08194A44 + thumb_func_end RestoreDomePlayerPartyHeldItems thumb_func_start sub_08194AB4 sub_08194AB4: @ 0x08194AB4 push {lr} - bl sub_080F9D78 + bl ReducePlayerPartyToSelectedMons pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08194AB4 - thumb_func_start sub_08194AC0 -sub_08194AC0: @ 0x08194AC0 + thumb_func_start GetPlayerSeededBeforeOpponent +GetPlayerSeededBeforeOpponent: @ 0x08194AC0 push {r4, lr} ldr r0, _08194ADC ldrh r0, [r0] @@ -829741,12 +829741,12 @@ _08194AEC: bx r0 .align 2, 0 _08194AF4: .4byte gUnknown_2037290 - thumb_func_end sub_08194AC0 + thumb_func_end GetPlayerSeededBeforeOpponent thumb_func_start BufferLastDomeWinnerName BufferLastDomeWinnerName: @ 0x08194AF8 push {r4, lr} - bl sub_08194948 + bl InitDomeFacilityTrainersAndMons movs r2, #0 ldr r3, _08194B48 ldr r0, [r3] @@ -829781,7 +829781,7 @@ _08194B2A: ldrh r1, [r1] lsls r1, r1, #0x16 lsrs r1, r1, #0x16 - bl sub_08195498 + bl CopyDomeTrainerName pop {r4} pop {r0} bx r0 @@ -829822,10 +829822,10 @@ sub_08194B58: @ 0x08194B58 b _08194F3E _08194B8C: movs r0, #0x20 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0x18] movs r0, #0x18 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0x1c] ldr r1, [r4] ldr r2, _08194BF8 @@ -829955,7 +829955,7 @@ _08194C92: _08194C9E: ldr r4, [sp, #0x30] lsrs r0, r4, #0x10 - bl sub_08163444 + bl RandomizeFacilityTrainerMonSet lsls r0, r0, #0x10 lsrs r5, r0, #0x10 movs r7, #0 @@ -830112,7 +830112,7 @@ _08194DAA: str r1, [sp, #4] movs r1, #0x32 mov r2, r8 - bl sub_0818F37C + bl CalcDomeMonStats ldr r2, [sp, #0x1c] ldr r1, [r2, #4] ldrh r0, [r5] @@ -830258,16 +830258,16 @@ _08194EF8: cmp r5, #0xe ble _08194E76 ldr r0, [sp, #0x18] - bl sub_08000BF0 + bl Free ldr r0, [sp, #0x1c] - bl sub_08000BF0 + bl Free movs r0, #0 mov sl, r0 _08194F14: mov r1, sl lsls r0, r1, #0x18 lsrs r0, r0, #0x18 - bl sub_08195038 + bl DecideRoundWinners movs r2, #1 add sl, r2 mov r3, sl @@ -830421,8 +830421,8 @@ _08195030: bx r1 thumb_func_end sub_08194FE8 - thumb_func_start sub_08195038 -sub_08195038: @ 0x08195038 + thumb_func_start DecideRoundWinners +DecideRoundWinners: @ 0x08195038 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -830469,7 +830469,7 @@ _08195088: str r5, [sp, #4] lsrs r1, r1, #0x16 ldr r0, [sp] - bl sub_0818FDFC + bl TournamentIdOfOpponent str r0, [sp, #8] ldr r0, _081950F0 ldr r3, [r0] @@ -830506,7 +830506,7 @@ _08195088: adds r0, r5, #0 ldr r1, [sp, #8] ldr r2, [sp] - bl sub_08193AB0 + bl GetWinningMove ldr r3, _081950F0 ldr r1, [r3] ldr r5, [sp, #8] @@ -830561,7 +830561,7 @@ _08195104: ldr r0, [sp, #8] ldr r1, [sp, #4] ldr r2, [sp] - bl sub_08193AB0 + bl GetWinningMove ldr r1, [r4] ldr r3, [sp, #4] lsls r2, r3, #1 @@ -830630,7 +830630,7 @@ _081951B0: adds r1, r1, r2 ldrh r1, [r1] movs r2, #2 - bl sub_0818FC1C + bl GetTypeEffectivenessPoints ldr r1, [sp, #0xc] adds r1, r1, r0 str r1, [sp, #0xc] @@ -830736,7 +830736,7 @@ _08195282: ldrh r1, [r1] movs r2, #2 str r3, [sp, #0x34] - bl sub_0818FC1C + bl GetTypeEffectivenessPoints ldr r1, [sp, #0x10] adds r1, r1, r0 str r1, [sp, #0x10] @@ -830820,7 +830820,7 @@ _08195282: ldr r0, [sp, #4] ldr r1, [sp, #8] ldr r2, [sp] - bl sub_08193AB0 + bl GetWinningMove ldr r3, _08195370 ldr r1, [r3] movs r5, #0xec @@ -830866,7 +830866,7 @@ _08195384: ldr r0, [sp, #8] ldr r1, [sp, #4] ldr r2, [sp] - bl sub_08193AB0 + bl GetWinningMove ldr r1, [r5] movs r5, #0xec lsls r5, r5, #4 @@ -830906,7 +830906,7 @@ _081953DC: ldr r0, [sp, #4] ldr r1, [sp, #8] ldr r2, [sp] - bl sub_08193AB0 + bl GetWinningMove ldr r5, _08195428 ldr r1, [r5] movs r2, #0xec @@ -830943,7 +830943,7 @@ _08195430: ldr r0, [sp, #8] ldr r1, [sp, #4] ldr r2, [sp] - bl sub_08193AB0 + bl GetWinningMove ldr r5, _08195490 ldr r1, [r5] movs r2, #0xec @@ -830971,16 +830971,16 @@ _0819547E: .align 2, 0 _08195490: .4byte gUnknown_3005AF0 _08195494: .4byte 0x00000D25 - thumb_func_end sub_08195038 + thumb_func_end DecideRoundWinners - thumb_func_start sub_08195498 -sub_08195498: @ 0x08195498 + thumb_func_start CopyDomeTrainerName +CopyDomeTrainerName: @ 0x08195498 push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x10 lsrs r5, r1, #0x10 movs r4, #0 - bl sub_08165A4C + bl SetFacilityPtrsGetLevel ldr r0, _081954B4 cmp r5, r0 bne _081954B8 @@ -831036,7 +831036,7 @@ _08195502: .align 2, 0 _08195508: .4byte 0x0000012B _0819550C: .4byte gUnknown_203B954 - thumb_func_end sub_08195498 + thumb_func_end CopyDomeTrainerName thumb_func_start sub_08195510 sub_08195510: @ 0x08195510 @@ -831475,7 +831475,7 @@ sub_08195850: @ 0x08195850 ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString _0819586C: pop {r0} bx r0 @@ -831645,7 +831645,7 @@ sub_081959B8: @ 0x081959B8 adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -831681,8 +831681,8 @@ _08195A06: _08195A0C: .4byte gUnknown_2037290 thumb_func_end sub_081959B8 - thumb_func_start sub_08195A10 -sub_08195A10: @ 0x08195A10 + thumb_func_start InitMatchCallCounters +InitMatchCallCounters: @ 0x08195A10 push {lr} bl RtcCalcLocalTime ldr r0, _08195A2C @@ -831697,7 +831697,7 @@ sub_08195A10: @ 0x08195A10 .align 2, 0 _08195A2C: .4byte gUnknown_3005A50 _08195A30: .4byte gUnknown_203CA4C - thumb_func_end sub_08195A10 + thumb_func_end InitMatchCallCounters thumb_func_start GetCurrentTotalMinutes GetCurrentTotalMinutes: @ 0x08195A34 @@ -831721,8 +831721,8 @@ GetCurrentTotalMinutes: @ 0x08195A34 bx lr thumb_func_end GetCurrentTotalMinutes - thumb_func_start sub_08195A58 -sub_08195A58: @ 0x08195A58 + thumb_func_start UpdateMatchCallMinutesCounter +UpdateMatchCallMinutesCounter: @ 0x08195A58 push {lr} bl RtcCalcLocalTime ldr r0, _08195A7C @@ -831748,20 +831748,20 @@ _08195A86: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195A58 + thumb_func_end UpdateMatchCallMinutesCounter - thumb_func_start sub_08195A8C -sub_08195A8C: @ 0x08195A8C + thumb_func_start CheckMatchCallChance +CheckMatchCallChance: @ 0x08195A8C push {r4, r5, lr} movs r5, #1 ldr r4, _08195ACC adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _08195AAE adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x1f @@ -831789,10 +831789,10 @@ _08195AD2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08195A8C + thumb_func_end CheckMatchCallChance - thumb_func_start sub_08195AD8 -sub_08195AD8: @ 0x08195AD8 + thumb_func_start MapAllowsMatchCall +MapAllowsMatchCall: @ 0x08195AD8 push {r4, lr} ldr r4, _08195B34 ldrb r0, [r4, #0x17] @@ -831844,10 +831844,10 @@ _08195B3A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08195AD8 + thumb_func_end MapAllowsMatchCall - thumb_func_start sub_08195B40 -sub_08195B40: @ 0x08195B40 + thumb_func_start UpdateMatchCallStepCounter +UpdateMatchCallStepCounter: @ 0x08195B40 push {lr} ldr r1, _08195B58 ldrb r0, [r1, #6] @@ -831869,12 +831869,12 @@ _08195B62: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195B40 + thumb_func_end UpdateMatchCallStepCounter - thumb_func_start sub_08195B68 -sub_08195B68: @ 0x08195B68 + thumb_func_start SelectMatchCallTrainer +SelectMatchCallTrainer: @ 0x08195B68 push {r4, lr} - bl sub_08195BCC + bl GetNumRegisteredNPCs adds r4, r0, #0 cmp r4, #0 beq _08195BB8 @@ -831883,7 +831883,7 @@ sub_08195B68: @ 0x08195B68 lsrs r0, r0, #0x10 adds r1, r4, #0 bl __umodsi3 - bl sub_08195BF8 + bl GetActiveMatchCallTrainerId ldr r2, _08195BBC movs r1, #0 strh r0, [r2, #4] @@ -831893,9 +831893,9 @@ sub_08195B68: @ 0x08195B68 cmp r0, #0x4e beq _08195BB8 ldrh r0, [r2, #4] - bl sub_08196444 + bl GetTrainerMatchCallId adds r4, r0, #0 - bl sub_0819632C + bl GetRematchTrainerLocation ldr r1, _08195BC0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -831918,10 +831918,10 @@ _08195BC6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08195B68 + thumb_func_end SelectMatchCallTrainer - thumb_func_start sub_08195BCC -sub_08195BCC: @ 0x08195BCC + thumb_func_start GetNumRegisteredNPCs +GetNumRegisteredNPCs: @ 0x08195BCC push {r4, r5, lr} movs r4, #0 movs r5, #0 @@ -831945,10 +831945,10 @@ _08195BE8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195BCC + thumb_func_end GetNumRegisteredNPCs - thumb_func_start sub_08195BF8 -sub_08195BF8: @ 0x08195BF8 + thumb_func_start GetActiveMatchCallTrainerId +GetActiveMatchCallTrainerId: @ 0x08195BF8 push {r4, r5, r6, lr} adds r5, r0, #0 movs r4, #0 @@ -831982,32 +831982,32 @@ _08195C2C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195BF8 + thumb_func_end GetActiveMatchCallTrainerId - thumb_func_start sub_08195C34 -sub_08195C34: @ 0x08195C34 + thumb_func_start TryStartMatchCall +TryStartMatchCall: @ 0x08195C34 push {lr} ldr r0, _08195C74 bl FlagGet lsls r0, r0, #0x18 cmp r0, #0 beq _08195C78 - bl sub_08195B40 + bl UpdateMatchCallStepCounter cmp r0, #0 beq _08195C78 - bl sub_08195A58 + bl UpdateMatchCallMinutesCounter cmp r0, #0 beq _08195C78 - bl sub_08195A8C + bl CheckMatchCallChance cmp r0, #0 beq _08195C78 - bl sub_08195AD8 + bl MapAllowsMatchCall cmp r0, #0 beq _08195C78 - bl sub_08195B68 + bl SelectMatchCallTrainer cmp r0, #0 beq _08195C78 - bl sub_08195CA8 + bl StartMatchCall movs r0, #1 b _08195C7A .align 2, 0 @@ -832018,36 +832018,36 @@ _08195C7A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195C34 + thumb_func_end TryStartMatchCall - thumb_func_start sub_08195C80 -sub_08195C80: @ 0x08195C80 + thumb_func_start StartMatchCallFromScript +StartMatchCallFromScript: @ 0x08195C80 push {lr} ldr r1, _08195C90 movs r0, #1 strb r0, [r1, #7] - bl sub_08195CA8 + bl StartMatchCall pop {r0} bx r0 .align 2, 0 _08195C90: .4byte gUnknown_203CA4C - thumb_func_end sub_08195C80 + thumb_func_end StartMatchCallFromScript thumb_func_start sub_08195C94 sub_08195C94: @ 0x08195C94 push {lr} ldr r0, _08195CA4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 -_08195CA4: .4byte sub_08195CE0 +_08195CA4: .4byte ExecuteMatchCall thumb_func_end sub_08195C94 - thumb_func_start sub_08195CA8 -sub_08195CA8: @ 0x08195CA8 + thumb_func_start StartMatchCall +StartMatchCall: @ 0x08195CA8 push {lr} ldr r0, _08195CD4 ldrb r0, [r0, #7] @@ -832062,17 +832062,17 @@ _08195CC2: bl sub_080A306C ldr r0, _08195CDC movs r1, #1 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _08195CD4: .4byte gUnknown_203CA4C _08195CD8: .4byte 0x00000107 -_08195CDC: .4byte sub_08195CE0 - thumb_func_end sub_08195CA8 +_08195CDC: .4byte ExecuteMatchCall + thumb_func_end StartMatchCall - thumb_func_start sub_08195CE0 -sub_08195CE0: @ 0x08195CE0 + thumb_func_start ExecuteMatchCall +ExecuteMatchCall: @ 0x08195CE0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -832101,7 +832101,7 @@ sub_08195CE0: @ 0x08195CE0 cmp r0, #7 bls _08195D1E adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _08195D1E: pop {r4, r5} pop {r0} @@ -832109,10 +832109,10 @@ _08195D1E: .align 2, 0 _08195D24: .4byte gUnknown_3005B68 _08195D28: .4byte gUnknown_85D79F4 - thumb_func_end sub_08195CE0 + thumb_func_end ExecuteMatchCall - thumb_func_start sub_08195D2C -sub_08195D2C: @ 0x08195D2C + thumb_func_start LoadMatchCallWindowGfx +LoadMatchCallWindowGfx: @ 0x08195D2C push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -832124,7 +832124,7 @@ sub_08195D2C: @ 0x08195D2C ldr r1, _08195D54 adds r5, r0, r1 ldr r0, _08195D58 - bl sub_08003250 + bl AddWindow strh r0, [r5, #4] lsls r0, r0, #0x10 asrs r0, r0, #0x10 @@ -832148,7 +832148,7 @@ _08195D5C: cmp r0, r1 bne _08195D88 ldrb r0, [r5, #4] - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 b _08195DE0 .align 2, 0 @@ -832160,24 +832160,24 @@ _08195D88: movs r0, #0 str r0, [sp] movs r2, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram cmp r0, #0 beq _08195DD8 ldrb r0, [r5, #4] movs r1, #0x88 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _08195DCC movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08195DD0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, _08195DD4 movs r0, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 b _08195DE6 .align 2, 0 @@ -832188,10 +832188,10 @@ _08195DD0: .4byte gUnknown_85D75E8 _08195DD4: .4byte 0xFFFFE000 _08195DD8: ldrb r0, [r5, #4] - bl sub_08003444 + bl RemoveWindow adds r0, r6, #0 _08195DE0: - bl sub_080A8964 + bl DestroyTask movs r0, #0 _08195DE6: add sp, #4 @@ -832199,10 +832199,10 @@ _08195DE6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195D2C + thumb_func_end LoadMatchCallWindowGfx - thumb_func_start sub_08195DF0 -sub_08195DF0: @ 0x08195DF0 + thumb_func_start MoveMatchCallWindowToVram +MoveMatchCallWindowToVram: @ 0x08195DF0 push {r4, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -832212,18 +832212,18 @@ sub_08195DF0: @ 0x08195DF0 lsls r1, r1, #3 ldr r0, _08195E5C adds r4, r1, r0 - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _08195E68 ldrb r0, [r4, #4] - bl sub_0800365C + bl PutWindowTilemap movs r1, #4 ldrsh r0, [r4, r1] movs r1, #0x9c lsls r1, r1, #2 movs r2, #0xe - bl sub_0819605C + bl DrawMatchCallTextBoxBorder ldr r1, _08195E60 movs r0, #4 str r0, [sp] @@ -832235,18 +832235,18 @@ sub_08195DF0: @ 0x08195DF0 movs r0, #0 movs r2, #1 movs r3, #0xf - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer ldr r0, _08195E64 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xa] ldrb r0, [r4, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 b _08195E6A .align 2, 0 @@ -832261,10 +832261,10 @@ _08195E6A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08195DF0 + thumb_func_end MoveMatchCallWindowToVram - thumb_func_start sub_08195E74 -sub_08195E74: @ 0x08195E74 + thumb_func_start PrintMatchCallIntroEllipsis +PrintMatchCallIntroEllipsis: @ 0x08195E74 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -832273,7 +832273,7 @@ sub_08195E74: @ 0x08195E74 lsls r1, r1, #3 ldr r0, _08195E94 adds r4, r1, r0 - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _08195E98 @@ -832285,7 +832285,7 @@ _08195E98: movs r1, #4 ldrsh r0, [r4, r1] ldr r1, _08195EAC - bl sub_081961D8 + bl InitMatchCallTextPrinter movs r0, #1 _08195EA4: pop {r4} @@ -832293,7 +832293,7 @@ _08195EA4: bx r1 .align 2, 0 _08195EAC: .4byte gUnknown_85D79EC - thumb_func_end sub_08195E74 + thumb_func_end PrintMatchCallIntroEllipsis thumb_func_start sub_08195EB0 sub_08195EB0: @ 0x08195EB0 @@ -832302,7 +832302,7 @@ sub_08195EB0: @ 0x08195EB0 lsls r1, r1, #3 movs r0, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY cmp r0, #0 bge _08195EC6 movs r0, #0 @@ -832311,7 +832311,7 @@ _08195EC6: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 _08195ED2: pop {r1} @@ -832331,24 +832331,24 @@ sub_08195ED8: @ 0x08195ED8 adds r4, r1, r0 movs r1, #4 ldrsh r0, [r4, r1] - bl sub_08196248 + bl ExecuteMatchCallTextPrinter cmp r0, #0 bne _08195F28 ldrb r0, [r4, #4] movs r1, #0x88 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _08195F20 ldrb r0, [r1, #7] cmp r0, #0 bne _08195F0C ldrh r0, [r1, #4] ldr r1, _08195F24 - bl sub_081963AC + bl SelectMatchCallMessage _08195F0C: movs r1, #4 ldrsh r0, [r4, r1] ldr r1, _08195F24 - bl sub_081961D8 + bl InitMatchCallTextPrinter movs r0, #1 b _08195F2A .align 2, 0 @@ -832375,10 +832375,10 @@ sub_08195F30: @ 0x08195F30 adds r4, r1, r0 movs r1, #4 ldrsh r0, [r4, r1] - bl sub_08196248 + bl ExecuteMatchCallTextPrinter cmp r0, #0 bne _08195F88 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08195F88 @@ -832390,10 +832390,10 @@ sub_08195F30: @ 0x08195F30 beq _08195F88 ldrb r0, [r4, #4] movs r1, #0x88 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0x84 lsls r0, r0, #1 bl sub_080A306C @@ -832425,7 +832425,7 @@ sub_08195F90: @ 0x08195F90 lsls r1, r1, #3 movs r0, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY ldr r1, _08195FBC cmp r0, r1 ble _08195FC0 @@ -832445,11 +832445,11 @@ _08195FC0: movs r3, #0xe bl FillBgTilemapBufferRect_Palette0 ldrb r0, [r4, #0xa] - bl sub_080A8964 + bl DestroyTask ldrb r0, [r4, #4] - bl sub_08003444 + bl RemoveWindow movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 _08195FE8: add sp, #8 @@ -832461,18 +832461,18 @@ _08195FE8: thumb_func_start sub_08195FF0 sub_08195FF0: @ 0x08195FF0 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08196054 - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 cmp r0, #0 bne _08196054 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, _0819604C ldrb r0, [r0, #7] cmp r0, #0 @@ -832508,8 +832508,8 @@ _08196056: .align 2, 0 thumb_func_end sub_08195FF0 - thumb_func_start sub_0819605C -sub_0819605C: @ 0x0819605C + thumb_func_start DrawMatchCallTextBoxBorder +DrawMatchCallTextBoxBorder: @ 0x0819605C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -832523,30 +832523,30 @@ sub_0819605C: @ 0x0819605C lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute mov sb, r0 adds r0, r4, #0 movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute str r0, [sp, #8] adds r0, r4, #0 movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute str r0, [sp, #0xc] adds r0, r4, #0 movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r6, r0, #0 adds r0, r4, #0 movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute str r0, [sp, #0x10] mov r0, sb lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r5, r5, r0 @@ -832686,10 +832686,10 @@ sub_0819605C: @ 0x0819605C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819605C + thumb_func_end DrawMatchCallTextBoxBorder - thumb_func_start sub_081961D8 -sub_081961D8: @ 0x081961D8 + thumb_func_start InitMatchCallTextPrinter +InitMatchCallTextPrinter: @ 0x081961D8 push {lr} sub sp, #0x10 str r1, [sp] @@ -832738,16 +832738,16 @@ sub_081961D8: @ 0x081961D8 lsrs r1, r1, #0x18 mov r0, sp movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r0} bx r0 .align 2, 0 _08196244: .4byte gUnknown_30030B4 - thumb_func_end sub_081961D8 + thumb_func_end InitMatchCallTextPrinter - thumb_func_start sub_08196248 -sub_08196248: @ 0x08196248 + thumb_func_start ExecuteMatchCallTextPrinter +ExecuteMatchCallTextPrinter: @ 0x08196248 push {r4, lr} adds r4, r0, #0 ldr r0, _08196264 @@ -832784,7 +832784,7 @@ _08196278: bx r1 .align 2, 0 _08196290: .4byte gUnknown_30030B4 - thumb_func_end sub_08196248 + thumb_func_end ExecuteMatchCallTextPrinter thumb_func_start sub_08196294 sub_08196294: @ 0x08196294 @@ -832836,9 +832836,9 @@ _081962C8: movs r0, #0 movs r2, #1 movs r3, #0xf - bl sub_0800271C + bl WriteSequenceToBgTilemapBuffer movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _081962FC: add sp, #0x10 pop {r0} @@ -832866,8 +832866,8 @@ _08196324: .4byte gUnknown_3005AEC _08196328: .4byte 0x000009CA thumb_func_end TrainerIsEligibleForRematch - thumb_func_start sub_0819632C -sub_0819632C: @ 0x0819632C + thumb_func_start GetRematchTrainerLocation +GetRematchTrainerLocation: @ 0x0819632C push {lr} ldr r1, _08196344 lsls r0, r0, #4 @@ -832881,17 +832881,17 @@ sub_0819632C: @ 0x0819632C bx r1 .align 2, 0 _08196344: .4byte gUnknown_852AD40 - thumb_func_end sub_0819632C + thumb_func_end GetRematchTrainerLocation - thumb_func_start sub_08196348 -sub_08196348: @ 0x08196348 + thumb_func_start GetNumRematchTrainersFought +GetNumRematchTrainersFought: @ 0x08196348 push {r4, r5, r6, lr} movs r5, #0 movs r6, #0 ldr r4, _08196370 _08196350: ldrh r0, [r4] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 beq _0819635E @@ -832907,7 +832907,7 @@ _0819635E: bx r1 .align 2, 0 _08196370: .4byte gUnknown_852AD40 - thumb_func_end sub_08196348 + thumb_func_end GetNumRematchTrainersFought thumb_func_start sub_08196374 sub_08196374: @ 0x08196374 @@ -832918,7 +832918,7 @@ sub_08196374: @ 0x08196374 ldr r5, _08196394 _0819637E: ldrh r0, [r5] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 beq _0819639A @@ -832943,12 +832943,12 @@ _081963A4: .align 2, 0 thumb_func_end sub_08196374 - thumb_func_start sub_081963AC -sub_081963AC: @ 0x081963AC + thumb_func_start SelectMatchCallMessage +SelectMatchCallMessage: @ 0x081963AC push {r4, r5, r6, r7, lr} adds r6, r1, #0 movs r7, #0 - bl sub_08196444 + bl GetTrainerMatchCallId adds r5, r0, #0 ldr r0, _081963E4 strh r7, [r0] @@ -832957,7 +832957,7 @@ sub_081963AC: @ 0x081963AC cmp r0, #0 beq _081963EC adds r0, r5, #0 - bl sub_0819632C + bl GetRematchTrainerLocation ldr r1, _081963E8 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -832995,27 +832995,27 @@ _0819640A: beq _08196428 adds r0, r5, #0 adds r1, r6, #0 - bl sub_081964BC + bl GetBattleMatchCallText b _08196430 _08196428: adds r0, r5, #0 adds r1, r6, #0 - bl sub_08196510 + bl GetGeneralMatchCallText _08196430: adds r4, r0, #0 _08196432: adds r0, r5, #0 adds r1, r4, #0 adds r2, r6, #0 - bl sub_081965E0 + bl BuildMatchCallString adds r0, r7, #0 pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081963AC + thumb_func_end SelectMatchCallMessage - thumb_func_start sub_08196444 -sub_08196444: @ 0x08196444 + thumb_func_start GetTrainerMatchCallId +GetTrainerMatchCallId: @ 0x08196444 push {lr} adds r3, r0, #0 movs r2, #0 @@ -833034,7 +833034,7 @@ _0819645C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08196444 + thumb_func_end GetTrainerMatchCallId thumb_func_start GetSameRouteMatchCallText GetSameRouteMatchCallText: @ 0x08196464 @@ -833086,8 +833086,8 @@ _081964B4: .4byte gUnknown_85D6934 _081964B8: .4byte gUnknown_85D74A8 thumb_func_end GetDifferentRouteMatchCallText - thumb_func_start sub_081964BC -sub_081964BC: @ 0x081964BC + thumb_func_start GetBattleMatchCallText +GetBattleMatchCallText: @ 0x081964BC push {r4, lr} adds r4, r0, #0 bl Random @@ -833127,10 +833127,10 @@ _081964EC: .align 2, 0 _08196508: .4byte gUnknown_85D6934 _0819650C: .4byte gUnknown_85D749C - thumb_func_end sub_081964BC + thumb_func_end GetBattleMatchCallText - thumb_func_start sub_08196510 -sub_08196510: @ 0x08196510 + thumb_func_start GetGeneralMatchCallText +GetGeneralMatchCallText: @ 0x08196510 push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r0, #0 @@ -833148,7 +833148,7 @@ _0819652C: lsls r0, r4, #0x10 lsrs r0, r0, #0x10 mov r1, sp - bl sub_081969F8 + bl GetFrontierStreakInfo lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -833178,7 +833178,7 @@ _08196562: lsls r0, r4, #0x10 lsrs r0, r0, #0x10 mov r1, sp - bl sub_081969F8 + bl GetFrontierStreakInfo ldr r1, _081965A0 strh r0, [r1, #2] lsls r0, r0, #0x10 @@ -833235,10 +833235,10 @@ _081965D0: .align 2, 0 _081965D8: .4byte gUnknown_85D6934 _081965DC: .4byte gUnknown_85D74B0 - thumb_func_end sub_08196510 + thumb_func_end GetGeneralMatchCallText - thumb_func_start sub_081965E0 -sub_081965E0: @ 0x081965E0 + thumb_func_start BuildMatchCallString +BuildMatchCallString: @ 0x081965E0 push {r4, r5, lr} adds r4, r1, #0 adds r5, r2, #0 @@ -833246,12 +833246,12 @@ sub_081965E0: @ 0x081965E0 bl PopulateMatchCallStringVars ldr r1, [r4] adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081965E0 + thumb_func_end BuildMatchCallString thumb_func_start PopulateMatchCallStringVars PopulateMatchCallStringVars: @ 0x081965FC @@ -833269,7 +833269,7 @@ _08196606: adds r1, r0, #0 ldr r2, [r5] adds r0, r7, #0 - bl sub_0819662C + bl PopulateMatchCallStringVar _0819661A: adds r5, #4 adds r4, #1 @@ -833282,8 +833282,8 @@ _0819661A: _08196628: .4byte gUnknown_85D7A1C thumb_func_end PopulateMatchCallStringVars - thumb_func_start sub_0819662C -sub_0819662C: @ 0x0819662C + thumb_func_start PopulateMatchCallStringVar +PopulateMatchCallStringVar: @ 0x0819662C push {lr} ldr r3, _08196640 lsls r1, r1, #2 @@ -833295,10 +833295,10 @@ sub_0819662C: @ 0x0819662C bx r0 .align 2, 0 _08196640: .4byte gUnknown_85D7A28 - thumb_func_end sub_0819662C + thumb_func_end PopulateMatchCallStringVar - thumb_func_start sub_08196644 -sub_08196644: @ 0x08196644 + thumb_func_start PopulateTrainerName +PopulateTrainerName: @ 0x08196644 push {r4, r5, r6, lr} adds r5, r1, #0 ldr r2, _08196670 @@ -833340,26 +833340,26 @@ _0819668C: bx r0 .align 2, 0 _08196694: .4byte gUnknown_82E3840 - thumb_func_end sub_08196644 + thumb_func_end PopulateTrainerName - thumb_func_start sub_08196698 -sub_08196698: @ 0x08196698 + thumb_func_start PopulateMapName +PopulateMapName: @ 0x08196698 push {r4, lr} adds r4, r1, #0 - bl sub_0819632C + bl GetRematchTrainerLocation adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0 - bl sub_08124578 + bl GetMapName pop {r4} pop {r0} bx r0 - thumb_func_end sub_08196698 + thumb_func_end PopulateMapName - thumb_func_start sub_081966B4 -sub_081966B4: @ 0x081966B4 + thumb_func_start GetLandEncounterSlot +GetLandEncounterSlot: @ 0x081966B4 push {lr} bl Random lsls r0, r0, #0x10 @@ -833446,10 +833446,10 @@ _08196746: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081966B4 + thumb_func_end GetLandEncounterSlot - thumb_func_start sub_0819674C -sub_0819674C: @ 0x0819674C + thumb_func_start GetWaterEncounterSlot +GetWaterEncounterSlot: @ 0x0819674C push {lr} bl Random lsls r0, r0, #0x10 @@ -833489,10 +833489,10 @@ _0819678E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0819674C + thumb_func_end GetWaterEncounterSlot - thumb_func_start sub_08196794 -sub_08196794: @ 0x08196794 + thumb_func_start PopulateSpeciesFromTrainerLocation +PopulateSpeciesFromTrainerLocation: @ 0x08196794 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -833539,7 +833539,7 @@ _081967CE: ldr r4, [r0] cmp r4, #0 beq _081967FE - bl sub_081966B4 + bl GetLandEncounterSlot lsls r0, r0, #0x18 mov r2, sp ldr r1, [r4, #4] @@ -833555,7 +833555,7 @@ _081967FE: ldr r4, [r0] cmp r4, #0 beq _08196822 - bl sub_0819674C + bl GetWaterEncounterSlot lsls r0, r0, #0x18 lsls r1, r6, #1 mov r3, sp @@ -833601,10 +833601,10 @@ _0819685E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08196794 + thumb_func_end PopulateSpeciesFromTrainerLocation - thumb_func_start sub_0819686C -sub_0819686C: @ 0x0819686C + thumb_func_start atk50_openpartyscreen +atk50_openpartyscreen: @ 0x0819686C push {r4, r5, r6, r7, lr} adds r7, r1, #0 ldr r2, _081968BC @@ -833665,10 +833665,10 @@ _081968CA: bx r0 .align 2, 0 _081968E4: .4byte gUnknown_82EA31C - thumb_func_end sub_0819686C + thumb_func_end atk50_openpartyscreen - thumb_func_start sub_081968E8 -sub_081968E8: @ 0x081968E8 + thumb_func_start PopulateBattleFrontierFacilityName +PopulateBattleFrontierFacilityName: @ 0x081968E8 push {lr} adds r0, r1, #0 ldr r2, _08196900 @@ -833683,10 +833683,10 @@ sub_081968E8: @ 0x081968E8 .align 2, 0 _08196900: .4byte gUnknown_85D7A84 _08196904: .4byte gUnknown_203CA54 - thumb_func_end sub_081968E8 + thumb_func_end PopulateBattleFrontierFacilityName - thumb_func_start sub_08196908 -sub_08196908: @ 0x08196908 + thumb_func_start PopulateBattleFrontierStreak +PopulateBattleFrontierStreak: @ 0x08196908 push {r4, r5, r6, lr} adds r5, r1, #0 movs r4, #0 @@ -833715,10 +833715,10 @@ _08196928: bx r0 .align 2, 0 _0819693C: .4byte gUnknown_203CA54 - thumb_func_end sub_08196908 + thumb_func_end PopulateBattleFrontierStreak - thumb_func_start sub_08196940 -sub_08196940: @ 0x08196940 + thumb_func_start GetNumOwnedBadges +GetNumOwnedBadges: @ 0x08196940 push {r4, r5, lr} movs r4, #0 ldr r5, _08196948 @@ -833741,7 +833741,7 @@ _08196960: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08196940 + thumb_func_end GetNumOwnedBadges thumb_func_start sub_08196968 sub_08196968: @ 0x08196968 @@ -833750,10 +833750,10 @@ sub_08196968: @ 0x08196968 mov r6, r8 push {r6, r7} adds r7, r0, #0 - bl sub_08196940 + bl GetNumOwnedBadges cmp r0, #4 ble _081969E8 - bl sub_0802F300 + bl RtcGetLocalDayCount adds r4, r0, #0 ldr r0, _081969D8 ldr r0, [r0] @@ -833767,7 +833767,7 @@ sub_08196968: @ 0x08196968 ldr r1, _081969E4 adds r0, r0, r1 ldrh r5, [r0] - bl sub_08196348 + bl GetNumRematchTrainersFought mov sb, r0 movs r0, #0xd mov r1, sb @@ -833777,7 +833777,7 @@ sub_08196968: @ 0x08196968 bl __divsi3 mov r8, r0 movs r0, #9 - bl sub_08084180 + bl GetGameStat eors r4, r5 eors r5, r0 adds r4, r4, r5 @@ -833809,8 +833809,8 @@ _081969EA: .align 2, 0 thumb_func_end sub_08196968 - thumb_func_start sub_081969F8 -sub_081969F8: @ 0x081969F8 + thumb_func_start GetFrontierStreakInfo +GetFrontierStreakInfo: @ 0x081969F8 push {r4, r5, r6, lr} adds r5, r1, #0 lsls r0, r0, #0x10 @@ -834020,10 +834020,10 @@ _08196B72: .align 2, 0 _08196B7C: .4byte gUnknown_3005AF0 _08196B80: .4byte 0x00000E1E - thumb_func_end sub_081969F8 + thumb_func_end GetFrontierStreakInfo - thumb_func_start sub_08196B84 -sub_08196B84: @ 0x08196B84 + thumb_func_start GetPokedexRatingLevel +GetPokedexRatingLevel: @ 0x08196B84 push {r4, lr} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 @@ -834130,7 +834130,7 @@ _08196C22: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _08196C44 @@ -834143,7 +834143,7 @@ _08196C44: lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _08196C60 @@ -834163,7 +834163,7 @@ _08196C6E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08196B84 + thumb_func_end GetPokedexRatingLevel thumb_func_start sub_08196C74 sub_08196C74: @ 0x08196C74 @@ -834185,11 +834185,11 @@ sub_08196C74: @ 0x08196C74 b _08196D50 _08196C96: movs r0, #0 - bl sub_080BFD9C + bl GetHoennPokedexCount lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount lsls r0, r0, #0x10 lsrs r6, r0, #0x10 ldr r0, _08196D60 @@ -834206,7 +834206,7 @@ _08196C96: movs r3, #3 bl sub_080089D8 adds r0, r6, #0 - bl sub_08196B84 + bl GetPokedexRatingLevel adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -834231,9 +834231,9 @@ _08196C96: bl StringCopy mov r0, r8 adds r1, r7, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r5, r0, #0 - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _08196D4A strb r6, [r5] @@ -834258,10 +834258,10 @@ _08196C96: bl sub_080089D8 ldr r1, _08196D74 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _08196D4A: adds r0, r7, #0 - bl sub_08000BF0 + bl Free _08196D50: pop {r3, r4, r5} mov r8, r3 @@ -834287,7 +834287,7 @@ sub_08196D78: @ 0x08196D78 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08196DB0 @@ -834302,7 +834302,7 @@ sub_08196D78: @ 0x08196D78 lsrs r5, r5, #0x10 adds r1, r5, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4, r5} pop {r0} bx r0 @@ -834314,17 +834314,17 @@ _08196DB4: .4byte gUnknown_85D74C8 thumb_func_start sub_08196DB8 sub_08196DB8: @ 0x08196DB8 push {lr} - bl sub_0819605C + bl DrawMatchCallTextBoxBorder pop {r0} bx r0 .align 2, 0 thumb_func_end sub_08196DB8 - thumb_func_start sub_08196DC4 -sub_08196DC4: @ 0x08196DC4 + thumb_func_start InitStandardTextBoxWindows +InitStandardTextBoxWindows: @ 0x08196DC4 push {lr} ldr r0, _08196DDC - bl sub_08003090 + bl InitWindows ldr r0, _08196DE0 movs r1, #0xff strb r1, [r0] @@ -834336,12 +834336,12 @@ sub_08196DC4: @ 0x08196DC4 _08196DDC: .4byte gUnknown_85D7B28 _08196DE0: .4byte gUnknown_203CA58 _08196DE4: .4byte gUnknown_203CA59 - thumb_func_end sub_08196DC4 + thumb_func_end InitStandardTextBoxWindows thumb_func_start sub_08196DE8 sub_08196DE8: @ 0x08196DE8 push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers pop {r0} bx r0 .align 2, 0 @@ -834353,11 +834353,11 @@ sub_08196DF4: @ 0x08196DF4 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY bl sub_08004480 bl sub_08196F98 pop {r0} @@ -834365,8 +834365,8 @@ sub_08196DF4: @ 0x08196DF4 .align 2, 0 thumb_func_end sub_08196DF4 - thumb_func_start sub_08196E18 -sub_08196E18: @ 0x08196E18 + thumb_func_start RunTextPrintersAndIsPrinter0Active +RunTextPrintersAndIsPrinter0Active: @ 0x08196E18 push {lr} bl sub_08004630 movs r0, #0 @@ -834375,10 +834375,10 @@ sub_08196E18: @ 0x08196E18 lsrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_08196E18 + thumb_func_end RunTextPrintersAndIsPrinter0Active - thumb_func_start sub_08196E2C -sub_08196E2C: @ 0x08196E2C + thumb_func_start AddTextPrinterParameterized2 +AddTextPrinterParameterized2: @ 0x08196E2C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -834437,7 +834437,7 @@ sub_08196E2C: @ 0x08196E2C mov r0, sp adds r1, r3, #0 adds r2, r7, #0 - bl sub_08004548 + bl AddTextPrinter lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #0x10 @@ -834448,10 +834448,10 @@ sub_08196E2C: @ 0x08196E2C bx r1 .align 2, 0 _08196EB4: .4byte gUnknown_30030B4 - thumb_func_end sub_08196E2C + thumb_func_end AddTextPrinterParameterized2 - thumb_func_start sub_08196EB8 -sub_08196EB8: @ 0x08196EB8 + thumb_func_start AddTextPrinterForMessage +AddTextPrinterForMessage: @ 0x08196EB8 push {r4, r5, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -834479,7 +834479,7 @@ sub_08196EB8: @ 0x08196EB8 str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5} pop {r0} @@ -834487,10 +834487,10 @@ sub_08196EB8: @ 0x08196EB8 .align 2, 0 _08196EFC: .4byte gUnknown_30030B4 _08196F00: .4byte gUnknown_2021C7C - thumb_func_end sub_08196EB8 + thumb_func_end AddTextPrinterForMessage - thumb_func_start sub_08196F04 -sub_08196F04: @ 0x08196F04 + thumb_func_start AddTextPrinterForMessage_2 +AddTextPrinterForMessage_2: @ 0x08196F04 push {r4, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -834518,7 +834518,7 @@ sub_08196F04: @ 0x08196F04 str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4} pop {r0} @@ -834526,7 +834526,7 @@ sub_08196F04: @ 0x08196F04 .align 2, 0 _08196F48: .4byte gUnknown_30030B4 _08196F4C: .4byte gUnknown_2021C7C - thumb_func_end sub_08196F04 + thumb_func_end AddTextPrinterForMessage_2 thumb_func_start AddTextPrinterWithCustomSpeedForMessage AddTextPrinterWithCustomSpeedForMessage: @ 0x08196F50 @@ -834556,7 +834556,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 0x08196F50 str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5} pop {r0} @@ -834573,7 +834573,7 @@ sub_08196F98: @ 0x08196F98 lsls r1, r1, #2 movs r0, #0 movs r2, #0xf0 - bl sub_08098104 + bl LoadMessageBoxGfx movs r1, #0x85 lsls r1, r1, #2 movs r0, #0 @@ -834594,17 +834594,17 @@ sub_08196FB8: @ 0x08196FB8 lsrs r4, r4, #0x18 ldr r1, _08196FEC adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _08196FE6 adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08196FE6: pop {r4, r5} pop {r0} @@ -834623,23 +834623,23 @@ sub_08196FF0: @ 0x08196FF0 lsrs r4, r4, #0x18 ldr r1, _08197024 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _0819701E adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0819701E: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08197024: .4byte sub_08197098 +_08197024: .4byte WindowFunc_DrawStandardFrame thumb_func_end sub_08196FF0 thumb_func_start sub_08197028 @@ -834652,23 +834652,23 @@ sub_08197028: @ 0x08197028 lsrs r4, r4, #0x18 ldr r1, _0819705C adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_08003774 + bl ClearWindowTilemap cmp r4, #1 bne _08197056 adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08197056: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_0819705C: .4byte sub_081975E8 +_0819705C: .4byte WindowFunc_ClearDialogWindowAndFrame thumb_func_end sub_08197028 thumb_func_start sub_08197060 @@ -834681,27 +834681,27 @@ sub_08197060: @ 0x08197060 lsrs r4, r4, #0x18 ldr r1, _08197094 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_08003774 + bl ClearWindowTilemap cmp r4, #1 bne _0819708E adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0819708E: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08197094: .4byte sub_081975A0 +_08197094: .4byte WindowFunc_ClearStdWindowAndFrame thumb_func_end sub_08197060 - thumb_func_start sub_08197098 -sub_08197098: @ 0x08197098 + thumb_func_start WindowFunc_DrawStandardFrame +WindowFunc_DrawStandardFrame: @ 0x08197098 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -834859,7 +834859,7 @@ _081971D8: .4byte 0x00000217 _081971DC: .4byte 0x00000219 _081971E0: .4byte 0x0000021A _081971E4: .4byte 0x0000021B - thumb_func_end sub_08197098 + thumb_func_end WindowFunc_DrawStandardFrame thumb_func_start sub_081971E8 sub_081971E8: @ 0x081971E8 @@ -835286,8 +835286,8 @@ _08197598: .4byte 0x00000A05 _0819759C: .4byte 0x00000A06 thumb_func_end sub_081971E8 - thumb_func_start sub_081975A0 -sub_081975A0: @ 0x081975A0 + thumb_func_start WindowFunc_ClearStdWindowAndFrame +WindowFunc_ClearStdWindowAndFrame: @ 0x081975A0 push {r4, r5, lr} sub sp, #0xc adds r4, r1, #0 @@ -835323,10 +835323,10 @@ sub_081975A0: @ 0x081975A0 pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081975A0 + thumb_func_end WindowFunc_ClearStdWindowAndFrame - thumb_func_start sub_081975E8 -sub_081975E8: @ 0x081975E8 + thumb_func_start WindowFunc_ClearDialogWindowAndFrame +WindowFunc_ClearDialogWindowAndFrame: @ 0x081975E8 push {r4, r5, lr} sub sp, #0xc adds r4, r1, #0 @@ -835366,10 +835366,10 @@ sub_081975E8: @ 0x081975E8 pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081975E8 + thumb_func_end WindowFunc_ClearDialogWindowAndFrame - thumb_func_start sub_08197638 -sub_08197638: @ 0x08197638 + thumb_func_start SetStandardWindowBorderStyle +SetStandardWindowBorderStyle: @ 0x08197638 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -835378,10 +835378,10 @@ sub_08197638: @ 0x08197638 movs r2, #0x85 lsls r2, r2, #2 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette pop {r0} bx r0 - thumb_func_end sub_08197638 + thumb_func_end SetStandardWindowBorderStyle thumb_func_start sub_08197650 sub_08197650: @ 0x08197650 @@ -835397,12 +835397,12 @@ sub_08197650: @ 0x08197650 adds r0, r4, #0 adds r1, r6, #0 movs r2, #0xf0 - bl sub_08098104 + bl LoadMessageBoxGfx adds r0, r4, #0 adds r1, r5, #0 adds r2, r6, #0 movs r3, #0xf - bl sub_08197924 + bl DrawDialogFrameWithCustomTileAndPalette pop {r4, r5, r6} pop {r0} bx r0 @@ -835415,27 +835415,27 @@ sub_08197680: @ 0x08197680 ldr r0, _08197690 movs r1, #0xe0 movs r2, #0x14 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 _08197690: .4byte gUnknown_85D7B04 thumb_func_end sub_08197680 - thumb_func_start sub_08197694 -sub_08197694: @ 0x08197694 + thumb_func_start Menu_LoadStdPalAt +Menu_LoadStdPalAt: @ 0x08197694 push {lr} adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 ldr r0, _081976A8 movs r2, #0x14 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 _081976A8: .4byte gUnknown_85D7B04 - thumb_func_end sub_08197694 + thumb_func_end Menu_LoadStdPalAt thumb_func_start sub_081976AC sub_081976AC: @ 0x081976AC @@ -835464,8 +835464,8 @@ _081976C0: _081976CC: .4byte gUnknown_85D7B04 thumb_func_end sub_081976B4 - thumb_func_start sub_081976D0 -sub_081976D0: @ 0x081976D0 + thumb_func_start DisplayItemMessageOnField +DisplayItemMessageOnField: @ 0x081976D0 push {r4, r5, r6, lr} sub sp, #0x10 adds r4, r0, #0 @@ -835487,16 +835487,16 @@ sub_081976D0: @ 0x081976D0 adds r0, r4, #0 movs r1, #0 movs r3, #0xf - bl sub_08121E6C + bl DisplayMessageAndContinueTask movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081976D0 + thumb_func_end DisplayItemMessageOnField thumb_func_start sub_08197714 sub_08197714: @ 0x08197714 @@ -835653,7 +835653,7 @@ sub_08197818: @ 0x08197818 ldrb r0, [r4] cmp r0, #0xff beq _0819782A - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] _0819782A: @@ -835680,8 +835680,8 @@ sub_0819783C: @ 0x0819783C .align 2, 0 thumb_func_end sub_0819783C - thumb_func_start sub_08197844 -sub_08197844: @ 0x08197844 + thumb_func_start AddMapNamePopUpWindow +AddMapNamePopUpWindow: @ 0x08197844 push {r4, lr} sub sp, #0xc ldr r4, _08197878 @@ -835709,7 +835709,7 @@ _0819786C: bx r1 .align 2, 0 _08197878: .4byte gUnknown_203CA59 - thumb_func_end sub_08197844 + thumb_func_end AddMapNamePopUpWindow thumb_func_start sub_0819787C sub_0819787C: @ 0x0819787C @@ -835727,7 +835727,7 @@ sub_08197888: @ 0x08197888 ldrb r0, [r4] cmp r0, #0xff beq _0819789A - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] _0819789A: @@ -835738,8 +835738,8 @@ _0819789A: _081978A0: .4byte gUnknown_203CA59 thumb_func_end sub_08197888 - thumb_func_start sub_081978A4 -sub_081978A4: @ 0x081978A4 + thumb_func_start AddTextPrinterWithCallbackForMessage +AddTextPrinterWithCallbackForMessage: @ 0x081978A4 push {r4, r5, lr} sub sp, #0x10 adds r5, r1, #0 @@ -835767,7 +835767,7 @@ sub_081978A4: @ 0x081978A4 str r0, [sp, #0xc] movs r0, #0 movs r1, #1 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5} pop {r0} @@ -835775,7 +835775,7 @@ sub_081978A4: @ 0x081978A4 .align 2, 0 _081978E8: .4byte gUnknown_30030B4 _081978EC: .4byte gUnknown_2021C7C - thumb_func_end sub_081978A4 + thumb_func_end AddTextPrinterWithCallbackForMessage thumb_func_start sub_081978F0 sub_081978F0: @ 0x081978F0 @@ -835797,7 +835797,7 @@ sub_081978F0: @ 0x081978F0 cmp r4, #1 bne _0819791A movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _0819791A: add sp, #0xc pop {r4} @@ -835806,8 +835806,8 @@ _0819791A: .align 2, 0 thumb_func_end sub_081978F0 - thumb_func_start sub_08197924 -sub_08197924: @ 0x08197924 + thumb_func_start DrawDialogFrameWithCustomTileAndPalette +DrawDialogFrameWithCustomTileAndPalette: @ 0x08197924 push {r4, r5, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -835820,17 +835820,17 @@ sub_08197924: @ 0x08197924 strb r3, [r0] ldr r1, _08197968 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _0819795A adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0819795A: pop {r4, r5} pop {r0} @@ -835839,10 +835839,10 @@ _0819795A: _08197960: .4byte gUnknown_203CA68 _08197964: .4byte gUnknown_203CA6A _08197968: .4byte sub_081979BC - thumb_func_end sub_08197924 + thumb_func_end DrawDialogFrameWithCustomTileAndPalette - thumb_func_start sub_0819796C -sub_0819796C: @ 0x0819796C + thumb_func_start DrawDialogFrameWithCustomTile +DrawDialogFrameWithCustomTile: @ 0x0819796C push {r4, r5, r6, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -835854,21 +835854,21 @@ sub_0819796C: @ 0x0819796C ldr r5, _081979B4 adds r0, r6, #0 movs r1, #5 - bl sub_0800401C + bl GetWindowAttribute strb r0, [r5] ldr r1, _081979B8 adds r0, r6, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r6, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r6, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _081979AA adds r0, r6, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _081979AA: pop {r4, r5, r6} pop {r0} @@ -835877,7 +835877,7 @@ _081979AA: _081979B0: .4byte gUnknown_203CA68 _081979B4: .4byte gUnknown_203CA6A _081979B8: .4byte sub_081979BC - thumb_func_end sub_0819796C + thumb_func_end DrawDialogFrameWithCustomTile thumb_func_start sub_081979BC sub_081979BC: @ 0x081979BC @@ -836487,27 +836487,27 @@ sub_08197EBC: @ 0x08197EBC lsrs r4, r4, #0x18 ldr r1, _08197EF0 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_08003774 + bl ClearWindowTilemap cmp r4, #1 bne _08197EEA adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08197EEA: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08197EF0: .4byte sub_08197EF4 +_08197EF0: .4byte WindowFunc_ClearDialogWindowAndFrameNullPalette thumb_func_end sub_08197EBC - thumb_func_start sub_08197EF4 -sub_08197EF4: @ 0x08197EF4 + thumb_func_start WindowFunc_ClearDialogWindowAndFrameNullPalette +WindowFunc_ClearDialogWindowAndFrameNullPalette: @ 0x08197EF4 push {r4, r5, lr} sub sp, #0xc adds r4, r1, #0 @@ -836547,10 +836547,10 @@ sub_08197EF4: @ 0x08197EF4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08197EF4 + thumb_func_end WindowFunc_ClearDialogWindowAndFrameNullPalette - thumb_func_start sub_08197F44 -sub_08197F44: @ 0x08197F44 + thumb_func_start DrawStdFrameWithCustomTileAndPalette +DrawStdFrameWithCustomTileAndPalette: @ 0x08197F44 push {r4, r5, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -836563,17 +836563,17 @@ sub_08197F44: @ 0x08197F44 strb r3, [r0] ldr r1, _08197F88 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _08197F7A adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08197F7A: pop {r4, r5} pop {r0} @@ -836581,8 +836581,8 @@ _08197F7A: .align 2, 0 _08197F80: .4byte gUnknown_203CA68 _08197F84: .4byte gUnknown_203CA6A -_08197F88: .4byte sub_08197FDC - thumb_func_end sub_08197F44 +_08197F88: .4byte WindowFunc_DrawStdFrameWithCustomTileAndPalette + thumb_func_end DrawStdFrameWithCustomTileAndPalette thumb_func_start sub_08197F8C sub_08197F8C: @ 0x08197F8C @@ -836597,21 +836597,21 @@ sub_08197F8C: @ 0x08197F8C ldr r5, _08197FD4 adds r0, r6, #0 movs r1, #5 - bl sub_0800401C + bl GetWindowAttribute strb r0, [r5] ldr r1, _08197FD8 adds r0, r6, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r6, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r6, #0 - bl sub_0800365C + bl PutWindowTilemap cmp r4, #1 bne _08197FCA adds r0, r6, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08197FCA: pop {r4, r5, r6} pop {r0} @@ -836619,11 +836619,11 @@ _08197FCA: .align 2, 0 _08197FD0: .4byte gUnknown_203CA68 _08197FD4: .4byte gUnknown_203CA6A -_08197FD8: .4byte sub_08197FDC +_08197FD8: .4byte WindowFunc_DrawStdFrameWithCustomTileAndPalette thumb_func_end sub_08197F8C - thumb_func_start sub_08197FDC -sub_08197FDC: @ 0x08197FDC + thumb_func_start WindowFunc_DrawStdFrameWithCustomTileAndPalette +WindowFunc_DrawStdFrameWithCustomTileAndPalette: @ 0x08197FDC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -836786,7 +836786,7 @@ sub_08197FDC: @ 0x08197FDC .align 2, 0 _0819812C: .4byte gUnknown_203CA68 _08198130: .4byte gUnknown_203CA6A - thumb_func_end sub_08197FDC + thumb_func_end WindowFunc_DrawStdFrameWithCustomTileAndPalette thumb_func_start sub_08198134 sub_08198134: @ 0x08198134 @@ -836798,27 +836798,27 @@ sub_08198134: @ 0x08198134 lsrs r4, r4, #0x18 ldr r1, _08198168 adds r0, r5, #0 - bl sub_08003F28 + bl CallWindowFunction adds r0, r5, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r5, #0 - bl sub_08003774 + bl ClearWindowTilemap cmp r4, #1 bne _08198162 adds r0, r5, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _08198162: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_08198168: .4byte sub_0819816C +_08198168: .4byte WindowFunc_ClearStdWindowAndFrameToTransparent thumb_func_end sub_08198134 - thumb_func_start sub_0819816C -sub_0819816C: @ 0x0819816C + thumb_func_start WindowFunc_ClearStdWindowAndFrameToTransparent +WindowFunc_ClearStdWindowAndFrameToTransparent: @ 0x0819816C push {r4, r5, lr} sub sp, #0xc adds r4, r1, #0 @@ -836854,7 +836854,7 @@ sub_0819816C: @ 0x0819816C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819816C + thumb_func_end WindowFunc_ClearStdWindowAndFrameToTransparent thumb_func_start sub_081981B4 sub_081981B4: @ 0x081981B4 @@ -836901,7 +836901,7 @@ _081981EE: strh r4, [r1, #6] ldr r4, _08198218 mov r0, sp - bl sub_08003250 + bl AddWindow strb r0, [r4] cmp r5, #0xf bls _0819821C @@ -836916,7 +836916,7 @@ _08198220: ldr r0, _0819823C adds r1, r5, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _08198240 ldrb r0, [r0] add sp, #8 @@ -836947,10 +836947,10 @@ sub_08198244: @ 0x08198244 ldrb r0, [r4] cmp r0, #0xff beq _081982D4 - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r6, #0 bl StringLength lsls r0, r0, #0x10 @@ -836979,7 +836979,7 @@ _08198298: ldr r5, _081982E0 ldrb r0, [r5] movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute movs r2, #0xec mov r1, r8 subs r2, r2, r1 @@ -836995,12 +836995,12 @@ _08198298: str r1, [sp, #4] str r6, [sp, #8] movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 cmp r7, #0 beq _081982D4 ldrb r0, [r5] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _081982D4: add sp, #0xc pop {r3} @@ -837054,10 +837054,10 @@ _08198326: strb r0, [r1, #2] ldr r4, _081983D8 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer lsls r7, r7, #0x18 cmp r6, #0 beq _0819839E @@ -837089,7 +837089,7 @@ _0819836E: ldr r4, _081983D8 ldrb r0, [r4] movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute movs r2, #0xec mov r1, r8 subs r2, r2, r1 @@ -837105,7 +837105,7 @@ _0819836E: str r1, [sp, #4] str r6, [sp, #8] movs r3, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819839E: ldr r4, _081983D8 ldrb r0, [r4] @@ -837120,12 +837120,12 @@ _0819839E: movs r1, #1 movs r2, #4 movs r3, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 cmp r7, #0 beq _081983C8 ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _081983C8: add sp, #0x18 pop {r3, r4} @@ -837146,7 +837146,7 @@ sub_081983DC: @ 0x081983DC cmp r0, #0xff beq _081983EC movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _081983EC: pop {r0} bx r0 @@ -837162,10 +837162,10 @@ sub_081983F4: @ 0x081983F4 cmp r0, #0xff beq _0819840C movs r1, #0xff - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0819840C: pop {r4} pop {r0} @@ -837182,14 +837182,14 @@ sub_08198418: @ 0x08198418 cmp r0, #0xff beq _08198440 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] _08198440: @@ -837243,7 +837243,7 @@ _08198494: strb r7, [r5, #2] _08198496: movs r0, #0 - bl sub_081985E8 + bl Menu_MoveCursor ldr r0, _081984AC ldrb r0, [r0, #2] pop {r3} @@ -837413,8 +837413,8 @@ _081985E0: .4byte gUnknown_85D7B6C _081985E4: .4byte gUnknown_203CA5C thumb_func_end sub_0819854C - thumb_func_start sub_081985E8 -sub_081985E8: @ 0x081985E8 + thumb_func_start Menu_MoveCursor +Menu_MoveCursor: @ 0x081985E8 push {r4, r5, lr} ldr r1, _08198608 ldrb r5, [r1, #2] @@ -837450,10 +837450,10 @@ _0819861A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081985E8 + thumb_func_end Menu_MoveCursor - thumb_func_start sub_0819862C -sub_0819862C: @ 0x0819862C + thumb_func_start Menu_MoveCursorNoWrapAround +Menu_MoveCursorNoWrapAround: @ 0x0819862C push {r4, r5, lr} ldr r1, _0819864C ldrb r5, [r1, #2] @@ -837489,19 +837489,19 @@ _0819865E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_0819862C + thumb_func_end Menu_MoveCursorNoWrapAround - thumb_func_start sub_08198670 -sub_08198670: @ 0x08198670 + thumb_func_start Menu_GetCursorPos +Menu_GetCursorPos: @ 0x08198670 ldr r0, _08198678 ldrb r0, [r0, #2] bx lr .align 2, 0 _08198678: .4byte gUnknown_203CA5C - thumb_func_end sub_08198670 + thumb_func_end Menu_GetCursorPos - thumb_func_start sub_0819867C -sub_0819867C: @ 0x0819867C + thumb_func_start Menu_ProcessInput +Menu_ProcessInput: @ 0x0819867C push {r4, lr} ldr r0, _081986A0 ldrh r1, [r0, #0x2e] @@ -837549,7 +837549,7 @@ _081986CA: bl sub_080A306C movs r0, #1 _081986DA: - bl sub_081985E8 + bl Menu_MoveCursor _081986DE: movs r0, #2 rsbs r0, r0, #0 @@ -837557,10 +837557,10 @@ _081986E2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0819867C + thumb_func_end Menu_ProcessInput - thumb_func_start sub_081986E8 -sub_081986E8: @ 0x081986E8 + thumb_func_start Menu_ProcessInputNoWrap +Menu_ProcessInputNoWrap: @ 0x081986E8 push {r4, r5, r6, lr} ldr r4, _08198710 ldrb r5, [r4, #2] @@ -837598,7 +837598,7 @@ _08198726: beq _08198740 movs r0, #1 rsbs r0, r0, #0 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -837610,7 +837610,7 @@ _08198740: cmp r0, #0 beq _0819875C movs r0, #1 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -837626,10 +837626,10 @@ _08198760: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081986E8 + thumb_func_end Menu_ProcessInputNoWrap - thumb_func_start sub_08198768 -sub_08198768: @ 0x08198768 + thumb_func_start ProcessMenuInput_other +ProcessMenuInput_other: @ 0x08198768 push {r4, lr} ldr r2, _0819878C ldrh r1, [r2, #0x2e] @@ -837676,7 +837676,7 @@ _081987B8: bl sub_080A306C movs r0, #1 _081987C4: - bl sub_081985E8 + bl Menu_MoveCursor _081987C8: movs r0, #2 rsbs r0, r0, #0 @@ -837685,10 +837685,10 @@ _081987CC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_08198768 + thumb_func_end ProcessMenuInput_other - thumb_func_start sub_081987D4 -sub_081987D4: @ 0x081987D4 + thumb_func_start Menu_ProcessInputNoWrapAround_other +Menu_ProcessInputNoWrapAround_other: @ 0x081987D4 push {r4, r5, r6, lr} ldr r4, _081987FC ldrb r5, [r4, #2] @@ -837727,7 +837727,7 @@ _08198812: bne _0819882E movs r0, #1 rsbs r0, r0, #0 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r5, r0 @@ -837737,7 +837737,7 @@ _0819882E: cmp r1, #0x80 bne _08198846 movs r0, #1 - bl sub_0819862C + bl Menu_MoveCursorNoWrapAround lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r6, r0 @@ -837752,10 +837752,10 @@ _0819884A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081987D4 + thumb_func_end Menu_ProcessInputNoWrapAround_other - thumb_func_start sub_08198850 -sub_08198850: @ 0x08198850 + thumb_func_start PrintTextArray +PrintTextArray: @ 0x08198850 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -837809,7 +837809,7 @@ _08198884: _081988B4: adds r0, r6, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -837818,7 +837818,7 @@ _081988B4: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_08198850 + thumb_func_end PrintTextArray thumb_func_start sub_081988CC sub_081988CC: @ 0x081988CC @@ -837880,7 +837880,7 @@ _08198914: adds r0, r7, #0 ldr r1, [sp, #0x14] ldr r3, [sp, #0x18] - bl sub_08199C0C + bl AddTextPrinterParameterized5 adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -837889,7 +837889,7 @@ _08198914: _0819894C: adds r0, r7, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x20 pop {r3, r4, r5} mov r8, r3 @@ -837922,7 +837922,7 @@ sub_08198964: @ 0x08198964 lsrs r5, r5, #0x18 adds r0, r6, #0 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -837932,7 +837932,7 @@ sub_08198964: @ 0x08198964 mov r0, r8 adds r1, r6, #0 movs r3, #2 - bl sub_08198850 + bl PrintTextArray add sp, #0xc pop {r3} mov r8, r3 @@ -837942,8 +837942,8 @@ sub_08198964: @ 0x08198964 .align 2, 0 thumb_func_end sub_08198964 - thumb_func_start sub_081989B4 -sub_081989B4: @ 0x081989B4 + thumb_func_start AddItemMenuActionTextPrinters +AddItemMenuActionTextPrinters: @ 0x081989B4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -837983,7 +837983,7 @@ sub_081989B4: @ 0x081989B4 strb r6, [r0, #5] adds r0, r6, #0 movs r1, #5 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp lsls r0, r0, #4 ldrb r2, [r3, #0xc] @@ -837994,7 +837994,7 @@ sub_081989B4: @ 0x081989B4 strb r1, [r3, #0xc] adds r0, r6, #0 movs r1, #6 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp adds r1, r5, #0 ands r1, r0 @@ -838007,7 +838007,7 @@ sub_081989B4: @ 0x081989B4 strb r0, [r3, #0xd] adds r0, r6, #0 movs r1, #7 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp lsls r0, r0, #4 ldrb r2, [r3, #0xd] @@ -838017,7 +838017,7 @@ sub_081989B4: @ 0x081989B4 strb r1, [r3, #0xd] adds r0, r6, #0 movs r1, #4 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp ands r5, r0 ldrb r0, [r1, #0xc] @@ -838029,7 +838029,7 @@ sub_081989B4: @ 0x081989B4 strb r2, [r0, #0xa] adds r0, r6, #0 movs r1, #3 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp strb r0, [r1, #0xb] mov r0, sp @@ -838058,7 +838058,7 @@ _08198A7E: mov r0, sp movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -838067,7 +838067,7 @@ _08198A7E: _08198AAE: ldr r0, [sp, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x18 pop {r3, r4, r5} mov r8, r3 @@ -838077,7 +838077,7 @@ _08198AAE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081989B4 + thumb_func_end AddItemMenuActionTextPrinters thumb_func_start sub_08198AC8 sub_08198AC8: @ 0x08198AC8 @@ -838104,13 +838104,13 @@ sub_08198AC8: @ 0x08198AC8 mov r8, r0 adds r0, r4, #0 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 adds r0, r4, #0 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp] @@ -838124,7 +838124,7 @@ sub_08198AC8: @ 0x08198AC8 adds r1, r4, #0 adds r2, r5, #0 movs r3, #2 - bl sub_081989B4 + bl AddItemMenuActionTextPrinters add sp, #0x14 pop {r3, r4} mov r8, r3 @@ -838239,7 +838239,7 @@ sub_08198BB4: @ 0x08198BB4 adds r3, r6, #0 bl SetWindowTemplateFields add r0, sp, #0x10 - bl sub_08003250 + bl AddWindow lsls r0, r0, #0x10 lsrs r0, r0, #0x10 add sp, #0x18 @@ -838283,13 +838283,13 @@ sub_08198C08: @ 0x08198C08 lsrs r1, r1, #0x18 mov sl, r1 ldr r7, _08198D3C - bl sub_08003250 + bl AddWindow strb r0, [r7] ldrb r0, [r7] movs r1, #1 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r0, _08198D40 str r0, [sp, #0xc] add r1, sp, #0xc @@ -838299,7 +838299,7 @@ sub_08198C08: @ 0x08198C08 strb r6, [r0, #5] adds r0, r6, #0 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute add r1, sp, #0xc add r0, r8 strb r0, [r1, #6] @@ -838314,7 +838314,7 @@ sub_08198C08: @ 0x08198C08 strb r0, [r1, #9] adds r0, r6, #0 movs r1, #5 - bl sub_080061B4 + bl GetFontAttribute add r3, sp, #0xc lsls r0, r0, #4 ldrb r2, [r3, #0xc] @@ -838325,7 +838325,7 @@ sub_08198C08: @ 0x08198C08 strb r1, [r3, #0xc] adds r0, r6, #0 movs r1, #6 - bl sub_080061B4 + bl GetFontAttribute add r3, sp, #0xc adds r1, r5, #0 ands r1, r0 @@ -838338,7 +838338,7 @@ sub_08198C08: @ 0x08198C08 strb r0, [r3, #0xd] adds r0, r6, #0 movs r1, #7 - bl sub_080061B4 + bl GetFontAttribute add r3, sp, #0xc lsls r0, r0, #4 ldrb r2, [r3, #0xd] @@ -838348,7 +838348,7 @@ sub_08198C08: @ 0x08198C08 strb r1, [r3, #0xd] adds r0, r6, #0 movs r1, #4 - bl sub_080061B4 + bl GetFontAttribute add r1, sp, #0xc ands r5, r0 ldrb r0, [r1, #0xc] @@ -838357,21 +838357,21 @@ sub_08198C08: @ 0x08198C08 strb r4, [r1, #0xc] adds r0, r6, #0 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute add r1, sp, #0xc strb r0, [r1, #0xa] adds r0, r6, #0 movs r1, #3 - bl sub_080061B4 + bl GetFontAttribute add r1, sp, #0xc strb r0, [r1, #0xb] adds r0, r1, #0 movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter adds r0, r6, #0 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrb r1, [r7] @@ -838422,14 +838422,14 @@ sub_08198D44: @ 0x08198D44 thumb_func_start Menu_ProcessInputNoWrapClearOnChoose Menu_ProcessInputNoWrapClearOnChoose: @ 0x08198D68 push {r4, lr} - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 rsbs r0, r0, #0 cmp r4, r0 beq _08198D7E - bl sub_08198D88 + bl MovementType_WalkSequenceUpLeftDownRight_callback _08198D7E: adds r0, r4, #0 pop {r4} @@ -838438,21 +838438,21 @@ _08198D7E: .align 2, 0 thumb_func_end Menu_ProcessInputNoWrapClearOnChoose - thumb_func_start sub_08198D88 -sub_08198D88: @ 0x08198D88 + thumb_func_start MovementType_WalkSequenceUpLeftDownRight_callback +MovementType_WalkSequenceUpLeftDownRight_callback: @ 0x08198D88 push {r4, lr} ldr r4, _08198DA0 ldrb r0, [r4] movs r1, #1 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 _08198DA0: .4byte gUnknown_203CA6B - thumb_func_end sub_08198D88 + thumb_func_end MovementType_WalkSequenceUpLeftDownRight_callback thumb_func_start sub_08198DA4 sub_08198DA4: @ 0x08198DA4 @@ -838544,7 +838544,7 @@ _08198E40: _08198E4A: mov r0, sl movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x20 pop {r3, r4, r5} mov r8, r3 @@ -838587,7 +838587,7 @@ sub_08198E64: @ 0x08198E64 lsrs r3, r3, #0x18 movs r1, #0 str r3, [sp, #0x14] - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -838647,7 +838647,7 @@ sub_08198ECC: @ 0x08198ECC strb r7, [r0, #5] adds r0, r7, #0 movs r1, #5 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp lsls r0, r0, #4 ldrb r2, [r3, #0xc] @@ -838658,7 +838658,7 @@ sub_08198ECC: @ 0x08198ECC strb r1, [r3, #0xc] adds r0, r7, #0 movs r1, #6 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp adds r1, r5, #0 ands r1, r0 @@ -838671,7 +838671,7 @@ sub_08198ECC: @ 0x08198ECC strb r0, [r3, #0xd] adds r0, r7, #0 movs r1, #7 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp lsls r0, r0, #4 ldrb r2, [r3, #0xd] @@ -838681,7 +838681,7 @@ sub_08198ECC: @ 0x08198ECC strb r1, [r3, #0xd] adds r0, r7, #0 movs r1, #4 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp ands r5, r0 ldrb r0, [r1, #0xc] @@ -838690,12 +838690,12 @@ sub_08198ECC: @ 0x08198ECC strb r4, [r1, #0xc] adds r0, r7, #0 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp strb r0, [r1, #0xa] adds r0, r7, #0 movs r1, #3 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp strb r0, [r1, #0xb] movs r6, #0 @@ -838728,7 +838728,7 @@ _08198F96: strb r0, [r4, #6] adds r0, r7, #0 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r1, r6, #0 muls r1, r0, r1 ldr r0, [sp, #0x18] @@ -838740,7 +838740,7 @@ _08198F96: mov r0, sp movs r1, #0xff movs r2, #0 - bl sub_08004548 + bl AddTextPrinter adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -838755,7 +838755,7 @@ _08198FE4: _08198FEE: ldr r0, [sp, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x20 pop {r3, r4, r5} mov r8, r3 @@ -838793,7 +838793,7 @@ sub_08199008: @ 0x08199008 adds r0, r3, #0 movs r1, #0 str r3, [sp, #0x14] - bl sub_080061B4 + bl GetFontAttribute adds r2, r0, #0 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 @@ -839296,7 +839296,7 @@ _08199400: ands r0, r1 cmp r0, #0 bne _08199414 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -839313,7 +839313,7 @@ _08199420: ands r0, r1 cmp r0, #0 bne _08199436 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -839336,8 +839336,8 @@ _08199448: .align 2, 0 thumb_func_end sub_081993A0 - thumb_func_start sub_08199450 -sub_08199450: @ 0x08199450 + thumb_func_start Menu_ProcessInputGridLayout +Menu_ProcessInputGridLayout: @ 0x08199450 push {r4, r5, r6, lr} ldr r5, _08199470 ldrb r4, [r5, #2] @@ -839385,7 +839385,7 @@ _081994A4: ands r0, r1 cmp r0, #0 bne _081994B8 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -839400,7 +839400,7 @@ _081994BE: ands r0, r1 cmp r0, #0 bne _081994D4 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -839424,7 +839424,7 @@ _081994EE: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_08199450 + thumb_func_end Menu_ProcessInputGridLayout thumb_func_start sub_081994F4 sub_081994F4: @ 0x081994F4 @@ -839618,8 +839618,8 @@ sub_08199640: @ 0x08199640 _08199650: .4byte gUnknown_203CA70 thumb_func_end sub_08199640 - thumb_func_start sub_08199654 -sub_08199654: @ 0x08199654 + thumb_func_start schedule_bg_copy_tilemap_to_vram +schedule_bg_copy_tilemap_to_vram: @ 0x08199654 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _08199664 @@ -839629,17 +839629,17 @@ sub_08199654: @ 0x08199654 bx lr .align 2, 0 _08199664: .4byte gUnknown_203CA70 - thumb_func_end sub_08199654 + thumb_func_end schedule_bg_copy_tilemap_to_vram - thumb_func_start sub_08199668 -sub_08199668: @ 0x08199668 + thumb_func_start do_scheduled_bg_tilemap_copies_to_vram +do_scheduled_bg_tilemap_copies_to_vram: @ 0x08199668 push {r4, lr} ldr r4, _081996B4 ldrb r0, [r4] cmp r0, #1 bne _0819967C movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 strb r0, [r4] _0819967C: @@ -839647,7 +839647,7 @@ _0819967C: cmp r0, #1 bne _0819968C movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 strb r0, [r4, #1] _0819968C: @@ -839655,7 +839655,7 @@ _0819968C: cmp r0, #1 bne _0819969C movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 strb r0, [r4, #2] _0819969C: @@ -839663,7 +839663,7 @@ _0819969C: cmp r0, #1 bne _081996AC movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 strb r0, [r4, #3] _081996AC: @@ -839672,7 +839672,7 @@ _081996AC: bx r0 .align 2, 0 _081996B4: .4byte gUnknown_203CA70 - thumb_func_end sub_08199668 + thumb_func_end do_scheduled_bg_tilemap_copies_to_vram thumb_func_start reset_temp_tile_data_buffers reset_temp_tile_data_buffers: @ 0x081996B8 @@ -839696,10 +839696,10 @@ _081996D4: .4byte gUnknown_203CA74 _081996D8: .4byte gUnknown_203CA78 thumb_func_end reset_temp_tile_data_buffers - thumb_func_start sub_081996DC -sub_081996DC: @ 0x081996DC + thumb_func_start free_temp_tile_data_buffers_if_possible +free_temp_tile_data_buffers_if_possible: @ 0x081996DC push {r4, r5, r6, lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _08199720 @@ -839715,7 +839715,7 @@ sub_081996DC: @ 0x081996DC movs r6, #0 _081996FC: ldr r0, [r5] - bl sub_08000BF0 + bl Free stm r5!, {r6} adds r4, #1 ldr r0, _08199718 @@ -839738,10 +839738,10 @@ _08199722: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081996DC + thumb_func_end free_temp_tile_data_buffers_if_possible - thumb_func_start sub_08199728 -sub_08199728: @ 0x08199728 + thumb_func_start decompress_and_copy_tile_data_to_vram +decompress_and_copy_tile_data_to_vram: @ 0x08199728 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -839764,7 +839764,7 @@ sub_08199728: @ 0x08199728 bhi _08199790 adds r0, r4, #0 add r1, sp, #4 - bl sub_08199858 + bl malloc_and_decompress adds r4, r0, #0 cmp r5, #0 bne _08199760 @@ -839778,7 +839778,7 @@ _08199760: mov r0, r8 adds r1, r4, #0 mov r3, sb - bl sub_08199888 + bl copy_decompressed_tile_data_to_vram ldr r2, _0819978C ldrh r0, [r6] adds r1, r0, #1 @@ -839803,10 +839803,10 @@ _08199792: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_08199728 + thumb_func_end decompress_and_copy_tile_data_to_vram - thumb_func_start sub_081997A0 -sub_081997A0: @ 0x081997A0 + thumb_func_start DecompressAndLoadBgGfxUsingHeap +DecompressAndLoadBgGfxUsingHeap: @ 0x081997A0 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -839824,7 +839824,7 @@ sub_081997A0: @ 0x081997A0 lsrs r7, r2, #0x18 adds r0, r1, #0 add r1, sp, #4 - bl sub_08199858 + bl malloc_and_decompress adds r6, r0, #0 cmp r5, #0 bne _081997CE @@ -839834,7 +839834,7 @@ _081997CE: beq _08199806 ldr r0, _08199814 movs r1, #0 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -839844,7 +839844,7 @@ _081997CE: mov r0, r8 adds r1, r6, #0 mov r3, sb - bl sub_08199888 + bl copy_decompressed_tile_data_to_vram ldr r2, _08199818 lsls r1, r4, #2 adds r1, r1, r4 @@ -839864,12 +839864,12 @@ _08199806: pop {r0} bx r0 .align 2, 0 -_08199814: .4byte sub_0819981C +_08199814: .4byte task_free_buf_after_copying_tile_data_to_vram _08199818: .4byte gUnknown_3005B60 - thumb_func_end sub_081997A0 + thumb_func_end DecompressAndLoadBgGfxUsingHeap - thumb_func_start sub_0819981C -sub_0819981C: @ 0x0819981C + thumb_func_start task_free_buf_after_copying_tile_data_to_vram +task_free_buf_after_copying_tile_data_to_vram: @ 0x0819981C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -839887,19 +839887,19 @@ sub_0819981C: @ 0x0819981C adds r0, r4, #0 movs r1, #1 bl GetWordTaskArg - bl sub_08000BF0 + bl Free adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _0819984C: pop {r4} pop {r0} bx r0 .align 2, 0 _08199854: .4byte gUnknown_3005B60 - thumb_func_end sub_0819981C + thumb_func_end task_free_buf_after_copying_tile_data_to_vram - thumb_func_start sub_08199858 -sub_08199858: @ 0x08199858 + thumb_func_start malloc_and_decompress +malloc_and_decompress: @ 0x08199858 push {r4, r5, lr} adds r5, r0, #0 ldrb r0, [r5, #1] @@ -839923,10 +839923,10 @@ _08199880: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_08199858 + thumb_func_end malloc_and_decompress - thumb_func_start sub_08199888 -sub_08199888: @ 0x08199888 + thumb_func_start copy_decompressed_tile_data_to_vram +copy_decompressed_tile_data_to_vram: @ 0x08199888 push {r4, lr} adds r4, r1, #0 ldr r1, [sp, #8] @@ -839960,7 +839960,7 @@ _081998C2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_08199888 + thumb_func_end copy_decompressed_tile_data_to_vram thumb_func_start sub_081998C8 sub_081998C8: @ 0x081998C8 @@ -839988,7 +839988,7 @@ sub_081998C8: @ 0x081998C8 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 mov sl, r2 - bl sub_08002194 + bl GetBgTilemapBuffer mov r8, r0 adds r0, r5, r4 cmp r5, r0 @@ -840063,7 +840063,7 @@ sub_08199954: @ 0x08199954 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 mov r8, r4 - bl sub_08002194 + bl GetBgTilemapBuffer adds r7, r0, #0 movs r0, #0 cmp r0, r8 @@ -840169,35 +840169,35 @@ sub_08199A30: @ 0x08199A30 movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 @@ -840217,7 +840217,7 @@ sub_08199A88: @ 0x08199A88 lsrs r5, r0, #0x18 adds r0, r5, #0 movs r1, #4 - bl sub_08001C34 + bl GetBgAttribute lsls r0, r0, #0x10 movs r7, #0x40 cmp r0, #0 @@ -840226,11 +840226,11 @@ sub_08199A88: @ 0x08199A88 _08199AAE: adds r0, r5, #0 movs r1, #1 - bl sub_08001C34 + bl GetBgAttribute adds r4, r0, #0 adds r0, r5, #0 movs r1, #0xa - bl sub_08001C34 + bl GetBgAttribute lsls r4, r4, #0x10 lsrs r4, r4, #2 lsls r0, r0, #0x10 @@ -840262,8 +840262,8 @@ _08199AAE: bx r0 thumb_func_end sub_08199A88 - thumb_func_start sub_08199AFC -sub_08199AFC: @ 0x08199AFC + thumb_func_start AddTextPrinterParameterized3 +AddTextPrinterParameterized3: @ 0x08199AFC push {r4, r5, r6, lr} sub sp, #0x10 adds r4, r1, #0 @@ -840288,12 +840288,12 @@ sub_08199AFC: @ 0x08199AFC strb r0, [r1, #9] adds r0, r4, #0 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp strb r0, [r1, #0xa] adds r0, r4, #0 movs r1, #3 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp strb r0, [r1, #0xb] mov r3, sp @@ -840324,15 +840324,15 @@ sub_08199AFC: @ 0x08199AFC mov r0, sp adds r1, r5, #0 movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08199AFC + thumb_func_end AddTextPrinterParameterized3 - thumb_func_start sub_08199B84 -sub_08199B84: @ 0x08199B84 + thumb_func_start AddTextPrinterParameterized4 +AddTextPrinterParameterized4: @ 0x08199B84 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -840392,7 +840392,7 @@ sub_08199B84: @ 0x08199B84 lsrs r1, r1, #0x18 mov r0, sp movs r2, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -840400,10 +840400,10 @@ sub_08199B84: @ 0x08199B84 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_08199B84 + thumb_func_end AddTextPrinterParameterized4 - thumb_func_start sub_08199C0C -sub_08199C0C: @ 0x08199C0C + thumb_func_start AddTextPrinterParameterized5 +AddTextPrinterParameterized5: @ 0x08199C0C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -840448,7 +840448,7 @@ sub_08199C0C: @ 0x08199C0C strb r0, [r2, #0xc] adds r0, r6, #0 movs r1, #5 - bl sub_080061B4 + bl GetFontAttribute mov r3, sp lsls r0, r0, #4 ldrb r2, [r3, #0xc] @@ -840459,7 +840459,7 @@ sub_08199C0C: @ 0x08199C0C strb r1, [r3, #0xc] adds r0, r6, #0 movs r1, #6 - bl sub_080061B4 + bl GetFontAttribute mov r2, sp adds r1, r4, #0 ands r1, r0 @@ -840469,7 +840469,7 @@ sub_08199C0C: @ 0x08199C0C strb r5, [r2, #0xd] adds r0, r6, #0 movs r1, #7 - bl sub_080061B4 + bl GetFontAttribute mov r2, sp lsls r0, r0, #4 ldrb r1, [r2, #0xd] @@ -840479,7 +840479,7 @@ sub_08199C0C: @ 0x08199C0C mov r0, sp mov r1, r8 adds r2, r7, #0 - bl sub_08004548 + bl AddTextPrinter add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -840488,10 +840488,10 @@ sub_08199C0C: @ 0x08199C0C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_08199C0C + thumb_func_end AddTextPrinterParameterized5 - thumb_func_start sub_08199CBC -sub_08199CBC: @ 0x08199CBC + thumb_func_start PrintPlayerNameOnWindow +PrintPlayerNameOnWindow: @ 0x08199CBC push {r4, r5, r6, r7, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -840515,7 +840515,7 @@ _08199CDA: bne _08199CDA _08199CE4: adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders lsls r3, r4, #0x18 lsrs r3, r3, #0x18 lsls r0, r5, #0x18 @@ -840536,7 +840536,7 @@ _08199CE4: .align 2, 0 _08199D10: .4byte gUnknown_3005AF0 _08199D14: .4byte gUnknown_2021C7C - thumb_func_end sub_08199CBC + thumb_func_end PrintPlayerNameOnWindow thumb_func_start sub_08199D18 sub_08199D18: @ 0x08199D18 @@ -840806,7 +840806,7 @@ sub_08199EF4: @ 0x08199EF4 bl GetValidMonIconPalettePtr adds r1, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -840874,15 +840874,15 @@ _08199F7C: _08199F7E: adds r1, r2, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r0} bx r0 .align 2, 0 _08199F8C: .4byte gUnknown_85D7C18 thumb_func_end sub_08199F54 - thumb_func_start sub_08199F90 -sub_08199F90: @ 0x08199F90 + thumb_func_start blit_move_info_icon +blit_move_info_icon: @ 0x08199F90 push {r4, r5, lr} sub sp, #0x18 lsls r0, r0, #0x18 @@ -840911,7 +840911,7 @@ sub_08199F90: @ 0x08199F90 adds r1, r5, #0 movs r2, #0 movs r3, #0 - bl sub_080038AC + bl BlitBitmapRectToWindow add sp, #0x18 pop {r4, r5} pop {r0} @@ -840919,7 +840919,7 @@ sub_08199F90: @ 0x08199F90 .align 2, 0 _08199FD4: .4byte gUnknown_85D7B70 _08199FD8: .4byte gUnknown_85D7C38 - thumb_func_end sub_08199F90 + thumb_func_end blit_move_info_icon thumb_func_start sub_08199FDC sub_08199FDC: @ 0x08199FDC @@ -840969,7 +840969,7 @@ _0819A030: .align 2, 0 _0819A03C: .4byte gUnknown_3005AF0 _0819A040: - bl sub_0809CD04 + bl IsNationalPokedexEnabled cmp r0, #0 beq _0819A050 movs r0, #1 @@ -840977,7 +840977,7 @@ _0819A040: b _0819A056 _0819A050: movs r0, #1 - bl sub_080BFD9C + bl GetHoennPokedexCount _0819A056: adds r1, r0, #0 lsls r1, r1, #0x10 @@ -841063,7 +841063,7 @@ sub_0819A0EC: @ 0x0819A0EC ldrb r4, [r5, #5] lsrs r4, r4, #4 movs r0, #0x65 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -841120,47 +841120,47 @@ _0819A162: bx r0 thumb_func_end sub_0819A0EC - thumb_func_start sub_0819A168 -sub_0819A168: @ 0x0819A168 + thumb_func_start Select_CB2 +Select_CB2: @ 0x0819A168 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819A168 + thumb_func_end Select_CB2 thumb_func_start sub_0819A184 sub_0819A184: @ 0x0819A184 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_0819A184 - thumb_func_start sub_0819A198 -sub_0819A198: @ 0x0819A198 + thumb_func_start DoBattleFactorySelectScreen +DoBattleFactorySelectScreen: @ 0x0819A198 push {lr} ldr r0, _0819A1AC movs r1, #0 str r1, [r0] ldr r0, _0819A1B0 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _0819A1AC: .4byte gUnknown_3001278 -_0819A1B0: .4byte sub_0819A1B4 - thumb_func_end sub_0819A198 +_0819A1B0: .4byte CB2_InitSelectScreen + thumb_func_end DoBattleFactorySelectScreen - thumb_func_start sub_0819A1B4 -sub_0819A1B4: @ 0x0819A1B4 + thumb_func_start CB2_InitSelectScreen +CB2_InitSelectScreen: @ 0x0819A1B4 push {r4, r5, lr} sub sp, #0xc ldr r0, _0819A1D4 @@ -841197,14 +841197,14 @@ _0819A208: ldr r0, [r4] cmp r0, #0 beq _0819A218 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _0819A218: movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 str r0, [sp, #8] movs r1, #0xc0 @@ -841219,7 +841219,7 @@ _0819A218: movs r2, #3 bl InitBgsFromTemplates ldr r0, _0819A25C - bl sub_08003090 + bl InitWindows bl sub_08004480 b _0819A586 .align 2, 0 @@ -841236,7 +841236,7 @@ _0819A260: str r0, [r5] ldr r5, _0819A32C adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] ldr r5, _0819A330 movs r4, #0x80 @@ -841246,32 +841246,32 @@ _0819A260: str r0, [r5] ldr r5, _0819A334 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -841316,7 +841316,7 @@ _0819A338: .4byte gUnknown_3002360 _0819A33C: bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl FreeAllSpritePalettes ldr r0, _0819A3EC ldr r5, _0819A3F0 @@ -841355,16 +841355,16 @@ _0819A33C: ldr r0, _0819A404 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r4, _0819A408 adds r0, r4, #0 movs r1, #0xf0 movs r2, #8 - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xe0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette ldr r0, _0819A40C ldr r1, [r0] ldrb r0, [r1, #6] @@ -841383,7 +841383,7 @@ _0819A3D8: ldr r0, _0819A414 movs r1, #0x20 movs r2, #4 - bl sub_080A1200 + bl LoadPalette ldr r1, _0819A418 movs r0, #0x87 lsls r0, r0, #3 @@ -841406,7 +841406,7 @@ _0819A41C: ldr r0, _0819A464 ldr r1, [r0] movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r5, _0819A468 movs r4, #8 str r4, [sp] @@ -841431,7 +841431,7 @@ _0819A41C: movs r3, #4 bl CopyToBgTilemapBufferRect movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0819A586 .align 2, 0 _0819A464: .4byte gUnknown_203CB04 @@ -841442,20 +841442,20 @@ _0819A46C: ldr r0, _0819A4DC bl LoadSpriteSheets ldr r0, _0819A4E0 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg ldr r0, _0819A4E4 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #1 rsbs r0, r0, #0 movs r1, #0 str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r1, #0x9a lsls r1, r1, #5 movs r0, #0 @@ -841469,9 +841469,9 @@ _0819A46C: movs r1, #0x98 movs r2, #0x20 movs r3, #0x60 - bl sub_0819C2B8 + bl Select_SetWinRegs movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r1, _0819A4EC movs r0, #0x50 bl SetGpuReg @@ -841489,7 +841489,7 @@ _0819A4EC: .4byte 0x00001248 _0819A4F0: .4byte 0x0000040B _0819A4F4: movs r0, #3 - bl sub_08001B5C + bl HideBg _0819A4FA: ldr r1, _0819A504 movs r3, #0x87 @@ -841508,13 +841508,13 @@ _0819A508: ldrb r0, [r0] strb r0, [r1, #3] _0819A518: - bl sub_0819A64C - bl sub_0819A6B8 + bl Select_InitMonsData + bl Select_InitAllSprites ldr r0, [r4] ldrb r0, [r0, #6] cmp r0, #1 bne _0819A52C - bl sub_0819BB1C + bl Select_ShowSummaryMonSprite _0819A52C: ldr r1, _0819A540 movs r0, #0x87 @@ -841526,13 +841526,13 @@ _0819A538: .4byte gUnknown_3001278 _0819A53C: .4byte gUnknown_203CBEC _0819A540: .4byte gUnknown_3002360 _0819A544: - bl sub_0819B708 + bl Select_PrintSelectMonString movs r0, #2 b _0819A582 _0819A54C: - bl sub_0819B99C + bl Select_PrintMonCategory movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0819A560 movs r3, #0x87 lsls r3, r3, #3 @@ -841541,9 +841541,9 @@ _0819A54C: .align 2, 0 _0819A560: .4byte gUnknown_3002360 _0819A564: - bl sub_0819B688 + bl Select_PrintMonSpecies movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0819A578 movs r0, #0x87 lsls r0, r0, #3 @@ -841555,7 +841555,7 @@ _0819A57C: bl sub_0819B654 movs r0, #0 _0819A582: - bl sub_0800365C + bl PutWindowTilemap _0819A586: ldr r1, _0819A598 movs r2, #0x87 @@ -841571,7 +841571,7 @@ _0819A598: .4byte gUnknown_3002360 _0819A59C: ldr r0, _0819A5E0 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r2, _0819A5E4 ldr r1, [r2] ldr r3, _0819A5E8 @@ -841592,7 +841592,7 @@ _0819A59C: strh r5, [r0, #8] ldr r0, _0819A5F0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #2 @@ -841602,11 +841602,11 @@ _0819A59C: strh r5, [r0, #8] b _0819A628 .align 2, 0 -_0819A5E0: .4byte sub_0819C384 +_0819A5E0: .4byte Task_SelectFadeSpeciesName _0819A5E4: .4byte gUnknown_3001278 _0819A5E8: .4byte 0x000002A1 _0819A5EC: .4byte gUnknown_3005B60 -_0819A5F0: .4byte sub_0819B018 +_0819A5F0: .4byte Task_HandleSelectionScreenChooseMons _0819A5F4: ldr r4, _0819A638 ldr r2, _0819A63C @@ -841624,7 +841624,7 @@ _0819A5F4: strb r2, [r0] ldr r0, _0819A644 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #2 @@ -841635,7 +841635,7 @@ _0819A5F4: strh r1, [r0, #8] _0819A628: ldr r0, _0819A648 - bl sub_08000540 + bl SetMainCallback2 _0819A62E: add sp, #0xc pop {r4, r5} @@ -841645,12 +841645,12 @@ _0819A62E: _0819A638: .4byte gUnknown_3005B60 _0819A63C: .4byte 0x000002A1 _0819A640: .4byte 0x000002A2 -_0819A644: .4byte sub_0819ADC4 -_0819A648: .4byte sub_0819A168 - thumb_func_end sub_0819A1B4 +_0819A644: .4byte Task_HandleSelectionScreenMenu +_0819A648: .4byte Select_CB2 + thumb_func_end CB2_InitSelectScreen - thumb_func_start sub_0819A64C -sub_0819A64C: @ 0x0819A64C + thumb_func_start Select_InitMonsData +Select_InitMonsData: @ 0x0819A64C push {r4, r5, lr} ldr r5, _0819A6A0 ldr r4, [r5] @@ -841658,7 +841658,7 @@ sub_0819A64C: @ 0x0819A64C bne _0819A6B2 movs r0, #0xab lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] strb r4, [r0, #3] ldr r1, [r5] @@ -841690,7 +841690,7 @@ _0819A672: cmp r0, #2 beq _0819A6AC movs r0, #0 - bl sub_0819B124 + bl CreateFrontierFactorySelectableMons b _0819A6B2 .align 2, 0 _0819A6A0: .4byte gUnknown_3001278 @@ -841698,15 +841698,15 @@ _0819A6A4: .4byte gUnknown_3005AF0 _0819A6A8: .4byte 0x00000CA9 _0819A6AC: movs r0, #0 - bl sub_0819B2DC + bl CreateTentFactorySelectableMons _0819A6B2: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_0819A64C + thumb_func_end Select_InitMonsData - thumb_func_start sub_0819A6B8 -sub_0819A6B8: @ 0x0819A6B8 + thumb_func_start Select_InitAllSprites +Select_InitAllSprites: @ 0x0819A6B8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -841724,7 +841724,7 @@ _0819A6C4: ldr r0, _0819A7CC movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r6, _0819A7D0 ldr r2, [r6] movs r5, #0x6c @@ -841742,7 +841742,7 @@ _0819A6C4: mov r1, r8 strh r1, [r0, #0x2e] adds r0, r4, #0 - bl sub_0819AA4C + bl Select_SetBallSpritePaletteNum adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -841763,7 +841763,7 @@ _0819A6C4: ldrsh r1, [r1, r2] movs r2, #0x58 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] movs r5, #0 strb r0, [r1, #4] @@ -841771,14 +841771,14 @@ _0819A6C4: movs r1, #0xb0 movs r2, #0x70 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] strb r0, [r1, #1] ldr r0, _0819A7DC movs r1, #0xb0 movs r2, #0x90 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] strb r0, [r1, #2] ldr r0, [r6] @@ -841846,10 +841846,10 @@ _0819A7D0: .4byte gUnknown_3001278 _0819A7D4: .4byte gUnknown_85DBDF8 _0819A7D8: .4byte gUnknown_85DBE10 _0819A7DC: .4byte gUnknown_85DBE28 - thumb_func_end sub_0819A6B8 + thumb_func_end Select_InitAllSprites - thumb_func_start sub_0819A7E0 -sub_0819A7E0: @ 0x0819A7E0 + thumb_func_start Select_DestroyAllSprites +Select_DestroyAllSprites: @ 0x0819A7E0 push {r4, r5, r6, lr} movs r4, #0 _0819A7E4: @@ -841897,10 +841897,10 @@ _0819A7E4: .align 2, 0 _0819A840: .4byte gUnknown_3001278 _0819A844: .4byte gUnknown_20205AC - thumb_func_end sub_0819A7E0 + thumb_func_end Select_DestroyAllSprites - thumb_func_start sub_0819A848 -sub_0819A848: @ 0x0819A848 + thumb_func_start Select_UpdateBallCursorPosition +Select_UpdateBallCursorPosition: @ 0x0819A848 push {r4, lr} lsls r0, r0, #0x18 cmp r0, #0 @@ -841956,10 +841956,10 @@ _0819A87E: bx r0 .align 2, 0 _0819A8AC: .4byte gUnknown_20205AC - thumb_func_end sub_0819A848 + thumb_func_end Select_UpdateBallCursorPosition - thumb_func_start sub_0819A8B0 -sub_0819A8B0: @ 0x0819A8B0 + thumb_func_start Select_UpdateMenuCursorPosition +Select_UpdateMenuCursorPosition: @ 0x0819A8B0 push {lr} lsls r0, r0, #0x18 cmp r0, #0 @@ -842016,10 +842016,10 @@ _0819A8E6: bx r0 .align 2, 0 _0819A914: .4byte gUnknown_20205AC - thumb_func_end sub_0819A8B0 + thumb_func_end Select_UpdateMenuCursorPosition - thumb_func_start sub_0819A918 -sub_0819A918: @ 0x0819A918 + thumb_func_start Select_UpdateYesNoCursorPosition +Select_UpdateYesNoCursorPosition: @ 0x0819A918 push {lr} lsls r0, r0, #0x18 cmp r0, #0 @@ -842076,10 +842076,10 @@ _0819A94E: bx r0 .align 2, 0 _0819A97C: .4byte gUnknown_20205AC - thumb_func_end sub_0819A918 + thumb_func_end Select_UpdateYesNoCursorPosition - thumb_func_start sub_0819A980 -sub_0819A980: @ 0x0819A980 + thumb_func_start Select_HandleMonSelectionChange +Select_HandleMonSelectionChange: @ 0x0819A980 push {r4, r5, r6, lr} ldr r5, _0819A9FC ldr r0, [r5] @@ -842092,7 +842092,7 @@ sub_0819A980: @ 0x0819A980 cmp r0, #0 beq _0819AA00 movs r0, #0x64 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r1, [r5] @@ -842147,7 +842147,7 @@ _0819A9E4: _0819A9FC: .4byte gUnknown_3001278 _0819AA00: movs r0, #0x65 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r0, [r5] @@ -842183,10 +842183,10 @@ _0819AA3C: .align 2, 0 _0819AA44: .4byte gUnknown_20205AC _0819AA48: .4byte gUnknown_3001278 - thumb_func_end sub_0819A980 + thumb_func_end Select_HandleMonSelectionChange - thumb_func_start sub_0819AA4C -sub_0819AA4C: @ 0x0819AA4C + thumb_func_start Select_SetBallSpritePaletteNum +Select_SetBallSpritePaletteNum: @ 0x0819AA4C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -842205,7 +842205,7 @@ _0819AA68: .4byte gUnknown_3001278 _0819AA6C: movs r0, #0x64 _0819AA6E: - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r2, _0819AAA0 @@ -842231,10 +842231,10 @@ _0819AA6E: .align 2, 0 _0819AAA0: .4byte gUnknown_20205AC _0819AAA4: .4byte gUnknown_3001278 - thumb_func_end sub_0819AA4C + thumb_func_end Select_SetBallSpritePaletteNum - thumb_func_start sub_0819AAA8 -sub_0819AAA8: @ 0x0819AAA8 + thumb_func_start Task_FromSelectScreenToSummaryScreen +Task_FromSelectScreenToSummaryScreen: @ 0x0819AAA8 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -842274,7 +842274,7 @@ _0819AAD6: str r2, [sp] movs r1, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #7 strh r0, [r6, #8] b _0819ABF0 @@ -842295,7 +842295,7 @@ _0819AB04: ldr r2, _0819AB74 adds r0, r0, r2 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask ldr r1, [r4] movs r3, #0xa6 lsls r3, r3, #2 @@ -842305,24 +842305,24 @@ _0819AB04: lsls r2, r2, #2 adds r1, r1, r2 bl sub_0819F330 - bl sub_0819A7E0 + bl Select_DestroyAllSprites ldr r4, _0819AB78 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819AB7C ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819AB80 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819AB84 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #8 strh r0, [r6, #8] b _0819ABF0 @@ -842346,7 +842346,7 @@ _0819AB88: adds r1, r1, r3 strh r0, [r1] adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r1, [r4] movs r0, #1 strb r0, [r1, #6] @@ -842355,7 +842355,7 @@ _0819AB88: ldr r4, _0819AC00 movs r0, #0x96 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r4, #0 _0819ABBA: @@ -842383,7 +842383,7 @@ _0819ABBA: movs r0, #1 adds r2, r6, #0 movs r3, #5 - bl sub_081BF280 + bl ShowPokemonSummaryScreen _0819ABF0: add sp, #4 pop {r4, r5, r6} @@ -842393,11 +842393,11 @@ _0819ABF0: _0819ABF8: .4byte gUnknown_3001278 _0819ABFC: .4byte gUnknown_20373B4 _0819AC00: .4byte gUnknown_203CB08 -_0819AC04: .4byte sub_0819A1B4 - thumb_func_end sub_0819AAA8 +_0819AC04: .4byte CB2_InitSelectScreen + thumb_func_end Task_FromSelectScreenToSummaryScreen - thumb_func_start sub_0819AC08 -sub_0819AC08: @ 0x0819AC08 + thumb_func_start Task_CloseSelectionScreen +Task_CloseSelectionScreen: @ 0x0819AC08 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -842432,44 +842432,44 @@ _0819AC40: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] b _0819ACAE _0819AC58: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 bne _0819ACAE - bl sub_0819B404 + bl Select_CopyMonsToPlayerParty ldr r0, [r7] ldr r1, _0819ACB8 adds r0, r0, r1 ldrb r0, [r0] - bl sub_080A8964 - bl sub_0819A7E0 + bl DestroyTask + bl Select_DestroyAllSprites ldr r4, _0819ACBC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819ACC0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819ACC4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r0, [r7] - bl sub_08000BF0 + bl Free str r5, [r7] - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0819ACC8 - bl sub_08000540 + bl SetMainCallback2 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0819ACAE: add sp, #4 pop {r4, r5, r6, r7} @@ -842480,11 +842480,11 @@ _0819ACB8: .4byte 0x000002A1 _0819ACBC: .4byte gUnknown_203CAF8 _0819ACC0: .4byte gUnknown_203CB00 _0819ACC4: .4byte gUnknown_203CB04 -_0819ACC8: .4byte sub_08085B18 - thumb_func_end sub_0819AC08 +_0819ACC8: .4byte CB2_ReturnToFieldContinueScript + thumb_func_end Task_CloseSelectionScreen - thumb_func_start sub_0819ACCC -sub_0819ACCC: @ 0x0819ACCC + thumb_func_start Task_HandleSelectionScreenYesNo +Task_HandleSelectionScreenYesNo: @ 0x0819ACCC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -842523,7 +842523,7 @@ _0819AD0C: strh r0, [r5, #8] b _0819ADBA _0819AD1A: - bl sub_0819B574 + bl Select_ShowYesNoOptions movs r0, #5 strh r0, [r5, #8] b _0819ADBA @@ -842550,7 +842550,7 @@ _0819AD24: b _0819ADBA .align 2, 0 _0819AD50: .4byte gUnknown_3002360 -_0819AD54: .4byte sub_0819AC08 +_0819AD54: .4byte Task_CloseSelectionScreen _0819AD58: movs r0, #2 ands r0, r1 @@ -842573,7 +842573,7 @@ _0819AD66: b _0819ADBA .align 2, 0 _0819AD84: .4byte 0x000002A2 -_0819AD88: .4byte sub_0819B018 +_0819AD88: .4byte Task_HandleSelectionScreenChooseMons _0819AD8C: ldrh r1, [r2, #0x30] movs r0, #0x40 @@ -842584,7 +842584,7 @@ _0819AD8C: bl sub_080A306C movs r0, #1 rsbs r0, r0, #0 - bl sub_0819A918 + bl Select_UpdateYesNoCursorPosition b _0819ADBA _0819ADA6: movs r0, #0x80 @@ -842594,17 +842594,17 @@ _0819ADA6: movs r0, #5 bl sub_080A306C movs r0, #1 - bl sub_0819A918 + bl Select_UpdateYesNoCursorPosition _0819ADBA: pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0819ACCC + thumb_func_end Task_HandleSelectionScreenYesNo - thumb_func_start sub_0819ADC4 -sub_0819ADC4: @ 0x0819ADC4 + thumb_func_start Task_HandleSelectionScreenMenu +Task_HandleSelectionScreenMenu: @ 0x0819ADC4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -842679,7 +842679,7 @@ _0819AE5C: bne _0819AE6E b _0819B00E _0819AE6E: - bl sub_0819B4E4 + bl Select_ShowMenuOptions ldr r1, [r4] movs r0, #0 strb r0, [r1, #6] @@ -842703,7 +842703,7 @@ _0819AE8C: beq _0819AF1C movs r0, #5 bl sub_080A306C - bl sub_0819B8A8 + bl Select_RunMenuOptionFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r0, #0 @@ -842733,7 +842733,7 @@ _0819AEC8: b _0819B00E .align 2, 0 _0819AEE0: .4byte gUnknown_3005B60 -_0819AEE4: .4byte sub_0819ACCC +_0819AEE4: .4byte Task_HandleSelectionScreenYesNo _0819AEE8: cmp r1, #3 bne _0819AF00 @@ -842760,7 +842760,7 @@ _0819AF00: b _0819B00E .align 2, 0 _0819AF14: .4byte gUnknown_3005B60 -_0819AF18: .4byte sub_0819AAA8 +_0819AF18: .4byte Task_FromSelectScreenToSummaryScreen _0819AF1C: movs r0, #2 ands r0, r1 @@ -842799,7 +842799,7 @@ _0819AF5A: _0819AF60: .4byte gUnknown_3001278 _0819AF64: .4byte 0x000002A2 _0819AF68: .4byte gUnknown_3005B60 -_0819AF6C: .4byte sub_0819B018 +_0819AF6C: .4byte Task_HandleSelectionScreenChooseMons _0819AF70: ldrh r1, [r2, #0x30] movs r0, #0x40 @@ -842810,7 +842810,7 @@ _0819AF70: bl sub_080A306C movs r0, #1 rsbs r0, r0, #0 - bl sub_0819A8B0 + bl Select_UpdateMenuCursorPosition b _0819B00E _0819AF8A: movs r0, #0x80 @@ -842820,7 +842820,7 @@ _0819AF8A: movs r0, #5 bl sub_080A306C movs r0, #1 - bl sub_0819A8B0 + bl Select_UpdateMenuCursorPosition b _0819B00E _0819AFA0: ldr r0, _0819AFEC @@ -842868,7 +842868,7 @@ _0819AFF0: .4byte gUnknown_3001278 _0819AFF4: .4byte gUnknown_20377B4 _0819AFF8: .4byte gUnknown_20373B4 _0819AFFC: - bl sub_0819B4E4 + bl Select_ShowMenuOptions ldr r0, _0819B014 lsls r1, r5, #2 adds r1, r1, r5 @@ -842883,10 +842883,10 @@ _0819B00E: bx r0 .align 2, 0 _0819B014: .4byte gUnknown_3005B60 - thumb_func_end sub_0819ADC4 + thumb_func_end Task_HandleSelectionScreenMenu - thumb_func_start sub_0819B018 -sub_0819B018: @ 0x0819B018 + thumb_func_start Task_HandleSelectionScreenChooseMons +Task_HandleSelectionScreenChooseMons: @ 0x0819B018 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -842957,7 +842957,7 @@ _0819B07C: .align 2, 0 _0819B0A0: .4byte gUnknown_3002360 _0819B0A4: .4byte 0x000002A2 -_0819B0A8: .4byte sub_0819ADC4 +_0819B0A8: .4byte Task_HandleSelectionScreenMenu _0819B0AC: ldrh r1, [r2, #0x30] movs r0, #0x20 @@ -842978,9 +842978,9 @@ _0819B0C2: bl sub_080A306C movs r0, #1 _0819B0D2: - bl sub_0819A848 - bl sub_0819B99C - bl sub_0819B688 + bl Select_UpdateBallCursorPosition + bl Select_PrintMonCategory + bl Select_PrintMonSpecies b _0819B116 _0819B0E0: ldr r0, _0819B11C @@ -843000,7 +843000,7 @@ _0819B0E0: adds r1, r1, r7 movs r2, #0 bl sub_0819F2E4 - bl sub_0819B708 + bl Select_PrintSelectMonString ldr r0, [r5] ldr r1, _0819B120 adds r0, r0, r1 @@ -843014,10 +843014,10 @@ _0819B116: .align 2, 0 _0819B11C: .4byte gUnknown_3002360 _0819B120: .4byte 0x000002A2 - thumb_func_end sub_0819B018 + thumb_func_end Task_HandleSelectionScreenChooseMons - thumb_func_start sub_0819B124 -sub_0819B124: @ 0x0819B124 + thumb_func_start CreateFrontierFactorySelectableMons +CreateFrontierFactorySelectableMons: @ 0x0819B124 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -843155,7 +843155,7 @@ _0819B212: mov r2, sb str r2, [sp, #8] ldr r2, [sp, #0x14] - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID movs r1, #0 add r0, sp, #0xc strb r1, [r0] @@ -843177,7 +843177,7 @@ _0819B258: ldrh r1, [r1] adds r2, r6, #0 str r3, [sp, #0x20] - bl sub_081A6DBC + bl SetMonMoveAvoidReturn adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -843194,7 +843194,7 @@ _0819B258: adds r0, #8 movs r1, #0x20 add r2, sp, #0xc - bl sub_0806A774 + bl SetMonData ldr r2, _0819B2D0 ldr r0, [r2] adds r0, r0, r4 @@ -843206,7 +843206,7 @@ _0819B258: ldr r1, _0819B2D8 adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r3, r8 lsls r0, r3, #0x18 lsrs r0, r0, #0x18 @@ -843227,10 +843227,10 @@ _0819B2C0: _0819B2D0: .4byte gUnknown_3001278 _0819B2D4: .4byte gUnknown_203B958 _0819B2D8: .4byte gUnknown_85ADBF4 - thumb_func_end sub_0819B124 + thumb_func_end CreateFrontierFactorySelectableMons - thumb_func_start sub_0819B2DC -sub_0819B2DC: @ 0x0819B2DC + thumb_func_start CreateTentFactorySelectableMons +CreateTentFactorySelectableMons: @ 0x0819B2DC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -843301,7 +843301,7 @@ _0819B318: mov r2, sl str r2, [sp, #8] movs r2, #0x1e - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID add r0, sp, #0xc movs r3, #0 strb r3, [r0] @@ -843322,7 +843322,7 @@ _0819B374: adds r1, r1, r2 ldrh r1, [r1] adds r2, r7, #0 - bl sub_081A6DBC + bl SetMonMoveAvoidReturn adds r0, r7, #1 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -843338,7 +843338,7 @@ _0819B374: adds r0, #8 movs r1, #0x20 add r2, sp, #0xc - bl sub_0806A774 + bl SetMonData ldr r2, _0819B3FC ldr r0, [r2] adds r0, r0, r4 @@ -843351,7 +843351,7 @@ _0819B374: ldr r1, _0819B400 adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r7, sb lsls r0, r7, #0x18 lsrs r0, r0, #0x18 @@ -843372,10 +843372,10 @@ _0819B3F4: .4byte gUnknown_85BCF70 _0819B3F8: .4byte gUnknown_3005AF0 _0819B3FC: .4byte gUnknown_3001278 _0819B400: .4byte gUnknown_85ADBF4 - thumb_func_end sub_0819B2DC + thumb_func_end CreateTentFactorySelectableMons - thumb_func_start sub_0819B404 -sub_0819B404: @ 0x0819B404 + thumb_func_start Select_CopyMonsToPlayerParty +Select_CopyMonsToPlayerParty: @ 0x0819B404 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -843426,7 +843426,7 @@ _0819B41E: adds r0, r5, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r2, r8 ldr r1, [r2] ldr r2, _0819B4B0 @@ -843482,10 +843482,10 @@ _0819B4C6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819B404 + thumb_func_end Select_CopyMonsToPlayerParty - thumb_func_start sub_0819B4E4 -sub_0819B4E4: @ 0x0819B4E4 + thumb_func_start Select_ShowMenuOptions +Select_ShowMenuOptions: @ 0x0819B4E4 push {r4, r5, lr} ldr r5, _0819B56C ldr r1, [r5] @@ -843550,17 +843550,17 @@ _0819B4F2: ldrb r1, [r0] ands r2, r1 strb r2, [r0] - bl sub_0819B7A0 + bl Select_PrintMenuOptions pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0819B56C: .4byte gUnknown_3001278 _0819B570: .4byte gUnknown_20205AC - thumb_func_end sub_0819B4E4 + thumb_func_end Select_ShowMenuOptions - thumb_func_start sub_0819B574 -sub_0819B574: @ 0x0819B574 + thumb_func_start Select_ShowYesNoOptions +Select_ShowYesNoOptions: @ 0x0819B574 push {r4, r5, lr} ldr r5, _0819B5F0 ldr r1, [r5] @@ -843617,14 +843617,14 @@ sub_0819B574: @ 0x0819B574 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - bl sub_0819B84C + bl Select_PrintYesNoOptions pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0819B5F0: .4byte gUnknown_3001278 _0819B5F4: .4byte gUnknown_20205AC - thumb_func_end sub_0819B574 + thumb_func_end Select_ShowYesNoOptions thumb_func_start sub_0819B5F8 sub_0819B5F8: @ 0x0819B5F8 @@ -843657,12 +843657,12 @@ sub_0819B5F8: @ 0x0819B5F8 strb r1, [r0] adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 - bl sub_08003774 + bl ClearWindowTilemap pop {r4, r5} pop {r0} bx r0 @@ -843677,7 +843677,7 @@ sub_0819B654: @ 0x0819B654 sub sp, #0xc movs r0, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0819B684 movs r0, #2 str r0, [sp] @@ -843689,7 +843689,7 @@ sub_0819B654: @ 0x0819B654 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -843697,8 +843697,8 @@ sub_0819B654: @ 0x0819B654 _0819B684: .4byte gUnknown_85DBB98 thumb_func_end sub_0819B654 - thumb_func_start sub_0819B688 -sub_0819B688: @ 0x0819B688 + thumb_func_start Select_PrintMonSpecies +Select_PrintMonSpecies: @ 0x0819B688 push {r4, r5, lr} sub sp, #0xc ldr r5, _0819B6F8 @@ -843706,7 +843706,7 @@ sub_0819B688: @ 0x0819B688 ldrb r4, [r0, #3] movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x6c muls r0, r4, r0 ldr r1, [r5] @@ -843714,7 +843714,7 @@ sub_0819B688: @ 0x0819B688 adds r0, #0x14 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _0819B6FC @@ -843741,10 +843741,10 @@ sub_0819B688: @ 0x0819B688 movs r0, #1 movs r1, #1 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -843754,15 +843754,15 @@ _0819B6F8: .4byte gUnknown_3001278 _0819B6FC: .4byte gUnknown_2021C7C _0819B700: .4byte gUnknown_82EA31C _0819B704: .4byte gUnknown_85DBC81 - thumb_func_end sub_0819B688 + thumb_func_end Select_PrintMonSpecies - thumb_func_start sub_0819B708 -sub_0819B708: @ 0x0819B708 + thumb_func_start Select_PrintSelectMonString +Select_PrintSelectMonString: @ 0x0819B708 push {lr} sub sp, #0xc movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0819B724 ldr r0, [r0] ldrb r0, [r0, #5] @@ -843797,22 +843797,22 @@ _0819B740: bl AddTextPrinterParameterized movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 .align 2, 0 _0819B764: .4byte gUnknown_85DBBF6 _0819B768: .4byte gUnknown_85DBBC9 - thumb_func_end sub_0819B708 + thumb_func_end Select_PrintSelectMonString - thumb_func_start sub_0819B76C -sub_0819B76C: @ 0x0819B76C + thumb_func_start Select_PrintCantSelectSameMon +Select_PrintCantSelectSameMon: @ 0x0819B76C push {lr} sub sp, #0xc movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0819B79C movs r0, #5 str r0, [sp] @@ -843825,16 +843825,16 @@ sub_0819B76C: @ 0x0819B76C bl AddTextPrinterParameterized movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 .align 2, 0 _0819B79C: .4byte gUnknown_85DBC11 - thumb_func_end sub_0819B76C + thumb_func_end Select_PrintCantSelectSameMon - thumb_func_start sub_0819B7A0 -sub_0819B7A0: @ 0x0819B7A0 + thumb_func_start Select_PrintMenuOptions +Select_PrintMenuOptions: @ 0x0819B7A0 push {r4, r5, r6, lr} sub sp, #0xc ldr r0, _0819B7F4 @@ -843845,10 +843845,10 @@ sub_0819B7A0: @ 0x0819B7A0 adds r0, r0, r1 ldrb r5, [r0, #0x10] movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _0819B7F8 str r4, [sp] movs r6, #0 @@ -843859,7 +843859,7 @@ sub_0819B7A0: @ 0x0819B7A0 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 cmp r5, #0 beq _0819B804 str r4, [sp] @@ -843870,7 +843870,7 @@ sub_0819B7A0: @ 0x0819B7A0 movs r1, #1 movs r2, #0 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0819B818 .align 2, 0 _0819B7F4: .4byte gUnknown_3001278 @@ -843886,7 +843886,7 @@ _0819B804: movs r1, #1 movs r2, #0 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819B818: ldr r0, _0819B844 str r0, [sp] @@ -843898,10 +843898,10 @@ _0819B818: movs r1, #1 movs r2, #0 movs r3, #0x22 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -843910,17 +843910,17 @@ _0819B818: _0819B840: .4byte gUnknown_85DBBDD _0819B844: .4byte gUnknown_85DBC7E _0819B848: .4byte gUnknown_85DBBEB - thumb_func_end sub_0819B7A0 + thumb_func_end Select_PrintMenuOptions - thumb_func_start sub_0819B84C -sub_0819B84C: @ 0x0819B84C + thumb_func_start Select_PrintYesNoOptions +Select_PrintYesNoOptions: @ 0x0819B84C push {r4, r5, lr} sub sp, #0xc movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0819B89C str r5, [sp] movs r4, #0 @@ -843931,7 +843931,7 @@ sub_0819B84C: @ 0x0819B84C movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0819B8A4 @@ -843940,10 +843940,10 @@ sub_0819B84C: @ 0x0819B84C movs r1, #1 movs r2, #0 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #4 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -843952,10 +843952,10 @@ sub_0819B84C: @ 0x0819B84C _0819B89C: .4byte gUnknown_85DBC7E _0819B8A0: .4byte gUnknown_85DBC0A _0819B8A4: .4byte gUnknown_85DBC0D - thumb_func_end sub_0819B84C + thumb_func_end Select_PrintYesNoOptions - thumb_func_start sub_0819B8A8 -sub_0819B8A8: @ 0x0819B8A8 + thumb_func_start Select_RunMenuOptionFunc +Select_RunMenuOptionFunc: @ 0x0819B8A8 push {lr} ldr r2, _0819B8C8 ldr r1, _0819B8CC @@ -843967,7 +843967,7 @@ sub_0819B8A8: @ 0x0819B8A8 ldr r0, [r0] str r0, [r2] bl _call_via_r0 - thumb_func_end sub_0819B8A8 + thumb_func_end Select_RunMenuOptionFunc thumb_func_start sub_0819B8C0 sub_0819B8C0: @ 0x0819B8C0 @@ -843981,8 +843981,8 @@ _0819B8CC: .4byte gUnknown_85DBC24 _0819B8D0: .4byte gUnknown_3001278 thumb_func_end sub_0819B8C0 - thumb_func_start sub_0819B8D4 -sub_0819B8D4: @ 0x0819B8D4 + thumb_func_start Select_OptionRentDeselect +Select_OptionRentDeselect: @ 0x0819B8D4 push {r4, lr} ldr r0, _0819B900 ldr r0, [r0] @@ -843994,10 +843994,10 @@ sub_0819B8D4: @ 0x0819B8D4 ldrh r0, [r0, #0xc] cmp r1, #0 bne _0819B904 - bl sub_0819C31C + bl Select_AreSpeciesValid cmp r0, #0 bne _0819B904 - bl sub_0819B76C + bl Select_PrintCantSelectSameMon movs r0, #3 bl sub_0819B5F8 movs r0, #3 @@ -844015,8 +844015,8 @@ _0819B904: adds r1, r1, r2 movs r2, #0 bl sub_0819F2E4 - bl sub_0819A980 - bl sub_0819B708 + bl Select_HandleMonSelectionChange + bl Select_PrintSelectMonString movs r0, #3 bl sub_0819B5F8 ldr r0, [r4] @@ -844033,14 +844033,14 @@ _0819B93A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_0819B8D4 + thumb_func_end Select_OptionRentDeselect thumb_func_start sub_0819B940 sub_0819B940: @ 0x0819B940 push {lr} bl sub_0819C250 - bl sub_0819A980 - bl sub_0819B708 + bl Select_HandleMonSelectionChange + bl Select_PrintSelectMonString movs r0, #3 bl sub_0819B5F8 ldr r0, _0819B964 @@ -844066,8 +844066,8 @@ sub_0819B970: @ 0x0819B970 bx lr thumb_func_end sub_0819B970 - thumb_func_start sub_0819B974 -sub_0819B974: @ 0x0819B974 + thumb_func_start Select_OptionOthers +Select_OptionOthers: @ 0x0819B974 push {lr} ldr r0, _0819B998 ldr r1, [r0] @@ -844086,10 +844086,10 @@ sub_0819B974: @ 0x0819B974 bx r1 .align 2, 0 _0819B998: .4byte gUnknown_3001278 - thumb_func_end sub_0819B974 + thumb_func_end Select_OptionOthers - thumb_func_start sub_0819B99C -sub_0819B99C: @ 0x0819B99C + thumb_func_start Select_PrintMonCategory +Select_PrintMonCategory: @ 0x0819B99C push {r4, r5, lr} sub sp, #0x18 ldr r5, _0819BA4C @@ -844098,10 +844098,10 @@ sub_0819B99C: @ 0x0819B99C cmp r4, #5 bhi _0819BA44 movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap movs r0, #5 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x6c muls r0, r4, r0 ldr r1, [r5] @@ -844109,7 +844109,7 @@ sub_0819B99C: @ 0x0819B99C adds r0, #0x14 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0806CF68 @@ -844168,7 +844168,7 @@ _0819BA0E: bl AddTextPrinterParameterized movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _0819BA44: add sp, #0x18 pop {r4, r5} @@ -844178,10 +844178,10 @@ _0819BA44: _0819BA4C: .4byte gUnknown_3001278 _0819BA50: .4byte gUnknown_854069C _0819BA54: .4byte gUnknown_85C8C66 - thumb_func_end sub_0819B99C + thumb_func_end Select_PrintMonCategory - thumb_func_start sub_0819BA58 -sub_0819BA58: @ 0x0819BA58 + thumb_func_start Summary_ShowMonSprite +Summary_ShowMonSprite: @ 0x0819BA58 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -844197,19 +844197,19 @@ sub_0819BA58: @ 0x0819BA58 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r8, r0 adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0x58 str r0, [sp] @@ -844263,7 +844263,7 @@ sub_0819BA58: @ 0x0819BA58 _0819BAFC: .4byte gUnknown_3001278 _0819BB00: .4byte 0x0000FFFF _0819BB04: .4byte gUnknown_20205AC - thumb_func_end sub_0819BA58 + thumb_func_end Summary_ShowMonSprite thumb_func_start sub_0819BB08 sub_0819BB08: @ 0x0819BB08 @@ -844278,8 +844278,8 @@ sub_0819BB08: @ 0x0819BB08 _0819BB18: .4byte gUnknown_3001278 thumb_func_end sub_0819BB08 - thumb_func_start sub_0819BB1C -sub_0819BB1C: @ 0x0819BB1C + thumb_func_start Select_ShowSummaryMonSprite +Select_ShowSummaryMonSprite: @ 0x0819BB1C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -844290,7 +844290,7 @@ sub_0819BB1C: @ 0x0819BB1C movs r1, #0x78 movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r6, _0819BC04 ldr r1, [r6] ldr r2, _0819BC08 @@ -844319,19 +844319,19 @@ sub_0819BB1C: @ 0x0819BB1C adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0x58 str r0, [sp] @@ -844394,10 +844394,10 @@ _0819BC04: .4byte gUnknown_3001278 _0819BC08: .4byte 0x00000299 _0819BC0C: .4byte gUnknown_20205AC _0819BC10: .4byte 0x0000FFFF - thumb_func_end sub_0819BB1C + thumb_func_end Select_ShowSummaryMonSprite - thumb_func_start sub_0819BC14 -sub_0819BC14: @ 0x0819BC14 + thumb_func_start Select_ShowChosenMonsSprites +Select_ShowChosenMonsSprites: @ 0x0819BC14 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -844428,19 +844428,19 @@ _0819BC30: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r0, r7, #3 adds r0, r0, r7 @@ -844532,7 +844532,7 @@ _0819BCFA: bx r0 .align 2, 0 _0819BD24: .4byte gUnknown_3001278 - thumb_func_end sub_0819BC14 + thumb_func_end Select_ShowChosenMonsSprites thumb_func_start sub_0819BD28 sub_0819BD28: @ 0x0819BD28 @@ -844600,7 +844600,7 @@ sub_0819BD28: @ 0x0819BD28 strb r1, [r0] ldr r0, _0819BDDC movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0819BDE0 @@ -844763,7 +844763,7 @@ _0819BEE6: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldrh r1, [r4, #0xe] lsls r1, r1, #8 ldrh r0, [r4, #0x38] @@ -844789,7 +844789,7 @@ _0819BEE6: b _0819BFAE _0819BF36: movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r1, _0819BF50 movs r0, #0x50 bl SetGpuReg @@ -844823,7 +844823,7 @@ _0819BF74: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits _0819BF86: ldrh r1, [r4, #0x12] lsls r1, r1, #8 @@ -844840,8 +844840,8 @@ _0819BF86: b _0819BFAE _0819BFA2: adds r0, r2, #0 - bl sub_080A8964 - bl sub_0819BC14 + bl DestroyTask + bl Select_ShowChosenMonsSprites b _0819BFB4 _0819BFAE: ldrh r0, [r4, #8] @@ -844879,7 +844879,7 @@ _0819BFDE: b _0819C148 _0819BFE4: movs r0, #3 - bl sub_08001B5C + bl HideBg ldr r4, _0819C0DC ldr r0, _0819C0E0 mov r8, r0 @@ -844989,9 +844989,9 @@ _0819BFE4: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask b _0819C18C .align 2, 0 _0819C0D8: .4byte gUnknown_3005B60 @@ -845014,7 +845014,7 @@ _0819C0F8: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldrh r1, [r4, #0xe] lsls r1, r1, #8 ldrh r0, [r4, #0x38] @@ -845096,7 +845096,7 @@ sub_0819C19C: @ 0x0819C19C movs r1, #0x78 movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r6, _0819C234 ldr r1, [r6] ldr r2, _0819C238 @@ -845107,7 +845107,7 @@ sub_0819C19C: @ 0x0819C19C movs r1, #0x2c movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] ldr r5, _0819C23C adds r1, r1, r5 @@ -845116,7 +845116,7 @@ sub_0819C19C: @ 0x0819C19C movs r1, #0xc4 movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r6] ldr r4, _0819C240 adds r1, r1, r4 @@ -845178,22 +845178,22 @@ sub_0819C250: @ 0x0819C250 lsls r1, r1, #2 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, [r4] movs r1, #0xa6 lsls r1, r1, #2 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, [r4] movs r1, #0xa7 lsls r1, r1, #2 adds r0, r0, r1 ldrb r0, [r0] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, _0819C2B0 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0819C2B4 @@ -845218,8 +845218,8 @@ _0819C2B0: .4byte sub_0819BFBC _0819C2B4: .4byte gUnknown_3005B60 thumb_func_end sub_0819C250 - thumb_func_start sub_0819C2B8 -sub_0819C2B8: @ 0x0819C2B8 + thumb_func_start Select_SetWinRegs +Select_SetWinRegs: @ 0x0819C2B8 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -845240,7 +845240,7 @@ sub_0819C2B8: @ 0x0819C2B8 movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits lsls r4, r4, #0x18 lsrs r4, r4, #0x10 orrs r4, r6 @@ -845265,10 +845265,10 @@ sub_0819C2B8: @ 0x0819C2B8 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_0819C2B8 + thumb_func_end Select_SetWinRegs - thumb_func_start sub_0819C31C -sub_0819C31C: @ 0x0819C31C + thumb_func_start Select_AreSpeciesValid +Select_AreSpeciesValid: @ 0x0819C31C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x10 ldr r2, _0819C360 @@ -845325,10 +845325,10 @@ _0819C37E: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_0819C31C + thumb_func_end Select_AreSpeciesValid - thumb_func_start sub_0819C384 -sub_0819C384: @ 0x0819C384 + thumb_func_start Task_SelectFadeSpeciesName +Task_SelectFadeSpeciesName: @ 0x0819C384 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -845437,7 +845437,7 @@ _0819C44C: adds r1, r1, r4 ldrb r1, [r1] movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r2, [r7] adds r4, r2, r4 ldrb r0, [r4] @@ -845491,34 +845491,34 @@ _0819C4C0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819C384 + thumb_func_end Task_SelectFadeSpeciesName - thumb_func_start sub_0819C4C8 -sub_0819C4C8: @ 0x0819C4C8 + thumb_func_start Swap_CB2 +Swap_CB2: @ 0x0819C4C8 push {lr} - bl sub_080066D8 + bl AnimateSprites bl BuildOamBuffer bl sub_08004630 - bl sub_080A12E4 - bl sub_080A89D4 + bl UpdatePaletteFade + bl RunTasks pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819C4C8 + thumb_func_end Swap_CB2 - thumb_func_start sub_0819C4E4 -sub_0819C4E4: @ 0x0819C4E4 + thumb_func_start FldEff_UseCutOnTree +FldEff_UseCutOnTree: @ 0x0819C4E4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819C4E4 + thumb_func_end FldEff_UseCutOnTree - thumb_func_start sub_0819C4F8 -sub_0819C4F8: @ 0x0819C4F8 + thumb_func_start CopySwappedMonData +CopySwappedMonData: @ 0x0819C4F8 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -845547,7 +845547,7 @@ sub_0819C4F8: @ 0x0819C4F8 adds r0, r0, r4 movs r1, #0x20 mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r3, _0819C5E4 mov r8, r3 ldr r3, [r3] @@ -845591,7 +845591,7 @@ sub_0819C4F8: @ 0x0819C4F8 add r0, sb movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 ldr r2, [r1] ldr r4, [r5] @@ -845635,10 +845635,10 @@ _0819C5E4: .4byte gUnknown_3005AF0 _0819C5E8: .4byte 0x00000E78 _0819C5EC: .4byte 0x00000E74 _0819C5F0: .4byte 0x00000E79 - thumb_func_end sub_0819C4F8 + thumb_func_end CopySwappedMonData - thumb_func_start sub_0819C5F4 -sub_0819C5F4: @ 0x0819C5F4 + thumb_func_start Task_FromSwapScreenToSummaryScreen +Task_FromSwapScreenToSummaryScreen: @ 0x0819C5F4 push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -845670,7 +845670,7 @@ _0819C622: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade movs r0, #7 strh r0, [r6, #8] b _0819C6D8 @@ -845687,29 +845687,29 @@ _0819C638: ldr r0, [r4] adds r0, #0x21 ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask ldr r1, [r4] ldr r0, [r1, #0x2c] adds r1, #0x30 bl sub_0819F330 - bl sub_0819E240 + bl Swap_DestroyAllSprites ldr r4, _0819C69C ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819C6A0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819C6A4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819C6A8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #8 strh r0, [r6, #8] b _0819C6D8 @@ -845722,7 +845722,7 @@ _0819C6A4: .4byte gUnknown_203CB14 _0819C6A8: .4byte gUnknown_203CB18 _0819C6AC: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask ldr r2, _0819C6E0 ldr r1, [r2] movs r0, #1 @@ -845740,7 +845740,7 @@ _0819C6AC: str r0, [sp] movs r0, #0 movs r3, #2 - bl sub_081BF280 + bl ShowPokemonSummaryScreen _0819C6D8: add sp, #4 pop {r4, r5, r6} @@ -845750,11 +845750,11 @@ _0819C6D8: _0819C6E0: .4byte gUnknown_3001280 _0819C6E4: .4byte gUnknown_20373B4 _0819C6E8: .4byte gUnknown_2024190 -_0819C6EC: .4byte sub_0819D904 - thumb_func_end sub_0819C5F4 +_0819C6EC: .4byte CB2_InitSwapScreen + thumb_func_end Task_FromSwapScreenToSummaryScreen - thumb_func_start sub_0819C6F0 -sub_0819C6F0: @ 0x0819C6F0 + thumb_func_start Task_CloseSwapScreen +Task_CloseSwapScreen: @ 0x0819C6F0 push {r4, r5, r6, r7, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -845820,7 +845820,7 @@ _0819C760: bne _0819C784 ldrb r0, [r2, #3] strb r0, [r2, #0x13] - bl sub_0819C4F8 + bl CopySwappedMonData b _0819C784 _0819C774: movs r0, #1 @@ -845829,14 +845829,14 @@ _0819C774: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0819C784: ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] b _0819C7E6 _0819C78C: - bl sub_080A12E4 + bl UpdatePaletteFade lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #0 @@ -845844,32 +845844,32 @@ _0819C78C: ldr r0, [r7] adds r0, #0x21 ldrb r0, [r0] - bl sub_080A8964 - bl sub_0819E240 + bl DestroyTask + bl Swap_DestroyAllSprites ldr r4, _0819C7F0 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819C7F4 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819C7F8 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _0819C7FC ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r0, [r7] - bl sub_08000BF0 + bl Free str r5, [r7] - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _0819C800 - bl sub_08000540 + bl SetMainCallback2 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _0819C7E6: add sp, #4 pop {r4, r5, r6, r7} @@ -845880,11 +845880,11 @@ _0819C7F0: .4byte gUnknown_203CB0C _0819C7F4: .4byte gUnknown_203CB10 _0819C7F8: .4byte gUnknown_203CB14 _0819C7FC: .4byte gUnknown_203CB18 -_0819C800: .4byte sub_08085B18 - thumb_func_end sub_0819C6F0 +_0819C800: .4byte CB2_ReturnToFieldContinueScript + thumb_func_end Task_CloseSwapScreen - thumb_func_start sub_0819C804 -sub_0819C804: @ 0x0819C804 + thumb_func_start Task_HandleSwapScreenYesNo +Task_HandleSwapScreenYesNo: @ 0x0819C804 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -845910,7 +845910,7 @@ sub_0819C804: @ 0x0819C804 _0819C830: .4byte gUnknown_3001280 _0819C834: .4byte gUnknown_3005B60 _0819C838: - bl sub_0819E6E8 + bl Swap_ShowYesNoOptions movs r0, #5 strh r0, [r4, #8] b _0819C8BE @@ -845964,7 +845964,7 @@ _0819C890: bl sub_080A306C movs r0, #1 rsbs r0, r0, #0 - bl sub_0819E460 + bl Swap_UpdateYesNoCursorPosition b _0819C8BE _0819C8AA: movs r0, #0x80 @@ -845974,12 +845974,12 @@ _0819C8AA: movs r0, #5 bl sub_080A306C movs r0, #1 - bl sub_0819E460 + bl Swap_UpdateYesNoCursorPosition _0819C8BE: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0819C804 + thumb_func_end Task_HandleSwapScreenYesNo thumb_func_start sub_0819C8C4 sub_0819C8C4: @ 0x0819C8C4 @@ -846001,7 +846001,7 @@ sub_0819C8C4: @ 0x0819C8C4 b _0819C8FE .align 2, 0 _0819C8E4: .4byte gUnknown_3005B60 -_0819C8E8: .4byte sub_0819C6F0 +_0819C8E8: .4byte Task_CloseSwapScreen _0819C8EC: movs r0, #0 strh r0, [r2, #8] @@ -846017,7 +846017,7 @@ _0819C8FE: pop {r0} bx r0 .align 2, 0 -_0819C904: .4byte sub_0819CB28 +_0819C904: .4byte Task_HandleSwapScreenChooseMons _0819C908: .4byte sub_0819D458 thumb_func_end sub_0819C8C4 @@ -846036,7 +846036,7 @@ sub_0819C90C: @ 0x0819C90C cmp r5, #0 bne _0819C942 ldr r0, _0819C94C - bl sub_0819E93C + bl Swap_PrintOnInfoWindow ldr r0, _0819C950 ldr r0, [r0] adds r0, #0x20 @@ -846058,7 +846058,7 @@ _0819C948: .4byte gUnknown_3005B60 _0819C94C: .4byte gUnknown_85DC0FB _0819C950: .4byte gUnknown_3001280 _0819C954: .4byte sub_0819C8C4 -_0819C958: .4byte sub_0819C804 +_0819C958: .4byte Task_HandleSwapScreenYesNo thumb_func_end sub_0819C90C thumb_func_start sub_0819C95C @@ -846089,7 +846089,7 @@ sub_0819C95C: @ 0x0819C95C .align 2, 0 _0819C98C: .4byte gUnknown_3001280 _0819C990: .4byte gUnknown_3005B60 -_0819C994: .4byte sub_0819C6F0 +_0819C994: .4byte Task_CloseSwapScreen _0819C998: movs r0, #0 strh r0, [r2, #8] @@ -846106,7 +846106,7 @@ _0819C9AA: pop {r0} bx r0 .align 2, 0 -_0819C9B4: .4byte sub_0819CB28 +_0819C9B4: .4byte Task_HandleSwapScreenChooseMons _0819C9B8: .4byte sub_0819D458 thumb_func_end sub_0819C95C @@ -846132,7 +846132,7 @@ sub_0819C9BC: @ 0x0819C9BC movs r2, #1 bl sub_0819F1A0 ldr r0, _0819CA10 - bl sub_0819E93C + bl Swap_PrintOnInfoWindow ldr r0, [r4] adds r0, #0x20 movs r1, #1 @@ -846154,11 +846154,11 @@ _0819CA08: .4byte gUnknown_3005B60 _0819CA0C: .4byte gUnknown_3001280 _0819CA10: .4byte gUnknown_85DC12B _0819CA14: .4byte sub_0819C95C -_0819CA18: .4byte sub_0819C804 +_0819CA18: .4byte Task_HandleSwapScreenYesNo thumb_func_end sub_0819C9BC - thumb_func_start sub_0819CA1C -sub_0819CA1C: @ 0x0819CA1C + thumb_func_start Task_HandleSwapScreenMenu +Task_HandleSwapScreenMenu: @ 0x0819CA1C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -846208,7 +846208,7 @@ _0819CA70: ldrb r0, [r0] cmp r0, #1 beq _0819CB1E - bl sub_0819E64C + bl Swap_ShowMenuOptions movs r0, #3 strh r0, [r5, #8] b _0819CB1E @@ -846232,7 +846232,7 @@ _0819CA8C: movs r0, #5 bl sub_080A306C adds r0, r6, #0 - bl sub_0819EF8C + bl Swap_RunMenuOptionFunc b _0819CB1E .align 2, 0 _0819CAB8: .4byte gUnknown_3001280 @@ -846262,7 +846262,7 @@ _0819CAC0: str r0, [r5] b _0819CB1E .align 2, 0 -_0819CAF4: .4byte sub_0819CB28 +_0819CAF4: .4byte Task_HandleSwapScreenChooseMons _0819CAF8: .4byte sub_0819D458 _0819CAFC: ldrh r1, [r2, #0x30] @@ -846272,7 +846272,7 @@ _0819CAFC: beq _0819CB10 movs r0, #1 rsbs r0, r0, #0 - bl sub_0819E4C8 + bl Swap_UpdateMenuCursorPosition b _0819CB1E _0819CB10: movs r0, #0x80 @@ -846280,17 +846280,17 @@ _0819CB10: cmp r0, #0 beq _0819CB1E movs r0, #1 - bl sub_0819E4C8 + bl Swap_UpdateMenuCursorPosition _0819CB1E: pop {r3} mov r8, r3 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0819CA1C + thumb_func_end Task_HandleSwapScreenMenu - thumb_func_start sub_0819CB28 -sub_0819CB28: @ 0x0819CB28 + thumb_func_start Task_HandleSwapScreenChooseMons +Task_HandleSwapScreenChooseMons: @ 0x0819CB28 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -846339,10 +846339,10 @@ _0819CB70: adds r0, #0x22 movs r1, #0 strb r1, [r0] - bl sub_0819EBF0 + bl Swap_PrintMonSpecies2 bl sub_0819E7C8 adds r0, r6, #0 - bl sub_0819F070 + bl Swap_RunActionFunc b _0819CC34 .align 2, 0 _0819CB9C: .4byte gUnknown_3002360 @@ -846358,7 +846358,7 @@ _0819CBA4: ldr r0, [r0] adds r0, #0x22 strb r5, [r0] - bl sub_0819EBF0 + bl Swap_PrintMonSpecies2 bl sub_0819E7C8 ldr r1, _0819CBD8 lsrs r0, r1, #0x10 @@ -846381,7 +846381,7 @@ _0819CBE0: beq _0819CBF4 movs r0, #1 rsbs r0, r0, #0 - bl sub_0819E39C + bl Swap_UpdateBallCursorPosition b _0819CC12 _0819CBF4: movs r0, #0x10 @@ -846389,7 +846389,7 @@ _0819CBF4: cmp r0, #0 beq _0819CC04 movs r0, #1 - bl sub_0819E39C + bl Swap_UpdateBallCursorPosition b _0819CC12 _0819CC04: movs r0, #0x80 @@ -846397,10 +846397,10 @@ _0819CC04: cmp r0, #0 beq _0819CC1C movs r0, #1 - bl sub_0819E3F0 + bl Swap_UpdateActionCursorPosition _0819CC12: - bl sub_0819EE50 - bl sub_0819E898 + bl Swap_PrintMonCategory + bl Swap_PrintMonSpecies b _0819CC34 _0819CC1C: movs r0, #0x40 @@ -846409,18 +846409,18 @@ _0819CC1C: beq _0819CC34 movs r0, #1 rsbs r0, r0, #0 - bl sub_0819E3F0 - bl sub_0819EE50 - bl sub_0819E898 + bl Swap_UpdateActionCursorPosition + bl Swap_PrintMonCategory + bl Swap_PrintMonSpecies _0819CC34: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819CB28 + thumb_func_end Task_HandleSwapScreenChooseMons - thumb_func_start sub_0819CC3C -sub_0819CC3C: @ 0x0819CC3C + thumb_func_start Task_SwapFadeSpeciesName +Task_SwapFadeSpeciesName: @ 0x0819CC3C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -846515,7 +846515,7 @@ _0819CCE0: adds r1, #0x28 ldrb r1, [r1] movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r2, [r6] adds r0, r2, #0 adds r0, #0x28 @@ -846566,10 +846566,10 @@ _0819CD44: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_0819CC3C + thumb_func_end Task_SwapFadeSpeciesName - thumb_func_start sub_0819CD4C -sub_0819CD4C: @ 0x0819CD4C + thumb_func_start Task_SwapFadeSpeciesName2 +Task_SwapFadeSpeciesName2: @ 0x0819CD4C push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -846606,7 +846606,7 @@ _0819CD8C: ldr r0, _0819CDA0 movs r1, #0xe0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette _0819CD96: ldrh r0, [r4, #8] adds r0, #1 @@ -846661,7 +846661,7 @@ _0819CDF0: adds r1, #0x28 ldrb r1, [r1] movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes _0819CE00: pop {r4} pop {r0} @@ -846670,7 +846670,7 @@ _0819CE00: _0819CE08: .4byte gUnknown_3001280 _0819CE0C: .4byte gUnknown_20373B4 _0819CE10: .4byte gUnknown_20377B4 - thumb_func_end sub_0819CD4C + thumb_func_end Task_SwapFadeSpeciesName2 thumb_func_start sub_0819CE14 sub_0819CE14: @ 0x0819CE14 @@ -846867,7 +846867,7 @@ _0819CF54: cmp r0, #1 bne _0819CFA8 movs r0, #0x65 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r1, [r5] adds r1, #5 adds r1, r1, r4 @@ -846882,7 +846882,7 @@ _0819CFA0: .4byte gUnknown_3001280 _0819CFA4: .4byte 0x0000FFF0 _0819CFA8: movs r0, #0x64 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r2, _0819D008 ldr r1, [r2] adds r1, #5 @@ -846921,7 +846921,7 @@ _0819CFEE: cmp r7, #1 bne _0819CFF8 ldr r0, [sp] - bl sub_080A8964 + bl DestroyTask _0819CFF8: add sp, #0x10 pop {r3, r4, r5} @@ -847109,7 +847109,7 @@ _0819D0F6: movs r1, #1 strh r1, [r0, #0xe] adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask b _0819D258 .align 2, 0 _0819D160: .4byte gUnknown_20205AC @@ -847238,7 +847238,7 @@ _0819D208: movs r1, #1 strh r1, [r0, #0x10] adds r0, r7, #0 - bl sub_080A8964 + bl DestroyTask _0819D258: pop {r3, r4, r5} mov r8, r3 @@ -847291,10 +847291,10 @@ _0819D2BC: ldr r0, _0819D2D4 movs r1, #0xe0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette bl sub_0819EAB0 movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap b _0819D30A .align 2, 0 _0819D2D4: .4byte gUnknown_85DC1C4 @@ -847322,7 +847322,7 @@ _0819D2F4: movs r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade _0819D30A: ldr r1, _0819D320 lsls r0, r5, #2 @@ -847349,10 +847349,10 @@ _0819D324: _0819D336: movs r0, #5 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0819D38C ldr r0, [r0] ldrb r0, [r0, #0x14] @@ -847360,7 +847360,7 @@ _0819D336: bne _0819D398 ldr r0, _0819D390 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r1, _0819D394 @@ -847392,7 +847392,7 @@ _0819D394: .4byte gUnknown_3005B60 _0819D398: ldr r0, _0819D3D0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r3, _0819D3D4 @@ -847432,7 +847432,7 @@ _0819D3D8: bne _0819D41C ldr r0, _0819D418 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 strh r7, [r6, #0x10] @@ -847543,7 +847543,7 @@ _0819D4C8: bne _0819D510 ldr r0, _0819D508 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r3, _0819D50C @@ -847573,7 +847573,7 @@ _0819D50C: .4byte gUnknown_3005B60 _0819D510: ldr r0, _0819D548 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r3, _0819D54C @@ -847612,7 +847612,7 @@ _0819D550: bne _0819D590 ldr r0, _0819D58C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 strh r7, [r5, #0x10] @@ -847663,7 +847663,7 @@ _0819D5B2: strh r0, [r1] bl sub_0819EAB0 movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -847681,7 +847681,7 @@ _0819D5DC: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _0819D678 .align 2, 0 _0819D5F4: .4byte gUnknown_85D9C38 @@ -847701,15 +847701,15 @@ _0819D610: movs r0, #1 bl sub_0819EB80 movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap b _0819D678 _0819D61E: movs r0, #5 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0819D678 _0819D630: ldr r0, _0819D644 @@ -847718,14 +847718,14 @@ _0819D630: cmp r0, #0 bne _0819D64C ldr r0, _0819D648 - bl sub_0819E93C + bl Swap_PrintOnInfoWindow b _0819D652 .align 2, 0 _0819D644: .4byte gUnknown_3001280 _0819D648: .4byte gUnknown_85DC0C2 _0819D64C: ldr r0, _0819D688 - bl sub_0819E93C + bl Swap_PrintOnInfoWindow _0819D652: ldr r0, _0819D68C ldr r1, [r0] @@ -847745,7 +847745,7 @@ _0819D652: ands r1, r2 strb r1, [r0] _0819D674: - bl sub_0819EE50 + bl Swap_PrintMonCategory _0819D678: ldr r0, _0819D694 adds r1, r5, r6 @@ -847868,7 +847868,7 @@ _0819D770: .4byte gUnknown_3005B60 _0819D774: ldr r0, _0819D794 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r2, _0819D798 ldr r0, _0819D79C ldr r0, [r0] @@ -847885,10 +847885,10 @@ _0819D774: _0819D794: .4byte sub_0819CE14 _0819D798: .4byte gUnknown_3005B60 _0819D79C: .4byte gUnknown_3001280 -_0819D7A0: .4byte sub_0819CD4C +_0819D7A0: .4byte Task_SwapFadeSpeciesName2 _0819D7A4: ldr r0, _0819D7E0 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _0819D7B2 @@ -847913,7 +847913,7 @@ _0819D7B2: cmp r0, #0 bne _0819D7EC movs r0, #1 - bl sub_0819EF34 + bl Swap_InitActions b _0819D81A .align 2, 0 _0819D7E0: .4byte sub_0819CE14 @@ -847921,7 +847921,7 @@ _0819D7E4: .4byte gUnknown_3005B60 _0819D7E8: .4byte gUnknown_3001280 _0819D7EC: movs r0, #0 - bl sub_0819EF34 + bl Swap_InitActions movs r2, #0 ldr r5, _0819D888 movs r3, #4 @@ -848004,7 +848004,7 @@ _0819D87E: _0819D888: .4byte gUnknown_20205AC _0819D88C: .4byte gUnknown_3001280 _0819D890: .4byte gUnknown_3005B60 -_0819D894: .4byte sub_0819CC3C +_0819D894: .4byte Task_SwapFadeSpeciesName _0819D898: adds r0, r7, r6 lsls r0, r0, #3 @@ -848024,19 +848024,19 @@ _0819D8B2: pop {r0} bx r0 .align 2, 0 -_0819D8B8: .4byte sub_0819CB28 +_0819D8B8: .4byte Task_HandleSwapScreenChooseMons _0819D8BC: .4byte sub_0819D458 thumb_func_end sub_0819D6D4 - thumb_func_start sub_0819D8C0 -sub_0819D8C0: @ 0x0819D8C0 + thumb_func_start Swap_InitStruct +Swap_InitStruct: @ 0x0819D8C0 push {r4, r5, lr} ldr r5, _0819D8E4 ldr r4, [r5] cmp r4, #0 bne _0819D8DE movs r0, #0x34 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] strb r4, [r0, #3] ldr r0, [r5] @@ -848050,7 +848050,7 @@ _0819D8DE: bx r0 .align 2, 0 _0819D8E4: .4byte gUnknown_3001280 - thumb_func_end sub_0819D8C0 + thumb_func_end Swap_InitStruct thumb_func_start sub_0819D8E8 sub_0819D8E8: @ 0x0819D8E8 @@ -848059,16 +848059,16 @@ sub_0819D8E8: @ 0x0819D8E8 movs r1, #0 str r1, [r0] ldr r0, _0819D900 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _0819D8FC: .4byte gUnknown_3001280 -_0819D900: .4byte sub_0819D904 +_0819D900: .4byte CB2_InitSwapScreen thumb_func_end sub_0819D8E8 - thumb_func_start sub_0819D904 -sub_0819D904: @ 0x0819D904 + thumb_func_start CB2_InitSwapScreen +CB2_InitSwapScreen: @ 0x0819D904 push {r4, r5, r6, lr} sub sp, #0xc ldr r1, _0819D924 @@ -848108,9 +848108,9 @@ _0819D92C: @ jump table .4byte _0819DD24 @ case 15 _0819D96C: movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 str r0, [sp, #8] movs r1, #0xc0 @@ -848125,7 +848125,7 @@ _0819D96C: movs r2, #4 bl InitBgsFromTemplates ldr r0, _0819D9B4 - bl sub_08003090 + bl InitWindows bl sub_08004480 ldr r1, _0819D9B8 movs r0, #0x87 @@ -848146,7 +848146,7 @@ _0819D9BC: str r0, [r5] ldr r5, _0819DA84 adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] ldr r5, _0819DA88 movs r4, #0x80 @@ -848156,40 +848156,40 @@ _0819D9BC: str r0, [r5] ldr r5, _0819DA8C adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed str r0, [r5] movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0x54 movs r1, #0 bl SetGpuReg @@ -848223,7 +848223,7 @@ _0819DA8C: .4byte gUnknown_203CB18 _0819DA90: bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks bl FreeAllSpritePalettes bl ResetAllPicSprites ldr r0, _0819DB28 @@ -848263,20 +848263,20 @@ _0819DA90: ldr r0, _0819DB40 movs r1, #0 movs r2, #0x40 - bl sub_080A1200 + bl LoadPalette ldr r4, _0819DB44 adds r0, r4, #0 movs r1, #0xf0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette adds r0, r4, #0 movs r1, #0xe0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette ldr r0, _0819DB48 movs r1, #0x20 movs r2, #4 - bl sub_080A1200 + bl LoadPalette ldr r1, _0819DB4C movs r0, #0x87 lsls r0, r0, #3 @@ -848297,7 +848297,7 @@ _0819DB50: ldr r0, _0819DB74 ldr r1, [r0] movs r0, #3 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _0819DB78 movs r0, #8 str r0, [sp] @@ -848307,7 +848307,7 @@ _0819DB50: movs r3, #4 bl CopyToBgTilemapBufferRect movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram b _0819DD0E .align 2, 0 _0819DB74: .4byte gUnknown_203CB18 @@ -848318,9 +848318,9 @@ _0819DB7C: ldr r0, _0819DBA4 bl LoadSpriteSheets ldr r0, _0819DBA8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _0819DBAC - bl sub_080006F0 + bl SetVBlankCallback ldr r1, _0819DBB0 movs r0, #0x87 lsls r0, r0, #3 @@ -848330,7 +848330,7 @@ _0819DB7C: _0819DBA0: .4byte gUnknown_85DBEB8 _0819DBA4: .4byte gUnknown_85DBE58 _0819DBA8: .4byte gUnknown_85DBEA8 -_0819DBAC: .4byte sub_0819C4E4 +_0819DBAC: .4byte FldEff_UseCutOnTree _0819DBB0: .4byte gUnknown_3002360 _0819DBB4: ldr r0, _0819DBCC @@ -848350,25 +848350,25 @@ _0819DBC4: _0819DBCC: .4byte gUnknown_3001280 _0819DBD0: .4byte gUnknown_203CBEC _0819DBD4: - bl sub_0819D8C0 - bl sub_0819DDC8 + bl Swap_InitStruct + bl Swap_InitAllSprites ldr r0, _0819DBF4 ldr r0, [r0] ldrb r0, [r0, #0x15] cmp r0, #1 bne _0819DBEA - bl sub_0819F1F0 + bl Swap_ShowSummaryMonSprite _0819DBEA: movs r0, #0 - bl sub_0819EF34 + bl Swap_InitActions b _0819DD0E .align 2, 0 _0819DBF4: .4byte gUnknown_3001280 _0819DBF8: ldr r0, _0819DC10 - bl sub_0819E93C + bl Swap_PrintOnInfoWindow movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0819DC14 movs r0, #0x87 lsls r0, r0, #3 @@ -848378,9 +848378,9 @@ _0819DBF8: _0819DC10: .4byte gUnknown_85DC0C2 _0819DC14: .4byte gUnknown_3002360 _0819DC18: - bl sub_0819EE50 + bl Swap_PrintMonCategory movs r0, #8 - bl sub_0800365C + bl PutWindowTilemap b _0819DD0E _0819DC24: ldr r0, _0819DC44 @@ -848388,10 +848388,10 @@ _0819DC24: ldrb r0, [r0, #0x15] cmp r0, #0 bne _0819DC32 - bl sub_0819E898 + bl Swap_PrintMonSpecies _0819DC32: movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0819DC48 movs r0, #0x87 lsls r0, r0, #3 @@ -848401,9 +848401,9 @@ _0819DC32: _0819DC44: .4byte gUnknown_3001280 _0819DC48: .4byte gUnknown_3002360 _0819DC4C: - bl sub_0819E864 + bl Swap_PrintPkmnSwap movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap b _0819DD0E _0819DC58: ldr r0, _0819DC78 @@ -848414,7 +848414,7 @@ _0819DC58: bl sub_0819EA40 _0819DC66: movs r0, #6 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0819DC7C movs r0, #0x87 lsls r0, r0, #3 @@ -848429,14 +848429,14 @@ _0819DC80: ldrb r0, [r0, #0x15] cmp r0, #0 beq _0819DD0E - bl sub_0819EBF0 + bl Swap_PrintMonSpecies2 b _0819DD0E .align 2, 0 _0819DC90: .4byte gUnknown_3001280 _0819DC94: bl sub_0819EB18 movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap ldr r1, _0819DCA8 movs r0, #0x87 lsls r0, r0, #3 @@ -848451,24 +848451,24 @@ _0819DCAC: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r0, _0819DCFC ldr r0, [r0] ldrb r0, [r0, #0x15] cmp r0, #1 bne _0819DD08 movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r1, _0819DD00 movs r0, #0x50 bl SetGpuReg @@ -848482,7 +848482,7 @@ _0819DD00: .4byte 0x00001248 _0819DD04: .4byte 0x0000040B _0819DD08: movs r0, #3 - bl sub_08001B5C + bl HideBg _0819DD0E: ldr r1, _0819DD20 movs r2, #0x87 @@ -848498,7 +848498,7 @@ _0819DD20: .4byte gUnknown_3002360 _0819DD24: ldr r0, _0819DD64 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r6, _0819DD68 ldr r1, [r6] adds r1, #0x21 @@ -848517,7 +848517,7 @@ _0819DD24: strh r5, [r0, #8] ldr r0, _0819DD70 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #2 @@ -848527,10 +848527,10 @@ _0819DD24: strh r5, [r0, #8] b _0819DDAC .align 2, 0 -_0819DD64: .4byte sub_0819CC3C +_0819DD64: .4byte Task_SwapFadeSpeciesName _0819DD68: .4byte gUnknown_3001280 _0819DD6C: .4byte gUnknown_3005B60 -_0819DD70: .4byte sub_0819CB28 +_0819DD70: .4byte Task_HandleSwapScreenChooseMons _0819DD74: bl sub_0819E844 ldr r4, _0819DDBC @@ -848549,7 +848549,7 @@ _0819DD74: strb r3, [r2] ldr r0, _0819DDC0 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #2 @@ -848560,7 +848560,7 @@ _0819DD74: strh r1, [r0, #8] _0819DDAC: ldr r0, _0819DDC4 - bl sub_08000540 + bl SetMainCallback2 _0819DDB2: add sp, #0xc pop {r4, r5, r6} @@ -848568,12 +848568,12 @@ _0819DDB2: bx r0 .align 2, 0 _0819DDBC: .4byte gUnknown_3005B60 -_0819DDC0: .4byte sub_0819CA1C -_0819DDC4: .4byte sub_0819C4C8 - thumb_func_end sub_0819D904 +_0819DDC0: .4byte Task_HandleSwapScreenMenu +_0819DDC4: .4byte Swap_CB2 + thumb_func_end CB2_InitSwapScreen - thumb_func_start sub_0819DDC8 -sub_0819DDC8: @ 0x0819DDC8 + thumb_func_start Swap_InitAllSprites +Swap_InitAllSprites: @ 0x0819DDC8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -848604,7 +848604,7 @@ _0819DDEE: mov r0, sp movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] adds r1, #5 adds r1, r1, r6 @@ -848639,7 +848639,7 @@ _0819DDEE: ldr r0, _0819E1C4 movs r2, #0x58 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] movs r4, #0 strb r0, [r1, #4] @@ -848647,14 +848647,14 @@ _0819DDEE: movs r1, #0xb0 movs r2, #0x70 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #1] ldr r0, _0819E1CC movs r1, #0xb0 movs r2, #0x90 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #2] ldr r0, [r7] @@ -848734,7 +848734,7 @@ _0819DEF0: movs r1, #0xf0 movs r2, #0x78 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #8] mov r1, sp @@ -848753,7 +848753,7 @@ _0819DEF0: adds r1, r4, #0 movs r2, #0x78 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #9] movs r5, #0x90 @@ -848762,7 +848762,7 @@ _0819DEF0: adds r1, r5, #0 movs r2, #0x78 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0xa] mov r1, sp @@ -848779,7 +848779,7 @@ _0819DEF0: movs r1, #0xf0 movs r2, #0x78 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0xb] mov r1, sp @@ -848795,7 +848795,7 @@ _0819DEF0: adds r1, r4, #0 movs r2, #0x78 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0xc] mov r0, sp @@ -848804,7 +848804,7 @@ _0819DEF0: adds r1, r5, #0 movs r2, #0x78 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0xd] mov r1, sp @@ -848819,7 +848819,7 @@ _0819DEF0: ldr r1, [sp, #0x18] movs r2, #0x90 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0xe] mov r1, sp @@ -848836,7 +848836,7 @@ _0819DEF0: adds r1, r4, #0 movs r2, #0x90 movs r3, #0xa - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0xf] mov r1, sp @@ -848851,7 +848851,7 @@ _0819DEF0: ldr r1, [sp, #0x18] movs r2, #0x90 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0x10] mov r1, sp @@ -848865,7 +848865,7 @@ _0819DEF0: adds r1, r4, #0 movs r2, #0x90 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r7] strb r0, [r1, #0x11] movs r6, #0 @@ -849131,10 +849131,10 @@ _0819E1D0: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_0819DDC8 + thumb_func_end Swap_InitAllSprites - thumb_func_start sub_0819E240 -sub_0819E240: @ 0x0819E240 + thumb_func_start Swap_DestroyAllSprites +Swap_DestroyAllSprites: @ 0x0819E240 push {r4, r5, r6, r7, lr} movs r5, #0 _0819E244: @@ -849236,10 +849236,10 @@ _0819E2D4: .align 2, 0 _0819E308: .4byte gUnknown_3001280 _0819E30C: .4byte gUnknown_20205AC - thumb_func_end sub_0819E240 + thumb_func_end Swap_DestroyAllSprites - thumb_func_start sub_0819E310 -sub_0819E310: @ 0x0819E310 + thumb_func_start Swap_HandleActionCursorChange +Swap_HandleActionCursorChange: @ 0x0819E310 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -849306,10 +849306,10 @@ _0819E38C: .align 2, 0 _0819E394: .4byte gUnknown_20205AC _0819E398: .4byte gUnknown_3001280 - thumb_func_end sub_0819E310 + thumb_func_end Swap_HandleActionCursorChange - thumb_func_start sub_0819E39C -sub_0819E39C: @ 0x0819E39C + thumb_func_start Swap_UpdateBallCursorPosition +Swap_UpdateBallCursorPosition: @ 0x0819E39C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -849348,14 +849348,14 @@ _0819E3E0: strb r0, [r2, #3] ldr r0, [r1] ldrb r0, [r0, #3] - bl sub_0819E310 + bl Swap_HandleActionCursorChange pop {r4} pop {r0} bx r0 - thumb_func_end sub_0819E39C + thumb_func_end Swap_UpdateBallCursorPosition - thumb_func_start sub_0819E3F0 -sub_0819E3F0: @ 0x0819E3F0 + thumb_func_start Swap_UpdateActionCursorPosition +Swap_UpdateActionCursorPosition: @ 0x0819E3F0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -849410,14 +849410,14 @@ _0819E450: _0819E452: ldr r0, [r4] ldrb r0, [r0, #3] - bl sub_0819E310 + bl Swap_HandleActionCursorChange pop {r4} pop {r0} bx r0 - thumb_func_end sub_0819E3F0 + thumb_func_end Swap_UpdateActionCursorPosition - thumb_func_start sub_0819E460 -sub_0819E460: @ 0x0819E460 + thumb_func_start Swap_UpdateYesNoCursorPosition +Swap_UpdateYesNoCursorPosition: @ 0x0819E460 push {lr} lsls r0, r0, #0x18 cmp r0, #0 @@ -849474,10 +849474,10 @@ _0819E496: bx r0 .align 2, 0 _0819E4C4: .4byte gUnknown_20205AC - thumb_func_end sub_0819E460 + thumb_func_end Swap_UpdateYesNoCursorPosition - thumb_func_start sub_0819E4C8 -sub_0819E4C8: @ 0x0819E4C8 + thumb_func_start Swap_UpdateMenuCursorPosition +Swap_UpdateMenuCursorPosition: @ 0x0819E4C8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -849540,7 +849540,7 @@ _0819E50A: bx r0 .align 2, 0 _0819E53C: .4byte gUnknown_20205AC - thumb_func_end sub_0819E4C8 + thumb_func_end Swap_UpdateMenuCursorPosition thumb_func_start sub_0819E540 sub_0819E540: @ 0x0819E540 @@ -849688,8 +849688,8 @@ _0819E644: .4byte gUnknown_20205AC _0819E648: .4byte gUnknown_3001280 thumb_func_end sub_0819E5F4 - thumb_func_start sub_0819E64C -sub_0819E64C: @ 0x0819E64C + thumb_func_start Swap_ShowMenuOptions +Swap_ShowMenuOptions: @ 0x0819E64C push {r4, r5, lr} ldr r0, _0819E660 ldr r3, [r0] @@ -849762,16 +849762,16 @@ _0819E668: ldrb r1, [r0] ands r2, r1 strb r2, [r0] - bl sub_0819E970 + bl Swap_PrintMenuOptions pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0819E6E4: .4byte gUnknown_20205AC - thumb_func_end sub_0819E64C + thumb_func_end Swap_ShowMenuOptions - thumb_func_start sub_0819E6E8 -sub_0819E6E8: @ 0x0819E6E8 + thumb_func_start Swap_ShowYesNoOptions +Swap_ShowYesNoOptions: @ 0x0819E6E8 push {r4, r5, lr} ldr r5, _0819E764 ldr r1, [r5] @@ -849828,14 +849828,14 @@ sub_0819E6E8: @ 0x0819E6E8 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - bl sub_0819E9E4 + bl Swap_PrintYesNoOptions pop {r4, r5} pop {r0} bx r0 .align 2, 0 _0819E764: .4byte gUnknown_3001280 _0819E768: .4byte gUnknown_20205AC - thumb_func_end sub_0819E6E8 + thumb_func_end Swap_ShowYesNoOptions thumb_func_start sub_0819E76C sub_0819E76C: @ 0x0819E76C @@ -849868,12 +849868,12 @@ sub_0819E76C: @ 0x0819E76C strb r1, [r0] adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 - bl sub_08003774 + bl ClearWindowTilemap pop {r4, r5} pop {r0} bx r0 @@ -849886,21 +849886,21 @@ _0819E7C4: .4byte gUnknown_3001280 sub_0819E7C8: @ 0x0819E7C8 push {lr} movs r0, #6 - bl sub_0800365C + bl PutWindowTilemap movs r0, #6 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #6 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 .align 2, 0 @@ -849911,7 +849911,7 @@ sub_0819E7FC: @ 0x0819E7FC push {lr} sub sp, #0xc movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap ldr r2, _0819E840 movs r0, #2 str r0, [sp] @@ -849923,15 +849923,15 @@ sub_0819E7FC: @ 0x0819E7FC bl AddTextPrinterParameterized movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #7 - bl sub_0800365C + bl PutWindowTilemap movs r0, #7 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #7 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -849944,24 +849944,24 @@ sub_0819E844: @ 0x0819E844 push {lr} bl sub_0819E7C8 movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap movs r0, #5 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 thumb_func_end sub_0819E844 - thumb_func_start sub_0819E864 -sub_0819E864: @ 0x0819E864 + thumb_func_start Swap_PrintPkmnSwap +Swap_PrintPkmnSwap: @ 0x0819E864 push {lr} sub sp, #0xc movs r0, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _0819E894 movs r0, #2 str r0, [sp] @@ -849973,21 +849973,21 @@ sub_0819E864: @ 0x0819E864 bl AddTextPrinterParameterized movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 .align 2, 0 _0819E894: .4byte gUnknown_85DC0B4 - thumb_func_end sub_0819E864 + thumb_func_end Swap_PrintPkmnSwap - thumb_func_start sub_0819E898 -sub_0819E898: @ 0x0819E898 + thumb_func_start Swap_PrintMonSpecies +Swap_PrintMonSpecies: @ 0x0819E898 push {r4, lr} sub sp, #0xc movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0819E8B8 ldr r1, [r0] ldrb r0, [r1, #3] @@ -849995,7 +849995,7 @@ sub_0819E898: @ 0x0819E898 bls _0819E8BC movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0819E924 .align 2, 0 _0819E8B8: .4byte gUnknown_3001280 @@ -850018,7 +850018,7 @@ _0819E8D6: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _0819E930 @@ -850045,10 +850045,10 @@ _0819E8D6: movs r0, #1 movs r1, #1 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _0819E924: add sp, #0xc pop {r4} @@ -850059,16 +850059,16 @@ _0819E92C: .4byte gUnknown_20243E8 _0819E930: .4byte gUnknown_2021C7C _0819E934: .4byte gUnknown_82EA31C _0819E938: .4byte gUnknown_85DC1D1 - thumb_func_end sub_0819E898 + thumb_func_end Swap_PrintMonSpecies - thumb_func_start sub_0819E93C -sub_0819E93C: @ 0x0819E93C + thumb_func_start Swap_PrintOnInfoWindow +Swap_PrintOnInfoWindow: @ 0x0819E93C push {r4, lr} sub sp, #0xc adds r4, r0, #0 movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 str r0, [sp] movs r0, #0 @@ -850081,22 +850081,22 @@ sub_0819E93C: @ 0x0819E93C bl AddTextPrinterParameterized movs r0, #2 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4} pop {r0} bx r0 - thumb_func_end sub_0819E93C + thumb_func_end Swap_PrintOnInfoWindow - thumb_func_start sub_0819E970 -sub_0819E970: @ 0x0819E970 + thumb_func_start Swap_PrintMenuOptions +Swap_PrintMenuOptions: @ 0x0819E970 push {r4, r5, lr} sub sp, #0xc movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0819E9D4 str r5, [sp] movs r4, #0 @@ -850107,7 +850107,7 @@ sub_0819E970: @ 0x0819E970 movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0819E9DC @@ -850116,7 +850116,7 @@ sub_0819E970: @ 0x0819E970 movs r1, #1 movs r2, #8 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0819E9E0 @@ -850125,10 +850125,10 @@ sub_0819E970: @ 0x0819E970 movs r1, #1 movs r2, #8 movs r3, #0x22 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -850138,17 +850138,17 @@ _0819E9D4: .4byte gUnknown_85DC1CE _0819E9D8: .4byte gUnknown_85DC0ED _0819E9DC: .4byte gUnknown_85DC0E8 _0819E9E0: .4byte gUnknown_85DC0F4 - thumb_func_end sub_0819E970 + thumb_func_end Swap_PrintMenuOptions - thumb_func_start sub_0819E9E4 -sub_0819E9E4: @ 0x0819E9E4 + thumb_func_start Swap_PrintYesNoOptions +Swap_PrintYesNoOptions: @ 0x0819E9E4 push {r4, r5, lr} sub sp, #0xc movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r5, _0819EA34 str r5, [sp] movs r4, #0 @@ -850159,7 +850159,7 @@ sub_0819E9E4: @ 0x0819E9E4 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r5, [sp] str r4, [sp, #4] ldr r0, _0819EA3C @@ -850168,10 +850168,10 @@ sub_0819E9E4: @ 0x0819E9E4 movs r1, #1 movs r2, #0 movs r3, #0x12 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #4 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -850180,17 +850180,17 @@ sub_0819E9E4: @ 0x0819E9E4 _0819EA34: .4byte gUnknown_85DC1CE _0819EA38: .4byte gUnknown_85DC10C _0819EA3C: .4byte gUnknown_85DC10F - thumb_func_end sub_0819E9E4 + thumb_func_end Swap_PrintYesNoOptions thumb_func_start sub_0819EA40 sub_0819EA40: @ 0x0819EA40 push {lr} sub sp, #0xc movs r0, #6 - bl sub_0800365C + bl PutWindowTilemap movs r0, #6 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0819EA74 ldr r0, [r0] ldrb r1, [r0, #0x14] @@ -850205,7 +850205,7 @@ sub_0819EA40: @ 0x0819EA40 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0819EA98 .align 2, 0 _0819EA74: .4byte gUnknown_3001280 @@ -850222,11 +850222,11 @@ _0819EA80: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EA98: movs r0, #6 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -850241,7 +850241,7 @@ sub_0819EAB0: @ 0x0819EAB0 sub sp, #0xc movs r0, #5 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0819EB08 ldr r0, [r0] ldrb r0, [r0, #0x14] @@ -850259,7 +850259,7 @@ sub_0819EAB0: @ 0x0819EAB0 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EAE2: ldr r0, _0819EB0C str r0, [sp] @@ -850271,11 +850271,11 @@ _0819EAE2: movs r1, #0 movs r2, #0x20 movs r3, #0x18 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EAFA: movs r0, #5 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -850292,7 +850292,7 @@ sub_0819EB18: @ 0x0819EB18 sub sp, #0xc movs r0, #3 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0819EB70 ldr r0, [r0] ldrb r0, [r0, #0x14] @@ -850310,7 +850310,7 @@ sub_0819EB18: @ 0x0819EB18 movs r1, #0 movs r2, #0 movs r3, #8 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EB4A: ldr r0, _0819EB74 str r0, [sp] @@ -850322,11 +850322,11 @@ _0819EB4A: movs r1, #0 movs r2, #0x20 movs r3, #0x20 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EB62: movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -850363,7 +850363,7 @@ _0819EB92: movs r1, #0 movs r2, #0 movs r3, #8 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0819EBD8 .align 2, 0 _0819EBB4: .4byte gUnknown_3001280 @@ -850380,11 +850380,11 @@ _0819EBC0: movs r1, #0 movs r2, #0x20 movs r3, #0x20 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EBD8: movs r0, #3 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r0} bx r0 @@ -850393,8 +850393,8 @@ _0819EBE8: .4byte gUnknown_85DC1CE _0819EBEC: .4byte gUnknown_85DC11C thumb_func_end sub_0819EB80 - thumb_func_start sub_0819EBF0 -sub_0819EBF0: @ 0x0819EBF0 + thumb_func_start Swap_PrintMonSpecies2 +Swap_PrintMonSpecies2: @ 0x0819EBF0 push {r4, lr} sub sp, #0x18 ldr r0, _0819EC18 @@ -850426,9 +850426,9 @@ _0819EC2A: add r0, sp, #0xc movs r1, #0xf0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _0819EC5C ldr r0, [r0] ldrb r1, [r0, #0x14] @@ -850443,7 +850443,7 @@ _0819EC2A: movs r1, #1 movs r2, #0x48 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0819EC80 .align 2, 0 _0819EC5C: .4byte gUnknown_3001280 @@ -850460,16 +850460,16 @@ _0819EC68: movs r1, #1 movs r2, #0x48 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EC80: movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #7 - bl sub_0800365C + bl PutWindowTilemap movs r0, #7 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _0819ECB4 ldr r1, [r0] ldrb r0, [r1, #3] @@ -850477,7 +850477,7 @@ _0819EC80: bls _0819ECB8 movs r0, #7 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _0819ED20 .align 2, 0 _0819ECAC: .4byte gUnknown_85DC1D1 @@ -850502,7 +850502,7 @@ _0819ECD2: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _0819ED2C @@ -850529,10 +850529,10 @@ _0819ECD2: movs r0, #7 movs r1, #1 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #7 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0819ED20: add sp, #0x18 pop {r4} @@ -850543,7 +850543,7 @@ _0819ED28: .4byte gUnknown_20243E8 _0819ED2C: .4byte gUnknown_2021C7C _0819ED30: .4byte gUnknown_82EA31C _0819ED34: .4byte gUnknown_85DC1D1 - thumb_func_end sub_0819EBF0 + thumb_func_end Swap_PrintMonSpecies2 thumb_func_start sub_0819ED38 sub_0819ED38: @ 0x0819ED38 @@ -850552,13 +850552,13 @@ sub_0819ED38: @ 0x0819ED38 ldr r0, _0819ED78 movs r1, #0xe0 movs r2, #0xa - bl sub_080A1200 + bl LoadPalette ldr r0, _0819ED7C ldr r1, _0819ED80 movs r2, #5 bl CpuSet movs r0, #6 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _0819ED84 ldr r0, [r0] ldrb r1, [r0, #0x14] @@ -850573,7 +850573,7 @@ sub_0819ED38: @ 0x0819ED38 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _0819EDA8 .align 2, 0 _0819ED78: .4byte gUnknown_85DC1C4 @@ -850593,11 +850593,11 @@ _0819ED90: movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _0819EDA8: movs r0, #6 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _0819EDCC ldr r1, [r0] ldrb r0, [r1, #3] @@ -850605,7 +850605,7 @@ _0819EDA8: bls _0819EDD0 movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0819EE38 .align 2, 0 _0819EDC4: .4byte gUnknown_85DC1D1 @@ -850630,7 +850630,7 @@ _0819EDEA: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r4, _0819EE44 @@ -850657,10 +850657,10 @@ _0819EDEA: movs r0, #1 movs r1, #1 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #1 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram _0819EE38: add sp, #0xc pop {r4} @@ -850673,8 +850673,8 @@ _0819EE48: .4byte gUnknown_82EA31C _0819EE4C: .4byte gUnknown_85DC1D1 thumb_func_end sub_0819ED38 - thumb_func_start sub_0819EE50 -sub_0819EE50: @ 0x0819EE50 + thumb_func_start Swap_PrintMonCategory +Swap_PrintMonCategory: @ 0x0819EE50 push {r4, r5, r6, lr} sub sp, #0x18 ldr r6, _0819EE74 @@ -850683,18 +850683,18 @@ sub_0819EE50: @ 0x0819EE50 adds r5, r4, #0 movs r0, #8 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r4, #2 bls _0819EE78 movs r0, #8 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0819EF20 .align 2, 0 _0819EE74: .4byte gUnknown_3001280 _0819EE78: movs r0, #8 - bl sub_0800365C + bl PutWindowTilemap ldr r0, [r6] ldrb r0, [r0, #0x14] cmp r0, #0 @@ -850713,7 +850713,7 @@ _0819EE9A: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0806CF68 @@ -850773,7 +850773,7 @@ _0819EEEA: bl AddTextPrinterParameterized movs r0, #8 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _0819EF20: add sp, #0x18 pop {r4, r5, r6} @@ -850783,10 +850783,10 @@ _0819EF20: _0819EF28: .4byte gUnknown_20243E8 _0819EF2C: .4byte gUnknown_854069C _0819EF30: .4byte gUnknown_85C8C66 - thumb_func_end sub_0819EE50 + thumb_func_end Swap_PrintMonCategory - thumb_func_start sub_0819EF34 -sub_0819EF34: @ 0x0819EF34 + thumb_func_start Swap_InitActions +Swap_InitActions: @ 0x0819EF34 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -850832,10 +850832,10 @@ _0819EF80: bx r0 .align 2, 0 _0819EF88: .4byte gUnknown_85DC1F4 - thumb_func_end sub_0819EF34 + thumb_func_end Swap_InitActions - thumb_func_start sub_0819EF8C -sub_0819EF8C: @ 0x0819EF8C + thumb_func_start Swap_RunMenuOptionFunc +Swap_RunMenuOptionFunc: @ 0x0819EF8C push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -850855,7 +850855,7 @@ sub_0819EF8C: @ 0x0819EF8C _0819EFAC: .4byte gUnknown_300127C _0819EFB0: .4byte gUnknown_85DC158 _0819EFB4: .4byte gUnknown_3001280 - thumb_func_end sub_0819EF8C + thumb_func_end Swap_RunMenuOptionFunc thumb_func_start sub_0819EFB8 sub_0819EFB8: @ 0x0819EFB8 @@ -850908,7 +850908,7 @@ sub_0819F000: @ 0x0819F000 bx lr .align 2, 0 _0819F018: .4byte gUnknown_3005B60 -_0819F01C: .4byte sub_0819C5F4 +_0819F01C: .4byte Task_FromSwapScreenToSummaryScreen thumb_func_end sub_0819F000 thumb_func_start sub_0819F020 @@ -850946,12 +850946,12 @@ sub_0819F020: @ 0x0819F020 .align 2, 0 _0819F060: .4byte gUnknown_3001280 _0819F064: .4byte gUnknown_3005B60 -_0819F068: .4byte sub_0819CB28 +_0819F068: .4byte Task_HandleSwapScreenChooseMons _0819F06C: .4byte sub_0819D458 thumb_func_end sub_0819F020 - thumb_func_start sub_0819F070 -sub_0819F070: @ 0x0819F070 + thumb_func_start Swap_RunActionFunc +Swap_RunActionFunc: @ 0x0819F070 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -850970,7 +850970,7 @@ sub_0819F070: @ 0x0819F070 .align 2, 0 _0819F090: .4byte gUnknown_300127C _0819F094: .4byte gUnknown_3001280 - thumb_func_end sub_0819F070 + thumb_func_end Swap_RunActionFunc thumb_func_start Swap_ActionCancel Swap_ActionCancel: @ 0x0819F098 @@ -851022,8 +851022,8 @@ _0819F0F0: .4byte sub_0819D6D4 _0819F0F4: .4byte sub_0819D270 thumb_func_end Swap_ActionPkmnForSwap - thumb_func_start sub_0819F0F8 -sub_0819F0F8: @ 0x0819F0F8 + thumb_func_start Swap_ActionMon +Swap_ActionMon: @ 0x0819F0F8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -851047,10 +851047,10 @@ sub_0819F0F8: @ 0x0819F0F8 .align 2, 0 _0819F120: .4byte gUnknown_3001280 _0819F124: .4byte gUnknown_3005B60 -_0819F128: .4byte sub_0819CA1C +_0819F128: .4byte Task_HandleSwapScreenMenu _0819F12C: ldrb r0, [r1, #3] - bl sub_0819F488 + bl Swap_AlreadyHasSameSpecies lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #1 @@ -851073,7 +851073,7 @@ _0819F12C: b _0819F18A .align 2, 0 _0819F15C: .4byte gUnknown_3005B60 -_0819F160: .4byte sub_0819F374 +_0819F160: .4byte Task_SwapCantHaveSameMons _0819F164: ldr r4, _0819F194 lsls r5, r6, #2 @@ -851104,7 +851104,7 @@ _0819F18A: _0819F194: .4byte gUnknown_3005B60 _0819F198: .4byte sub_0819C9BC _0819F19C: .4byte sub_0819D270 - thumb_func_end sub_0819F0F8 + thumb_func_end Swap_ActionMon thumb_func_start sub_0819F1A0 sub_0819F1A0: @ 0x0819F1A0 @@ -851117,7 +851117,7 @@ sub_0819F1A0: @ 0x0819F1A0 movs r1, #0x78 movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite strb r0, [r4] ldr r2, _0819F1E8 ldrb r1, [r4] @@ -851146,8 +851146,8 @@ _0819F1E8: .4byte gUnknown_20205AC _0819F1EC: .4byte sub_0819F4EC thumb_func_end sub_0819F1A0 - thumb_func_start sub_0819F1F0 -sub_0819F1F0: @ 0x0819F1F0 + thumb_func_start Swap_ShowSummaryMonSprite +Swap_ShowSummaryMonSprite: @ 0x0819F1F0 push {r4, r5, r6, lr} mov r6, sl mov r5, sb @@ -851158,7 +851158,7 @@ sub_0819F1F0: @ 0x0819F1F0 movs r1, #0x78 movs r2, #0x40 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r6, _0819F2D4 ldr r1, [r6] adds r1, #0x2d @@ -851186,19 +851186,19 @@ sub_0819F1F0: @ 0x0819F1F0 adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov sb, r0 adds r0, r4, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 movs r0, #0x58 str r0, [sp] @@ -851260,7 +851260,7 @@ _0819F2D4: .4byte gUnknown_3001280 _0819F2D8: .4byte gUnknown_20205AC _0819F2DC: .4byte gUnknown_2024190 _0819F2E0: .4byte 0x0000FFFF - thumb_func_end sub_0819F1F0 + thumb_func_end Swap_ShowSummaryMonSprite thumb_func_start sub_0819F2E4 sub_0819F2E4: @ 0x0819F2E4 @@ -851271,10 +851271,10 @@ sub_0819F2E4: @ 0x0819F2E4 lsrs r5, r5, #0x18 lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r0, _0819F328 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0819F32C @@ -851306,7 +851306,7 @@ sub_0819F330: @ 0x0819F330 adds r6, r1, #0 lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite ldr r5, _0819F370 lsls r4, r4, #0x10 lsrs r1, r4, #0x18 @@ -851333,8 +851333,8 @@ sub_0819F330: @ 0x0819F330 _0819F370: .4byte gUnknown_20205AC thumb_func_end sub_0819F330 - thumb_func_start sub_0819F374 -sub_0819F374: @ 0x0819F374 + thumb_func_start Task_SwapCantHaveSameMons +Task_SwapCantHaveSameMons: @ 0x0819F374 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -851372,7 +851372,7 @@ _0819F3B4: @ jump table .4byte _0819F454 @ case 4 _0819F3C8: ldr r0, _0819F3DC - bl sub_0819E93C + bl Swap_PrintOnInfoWindow ldr r0, _0819F3E0 ldr r0, [r0] adds r0, #0x20 @@ -851414,14 +851414,14 @@ _0819F418: beq _0819F476 movs r0, #5 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #5 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _0819F43A _0819F434: ldr r0, _0819F44C - bl sub_0819E93C + bl Swap_PrintOnInfoWindow _0819F43A: ldr r0, _0819F450 adds r1, r5, r4 @@ -851457,11 +851457,11 @@ _0819F476: .align 2, 0 _0819F47C: .4byte gUnknown_3001280 _0819F480: .4byte gUnknown_3005B60 -_0819F484: .4byte sub_0819CB28 - thumb_func_end sub_0819F374 +_0819F484: .4byte Task_HandleSwapScreenChooseMons + thumb_func_end Task_SwapCantHaveSameMons - thumb_func_start sub_0819F488 -sub_0819F488: @ 0x0819F488 + thumb_func_start Swap_AlreadyHasSameSpecies +Swap_AlreadyHasSameSpecies: @ 0x0819F488 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -851471,7 +851471,7 @@ sub_0819F488: @ 0x0819F488 adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 movs r4, #0 @@ -851487,7 +851487,7 @@ _0819F4A4: adds r0, r0, r1 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, r5 @@ -851510,7 +851510,7 @@ _0819F4E4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_0819F488 + thumb_func_end Swap_AlreadyHasSameSpecies thumb_func_start sub_0819F4EC sub_0819F4EC: @ 0x0819F4EC @@ -851530,7 +851530,7 @@ sub_0819F4EC: @ 0x0819F4EC strb r0, [r2] ldr r0, _0819F534 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _0819F538 @@ -851630,7 +851630,7 @@ _0819F5B6: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldrh r1, [r4, #0xe] lsls r1, r1, #8 ldrh r0, [r4, #0x38] @@ -851656,7 +851656,7 @@ _0819F5B6: b _0819F692 _0819F606: movs r0, #3 - bl sub_08001B48 + bl ShowBg ldr r1, _0819F620 movs r0, #0x50 bl SetGpuReg @@ -851703,7 +851703,7 @@ _0819F64C: b _0819F692 _0819F668: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _0819F688 lsls r1, r5, #2 adds r1, r1, r5 @@ -851713,12 +851713,12 @@ _0819F668: ldrsh r0, [r1, r2] cmp r0, #1 bne _0819F68C - bl sub_0819F7CC + bl Swap_ShowMonSprite b _0819F698 .align 2, 0 _0819F688: .4byte gUnknown_3005B60 _0819F68C: - bl sub_0819BA58 + bl Summary_ShowMonSprite b _0819F698 _0819F692: ldrh r0, [r4, #8] @@ -851748,7 +851748,7 @@ sub_0819F6A0: @ 0x0819F6A0 cmp r0, #1 beq _0819F780 movs r0, #3 - bl sub_08001B5C + bl HideBg ldr r3, _0819F728 movs r0, #0x14 ldrsh r1, [r4, r0] @@ -851791,9 +851791,9 @@ sub_0819F6A0: @ 0x0819F6A0 movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _0819F7C4 .align 2, 0 _0819F724: .4byte gUnknown_3005B60 @@ -851811,7 +851811,7 @@ _0819F730: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits ldrh r1, [r4, #0xe] lsls r1, r1, #8 ldrh r0, [r4, #0x38] @@ -851879,8 +851879,8 @@ _0819F7C4: .align 2, 0 thumb_func_end sub_0819F6A0 - thumb_func_start sub_0819F7CC -sub_0819F7CC: @ 0x0819F7CC + thumb_func_start Swap_ShowMonSprite +Swap_ShowMonSprite: @ 0x0819F7CC push {r4, r5, r6, lr} sub sp, #0x10 ldr r0, _0819F7E4 @@ -851906,19 +851906,19 @@ _0819F7F4: adds r0, r6, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r6, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 adds r0, r6, #0 movs r1, #1 movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 movs r0, #0x58 str r0, [sp] @@ -851968,10 +851968,10 @@ _0819F878: .4byte gUnknown_20243E8 _0819F87C: .4byte 0x0000FFFF _0819F880: .4byte gUnknown_3001280 _0819F884: .4byte gUnknown_20205AC - thumb_func_end sub_0819F7CC + thumb_func_end Swap_ShowMonSprite - thumb_func_start sub_0819F888 -sub_0819F888: @ 0x0819F888 + thumb_func_start CopyFriendsApprenticeChallengeText +CopyFriendsApprenticeChallengeText: @ 0x0819F888 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -852014,7 +852014,7 @@ _0819F8C8: lsls r0, r0, #1 adds r1, r1, r0 mov r0, r8 - bl sub_08008888 + bl StringCopy7 ldr r0, _0819F91C ldr r1, [r7] adds r1, r1, r4 @@ -852033,7 +852033,7 @@ _0819F8C8: adds r0, r0, r1 ldr r1, [r0] ldr r0, _0819F924 - bl sub_08008BCC + bl StringExpandPlaceholders pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -852045,12 +852045,12 @@ _0819F918: .4byte gUnknown_2021C40 _0819F91C: .4byte gUnknown_2021C54 _0819F920: .4byte gUnknown_85DC95C _0819F924: .4byte gUnknown_2021C7C - thumb_func_end sub_0819F888 + thumb_func_end CopyFriendsApprenticeChallengeText thumb_func_start sub_0819F928 sub_0819F928: @ 0x0819F928 push {lr} - bl sub_080988C4 + bl EnableBothScriptContexts pop {r0} bx r0 .align 2, 0 @@ -852094,8 +852094,8 @@ _0819F942: _0819F974: .4byte 0x0000FFFF thumb_func_end ResetApprenticeStruct - thumb_func_start sub_0819F978 -sub_0819F978: @ 0x0819F978 + thumb_func_start ResetAllApprenticeData +ResetAllApprenticeData: @ 0x0819F978 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -852217,7 +852217,7 @@ _0819FA20: mov ip, r0 cmp r0, #3 bls _0819F99E - bl sub_081A0744 + bl Script_ResetPlayerApprentice pop {r3, r4, r5} mov r8, r3 mov sb, r4 @@ -852230,7 +852230,7 @@ _0819FA78: .4byte gUnknown_3005AF0 _0819FA7C: .4byte 0x0000FFFF _0819FA80: .4byte gUnknown_829BDA5 _0819FA84: .4byte 0x0000011B - thumb_func_end sub_0819F978 + thumb_func_end ResetAllApprenticeData thumb_func_start IsPlayersApprenticeActive IsPlayersApprenticeActive: @ 0x0819FA88 @@ -852566,7 +852566,7 @@ _0819FCBE: bls _0819FCBE ldr r4, _0819FE68 movs r0, #0x30 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r1, #0 strb r1, [r0] @@ -852736,7 +852736,7 @@ _0819FE3A: _0819FE46: ldr r4, _0819FE68 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] add sp, #0x20 @@ -852878,13 +852878,13 @@ _0819FF48: lsrs r4, r0, #0x18 ldr r0, [sp, #8] adds r1, r4, #0 - bl sub_0806DAF8 + bl CanSpeciesLearnTMHM adds r2, r0, #0 cmp r2, #0 beq _0819FF48 ldr r3, _0819FF94 adds r0, r4, r3 - bl sub_081B69B4 + bl ItemIdToBattleMoveId lsls r0, r0, #0x10 lsrs r7, r0, #0x10 movs r2, #1 @@ -853678,12 +853678,12 @@ _081A0556: mov r0, sl adds r1, r5, #0 ldr r2, [sp, #0x18] - bl sub_081A064C + bl CreateAndShowWindow lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle movs r4, #0 cmp r4, r7 bhs _081A05A2 @@ -853724,7 +853724,7 @@ _081A05A2: movs r0, #1 adds r1, r7, #0 adds r2, r5, #0 - bl sub_081A06CC + bl CreateChooseAnswerTask _081A05C2: add sp, #0x1c pop {r3, r4, r5} @@ -853737,8 +853737,8 @@ _081A05C2: .align 2, 0 thumb_func_end sub_081A03C4 - thumb_func_start sub_081A05D4 -sub_081A05D4: @ 0x081A05D4 + thumb_func_start Task_ChooseAnswer +Task_ChooseAnswer: @ 0x081A05D4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -853751,12 +853751,12 @@ sub_081A05D4: @ 0x081A05D4 ldrsh r0, [r4, r1] cmp r0, #0 bne _081A05F8 - bl sub_081986E8 + bl Menu_ProcessInputNoWrap b _081A05FC .align 2, 0 _081A05F4: .4byte gUnknown_3005B68 _081A05F8: - bl sub_0819867C + bl Menu_ProcessInput _081A05FC: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -853786,20 +853786,20 @@ _081A062C: strh r1, [r0] _081A0630: ldrb r0, [r4, #0xc] - bl sub_081A06B0 + bl RemoveAndHideWindow adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _081A0640: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081A0648: .4byte gUnknown_2037290 - thumb_func_end sub_081A05D4 + thumb_func_end Task_ChooseAnswer - thumb_func_start sub_081A064C -sub_081A064C: @ 0x081A064C + thumb_func_start CreateAndShowWindow +CreateAndShowWindow: @ 0x081A064C push {r4, r5, lr} sub sp, #0x20 adds r4, r0, #0 @@ -853832,24 +853832,24 @@ sub_081A064C: @ 0x081A064C str r0, [sp, #0x18] str r1, [sp, #0x1c] add r0, sp, #0x18 - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 add sp, #0x20 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081A064C + thumb_func_end CreateAndShowWindow - thumb_func_start sub_081A06B0 -sub_081A06B0: @ 0x081A06B0 + thumb_func_start RemoveAndHideWindow +RemoveAndHideWindow: @ 0x081A06B0 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -853858,14 +853858,14 @@ sub_081A06B0: @ 0x081A06B0 movs r1, #1 bl sub_08198134 adds r0, r4, #0 - bl sub_08003444 + bl RemoveWindow pop {r4} pop {r0} bx r0 - thumb_func_end sub_081A06B0 + thumb_func_end RemoveAndHideWindow - thumb_func_start sub_081A06CC -sub_081A06CC: @ 0x081A06CC + thumb_func_start CreateChooseAnswerTask +CreateChooseAnswerTask: @ 0x081A06CC push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 @@ -853877,7 +853877,7 @@ sub_081A06CC: @ 0x081A06CC lsrs r6, r2, #0x18 ldr r0, _081A0700 movs r1, #0x50 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r1, _081A0704 @@ -853891,7 +853891,7 @@ sub_081A06CC: @ 0x081A06CC movs r0, #1 b _081A070A .align 2, 0 -_081A0700: .4byte sub_081A05D4 +_081A0700: .4byte Task_ChooseAnswer _081A0704: .4byte gUnknown_3005B60 _081A0708: movs r0, #0 @@ -853908,7 +853908,7 @@ _081A070A: bx r0 .align 2, 0 _081A0720: .4byte gUnknown_3005B60 - thumb_func_end sub_081A06CC + thumb_func_end CreateChooseAnswerTask thumb_func_start sub_081A0724 sub_081A0724: @ 0x081A0724 @@ -853931,8 +853931,8 @@ _081A073C: .4byte gUnknown_85DCB0C _081A0740: .4byte gUnknown_2037280 thumb_func_end sub_081A0738 - thumb_func_start sub_081A0744 -sub_081A0744: @ 0x081A0744 + thumb_func_start Script_ResetPlayerApprentice +Script_ResetPlayerApprentice: @ 0x081A0744 push {r4, r5, r6, r7, lr} bl sub_0819FAA0 ldr r3, _081A0800 @@ -854029,7 +854029,7 @@ _081A07AA: bx r0 .align 2, 0 _081A0800: .4byte gUnknown_3005AF0 - thumb_func_end sub_081A0744 + thumb_func_end Script_ResetPlayerApprentice thumb_func_start sub_081A0804 sub_081A0804: @ 0x081A0804 @@ -854182,38 +854182,38 @@ sub_081A08E8: @ 0x081A08E8 _081A08F8: .4byte gUnknown_2037282 thumb_func_end sub_081A08E8 - thumb_func_start sub_081A08FC -sub_081A08FC: @ 0x081A08FC + thumb_func_start Task_WaitForPrintingMessage +Task_WaitForPrintingMessage: @ 0x081A08FC push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08196E18 + bl RunTextPrintersAndIsPrinter0Active lsls r0, r0, #0x10 cmp r0, #0 bne _081A0930 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _081A0924 ldrh r0, [r0] cmp r0, #0 beq _081A092C ldr r0, _081A0928 - bl sub_081A15D4 + bl ExecuteFuncAfterButtonPress b _081A0930 .align 2, 0 _081A0924: .4byte gUnknown_2037282 -_081A0928: .4byte sub_080988C4 +_081A0928: .4byte EnableBothScriptContexts _081A092C: - bl sub_080988C4 + bl EnableBothScriptContexts _081A0930: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A08FC + thumb_func_end Task_WaitForPrintingMessage - thumb_func_start sub_081A0938 -sub_081A0938: @ 0x081A0938 + thumb_func_start PrintMessage +PrintMessage: @ 0x081A0938 push {lr} ldr r1, _081A0950 ldrh r0, [r1] @@ -854467,26 +854467,26 @@ _081A0B2E: _081A0B34: .4byte gUnknown_85DC51C _081A0B38: .4byte gUnknown_3005AF0 _081A0B3C: - bl sub_080988C4 + bl EnableBothScriptContexts b _081A0B56 _081A0B42: ldr r0, _081A0B5C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 - bl sub_08196EB8 + bl AddTextPrinterForMessage ldr r0, _081A0B60 movs r1, #1 - bl sub_080A8878 + bl CreateTask _081A0B56: pop {r0} bx r0 .align 2, 0 _081A0B5C: .4byte gUnknown_2021C7C -_081A0B60: .4byte sub_081A08FC - thumb_func_end sub_081A0938 +_081A0B60: .4byte Task_WaitForPrintingMessage + thumb_func_end PrintMessage - thumb_func_start sub_081A0B64 -sub_081A0B64: @ 0x081A0B64 + thumb_func_start Script_PrintMessage +Script_PrintMessage: @ 0x081A0B64 push {lr} bl sub_080987DC bl FreezeEventObjects @@ -854495,11 +854495,11 @@ sub_081A0B64: @ 0x081A0B64 movs r0, #0 movs r1, #1 bl sub_08196FB8 - bl sub_081A0938 + bl PrintMessage pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A0B64 + thumb_func_end Script_PrintMessage thumb_func_start sub_081A0B88 sub_081A0B88: @ 0x081A0B88 @@ -854690,7 +854690,7 @@ _081A0CBC: _081A0CDC: mov r4, sb movs r0, #8 - bl sub_08000BDC + bl AllocZeroed adds r7, r0, #0 str r7, [r4] ldr r0, _081A0D54 @@ -854934,7 +854934,7 @@ sub_081A0EBC: @ 0x081A0EBC push {r4, lr} ldr r4, _081A0ED0 ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] pop {r4} @@ -854944,8 +854944,8 @@ sub_081A0EBC: @ 0x081A0EBC _081A0ED0: .4byte gUnknown_3006030 thumb_func_end sub_081A0EBC - thumb_func_start sub_081A0ED4 -sub_081A0ED4: @ 0x081A0ED4 + thumb_func_start AtkCanceller_UnableToUseMove +AtkCanceller_UnableToUseMove: @ 0x081A0ED4 push {r4, r5, r6, r7, lr} sub sp, #0x10 ldr r0, _081A0EEC @@ -855145,7 +855145,7 @@ _081A106C: movs r1, #0x82 lsls r1, r1, #1 adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString ldr r1, _081A1088 _081A107C: adds r0, r5, #0 @@ -855214,7 +855214,7 @@ _081A10F2: .align 2, 0 _081A10FC: .4byte gUnknown_85DC21C _081A1100: .4byte gUnknown_82EA31C - thumb_func_end sub_081A0ED4 + thumb_func_end AtkCanceller_UnableToUseMove thumb_func_start sub_081A1104 sub_081A1104: @ 0x081A1104 @@ -855709,8 +855709,8 @@ _081A14A8: .4byte gUnknown_85BBE70 _081A14AC: .4byte 0x00004010 thumb_func_end sub_081A1418 - thumb_func_start sub_081A14B0 -sub_081A14B0: @ 0x081A14B0 + thumb_func_start Script_SetPlayerApprenticeTrainerGfxId +Script_SetPlayerApprenticeTrainerGfxId: @ 0x081A14B0 push {lr} ldr r2, _081A14F4 ldr r0, _081A14F8 @@ -855783,7 +855783,7 @@ _081A1534: _081A1538: .4byte gUnknown_85BBE3E _081A153C: .4byte gUnknown_85BBE70 _081A1540: .4byte 0x00004010 - thumb_func_end sub_081A14B0 + thumb_func_end Script_SetPlayerApprenticeTrainerGfxId thumb_func_start sub_081A1544 sub_081A1544: @ 0x081A1544 @@ -855830,8 +855830,8 @@ _081A157C: _081A1580: .4byte gUnknown_3002360 thumb_func_end sub_081A155C - thumb_func_start sub_081A1584 -sub_081A1584: @ 0x081A1584 + thumb_func_start Task_ExecuteFuncAfterButtonPress +Task_ExecuteFuncAfterButtonPress: @ 0x081A1584 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -855860,7 +855860,7 @@ _081A159E: str r1, [r2] bl _call_via_r1 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081A15C0: pop {r4} pop {r0} @@ -855869,15 +855869,15 @@ _081A15C0: _081A15C8: .4byte gUnknown_3002360 _081A15CC: .4byte gUnknown_3006034 _081A15D0: .4byte gUnknown_3005B60 - thumb_func_end sub_081A1584 + thumb_func_end Task_ExecuteFuncAfterButtonPress - thumb_func_start sub_081A15D4 -sub_081A15D4: @ 0x081A15D4 + thumb_func_start ExecuteFuncAfterButtonPress +ExecuteFuncAfterButtonPress: @ 0x081A15D4 push {r4, lr} adds r4, r0, #0 ldr r0, _081A15FC movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081A1600 @@ -855892,9 +855892,9 @@ sub_081A15D4: @ 0x081A15D4 pop {r0} bx r0 .align 2, 0 -_081A15FC: .4byte sub_081A1584 +_081A15FC: .4byte Task_ExecuteFuncAfterButtonPress _081A1600: .4byte gUnknown_3005B60 - thumb_func_end sub_081A15D4 + thumb_func_end ExecuteFuncAfterButtonPress thumb_func_start sub_081A1604 sub_081A1604: @ 0x081A1604 @@ -855903,7 +855903,7 @@ sub_081A1604: @ 0x081A1604 ldr r4, _081A1624 adds r0, r4, #0 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -856013,7 +856013,7 @@ sub_081A16D8: @ 0x081A16D8 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r6, #0 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #2 @@ -856159,7 +856159,7 @@ sub_081A1810: @ 0x081A1810 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 @@ -856346,7 +856346,7 @@ _081A1992: cmp r3, r0 blt _081A1992 _081A19A8: - bl sub_080F9D78 + bl ReducePlayerPartyToSelectedMons pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -856357,14 +856357,14 @@ _081A19BC: .4byte gUnknown_3005AF0 _081A19C0: .4byte 0x00000CAA thumb_func_end sub_081A197C - thumb_func_start sub_081A19C4 -sub_081A19C4: @ 0x081A19C4 + thumb_func_start DoSoftReset_ +DoSoftReset_: @ 0x081A19C4 push {lr} - bl sub_080008F4 + bl DoSoftReset pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A19C4 + thumb_func_end DoSoftReset_ thumb_func_start sub_081A19D0 sub_081A19D0: @ 0x081A19D0 @@ -856426,8 +856426,8 @@ _081A1A38: .4byte gUnknown_3005AEC _081A1A3C: .4byte gUnknown_2024190 thumb_func_end sub_081A19E0 - thumb_func_start sub_081A1A40 -sub_081A1A40: @ 0x081A1A40 + thumb_func_start ShowFacilityResultsWindow +ShowFacilityResultsWindow: @ 0x081A1A40 push {lr} ldr r0, _081A1A64 ldrh r1, [r0] @@ -856476,7 +856476,7 @@ _081A1AA8: b _081A1AC6 _081A1AAE: ldrb r0, [r2] - bl sub_081A2A78 + bl ScriptCmd_end b _081A1AC6 _081A1AB6: bl sub_081A2758 @@ -856490,7 +856490,7 @@ _081A1AC6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A1A40 + thumb_func_end ShowFacilityResultsWindow thumb_func_start sub_081A1ACC sub_081A1ACC: @ 0x081A1ACC @@ -856516,8 +856516,8 @@ _081A1AEE: .align 2, 0 thumb_func_end sub_081A1ACC - thumb_func_start sub_081A1AF4 -sub_081A1AF4: @ 0x081A1AF4 + thumb_func_start PrintLinkBattleRecord +PrintLinkBattleRecord: @ 0x081A1AF4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -856560,7 +856560,7 @@ _081A1B38: ldr r4, _081A1B84 ldr r1, _081A1B88 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] mov r3, r8 @@ -856586,7 +856586,7 @@ _081A1B7C: .4byte 0x0000270F _081A1B80: .4byte gUnknown_2021C40 _081A1B84: .4byte gUnknown_2021C7C _081A1B88: .4byte gUnknown_85DD41D - thumb_func_end sub_081A1AF4 + thumb_func_end PrintLinkBattleRecord thumb_func_start sub_081A1B8C sub_081A1B8C: @ 0x081A1B8C @@ -856608,7 +856608,7 @@ sub_081A1B8C: @ 0x081A1B8C adds r4, r4, r1 ldrh r1, [r4] ldr r0, _081A1BC0 - bl sub_081A1AF4 + bl PrintLinkBattleRecord pop {r4} pop {r0} bx r0 @@ -856718,7 +856718,7 @@ _081A1C62: adds r1, r6, #0 adds r2, r7, #0 mov r3, r8 - bl sub_081A1AF4 + bl PrintLinkBattleRecord b _081A1C8C .align 2, 0 _081A1C7C: .4byte gUnknown_85DD425 @@ -856727,7 +856727,7 @@ _081A1C80: adds r1, r6, #0 adds r2, r7, #0 mov r3, r8 - bl sub_081A1AF4 + bl PrintLinkBattleRecord _081A1C8C: pop {r3} mov r8, r3 @@ -856746,19 +856746,19 @@ sub_081A1C9C: @ 0x081A1C9C lsrs r6, r0, #0x18 ldr r4, _081A1CCC ldr r0, _081A1CD0 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r6, #0 bne _081A1CDC ldr r0, _081A1CD4 ldr r1, _081A1CD8 - bl sub_08008BCC + bl StringExpandPlaceholders b _081A1D14 .align 2, 0 _081A1CCC: .4byte gUnknown_203A840 @@ -856770,7 +856770,7 @@ _081A1CDC: bne _081A1CF4 ldr r0, _081A1CEC ldr r1, _081A1CF0 - bl sub_08008BCC + bl StringExpandPlaceholders b _081A1D14 .align 2, 0 _081A1CEC: .4byte gUnknown_2021C7C @@ -856780,7 +856780,7 @@ _081A1CF4: bne _081A1D0C ldr r0, _081A1D04 ldr r1, _081A1D08 - bl sub_08008BCC + bl StringExpandPlaceholders b _081A1D14 .align 2, 0 _081A1D04: .4byte gUnknown_2021C7C @@ -856788,7 +856788,7 @@ _081A1D08: .4byte gUnknown_85DD31A _081A1D0C: ldr r0, _081A1DC4 ldr r1, _081A1DC8 - bl sub_08008BCC + bl StringExpandPlaceholders _081A1D14: ldr r5, _081A1DCC ldrb r0, [r5] @@ -856861,10 +856861,10 @@ _081A1D56: movs r3, #0xe bl sub_081A1B8C ldrb r0, [r7] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r7] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -856948,7 +856948,7 @@ sub_081A1E0C: @ 0x081A1E0C ldr r6, _081A1E9C adds r0, r6, #0 adds r1, r7, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] adds r5, #5 @@ -857064,19 +857064,19 @@ sub_081A1F30: @ 0x081A1F30 lsrs r6, r0, #0x18 ldr r4, _081A1F68 ldr r0, _081A1F6C - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r6, #0 bne _081A1F78 ldr r0, _081A1F70 ldr r1, _081A1F74 - bl sub_08008BCC + bl StringExpandPlaceholders b _081A1F80 .align 2, 0 _081A1F68: .4byte gUnknown_203A840 @@ -857086,7 +857086,7 @@ _081A1F74: .4byte gUnknown_85DD34A _081A1F78: ldr r0, _081A2094 ldr r1, _081A2098 - bl sub_08008BCC + bl StringExpandPlaceholders _081A1F80: ldr r5, _081A209C ldrb r0, [r5] @@ -857201,11 +857201,11 @@ _081A1FC4: bl sub_081A1E0C mov r1, sl ldrb r0, [r1] - bl sub_0800365C + bl PutWindowTilemap mov r1, sl ldrb r0, [r1] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -857276,7 +857276,7 @@ _081A2114: ldr r4, _081A2160 ldr r1, _081A2164 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] mov r3, r8 @@ -857438,19 +857438,19 @@ sub_081A2250: @ 0x081A2250 lsrs r7, r0, #0x18 ldr r4, _081A2280 ldr r0, _081A2284 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r7, #0 bne _081A2290 ldr r0, _081A2288 ldr r1, _081A228C - bl sub_08008BCC + bl StringExpandPlaceholders b _081A2298 .align 2, 0 _081A2280: .4byte gUnknown_203A840 @@ -857460,7 +857460,7 @@ _081A228C: .4byte gUnknown_85DD37B _081A2290: ldr r0, _081A2348 ldr r1, _081A234C - bl sub_08008BCC + bl StringExpandPlaceholders _081A2298: ldr r5, _081A2350 ldrb r0, [r5] @@ -857532,10 +857532,10 @@ _081A22DA: movs r3, #0xe bl sub_081A2168 ldrb r0, [r6] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -857616,7 +857616,7 @@ sub_081A238C: @ 0x081A238C ldr r6, _081A241C adds r0, r6, #0 adds r1, r7, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] adds r5, #5 @@ -857709,18 +857709,18 @@ sub_081A2490: @ 0x081A2490 sub sp, #0xc ldr r5, _081A25BC ldr r0, _081A25C0 - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 bl sub_08196FF0 ldrb r0, [r5] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r6, _081A25C4 ldr r1, _081A25C8 adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r5] movs r1, #2 str r1, [sp] @@ -857825,10 +857825,10 @@ _081A24FE: movs r3, #0xb bl sub_081A238C ldrb r0, [r7] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r7] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4} mov r8, r3 @@ -857899,7 +857899,7 @@ _081A2640: ldr r4, _081A2690 ldr r1, _081A2694 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] mov r1, r8 @@ -858036,14 +858036,14 @@ sub_081A2758: @ 0x081A2758 sub sp, #0xc ldr r4, _081A2828 ldr r0, _081A282C - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r4, #0 movs r5, #0 _081A277A: @@ -858068,7 +858068,7 @@ _081A277A: ldr r5, _081A2834 ldr r1, _081A2838 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r6] movs r1, #0x10 str r1, [sp] @@ -858114,10 +858114,10 @@ _081A277A: movs r2, #0xe bl sub_081A2698 ldrb r0, [r6] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -858182,7 +858182,7 @@ _081A2892: ldr r4, _081A2918 ldr r1, _081A291C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] lsls r3, r5, #0x1b @@ -858204,7 +858204,7 @@ _081A2892: bl sub_080089D8 ldr r1, _081A2920 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] lsls r3, r5, #0x1b @@ -858416,27 +858416,27 @@ _081A2A64: _081A2A74: .4byte gUnknown_85DD42F thumb_func_end sub_081A29D4 - thumb_func_start sub_081A2A78 -sub_081A2A78: @ 0x081A2A78 + thumb_func_start ScriptCmd_end +ScriptCmd_end: @ 0x081A2A78 push {r4, r5, r6, r7, lr} sub sp, #0xc lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r4, _081A2AA8 ldr r0, _081A2AAC - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r7, #0 bne _081A2AB8 ldr r0, _081A2AB0 ldr r1, _081A2AB4 - bl sub_08008BCC + bl StringExpandPlaceholders b _081A2AC0 .align 2, 0 _081A2AA8: .4byte gUnknown_203A840 @@ -858446,7 +858446,7 @@ _081A2AB4: .4byte gUnknown_85DD3CC _081A2AB8: ldr r0, _081A2B80 ldr r1, _081A2B84 - bl sub_08008BCC + bl StringExpandPlaceholders _081A2AC0: ldr r5, _081A2B88 ldrb r0, [r5] @@ -858526,10 +858526,10 @@ _081A2B14: movs r3, #0x10 bl sub_081A2924 ldrb r0, [r6] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -858542,7 +858542,7 @@ _081A2B8C: .4byte gUnknown_85DD40E _081A2B90: .4byte gUnknown_85DD438 _081A2B94: .4byte gUnknown_85DD415 _081A2B98: .4byte gUnknown_85DD2E8 - thumb_func_end sub_081A2A78 + thumb_func_end ScriptCmd_end thumb_func_start sub_081A2B9C sub_081A2B9C: @ 0x081A2B9C @@ -858588,7 +858588,7 @@ _081A2BE0: ldr r4, _081A2C30 ldr r1, _081A2C34 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] mov r1, r8 @@ -858727,18 +858727,18 @@ sub_081A2CFC: @ 0x081A2CFC sub sp, #0xc ldr r5, _081A2DC8 ldr r0, _081A2DCC - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 bl sub_08196FF0 ldrb r0, [r5] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r6, _081A2DD0 ldr r1, _081A2DD4 adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r5] movs r1, #0x12 str r1, [sp] @@ -858804,10 +858804,10 @@ _081A2D64: movs r2, #0xe bl sub_081A2C38 ldrb r0, [r6] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r6] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -858832,18 +858832,18 @@ sub_081A2DE4: @ 0x081A2DE4 sub sp, #0xc ldr r5, _081A2F54 ldr r0, _081A2F58 - bl sub_08003250 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, #0 bl sub_08196FF0 ldrb r0, [r5] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081A2F5C mov r8, r0 ldr r1, _081A2F60 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r5] movs r4, #0 str r4, [sp] @@ -858979,10 +858979,10 @@ _081A2EF2: cmp r1, #4 ble _081A2EDA ldrb r0, [r7] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r7] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -859133,7 +859133,7 @@ _081A304A: adds r2, r3, r2 ldr r1, [r1] adds r1, r1, r2 - bl sub_08083C54 + bl SetTrainerId _081A309A: ldr r4, _081A30D0 ldr r0, [r4] @@ -859525,7 +859525,7 @@ sub_081A33A0: @ 0x081A33A0 adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_081A375C + bl GetCurrentFacilityWinStreak lsls r0, r0, #0x10 ldr r1, _081A33E8 mov sb, r1 @@ -859546,7 +859546,7 @@ _081A33E8: .4byte gUnknown_85DCB7C _081A33EC: lsls r0, r6, #0x18 lsrs r0, r0, #0x18 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #0 @@ -859608,8 +859608,8 @@ _081A3452: .align 2, 0 thumb_func_end sub_081A33A0 - thumb_func_start sub_081A3460 -sub_081A3460: @ 0x081A3460 + thumb_func_start CopyFrontierTrainerText +CopyFrontierTrainerText: @ 0x081A3460 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -859655,7 +859655,7 @@ _081A349C: ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString b _081A368E .align 2, 0 _081A34BC: .4byte 0x000003FE @@ -859681,7 +859681,7 @@ _081A34E8: adds r0, #0x70 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0819F888 + bl CopyFriendsApprenticeChallengeText b _081A368E _081A34F6: movs r0, #0xfa @@ -859701,7 +859701,7 @@ _081A3510: bne _081A3524 _081A3516: movs r0, #0 - bl sub_081A4D98 + bl CopyFrontierBrainText b _081A368E .align 2, 0 _081A3520: .4byte 0x000003FE @@ -859716,7 +859716,7 @@ _081A3524: ldr r0, [r2] adds r0, r0, r1 adds r0, #0x18 - bl sub_081637CC + bl FrontierSpeechToString b _081A368E .align 2, 0 _081A3540: .4byte 0x0000012B @@ -859781,7 +859781,7 @@ _081A35C0: cmp r3, r0 bne _081A35D4 movs r0, #1 - bl sub_081A4D98 + bl CopyFrontierBrainText b _081A368E .align 2, 0 _081A35D0: .4byte 0x000003FE @@ -859796,7 +859796,7 @@ _081A35D4: ldr r0, [r2] adds r0, r0, r1 adds r0, #0x24 - bl sub_081637CC + bl FrontierSpeechToString b _081A368E .align 2, 0 _081A35F0: .4byte 0x0000012B @@ -859814,7 +859814,7 @@ _081A35F8: beq _081A3620 _081A360C: bl sub_0818620C - bl sub_081637CC + bl FrontierSpeechToString b _081A368E .align 2, 0 _081A3618: .4byte 0x0000018F @@ -859847,7 +859847,7 @@ _081A3638: ldr r1, _081A3664 _081A3656: adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString b _081A368E .align 2, 0 _081A3660: .4byte gUnknown_2022C90 @@ -859870,7 +859870,7 @@ _081A3668: lsls r0, r0, #4 ldr r1, _081A369C adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString _081A368E: pop {r0} bx r0 @@ -859878,7 +859878,7 @@ _081A368E: _081A3694: .4byte gUnknown_3005AF0 _081A3698: .4byte 0xFFFFFE70 _081A369C: .4byte gUnknown_85DC23E - thumb_func_end sub_081A3460 + thumb_func_end CopyFrontierTrainerText thumb_func_start sub_081A36A0 sub_081A36A0: @ 0x081A36A0 @@ -859978,8 +859978,8 @@ _081A3754: .4byte 0x00000E1A _081A3758: .4byte 0x00000CA8 thumb_func_end sub_081A36A0 - thumb_func_start sub_081A375C -sub_081A375C: @ 0x081A375C + thumb_func_start GetCurrentFacilityWinStreak +GetCurrentFacilityWinStreak: @ 0x081A375C push {r4, r5, lr} ldr r0, _081A3790 ldr r0, [r0] @@ -860098,7 +860098,7 @@ _081A385E: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081A375C + thumb_func_end GetCurrentFacilityWinStreak thumb_func_start sub_081A3864 sub_081A3864: @ 0x081A3864 @@ -860154,8 +860154,8 @@ _081A38BC: _081A38C4: .4byte gUnknown_2037290 thumb_func_end sub_081A3898 - thumb_func_start sub_081A38C8 -sub_081A38C8: @ 0x081A38C8 + thumb_func_start GetPlayerSymbolCountForFacility +GetPlayerSymbolCountForFacility: @ 0x081A38C8 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -860178,7 +860178,7 @@ sub_081A38C8: @ 0x081A38C8 .align 2, 0 _081A38F4: .4byte 0x000008C4 _081A38F8: .4byte 0x000008C5 - thumb_func_end sub_081A38C8 + thumb_func_end GetPlayerSymbolCountForFacility thumb_func_start sub_081A38FC sub_081A38FC: @ 0x081A38FC @@ -860403,7 +860403,7 @@ sub_081A3AC8: @ 0x081A3AC8 ldr r4, _081A3AEC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -860424,7 +860424,7 @@ sub_081A3AF0: @ 0x081A3AF0 lsrs r4, r0, #0x10 lsls r0, r4, #0x18 lsrs r0, r0, #0x18 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 cmp r0, #0 bne _081A3B20 @@ -860491,7 +860491,7 @@ sub_081A3B68: @ 0x081A3B68 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #1 - bl sub_080BFBBC + bl GetSetPokedexFlag lsls r0, r0, #0x18 cmp r0, #0 beq _081A3BFC @@ -860743,22 +860743,22 @@ _081A3D4A: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r0, _081A3DB4 @@ -860906,7 +860906,7 @@ _081A3EAC: .4byte 0x00000CA9 thumb_func_start sub_081A3EB0 sub_081A3EB0: @ 0x081A3EB0 push {lr} - bl sub_08165130 + bl ValidateEReaderTrainer pop {r0} bx r0 .align 2, 0 @@ -861114,7 +861114,7 @@ _081A403E: adds r0, r0, r1 movs r1, #0xc movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 @@ -861123,7 +861123,7 @@ _081A403E: adds r0, r0, r1 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData _081A407A: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -861145,7 +861145,7 @@ _081A4098: .4byte gUnknown_2024190 sub_081A409C: @ 0x081A409C push {r4, lr} ldr r4, _081A40BC - bl sub_08185198 + bl MoveRecordedBattleToSaveData strh r0, [r4] ldr r0, _081A40C0 ldr r1, [r0] @@ -861258,12 +861258,12 @@ _081A4152: adds r1, r5, #0 adds r1, #0xd movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r0, r7, #0 mov r1, r8 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 beq _081A4194 adds r0, r5, #1 @@ -861277,7 +861277,7 @@ _081A4194: adds r0, r7, #0 movs r1, #0xa6 adds r2, r6, #0 - bl sub_08068D34 + bl SetMonMoveSlot _081A41A2: mov r4, sl lsls r0, r4, #0x18 @@ -861335,15 +861335,15 @@ sub_081A4208: @ 0x081A4208 bl VarGet lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081A4C20 + bl SetFrontierBrainEventObjGfx pop {r0} bx r0 .align 2, 0 _081A421C: .4byte 0x000040CF thumb_func_end sub_081A4208 - thumb_func_start sub_081A4220 -sub_081A4220: @ 0x081A4220 + thumb_func_start Print1PRecord +Print1PRecord: @ 0x081A4220 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -861412,7 +861412,7 @@ _081A4294: adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sl ldrb r0, [r1] mov r3, sb @@ -861442,7 +861442,7 @@ _081A42E4: .4byte 0x0000270F _081A42E8: .4byte gUnknown_2021C54 _081A42EC: .4byte gUnknown_2021C7C _081A42F0: .4byte gUnknown_85DD53C - thumb_func_end sub_081A4220 + thumb_func_end Print1PRecord thumb_func_start sub_081A42F4 sub_081A42F4: @ 0x081A42F4 @@ -861537,7 +861537,7 @@ _081A439E: ldr r0, _081A43F4 ldr r1, [r0, #0x24] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders mov r1, sb ldrb r0, [r1] mov r3, r8 @@ -861582,9 +861582,9 @@ sub_081A43F8: @ 0x081A43F8 str r2, [sp, #0x40] movs r0, #0xac lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed mov r8, r0 - bl sub_080E7A48 + bl GetPlayerHallRecords add r0, sp, #0x30 mov ip, r0 ldr r0, _081A44C8 @@ -861667,7 +861667,7 @@ _081A4492: cmp r2, #2 ble _081A446A mov r0, r8 - bl sub_08000BF0 + bl Free add sp, #0x44 pop {r3, r4, r5} mov r8, r3 @@ -861680,8 +861680,8 @@ _081A4492: _081A44C8: .4byte gUnknown_3005AF0 thumb_func_end sub_081A43F8 - thumb_func_start sub_081A44CC -sub_081A44CC: @ 0x081A44CC + thumb_func_start Fill2PRecords +Fill2PRecords: @ 0x081A44CC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -861692,9 +861692,9 @@ sub_081A44CC: @ 0x081A44CC mov sl, r1 movs r0, #0xac lsls r0, r0, #1 - bl sub_08000BDC + bl AllocZeroed mov r8, r0 - bl sub_080E7A48 + bl GetPlayerHallRecords mov r0, sp adds r0, #0x54 str r0, [sp, #0x70] @@ -861785,7 +861785,7 @@ _081A456A: cmp r4, #2 ble _081A4542 mov r0, r8 - bl sub_08000BF0 + bl Free add sp, #0x74 pop {r3, r4, r5} mov r8, r3 @@ -861797,7 +861797,7 @@ _081A456A: .align 2, 0 _081A45A8: .4byte gUnknown_3005AF0 _081A45AC: .4byte 0x0000057C - thumb_func_end sub_081A44CC + thumb_func_end Fill2PRecords thumb_func_start sub_081A45B0 sub_081A45B0: @ 0x081A45B0 @@ -861819,7 +861819,7 @@ sub_081A45B0: @ 0x081A45B0 adds r4, #4 adds r5, r5, r4 ldr r1, [r5] - bl sub_08008BCC + bl StringExpandPlaceholders ldr r5, _081A4658 ldrb r0, [r5] movs r6, #2 @@ -861861,7 +861861,7 @@ sub_081A45B0: @ 0x081A45B0 add r4, sp, #0x3c adds r0, r4, #0 mov r1, sb - bl sub_081A44CC + bl Fill2PRecords movs r5, #0 _081A4636: adds r0, r5, #0 @@ -861895,7 +861895,7 @@ _081A4676: movs r1, #1 movs r2, #4 adds r3, r4, #0 - bl sub_081A4220 + bl Print1PRecord adds r4, #0x10 adds r5, #1 cmp r5, #2 @@ -861911,28 +861911,28 @@ _081A468C: .align 2, 0 thumb_func_end sub_081A45B0 - thumb_func_start sub_081A469C -sub_081A469C: @ 0x081A469C + thumb_func_start ShowRankingHallRecordsWindow +ShowRankingHallRecordsWindow: @ 0x081A469C push {r4, lr} ldr r4, _081A46D8 ldr r0, _081A46DC - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 bl sub_08196FF0 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081A46E0 ldrh r0, [r0] movs r1, #0 bl sub_081A45B0 ldrb r0, [r4] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -861940,32 +861940,32 @@ sub_081A469C: @ 0x081A469C _081A46D8: .4byte gUnknown_203A840 _081A46DC: .4byte gUnknown_85DD2E0 _081A46E0: .4byte gUnknown_2037282 - thumb_func_end sub_081A469C + thumb_func_end ShowRankingHallRecordsWindow - thumb_func_start sub_081A46E4 -sub_081A46E4: @ 0x081A46E4 + thumb_func_start ScrollRankingHallRecordsWindow +ScrollRankingHallRecordsWindow: @ 0x081A46E4 push {r4, lr} ldr r4, _081A4708 ldrb r0, [r4] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081A470C ldrh r0, [r0] movs r1, #1 bl sub_081A45B0 ldrb r0, [r4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 .align 2, 0 _081A4708: .4byte gUnknown_203A840 _081A470C: .4byte gUnknown_2037282 - thumb_func_end sub_081A46E4 + thumb_func_end ScrollRankingHallRecordsWindow - thumb_func_start sub_081A4710 -sub_081A4710: @ 0x081A4710 + thumb_func_start ClearRankingHallRecords +ClearRankingHallRecords: @ 0x081A4710 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -862105,7 +862105,7 @@ _081A481C: .4byte 0x0000057C _081A4820: .4byte 0x00000586 _081A4824: .4byte 0x0000058E _081A4828: .4byte 0x00000584 - thumb_func_end sub_081A4710 + thumb_func_end ClearRankingHallRecords thumb_func_start sub_081A482C sub_081A482C: @ 0x081A482C @@ -862114,7 +862114,7 @@ sub_081A482C: @ 0x081A482C push {r7} movs r0, #0x96 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed adds r7, r0, #0 adds r4, r7, #0 movs r5, #0 @@ -862135,10 +862135,10 @@ _081A484A: ble _081A484A ldr r4, _081A48A8 ldrb r5, [r4] - bl sub_080767DC - bl sub_08076764 + bl LoadPlayerParty + bl SetContinueGameWarpStatusToDynamicWarp movs r0, #1 - bl sub_08153274 + bl TrySavingData bl sub_08076780 strb r5, [r4] adds r4, r7, #0 @@ -862156,7 +862156,7 @@ _081A4880: cmp r4, r6 ble _081A4880 adds r0, r7, #0 - bl sub_08000BF0 + bl Free pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -862243,8 +862243,8 @@ _081A493C: .4byte gUnknown_82E383C _081A4940: .4byte gUnknown_85DD56A thumb_func_end sub_081A48F8 - thumb_func_start sub_081A4944 -sub_081A4944: @ 0x081A4944 + thumb_func_start CopyFrontierBrainTrainerName +CopyFrontierBrainTrainerName: @ 0x081A4944 push {r4, lr} adds r4, r0, #0 ldr r0, _081A4960 @@ -862293,10 +862293,10 @@ _081A4980: _081A499C: .4byte 0x000040CF _081A49A0: .4byte gUnknown_82E383C _081A49A4: .4byte gUnknown_85DD56A - thumb_func_end sub_081A4944 + thumb_func_end CopyFrontierBrainTrainerName - thumb_func_start sub_081A49A8 -sub_081A49A8: @ 0x081A49A8 + thumb_func_start IsFrontierBrainFemale +IsFrontierBrainFemale: @ 0x081A49A8 push {lr} ldr r0, _081A49C0 bl VarGet @@ -862311,10 +862311,10 @@ sub_081A49A8: @ 0x081A49A8 .align 2, 0 _081A49C0: .4byte 0x000040CF _081A49C4: .4byte gUnknown_85DD47F - thumb_func_end sub_081A49A8 + thumb_func_end IsFrontierBrainFemale - thumb_func_start sub_081A49C8 -sub_081A49C8: @ 0x081A49C8 + thumb_func_start SetFrontierBrainEventObjGfx_2 +SetFrontierBrainEventObjGfx_2: @ 0x081A49C8 push {lr} ldr r0, _081A49E8 bl VarGet @@ -862332,10 +862332,10 @@ sub_081A49C8: @ 0x081A49C8 _081A49E8: .4byte 0x000040CF _081A49EC: .4byte 0x00004010 _081A49F0: .4byte gUnknown_85DD47F - thumb_func_end sub_081A49C8 + thumb_func_end SetFrontierBrainEventObjGfx_2 - thumb_func_start sub_081A49F4 -sub_081A49F4: @ 0x081A49F4 + thumb_func_start CreateFrontierBrainPokemon +CreateFrontierBrainPokemon: @ 0x081A49F4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -862347,7 +862347,7 @@ sub_081A49F4: @ 0x081A49F4 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #0x20] - bl sub_081A4D2C + bl GetFronterBrainSymbol str r0, [sp, #0x24] ldr r0, [sp, #0x20] cmp r0, #1 @@ -862356,7 +862356,7 @@ sub_081A49F4: @ 0x081A49F4 bl sub_08194FA0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0818F8D4 + bl GetDomeTrainerMonCountInBits adds r4, r0, #0 b _081A4A36 .align 2, 0 @@ -862368,7 +862368,7 @@ _081A4A36: bl ZeroEnemyPartyMons movs r1, #0 str r1, [sp, #0x18] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x1c] @@ -862433,7 +862433,7 @@ _081A4A86: ldr r2, _081A4BD4 adds r4, r4, r2 adds r0, r7, #0 - bl sub_0806CB4C + bl GetNatureFromPersonality ldrb r1, [r4, #5] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -862465,7 +862465,7 @@ _081A4A86: ldr r0, _081A4BD0 str r0, [sp, #0xc] mov r0, sl - bl sub_08067730 + bl CreateMon ldr r0, _081A4BD4 adds r5, r5, r0 adds r5, r6, r5 @@ -862474,7 +862474,7 @@ _081A4A86: mov r0, sl movs r1, #0xc adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData movs r7, #0 mov r6, r8 ldr r3, _081A4BD8 @@ -862489,7 +862489,7 @@ _081A4B22: adds r2, r2, r0 adds r0, r6, r3 str r3, [sp, #0x40] - bl sub_0806A774 + bl SetMonData adds r7, #1 ldr r3, [sp, #0x40] cmp r7, #5 @@ -862524,7 +862524,7 @@ _081A4B5A: adds r0, r6, r3 adds r1, r4, #0 str r3, [sp, #0x40] - bl sub_08068D34 + bl SetMonMoveSlot ldr r3, [sp, #0x40] cmp r4, #0xda bne _081A4B8C @@ -862545,9 +862545,9 @@ _081A4B8C: adds r0, r4, #0 movs r1, #0x20 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats ldr r2, [sp, #0x2c] str r2, [sp, #0x18] _081A4BB4: @@ -862571,10 +862571,10 @@ _081A4BD0: .4byte 0x0000EF2A _081A4BD4: .4byte gUnknown_85DCB98 _081A4BD8: .4byte gUnknown_20243E8 _081A4BDC: .4byte gUnknown_85DCBA4 - thumb_func_end sub_081A49F4 + thumb_func_end CreateFrontierBrainPokemon - thumb_func_start sub_081A4BE0 -sub_081A4BE0: @ 0x081A4BE0 + thumb_func_start GetFrontierBrainMonSpecies +GetFrontierBrainMonSpecies: @ 0x081A4BE0 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -862584,7 +862584,7 @@ sub_081A4BE0: @ 0x081A4BE0 adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_081A4D2C + bl GetFronterBrainSymbol ldr r3, _081A4C1C lsls r2, r4, #2 adds r2, r2, r4 @@ -862604,10 +862604,10 @@ sub_081A4BE0: @ 0x081A4BE0 .align 2, 0 _081A4C18: .4byte 0x000040CF _081A4C1C: .4byte gUnknown_85DCB98 - thumb_func_end sub_081A4BE0 + thumb_func_end GetFrontierBrainMonSpecies - thumb_func_start sub_081A4C20 -sub_081A4C20: @ 0x081A4C20 + thumb_func_start SetFrontierBrainEventObjGfx +SetFrontierBrainEventObjGfx: @ 0x081A4C20 push {lr} lsls r0, r0, #0x18 ldr r2, _081A4C40 @@ -862628,10 +862628,10 @@ _081A4C40: .4byte gUnknown_203886A _081A4C44: .4byte 0x000003FE _081A4C48: .4byte 0x00004010 _081A4C4C: .4byte gUnknown_85DD47F - thumb_func_end sub_081A4C20 + thumb_func_end SetFrontierBrainEventObjGfx - thumb_func_start sub_081A4C50 -sub_081A4C50: @ 0x081A4C50 + thumb_func_start GetFrontierBrainMonMove +GetFrontierBrainMonMove: @ 0x081A4C50 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -862644,7 +862644,7 @@ sub_081A4C50: @ 0x081A4C50 adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_081A4D2C + bl GetFronterBrainSymbol ldr r2, _081A4C9C lsls r4, r4, #1 lsls r1, r6, #2 @@ -862668,10 +862668,10 @@ sub_081A4C50: @ 0x081A4C50 .align 2, 0 _081A4C98: .4byte 0x000040CF _081A4C9C: .4byte gUnknown_85DCB98 - thumb_func_end sub_081A4C50 + thumb_func_end GetFrontierBrainMonMove - thumb_func_start sub_081A4CA0 -sub_081A4CA0: @ 0x081A4CA0 + thumb_func_start GetFrontierBrainMonNature +GetFrontierBrainMonNature: @ 0x081A4CA0 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -862681,7 +862681,7 @@ sub_081A4CA0: @ 0x081A4CA0 adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_081A4D2C + bl GetFronterBrainSymbol ldr r3, _081A4CDC lsls r2, r4, #2 adds r2, r2, r4 @@ -862701,10 +862701,10 @@ sub_081A4CA0: @ 0x081A4CA0 .align 2, 0 _081A4CD8: .4byte 0x000040CF _081A4CDC: .4byte gUnknown_85DCB98 - thumb_func_end sub_081A4CA0 + thumb_func_end GetFrontierBrainMonNature - thumb_func_start sub_081A4CE0 -sub_081A4CE0: @ 0x081A4CE0 + thumb_func_start GetFrontierBrainMonEvs +GetFrontierBrainMonEvs: @ 0x081A4CE0 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 @@ -862717,7 +862717,7 @@ sub_081A4CE0: @ 0x081A4CE0 adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 - bl sub_081A4D2C + bl GetFronterBrainSymbol ldr r2, _081A4D28 lsls r1, r6, #2 adds r1, r1, r6 @@ -862740,10 +862740,10 @@ sub_081A4CE0: @ 0x081A4CE0 .align 2, 0 _081A4D24: .4byte 0x000040CF _081A4D28: .4byte gUnknown_85DCB98 - thumb_func_end sub_081A4CE0 + thumb_func_end GetFrontierBrainMonEvs - thumb_func_start sub_081A4D2C -sub_081A4D2C: @ 0x081A4D2C + thumb_func_start GetFronterBrainSymbol +GetFronterBrainSymbol: @ 0x081A4D2C push {r4, r5, lr} ldr r0, _081A4D68 bl VarGet @@ -862751,12 +862751,12 @@ sub_081A4D2C: @ 0x081A4D2C lsrs r5, r0, #0x10 lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 bne _081A4D90 - bl sub_081A375C + bl GetCurrentFacilityWinStreak lsls r0, r0, #0x10 ldr r3, _081A4D6C lsls r2, r5, #2 @@ -862796,10 +862796,10 @@ _081A4D90: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081A4D2C + thumb_func_end GetFronterBrainSymbol - thumb_func_start sub_081A4D98 -sub_081A4D98: @ 0x081A4D98 + thumb_func_start CopyFrontierBrainText +CopyFrontierBrainText: @ 0x081A4D98 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -862824,7 +862824,7 @@ _081A4DC4: bl VarGet lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - bl sub_081A4D2C + bl GetFronterBrainSymbol adds r1, r0, #0 _081A4DD4: cmp r5, #0 @@ -862865,7 +862865,7 @@ _081A4E18: .align 2, 0 _081A4E20: .4byte gUnknown_2021C7C _081A4E24: .4byte gUnknown_85DD5F0 - thumb_func_end sub_081A4D98 + thumb_func_end CopyFrontierBrainText thumb_func_start sub_081A4E28 sub_081A4E28: @ 0x081A4E28 @@ -862888,8 +862888,8 @@ _081A4E40: .4byte gUnknown_85DD7BC _081A4E44: .4byte gUnknown_2037280 thumb_func_end sub_081A4E3C - thumb_func_start sub_081A4E48 -sub_081A4E48: @ 0x081A4E48 + thumb_func_start BattleArena_ShowJudgmentWindow +BattleArena_ShowJudgmentWindow: @ 0x081A4E48 push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 @@ -862925,17 +862925,17 @@ _081A4E94: movs r1, #4 movs r2, #0 movs r3, #8 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081A4ED0 movs r0, #0x48 bl SetGpuReg ldr r0, _081A4ED4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081A4ED8 movs r1, #0xf8 lsls r1, r1, #1 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette ldr r1, _081A4EDC movs r0, #0xff strh r0, [r1] @@ -862966,12 +862966,12 @@ _081A4EF6: movs r1, #0 movs r2, #0x17 movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow b _081A512E .align 2, 0 _081A4F08: .4byte gUnknown_2037C74 _081A4F0C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081A4F18 @@ -862988,7 +862988,7 @@ _081A4F18: rsbs r0, r0, #0 strb r0, [r1, #1] ldr r0, _081A4F84 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r4, _081A4F88 adds r0, r4, #0 movs r1, #0xf @@ -862997,7 +862997,7 @@ _081A4F18: movs r1, #0x10 bl sub_0814FA04 ldr r0, _081A4F90 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString adds r0, r4, #0 movs r1, #0x11 bl sub_0814FA04 @@ -863011,7 +863011,7 @@ _081A4F18: movs r1, #0x14 bl sub_0814FA04 ldr r0, _081A4FA0 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString adds r0, r4, #0 movs r1, #0x15 bl sub_0814FA04 @@ -863028,7 +863028,7 @@ _081A4F98: .4byte gUnknown_85ABDA7 _081A4F9C: .4byte gUnknown_85ABDAA _081A4FA0: .4byte gUnknown_85ABDAE _081A4FA4: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081A4FB0 @@ -863045,7 +863045,7 @@ _081A4FBE: ldr r0, _081A4FF4 movs r2, #0x54 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -863074,7 +863074,7 @@ _081A4FFC: movs r1, #0x28 movs r2, #0 movs r3, #0 - bl sub_081A5148 + bl ShowJudgmentSprite movs r0, #0xa0 movs r1, #0x28 movs r2, #0 @@ -863088,7 +863088,7 @@ _081A501C: movs r1, #0x38 movs r2, #1 movs r3, #0 - bl sub_081A5148 + bl ShowJudgmentSprite movs r0, #0xa0 movs r1, #0x38 movs r2, #1 @@ -863102,15 +863102,15 @@ _081A503C: movs r1, #0x48 movs r2, #2 movs r3, #0 - bl sub_081A5148 + bl ShowJudgmentSprite movs r0, #0xa0 movs r1, #0x48 movs r2, #2 _081A5054: movs r3, #1 - bl sub_081A5148 + bl ShowJudgmentSprite ldr r0, _081A5078 - bl sub_0814E7A0 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _081A507C movs r1, #0x15 bl sub_0814FA04 @@ -863165,9 +863165,9 @@ _081A50C4: movs r1, #0 movs r2, #0x17 movs r3, #0xd - bl sub_0805664C + bl HandleBattleWindow movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _081A5104 ldr r1, _081A5108 movs r2, #0x80 @@ -863179,7 +863179,7 @@ _081A50C4: movs r1, #4 movs r2, #8 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _081A512E .align 2, 0 _081A5100: .4byte 0x00003F3E @@ -863214,10 +863214,10 @@ _081A5134: .align 2, 0 _081A5140: .4byte gUnknown_2037C74 _081A5144: .4byte 0x00003F3F - thumb_func_end sub_081A4E48 + thumb_func_end BattleArena_ShowJudgmentWindow - thumb_func_start sub_081A5148 -sub_081A5148: @ 0x081A5148 + thumb_func_start ShowJudgmentSprite +ShowJudgmentSprite: @ 0x081A5148 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -863358,7 +863358,7 @@ _081A524E: ldr r1, [sp] mov r2, sl movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 lsls r0, r6, #4 @@ -863379,10 +863379,10 @@ _081A524E: .align 2, 0 _081A5280: .4byte gUnknown_85DD794 _081A5284: .4byte gUnknown_20205AC - thumb_func_end sub_081A5148 + thumb_func_end ShowJudgmentSprite - thumb_func_start sub_081A5288 -sub_081A5288: @ 0x081A5288 + thumb_func_start SpriteCb_JudgmentIcon +SpriteCb_JudgmentIcon: @ 0x081A5288 push {lr} adds r1, r0, #0 ldr r0, _081A52A0 @@ -863396,7 +863396,7 @@ _081A529A: bx r0 .align 2, 0 _081A52A0: .4byte gUnknown_2023FD6 - thumb_func_end sub_081A5288 + thumb_func_end SpriteCb_JudgmentIcon thumb_func_start BattleArena_InitPoints BattleArena_InitPoints: @ 0x081A52A4 @@ -863451,8 +863451,8 @@ _081A5300: .4byte gUnknown_85DD5F8 _081A5304: .4byte gUnknown_2023E8E thumb_func_end BattleArena_AddMindPoints - thumb_func_start sub_081A5308 -sub_081A5308: @ 0x081A5308 + thumb_func_start BattleArena_AddSkillPoints +BattleArena_AddSkillPoints: @ 0x081A5308 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -863559,10 +863559,10 @@ _081A53CA: bx r0 .align 2, 0 _081A53D0: .4byte gUnknown_2023FE0 - thumb_func_end sub_081A5308 + thumb_func_end BattleArena_AddSkillPoints - thumb_func_start sub_081A53D4 -sub_081A53D4: @ 0x081A53D4 + thumb_func_start BattleArena_DeductMindPoints +BattleArena_DeductMindPoints: @ 0x081A53D4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -863634,7 +863634,7 @@ _081A5454: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A53D4 + thumb_func_end BattleArena_DeductMindPoints thumb_func_start sub_081A545C sub_081A545C: @ 0x081A545C @@ -863675,8 +863675,8 @@ _081A549C: .4byte gUnknown_2024140 _081A54A0: .4byte gUnknown_2023D28 thumb_func_end sub_081A545C - thumb_func_start sub_081A54A4 -sub_081A54A4: @ 0x081A54A4 + thumb_func_start InitArenaChallenge +InitArenaChallenge: @ 0x081A54A4 push {r4, r5, r6, lr} ldr r4, _081A54F0 ldr r1, [r4] @@ -863758,10 +863758,10 @@ _081A5544: .4byte 0x00000CDC _081A5548: .4byte 0x00000DDA _081A554C: .4byte gUnknown_3005AEC _081A5550: .4byte gUnknown_203886A - thumb_func_end sub_081A54A4 + thumb_func_end InitArenaChallenge - thumb_func_start sub_081A5554 -sub_081A5554: @ 0x081A5554 + thumb_func_start GetArenaData +GetArenaData: @ 0x081A5554 push {r4, lr} ldr r0, _081A5578 ldr r3, [r0] @@ -863837,10 +863837,10 @@ _081A55DE: .align 2, 0 _081A55E4: .4byte gUnknown_2037290 _081A55E8: .4byte 0x00000CDC - thumb_func_end sub_081A5554 + thumb_func_end GetArenaData - thumb_func_start sub_081A55EC -sub_081A55EC: @ 0x081A55EC + thumb_func_start SetArenaData +SetArenaData: @ 0x081A55EC push {lr} ldr r0, _081A5610 ldr r2, [r0] @@ -863942,7 +863942,7 @@ _081A56AA: bx r0 .align 2, 0 _081A56B0: .4byte 0x00000CDC - thumb_func_end sub_081A55EC + thumb_func_end SetArenaData thumb_func_start sub_081A56B4 sub_081A56B4: @ 0x081A56B4 @@ -863976,8 +863976,8 @@ _081A56F0: .4byte 0x00000CA8 _081A56F4: .4byte 0x00000CA9 thumb_func_end sub_081A56B4 - thumb_func_start sub_081A56F8 -sub_081A56F8: @ 0x081A56F8 + thumb_func_start SetArenaRewardItem +SetArenaRewardItem: @ 0x081A56F8 push {r4, r5, lr} ldr r4, _081A5734 ldr r1, [r4] @@ -864034,10 +864034,10 @@ _081A5766: .align 2, 0 _081A5770: .4byte gUnknown_85DD7D8 _081A5774: .4byte 0x00000DD8 - thumb_func_end sub_081A56F8 + thumb_func_end SetArenaRewardItem - thumb_func_start sub_081A5778 -sub_081A5778: @ 0x081A5778 + thumb_func_start GiveArenaRewardItem +GiveArenaRewardItem: @ 0x081A5778 push {r4, r5, lr} ldr r4, _081A57B0 ldr r0, [r4] @@ -864045,7 +864045,7 @@ sub_081A5778: @ 0x081A5778 adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -864079,10 +864079,10 @@ _081A57C6: bx r0 .align 2, 0 _081A57CC: .4byte gUnknown_2037290 - thumb_func_end sub_081A5778 + thumb_func_end GiveArenaRewardItem - thumb_func_start sub_081A57D0 -sub_081A57D0: @ 0x081A57D0 + thumb_func_start BufferArenaOpponentName +BufferArenaOpponentName: @ 0x081A57D0 push {lr} ldr r0, _081A57E0 ldr r1, _081A57E4 @@ -864093,10 +864093,10 @@ sub_081A57D0: @ 0x081A57D0 .align 2, 0 _081A57E0: .4byte gUnknown_2021C40 _081A57E4: .4byte gUnknown_203886A - thumb_func_end sub_081A57D0 + thumb_func_end BufferArenaOpponentName - thumb_func_start sub_081A57E8 -sub_081A57E8: @ 0x081A57E8 + thumb_func_start DrawArenaRefereeTextBox +DrawArenaRefereeTextBox: @ 0x081A57E8 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -864426,7 +864426,7 @@ _081A5AC8: .4byte 0x00000833 _081A5ACC: .4byte 0x00000834 _081A5AD0: .4byte 0x00000835 _081A5AD4: .4byte 0x00000836 - thumb_func_end sub_081A57E8 + thumb_func_end DrawArenaRefereeTextBox thumb_func_start sub_081A5AD8 sub_081A5AD8: @ 0x081A5AD8 @@ -864592,8 +864592,8 @@ _081A5C24: .4byte gUnknown_85DD958 _081A5C28: .4byte gUnknown_2037280 thumb_func_end sub_081A5C20 - thumb_func_start sub_081A5C2C -sub_081A5C2C: @ 0x081A5C2C + thumb_func_start InitFactoryChallenge +InitFactoryChallenge: @ 0x081A5C2C push {r4, r5, r6, r7, lr} ldr r5, _081A5D0C ldr r0, [r5] @@ -864721,10 +864721,10 @@ _081A5D30: .4byte gUnknown_3005AEC _081A5D34: .4byte 0x0000FFFF _081A5D38: .4byte gUnknown_3005FD8 _081A5D3C: .4byte gUnknown_203886A - thumb_func_end sub_081A5C2C + thumb_func_end InitFactoryChallenge - thumb_func_start sub_081A5D40 -sub_081A5D40: @ 0x081A5D40 + thumb_func_start GetBattleFactoryData +GetBattleFactoryData: @ 0x081A5D40 push {r4, r5, r6, r7, lr} ldr r7, _081A5D6C ldr r0, [r7] @@ -864807,10 +864807,10 @@ _081A5DDC: .align 2, 0 _081A5DE4: .4byte gUnknown_2037290 _081A5DE8: .4byte 0x00000DF2 - thumb_func_end sub_081A5D40 + thumb_func_end GetBattleFactoryData - thumb_func_start sub_081A5DEC -sub_081A5DEC: @ 0x081A5DEC + thumb_func_start SetBattleFactoryData +SetBattleFactoryData: @ 0x081A5DEC push {r4, r5, r6, lr} ldr r6, _081A5E18 ldr r0, [r6] @@ -864920,7 +864920,7 @@ _081A5EC0: _081A5EC8: .4byte gUnknown_3001284 _081A5ECC: .4byte 0x00000DF2 _081A5ED0: .4byte gUnknown_2037284 - thumb_func_end sub_081A5DEC + thumb_func_end SetBattleFactoryData thumb_func_start sub_081A5ED4 sub_081A5ED4: @ 0x081A5ED4 @@ -864966,15 +864966,15 @@ sub_081A5F1C: @ 0x081A5F1C .align 2, 0 thumb_func_end sub_081A5F1C - thumb_func_start sub_081A5F20 -sub_081A5F20: @ 0x081A5F20 + thumb_func_start SelectInitialRentalMons +SelectInitialRentalMons: @ 0x081A5F20 push {lr} bl ZeroPlayerPartyMons - bl sub_0819A198 + bl DoBattleFactorySelectScreen pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A5F20 + thumb_func_end SelectInitialRentalMons thumb_func_start sub_081A5F30 sub_081A5F30: @ 0x081A5F30 @@ -864995,8 +864995,8 @@ sub_081A5F3C: @ 0x081A5F3C _081A5F44: .4byte gUnknown_3001284 thumb_func_end sub_081A5F3C - thumb_func_start sub_081A5F48 -sub_081A5F48: @ 0x081A5F48 + thumb_func_start GenerateOpponentMons +GenerateOpponentMons: @ 0x081A5F48 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -865105,7 +865105,7 @@ _081A6012: ldr r2, [sp, #0x20] lsrs r1, r2, #0x18 movs r2, #0 - bl sub_081A6C88 + bl GetMonSetId lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 @@ -865254,10 +865254,10 @@ _081A6140: .4byte gUnknown_203B958 _081A6144: .4byte 0x00000351 _081A6148: .4byte gUnknown_85ADBF4 _081A614C: .4byte gUnknown_3005FD8 - thumb_func_end sub_081A5F48 + thumb_func_end GenerateOpponentMons - thumb_func_start sub_081A6150 -sub_081A6150: @ 0x081A6150 + thumb_func_start VBlankCB_EvolutionScene +VBlankCB_EvolutionScene: @ 0x081A6150 push {lr} ldr r0, _081A6160 ldrh r0, [r0] @@ -865267,10 +865267,10 @@ sub_081A6150: @ 0x081A6150 bx r0 .align 2, 0 _081A6160: .4byte gUnknown_203886A - thumb_func_end sub_081A6150 + thumb_func_end VBlankCB_EvolutionScene - thumb_func_start sub_081A6164 -sub_081A6164: @ 0x081A6164 + thumb_func_start SetRentalsToOpponentParty +SetRentalsToOpponentParty: @ 0x081A6164 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -865333,7 +865333,7 @@ _081A61A0: adds r0, r5, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData mov r2, r8 ldr r1, [r2] ldr r2, _081A6250 @@ -865361,7 +865361,7 @@ _081A61A0: adds r2, r2, r0 adds r0, r5, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData adds r0, r7, #1 lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -865382,10 +865382,10 @@ _081A624C: .4byte 0x00000E78 _081A6250: .4byte 0x00000E74 _081A6254: .4byte 0x00000E79 _081A6258: .4byte gUnknown_85ADBF4 - thumb_func_end sub_081A6164 + thumb_func_end SetRentalsToOpponentParty - thumb_func_start sub_081A625C -sub_081A625C: @ 0x081A625C + thumb_func_start SetPlayerAndOpponentParties +SetPlayerAndOpponentParties: @ 0x081A625C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -865480,7 +865480,7 @@ _081A62CC: str r2, [sp, #0xc] ldr r2, [sp, #0x14] adds r3, r6, #0 - bl sub_08067730 + bl CreateMon movs r1, #0 mov r2, sb ldr r0, [r2] @@ -865527,7 +865527,7 @@ _081A635C: adds r0, r6, r3 add r2, sp, #0x10 str r3, [sp, #0x20] - bl sub_0806A774 + bl SetMonData ldr r3, [sp, #0x20] _081A637A: lsls r0, r4, #0x19 @@ -865540,7 +865540,7 @@ _081A637A: muls r4, r2, r4 ldr r5, _081A656C adds r0, r4, r5 - bl sub_0806884C + bl CalculateMonStats movs r0, #0 ldr r1, [sp, #0x1c] strb r0, [r1] @@ -865556,7 +865556,7 @@ _081A639A: lsls r2, r6, #0x18 lsrs r2, r2, #0x18 adds r0, r4, r5 - bl sub_081A6DBC + bl SetMonMoveAvoidReturn adds r6, #1 cmp r6, #3 ble _081A639A @@ -865568,7 +865568,7 @@ _081A639A: adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData mov r1, sb ldr r0, [r1] adds r0, r7, r0 @@ -865578,7 +865578,7 @@ _081A639A: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r2, sl add r2, r8 lsls r2, r2, #2 @@ -865589,7 +865589,7 @@ _081A639A: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A774 + bl SetMonData ldr r1, [sp, #0x18] mov r8, r1 cmp r1, #2 @@ -865646,7 +865646,7 @@ _081A641A: str r2, [sp, #0xc] ldr r2, [sp, #0x14] adds r3, r6, #0 - bl sub_08067730 + bl CreateMon movs r1, #0 mov r2, sb ldr r0, [r2] @@ -865696,7 +865696,7 @@ _081A64AE: adds r0, r6, r3 add r2, sp, #0x10 str r3, [sp, #0x20] - bl sub_0806A774 + bl SetMonData ldr r3, [sp, #0x20] _081A64CC: lsls r0, r4, #0x19 @@ -865709,7 +865709,7 @@ _081A64CC: muls r4, r2, r4 ldr r5, _081A657C adds r0, r4, r5 - bl sub_0806884C + bl CalculateMonStats movs r6, #0 _081A64E6: mov r1, sb @@ -865722,7 +865722,7 @@ _081A64E6: lsls r2, r6, #0x18 lsrs r2, r2, #0x18 adds r0, r4, r5 - bl sub_081A6DBC + bl SetMonMoveAvoidReturn adds r6, #1 cmp r6, #3 ble _081A64E6 @@ -865740,7 +865740,7 @@ _081A64E6: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov r2, sl add r2, r8 lsls r2, r2, #2 @@ -865751,7 +865751,7 @@ _081A64E6: adds r2, r2, r5 adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A774 + bl SetMonData ldr r0, [sp, #0x18] mov r8, r0 cmp r0, #2 @@ -865778,10 +865778,10 @@ _081A6574: .4byte gUnknown_85ADBF4 _081A6578: .4byte 0x00000E79 _081A657C: .4byte gUnknown_20243E8 _081A6580: .4byte 0x00000E9D - thumb_func_end sub_081A625C + thumb_func_end SetPlayerAndOpponentParties - thumb_func_start sub_081A6584 -sub_081A6584: @ 0x081A6584 + thumb_func_start GenerateInitialRentalMons +GenerateInitialRentalMons: @ 0x081A6584 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -865909,7 +865909,7 @@ _081A6684: ldr r1, [sp, #0x24] movs r2, #0 _081A668A: - bl sub_081A6C88 + bl GetMonSetId lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldr r0, _081A6724 @@ -866050,10 +866050,10 @@ _081A6782: _081A6794: .4byte gUnknown_3005AF0 _081A6798: .4byte gUnknown_203B958 _081A679C: .4byte gUnknown_85ADBF4 - thumb_func_end sub_081A6584 + thumb_func_end GenerateInitialRentalMons - thumb_func_start sub_081A67A0 -sub_081A67A0: @ 0x081A67A0 + thumb_func_start GetOpponentMostCommonMonType +GetOpponentMostCommonMonType: @ 0x081A67A0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -866173,7 +866173,7 @@ _081A6876: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A67A0 + thumb_func_end GetOpponentMostCommonMonType thumb_func_start GetOpponentBattleStyle GetOpponentBattleStyle: @ 0x081A6884 @@ -866210,7 +866210,7 @@ _081A68B0: adds r0, #2 adds r0, r0, r1 ldrh r0, [r0] - bl sub_081A693C + bl GetMoveBattleStyle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r2, sp @@ -866271,8 +866271,8 @@ _081A6934: .4byte gUnknown_2037290 _081A6938: .4byte gUnknown_85DD7F8 thumb_func_end GetOpponentBattleStyle - thumb_func_start sub_081A693C -sub_081A693C: @ 0x081A693C + thumb_func_start GetMoveBattleStyle +GetMoveBattleStyle: @ 0x081A693C push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r5, r0, #0x10 @@ -866318,7 +866318,7 @@ _081A6986: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081A693C + thumb_func_end GetMoveBattleStyle thumb_func_start InBattleFactory InBattleFactory: @ 0x081A698C @@ -866343,8 +866343,8 @@ _081A69AC: .4byte gUnknown_2036FB8 _081A69B0: .4byte 0xFFFFFEA5 thumb_func_end InBattleFactory - thumb_func_start sub_081A69B4 -sub_081A69B4: @ 0x081A69B4 + thumb_func_start RestorePlayerPartyHeldItems +RestorePlayerPartyHeldItems: @ 0x081A69B4 push {r4, lr} ldr r0, _081A69D0 ldr r0, [r0] @@ -866393,7 +866393,7 @@ _081A69E8: ldr r1, _081A6A3C adds r2, r2, r1 movs r1, #0xc - bl sub_0806A774 + bl SetMonData adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -866408,7 +866408,7 @@ _081A6A30: .4byte gUnknown_85BCF70 _081A6A34: .4byte gUnknown_2024190 _081A6A38: .4byte gUnknown_3005AF0 _081A6A3C: .4byte gUnknown_85ADBF4 - thumb_func_end sub_081A69B4 + thumb_func_end RestorePlayerPartyHeldItems thumb_func_start GetFactoryMonFixedIV GetFactoryMonFixedIV: @ 0x081A6A40 @@ -866435,8 +866435,8 @@ _081A6A56: _081A6A64: .4byte gUnknown_85DD9BC thumb_func_end GetFactoryMonFixedIV - thumb_func_start sub_081A6A68 -sub_081A6A68: @ 0x081A6A68 + thumb_func_start FillFactoryBrainParty +FillFactoryBrainParty: @ 0x081A6A68 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -866477,7 +866477,7 @@ sub_081A6A68: @ 0x081A6A68 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x24] - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp, #0x20] @@ -866499,7 +866499,7 @@ _081A6AE4: ldr r0, [sp, #0x2c] ldr r1, [sp, #0x30] movs r2, #0 - bl sub_081A6C88 + bl GetMonSetId lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r7, _081A6C78 @@ -866639,7 +866639,7 @@ _081A6BA4: ldr r4, [sp, #0x28] str r4, [sp, #8] lsrs r2, r2, #0x18 - bl sub_08068174 + bl CreateMonWithEVSpreadNatureOTID add r0, sp, #0x1c movs r7, #0 strb r7, [r0] @@ -866660,7 +866660,7 @@ _081A6C06: lsls r2, r4, #0x18 lsrs r2, r2, #0x18 adds r0, r5, r6 - bl sub_081A6DBC + bl SetMonMoveAvoidReturn adds r4, #1 cmp r4, #3 ble _081A6C06 @@ -866672,7 +866672,7 @@ _081A6C06: adds r0, r4, #0 movs r1, #0x20 mov r2, sl - bl sub_0806A774 + bl SetMonData ldr r2, _081A6C78 ldr r0, [r2] adds r0, r7, r0 @@ -866682,7 +866682,7 @@ _081A6C06: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData mov sb, r8 _081A6C50: mov r3, sb @@ -866707,10 +866707,10 @@ _081A6C78: .4byte gUnknown_203B958 _081A6C7C: .4byte 0x00000351 _081A6C80: .4byte gUnknown_85ADBF4 _081A6C84: .4byte gUnknown_20243E8 - thumb_func_end sub_081A6A68 + thumb_func_end FillFactoryBrainParty - thumb_func_start sub_081A6C88 -sub_081A6C88: @ 0x081A6C88 + thumb_func_start GetMonSetId +GetMonSetId: @ 0x081A6C88 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -866774,7 +866774,7 @@ _081A6CD0: bx r1 .align 2, 0 _081A6D04: .4byte gUnknown_85DD9CC - thumb_func_end sub_081A6C88 + thumb_func_end GetMonSetId thumb_func_start GetNumPastRentalsRank GetNumPastRentalsRank: @ 0x081A6D08 @@ -866814,8 +866814,8 @@ _081A6D44: .4byte gUnknown_3005AF0 _081A6D48: .4byte 0x00000DF2 thumb_func_end GetNumPastRentalsRank - thumb_func_start sub_081A6D4C -sub_081A6D4C: @ 0x081A6D4C + thumb_func_start GetAiScriptsInBattleFactory +GetAiScriptsInBattleFactory: @ 0x081A6D4C push {r4, r5, lr} ldr r5, _081A6D94 ldr r0, [r5] @@ -866870,10 +866870,10 @@ _081A6DB6: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081A6D4C + thumb_func_end GetAiScriptsInBattleFactory - thumb_func_start sub_081A6DBC -sub_081A6DBC: @ 0x081A6DBC + thumb_func_start SetMonMoveAvoidReturn +SetMonMoveAvoidReturn: @ 0x081A6DBC push {lr} lsls r1, r1, #0x10 lsls r2, r2, #0x18 @@ -866883,10 +866883,10 @@ sub_081A6DBC: @ 0x081A6DBC bne _081A6DCC movs r1, #0xda _081A6DCC: - bl sub_08068D34 + bl SetMonMoveSlot pop {r0} bx r0 - thumb_func_end sub_081A6DBC + thumb_func_end SetMonMoveAvoidReturn thumb_func_start sub_081A6DD4 sub_081A6DD4: @ 0x081A6DD4 @@ -866909,17 +866909,17 @@ _081A6DEC: .4byte gUnknown_85DDE30 _081A6DF0: .4byte gUnknown_2037280 thumb_func_end sub_081A6DE8 - thumb_func_start sub_081A6DF4 -sub_081A6DF4: @ 0x081A6DF4 + thumb_func_start SetRoomType +SetRoomType: @ 0x081A6DF4 push {lr} - bl sub_081A776C + bl GetNextRoomType ldr r1, _081A6E04 strb r0, [r1] pop {r0} bx r0 .align 2, 0 _081A6E04: .4byte gUnknown_3001288 - thumb_func_end sub_081A6DF4 + thumb_func_end SetRoomType thumb_func_start sub_081A6E08 sub_081A6E08: @ 0x081A6E08 @@ -866952,7 +866952,7 @@ _081A6E2C: @ jump table .4byte _081A6E8E @ case 8 _081A6E50: movs r0, #0 - bl sub_081A8024 + bl PrepareOneTrainer _081A6E56: movs r4, #0 b _081A6E9A @@ -866960,7 +866960,7 @@ _081A6E5A: movs r5, #0x1c b _081A6E9A _081A6E5E: - bl sub_081A78D8 + bl GetNPCRoomGraphicsId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 b _081A6E9A @@ -866980,14 +866980,14 @@ _081A6E7C: b _081A6E9A _081A6E80: movs r0, #1 - bl sub_081A8024 + bl PrepareOneTrainer b _081A6E94 _081A6E88: - bl sub_081A80F4 + bl PrepareTwoTrainers b _081A6E56 _081A6E8E: movs r0, #5 - bl sub_081A4C20 + bl SetFrontierBrainEventObjGfx _081A6E94: movs r7, #0x1c movs r4, #0 @@ -867014,8 +867014,8 @@ _081A6EB8: .4byte 0x00004010 _081A6EBC: .4byte 0x00004011 thumb_func_end sub_081A6E08 - thumb_func_start sub_081A6EC0 -sub_081A6EC0: @ 0x081A6EC0 + thumb_func_start GetBattlePikeData +GetBattlePikeData: @ 0x081A6EC0 push {lr} ldr r1, _081A6EE4 ldr r0, [r1] @@ -867139,10 +867139,10 @@ _081A6FBA: .align 2, 0 _081A6FC0: .4byte gUnknown_2037290 _081A6FC4: .4byte 0x00000CDC - thumb_func_end sub_081A6EC0 + thumb_func_end GetBattlePikeData - thumb_func_start sub_081A6FC8 -sub_081A6FC8: @ 0x081A6FC8 + thumb_func_start SetBattlePikeData +SetBattlePikeData: @ 0x081A6FC8 push {r4, r5, lr} ldr r1, _081A6FF0 ldr r0, [r1] @@ -867318,10 +867318,10 @@ _081A712A: .align 2, 0 _081A7130: .4byte 0x00000CDC _081A7134: .4byte 0xFFFFFBFF - thumb_func_end sub_081A6FC8 + thumb_func_end SetBattlePikeData - thumb_func_start sub_081A7138 -sub_081A7138: @ 0x081A7138 + thumb_func_start GetInFinalRoom +GetInFinalRoom: @ 0x081A7138 push {lr} ldr r0, _081A7150 ldr r0, [r0] @@ -867346,7 +867346,7 @@ _081A7160: bx r0 .align 2, 0 _081A7168: .4byte gUnknown_2037290 - thumb_func_end sub_081A7138 + thumb_func_end GetInFinalRoom thumb_func_start sub_081A716C sub_081A716C: @ 0x081A716C @@ -867403,7 +867403,7 @@ sub_081A7198: @ 0x081A7198 strb r0, [r1] bl save_serialize_map movs r0, #1 - bl sub_08153274 + bl TrySavingData pop {r4} pop {r0} bx r0 @@ -867426,8 +867426,8 @@ sub_081A71E4: @ 0x081A71E4 .align 2, 0 thumb_func_end sub_081A71E4 - thumb_func_start sub_081A71E8 -sub_081A71E8: @ 0x081A71E8 + thumb_func_start GetRoomInflictedStatus +GetRoomInflictedStatus: @ 0x081A71E8 push {lr} ldr r0, _081A7200 ldr r0, [r0] @@ -867482,7 +867482,7 @@ _081A7242: bx r0 .align 2, 0 _081A7248: .4byte gUnknown_2037290 - thumb_func_end sub_081A71E8 + thumb_func_end GetRoomInflictedStatus thumb_func_start sub_081A724C sub_081A724C: @ 0x081A724C @@ -867496,8 +867496,8 @@ _081A7258: .4byte gUnknown_2037290 _081A725C: .4byte gUnknown_3001289 thumb_func_end sub_081A724C - thumb_func_start sub_081A7260 -sub_081A7260: @ 0x081A7260 + thumb_func_start HealOneOrTwoMons +HealOneOrTwoMons: @ 0x081A7260 push {r4, lr} bl Random adds r4, r0, #0 @@ -867507,7 +867507,7 @@ sub_081A7260: @ 0x081A7260 ands r4, r0 adds r4, #1 adds r0, r4, #0 - bl sub_081A7CB8 + bl TryHealMons ldr r0, _081A7284 strh r4, [r0] pop {r4} @@ -867515,10 +867515,10 @@ sub_081A7260: @ 0x081A7260 bx r0 .align 2, 0 _081A7284: .4byte gUnknown_2037290 - thumb_func_end sub_081A7260 + thumb_func_end HealOneOrTwoMons - thumb_func_start sub_081A7288 -sub_081A7288: @ 0x081A7288 + thumb_func_start BufferNPCMessage +BufferNPCMessage: @ 0x081A7288 push {lr} ldr r0, _081A72A8 ldr r0, [r0] @@ -867565,29 +867565,29 @@ _081A72E0: lsls r0, r0, #2 ldr r1, _081A72FC adds r0, r0, r1 - bl sub_081637CC + bl FrontierSpeechToString pop {r0} bx r0 .align 2, 0 _081A72F4: .4byte gUnknown_85DDB54 _081A72F8: .4byte gUnknown_3001290 _081A72FC: .4byte gUnknown_85DDC1C - thumb_func_end sub_081A7288 + thumb_func_end BufferNPCMessage - thumb_func_start sub_081A7300 -sub_081A7300: @ 0x081A7300 + thumb_func_start StatusInflictionScreenFade +StatusInflictionScreenFade: @ 0x081A7300 push {lr} ldr r0, _081A7310 movs r1, #2 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_081A7310: .4byte sub_081A7C64 - thumb_func_end sub_081A7300 +_081A7310: .4byte Task_DoStatusInflictionScreenFade + thumb_func_end StatusInflictionScreenFade - thumb_func_start sub_081A7314 -sub_081A7314: @ 0x081A7314 + thumb_func_start HealMon +HealMon: @ 0x081A7314 push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 @@ -867604,7 +867604,7 @@ _081A731E: bls _081A731E adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData lsls r2, r0, #0x10 mov r1, sp strb r0, [r1] @@ -867614,10 +867614,10 @@ _081A731E: adds r0, r5, #0 movs r1, #0x39 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r4, #0 @@ -867625,19 +867625,19 @@ _081A735A: adds r1, r4, #0 adds r1, #0xd adds r0, r5, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r6, #0 adds r2, r4, #0 - bl sub_0806B424 + bl CalculatePPWithBonus mov r1, sp strb r0, [r1] adds r1, r4, #0 adds r1, #0x11 adds r0, r5, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -867652,18 +867652,18 @@ _081A735A: adds r0, r5, #0 movs r1, #0x37 mov r2, sp - bl sub_0806A774 + bl SetMonData add sp, #4 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081A7314 + thumb_func_end HealMon - thumb_func_start sub_081A73A8 -sub_081A73A8: @ 0x081A73A8 + thumb_func_start DoesAbilityPreventStatus +DoesAbilityPreventStatus: @ 0x081A73A8 push {r4, lr} adds r4, r1, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -867710,10 +867710,10 @@ _081A73F4: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081A73A8 + thumb_func_end DoesAbilityPreventStatus - thumb_func_start sub_081A73FC -sub_081A73FC: @ 0x081A73FC + thumb_func_start DoesTypePreventStatus +DoesTypePreventStatus: @ 0x081A73FC push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -867804,10 +867804,10 @@ _081A749C: bx r1 .align 2, 0 _081A74A4: .4byte gUnknown_82F0D54 - thumb_func_end sub_081A73FC + thumb_func_end DoesTypePreventStatus - thumb_func_start sub_081A74A8 -sub_081A74A8: @ 0x081A74A8 + thumb_func_start TryInflictRandomStatus +TryInflictRandomStatus: @ 0x081A74A8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -867935,14 +867935,14 @@ _081A7590: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 cmp r0, #0 bne _081A75E0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081A75E0 mov r0, r8 @@ -867952,12 +867952,12 @@ _081A7590: mov r8, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r1, [r7] adds r0, r4, #0 - bl sub_081A73FC + bl DoesTypePreventStatus lsls r0, r0, #0x18 cmp r0, #0 beq _081A7574 @@ -868038,14 +868038,14 @@ _081A765C: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 cmp r0, #0 bne _081A76C6 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081A76C6 mov r0, r8 @@ -868055,26 +868055,26 @@ _081A765C: mov r8, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r7, _081A76F0 ldr r1, [r7] adds r0, r5, #0 - bl sub_081A73A8 + bl DoesAbilityPreventStatus lsls r0, r0, #0x18 cmp r0, #0 bne _081A76C6 ldr r1, [r7] adds r0, r4, #0 - bl sub_081A73FC + bl DoesTypePreventStatus lsls r0, r0, #0x18 cmp r0, #0 bne _081A76C6 adds r0, r5, #0 movs r1, #0x37 adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData _081A76C6: cmp r8, sl beq _081A76D4 @@ -868098,10 +868098,10 @@ _081A76D6: _081A76E8: .4byte gUnknown_3001289 _081A76EC: .4byte gUnknown_2024190 _081A76F0: .4byte gUnknown_300128C - thumb_func_end sub_081A74A8 + thumb_func_end TryInflictRandomStatus - thumb_func_start sub_081A76F4 -sub_081A76F4: @ 0x081A76F4 + thumb_func_start AtLeastOneHealthyMon +AtLeastOneHealthyMon: @ 0x081A76F4 push {r4, r5, r6, r7, lr} ldr r0, _081A7714 ldr r0, [r0] @@ -868136,14 +868136,14 @@ _081A7722: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 cmp r0, #0 bne _081A7754 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081A7754 adds r0, r6, #1 @@ -868165,10 +868165,10 @@ _081A7766: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081A76F4 + thumb_func_end AtLeastOneHealthyMon - thumb_func_start sub_081A776C -sub_081A776C: @ 0x081A776C + thumb_func_start GetNextRoomType +GetNextRoomType: @ 0x081A776C push {r4, r5, r6, lr} sub sp, #8 ldr r1, _081A778C @@ -868196,7 +868196,7 @@ _081A7790: bne _081A77B4 cmp r3, #0x18 bne _081A77A4 - bl sub_081A74A8 + bl TryInflictRandomStatus _081A77A4: ldr r0, [r5] adds r0, r0, r4 @@ -868253,7 +868253,7 @@ _081A77F8: ldrb r0, [r0, #7] cmp r0, #1 beq _081A7820 - bl sub_081A82D4 + bl AtLeastTwoAliveMons lsls r0, r0, #0x18 cmp r0, #0 bne _081A7820 @@ -868268,7 +868268,7 @@ _081A7820: ldrb r0, [r0, #3] cmp r0, #1 beq _081A783E - bl sub_081A76F4 + bl AtLeastOneHealthyMon lsls r0, r0, #0x18 cmp r0, #0 bne _081A783E @@ -868312,7 +868312,7 @@ _081A7866: lsrs r4, r0, #0x18 _081A787A: adds r0, r4, #0 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 movs r3, #0 movs r2, #0 @@ -868342,10 +868342,10 @@ _081A789C: adds r0, r5, r0 ldrb r4, [r0] adds r0, r5, #0 - bl sub_08000BF0 + bl Free cmp r4, #3 bne _081A78C6 - bl sub_081A74A8 + bl TryInflictRandomStatus _081A78C6: adds r0, r4, #0 _081A78C8: @@ -868356,10 +868356,10 @@ _081A78C8: .align 2, 0 _081A78D0: .4byte gUnknown_85DDEA4 _081A78D4: .4byte gUnknown_3005AF0 - thumb_func_end sub_081A776C + thumb_func_end GetNextRoomType - thumb_func_start sub_081A78D8 -sub_081A78D8: @ 0x081A78D8 + thumb_func_start GetNPCRoomGraphicsId +GetNPCRoomGraphicsId: @ 0x081A78D8 push {r4, lr} ldr r4, _081A78FC bl Random @@ -868379,7 +868379,7 @@ sub_081A78D8: @ 0x081A78D8 .align 2, 0 _081A78FC: .4byte gUnknown_3001290 _081A7900: .4byte gUnknown_85DDB54 - thumb_func_end sub_081A78D8 + thumb_func_end GetNPCRoomGraphicsId thumb_func_start sub_081A7904 sub_081A7904: @ 0x081A7904 @@ -868390,8 +868390,8 @@ sub_081A7904: @ 0x081A7904 _081A790C: .4byte gUnknown_300128A thumb_func_end sub_081A7904 - thumb_func_start sub_081A7910 -sub_081A7910: @ 0x081A7910 + thumb_func_start TryGenerateBattlePikeWildMon +TryGenerateBattlePikeWildMon: @ 0x081A7910 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -868401,7 +868401,7 @@ sub_081A7910: @ 0x081A7910 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 - bl sub_081A7A80 + bl GetBattlePikeWildMonHeaderId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 ldr r7, _081A798C @@ -868418,7 +868418,7 @@ sub_081A7910: @ 0x081A7910 ldr r0, _081A7998 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r0, r5, #0x10 lsrs r0, r0, #0x10 @@ -868432,7 +868432,7 @@ sub_081A7910: @ 0x081A7910 ands r0, r1 cmp r0, #0 beq _081A799C - bl sub_08165AC0 + bl GetHighestLevelInPlayerParty adds r7, r0, #0 cmp r7, #0x3b ble _081A7988 @@ -868474,7 +868474,7 @@ _081A79B2: bne _081A79CA lsls r0, r7, #0x18 lsrs r0, r0, #0x18 - bl sub_081A8630 + bl CanEncounterWildMon lsls r0, r0, #0x18 cmp r0, #0 bne _081A79CA @@ -868508,7 +868508,7 @@ _081A79CA: adds r1, r1, r3 adds r2, r2, r1 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData mov r1, sl ldr r0, [r1] adds r4, r4, r0 @@ -868531,7 +868531,7 @@ _081A7A28: ldr r0, _081A7A74 movs r1, #0x2e mov r2, sp - bl sub_0806A774 + bl SetMonData movs r4, #0 adds r0, r6, r5 lsls r6, r0, #2 @@ -868547,12 +868547,12 @@ _081A7A3A: lsls r2, r4, #0x18 lsrs r2, r2, #0x18 ldr r0, _081A7A74 - bl sub_08068D34 + bl SetMonMoveSlot adds r4, #1 cmp r4, #3 ble _081A7A3A ldr r0, _081A7A74 - bl sub_0806884C + bl CalculateMonStats movs r0, #1 _081A7A62: add sp, #8 @@ -868567,10 +868567,10 @@ _081A7A62: _081A7A74: .4byte gUnknown_20243E8 _081A7A78: .4byte gUnknown_82F0D54 _081A7A7C: .4byte gUnknown_82F00B4 - thumb_func_end sub_081A7910 + thumb_func_end TryGenerateBattlePikeWildMon - thumb_func_start sub_081A7A80 -sub_081A7A80: @ 0x081A7A80 + thumb_func_start GetBattlePikeWildMonHeaderId +GetBattlePikeWildMonHeaderId: @ 0x081A7A80 push {lr} ldr r0, _081A7AA8 ldr r1, [r0] @@ -868613,7 +868613,7 @@ _081A7ACC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081A7A80 + thumb_func_end GetBattlePikeWildMonHeaderId thumb_func_start sub_081A7AD4 sub_081A7AD4: @ 0x081A7AD4 @@ -868645,8 +868645,8 @@ _081A7B04: .4byte gUnknown_85DDEC0 _081A7B08: .4byte gUnknown_3005B60 thumb_func_end sub_081A7AD4 - thumb_func_start sub_081A7B0C -sub_081A7B0C: @ 0x081A7B0C + thumb_func_start StatusInflictionFadeOut +StatusInflictionFadeOut: @ 0x081A7B0C push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x14] @@ -868677,7 +868677,7 @@ _081A7B3C: rsbs r0, r0, #0 ldrb r1, [r4, #0x16] ldr r2, _081A7B64 - bl sub_080A22E8 + bl BlendPalettes _081A7B48: movs r2, #0x16 ldrsh r0, [r4, r2] @@ -868695,10 +868695,10 @@ _081A7B5A: bx r1 .align 2, 0 _081A7B64: .4byte 0x00002D6B - thumb_func_end sub_081A7B0C + thumb_func_end StatusInflictionFadeOut - thumb_func_start sub_081A7B68 -sub_081A7B68: @ 0x081A7B68 + thumb_func_start StatusInflictionFadeIn +StatusInflictionFadeIn: @ 0x081A7B68 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x14] @@ -868728,7 +868728,7 @@ _081A7B96: rsbs r0, r0, #0 ldrb r1, [r4, #0x16] ldr r2, _081A7BC8 - bl sub_080A22E8 + bl BlendPalettes _081A7BA2: movs r0, #0x16 ldrsh r1, [r4, r0] @@ -868741,10 +868741,10 @@ _081A7BA2: cmp r0, #0 bne _081A7BD0 ldr r0, _081A7BCC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask b _081A7BD6 .align 2, 0 _081A7BC8: .4byte 0x00002D6B @@ -868759,7 +868759,7 @@ _081A7BD6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081A7B68 + thumb_func_end StatusInflictionFadeIn thumb_func_start sub_081A7BE0 sub_081A7BE0: @ 0x081A7BE0 @@ -868786,7 +868786,7 @@ sub_081A7BE0: @ 0x081A7BE0 ldr r0, _081A7C3C movs r1, #3 str r3, [sp] - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081A7C40 @@ -868813,11 +868813,11 @@ _081A7C3C: .4byte sub_081A7AD4 _081A7C40: .4byte gUnknown_3005B60 thumb_func_end sub_081A7BE0 - thumb_func_start sub_081A7C44 -sub_081A7C44: @ 0x081A7C44 + thumb_func_start IsStatusInflictionScreenFadeTaskFinished +IsStatusInflictionScreenFadeTaskFinished: @ 0x081A7C44 push {lr} ldr r0, _081A7C58 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -868832,10 +868832,10 @@ _081A7C5E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081A7C44 + thumb_func_end IsStatusInflictionScreenFadeTaskFinished - thumb_func_start sub_081A7C64 -sub_081A7C64: @ 0x081A7C64 + thumb_func_start Task_DoStatusInflictionScreenFade +Task_DoStatusInflictionScreenFade: @ 0x081A7C64 push {r4, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -868864,22 +868864,22 @@ sub_081A7C64: @ 0x081A7C64 .align 2, 0 _081A7C98: .4byte gUnknown_3005B60 _081A7C9C: - bl sub_081A7C44 + bl IsStatusInflictionScreenFadeTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081A7CB0 - bl sub_080988C4 + bl EnableBothScriptContexts adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081A7CB0: add sp, #4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_081A7C64 + thumb_func_end Task_DoStatusInflictionScreenFade - thumb_func_start sub_081A7CB8 -sub_081A7CB8: @ 0x081A7CB8 + thumb_func_start TryHealMons +TryHealMons: @ 0x081A7CB8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -868951,12 +868951,12 @@ _081A7D30: adds r7, r1, r0 adds r0, r7, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 adds r0, r7, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 str r4, [sp, #8] @@ -868964,7 +868964,7 @@ _081A7D30: blo _081A7DC4 adds r0, r7, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 cmp r0, #0 @@ -868977,7 +868977,7 @@ _081A7D78: .4byte gUnknown_2024190 _081A7D7C: adds r0, r7, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -868993,18 +868993,18 @@ _081A7D94: adds r1, r4, #0 adds r1, #0xd adds r0, r7, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r1, sb adds r2, r4, #0 - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r1, r4, #0 adds r1, #0x11 adds r0, r7, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r5, r6 @@ -869022,7 +869022,7 @@ _081A7DC8: muls r0, r1, r0 ldr r1, _081A7E0C adds r0, r0, r1 - bl sub_081A7314 + bl HealMon ldr r0, [sp, #4] subs r0, #1 lsls r0, r0, #0x18 @@ -869049,7 +869049,7 @@ _081A7DFA: bx r0 .align 2, 0 _081A7E0C: .4byte gUnknown_2024190 - thumb_func_end sub_081A7CB8 + thumb_func_end TryHealMons thumb_func_start GetInBattlePike GetInBattlePike: @ 0x081A7E10 @@ -869096,8 +869096,8 @@ _081A7E54: .4byte gUnknown_2036FB8 _081A7E58: .4byte 0xFFFFFEA1 thumb_func_end InBattlePike - thumb_func_start sub_081A7E5C -sub_081A7E5C: @ 0x081A7E5C + thumb_func_start SetHintedRoom +SetHintedRoom: @ 0x081A7E5C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -869105,7 +869105,7 @@ sub_081A7E5C: @ 0x081A7E5C movs r0, #0 strh r0, [r4] movs r0, #1 - bl sub_081A8310 + bl GetPikeQueenFightType lsls r0, r0, #0x18 cmp r0, #0 beq _081A7EB8 @@ -869170,7 +869170,7 @@ _081A7EB8: movs r6, #6 _081A7EF2: adds r0, r6, #0 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 movs r2, #0 movs r3, #0 @@ -869233,7 +869233,7 @@ _081A7F3E: orrs r0, r1 strb r0, [r4] adds r0, r5, #0 - bl sub_08000BF0 + bl Free ldr r0, [r7] adds r0, r0, r6 ldrb r1, [r0] @@ -869241,7 +869241,7 @@ _081A7F3E: ands r0, r1 cmp r0, #0x18 bne _081A7F9C - bl sub_081A76F4 + bl AtLeastOneHealthyMon lsls r0, r0, #0x18 cmp r0, #0 bne _081A7F9C @@ -869264,7 +869264,7 @@ _081A7F9C: ands r0, r1 cmp r0, #0x38 bne _081A7FCC - bl sub_081A82D4 + bl AtLeastTwoAliveMons lsls r0, r0, #0x18 cmp r0, #0 bne _081A7FCC @@ -869286,7 +869286,7 @@ _081A7FCC: bx r0 .align 2, 0 _081A7FD8: .4byte gUnknown_3005AF0 - thumb_func_end sub_081A7E5C + thumb_func_end SetHintedRoom thumb_func_start GetHintedRoomIndex GetHintedRoomIndex: @ 0x081A7FDC @@ -869328,8 +869328,8 @@ _081A801C: .4byte gUnknown_85DDEA4 _081A8020: .4byte gUnknown_3005AF0 thumb_func_end GetRoomTypeHint - thumb_func_start sub_081A8024 -sub_081A8024: @ 0x081A8024 + thumb_func_start PrepareOneTrainer +PrepareOneTrainer: @ 0x081A8024 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 movs r7, #6 @@ -869427,10 +869427,10 @@ _081A80E4: .4byte gUnknown_203B954 _081A80E8: .4byte gUnknown_85B4A10 _081A80EC: .4byte gUnknown_3005AF0 _081A80F0: .4byte 0x00000CB4 - thumb_func_end sub_081A8024 + thumb_func_end PrepareOneTrainer - thumb_func_start sub_081A80F4 -sub_081A80F4: @ 0x081A80F4 + thumb_func_start PrepareTwoTrainers +PrepareTwoTrainers: @ 0x081A80F4 push {r4, r5, r6, r7, lr} ldr r4, _081A8144 ldr r1, [r4] @@ -869585,7 +869585,7 @@ _081A8224: .4byte gUnknown_203886A _081A8228: .4byte gUnknown_3005AF0 _081A822C: .4byte 0x00000CB4 _081A8230: .4byte gUnknown_203886C - thumb_func_end sub_081A80F4 + thumb_func_end PrepareTwoTrainers thumb_func_start ClearPikeTrainerIds ClearPikeTrainerIds: @ 0x081A8234 @@ -869617,8 +869617,8 @@ _081A8264: .4byte 0x00000CB4 _081A8268: .4byte 0x0000FFFF thumb_func_end ClearPikeTrainerIds - thumb_func_start sub_081A826C -sub_081A826C: @ 0x081A826C + thumb_func_start BufferRecordMixingTrainerMessage +BufferRecordMixingTrainerMessage: @ 0x081A826C push {lr} ldr r0, _081A8294 ldrh r0, [r0] @@ -869635,7 +869635,7 @@ sub_081A826C: @ 0x081A826C ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString b _081A82C2 .align 2, 0 _081A8294: .4byte gUnknown_2037282 @@ -869656,7 +869656,7 @@ _081A82A4: ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString _081A82C2: pop {r0} bx r0 @@ -869664,10 +869664,10 @@ _081A82C2: _081A82C8: .4byte gUnknown_203886C _081A82CC: .4byte 0x0000012B _081A82D0: .4byte gUnknown_203B954 - thumb_func_end sub_081A826C + thumb_func_end BufferRecordMixingTrainerMessage - thumb_func_start sub_081A82D4 -sub_081A82D4: @ 0x081A82D4 + thumb_func_start AtLeastTwoAliveMons +AtLeastTwoAliveMons: @ 0x081A82D4 push {r4, r5, r6, lr} ldr r5, _081A8304 movs r6, #0 @@ -869675,7 +869675,7 @@ sub_081A82D4: @ 0x081A82D4 _081A82DC: adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081A82EE adds r0, r6, #1 @@ -869700,10 +869700,10 @@ _081A830A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081A82D4 + thumb_func_end AtLeastTwoAliveMons - thumb_func_start sub_081A8310 -sub_081A8310: @ 0x081A8310 + thumb_func_start GetPikeQueenFightType +GetPikeQueenFightType: @ 0x081A8310 push {r4, r5, r6, lr} lsls r0, r0, #0x18 movs r6, #0 @@ -869723,7 +869723,7 @@ sub_081A8310: @ 0x081A8310 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #5 - bl sub_081A38C8 + bl GetPlayerSymbolCountForFacility lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -869788,14 +869788,14 @@ _081A83B4: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081A8310 + thumb_func_end GetPikeQueenFightType thumb_func_start GetCurrentRoomPikeQueenFightType GetCurrentRoomPikeQueenFightType: @ 0x081A83BC push {r4, lr} ldr r4, _081A83D4 movs r0, #0 - bl sub_081A8310 + bl GetPikeQueenFightType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -869826,7 +869826,7 @@ HealSomeMonsBeforePikeQueen: @ 0x081A83D8 adds r0, r0, r3 ldrb r4, [r0] adds r0, r4, #0 - bl sub_081A7CB8 + bl TryHealMons ldr r0, _081A8418 strh r4, [r0] pop {r4} @@ -869860,8 +869860,8 @@ _081A8438: .4byte gUnknown_3005AF0 _081A843C: .4byte gUnknown_2037282 thumb_func_end SetHealingRoomsDisabled - thumb_func_start sub_081A8440 -sub_081A8440: @ 0x081A8440 + thumb_func_start CanAnyPartyMonsBeHealed +CanAnyPartyMonsBeHealed: @ 0x081A8440 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -869882,26 +869882,26 @@ _081A8454: adds r7, r1, r0 adds r0, r7, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r7, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 cmp r4, r5 blo _081A84E2 adds r0, r7, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 cmp r0, #0 bne _081A84E2 adds r0, r7, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -869920,18 +869920,18 @@ _081A84B2: adds r1, r6, #0 adds r1, #0xd adds r0, r7, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r1, r8 adds r2, r6, #0 - bl sub_0806B424 + bl CalculatePPWithBonus lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r1, r6, #0 adds r1, #0x11 adds r0, r7, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, r5 @@ -869965,10 +869965,10 @@ _081A8506: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081A8440 + thumb_func_end CanAnyPartyMonsBeHealed - thumb_func_start sub_081A8514 -sub_081A8514: @ 0x081A8514 + thumb_func_start BackupMonHeldItems +BackupMonHeldItems: @ 0x081A8514 push {r4, r5, r6, r7, lr} movs r5, #0 ldr r7, _081A8558 @@ -869988,7 +869988,7 @@ _081A851C: ldr r0, [r7] adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData ldr r1, [r6] ldr r2, _081A8564 adds r1, r1, r2 @@ -870007,10 +870007,10 @@ _081A8558: .4byte gUnknown_3005AEC _081A855C: .4byte gUnknown_3005AF0 _081A8560: .4byte 0x00000CAA _081A8564: .4byte 0x00000E12 - thumb_func_end sub_081A8514 + thumb_func_end BackupMonHeldItems - thumb_func_start sub_081A8568 -sub_081A8568: @ 0x081A8568 + thumb_func_start RestoreMonHeldItems +RestoreMonHeldItems: @ 0x081A8568 push {r4, lr} movs r4, #0 _081A856C: @@ -870029,7 +870029,7 @@ _081A856C: adds r3, r3, r1 adds r2, r2, r3 movs r1, #0xc - bl sub_0806A774 + bl SetMonData adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -870043,7 +870043,7 @@ _081A85A0: .4byte gUnknown_3005AF0 _081A85A4: .4byte 0x00000CAA _081A85A8: .4byte gUnknown_202412C _081A85AC: .4byte 0x00000E12 - thumb_func_end sub_081A8568 + thumb_func_end RestoreMonHeldItems thumb_func_start InitPikeChallenge InitPikeChallenge: @ 0x081A85B0 @@ -870106,19 +870106,19 @@ _081A8628: .4byte gUnknown_203886A _081A862C: .4byte gUnknown_2023FDE thumb_func_end InitPikeChallenge - thumb_func_start sub_081A8630 -sub_081A8630: @ 0x081A8630 + thumb_func_start CanEncounterWildMon +CanEncounterWildMon: @ 0x081A8630 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _081A8680 adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081A8684 adds r0, r4, #0 - bl sub_0806B1A0 + bl GetMonAbility lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x33 @@ -870128,7 +870128,7 @@ sub_081A8630: @ 0x081A8630 _081A8656: adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #5 @@ -870153,7 +870153,7 @@ _081A8686: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081A8630 + thumb_func_end CanEncounterWildMon thumb_func_start SpeciesToPikeMonId SpeciesToPikeMonId: @ 0x081A868C @@ -870181,8 +870181,8 @@ _081A86AA: _081A86B0: .4byte 0x00000149 thumb_func_end SpeciesToPikeMonId - thumb_func_start sub_081A86B4 -sub_081A86B4: @ 0x081A86B4 + thumb_func_start InitMossdeepGymTiles +InitMossdeepGymTiles: @ 0x081A86B4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -870191,7 +870191,7 @@ sub_081A86B4: @ 0x081A86B4 cmp r0, #0 bne _081A86CA movs r0, #0x44 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] _081A86CA: ldr r0, [r4] @@ -870202,16 +870202,16 @@ _081A86CA: bx r0 .align 2, 0 _081A86D8: .4byte gUnknown_203CB1C - thumb_func_end sub_081A86B4 + thumb_func_end InitMossdeepGymTiles - thumb_func_start sub_081A86DC -sub_081A86DC: @ 0x081A86DC + thumb_func_start FinishMossdeepGymTiles +FinishMossdeepGymTiles: @ 0x081A86DC push {r4, lr} ldr r4, _081A8718 ldr r0, [r4] cmp r0, #0 beq _081A86EE - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _081A86EE: @@ -870235,10 +870235,10 @@ _081A86EE: .align 2, 0 _081A8718: .4byte gUnknown_203CB1C _081A871C: .4byte gUnknown_2036FF0 - thumb_func_end sub_081A86DC + thumb_func_end FinishMossdeepGymTiles - thumb_func_start sub_081A8720 -sub_081A8720: @ 0x081A8720 + thumb_func_start MossdeepGym_MoveEvents +MossdeepGym_MoveEvents: @ 0x081A8720 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -870271,7 +870271,7 @@ _081A8744: asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r1, r0, #0x10 ldr r0, _081A87BC @@ -870383,7 +870383,7 @@ _081A87F4: ldrb r1, [r2, #5] ldrb r2, [r2, #4] adds r3, r7, #0 - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript b _081A8854 .align 2, 0 _081A8844: .4byte gUnknown_85DDEDC @@ -870412,10 +870412,10 @@ _081A8864: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081A8720 + thumb_func_end MossdeepGym_MoveEvents - thumb_func_start sub_081A8878 -sub_081A8878: @ 0x081A8878 + thumb_func_start MossdeepGym_TurnEvents +MossdeepGym_TurnEvents: @ 0x081A8878 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -870473,7 +870473,7 @@ _081A88BE: asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r3, sl @@ -870628,7 +870628,7 @@ _081A89F2: ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript b _081A8AB2 .align 2, 0 _081A8A14: .4byte gUnknown_85DDEE4 @@ -870711,7 +870711,7 @@ _081A8A92: ldr r2, [r1] ldrb r1, [r2, #5] ldrb r2, [r2, #4] - bl sub_080D2B88 + bl ScriptMovement_StartObjectMovementScript _081A8AB2: mov r0, sb adds r0, #1 @@ -870736,7 +870736,7 @@ _081A8ACA: .align 2, 0 _081A8AD8: .4byte gUnknown_85DDEE0 _081A8ADC: .4byte gUnknown_3005AEC - thumb_func_end sub_081A8878 + thumb_func_end MossdeepGym_TurnEvents thumb_func_start AddEventObject AddEventObject: @ 0x081A8AE0 @@ -870792,7 +870792,7 @@ sub_081A8B14: @ 0x081A8B14 asrs r0, r0, #0x10 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_08087B88 + bl MapGridGetMetatileIdAt lsls r0, r0, #0x10 lsrs r2, r0, #0x10 ldr r0, _081A8B84 @@ -870924,8 +870924,8 @@ _081A8C14: .4byte gUnknown_85DF718 _081A8C18: .4byte gUnknown_2037280 thumb_func_end sub_081A8C10 - thumb_func_start sub_081A8C1C -sub_081A8C1C: @ 0x081A8C1C + thumb_func_start InitPyramidChallenge +InitPyramidChallenge: @ 0x081A8C1C push {r4, r5, r6, lr} ldr r3, _081A8C5C ldr r1, [r3] @@ -870981,9 +870981,9 @@ _081A8C7C: adds r0, r0, r1 strh r2, [r0] adds r0, r5, #0 - bl sub_081AA7F4 + bl InitPyramidBagItems _081A8C94: - bl sub_081C46F4 + bl InitBattlePyramidBagCursorPosition ldr r0, _081A8CB0 movs r1, #0 strh r1, [r0] @@ -870997,10 +870997,10 @@ _081A8CA8: .4byte 0x00000CDC _081A8CAC: .4byte 0x00000E1A _081A8CB0: .4byte gUnknown_203886A _081A8CB4: .4byte gUnknown_2023FDE - thumb_func_end sub_081A8C1C + thumb_func_end InitPyramidChallenge - thumb_func_start sub_081A8CB8 -sub_081A8CB8: @ 0x081A8CB8 + thumb_func_start GetBattlePyramidData +GetBattlePyramidData: @ 0x081A8CB8 push {r4, lr} ldr r1, _081A8CE0 ldr r0, [r1] @@ -871131,10 +871131,10 @@ _081A8DBA: .align 2, 0 _081A8DC0: .4byte gUnknown_2037290 _081A8DC4: .4byte 0x00000CDC - thumb_func_end sub_081A8CB8 + thumb_func_end GetBattlePyramidData - thumb_func_start sub_081A8DC8 -sub_081A8DC8: @ 0x081A8DC8 + thumb_func_start SetBattlePyramidData +SetBattlePyramidData: @ 0x081A8DC8 push {lr} ldr r0, _081A8DEC ldr r2, [r0] @@ -871250,7 +871250,7 @@ _081A8EA6: .align 2, 0 _081A8EAC: .4byte gUnknown_2037284 _081A8EB0: .4byte 0x00000E2A - thumb_func_end sub_081A8DC8 + thumb_func_end SetBattlePyramidData thumb_func_start sub_081A8EB4 sub_081A8EB4: @ 0x081A8EB4 @@ -871275,7 +871275,7 @@ sub_081A8EB4: @ 0x081A8EB4 strb r0, [r1] bl save_serialize_map movs r0, #1 - bl sub_08153274 + bl TrySavingData pop {r4} pop {r0} bx r0 @@ -871286,8 +871286,8 @@ _081A8EF4: .4byte 0x00000CA8 _081A8EF8: .4byte 0x00000CA9 thumb_func_end sub_081A8EB4 - thumb_func_start sub_081A8EFC -sub_081A8EFC: @ 0x081A8EFC + thumb_func_start SetBattlePyramidRewardItem +SetBattlePyramidRewardItem: @ 0x081A8EFC push {r4, r5, lr} ldr r4, _081A8F38 ldr r1, [r4] @@ -871344,10 +871344,10 @@ _081A8F6A: .align 2, 0 _081A8F74: .4byte gUnknown_85DF760 _081A8F78: .4byte 0x00000E18 - thumb_func_end sub_081A8EFC + thumb_func_end SetBattlePyramidRewardItem - thumb_func_start sub_081A8F7C -sub_081A8F7C: @ 0x081A8F7C + thumb_func_start GiveBattlePyramidRewardItem +GiveBattlePyramidRewardItem: @ 0x081A8F7C push {r4, r5, lr} ldr r4, _081A8FB4 ldr r0, [r4] @@ -871355,7 +871355,7 @@ sub_081A8F7C: @ 0x081A8F7C adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -871389,10 +871389,10 @@ _081A8FCA: bx r0 .align 2, 0 _081A8FD0: .4byte gUnknown_2037290 - thumb_func_end sub_081A8F7C + thumb_func_end GiveBattlePyramidRewardItem - thumb_func_start sub_081A8FD4 -sub_081A8FD4: @ 0x081A8FD4 + thumb_func_start SeedPyramidFloor +SeedPyramidFloor: @ 0x081A8FD4 push {r4, r5, lr} movs r4, #0 ldr r5, _081A9004 @@ -871420,7 +871420,7 @@ _081A8FDA: _081A9004: .4byte gUnknown_3005AF0 _081A9008: .4byte 0x00000E22 _081A900C: .4byte 0x00000E2A - thumb_func_end sub_081A8FD4 + thumb_func_end SeedPyramidFloor thumb_func_start sub_081A9010 sub_081A9010: @ 0x081A9010 @@ -871458,7 +871458,7 @@ sub_081A9010: @ 0x081A9010 movs r0, #0x13 mov r8, r0 _081A9054: - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 ldr r1, _081A90EC ldrh r4, [r1] @@ -871568,8 +871568,8 @@ _081A910E: _081A913C: .4byte gUnknown_85DEFD4 thumb_func_end sub_081A9010 - thumb_func_start sub_081A9140 -sub_081A9140: @ 0x081A9140 + thumb_func_start HidePyramidItem +HidePyramidItem: @ 0x081A9140 push {r4, r5, lr} ldr r0, _081A9154 ldr r0, [r0] @@ -871609,7 +871609,7 @@ _081A9182: bx r0 .align 2, 0 _081A9188: .4byte 0x00007FFF - thumb_func_end sub_081A9140 + thumb_func_end HidePyramidItem thumb_func_start sub_081A918C sub_081A918C: @ 0x081A918C @@ -871622,8 +871622,8 @@ _081A9194: .4byte gUnknown_203B954 _081A9198: .4byte gUnknown_85B4A10 thumb_func_end sub_081A918C - thumb_func_start sub_081A919C -sub_081A919C: @ 0x081A919C + thumb_func_start ShowPostBattleHintText +ShowPostBattleHintText: @ 0x081A919C push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -871739,7 +871739,7 @@ _081A9298: mov r0, sp movs r1, #8 movs r2, #0 - bl sub_081A9710 + bl GetPostBattleDirectionHintTextIndex lsls r0, r0, #0x18 lsrs r7, r0, #0x18 b _081A9366 @@ -871772,7 +871772,7 @@ _081A92D2: adds r6, #1 _081A92D8: str r2, [sp, #4] - bl sub_081AA7B8 + bl GetNumBattlePyramidEventObjects lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, [sp, #4] @@ -871780,7 +871780,7 @@ _081A92D8: blt _081A92B8 b _081A9366 _081A92EA: - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 ldr r1, _081A931C lsrs r0, r0, #0x14 @@ -871827,20 +871827,20 @@ _081A933E: movs r1, #0x10 _081A9342: movs r2, #1 - bl sub_081A9710 + bl GetPostBattleDirectionHintTextIndex b _081A9360 _081A934A: mov r0, sp movs r1, #0x18 _081A934E: movs r2, #2 - bl sub_081A9710 + bl GetPostBattleDirectionHintTextIndex b _081A9360 _081A9356: mov r0, sp movs r1, #0x18 movs r2, #1 - bl sub_081A9710 + bl GetPostBattleDirectionHintTextIndex _081A9360: cmp r6, #0 bne _081A9366 @@ -871856,7 +871856,7 @@ _081A9366: lsls r0, r7, #2 adds r0, r0, r1 ldr r0, [r0] - bl sub_08097B74 + bl ShowFieldMessage add sp, #8 pop {r3, r4} mov r8, r3 @@ -871866,7 +871866,7 @@ _081A9366: bx r0 .align 2, 0 _081A938C: .4byte gUnknown_85DF6F8 - thumb_func_end sub_081A919C + thumb_func_end ShowPostBattleHintText thumb_func_start UpdatePyramidWinStreak UpdatePyramidWinStreak: @ 0x081A9390 @@ -871915,7 +871915,7 @@ _081A93E0: .4byte 0x00000E1E GetInBattlePyramid: @ 0x081A93E4 push {r4, lr} ldr r4, _081A93F8 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -871926,8 +871926,8 @@ GetInBattlePyramid: @ 0x081A93E4 _081A93F8: .4byte gUnknown_2037290 thumb_func_end GetInBattlePyramid - thumb_func_start sub_081A93FC -sub_081A93FC: @ 0x081A93FC + thumb_func_start UpdatePyramidLightRadius +UpdatePyramidLightRadius: @ 0x081A93FC push {r4, lr} ldr r0, _081A940C ldrh r0, [r0] @@ -872019,7 +872019,7 @@ _081A9488: adds r0, #1 strh r0, [r4] _081A94B6: - bl sub_080AFA20 + bl WriteBattlePyramidViewScanlineEffectBuffer b _081A94CC .align 2, 0 _081A94BC: .4byte gUnknown_2037282 @@ -872033,10 +872033,10 @@ _081A94CC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A93FC + thumb_func_end UpdatePyramidLightRadius - thumb_func_start sub_081A94D4 -sub_081A94D4: @ 0x081A94D4 + thumb_func_start ClearPyramidPartyHeldItems +ClearPyramidPartyHeldItems: @ 0x081A94D4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -872072,7 +872072,7 @@ _081A94F6: adds r0, r6, r1 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData _081A951A: adds r4, #1 cmp r4, #3 @@ -872091,22 +872091,22 @@ _081A951A: _081A9534: .4byte gUnknown_2024190 _081A9538: .4byte gUnknown_3005AF0 _081A953C: .4byte 0x00000CAA - thumb_func_end sub_081A94D4 + thumb_func_end ClearPyramidPartyHeldItems - thumb_func_start sub_081A9540 -sub_081A9540: @ 0x081A9540 + thumb_func_start SetPyramidFloorPalette +SetPyramidFloorPalette: @ 0x081A9540 push {lr} ldr r0, _081A9550 movs r1, #0 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_081A9550: .4byte sub_081A9554 - thumb_func_end sub_081A9540 +_081A9550: .4byte Task_SetPyramidFloorPalette + thumb_func_end SetPyramidFloorPalette - thumb_func_start sub_081A9554 -sub_081A9554: @ 0x081A9554 + thumb_func_start Task_SetPyramidFloorPalette +Task_SetPyramidFloorPalette: @ 0x081A9554 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -872128,7 +872128,7 @@ sub_081A9554: @ 0x081A9554 movs r2, #0x10 bl CpuSet adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081A9584: pop {r4} pop {r0} @@ -872139,19 +872139,19 @@ _081A9590: .4byte gUnknown_3005AF0 _081A9594: .4byte 0x00000CB2 _081A9598: .4byte gUnknown_8D856AC _081A959C: .4byte gUnknown_2037474 - thumb_func_end sub_081A9554 + thumb_func_end Task_SetPyramidFloorPalette - thumb_func_start sub_081A95A0 -sub_081A95A0: @ 0x081A95A0 + thumb_func_start FldEff_UseSecretPowerShrub +FldEff_UseSecretPowerShrub: @ 0x081A95A0 push {lr} - bl sub_0809F6AC + bl CableCarMainCallback_Run pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A95A0 + thumb_func_end FldEff_UseSecretPowerShrub - thumb_func_start sub_081A95AC -sub_081A95AC: @ 0x081A95AC + thumb_func_start RestorePyramidPlayerParty +RestorePyramidPlayerParty: @ 0x081A95AC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -872187,7 +872187,7 @@ _081A95E4: adds r0, r0, r6 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 ldr r3, _081A9638 ldr r1, [sp, #0x10] @@ -872195,7 +872195,7 @@ _081A95E4: movs r1, #0xb movs r2, #0 str r3, [sp, #0x14] - bl sub_0806A058 + bl GetMonData ldr r3, [sp, #0x14] cmp r4, r0 bne _081A96B4 @@ -872233,14 +872233,14 @@ _081A963E: adds r1, r5, #0 adds r1, #0xd movs r2, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 adds r1, r6, #0 adds r1, #0xd mov r2, sl adds r0, r7, r2 movs r2, #0 - bl sub_0806A058 + bl GetMonData cmp r4, r0 bne _081A963C _081A9666: @@ -872251,7 +872251,7 @@ _081A9666: mov r5, sl adds r0, r7, r5 movs r1, #0xa6 - bl sub_08068D34 + bl SetMonMoveSlot _081A9678: mov r6, r8 cmp r6, #3 @@ -872326,10 +872326,10 @@ _081A96DA: _081A9704: .4byte gUnknown_3005AF0 _081A9708: .4byte 0x00000CAA _081A970C: .4byte gUnknown_203CBC4 - thumb_func_end sub_081A95AC + thumb_func_end RestorePyramidPlayerParty - thumb_func_start sub_081A9710 -sub_081A9710: @ 0x081A9710 + thumb_func_start GetPostBattleDirectionHintTextIndex +GetPostBattleDirectionHintTextIndex: @ 0x081A9710 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -872474,7 +872474,7 @@ _081A9810: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081A9710 + thumb_func_end GetPostBattleDirectionHintTextIndex thumb_func_start sub_081A9820 sub_081A9820: @ 0x081A9820 @@ -872524,8 +872524,8 @@ _081A9874: .4byte gUnknown_82FACB4 _081A9878: .4byte gUnknown_2036FF0 thumb_func_end GetBattlePyramidTrainerFlag - thumb_func_start sub_081A987C -sub_081A987C: @ 0x081A987C + thumb_func_start MarkApproachingPyramidTrainersAsBattled +MarkApproachingPyramidTrainersAsBattled: @ 0x081A987C push {lr} ldr r0, _081A98AC ldrh r0, [r0] @@ -872538,7 +872538,7 @@ sub_081A987C: @ 0x081A987C cmp r0, #0 beq _081A98A6 movs r0, #1 - bl sub_080B3F38 + bl GetChosenApproachingTrainerEventObjectId ldr r1, _081A98B4 strb r0, [r1] ldr r0, _081A98B8 @@ -872552,7 +872552,7 @@ _081A98AC: .4byte gUnknown_203886A _081A98B0: .4byte gUnknown_2022C90 _081A98B4: .4byte gUnknown_3005B50 _081A98B8: .4byte gUnknown_203886C - thumb_func_end sub_081A987C + thumb_func_end MarkApproachingPyramidTrainersAsBattled thumb_func_start MarkPyramidTrainerAsBattled MarkPyramidTrainerAsBattled: @ 0x081A98BC @@ -872647,8 +872647,8 @@ _081A9974: .4byte gUnknown_2037292 _081A9978: .4byte 0x00000C79 thumb_func_end MarkPyramidTrainerAsBattled - thumb_func_start sub_081A997C -sub_081A997C: @ 0x081A997C + thumb_func_start GenerateBattlePyramidWildMon +GenerateBattlePyramidWildMon: @ 0x081A997C push {r4, r5, r6, lr} sub sp, #0x14 ldr r0, _081A99BC @@ -872694,7 +872694,7 @@ _081A99CE: adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData subs r0, #1 str r0, [sp, #0x10] lsls r2, r0, #1 @@ -872703,7 +872703,7 @@ _081A99CE: adds r2, r6, r2 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A774 + bl SetMonData ldr r1, [sp, #0x10] lsls r0, r1, #1 adds r0, r0, r1 @@ -872715,10 +872715,10 @@ _081A99CE: adds r0, r4, #0 movs r1, #2 mov r2, sp - bl sub_0806A774 + bl SetMonData cmp r5, #0 beq _081A9A4C - bl sub_08165A4C + bl SetFacilityPtrsGetLevel lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r1, [sp, #0x10] @@ -872781,7 +872781,7 @@ _081A9A6E: adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData ldr r1, [sp, #0x10] lsls r0, r1, #1 adds r0, r0, r1 @@ -872817,7 +872817,7 @@ _081A9AC4: adds r0, r4, #0 movs r1, #0 movs r2, #0 - bl sub_0806A058 + bl GetMonData movs r1, #1 ands r1, r0 str r1, [sp, #0xc] @@ -872825,7 +872825,7 @@ _081A9AC4: _081A9AF4: adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A774 + bl SetMonData b _081A9B14 .align 2, 0 _081A9B00: .4byte gUnknown_82F0D54 @@ -872835,7 +872835,7 @@ _081A9B08: ldr r0, _081A9B94 add r2, sp, #0xc movs r1, #0x2e - bl sub_0806A774 + bl SetMonData _081A9B14: movs r0, #0 str r0, [sp, #0xc] @@ -872854,7 +872854,7 @@ _081A9B1C: lsls r2, r2, #0x18 lsrs r2, r2, #0x18 ldr r0, _081A9B94 - bl sub_08068D34 + bl SetMonMoveSlot ldr r0, [sp, #0xc] adds r0, #1 str r0, [sp, #0xc] @@ -872885,7 +872885,7 @@ _081A9B6E: adds r1, #0x27 ldr r0, _081A9B94 add r2, sp, #0x10 - bl sub_0806A774 + bl SetMonData ldr r0, [sp, #0xc] adds r0, #1 str r0, [sp, #0xc] @@ -872893,7 +872893,7 @@ _081A9B6E: ble _081A9B6E _081A9B84: ldr r0, _081A9B94 - bl sub_0806884C + bl CalculateMonStats add sp, #0x14 pop {r4, r5, r6} pop {r0} @@ -872902,12 +872902,12 @@ _081A9B84: _081A9B94: .4byte gUnknown_20243E8 _081A9B98: .4byte gUnknown_3005AF0 _081A9B9C: .4byte 0x00000E1A - thumb_func_end sub_081A997C + thumb_func_end GenerateBattlePyramidWildMon thumb_func_start GetPyramidRunMultiplier GetPyramidRunMultiplier: @ 0x081A9BA0 push {lr} - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 ldr r1, _081A9BB4 lsrs r0, r0, #0x14 @@ -872919,8 +872919,8 @@ GetPyramidRunMultiplier: @ 0x081A9BA0 _081A9BB4: .4byte gUnknown_85DEE88 thumb_func_end GetPyramidRunMultiplier - thumb_func_start sub_081A9BB8 -sub_081A9BB8: @ 0x081A9BB8 + thumb_func_start InBattlePyramid +InBattlePyramid: @ 0x081A9BB8 push {lr} ldr r0, _081A9BC8 ldrh r1, [r0, #0x12] @@ -872945,7 +872945,7 @@ _081A9BDE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081A9BB8 + thumb_func_end InBattlePyramid thumb_func_start InBattlePyramid_ InBattlePyramid_: @ 0x081A9BE4 @@ -872973,11 +872973,11 @@ _081A9C04: .4byte 0x00000169 thumb_func_start sub_081A9C08 sub_081A9C08: @ 0x081A9C08 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _081A9C30 - bl sub_081A95AC + bl RestorePyramidPlayerParty ldr r0, _081A9C34 ldr r0, [r0] ldr r1, _081A9C38 @@ -872987,7 +872987,7 @@ sub_081A9C08: @ 0x081A9C08 ldr r0, _081A9C3C movs r1, #0 bl VarSet - bl sub_080767DC + bl LoadPlayerParty _081A9C30: pop {r0} bx r0 @@ -872997,21 +872997,21 @@ _081A9C38: .4byte 0x00000CA8 _081A9C3C: .4byte 0x0000400E thumb_func_end sub_081A9C08 - thumb_func_start sub_081A9C40 -sub_081A9C40: @ 0x081A9C40 + thumb_func_start SoftResetInBattlePyramid +SoftResetInBattlePyramid: @ 0x081A9C40 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 beq _081A9C50 - bl sub_080008F4 + bl DoSoftReset _081A9C50: pop {r0} bx r0 - thumb_func_end sub_081A9C40 + thumb_func_end SoftResetInBattlePyramid - thumb_func_start sub_081A9C54 -sub_081A9C54: @ 0x081A9C54 + thumb_func_start CopyPyramidTrainerSpeechBefore +CopyPyramidTrainerSpeechBefore: @ 0x081A9C54 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -873021,15 +873021,15 @@ sub_081A9C54: @ 0x081A9C54 ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString pop {r0} bx r0 .align 2, 0 _081A9C70: .4byte gUnknown_203B954 - thumb_func_end sub_081A9C54 + thumb_func_end CopyPyramidTrainerSpeechBefore - thumb_func_start sub_081A9C74 -sub_081A9C74: @ 0x081A9C74 + thumb_func_start CopyPyramidTrainerWinSpeech +CopyPyramidTrainerWinSpeech: @ 0x081A9C74 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -873039,15 +873039,15 @@ sub_081A9C74: @ 0x081A9C74 ldr r0, [r2] adds r0, r0, r1 adds r0, #0x18 - bl sub_081637CC + bl FrontierSpeechToString pop {r0} bx r0 .align 2, 0 _081A9C90: .4byte gUnknown_203B954 - thumb_func_end sub_081A9C74 + thumb_func_end CopyPyramidTrainerWinSpeech - thumb_func_start sub_081A9C94 -sub_081A9C94: @ 0x081A9C94 + thumb_func_start CopyPyramidTrainerLoseSpeech +CopyPyramidTrainerLoseSpeech: @ 0x081A9C94 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -873057,15 +873057,15 @@ sub_081A9C94: @ 0x081A9C94 ldr r0, [r2] adds r0, r0, r1 adds r0, #0x24 - bl sub_081637CC + bl FrontierSpeechToString pop {r0} bx r0 .align 2, 0 _081A9CB0: .4byte gUnknown_203B954 - thumb_func_end sub_081A9C94 + thumb_func_end CopyPyramidTrainerLoseSpeech - thumb_func_start sub_081A9CB4 -sub_081A9CB4: @ 0x081A9CB4 + thumb_func_start GetBattlePyramindTrainerEncounterMusicId +GetBattlePyramindTrainerEncounterMusicId: @ 0x081A9CB4 push {r4, lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -873100,7 +873100,7 @@ _081A9CF2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081A9CB4 + thumb_func_end GetBattlePyramindTrainerEncounterMusicId thumb_func_start sub_081A9CF8 sub_081A9CF8: @ 0x081A9CF8 @@ -873113,8 +873113,8 @@ sub_081A9CF8: @ 0x081A9CF8 _081A9D04: .4byte gUnknown_822D751 thumb_func_end sub_081A9CF8 - thumb_func_start sub_081A9D08 -sub_081A9D08: @ 0x081A9D08 + thumb_func_start GetUniqueTrainerId +GetUniqueTrainerId: @ 0x081A9D08 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -873229,10 +873229,10 @@ _081A9DDA: .align 2, 0 _081A9DE8: .4byte gUnknown_3005AF0 _081A9DEC: .4byte 0x00000CB4 - thumb_func_end sub_081A9D08 + thumb_func_end GetUniqueTrainerId - thumb_func_start sub_081A9DF0 -sub_081A9DF0: @ 0x081A9DF0 + thumb_func_start GenerateBattlePyramidFloorLayout +GenerateBattlePyramidFloorLayout: @ 0x081A9DF0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -873244,7 +873244,7 @@ sub_081A9DF0: @ 0x081A9DF0 lsrs r1, r1, #0x18 str r1, [sp, #8] movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0xc] bl GetPyramidFloorLayoutOffsets mov r4, sp @@ -873400,7 +873400,7 @@ _081A9F2E: _081A9F36: bl sub_080989C8 ldr r0, [sp, #0xc] - bl sub_08000BF0 + bl Free add sp, #0x1c pop {r3, r4, r5} mov r8, r3 @@ -873409,10 +873409,10 @@ _081A9F36: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081A9DF0 + thumb_func_end GenerateBattlePyramidFloorLayout - thumb_func_start sub_081A9F50 -sub_081A9F50: @ 0x081A9F50 + thumb_func_start LoadBattlePyramidEventObjectTemplates +LoadBattlePyramidEventObjectTemplates: @ 0x081A9F50 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -873437,7 +873437,7 @@ _081A9F6A: adds r5, #1 cmp r5, #7 ble _081A9F6A - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 lsrs r7, r0, #0x18 mov r0, sp @@ -873494,7 +873494,7 @@ _081A9FEC: @ jump table _081AA000: lsls r0, r5, #0x18 lsrs r0, r0, #0x18 - bl sub_081AA110 + bl SetPyramidObjectPositionsUniformly b _081AA05C _081AA00A: lsls r0, r5, #0x18 @@ -873502,14 +873502,14 @@ _081AA00A: mov r0, sp ldrb r1, [r0] adds r0, r4, #0 - bl sub_081AA250 + bl SetPyramidObjectPositionsInAndNearSquare b _081AA036 _081AA01A: lsls r0, r5, #0x18 lsrs r4, r0, #0x18 ldrb r1, [r6] adds r0, r4, #0 - bl sub_081AA250 + bl SetPyramidObjectPositionsInAndNearSquare b _081AA036 _081AA028: lsls r0, r5, #0x18 @@ -873517,25 +873517,25 @@ _081AA028: mov r0, sp ldrb r1, [r0] adds r0, r4, #0 - bl sub_081AA3C0 + bl SetPyramidObjectPositionsNearSquare _081AA036: lsls r0, r0, #0x18 cmp r0, #0 beq _081AA05C adds r0, r4, #0 - bl sub_081AA110 + bl SetPyramidObjectPositionsUniformly b _081AA05C _081AA044: lsls r0, r5, #0x18 lsrs r4, r0, #0x18 ldrb r1, [r6] adds r0, r4, #0 - bl sub_081AA3C0 + bl SetPyramidObjectPositionsNearSquare lsls r0, r0, #0x18 cmp r0, #0 beq _081AA05C adds r0, r4, #0 - bl sub_081AA110 + bl SetPyramidObjectPositionsUniformly _081AA05C: adds r5, #1 cmp r5, #1 @@ -873547,10 +873547,10 @@ _081AA05C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081A9F50 + thumb_func_end LoadBattlePyramidEventObjectTemplates - thumb_func_start sub_081AA070 -sub_081AA070: @ 0x081AA070 + thumb_func_start LoadBattlePyramidFloorEventObjectScripts +LoadBattlePyramidFloorEventObjectScripts: @ 0x081AA070 push {r4, r5, lr} ldr r0, _081AA094 ldr r0, [r0] @@ -873585,7 +873585,7 @@ _081AA0A2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AA070 + thumb_func_end LoadBattlePyramidFloorEventObjectScripts thumb_func_start GetPyramidEntranceAndExitSquareIds GetPyramidEntranceAndExitSquareIds: @ 0x081AA0B4 @@ -873636,8 +873636,8 @@ _081AA108: .4byte 0x00000E28 _081AA10C: .4byte 0x00000E22 thumb_func_end GetPyramidEntranceAndExitSquareIds - thumb_func_start sub_081AA110 -sub_081AA110: @ 0x081AA110 + thumb_func_start SetPyramidObjectPositionsUniformly +SetPyramidObjectPositionsUniformly: @ 0x081AA110 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -873648,11 +873648,11 @@ sub_081AA110: @ 0x081AA110 lsrs r0, r0, #0x18 str r0, [sp] movs r5, #0 - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #8] bl GetPyramidFloorLayoutOffsets ldr r0, _081AA15C @@ -873706,7 +873706,7 @@ _081AA18C: lsrs r3, r3, #0x18 ldr r0, [sp] ldr r1, [sp, #8] - bl sub_081AA4D8 + bl TrySetPyramidEventObjectPositionInSquare lsls r0, r0, #0x18 cmp r0, #0 beq _081AA22E @@ -873791,7 +873791,7 @@ _081AA22E: blt _081AA17E _081AA238: ldr r0, [sp, #8] - bl sub_08000BF0 + bl Free add sp, #0xc pop {r3, r4, r5} mov r8, r3 @@ -873801,10 +873801,10 @@ _081AA238: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AA110 + thumb_func_end SetPyramidObjectPositionsUniformly - thumb_func_start sub_081AA250 -sub_081AA250: @ 0x081AA250 + thumb_func_start SetPyramidObjectPositionsInAndNearSquare +SetPyramidObjectPositionsInAndNearSquare: @ 0x081AA250 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -873821,11 +873821,11 @@ sub_081AA250: @ 0x081AA250 movs r7, #0 movs r0, #0 str r0, [sp, #0xc] - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #0x14] bl GetPyramidFloorLayoutOffsets ldr r1, [sp] @@ -873868,7 +873868,7 @@ _081AA2C0: ldr r0, [sp] ldr r1, [sp, #0x14] ldr r2, [sp, #4] - bl sub_081AA4D8 + bl TrySetPyramidEventObjectPositionInSquare lsls r0, r0, #0x18 cmp r0, #0 beq _081AA2E0 @@ -873896,7 +873896,7 @@ _081AA2E6: lsrs r3, r0, #0x18 ldr r0, [sp] ldr r1, [sp, #0x14] - bl sub_081AA4D8 + bl TrySetPyramidEventObjectPositionInSquare lsls r0, r0, #0x18 ldr r1, [sp, #0x1c] mov sl, r1 @@ -873917,7 +873917,7 @@ _081AA320: lsrs r3, r3, #0x18 ldr r0, [sp] ldr r1, [sp, #0x14] - bl sub_081AA4D8 + bl TrySetPyramidEventObjectPositionInSquare lsls r0, r0, #0x18 cmp r0, #0 beq _081AA358 @@ -873998,10 +873998,10 @@ _081AA3AC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AA250 + thumb_func_end SetPyramidObjectPositionsInAndNearSquare - thumb_func_start sub_081AA3C0 -sub_081AA3C0: @ 0x081AA3C0 + thumb_func_start SetPyramidObjectPositionsNearSquare +SetPyramidObjectPositionsNearSquare: @ 0x081AA3C0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -874017,11 +874017,11 @@ sub_081AA3C0: @ 0x081AA3C0 movs r7, #0 movs r0, #0 mov r8, r0 - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #0x10 - bl sub_08000BDC + bl AllocZeroed str r0, [sp, #8] bl GetPyramidFloorLayoutOffsets ldr r1, [sp] @@ -874062,7 +874062,7 @@ _081AA42E: lsrs r3, r6, #0x18 ldr r0, [sp] ldr r1, [sp, #8] - bl sub_081AA4D8 + bl TrySetPyramidEventObjectPositionInSquare lsls r0, r0, #0x18 cmp r0, #0 beq _081AA48C @@ -874078,7 +874078,7 @@ _081AA450: lsrs r3, r6, #0x18 ldr r0, [sp] ldr r1, [sp, #8] - bl sub_081AA4D8 + bl TrySetPyramidEventObjectPositionInSquare lsls r0, r0, #0x18 cmp r0, #0 beq _081AA4A0 @@ -874147,10 +874147,10 @@ _081AA4C6: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081AA3C0 + thumb_func_end SetPyramidObjectPositionsNearSquare - thumb_func_start sub_081AA4D8 -sub_081AA4D8: @ 0x081AA4D8 + thumb_func_start TrySetPyramidEventObjectPositionInSquare +TrySetPyramidEventObjectPositionInSquare: @ 0x081AA4D8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -874188,7 +874188,7 @@ _081AA50E: mov r0, sb lsrs r2, r5, #0x18 mov r3, sl - bl sub_081AA588 + bl TrySetPyramidEventObjectPositionAtCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081AA544 @@ -874221,7 +874221,7 @@ _081AA54E: mov r0, sb lsrs r2, r5, #0x18 mov r3, sl - bl sub_081AA588 + bl TrySetPyramidEventObjectPositionAtCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081AA544 @@ -874243,10 +874243,10 @@ _081AA576: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AA4D8 + thumb_func_end TrySetPyramidEventObjectPositionInSquare - thumb_func_start sub_081AA588 -sub_081AA588: @ 0x081AA588 + thumb_func_start TrySetPyramidEventObjectPositionAtCoords +TrySetPyramidEventObjectPositionAtCoords: @ 0x081AA588 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -874389,12 +874389,12 @@ _081AA654: cmp r0, #0x3b beq _081AA6B8 adds r0, r6, #0 - bl sub_081A9D08 + bl GetUniqueTrainerId lsls r0, r0, #0x10 lsrs r7, r0, #0x10 adds r4, r7, #0 adds r0, r4, #0 - bl sub_081626B0 + bl IsFrontierTrainerFemale strb r0, [r5, #1] ldr r0, _081AA6C0 ldr r0, [r0] @@ -874426,7 +874426,7 @@ _081AA6D4: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081AA588 + thumb_func_end TrySetPyramidEventObjectPositionAtCoords thumb_func_start GetPyramidFloorLayoutOffsets GetPyramidFloorLayoutOffsets: @ 0x081AA6E4 @@ -874442,7 +874442,7 @@ GetPyramidFloorLayoutOffsets: @ 0x081AA6E4 ldrh r0, [r0] lsls r0, r0, #0x10 orrs r4, r0 - bl sub_081AA75C + bl GetPyramidFloorTemplateId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r3, #0 @@ -874488,8 +874488,8 @@ _081AA754: .4byte 0x00000E26 _081AA758: .4byte 0x00000E28 thumb_func_end GetPyramidFloorLayoutOffsets - thumb_func_start sub_081AA75C -sub_081AA75C: @ 0x081AA75C + thumb_func_start GetPyramidFloorTemplateId +GetPyramidFloorTemplateId: @ 0x081AA75C push {r4, lr} ldr r0, _081AA794 ldr r4, [r0] @@ -874534,10 +874534,10 @@ _081AA7B2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081AA75C + thumb_func_end GetPyramidFloorTemplateId - thumb_func_start sub_081AA7B8 -sub_081AA7B8: @ 0x081AA7B8 + thumb_func_start GetNumBattlePyramidEventObjects +GetNumBattlePyramidEventObjects: @ 0x081AA7B8 push {lr} ldr r0, _081AA7D0 ldr r0, [r0] @@ -874570,10 +874570,10 @@ _081AA7EC: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AA7B8 + thumb_func_end GetNumBattlePyramidEventObjects - thumb_func_start sub_081AA7F4 -sub_081AA7F4: @ 0x081AA7F4 + thumb_func_start InitPyramidBagItems +InitPyramidBagItems: @ 0x081AA7F4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -874608,10 +874608,10 @@ _081AA816: ble _081AA816 movs r0, #0x15 movs r1, #1 - bl sub_080D6A1C + bl AddPyramidBagItem movs r0, #0x22 movs r1, #1 - bl sub_080D6A1C + bl AddPyramidBagItem pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -874621,10 +874621,10 @@ _081AA816: _081AA84C: .4byte gUnknown_3005AF0 _081AA850: .4byte 0x00000E2C _081AA854: .4byte 0x00000E54 - thumb_func_end sub_081AA7F4 + thumb_func_end InitPyramidBagItems - thumb_func_start sub_081AA858 -sub_081AA858: @ 0x081AA858 + thumb_func_start GetBattlePyramidPickupItemId +GetBattlePyramidPickupItemId: @ 0x081AA858 push {r4, r5, r6, lr} ldr r0, _081AA8BC ldr r1, [r0] @@ -874697,10 +874697,10 @@ _081AA8D2: bx r1 .align 2, 0 _081AA8E4: .4byte gUnknown_85DF164 - thumb_func_end sub_081AA858 + thumb_func_end GetBattlePyramidPickupItemId - thumb_func_start sub_081AA8E8 -sub_081AA8E8: @ 0x081AA8E8 + thumb_func_start ResetBagScrollPositions +ResetBagScrollPositions: @ 0x081AA8E8 push {r4, lr} ldr r4, _081AA910 movs r0, #0 @@ -874720,32 +874720,32 @@ sub_081AA8E8: @ 0x081AA8E8 bx r0 .align 2, 0 _081AA910: .4byte gUnknown_203CB24 - thumb_func_end sub_081AA8E8 + thumb_func_end ResetBagScrollPositions - thumb_func_start sub_081AA914 -sub_081AA914: @ 0x081AA914 + thumb_func_start CB2_BagMenuFromStartMenu +CB2_BagMenuFromStartMenu: @ 0x081AA914 push {lr} ldr r2, _081AA924 movs r0, #0 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 -_081AA924: .4byte sub_08085AFC - thumb_func_end sub_081AA914 +_081AA924: .4byte CB2_ReturnToFieldWithOpenMenu + thumb_func_end CB2_BagMenuFromStartMenu thumb_func_start sub_081AA928 sub_081AA928: @ 0x081AA928 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _081AA944 ldr r2, _081AA940 movs r0, #1 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu b _081AA94C .align 2, 0 _081AA940: .4byte sub_0805996C @@ -874760,18 +874760,18 @@ _081AA94C: _081AA950: .4byte sub_0805996C thumb_func_end sub_081AA928 - thumb_func_start sub_081AA954 -sub_081AA954: @ 0x081AA954 + thumb_func_start CB2_ChooseBerry +CB2_ChooseBerry: @ 0x081AA954 push {lr} ldr r2, _081AA964 movs r0, #4 movs r1, #3 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 -_081AA964: .4byte sub_08085B18 - thumb_func_end sub_081AA954 +_081AA964: .4byte CB2_ReturnToFieldContinueScript + thumb_func_end CB2_ChooseBerry thumb_func_start sub_081AA968 sub_081AA968: @ 0x081AA968 @@ -874779,23 +874779,23 @@ sub_081AA968: @ 0x081AA968 adds r2, r0, #0 movs r0, #5 movs r1, #3 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 thumb_func_end sub_081AA968 - thumb_func_start sub_081AA978 -sub_081AA978: @ 0x081AA978 + thumb_func_start CB2_GoToSellMenu +CB2_GoToSellMenu: @ 0x081AA978 push {lr} ldr r2, _081AA988 movs r0, #3 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 _081AA988: .4byte sub_080DF194 - thumb_func_end sub_081AA978 + thumb_func_end CB2_GoToSellMenu thumb_func_start sub_081AA98C sub_081AA98C: @ 0x081AA98C @@ -874803,7 +874803,7 @@ sub_081AA98C: @ 0x081AA98C ldr r2, _081AA99C movs r0, #6 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 @@ -874816,7 +874816,7 @@ sub_081AA9A0: @ 0x081AA9A0 ldr r2, _081AA9BC movs r0, #9 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu ldr r0, _081AA9C0 movs r1, #0 strh r1, [r0] @@ -874836,7 +874836,7 @@ sub_081AA9C8: @ 0x081AA9C8 ldr r2, _081AA9E0 movs r0, #7 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu ldr r1, _081AA9E4 movs r0, #0 strh r0, [r1] @@ -874853,7 +874853,7 @@ sub_081AA9E8: @ 0x081AA9E8 ldr r2, _081AAA00 movs r0, #8 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu ldr r1, _081AAA04 movs r0, #0 strh r0, [r1] @@ -874864,8 +874864,8 @@ _081AAA00: .4byte sub_081ADD0C _081AAA04: .4byte gUnknown_2037290 thumb_func_end sub_081AA9E8 - thumb_func_start sub_081AAA08 -sub_081AAA08: @ 0x081AAA08 + thumb_func_start GoToBagMenu +GoToBagMenu: @ 0x081AAA08 push {r4, r5, r6, r7, lr} adds r4, r2, #0 lsls r0, r0, #0x18 @@ -874874,12 +874874,12 @@ sub_081AAA08: @ 0x081AAA08 lsrs r7, r1, #0x18 ldr r6, _081AAA2C ldr r0, _081AAA30 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] cmp r0, #0 bne _081AAA34 adds r0, r4, #0 - bl sub_08000540 + bl SetMainCallback2 b _081AAAB2 .align 2, 0 _081AAA2C: .4byte gUnknown_203CB20 @@ -874948,7 +874948,7 @@ _081AAA68: movs r2, #0xa bl memset ldr r0, _081AAAD0 - bl sub_08000540 + bl SetMainCallback2 _081AAAB2: pop {r4, r5, r6, r7} pop {r0} @@ -874960,35 +874960,35 @@ _081AAAC0: .4byte 0x0000081A _081AAAC4: .4byte 0x0000081E _081AAAC8: .4byte 0x0000081F _081AAACC: .4byte 0x00000804 -_081AAAD0: .4byte sub_081AAB04 - thumb_func_end sub_081AAA08 +_081AAAD0: .4byte CB2_Bag + thumb_func_end GoToBagMenu thumb_func_start sub_081AAAD4 sub_081AAAD4: @ 0x081AAAD4 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081AAAD4 - thumb_func_start sub_081AAAF0 -sub_081AAAF0: @ 0x081AAAF0 + thumb_func_start c2_bag_3 +c2_bag_3: @ 0x081AAAF0 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AAAF0 + thumb_func_end c2_bag_3 - thumb_func_start sub_081AAB04 -sub_081AAB04: @ 0x081AAB04 + thumb_func_start CB2_Bag +CB2_Bag: @ 0x081AAB04 push {lr} _081AAB06: bl sub_081221F8 @@ -874996,7 +874996,7 @@ _081AAB06: lsrs r0, r0, #0x18 cmp r0, #1 beq _081AAB2A - bl sub_081AAB30 + bl SetupBagMenu lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -875010,10 +875010,10 @@ _081AAB2A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AAB04 + thumb_func_end CB2_Bag - thumb_func_start sub_081AAB30 -sub_081AAB30: @ 0x081AAB30 + thumb_func_start SetupBagMenu +SetupBagMenu: @ 0x081AAB30 push {r4, r5, lr} sub sp, #4 ldr r1, _081AAB50 @@ -875057,11 +875057,11 @@ _081AAB58: @ jump table .4byte _081AAD4E @ case 19 .4byte _081AAD68 @ case 20 _081AABAC: - bl sub_08121E58 + bl SetVBlankHBlankCallbacksToNull bl sub_08199640 b _081AAD82 _081AABB6: - bl sub_080B9710 + bl ScanlineEffect_Stop ldr r1, _081AABC4 movs r2, #0x87 lsls r2, r2, #3 @@ -875100,7 +875100,7 @@ _081AABFE: lsls r0, r0, #0x18 cmp r0, #0 bne _081AAC0C - bl sub_080A8818 + bl ResetTasks _081AAC0C: ldr r1, _081AAC18 movs r2, #0x87 @@ -875110,7 +875110,7 @@ _081AAC0C: .align 2, 0 _081AAC18: .4byte gUnknown_3002360 _081AAC1C: - bl sub_081AADC0 + bl BagMenu_InitBGs ldr r0, _081AAC38 ldr r0, [r0] ldr r1, _081AAC3C @@ -875127,7 +875127,7 @@ _081AAC38: .4byte gUnknown_203CB20 _081AAC3C: .4byte 0x00000834 _081AAC40: .4byte gUnknown_3002360 _081AAC44: - bl sub_081AAE2C + bl LoadBagMenu_Graphics lsls r0, r0, #0x18 cmp r0, #0 bne _081AAC50 @@ -875135,7 +875135,7 @@ _081AAC44: _081AAC50: b _081AAD82 _081AAC52: - bl sub_081ADD2C + bl SetupBagMenu_Textboxes ldr r1, _081AAC60 movs r2, #0x87 lsls r2, r2, #3 @@ -875149,7 +875149,7 @@ _081AAC64: bl sub_081AB88C b _081AAD82 _081AAC72: - bl sub_081AAF88 + bl AllocateBagItemListBuffers ldr r1, _081AAC80 movs r2, #0x87 lsls r2, r2, #3 @@ -875160,7 +875160,7 @@ _081AAC80: .4byte gUnknown_3002360 _081AAC84: ldr r0, _081AAC90 ldrb r0, [r0, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers b _081AAD82 .align 2, 0 _081AAC90: .4byte gUnknown_203CB24 @@ -875175,7 +875175,7 @@ _081AAC94: bl sub_081AB4A0 ldrb r0, [r4, #5] movs r1, #1 - bl sub_081AC030 + bl BagMenu_DrawPocketIndicatorSquare ldr r1, _081AACC0 movs r2, #0x87 lsls r2, r2, #3 @@ -875188,7 +875188,7 @@ _081AACC0: .4byte gUnknown_3002360 _081AACC4: ldr r4, _081AAD04 ldrb r0, [r4, #4] - bl sub_081AAF60 + bl AccessHallOfFamePC adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -875202,7 +875202,7 @@ _081AACC4: adds r4, #8 adds r2, r2, r4 ldrh r2, [r2] - bl sub_081AE25C + bl ListMenuInit ldr r2, _081AAD0C lsls r1, r5, #2 adds r1, r1, r5 @@ -875222,7 +875222,7 @@ _081AAD0C: .4byte gUnknown_3005B60 _081AAD10: ldr r0, _081AAD24 ldrb r0, [r0, #5] - bl sub_080D4584 + bl AddBagVisualSprite ldr r1, _081AAD28 movs r2, #0x87 lsls r2, r2, #3 @@ -875235,8 +875235,8 @@ _081AAD2C: bl sub_080D4830 b _081AAD82 _081AAD32: - bl sub_081AB568 - bl sub_081AB600 + bl bag_menu_add_pocket_scroll_arrow_indicators_maybe + bl bag_menu_add_list_scroll_arrow_indicators_maybe ldr r1, _081AAD44 movs r2, #0x87 lsls r2, r2, #3 @@ -875245,14 +875245,14 @@ _081AAD32: .align 2, 0 _081AAD44: .4byte gUnknown_3002360 _081AAD48: - bl sub_081ADF8C + bl BagMenu_PrepareTMHMMoveWindow b _081AAD82 _081AAD4E: movs r0, #1 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r1, _081AAD64 movs r2, #0x87 lsls r2, r2, #3 @@ -875267,7 +875267,7 @@ _081AAD68: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _081AAD94 ldrb r1, [r2, #8] movs r0, #0x7f @@ -875288,13 +875288,13 @@ _081AAD94: .4byte gUnknown_2037C74 _081AAD98: .4byte gUnknown_3002360 _081AAD9C: ldr r0, _081AADAC - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081AADB0 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _081AADB6 .align 2, 0 -_081AADAC: .4byte sub_081AAAF0 +_081AADAC: .4byte c2_bag_3 _081AADB0: .4byte sub_081AAAD4 _081AADB4: movs r0, #0 @@ -875304,12 +875304,12 @@ _081AADB6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AAB30 + thumb_func_end SetupBagMenu - thumb_func_start sub_081AADC0 -sub_081AADC0: @ 0x081AADC0 + thumb_func_start BagMenu_InitBGs +BagMenu_InitBGs: @ 0x081AADC0 push {r4, lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs ldr r4, _081AAE24 ldr r0, [r4] adds r0, #4 @@ -875326,20 +875326,20 @@ sub_081AADC0: @ 0x081AADC0 ldr r1, [r4] adds r1, #4 movs r0, #2 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -875349,10 +875349,10 @@ sub_081AADC0: @ 0x081AADC0 .align 2, 0 _081AAE24: .4byte gUnknown_203CB20 _081AAE28: .4byte gUnknown_85DF7C8 - thumb_func_end sub_081AADC0 + thumb_func_end BagMenu_InitBGs - thumb_func_start sub_081AAE2C -sub_081AAE2C: @ 0x081AAE2C + thumb_func_start LoadBagMenu_Graphics +LoadBagMenu_Graphics: @ 0x081AAE2C push {r4, lr} sub sp, #4 ldr r4, _081AAE4C @@ -875388,12 +875388,12 @@ _081AAE6C: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _081AAF1E .align 2, 0 _081AAE84: .4byte gUnknown_8D9A7CC _081AAE88: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -875409,7 +875409,7 @@ _081AAE88: _081AAEA4: .4byte gUnknown_8D9AA84 _081AAEA8: .4byte gUnknown_203CB20 _081AAEAC: - bl sub_081ADA60 + bl IsWallysBag lsls r0, r0, #0x18 cmp r0, #0 bne _081AAED4 @@ -875421,7 +875421,7 @@ _081AAEAC: ldr r0, _081AAED0 movs r1, #0 movs r2, #0x40 - bl sub_080A11BC + bl LoadCompressedPalette b _081AAF1E .align 2, 0 _081AAECC: .4byte gUnknown_3005AF0 @@ -875430,12 +875430,12 @@ _081AAED4: ldr r0, _081AAEE0 movs r1, #0 movs r2, #0x40 - bl sub_080A11BC + bl LoadCompressedPalette b _081AAF1E .align 2, 0 _081AAEE0: .4byte gUnknown_8D9A734 _081AAEE4: - bl sub_081ADA60 + bl IsWallysBag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -875447,20 +875447,20 @@ _081AAEE4: bne _081AAF0C _081AAEFA: ldr r0, _081AAF08 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _081AAF1E .align 2, 0 _081AAF04: .4byte gUnknown_3005AF0 _081AAF08: .4byte gUnknown_855A664 _081AAF0C: ldr r0, _081AAF14 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _081AAF1E .align 2, 0 _081AAF14: .4byte gUnknown_855A66C _081AAF18: ldr r0, _081AAF30 - bl sub_080343E4 + bl LoadCompressedSpritePalette _081AAF1E: ldr r0, _081AAF34 ldr r1, [r0] @@ -875494,10 +875494,10 @@ _081AAF56: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AAE2C + thumb_func_end LoadBagMenu_Graphics - thumb_func_start sub_081AAF60 -sub_081AAF60: @ 0x081AAF60 + thumb_func_start AccessHallOfFamePC +AccessHallOfFamePC: @ 0x081AAF60 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -875506,22 +875506,22 @@ sub_081AAF60: @ 0x081AAF60 ldr r0, _081AAF70 b _081AAF76 .align 2, 0 -_081AAF70: .4byte sub_081ADBA4 +_081AAF70: .4byte Task_WallyTutorialBagMenu _081AAF74: ldr r0, _081AAF84 _081AAF76: movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _081AAF84: .4byte sub_081ABAB4 - thumb_func_end sub_081AAF60 + thumb_func_end AccessHallOfFamePC - thumb_func_start sub_081AAF88 -sub_081AAF88: @ 0x081AAF88 + thumb_func_start AllocateBagItemListBuffers +AllocateBagItemListBuffers: @ 0x081AAF88 push {r4, lr} ldr r4, _081AAFA8 movs r0, #0x82 @@ -875539,10 +875539,10 @@ sub_081AAF88: @ 0x081AAF88 .align 2, 0 _081AAFA8: .4byte gUnknown_203CB40 _081AAFAC: .4byte gUnknown_203CB44 - thumb_func_end sub_081AAF88 + thumb_func_end AllocateBagItemListBuffers - thumb_func_start sub_081AAFB0 -sub_081AAFB0: @ 0x081AAFB0 + thumb_func_start LoadBagItemListBuffers +LoadBagItemListBuffers: @ 0x081AAFB0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -875706,7 +875706,7 @@ _081AB0FC: .4byte gUnknown_203CB20 _081AB100: .4byte gUnknown_3006050 _081AB104: .4byte gUnknown_85DF7D4 _081AB108: .4byte 0x0000082E - thumb_func_end sub_081AAFB0 + thumb_func_end LoadBagItemListBuffers thumb_func_start sub_081AB10C sub_081AB10C: @ 0x081AB10C @@ -875729,7 +875729,7 @@ _081AB12C: .4byte gUnknown_203CB24 _081AB130: ldr r4, _081AB164 adds r0, r5, #0 - bl sub_081B69B4 + bl ItemIdToBattleMoveId adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0xd @@ -875780,7 +875780,7 @@ _081AB1A6: ldr r1, _081AB1BC _081AB1A8: adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _081AB1AE: pop {r4, r5, r6} pop {r0} @@ -875791,8 +875791,8 @@ _081AB1B8: .4byte gUnknown_2021C54 _081AB1BC: .4byte gUnknown_85C976F thumb_func_end sub_081AB10C - thumb_func_start sub_081AB1C0 -sub_081AB1C0: @ 0x081AB1C0 + thumb_func_start BagMenu_MoveCursorCallback +BagMenu_MoveCursorCallback: @ 0x081AB1C0 push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x18 @@ -875801,7 +875801,7 @@ sub_081AB1C0: @ 0x081AB1C0 beq _081AB1D6 movs r0, #5 bl sub_080A306C - bl sub_080D4648 + bl ShakeBagVisual _081AB1D6: ldr r4, _081AB228 ldr r1, [r4] @@ -875838,7 +875838,7 @@ _081AB1D6: ldrb r1, [r1] lsls r1, r1, #0x1a lsrs r1, r1, #0x1e - bl sub_080D47BC + bl AddBagItemIconSprite b _081AB24A .align 2, 0 _081AB228: .4byte gUnknown_203CB20 @@ -875853,7 +875853,7 @@ _081AB238: ldrb r1, [r1] lsls r1, r1, #0x1a lsrs r1, r1, #0x1e - bl sub_080D47BC + bl AddBagItemIconSprite _081AB24A: ldr r5, _081AB28C ldr r2, [r5] @@ -875878,7 +875878,7 @@ _081AB24A: cmp r0, #0 bne _081AB27C adds r0, r6, #0 - bl sub_081AB414 + bl BagMenu_PrintDescription _081AB27C: pop {r4, r5, r6} pop {r0} @@ -875887,10 +875887,10 @@ _081AB27C: _081AB284: .4byte 0x0000FFFF _081AB288: .4byte 0x0000081B _081AB28C: .4byte gUnknown_203CB20 - thumb_func_end sub_081AB1C0 + thumb_func_end BagMenu_MoveCursorCallback - thumb_func_start sub_081AB290 -sub_081AB290: @ 0x081AB290 + thumb_func_start PrintItemQuantityPlusGFX +PrintItemQuantityPlusGFX: @ 0x081AB290 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -875921,7 +875921,7 @@ _081AB2B0: bne _081AB2D8 adds r0, r7, #0 movs r1, #2 - bl sub_081AB508 + bl BagMenu_PrintCursor b _081AB2E0 .align 2, 0 _081AB2D0: .4byte gUnknown_203CB20 @@ -875929,7 +875929,7 @@ _081AB2D4: .4byte 0x0000081A _081AB2D8: adds r0, r7, #0 movs r1, #0xff - bl sub_081AB508 + bl BagMenu_PrintCursor _081AB2E0: ldr r5, _081AB368 ldrb r0, [r5, #5] @@ -875947,7 +875947,7 @@ _081AB2E0: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 - bl sub_080D6748 + bl BagGetQuantityByPocketPosition lsls r0, r0, #0x10 lsrs r4, r0, #0x10 mov sb, r4 @@ -875979,7 +875979,7 @@ _081AB32E: ldr r4, _081AB378 ldr r1, _081AB37C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders str r7, [sp] movs r1, #0 str r1, [sp, #4] @@ -875991,7 +875991,7 @@ _081AB32E: movs r1, #1 adds r2, r4, #0 movs r3, #0x58 - bl sub_081ADD94 + bl BagMenu_Print b _081AB3FA .align 2, 0 _081AB368: .4byte gUnknown_203CB24 @@ -876017,7 +876017,7 @@ _081AB380: ldr r4, _081AB3C8 ldr r1, _081AB3CC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders str r7, [sp] str r5, [sp, #4] str r5, [sp, #8] @@ -876028,7 +876028,7 @@ _081AB380: movs r1, #1 adds r2, r4, #0 movs r3, #0x60 - bl sub_081ADD94 + bl BagMenu_Print b _081AB3FA .align 2, 0 _081AB3C4: .4byte gUnknown_2021C40 @@ -876067,10 +876067,10 @@ _081AB3FA: _081AB408: .4byte gUnknown_3005AEC _081AB40C: .4byte 0x00000496 _081AB410: .4byte gUnknown_85DF8DC - thumb_func_end sub_081AB290 + thumb_func_end PrintItemQuantityPlusGFX - thumb_func_start sub_081AB414 -sub_081AB414: @ 0x081AB414 + thumb_func_start BagMenu_PrintDescription +BagMenu_PrintDescription: @ 0x081AB414 push {r4, lr} sub sp, #0x14 adds r1, r0, #0 @@ -876105,11 +876105,11 @@ _081AB444: ldr r4, _081AB498 ldr r1, _081AB49C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _081AB460: movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -876121,7 +876121,7 @@ _081AB460: movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print add sp, #0x14 pop {r4} pop {r0} @@ -876132,7 +876132,7 @@ _081AB490: .4byte gUnknown_85C96F8 _081AB494: .4byte gUnknown_203CB24 _081AB498: .4byte gUnknown_2021C7C _081AB49C: .4byte gUnknown_85C9738 - thumb_func_end sub_081AB414 + thumb_func_end BagMenu_PrintDescription thumb_func_start sub_081AB4A0 sub_081AB4A0: @ 0x081AB4A0 @@ -876151,7 +876151,7 @@ sub_081AB4A0: @ 0x081AB4A0 strb r0, [r1, #8] movs r0, #2 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -876164,33 +876164,33 @@ sub_081AB4A0: @ 0x081AB4A0 movs r1, #1 add r2, sp, #0x14 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print add sp, #0x20 pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081AB4A0 - thumb_func_start sub_081AB4E8 -sub_081AB4E8: @ 0x081AB4E8 + thumb_func_start BagMenu_PrintCursor_ +BagMenu_PrintCursor_: @ 0x081AB4E8 push {r4, lr} adds r4, r1, #0 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AE564 + bl ListMenuGetYCoordForPrintingArrowCursor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 - bl sub_081AB508 + bl BagMenu_PrintCursor pop {r4} pop {r0} bx r0 - thumb_func_end sub_081AB4E8 + thumb_func_end BagMenu_PrintCursor_ - thumb_func_start sub_081AB508 -sub_081AB508: @ 0x081AB508 + thumb_func_start BagMenu_PrintCursor +BagMenu_PrintCursor: @ 0x081AB508 push {r4, r5, lr} sub sp, #0x14 lsls r0, r0, #0x18 @@ -876228,7 +876228,7 @@ _081AB544: str r1, [sp, #0x10] movs r1, #1 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print _081AB55A: add sp, #0x14 pop {r4, r5} @@ -876236,10 +876236,10 @@ _081AB55A: bx r0 .align 2, 0 _081AB564: .4byte gUnknown_85C9421 - thumb_func_end sub_081AB508 + thumb_func_end BagMenu_PrintCursor - thumb_func_start sub_081AB568 -sub_081AB568: @ 0x081AB568 + thumb_func_start bag_menu_add_pocket_scroll_arrow_indicators_maybe +bag_menu_add_pocket_scroll_arrow_indicators_maybe: @ 0x081AB568 push {r4, r5, r6, lr} sub sp, #0x10 ldr r5, _081AB5C0 @@ -876273,7 +876273,7 @@ sub_081AB568: @ 0x081AB568 movs r1, #0xac movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r5] ldr r2, _081AB5C4 adds r1, r1, r2 @@ -876288,7 +876288,7 @@ _081AB5C0: .4byte gUnknown_203CB20 _081AB5C4: .4byte 0x0000081E _081AB5C8: .4byte gUnknown_203CB24 _081AB5CC: .4byte 0x00000829 - thumb_func_end sub_081AB568 + thumb_func_end bag_menu_add_pocket_scroll_arrow_indicators_maybe thumb_func_start sub_081AB5D0 sub_081AB5D0: @ 0x081AB5D0 @@ -876300,7 +876300,7 @@ sub_081AB5D0: @ 0x081AB5D0 ldrb r0, [r1] cmp r0, #0xff beq _081AB5EE - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r1, _081AB5FC adds r0, r0, r1 @@ -876316,8 +876316,8 @@ _081AB5F8: .4byte gUnknown_203CB20 _081AB5FC: .4byte 0x0000081E thumb_func_end sub_081AB5D0 - thumb_func_start sub_081AB600 -sub_081AB600: @ 0x081AB600 + thumb_func_start bag_menu_add_list_scroll_arrow_indicators_maybe +bag_menu_add_list_scroll_arrow_indicators_maybe: @ 0x081AB600 push {r4, lr} ldr r4, _081AB634 ldr r2, [r4] @@ -876335,7 +876335,7 @@ sub_081AB600: @ 0x081AB600 bne _081AB62E ldr r0, _081AB640 ldr r1, _081AB644 - bl sub_081AF058 + bl AddScrollIndicatorArrowPair ldr r1, [r4] ldr r2, _081AB63C adds r1, r1, r2 @@ -876350,7 +876350,7 @@ _081AB638: .4byte 0x0000081B _081AB63C: .4byte 0x0000081F _081AB640: .4byte gUnknown_85DF8CC _081AB644: .4byte gUnknown_203CB2A - thumb_func_end sub_081AB600 + thumb_func_end bag_menu_add_list_scroll_arrow_indicators_maybe thumb_func_start sub_081AB648 sub_081AB648: @ 0x081AB648 @@ -876362,7 +876362,7 @@ sub_081AB648: @ 0x081AB648 ldrb r0, [r1] cmp r0, #0xff beq _081AB666 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r1, _081AB670 adds r0, r0, r1 @@ -876382,14 +876382,14 @@ sub_081AB674: @ 0x081AB674 push {lr} ldr r0, _081AB698 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _081AB69C ldr r0, [r0] - bl sub_08000BF0 - bl sub_080034D4 + bl Free + bl FreeAllWindowBuffers ldr r0, _081AB6A0 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 @@ -876411,7 +876411,7 @@ sub_081AB6A4: @ 0x081AB6A4 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081AB6D4 lsls r0, r4, #2 adds r0, r0, r4 @@ -876425,11 +876425,11 @@ sub_081AB6A4: @ 0x081AB6A4 bx r0 .align 2, 0 _081AB6D4: .4byte gUnknown_3005B60 -_081AB6D8: .4byte sub_081AB6DC +_081AB6D8: .4byte TaskCloseBagMenu_2 thumb_func_end sub_081AB6A4 - thumb_func_start sub_081AB6DC -sub_081AB6DC: @ 0x081AB6DC + thumb_func_start TaskCloseBagMenu_2 +TaskCloseBagMenu_2: @ 0x081AB6DC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -876454,13 +876454,13 @@ sub_081AB6DC: @ 0x081AB6DC adds r3, r4, #0 adds r3, #8 adds r2, r2, r3 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _081AB72C ldr r0, [r0] ldr r0, [r0] cmp r0, #0 beq _081AB730 - bl sub_08000540 + bl SetMainCallback2 b _081AB736 .align 2, 0 _081AB720: .4byte gUnknown_3005B68 @@ -876469,20 +876469,20 @@ _081AB728: .4byte gUnknown_203CB24 _081AB72C: .4byte gUnknown_203CB20 _081AB730: ldr r0, [r4] - bl sub_08000540 + bl SetMainCallback2 _081AB736: bl sub_081AB5D0 bl ResetSpriteData bl FreeAllSpritePalettes bl sub_081AB674 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081AB74C: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AB6DC + thumb_func_end TaskCloseBagMenu_2 thumb_func_start sub_081AB754 sub_081AB754: @ 0x081AB754 @@ -876497,13 +876497,13 @@ sub_081AB754: @ 0x081AB754 cmp r5, #2 blt _081AB774 adds r0, r4, #0 - bl sub_080D67CC + bl SortBerriesOrTMHMs b _081AB77A .align 2, 0 _081AB770: .4byte gUnknown_2039A78 _081AB774: adds r0, r4, #0 - bl sub_080D677C + bl CompactItemsInBagPocket _081AB77A: ldr r0, _081AB7F4 ldr r1, [r0] @@ -876605,8 +876605,8 @@ _081AB81C: .align 2, 0 thumb_func_end sub_081AB818 - thumb_func_start sub_081AB834 -sub_081AB834: @ 0x081AB834 + thumb_func_start SetInitialScrollAndCursorPositions +SetInitialScrollAndCursorPositions: @ 0x081AB834 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -876634,7 +876634,7 @@ sub_081AB834: @ 0x081AB834 _081AB864: .4byte gUnknown_203CB36 _081AB868: .4byte gUnknown_203CB20 _081AB86C: .4byte 0x0000082E - thumb_func_end sub_081AB834 + thumb_func_end SetInitialScrollAndCursorPositions thumb_func_start SetPocketListPositions SetPocketListPositions: @ 0x081AB870 @@ -876642,7 +876642,7 @@ SetPocketListPositions: @ 0x081AB870 movs r4, #0 _081AB874: adds r0, r4, #0 - bl sub_081AB834 + bl SetInitialScrollAndCursorPositions adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -876714,8 +876714,8 @@ GetItemListPosition: @ 0x081AB8D8 _081AB8F4: .4byte gUnknown_203CB24 thumb_func_end GetItemListPosition - thumb_func_start sub_081AB8F8 -sub_081AB8F8: @ 0x081AB8F8 + thumb_func_start DisplayItemMessage +DisplayItemMessage: @ 0x081AB8F8 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -876735,12 +876735,12 @@ sub_081AB8F8: @ 0x081AB8F8 ldr r0, _081AB964 adds r4, r4, r0 movs r0, #4 - bl sub_081ADE9C + bl AddItemMessageWindow lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x14] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer bl GetPlayerTextSpeedDelay lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -876754,9 +876754,9 @@ sub_081AB8F8: @ 0x081AB8F8 adds r0, r5, #0 movs r2, #0xa movs r3, #0xd - bl sub_08121E6C + bl DisplayMessageAndContinueTask movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0x10 pop {r3, r4} mov r8, r3 @@ -876766,10 +876766,10 @@ sub_081AB8F8: @ 0x081AB8F8 bx r0 .align 2, 0 _081AB964: .4byte gUnknown_3005B68 - thumb_func_end sub_081AB8F8 + thumb_func_end DisplayItemMessage - thumb_func_start sub_081AB968 -sub_081AB968: @ 0x081AB968 + thumb_func_start BagMenu_InitListsMenu +BagMenu_InitListsMenu: @ 0x081AB968 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -876796,25 +876796,25 @@ sub_081AB968: @ 0x081AB968 ldrb r0, [r5] mov r1, r8 adds r2, r4, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r7, #5] bl sub_081AB754 ldrb r0, [r7, #5] - bl sub_081AB834 + bl SetInitialScrollAndCursorPositions ldrb r0, [r7, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081AB9E4 mov r2, r8 ldrh r1, [r2] ldrh r2, [r4] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r6, #0 - bl sub_081ABC58 + bl set_callback3_to_bag pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -876824,10 +876824,10 @@ sub_081AB968: @ 0x081AB968 _081AB9DC: .4byte gUnknown_3005B68 _081AB9E0: .4byte gUnknown_203CB24 _081AB9E4: .4byte gUnknown_3006050 - thumb_func_end sub_081AB968 + thumb_func_end BagMenu_InitListsMenu - thumb_func_start sub_081AB9E8 -sub_081AB9E8: @ 0x081AB9E8 + thumb_func_start GetItemName +GetItemName: @ 0x081AB9E8 push {r4, r5, r6, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -876852,9 +876852,9 @@ _081ABA08: ldr r4, _081ABA48 ldr r1, _081ABA4C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r5, #0 - bl sub_081ADE14 + bl BagMenu_AddWindow lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r3, r6, #0 @@ -876874,7 +876874,7 @@ _081ABA08: _081ABA44: .4byte gUnknown_2021C40 _081ABA48: .4byte gUnknown_2021C7C _081ABA4C: .4byte gUnknown_85C943C - thumb_func_end sub_081AB9E8 + thumb_func_end GetItemName thumb_func_start sub_081ABA50 sub_081ABA50: @ 0x081ABA50 @@ -876905,7 +876905,7 @@ _081ABA74: ldr r4, _081ABAAC ldr r1, _081ABAB0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r3, r5, #0 movs r0, #2 str r0, [sp] @@ -876967,7 +876967,7 @@ _081ABAF2: beq _081ABB00 b _081ABC3E _081ABB00: - bl sub_081ABC9C + bl GetSwitchBagPocketDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -877006,7 +877006,7 @@ _081ABB4C: movs r1, #1 _081ABB50: movs r2, #0 - bl sub_081ABD34 + bl Fill1PRecords b _081ABC3E _081ABB58: ldrb r0, [r6] @@ -877039,7 +877039,7 @@ _081ABB94: .4byte gUnknown_203CB24 _081ABB98: .4byte 0x00000829 _081ABB9C: ldrb r0, [r6] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r4, r0, #0 ldrb r0, [r6] adds r1, r7, #0 @@ -877083,7 +877083,7 @@ _081ABBF4: bl sub_081AB5D0 ldrb r0, [r6] movs r1, #2 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ strh r4, [r6, #2] ldrb r0, [r5, #5] adds r0, #1 @@ -877092,7 +877092,7 @@ _081ABBF4: lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r1, r4, #0 - bl sub_080D6748 + bl BagGetQuantityByPocketPosition strh r0, [r6, #4] ldrb r0, [r5, #5] adds r0, #1 @@ -877123,22 +877123,22 @@ _081ABC50: .4byte gUnknown_203CB48 _081ABC54: .4byte gUnknown_85DF88C thumb_func_end sub_081ABAB4 - thumb_func_start sub_081ABC58 -sub_081ABC58: @ 0x081ABC58 + thumb_func_start set_callback3_to_bag +set_callback3_to_bag: @ 0x081ABC58 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AB568 - bl sub_081AB600 + bl bag_menu_add_pocket_scroll_arrow_indicators_maybe + bl bag_menu_add_list_scroll_arrow_indicators_maybe movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #4 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081ABC94 lsls r0, r4, #2 adds r0, r0, r4 @@ -877152,10 +877152,10 @@ sub_081ABC58: @ 0x081ABC58 .align 2, 0 _081ABC94: .4byte gUnknown_3005B60 _081ABC98: .4byte sub_081ABAB4 - thumb_func_end sub_081ABC58 + thumb_func_end set_callback3_to_bag - thumb_func_start sub_081ABC9C -sub_081ABC9C: @ 0x081ABC9C + thumb_func_start GetSwitchBagPocketDirection +GetSwitchBagPocketDirection: @ 0x081ABC9C push {lr} ldr r0, _081ABCD4 ldr r0, [r0] @@ -877166,7 +877166,7 @@ sub_081ABC9C: @ 0x081ABC9C ands r0, r1 cmp r0, #0 bne _081ABCF6 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r2, r0, #0x18 ldr r0, _081ABCDC @@ -877203,7 +877203,7 @@ _081ABCF6: _081ABCF8: pop {r1} bx r1 - thumb_func_end sub_081ABC9C + thumb_func_end GetSwitchBagPocketDirection thumb_func_start ChangeBagPocketId ChangeBagPocketId: @ 0x081ABCFC @@ -877240,8 +877240,8 @@ _081ABD2C: bx r0 thumb_func_end ChangeBagPocketId - thumb_func_start sub_081ABD34 -sub_081ABD34: @ 0x081ABD34 + thumb_func_start Fill1PRecords +Fill1PRecords: @ 0x081ABD34 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -877263,9 +877263,9 @@ sub_081ABD34: @ 0x081ABD34 cmp r2, #0 bne _081ABDB6 movs r0, #0 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] ldr r3, _081ABE00 ldrb r2, [r3, #5] @@ -877275,9 +877275,9 @@ sub_081ABD34: @ 0x081ABD34 adds r1, r2, r1 adds r3, #8 adds r2, r2, r3 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r3, _081ABE04 ldr r0, _081ABE08 ldr r2, [r0] @@ -877366,11 +877366,11 @@ _081ABE46: ldr r0, _081ABEB4 ldrb r0, [r0, #5] movs r1, #0 - bl sub_081AC030 + bl BagMenu_DrawPocketIndicatorSquare add r0, sp, #8 ldrb r0, [r0] movs r1, #1 - bl sub_081AC030 + bl BagMenu_DrawPocketIndicatorSquare movs r0, #0xf str r0, [sp] movs r0, #0x10 @@ -877381,16 +877381,16 @@ _081ABE46: movs r3, #2 bl FillBgTilemapBufferRect_Palette0 movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add r0, sp, #8 ldrb r0, [r0] movs r1, #1 - bl sub_080D45BC + bl SetBagVisualPocketId movs r0, #1 - bl sub_080D452C + bl RemoveBagSprite mov r1, r8 asrs r0, r1, #0x10 - bl sub_080D46B8 + bl AddSwitchPocketRotatingBallSprite ldr r1, _081ABEB8 ldr r2, _081ABEBC lsls r0, r7, #2 @@ -877412,7 +877412,7 @@ _081ABEB0: .4byte gUnknown_85C9742 _081ABEB4: .4byte gUnknown_203CB24 _081ABEB8: .4byte sub_081ABEC0 _081ABEBC: .4byte gUnknown_3005B60 - thumb_func_end sub_081ABD34 + thumb_func_end Fill1PRecords thumb_func_start sub_081ABEC0 sub_081ABEC0: @ 0x081ABEC0 @@ -877428,11 +877428,11 @@ sub_081ABEC0: @ 0x081ABEC0 lsls r0, r0, #0x18 cmp r0, #0 bne _081ABF38 - bl sub_081ADA60 + bl IsWallysBag lsls r0, r0, #0x18 cmp r0, #0 bne _081ABF38 - bl sub_081ABC9C + bl GetSwitchBagPocketDirection lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -877466,7 +877466,7 @@ _081ABF18: movs r1, #1 _081ABF2C: movs r2, #1 - bl sub_081ABD34 + bl Fill1PRecords b _081ABFF2 .align 2, 0 _081ABF34: .4byte gUnknown_203CB29 @@ -877529,7 +877529,7 @@ _081ABFA0: bl ChangeBagPocketId subs r5, r4, #5 ldrb r0, [r5, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081ABFFC ldrb r2, [r5, #5] lsls r2, r2, #1 @@ -877540,18 +877540,18 @@ _081ABFA0: adds r4, #3 adds r2, r2, r4 ldrh r2, [r2] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6] movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 - bl sub_081AB568 - bl sub_081AB600 + bl schedule_bg_copy_tilemap_to_vram + bl bag_menu_add_pocket_scroll_arrow_indicators_maybe + bl bag_menu_add_list_scroll_arrow_indicators_maybe adds r0, r7, #0 bl SwitchTaskToFollowupFunc _081ABFF2: @@ -877582,15 +877582,15 @@ sub_081AC000: @ 0x081AC000 movs r2, #0xe bl FillBgTilemapBufferRect_Palette0 movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081AC000 - thumb_func_start sub_081AC030 -sub_081AC030: @ 0x081AC030 + thumb_func_start BagMenu_DrawPocketIndicatorSquare +BagMenu_DrawPocketIndicatorSquare: @ 0x081AC030 push {lr} sub sp, #8 lsls r0, r0, #0x18 @@ -877624,13 +877624,13 @@ _081AC05C: bl FillBgTilemapBufferRect_Palette0 _081AC072: movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r0} bx r0 .align 2, 0 _081AC080: .4byte 0x0000102B - thumb_func_end sub_081AC030 + thumb_func_end BagMenu_DrawPocketIndicatorSquare thumb_func_start sub_081AC084 sub_081AC084: @ 0x081AC084 @@ -877675,7 +877675,7 @@ sub_081AC0AC: @ 0x081AC0AC ldrb r0, [r6] movs r1, #0x10 movs r2, #1 - bl sub_081AEE34 + bl ListMenuSetUnkIndicatorsStructField ldr r3, _081AC168 ldrb r0, [r3, #5] lsls r0, r0, #1 @@ -877708,10 +877708,10 @@ sub_081AC0AC: @ 0x081AC0AC ldr r0, _081AC178 mov r8, r0 ldr r1, _081AC17C - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] str r5, [sp, #4] @@ -877722,13 +877722,13 @@ sub_081AC0AC: @ 0x081AC0AC movs r1, #1 mov r2, r8 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print ldrb r0, [r6, #2] bl sub_080D4870 bl sub_081AB648 ldrb r0, [r6] movs r1, #2 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ movs r2, #8 rsbs r2, r2, #0 add sb, r2 @@ -877796,7 +877796,7 @@ _081AC1D4: .4byte gUnknown_3002360 _081AC1D8: .4byte gUnknown_203CB24 _081AC1DC: ldrb r0, [r4] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r7, r0, #0 ldrb r0, [r4] ldr r5, _081AC220 @@ -877921,7 +877921,7 @@ _081AC2BC: ldrb r0, [r1] mov r1, r8 adds r2, r7, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask mov r2, sb movs r1, #2 ldrsh r0, [r2, r1] @@ -877936,19 +877936,19 @@ _081AC2BC: strh r0, [r1] _081AC2FC: ldrb r0, [r5, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081AC348 mov r2, r8 ldrh r1, [r2] ldrh r2, [r7] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, sb strh r0, [r1] movs r0, #1 bl sub_080D484C - bl sub_081AB600 + bl bag_menu_add_list_scroll_arrow_indicators_maybe ldr r0, _081AC34C subs r0, #8 add r0, sl @@ -878008,7 +878008,7 @@ sub_081AC354: @ 0x081AC354 ldrb r0, [r7] adds r1, r6, #0 adds r2, r5, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #2 ldrsh r2, [r7, r0] ldrh r0, [r6] @@ -878024,17 +878024,17 @@ sub_081AC354: @ 0x081AC354 strh r0, [r1] _081AC3B6: ldrb r0, [r4, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081AC400 ldrh r1, [r6] ldrh r2, [r5] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7] movs r0, #1 bl sub_080D484C - bl sub_081AB600 + bl bag_menu_add_list_scroll_arrow_indicators_maybe mov r0, sl subs r0, #8 add r0, sb @@ -878423,7 +878423,7 @@ _081AC730: bne _081AC7D6 _081AC73E: movs r0, #6 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _081AC7D6 @@ -878493,16 +878493,16 @@ _081AC7D6: cmp r0, #2 bne _081AC814 movs r0, #1 - bl sub_08003774 + bl ClearWindowTilemap ldr r0, _081AC810 ldrh r0, [r0] - bl sub_081ADFD4 + bl PrintTMHMMoveData movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081AC84A .align 2, 0 _081AC800: .4byte gUnknown_203CB20 @@ -878518,10 +878518,10 @@ _081AC814: ldr r4, _081AC864 ldr r1, _081AC868 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -878533,7 +878533,7 @@ _081AC814: movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print _081AC84A: ldr r0, _081AC86C ldr r0, [r0] @@ -878556,7 +878556,7 @@ _081AC874: bne _081AC888 movs r0, #1 _081AC87A: - bl sub_081ADE14 + bl BagMenu_AddWindow lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_081AC8BC @@ -878565,7 +878565,7 @@ _081AC888: cmp r0, #4 bne _081AC8A0 movs r0, #2 - bl sub_081ADE14 + bl BagMenu_AddWindow lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 @@ -878574,7 +878574,7 @@ _081AC888: b _081AC8B2 _081AC8A0: movs r0, #3 - bl sub_081ADE14 + bl BagMenu_AddWindow lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #2 @@ -878619,10 +878619,10 @@ sub_081AC8BC: @ 0x081AC8BC movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_081989B4 + bl AddItemMenuActionTextPrinters movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp] @@ -878705,8 +878705,8 @@ _081AC9A0: .4byte gUnknown_85DF7EC _081AC9A4: .4byte gUnknown_203CB20 thumb_func_end sub_081AC938 - thumb_func_start sub_081AC9A8 -sub_081AC9A8: @ 0x081AC9A8 + thumb_func_start unknown_item_menu_type +unknown_item_menu_type: @ 0x081AC9A8 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -878730,7 +878730,7 @@ sub_081AC9A8: @ 0x081AC9A8 _081AC9D0: .4byte gUnknown_203CB20 _081AC9D4: .4byte 0x00000828 _081AC9D8: .4byte gUnknown_3005B60 -_081AC9DC: .4byte sub_081AC9FC +_081AC9DC: .4byte Task_HandleInBattleItemMenuInput _081AC9E0: ldr r0, _081AC9F4 lsls r1, r4, #2 @@ -878745,11 +878745,11 @@ _081AC9EC: bx r0 .align 2, 0 _081AC9F4: .4byte gUnknown_3005B60 -_081AC9F8: .4byte sub_081ACA70 - thumb_func_end sub_081AC9A8 +_081AC9F8: .4byte Task_HandleOutOfBattleItemMenuInput + thumb_func_end unknown_item_menu_type - thumb_func_start sub_081AC9FC -sub_081AC9FC: @ 0x081AC9FC + thumb_func_start Task_HandleInBattleItemMenuInput +Task_HandleInBattleItemMenuInput: @ 0x081AC9FC push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -878759,7 +878759,7 @@ sub_081AC9FC: @ 0x081AC9FC lsrs r0, r0, #0x18 cmp r0, #1 beq _081ACA62 - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 @@ -878803,10 +878803,10 @@ _081ACA62: .align 2, 0 _081ACA68: .4byte gUnknown_85DF7EC _081ACA6C: .4byte gUnknown_203CB20 - thumb_func_end sub_081AC9FC + thumb_func_end Task_HandleInBattleItemMenuInput - thumb_func_start sub_081ACA70 -sub_081ACA70: @ 0x081ACA70 + thumb_func_start Task_HandleOutOfBattleItemMenuInput +Task_HandleOutOfBattleItemMenuInput: @ 0x081ACA70 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -878817,7 +878817,7 @@ sub_081ACA70: @ 0x081ACA70 bne _081ACA84 b _081ACBE8 _081ACA84: - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r5, _081ACAC8 @@ -878888,7 +878888,7 @@ _081ACB14: ands r0, r1 cmp r0, #0 bne _081ACB28 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -878918,7 +878918,7 @@ _081ACB50: ands r0, r1 cmp r0, #0 bne _081ACB66 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -878990,7 +878990,7 @@ _081ACBE8: bx r0 .align 2, 0 _081ACBF0: .4byte gUnknown_85DF7EC - thumb_func_end sub_081ACA70 + thumb_func_end Task_HandleOutOfBattleItemMenuInput thumb_func_start sub_081ACBF4 sub_081ACBF4: @ 0x081ACBF4 @@ -879027,8 +879027,8 @@ _081ACC2A: .align 2, 0 thumb_func_end sub_081ACBF4 - thumb_func_start sub_081ACC30 -sub_081ACC30: @ 0x081ACC30 + thumb_func_start BagMenu_RemoveSomeWindow +BagMenu_RemoveSomeWindow: @ 0x081ACC30 push {lr} ldr r0, _081ACC48 ldr r0, [r0] @@ -879062,10 +879062,10 @@ _081ACC6E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081ACC30 + thumb_func_end BagMenu_RemoveSomeWindow - thumb_func_start sub_081ACC74 -sub_081ACC74: @ 0x081ACC74 + thumb_func_start ItemMenu_UseOutOfBattle +ItemMenu_UseOutOfBattle: @ 0x081ACC74 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -879074,7 +879074,7 @@ sub_081ACC74: @ 0x081ACC74 bl sub_080D6DF8 cmp r0, #0 beq _081ACCE6 - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow bl sub_0806B004 lsls r0, r0, #0x18 cmp r0, #0 @@ -879086,16 +879086,16 @@ sub_081ACC74: @ 0x081ACC74 cmp r0, #1 bne _081ACCB0 adds r0, r4, #0 - bl sub_081AD0E8 + bl BagMenu_PrintThereIsNoPokemon b _081ACCE6 .align 2, 0 _081ACCAC: .4byte gUnknown_203CB48 _081ACCB0: movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081ACCD8 ldrb r0, [r0, #5] cmp r0, #3 @@ -879117,10 +879117,10 @@ _081ACCE6: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081ACC74 + thumb_func_end ItemMenu_UseOutOfBattle - thumb_func_start sub_081ACCEC -sub_081ACCEC: @ 0x081ACCEC + thumb_func_start ItemMenu_Toss +ItemMenu_Toss: @ 0x081ACCEC push {r4, r5, r6, r7, lr} sub sp, #0x14 lsls r0, r0, #0x18 @@ -879130,7 +879130,7 @@ sub_081ACCEC: @ 0x081ACCEC lsls r6, r0, #3 ldr r7, _081ACD18 adds r4, r6, r7 - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow movs r0, #1 strh r0, [r4, #0x10] movs r1, #4 @@ -879150,10 +879150,10 @@ _081ACD1C: ldr r4, _081ACD74 ldr r1, _081ACD78 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -879165,9 +879165,9 @@ _081ACD1C: movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print movs r0, #7 - bl sub_081AB9E8 + bl GetItemName adds r0, r7, #0 subs r0, #8 adds r0, r6, r0 @@ -879183,8 +879183,8 @@ _081ACD6C: .4byte gUnknown_203CB48 _081ACD70: .4byte gUnknown_2021C40 _081ACD74: .4byte gUnknown_2021C7C _081ACD78: .4byte gUnknown_85C9523 -_081ACD7C: .4byte sub_081ACE3C - thumb_func_end sub_081ACCEC +_081ACD7C: .4byte Task_ChooseHowManyToToss + thumb_func_end ItemMenu_Toss thumb_func_start sub_081ACD80 sub_081ACD80: @ 0x081ACD80 @@ -879211,10 +879211,10 @@ sub_081ACD80: @ 0x081ACD80 ldr r4, _081ACDFC ldr r1, _081ACE00 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -879226,11 +879226,11 @@ sub_081ACD80: @ 0x081ACD80 movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print ldr r2, _081ACE04 adds r0, r5, #0 movs r1, #5 - bl sub_081ADF10 + bl BagMenu_YesNo add sp, #0x14 pop {r4, r5} pop {r0} @@ -879245,8 +879245,8 @@ _081ACE00: .4byte gUnknown_85C9540 _081ACE04: .4byte gUnknown_85DF8BC thumb_func_end sub_081ACD80 - thumb_func_start sub_081ACE08 -sub_081ACE08: @ 0x081ACE08 + thumb_func_start BagMenu_CancelToss +BagMenu_CancelToss: @ 0x081ACE08 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -879258,21 +879258,21 @@ sub_081ACE08: @ 0x081ACE08 adds r4, r4, r0 movs r1, #2 ldrsh r0, [r4, r1] - bl sub_081AB414 + bl BagMenu_PrintDescription ldrb r0, [r4] movs r1, #0 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ adds r0, r5, #0 - bl sub_081ABC58 + bl set_callback3_to_bag pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081ACE38: .4byte gUnknown_3005B68 - thumb_func_end sub_081ACE08 + thumb_func_end BagMenu_CancelToss - thumb_func_start sub_081ACE3C -sub_081ACE3C: @ 0x081ACE3C + thumb_func_start Task_ChooseHowManyToToss +Task_ChooseHowManyToToss: @ 0x081ACE3C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -879285,7 +879285,7 @@ sub_081ACE3C: @ 0x081ACE3C adds r0, r4, #0 adds r0, #0x10 ldrh r1, [r4, #4] - bl sub_08122040 + bl AdjustQuantityAccordingToDPadInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -879329,15 +879329,15 @@ _081ACEA4: movs r0, #7 bl sub_081ADE5C adds r0, r6, #0 - bl sub_081ACE08 + bl BagMenu_CancelToss _081ACEBE: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081ACE3C + thumb_func_end Task_ChooseHowManyToToss - thumb_func_start sub_081ACEC4 -sub_081ACEC4: @ 0x081ACEC4 + thumb_func_start BagMenu_ConfirmToss +BagMenu_ConfirmToss: @ 0x081ACEC4 push {r4, r5, r6, lr} sub sp, #0x14 lsls r0, r0, #0x18 @@ -879360,10 +879360,10 @@ sub_081ACEC4: @ 0x081ACEC4 ldr r6, _081ACF3C ldr r1, _081ACF40 adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -879375,7 +879375,7 @@ sub_081ACEC4: @ 0x081ACEC4 movs r1, #1 adds r2, r6, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print subs r5, #8 adds r4, r4, r5 ldr r0, _081ACF44 @@ -879391,11 +879391,11 @@ _081ACF34: .4byte gUnknown_2021C40 _081ACF38: .4byte gUnknown_2021C54 _081ACF3C: .4byte gUnknown_2021C7C _081ACF40: .4byte gUnknown_85C9532 -_081ACF44: .4byte sub_081ACF48 - thumb_func_end sub_081ACEC4 +_081ACF44: .4byte Task_ActuallyToss + thumb_func_end BagMenu_ConfirmToss - thumb_func_start sub_081ACF48 -sub_081ACF48: @ 0x081ACF48 + thumb_func_start Task_ActuallyToss +Task_ActuallyToss: @ 0x081ACF48 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -879427,29 +879427,29 @@ sub_081ACF48: @ 0x081ACF48 ldr r0, _081ACFDC ldrh r0, [r0] ldrh r1, [r5, #0x10] - bl sub_080D62BC + bl RemoveBagItem ldrb r0, [r5] mov r1, r8 adds r2, r7, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r4, #5] bl sub_081AB754 ldrb r0, [r4, #5] - bl sub_081AB834 + bl SetInitialScrollAndCursorPositions ldrb r0, [r4, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081ACFE0 mov r2, r8 ldrh r1, [r2] ldrh r2, [r7] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r6, #0 - bl sub_081ABC58 + bl set_callback3_to_bag _081ACFC6: pop {r3} mov r8, r3 @@ -879462,10 +879462,10 @@ _081ACFD4: .4byte gUnknown_203CB24 _081ACFD8: .4byte gUnknown_3002360 _081ACFDC: .4byte gUnknown_203CB48 _081ACFE0: .4byte gUnknown_3006050 - thumb_func_end sub_081ACF48 + thumb_func_end Task_ActuallyToss - thumb_func_start sub_081ACFE4 -sub_081ACFE4: @ 0x081ACFE4 + thumb_func_start ItemMenu_Register +ItemMenu_Register: @ 0x081ACFE4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -879506,39 +879506,39 @@ _081AD032: ldrb r0, [r7] adds r1, r6, #0 adds r2, r5, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _081AD068 ldrb r0, [r0, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081AD06C ldrh r1, [r6] ldrh r2, [r5] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r4, #0 - bl sub_081AD190 + bl ItemMenu_Cancel pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 _081AD068: .4byte gUnknown_203CB24 _081AD06C: .4byte gUnknown_3006050 - thumb_func_end sub_081ACFE4 + thumb_func_end ItemMenu_Register - thumb_func_start sub_081AD070 -sub_081AD070: @ 0x081AD070 + thumb_func_start ItemMenu_Give +ItemMenu_Give: @ 0x081AD070 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r6, r4, #0 - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow ldr r5, _081AD098 ldrh r0, [r5] - bl sub_08122188 + bl itemid_80BF6D8_mail_related lsls r0, r0, #0x18 cmp r0, #0 bne _081AD0A4 @@ -879546,7 +879546,7 @@ sub_081AD070: @ 0x081AD070 ldr r3, _081AD0A0 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _081AD0E2 .align 2, 0 _081AD098: .4byte gUnknown_203CB48 @@ -879563,7 +879563,7 @@ _081AD0A4: cmp r0, #0 bne _081AD0C2 adds r0, r4, #0 - bl sub_081AD0E8 + bl BagMenu_PrintThereIsNoPokemon b _081AD0E2 _081AD0C2: ldr r0, _081AD0D4 @@ -879578,31 +879578,31 @@ _081AD0D4: .4byte gUnknown_203CB20 _081AD0D8: .4byte sub_081B7C00 _081AD0DC: adds r0, r6, #0 - bl sub_081AD104 + bl BagMenu_PrintItemCantBeHeld _081AD0E2: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081AD070 + thumb_func_end ItemMenu_Give - thumb_func_start sub_081AD0E8 -sub_081AD0E8: @ 0x081AD0E8 + thumb_func_start BagMenu_PrintThereIsNoPokemon +BagMenu_PrintThereIsNoPokemon: @ 0x081AD0E8 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081AD0FC ldr r3, _081AD100 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage pop {r0} bx r0 .align 2, 0 _081AD0FC: .4byte gUnknown_85C9472 _081AD100: .4byte sub_081AD148 - thumb_func_end sub_081AD0E8 + thumb_func_end BagMenu_PrintThereIsNoPokemon - thumb_func_start sub_081AD104 -sub_081AD104: @ 0x081AD104 + thumb_func_start BagMenu_PrintItemCantBeHeld +BagMenu_PrintItemCantBeHeld: @ 0x081AD104 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -879614,12 +879614,12 @@ sub_081AD104: @ 0x081AD104 ldr r5, _081AD13C ldr r1, _081AD140 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _081AD144 adds r0, r4, #0 movs r1, #1 adds r2, r5, #0 - bl sub_081AB8F8 + bl DisplayItemMessage pop {r4, r5} pop {r0} bx r0 @@ -879629,7 +879629,7 @@ _081AD138: .4byte gUnknown_2021C40 _081AD13C: .4byte gUnknown_2021C7C _081AD140: .4byte gUnknown_85C948E _081AD144: .4byte sub_081AD148 - thumb_func_end sub_081AD104 + thumb_func_end BagMenu_PrintItemCantBeHeld thumb_func_start sub_081AD148 sub_081AD148: @ 0x081AD148 @@ -879645,7 +879645,7 @@ sub_081AD148: @ 0x081AD148 movs r0, #5 bl sub_080A306C adds r0, r4, #0 - bl sub_081AB968 + bl BagMenu_InitListsMenu _081AD166: pop {r4} pop {r0} @@ -879654,8 +879654,8 @@ _081AD166: _081AD16C: .4byte gUnknown_3002360 thumb_func_end sub_081AD148 - thumb_func_start sub_081AD170 -sub_081AD170: @ 0x081AD170 + thumb_func_start ItemMenu_CheckTag +ItemMenu_CheckTag: @ 0x081AD170 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -879668,11 +879668,11 @@ sub_081AD170: @ 0x081AD170 bx r0 .align 2, 0 _081AD188: .4byte gUnknown_203CB20 -_081AD18C: .4byte sub_08177AFC - thumb_func_end sub_081AD170 +_081AD18C: .4byte DoBerryTagScreen + thumb_func_end ItemMenu_CheckTag - thumb_func_start sub_081AD190 -sub_081AD190: @ 0x081AD190 + thumb_func_start ItemMenu_Cancel +ItemMenu_Cancel: @ 0x081AD190 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -879682,28 +879682,28 @@ sub_081AD190: @ 0x081AD190 lsls r4, r4, #3 ldr r0, _081AD1D0 adds r4, r4, r0 - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow movs r1, #2 ldrsh r0, [r4, r1] - bl sub_081AB414 + bl BagMenu_PrintDescription movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, #0 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ adds r0, r5, #0 - bl sub_081ABC58 + bl set_callback3_to_bag pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081AD1D0: .4byte gUnknown_3005B68 - thumb_func_end sub_081AD190 + thumb_func_end ItemMenu_Cancel - thumb_func_start sub_081AD1D4 -sub_081AD1D4: @ 0x081AD1D4 + thumb_func_start AnimRazorLeafParticle +AnimRazorLeafParticle: @ 0x081AD1D4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -879712,7 +879712,7 @@ sub_081AD1D4: @ 0x081AD1D4 bl sub_080D6E44 cmp r0, #0 beq _081AD1F8 - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow ldrh r0, [r4] bl sub_080D6E44 adds r1, r0, #0 @@ -879724,27 +879724,27 @@ _081AD1F8: bx r0 .align 2, 0 _081AD200: .4byte gUnknown_203CB48 - thumb_func_end sub_081AD1D4 + thumb_func_end AnimRazorLeafParticle - thumb_func_start sub_081AD204 -sub_081AD204: @ 0x081AD204 + thumb_func_start bag_menu_mail_related +bag_menu_mail_related: @ 0x081AD204 push {lr} movs r0, #0xc movs r1, #5 movs r2, #0 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 - thumb_func_end sub_081AD204 + thumb_func_end bag_menu_mail_related - thumb_func_start sub_081AD214 -sub_081AD214: @ 0x081AD214 + thumb_func_start item_menu_type_2 +item_menu_type_2: @ 0x081AD214 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r4, _081AD238 ldrh r0, [r4] - bl sub_08122188 + bl itemid_80BF6D8_mail_related lsls r0, r0, #0x18 cmp r0, #0 bne _081AD244 @@ -879752,7 +879752,7 @@ sub_081AD214: @ 0x081AD214 ldr r3, _081AD240 adds r0, r5, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _081AD2A6 .align 2, 0 _081AD238: .4byte gUnknown_203CB48 @@ -879770,12 +879770,12 @@ _081AD244: ldr r4, _081AD274 ldr r1, _081AD278 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _081AD27C adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage b _081AD2A6 .align 2, 0 _081AD270: .4byte gUnknown_2021C40 @@ -879799,15 +879799,15 @@ _081AD280: _081AD29C: .4byte gUnknown_203CB24 _081AD2A0: adds r0, r5, #0 - bl sub_081AD104 + bl BagMenu_PrintItemCantBeHeld _081AD2A6: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081AD214 + thumb_func_end item_menu_type_2 - thumb_func_start sub_081AD2AC -sub_081AD2AC: @ 0x081AD2AC + thumb_func_start item_menu_type_b +item_menu_type_b: @ 0x081AD2AC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -879822,7 +879822,7 @@ sub_081AD2AC: @ 0x081AD2AC ldr r3, _081AD2D8 adds r0, r4, #0 movs r1, #1 - bl sub_081AB8F8 + bl DisplayItemMessage b _081AD312 .align 2, 0 _081AD2D0: .4byte gUnknown_203CB48 @@ -879852,20 +879852,20 @@ _081AD304: .4byte gUnknown_3005B60 _081AD308: .4byte sub_081AB6A4 _081AD30C: adds r0, r4, #0 - bl sub_081AD104 + bl BagMenu_PrintItemCantBeHeld _081AD312: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081AD2AC + thumb_func_end item_menu_type_b - thumb_func_start sub_081AD318 -sub_081AD318: @ 0x081AD318 + thumb_func_start UseRegisteredKeyItemOnField +UseRegisteredKeyItemOnField: @ 0x081AD318 push {r4, r5, r6, r7, lr} bl InUnionRoom cmp r0, #1 beq _081AD344 - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _081AD344 @@ -879874,7 +879874,7 @@ sub_081AD318: @ 0x081AD318 lsrs r7, r0, #0x18 cmp r7, #0 bne _081AD344 - bl sub_081399C0 + bl InMultiBattleRoom lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -879883,11 +879883,11 @@ _081AD344: movs r0, #0 b _081AD3CA _081AD348: - bl sub_080D41F8 + bl HideMapNamePopUpWindow movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r4, _081AD3AC ldr r0, [r4] ldr r5, _081AD3B0 @@ -879896,7 +879896,7 @@ _081AD348: cmp r0, #0 beq _081AD3C2 movs r1, #1 - bl sub_080D5F3C + bl CheckBagHasItem lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #1 @@ -879913,7 +879913,7 @@ _081AD348: ldrh r0, [r0] bl sub_080D6DF8 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081AD3B8 @@ -879943,10 +879943,10 @@ _081AD3CA: bx r1 .align 2, 0 _081AD3D0: .4byte gUnknown_82440DD - thumb_func_end sub_081AD318 + thumb_func_end UseRegisteredKeyItemOnField - thumb_func_start sub_081AD3D4 -sub_081AD3D4: @ 0x081AD3D4 + thumb_func_start DisplaySellItemAskString +DisplaySellItemAskString: @ 0x081AD3D4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -879968,12 +879968,12 @@ sub_081AD3D4: @ 0x081AD3D4 ldr r4, _081AD420 ldr r1, _081AD424 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _081AD428 adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage b _081AD462 .align 2, 0 _081AD414: .4byte gUnknown_3005B68 @@ -879981,7 +879981,7 @@ _081AD418: .4byte gUnknown_203CB48 _081AD41C: .4byte gUnknown_2021C54 _081AD420: .4byte gUnknown_2021C7C _081AD424: .4byte gUnknown_85C9A47 -_081AD428: .4byte sub_081AB968 +_081AD428: .4byte BagMenu_InitListsMenu _081AD42C: movs r0, #1 strh r0, [r4, #0x10] @@ -879989,7 +879989,7 @@ _081AD42C: ldrsh r0, [r4, r1] cmp r0, #1 bne _081AD444 - bl sub_081ADF40 + bl bag_menu_AddMoney_window adds r0, r5, #0 bl sub_081AD478 b _081AD462 @@ -880000,12 +880000,12 @@ _081AD444: ldr r4, _081AD46C ldr r1, _081AD470 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _081AD474 adds r0, r7, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage _081AD462: pop {r4, r5, r6, r7} pop {r0} @@ -880015,7 +880015,7 @@ _081AD468: .4byte gUnknown_2021C54 _081AD46C: .4byte gUnknown_2021C7C _081AD470: .4byte gUnknown_85C9A5D _081AD474: .4byte sub_081AD528 - thumb_func_end sub_081AD3D4 + thumb_func_end DisplaySellItemAskString thumb_func_start sub_081AD478 sub_081AD478: @ 0x081AD478 @@ -880044,12 +880044,12 @@ sub_081AD478: @ 0x081AD478 ldr r4, _081AD4D0 ldr r1, _081AD4D4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _081AD4D8 adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage pop {r4, r5, r6} pop {r0} bx r0 @@ -880069,15 +880069,15 @@ sub_081AD4DC: @ 0x081AD4DC lsrs r0, r0, #0x18 ldr r2, _081AD4F0 movs r1, #6 - bl sub_081ADF10 + bl BagMenu_YesNo pop {r0} bx r0 .align 2, 0 _081AD4F0: .4byte gUnknown_85DF8C4 thumb_func_end sub_081AD4DC - thumb_func_start sub_081AD4F4 -sub_081AD4F4: @ 0x081AD4F4 + thumb_func_start BagMenu_CancelSell +BagMenu_CancelSell: @ 0x081AD4F4 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -880087,20 +880087,20 @@ sub_081AD4F4: @ 0x081AD4F4 lsls r4, r4, #3 ldr r0, _081AD524 adds r4, r4, r0 - bl sub_081ADF7C + bl bag_menu_remove_money_window movs r0, #4 bl sub_081ADED0 ldrb r0, [r4] movs r1, #0 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ adds r0, r5, #0 - bl sub_081ABC58 + bl set_callback3_to_bag pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081AD524: .4byte gUnknown_3005B68 - thumb_func_end sub_081AD4F4 + thumb_func_end BagMenu_CancelSell thumb_func_start sub_081AD528 sub_081AD528: @ 0x081AD528 @@ -880113,7 +880113,7 @@ sub_081AD528: @ 0x081AD528 ldr r5, _081AD570 adds r6, r4, r5 movs r0, #8 - bl sub_081ADE14 + bl BagMenu_AddWindow lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #1 @@ -880127,7 +880127,7 @@ sub_081AD528: @ 0x081AD528 ldrsh r1, [r6, r2] muls r0, r1, r0 bl sub_081AD57C - bl sub_081ADF40 + bl bag_menu_AddMoney_window subs r5, #8 adds r4, r4, r5 ldr r0, _081AD578 @@ -880155,7 +880155,7 @@ sub_081AD57C: @ 0x081AD57C str r1, [sp] movs r1, #0x28 movs r2, #2 - bl sub_080E4A08 + bl CreateBicycleAnimationTask add sp, #4 pop {r0} bx r0 @@ -880178,7 +880178,7 @@ sub_081AD5A8: @ 0x081AD5A8 adds r0, r5, #0 adds r0, #0x10 ldrh r1, [r5, #4] - bl sub_08122040 + bl AdjustQuantityAccordingToDPadInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -880231,14 +880231,14 @@ _081AD62C: bl sub_080A306C ldrb r0, [r5] movs r1, #0 - bl sub_081AB4E8 - bl sub_081ADF7C + bl BagMenu_PrintCursor_ + bl bag_menu_remove_money_window movs r0, #8 bl sub_081ADE5C movs r0, #4 bl sub_081ADED0 adds r0, r6, #0 - bl sub_081ABC58 + bl set_callback3_to_bag _081AD658: pop {r4, r5, r6} pop {r0} @@ -880246,8 +880246,8 @@ _081AD658: .align 2, 0 thumb_func_end sub_081AD5A8 - thumb_func_start sub_081AD660 -sub_081AD660: @ 0x081AD660 + thumb_func_start BagMenu_ConfirmSell +BagMenu_ConfirmSell: @ 0x081AD660 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -880279,12 +880279,12 @@ sub_081AD660: @ 0x081AD660 ldr r4, _081AD6D0 ldr r1, _081AD6D4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r3, _081AD6D8 adds r0, r5, #0 movs r1, #1 adds r2, r4, #0 - bl sub_081AB8F8 + bl DisplayItemMessage pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -880298,7 +880298,7 @@ _081AD6CC: .4byte gUnknown_2021C40 _081AD6D0: .4byte gUnknown_2021C7C _081AD6D4: .4byte gUnknown_85C9A88 _081AD6D8: .4byte sub_081AD6DC - thumb_func_end sub_081AD660 + thumb_func_end BagMenu_ConfirmSell thumb_func_start sub_081AD6DC sub_081AD6DC: @ 0x081AD6DC @@ -880332,7 +880332,7 @@ sub_081AD6DC: @ 0x081AD6DC ldrh r0, [r2] mov r3, sl ldrh r1, [r3, #0x10] - bl sub_080D62BC + bl RemoveBagItem ldr r0, _081AD7C0 ldr r4, [r0] movs r1, #0x92 @@ -880353,24 +880353,24 @@ sub_081AD6DC: @ 0x081AD6DC ldrb r0, [r3] mov r1, sb adds r2, r5, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r7, #5] bl sub_081AB754 ldrb r0, [r7, #5] - bl sub_081AB834 + bl SetInitialScrollAndCursorPositions ldrb r0, [r7, #5] - bl sub_081AAFB0 + bl LoadBagItemListBuffers ldr r0, _081AD7C4 mov r2, sb ldrh r1, [r2] ldrh r2, [r5] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r3, sl strh r0, [r3] movs r1, #2 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ ldr r0, _081AD7C8 ldr r0, [r0] ldr r1, _081AD7CC @@ -880385,7 +880385,7 @@ sub_081AD6DC: @ 0x081AD6DC adds r1, r0, #0 adds r0, r4, #0 movs r2, #0 - bl sub_080E49E8 + bl PrintMoneyAmountInMoneyBox ldr r0, _081AD7B4 subs r0, #8 adds r6, r6, r0 @@ -880422,9 +880422,9 @@ sub_081AD7D4: @ 0x081AD7D4 beq _081AD7F6 movs r0, #5 bl sub_080A306C - bl sub_081ADF7C + bl bag_menu_remove_money_window adds r0, r4, #0 - bl sub_081AB968 + bl BagMenu_InitListsMenu _081AD7F6: pop {r4} pop {r0} @@ -880433,8 +880433,8 @@ _081AD7F6: _081AD7FC: .4byte gUnknown_3002360 thumb_func_end sub_081AD7D4 - thumb_func_start sub_081AD800 -sub_081AD800: @ 0x081AD800 + thumb_func_start DisplayDepositItemAskString +DisplayDepositItemAskString: @ 0x081AD800 push {r4, r5, r6, lr} sub sp, #0x14 lsls r0, r0, #0x18 @@ -880463,10 +880463,10 @@ _081AD82C: ldr r4, _081AD884 ldr r1, _081AD888 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #2 str r0, [sp] movs r0, #0 @@ -880478,9 +880478,9 @@ _081AD82C: movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print movs r0, #7 - bl sub_081AB9E8 + bl GetItemName adds r0, r6, #0 subs r0, #8 adds r0, r5, r0 @@ -880497,7 +880497,7 @@ _081AD880: .4byte gUnknown_2021C40 _081AD884: .4byte gUnknown_2021C7C _081AD888: .4byte gUnknown_85C94B9 _081AD88C: .4byte sub_081AD890 - thumb_func_end sub_081AD800 + thumb_func_end DisplayDepositItemAskString thumb_func_start sub_081AD890 sub_081AD890: @ 0x081AD890 @@ -880513,7 +880513,7 @@ sub_081AD890: @ 0x081AD890 adds r0, r5, #0 adds r0, #0x10 ldrh r1, [r5, #4] - bl sub_08122040 + bl AdjustQuantityAccordingToDPadInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -880556,14 +880556,14 @@ _081AD8F8: bl sub_080A306C movs r1, #2 ldrsh r0, [r5, r1] - bl sub_081AB414 + bl BagMenu_PrintDescription ldrb r0, [r5] movs r1, #0 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ movs r0, #7 bl sub_081ADE5C adds r0, r6, #0 - bl sub_081ABC58 + bl set_callback3_to_bag _081AD922: pop {r4, r5, r6} pop {r0} @@ -880586,7 +880586,7 @@ sub_081AD928: @ 0x081AD928 adds r7, r6, r0 movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r4, _081AD970 ldrh r0, [r4] bl sub_080D6D68 @@ -880610,7 +880610,7 @@ _081AD974: .4byte gUnknown_85C94EB _081AD978: ldrh r0, [r4] ldrh r1, [r7, #0x10] - bl sub_080D6588 + bl AddPCItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -880627,7 +880627,7 @@ _081AD978: ldr r4, _081AD9D4 ldr r1, _081AD9D8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [sp] str r5, [sp, #4] @@ -880638,7 +880638,7 @@ _081AD978: movs r1, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print mov r0, r8 subs r0, #8 adds r0, r6, r0 @@ -880649,7 +880649,7 @@ _081AD9CC: .4byte gUnknown_2021C40 _081AD9D0: .4byte gUnknown_2021C54 _081AD9D4: .4byte gUnknown_2021C7C _081AD9D8: .4byte gUnknown_85C94CA -_081AD9DC: .4byte sub_081ACF48 +_081AD9DC: .4byte Task_ActuallyToss _081AD9E0: ldr r2, _081ADA10 movs r0, #2 @@ -880662,7 +880662,7 @@ _081AD9EE: movs r0, #1 movs r1, #1 movs r3, #0 - bl sub_081ADD94 + bl BagMenu_Print mov r0, r8 subs r0, #8 adds r0, r6, r0 @@ -880700,12 +880700,12 @@ sub_081ADA18: @ 0x081ADA18 bl sub_080A306C movs r1, #2 ldrsh r0, [r5, r1] - bl sub_081AB414 + bl BagMenu_PrintDescription ldrb r0, [r5] movs r1, #0 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ adds r0, r4, #0 - bl sub_081ABC58 + bl set_callback3_to_bag _081ADA50: pop {r4, r5} pop {r0} @@ -880715,8 +880715,8 @@ _081ADA58: .4byte gUnknown_3005B68 _081ADA5C: .4byte gUnknown_3002360 thumb_func_end sub_081ADA18 - thumb_func_start sub_081ADA60 -sub_081ADA60: @ 0x081ADA60 + thumb_func_start IsWallysBag +IsWallysBag: @ 0x081ADA60 push {lr} ldr r0, _081ADA70 ldrb r0, [r0, #4] @@ -880732,14 +880732,14 @@ _081ADA76: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081ADA60 + thumb_func_end IsWallysBag - thumb_func_start sub_081ADA7C -sub_081ADA7C: @ 0x081ADA7C + thumb_func_start PrepareBagForWallyTutorial +PrepareBagForWallyTutorial: @ 0x081ADA7C push {r4, r5, r6, lr} ldr r4, _081ADB00 movs r0, #0xd0 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r5, _081ADB04 ldr r1, [r5] @@ -880786,14 +880786,14 @@ _081ADABA: lsls r1, r1, #3 adds r0, r0, r1 movs r1, #0x1e - bl sub_080D6494 + bl ClearItemSlots ldr r0, [r4] movs r2, #0xca lsls r2, r2, #3 adds r0, r0, r2 movs r1, #0x10 - bl sub_080D6494 - bl sub_081AA8E8 + bl ClearItemSlots + bl ResetBagScrollPositions pop {r4, r5, r6} pop {r0} bx r0 @@ -880801,10 +880801,10 @@ _081ADABA: _081ADB00: .4byte gUnknown_203CB4C _081ADB04: .4byte gUnknown_3005AEC _081ADB08: .4byte gUnknown_203CB24 - thumb_func_end sub_081ADA7C + thumb_func_end PrepareBagForWallyTutorial - thumb_func_start sub_081ADB0C -sub_081ADB0C: @ 0x081ADB0C + thumb_func_start RestoreBagAfterWallyTutorial +RestoreBagAfterWallyTutorial: @ 0x081ADB0C push {r4, r5, r6, lr} ldr r5, _081ADB70 ldr r0, [r5] @@ -880849,7 +880849,7 @@ _081ADB46: cmp r5, #4 bls _081ADB46 ldr r0, [r6] - bl sub_08000BF0 + bl Free pop {r4, r5, r6} pop {r0} bx r0 @@ -880857,30 +880857,30 @@ _081ADB46: _081ADB70: .4byte gUnknown_3005AEC _081ADB74: .4byte gUnknown_203CB4C _081ADB78: .4byte gUnknown_203CB24 - thumb_func_end sub_081ADB0C + thumb_func_end RestoreBagAfterWallyTutorial - thumb_func_start sub_081ADB7C -sub_081ADB7C: @ 0x081ADB7C + thumb_func_start DoWallyTutorialBagMenu +DoWallyTutorialBagMenu: @ 0x081ADB7C push {lr} - bl sub_081ADA7C + bl PrepareBagForWallyTutorial movs r0, #0xd movs r1, #1 - bl sub_080D6140 + bl AddBagItem movs r0, #4 movs r1, #1 - bl sub_080D6140 + bl AddBagItem ldr r2, _081ADBA0 movs r0, #0xa movs r1, #0 - bl sub_081AAA08 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 _081ADBA0: .4byte sub_0805996C - thumb_func_end sub_081ADB7C + thumb_func_end DoWallyTutorialBagMenu - thumb_func_start sub_081ADBA4 -sub_081ADBA4: @ 0x081ADBA4 + thumb_func_start Task_WallyTutorialBagMenu +Task_WallyTutorialBagMenu: @ 0x081ADBA4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -880919,14 +880919,14 @@ _081ADBE6: adds r0, r5, #0 movs r1, #1 movs r2, #0 - bl sub_081ABD34 + bl Fill1PRecords b _081ADC38 _081ADBF8: movs r0, #5 bl sub_080A306C ldrb r0, [r4] movs r1, #2 - bl sub_081AB4E8 + bl BagMenu_PrintCursor_ ldr r1, _081ADC14 movs r0, #4 strh r0, [r1] @@ -880938,12 +880938,12 @@ _081ADC14: .4byte gUnknown_203CB48 _081ADC18: movs r0, #5 bl sub_080A306C - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow ldrb r0, [r4] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 - bl sub_081ADB0C + bl DestroyListMenuTask + bl RestoreBagAfterWallyTutorial adds r0, r5, #0 bl sub_081AB6A4 b _081ADC3E @@ -880955,7 +880955,7 @@ _081ADC3E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081ADBA4 + thumb_func_end Task_WallyTutorialBagMenu thumb_func_start sub_081ADC44 sub_081ADC44: @ 0x081ADC44 @@ -880970,7 +880970,7 @@ sub_081ADC44: @ 0x081ADC44 ldr r1, _081ADC74 movs r0, #1 strh r0, [r1] - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow adds r0, r4, #0 bl sub_081AB6A4 pop {r4} @@ -880989,7 +880989,7 @@ sub_081ADC78: @ 0x081ADC78 ldr r1, _081ADC90 str r1, [r0] ldr r0, _081ADC94 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -880998,8 +880998,8 @@ _081ADC90: .4byte sub_0819F928 _081ADC94: .4byte sub_08085A30 thumb_func_end sub_081ADC78 - thumb_func_start sub_081ADC98 -sub_081ADC98: @ 0x081ADC98 + thumb_func_start unknown_ItemMenu_Give2 +unknown_ItemMenu_Give2: @ 0x081ADC98 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -881007,11 +881007,11 @@ sub_081ADC98: @ 0x081ADC98 ldr r0, _081ADCC0 ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem ldr r1, _081ADCC4 movs r0, #1 strh r0, [r1] - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow adds r0, r4, #0 bl sub_081AB6A4 pop {r4} @@ -881020,7 +881020,7 @@ sub_081ADC98: @ 0x081ADC98 .align 2, 0 _081ADCC0: .4byte gUnknown_203CB48 _081ADCC4: .4byte gUnknown_2037290 - thumb_func_end sub_081ADC98 + thumb_func_end unknown_ItemMenu_Give2 thumb_func_start sub_081ADCC8 sub_081ADCC8: @ 0x081ADCC8 @@ -881029,17 +881029,17 @@ sub_081ADCC8: @ 0x081ADCC8 ldr r1, _081ADCE0 str r1, [r0] ldr r0, _081ADCE4 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _081ADCDC: .4byte gUnknown_3005B0C -_081ADCE0: .4byte sub_0818DC00 +_081ADCE0: .4byte CB2_ReturnToField _081ADCE4: .4byte sub_08085A30 thumb_func_end sub_081ADCC8 - thumb_func_start sub_081ADCE8 -sub_081ADCE8: @ 0x081ADCE8 + thumb_func_start unknown_ItemMenu_Confirm2 +unknown_ItemMenu_Confirm2: @ 0x081ADCE8 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -881047,7 +881047,7 @@ sub_081ADCE8: @ 0x081ADCE8 ldr r1, _081ADD08 movs r0, #1 strh r0, [r1] - bl sub_081ACC30 + bl BagMenu_RemoveSomeWindow adds r0, r4, #0 bl sub_081AB6A4 pop {r4} @@ -881055,7 +881055,7 @@ sub_081ADCE8: @ 0x081ADCE8 bx r0 .align 2, 0 _081ADD08: .4byte gUnknown_2037290 - thumb_func_end sub_081ADCE8 + thumb_func_end unknown_ItemMenu_Confirm2 thumb_func_start sub_081ADD0C sub_081ADD0C: @ 0x081ADD0C @@ -881064,20 +881064,20 @@ sub_081ADD0C: @ 0x081ADD0C ldr r1, _081ADD24 str r1, [r0] ldr r0, _081ADD28 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _081ADD20: .4byte gUnknown_3005B0C -_081ADD24: .4byte sub_0818E1C0 +_081ADD24: .4byte MainCB2 _081ADD28: .4byte sub_08085A30 thumb_func_end sub_081ADD0C - thumb_func_start sub_081ADD2C -sub_081ADD2C: @ 0x081ADD2C + thumb_func_start SetupBagMenu_Textboxes +SetupBagMenu_Textboxes: @ 0x081ADD2C push {r4, lr} ldr r0, _081ADD8C - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #1 @@ -881086,40 +881086,40 @@ sub_081ADD2C: @ 0x081ADD2C movs r0, #0 movs r1, #0xa movs r2, #0xd0 - bl sub_08098104 + bl LoadMessageBoxGfx movs r0, #0xc0 movs r1, #1 bl sub_08199F54 ldr r0, _081ADD90 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r4, #0 _081ADD60: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #2 bls _081ADD60 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 .align 2, 0 _081ADD8C: .4byte gUnknown_85DFA2C _081ADD90: .4byte gUnknown_85D7B04 - thumb_func_end sub_081ADD2C + thumb_func_end SetupBagMenu_Textboxes - thumb_func_start sub_081ADD94 -sub_081ADD94: @ 0x081ADD94 + thumb_func_start BagMenu_Print +BagMenu_Print: @ 0x081ADD94 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -881161,7 +881161,7 @@ sub_081ADD94: @ 0x081ADD94 str r4, [sp, #0xc] str r2, [sp, #0x10] mov r2, sb - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r3, r4} mov r8, r3 @@ -881171,7 +881171,7 @@ sub_081ADD94: @ 0x081ADD94 bx r0 .align 2, 0 _081ADDF8: .4byte gUnknown_85DFA1C - thumb_func_end sub_081ADD94 + thumb_func_end BagMenu_Print thumb_func_start sub_081ADDFC sub_081ADDFC: @ 0x081ADDFC @@ -881189,8 +881189,8 @@ sub_081ADDFC: @ 0x081ADDFC _081ADE10: .4byte gUnknown_203CB20 thumb_func_end sub_081ADDFC - thumb_func_start sub_081ADE14 -sub_081ADE14: @ 0x081ADE14 + thumb_func_start BagMenu_AddWindow +BagMenu_AddWindow: @ 0x081ADE14 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -881206,15 +881206,15 @@ sub_081ADE14: @ 0x081ADE14 lsls r0, r2, #3 ldr r1, _081ADE58 adds r0, r0, r1 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081ADE4A: ldrb r0, [r4] pop {r4} @@ -881223,7 +881223,7 @@ _081ADE4A: .align 2, 0 _081ADE54: .4byte gUnknown_203CB20 _081ADE58: .4byte gUnknown_85DFA64 - thumb_func_end sub_081ADE14 + thumb_func_end BagMenu_AddWindow thumb_func_start sub_081ADE5C sub_081ADE5C: @ 0x081ADE5C @@ -881242,11 +881242,11 @@ sub_081ADE5C: @ 0x081ADE5C movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0xff strb r0, [r4] _081ADE90: @@ -881257,8 +881257,8 @@ _081ADE90: _081ADE98: .4byte gUnknown_203CB20 thumb_func_end sub_081ADE5C - thumb_func_start sub_081ADE9C -sub_081ADE9C: @ 0x081ADE9C + thumb_func_start AddItemMessageWindow +AddItemMessageWindow: @ 0x081ADE9C push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -881274,7 +881274,7 @@ sub_081ADE9C: @ 0x081ADE9C lsls r0, r2, #3 ldr r1, _081ADECC adds r0, r0, r1 - bl sub_08003250 + bl AddWindow strb r0, [r4] _081ADEC0: ldrb r0, [r4] @@ -881284,7 +881284,7 @@ _081ADEC0: .align 2, 0 _081ADEC8: .4byte gUnknown_203CB20 _081ADECC: .4byte gUnknown_85DFA64 - thumb_func_end sub_081ADE9C + thumb_func_end AddItemMessageWindow thumb_func_start sub_081ADED0 sub_081ADED0: @ 0x081ADED0 @@ -881303,11 +881303,11 @@ sub_081ADED0: @ 0x081ADED0 movs r1, #0 bl sub_08197EBC ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0xff strb r0, [r4] _081ADF04: @@ -881318,8 +881318,8 @@ _081ADF04: _081ADF0C: .4byte gUnknown_203CB20 thumb_func_end sub_081ADED0 - thumb_func_start sub_081ADF10 -sub_081ADF10: @ 0x081ADF10 + thumb_func_start BagMenu_YesNo +BagMenu_YesNo: @ 0x081ADF10 push {lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -881343,13 +881343,13 @@ sub_081ADF10: @ 0x081ADF10 bx r0 .align 2, 0 _081ADF3C: .4byte gUnknown_85DFA64 - thumb_func_end sub_081ADF10 + thumb_func_end BagMenu_YesNo - thumb_func_start sub_081ADF40 -sub_081ADF40: @ 0x081ADF40 + thumb_func_start bag_menu_AddMoney_window +bag_menu_AddMoney_window: @ 0x081ADF40 push {r4, lr} movs r0, #9 - bl sub_081ADE14 + bl BagMenu_AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -881363,63 +881363,63 @@ sub_081ADF40: @ 0x081ADF40 adds r0, r4, #0 movs r1, #1 movs r2, #0xe - bl sub_080E4A74 + bl PrintMoneyAmountInMoneyBoxWithBorder movs r0, #0x13 movs r1, #0xb - bl sub_080E4B88 + bl AddMoneyLabelObject pop {r4} pop {r0} bx r0 .align 2, 0 _081ADF78: .4byte gUnknown_3005AEC - thumb_func_end sub_081ADF40 + thumb_func_end bag_menu_AddMoney_window - thumb_func_start sub_081ADF7C -sub_081ADF7C: @ 0x081ADF7C + thumb_func_start bag_menu_remove_money_window +bag_menu_remove_money_window: @ 0x081ADF7C push {lr} movs r0, #9 bl sub_081ADE5C - bl sub_080E4BD0 + bl RemoveMoneyLabelObject pop {r0} bx r0 - thumb_func_end sub_081ADF7C + thumb_func_end bag_menu_remove_money_window - thumb_func_start sub_081ADF8C -sub_081ADF8C: @ 0x081ADF8C + thumb_func_start BagMenu_PrepareTMHMMoveWindow +BagMenu_PrepareTMHMMoveWindow: @ 0x081ADF8C push {lr} movs r0, #3 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #3 movs r1, #0x13 movs r2, #0 movs r3, #0 - bl sub_08199F90 + bl blit_move_info_icon movs r0, #3 movs r1, #0x14 movs r2, #0 movs r3, #0xc - bl sub_08199F90 + bl blit_move_info_icon movs r0, #3 movs r1, #0x15 movs r2, #0 movs r3, #0x18 - bl sub_08199F90 + bl blit_move_info_icon movs r0, #3 movs r1, #0x16 movs r2, #0 movs r3, #0x24 - bl sub_08199F90 + bl blit_move_info_icon movs r0, #3 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081ADF8C + thumb_func_end BagMenu_PrepareTMHMMoveWindow - thumb_func_start sub_081ADFD4 -sub_081ADFD4: @ 0x081ADFD4 + thumb_func_start PrintTMHMMoveData +PrintTMHMMoveData: @ 0x081ADFD4 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -881429,7 +881429,7 @@ sub_081ADFD4: @ 0x081ADFD4 lsrs r4, r0, #0x10 movs r0, #4 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r4, #0 bne _081AE02C movs r4, #0 @@ -881449,7 +881449,7 @@ _081ADFF2: movs r1, #1 ldr r2, _081AE028 movs r3, #4 - bl sub_081ADD94 + bl BagMenu_Print adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -881457,13 +881457,13 @@ _081ADFF2: bls _081ADFF2 movs r0, #4 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _081AE118 .align 2, 0 _081AE028: .4byte gUnknown_85C9406 _081AE02C: adds r0, r4, #0 - bl sub_081B69B4 + bl ItemIdToBattleMoveId lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldr r1, _081AE05C @@ -881478,7 +881478,7 @@ _081AE02C: movs r0, #4 movs r2, #0 movs r3, #0 - bl sub_08199F90 + bl blit_move_info_icon ldrb r0, [r5, #1] cmp r0, #1 bhi _081AE064 @@ -881507,7 +881507,7 @@ _081AE074: str r0, [sp, #0x10] movs r1, #1 movs r3, #4 - bl sub_081ADD94 + bl BagMenu_Print ldr r2, _081AE0A8 lsls r1, r7, #1 adds r0, r1, r7 @@ -881545,7 +881545,7 @@ _081AE0C0: str r0, [sp, #0x10] movs r1, #1 movs r3, #4 - bl sub_081ADD94 + bl BagMenu_Print ldr r5, _081AE128 ldr r1, _081AE12C adds r0, r6, r7 @@ -881568,10 +881568,10 @@ _081AE0C0: movs r1, #1 adds r2, r5, #0 movs r3, #4 - bl sub_081ADD94 + bl BagMenu_Print movs r0, #4 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081AE118: add sp, #0x14 pop {r3, r4} @@ -881583,7 +881583,7 @@ _081AE118: .align 2, 0 _081AE128: .4byte gUnknown_2021C40 _081AE12C: .4byte gUnknown_82ED220 - thumb_func_end sub_081ADFD4 + thumb_func_end PrintTMHMMoveData thumb_func_start sub_081AE130 sub_081AE130: @ 0x081AE130 @@ -881591,8 +881591,8 @@ sub_081AE130: @ 0x081AE130 .align 2, 0 thumb_func_end sub_081AE130 - thumb_func_start sub_081AE134 -sub_081AE134: @ 0x081AE134 + thumb_func_start DoMysteryGiftListMenu +DoMysteryGiftListMenu: @ 0x081AE134 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -881622,7 +881622,7 @@ sub_081AE134: @ 0x081AE134 beq _081AE230 _081AE16A: mov r0, ip - bl sub_08003250 + bl AddWindow strb r0, [r5, #5] cmp r6, #1 beq _081AE188 @@ -881641,7 +881641,7 @@ _081AE188: lsls r2, r2, #0x18 lsrs r2, r2, #0x18 ldr r1, [sp, #4] - bl sub_080981E0 + bl DrawTextBorderOuter _081AE198: ldr r0, _081AE1C8 adds r2, r0, #0 @@ -881655,11 +881655,11 @@ _081AE198: strb r1, [r0, #0x10] movs r1, #0 movs r2, #0 - bl sub_081AE25C + bl ListMenuInit strb r0, [r4, #6] ldrb r0, [r4, #5] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 strb r0, [r4, #4] b _081AE248 @@ -881668,7 +881668,7 @@ _081AE1C4: .4byte gUnknown_203CB50 _081AE1C8: .4byte gUnknown_3006050 _081AE1CC: ldrb r0, [r5, #6] - bl sub_081AE2DC + bl ListMenu_ProcessInput str r0, [r5] ldr r1, _081AE208 ldrh r0, [r1, #0x2e] @@ -881695,7 +881695,7 @@ _081AE1F6: cmp r6, #0 bne _081AE20C ldrb r0, [r5, #5] - bl sub_08003774 + bl ClearWindowTilemap b _081AE21E .align 2, 0 _081AE208: .4byte gUnknown_3002360 @@ -881712,7 +881712,7 @@ _081AE21E: ldr r0, _081AE22C ldrb r0, [r0, #5] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram b _081AE248 .align 2, 0 _081AE22C: .4byte gUnknown_203CB50 @@ -881720,9 +881720,9 @@ _081AE230: ldrb r0, [r5, #6] movs r1, #0 movs r2, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldrb r0, [r5, #5] - bl sub_08003444 + bl RemoveWindow movs r0, #0 strb r0, [r5, #4] ldr r0, [r5] @@ -881739,33 +881739,33 @@ _081AE24C: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081AE134 + thumb_func_end DoMysteryGiftListMenu - thumb_func_start sub_081AE25C -sub_081AE25C: @ 0x081AE25C + thumb_func_start ListMenuInit +ListMenuInit: @ 0x081AE25C push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 - bl sub_081AE5AC + bl ListMenuInitInternal adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldrb r0, [r5, #0x10] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r5, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081AE25C + thumb_func_end ListMenuInit - thumb_func_start sub_081AE288 -sub_081AE288: @ 0x081AE288 + thumb_func_start ListMenuInitInRect +ListMenuInitInRect: @ 0x081AE288 push {r4, r5, r6, r7, lr} sub sp, #8 adds r6, r0, #0 @@ -881776,7 +881776,7 @@ sub_081AE288: @ 0x081AE288 lsrs r1, r1, #0x10 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 - bl sub_081AE5AC + bl ListMenuInitInternal lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldrb r0, [r4, #4] @@ -881792,7 +881792,7 @@ _081AE2AC: str r4, [sp] ldrb r4, [r5, #4] str r4, [sp, #4] - bl sub_080036BC + bl PutWindowRectTilemapOverridePalette adds r5, #8 ldrb r0, [r5, #4] cmp r0, #0xff @@ -881800,17 +881800,17 @@ _081AE2AC: _081AE2C8: ldrb r0, [r6, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram adds r0, r7, #0 add sp, #8 pop {r4, r5, r6, r7} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AE288 + thumb_func_end ListMenuInitInRect - thumb_func_start sub_081AE2DC -sub_081AE2DC: @ 0x081AE2DC + thumb_func_start ListMenu_ProcessInput +ListMenu_ProcessInput: @ 0x081AE2DC push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -881913,7 +881913,7 @@ _081AE386: _081AE390: movs r3, #1 _081AE392: - bl sub_081AEC00 + bl ListMenuChangeSelection _081AE396: movs r0, #1 rsbs r0, r0, #0 @@ -881921,10 +881921,10 @@ _081AE39A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AE2DC + thumb_func_end ListMenu_ProcessInput - thumb_func_start sub_081AE3A0 -sub_081AE3A0: @ 0x081AE3A0 + thumb_func_start DestroyListMenuTask +DestroyListMenuTask: @ 0x081AE3A0 push {r4, lr} adds r3, r1, #0 lsls r0, r0, #0x18 @@ -881954,16 +881954,16 @@ _081AE3C4: bl ListMenuRemoveCursorObject _081AE3D4: adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask pop {r4} pop {r0} bx r0 .align 2, 0 _081AE3E0: .4byte gUnknown_3005B68 - thumb_func_end sub_081AE3A0 + thumb_func_end DestroyListMenuTask - thumb_func_start sub_081AE3E4 -sub_081AE3E4: @ 0x081AE3E4 + thumb_func_start RedrawListMenu +RedrawListMenu: @ 0x081AE3E4 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -881978,23 +881978,23 @@ sub_081AE3E4: @ 0x081AE3E4 lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r1, [r4, #0x18] ldrh r3, [r4, #0xe] adds r0, r4, #0 movs r2, #0 - bl sub_081AE740 + bl ListMenuPrintEntries adds r0, r4, #0 - bl sub_081AE7F8 + bl ListMenuDrawCursor ldrb r0, [r4, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 .align 2, 0 _081AE424: .4byte gUnknown_3005B68 - thumb_func_end sub_081AE3E4 + thumb_func_end RedrawListMenu thumb_func_start ChangeListMenuPals ChangeListMenuPals: @ 0x081AE428 @@ -882034,8 +882034,8 @@ ChangeListMenuPals: @ 0x081AE428 _081AE468: .4byte gUnknown_3005B68 thumb_func_end ChangeListMenuPals - thumb_func_start sub_081AE46C -sub_081AE46C: @ 0x081AE46C + thumb_func_start ChangeListMenuCoords +ChangeListMenuCoords: @ 0x081AE46C push {r4, r5, lr} adds r3, r1, #0 adds r5, r2, #0 @@ -882053,17 +882053,17 @@ sub_081AE46C: @ 0x081AE46C ldrb r0, [r4, #0x10] movs r1, #1 adds r2, r3, #0 - bl sub_08003F78 + bl SetWindowAttribute ldrb r0, [r4, #0x10] movs r1, #2 adds r2, r5, #0 - bl sub_08003F78 + bl SetWindowAttribute pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081AE4A4: .4byte gUnknown_3005B68 - thumb_func_end sub_081AE46C + thumb_func_end ChangeListMenuCoords thumb_func_start ListMenuTestInput ListMenuTestInput: @ 0x081AE4A8 @@ -882091,7 +882091,7 @@ ListMenuTestInput: @ 0x081AE4A8 movs r1, #0 movs r2, #1 movs r3, #0 - bl sub_081AEC00 + bl ListMenuChangeSelection _081AE4DC: cmp r4, #0x80 bne _081AE4EC @@ -882099,7 +882099,7 @@ _081AE4DC: movs r1, #0 movs r2, #1 movs r3, #1 - bl sub_081AEC00 + bl ListMenuChangeSelection _081AE4EC: cmp r5, #0 beq _081AE4F6 @@ -882174,8 +882174,8 @@ _081AE55A: _081AE560: .4byte gUnknown_3005B68 thumb_func_end ListMenuGetScrollAndRow - thumb_func_start sub_081AE564 -sub_081AE564: @ 0x081AE564 + thumb_func_start ListMenuGetYCoordForPrintingArrowCursor +ListMenuGetYCoordForPrintingArrowCursor: @ 0x081AE564 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -882188,7 +882188,7 @@ sub_081AE564: @ 0x081AE564 lsls r0, r0, #0x1a lsrs r0, r0, #0x1a movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute ldrb r1, [r4, #0x16] lsls r1, r1, #0x1a lsrs r1, r1, #0x1d @@ -882210,10 +882210,10 @@ sub_081AE564: @ 0x081AE564 bx r1 .align 2, 0 _081AE5A8: .4byte gUnknown_3005B68 - thumb_func_end sub_081AE564 + thumb_func_end ListMenuGetYCoordForPrintingArrowCursor - thumb_func_start sub_081AE5AC -sub_081AE5AC: @ 0x081AE5AC + thumb_func_start ListMenuInitInternal +ListMenuInitInternal: @ 0x081AE5AC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -882226,7 +882226,7 @@ sub_081AE5AC: @ 0x081AE5AC lsrs r6, r6, #0x10 ldr r0, _081AE67C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -882296,17 +882296,17 @@ _081AE644: lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r1, [r7, #0x18] ldrh r3, [r7, #0xe] adds r0, r7, #0 movs r2, #0 - bl sub_081AE740 + bl ListMenuPrintEntries adds r0, r7, #0 - bl sub_081AE7F8 + bl ListMenuDrawCursor adds r0, r7, #0 movs r1, #1 - bl sub_081AECD8 + bl ListMenuCallSelectionChangedCallback mov r0, r8 pop {r3} mov r8, r3 @@ -882318,10 +882318,10 @@ _081AE67C: .4byte sub_081AE130 _081AE680: .4byte gUnknown_3005B68 _081AE684: .4byte gUnknown_3006040 _081AE688: .4byte 0xFFFC0FFF - thumb_func_end sub_081AE5AC + thumb_func_end ListMenuInitInternal - thumb_func_start sub_081AE68C -sub_081AE68C: @ 0x081AE68C + thumb_func_start ListMenuPrint +ListMenuPrint: @ 0x081AE68C push {r4, r5, r6, r7, lr} sub sp, #0x18 adds r4, r0, #0 @@ -882366,7 +882366,7 @@ sub_081AE68C: @ 0x081AE68C str r6, [sp, #0x10] adds r2, r7, #0 mov r3, ip - bl sub_08199B84 + bl AddTextPrinterParameterized4 ldrb r1, [r5, #3] movs r0, #0x7f ands r0, r1 @@ -882404,17 +882404,17 @@ _081AE6F8: str r6, [sp, #0x10] adds r2, r7, #0 mov r3, ip - bl sub_08199B84 + bl AddTextPrinterParameterized4 _081AE736: add sp, #0x18 pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AE68C + thumb_func_end ListMenuPrint - thumb_func_start sub_081AE740 -sub_081AE740: @ 0x081AE740 + thumb_func_start ListMenuPrintEntries +ListMenuPrintEntries: @ 0x081AE740 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -882435,7 +882435,7 @@ sub_081AE740: @ 0x081AE740 lsls r0, r0, #0x1a lsrs r0, r0, #0x1a movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute ldrb r1, [r4, #0x16] lsls r1, r1, #0x1a lsrs r1, r1, #0x1d @@ -882490,7 +882490,7 @@ _081AE7C6: adds r0, r4, #0 adds r2, r6, #0 adds r3, r7, #0 - bl sub_081AE68C + bl ListMenuPrint mov r0, sb adds r0, #1 lsls r0, r0, #0x10 @@ -882509,10 +882509,10 @@ _081AE7E8: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081AE740 + thumb_func_end ListMenuPrintEntries - thumb_func_start sub_081AE7F8 -sub_081AE7F8: @ 0x081AE7F8 + thumb_func_start ListMenuDrawCursor +ListMenuDrawCursor: @ 0x081AE7F8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -882521,7 +882521,7 @@ sub_081AE7F8: @ 0x081AE7F8 lsls r0, r0, #0x1a lsrs r0, r0, #0x1a movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute ldrb r1, [r6, #0x16] lsls r1, r1, #0x1a lsrs r1, r1, #0x1d @@ -882558,7 +882558,7 @@ _081AE848: adds r0, r6, #0 mov r2, r8 adds r3, r7, #0 - bl sub_081AE68C + bl ListMenuPrint b _081AE8E4 .align 2, 0 _081AE858: .4byte gUnknown_85C9421 @@ -882568,13 +882568,13 @@ _081AE85C: bne _081AE86C adds r0, r6, #0 movs r1, #0 - bl sub_081AE8F0 + bl ListMenuAddCursorObject strb r0, [r6, #0x1e] _081AE86C: ldrb r5, [r6, #0x1e] ldrb r0, [r6, #0x10] movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute adds r4, r0, #0 lsls r4, r4, #0x13 ldr r0, _081AE8A0 @@ -882582,7 +882582,7 @@ _081AE86C: lsrs r4, r4, #0x10 ldrb r0, [r6, #0x10] movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute adds r2, r0, #0 lsls r2, r2, #3 adds r2, r2, r7 @@ -882602,13 +882602,13 @@ _081AE8A4: bne _081AE8B4 adds r0, r6, #0 movs r1, #1 - bl sub_081AE8F0 + bl ListMenuAddCursorObject strb r0, [r6, #0x1e] _081AE8B4: ldrb r5, [r6, #0x1e] ldrb r0, [r6, #0x10] movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute adds r4, r0, #0 lsls r4, r4, #3 add r4, r8 @@ -882616,7 +882616,7 @@ _081AE8B4: lsrs r4, r4, #0x10 ldrb r0, [r6, #0x10] movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute adds r2, r0, #0 lsls r2, r2, #3 adds r2, r2, r7 @@ -882633,10 +882633,10 @@ _081AE8E4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AE7F8 + thumb_func_end ListMenuDrawCursor - thumb_func_start sub_081AE8F0 -sub_081AE8F0: @ 0x081AE8F0 + thumb_func_start ListMenuAddCursorObject +ListMenuAddCursorObject: @ 0x081AE8F0 push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 @@ -882648,7 +882648,7 @@ sub_081AE8F0: @ 0x081AE8F0 strb r0, [r1, #1] ldrb r0, [r4, #0x10] movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute mov r1, sp lsls r0, r0, #3 adds r0, #2 @@ -882657,7 +882657,7 @@ sub_081AE8F0: @ 0x081AE8F0 lsls r0, r0, #0x1a lsrs r0, r0, #0x1a movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute mov r1, sp lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -882681,10 +882681,10 @@ sub_081AE8F0: @ 0x081AE8F0 bx r1 .align 2, 0 _081AE94C: .4byte 0x0000FFFF - thumb_func_end sub_081AE8F0 + thumb_func_end ListMenuAddCursorObject - thumb_func_start sub_081AE950 -sub_081AE950: @ 0x081AE950 + thumb_func_start ListMenuErasePrintedCursor +ListMenuErasePrintedCursor: @ 0x081AE950 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -882700,7 +882700,7 @@ sub_081AE950: @ 0x081AE950 lsls r0, r1, #0x1a lsrs r0, r0, #0x1a movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 ldrb r0, [r7, #0x16] lsls r0, r0, #0x1a @@ -882750,7 +882750,7 @@ _081AE9CC: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081AE950 + thumb_func_end ListMenuErasePrintedCursor thumb_func_start ListMenuUpdateSelectedRowIndexAndScrollOffset ListMenuUpdateSelectedRowIndexAndScrollOffset: @ 0x081AE9D8 @@ -882893,8 +882893,8 @@ _081AEAC0: .align 2, 0 thumb_func_end ListMenuUpdateSelectedRowIndexAndScrollOffset - thumb_func_start sub_081AEAC8 -sub_081AEAC8: @ 0x081AEAC8 + thumb_func_start ListMenuScroll +ListMenuScroll: @ 0x081AEAC8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -882915,19 +882915,19 @@ sub_081AEAC8: @ 0x081AEAC8 lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r1, [r6, #0x18] ldrh r3, [r6, #0xe] adds r0, r6, #0 movs r2, #0 - bl sub_081AE740 + bl ListMenuPrintEntries b _081AEBF2 _081AEB02: ldrb r0, [r6, #0x17] lsls r0, r0, #0x1a lsrs r0, r0, #0x1a movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute ldrb r1, [r6, #0x16] lsls r1, r1, #0x1a lsrs r1, r1, #0x1d @@ -882953,7 +882953,7 @@ _081AEB02: adds r0, r6, #0 movs r2, #0 adds r3, r5, #0 - bl sub_081AE740 + bl ListMenuPrintEntries ldrh r0, [r6, #0xe] adds r1, r0, #0 muls r1, r4, r1 @@ -882966,13 +882966,13 @@ _081AEB02: lsrs r4, r4, #0x10 ldrb r0, [r6, #0x10] movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute adds r5, r0, #0 lsls r5, r5, #0x13 lsrs r5, r5, #0x10 ldrb r0, [r6, #0x10] movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #3 subs r0, r0, r4 lsls r0, r0, #0x10 @@ -883013,10 +883013,10 @@ _081AEB94: lsrs r2, r2, #0x10 adds r0, r6, #0 adds r3, r7, #0 - bl sub_081AE740 + bl ListMenuPrintEntries ldrb r0, [r6, #0x10] movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x13 lsrs r0, r0, #0x10 ldrb r3, [r6, #0x10] @@ -883042,10 +883042,10 @@ _081AEBF2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AEAC8 + thumb_func_end ListMenuScroll - thumb_func_start sub_081AEC00 -sub_081AEC00: @ 0x081AEC00 + thumb_func_start ListMenuChangeSelection +ListMenuChangeSelection: @ 0x081AEC00 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -883117,32 +883117,32 @@ _081AEC7A: _081AEC7E: adds r0, r4, #0 mov r1, sl - bl sub_081AE950 + bl ListMenuErasePrintedCursor adds r0, r4, #0 - bl sub_081AE7F8 + bl ListMenuDrawCursor adds r0, r4, #0 movs r1, #0 - bl sub_081AECD8 + bl ListMenuCallSelectionChangedCallback ldrb r0, [r4, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _081AECC6 _081AEC9E: adds r0, r4, #0 mov r1, sl - bl sub_081AE950 + bl ListMenuErasePrintedCursor adds r0, r4, #0 adds r1, r7, #0 mov r2, sb - bl sub_081AEAC8 + bl ListMenuScroll adds r0, r4, #0 - bl sub_081AE7F8 + bl ListMenuDrawCursor adds r0, r4, #0 movs r1, #0 - bl sub_081AECD8 + bl ListMenuCallSelectionChangedCallback ldrb r0, [r4, #0x10] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081AECC6: movs r0, #0 _081AECC8: @@ -883154,10 +883154,10 @@ _081AECC8: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081AEC00 + thumb_func_end ListMenuChangeSelection - thumb_func_start sub_081AECD8 -sub_081AECD8: @ 0x081AECD8 + thumb_func_start ListMenuCallSelectionChangedCallback +ListMenuCallSelectionChangedCallback: @ 0x081AECD8 push {r4, lr} adds r2, r0, #0 lsls r1, r1, #0x18 @@ -883178,7 +883178,7 @@ _081AECFA: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081AECD8 + thumb_func_end ListMenuCallSelectionChangedCallback thumb_func_start ListMenuOverrideSetColors ListMenuOverrideSetColors: @ 0x081AED00 @@ -883223,8 +883223,8 @@ ListMenuOverrideSetColors: @ 0x081AED00 _081AED4C: .4byte gUnknown_3006040 thumb_func_end ListMenuOverrideSetColors - thumb_func_start sub_081AED50 -sub_081AED50: @ 0x081AED50 + thumb_func_start ListMenuDefaultCursorMoveFunc +ListMenuDefaultCursorMoveFunc: @ 0x081AED50 push {lr} lsls r1, r1, #0x18 cmp r1, #0 @@ -883235,10 +883235,10 @@ _081AED5E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AED50 + thumb_func_end ListMenuDefaultCursorMoveFunc - thumb_func_start sub_081AED64 -sub_081AED64: @ 0x081AED64 + thumb_func_start ListMenuGetUnkIndicatorsStructFields +ListMenuGetUnkIndicatorsStructFields: @ 0x081AED64 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -883344,10 +883344,10 @@ _081AEE2C: _081AEE30: pop {r1} bx r1 - thumb_func_end sub_081AED64 + thumb_func_end ListMenuGetUnkIndicatorsStructFields - thumb_func_start sub_081AEE34 -sub_081AEE34: @ 0x081AEE34 + thumb_func_start ListMenuSetUnkIndicatorsStructField +ListMenuSetUnkIndicatorsStructField: @ 0x081AEE34 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -883483,10 +883483,10 @@ _081AEF34: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AEE34 + thumb_func_end ListMenuSetUnkIndicatorsStructField - thumb_func_start sub_081AEF3C -sub_081AEF3C: @ 0x081AEF3C + thumb_func_start SpriteCallback_ScrollIndicatorArrow +SpriteCallback_ScrollIndicatorArrow: @ 0x081AEF3C push {r4, lr} adds r4, r0, #0 movs r1, #0x2e @@ -883562,10 +883562,10 @@ _081AEFBC: bx r0 .align 2, 0 _081AEFC4: .4byte gUnknown_82FA8CC - thumb_func_end sub_081AEF3C + thumb_func_end SpriteCallback_ScrollIndicatorArrow - thumb_func_start sub_081AEFC8 -sub_081AEFC8: @ 0x081AEFC8 + thumb_func_start AddScrollIndicatorArrowObject +AddScrollIndicatorArrowObject: @ 0x081AEFC8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -883594,7 +883594,7 @@ sub_081AEFC8: @ 0x081AEFC8 mov r3, ip strh r3, [r0, #2] movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081AF050 @@ -883634,10 +883634,10 @@ sub_081AEFC8: @ 0x081AEFC8 _081AF04C: .4byte gUnknown_85DFAFC _081AF050: .4byte gUnknown_20205AC _081AF054: .4byte gUnknown_85DFAB4 - thumb_func_end sub_081AEFC8 + thumb_func_end AddScrollIndicatorArrowObject - thumb_func_start sub_081AF058 -sub_081AF058: @ 0x081AF058 + thumb_func_start AddScrollIndicatorArrowPair +AddScrollIndicatorArrowPair: @ 0x081AF058 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -883660,7 +883660,7 @@ sub_081AF058: @ 0x081AF058 orrs r0, r1 str r0, [sp, #8] add r0, sp, #4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldrh r2, [r6, #0xc] cmp r2, r4 bne _081AF0B4 @@ -883672,7 +883672,7 @@ sub_081AF058: @ 0x081AF058 adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _081AF0C6 .align 2, 0 _081AF0A4: .4byte gUnknown_85DFB80 @@ -883691,7 +883691,7 @@ _081AF0B4: _081AF0C6: ldr r0, _081AF168 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -883718,7 +883718,7 @@ _081AF0C6: ldrh r3, [r6, #0xa] ldrh r4, [r6, #0xc] str r4, [sp] - bl sub_081AEFC8 + bl AddScrollIndicatorArrowObject strb r0, [r7, #0xc] ldrb r0, [r6, #3] ldrb r1, [r6, #4] @@ -883726,7 +883726,7 @@ _081AF0C6: ldrh r3, [r6, #0xa] ldrh r4, [r6, #0xc] str r4, [sp] - bl sub_081AEFC8 + bl AddScrollIndicatorArrowObject strb r0, [r7, #0xd] ldrh r1, [r6, #0xc] ldr r0, _081AF170 @@ -883768,14 +883768,14 @@ _081AF154: bx r1 .align 2, 0 _081AF164: .4byte gUnknown_85DFB60 -_081AF168: .4byte sub_081AF1DC +_081AF168: .4byte Task_ScrollIndicatorArrowPair _081AF16C: .4byte gUnknown_3005B68 _081AF170: .4byte 0x0000FFFF _081AF174: .4byte gUnknown_20205AC - thumb_func_end sub_081AF058 + thumb_func_end AddScrollIndicatorArrowPair - thumb_func_start sub_081AF178 -sub_081AF178: @ 0x081AF178 + thumb_func_start AddScrollIndicatorArrowPairParameterized +AddScrollIndicatorArrowPairParameterized: @ 0x081AF178 push {r4, lr} adds r4, r1, #0 subs r0, #2 @@ -883817,7 +883817,7 @@ _081AF1AE: strb r1, [r2, #0xe] adds r0, r2, #0 ldr r1, [sp, #0x14] - bl sub_081AF058 + bl AddScrollIndicatorArrowPair lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r4} @@ -883825,10 +883825,10 @@ _081AF1AE: bx r1 .align 2, 0 _081AF1D8: .4byte gUnknown_203CB58 - thumb_func_end sub_081AF178 + thumb_func_end AddScrollIndicatorArrowPairParameterized - thumb_func_start sub_081AF1DC -sub_081AF1DC: @ 0x081AF1DC + thumb_func_start Task_ScrollIndicatorArrowPair +Task_ScrollIndicatorArrowPair: @ 0x081AF1DC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -883905,10 +883905,10 @@ _081AF26C: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081AF1DC + thumb_func_end Task_ScrollIndicatorArrowPair - thumb_func_start sub_081AF274 -sub_081AF274: @ 0x081AF274 + thumb_func_start Task_ScrollIndicatorArrowPairOnMainMenu +Task_ScrollIndicatorArrowPairOnMainMenu: @ 0x081AF274 push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -883975,10 +883975,10 @@ _081AF2EA: bx r0 .align 2, 0 _081AF2F4: .4byte gUnknown_20205AC - thumb_func_end sub_081AF274 + thumb_func_end Task_ScrollIndicatorArrowPairOnMainMenu - thumb_func_start sub_081AF2F8 -sub_081AF2F8: @ 0x081AF2F8 + thumb_func_start RemoveScrollIndicatorArrowPair +RemoveScrollIndicatorArrowPair: @ 0x081AF2F8 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -884013,7 +884013,7 @@ _081AF320: adds r0, r0, r4 bl DestroySprite adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5, r6} pop {r0} bx r0 @@ -884021,7 +884021,7 @@ _081AF320: _081AF34C: .4byte gUnknown_3005B68 _081AF350: .4byte 0x0000FFFF _081AF354: .4byte gUnknown_20205AC - thumb_func_end sub_081AF2F8 + thumb_func_end RemoveScrollIndicatorArrowPair thumb_func_start ListMenuAddCursorObjectInternal ListMenuAddCursorObjectInternal: @ 0x081AF358 @@ -884031,10 +884031,10 @@ ListMenuAddCursorObjectInternal: @ 0x081AF358 cmp r1, #1 beq _081AF368 _081AF362: - bl sub_081AF500 + bl ListMenuAddRedOutlineCursorObject b _081AF36C _081AF368: - bl sub_081AF738 + bl ListMenuAddRedArrowCursorObject _081AF36C: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -884078,10 +884078,10 @@ ListMenuRemoveCursorObject: @ 0x081AF39C beq _081AF3B2 b _081AF3B6 _081AF3AC: - bl sub_081AF6B0 + bl ListMenuRemoveRedOutlineCursorObject b _081AF3B6 _081AF3B2: - bl sub_081AF878 + bl ListMenuRemoveRedArrowCursorObject _081AF3B6: pop {r0} bx r0 @@ -884262,8 +884262,8 @@ _081AF4F8: .4byte gUnknown_85DFB20 _081AF4FC: .4byte gUnknown_85DFB24 thumb_func_end ListMenuSetUpRedOutlineCursorSpriteOamTable - thumb_func_start sub_081AF500 -sub_081AF500: @ 0x081AF500 + thumb_func_start ListMenuAddRedOutlineCursorObject +ListMenuAddRedOutlineCursorObject: @ 0x081AF500 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -884284,7 +884284,7 @@ sub_081AF500: @ 0x081AF500 ands r1, r3 orrs r1, r2 str r1, [r0, #4] - bl sub_08034388 + bl LoadCompressedSpriteSheet ldrh r2, [r6, #8] ldr r7, _081AF554 cmp r2, r7 @@ -884297,7 +884297,7 @@ sub_081AF500: @ 0x081AF500 adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _081AF56E .align 2, 0 _081AF54C: .4byte gUnknown_85DFBF0 @@ -884316,7 +884316,7 @@ _081AF55C: _081AF56E: ldr r0, _081AF658 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r4, r0, #0 @@ -884361,7 +884361,7 @@ _081AF56E: adds r2, #0x78 mov r0, sp movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r5, #0xc] ldrb r1, [r5, #0xc] lsls r0, r1, #4 @@ -884370,7 +884370,7 @@ _081AF56E: ldr r7, _081AF664 adds r0, r0, r7 adds r1, r5, #0 - bl sub_0800858C + bl SetSubspriteTables ldrb r0, [r5, #0xc] lsls r1, r0, #4 adds r1, r1, r0 @@ -884431,7 +884431,7 @@ _081AF65C: .4byte gUnknown_3005B68 _081AF660: .4byte gUnknown_82BF314 _081AF664: .4byte gUnknown_20205AC _081AF668: .4byte 0x0000FFFF - thumb_func_end sub_081AF500 + thumb_func_end ListMenuAddRedOutlineCursorObject thumb_func_start ListMenuUpdateRedOutlineCursorObject ListMenuUpdateRedOutlineCursorObject: @ 0x081AF66C @@ -884470,8 +884470,8 @@ _081AF6A8: .4byte gUnknown_3005B68 _081AF6AC: .4byte gUnknown_20205AC thumb_func_end ListMenuUpdateRedOutlineCursorObject - thumb_func_start sub_081AF6B0 -sub_081AF6B0: @ 0x081AF6B0 + thumb_func_start ListMenuRemoveRedOutlineCursorObject +ListMenuRemoveRedOutlineCursorObject: @ 0x081AF6B0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -884482,7 +884482,7 @@ sub_081AF6B0: @ 0x081AF6B0 ldr r1, _081AF6FC adds r4, r0, r1 ldr r0, [r4, #8] - bl sub_08000BF0 + bl Free ldrh r0, [r4, #0xe] ldr r6, _081AF700 cmp r0, r6 @@ -884502,7 +884502,7 @@ _081AF6DE: adds r0, r0, r1 bl DestroySprite adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5, r6} pop {r0} bx r0 @@ -884510,7 +884510,7 @@ _081AF6DE: _081AF6FC: .4byte gUnknown_3005B68 _081AF700: .4byte 0x0000FFFF _081AF704: .4byte gUnknown_20205AC - thumb_func_end sub_081AF6B0 + thumb_func_end ListMenuRemoveRedOutlineCursorObject thumb_func_start SpriteCallback_RedArrowCursor SpriteCallback_RedArrowCursor: @ 0x081AF708 @@ -884544,8 +884544,8 @@ sub_081AF734: @ 0x081AF734 .align 2, 0 thumb_func_end sub_081AF734 - thumb_func_start sub_081AF738 -sub_081AF738: @ 0x081AF738 + thumb_func_start ListMenuAddRedArrowCursorObject +ListMenuAddRedArrowCursorObject: @ 0x081AF738 push {r4, r5, r6, r7, lr} sub sp, #0x28 adds r5, r0, #0 @@ -884563,7 +884563,7 @@ sub_081AF738: @ 0x081AF738 ands r1, r4 orrs r1, r2 str r1, [r0, #4] - bl sub_08034388 + bl LoadCompressedSpriteSheet ldrh r2, [r5, #8] cmp r2, r4 bne _081AF78C @@ -884575,7 +884575,7 @@ sub_081AF738: @ 0x081AF738 adds r1, r1, r2 lsrs r1, r1, #0x10 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette b _081AF79E .align 2, 0 _081AF77C: .4byte gUnknown_85DFC30 @@ -884594,7 +884594,7 @@ _081AF78C: _081AF79E: ldr r0, _081AF82C movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r6, r0, #0 @@ -884622,7 +884622,7 @@ _081AF79E: ldrb r2, [r5, #1] mov r0, sp movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4] ldr r3, _081AF838 ldrb r1, [r4] @@ -884667,7 +884667,7 @@ _081AF830: .4byte gUnknown_3005B68 _081AF834: .4byte gUnknown_85DFB48 _081AF838: .4byte gUnknown_20205AC _081AF83C: .4byte 0x0000FFFF - thumb_func_end sub_081AF738 + thumb_func_end ListMenuAddRedArrowCursorObject thumb_func_start ListMenuUpdateRedArrowCursorObject ListMenuUpdateRedArrowCursorObject: @ 0x081AF840 @@ -884700,8 +884700,8 @@ _081AF870: .4byte gUnknown_3005B68 _081AF874: .4byte gUnknown_20205AC thumb_func_end ListMenuUpdateRedArrowCursorObject - thumb_func_start sub_081AF878 -sub_081AF878: @ 0x081AF878 + thumb_func_start ListMenuRemoveRedArrowCursorObject +ListMenuRemoveRedArrowCursorObject: @ 0x081AF878 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -884730,7 +884730,7 @@ _081AF8A0: adds r0, r0, r1 bl DestroySprite adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5, r6} pop {r0} bx r0 @@ -884738,7 +884738,7 @@ _081AF8A0: _081AF8BC: .4byte gUnknown_3005B68 _081AF8C0: .4byte 0x0000FFFF _081AF8C4: .4byte gUnknown_20205AC - thumb_func_end sub_081AF878 + thumb_func_end ListMenuRemoveRedArrowCursorObject thumb_func_start DynamicPlaceholderTextUtil_Reset DynamicPlaceholderTextUtil_Reset: @ 0x081AF8C8 @@ -884777,8 +884777,8 @@ _081AF8F8: _081AF8FC: .4byte gUnknown_203CB68 thumb_func_end DynamicPlaceholderTextUtil_SetPlaceholderPtr - thumb_func_start sub_081AF900 -sub_081AF900: @ 0x081AF900 + thumb_func_start DynamicPlaceholderTextUtil_ExpandPlaceholders +DynamicPlaceholderTextUtil_ExpandPlaceholders: @ 0x081AF900 push {r4, r5, lr} adds r2, r0, #0 adds r4, r1, #0 @@ -884821,7 +884821,7 @@ _081AF940: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081AF900 + thumb_func_end DynamicPlaceholderTextUtil_ExpandPlaceholders thumb_func_start sub_081AF94C sub_081AF94C: @ 0x081AF94C @@ -884835,8 +884835,8 @@ sub_081AF94C: @ 0x081AF94C _081AF958: .4byte gUnknown_203CB68 thumb_func_end sub_081AF94C - thumb_func_start sub_081AF95C -sub_081AF95C: @ 0x081AF95C + thumb_func_start IsCurMapInLocationList +IsCurMapInLocationList: @ 0x081AF95C push {r4, lr} adds r2, r0, #0 ldr r0, _081AF98C @@ -884876,45 +884876,45 @@ _081AF99E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081AF95C + thumb_func_end IsCurMapInLocationList - thumb_func_start sub_081AF9A4 -sub_081AF9A4: @ 0x081AF9A4 + thumb_func_start IsCurMapPokeCenter +IsCurMapPokeCenter: @ 0x081AF9A4 push {lr} ldr r0, _081AF9B0 - bl sub_081AF95C + bl IsCurMapInLocationList pop {r1} bx r1 .align 2, 0 _081AF9B0: .4byte gUnknown_85DFC74 - thumb_func_end sub_081AF9A4 + thumb_func_end IsCurMapPokeCenter - thumb_func_start sub_081AF9B4 -sub_081AF9B4: @ 0x081AF9B4 + thumb_func_start IsCurMapReloadLocation +IsCurMapReloadLocation: @ 0x081AF9B4 push {lr} ldr r0, _081AF9C0 - bl sub_081AF95C + bl IsCurMapInLocationList pop {r1} bx r1 .align 2, 0 _081AF9C0: .4byte gUnknown_85DFCC2 - thumb_func_end sub_081AF9B4 + thumb_func_end IsCurMapReloadLocation thumb_func_start sub_081AF9C4 sub_081AF9C4: @ 0x081AF9C4 push {lr} ldr r0, _081AF9D0 - bl sub_081AF95C + bl IsCurMapInLocationList pop {r1} bx r1 .align 2, 0 _081AF9D0: .4byte gUnknown_85DFCC6 thumb_func_end sub_081AF9C4 - thumb_func_start sub_081AF9D4 -sub_081AF9D4: @ 0x081AF9D4 + thumb_func_start TrySetPokeCenterWarpStatus +TrySetPokeCenterWarpStatus: @ 0x081AF9D4 push {lr} - bl sub_081AF9A4 + bl IsCurMapPokeCenter cmp r0, #0 bne _081AF9F0 ldr r0, _081AF9EC @@ -884937,12 +884937,12 @@ _081AF9FA: bx r0 .align 2, 0 _081AFA00: .4byte gUnknown_3005AF0 - thumb_func_end sub_081AF9D4 + thumb_func_end TrySetPokeCenterWarpStatus - thumb_func_start sub_081AFA04 -sub_081AFA04: @ 0x081AFA04 + thumb_func_start TrySetReloadWarpStatus +TrySetReloadWarpStatus: @ 0x081AFA04 push {lr} - bl sub_081AF9B4 + bl IsCurMapReloadLocation cmp r0, #0 bne _081AFA20 ldr r0, _081AFA1C @@ -884965,7 +884965,7 @@ _081AFA2A: bx r0 .align 2, 0 _081AFA30: .4byte gUnknown_3005AF0 - thumb_func_end sub_081AFA04 + thumb_func_end TrySetReloadWarpStatus thumb_func_start sub_081AFA34 sub_081AFA34: @ 0x081AFA34 @@ -884995,16 +884995,16 @@ _081AFA5A: _081AFA60: .4byte gUnknown_3005AF0 thumb_func_end sub_081AFA34 - thumb_func_start sub_081AFA64 -sub_081AFA64: @ 0x081AFA64 + thumb_func_start TrySetMapSaveWarpStatus +TrySetMapSaveWarpStatus: @ 0x081AFA64 push {lr} - bl sub_081AF9D4 - bl sub_081AFA04 + bl TrySetPokeCenterWarpStatus + bl TrySetReloadWarpStatus bl sub_081AFA34 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AFA64 + thumb_func_end TrySetMapSaveWarpStatus thumb_func_start sub_081AFA78 sub_081AFA78: @ 0x081AFA78 @@ -885046,8 +885046,8 @@ sub_081AFAA8: @ 0x081AFAA8 _081AFAB8: .4byte gUnknown_3005AF0 thumb_func_end sub_081AFAA8 - thumb_func_start sub_081AFABC -sub_081AFABC: @ 0x081AFABC + thumb_func_start AllocItemIconTemporaryBuffers +AllocItemIconTemporaryBuffers: @ 0x081AFABC push {r4, r5, lr} ldr r5, _081AFAE4 movs r0, #0x90 @@ -885059,7 +885059,7 @@ sub_081AFABC: @ 0x081AFABC ldr r4, _081AFAE8 movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] cmp r0, #0 beq _081AFAEC @@ -885070,7 +885070,7 @@ _081AFAE4: .4byte gUnknown_203CB88 _081AFAE8: .4byte gUnknown_203CB8C _081AFAEC: ldr r0, [r5] - bl sub_08000BF0 + bl Free _081AFAF2: movs r0, #0 _081AFAF4: @@ -885078,26 +885078,26 @@ _081AFAF4: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AFABC + thumb_func_end AllocItemIconTemporaryBuffers - thumb_func_start sub_081AFAFC -sub_081AFAFC: @ 0x081AFAFC + thumb_func_start FreeItemIconTemporaryBuffers +FreeItemIconTemporaryBuffers: @ 0x081AFAFC push {lr} ldr r0, _081AFB14 ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _081AFB18 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 _081AFB14: .4byte gUnknown_203CB88 _081AFB18: .4byte gUnknown_203CB8C - thumb_func_end sub_081AFAFC + thumb_func_end FreeItemIconTemporaryBuffers - thumb_func_start sub_081AFB1C -sub_081AFB1C: @ 0x081AFB1C + thumb_func_start CopyItemIconPicTo4x4Buffer +CopyItemIconPicTo4x4Buffer: @ 0x081AFB1C push {r4, r5, r6, lr} adds r6, r0, #0 adds r5, r1, #0 @@ -885120,10 +885120,10 @@ _081AFB24: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AFB1C + thumb_func_end CopyItemIconPicTo4x4Buffer - thumb_func_start sub_081AFB48 -sub_081AFB48: @ 0x081AFB48 + thumb_func_start AddItemIconSprite +AddItemIconSprite: @ 0x081AFB48 push {r4, r5, r6, r7, lr} sub sp, #0x10 lsls r0, r0, #0x10 @@ -885132,7 +885132,7 @@ sub_081AFB48: @ 0x081AFB48 lsrs r6, r1, #0x10 lsls r2, r2, #0x10 lsrs r5, r2, #0x10 - bl sub_081AFABC + bl AllocItemIconTemporaryBuffers lsls r0, r0, #0x18 cmp r0, #0 beq _081AFC00 @@ -885145,7 +885145,7 @@ sub_081AFB48: @ 0x081AFB48 ldr r0, [r4] ldr r4, _081AFBF0 ldr r1, [r4] - bl sub_081AFB1C + bl CopyItemIconPicTo4x4Buffer ldr r0, [r4] str r0, [sp] ldr r4, _081AFBF4 @@ -885160,7 +885160,7 @@ sub_081AFB48: @ 0x081AFB48 orrs r0, r2 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r5, #0 movs r1, #1 bl GetItemIconPicOrPalette @@ -885170,7 +885170,7 @@ sub_081AFB48: @ 0x081AFB48 ands r1, r4 orrs r1, r6 str r1, [r0, #4] - bl sub_080343E4 + bl LoadCompressedSpritePalette movs r0, #0x18 bl sub_08000BC8 adds r5, r0, #0 @@ -885184,13 +885184,13 @@ sub_081AFB48: @ 0x081AFB48 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AFAFC + bl FreeItemIconTemporaryBuffers adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r4, #0 b _081AFC02 .align 2, 0 @@ -885207,10 +885207,10 @@ _081AFC02: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AFB48 + thumb_func_end AddItemIconSprite - thumb_func_start sub_081AFC0C -sub_081AFC0C: @ 0x081AFC0C + thumb_func_start AddCustomItemIconSprite +AddCustomItemIconSprite: @ 0x081AFC0C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -885222,7 +885222,7 @@ sub_081AFC0C: @ 0x081AFC0C lsrs r6, r2, #0x10 lsls r3, r3, #0x10 lsrs r5, r3, #0x10 - bl sub_081AFABC + bl AllocItemIconTemporaryBuffers lsls r0, r0, #0x18 cmp r0, #0 beq _081AFCC4 @@ -885235,7 +885235,7 @@ sub_081AFC0C: @ 0x081AFC0C ldr r0, [r4] ldr r4, _081AFCB8 ldr r1, [r4] - bl sub_081AFB1C + bl CopyItemIconPicTo4x4Buffer ldr r0, [r4] str r0, [sp] ldr r4, _081AFCBC @@ -885250,7 +885250,7 @@ sub_081AFC0C: @ 0x081AFC0C orrs r0, r2 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet adds r0, r5, #0 movs r1, #1 bl GetItemIconPicOrPalette @@ -885260,7 +885260,7 @@ sub_081AFC0C: @ 0x081AFC0C ands r1, r4 orrs r1, r6 str r1, [r0, #4] - bl sub_080343E4 + bl LoadCompressedSpritePalette movs r0, #0x18 bl sub_08000BC8 adds r5, r0, #0 @@ -885274,13 +885274,13 @@ sub_081AFC0C: @ 0x081AFC0C movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AFAFC + bl FreeItemIconTemporaryBuffers adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r4, #0 b _081AFCC6 .align 2, 0 @@ -885298,7 +885298,7 @@ _081AFCC6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AFC0C + thumb_func_end AddCustomItemIconSprite thumb_func_start GetItemIconPicOrPalette GetItemIconPicOrPalette: @ 0x081AFCD4 @@ -885334,8 +885334,8 @@ _081AFCFA: _081AFD0C: .4byte gUnknown_85DFCC8 thumb_func_end GetItemIconPicOrPalette - thumb_func_start sub_081AFD10 -sub_081AFD10: @ 0x081AFD10 + thumb_func_start InitPartyMenu +InitPartyMenu: @ 0x081AFD10 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -885368,7 +885368,7 @@ sub_081AFD10: @ 0x081AFD10 cmp r5, #0 bne _081AFD60 ldr r0, [sp, #0x2c] - bl sub_08000540 + bl SetMainCallback2 b _081AFE6C .align 2, 0 _081AFD5C: .4byte gUnknown_203CB90 @@ -885495,7 +885495,7 @@ _081AFE34: ldr r1, _081AFE7C adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081AFE56 _081AFE52: @@ -885510,7 +885510,7 @@ _081AFE56: strb r0, [r2] bl sub_0806B004 ldr r0, _081AFE84 - bl sub_08000540 + bl SetMainCallback2 _081AFE6C: add sp, #4 pop {r3, r4, r5} @@ -885523,35 +885523,35 @@ _081AFE6C: .align 2, 0 _081AFE7C: .4byte gUnknown_2024190 _081AFE80: .4byte gUnknown_30030B4 -_081AFE84: .4byte sub_081AFEB8 - thumb_func_end sub_081AFD10 +_081AFE84: .4byte PartyMenuInitCallback + thumb_func_end InitPartyMenu - thumb_func_start sub_081AFE88 -sub_081AFE88: @ 0x081AFE88 + thumb_func_start PartyMenuCallback +PartyMenuCallback: @ 0x081AFE88 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AFE88 + thumb_func_end PartyMenuCallback thumb_func_start sub_081AFEA4 sub_081AFEA4: @ 0x081AFEA4 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081AFEA4 - thumb_func_start sub_081AFEB8 -sub_081AFEB8: @ 0x081AFEB8 + thumb_func_start PartyMenuInitCallback +PartyMenuInitCallback: @ 0x081AFEB8 push {lr} _081AFEBA: bl sub_081221F8 @@ -885559,7 +885559,7 @@ _081AFEBA: lsrs r0, r0, #0x18 cmp r0, #1 beq _081AFEDE - bl sub_081AFEE4 + bl PartyMenuSetup lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -885573,10 +885573,10 @@ _081AFEDE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081AFEB8 + thumb_func_end PartyMenuInitCallback - thumb_func_start sub_081AFEE4 -sub_081AFEE4: @ 0x081AFEE4 + thumb_func_start PartyMenuSetup +PartyMenuSetup: @ 0x081AFEE4 push {r4, lr} sub sp, #4 ldr r1, _081AFF04 @@ -885622,8 +885622,8 @@ _081AFF0C: @ jump table .4byte _081B0124 @ case 21 .4byte _081B014C @ case 22 _081AFF68: - bl sub_08121E58 - bl sub_08121D90 + bl SetVBlankHBlankCallbacksToNull + bl ResetVramOamAndBgCntRegs bl sub_08199640 ldr r1, _081AFF80 movs r0, #0x87 @@ -885633,7 +885633,7 @@ _081AFF68: .align 2, 0 _081AFF80: .4byte gUnknown_3002360 _081AFF84: - bl sub_080B9710 + bl ScanlineEffect_Stop b _081B015C _081AFF8A: bl ResetPaletteFade @@ -885669,7 +885669,7 @@ _081AFFC4: beq _081AFFD0 b _081B015C _081AFFD0: - bl sub_080A8818 + bl ResetTasks b _081B015C _081AFFD6: bl sub_081B1D6C @@ -885681,11 +885681,11 @@ _081AFFD6: .align 2, 0 _081AFFE4: .4byte gUnknown_3002360 _081AFFE8: - bl sub_081B0228 + bl AllocPartyMenuBg lsls r0, r0, #0x18 cmp r0, #0 bne _081AFFFA - bl sub_081B0194 + bl PartyMenuExit movs r0, #1 b _081B018A _081AFFFA: @@ -885700,7 +885700,7 @@ _081AFFFA: .align 2, 0 _081B000C: .4byte gUnknown_203CB90 _081B0010: - bl sub_081B02A0 + bl AllocPartyMiscGfx lsls r0, r0, #0x18 cmp r0, #0 bne _081B001C @@ -885727,7 +885727,7 @@ _081B0040: ldrb r0, [r0, #8] lsls r0, r0, #0x1a lsrs r0, r0, #0x1e - bl sub_081B0418 + bl PartyMenuInitHelperStructs ldr r0, _081B0060 ldr r0, [r0] movs r1, #0x86 @@ -885749,10 +885749,10 @@ _081B0064: .align 2, 0 _081B0074: .4byte gUnknown_3002360 _081B0078: - bl sub_081B5CE0 + bl LoadPartyMenuPokeballGfx b _081B015C _081B007E: - bl sub_081B5E00 + bl LoadPartyMenuAilmentGfx ldr r1, _081B008C movs r0, #0x87 lsls r0, r0, #3 @@ -885761,10 +885761,10 @@ _081B007E: .align 2, 0 _081B008C: .4byte gUnknown_3002360 _081B0090: - bl sub_080D27A4 + bl LoadMonIconPalettes b _081B015C _081B0096: - bl sub_081B0BC4 + bl party_menu_add_per_mon_objects lsls r0, r0, #0x18 cmp r0, #0 bne _081B00A2 @@ -885824,11 +885824,11 @@ _081B0108: ldr r0, [r4] ldr r0, [r0] movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, [r4] ldrh r0, [r0, #0xa] lsrs r0, r0, #2 - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B015C .align 2, 0 _081B0120: .4byte gUnknown_203CB90 @@ -885837,7 +885837,7 @@ _081B0124: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r2, _081B0144 ldrb r1, [r2, #8] movs r0, #0x7f @@ -885858,7 +885858,7 @@ _081B014C: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _081B015C: ldr r1, _081B016C movs r2, #0x87 @@ -885873,14 +885873,14 @@ _081B0164: _081B016C: .4byte gUnknown_3002360 _081B0170: ldr r0, _081B0180 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081B0184 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _081B018A .align 2, 0 _081B0180: .4byte sub_081AFEA4 -_081B0184: .4byte sub_081AFE88 +_081B0184: .4byte PartyMenuCallback _081B0188: movs r0, #0 _081B018A: @@ -885889,10 +885889,10 @@ _081B018A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081AFEE4 + thumb_func_end PartyMenuSetup - thumb_func_start sub_081B0194 -sub_081B0194: @ 0x081B0194 + thumb_func_start PartyMenuExit +PartyMenuExit: @ 0x081B0194 push {lr} sub sp, #4 movs r0, #1 @@ -885901,25 +885901,25 @@ sub_081B0194: @ 0x081B0194 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081B01C4 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _081B01C8 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081B01CC - bl sub_08000540 + bl SetMainCallback2 add sp, #4 pop {r0} bx r0 .align 2, 0 -_081B01C4: .4byte sub_081B01D0 +_081B01C4: .4byte PartyMenuExitTask _081B01C8: .4byte sub_081AFEA4 -_081B01CC: .4byte sub_081AFE88 - thumb_func_end sub_081B0194 +_081B01CC: .4byte PartyMenuCallback + thumb_func_end PartyMenuExit - thumb_func_start sub_081B01D0 -sub_081B01D0: @ 0x081B01D0 + thumb_func_start PartyMenuExitTask +PartyMenuExitTask: @ 0x081B01D0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -885931,10 +885931,10 @@ sub_081B01D0: @ 0x081B01D0 bne _081B01F4 ldr r0, _081B0200 ldr r0, [r0] - bl sub_08000540 - bl sub_081B03CC + bl SetMainCallback2 + bl FreePartyPointers adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081B01F4: pop {r4} pop {r0} @@ -885942,7 +885942,7 @@ _081B01F4: .align 2, 0 _081B01FC: .4byte gUnknown_2037C74 _081B0200: .4byte gUnknown_203CB94 - thumb_func_end sub_081B01D0 + thumb_func_end PartyMenuExitTask thumb_func_start reset_brm reset_brm: @ 0x081B0204 @@ -885963,8 +885963,8 @@ _081B0220: .4byte gUnknown_203CBA8 _081B0224: .4byte gUnknown_203CBAC thumb_func_end reset_brm - thumb_func_start sub_081B0228 -sub_081B0228: @ 0x081B0228 + thumb_func_start AllocPartyMenuBg +AllocPartyMenuBg: @ 0x081B0228 push {r4, r5, lr} ldr r5, _081B0290 movs r4, #0x80 @@ -885985,10 +885985,10 @@ sub_081B0228: @ 0x081B0228 bl InitBgsFromTemplates ldr r1, [r5] movs r0, #1 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 @@ -885997,11 +885997,11 @@ sub_081B0228: @ 0x081B0228 movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #1 b _081B029A .align 2, 0 @@ -886013,10 +886013,10 @@ _081B029A: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081B0228 + thumb_func_end AllocPartyMenuBg - thumb_func_start sub_081B02A0 -sub_081B02A0: @ 0x081B02A0 + thumb_func_start AllocPartyMiscGfx +AllocPartyMiscGfx: @ 0x081B02A0 push {r4, lr} sub sp, #4 ldr r0, _081B02C0 @@ -886049,7 +886049,7 @@ _081B02E8: ldr r4, _081B0308 ldr r0, _081B030C mov r1, sp - bl sub_08199858 + bl malloc_and_decompress adds r1, r0, #0 str r1, [r4] ldr r2, [sp] @@ -886063,7 +886063,7 @@ _081B02E8: _081B0308: .4byte gUnknown_203CBAC _081B030C: .4byte gUnknown_8D967A0 _081B0310: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081B038C @@ -886080,7 +886080,7 @@ _081B0330: movs r2, #0xb0 lsls r2, r2, #1 movs r1, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081B0354 ldr r4, _081B0358 ldr r1, [r4] @@ -886108,7 +886108,7 @@ _081B0368: _081B036C: movs r0, #8 _081B036E: - bl sub_081B0398 + bl PartyPaletteBufferCopy _081B0372: ldr r0, _081B0384 ldr r1, [r0] @@ -886133,10 +886133,10 @@ _081B038E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B02A0 + thumb_func_end AllocPartyMiscGfx - thumb_func_start sub_081B0398 -sub_081B0398: @ 0x081B0398 + thumb_func_start PartyPaletteBufferCopy +PartyPaletteBufferCopy: @ 0x081B0398 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x1c @@ -886160,36 +886160,36 @@ sub_081B0398: @ 0x081B0398 .align 2, 0 _081B03C4: .4byte gUnknown_2037414 _081B03C8: .4byte gUnknown_20377B4 - thumb_func_end sub_081B0398 + thumb_func_end PartyPaletteBufferCopy - thumb_func_start sub_081B03CC -sub_081B03CC: @ 0x081B03CC + thumb_func_start FreePartyPointers +FreePartyPointers: @ 0x081B03CC push {lr} ldr r0, _081B0408 ldr r0, [r0] cmp r0, #0 beq _081B03DA - bl sub_08000BF0 + bl Free _081B03DA: ldr r0, _081B040C ldr r0, [r0] cmp r0, #0 beq _081B03E6 - bl sub_08000BF0 + bl Free _081B03E6: ldr r0, _081B0410 ldr r0, [r0] cmp r0, #0 beq _081B03F2 - bl sub_08000BF0 + bl Free _081B03F2: ldr r0, _081B0414 ldr r0, [r0] cmp r0, #0 beq _081B03FE - bl sub_08000BF0 + bl Free _081B03FE: - bl sub_080034D4 + bl FreeAllWindowBuffers pop {r0} bx r0 .align 2, 0 @@ -886197,10 +886197,10 @@ _081B0408: .4byte gUnknown_203CB90 _081B040C: .4byte gUnknown_203CBB0 _081B0410: .4byte gUnknown_203CBAC _081B0414: .4byte gUnknown_203CBA8 - thumb_func_end sub_081B03CC + thumb_func_end FreePartyPointers - thumb_func_start sub_081B0418 -sub_081B0418: @ 0x081B0418 + thumb_func_start PartyMenuInitHelperStructs +PartyMenuInitHelperStructs: @ 0x081B0418 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -886281,10 +886281,10 @@ _081B04AA: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B0418 + thumb_func_end PartyMenuInitHelperStructs - thumb_func_start sub_081B04B8 -sub_081B04B8: @ 0x081B04B8 + thumb_func_start RenderPartyMenuBox +RenderPartyMenuBox: @ 0x081B04B8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -886310,7 +886310,7 @@ sub_081B04B8: @ 0x081B04B8 ldr r0, [r0] adds r0, r0, r4 movs r1, #0x40 - bl sub_081B23E4 + bl UpdateSelectedPartyBox b _081B050E .align 2, 0 _081B04F4: .4byte gUnknown_203CB94 @@ -886322,7 +886322,7 @@ _081B0500: ldr r0, [r0] adds r0, r0, r4 movs r1, #8 - bl sub_081B23E4 + bl UpdateSelectedPartyBox _081B050E: adds r5, r4, #0 ldr r4, _081B0530 @@ -886330,13 +886330,13 @@ _081B050E: adds r0, r5, r0 ldrb r0, [r0, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, [r4] adds r0, r5, r0 ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081B0616 .align 2, 0 _081B0530: .4byte gUnknown_203CBA8 @@ -886346,7 +886346,7 @@ _081B0534: ldr r1, _081B056C adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B0574 ldr r4, _081B0570 @@ -886358,12 +886358,12 @@ _081B0534: ldr r0, [r4] adds r0, r0, r5 movs r1, #0x40 - bl sub_081B23E4 + bl UpdateSelectedPartyBox ldr r0, [r4] adds r0, r5, r0 ldrb r0, [r0, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _081B0604 .align 2, 0 _081B056C: .4byte gUnknown_2024190 @@ -886376,7 +886376,7 @@ _081B0574: cmp r1, #7 bne _081B058C adds r0, r5, #0 - bl sub_081B0838 + bl DisplayPartyPokemonSelectForRelearner b _081B05CE .align 2, 0 _081B0588: .4byte gUnknown_203CB94 @@ -886384,13 +886384,13 @@ _081B058C: cmp r1, #2 bne _081B0598 adds r0, r5, #0 - bl sub_081B07E0 + bl DisplayPartyPokemonSelectForContest b _081B05CE _081B0598: cmp r1, #4 bne _081B05A4 adds r0, r5, #0 - bl sub_081B0774 + bl DisplayPartyPokemonSelectForBattle b _081B05CE _081B05A4: cmp r1, #0xb @@ -886402,7 +886402,7 @@ _081B05B0: cmp r1, #0xc bne _081B05BC adds r0, r5, #0 - bl sub_081B089C + bl DisplayPartyPokemonSelectHeldItemRelated b _081B05CE _081B05BC: adds r0, r5, #0 @@ -886411,7 +886411,7 @@ _081B05BC: cmp r0, #0 bne _081B05CE adds r0, r5, #0 - bl sub_081B0620 + bl DisplayPartyPokemonData _081B05CE: ldr r2, _081B05E4 ldrb r1, [r2, #8] @@ -886445,19 +886445,19 @@ _081B0604: ldr r0, [r0] adds r0, r5, r0 ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081B0616: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081B061C: .4byte gUnknown_203CBA8 - thumb_func_end sub_081B04B8 + thumb_func_end RenderPartyMenuBox - thumb_func_start sub_081B0620 -sub_081B0620: @ 0x081B0620 + thumb_func_start DisplayPartyPokemonData +DisplayPartyPokemonData: @ 0x081B0620 push {r4, r5, r6, r7, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -886469,7 +886469,7 @@ sub_081B0620: @ 0x081B0620 adds r7, r1, r0 adds r0, r7, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 cmp r2, #0 beq _081B0678 @@ -886492,7 +886492,7 @@ sub_081B0620: @ 0x081B0620 adds r1, r1, r5 adds r0, r7, #0 movs r2, #0 - bl sub_081B270C + bl DisplayPartyPokemonNickname b _081B06DA .align 2, 0 _081B0670: .4byte gUnknown_2024190 @@ -886515,31 +886515,31 @@ _081B0678: adds r1, r1, r4 adds r0, r7, #0 movs r2, #0 - bl sub_081B270C + bl DisplayPartyPokemonNickname ldr r1, [r5] adds r1, r1, r4 adds r0, r7, #0 movs r2, #0 - bl sub_081B2764 + bl DisplayPartyPokemonLevelCheck ldr r1, [r5] adds r1, r1, r4 adds r0, r7, #0 movs r2, #0 - bl sub_081B2828 + bl DisplayPartyPokemonGenderNidoranCheck ldr r1, [r5] adds r1, r1, r4 adds r0, r7, #0 movs r2, #0 - bl sub_081B2970 + bl DisplayPartyPokemonHPCheck ldr r1, [r5] adds r1, r1, r4 adds r0, r7, #0 movs r2, #0 - bl sub_081B2A08 + bl DisplayPartyPokemonMaxHPCheck ldr r1, [r5] adds r1, r1, r4 adds r0, r7, #0 - bl sub_081B2ABC + bl DisplayPartyPokemonHPBarCheck _081B06DA: add sp, #8 pop {r4, r5, r6, r7} @@ -886547,10 +886547,10 @@ _081B06DA: bx r0 .align 2, 0 _081B06E4: .4byte gUnknown_203CBA8 - thumb_func_end sub_081B0620 + thumb_func_end DisplayPartyPokemonData - thumb_func_start sub_081B06E8 -sub_081B06E8: @ 0x081B06E8 + thumb_func_start DisplayPartyPokemonSelectData +DisplayPartyPokemonSelectData: @ 0x081B06E8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -886584,22 +886584,22 @@ sub_081B06E8: @ 0x081B06E8 adds r1, r1, r5 adds r0, r6, #0 movs r2, #0 - bl sub_081B270C + bl DisplayPartyPokemonNickname adds r0, r6, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B0754 ldr r1, [r7] adds r1, r1, r5 adds r0, r6, #0 movs r2, #0 - bl sub_081B2764 + bl DisplayPartyPokemonLevelCheck ldr r1, [r7] adds r1, r1, r5 adds r0, r6, #0 movs r2, #0 - bl sub_081B2828 + bl DisplayPartyPokemonGenderNidoranCheck _081B0754: ldr r1, [r7] adds r1, r1, r5 @@ -886615,10 +886615,10 @@ _081B0754: .align 2, 0 _081B076C: .4byte gUnknown_2024190 _081B0770: .4byte gUnknown_203CBA8 - thumb_func_end sub_081B06E8 + thumb_func_end DisplayPartyPokemonSelectData - thumb_func_start sub_081B0774 -sub_081B0774: @ 0x081B0774 + thumb_func_start DisplayPartyPokemonSelectForBattle +DisplayPartyPokemonSelectForBattle: @ 0x081B0774 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -886627,13 +886627,13 @@ sub_081B0774: @ 0x081B0774 ldr r1, _081B0798 adds r0, r0, r1 ldr r6, _081B079C - bl sub_081B824C + bl GetBattleEntryEligibility lsls r0, r0, #0x18 cmp r0, #0 bne _081B07AE adds r0, r5, #0 movs r1, #7 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B07DA .align 2, 0 _081B0798: .4byte gUnknown_2024190 @@ -886643,7 +886643,7 @@ _081B07A0: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B07DA _081B07AE: movs r4, #0 @@ -886668,15 +886668,15 @@ _081B07C6: blo _081B07B2 adds r0, r5, #0 movs r1, #1 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B07DA: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081B0774 + thumb_func_end DisplayPartyPokemonSelectForBattle - thumb_func_start sub_081B07E0 -sub_081B07E0: @ 0x081B07E0 + thumb_func_start DisplayPartyPokemonSelectForContest +DisplayPartyPokemonSelectForContest: @ 0x081B07E0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -886706,20 +886706,20 @@ _081B080C: @ jump table _081B0820: adds r0, r4, #0 movs r1, #7 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B0832 _081B082A: adds r0, r4, #0 movs r1, #6 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B0832: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081B07E0 + thumb_func_end DisplayPartyPokemonSelectForContest - thumb_func_start sub_081B0838 -sub_081B0838: @ 0x081B0838 + thumb_func_start DisplayPartyPokemonSelectForRelearner +DisplayPartyPokemonSelectForRelearner: @ 0x081B0838 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -886727,26 +886727,26 @@ sub_081B0838: @ 0x081B0838 muls r0, r4, r0 ldr r1, _081B085C adds r0, r0, r1 - bl sub_0806DCF0 + bl GetNumberOfRelearnableMoves lsls r0, r0, #0x18 cmp r0, #0 bne _081B0860 adds r0, r4, #0 movs r1, #9 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B0868 .align 2, 0 _081B085C: .4byte gUnknown_2024190 _081B0860: adds r0, r4, #0 movs r1, #8 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B0868: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B0838 + thumb_func_end DisplayPartyPokemonSelectForRelearner thumb_func_start sub_081B0870 sub_081B0870: @ 0x081B0870 @@ -886761,20 +886761,20 @@ sub_081B0870: @ 0x081B0870 bne _081B088E adds r0, r4, #0 movs r1, #6 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B0896 _081B088E: adds r0, r4, #0 movs r1, #7 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B0896: pop {r4} pop {r0} bx r0 thumb_func_end sub_081B0870 - thumb_func_start sub_081B089C -sub_081B089C: @ 0x081B089C + thumb_func_start DisplayPartyPokemonSelectHeldItemRelated +DisplayPartyPokemonSelectHeldItemRelated: @ 0x081B089C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -886783,25 +886783,25 @@ sub_081B089C: @ 0x081B089C ldr r1, _081B08C0 adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B08C4 adds r0, r4, #0 movs r1, #0xb - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B08CC .align 2, 0 _081B08C0: .4byte gUnknown_2024190 _081B08C4: adds r0, r4, #0 movs r1, #0xc - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B08CC: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B089C + thumb_func_end DisplayPartyPokemonSelectHeldItemRelated thumb_func_start sub_081B08D4 sub_081B08D4: @ 0x081B08D4 @@ -886826,7 +886826,7 @@ sub_081B08D4: @ 0x081B08D4 ldrb r2, [r0] adds r0, r5, #0 movs r1, #0 - bl sub_081B096C + bl DisplayPartyPokemonSelectToTeachMove b _081B0962 .align 2, 0 _081B0904: .4byte gUnknown_2024190 @@ -886838,7 +886838,7 @@ _081B0918: cmp r0, #3 bne _081B092E adds r0, r4, #0 - bl sub_080FDA70 + bl CheckIfItemIsTMHMOrEvolutionStone lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -886852,25 +886852,25 @@ _081B0932: adds r0, r5, #0 adds r1, r4, #0 movs r2, #0 - bl sub_081B096C + bl DisplayPartyPokemonSelectToTeachMove b _081B0962 _081B093E: adds r0, r6, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B095A adds r0, r6, #0 movs r1, #3 adds r2, r4, #0 - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 cmp r0, #0 bne _081B092E _081B095A: adds r0, r5, #0 movs r1, #0 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B0962: movs r0, #1 _081B0964: @@ -886880,8 +886880,8 @@ _081B0964: .align 2, 0 thumb_func_end sub_081B08D4 - thumb_func_start sub_081B096C -sub_081B096C: @ 0x081B096C + thumb_func_start DisplayPartyPokemonSelectToTeachMove +DisplayPartyPokemonSelectToTeachMove: @ 0x081B096C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -886893,7 +886893,7 @@ sub_081B096C: @ 0x081B096C muls r0, r4, r0 ldr r3, _081B0998 adds r0, r0, r3 - bl sub_081B1FA8 + bl CanMonLearnTMTutor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -886911,23 +886911,23 @@ _081B099C: _081B09A0: adds r0, r4, #0 movs r1, #9 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B09BC _081B09AA: adds r0, r4, #0 movs r1, #0xa - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData b _081B09BC _081B09B4: adds r0, r4, #0 movs r1, #8 - bl sub_081B06E8 + bl DisplayPartyPokemonSelectData _081B09BC: pop {r4} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B096C + thumb_func_end DisplayPartyPokemonSelectToTeachMove thumb_func_start sub_081B09C4 sub_081B09C4: @ 0x081B09C4 @@ -886973,31 +886973,31 @@ _081B09FC: adds r1, r5, #0 bl StringCopy adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 ldrb r0, [r6, #8] ldr r3, [r6] adds r3, #4 adds r1, r4, #0 movs r2, #0 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail ldrb r0, [r7, #0xf] adds r1, r6, #0 - bl sub_081B27DC + bl DisplayPartyPokemonLevel ldrb r0, [r7, #0x1c] ldrh r1, [r7] adds r2, r5, #0 adds r3, r6, #0 - bl sub_081B2890 + bl DisplayPartyPokemonGender ldrh r0, [r7, #0x10] adds r1, r6, #0 - bl sub_081B29D8 + bl DisplayPartyPokemonHP ldrh r0, [r7, #0x12] adds r1, r6, #0 - bl sub_081B2A70 + bl DisplayPartyPokemonMaxHP ldrh r0, [r7, #0x10] ldrh r1, [r7, #0x12] adds r2, r6, #0 - bl sub_081B2AF8 + bl DisplayPartyPokemonHPBar _081B0A60: add sp, #8 pop {r3} @@ -887018,7 +887018,7 @@ sub_081B0A70: @ 0x081B0A70 lsls r4, r4, #2 adds r0, r0, r4 ldrb r0, [r0] - bl sub_081B04B8 + bl RenderPartyMenuBox ldr r1, [r5] adds r1, r1, r4 ldrh r0, [r1] @@ -887040,8 +887040,8 @@ _081B0A9E: bx r1 thumb_func_end sub_081B0A70 - thumb_func_start sub_081B0AA4 -sub_081B0AA4: @ 0x081B0AA4 + thumb_func_start GetPartyMiscGraphicsTile +GetPartyMiscGraphicsTile: @ 0x081B0AA4 lsls r0, r0, #0x10 ldr r1, _081B0AB4 lsrs r0, r0, #0xb @@ -887051,10 +887051,10 @@ sub_081B0AA4: @ 0x081B0AA4 bx lr .align 2, 0 _081B0AB4: .4byte gUnknown_203CBAC - thumb_func_end sub_081B0AA4 + thumb_func_end GetPartyMiscGraphicsTile - thumb_func_start sub_081B0AB8 -sub_081B0AB8: @ 0x081B0AB8 + thumb_func_start party_menu_add_per_mon_objects_internal +party_menu_add_per_mon_objects_internal: @ 0x081B0AB8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -887095,12 +887095,12 @@ sub_081B0AB8: @ 0x081B0AB8 adds r2, r2, r5 movs r3, #0 str r3, [sp] - bl sub_081B56CC + bl party_menu_link_mon_icon_anim ldrh r0, [r6] ldrh r1, [r6, #2] ldr r2, [r4] adds r2, r2, r5 - bl sub_081B58E8 + bl party_menu_link_mon_held_item_object ldrh r0, [r6] ldr r1, [r4] adds r1, r1, r5 @@ -887132,7 +887132,7 @@ _081B0B48: ldr r2, [r1] adds r2, r2, r5 adds r1, r3, #0 - bl sub_081B5D38 + bl party_menu_link_mon_status_condition_object b _081B0BAC .align 2, 0 _081B0B60: .4byte gUnknown_2022C9C @@ -887145,7 +887145,7 @@ _081B0B68: adds r6, r1, r0 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B0BAC ldr r4, _081B0BC0 @@ -887154,19 +887154,19 @@ _081B0B68: adds r1, r1, r5 adds r0, r6, #0 adds r2, r7, #0 - bl sub_081B5654 + bl party_menu_icon_anim ldr r1, [r4] adds r1, r1, r5 adds r0, r6, #0 - bl sub_081B58B4 + bl party_menu_held_item_object ldr r1, [r4] adds r1, r1, r5 adds r0, r6, #0 - bl sub_081B5B6C + bl party_menu_pokeball_object ldr r1, [r4] adds r1, r1, r5 adds r0, r6, #0 - bl sub_081B5D04 + bl party_menu_status_condition_object _081B0BAC: add sp, #4 pop {r3, r4, r5} @@ -887179,10 +887179,10 @@ _081B0BAC: .align 2, 0 _081B0BBC: .4byte gUnknown_2024190 _081B0BC0: .4byte gUnknown_203CBA8 - thumb_func_end sub_081B0AB8 + thumb_func_end party_menu_add_per_mon_objects_internal - thumb_func_start sub_081B0BC4 -sub_081B0BC4: @ 0x081B0BC4 + thumb_func_start party_menu_add_per_mon_objects +party_menu_add_per_mon_objects: @ 0x081B0BC4 push {r4, r5, lr} ldr r5, _081B0BEC ldr r0, [r5] @@ -887190,7 +887190,7 @@ sub_081B0BC4: @ 0x081B0BC4 lsls r4, r4, #2 adds r0, r0, r4 ldrb r0, [r0] - bl sub_081B0AB8 + bl party_menu_add_per_mon_objects_internal ldr r1, [r5] adds r1, r1, r4 ldrh r0, [r1] @@ -887210,7 +887210,7 @@ _081B0BF2: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081B0BC4 + thumb_func_end party_menu_add_per_mon_objects thumb_func_start sub_081B0BF8 sub_081B0BF8: @ 0x081B0BF8 @@ -887314,7 +887314,7 @@ sub_081B0C9C: @ 0x081B0C9C ldr r1, _081B0D00 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B0DB8 ldr r6, _081B0D04 @@ -887323,17 +887323,17 @@ sub_081B0C9C: @ 0x081B0C9C adds r4, r4, r5 adds r0, r7, #0 mov r1, r8 - bl sub_081B0DC8 + bl GetPartyBoxPalBitfield adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_081B23E4 + bl UpdateSelectedPartyBox ldr r0, [r6] adds r0, r5, r0 ldrb r0, [r0, #9] mov r1, r8 - bl sub_081B580C + bl AnimateSelectedPartyIcon ldr r0, [r6] adds r5, r5, r0 ldrb r0, [r5, #0xb] @@ -887433,7 +887433,7 @@ _081B0DAA: mov r1, r8 bl sub_081B5C38 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081B0DB8: add sp, #8 pop {r3} @@ -887445,8 +887445,8 @@ _081B0DB8: _081B0DC4: .4byte gUnknown_203CB90 thumb_func_end sub_081B0C9C - thumb_func_start sub_081B0DC8 -sub_081B0DC8: @ 0x081B0DC8 + thumb_func_start GetPartyBoxPalBitfield +GetPartyBoxPalBitfield: @ 0x081B0DC8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -887462,14 +887462,14 @@ _081B0DDA: ldr r1, _081B0E54 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B0DF0 movs r0, #2 orrs r4, r0 _081B0DF0: adds r0, r5, #0 - bl sub_081B0E5C + bl PartyBoxPal_ParnterOrDisqualifiedInArena lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -887524,10 +887524,10 @@ _081B0E4A: .align 2, 0 _081B0E54: .4byte gUnknown_2024190 _081B0E58: .4byte gUnknown_203CB94 - thumb_func_end sub_081B0DC8 + thumb_func_end GetPartyBoxPalBitfield - thumb_func_start sub_081B0E5C -sub_081B0E5C: @ 0x081B0E5C + thumb_func_start PartyBoxPal_ParnterOrDisqualifiedInArena +PartyBoxPal_ParnterOrDisqualifiedInArena: @ 0x081B0E5C push {lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -887591,7 +887591,7 @@ _081B0ECC: .4byte gUnknown_2022C90 _081B0ED0: .4byte gUnknown_3002360 _081B0ED4: .4byte 0x00000439 _081B0ED8: .4byte gUnknown_2024140 - thumb_func_end sub_081B0E5C + thumb_func_end PartyBoxPal_ParnterOrDisqualifiedInArena thumb_func_start sub_081B0EDC sub_081B0EDC: @ 0x081B0EDC @@ -887617,7 +887617,7 @@ sub_081B0EDC: @ 0x081B0EDC movs r3, #0x12 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -887627,8 +887627,8 @@ _081B0F18: .4byte gUnknown_85E107C _081B0F1C: .4byte gUnknown_85E1098 thumb_func_end sub_081B0EDC - thumb_func_start sub_081B0F20 -sub_081B0F20: @ 0x081B0F20 + thumb_func_start IsMultiBattle +IsMultiBattle: @ 0x081B0F20 push {lr} ldr r0, _081B0F44 ldr r0, [r0] @@ -887656,7 +887656,7 @@ _081B0F52: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B0F20 + thumb_func_end IsMultiBattle thumb_func_start sub_081B0F58 sub_081B0F58: @ 0x081B0F58 @@ -887678,7 +887678,7 @@ sub_081B0F58: @ 0x081B0F58 movs r2, #0x64 bl memcpy adds r0, r5, #0 - bl sub_08000BF0 + bl Free pop {r4, r5, r6} pop {r0} bx r0 @@ -887698,7 +887698,7 @@ sub_081B0F90: @ 0x081B0F90 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081B0FC0 lsls r0, r4, #2 adds r0, r0, r4 @@ -887712,11 +887712,11 @@ sub_081B0F90: @ 0x081B0F90 bx r0 .align 2, 0 _081B0FC0: .4byte gUnknown_3005B60 -_081B0FC4: .4byte sub_081B0FC8 +_081B0FC4: .4byte c3_0811FAB4 thumb_func_end sub_081B0F90 - thumb_func_start sub_081B0FC8 -sub_081B0FC8: @ 0x081B0FC8 + thumb_func_start c3_0811FAB4 +c3_0811FAB4: @ 0x081B0FC8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -887739,7 +887739,7 @@ _081B0FEA: ldr r0, [r0, #4] cmp r0, #0 beq _081B1008 - bl sub_08000540 + bl SetMainCallback2 b _081B100E .align 2, 0 _081B0FFC: .4byte gUnknown_2037C74 @@ -887747,27 +887747,27 @@ _081B1000: .4byte gUnknown_203CB94 _081B1004: .4byte gUnknown_203CB90 _081B1008: ldr r0, [r4] - bl sub_08000540 + bl SetMainCallback2 _081B100E: bl ResetSpriteData - bl sub_081B03CC + bl FreePartyPointers adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081B101C: pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B0FC8 + thumb_func_end c3_0811FAB4 - thumb_func_start sub_081B1024 -sub_081B1024: @ 0x081B1024 + thumb_func_start GetCursorSelectionMonId +GetCursorSelectionMonId: @ 0x081B1024 ldr r0, _081B102C ldrb r0, [r0, #9] bx lr .align 2, 0 _081B102C: .4byte gUnknown_203CB94 - thumb_func_end sub_081B1024 + thumb_func_end GetCursorSelectionMonId thumb_func_start sub_081B1030 sub_081B1030: @ 0x081B1030 @@ -887799,7 +887799,7 @@ sub_081B1040: @ 0x081B1040 beq _081B10B0 bl sub_081B10BC adds r4, r0, #0 - bl sub_081B1430 + bl PartyMenuButtonHandler lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #2 @@ -888054,7 +888054,7 @@ sub_081B1274: @ 0x081B1274 ldr r1, _081B1290 adds r0, r0, r1 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #1 beq _081B1294 movs r0, #1 @@ -888174,7 +888174,7 @@ _081B135A: ldr r4, _081B1390 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C @@ -888205,7 +888205,7 @@ sub_081B13A4: @ 0x081B13A4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -888274,8 +888274,8 @@ _081B1428: .align 2, 0 thumb_func_end sub_081B13D8 - thumb_func_start sub_081B1430 -sub_081B1430: @ 0x081B1430 + thumb_func_start PartyMenuButtonHandler +PartyMenuButtonHandler: @ 0x081B1430 push {r4, lr} adds r4, r0, #0 ldr r0, _081B1448 @@ -888341,7 +888341,7 @@ _081B1494: cmp r1, #0 beq _081B14A6 adds r0, r4, #0 - bl sub_081B14C8 + bl UpdateCurrentPartySelection movs r0, #0 b _081B14C0 _081B14A6: @@ -888364,10 +888364,10 @@ _081B14C0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B1430 + thumb_func_end PartyMenuButtonHandler - thumb_func_start sub_081B14C8 -sub_081B14C8: @ 0x081B14C8 + thumb_func_start UpdateCurrentPartySelection +UpdateCurrentPartySelection: @ 0x081B14C8 push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x18 @@ -888382,7 +888382,7 @@ sub_081B14C8: @ 0x081B14C8 lsls r1, r1, #0x18 asrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_081B1524 + bl SetNewPartySelectTarget1 b _081B14FA .align 2, 0 _081B14EC: .4byte gUnknown_203CB94 @@ -888390,7 +888390,7 @@ _081B14F0: lsls r1, r1, #0x18 asrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_081B162C + bl SetNewPartySelectTarget2 _081B14FA: movs r1, #0 ldrsb r1, [r5, r1] @@ -888411,10 +888411,10 @@ _081B151C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B14C8 + thumb_func_end UpdateCurrentPartySelection - thumb_func_start sub_081B1524 -sub_081B1524: @ 0x081B1524 + thumb_func_start SetNewPartySelectTarget1 +SetNewPartySelectTarget1: @ 0x081B1524 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -888558,10 +888558,10 @@ _081B1622: bx r0 .align 2, 0 _081B1628: .4byte gUnknown_203CB90 - thumb_func_end sub_081B1524 + thumb_func_end SetNewPartySelectTarget1 - thumb_func_start sub_081B162C -sub_081B162C: @ 0x081B162C + thumb_func_start SetNewPartySelectTarget2 +SetNewPartySelectTarget2: @ 0x081B162C push {r4, r5, r6, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -888685,7 +888685,7 @@ _081B16F4: bne _081B1724 ldr r0, _081B1720 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B17C4 strb r6, [r4] @@ -888711,7 +888711,7 @@ _081B172C: ldr r0, _081B1754 _081B1740: movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B17C4 strb r5, [r4] @@ -888722,7 +888722,7 @@ _081B1754: .4byte gUnknown_2024384 _081B1758: ldr r0, _081B1768 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B17C4 movs r0, #4 @@ -888781,7 +888781,7 @@ _081B17C4: bx r0 .align 2, 0 _081B17CC: .4byte gUnknown_203CB90 - thumb_func_end sub_081B162C + thumb_func_end SetNewPartySelectTarget2 thumb_func_start sub_081B17D0 sub_081B17D0: @ 0x081B17D0 @@ -888806,7 +888806,7 @@ _081B17DA: ldr r1, _081B1804 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B17DA adds r0, r4, #0 @@ -888823,19 +888823,19 @@ _081B180C: .align 2, 0 thumb_func_end sub_081B17D0 - thumb_func_start sub_081B1814 -sub_081B1814: @ 0x081B1814 + thumb_func_start GetMonNickname +GetMonNickname: @ 0x081B1814 push {r4, lr} adds r4, r1, #0 movs r1, #2 adds r2, r4, #0 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 pop {r4} pop {r1} bx r1 - thumb_func_end sub_081B1814 + thumb_func_end GetMonNickname thumb_func_start sub_081B182C sub_081B182C: @ 0x081B182C @@ -888845,7 +888845,7 @@ sub_081B182C: @ 0x081B182C bl sub_081B2F90 ldr r0, _081B1854 movs r1, #1 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081B1858 @@ -888869,7 +888869,7 @@ sub_081B185C: @ 0x081B185C lsrs r4, r0, #0x18 adds r5, r4, #0 movs r0, #6 - bl sub_08121F10 + bl RunTextPrintersRetIsActive lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -888887,10 +888887,10 @@ sub_081B185C: @ 0x081B185C movs r1, #0 bl sub_08198134 movs r0, #6 - bl sub_08003774 + bl ClearWindowTilemap _081B1892: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081B1898: pop {r4, r5} pop {r0} @@ -888899,18 +888899,18 @@ _081B1898: _081B18A0: .4byte gUnknown_3005B60 thumb_func_end sub_081B185C - thumb_func_start sub_081B18A4 -sub_081B18A4: @ 0x081B18A4 + thumb_func_start LoadListMenuArrowsGfx +LoadListMenuArrowsGfx: @ 0x081B18A4 push {lr} ldr r0, _081B18B4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 _081B18B4: .4byte sub_081B185C - thumb_func_end sub_081B18A4 + thumb_func_end LoadListMenuArrowsGfx thumb_func_start sub_081B18B8 sub_081B18B8: @ 0x081B18B8 @@ -888923,7 +888923,7 @@ sub_081B18B8: @ 0x081B18B8 cmp r0, #1 beq _081B18DE movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B18E4 lsls r1, r4, #2 adds r1, r1, r4 @@ -888946,7 +888946,7 @@ sub_081B18EC: @ 0x081B18EC lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -888955,7 +888955,7 @@ sub_081B18EC: @ 0x081B18EC movs r1, #0 bl sub_08198134 movs r0, #6 - bl sub_08003774 + bl ClearWindowTilemap bl sub_081221B8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -888973,7 +888973,7 @@ _081B1928: .4byte gUnknown_3005B60 _081B192C: .4byte sub_081B18B8 _081B1930: movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B194C lsls r1, r5, #2 adds r1, r1, r5 @@ -889001,19 +889001,19 @@ sub_081B1954: @ 0x081B1954 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 ldr r1, _081B1990 - bl sub_081B1814 + bl GetMonNickname ldr r1, _081B1994 adds r0, r4, #0 bl sub_080D5EC8 ldr r4, _081B1998 ldr r1, _081B199C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 adds r1, r5, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 @@ -889034,19 +889034,19 @@ sub_081B19A0: @ 0x081B19A0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 ldr r1, _081B19DC - bl sub_081B1814 + bl GetMonNickname ldr r1, _081B19E0 adds r0, r4, #0 bl sub_080D5EC8 ldr r4, _081B19E4 ldr r1, _081B19E8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 adds r1, r5, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 @@ -889067,19 +889067,19 @@ sub_081B19EC: @ 0x081B19EC lsls r5, r5, #0x18 lsrs r5, r5, #0x18 ldr r1, _081B1A28 - bl sub_081B1814 + bl GetMonNickname ldr r1, _081B1A2C adds r0, r4, #0 bl sub_080D5EC8 ldr r4, _081B1A30 ldr r1, _081B1A34 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 adds r1, r5, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 @@ -889109,12 +889109,12 @@ sub_081B1A38: @ 0x081B1A38 ldr r4, _081B1A80 ldr r1, _081B1A84 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 adds r1, r5, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 @@ -889155,7 +889155,7 @@ _081B1AB2: adds r0, r6, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData _081B1AC6: add sp, #4 pop {r4, r5, r6, r7} @@ -889164,13 +889164,13 @@ _081B1AC6: .align 2, 0 thumb_func_end sub_081B1A88 - thumb_func_start sub_081B1AD0 -sub_081B1AD0: @ 0x081B1AD0 + thumb_func_start InitEventObjectPalettes +InitEventObjectPalettes: @ 0x081B1AD0 push {r4, lr} sub sp, #4 adds r4, r0, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r1, sp @@ -889181,7 +889181,7 @@ sub_081B1AD0: @ 0x081B1AD0 b _081B1B0E _081B1AEC: movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 beq _081B1B0C @@ -889191,7 +889191,7 @@ _081B1AEC: adds r0, r4, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData movs r0, #2 b _081B1B0E _081B1B0C: @@ -889202,20 +889202,20 @@ _081B1B0E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B1AD0 + thumb_func_end InitEventObjectPalettes - thumb_func_start sub_081B1B18 -sub_081B1B18: @ 0x081B1B18 + thumb_func_start pokemon_item_not_removed +pokemon_item_not_removed: @ 0x081B1B18 push {lr} ldr r0, _081B1B28 ldr r1, _081B1B2C - bl sub_08008BCC + bl StringExpandPlaceholders pop {r0} bx r0 .align 2, 0 _081B1B28: .4byte gUnknown_2021C7C _081B1B2C: .4byte gUnknown_85C9D47 - thumb_func_end sub_081B1B18 + thumb_func_end pokemon_item_not_removed thumb_func_start sub_081B1B30 sub_081B1B30: @ 0x081B1B30 @@ -889245,7 +889245,7 @@ sub_081B1B30: @ 0x081B1B30 adds r0, r0, r4 movs r1, #0x39 adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData movs r3, #8 ldrsh r2, [r7, r3] adds r0, r2, #0 @@ -889256,7 +889256,7 @@ sub_081B1B30: @ 0x081B1B30 ldr r1, [r6] adds r1, r1, r2 movs r2, #1 - bl sub_081B2970 + bl DisplayPartyPokemonHPCheck movs r0, #8 ldrsh r2, [r7, r0] adds r0, r2, #0 @@ -889265,7 +889265,7 @@ sub_081B1B30: @ 0x081B1B30 lsls r2, r2, #4 ldr r1, [r6] adds r1, r1, r2 - bl sub_081B2ABC + bl DisplayPartyPokemonHPBarCheck movs r1, #6 ldrsh r0, [r7, r1] cmp r0, #0 @@ -889346,11 +889346,11 @@ sub_081B1BE8: @ 0x081B1BE8 adds r4, r4, r0 adds r0, r6, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r0, r6, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r4, #2] lsls r5, r5, #0x18 asrs r5, r5, #0x18 @@ -889481,12 +889481,12 @@ _081B1D26: .align 2, 0 thumb_func_end pokemon_ailments_get_primary - thumb_func_start sub_081B1D2C -sub_081B1D2C: @ 0x081B1D2C + thumb_func_start GetMonAilment +GetMonAilment: @ 0x081B1D2C push {r4, lr} adds r4, r0, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B1D3E movs r0, #7 @@ -889494,7 +889494,7 @@ sub_081B1D2C: @ 0x081B1D2C _081B1D3E: adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData bl pokemon_ailments_get_primary lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -889502,7 +889502,7 @@ _081B1D3E: bne _081B1D66 adds r0, r4, #0 movs r1, #0 - bl sub_0806D810 + bl CheckPartyPokerus lsls r0, r0, #0x18 cmp r0, #0 bne _081B1D64 @@ -889514,7 +889514,7 @@ _081B1D66: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081B1D2C + thumb_func_end GetMonAilment thumb_func_start sub_081B1D6C sub_081B1D6C: @ 0x081B1D6C @@ -889600,12 +889600,12 @@ sub_081B1E04: @ 0x081B1E04 push {r4, lr} adds r4, r0, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #1 beq _081B1E2A adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0802C5FC @@ -889627,12 +889627,12 @@ sub_081B1E34: @ 0x081B1E34 push {r4, lr} adds r4, r0, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #1 beq _081B1E52 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0x55 bne _081B1E52 movs r0, #1 @@ -889696,7 +889696,7 @@ _081B1EAC: movs r1, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B1ED8 lsls r0, r4, #2 adds r0, r0, r4 @@ -889724,7 +889724,7 @@ sub_081B1EE0: @ 0x081B1EE0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B1F10 lsls r0, r4, #2 adds r0, r0, r4 @@ -889746,7 +889746,7 @@ sub_081B1F18: @ 0x081B1F18 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -889818,8 +889818,8 @@ _081B1FA0: .4byte gUnknown_3005B60 _081B1FA4: .4byte sub_081B18EC thumb_func_end sub_081B1F4C - thumb_func_start sub_081B1FA8 -sub_081B1FA8: @ 0x081B1FA8 + thumb_func_start CanMonLearnTMTutor +CanMonLearnTMTutor: @ 0x081B1FA8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -889831,7 +889831,7 @@ sub_081B1FA8: @ 0x081B1FA8 lsrs r6, r2, #0x18 mov r8, r6 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B1FCA movs r0, #3 @@ -889846,20 +889846,20 @@ _081B1FCA: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_0806DAA0 + bl CanMonLearnTMHM cmp r0, #0 beq _081B2004 adds r0, r7, #0 - bl sub_081B69B4 + bl ItemIdToBattleMoveId b _081B200E _081B1FEC: adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r6, #0 - bl sub_081B2040 + bl CanLearnTutorMove lsls r0, r0, #0x18 cmp r0, #0 bne _081B2008 @@ -889873,7 +889873,7 @@ _081B200E: lsls r0, r0, #0x10 lsrs r1, r0, #0x10 adds r0, r5, #0 - bl sub_081B69FC + bl MonKnowsMove lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -889888,7 +889888,7 @@ _081B2026: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081B1FA8 + thumb_func_end CanMonLearnTMTutor thumb_func_start sub_081B2030 sub_081B2030: @ 0x081B2030 @@ -889902,8 +889902,8 @@ sub_081B2030: @ 0x081B2030 _081B203C: .4byte gUnknown_85E08C4 thumb_func_end sub_081B2030 - thumb_func_start sub_081B2040 -sub_081B2040: @ 0x081B2040 + thumb_func_start CanLearnTutorMove +CanLearnTutorMove: @ 0x081B2040 push {lr} lsls r0, r0, #0x10 lsls r1, r1, #0x18 @@ -889927,7 +889927,7 @@ _081B2066: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B2040 + thumb_func_end CanLearnTutorMove thumb_func_start sub_081B206C sub_081B206C: @ 0x081B206C @@ -889948,32 +889948,32 @@ _081B2082: b _081B20AC _081B2088: ldr r0, _081B2090 - bl sub_08003090 + bl InitWindows b _081B20B2 .align 2, 0 _081B2090: .4byte gUnknown_85E10C8 _081B2094: ldr r0, _081B209C - bl sub_08003090 + bl InitWindows b _081B20B2 .align 2, 0 _081B209C: .4byte gUnknown_85E1108 _081B20A0: ldr r0, _081B20A8 - bl sub_08003090 + bl InitWindows b _081B20B2 .align 2, 0 _081B20A8: .4byte gUnknown_85E1148 _081B20AC: ldr r0, _081B20F0 - bl sub_08003090 + bl InitWindows _081B20B2: bl sub_08004480 movs r4, #0 _081B20B8: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -889986,11 +889986,11 @@ _081B20B8: bl sub_080985EC movs r1, #0xe0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _081B20F4 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette pop {r4} pop {r0} bx r0 @@ -890014,13 +890014,13 @@ sub_081B20F8: @ 0x081B20F8 cmp r2, #1 bne _081B2174 ldr r0, _081B2164 - bl sub_08003250 + bl AddWindow adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -890035,14 +890035,14 @@ sub_081B20F8: @ 0x081B20F8 movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_08199B84 + bl AddTextPrinterParameterized4 adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _081B2170 - bl sub_08003250 + bl AddWindow lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r5, #0xa @@ -890055,14 +890055,14 @@ _081B216C: .4byte gUnknown_85C93BB _081B2170: .4byte gUnknown_85E11C8 _081B2174: ldr r0, _081B21B0 - bl sub_08003250 + bl AddWindow lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r5, #0xc _081B2180: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081B21B4 ldrb r1, [r0, #8] movs r0, #0xf @@ -890080,7 +890080,7 @@ _081B2180: movs r1, #1 adds r2, r5, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 b _081B21DA .align 2, 0 _081B21B0: .4byte gUnknown_85E11C0 @@ -890099,15 +890099,15 @@ _081B21C0: movs r1, #1 adds r2, r5, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _081B21DA: adds r0, r4, #0 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081B21EE: add sp, #0x14 pop {r4, r5} @@ -890118,8 +890118,8 @@ _081B21F8: .4byte gUnknown_85E10B4 _081B21FC: .4byte gUnknown_85C93C8 thumb_func_end sub_081B20F8 - thumb_func_start sub_081B2200 -sub_081B2200: @ 0x081B2200 + thumb_func_start GetPartyMenuPaletteFromBuffer +GetPartyMenuPaletteFromBuffer: @ 0x081B2200 lsls r0, r0, #0x18 ldr r1, _081B2210 lsrs r0, r0, #0x17 @@ -890130,10 +890130,10 @@ sub_081B2200: @ 0x081B2200 bx lr .align 2, 0 _081B2210: .4byte gUnknown_203CB90 - thumb_func_end sub_081B2200 + thumb_func_end GetPartyMenuPaletteFromBuffer - thumb_func_start sub_081B2214 -sub_081B2214: @ 0x081B2214 + thumb_func_start BlitBitmapToPartyWindow +BlitBitmapToPartyWindow: @ 0x081B2214 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -890164,7 +890164,7 @@ sub_081B2214: @ 0x081B2214 mov r0, sl muls r0, r6, r0 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed mov sb, r0 cmp r0, #0 beq _081B22E2 @@ -890201,7 +890201,7 @@ _081B228C: ldr r2, [sp, #0xc] adds r0, r2, r0 ldrb r0, [r0] - bl sub_081B0AA4 + bl GetPartyMiscGraphicsTile adds r1, r5, #0 muls r1, r6, r1 adds r1, r1, r4 @@ -890235,7 +890235,7 @@ _081B22C0: mov r1, sb bl BlitBitmapToWindow mov r0, sb - bl sub_08000BF0 + bl Free _081B22E2: add sp, #0x2c pop {r3, r4, r5} @@ -890246,10 +890246,10 @@ _081B22E2: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B2214 + thumb_func_end BlitBitmapToPartyWindow - thumb_func_start sub_081B22F4 -sub_081B22F4: @ 0x081B22F4 + thumb_func_start BlitBitmapToPartyWindow_Default1 +BlitBitmapToPartyWindow_Default1: @ 0x081B22F4 push {r4, r5, r6, lr} sub sp, #0xc ldr r4, [sp, #0x1c] @@ -890281,7 +890281,7 @@ _081B2320: str r4, [sp, #8] movs r2, #0xa adds r3, r6, #0 - bl sub_081B2214 + bl BlitBitmapToPartyWindow b _081B234C .align 2, 0 _081B2338: .4byte gUnknown_85E1240 @@ -890292,7 +890292,7 @@ _081B233C: str r4, [sp, #8] movs r2, #0xa adds r3, r6, #0 - bl sub_081B2214 + bl BlitBitmapToPartyWindow _081B234C: add sp, #0xc pop {r4, r5, r6} @@ -890300,10 +890300,10 @@ _081B234C: bx r0 .align 2, 0 _081B2354: .4byte gUnknown_85E1286 - thumb_func_end sub_081B22F4 + thumb_func_end BlitBitmapToPartyWindow_Default1 - thumb_func_start sub_081B2358 -sub_081B2358: @ 0x081B2358 + thumb_func_start BlitBitmapToPartyWindow_Default2 +BlitBitmapToPartyWindow_Default2: @ 0x081B2358 push {r4, r5, r6, lr} sub sp, #0xc ldr r4, [sp, #0x1c] @@ -890335,7 +890335,7 @@ _081B2384: str r4, [sp, #8] movs r2, #0x12 adds r3, r6, #0 - bl sub_081B2214 + bl BlitBitmapToPartyWindow b _081B23B0 .align 2, 0 _081B239C: .4byte gUnknown_85E12CC @@ -890346,7 +890346,7 @@ _081B23A0: str r4, [sp, #8] movs r2, #0x12 adds r3, r6, #0 - bl sub_081B2214 + bl BlitBitmapToPartyWindow _081B23B0: add sp, #0xc pop {r4, r5, r6} @@ -890354,7 +890354,7 @@ _081B23B0: bx r0 .align 2, 0 _081B23B8: .4byte gUnknown_85E1302 - thumb_func_end sub_081B2358 + thumb_func_end BlitBitmapToPartyWindow_Default2 thumb_func_start DrawEmptySlot DrawEmptySlot: @ 0x081B23BC @@ -890371,7 +890371,7 @@ DrawEmptySlot: @ 0x081B23BC str r2, [sp, #8] movs r2, #0x12 movs r3, #0 - bl sub_081B2214 + bl BlitBitmapToPartyWindow add sp, #0xc pop {r0} bx r0 @@ -890379,15 +890379,15 @@ DrawEmptySlot: @ 0x081B23BC _081B23E0: .4byte gUnknown_85E1338 thumb_func_end DrawEmptySlot - thumb_func_start sub_081B23E4 -sub_081B23E4: @ 0x081B23E4 + thumb_func_start UpdateSelectedPartyBox +UpdateSelectedPartyBox: @ 0x081B23E4 push {r4, r5, r6, r7, lr} lsls r1, r1, #0x18 lsrs r4, r1, #0x18 adds r5, r4, #0 ldrb r0, [r0, #8] movs r1, #5 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x1c lsrs r6, r0, #0x18 adds r7, r6, #0 @@ -890397,7 +890397,7 @@ sub_081B23E4: @ 0x081B23E4 beq _081B2418 ldr r5, _081B2410 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2414 b _081B261A .align 2, 0 @@ -890419,24 +890419,24 @@ _081B242C: .4byte gUnknown_85E1397 _081B2430: ldr r5, _081B2468 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B246C ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B2470 b _081B2612 .align 2, 0 @@ -890450,24 +890450,24 @@ _081B2474: beq _081B24C0 ldr r5, _081B24B4 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B24B8 ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B24BC b _081B2612 .align 2, 0 @@ -890490,24 +890490,24 @@ _081B24D4: .4byte gUnknown_85E1397 _081B24D8: ldr r5, _081B2510 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2514 ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B2518 b _081B2612 .align 2, 0 @@ -890530,24 +890530,24 @@ _081B2530: .4byte gUnknown_85E1394 _081B2534: ldr r5, _081B256C ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2570 ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B2574 b _081B2612 .align 2, 0 @@ -890570,24 +890570,24 @@ _081B258C: .4byte gUnknown_85E1391 _081B2590: ldr r5, _081B25C8 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B25CC ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B25D0 b _081B2612 .align 2, 0 @@ -890602,46 +890602,46 @@ _081B25D4: ldr r5, _081B2648 _081B25DE: ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B264C ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B2650 _081B2612: ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2654 _081B261A: ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette b _081B26C0 .align 2, 0 _081B2648: .4byte gUnknown_85E138E @@ -890651,44 +890651,44 @@ _081B2654: .4byte gUnknown_85E1375 _081B2658: ldr r5, _081B26C8 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B26CC ldrb r1, [r4] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldr r5, _081B26D0 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B26D4 ldrb r1, [r4] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #2] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #2] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette _081B26C0: pop {r4, r5, r6, r7} pop {r0} @@ -890698,10 +890698,10 @@ _081B26C8: .4byte gUnknown_85E1385 _081B26CC: .4byte gUnknown_85E1372 _081B26D0: .4byte gUnknown_85E139A _081B26D4: .4byte gUnknown_85E1375 - thumb_func_end sub_081B23E4 + thumb_func_end UpdateSelectedPartyBox - thumb_func_start sub_081B26D8 -sub_081B26D8: @ 0x081B26D8 + thumb_func_start DisplayPartyPokemonBarDetail +DisplayPartyPokemonBarDetail: @ 0x081B26D8 push {r4, r5, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -890720,17 +890720,17 @@ sub_081B26D8: @ 0x081B26D8 str r1, [sp, #8] movs r1, #0 adds r2, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081B2708: .4byte gUnknown_85E10B4 - thumb_func_end sub_081B26D8 + thumb_func_end DisplayPartyPokemonBarDetail - thumb_func_start sub_081B270C -sub_081B270C: @ 0x081B270C + thumb_func_start DisplayPartyPokemonNickname +DisplayPartyPokemonNickname: @ 0x081B270C push {r4, r5, r6, r7, lr} sub sp, #0x14 adds r7, r0, #0 @@ -890738,7 +890738,7 @@ sub_081B270C: @ 0x081B270C lsls r2, r2, #0x18 lsrs r4, r2, #0x18 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B275C cmp r4, #1 @@ -890761,22 +890761,22 @@ sub_081B270C: @ 0x081B270C _081B2746: adds r0, r7, #0 add r1, sp, #8 - bl sub_081B1814 + bl GetMonNickname ldrb r0, [r6, #8] ldr r3, [r6] adds r3, #4 add r1, sp, #8 movs r2, #0 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail _081B275C: add sp, #0x14 pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081B270C + thumb_func_end DisplayPartyPokemonNickname - thumb_func_start sub_081B2764 -sub_081B2764: @ 0x081B2764 + thumb_func_start DisplayPartyPokemonLevelCheck +DisplayPartyPokemonLevelCheck: @ 0x081B2764 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -890787,11 +890787,11 @@ sub_081B2764: @ 0x081B2764 lsrs r4, r2, #0x18 mov r8, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B27D0 adds r0, r6, #0 - bl sub_081B1D2C + bl GetMonAilment lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -890823,11 +890823,11 @@ _081B27B8: beq _081B27D0 adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r7, #0 - bl sub_081B27DC + bl DisplayPartyPokemonLevel _081B27D0: add sp, #8 pop {r3} @@ -890835,10 +890835,10 @@ _081B27D0: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081B2764 + thumb_func_end DisplayPartyPokemonLevelCheck - thumb_func_start sub_081B27DC -sub_081B27DC: @ 0x081B27DC + thumb_func_start DisplayPartyPokemonLevel +DisplayPartyPokemonLevel: @ 0x081B27DC push {r4, r5, r6, lr} adds r2, r0, #0 adds r6, r1, #0 @@ -890862,7 +890862,7 @@ sub_081B27DC: @ 0x081B27DC adds r3, #8 adds r1, r4, #0 movs r2, #0 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail pop {r4, r5, r6} pop {r0} bx r0 @@ -890870,10 +890870,10 @@ sub_081B27DC: @ 0x081B27DC _081B281C: .4byte gUnknown_2021C54 _081B2820: .4byte gUnknown_2021C40 _081B2824: .4byte gUnknown_85C940E - thumb_func_end sub_081B27DC + thumb_func_end DisplayPartyPokemonLevel - thumb_func_start sub_081B2828 -sub_081B2828: @ 0x081B2828 + thumb_func_start DisplayPartyPokemonGenderNidoranCheck +DisplayPartyPokemonGenderNidoranCheck: @ 0x081B2828 push {r4, r5, r6, r7, lr} sub sp, #0x14 adds r6, r0, #0 @@ -890901,31 +890901,31 @@ sub_081B2828: @ 0x081B2828 _081B285A: adds r0, r6, #0 add r1, sp, #8 - bl sub_081B1814 + bl GetMonNickname adds r0, r6, #0 - bl sub_08069AF4 + bl GetMonGender adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 add r2, sp, #8 adds r3, r7, #0 - bl sub_081B2890 + bl DisplayPartyPokemonGender add sp, #0x14 pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B2828 + thumb_func_end DisplayPartyPokemonGenderNidoranCheck - thumb_func_start sub_081B2890 -sub_081B2890: @ 0x081B2890 + thumb_func_start DisplayPartyPokemonGender +DisplayPartyPokemonGender: @ 0x081B2890 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -890940,7 +890940,7 @@ sub_081B2890: @ 0x081B2890 adds r5, r4, #0 ldrb r0, [r7, #8] movs r1, #5 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x1c lsrs r6, r0, #0x18 cmp r4, #0 @@ -890971,24 +890971,24 @@ _081B28E0: .4byte gUnknown_82EA31C _081B28E4: ldr r5, _081B2918 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B291C ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r7, #8] ldr r1, _081B2920 ldr r3, [r7] adds r3, #0xc movs r2, #2 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail b _081B2956 .align 2, 0 _081B2918: .4byte gUnknown_85E137B @@ -890997,24 +890997,24 @@ _081B2920: .4byte gUnknown_85C940A _081B2924: ldr r5, _081B2964 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2968 ldrb r1, [r4] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r6 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r7, #8] ldr r1, _081B296C ldr r3, [r7] adds r3, #0xc movs r2, #2 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail _081B2956: pop {r3, r4} mov r8, r3 @@ -891026,10 +891026,10 @@ _081B2956: _081B2964: .4byte gUnknown_85E137D _081B2968: .4byte gUnknown_85E136E _081B296C: .4byte gUnknown_85C940C - thumb_func_end sub_081B2890 + thumb_func_end DisplayPartyPokemonGender - thumb_func_start sub_081B2970 -sub_081B2970: @ 0x081B2970 + thumb_func_start DisplayPartyPokemonHPCheck +DisplayPartyPokemonHPCheck: @ 0x081B2970 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -891040,7 +891040,7 @@ sub_081B2970: @ 0x081B2970 lsrs r4, r2, #0x18 mov r8, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B29CA cmp r4, #0 @@ -891067,11 +891067,11 @@ _081B29B2: beq _081B29CA adds r0, r7, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r6, #0 - bl sub_081B29D8 + bl DisplayPartyPokemonHP _081B29CA: add sp, #8 pop {r3} @@ -891080,10 +891080,10 @@ _081B29CA: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B2970 + thumb_func_end DisplayPartyPokemonHPCheck - thumb_func_start sub_081B29D8 -sub_081B29D8: @ 0x081B29D8 + thumb_func_start DisplayPartyPokemonHP +DisplayPartyPokemonHP: @ 0x081B29D8 push {r4, r5, lr} adds r2, r0, #0 adds r4, r1, #0 @@ -891100,16 +891100,16 @@ sub_081B29D8: @ 0x081B29D8 adds r3, #0x10 adds r1, r5, #0 movs r2, #0 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081B2A04: .4byte gUnknown_2021C40 - thumb_func_end sub_081B29D8 + thumb_func_end DisplayPartyPokemonHP - thumb_func_start sub_081B2A08 -sub_081B2A08: @ 0x081B2A08 + thumb_func_start DisplayPartyPokemonMaxHPCheck +DisplayPartyPokemonMaxHPCheck: @ 0x081B2A08 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -891120,7 +891120,7 @@ sub_081B2A08: @ 0x081B2A08 lsrs r4, r2, #0x18 mov r8, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B2A64 cmp r4, #0 @@ -891148,11 +891148,11 @@ _081B2A4C: beq _081B2A64 adds r0, r7, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r6, #0 - bl sub_081B2A70 + bl DisplayPartyPokemonMaxHP _081B2A64: add sp, #8 pop {r3} @@ -891160,10 +891160,10 @@ _081B2A64: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081B2A08 + thumb_func_end DisplayPartyPokemonMaxHPCheck - thumb_func_start sub_081B2A70 -sub_081B2A70: @ 0x081B2A70 + thumb_func_start DisplayPartyPokemonMaxHP +DisplayPartyPokemonMaxHP: @ 0x081B2A70 push {r4, r5, r6, lr} adds r2, r0, #0 adds r6, r1, #0 @@ -891187,7 +891187,7 @@ sub_081B2A70: @ 0x081B2A70 adds r3, #0x14 adds r1, r4, #0 movs r2, #0 - bl sub_081B26D8 + bl DisplayPartyPokemonBarDetail pop {r4, r5, r6} pop {r0} bx r0 @@ -891195,41 +891195,41 @@ sub_081B2A70: @ 0x081B2A70 _081B2AB0: .4byte gUnknown_2021C54 _081B2AB4: .4byte gUnknown_2021C40 _081B2AB8: .4byte gUnknown_85C93FF - thumb_func_end sub_081B2A70 + thumb_func_end DisplayPartyPokemonMaxHP - thumb_func_start sub_081B2ABC -sub_081B2ABC: @ 0x081B2ABC + thumb_func_start DisplayPartyPokemonHPBarCheck +DisplayPartyPokemonHPBarCheck: @ 0x081B2ABC push {r4, r5, r6, lr} adds r5, r0, #0 adds r6, r1, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B2AF0 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 lsrs r1, r1, #0x10 adds r0, r4, #0 adds r2, r6, #0 - bl sub_081B2AF8 + bl DisplayPartyPokemonHPBar _081B2AF0: pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B2ABC + thumb_func_end DisplayPartyPokemonHPBarCheck - thumb_func_start sub_081B2AF8 -sub_081B2AF8: @ 0x081B2AF8 + thumb_func_start DisplayPartyPokemonHPBar +DisplayPartyPokemonHPBar: @ 0x081B2AF8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -891244,7 +891244,7 @@ sub_081B2AF8: @ 0x081B2AF8 mov sb, r1 ldrb r0, [r6, #8] movs r1, #5 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x1c lsrs r7, r0, #0x18 mov r1, r8 @@ -891270,18 +891270,18 @@ _081B2B44: ldr r5, _081B2B6C _081B2B46: ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2B70 ldrb r1, [r4] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette b _081B2B98 .align 2, 0 _081B2B6C: .4byte gUnknown_85E1381 @@ -891289,18 +891289,18 @@ _081B2B70: .4byte gUnknown_85E1370 _081B2B74: ldr r5, _081B2C34 ldrb r0, [r5] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldr r4, _081B2C38 ldrb r1, [r4] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette ldrb r0, [r5, #1] - bl sub_081B2200 + bl GetPartyMenuPaletteFromBuffer ldrb r1, [r4, #1] adds r1, r1, r7 movs r2, #2 - bl sub_080A1200 + bl LoadPalette _081B2B98: mov r1, r8 lsls r0, r1, #0x10 @@ -891310,7 +891310,7 @@ _081B2B98: asrs r1, r1, #0x10 ldr r2, [r6] ldrb r2, [r2, #0x1a] - bl sub_08074BC4 + bl GetScaledHPFraction lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldrb r0, [r6, #8] @@ -891366,7 +891366,7 @@ _081B2B98: _081B2C1C: ldrb r0, [r6, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #8 pop {r3, r4} mov r8, r3 @@ -891377,7 +891377,7 @@ _081B2C1C: .align 2, 0 _081B2C34: .4byte gUnknown_85E1383 _081B2C38: .4byte gUnknown_85E1370 - thumb_func_end sub_081B2AF8 + thumb_func_end DisplayPartyPokemonHPBar thumb_func_start sub_081B2C3C sub_081B2C3C: @ 0x081B2C3C @@ -891427,7 +891427,7 @@ _081B2C76: ldr r1, [r1] str r1, [sp, #8] movs r1, #1 - bl sub_08199AFC + bl AddTextPrinterParameterized3 _081B2C9C: add sp, #0xc pop {r3} @@ -891450,11 +891450,11 @@ sub_081B2CB0: @ 0x081B2CB0 movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081B2CD0: pop {r4} pop {r0} @@ -891462,8 +891462,8 @@ _081B2CD0: .align 2, 0 thumb_func_end sub_081B2CB0 - thumb_func_start sub_081B2CD8 -sub_081B2CD8: @ 0x081B2CD8 + thumb_func_start display_pokemon_menu_message +display_pokemon_menu_message: @ 0x081B2CD8 push {r4, r5, r6, lr} sub sp, #0xc adds r6, r0, #0 @@ -891521,14 +891521,14 @@ _081B2D44: .4byte gUnknown_85E11F8 _081B2D48: ldr r0, _081B2D54 _081B2D4A: - bl sub_08003250 + bl AddWindow strb r0, [r5] b _081B2D60 .align 2, 0 _081B2D54: .4byte gUnknown_85E1200 _081B2D58: ldr r0, _081B2D74 - bl sub_08003250 + bl AddWindow strb r0, [r4, #0xd] _081B2D60: cmp r6, #0 @@ -891555,14 +891555,14 @@ _081B2D88: movs r1, #0 movs r2, #0x4f movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r4, _081B2DC8 ldr r1, _081B2DCC lsls r0, r6, #2 adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldrb r0, [r5] movs r1, #2 str r1, [sp] @@ -891574,7 +891574,7 @@ _081B2D88: movs r3, #0 bl AddTextPrinterParameterized movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081B2DC0: add sp, #0xc pop {r4, r5, r6} @@ -891583,7 +891583,7 @@ _081B2DC0: .align 2, 0 _081B2DC8: .4byte gUnknown_2021C7C _081B2DCC: .4byte gUnknown_85E13AC - thumb_func_end sub_081B2CD8 + thumb_func_end display_pokemon_menu_message thumb_func_start sub_081B2DD0 sub_081B2DD0: @ 0x081B2DD0 @@ -891608,17 +891608,17 @@ _081B2DEE: adds r4, r7, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B2E1E adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B2E18 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B2E1E _081B2E18: @@ -891706,7 +891706,7 @@ _081B2EA2: str r1, [sp, #0x18] _081B2EAA: add r0, sp, #0x14 - bl sub_08003250 + bl AddWindow ldr r6, _081B2ED0 ldr r1, [r6] strb r0, [r1, #0xc] @@ -891715,7 +891715,7 @@ _081B2EAA: movs r1, #0 movs r2, #0x4f movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette cmp r4, #3 bne _081B2ED4 ldr r0, [r6] @@ -891732,7 +891732,7 @@ _081B2ED4: mov sb, r0 movs r0, #1 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -891776,7 +891776,7 @@ _081B2F10: str r1, [sp, #0x10] movs r1, #1 mov r2, sb - bl sub_08199B84 + bl AddTextPrinterParameterized4 adds r0, r5, #1 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -891800,7 +891800,7 @@ _081B2F4E: movs r3, #2 bl sub_0819844C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, [r4] _081B2F74: ldrb r0, [r0, #0xc] @@ -891826,7 +891826,7 @@ sub_081B2F90: @ 0x081B2F90 movs r1, #0 movs r2, #0x4f movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _081B2FD8 ldrb r0, [r2] movs r1, #1 @@ -891847,7 +891847,7 @@ sub_081B2F90: @ 0x081B2F90 movs r0, #6 movs r1, #1 adds r2, r4, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4} pop {r0} @@ -891882,7 +891882,7 @@ _081B3000: .4byte gUnknown_85E1220 sub_081B3004: @ 0x081B3004 push {r4, lr} ldr r0, _081B302C - bl sub_08003250 + bl AddWindow ldr r4, _081B3030 ldr r1, [r4] strb r0, [r1, #0xc] @@ -891891,7 +891891,7 @@ sub_081B3004: @ 0x081B3004 movs r1, #0 movs r2, #0x4f movs r3, #0xd - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette ldr r0, [r4] ldrb r0, [r0, #0xc] pop {r4} @@ -891908,7 +891908,7 @@ sub_081B3034: @ 0x081B3034 ldr r4, _081B3050 ldr r0, [r4] ldrb r0, [r0, #0xc] - bl sub_08003774 + bl ClearWindowTilemap ldr r0, [r4] adds r0, #0xc bl sub_081B2CB0 @@ -891928,7 +891928,7 @@ sub_081B3054: @ 0x081B3054 lsrs r2, r2, #0x18 cmp r2, #0 bne _081B3068 - bl sub_081B30B4 + bl CreateActionList b _081B30A0 _081B3068: ldr r4, _081B30A8 @@ -891970,8 +891970,8 @@ _081B30AC: .4byte gUnknown_85E1628 _081B30B0: .4byte gUnknown_85E15F0 thumb_func_end sub_081B3054 - thumb_func_start sub_081B30B4 -sub_081B30B4: @ 0x081B30B4 + thumb_func_start CreateActionList +CreateActionList: @ 0x081B30B4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -891991,7 +891991,7 @@ sub_081B30B4: @ 0x081B30B4 adds r0, #0xf adds r1, #0x17 movs r2, #0 - bl sub_080A020C + bl AppendToList movs r7, #0 ldr r0, _081B312C ldrh r0, [r0] @@ -892012,7 +892012,7 @@ _081B30FA: adds r0, r1, r6 adds r1, r7, #0 adds r1, #0xd - bl sub_0806A058 + bl GetMonData lsls r1, r4, #1 adds r1, r1, r5 ldrh r1, [r1] @@ -892027,7 +892027,7 @@ _081B30FA: adds r2, #0x13 lsls r2, r2, #0x18 lsrs r2, r2, #0x18 - bl sub_080A020C + bl AppendToList b _081B3140 .align 2, 0 _081B3128: .4byte gUnknown_203CB90 @@ -892054,7 +892054,7 @@ _081B3140: mov r0, sb adds r0, #0x64 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B3172 ldr r0, _081B31A4 @@ -892063,7 +892063,7 @@ _081B3140: adds r0, #0xf adds r1, #0x17 movs r2, #1 - bl sub_080A020C + bl AppendToList _081B3172: movs r0, #0x64 mov r1, sl @@ -892071,7 +892071,7 @@ _081B3172: adds r0, r1, #0 add r0, sb movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl ItemIsMail @@ -892084,7 +892084,7 @@ _081B3172: adds r0, #0xf adds r1, #0x17 movs r2, #6 - bl sub_080A020C + bl AppendToList b _081B31B8 .align 2, 0 _081B31A4: .4byte gUnknown_203CB90 @@ -892095,7 +892095,7 @@ _081B31A8: adds r0, #0xf adds r1, #0x17 movs r2, #3 - bl sub_080A020C + bl AppendToList _081B31B8: ldr r0, _081B31D8 ldr r1, [r0] @@ -892103,7 +892103,7 @@ _081B31B8: adds r0, #0xf adds r1, #0x17 movs r2, #2 - bl sub_080A020C + bl AppendToList add sp, #4 pop {r3, r4, r5} mov r8, r3 @@ -892114,7 +892114,7 @@ _081B31B8: bx r0 .align 2, 0 _081B31D8: .4byte gUnknown_203CB90 - thumb_func_end sub_081B30B4 + thumb_func_end CreateActionList thumb_func_start sub_081B31DC sub_081B31DC: @ 0x081B31DC @@ -892150,14 +892150,14 @@ _081B3200: @ jump table .4byte _081B329E @ case 11 .4byte _081B329A @ case 12 _081B3234: - bl sub_081399C0 + bl InMultiBattleRoom lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _081B324C adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B329E _081B324C: @@ -892190,7 +892190,7 @@ _081B3278: _081B327C: adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData movs r1, #6 cmp r0, #0 beq _081B32A0 @@ -892234,7 +892234,7 @@ sub_081B32A8: @ 0x081B32A8 adds r5, r0, r7 ldr r1, _081B330C adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B3310 ldr r0, [r0] adds r0, #0xd @@ -892256,7 +892256,7 @@ sub_081B32A8: @ 0x081B32A8 movs r0, #0 bl sub_081B2E34 movs r0, #0x15 - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B338A .align 2, 0 _081B3304: .4byte gUnknown_203CB94 @@ -892266,7 +892266,7 @@ _081B3310: .4byte gUnknown_203CB90 _081B3314: adds r0, r5, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 cmp r6, #0 @@ -892274,12 +892274,12 @@ _081B3314: ldr r4, _081B3350 ldr r1, _081B3354 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B3358 mov r2, r8 lsls r0, r2, #2 @@ -892311,7 +892311,7 @@ _081B3360: adds r0, r6, #0 bl sub_080D5EC8 movs r0, #0x1a - bl sub_081B2CD8 + bl display_pokemon_menu_message _081B338A: movs r0, #1 _081B338C: @@ -892349,11 +892349,11 @@ _081B33C0: bx r0 .align 2, 0 _081B33C8: .4byte gUnknown_3005B60 -_081B33CC: .4byte sub_081B33D0 +_081B33CC: .4byte HandleMenuInput thumb_func_end sub_081B339C - thumb_func_start sub_081B33D0 -sub_081B33D0: @ 0x081B33D0 + thumb_func_start HandleMenuInput +HandleMenuInput: @ 0x081B33D0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -892378,18 +892378,18 @@ sub_081B33D0: @ 0x081B33D0 ldrb r0, [r0, #0x17] cmp r0, #3 bhi _081B3414 - bl sub_081987D4 + bl Menu_ProcessInputNoWrapAround_other b _081B3418 .align 2, 0 _081B3408: .4byte gUnknown_2037C74 _081B340C: .4byte gUnknown_3005B68 _081B3410: .4byte gUnknown_203CB90 _081B3414: - bl sub_08198768 + bl ProcessMenuInput_other _081B3418: lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -892446,7 +892446,7 @@ _081B348E: .align 2, 0 _081B3494: .4byte gUnknown_203CB90 _081B3498: .4byte gUnknown_85E14C0 - thumb_func_end sub_081B33D0 + thumb_func_end HandleMenuInput thumb_func_start sub_081B349C sub_081B349C: @ 0x081B349C @@ -892491,7 +892491,7 @@ sub_081B34C8: @ 0x081B34C8 ldr r0, _081B3504 str r0, [sp] movs r0, #1 - bl sub_081BF280 + bl ShowPokemonSummaryScreen b _081B3520 .align 2, 0 _081B34F8: .4byte gUnknown_203CB94 @@ -892509,7 +892509,7 @@ _081B3508: ldr r0, _081B3530 str r0, [sp] movs r0, #0 - bl sub_081BF280 + bl ShowPokemonSummaryScreen _081B3520: add sp, #4 pop {r4} @@ -892546,7 +892546,7 @@ sub_081B3534: @ 0x081B3534 str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -892557,8 +892557,8 @@ _081B3574: .4byte gUnknown_203CBEC _081B3578: .4byte sub_081B339C thumb_func_end sub_081B3534 - thumb_func_start sub_081B357C -sub_081B357C: @ 0x081B357C + thumb_func_start CursorCb_Switch +CursorCb_Switch: @ 0x081B357C push {r4, r5, r6, lr} adds r6, r0, #0 lsls r6, r6, #0x18 @@ -892576,7 +892576,7 @@ sub_081B357C: @ 0x081B357C adds r0, #0xc bl sub_081B2CB0 movs r0, #3 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldrb r0, [r5, #9] movs r1, #1 bl sub_081B0C9C @@ -892597,7 +892597,7 @@ _081B35C8: .4byte gUnknown_203CB94 _081B35CC: .4byte gUnknown_203CB90 _081B35D0: .4byte gUnknown_3005B60 _081B35D4: .4byte sub_081B1040 - thumb_func_end sub_081B357C + thumb_func_end CursorCb_Switch thumb_func_start sub_081B35D8 sub_081B35D8: @ 0x081B35D8 @@ -892637,22 +892637,22 @@ _081B3608: adds r0, r2, #0 ldrb r0, [r0] movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6] add r0, sp, #8 ldrb r0, [r0] movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #2] add r0, sp, #8 ldrb r0, [r0] movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #4] add r0, sp, #8 ldrb r0, [r0] movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #6] strh r4, [r6, #0x10] movs r1, #4 @@ -892684,22 +892684,22 @@ _081B3666: adds r0, r2, #0 ldrb r0, [r0, #1] movs r1, #1 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #8] add r0, sp, #8 ldrb r0, [r0, #1] movs r1, #2 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #0xa] add r0, sp, #8 ldrb r0, [r0, #1] movs r1, #3 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #0xc] add r0, sp, #8 ldrb r0, [r0, #1] movs r1, #4 - bl sub_0800401C + bl GetWindowAttribute strh r0, [r6, #0xe] strh r4, [r6, #0x12] movs r1, #0xc @@ -892755,10 +892755,10 @@ _081B36CE: bl sub_08199954 add r0, sp, #8 ldrb r0, [r0] - bl sub_08003774 + bl ClearWindowTilemap add r0, sp, #8 ldrb r0, [r0, #1] - bl sub_08003774 + bl ClearWindowTilemap ldr r4, _081B376C movs r0, #9 strb r0, [r4, #0xb] @@ -892942,7 +892942,7 @@ sub_081B37E0: @ 0x081B37E0 str r0, [sp, #0x20] ldr r1, [sp, #0x28] movs r3, #0 - bl sub_080023F8 + bl CopyRectToBgTilemapBufferRect _081B389A: add sp, #0x34 pop {r3, r4, r5} @@ -893107,7 +893107,7 @@ _081B39A0: bl sub_081B37E0 _081B39CE: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r4, r5, r6} pop {r0} @@ -893170,12 +893170,12 @@ sub_081B39E8: @ 0x081B39E8 ldrsh r0, [r6, r2] rsbs r0, r0, #0 strh r0, [r6, #0x16] - bl sub_081B3C7C + bl swap_pokemon_and_oams ldr r4, _081B3AEC ldrb r0, [r4, #9] - bl sub_081B0620 + bl DisplayPartyPokemonData ldrb r0, [r4, #0xa] - bl sub_081B0620 + bl DisplayPartyPokemonData movs r0, #9 ldrsb r0, [r4, r0] ldr r5, _081B3AF0 @@ -893183,14 +893183,14 @@ sub_081B39E8: @ 0x081B39E8 lsls r0, r0, #4 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xa ldrsb r0, [r4, r0] ldr r1, [r5] lsls r0, r0, #4 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap ldr r0, _081B3AF4 ldr r1, [r0] ldrb r2, [r6] @@ -893217,14 +893217,14 @@ sub_081B39E8: @ 0x081B39E8 lsls r0, r0, #4 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xa ldrsb r0, [r4, r0] ldr r1, [r5] lsls r0, r0, #4 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_08003774 + bl ClearWindowTilemap mov r0, r8 subs r0, #8 adds r0, r7, r0 @@ -893276,22 +893276,22 @@ sub_081B3B00: @ 0x081B3B00 lsls r0, r0, #4 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xa ldrsb r0, [r5, r0] ldr r1, [r4] lsls r0, r0, #4 adds r0, r0, r1 ldrb r0, [r0, #8] - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081B3B7C ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, _081B3B80 ldr r0, [r0] - bl sub_08000BF0 + bl Free adds r0, r6, #0 bl sub_081B3D1C b _081B3BA8 @@ -893433,8 +893433,8 @@ oamt_swap_pos: @ 0x081B3BB0 _081B3C78: .4byte gUnknown_20205AC thumb_func_end oamt_swap_pos - thumb_func_start sub_081B3C7C -sub_081B3C7C: @ 0x081B3C7C + thumb_func_start swap_pokemon_and_oams +swap_pokemon_and_oams: @ 0x081B3C7C push {r4, r5, r6, lr} sub sp, #8 ldr r1, _081B3D10 @@ -893474,7 +893474,7 @@ sub_081B3C7C: @ 0x081B3C7C movs r2, #0x64 bl memcpy adds r0, r6, #0 - bl sub_08000BF0 + bl Free ldr r0, [sp] adds r0, #0xb ldr r1, [sp, #4] @@ -893503,7 +893503,7 @@ sub_081B3C7C: @ 0x081B3C7C _081B3D10: .4byte gUnknown_203CBA8 _081B3D14: .4byte gUnknown_203CB94 _081B3D18: .4byte gUnknown_2024190 - thumb_func_end sub_081B3C7C + thumb_func_end swap_pokemon_and_oams thumb_func_start sub_081B3D1C sub_081B3D1C: @ 0x081B3D1C @@ -893527,7 +893527,7 @@ sub_081B3D1C: @ 0x081B3D1C movs r1, #1 bl sub_081B0C9C movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r1, _081B3D6C lsls r0, r5, #2 adds r0, r0, r5 @@ -893545,8 +893545,8 @@ _081B3D6C: .4byte gUnknown_3005B60 _081B3D70: .4byte sub_081B1040 thumb_func_end sub_081B3D1C - thumb_func_start sub_081B3D74 -sub_081B3D74: @ 0x081B3D74 + thumb_func_start CursorCb_Cancel1 +CursorCb_Cancel1: @ 0x081B3D74 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -893566,14 +893566,14 @@ sub_081B3D74: @ 0x081B3D74 cmp r0, #6 bne _081B3DB0 movs r0, #0xf - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B3DB6 .align 2, 0 _081B3DA8: .4byte gUnknown_203CB90 _081B3DAC: .4byte gUnknown_203CB94 _081B3DB0: movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message _081B3DB6: ldr r0, _081B3DCC lsls r1, r5, #2 @@ -893588,10 +893588,10 @@ _081B3DB6: .align 2, 0 _081B3DCC: .4byte gUnknown_3005B60 _081B3DD0: .4byte sub_081B1040 - thumb_func_end sub_081B3D74 + thumb_func_end CursorCb_Cancel1 - thumb_func_start sub_081B3DD4 -sub_081B3DD4: @ 0x081B3DD4 + thumb_func_start CursorCb_Item +CursorCb_Item: @ 0x081B3DD4 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -893613,7 +893613,7 @@ sub_081B3DD4: @ 0x081B3DD4 movs r0, #1 bl sub_081B2E34 movs r0, #0x18 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r1, _081B3E30 lsls r0, r5, #2 adds r0, r0, r5 @@ -893631,8 +893631,8 @@ _081B3E24: .4byte gUnknown_203CB90 _081B3E28: .4byte gUnknown_2024190 _081B3E2C: .4byte gUnknown_203CB94 _081B3E30: .4byte gUnknown_3005B60 -_081B3E34: .4byte sub_081B33D0 - thumb_func_end sub_081B3DD4 +_081B3E34: .4byte HandleMenuInput + thumb_func_end CursorCb_Item thumb_func_start sub_081B3E38 sub_081B3E38: @ 0x081B3E38 @@ -893659,17 +893659,17 @@ _081B3E60: .4byte sub_081B3E64 thumb_func_start sub_081B3E64 sub_081B3E64: @ 0x081B3E64 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _081B3E80 ldr r2, _081B3E7C movs r0, #2 movs r1, #5 - bl sub_081AAA08 + bl GoToBagMenu b _081B3E88 .align 2, 0 -_081B3E7C: .4byte sub_081B3E90 +_081B3E7C: .4byte c2_8123744 _081B3E80: ldr r1, _081B3E8C movs r0, #2 @@ -893678,11 +893678,11 @@ _081B3E88: pop {r0} bx r0 .align 2, 0 -_081B3E8C: .4byte sub_081B3E90 +_081B3E8C: .4byte c2_8123744 thumb_func_end sub_081B3E64 - thumb_func_start sub_081B3E90 -sub_081B3E90: @ 0x081B3E90 + thumb_func_start c2_8123744 +c2_8123744: @ 0x081B3E90 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -893719,7 +893719,7 @@ _081B3EC4: ldr r7, _081B3F10 adds r0, r0, r7 movs r1, #0xc - bl sub_0806A058 + bl GetMonData strh r0, [r4] lsls r0, r0, #0x10 cmp r0, #0 @@ -893737,7 +893737,7 @@ _081B3EFA: str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu b _081B3F60 .align 2, 0 _081B3F08: .4byte gUnknown_203CBC8 @@ -893752,7 +893752,7 @@ _081B3F18: beq _081B3F44 ldrh r0, [r6] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem movs r0, #9 ldrsb r0, [r5, r0] mov r1, r8 @@ -893776,7 +893776,7 @@ _081B3F44: str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu _081B3F60: add sp, #0xc pop {r3} @@ -893786,7 +893786,7 @@ _081B3F60: bx r0 .align 2, 0 _081B3F6C: .4byte sub_081B3F70 - thumb_func_end sub_081B3E90 + thumb_func_end c2_8123744 thumb_func_start sub_081B3F70 sub_081B3F70: @ 0x081B3F70 @@ -893825,7 +893825,7 @@ sub_081B3F70: @ 0x081B3F70 bl sub_081B1A88 adds r0, r4, #0 movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem ldr r1, _081B3FE8 lsls r0, r7, #2 adds r0, r0, r7 @@ -893895,7 +893895,7 @@ sub_081B4048: @ 0x081B4048 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -893942,19 +893942,19 @@ _081B40A2: ldr r5, _081B40E4 ldrh r0, [r5] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem ldr r6, _081B40E8 ldrh r0, [r6] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 bne _081B40F8 ldrh r0, [r5] movs r1, #1 - bl sub_080D6140 + bl AddBagItem ldrh r0, [r6] - bl sub_081B1B18 + bl pokemon_item_not_removed ldr r0, _081B40EC movs r1, #0 bl sub_081B182C @@ -894052,7 +894052,7 @@ sub_081B419C: @ 0x081B419C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -894083,7 +894083,7 @@ sub_081B41CC: @ 0x081B41CC ldr r1, _081B4208 adds r0, r0, r1 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081B420C @@ -894097,7 +894097,7 @@ sub_081B41CC: @ 0x081B41CC ldr r2, _081B4214 movs r0, #4 movs r3, #3 - bl sub_0811AA5C + bl DoEasyChatScreen pop {r0} bx r0 .align 2, 0 @@ -894123,7 +894123,7 @@ sub_081B4218: @ 0x081B4218 adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 @@ -894132,18 +894132,18 @@ sub_081B4218: @ 0x081B4218 cmp r7, #0 bne _081B4298 adds r0, r5, #0 - bl sub_080D3F04 + bl TakeMailFromMon ldr r4, _081B4290 adds r0, r5, #0 movs r1, #0xc adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrh r0, [r4] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem mov r0, r8 movs r1, #1 - bl sub_080D6140 + bl AddBagItem ldrb r0, [r6, #8] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -894155,7 +894155,7 @@ sub_081B4218: @ 0x081B4218 str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu b _081B42B4 .align 2, 0 _081B4284: .4byte gUnknown_203CB94 @@ -894176,7 +894176,7 @@ _081B4298: str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu _081B42B4: add sp, #0xc pop {r3} @@ -894258,7 +894258,7 @@ sub_081B433C: @ 0x081B433C muls r1, r0, r1 ldr r0, _081B439C adds r6, r1, r0 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -894278,7 +894278,7 @@ sub_081B433C: @ 0x081B433C bne _081B43B6 adds r0, r6, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B43A4 movs r0, #9 @@ -894313,8 +894313,8 @@ _081B43BC: .align 2, 0 thumb_func_end sub_081B433C - thumb_func_start sub_081B43C4 -sub_081B43C4: @ 0x081B43C4 + thumb_func_start CursorCb_TakeItem +CursorCb_TakeItem: @ 0x081B43C4 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -894327,7 +894327,7 @@ sub_081B43C4: @ 0x081B43C4 adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 movs r0, #5 @@ -894340,7 +894340,7 @@ sub_081B43C4: @ 0x081B43C4 adds r0, #0xd bl sub_081B2CB0 adds r0, r5, #0 - bl sub_081B1AD0 + bl InitEventObjectPalettes lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -894359,11 +894359,11 @@ _081B4424: .4byte gUnknown_203CB90 _081B4428: ldr r1, _081B4440 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B4444 ldr r1, _081B4448 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 b _081B4454 .align 2, 0 @@ -894372,14 +894372,14 @@ _081B4444: .4byte gUnknown_2021C7C _081B4448: .4byte gUnknown_85C9CAD _081B444C: adds r0, r6, #0 - bl sub_081B1B18 + bl pokemon_item_not_removed ldr r0, _081B4474 _081B4454: movs r1, #1 bl sub_081B182C _081B445A: movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081B4478 lsls r1, r7, #2 adds r1, r1, r7 @@ -894394,10 +894394,10 @@ _081B445A: _081B4474: .4byte gUnknown_2021C7C _081B4478: .4byte gUnknown_3005B60 _081B447C: .4byte sub_081B433C - thumb_func_end sub_081B43C4 + thumb_func_end CursorCb_TakeItem - thumb_func_start sub_081B4480 -sub_081B4480: @ 0x081B4480 + thumb_func_start CursorCb_Toss +CursorCb_Toss: @ 0x081B4480 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -894410,7 +894410,7 @@ sub_081B4480: @ 0x081B4480 adds r7, r1, r0 adds r0, r7, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r5, r0, #0x10 movs r0, #5 @@ -894426,11 +894426,11 @@ sub_081B4480: @ 0x081B4480 bne _081B4504 ldr r1, _081B44F0 adds r0, r7, #0 - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B44F4 ldr r1, _081B44F8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C @@ -894457,7 +894457,7 @@ _081B4504: ldr r4, _081B4538 ldr r1, _081B453C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C @@ -894478,14 +894478,14 @@ _081B4538: .4byte gUnknown_2021C7C _081B453C: .4byte gUnknown_85CA007 _081B4540: .4byte gUnknown_3005B60 _081B4544: .4byte sub_081B4548 - thumb_func_end sub_081B4480 + thumb_func_end CursorCb_Toss thumb_func_start sub_081B4548 sub_081B4548: @ 0x081B4548 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -894504,11 +894504,11 @@ _081B456C: bx r0 .align 2, 0 _081B4574: .4byte gUnknown_3005B60 -_081B4578: .4byte sub_081B457C +_081B4578: .4byte BagMenu_TossItems thumb_func_end sub_081B4548 - thumb_func_start sub_081B457C -sub_081B457C: @ 0x081B457C + thumb_func_start BagMenu_TossItems +BagMenu_TossItems: @ 0x081B457C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -894541,7 +894541,7 @@ _081B45B4: _081B45BA: adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, _081B45F0 @@ -894549,7 +894549,7 @@ _081B45BA: ldr r4, _081B45F4 ldr r1, _081B45F8 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 bl sub_081B182C @@ -894585,7 +894585,7 @@ _081B4618: .align 2, 0 _081B4620: .4byte gUnknown_3005B60 _081B4624: .4byte sub_081B18EC - thumb_func_end sub_081B457C + thumb_func_end BagMenu_TossItems thumb_func_start sub_081B4628 sub_081B4628: @ 0x081B4628 @@ -894600,7 +894600,7 @@ sub_081B4628: @ 0x081B4628 muls r1, r0, r1 ldr r0, _081B4698 adds r5, r1, r0 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -894611,7 +894611,7 @@ sub_081B4628: @ 0x081B4628 adds r0, r5, #0 movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData ldr r4, _081B469C movs r0, #9 ldrsb r0, [r6, r0] @@ -894648,8 +894648,8 @@ _081B46A0: .4byte gUnknown_3005B60 _081B46A4: .4byte sub_081B18EC thumb_func_end sub_081B4628 - thumb_func_start sub_081B46A8 -sub_081B46A8: @ 0x081B46A8 + thumb_func_start CursorCb_Mail +CursorCb_Mail: @ 0x081B46A8 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -894671,7 +894671,7 @@ sub_081B46A8: @ 0x081B46A8 movs r0, #2 bl sub_081B2E34 movs r0, #0x19 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r1, _081B4704 lsls r0, r5, #2 adds r0, r0, r5 @@ -894689,11 +894689,11 @@ _081B46F8: .4byte gUnknown_203CB90 _081B46FC: .4byte gUnknown_2024190 _081B4700: .4byte gUnknown_203CB94 _081B4704: .4byte gUnknown_3005B60 -_081B4708: .4byte sub_081B33D0 - thumb_func_end sub_081B46A8 +_081B4708: .4byte HandleMenuInput + thumb_func_end CursorCb_Mail - thumb_func_start sub_081B470C -sub_081B470C: @ 0x081B470C + thumb_func_start CursorCb_Read +CursorCb_Read: @ 0x081B470C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -894712,7 +894712,7 @@ sub_081B470C: @ 0x081B470C .align 2, 0 _081B4730: .4byte gUnknown_203CB90 _081B4734: .4byte sub_081B4738 - thumb_func_end sub_081B470C + thumb_func_end CursorCb_Read thumb_func_start sub_081B4738 sub_081B4738: @ 0x081B4738 @@ -894725,7 +894725,7 @@ sub_081B4738: @ 0x081B4738 ldr r1, _081B4770 adds r0, r0, r1 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData ldr r2, _081B4774 lsls r1, r0, #3 adds r1, r1, r0 @@ -894769,7 +894769,7 @@ sub_081B4780: @ 0x081B4780 str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -894779,8 +894779,8 @@ _081B47B8: .4byte gUnknown_203CB94 _081B47BC: .4byte sub_081B339C thumb_func_end sub_081B4780 - thumb_func_start sub_081B47C0 -sub_081B47C0: @ 0x081B47C0 + thumb_func_start CursorCb_TakeMail +CursorCb_TakeMail: @ 0x081B47C0 push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -894812,14 +894812,14 @@ _081B47FC: .4byte gUnknown_203CB90 _081B4800: .4byte gUnknown_85C9BF1 _081B4804: .4byte gUnknown_3005B60 _081B4808: .4byte sub_081B480C - thumb_func_end sub_081B47C0 + thumb_func_end CursorCb_TakeMail thumb_func_start sub_081B480C sub_081B480C: @ 0x081B480C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -894870,7 +894870,7 @@ _081B4866: muls r0, r1, r0 ldr r1, _081B489C adds r0, r0, r1 - bl sub_080D3F84 + bl TakeMailFromMon2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff @@ -894936,7 +894936,7 @@ sub_081B4900: @ 0x081B4900 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -894992,12 +894992,12 @@ _081B495E: ldr r6, _081B49B4 adds r0, r0, r6 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 adds r0, r4, #0 movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -895007,7 +895007,7 @@ _081B495E: ldrsb r0, [r1, r0] muls r0, r7, r0 adds r0, r0, r6 - bl sub_080D3F04 + bl TakeMailFromMon ldr r0, _081B49B8 movs r1, #0 bl sub_081B182C @@ -895027,7 +895027,7 @@ _081B49BC: .4byte gUnknown_3005B60 _081B49C0: .4byte sub_081B433C _081B49C4: adds r0, r4, #0 - bl sub_081B1B18 + bl pokemon_item_not_removed ldr r0, _081B49E4 movs r1, #0 bl sub_081B182C @@ -895065,8 +895065,8 @@ _081B4A10: .4byte gUnknown_3005B60 _081B4A14: .4byte sub_081B18EC thumb_func_end sub_081B4934 - thumb_func_start sub_081B4A18 -sub_081B4A18: @ 0x081B4A18 + thumb_func_start CursorCb_Cancel2 +CursorCb_Cancel2: @ 0x081B4A18 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -895106,7 +895106,7 @@ sub_081B4A18: @ 0x081B4A18 movs r0, #0 bl sub_081B2E34 movs r0, #0x15 - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B4AA2 .align 2, 0 _081B4A78: .4byte gUnknown_203CB94 @@ -895117,13 +895117,13 @@ _081B4A84: bl sub_081B2E34 adds r0, r7, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r1, _081B4AC0 bl sub_080D5EC8 movs r0, #0x1a - bl sub_081B2CD8 + bl display_pokemon_menu_message _081B4AA2: ldr r1, _081B4AC4 mov r2, r8 @@ -895143,11 +895143,11 @@ _081B4AA2: .align 2, 0 _081B4AC0: .4byte gUnknown_2021C54 _081B4AC4: .4byte gUnknown_3005B60 -_081B4AC8: .4byte sub_081B33D0 - thumb_func_end sub_081B4A18 +_081B4AC8: .4byte HandleMenuInput + thumb_func_end CursorCb_Cancel2 - thumb_func_start sub_081B4ACC -sub_081B4ACC: @ 0x081B4ACC + thumb_func_start CursorCb_SendMon +CursorCb_SendMon: @ 0x081B4ACC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -895189,10 +895189,10 @@ _081B4B1A: _081B4B20: .4byte gUnknown_2021C7C _081B4B24: .4byte gUnknown_3005B60 _081B4B28: .4byte sub_081B18EC - thumb_func_end sub_081B4ACC + thumb_func_end CursorCb_SendMon - thumb_func_start sub_081B4B2C -sub_081B4B2C: @ 0x081B4B2C + thumb_func_start CursorCb_Enter +CursorCb_Enter: @ 0x081B4B2C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -895250,7 +895250,7 @@ _081B4B66: bl sub_081B4C28 _081B4BA4: movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B4BC8 mov r1, r8 str r0, [r1] @@ -895277,7 +895277,7 @@ _081B4BD6: ldr r4, _081B4C18 ldr r1, _081B4C1C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0x20 bl sub_080A306C adds r0, r4, #0 @@ -895303,7 +895303,7 @@ _081B4C18: .4byte gUnknown_2021C7C _081B4C1C: .4byte gUnknown_85C9BD5 _081B4C20: .4byte gUnknown_3005B60 _081B4C24: .4byte sub_081B18EC - thumb_func_end sub_081B4B2C + thumb_func_end CursorCb_Enter thumb_func_start sub_081B4C28 sub_081B4C28: @ 0x081B4C28 @@ -895323,8 +895323,8 @@ sub_081B4C28: @ 0x081B4C28 _081B4C44: .4byte gUnknown_203CB94 thumb_func_end sub_081B4C28 - thumb_func_start sub_081B4C48 -sub_081B4C48: @ 0x081B4C48 + thumb_func_start CursorCb_NoEntry +CursorCb_NoEntry: @ 0x081B4C48 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -895430,7 +895430,7 @@ _081B4D0E: blt _081B4CEE _081B4D18: movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B4D44 mov r2, r8 adds r1, r7, r2 @@ -895449,10 +895449,10 @@ _081B4D3C: .4byte gUnknown_203CB94 _081B4D40: .4byte gUnknown_203CBC4 _081B4D44: .4byte gUnknown_3005B60 _081B4D48: .4byte sub_081B1040 - thumb_func_end sub_081B4C48 + thumb_func_end CursorCb_NoEntry - thumb_func_start sub_081B4D4C -sub_081B4D4C: @ 0x081B4D4C + thumb_func_start CursorCb_Store +CursorCb_Store: @ 0x081B4D4C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -895465,10 +895465,10 @@ sub_081B4D4C: @ 0x081B4D4C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B4D4C + thumb_func_end CursorCb_Store - thumb_func_start sub_081B4D68 -sub_081B4D68: @ 0x081B4D68 + thumb_func_start CursorCb_Register +CursorCb_Register: @ 0x081B4D68 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -895488,7 +895488,7 @@ sub_081B4D68: @ 0x081B4D68 ldr r4, _081B4DF8 adds r0, r0, r4 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r6, r0, #0 lsls r6, r6, #0x10 lsrs r6, r6, #0x10 @@ -895500,7 +895500,7 @@ sub_081B4D68: @ 0x081B4D68 adds r0, r1, #0 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 @@ -895512,7 +895512,7 @@ sub_081B4D68: @ 0x081B4D68 adds r0, r1, #0 adds r0, r0, r4 movs r1, #0x50 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -895537,7 +895537,7 @@ _081B4DF8: .4byte gUnknown_2024190 _081B4DFC: ldr r0, _081B4E08 ldr r1, _081B4E0C - bl sub_08008BCC + bl StringExpandPlaceholders b _081B4E18 .align 2, 0 _081B4E08: .4byte gUnknown_2021C7C @@ -895545,7 +895545,7 @@ _081B4E0C: .4byte gUnknown_85CA2B4 _081B4E10: ldr r0, _081B4E5C ldr r1, _081B4E60 - bl sub_08008BCC + bl StringExpandPlaceholders _081B4E18: movs r0, #0x20 bl sub_080A306C @@ -895584,10 +895584,10 @@ _081B4E64: .4byte gUnknown_203CB90 _081B4E68: .4byte gUnknown_85CA273 _081B4E6C: .4byte gUnknown_3005B60 _081B4E70: .4byte sub_081B18EC - thumb_func_end sub_081B4D68 + thumb_func_end CursorCb_Register - thumb_func_start sub_081B4E74 -sub_081B4E74: @ 0x081B4E74 + thumb_func_start CursorCb_Trade1 +CursorCb_Trade1: @ 0x081B4E74 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -895605,7 +895605,7 @@ sub_081B4E74: @ 0x081B4E74 ldr r4, _081B4F40 adds r0, r0, r4 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData mov sb, r0 mov r1, sb lsls r1, r1, #0x10 @@ -895617,7 +895617,7 @@ sub_081B4E74: @ 0x081B4E74 muls r0, r6, r0 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 @@ -895627,7 +895627,7 @@ sub_081B4E74: @ 0x081B4E74 muls r0, r6, r0 adds r0, r0, r4 movs r1, #0x50 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -895653,7 +895653,7 @@ sub_081B4E74: @ 0x081B4E74 adds r0, r0, r1 ldr r1, [r0] adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #0x20 bl sub_080A306C ldr r4, _081B4F58 @@ -895703,10 +895703,10 @@ _081B4F74: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B4E74 + thumb_func_end CursorCb_Trade1 - thumb_func_start sub_081B4F84 -sub_081B4F84: @ 0x081B4F84 + thumb_func_start CursorCb_Trade2 +CursorCb_Trade2: @ 0x081B4F84 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -895743,7 +895743,7 @@ _081B4FC8: _081B4FCE: ldr r0, _081B4FD8 ldr r1, _081B4FDC - bl sub_08008BCC + bl StringExpandPlaceholders b _081B5060 .align 2, 0 _081B4FD8: .4byte gUnknown_2021C7C @@ -895751,7 +895751,7 @@ _081B4FDC: .4byte gUnknown_85CA294 _081B4FE0: ldr r0, _081B4FEC ldr r1, _081B4FF0 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B5060 .align 2, 0 _081B4FEC: .4byte gUnknown_2021C7C @@ -895759,7 +895759,7 @@ _081B4FF0: .4byte gUnknown_85CA2B4 _081B4FF4: ldr r0, _081B5000 ldr r1, _081B5004 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B5060 .align 2, 0 _081B5000: .4byte gUnknown_2021C7C @@ -895775,11 +895775,11 @@ _081B5008: ldr r1, _081B5048 adds r0, r0, r1 ldr r1, _081B504C - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B5050 ldr r1, _081B5054 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C @@ -895797,7 +895797,7 @@ _081B504C: .4byte gUnknown_2021C40 _081B5050: .4byte gUnknown_2021C7C _081B5054: .4byte gUnknown_85CA276 _081B5058: .4byte gUnknown_3005B60 -_081B505C: .4byte sub_081B509C +_081B505C: .4byte GetFlavorRelationByPersonality _081B5060: movs r0, #0x20 bl sub_080A306C @@ -895824,14 +895824,14 @@ _081B508C: .4byte gUnknown_2021C7C _081B5090: .4byte gUnknown_85CA273 _081B5094: .4byte gUnknown_3005B60 _081B5098: .4byte sub_081B18EC - thumb_func_end sub_081B4F84 + thumb_func_end CursorCb_Trade2 - thumb_func_start sub_081B509C -sub_081B509C: @ 0x081B509C + thumb_func_start GetFlavorRelationByPersonality +GetFlavorRelationByPersonality: @ 0x081B509C push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -895851,7 +895851,7 @@ _081B50C0: .align 2, 0 _081B50C8: .4byte gUnknown_3005B60 _081B50CC: .4byte sub_081B50D0 - thumb_func_end sub_081B509C + thumb_func_end GetFlavorRelationByPersonality thumb_func_start sub_081B50D0 sub_081B50D0: @ 0x081B50D0 @@ -895890,12 +895890,12 @@ _081B510A: bx r0 thumb_func_end sub_081B50D0 - thumb_func_start sub_081B5110 -sub_081B5110: @ 0x081B5110 + thumb_func_start CursorCb_FieldMove +CursorCb_FieldMove: @ 0x081B5110 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_08198670 + bl Menu_GetCursorPos ldr r5, _081B517C ldr r1, [r5] lsls r0, r0, #0x18 @@ -895938,7 +895938,7 @@ _081B5166: cmp r0, #1 bhi _081B5184 movs r0, #0xd - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B52F6 .align 2, 0 _081B517C: .4byte gUnknown_203CB90 @@ -896057,7 +896057,7 @@ _081B5258: ldr r0, _081B52A8 ldr r1, _081B52AC _081B5288: - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r6, #0 bl sub_081B5314 ldr r0, _081B52B0 @@ -896079,7 +896079,7 @@ _081B52B4: b _081B52C8 .align 2, 0 _081B52BC: .4byte gUnknown_203CB94 -_081B52C0: .4byte sub_0812469C +_081B52C0: .4byte MCB2_FlyMap _081B52C4: ldr r1, _081B52D4 ldr r0, _081B52D8 @@ -896104,7 +896104,7 @@ _081B52EA: _081B52F0: ldrb r0, [r5, #4] _081B52F2: - bl sub_081B2CD8 + bl display_pokemon_menu_message _081B52F6: ldr r0, _081B530C lsls r1, r6, #2 @@ -896120,7 +896120,7 @@ _081B5304: .align 2, 0 _081B530C: .4byte gUnknown_3005B60 _081B5310: .4byte task_brm_cancel_1_on_keypad_a_or_b - thumb_func_end sub_081B5110 + thumb_func_end CursorCb_FieldMove thumb_func_start sub_081B5314 sub_081B5314: @ 0x081B5314 @@ -896152,7 +896152,7 @@ sub_081B5344: @ 0x081B5344 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -896225,22 +896225,22 @@ _081B53D0: .4byte gUnknown_3005B10 _081B53D4: .4byte gUnknown_203CBB8 thumb_func_end sub_081B5378 - thumb_func_start sub_081B53D8 -sub_081B53D8: @ 0x081B53D8 + thumb_func_start FieldCallback_PrepareFadeInFromMenu +FieldCallback_PrepareFadeInFromMenu: @ 0x081B53D8 push {lr} - bl sub_080AE99C + bl pal_fill_black ldr r0, _081B53EC movs r1, #8 - bl sub_080A8878 + bl CreateTask movs r0, #1 pop {r1} bx r1 .align 2, 0 -_081B53EC: .4byte sub_081B53F0 - thumb_func_end sub_081B53D8 +_081B53EC: .4byte task_launch_hm_phase_2 + thumb_func_end FieldCallback_PrepareFadeInFromMenu - thumb_func_start sub_081B53F0 -sub_081B53F0: @ 0x081B53F0 + thumb_func_start task_launch_hm_phase_2 +task_launch_hm_phase_2: @ 0x081B53F0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -896249,7 +896249,7 @@ sub_081B53F0: @ 0x081B53F0 lsrs r0, r0, #0x18 cmp r0, #1 bne _081B541C - bl sub_081B542C + bl brm_get_selected_species ldr r1, _081B5424 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -896258,7 +896258,7 @@ sub_081B53F0: @ 0x081B53F0 ldr r0, [r0] bl _call_via_r0 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081B541C: pop {r4} pop {r0} @@ -896266,10 +896266,10 @@ _081B541C: .align 2, 0 _081B5424: .4byte gUnknown_20388A8 _081B5428: .4byte gUnknown_203CBB8 - thumb_func_end sub_081B53F0 + thumb_func_end task_launch_hm_phase_2 - thumb_func_start sub_081B542C -sub_081B542C: @ 0x081B542C + thumb_func_start brm_get_selected_species +brm_get_selected_species: @ 0x081B542C push {lr} ldr r0, _081B544C movs r1, #9 @@ -896279,7 +896279,7 @@ sub_081B542C: @ 0x081B542C ldr r1, _081B5450 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 pop {r1} @@ -896287,7 +896287,7 @@ sub_081B542C: @ 0x081B542C .align 2, 0 _081B544C: .4byte gUnknown_203CB94 _081B5450: .4byte gUnknown_2024190 - thumb_func_end sub_081B542C + thumb_func_end brm_get_selected_species thumb_func_start task_brm_cancel_1_on_keypad_a_or_b task_brm_cancel_1_on_keypad_a_or_b: @ 0x081B5454 @@ -896306,7 +896306,7 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 0x081B5454 beq _081B5474 _081B546E: adds r0, r2, #0 - bl sub_081B3D74 + bl CursorCb_Cancel1 _081B5474: pop {r0} bx r0 @@ -896324,13 +896324,13 @@ sub_081B547C: @ 0x081B547C cmp r0, #1 bne _081B5498 movs r0, #0xc - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B549E .align 2, 0 _081B5494: .4byte 0x00000888 _081B5498: movs r0, #0xd - bl sub_081B2CD8 + bl display_pokemon_menu_message _081B549E: pop {r0} bx r0 @@ -896340,28 +896340,28 @@ _081B549E: thumb_func_start sub_081B54A4 sub_081B54A4: @ 0x081B54A4 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _081B54BC lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r1] movs r0, #9 - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _081B54BC: .4byte gUnknown_20388A8 thumb_func_end sub_081B54A4 - thumb_func_start sub_081B54C0 -sub_081B54C0: @ 0x081B54C0 + thumb_func_start SetUpFieldMove_Surf +SetUpFieldMove_Surf: @ 0x081B54C0 push {lr} - bl sub_0808B764 + bl PartyHasMonWithSurf lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _081B54FC - bl sub_0808B7D8 + bl IsPlayerFacingSurfableFishableWater lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -896376,7 +896376,7 @@ sub_081B54C0: @ 0x081B54C0 b _081B54FE .align 2, 0 _081B54EC: .4byte gUnknown_3005B10 -_081B54F0: .4byte sub_081B53D8 +_081B54F0: .4byte FieldCallback_PrepareFadeInFromMenu _081B54F4: .4byte gUnknown_203CBB8 _081B54F8: .4byte sub_081B54A4 _081B54FC: @@ -896385,29 +896385,29 @@ _081B54FE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B54C0 + thumb_func_end SetUpFieldMove_Surf thumb_func_start sub_081B5504 sub_081B5504: @ 0x081B5504 push {lr} movs r0, #8 - bl sub_0808B624 + bl TestPlayerAvatarFlags lsls r0, r0, #0x18 cmp r0, #0 beq _081B551A movs r0, #9 - bl sub_081B2CD8 + bl display_pokemon_menu_message b _081B5520 _081B551A: movs r0, #8 - bl sub_081B2CD8 + bl display_pokemon_menu_message _081B5520: pop {r0} bx r0 thumb_func_end sub_081B5504 - thumb_func_start sub_081B5524 -sub_081B5524: @ 0x081B5524 + thumb_func_start SetUpFieldMove_Fly +SetUpFieldMove_Fly: @ 0x081B5524 push {lr} ldr r0, _081B553C ldrb r0, [r0, #0x17] @@ -896426,7 +896426,7 @@ _081B5542: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B5524 + thumb_func_end SetUpFieldMove_Fly thumb_func_start sub_081B5548 sub_081B5548: @ 0x081B5548 @@ -896442,40 +896442,40 @@ sub_081B5548: @ 0x081B5548 movs r1, #0 movs r2, #0 movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 .align 2, 0 _081B556C: .4byte sub_081B1040 -_081B5570: .4byte sub_08085AFC +_081B5570: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_081B5548 - thumb_func_start sub_081B5574 -sub_081B5574: @ 0x081B5574 + thumb_func_start hm2_waterfall +hm2_waterfall: @ 0x081B5574 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _081B558C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r1] movs r0, #0x2b - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _081B558C: .4byte gUnknown_20388A8 - thumb_func_end sub_081B5574 + thumb_func_end hm2_waterfall - thumb_func_start sub_081B5590 -sub_081B5590: @ 0x081B5590 + thumb_func_start SetUpFieldMove_Waterfall +SetUpFieldMove_Waterfall: @ 0x081B5590 push {r4, lr} sub sp, #4 mov r4, sp adds r4, #2 mov r0, sp adds r1, r4, #0 - bl sub_0808B3CC + bl GetXYCoordsOneStepInFrontOfPlayer mov r0, sp movs r1, #0 ldrsh r0, [r0, r1] @@ -896504,9 +896504,9 @@ sub_081B5590: @ 0x081B5590 b _081B55EE .align 2, 0 _081B55DC: .4byte gUnknown_3005B10 -_081B55E0: .4byte sub_081B53D8 +_081B55E0: .4byte FieldCallback_PrepareFadeInFromMenu _081B55E4: .4byte gUnknown_203CBB8 -_081B55E8: .4byte sub_081B5574 +_081B55E8: .4byte hm2_waterfall _081B55EC: movs r0, #0 _081B55EE: @@ -896515,28 +896515,28 @@ _081B55EE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B5590 + thumb_func_end SetUpFieldMove_Waterfall thumb_func_start sub_081B55F8 sub_081B55F8: @ 0x081B55F8 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r1, _081B5610 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [r1] movs r0, #0x2c - bl sub_080B5270 + bl FieldEffectStart pop {r0} bx r0 .align 2, 0 _081B5610: .4byte gUnknown_20388A8 thumb_func_end sub_081B55F8 - thumb_func_start sub_081B5614 -sub_081B5614: @ 0x081B5614 + thumb_func_start SetUpFieldMove_Dive +SetUpFieldMove_Dive: @ 0x081B5614 push {lr} - bl sub_0809CAC0 + bl TrySetDiveWarp ldr r1, _081B562C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -896560,20 +896560,20 @@ _081B563E: bx r1 .align 2, 0 _081B5644: .4byte gUnknown_3005B10 -_081B5648: .4byte sub_081B53D8 +_081B5648: .4byte FieldCallback_PrepareFadeInFromMenu _081B564C: .4byte gUnknown_203CBB8 _081B5650: .4byte sub_081B55F8 - thumb_func_end sub_081B5614 + thumb_func_end SetUpFieldMove_Dive - thumb_func_start sub_081B5654 -sub_081B5654: @ 0x081B5654 + thumb_func_start party_menu_icon_anim +party_menu_icon_anim: @ 0x081B5654 push {r4, r5, r6, r7, lr} sub sp, #4 adds r5, r0, #0 adds r7, r1, #0 adds r4, r2, #0 movs r6, #1 - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -896596,19 +896596,19 @@ sub_081B5654: @ 0x081B5654 _081B568A: adds r0, r5, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r5, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 str r6, [sp] adds r0, r4, #0 adds r2, r7, #0 movs r3, #1 - bl sub_081B56CC + bl party_menu_link_mon_icon_anim ldrb r0, [r7, #9] adds r1, r5, #0 bl sub_081B57D8 @@ -896620,10 +896620,10 @@ _081B568A: _081B56C0: .4byte gUnknown_3002360 _081B56C4: .4byte 0x00000439 _081B56C8: .4byte gUnknown_85E18D8 - thumb_func_end sub_081B5654 + thumb_func_end party_menu_icon_anim - thumb_func_start sub_081B56CC -sub_081B56CC: @ 0x081B56CC + thumb_func_start party_menu_link_mon_icon_anim +party_menu_link_mon_icon_anim: @ 0x081B56CC push {r4, r5, r6, r7, lr} sub sp, #0xc adds r6, r1, #0 @@ -896644,7 +896644,7 @@ sub_081B56CC: @ 0x081B56CC ldr r0, [sp, #0x20] str r0, [sp, #8] adds r0, r5, #0 - bl sub_080D2564 + bl CreateMonIcon strb r0, [r4, #9] ldr r2, _081B5728 ldrb r0, [r4, #9] @@ -896670,7 +896670,7 @@ _081B571A: .align 2, 0 _081B5724: .4byte sub_080D28B4 _081B5728: .4byte gUnknown_20205AC - thumb_func_end sub_081B56CC + thumb_func_end party_menu_link_mon_icon_anim thumb_func_start sub_081B572C sub_081B572C: @ 0x081B572C @@ -896766,13 +896766,13 @@ sub_081B57D8: @ 0x081B57D8 lsrs r5, r5, #0x18 adds r0, r6, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 adds r0, r6, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 lsls r2, r2, #0x10 lsrs r2, r2, #0x10 @@ -896784,8 +896784,8 @@ sub_081B57D8: @ 0x081B57D8 bx r0 thumb_func_end sub_081B57D8 - thumb_func_start sub_081B580C -sub_081B580C: @ 0x081B580C + thumb_func_start AnimateSelectedPartyIcon +AnimateSelectedPartyIcon: @ 0x081B580C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -896827,7 +896827,7 @@ _081B584A: b _081B5870 .align 2, 0 _081B585C: .4byte 0x0000FFFC -_081B5860: .4byte sub_081B58A8 +_081B5860: .4byte UpdatePartyMonIconFrame _081B5864: strh r3, [r2, #0x24] strh r3, [r2, #0x26] @@ -896841,14 +896841,14 @@ _081B5870: pop {r0} bx r0 .align 2, 0 -_081B5878: .4byte sub_081B587C - thumb_func_end sub_081B580C +_081B5878: .4byte UpdatePartyMonIconFrameAndBounce + thumb_func_end AnimateSelectedPartyIcon - thumb_func_start sub_081B587C -sub_081B587C: @ 0x081B587C + thumb_func_start UpdatePartyMonIconFrameAndBounce +UpdatePartyMonIconFrameAndBounce: @ 0x081B587C push {r4, lr} adds r4, r0, #0 - bl sub_080D297C + bl UpdateMonIconFrame lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -896868,24 +896868,24 @@ _081B58A2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081B587C + thumb_func_end UpdatePartyMonIconFrameAndBounce - thumb_func_start sub_081B58A8 -sub_081B58A8: @ 0x081B58A8 + thumb_func_start UpdatePartyMonIconFrame +UpdatePartyMonIconFrame: @ 0x081B58A8 push {lr} - bl sub_080D297C + bl UpdateMonIconFrame pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081B58A8 + thumb_func_end UpdatePartyMonIconFrame - thumb_func_start sub_081B58B4 -sub_081B58B4: @ 0x081B58B4 + thumb_func_start party_menu_held_item_object +party_menu_held_item_object: @ 0x081B58B4 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B58DC ldr r0, _081B58E4 @@ -896893,7 +896893,7 @@ sub_081B58B4: @ 0x081B58B4 ldrb r1, [r2, #2] ldrb r2, [r2, #3] movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4, #0xa] adds r0, r5, #0 adds r1, r4, #0 @@ -896904,10 +896904,10 @@ _081B58DC: bx r0 .align 2, 0 _081B58E4: .4byte gUnknown_85E1778 - thumb_func_end sub_081B58B4 + thumb_func_end party_menu_held_item_object - thumb_func_start sub_081B58E8 -sub_081B58E8: @ 0x081B58E8 + thumb_func_start party_menu_link_mon_held_item_object +party_menu_link_mon_held_item_object: @ 0x081B58E8 push {r4, r5, lr} adds r4, r2, #0 lsls r0, r0, #0x10 @@ -896920,7 +896920,7 @@ sub_081B58E8: @ 0x081B58E8 ldrb r1, [r2, #2] ldrb r2, [r2, #3] movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4, #0xa] ldr r2, _081B5930 ldrb r0, [r4, #0xa] @@ -896943,14 +896943,14 @@ _081B5924: .align 2, 0 _081B592C: .4byte gUnknown_85E1778 _081B5930: .4byte gUnknown_20205AC - thumb_func_end sub_081B58E8 + thumb_func_end party_menu_link_mon_held_item_object thumb_func_start sub_081B5934 sub_081B5934: @ 0x081B5934 push {r4, lr} adds r4, r1, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 adds r1, r4, #0 @@ -897032,7 +897032,7 @@ _081B59CC: .4byte gUnknown_20205AC sub_081B59D0: @ 0x081B59D0 push {lr} ldr r0, _081B59E4 - bl sub_08008210 + bl LoadSpriteSheet ldr r0, _081B59E8 bl LoadSpritePalette pop {r0} @@ -897065,7 +897065,7 @@ _081B5A08: ldr r1, _081B5A44 adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -897098,7 +897098,7 @@ _081B5A4C: ldr r1, _081B5A8C adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r1, r0, #0x10 cmp r1, #0 @@ -897156,7 +897156,7 @@ sub_081B5A90: @ 0x081B5A90 lsrs r3, r3, #0x18 movs r1, #0xfa movs r2, #0xaa - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #4 @@ -897189,11 +897189,11 @@ sub_081B5A90: @ 0x081B5A90 .align 2, 0 _081B5B08: .4byte gUnknown_20205AC _081B5B0C: .4byte gUnknown_85E1778 -_081B5B10: .4byte sub_081B5B14 +_081B5B10: .4byte SpriteCB_HeldItem thumb_func_end sub_081B5A90 - thumb_func_start sub_081B5B14 -sub_081B5B14: @ 0x081B5B14 + thumb_func_start SpriteCB_HeldItem +SpriteCB_HeldItem: @ 0x081B5B14 push {r4, lr} adds r4, r0, #0 ldrh r1, [r4, #0x3c] @@ -897239,14 +897239,14 @@ _081B5B66: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081B5B14 + thumb_func_end SpriteCB_HeldItem - thumb_func_start sub_081B5B6C -sub_081B5B6C: @ 0x081B5B6C + thumb_func_start party_menu_pokeball_object +party_menu_pokeball_object: @ 0x081B5B6C push {r4, lr} adds r4, r1, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B5B8A ldr r0, _081B5B90 @@ -897254,7 +897254,7 @@ sub_081B5B6C: @ 0x081B5B6C ldrb r1, [r2, #6] ldrb r2, [r2, #7] movs r3, #8 - bl sub_08006B0C + bl CreateSprite strb r0, [r4, #0xb] _081B5B8A: pop {r4} @@ -897262,7 +897262,7 @@ _081B5B8A: bx r0 .align 2, 0 _081B5B90: .4byte gUnknown_85E17C0 - thumb_func_end sub_081B5B6C + thumb_func_end party_menu_pokeball_object thumb_func_start sub_081B5B94 sub_081B5B94: @ 0x081B5B94 @@ -897276,7 +897276,7 @@ sub_081B5B94: @ 0x081B5B94 ldrb r1, [r2, #6] ldrb r2, [r2, #7] movs r3, #8 - bl sub_08006B0C + bl CreateSprite strb r0, [r4, #0xb] ldr r2, _081B5BD0 ldrb r0, [r4, #0xb] @@ -897310,7 +897310,7 @@ sub_081B5BD4: @ 0x081B5BD4 ldr r0, _081B5C0C adds r1, r3, #0 movs r3, #8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081B5C10 @@ -897344,7 +897344,7 @@ sub_081B5C14: @ 0x081B5C14 ldr r0, _081B5C34 adds r1, r3, #0 movs r3, #8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -897439,30 +897439,30 @@ _081B5CD8: .4byte gUnknown_20205AC _081B5CDC: .4byte 0x0000FFFC thumb_func_end sub_081B5C5C - thumb_func_start sub_081B5CE0 -sub_081B5CE0: @ 0x081B5CE0 + thumb_func_start LoadPartyMenuPokeballGfx +LoadPartyMenuPokeballGfx: @ 0x081B5CE0 push {lr} ldr r0, _081B5CF8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081B5CFC - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081B5D00 - bl sub_080343E4 + bl LoadCompressedSpritePalette pop {r0} bx r0 .align 2, 0 _081B5CF8: .4byte gUnknown_85E17B0 _081B5CFC: .4byte gUnknown_85E1828 _081B5D00: .4byte gUnknown_85E17B8 - thumb_func_end sub_081B5CE0 + thumb_func_end LoadPartyMenuPokeballGfx - thumb_func_start sub_081B5D04 -sub_081B5D04: @ 0x081B5D04 + thumb_func_start party_menu_status_condition_object +party_menu_status_condition_object: @ 0x081B5D04 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B5D2C ldr r0, _081B5D34 @@ -897470,21 +897470,21 @@ sub_081B5D04: @ 0x081B5D04 ldrb r1, [r2, #4] ldrb r2, [r2, #5] movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4, #0xc] adds r0, r5, #0 adds r1, r4, #0 - bl sub_081B5D84 + bl party_menu_get_status_condition_and_update_object _081B5D2C: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081B5D34: .4byte gUnknown_85E18C0 - thumb_func_end sub_081B5D04 + thumb_func_end party_menu_status_condition_object - thumb_func_start sub_081B5D38 -sub_081B5D38: @ 0x081B5D38 + thumb_func_start party_menu_link_mon_status_condition_object +party_menu_link_mon_status_condition_object: @ 0x081B5D38 push {r4, r5, lr} adds r4, r2, #0 lsls r0, r0, #0x10 @@ -897497,11 +897497,11 @@ sub_081B5D38: @ 0x081B5D38 ldrb r1, [r2, #4] ldrb r2, [r2, #5] movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4, #0xc] adds r0, r5, #0 adds r1, r4, #0 - bl sub_081B5D9C + bl party_menu_update_status_condition_object ldr r2, _081B5D80 ldrb r0, [r4, #0xc] lsls r1, r0, #4 @@ -897520,24 +897520,24 @@ _081B5D74: .align 2, 0 _081B5D7C: .4byte gUnknown_85E18C0 _081B5D80: .4byte gUnknown_20205AC - thumb_func_end sub_081B5D38 + thumb_func_end party_menu_link_mon_status_condition_object - thumb_func_start sub_081B5D84 -sub_081B5D84: @ 0x081B5D84 + thumb_func_start party_menu_get_status_condition_and_update_object +party_menu_get_status_condition_and_update_object: @ 0x081B5D84 push {r4, lr} adds r4, r1, #0 - bl sub_081B1D2C + bl GetMonAilment lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 - bl sub_081B5D9C + bl party_menu_update_status_condition_object pop {r4} pop {r0} bx r0 - thumb_func_end sub_081B5D84 + thumb_func_end party_menu_get_status_condition_and_update_object - thumb_func_start sub_081B5D9C -sub_081B5D9C: @ 0x081B5D9C + thumb_func_start party_menu_update_status_condition_object +party_menu_update_status_condition_object: @ 0x081B5D9C push {r4, r5, lr} adds r5, r1, #0 lsls r0, r0, #0x18 @@ -897588,21 +897588,21 @@ _081B5DF2: bx r0 .align 2, 0 _081B5DFC: .4byte gUnknown_20205AC - thumb_func_end sub_081B5D9C + thumb_func_end party_menu_update_status_condition_object - thumb_func_start sub_081B5E00 -sub_081B5E00: @ 0x081B5E00 + thumb_func_start LoadPartyMenuAilmentGfx +LoadPartyMenuAilmentGfx: @ 0x081B5E00 push {lr} ldr r0, _081B5E14 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081B5E18 - bl sub_080343E4 + bl LoadCompressedSpritePalette pop {r0} bx r0 .align 2, 0 _081B5E14: .4byte gUnknown_85E18B0 _081B5E18: .4byte gUnknown_85E18B8 - thumb_func_end sub_081B5E00 + thumb_func_end LoadPartyMenuAilmentGfx thumb_func_start sub_081B5E1C sub_081B5E1C: @ 0x081B5E1C @@ -897626,7 +897626,7 @@ sub_081B5E1C: @ 0x081B5E1C lsrs r6, r0, #0x18 b _081B5E60 .align 2, 0 -_081B5E44: .4byte sub_081B5EF4 +_081B5E44: .4byte c2_815ABFC _081B5E48: .4byte gUnknown_3002360 _081B5E4C: .4byte 0x00000439 _081B5E50: @@ -897641,7 +897641,7 @@ _081B5E5C: _081B5E60: ldr r4, _081B5EAC ldrh r0, [r4] - bl sub_081B7990 + bl GetItemEffectType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xa @@ -897658,12 +897658,12 @@ _081B5E78: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B5E9A adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B5E50 _081B5E9A: @@ -897683,7 +897683,7 @@ _081B5EB4: .4byte gUnknown_2024190 _081B5EB8: .4byte sub_081B5F20 _081B5EBC: ldrh r0, [r4] - bl sub_080D6480 + bl GetPocketByItemId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #5 @@ -897701,7 +897701,7 @@ _081B5ED0: adds r1, r6, #0 movs r2, #3 movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r3} mov r8, r3 @@ -897712,17 +897712,17 @@ _081B5ED0: _081B5EF0: .4byte sub_081B1040 thumb_func_end sub_081B5E1C - thumb_func_start sub_081B5EF4 -sub_081B5EF4: @ 0x081B5EF4 + thumb_func_start c2_815ABFC +c2_815ABFC: @ 0x081B5EF4 push {lr} - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 cmp r0, #0 bne _081B5F0C movs r0, #0xc movs r1, #5 movs r2, #0 - bl sub_081AAA08 + bl GoToBagMenu b _081B5F16 _081B5F0C: ldr r0, _081B5F1C @@ -897734,7 +897734,7 @@ _081B5F16: bx r0 .align 2, 0 _081B5F1C: .4byte gUnknown_203CBFC - thumb_func_end sub_081B5EF4 + thumb_func_end c2_815ABFC thumb_func_start sub_081B5F20 sub_081B5F20: @ 0x081B5F20 @@ -897775,8 +897775,8 @@ _081B5F68: .4byte gUnknown_3006068 _081B5F6C: .4byte sub_081B6434 thumb_func_end sub_081B5F20 - thumb_func_start sub_081B5F70 -sub_081B5F70: @ 0x081B5F70 + thumb_func_start IsHPRecoveryItem +IsHPRecoveryItem: @ 0x081B5F70 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -897812,14 +897812,14 @@ _081B5FAA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B5F70 + thumb_func_end IsHPRecoveryItem - thumb_func_start sub_081B5FB0 -sub_081B5FB0: @ 0x081B5FB0 + thumb_func_start GetMedicineItemEffectMessage +GetMedicineItemEffectMessage: @ 0x081B5FB0 push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_081B7990 + bl GetItemEffectType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 subs r0, #3 @@ -897857,7 +897857,7 @@ _081B5FD4: @ jump table _081B6020: ldr r0, _081B602C ldr r1, _081B6030 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B602C: .4byte gUnknown_2021C7C @@ -897865,7 +897865,7 @@ _081B6030: .4byte gUnknown_85C9EA6 _081B6034: ldr r0, _081B6040 ldr r1, _081B6044 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6040: .4byte gUnknown_2021C7C @@ -897873,7 +897873,7 @@ _081B6044: .4byte gUnknown_85C9ED4 _081B6048: ldr r0, _081B6054 ldr r1, _081B6058 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6054: .4byte gUnknown_2021C7C @@ -897881,7 +897881,7 @@ _081B6058: .4byte gUnknown_85C9EE2 _081B605C: ldr r0, _081B6068 ldr r1, _081B606C - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6068: .4byte gUnknown_2021C7C @@ -897889,7 +897889,7 @@ _081B606C: .4byte gUnknown_85C9EF2 _081B6070: ldr r0, _081B607C ldr r1, _081B6080 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B607C: .4byte gUnknown_2021C7C @@ -897897,7 +897897,7 @@ _081B6080: .4byte gUnknown_85C9EC0 _081B6084: ldr r0, _081B6090 ldr r1, _081B6094 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6090: .4byte gUnknown_2021C7C @@ -897905,7 +897905,7 @@ _081B6094: .4byte gUnknown_85C9FE7 _081B6098: ldr r0, _081B60A4 ldr r1, _081B60A8 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B60A4: .4byte gUnknown_2021C7C @@ -897913,7 +897913,7 @@ _081B60A8: .4byte gUnknown_85C9FF7 _081B60AC: ldr r0, _081B60B8 ldr r1, _081B60BC - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B60B8: .4byte gUnknown_2021C7C @@ -897960,7 +897960,7 @@ _081B6114: bl StringCopy ldr r0, _081B612C ldr r1, _081B6130 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6124: .4byte gUnknown_2021C54 @@ -897970,7 +897970,7 @@ _081B6130: .4byte gUnknown_85C9F5F _081B6134: ldr r0, _081B6140 ldr r1, _081B6144 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6140: .4byte gUnknown_2021C7C @@ -897978,7 +897978,7 @@ _081B6144: .4byte gUnknown_85C9F3B _081B6148: ldr r0, _081B6154 ldr r1, _081B6158 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6164 .align 2, 0 _081B6154: .4byte gUnknown_2021C7C @@ -897986,29 +897986,29 @@ _081B6158: .4byte gUnknown_85C9F06 _081B615C: ldr r0, _081B6168 ldr r1, _081B616C - bl sub_08008BCC + bl StringExpandPlaceholders _081B6164: pop {r0} bx r0 .align 2, 0 _081B6168: .4byte gUnknown_2021C7C _081B616C: .4byte gUnknown_85C9AF7 - thumb_func_end sub_081B5FB0 + thumb_func_end GetMedicineItemEffectMessage - thumb_func_start sub_081B6170 -sub_081B6170: @ 0x081B6170 + thumb_func_start UsingHPEVItemOnShedinja +UsingHPEVItemOnShedinja: @ 0x081B6170 push {r4, lr} adds r4, r0, #0 lsls r0, r1, #0x10 lsrs r0, r0, #0x10 - bl sub_081B7990 + bl GetItemEffectType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xd bne _081B619C adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldr r1, _081B6198 cmp r0, r1 bne _081B619C @@ -898022,7 +898022,7 @@ _081B619E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081B6170 + thumb_func_end UsingHPEVItemOnShedinja thumb_func_start IsItemFlute IsItemFlute: @ 0x081B61A4 @@ -898045,8 +898045,8 @@ _081B61BC: bx r1 thumb_func_end IsItemFlute - thumb_func_start sub_081B61C0 -sub_081B61C0: @ 0x081B61C0 + thumb_func_start ExecuteTableBasedItemEffect__ +ExecuteTableBasedItemEffect__: @ 0x081B61C0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -898096,10 +898096,10 @@ _081B6212: bx r1 .align 2, 0 _081B6224: .4byte gUnknown_2024190 - thumb_func_end sub_081B61C0 + thumb_func_end ExecuteTableBasedItemEffect__ - thumb_func_start sub_081B6228 -sub_081B6228: @ 0x081B6228 + thumb_func_start ItemUseCB_Medicine +ItemUseCB_Medicine: @ 0x081B6228 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -898123,12 +898123,12 @@ sub_081B6228: @ 0x081B6228 ldrh r6, [r0] adds r0, r5, #0 adds r1, r6, #0 - bl sub_081B6170 + bl UsingHPEVItemOnShedinja lsls r0, r0, #0x18 cmp r0, #0 beq _081B62A0 adds r0, r6, #0 - bl sub_081B5F70 + bl IsHPRecoveryItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -898136,13 +898136,13 @@ sub_081B6228: @ 0x081B6228 bne _081B628E adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sl, r0 adds r0, r5, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData cmp sl, r0 bne _081B628E movs r1, #0 @@ -898152,7 +898152,7 @@ _081B628E: ldrb r0, [r4, #9] adds r1, r6, #0 movs r2, #0 - bl sub_081B61C0 + bl ExecuteTableBasedItemEffect__ lsls r0, r0, #0x18 cmp r0, #0 beq _081B62C4 @@ -898186,7 +898186,7 @@ _081B62C4: beq _081B62F6 adds r0, r6, #0 movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem b _081B62F6 .align 2, 0 _081B62EC: .4byte gUnknown_203CBB4 @@ -898202,7 +898202,7 @@ _081B62F6: ldr r1, [r4] adds r1, r1, r0 adds r0, r5, #0 - bl sub_081B5D84 + bl party_menu_get_status_condition_and_update_object ldr r2, _081B637C movs r0, #9 ldrsb r0, [r7, r0] @@ -898222,7 +898222,7 @@ _081B62F6: adds r0, r5, #0 adds r1, r3, #0 movs r2, #1 - bl sub_081B2764 + bl DisplayPartyPokemonLevelCheck _081B6334: mov r2, r8 cmp r2, #1 @@ -898236,7 +898236,7 @@ _081B6334: _081B6348: adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sl subs r3, r3, r1 @@ -898261,15 +898261,15 @@ _081B6380: .4byte sub_081B63CC _081B6384: ldr r1, _081B63C0 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname adds r0, r6, #0 - bl sub_081B5FB0 + bl GetMedicineItemEffectMessage ldr r0, _081B63C4 _081B6394: movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B63C8 mov r2, sb lsls r0, r2, #2 @@ -898291,7 +898291,7 @@ _081B63B0: _081B63C0: .4byte gUnknown_2021C40 _081B63C4: .4byte gUnknown_2021C7C _081B63C8: .4byte gUnknown_3005B60 - thumb_func_end sub_081B6228 + thumb_func_end ItemUseCB_Medicine thumb_func_start sub_081B63CC sub_081B63CC: @ 0x081B63CC @@ -898307,17 +898307,17 @@ sub_081B63CC: @ 0x081B63CC ldr r1, _081B641C adds r0, r0, r1 ldr r1, _081B6420 - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B6424 ldr r1, _081B6428 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 - bl sub_0805E704 + bl schedule_bg_copy_tilemap_to_vram + bl HandleBattleLowHpMusicChange ldr r1, _081B642C lsls r0, r5, #2 adds r0, r0, r5 @@ -898343,7 +898343,7 @@ sub_081B6434: @ 0x081B6434 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -898389,37 +898389,37 @@ sub_081B6468: @ 0x081B6468 ldr r0, _081B6508 ldrh r6, [r0] adds r0, r6, #0 - bl sub_081B7990 + bl GetItemEffectType lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r5, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #4] adds r0, r5, #0 adds r1, r7, #0 - bl sub_081B65BC + bl ItemEffectToMonEv lsls r0, r0, #0x10 lsrs r0, r0, #0x10 str r0, [sp, #8] ldrb r0, [r4, #9] adds r1, r6, #0 movs r2, #0 - bl sub_081B61C0 + bl ExecuteTableBasedItemEffect__ adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sb, r0 adds r0, r5, #0 adds r1, r7, #0 - bl sub_081B65BC + bl ItemEffectToMonEv lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 @@ -898453,13 +898453,13 @@ _081B6514: bl sub_080A306C adds r0, r6, #0 movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem ldr r1, _081B6554 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r1, _081B6558 adds r0, r7, #0 - bl sub_081B663C + bl ItemEffectToStatString ldr r2, [sp, #4] cmp r2, sb beq _081B6578 @@ -898468,7 +898468,7 @@ _081B6514: beq _081B6564 ldr r0, _081B655C ldr r1, _081B6560 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6580 .align 2, 0 _081B6550: .4byte gUnknown_203CBB4 @@ -898479,7 +898479,7 @@ _081B6560: .4byte gUnknown_85C9F78 _081B6564: ldr r0, _081B6570 ldr r1, _081B6574 - bl sub_08008BCC + bl StringExpandPlaceholders b _081B6580 .align 2, 0 _081B6570: .4byte gUnknown_2021C7C @@ -898487,14 +898487,14 @@ _081B6574: .4byte gUnknown_85C9FC1 _081B6578: ldr r0, _081B65B0 ldr r1, _081B65B4 - bl sub_08008BCC + bl StringExpandPlaceholders _081B6580: ldr r0, _081B65B0 _081B6582: movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B65B8 mov r2, sl lsls r0, r2, #2 @@ -898517,8 +898517,8 @@ _081B65B4: .4byte gUnknown_85C9F9B _081B65B8: .4byte gUnknown_3005B60 thumb_func_end sub_081B6468 - thumb_func_start sub_081B65BC -sub_081B65BC: @ 0x081B65BC + thumb_func_start ItemEffectToMonEv +ItemEffectToMonEv: @ 0x081B65BC push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -898544,7 +898544,7 @@ _081B65DC: @ jump table _081B65F4: adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldr r1, _081B6608 cmp r0, r1 beq _081B6632 @@ -898573,7 +898573,7 @@ _081B6624: adds r0, r4, #0 movs r1, #0x1f _081B6628: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 b _081B6634 @@ -898584,10 +898584,10 @@ _081B6634: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B65BC + thumb_func_end ItemEffectToMonEv - thumb_func_start sub_081B663C -sub_081B663C: @ 0x081B663C + thumb_func_start ItemEffectToStatString +ItemEffectToStatString: @ 0x081B663C push {lr} adds r2, r1, #0 lsls r0, r0, #0x18 @@ -898646,7 +898646,7 @@ _081B66A8: bx r0 .align 2, 0 _081B66AC: .4byte gUnknown_85C9AF2 - thumb_func_end sub_081B663C + thumb_func_end ItemEffectToStatString thumb_func_start sub_081B66B0 sub_081B66B0: @ 0x081B66B0 @@ -898679,17 +898679,17 @@ _081B66E0: adds r1, #0xd ldr r2, [sp, #0xc] adds r0, r2, r0 - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 mov r0, r8 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute adds r4, r0, #0 mov r0, r8 movs r1, #2 - bl sub_080061B4 + bl GetFontAttribute adds r4, r4, r0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -898733,7 +898733,7 @@ _081B673C: movs r3, #2 bl sub_081984B0 movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -898747,13 +898747,13 @@ _081B6774: .4byte gUnknown_2024190 _081B6778: .4byte gUnknown_82EACC4 thumb_func_end sub_081B66B0 - thumb_func_start sub_081B677C -sub_081B677C: @ 0x081B677C + thumb_func_start ether_effect_related_3 +ether_effect_related_3: @ 0x081B677C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_0819867C + bl Menu_ProcessInput lsls r0, r0, #0x18 asrs r1, r0, #0x18 movs r0, #2 @@ -898774,17 +898774,17 @@ _081B67A8: adds r0, #0xd bl sub_081B2CB0 adds r0, r5, #0 - bl sub_081B6848 + bl ether_effect_related_2 _081B67B8: pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081B67C0: .4byte gUnknown_203CB90 - thumb_func_end sub_081B677C + thumb_func_end ether_effect_related_3 - thumb_func_start sub_081B67C4 -sub_081B67C4: @ 0x081B67C4 + thumb_func_start dp05_ether +dp05_ether: @ 0x081B67C4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -898827,7 +898827,7 @@ _081B6814: movs r0, #5 bl sub_080A306C movs r0, #0x16 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B683C ldrb r0, [r0, #9] bl sub_081B66B0 @@ -898845,11 +898845,11 @@ _081B6836: .align 2, 0 _081B683C: .4byte gUnknown_203CB94 _081B6840: .4byte gUnknown_3005B60 -_081B6844: .4byte sub_081B677C - thumb_func_end sub_081B67C4 +_081B6844: .4byte ether_effect_related_3 + thumb_func_end dp05_ether - thumb_func_start sub_081B6848 -sub_081B6848: @ 0x081B6848 + thumb_func_start ether_effect_related_2 +ether_effect_related_2: @ 0x081B6848 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -898858,7 +898858,7 @@ sub_081B6848: @ 0x081B6848 ldr r0, [r0] adds r0, #0xc bl sub_081B2CB0 - bl sub_08198670 + bl Menu_GetCursorPos ldr r1, _081B6878 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -898871,7 +898871,7 @@ sub_081B6848: @ 0x081B6848 .align 2, 0 _081B6874: .4byte gUnknown_203CB90 _081B6878: .4byte gUnknown_203CB94 - thumb_func_end sub_081B6848 + thumb_func_end ether_effect_related_2 thumb_func_start sub_081B687C sub_081B687C: @ 0x081B687C @@ -898892,7 +898892,7 @@ sub_081B687C: @ 0x081B687C adds r0, #0xc bl sub_081B2CB0 movs r0, #5 - bl sub_081B2CD8 + bl display_pokemon_menu_message pop {r0} bx r0 .align 2, 0 @@ -898914,7 +898914,7 @@ sub_081B68B4: @ 0x081B68B4 ldrb r0, [r4, #9] ldrb r2, [r7] adds r1, r5, #0 - bl sub_081B61C0 + bl ExecuteTableBasedItemEffect__ lsls r0, r0, #0x18 cmp r0, #0 beq _081B68F4 @@ -898945,12 +898945,12 @@ _081B68F4: bl sub_080A306C adds r0, r5, #0 movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem movs r0, #0 ldrsh r1, [r7, r0] adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x10 ldr r0, _081B6964 @@ -898959,13 +898959,13 @@ _081B68F4: adds r1, r1, r2 bl StringCopy adds r0, r5, #0 - bl sub_081B5FB0 + bl GetMedicineItemEffectMessage ldr r0, _081B696C _081B693A: movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B6970 lsls r0, r6, #2 adds r0, r0, r6 @@ -898986,8 +898986,8 @@ _081B6970: .4byte gUnknown_3005B60 _081B6974: .4byte sub_081B6434 thumb_func_end sub_081B68B4 - thumb_func_start sub_081B6978 -sub_081B6978: @ 0x081B6978 + thumb_func_start dp05_pp_up +dp05_pp_up: @ 0x081B6978 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -898995,7 +898995,7 @@ sub_081B6978: @ 0x081B6978 movs r0, #5 bl sub_080A306C movs r0, #0x17 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B69A8 ldrb r0, [r0, #9] bl sub_081B66B0 @@ -899012,11 +899012,11 @@ sub_081B6978: @ 0x081B6978 .align 2, 0 _081B69A8: .4byte gUnknown_203CB94 _081B69AC: .4byte gUnknown_3005B60 -_081B69B0: .4byte sub_081B677C - thumb_func_end sub_081B6978 +_081B69B0: .4byte ether_effect_related_3 + thumb_func_end dp05_pp_up - thumb_func_start sub_081B69B4 -sub_081B69B4: @ 0x081B69B4 + thumb_func_start ItemIdToBattleMoveId +ItemIdToBattleMoveId: @ 0x081B69B4 lsls r0, r0, #0x10 ldr r1, _081B69C4 adds r0, r0, r1 @@ -899028,10 +899028,10 @@ sub_081B69B4: @ 0x081B69B4 .align 2, 0 _081B69C4: .4byte 0xFEDF0000 _081B69C8: .4byte gUnknown_85E18F8 - thumb_func_end sub_081B69B4 + thumb_func_end ItemIdToBattleMoveId - thumb_func_start sub_081B69CC -sub_081B69CC: @ 0x081B69CC + thumb_func_start IsMoveHm +IsMoveHm: @ 0x081B69CC push {lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x10 @@ -899059,10 +899059,10 @@ _081B69EC: _081B69F8: pop {r1} bx r1 - thumb_func_end sub_081B69CC + thumb_func_end IsMoveHm - thumb_func_start sub_081B69FC -sub_081B69FC: @ 0x081B69FC + thumb_func_start MonKnowsMove +MonKnowsMove: @ 0x081B69FC push {r4, r5, r6, lr} adds r6, r0, #0 lsls r1, r1, #0x10 @@ -899072,7 +899072,7 @@ _081B6A06: adds r1, r4, #0 adds r1, #0xd adds r0, r6, #0 - bl sub_0806A058 + bl GetMonData cmp r0, r5 bne _081B6A18 movs r0, #1 @@ -899089,7 +899089,7 @@ _081B6A24: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081B69FC + thumb_func_end MonKnowsMove thumb_func_start sub_081B6A2C sub_081B6A2C: @ 0x081B6A2C @@ -899097,12 +899097,12 @@ sub_081B6A2C: @ 0x081B6A2C adds r1, r0, #0 ldr r4, _081B6A4C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -899156,9 +899156,9 @@ sub_081B6A7C: @ 0x081B6A7C ldrh r4, [r0] ldr r1, _081B6B0C adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname adds r0, r4, #0 - bl sub_081B69B4 + bl ItemIdToBattleMoveId strh r0, [r7, #0xe] ldr r0, _081B6B10 movs r2, #0xe @@ -899173,7 +899173,7 @@ sub_081B6A7C: @ 0x081B6A7C adds r0, r5, #0 adds r1, r4, #0 movs r2, #0 - bl sub_081B1FA8 + bl CanMonLearnTMTutor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -899182,7 +899182,7 @@ sub_081B6A7C: @ 0x081B6A7C beq _081B6B2C ldrh r1, [r7, #0xe] adds r0, r5, #0 - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 ldr r1, _081B6B18 cmp r0, r1 @@ -899262,18 +899262,18 @@ sub_081B6B68: @ 0x081B6B68 bne _081B6BA4 adds r0, r5, #0 movs r1, #4 - bl sub_0806D3CC + bl AdjustFriendship movs r0, #0xa9 lsls r0, r0, #1 cmp r4, r0 bhi _081B6BA4 adds r0, r4, #0 movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem _081B6BA4: ldr r1, _081B6BF4 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B6BF8 movs r2, #0 ldrsh r1, [r7, r2] @@ -899284,12 +899284,12 @@ _081B6BA4: ldr r4, _081B6C00 ldr r1, _081B6C04 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B6C08 lsls r0, r6, #2 adds r0, r0, r6 @@ -899318,13 +899318,13 @@ sub_081B6C10: @ 0x081B6C10 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 beq _081B6C36 ldr r0, _081B6C3C - bl sub_080A29AC + bl PlayFanfare ldr r1, _081B6C40 lsls r0, r4, #2 adds r0, r0, r4 @@ -899348,7 +899348,7 @@ sub_081B6C48: @ 0x081B6C48 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r5, r4, #0 - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _081B6C9A @@ -899396,7 +899396,7 @@ sub_081B6CA4: @ 0x081B6CA4 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -899473,7 +899473,7 @@ sub_081B6D38: @ 0x081B6D38 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -899535,7 +899535,7 @@ sub_081B6DA0: @ 0x081B6DA0 movs r1, #0 movs r2, #0 movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -899595,13 +899595,13 @@ sub_081B6E04: @ 0x081B6E04 lsrs r1, r1, #0x18 adds r1, #0xd adds r0, r5, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r1, _081B6E6C adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B6E70 lsls r4, r4, #3 ldr r1, _081B6E74 @@ -899636,7 +899636,7 @@ sub_081B6E84: @ 0x081B6E84 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -899654,7 +899654,7 @@ sub_081B6E84: @ 0x081B6E84 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_0806B46C + bl RemoveMonPPBonus ldrh r5, [r5, #0xe] bl sub_081C14C8 adds r2, r0, #0 @@ -899662,7 +899662,7 @@ sub_081B6E84: @ 0x081B6E84 lsrs r2, r2, #0x18 adds r0, r4, #0 adds r1, r5, #0 - bl sub_08068D34 + bl SetMonMoveSlot adds r0, r6, #0 bl sub_081B6B68 _081B6ED0: @@ -899691,12 +899691,12 @@ sub_081B6EE0: @ 0x081B6EE0 ldr r4, _081B6F34 ldr r1, _081B6F38 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B6F3C lsls r0, r5, #2 adds r0, r0, r5 @@ -899722,7 +899722,7 @@ sub_081B6F44: @ 0x081B6F44 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -899778,7 +899778,7 @@ _081B6FB0: _081B6FB6: ldr r1, _081B6FF8 adds r0, r4, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B6FFC movs r2, #0xe ldrsh r1, [r7, r2] @@ -899789,7 +899789,7 @@ _081B6FB6: ldr r4, _081B7004 ldr r1, _081B7008 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C @@ -899837,7 +899837,7 @@ _081B7038: _081B703E: ldr r1, _081B7074 adds r0, r4, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B7078 ldr r1, _081B707C movs r2, #0xe @@ -899874,7 +899874,7 @@ sub_081B7090: @ 0x081B7090 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -899888,8 +899888,8 @@ _081B70A8: .align 2, 0 thumb_func_end sub_081B7090 - thumb_func_start sub_081B70B0 -sub_081B70B0: @ 0x081B70B0 + thumb_func_start dp05_rare_candy +dp05_rare_candy: @ 0x081B70B0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -899915,7 +899915,7 @@ sub_081B70B0: @ 0x081B70B0 mov r8, r2 adds r0, r5, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x64 beq _081B7124 adds r0, r5, #0 @@ -899926,7 +899926,7 @@ sub_081B70B0: @ 0x081B70B0 mov r2, r8 ldrh r1, [r2] movs r2, #0 - bl sub_081B61C0 + bl ExecuteTableBasedItemEffect__ lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0x89 @@ -899954,7 +899954,7 @@ _081B7126: movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B715C lsls r0, r7, #2 adds r0, r0, r7 @@ -899971,7 +899971,7 @@ _081B7160: movs r0, #1 strb r0, [r1] movs r0, #0 - bl sub_080A2928 + bl PlayFanfareByFanfareNum ldr r0, _081B71D8 ldrb r0, [r0, #9] adds r1, r5, #0 @@ -899979,14 +899979,14 @@ _081B7160: ldr r0, _081B71DC ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem ldr r1, _081B71E0 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B71E4 adds r0, r5, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 adds r0, r4, #0 movs r2, #0 @@ -899995,12 +899995,12 @@ _081B7160: ldr r4, _081B71E8 ldr r1, _081B71EC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B71F0 lsls r0, r7, #2 adds r0, r0, r7 @@ -900026,7 +900026,7 @@ _081B71E8: .4byte gUnknown_2021C7C _081B71EC: .4byte gUnknown_85C9F4E _081B71F0: .4byte gUnknown_3005B60 _081B71F4: .4byte sub_081B7280 - thumb_func_end sub_081B70B0 + thumb_func_end dp05_rare_candy thumb_func_start sub_081B71F8 sub_081B71F8: @ 0x081B71F8 @@ -900040,7 +900040,7 @@ sub_081B71F8: @ 0x081B71F8 ldr r1, [r6] adds r1, r1, r4 adds r0, r5, #0 - bl sub_081B5D84 + bl party_menu_get_status_condition_and_update_object ldr r2, _081B727C ldr r0, [r6] adds r3, r4, r0 @@ -900057,22 +900057,22 @@ sub_081B71F8: @ 0x081B71F8 adds r0, r5, #0 adds r1, r3, #0 movs r2, #1 - bl sub_081B2764 + bl DisplayPartyPokemonLevelCheck _081B7234: ldr r1, [r6] adds r1, r1, r4 adds r0, r5, #0 movs r2, #1 - bl sub_081B2970 + bl DisplayPartyPokemonHPCheck ldr r1, [r6] adds r1, r1, r4 adds r0, r5, #0 movs r2, #1 - bl sub_081B2A08 + bl DisplayPartyPokemonMaxHPCheck ldr r1, [r6] adds r1, r1, r4 adds r0, r5, #0 - bl sub_081B2ABC + bl DisplayPartyPokemonHPBarCheck ldr r0, [r6] adds r0, r4, r0 ldrb r0, [r0, #9] @@ -900082,7 +900082,7 @@ _081B7234: movs r1, #1 bl sub_081B0C9C movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -900097,11 +900097,11 @@ sub_081B7280: @ 0x081B7280 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0 - bl sub_080A295C + bl WaitFanfare lsls r0, r0, #0x18 cmp r0, #0 beq _081B72CC - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -900198,12 +900198,12 @@ sub_081B7328: @ 0x081B7328 str r1, [sp, #4] adds r1, r4, #0 movs r3, #1 - bl sub_081D2C70 + bl DrawLevelUpWindowPg1 ldrb r0, [r4, #0x18] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r4, r5} pop {r0} @@ -900229,12 +900229,12 @@ sub_081B7374: @ 0x081B7374 str r2, [sp] movs r2, #1 movs r3, #2 - bl sub_081D2DB4 + bl DrawLevelUpWindowPg2 ldrb r0, [r4, #0x18] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #4 pop {r4} pop {r0} @@ -900249,7 +900249,7 @@ sub_081B73B0: @ 0x081B73B0 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 movs r0, #0 - bl sub_080A295C + bl WaitFanfare lsls r0, r0, #0x18 cmp r0, #0 beq _081B7452 @@ -900274,7 +900274,7 @@ _081B73D8: ldr r1, _081B7410 adds r0, r0, r1 movs r1, #1 - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r1, r0, #0x10 strh r6, [r4, #0x10] @@ -900340,7 +900340,7 @@ sub_081B7458: @ 0x081B7458 ldr r1, _081B748C adds r0, r0, r1 movs r1, #0 - bl sub_08068E58 + bl MonTryLearningNewMove lsls r0, r0, #0x10 lsrs r1, r0, #0x10 ldr r0, _081B7490 @@ -900394,12 +900394,12 @@ sub_081B74BC: @ 0x081B74BC adds r0, r7, #0 movs r1, #0 movs r2, #0 - bl sub_0806CB5C + bl GetEvolutionTargetSpecies lsls r0, r0, #0x10 lsrs r4, r0, #0x10 cmp r4, #0 beq _081B750C - bl sub_081B03CC + bl FreePartyPointers ldr r0, _081B7508 ldr r1, [r6] str r1, [r0] @@ -900407,9 +900407,9 @@ sub_081B74BC: @ 0x081B74BC adds r0, r7, #0 adds r1, r4, #0 movs r2, #1 - bl sub_0813DB44 + bl BeginEvolutionScene adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _081B751A .align 2, 0 _081B7500: .4byte gUnknown_203CB94 @@ -900449,7 +900449,7 @@ sub_081B7528: @ 0x081B7528 ldr r1, _081B7594 adds r0, r0, r1 ldr r1, _081B7598 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B759C ldr r6, _081B75A0 ldrh r1, [r6] @@ -900460,12 +900460,12 @@ sub_081B7528: @ 0x081B7528 ldr r4, _081B75A8 ldr r1, _081B75AC adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrh r0, [r6] mov r1, r8 strh r0, [r1, #0xe] @@ -900514,7 +900514,7 @@ sub_081B75B8: @ 0x081B75B8 ldr r1, _081B7624 adds r0, r0, r1 ldr r1, _081B7628 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B762C lsls r1, r5, #3 ldr r2, _081B7630 @@ -900523,12 +900523,12 @@ sub_081B75B8: @ 0x081B75B8 ldr r4, _081B7634 ldr r1, _081B7638 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram mov r0, r8 strh r5, [r0, #0xe] ldr r1, _081B763C @@ -900561,27 +900561,27 @@ sub_081B7644: @ 0x081B7644 adds r4, r0, #0 adds r5, r1, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData strh r0, [r5, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData strh r0, [r5, #4] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData strh r0, [r5, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0xa] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData strh r0, [r5, #6] pop {r4, r5} pop {r0} @@ -900640,19 +900640,19 @@ sub_081B76CC: @ 0x081B76CC adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B7712 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldrb r0, [r6, #9] ldr r1, _081B772C ldrh r1, [r1] movs r2, #0 - bl sub_081B61C0 + bl ExecuteTableBasedItemEffect__ lsls r0, r0, #0x18 cmp r0, #0 beq _081B7738 @@ -900670,7 +900670,7 @@ _081B7724: .4byte gUnknown_203CB94 _081B7728: .4byte gUnknown_2024190 _081B772C: .4byte gUnknown_203CB48 _081B7730: .4byte gUnknown_3005B60 -_081B7734: .4byte sub_081B77F0 +_081B7734: .4byte task_sacred_ash_party_loop _081B7738: movs r0, #1 bl sub_080A306C @@ -900681,7 +900681,7 @@ _081B7738: ldr r1, [r4] adds r1, r1, r0 adds r0, r5, #0 - bl sub_081B5D84 + bl party_menu_get_status_condition_and_update_object ldr r2, _081B77E0 movs r0, #9 ldrsb r0, [r6, r0] @@ -900701,7 +900701,7 @@ _081B7738: adds r0, r5, #0 adds r1, r3, #0 movs r2, #1 - bl sub_081B2764 + bl DisplayPartyPokemonLevelCheck _081B777A: ldr r4, _081B77E4 ldr r0, [r4] @@ -900716,7 +900716,7 @@ _081B777A: bl sub_081B0C9C adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 subs r3, r3, r7 lsls r3, r3, #0x10 @@ -900755,12 +900755,12 @@ _081B77E8: .4byte sub_081B78B4 _081B77EC: .4byte 0x0000021A thumb_func_end sub_081B76CC - thumb_func_start sub_081B77F0 -sub_081B77F0: @ 0x081B77F0 + thumb_func_start task_sacred_ash_party_loop +task_sacred_ash_party_loop: @ 0x081B77F0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -900804,7 +900804,7 @@ _081B7826: movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081B787C .align 2, 0 _081B7858: .4byte gUnknown_203CB90 @@ -900819,7 +900819,7 @@ _081B786C: ldr r0, _081B7898 ldrh r0, [r0] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem _081B787C: ldr r1, _081B789C lsls r0, r4, #2 @@ -900845,7 +900845,7 @@ _081B78AE: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081B77F0 + thumb_func_end task_sacred_ash_party_loop thumb_func_start sub_081B78B4 sub_081B78B4: @ 0x081B78B4 @@ -900861,16 +900861,16 @@ sub_081B78B4: @ 0x081B78B4 ldr r1, _081B7900 adds r0, r0, r1 ldr r1, _081B7904 - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B7908 ldr r1, _081B790C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders adds r0, r4, #0 movs r1, #0 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B7910 lsls r0, r5, #2 adds r0, r0, r5 @@ -900888,7 +900888,7 @@ _081B7904: .4byte gUnknown_2021C40 _081B7908: .4byte gUnknown_2021C7C _081B790C: .4byte gUnknown_85C9E8F _081B7910: .4byte gUnknown_3005B60 -_081B7914: .4byte sub_081B77F0 +_081B7914: .4byte task_sacred_ash_party_loop thumb_func_end sub_081B78B4 thumb_func_start sub_081B7918 @@ -900907,7 +900907,7 @@ sub_081B7918: @ 0x081B7918 ldr r4, _081B796C ldrh r1, [r4] movs r2, #0 - bl sub_081B61C0 + bl ExecuteTableBasedItemEffect__ lsls r0, r0, #0x18 cmp r0, #0 beq _081B797C @@ -900918,7 +900918,7 @@ sub_081B7918: @ 0x081B7918 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B7978 lsls r0, r5, #2 adds r0, r0, r5 @@ -900936,8 +900936,8 @@ _081B7978: .4byte gUnknown_3005B60 _081B797C: ldrh r0, [r4] movs r1, #1 - bl sub_080D62BC - bl sub_081B03CC + bl RemoveBagItem + bl FreePartyPointers _081B7988: pop {r4, r5, r6} pop {r0} @@ -900945,8 +900945,8 @@ _081B7988: .align 2, 0 thumb_func_end sub_081B7918 - thumb_func_start sub_081B7990 -sub_081B7990: @ 0x081B7990 + thumb_func_start GetItemEffectType +GetItemEffectType: @ 0x081B7990 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r1, r0, #0x10 @@ -901149,7 +901149,7 @@ _081B7AEA: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081B7990 + thumb_func_end GetItemEffectType thumb_func_start sub_081B7AF0 sub_081B7AF0: @ 0x081B7AF0 @@ -901176,7 +901176,7 @@ sub_081B7AF0: @ 0x081B7AF0 mov r8, r0 ldr r1, _081B7B7C adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r4, _081B7B80 ldrb r0, [r4] bl sub_081B2030 @@ -901194,7 +901194,7 @@ sub_081B7AF0: @ 0x081B7AF0 ldrb r2, [r4] adds r0, r5, #0 movs r1, #0 - bl sub_081B1FA8 + bl CanMonLearnTMTutor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -901203,7 +901203,7 @@ sub_081B7AF0: @ 0x081B7AF0 beq _081B7B98 ldrh r1, [r7, #0xe] adds r0, r5, #0 - bl sub_08068C6C + bl GiveMoveToMon lsls r0, r0, #0x10 ldr r1, _081B7B8C cmp r0, r1 @@ -901255,8 +901255,8 @@ _081B7BCC: .4byte gUnknown_3005B60 _081B7BD0: .4byte sub_081B6CA4 thumb_func_end sub_081B7AF0 - thumb_func_start sub_081B7BD4 -sub_081B7BD4: @ 0x081B7BD4 + thumb_func_start CB2_PartyMenuFromStartMenu +CB2_PartyMenuFromStartMenu: @ 0x081B7BD4 push {lr} sub sp, #0xc movs r0, #0 @@ -901269,20 +901269,20 @@ sub_081B7BD4: @ 0x081B7BD4 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 .align 2, 0 _081B7BF8: .4byte sub_081B1040 -_081B7BFC: .4byte sub_08085AFC - thumb_func_end sub_081B7BD4 +_081B7BFC: .4byte CB2_ReturnToFieldWithOpenMenu + thumb_func_end CB2_PartyMenuFromStartMenu thumb_func_start sub_081B7C00 sub_081B7C00: @ 0x081B7C00 push {lr} sub sp, #0xc - bl sub_081A9BB8 + bl InBattlePyramid lsls r0, r0, #0x18 ldr r1, _081B7C38 cmp r0, #0 @@ -901298,7 +901298,7 @@ _081B7C12: movs r1, #0 movs r2, #5 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu ldr r1, _081B7C44 ldr r0, _081B7C48 ldrh r0, [r0] @@ -901308,7 +901308,7 @@ _081B7C12: bx r0 .align 2, 0 _081B7C38: .4byte sub_081C478C -_081B7C3C: .4byte sub_081B5EF4 +_081B7C3C: .4byte c2_815ABFC _081B7C40: .4byte sub_081B1040 _081B7C44: .4byte gUnknown_203CB94 _081B7C48: .4byte gUnknown_203CB48 @@ -901337,7 +901337,7 @@ sub_081B7C4C: @ 0x081B7C4C ldr r7, _081B7C94 adds r0, r0, r7 movs r1, #0xc - bl sub_0806A058 + bl GetMonData strh r0, [r5] lsls r0, r0, #0x10 cmp r0, #0 @@ -901487,7 +901487,7 @@ sub_081B7DA4: @ 0x081B7DA4 lsrs r5, r0, #0x18 ldr r0, _081B7DE0 ldrb r4, [r0, #9] - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -901532,7 +901532,7 @@ sub_081B7DEC: @ 0x081B7DEC muls r0, r6, r0 adds r0, r0, r5 movs r1, #0x40 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081B7E3C @@ -901546,7 +901546,7 @@ sub_081B7DEC: @ 0x081B7DEC ldr r2, _081B7E44 movs r0, #4 movs r3, #3 - bl sub_0811AA5C + bl DoEasyChatScreen pop {r4, r5, r6} pop {r0} bx r0 @@ -901571,7 +901571,7 @@ sub_081B7E48: @ 0x081B7E48 adds r5, r1, r0 adds r0, r5, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 ldr r0, _081B7EA0 @@ -901579,19 +901579,19 @@ sub_081B7E48: @ 0x081B7E48 cmp r0, #0 bne _081B7EA8 adds r0, r5, #0 - bl sub_080D3F04 + bl TakeMailFromMon ldr r4, _081B7EA4 adds r0, r5, #0 movs r1, #0xc adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData ldrh r0, [r4] movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem adds r0, r7, #0 bl sub_081B80BC ldr r0, [r6] - bl sub_08000540 + bl SetMainCallback2 b _081B7EC4 .align 2, 0 _081B7E98: .4byte gUnknown_203CB94 @@ -901611,7 +901611,7 @@ _081B7EA8: str r1, [sp, #8] movs r1, #0xff movs r3, #1 - bl sub_081AFD10 + bl InitPartyMenu _081B7EC4: add sp, #0xc pop {r4, r5, r6, r7} @@ -901682,7 +901682,7 @@ sub_081B7F40: @ 0x081B7F40 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 - bl sub_081B18A4 + bl LoadListMenuArrowsGfx lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -901733,14 +901733,14 @@ _081B7F9A: ldr r6, _081B7FD0 ldrh r0, [r6] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 bne _081B7FD8 adds r0, r4, #0 bl sub_081B80BC ldrh r0, [r6] - bl sub_081B1B18 + bl pokemon_item_not_removed ldr r0, _081B7FD4 movs r1, #0 bl sub_081B182C @@ -901821,7 +901821,7 @@ sub_081B8058: @ 0x081B8058 movs r1, #1 bl sub_081B182C movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081B8088 lsls r0, r4, #2 adds r0, r0, r4 @@ -901857,7 +901857,7 @@ _081B80AC: .4byte gUnknown_203CB94 _081B80B0: adds r0, r1, #0 movs r1, #1 - bl sub_080D62BC + bl RemoveBagItem _081B80B8: pop {r0} bx r0 @@ -901874,14 +901874,14 @@ sub_081B80BC: @ 0x081B80BC beq _081B80D8 adds r0, r1, #0 movs r1, #1 - bl sub_080D6588 + bl AddPCItem b _081B80E0 .align 2, 0 _081B80D4: .4byte gUnknown_203CB94 _081B80D8: adds r0, r1, #0 movs r1, #1 - bl sub_080D6140 + bl AddBagItem _081B80E0: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -901903,7 +901903,7 @@ sub_081B80E8: @ 0x081B80E8 movs r1, #0 movs r2, #7 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -901942,7 +901942,7 @@ sub_081B8114: @ 0x081B8114 adds r4, r1, r0 adds r0, r5, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B817C ldr r0, _081B8178 @@ -901960,7 +901960,7 @@ _081B8178: .4byte gUnknown_85C9D0C _081B817C: adds r0, r5, #0 adds r1, r4, #0 - bl sub_080D3E90 + bl GiveMailToMon2 adds r0, r4, #0 bl ClearMailStruct ldr r0, _081B81AC @@ -901968,7 +901968,7 @@ _081B817C: bl sub_081B182C _081B8192: movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081B81B0 lsls r1, r6, #2 adds r1, r1, r6 @@ -901985,8 +901985,8 @@ _081B81B0: .4byte gUnknown_3005B60 _081B81B4: .4byte sub_081B7DA4 thumb_func_end sub_081B8114 - thumb_func_start sub_081B81B8 -sub_081B81B8: @ 0x081B81B8 + thumb_func_start InitChooseHalfPartyForBattle +InitChooseHalfPartyForBattle: @ 0x081B81B8 push {lr} sub sp, #0xc bl sub_081B81F8 @@ -902001,7 +902001,7 @@ sub_081B81B8: @ 0x081B81B8 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu ldr r1, _081B81F0 ldr r0, _081B81F4 str r0, [r1, #4] @@ -902013,7 +902013,7 @@ _081B81E8: .4byte sub_081B1040 _081B81EC: .4byte gUnknown_3002360 _081B81F0: .4byte gUnknown_203CB94 _081B81F4: .4byte sub_081B843C - thumb_func_end sub_081B81B8 + thumb_func_end InitChooseHalfPartyForBattle thumb_func_start sub_081B81F8 sub_081B81F8: @ 0x081B81F8 @@ -902037,7 +902037,7 @@ sub_081B820C: @ 0x081B820C muls r0, r4, r0 ldr r1, _081B8228 adds r0, r0, r1 - bl sub_081B824C + bl GetBattleEntryEligibility lsls r0, r0, #0x18 cmp r0, #0 bne _081B822C @@ -902065,18 +902065,18 @@ _081B8244: .align 2, 0 thumb_func_end sub_081B820C - thumb_func_start sub_081B824C -sub_081B824C: @ 0x081B824C + thumb_func_start GetBattleEntryEligibility +GetBattleEntryEligibility: @ 0x081B824C push {r4, r5, r6, lr} adds r5, r0, #0 movs r6, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B82A8 adds r0, r5, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 bl sub_081B8528 lsls r0, r0, #0x18 @@ -902091,7 +902091,7 @@ sub_081B824C: @ 0x081B824C bne _081B828A adds r0, r5, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B82A8 _081B828A: @@ -902105,7 +902105,7 @@ _081B828A: bne _081B82B8 adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B82EA _081B82A8: @@ -902118,7 +902118,7 @@ _081B82B4: .4byte 0x000040CF _081B82B8: adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r4, r0, #0x10 ldr r3, _081B82F4 @@ -902150,7 +902150,7 @@ _081B82EC: .align 2, 0 _081B82F4: .4byte gUnknown_85DD48E _081B82F8: .4byte 0x0000FFFF - thumb_func_end sub_081B824C + thumb_func_end GetBattleEntryEligibility thumb_func_start sub_081B82FC sub_081B82FC: @ 0x081B82FC @@ -902220,7 +902220,7 @@ _081B836E: ldr r3, _081B840C adds r0, r3, r0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov sl, r0 @@ -902231,7 +902231,7 @@ _081B836E: ldr r3, _081B840C adds r0, r3, r0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r6, r0, #0x10 adds r1, r5, #1 @@ -902250,7 +902250,7 @@ _081B83AE: ldr r1, _081B840C adds r0, r1, r0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp sl, r0 beq _081B8358 cmp r6, #0 @@ -902261,7 +902261,7 @@ _081B83AE: ldr r3, _081B840C adds r0, r3, r0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r6, r0 beq _081B835C _081B83DE: @@ -902335,7 +902335,7 @@ sub_081B843C: @ 0x081B843C movs r0, #0x20 bl sub_080A306C adds r0, r4, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B846C lsls r1, r5, #2 adds r1, r1, r5 @@ -902378,7 +902378,7 @@ _081B84A2: movs r0, #5 bl sub_080A306C movs r0, #0 - bl sub_081B2CD8 + bl display_pokemon_menu_message ldr r0, _081B84C8 lsls r1, r4, #2 adds r1, r1, r4 @@ -902537,7 +902537,7 @@ sub_081B85A4: @ 0x081B85A4 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -902559,13 +902559,13 @@ sub_081B85CC: @ 0x081B85CC movs r1, #0 movs r2, #0xc movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 .align 2, 0 _081B85F0: .4byte sub_081B1040 -_081B85F4: .4byte sub_08085B34 +_081B85F4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_081B85CC thumb_func_start sub_081B85F8 @@ -902582,26 +902582,26 @@ sub_081B85F8: @ 0x081B85F8 movs r1, #0 movs r2, #0xd movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 .align 2, 0 _081B861C: .4byte sub_081B1040 -_081B8620: .4byte sub_08085B34 +_081B8620: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_081B85F8 thumb_func_start sub_081B8624 sub_081B8624: @ 0x081B8624 push {lr} - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _081B8634 movs r0, #0 b _081B8646 _081B8634: - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -902616,8 +902616,8 @@ _081B8646: .align 2, 0 thumb_func_end sub_081B8624 - thumb_func_start sub_081B864C -sub_081B864C: @ 0x081B864C + thumb_func_start OpenPartyMenuInBattle +OpenPartyMenuInBattle: @ 0x081B864C push {r4, lr} sub sp, #0xc adds r4, r0, #0 @@ -902636,7 +902636,7 @@ sub_081B864C: @ 0x081B864C movs r0, #1 adds r2, r4, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu bl sub_080A8BBC bl sub_081B8CD0 add sp, #0xc @@ -902646,7 +902646,7 @@ sub_081B864C: @ 0x081B864C .align 2, 0 _081B8688: .4byte sub_081B1040 _081B868C: .4byte sub_0805995C - thumb_func_end sub_081B864C + thumb_func_end OpenPartyMenuInBattle thumb_func_start sub_081B8690 sub_081B8690: @ 0x081B8690 @@ -902665,7 +902665,7 @@ sub_081B8690: @ 0x081B8690 movs r0, #1 movs r2, #3 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu bl sub_080A8BBC bl sub_081B8CD0 add sp, #0xc @@ -902673,7 +902673,7 @@ sub_081B8690: @ 0x081B8690 bx r0 .align 2, 0 _081B86C4: .4byte sub_081B1040 -_081B86C8: .4byte sub_081B5EF4 +_081B86C8: .4byte c2_815ABFC thumb_func_end sub_081B8690 thumb_func_start sub_081B86CC @@ -902682,12 +902682,12 @@ sub_081B86CC: @ 0x081B86CC adds r4, r0, #0 ldr r0, _081B86F4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B8714 adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B8714 ldr r0, _081B86F8 @@ -902724,10 +902724,10 @@ sub_081B871C: @ 0x081B871C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r5, r0, #0x18 - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -902740,7 +902740,7 @@ sub_081B871C: @ 0x081B871C bne _081B8764 _081B8742: ldr r4, _081B8758 - bl sub_0806E684 + bl GetTrainerPartnerName adds r1, r0, #0 adds r0, r4, #0 bl StringCopy @@ -902759,12 +902759,12 @@ _081B8764: adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081B8798 ldr r1, _081B878C adds r0, r4, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B8790 ldr r1, _081B8794 b _081B88E2 @@ -902778,7 +902778,7 @@ _081B8798: b _081B87C4 _081B879C: adds r0, r4, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081B87BE @@ -902809,7 +902809,7 @@ _081B87C4: adds r6, r0, r1 adds r0, r6, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B8800 ldr r0, _081B87F8 @@ -902834,7 +902834,7 @@ _081B8800: bne _081B8834 ldr r1, _081B8828 adds r0, r6, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B882C ldr r1, _081B8830 b _081B88E2 @@ -902848,7 +902848,7 @@ _081B8834: ldrb r0, [r0, #0xb] cmp r0, #4 bne _081B8848 - bl sub_0806E420 + bl SetMonPreventsSwitchingString b _081B88E6 .align 2, 0 _081B8844: .4byte gUnknown_203CB94 @@ -902868,7 +902868,7 @@ _081B8848: lsls r0, r0, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -902893,7 +902893,7 @@ _081B889C: ldr r1, _081B88B0 adds r0, r0, r1 ldr r1, _081B88B4 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B88B8 ldr r1, _081B88BC b _081B88E2 @@ -902909,17 +902909,17 @@ _081B88C0: lsls r0, r0, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_081B8C8C + bl pokemon_order_func lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r7, r0 add r0, r8 ldr r1, _081B88FC - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B8900 ldr r1, _081B8904 _081B88E2: - bl sub_08008BCC + bl StringExpandPlaceholders _081B88E6: movs r0, #0 _081B88E8: @@ -902960,7 +902960,7 @@ sub_081B8928: @ 0x081B8928 adds r6, r0, #0 lsls r1, r1, #0x18 lsrs r4, r1, #0x18 - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -902983,7 +902983,7 @@ _081B8950: strb r0, [r6, #2] b _081B89F8 _081B895E: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _081B899C @@ -903103,7 +903103,7 @@ sub_081B8A28: @ 0x081B8A28 lsrs r7, r1, #0x18 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081B8A50 @@ -903123,7 +903123,7 @@ _081B8A5C: bl GetBattlerAtPosition lsls r0, r0, #0x18 lsrs r6, r0, #0x18 - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -903146,7 +903146,7 @@ _081B8A82: strb r0, [r5, #2] b _081B8B12 _081B8A90: - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 bne _081B8AC8 @@ -903236,7 +903236,7 @@ sub_081B8B20: @ 0x081B8B20 lsls r2, r2, #0x18 lsrs r6, r2, #0x18 movs r7, #0 - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081B8BCE @@ -903423,8 +903423,8 @@ sub_081B8C50: @ 0x081B8C50 .align 2, 0 thumb_func_end sub_081B8C50 - thumb_func_start sub_081B8C8C -sub_081B8C8C: @ 0x081B8C8C + thumb_func_start pokemon_order_func +pokemon_order_func: @ 0x081B8C8C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -903463,7 +903463,7 @@ _081B8CCA: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081B8C8C + thumb_func_end pokemon_order_func thumb_func_start sub_081B8CD0 sub_081B8CD0: @ 0x081B8CD0 @@ -903480,7 +903480,7 @@ sub_081B8CD0: @ 0x081B8CD0 movs r6, #0x64 _081B8CEA: adds r0, r4, #0 - bl sub_081B8C8C + bl pokemon_order_func lsls r0, r0, #0x18 lsrs r0, r0, #0x18 muls r0, r6, r0 @@ -903497,7 +903497,7 @@ _081B8CEA: cmp r4, #5 bls _081B8CEA adds r0, r5, #0 - bl sub_08000BF0 + bl Free pop {r4, r5, r6} pop {r0} bx r0 @@ -903537,7 +903537,7 @@ _081B8D3A: cmp r4, #5 bls _081B8D3A adds r0, r5, #0 - bl sub_08000BF0 + bl Free pop {r4, r5, r6} pop {r0} bx r0 @@ -903564,12 +903564,12 @@ _081B8D7E: adds r5, r0, r1 adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B8DCC adds r0, r5, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B8DCC movs r0, #0 @@ -903606,7 +903606,7 @@ _081B8DD6: sub_081B8DE0: @ 0x081B8DE0 push {lr} ldr r0, _081B8DEC - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -903628,7 +903628,7 @@ sub_081B8DF0: @ 0x081B8DF0 movs r1, #3 movs r2, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -903655,7 +903655,7 @@ sub_081B8E1C: @ 0x081B8E1C lsls r1, r1, #9 movs r0, #2 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX ldr r0, _081B8E50 str r0, [r4] pop {r4} @@ -903706,7 +903706,7 @@ _081B8E88: adds r0, r0, r1 ldrb r0, [r0, #9] movs r1, #0 - bl sub_081B580C + bl AnimateSelectedPartyIcon _081B8EA4: adds r0, r4, #1 lsls r0, r0, #0x18 @@ -903846,7 +903846,7 @@ _081B8FA0: lsls r1, r1, #4 movs r0, #2 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -903870,7 +903870,7 @@ sub_081B8FC8: @ 0x081B8FC8 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 @@ -903897,13 +903897,13 @@ sub_081B8FF4: @ 0x081B8FF4 movs r1, #0 movs r2, #0xb movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu add sp, #0xc pop {r0} bx r0 .align 2, 0 _081B9020: .4byte gUnknown_3005B10 -_081B9024: .4byte sub_081B9068 +_081B9024: .4byte hm_add_c3_without_phase_2 _081B9028: .4byte sub_081B1040 _081B902C: .4byte sub_08085A30 thumb_func_end sub_081B8FF4 @@ -903912,7 +903912,7 @@ _081B902C: .4byte sub_08085A30 sub_081B9030: @ 0x081B9030 push {r4, lr} ldr r4, _081B9058 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -903925,33 +903925,33 @@ _081B9046: ldr r1, _081B9060 str r1, [r0] ldr r0, _081B9064 - bl sub_08000540 + bl SetMainCallback2 pop {r4} pop {r0} bx r0 .align 2, 0 _081B9058: .4byte gUnknown_2037280 _081B905C: .4byte gUnknown_3005B10 -_081B9060: .4byte sub_081B9068 +_081B9060: .4byte hm_add_c3_without_phase_2 _081B9064: .4byte sub_08085A30 thumb_func_end sub_081B9030 - thumb_func_start sub_081B9068 -sub_081B9068: @ 0x081B9068 + thumb_func_start hm_add_c3_without_phase_2 +hm_add_c3_without_phase_2: @ 0x081B9068 push {lr} - bl sub_080AE99C + bl pal_fill_black ldr r0, _081B907C movs r1, #0xa - bl sub_080A8878 + bl CreateTask movs r0, #1 pop {r1} bx r1 .align 2, 0 -_081B907C: .4byte sub_081B9080 - thumb_func_end sub_081B9068 +_081B907C: .4byte TossPokeblockChoice_No + thumb_func_end hm_add_c3_without_phase_2 - thumb_func_start sub_081B9080 -sub_081B9080: @ 0x081B9080 + thumb_func_start TossPokeblockChoice_No +TossPokeblockChoice_No: @ 0x081B9080 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -903960,14 +903960,14 @@ sub_081B9080: @ 0x081B9080 cmp r0, #0 beq _081B909E adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask bl sub_080987E8 - bl sub_080988C4 + bl EnableBothScriptContexts _081B909E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081B9080 + thumb_func_end TossPokeblockChoice_No thumb_func_start sub_081B90A4 sub_081B90A4: @ 0x081B90A4 @@ -903975,10 +903975,10 @@ sub_081B90A4: @ 0x081B90A4 bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _081B90C0 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -903999,7 +903999,7 @@ sub_081B90C4: @ 0x081B90C4 lsrs r4, r0, #0x18 cmp r4, #0 bne _081B90FC - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps str r4, [sp] ldr r0, _081B9108 str r0, [sp, #4] @@ -904009,9 +904009,9 @@ sub_081B90C4: @ 0x081B90C4 movs r1, #0 movs r2, #0xb movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081B90FC: add sp, #0xc pop {r4, r5} @@ -904026,7 +904026,7 @@ _081B910C: .4byte sub_081B9110 thumb_func_start sub_081B9110 sub_081B9110: @ 0x081B9110 push {lr} - bl sub_081B1024 + bl GetCursorSelectionMonId ldr r2, _081B913C strb r0, [r2] lsls r0, r0, #0x18 @@ -904043,14 +904043,14 @@ _081B9126: ldr r0, _081B9148 str r0, [r1] ldr r0, _081B914C - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _081B913C: .4byte gUnknown_2039BC4 _081B9140: .4byte gUnknown_2037280 _081B9144: .4byte gUnknown_3005B10 -_081B9148: .4byte sub_081B9068 +_081B9148: .4byte hm_add_c3_without_phase_2 _081B914C: .4byte sub_08085A30 thumb_func_end sub_081B9110 @@ -904060,10 +904060,10 @@ sub_081B9150: @ 0x081B9150 bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _081B916C movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -904084,7 +904084,7 @@ sub_081B9170: @ 0x081B9170 lsrs r4, r0, #0x18 cmp r4, #0 bne _081B91A8 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps str r4, [sp] ldr r0, _081B91B4 str r0, [sp, #4] @@ -904094,9 +904094,9 @@ sub_081B9170: @ 0x081B9170 movs r1, #0 movs r2, #0xb movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081B91A8: add sp, #0xc pop {r4, r5} @@ -904114,10 +904114,10 @@ sub_081B91BC: @ 0x081B91BC bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _081B91D8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -904138,7 +904138,7 @@ sub_081B91DC: @ 0x081B91DC lsrs r4, r0, #0x18 cmp r4, #0 bne _081B9214 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps str r4, [sp] ldr r0, _081B9220 str r0, [sp, #4] @@ -904148,9 +904148,9 @@ sub_081B91DC: @ 0x081B91DC movs r1, #0 movs r2, #0xb movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081B9214: add sp, #0xc pop {r4, r5} @@ -904166,7 +904166,7 @@ _081B9224: .4byte sub_081B9228 sub_081B9228: @ 0x081B9228 push {r4, r5, lr} ldr r5, _081B9240 - bl sub_081B1024 + bl GetCursorSelectionMonId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -904184,7 +904184,7 @@ _081B9244: muls r0, r1, r0 ldr r1, _081B9270 adds r0, r0, r1 - bl sub_0806DCF0 + bl GetNumberOfRelearnableMoves lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -904193,7 +904193,7 @@ _081B925A: ldr r1, _081B9278 str r1, [r0] ldr r0, _081B927C - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 @@ -904201,7 +904201,7 @@ _081B925A: _081B926C: .4byte gUnknown_2037282 _081B9270: .4byte gUnknown_2024190 _081B9274: .4byte gUnknown_3005B10 -_081B9278: .4byte sub_081B9068 +_081B9278: .4byte hm_add_c3_without_phase_2 _081B927C: .4byte sub_08085A30 thumb_func_end sub_081B9228 @@ -904228,7 +904228,7 @@ _081B929A: ldr r1, _081B92BC adds r0, r0, r1 movs r1, #0xc - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B9294 movs r0, #1 @@ -904247,10 +904247,10 @@ sub_081B92C0: @ 0x081B92C0 bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _081B92DC movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -904271,7 +904271,7 @@ sub_081B92E0: @ 0x081B92E0 lsrs r4, r0, #0x18 cmp r4, #0 bne _081B9318 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps str r4, [sp] ldr r0, _081B9324 str r0, [sp, #4] @@ -904281,9 +904281,9 @@ sub_081B92E0: @ 0x081B92E0 movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_081AFD10 + bl InitPartyMenu adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081B9318: add sp, #0xc pop {r4, r5} @@ -904295,8 +904295,8 @@ _081B9324: .4byte sub_081B1040 _081B9328: .4byte sub_081B9030 thumb_func_end sub_081B92E0 - thumb_func_start sub_081B932C -sub_081B932C: @ 0x081B932C + thumb_func_start ForcedMovement_Slip +ForcedMovement_Slip: @ 0x081B932C push {lr} sub sp, #4 ldr r1, _081B9358 @@ -904310,7 +904310,7 @@ sub_081B932C: @ 0x081B932C ldr r0, _081B9364 str r0, [sp] movs r0, #3 - bl sub_081BF280 + bl ShowPokemonSummaryScreen ldr r1, _081B9368 ldr r0, _081B936C str r0, [r1] @@ -904323,8 +904323,8 @@ _081B935C: .4byte gUnknown_2037280 _081B9360: .4byte gUnknown_202418D _081B9364: .4byte sub_08085A30 _081B9368: .4byte gUnknown_3005B0C -_081B936C: .4byte sub_080AEA64 - thumb_func_end sub_081B932C +_081B936C: .4byte FieldCallback_ReturnToEventScript2 + thumb_func_end ForcedMovement_Slip thumb_func_start sub_081B9370 sub_081B9370: @ 0x081B9370 @@ -904343,7 +904343,7 @@ _081B937C: adds r0, r0, r1 adds r1, r4, #0 adds r1, #0xd - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081B939A ldrh r0, [r5] @@ -904378,13 +904378,13 @@ sub_081B93B8: @ 0x081B93B8 ldrh r1, [r0] adds r1, #0xd adds r0, r5, #0 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 ldr r1, _081B9404 adds r0, r5, #0 - bl sub_081B1814 + bl GetMonNickname ldr r0, _081B9408 lsls r4, r4, #3 ldr r1, _081B940C @@ -904418,13 +904418,13 @@ sub_081B9410: @ 0x081B9410 ldr r4, _081B9478 ldrb r2, [r4] movs r1, #0 - bl sub_08068D34 + bl SetMonMoveSlot mov r1, r8 ldrh r0, [r1] muls r0, r6, r0 adds r0, r0, r5 ldrb r1, [r4] - bl sub_0806B46C + bl RemoveMonPPBonus ldrh r4, [r4] cmp r4, #2 bhi _081B9464 @@ -904477,7 +904477,7 @@ sub_081B947C: @ 0x081B947C str r0, [sp, #8] mov r0, r8 ldr r1, [sp, #8] - bl sub_0806A058 + bl GetMonData mov r1, sp adds r1, #2 str r1, [sp, #0x14] @@ -904487,7 +904487,7 @@ sub_081B947C: @ 0x081B947C str r3, [sp, #0xc] mov r0, r8 adds r1, r3, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r7, r5, #0 @@ -904495,7 +904495,7 @@ sub_081B947C: @ 0x081B947C str r7, [sp, #0x10] mov r0, r8 adds r1, r7, #0 - bl sub_0806A058 + bl GetMonData mov r1, sp adds r1, #5 str r1, [sp, #0x18] @@ -904505,13 +904505,13 @@ sub_081B947C: @ 0x081B947C str r3, [sp, #0x1c] mov r0, r8 adds r1, r3, #0 - bl sub_0806A058 + bl GetMonData add r7, sp, #4 mov sl, r7 strb r0, [r7] mov r0, r8 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r6, sp adds r6, #6 strb r0, [r6] @@ -904550,23 +904550,23 @@ sub_081B947C: @ 0x081B947C mov r0, r8 ldr r1, [sp, #8] mov r2, sp - bl sub_0806A774 + bl SetMonData mov r0, r8 ldr r1, [sp, #0xc] ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData mov r0, r8 ldr r1, [sp, #0x10] mov r2, sl - bl sub_0806A774 + bl SetMonData mov r0, r8 ldr r1, [sp, #0x1c] ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData mov r0, r8 movs r1, #0x15 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData add sp, #0x20 pop {r3, r4, r5} mov r8, r3 @@ -904589,7 +904589,7 @@ sub_081B957C: @ 0x081B957C ldr r1, _081B95A4 adds r0, r0, r1 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 cmp r1, #0 beq _081B95AC @@ -904628,7 +904628,7 @@ sub_081B95B8: @ 0x081B95B8 ldr r1, _081B95F4 ldrh r1, [r1] adds r1, #0xd - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 @@ -904655,7 +904655,7 @@ _081B960A: adds r1, r4, #0 adds r1, #0xd adds r0, r5, r7 - bl sub_0806A058 + bl GetMonData cmp r0, #0x39 beq _081B963C adds r4, #1 @@ -904670,7 +904670,7 @@ _081B9620: cmp r6, r0 blo _081B95F8 mov r0, r8 - bl sub_080D1C48 + bl AnyStorageMonWithMove cmp r0, #1 beq _081B963C ldr r1, _081B9650 @@ -904820,7 +904820,7 @@ sub_081B9730: @ 0x081B9730 ldr r0, [r2] adds r0, r0, r1 adds r0, #0xc - bl sub_081637CC + bl FrontierSpeechToString _081B974C: pop {r0} bx r0 @@ -904891,7 +904891,7 @@ sub_081B97C8: @ 0x081B97C8 adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -905081,7 +905081,7 @@ sub_081B9938: @ 0x081B9938 adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -905256,8 +905256,8 @@ _081B9A90: .4byte 0x00000CA8 _081B9A94: .4byte 0x00000CA9 thumb_func_end sub_081B9A54 - thumb_func_start sub_081B9A98 -sub_081B9A98: @ 0x081B9A98 + thumb_func_start GetTrainerEncounterMusicId +GetTrainerEncounterMusicId: @ 0x081B9A98 push {r4, r5, lr} ldr r0, _081B9AB4 ldr r4, [r0] @@ -905274,7 +905274,7 @@ sub_081B9A98: @ 0x081B9A98 _081B9AB4: .4byte gUnknown_3005AF0 _081B9AB8: .4byte gUnknown_85E19D8 _081B9ABC: .4byte 0x00000E6E - thumb_func_end sub_081B9A98 + thumb_func_end GetTrainerEncounterMusicId thumb_func_start sub_081B9AC0 sub_081B9AC0: @ 0x081B9AC0 @@ -905285,7 +905285,7 @@ sub_081B9AC0: @ 0x081B9AC0 adds r0, r0, r1 ldrh r0, [r0] movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r5, #1 @@ -905325,7 +905325,7 @@ _081B9B14: .4byte gUnknown_2037290 sub_081B9B18: @ 0x081B9B18 push {lr} bl ZeroPlayerPartyMons - bl sub_0819A198 + bl DoBattleFactorySelectScreen pop {r0} bx r0 .align 2, 0 @@ -905829,8 +905829,8 @@ _081B9EE8: .4byte gUnknown_85ADBF4 _081B9EEC: .4byte gUnknown_3005FD8 thumb_func_end sub_081B9CE0 - thumb_func_start sub_081B9EF0 -sub_081B9EF0: @ 0x081B9EF0 + thumb_func_start Font6Func +Font6Func: @ 0x081B9EF0 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r6, #0 @@ -906171,7 +906171,7 @@ _081BA18E: lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer b _081B9FFE _081BA1A0: movs r0, #2 @@ -906181,7 +906181,7 @@ _081BA1A4: _081BA1A6: strb r0, [r6, #0x1c] adds r0, r6, #0 - bl sub_080054A4 + bl TextPrinterInitDownArrowCounters _081BA1AE: movs r0, #3 b _081BA302 @@ -906203,7 +906203,7 @@ _081BA1C4: b _081BA302 _081BA1CE: adds r0, r3, #0 - bl sub_081BA308 + bl DecompressGlyphFont6 adds r0, r6, #0 bl sub_08004850 ldr r0, _081BA1F0 @@ -906220,7 +906220,7 @@ _081BA1CE: _081BA1F0: .4byte gUnknown_3003030 _081BA1F4: adds r0, r6, #0 - bl sub_08005648 + bl TextPrinterWait lsls r0, r0, #0x10 cmp r0, #0 beq _081BA1AE @@ -906229,7 +906229,7 @@ _081BA1F4: b _081BA1AE _081BA206: adds r0, r6, #0 - bl sub_080055FC + bl TextPrinterWaitWithDownArrow lsls r0, r0, #0x10 cmp r0, #0 beq _081BA1AE @@ -906239,7 +906239,7 @@ _081BA206: lsrs r1, r2, #4 orrs r1, r2 lsrs r1, r1, #0x18 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r6, #6] movs r1, #0 strb r0, [r6, #8] @@ -906249,12 +906249,12 @@ _081BA206: b _081BA1AE _081BA230: adds r0, r6, #0 - bl sub_080055FC + bl TextPrinterWaitWithDownArrow lsls r0, r0, #0x10 cmp r0, #0 beq _081BA1AE adds r0, r6, #0 - bl sub_080055AC + bl TextPrinterClearDownArrow ldrb r1, [r6, #5] ldr r0, _081BA264 ldr r2, [r0] @@ -906325,13 +906325,13 @@ _081BA2A4: _081BA2CE: ldrb r0, [r6, #4] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _081BA1AE _081BA2D8: strb r2, [r6, #0x1c] b _081BA1AE _081BA2DC: - bl sub_080A3168 + bl IsSEPlaying lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -906357,10 +906357,10 @@ _081BA302: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081B9EF0 + thumb_func_end Font6Func - thumb_func_start sub_081BA308 -sub_081BA308: @ 0x081BA308 + thumb_func_start DecompressGlyphFont6 +DecompressGlyphFont6: @ 0x081BA308 push {r4, r5, lr} lsls r0, r0, #0x10 lsrs r2, r0, #0x13 @@ -906405,7 +906405,7 @@ sub_081BA308: @ 0x081BA308 .align 2, 0 _081BA364: .4byte gUnknown_85E19E0 _081BA368: .4byte gUnknown_3003030 - thumb_func_end sub_081BA308 + thumb_func_end DecompressGlyphFont6 thumb_func_start MultiBootInit MultiBootInit: @ 0x081BA36C @@ -906438,15 +906438,15 @@ _081BA3A0: .4byte 0x00002003 _081BA3A4: .4byte 0x0400012A thumb_func_end MultiBootInit - thumb_func_start sub_081BA3A8 -sub_081BA3A8: @ 0x081BA3A8 + thumb_func_start MultiBootMain +MultiBootMain: @ 0x081BA3A8 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb mov r5, r8 push {r5, r6, r7} adds r7, r0, #0 - bl sub_081BA8CC + bl MultiBootCheckComplete cmp r0, #0 beq _081BA3BE b _081BA786 @@ -906502,13 +906502,13 @@ _081BA410: cmp r0, #0xe1 bls _081BA42C adds r0, r7, #0 - bl sub_081BA8CC + bl MultiBootCheckComplete cmp r0, #0 bne _081BA42C b _081BA776 _081BA42C: adds r0, r7, #0 - bl sub_081BA8CC + bl MultiBootCheckComplete cmp r0, #0 beq _081BA438 b _081BA786 @@ -906967,7 +906967,7 @@ _081BA788: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081BA3A8 + thumb_func_end MultiBootMain thumb_func_start MultiBootSend MultiBootSend: @ 0x081BA798 @@ -907032,8 +907032,8 @@ _081BA802: .align 2, 0 thumb_func_end MultiBootStartProbe - thumb_func_start sub_081BA808 -sub_081BA808: @ 0x081BA808 + thumb_func_start MultiBootStartMaster +MultiBootStartMaster: @ 0x081BA808 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r6, r1, #0 @@ -907130,10 +907130,10 @@ _081BA8C4: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BA808 + thumb_func_end MultiBootStartMaster - thumb_func_start sub_081BA8CC -sub_081BA8CC: @ 0x081BA8CC + thumb_func_start MultiBootCheckComplete +MultiBootCheckComplete: @ 0x081BA8CC push {lr} ldrb r0, [r0, #0x18] cmp r0, #0xe9 @@ -907146,7 +907146,7 @@ _081BA8DA: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081BA8CC + thumb_func_end MultiBootCheckComplete thumb_func_start MultiBootHandShake MultiBootHandShake: @ 0x081BA8E0 @@ -907436,7 +907436,7 @@ _081BAAE8: .4byte gUnknown_2023D08 _081BAAEC: .4byte gUnknown_2022D08 _081BAAF0: .4byte gUnknown_85E732C _081BAAF4: - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BAAF8: pop {r0} bx r0 @@ -907460,7 +907460,7 @@ CompleteOnBattlerSpriteCallbackDummy: @ 0x081BAAFC ldr r0, _081BAB30 cmp r1, r0 bne _081BAB20 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BAB20: pop {r0} bx r0 @@ -907508,7 +907508,7 @@ sub_081BAB34: @ 0x081BAB34 lsls r0, r0, #2 adds r0, r0, r6 bl DestroySprite - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BAB84: pop {r4, r5, r6} pop {r0} @@ -907548,7 +907548,7 @@ sub_081BAB9C: @ 0x081BAB9C adds r0, r0, r2 movs r1, #0 strb r1, [r0, #9] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BABD4: pop {r4} pop {r0} @@ -907562,11 +907562,11 @@ _081BABE0: .4byte gUnknown_2023D08 sub_081BABE4: @ 0x081BABE4 push {r4, r5, r6, lr} movs r6, #0 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081BAC08 - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081BAC3C @@ -907630,7 +907630,7 @@ _081BAC3C: _081BAC72: movs r6, #1 _081BAC74: - bl sub_080A2F90 + bl IsCryPlayingOrClearCrySongs lsls r0, r0, #0x18 cmp r0, #0 beq _081BAC80 @@ -907754,7 +907754,7 @@ _081BAD16: lsls r0, r0, #2 adds r0, r0, r2 strb r6, [r0, #9] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081BADD0 @@ -907789,7 +907789,7 @@ _081BAD16: ldr r2, _081BAE64 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] mov r1, r8 eors r0, r1 @@ -907825,7 +907825,7 @@ _081BADD0: ldr r2, _081BAE64 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r4] bl sub_08076320 ldrb r0, [r4] @@ -907892,7 +907892,7 @@ sub_081BAE70: @ 0x081BAE70 ldrsh r0, [r1, r2] cmp r0, #0 bne _081BAE9E - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BAE9E: pop {r0} bx r0 @@ -907912,7 +907912,7 @@ sub_081BAEB0: @ 0x081BAEB0 ldrb r1, [r1] movs r2, #0 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -907945,8 +907945,8 @@ _081BAEF8: muls r0, r2, r0 ldr r2, _081BAF1C adds r0, r0, r2 - bl sub_0805E5AC - bl sub_081BB828 + bl HandleLowHpMusicChange + bl PlayerPartnerBufferExecCompleted _081BAF12: pop {r4, r5, r6} pop {r0} @@ -907964,15 +907964,15 @@ sub_081BAF20: @ 0x081BAF20 lsls r0, r0, #0x10 cmp r0, #0 bne _081BAF32 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BAF32: pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081BAF20 - thumb_func_start sub_081BAF38 -sub_081BAF38: @ 0x081BAF38 + thumb_func_start Task_GiveExpToMon +Task_GiveExpToMon: @ 0x081BAF38 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -907995,7 +907995,7 @@ sub_081BAF38: @ 0x081BAF38 str r7, [sp, #8] ldrh r2, [r1, #0xa] str r2, [sp, #0xc] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -908015,19 +908015,19 @@ _081BAF7E: adds r6, r1, r0 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r6, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] ldr r3, _081BB044 adds r4, #1 @@ -908054,9 +908054,9 @@ _081BAF7E: adds r0, r6, #0 movs r1, #0x19 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r6, #0 - bl sub_0806884C + bl CalculateMonStats ldr r2, [sp] add r0, sp, #4 ldrh r0, [r0] @@ -908070,9 +908070,9 @@ _081BAF7E: lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xb - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues strb r5, [r4] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -908119,7 +908119,7 @@ _081BB06C: add r2, sp, #4 adds r0, r6, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData ldr r1, _081BB08C ldr r3, [sp, #8] lsls r0, r3, #2 @@ -908127,7 +908127,7 @@ _081BB06C: ldr r1, _081BB090 str r1, [r0] mov r0, sb - bl sub_080A8964 + bl DestroyTask b _081BB09A .align 2, 0 _081BB08C: .4byte gUnknown_3005AC0 @@ -908149,7 +908149,7 @@ _081BB09A: bx r0 .align 2, 0 _081BB0AC: .4byte sub_081BB0B0 - thumb_func_end sub_081BAF38 + thumb_func_end Task_GiveExpToMon thumb_func_start sub_081BB0B0 sub_081BB0B0: @ 0x081BB0B0 @@ -908184,19 +908184,19 @@ sub_081BB0B0: @ 0x081BB0B0 adds r6, r6, r0 adds r0, r6, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r6, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r5, r0, #0 lsls r5, r5, #0x10 lsrs r5, r5, #0x10 adds r0, r6, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 ldr r6, _081BB170 lsls r1, r4, #2 @@ -908287,7 +908287,7 @@ _081BB1B0: adds r0, r7, #0 movs r2, #1 movs r3, #0 - bl sub_08074630 + bl MoveBattleBar adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -908308,17 +908308,17 @@ _081BB1B0: adds r5, r1, r0 adds r0, r5, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #4] adds r0, r5, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r3, _081BB280 @@ -908347,9 +908347,9 @@ _081BB1B0: adds r0, r5, #0 movs r1, #0x19 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r5, #0 - bl sub_0806884C + bl CalculateMonStats ldr r2, [sp] add r0, sp, #4 ldrh r0, [r0] @@ -908362,7 +908362,7 @@ _081BB1B0: lsrs r2, r2, #0x10 movs r0, #1 movs r1, #0xb - bl sub_08033FB0 + bl BtlController_EmitTwoReturnValues strb r5, [r4] ldr r0, _081BB28C str r0, [r6] @@ -908379,14 +908379,14 @@ _081BB290: add r2, sp, #4 adds r0, r5, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData ldr r1, _081BB2BC lsls r0, r7, #2 adds r0, r0, r1 ldr r1, _081BB2C0 str r1, [r0] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _081BB2AC: add sp, #8 pop {r3, r4, r5} @@ -908413,7 +908413,7 @@ sub_081BB2C4: @ 0x081BB2C4 adds r0, r0, r1 ldrb r4, [r0, #0xc] ldrb r6, [r0, #8] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -908433,7 +908433,7 @@ _081BB2F8: adds r1, r4, #0 adds r2, r4, #0 movs r3, #0 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, _081BB318 lsls r1, r5, #2 adds r1, r1, r5 @@ -908481,8 +908481,8 @@ sub_081BB324: @ 0x081BB324 adds r7, r1, r0 adds r0, r7, #0 movs r1, #0x38 - bl sub_0806A058 - bl sub_080A63E8 + bl GetMonData + bl IsDoubleBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -908501,7 +908501,7 @@ sub_081BB324: @ 0x081BB324 ldrb r0, [r0] adds r1, r7, #0 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute b _081BB3B8 .align 2, 0 _081BB390: .4byte gUnknown_3005B60 @@ -908518,7 +908518,7 @@ _081BB3A4: ldr r2, _081BB3D0 adds r1, r1, r2 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute _081BB3B8: ldr r0, _081BB3D4 lsls r1, r6, #2 @@ -908555,7 +908555,7 @@ sub_081BB3DC: @ 0x081BB3DC ldr r1, _081BB41C adds r0, r0, r1 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldrb r0, [r4, #0xc] ldr r1, _081BB420 lsls r0, r0, #2 @@ -908563,7 +908563,7 @@ sub_081BB3DC: @ 0x081BB3DC ldr r1, _081BB424 str r1, [r0] adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask pop {r4, r5} pop {r0} bx r0 @@ -908603,7 +908603,7 @@ sub_081BB428: @ 0x081BB428 ldr r1, _081BB4BC adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 bl sub_0805DB50 @@ -908631,7 +908631,7 @@ sub_081BB428: @ 0x081BB428 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BB4A4: pop {r4, r5, r6} pop {r0} @@ -908684,7 +908684,7 @@ sub_081BB4C4: @ 0x081BB4C4 adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BB518: pop {r4, r5, r6} pop {r0} @@ -908697,20 +908697,20 @@ _081BB52C: .4byte gUnknown_20205AC _081BB530: .4byte gUnknown_3005AD0 thumb_func_end sub_081BB4C4 - thumb_func_start sub_081BB534 -sub_081BB534: @ 0x081BB534 + thumb_func_start CompleteOnInactiveTextPrinter +CompleteOnInactiveTextPrinter: @ 0x081BB534 push {lr} movs r0, #0 bl sub_080046A8 lsls r0, r0, #0x10 cmp r0, #0 bne _081BB546 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BB546: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BB534 + thumb_func_end CompleteOnInactiveTextPrinter thumb_func_start sub_081BB54C sub_081BB54C: @ 0x081BB54C @@ -908740,7 +908740,7 @@ sub_081BB54C: @ 0x081BB54C strb r0, [r2] ldr r0, _081BB594 strb r3, [r0] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted b _081BB5C2 .align 2, 0 _081BB588: .4byte gUnknown_2023E88 @@ -908810,7 +908810,7 @@ sub_081BB5C8: @ 0x081BB5C8 adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _081BB60E: ldr r0, _081BB634 ldrb r1, [r4] @@ -908862,7 +908862,7 @@ sub_081BB63C: @ 0x081BB63C ldr r0, _081BB68C cmp r1, r0 bne _081BB678 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BB678: pop {r0} bx r0 @@ -908916,7 +908916,7 @@ sub_081BB690: @ 0x081BB690 bl FreeSpritePaletteByTag ldr r0, _081BB764 movs r1, #0xa - bl sub_080A8878 + bl CreateTask ldr r0, _081BB768 mov r8, r0 ldrb r1, [r7] @@ -908927,7 +908927,7 @@ sub_081BB690: @ 0x081BB690 muls r0, r6, r0 ldr r5, _081BB76C adds r0, r0, r5 - bl sub_0805E5AC + bl HandleLowHpMusicChange ldr r1, _081BB770 ldrb r0, [r7] adds r0, r0, r1 @@ -908949,7 +908949,7 @@ sub_081BB690: @ 0x081BB690 muls r1, r6, r1 adds r1, r1, r5 movs r2, #0 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r0, [r7] bl sub_08076320 ldrb r0, [r7] @@ -909059,8 +909059,8 @@ _081BB820: .4byte gUnknown_3005AC0 _081BB824: .4byte sub_081BB690 thumb_func_end sub_081BB784 - thumb_func_start sub_081BB828 -sub_081BB828: @ 0x081BB828 + thumb_func_start PlayerPartnerBufferExecCompleted +PlayerPartnerBufferExecCompleted: @ 0x081BB828 push {r4, lr} sub sp, #4 ldr r1, _081BB868 @@ -909076,7 +909076,7 @@ sub_081BB828: @ 0x081BB828 ands r0, r1 cmp r0, #0 beq _081BB87C - bl sub_0800A02C + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, #2 @@ -909114,7 +909114,7 @@ _081BB88E: .align 2, 0 _081BB898: .4byte gUnknown_2023D0C _081BB89C: .4byte gUnknown_82FACB4 - thumb_func_end sub_081BB828 + thumb_func_end PlayerPartnerBufferExecCompleted thumb_func_start sub_081BB8A0 sub_081BB8A0: @ 0x081BB8A0 @@ -909133,7 +909133,7 @@ sub_081BB8A0: @ 0x081BB8A0 ands r0, r1 cmp r0, #0 bne _081BB8C2 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BB8C2: pop {r0} bx r0 @@ -909159,7 +909159,7 @@ sub_081BB8D0: @ 0x081BB8D0 ands r0, r1 cmp r0, #0 bne _081BB8F2 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BB8F2: pop {r0} bx r0 @@ -909168,8 +909168,8 @@ _081BB8F8: .4byte gUnknown_2024174 _081BB8FC: .4byte gUnknown_2023D08 thumb_func_end sub_081BB8D0 - thumb_func_start sub_081BB900 -sub_081BB900: @ 0x081BB900 + thumb_func_start PlayerPartnerHandleGetMonData +PlayerPartnerHandleGetMonData: @ 0x081BB900 push {r4, r5, r6, lr} sub sp, #0x100 movs r6, #0 @@ -909187,7 +909187,7 @@ sub_081BB900: @ 0x081BB900 adds r1, r1, r0 ldrb r0, [r1] mov r1, sp - bl sub_081BB974 + bl CopyPlayerPartnerMonData adds r6, r0, #0 b _081BB95A .align 2, 0 @@ -909206,7 +909206,7 @@ _081BB93C: lsrs r0, r0, #0x18 mov r2, sp adds r1, r2, r6 - bl sub_081BB974 + bl CopyPlayerPartnerMonData adds r6, r6, r0 _081BB952: lsrs r4, r4, #1 @@ -909218,17 +909218,17 @@ _081BB95A: lsrs r1, r1, #0x10 movs r0, #1 mov r2, sp - bl sub_08033E70 - bl sub_081BB828 + bl BtlController_EmitDataTransfer + bl PlayerPartnerBufferExecCompleted add sp, #0x100 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BB900 + thumb_func_end PlayerPartnerHandleGetMonData - thumb_func_start sub_081BB974 -sub_081BB974: @ 0x081BB974 + thumb_func_start CopyPlayerPartnerMonData +CopyPlayerPartnerMonData: @ 0x081BB974 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -909328,12 +909328,12 @@ _081BBAA4: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2e] movs r6, #0 @@ -909361,12 +909361,12 @@ _081BBAF0: adds r1, r6, #0 adds r1, #0xd mov r0, r8 - bl sub_0806A058 + bl GetMonData strh r0, [r4] adds r1, r6, #0 adds r1, #0x11 mov r0, r8 - bl sub_0806A058 + bl GetMonData mov r2, sb adds r1, r2, r6 strb r0, [r1] @@ -909381,21 +909381,21 @@ _081BBAF0: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sl strb r0, [r1] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData ldr r2, [sp, #0x80] strb r0, [r2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x44] adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r5, #0x1f ands r0, r5 @@ -909407,7 +909407,7 @@ _081BBAF0: strb r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData mov r3, sp movs r6, #0x1f ands r0, r6 @@ -909419,7 +909419,7 @@ _081BBAF0: strh r1, [r3, #0x14] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #2 @@ -909431,7 +909431,7 @@ _081BBAF0: strb r1, [r3, #0x15] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData movs r1, #0x1f ands r1, r0 lsls r1, r1, #0xf @@ -909442,7 +909442,7 @@ _081BBAF0: str r0, [sp, #0x14] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r6 lsls r0, r0, #4 @@ -909453,7 +909453,7 @@ _081BBAF0: strh r1, [r3, #0x16] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData mov r3, sp ands r0, r5 lsls r0, r0, #1 @@ -909465,55 +909465,55 @@ _081BBAF0: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x48] adds r0, r4, #0 movs r1, #0x37 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x4c] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData ldr r1, [sp, #0x7c] strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x28] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0x2c] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData mov r1, sp strh r0, [r1, #0xa] adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData mov r3, sp movs r1, #1 ands r0, r1 @@ -909526,7 +909526,7 @@ _081BBAF0: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData mov r3, sp lsls r0, r0, #7 ldrb r2, [r3, #0x17] @@ -909536,19 +909536,19 @@ _081BBAF0: strb r1, [r3, #0x17] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [sp, #0x54] adds r0, r4, #0 movs r1, #2 ldr r2, [sp, #0x8c] - bl sub_0806A058 + bl GetMonData ldr r0, [sp, #0x84] ldr r1, [sp, #0x8c] - bl sub_08008828 + bl StringCopy10 adds r0, r4, #0 movs r1, #7 ldr r2, [sp, #0x88] - bl sub_0806A058 + bl GetMonData mov r2, sp movs r6, #0 _081BBCA8: @@ -909599,13 +909599,13 @@ _081BBCFE: adds r1, r6, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r1, r8 strh r0, [r1] adds r1, r6, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData mov r2, sl adds r1, r2, r6 strb r0, [r1] @@ -909619,7 +909619,7 @@ _081BBCFE: ldr r1, _081BBD4C adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, sb strb r0, [r1, #0xc] mov r2, sb @@ -909661,7 +909661,7 @@ _081BBD78: adds r1, #0x11 mov r2, r8 adds r0, r4, r2 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -909672,7 +909672,7 @@ _081BBD78: ldr r1, _081BBDA4 adds r0, r0, r1 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData adds r1, r7, r6 strb r0, [r1] adds r6, #1 @@ -909709,7 +909709,7 @@ _081BBDD4: adds r0, r0, r1 movs r1, #0x19 _081BBDDE: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -909842,27 +909842,27 @@ _081BBEC4: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A058 + bl GetMonData strb r0, [r7] adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #1] adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A058 + bl GetMonData strb r0, [r7, #2] adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A058 + bl GetMonData strb r0, [r7, #3] adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A058 + bl GetMonData strb r0, [r7, #4] adds r0, r4, #0 movs r1, #0x2c - bl sub_0806A058 + bl GetMonData strb r0, [r7, #5] movs r6, #6 b _081BC10A @@ -909947,7 +909947,7 @@ _081BBF94: adds r0, r0, r1 movs r1, #0x37 _081BBF9E: - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 strb r1, [r7] movs r0, #0xff @@ -910036,7 +910036,7 @@ _081BC038: adds r0, r0, r1 movs r1, #0x3f _081BC042: - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 strb r0, [r7] @@ -910143,7 +910143,7 @@ _081BC0F8: adds r0, r0, r1 movs r1, #0x36 _081BC102: - bl sub_0806A058 + bl GetMonData strb r0, [r7] movs r6, #1 _081BC10A: @@ -910158,12 +910158,12 @@ _081BC10A: bx r1 .align 2, 0 _081BC11C: .4byte gUnknown_2024190 - thumb_func_end sub_081BB974 + thumb_func_end CopyPlayerPartnerMonData thumb_func_start sub_081BC120 sub_081BC120: @ 0x081BC120 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -910185,7 +910185,7 @@ sub_081BC12C: @ 0x081BC12C lsls r1, r2, #1 adds r1, r1, r0 ldrb r0, [r1] - bl sub_081BC184 + bl SetPlayerPartnerMonData b _081BC17A .align 2, 0 _081BC150: .4byte gUnknown_2022D08 @@ -910200,7 +910200,7 @@ _081BC160: cmp r0, #0 beq _081BC16E adds r0, r5, #0 - bl sub_081BC184 + bl SetPlayerPartnerMonData _081BC16E: lsrs r4, r4, #1 adds r0, r5, #1 @@ -910209,14 +910209,14 @@ _081BC16E: cmp r5, #5 bls _081BC160 _081BC17A: - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 thumb_func_end sub_081BC12C - thumb_func_start sub_081BC184 -sub_081BC184: @ 0x081BC184 + thumb_func_start SetPlayerPartnerMonData +SetPlayerPartnerMonData: @ 0x081BC184 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -910318,12 +910318,12 @@ _081BC2B8: adds r0, r4, #0 movs r1, #0xb adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r2, r6, #0 adds r2, #0x2e adds r0, r4, #0 movs r1, #0xc - bl sub_0806A774 + bl SetMonData movs r0, #0 mov r8, r0 movs r0, #0x3b @@ -910364,12 +910364,12 @@ _081BC31E: adds r1, #0xd mov r0, sb adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 mov r0, sb adds r2, r7, #0 - bl sub_0806A774 + bl SetMonData adds r7, #1 adds r4, #2 movs r0, #1 @@ -910385,15 +910385,15 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x15 mov r2, sl - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x20 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x19 ldr r2, [sp, #0x28] - bl sub_0806A774 + bl SetMonData ldrb r0, [r6, #0x14] lsls r0, r0, #0x1b lsrs r0, r0, #0x1b @@ -910402,7 +910402,7 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x27 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x14] lsls r0, r0, #0x16 @@ -910411,7 +910411,7 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x28 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x15] lsls r0, r0, #0x19 @@ -910420,7 +910420,7 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x29 mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldr r0, [r6, #0x14] lsls r0, r0, #0xc @@ -910429,7 +910429,7 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x2a mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrh r0, [r6, #0x16] lsls r0, r0, #0x17 @@ -910438,7 +910438,7 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x2b mov r2, sp - bl sub_0806A774 + bl SetMonData mov r1, sp ldrb r0, [r6, #0x17] lsls r0, r0, #0x1a @@ -910447,47 +910447,47 @@ _081BC31E: adds r0, r4, #0 movs r1, #0x2c mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0 ldr r2, [sp, #0x2c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x37 ldr r2, [sp, #0x30] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x39 ldr r2, [sp, #0x18] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3a ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3b ldr r2, [sp, #4] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3c ldr r2, [sp, #8] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3d ldr r2, [sp, #0xc] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3e ldr r2, [sp, #0x10] - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x3f ldr r2, [sp, #0x14] - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC44C: .4byte gUnknown_2024190 @@ -910501,7 +910501,7 @@ _081BC450: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xb - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC468: .4byte gUnknown_2024190 @@ -910516,7 +910516,7 @@ _081BC470: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0xc - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC488: .4byte gUnknown_2024190 @@ -910540,12 +910540,12 @@ _081BC4AA: adds r1, #0xd adds r0, r7, #0 adds r2, r4, #0 - bl sub_0806A774 + bl SetMonData mov r1, r8 adds r1, #0x11 adds r0, r7, #0 adds r2, r6, #0 - bl sub_0806A774 + bl SetMonData adds r6, #1 adds r4, #2 movs r0, #1 @@ -910559,7 +910559,7 @@ _081BC4AA: adds r0, r0, r1 movs r1, #0x15 mov r2, sb - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC4E4: .4byte gUnknown_2024190 @@ -910593,35 +910593,35 @@ _081BC510: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x11 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x12 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x13 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x14 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC56C: .4byte gUnknown_2024190 @@ -910642,7 +910642,7 @@ _081BC574: _081BC58C: adds r3, #3 adds r2, r2, r3 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC598: .4byte gUnknown_2024190 @@ -910658,7 +910658,7 @@ _081BC5A4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #1 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC5BC: .4byte gUnknown_2024190 @@ -910673,7 +910673,7 @@ _081BC5C4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC5DC: .4byte gUnknown_2024190 @@ -910688,7 +910688,7 @@ _081BC5E4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1a - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC5FC: .4byte gUnknown_2024190 @@ -910703,7 +910703,7 @@ _081BC604: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1b - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC61C: .4byte gUnknown_2024190 @@ -910718,7 +910718,7 @@ _081BC624: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1c - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC63C: .4byte gUnknown_2024190 @@ -910733,7 +910733,7 @@ _081BC644: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1d - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC65C: .4byte gUnknown_2024190 @@ -910748,7 +910748,7 @@ _081BC664: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1e - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC67C: .4byte gUnknown_2024190 @@ -910763,7 +910763,7 @@ _081BC684: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x1f - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC69C: .4byte gUnknown_2024190 @@ -910778,7 +910778,7 @@ _081BC6A4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x20 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC6BC: .4byte gUnknown_2024190 @@ -910793,7 +910793,7 @@ _081BC6C4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x22 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC6DC: .4byte gUnknown_2024190 @@ -910808,7 +910808,7 @@ _081BC6E4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x23 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC6FC: .4byte gUnknown_2024190 @@ -910823,7 +910823,7 @@ _081BC704: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x24 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC71C: .4byte gUnknown_2024190 @@ -910838,7 +910838,7 @@ _081BC724: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x25 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC73C: .4byte gUnknown_2024190 @@ -910853,7 +910853,7 @@ _081BC744: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x26 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC75C: .4byte gUnknown_2024190 @@ -910870,35 +910870,35 @@ _081BC764: adds r2, r2, r7 adds r0, r4, #0 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #1 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #2 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #3 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #4 adds r2, r2, r0 adds r0, r4, #0 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData ldrb r2, [r5] lsls r2, r2, #9 adds r0, r7, #5 @@ -910918,7 +910918,7 @@ _081BC7D4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x27 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC7EC: .4byte gUnknown_2024190 @@ -910933,7 +910933,7 @@ _081BC7F4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x28 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC80C: .4byte gUnknown_2024190 @@ -910948,7 +910948,7 @@ _081BC814: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x29 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC82C: .4byte gUnknown_2024190 @@ -910963,7 +910963,7 @@ _081BC834: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2a - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC84C: .4byte gUnknown_2024190 @@ -910978,7 +910978,7 @@ _081BC854: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2b - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC86C: .4byte gUnknown_2024190 @@ -910994,7 +910994,7 @@ _081BC874: adds r2, r2, r7 _081BC884: movs r1, #0x2c - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC88C: .4byte gUnknown_2024190 @@ -911009,7 +911009,7 @@ _081BC894: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC8AC: .4byte gUnknown_2024190 @@ -911024,7 +911024,7 @@ _081BC8B4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #9 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC8CC: .4byte gUnknown_2024190 @@ -911039,7 +911039,7 @@ _081BC8D4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x37 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC8EC: .4byte gUnknown_2024190 @@ -911054,7 +911054,7 @@ _081BC8F4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x38 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC90C: .4byte gUnknown_2024190 @@ -911069,7 +911069,7 @@ _081BC914: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x39 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC92C: .4byte gUnknown_2024190 @@ -911084,7 +911084,7 @@ _081BC934: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3a - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC94C: .4byte gUnknown_2024190 @@ -911099,7 +911099,7 @@ _081BC954: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3b - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC96C: .4byte gUnknown_2024190 @@ -911114,7 +911114,7 @@ _081BC974: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3c - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC98C: .4byte gUnknown_2024190 @@ -911129,7 +911129,7 @@ _081BC994: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3d - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC9AC: .4byte gUnknown_2024190 @@ -911144,7 +911144,7 @@ _081BC9B4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3e - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC9CC: .4byte gUnknown_2024190 @@ -911159,7 +911159,7 @@ _081BC9D4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x3f - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BC9EC: .4byte gUnknown_2024190 @@ -911174,7 +911174,7 @@ _081BC9F4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x16 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCA0C: .4byte gUnknown_2024190 @@ -911189,7 +911189,7 @@ _081BCA14: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x17 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCA2C: .4byte gUnknown_2024190 @@ -911204,7 +911204,7 @@ _081BCA34: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x18 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCA4C: .4byte gUnknown_2024190 @@ -911219,7 +911219,7 @@ _081BCA54: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x21 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCA6C: .4byte gUnknown_2024190 @@ -911234,7 +911234,7 @@ _081BCA74: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x2f - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCA8C: .4byte gUnknown_2024190 @@ -911249,7 +911249,7 @@ _081BCA94: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x30 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCAAC: .4byte gUnknown_2024190 @@ -911264,7 +911264,7 @@ _081BCAB4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x32 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCACC: .4byte gUnknown_2024190 @@ -911279,7 +911279,7 @@ _081BCAD4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x33 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCAEC: .4byte gUnknown_2024190 @@ -911294,7 +911294,7 @@ _081BCAF4: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x34 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCB0C: .4byte gUnknown_2024190 @@ -911309,7 +911309,7 @@ _081BCB14: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x35 - bl sub_0806A774 + bl SetMonData b _081BCB4A .align 2, 0 _081BCB2C: .4byte gUnknown_2024190 @@ -911324,7 +911324,7 @@ _081BCB34: lsls r2, r2, #9 adds r2, r2, r7 movs r1, #0x36 - bl sub_0806A774 + bl SetMonData _081BCB4A: ldr r2, _081BCB7C ldr r0, _081BCB78 @@ -911336,7 +911336,7 @@ _081BCB4A: muls r0, r2, r0 ldr r2, _081BCB74 adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange add sp, #0x34 pop {r3, r4, r5} mov r8, r3 @@ -911349,7 +911349,7 @@ _081BCB4A: _081BCB74: .4byte gUnknown_2024190 _081BCB78: .4byte gUnknown_2023D08 _081BCB7C: .4byte gUnknown_2023D12 - thumb_func_end sub_081BC184 + thumb_func_end SetPlayerPartnerMonData thumb_func_start sub_081BCB80 sub_081BCB80: @ 0x081BCB80 @@ -911399,7 +911399,7 @@ _081BCBB6: cmp r3, r0 blo _081BCBB6 _081BCBD8: - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -911410,8 +911410,8 @@ _081BCBEC: .4byte gUnknown_2022D08 _081BCBF0: .4byte gUnknown_2024190 thumb_func_end sub_081BCB80 - thumb_func_start sub_081BCBF4 -sub_081BCBF4: @ 0x081BCBF4 + thumb_func_start PlayerPartnerHandleLoadMonSprite +PlayerPartnerHandleLoadMonSprite: @ 0x081BCBF4 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -911426,7 +911426,7 @@ sub_081BCBF4: @ 0x081BCBF4 muls r0, r5, r0 ldr r4, _081BCCF0 adds r0, r0, r4 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r6] lsls r0, r0, #1 add r0, r8 @@ -911434,7 +911434,7 @@ sub_081BCBF4: @ 0x081BCBF4 muls r0, r5, r0 adds r0, r0, r4 movs r1, #0xb - bl sub_0806A058 + bl GetMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -911444,12 +911444,12 @@ sub_081BCBF4: @ 0x081BCBF4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _081BCCF4 mov r8, r0 ldrb r0, [r6] movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -911466,7 +911466,7 @@ sub_081BCBF4: @ 0x081BCBF4 mov r0, r8 adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _081BCCF8 ldrb r1, [r6] adds r1, r1, r4 @@ -911535,10 +911535,10 @@ _081BCD00: .4byte 0x0000FF10 _081BCD04: .4byte gUnknown_2024188 _081BCD08: .4byte gUnknown_3005AC0 _081BCD0C: .4byte sub_081BAE70 - thumb_func_end sub_081BCBF4 + thumb_func_end PlayerPartnerHandleLoadMonSprite - thumb_func_start sub_081BCD10 -sub_081BCD10: @ 0x081BCD10 + thumb_func_start PlayerPartnerHandleSwitchInAnim +PlayerPartnerHandleSwitchInAnim: @ 0x081BCD10 push {r4, r5, r6, lr} ldr r5, _081BCD68 ldrb r0, [r5] @@ -911565,7 +911565,7 @@ sub_081BCD10: @ 0x081BCD10 muls r0, r2, r0 ldr r2, _081BCD74 adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r5] lsls r1, r0, #9 adds r1, r1, r6 @@ -911587,7 +911587,7 @@ _081BCD70: .4byte gUnknown_2023D12 _081BCD74: .4byte gUnknown_2024190 _081BCD78: .4byte gUnknown_3005AC0 _081BCD7C: .4byte sub_081BB784 - thumb_func_end sub_081BCD10 + thumb_func_end PlayerPartnerHandleSwitchInAnim thumb_func_start sub_081BCD80 sub_081BCD80: @ 0x081BCD80 @@ -911618,13 +911618,13 @@ sub_081BCD80: @ 0x081BCD80 ldr r1, _081BCEDC adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData mov r8, r0 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 ldr r0, _081BCEE0 - bl sub_0806F0C4 + bl CreateInvisibleSpriteWithCallback ldr r1, _081BCEE4 mov sb, r1 add sb, r6 @@ -911636,12 +911636,12 @@ sub_081BCD80: @ 0x081BCD80 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 mov r0, r8 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon ldr r0, _081BCEE8 mov sl, r0 adds r0, r6, #0 movs r1, #2 - bl sub_080A5534 + bl GetBattlerSpriteCoord adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -911658,7 +911658,7 @@ sub_081BCD80: @ 0x081BCD80 mov r0, sl adds r1, r5, #0 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _081BCEEC adds r4, r6, r4 strb r0, [r4] @@ -911732,7 +911732,7 @@ sub_081BCD80: @ 0x081BCD80 str r1, [r0] movs r0, #0 movs r1, #0xff - bl sub_08074DF0 + bl DoPokeballSendOutAnimation mov r1, sb ldrb r2, [r1] lsls r1, r2, #4 @@ -911818,7 +911818,7 @@ _081BCF44: adds r0, r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BCF7A: pop {r4, r5, r6} pop {r0} @@ -911862,7 +911862,7 @@ _081BCFB4: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _081BCFCE: ldr r0, [r6] ldrb r1, [r5] @@ -911887,7 +911887,7 @@ _081BCFE2: adds r0, r2, #0 adds r1, r2, #0 movs r3, #1 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r1, _081BD010 ldrb r0, [r5] lsls r0, r0, #2 @@ -911903,8 +911903,8 @@ _081BD010: .4byte gUnknown_3005AC0 _081BD014: .4byte sub_081BB4C4 thumb_func_end sub_081BCF8C - thumb_func_start sub_081BD018 -sub_081BD018: @ 0x081BD018 + thumb_func_start PlayerPartnerHandleDrawTrainerPic +PlayerPartnerHandleDrawTrainerPic: @ 0x081BD018 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -911926,7 +911926,7 @@ _081BD03C: .4byte 0x00000C03 _081BD040: .4byte gUnknown_82D95BC _081BD044: ldrh r0, [r2] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId lsls r0, r0, #0x18 lsrs r4, r0, #0x18 movs r0, #0x20 @@ -911951,14 +911951,14 @@ _081BD05A: ldr r5, _081BD118 ldrb r1, [r5] adds r0, r4, #0 - bl sub_0805DBA0 + bl DecompressTrainerBackPic ldrb r0, [r5] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl sub_08069C6C + bl SetMultiuseSpriteTemplateToTrainerBack ldr r6, _081BD11C mov r8, sb lsls r4, r7, #0x10 @@ -911971,7 +911971,7 @@ _081BD05A: adds r0, r6, #0 mov r1, r8 adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r6, _081BD120 ldrb r1, [r5] adds r1, r1, r6 @@ -912034,14 +912034,14 @@ _081BD130: ldr r6, _081BD234 ldrb r1, [r6] adds r0, r5, #0 - bl sub_0805DB54 + bl DecompressTrainerFrontPic ldrb r0, [r6] bl sub_080A630C adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r5, #0 - bl sub_08069D00 + bl SetMultiuseSpriteTemplateToTrainerFront ldr r0, _081BD238 mov r8, r0 lsls r4, r7, #0x10 @@ -912054,7 +912054,7 @@ _081BD130: mov r0, r8 mov r1, sb adds r2, r4, #0 - bl sub_08006B0C + bl CreateSprite ldr r4, _081BD23C ldrb r1, [r6] adds r1, r1, r4 @@ -912063,7 +912063,7 @@ _081BD130: lsls r5, r5, #3 adds r5, r5, r0 ldrh r0, [r5, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r5, _081BD244 ldrb r1, [r6] adds r1, r1, r4 @@ -912164,16 +912164,16 @@ _081BD248: .4byte 0x0000FFFE _081BD24C: .4byte sub_0805D3C8 _081BD250: .4byte gUnknown_3005AC0 _081BD254: .4byte CompleteOnBattlerSpriteCallbackDummy - thumb_func_end sub_081BD018 + thumb_func_end PlayerPartnerHandleDrawTrainerPic - thumb_func_start sub_081BD258 -sub_081BD258: @ 0x081BD258 + thumb_func_start PlayerPartnerHandleTrainerSlide +PlayerPartnerHandleTrainerSlide: @ 0x081BD258 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD258 + thumb_func_end PlayerPartnerHandleTrainerSlide thumb_func_start sub_081BD264 sub_081BD264: @ 0x081BD264 @@ -912235,7 +912235,7 @@ sub_081BD264: @ 0x081BD264 lsls r0, r0, #2 adds r0, r0, r5 ldr r1, _081BD304 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldr r1, _081BD308 ldrb r0, [r4] lsls r0, r0, #2 @@ -912256,8 +912256,8 @@ _081BD308: .4byte gUnknown_3005AC0 _081BD30C: .4byte sub_081BAB34 thumb_func_end sub_081BD264 - thumb_func_start sub_081BD310 -sub_081BD310: @ 0x081BD310 + thumb_func_start PlayerPartnerHandleFaintAnimation +PlayerPartnerHandleFaintAnimation: @ 0x081BD310 push {r4, r5, r6, lr} ldr r6, _081BD35C ldr r4, [r6] @@ -912282,7 +912282,7 @@ sub_081BD310: @ 0x081BD310 adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _081BD344: ldr r0, [r6] ldrb r1, [r5] @@ -912316,11 +912316,11 @@ _081BD364: muls r0, r2, r0 ldr r2, _081BD3E4 adds r0, r0, r2 - bl sub_0805E5AC + bl HandleLowHpMusicChange movs r1, #0x40 rsbs r1, r1, #0 movs r0, #0x10 - bl sub_080A307C + bl PlaySE12WithPanning ldr r2, _081BD3E8 ldr r3, _081BD3EC ldrb r0, [r5] @@ -912368,50 +912368,50 @@ _081BD3EC: .4byte gUnknown_2023E88 _081BD3F0: .4byte sub_08039844 _081BD3F4: .4byte gUnknown_3005AC0 _081BD3F8: .4byte sub_081BB428 - thumb_func_end sub_081BD310 + thumb_func_end PlayerPartnerHandleFaintAnimation - thumb_func_start sub_081BD3FC -sub_081BD3FC: @ 0x081BD3FC + thumb_func_start PlayerPartnerHandlePaletteFade +PlayerPartnerHandlePaletteFade: @ 0x081BD3FC push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD3FC + thumb_func_end PlayerPartnerHandlePaletteFade - thumb_func_start sub_081BD408 -sub_081BD408: @ 0x081BD408 + thumb_func_start PlayerPartnerHandleSuccessBallThrowAnim +PlayerPartnerHandleSuccessBallThrowAnim: @ 0x081BD408 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD408 + thumb_func_end PlayerPartnerHandleSuccessBallThrowAnim - thumb_func_start sub_081BD414 -sub_081BD414: @ 0x081BD414 + thumb_func_start PlayerPartnerHandleBallThrowAnim +PlayerPartnerHandleBallThrowAnim: @ 0x081BD414 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD414 + thumb_func_end PlayerPartnerHandleBallThrowAnim - thumb_func_start sub_081BD420 -sub_081BD420: @ 0x081BD420 + thumb_func_start PlayerPartnerHandlePause +PlayerPartnerHandlePause: @ 0x081BD420 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD420 + thumb_func_end PlayerPartnerHandlePause - thumb_func_start sub_081BD42C -sub_081BD42C: @ 0x081BD42C + thumb_func_start PlayerPartnerHandleMoveAnimation +PlayerPartnerHandleMoveAnimation: @ 0x081BD42C push {r4, r5, r6, lr} ldr r6, _081BD510 ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 beq _081BD43E @@ -912517,7 +912517,7 @@ _081BD43E: lsrs r3, r0, #0x18 cmp r3, #0 beq _081BD534 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted b _081BD552 .align 2, 0 _081BD510: .4byte gUnknown_2023D08 @@ -912552,11 +912552,11 @@ _081BD552: .align 2, 0 _081BD558: .4byte gUnknown_2024174 _081BD55C: .4byte gUnknown_3005AC0 -_081BD560: .4byte sub_081BD564 - thumb_func_end sub_081BD42C +_081BD560: .4byte PlayerPartnerDoMoveAnimation + thumb_func_end PlayerPartnerHandleMoveAnimation - thumb_func_start sub_081BD564 -sub_081BD564: @ 0x081BD564 + thumb_func_start PlayerPartnerDoMoveAnimation +PlayerPartnerDoMoveAnimation: @ 0x081BD564 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -912621,7 +912621,7 @@ _081BD5C6: adds r0, r2, #0 adds r1, r2, #0 movs r3, #5 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation _081BD5E8: ldr r0, [r7] ldrb r1, [r6] @@ -912679,7 +912679,7 @@ _081BD626: adds r0, r2, #0 adds r1, r2, #0 movs r3, #6 - bl sub_0805D6E0 + bl InitAndLaunchSpecialAnimation ldr r0, [r7] ldrb r1, [r6] ldr r0, [r0] @@ -912735,7 +912735,7 @@ _081BD69C: lsls r0, r0, #2 adds r0, r0, r2 strb r4, [r0, #4] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BD6D8: pop {r3, r4, r5} mov r8, r3 @@ -912745,10 +912745,10 @@ _081BD6D8: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD564 + thumb_func_end PlayerPartnerDoMoveAnimation - thumb_func_start sub_081BD6E8 -sub_081BD6E8: @ 0x081BD6E8 + thumb_func_start PlayerPartnerHandlePrintString +PlayerPartnerHandlePrintString: @ 0x081BD6E8 push {r4, lr} ldr r0, _081BD720 movs r1, #0 @@ -912761,7 +912761,7 @@ sub_081BD6E8: @ 0x081BD6E8 ldr r1, _081BD72C adds r0, r0, r1 ldrh r0, [r0] - bl sub_0814E184 + bl PrintOnTrainerHillRecordsWindow ldr r0, _081BD730 movs r1, #0 bl sub_0814FA04 @@ -912781,39 +912781,39 @@ _081BD728: .4byte gUnknown_2023D08 _081BD72C: .4byte gUnknown_2022D0A _081BD730: .4byte gUnknown_2022AE0 _081BD734: .4byte gUnknown_3005AC0 -_081BD738: .4byte sub_081BB534 - thumb_func_end sub_081BD6E8 +_081BD738: .4byte CompleteOnInactiveTextPrinter + thumb_func_end PlayerPartnerHandlePrintString thumb_func_start sub_081BD73C sub_081BD73C: @ 0x081BD73C push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081BD73C - thumb_func_start sub_081BD748 -sub_081BD748: @ 0x081BD748 + thumb_func_start PlayerPartnerHandleChooseAction +PlayerPartnerHandleChooseAction: @ 0x081BD748 push {lr} - bl sub_08063464 - bl sub_081BB828 + bl AI_TrySwitchOrUseItem + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD748 + thumb_func_end PlayerPartnerHandleChooseAction - thumb_func_start sub_081BD758 -sub_081BD758: @ 0x081BD758 + thumb_func_start PlayerPartnerHandleUnknownYesNoBox +PlayerPartnerHandleUnknownYesNoBox: @ 0x081BD758 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BD758 + thumb_func_end PlayerPartnerHandleUnknownYesNoBox - thumb_func_start sub_081BD764 -sub_081BD764: @ 0x081BD764 + thumb_func_start PlayerPartnerHandleChooseMove +PlayerPartnerHandleChooseMove: @ 0x081BD764 push {r4, r5, r6, lr} ldr r6, _081BD7F4 ldrb r4, [r6] @@ -912821,7 +912821,7 @@ sub_081BD764: @ 0x081BD764 ldr r0, _081BD7F8 adds r4, r4, r0 movs r0, #0xf - bl sub_081309A4 + bl BattleAI_SetupAIData bl sub_08130BEC lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -912876,8 +912876,8 @@ _081BD7D8: orrs r2, r5 movs r0, #1 movs r1, #0xa - bl sub_08033FB0 - bl sub_081BB828 + bl BtlController_EmitTwoReturnValues + bl PlayerPartnerBufferExecCompleted pop {r4, r5, r6} pop {r0} bx r0 @@ -912888,21 +912888,21 @@ _081BD7FC: .4byte gUnknown_82ED220 _081BD800: .4byte gUnknown_2023EB0 _081BD804: .4byte gUnknown_2023EB4 _081BD808: .4byte gUnknown_82FACB4 - thumb_func_end sub_081BD764 + thumb_func_end PlayerPartnerHandleChooseMove thumb_func_start sub_081BD80C sub_081BD80C: @ 0x081BD80C push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081BD80C - thumb_func_start sub_081BD818 -sub_081BD818: @ 0x081BD818 + thumb_func_start PlayerPartnerHandleChoosePokemon +PlayerPartnerHandleChoosePokemon: @ 0x081BD818 push {r4, r5, r6, lr} - bl sub_08063674 + bl GetMostSuitableMonToSwitchInto lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #6 @@ -912927,7 +912927,7 @@ _081BD840: ldr r1, _081BD890 adds r0, r0, r1 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081BD83E ldr r1, _081BD894 @@ -912953,8 +912953,8 @@ _081BD86C: lsrs r1, r1, #0x18 movs r0, #1 movs r2, #0 - bl sub_08033FDC - bl sub_081BB828 + bl BtlController_EmitChosenMonReturnValue + bl PlayerPartnerBufferExecCompleted pop {r4, r5, r6} pop {r0} bx r0 @@ -912963,12 +912963,12 @@ _081BD890: .4byte gUnknown_2024190 _081BD894: .4byte gUnknown_2023D12 _081BD898: .4byte gUnknown_2023D08 _081BD89C: .4byte gUnknown_2024140 - thumb_func_end sub_081BD818 + thumb_func_end PlayerPartnerHandleChoosePokemon thumb_func_start sub_081BD8A0 sub_081BD8A0: @ 0x081BD8A0 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -912982,7 +912982,7 @@ sub_081BD8AC: @ 0x081BD8AC push {r6, r7} sub sp, #4 movs r0, #0 - bl sub_0805DDD4 + bl LoadBattleBarGfx ldr r3, _081BD924 ldr r0, _081BD928 mov sb, r0 @@ -913010,7 +913010,7 @@ sub_081BD8AC: @ 0x081BD8AC ldr r4, _081BD934 adds r0, r0, r4 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData mov r8, r0 mov r1, sb ldrb r0, [r1] @@ -913020,7 +913020,7 @@ sub_081BD8AC: @ 0x081BD8AC muls r0, r5, r0 adds r0, r0, r4 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 mov r1, sb ldrb r0, [r1] @@ -913048,7 +913048,7 @@ _081BD93C: ldr r1, _081BD988 adds r0, r0, r1 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 mov r1, sb ldrb r0, [r1] @@ -913082,8 +913082,8 @@ _081BD994: .4byte gUnknown_2023D08 _081BD998: .4byte sub_081BAEB0 thumb_func_end sub_081BD8AC - thumb_func_start sub_081BD99C -sub_081BD99C: @ 0x081BD99C + thumb_func_start PlayerPartnerHandleExpUpdate +PlayerPartnerHandleExpUpdate: @ 0x081BD99C push {r4, r5, r6, r7, lr} ldr r5, _081BD9C8 ldr r6, _081BD9CC @@ -913099,10 +913099,10 @@ sub_081BD99C: @ 0x081BD99C adds r4, r1, r0 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData cmp r0, #0x63 bls _081BD9D4 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted b _081BDA20 .align 2, 0 _081BD9C8: .4byte gUnknown_2022D08 @@ -913110,10 +913110,10 @@ _081BD9CC: .4byte gUnknown_2023D08 _081BD9D0: .4byte gUnknown_2024190 _081BD9D4: movs r0, #1 - bl sub_0805DDD4 + bl LoadBattleBarGfx adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData ldrb r1, [r6] lsls r1, r1, #9 adds r0, r5, #2 @@ -913126,7 +913126,7 @@ _081BD9D4: orrs r4, r0 ldr r0, _081BDA28 movs r1, #0xa - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081BDA2C @@ -913149,18 +913149,18 @@ _081BDA20: pop {r0} bx r0 .align 2, 0 -_081BDA28: .4byte sub_081BAF38 +_081BDA28: .4byte Task_GiveExpToMon _081BDA2C: .4byte gUnknown_3005B60 _081BDA30: .4byte gUnknown_3005AC0 _081BDA34: .4byte sub_08057068 - thumb_func_end sub_081BD99C + thumb_func_end PlayerPartnerHandleExpUpdate - thumb_func_start sub_081BDA38 -sub_081BDA38: @ 0x081BDA38 + thumb_func_start PlayerPartnerHandleStatusIconUpdate +PlayerPartnerHandleStatusIconUpdate: @ 0x081BDA38 push {r4, lr} ldr r4, _081BDA94 ldrb r0, [r4] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _081BDA8C @@ -913177,7 +913177,7 @@ sub_081BDA38: @ 0x081BDA38 ldr r2, _081BDAA0 adds r1, r1, r2 movs r2, #9 - bl sub_080743F0 + bl UpdateHealthboxAttribute ldrb r2, [r4] ldr r0, _081BDAA4 ldr r0, [r0] @@ -913209,14 +913209,14 @@ _081BDAA0: .4byte gUnknown_2024190 _081BDAA4: .4byte gUnknown_2024174 _081BDAA8: .4byte gUnknown_3005AC0 _081BDAAC: .4byte sub_081BB8A0 - thumb_func_end sub_081BDA38 + thumb_func_end PlayerPartnerHandleStatusIconUpdate - thumb_func_start sub_081BDAB0 -sub_081BDAB0: @ 0x081BDAB0 + thumb_func_start PlayerPartnerHandleStatusAnimation +PlayerPartnerHandleStatusAnimation: @ 0x081BDAB0 push {r4, r5, lr} ldr r5, _081BDB08 ldrb r0, [r5] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _081BDB00 @@ -913244,7 +913244,7 @@ sub_081BDAB0: @ 0x081BDAB0 ldrb r2, [r3] lsls r2, r2, #0x18 orrs r1, r2 - bl sub_0805D424 + bl InitAndLaunchChosenStatusAnimation ldr r1, _081BDB10 ldrb r0, [r5] lsls r0, r0, #2 @@ -913260,12 +913260,12 @@ _081BDB08: .4byte gUnknown_2023D08 _081BDB0C: .4byte gUnknown_2022D08 _081BDB10: .4byte gUnknown_3005AC0 _081BDB14: .4byte sub_081BB8A0 - thumb_func_end sub_081BDAB0 + thumb_func_end PlayerPartnerHandleStatusAnimation thumb_func_start sub_081BDB18 sub_081BDB18: @ 0x081BDB18 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913274,7 +913274,7 @@ sub_081BDB18: @ 0x081BDB18 thumb_func_start sub_081BDB24 sub_081BDB24: @ 0x081BDB24 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913283,7 +913283,7 @@ sub_081BDB24: @ 0x081BDB24 thumb_func_start sub_081BDB30 sub_081BDB30: @ 0x081BDB30 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913292,7 +913292,7 @@ sub_081BDB30: @ 0x081BDB30 thumb_func_start sub_081BDB3C sub_081BDB3C: @ 0x081BDB3C push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913301,47 +913301,47 @@ sub_081BDB3C: @ 0x081BDB3C thumb_func_start sub_081BDB48 sub_081BDB48: @ 0x081BDB48 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081BDB48 - thumb_func_start sub_081BDB54 -sub_081BDB54: @ 0x081BDB54 + thumb_func_start PlayerPartnerHandleTwoReturnValues +PlayerPartnerHandleTwoReturnValues: @ 0x081BDB54 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BDB54 + thumb_func_end PlayerPartnerHandleTwoReturnValues - thumb_func_start sub_081BDB60 -sub_081BDB60: @ 0x081BDB60 + thumb_func_start PlayerPartnerHandleChosenMonReturnValue +PlayerPartnerHandleChosenMonReturnValue: @ 0x081BDB60 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BDB60 + thumb_func_end PlayerPartnerHandleChosenMonReturnValue - thumb_func_start sub_081BDB6C -sub_081BDB6C: @ 0x081BDB6C + thumb_func_start PlayerPartnerHandleOneReturnValue +PlayerPartnerHandleOneReturnValue: @ 0x081BDB6C push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BDB6C + thumb_func_end PlayerPartnerHandleOneReturnValue - thumb_func_start sub_081BDB78 -sub_081BDB78: @ 0x081BDB78 + thumb_func_start PlayerPartnerHandleOneReturnValue_Duplicate +PlayerPartnerHandleOneReturnValue_Duplicate: @ 0x081BDB78 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BDB78 + thumb_func_end PlayerPartnerHandleOneReturnValue_Duplicate thumb_func_start PlayerPartnerHandleCmd37 PlayerPartnerHandleCmd37: @ 0x081BDB84 @@ -913352,7 +913352,7 @@ PlayerPartnerHandleCmd37: @ 0x081BDB84 rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913378,7 +913378,7 @@ PlayerPartnerHandleCmd38: @ 0x081BDBA0 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913395,7 +913395,7 @@ PlayerPartnerHandleCmd39: @ 0x081BDBD8 movs r0, #0x7f ands r0, r1 strb r0, [r2] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913417,15 +913417,15 @@ PlayerPartnerHandleCmd40: @ 0x081BDBF0 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _081BDC14: .4byte gUnknown_20229C0 thumb_func_end PlayerPartnerHandleCmd40 - thumb_func_start sub_081BDC18 -sub_081BDC18: @ 0x081BDC18 + thumb_func_start PlayerPartnerHandleHitAnimation +PlayerPartnerHandleHitAnimation: @ 0x081BDC18 push {r4, lr} ldr r3, _081BDC40 ldr r2, _081BDC44 @@ -913442,7 +913442,7 @@ sub_081BDC18: @ 0x081BDC18 lsls r0, r0, #0x1d cmp r0, #0 bge _081BDC4C - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted b _081BDC76 .align 2, 0 _081BDC40: .4byte gUnknown_20205AC @@ -913477,23 +913477,23 @@ _081BDC76: _081BDC7C: .4byte gUnknown_202415D _081BDC80: .4byte gUnknown_3005AC0 _081BDC84: .4byte sub_081BB54C - thumb_func_end sub_081BDC18 + thumb_func_end PlayerPartnerHandleHitAnimation - thumb_func_start sub_081BDC88 -sub_081BDC88: @ 0x081BDC88 + thumb_func_start PlayerPartnerHandleCmd42 +PlayerPartnerHandleCmd42: @ 0x081BDC88 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BDC88 + thumb_func_end PlayerPartnerHandleCmd42 - thumb_func_start sub_081BDC94 -sub_081BDC94: @ 0x081BDC94 + thumb_func_start PlayerPartnerHandlePlaySE +PlayerPartnerHandlePlaySE: @ 0x081BDC94 push {r4, lr} ldr r4, _081BDCD0 ldrb r0, [r4] - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 movs r3, #0x3f cmp r0, #0 @@ -913513,18 +913513,18 @@ _081BDCA8: orrs r0, r1 lsls r1, r3, #0x18 asrs r1, r1, #0x18 - bl sub_080A307C - bl sub_081BB828 + bl PlaySE12WithPanning + bl PlayerPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _081BDCD0: .4byte gUnknown_2023D08 _081BDCD4: .4byte gUnknown_2022D08 - thumb_func_end sub_081BDC94 + thumb_func_end PlayerPartnerHandlePlaySE - thumb_func_start sub_081BDCD8 -sub_081BDCD8: @ 0x081BDCD8 + thumb_func_start PlayerPartnerHandlePlayFanfareOrBGM +PlayerPartnerHandlePlayFanfareOrBGM: @ 0x081BDCD8 push {r4, r5, lr} ldr r4, _081BDD0C ldr r5, _081BDD10 @@ -913535,7 +913535,7 @@ sub_081BDCD8: @ 0x081BDCD8 ldrb r0, [r0] cmp r0, #0 beq _081BDD14 - bl sub_0805E67C + bl BattleStopLowHpSound ldrb r1, [r5] lsls r1, r1, #9 adds r0, r4, #1 @@ -913546,7 +913546,7 @@ sub_081BDCD8: @ 0x081BDCD8 ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A3040 + bl PlayBGM b _081BDD28 .align 2, 0 _081BDD0C: .4byte gUnknown_2022D08 @@ -913560,17 +913560,17 @@ _081BDD14: ldrb r1, [r1] lsls r1, r1, #8 orrs r0, r1 - bl sub_080A29AC + bl PlayFanfare _081BDD28: - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BDCD8 + thumb_func_end PlayerPartnerHandlePlayFanfareOrBGM - thumb_func_start sub_081BDD34 -sub_081BDD34: @ 0x081BDD34 + thumb_func_start PlayerPartnerHandleFaintingCry +PlayerPartnerHandleFaintingCry: @ 0x081BDD34 push {lr} ldr r1, _081BDD68 ldr r0, _081BDD6C @@ -913583,21 +913583,21 @@ sub_081BDD34: @ 0x081BDD34 ldr r1, _081BDD70 adds r0, r0, r1 movs r1, #0xb - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 movs r1, #0x19 rsbs r1, r1, #0 movs r2, #5 - bl sub_080A2BAC - bl sub_081BB828 + bl PlayCry3 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _081BDD68: .4byte gUnknown_2023D12 _081BDD6C: .4byte gUnknown_2023D08 _081BDD70: .4byte gUnknown_2024190 - thumb_func_end sub_081BDD34 + thumb_func_end PlayerPartnerHandleFaintingCry thumb_func_start sub_081BDD74 sub_081BDD74: @ 0x081BDD74 @@ -913609,13 +913609,13 @@ sub_081BDD74: @ 0x081BDD74 adds r1, #1 adds r0, r0, r1 ldrb r0, [r0] - bl sub_08118A24 + bl HandleIntroSlide ldr r2, _081BDDA4 ldrh r0, [r2] movs r1, #1 orrs r0, r1 strh r0, [r2] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -913624,8 +913624,8 @@ _081BDDA0: .4byte gUnknown_2023D08 _081BDDA4: .4byte gUnknown_20240A0 thumb_func_end sub_081BDD74 - thumb_func_start sub_081BDDA8 -sub_081BDDA8: @ 0x081BDDA8 + thumb_func_start PlayerPartnerHandleIntroTrainerBallThrow +PlayerPartnerHandleIntroTrainerBallThrow: @ 0x081BDDA8 push {r4, r5, r6, lr} ldr r6, _081BDE70 ldr r5, _081BDE74 @@ -913692,7 +913692,7 @@ sub_081BDDA8: @ 0x081BDDA8 lsls r0, r0, #2 adds r0, r0, r4 ldr r1, _081BDE84 - bl sub_080A5B9C + bl StoreSpriteCallbackInData6 ldrb r0, [r5] adds r0, r0, r6 ldrb r1, [r0] @@ -913718,7 +913718,7 @@ sub_081BDDA8: @ 0x081BDDA8 lsls r2, r2, #1 adds r1, r4, r2 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _081BDEB6 .align 2, 0 _081BDE70: .4byte gUnknown_2023E88 @@ -913733,7 +913733,7 @@ _081BDE90: .4byte 0x00000C03 _081BDE94: .4byte gUnknown_82D961C _081BDE98: ldrh r0, [r2] - bl sub_081629A4 + bl GetFrontierTrainerFrontSpriteId lsls r0, r0, #0x18 ldr r1, _081BDF38 lsrs r0, r0, #0x15 @@ -913744,7 +913744,7 @@ _081BDE98: lsls r2, r2, #1 adds r1, r4, r2 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette _081BDEB6: ldr r2, _081BDF3C ldr r1, _081BDF40 @@ -913763,7 +913763,7 @@ _081BDEB6: strb r0, [r1, #5] ldr r0, _081BDF48 movs r1, #5 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _081BDF4C @@ -913820,10 +913820,10 @@ _081BDF48: .4byte sub_081BDF64 _081BDF4C: .4byte gUnknown_3005B60 _081BDF50: .4byte gUnknown_2024174 _081BDF54: .4byte gUnknown_2024158 -_081BDF58: .4byte sub_0807352C +_081BDF58: .4byte Task_HidePartyStatusSummary _081BDF5C: .4byte gUnknown_3005AC0 _081BDF60: .4byte sub_081BAA8C - thumb_func_end sub_081BDDA8 + thumb_func_end PlayerPartnerHandleIntroTrainerBallThrow thumb_func_start sub_081BDF64 sub_081BDF64: @ 0x081BDF64 @@ -913855,7 +913855,7 @@ _081BDF90: mov sb, r0 ldrh r0, [r1, #8] strb r0, [r7] - bl sub_080A63E8 + bl IsDoubleBattle lsls r0, r0, #0x18 cmp r0, #0 beq _081BDFB0 @@ -913918,7 +913918,7 @@ _081BDFE0: muls r0, r2, r0 ldr r2, _081BE060 adds r0, r0, r2 - bl sub_0805D998 + bl BattleLoadPlayerMonSpriteGfx ldrb r0, [r7] movs r1, #0 bl sub_081BCD80 @@ -913936,7 +913936,7 @@ _081BE034: mov r3, sb strb r3, [r2] mov r0, r8 - bl sub_080A8964 + bl DestroyTask _081BE04C: pop {r3, r4} mov r8, r3 @@ -913953,8 +913953,8 @@ _081BE068: .4byte gUnknown_2023D08 _081BE06C: .4byte sub_081BACC8 thumb_func_end sub_081BDF64 - thumb_func_start sub_081BE070 -sub_081BE070: @ 0x081BE070 + thumb_func_start PlayerPartnerHandleDrawPartyStatusSummary +PlayerPartnerHandleDrawPartyStatusSummary: @ 0x081BE070 push {r4, r5, r6, lr} ldr r1, _081BE098 ldr r0, _081BE09C @@ -913966,11 +913966,11 @@ sub_081BE070: @ 0x081BE070 cmp r0, #0 beq _081BE0A0 adds r0, r2, #0 - bl sub_080A62F8 + bl GetBattlerSide lsls r0, r0, #0x18 cmp r0, #0 bne _081BE0A0 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted b _081BE114 .align 2, 0 _081BE098: .4byte gUnknown_2022D08 @@ -913999,7 +913999,7 @@ _081BE0A0: subs r4, #2 adds r3, r3, r4 ldrb r3, [r3] - bl sub_08072ED8 + bl CreatePartyStatusSummarySprites ldr r2, _081BE128 ldrb r1, [r5] adds r1, r1, r2 @@ -914045,7 +914045,7 @@ _081BE124: .4byte gUnknown_2022D0C _081BE128: .4byte gUnknown_2024158 _081BE12C: .4byte gUnknown_3005AC0 _081BE130: .4byte sub_081BE134 - thumb_func_end sub_081BE070 + thumb_func_end PlayerPartnerHandleDrawPartyStatusSummary thumb_func_start sub_081BE134 sub_081BE134: @ 0x081BE134 @@ -914075,7 +914075,7 @@ sub_081BE134: @ 0x081BE134 adds r0, r0, r2 movs r1, #0 strb r1, [r0, #5] - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted _081BE16C: pop {r4} pop {r0} @@ -914113,7 +914113,7 @@ PlayerPartnerHandleHidePartyStatusSummary: @ 0x081BE17C ldr r1, _081BE1C8 str r1, [r0] _081BE1AE: - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -914121,24 +914121,24 @@ _081BE1B8: .4byte gUnknown_2024174 _081BE1BC: .4byte gUnknown_2023D08 _081BE1C0: .4byte gUnknown_3005B60 _081BE1C4: .4byte gUnknown_2024158 -_081BE1C8: .4byte sub_0807352C +_081BE1C8: .4byte Task_HidePartyStatusSummary thumb_func_end PlayerPartnerHandleHidePartyStatusSummary - thumb_func_start sub_081BE1CC -sub_081BE1CC: @ 0x081BE1CC + thumb_func_start PlayerPartnerHandleEndBounceEffect +PlayerPartnerHandleEndBounceEffect: @ 0x081BE1CC push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BE1CC + thumb_func_end PlayerPartnerHandleEndBounceEffect thumb_func_start sub_081BE1D8 sub_081BE1D8: @ 0x081BE1D8 push {r4, lr} ldr r4, _081BE228 ldrb r0, [r4] - bl sub_080A6358 + bl IsBattlerSpritePresent lsls r0, r0, #0x18 cmp r0, #0 beq _081BE21E @@ -914169,7 +914169,7 @@ sub_081BE1D8: @ 0x081BE1D8 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _081BE21E: - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -914180,13 +914180,13 @@ _081BE230: .4byte gUnknown_2023E88 _081BE234: .4byte gUnknown_2022D08 thumb_func_end sub_081BE1D8 - thumb_func_start sub_081BE238 -sub_081BE238: @ 0x081BE238 + thumb_func_start PlayerPartnerHandleBattleAnimation +PlayerPartnerHandleBattleAnimation: @ 0x081BE238 push {r4, r5, r6, lr} sub sp, #4 ldr r6, _081BE27C ldrb r0, [r6] - bl sub_0805D7AC + bl mplay_80342A4 lsls r0, r0, #0x18 cmp r0, #0 bne _081BE290 @@ -914207,11 +914207,11 @@ sub_081BE238: @ 0x081BE238 str r4, [sp] adds r0, r2, #0 adds r1, r2, #0 - bl sub_0805D524 + bl TryHandleLaunchBattleTableAnimation lsls r0, r0, #0x18 cmp r0, #0 beq _081BE284 - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted b _081BE290 .align 2, 0 _081BE27C: .4byte gUnknown_2023D08 @@ -914231,28 +914231,28 @@ _081BE290: .align 2, 0 _081BE298: .4byte gUnknown_3005AC0 _081BE29C: .4byte sub_081BB8D0 - thumb_func_end sub_081BE238 + thumb_func_end PlayerPartnerHandleBattleAnimation - thumb_func_start sub_081BE2A0 -sub_081BE2A0: @ 0x081BE2A0 + thumb_func_start PlayerPartnerHandleLinkStandbyMsg +PlayerPartnerHandleLinkStandbyMsg: @ 0x081BE2A0 push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BE2A0 + thumb_func_end PlayerPartnerHandleLinkStandbyMsg - thumb_func_start sub_081BE2AC -sub_081BE2AC: @ 0x081BE2AC + thumb_func_start PlayerPartnerHandleResetActionMoveSelection +PlayerPartnerHandleResetActionMoveSelection: @ 0x081BE2AC push {lr} - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BE2AC + thumb_func_end PlayerPartnerHandleResetActionMoveSelection - thumb_func_start sub_081BE2B8 -sub_081BE2B8: @ 0x081BE2B8 + thumb_func_start FullSaveGame +FullSaveGame: @ 0x081BE2B8 push {r4, lr} ldr r2, _081BE2F0 ldr r1, _081BE2F4 @@ -914267,7 +914267,7 @@ sub_081BE2B8: @ 0x081BE2B8 bl FadeOutMapMusic movs r0, #3 bl BeginFastPaletteFade - bl sub_081BB828 + bl PlayerPartnerBufferExecCompleted ldr r1, _081BE2FC ldrb r0, [r4] lsls r0, r0, #2 @@ -914283,7 +914283,7 @@ _081BE2F4: .4byte gUnknown_2022D08 _081BE2F8: .4byte gUnknown_2023D08 _081BE2FC: .4byte gUnknown_3005AC0 _081BE300: .4byte sub_080583C0 - thumb_func_end sub_081BE2B8 + thumb_func_end FullSaveGame thumb_func_start sub_081BE304 sub_081BE304: @ 0x081BE304 @@ -914291,8 +914291,8 @@ sub_081BE304: @ 0x081BE304 .align 2, 0 thumb_func_end sub_081BE304 - thumb_func_start sub_081BE308 -sub_081BE308: @ 0x081BE308 + thumb_func_start IsMirageTowerVisible +IsMirageTowerVisible: @ 0x081BE308 push {lr} ldr r0, _081BE328 ldr r0, [r0] @@ -914315,20 +914315,20 @@ _081BE32E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081BE308 + thumb_func_end IsMirageTowerVisible - thumb_func_start sub_081BE334 -sub_081BE334: @ 0x081BE334 + thumb_func_start UpdateMirageTowerPulseBlend +UpdateMirageTowerPulseBlend: @ 0x081BE334 push {lr} ldr r0, _081BE344 ldr r0, [r0] adds r0, #4 - bl sub_08151E2C + bl UpdatePulseBlend pop {r0} bx r0 .align 2, 0 _081BE344: .4byte gUnknown_203CBE4 - thumb_func_end sub_081BE334 + thumb_func_end UpdateMirageTowerPulseBlend thumb_func_start sub_081BE348 sub_081BE348: @ 0x081BE348 @@ -914340,8 +914340,8 @@ sub_081BE348: @ 0x081BE348 _081BE350: .4byte gUnknown_203CBE4 thumb_func_end sub_081BE348 - thumb_func_start sub_081BE354 -sub_081BE354: @ 0x081BE354 + thumb_func_start TryStartMirageTowerPulseBlendEffect +TryStartMirageTowerPulseBlendEffect: @ 0x081BE354 push {r4, lr} ldr r4, _081BE364 ldr r0, [r4] @@ -914367,10 +914367,10 @@ _081BE368: cmp r0, #0 beq _081BE3B4 movs r0, #0xc8 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] adds r0, #4 - bl sub_08151B18 + bl InitPulseBlend ldr r0, [r4] adds r0, #4 ldr r1, _081BE3C0 @@ -914382,7 +914382,7 @@ _081BE368: bl MarkUsedPulseBlendPalettes ldr r0, _081BE3C4 movs r1, #0xff - bl sub_080A8878 + bl CreateTask ldr r1, [r4] strb r0, [r1] _081BE3B4: @@ -914392,11 +914392,11 @@ _081BE3B4: .align 2, 0 _081BE3BC: .4byte gUnknown_3005AEC _081BE3C0: .4byte gUnknown_85E7FD4 -_081BE3C4: .4byte sub_081BE334 - thumb_func_end sub_081BE354 +_081BE3C4: .4byte UpdateMirageTowerPulseBlend + thumb_func_end TryStartMirageTowerPulseBlendEffect - thumb_func_start sub_081BE3C8 -sub_081BE3C8: @ 0x081BE3C8 + thumb_func_start ClearMirageTowerPulseBlendEffect +ClearMirageTowerPulseBlendEffect: @ 0x081BE3C8 push {r4, lr} ldr r0, _081BE42C ldr r0, [r0] @@ -914416,26 +914416,26 @@ sub_081BE3C8: @ 0x081BE3C8 cmp r0, #0 beq _081BE424 ldr r0, _081BE434 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 beq _081BE402 ldr r0, [r4] ldrb r0, [r0] - bl sub_080A8964 + bl DestroyTask _081BE402: ldr r0, [r4] adds r0, #4 movs r1, #1 movs r2, #1 - bl sub_08151D04 + bl UnmarkUsedPulseBlendPalettes ldr r0, [r4] adds r0, #4 movs r1, #1 movs r2, #1 bl UnloadUsedPulseBlendPalettes ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _081BE424: @@ -914445,11 +914445,11 @@ _081BE424: .align 2, 0 _081BE42C: .4byte gUnknown_3005AEC _081BE430: .4byte gUnknown_203CBE4 -_081BE434: .4byte sub_081BE334 - thumb_func_end sub_081BE3C8 +_081BE434: .4byte UpdateMirageTowerPulseBlend + thumb_func_end ClearMirageTowerPulseBlendEffect - thumb_func_start sub_081BE438 -sub_081BE438: @ 0x081BE438 + thumb_func_start SetMirageTowerVisibility +SetMirageTowerVisibility: @ 0x081BE438 push {r4, lr} ldr r0, _081BE450 bl VarGet @@ -914481,7 +914481,7 @@ _081BE470: movs r0, #0xa7 lsls r0, r0, #1 bl FlagSet - bl sub_081BE354 + bl TryStartMirageTowerPulseBlendEffect b _081BE48A _081BE482: movs r0, #0xa7 @@ -914491,22 +914491,22 @@ _081BE48A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081BE438 + thumb_func_end SetMirageTowerVisibility - thumb_func_start sub_081BE490 -sub_081BE490: @ 0x081BE490 + thumb_func_start StartPlayerDescendMirageTower +StartPlayerDescendMirageTower: @ 0x081BE490 push {lr} ldr r0, _081BE4A0 movs r1, #8 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_081BE4A0: .4byte sub_081BE4A4 - thumb_func_end sub_081BE490 +_081BE4A0: .4byte PlayerDescendMirageTower + thumb_func_end StartPlayerDescendMirageTower - thumb_func_start sub_081BE4A4 -sub_081BE4A4: @ 0x081BE4A4 + thumb_func_start PlayerDescendMirageTower +PlayerDescendMirageTower: @ 0x081BE4A4 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -914563,8 +914563,8 @@ sub_081BE4A4: @ 0x081BE4A4 cmp r2, r1 blt _081BE51E adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _081BE51E: add sp, #4 pop {r4, r5} @@ -914575,10 +914575,10 @@ _081BE528: .4byte gUnknown_3005AEC _081BE52C: .4byte gUnknown_2036FF0 _081BE530: .4byte gUnknown_20205AC _081BE534: .4byte gUnknown_2037230 - thumb_func_end sub_081BE4A4 + thumb_func_end PlayerDescendMirageTower - thumb_func_start sub_081BE538 -sub_081BE538: @ 0x081BE538 + thumb_func_start StartScreenShake +StartScreenShake: @ 0x081BE538 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -914597,7 +914597,7 @@ sub_081BE538: @ 0x081BE538 lsrs r6, r6, #0x18 ldr r0, _081BE594 movs r1, #9 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081BE598 @@ -914622,12 +914622,12 @@ sub_081BE538: @ 0x081BE538 pop {r0} bx r0 .align 2, 0 -_081BE594: .4byte sub_081BE59C +_081BE594: .4byte DoScreenShake _081BE598: .4byte gUnknown_3005B60 - thumb_func_end sub_081BE538 + thumb_func_end StartScreenShake - thumb_func_start sub_081BE59C -sub_081BE59C: @ 0x081BE59C + thumb_func_start DoScreenShake +DoScreenShake: @ 0x081BE59C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -914660,14 +914660,14 @@ sub_081BE59C: @ 0x081BE59C ldrsh r0, [r4, r1] movs r2, #8 ldrsh r1, [r4, r2] - bl sub_08089C30 + bl SetCameraPanning movs r1, #4 ldrsh r0, [r4, r1] cmp r0, #0 bne _081BE5F8 - bl sub_081BE604 + bl IncrementCeilingCrumbleFinishedCount adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask bl InstallCameraPanAheadCallback _081BE5F8: pop {r4, r5} @@ -914675,13 +914675,13 @@ _081BE5F8: bx r0 .align 2, 0 _081BE600: .4byte gUnknown_3005B68 - thumb_func_end sub_081BE59C + thumb_func_end DoScreenShake - thumb_func_start sub_081BE604 -sub_081BE604: @ 0x081BE604 + thumb_func_start IncrementCeilingCrumbleFinishedCount +IncrementCeilingCrumbleFinishedCount: @ 0x081BE604 push {lr} ldr r0, _081BE628 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -914700,28 +914700,28 @@ _081BE624: .align 2, 0 _081BE628: .4byte WaitCeilingCrumble _081BE62C: .4byte gUnknown_3005B60 - thumb_func_end sub_081BE604 + thumb_func_end IncrementCeilingCrumbleFinishedCount - thumb_func_start sub_081BE630 -sub_081BE630: @ 0x081BE630 + thumb_func_start DoMirageTowerCeilingCrumble +DoMirageTowerCeilingCrumble: @ 0x081BE630 push {lr} ldr r0, _081BE654 bl LoadSpriteSheets - bl sub_081BE6BC + bl CreateCeilingCrumbleSprites ldr r0, _081BE658 movs r1, #8 - bl sub_080A8878 + bl CreateTask movs r0, #2 movs r1, #1 movs r2, #0x10 movs r3, #3 - bl sub_081BE538 + bl StartScreenShake pop {r0} bx r0 .align 2, 0 _081BE654: .4byte gUnknown_85E7F50 _081BE658: .4byte WaitCeilingCrumble - thumb_func_end sub_081BE630 + thumb_func_end DoMirageTowerCeilingCrumble thumb_func_start WaitCeilingCrumble WaitCeilingCrumble: @ 0x081BE65C @@ -914756,11 +914756,11 @@ _081BE68C: bx r0 .align 2, 0 _081BE694: .4byte gUnknown_3005B68 -_081BE698: .4byte sub_081BE69C +_081BE698: .4byte FinishCeilingCrumbleTask thumb_func_end WaitCeilingCrumble - thumb_func_start sub_081BE69C -sub_081BE69C: @ 0x081BE69C + thumb_func_start FinishCeilingCrumbleTask +FinishCeilingCrumbleTask: @ 0x081BE69C push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -914769,15 +914769,15 @@ sub_081BE69C: @ 0x081BE69C lsls r0, r0, #4 bl FreeSpriteTilesByTag adds r0, r4, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts pop {r4} pop {r0} bx r0 - thumb_func_end sub_081BE69C + thumb_func_end FinishCeilingCrumbleTask - thumb_func_start sub_081BE6BC -sub_081BE6BC: @ 0x081BE6BC + thumb_func_start CreateCeilingCrumbleSprites +CreateCeilingCrumbleSprites: @ 0x081BE6BC push {r4, r5, r6, r7, lr} movs r4, #0 ldr r5, _081BE764 @@ -914797,7 +914797,7 @@ _081BE6C6: ldrsh r2, [r0, r3] ldr r0, _081BE76C movs r3, #8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -914838,7 +914838,7 @@ _081BE714: asrs r2, r2, #0x10 ldr r0, _081BE770 movs r3, #8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r0, r1, #4 @@ -914867,10 +914867,10 @@ _081BE764: .4byte gUnknown_85E7F20 _081BE768: .4byte gUnknown_20205AC _081BE76C: .4byte gUnknown_85E801C _081BE770: .4byte gUnknown_85E7FF0 - thumb_func_end sub_081BE6BC + thumb_func_end CreateCeilingCrumbleSprites - thumb_func_start sub_081BE774 -sub_081BE774: @ 0x081BE774 + thumb_func_start MoveCeilingCrumbleSprite +MoveCeilingCrumbleSprite: @ 0x081BE774 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x30] @@ -914901,17 +914901,17 @@ sub_081BE774: @ 0x081BE774 ble _081BE7B6 adds r0, r4, #0 bl DestroySprite - bl sub_081BE604 + bl IncrementCeilingCrumbleFinishedCount _081BE7B6: pop {r4} pop {r0} bx r0 .align 2, 0 _081BE7BC: .4byte gUnknown_85E7F20 - thumb_func_end sub_081BE774 + thumb_func_end MoveCeilingCrumbleSprite - thumb_func_start sub_081BE7C0 -sub_081BE7C0: @ 0x081BE7C0 + thumb_func_start SetInvisibleMirageTowerMetatiles +SetInvisibleMirageTowerMetatiles: @ 0x081BE7C0 push {r4, r5, lr} movs r4, #0 ldr r5, _081BE7EC @@ -914935,18 +914935,18 @@ _081BE7C6: bx r0 .align 2, 0 _081BE7EC: .4byte gUnknown_85E7F60 - thumb_func_end sub_081BE7C0 + thumb_func_end SetInvisibleMirageTowerMetatiles thumb_func_start sub_081BE7F0 sub_081BE7F0: @ 0x081BE7F0 push {lr} ldr r0, _081BE800 movs r1, #9 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_081BE800: .4byte sub_081BE9EC +_081BE800: .4byte DoMirageTowerDisintegration thumb_func_end sub_081BE7F0 thumb_func_start sub_081BE804 @@ -914954,11 +914954,11 @@ sub_081BE804: @ 0x081BE804 push {lr} ldr r0, _081BE814 movs r1, #9 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_081BE814: .4byte sub_081BE890 +_081BE814: .4byte InitMirageTowerShake thumb_func_end sub_081BE804 thumb_func_start sub_081BE818 @@ -914966,15 +914966,15 @@ sub_081BE818: @ 0x081BE818 push {lr} ldr r0, _081BE828 movs r1, #9 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 -_081BE828: .4byte sub_081BECC4 +_081BE828: .4byte DoFossilFallAndSink thumb_func_end sub_081BE818 - thumb_func_start sub_081BE82C -sub_081BE82C: @ 0x081BE82C + thumb_func_start SetBgShakeOffsets +SetBgShakeOffsets: @ 0x081BE82C push {r4, lr} ldr r4, _081BE84C ldr r0, [r4] @@ -914990,10 +914990,10 @@ sub_081BE82C: @ 0x081BE82C bx r0 .align 2, 0 _081BE84C: .4byte gUnknown_203CBE0 - thumb_func_end sub_081BE82C + thumb_func_end SetBgShakeOffsets - thumb_func_start sub_081BE850 -sub_081BE850: @ 0x081BE850 + thumb_func_start UpdateBgShake +UpdateBgShake: @ 0x081BE850 push {lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -915014,7 +915014,7 @@ sub_081BE850: @ 0x081BE850 strh r0, [r1] movs r0, #2 strh r0, [r2, #8] - bl sub_081BE82C + bl SetBgShakeOffsets b _081BE88C .align 2, 0 _081BE880: .4byte gUnknown_3005B60 @@ -915025,10 +915025,10 @@ _081BE888: _081BE88C: pop {r0} bx r0 - thumb_func_end sub_081BE850 + thumb_func_end UpdateBgShake - thumb_func_start sub_081BE890 -sub_081BE890: @ 0x081BE890 + thumb_func_start InitMirageTowerShake +InitMirageTowerShake: @ 0x081BE890 push {r4, r5, lr} sub sp, #0xc lsls r0, r0, #0x18 @@ -915061,31 +915061,31 @@ _081BE8C0: @ jump table .4byte _081BE99C @ case 5 .4byte _081BE9B8 @ case 6 _081BE8DC: - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute b _081BE9A0 _081BE8EC: ldr r4, _081BE91C movs r0, #0x92 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r4, _081BE920 movs r0, #0x80 lsls r0, r0, #4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY b _081BE974 .align 2, 0 _081BE91C: .4byte gUnknown_203CBD0 @@ -915111,7 +915111,7 @@ _081BE94C: ldr r0, _081BE988 ldr r1, [r0] movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081BE98C movs r0, #6 str r0, [sp] @@ -915124,7 +915124,7 @@ _081BE94C: movs r3, #0x1d bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _081BE974: ldr r1, _081BE990 lsls r0, r5, #2 @@ -915141,10 +915141,10 @@ _081BE98C: .4byte gUnknown_85E7D50 _081BE990: .4byte gUnknown_3005B60 _081BE994: movs r0, #0 - bl sub_08001B48 + bl ShowBg b _081BE9A0 _081BE99C: - bl sub_081BE7C0 + bl SetInvisibleMirageTowerMetatiles _081BE9A0: ldr r0, _081BE9B4 lsls r1, r5, #2 @@ -915168,10 +915168,10 @@ _081BE9B8: strh r2, [r0, #2] ldr r0, _081BE9E8 movs r1, #0xa - bl sub_080A8878 + bl CreateTask adds r0, r5, #0 - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _081BE9DC: add sp, #0xc pop {r4, r5} @@ -915179,11 +915179,11 @@ _081BE9DC: bx r0 .align 2, 0 _081BE9E4: .4byte gUnknown_203CBE0 -_081BE9E8: .4byte sub_081BE850 - thumb_func_end sub_081BE890 +_081BE9E8: .4byte UpdateBgShake + thumb_func_end InitMirageTowerShake - thumb_func_start sub_081BE9EC -sub_081BE9EC: @ 0x081BE9EC + thumb_func_start DoMirageTowerDisintegration +DoMirageTowerDisintegration: @ 0x081BE9EC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -915228,7 +915228,7 @@ _081BEA4C: ldr r4, _081BEA5C movs r0, #0xc0 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] b _081BEC9E .align 2, 0 @@ -915388,7 +915388,7 @@ _081BEB4E: cmp r0, #0x2f bls _081BEBC0 ldr r0, [r1] - bl sub_08000BF0 + bl Free ldr r0, [r7] adds r0, r4, r0 movs r1, #0 @@ -915442,42 +915442,42 @@ _081BEBF8: .4byte gUnknown_203CBD0 _081BEBFC: .4byte gUnknown_203CBE0 _081BEC00: movs r0, #0 - bl sub_08002160 + bl UnsetBgTilemapBuffer ldr r0, _081BEC28 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0xff beq _081BEC18 - bl sub_080A8964 + bl DestroyTask _081BEC18: ldr r0, _081BEC2C ldr r1, [r0] movs r0, #0 strh r0, [r1] strh r0, [r1, #2] - bl sub_081BE82C + bl SetBgShakeOffsets b _081BEC9E .align 2, 0 -_081BEC28: .4byte sub_081BE850 +_081BEC28: .4byte UpdateBgShake _081BEC2C: .4byte gUnknown_203CBE0 _081BEC30: ldr r4, _081BEC5C ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r5, #0 str r5, [r4] ldr r4, _081BEC60 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _081BEC64 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] ldr r4, _081BEC68 ldr r0, [r4] - bl sub_08000BF0 + bl Free str r5, [r4] b _081BEC9E .align 2, 0 @@ -915488,24 +915488,24 @@ _081BEC68: .4byte gUnknown_203CBD4 _081BEC6C: movs r0, #0xc movs r1, #2 - bl sub_08001200 + bl SetGpuRegBits movs r0, #8 movs r1, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0 movs r1, #7 movs r2, #0 - bl sub_08001B70 - bl sub_08196DC4 + bl SetBgAttribute + bl InitStandardTextBoxWindows b _081BEC9E _081BEC8C: movs r0, #0 - bl sub_08001B48 + bl ShowBg b _081BEC9E _081BEC94: mov r0, sl - bl sub_080A8964 - bl sub_080988C4 + bl DestroyTask + bl EnableBothScriptContexts _081BEC9E: ldr r0, _081BECC0 mov r2, sl @@ -915527,10 +915527,10 @@ _081BECB0: bx r0 .align 2, 0 _081BECC0: .4byte gUnknown_3005B60 - thumb_func_end sub_081BE9EC + thumb_func_end DoMirageTowerDisintegration - thumb_func_start sub_081BECC4 -sub_081BECC4: @ 0x081BECC4 + thumb_func_start DoFossilFallAndSink +DoFossilFallAndSink: @ 0x081BECC4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -915570,19 +915570,19 @@ _081BECFC: @ jump table _081BED1C: ldr r4, _081BED4C movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r0, #0x80 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1] movs r0, #8 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #4] movs r0, #0x80 lsls r0, r0, #2 - bl sub_08000BDC + bl AllocZeroed ldr r1, [r4] str r0, [r1, #0xc] movs r0, #0 @@ -915637,7 +915637,7 @@ _081BED8C: mov r0, sp movs r1, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite ldr r1, [r4] movs r3, #0 strb r0, [r1, #8] @@ -915746,19 +915746,19 @@ _081BEE68: bl DestroySprite ldr r0, [r5] ldr r0, [r0, #0xc] - bl sub_08000BF0 + bl Free ldr r0, [r5] movs r4, #0 str r4, [r0, #0xc] ldr r0, [r0, #4] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0, #4] ldr r0, [r0] - bl sub_08000BF0 + bl Free ldr r0, [r5] str r4, [r0] - bl sub_08000BF0 + bl Free str r4, [r5] b _081BEEC4 .align 2, 0 @@ -915766,7 +915766,7 @@ _081BEEB4: .4byte gUnknown_20205AC _081BEEB8: .4byte gUnknown_203CBD8 _081BEEBC: .4byte sub_08007140 _081BEEC0: - bl sub_080988C4 + bl EnableBothScriptContexts _081BEEC4: ldr r0, _081BEEE0 lsls r1, r7, #2 @@ -915785,7 +915785,7 @@ _081BEED4: bx r0 .align 2, 0 _081BEEE0: .4byte gUnknown_3005B60 - thumb_func_end sub_081BECC4 + thumb_func_end DoFossilFallAndSink thumb_func_start sub_081BEEE4 sub_081BEEE4: @ 0x081BEEE4 @@ -915961,7 +915961,7 @@ sub_081BF020: @ 0x081BF020 bl EnableInterrupts bl m4aSoundVSyncOff movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r4, #0 str r4, [sp] ldr r0, _081BF098 @@ -915983,11 +915983,11 @@ sub_081BF020: @ 0x081BF020 str r1, [r0, #8] ldr r0, [r0, #8] bl ResetSpriteData - bl sub_080A8818 - bl sub_080B9710 + bl ResetTasks + bl ScanlineEffect_Stop ldr r0, _081BF0A4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081BF0A8 @@ -915997,7 +915997,7 @@ sub_081BF020: @ 0x081BF020 adds r1, r1, r2 strh r4, [r1, #8] ldr r0, _081BF0AC - bl sub_08000540 + bl SetMainCallback2 add sp, #4 pop {r4} pop {r0} @@ -916015,7 +916015,7 @@ _081BF0AC: .4byte sub_081BF0B0 thumb_func_start sub_081BF0B0 sub_081BF0B0: @ 0x081BF0B0 push {lr} - bl sub_080A89D4 + bl RunTasks pop {r0} bx r0 .align 2, 0 @@ -916147,7 +916147,7 @@ _081BF194: str r0, [sp] adds r0, r4, #0 movs r3, #4 - bl sub_081BA808 + bl MultiBootStartMaster strh r6, [r5, #2] movs r0, #6 b _081BF270 @@ -916161,7 +916161,7 @@ _081BF1EC: strh r0, [r5, #2] _081BF1F0: adds r0, r4, #0 - bl sub_081BA3A8 + bl MultiBootMain ldr r1, _081BF1FC str r0, [r1] b _081BF272 @@ -916170,11 +916170,11 @@ _081BF1FC: .4byte gUnknown_3006074 _081BF200: ldr r4, _081BF220 adds r0, r4, #0 - bl sub_081BA3A8 + bl MultiBootMain ldr r1, _081BF224 str r0, [r1] adds r0, r4, #0 - bl sub_081BA8CC + bl MultiBootCheckComplete cmp r0, #0 beq _081BF228 movs r0, #3 @@ -916203,8 +916203,8 @@ _081BF23A: cmp r0, #0 beq _081BF272 adds r0, r2, #0 - bl sub_080A8964 - bl sub_080008F4 + bl DestroyTask + bl DoSoftReset b _081BF272 .align 2, 0 _081BF254: .4byte gUnknown_3002360 @@ -916232,8 +916232,8 @@ _081BF272: _081BF27C: .4byte gUnknown_3002360 thumb_func_end sub_081BF0BC - thumb_func_start sub_081BF280 -sub_081BF280: @ 0x081BF280 + thumb_func_start ShowPokemonSummaryScreen +ShowPokemonSummaryScreen: @ 0x081BF280 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -916248,7 +916248,7 @@ sub_081BF280: @ 0x081BF280 lsrs r6, r6, #0x18 ldr r4, _081BF2D0 ldr r0, _081BF2D4 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _081BF2D8 adds r0, r0, r1 @@ -916377,7 +916377,7 @@ _081BF382: bl sub_0806ED30 _081BF3A6: ldr r0, _081BF3C8 - bl sub_08000540 + bl SetMainCallback2 pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -916388,8 +916388,8 @@ _081BF3B8: .4byte gUnknown_203CBE8 _081BF3BC: .4byte 0x000040C1 _081BF3C0: .4byte 0x000040C2 _081BF3C4: .4byte gUnknown_2024178 -_081BF3C8: .4byte sub_081BF444 - thumb_func_end sub_081BF280 +_081BF3C8: .4byte SummaryScreen_LoadingCB2 + thumb_func_end ShowPokemonSummaryScreen thumb_func_start ShowSelectMovePokemonSummaryScreen ShowSelectMovePokemonSummaryScreen: @ 0x081BF3CC @@ -916412,7 +916412,7 @@ ShowSelectMovePokemonSummaryScreen: @ 0x081BF3CC mov r1, r8 adds r2, r4, #0 adds r3, r5, #0 - bl sub_081BF280 + bl ShowPokemonSummaryScreen ldr r0, _081BF40C ldr r0, [r0] ldr r1, _081BF410 @@ -916429,32 +916429,32 @@ _081BF40C: .4byte gUnknown_203CBE8 _081BF410: .4byte 0x000040C4 thumb_func_end ShowSelectMovePokemonSummaryScreen - thumb_func_start sub_081BF414 -sub_081BF414: @ 0x081BF414 + thumb_func_start CallBattlePyramidFunction +CallBattlePyramidFunction: @ 0x081BF414 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BF414 + thumb_func_end CallBattlePyramidFunction - thumb_func_start sub_081BF430 -sub_081BF430: @ 0x081BF430 + thumb_func_start SummaryScreen_VBlank +SummaryScreen_VBlank: @ 0x081BF430 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BF430 + thumb_func_end SummaryScreen_VBlank - thumb_func_start sub_081BF444 -sub_081BF444: @ 0x081BF444 + thumb_func_start SummaryScreen_LoadingCB2 +SummaryScreen_LoadingCB2: @ 0x081BF444 push {lr} _081BF446: bl sub_081221F8 @@ -916462,7 +916462,7 @@ _081BF446: lsrs r0, r0, #0x18 cmp r0, #1 beq _081BF46A - bl sub_081BF470 + bl SummaryScreen_LoadGraphics lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -916476,10 +916476,10 @@ _081BF46A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081BF444 + thumb_func_end SummaryScreen_LoadingCB2 - thumb_func_start sub_081BF470 -sub_081BF470: @ 0x081BF470 + thumb_func_start SummaryScreen_LoadGraphics +SummaryScreen_LoadGraphics: @ 0x081BF470 push {r4, lr} sub sp, #4 ldr r0, _081BF490 @@ -916526,12 +916526,12 @@ _081BF498: @ jump table .4byte _081BF710 @ case 23 .4byte _081BF72C @ case 24 _081BF4FC: - bl sub_08121E58 - bl sub_08121D90 + bl SetVBlankHBlankCallbacksToNull + bl ResetVramOamAndBgCntRegs bl sub_08199640 b _081BF746 _081BF50A: - bl sub_080B9710 + bl ScanlineEffect_Stop ldr r1, _081BF518 movs r0, #0x87 lsls r0, r0, #3 @@ -916561,7 +916561,7 @@ _081BF544: bl FreeAllSpritePalettes b _081BF746 _081BF54A: - bl sub_081BF784 + bl InitBGs ldr r0, _081BF55C ldr r0, [r0] ldr r1, _081BF560 @@ -916573,7 +916573,7 @@ _081BF54A: _081BF55C: .4byte gUnknown_203CBE8 _081BF560: .4byte 0x000040F0 _081BF564: - bl sub_081BF810 + bl SummaryScreen_DecompressGraphics lsls r0, r0, #0x18 cmp r0, #0 bne _081BF570 @@ -916587,10 +916587,10 @@ _081BF570: .align 2, 0 _081BF57C: .4byte gUnknown_3002360 _081BF580: - bl sub_081C1E88 + bl ResetWindows b _081BF746 _081BF586: - bl sub_081C14D4 + bl DrawPagination ldr r1, _081BF594 movs r0, #0x87 lsls r0, r0, #3 @@ -916602,7 +916602,7 @@ _081BF598: ldr r4, _081BF5B0 ldr r0, [r4] adds r0, #0xc - bl sub_081BF9F8 + bl CopyMonToSummaryStruct ldr r0, [r4] ldr r1, _081BF5B4 adds r0, r0, r1 @@ -916616,7 +916616,7 @@ _081BF5B8: ldr r0, _081BF5D4 ldr r0, [r0] adds r0, #0xc - bl sub_081BFA50 + bl ExtractMonDataToSummaryStruct lsls r0, r0, #0x18 cmp r0, #0 bne _081BF5CA @@ -916648,7 +916648,7 @@ _081BF5F4: ldr r1, _081BF608 adds r0, r0, r1 ldrb r0, [r0] - bl sub_081C2690 + bl PrintPageSpecificText b _081BF746 .align 2, 0 _081BF604: .4byte gUnknown_203CBE8 @@ -916675,7 +916675,7 @@ _081BF630: .4byte gUnknown_203CBE8 _081BF634: .4byte 0x000040C0 _081BF638: bl ResetSpriteIds - bl sub_081C3AEC + bl CreateMoveTypeIcons ldr r0, _081BF650 ldr r0, [r0] ldr r1, _081BF654 @@ -916693,7 +916693,7 @@ _081BF658: adds r0, #0xc ldr r2, _081BF68C adds r1, r1, r2 - bl sub_081C3E18 + bl CreatePokemonSprite ldr r1, [r4] ldr r2, _081BF690 adds r1, r1, r2 @@ -916718,7 +916718,7 @@ _081BF694: ldr r0, _081BF6A8 ldr r0, [r0] adds r0, #0xc - bl sub_081C418C + bl CreateMonMarkingsSprite ldr r1, _081BF6AC movs r0, #0x87 lsls r0, r0, #3 @@ -916731,7 +916731,7 @@ _081BF6B0: ldr r0, _081BF6BC ldr r0, [r0] adds r0, #0xc - bl sub_081C4210 + bl CreateCaughtBallSprite b _081BF746 .align 2, 0 _081BF6BC: .4byte gUnknown_203CBE8 @@ -916745,7 +916745,7 @@ _081BF6C0: .align 2, 0 _081BF6D0: .4byte gUnknown_3002360 _081BF6D4: - bl sub_081C3AA4 + bl SetTypeIcons b _081BF746 _081BF6DA: ldr r0, _081BF6F4 @@ -916757,16 +916757,16 @@ _081BF6DA: beq _081BF700 ldr r0, _081BF6FC movs r1, #0 - bl sub_080A8878 + bl CreateTask b _081BF746 .align 2, 0 _081BF6F4: .4byte gUnknown_203CBE8 _081BF6F8: .4byte 0x000040BC -_081BF6FC: .4byte sub_081BFE44 +_081BF6FC: .4byte HandleInput _081BF700: ldr r0, _081BF70C movs r1, #0 - bl sub_080A8878 + bl CreateTask b _081BF746 .align 2, 0 _081BF70C: .4byte sub_081C1050 @@ -916775,7 +916775,7 @@ _081BF710: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r1, _081BF728 movs r0, #0x87 lsls r0, r0, #3 @@ -916790,7 +916790,7 @@ _081BF72C: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _081BF758 ldrb r1, [r2, #8] movs r0, #0x7f @@ -916812,14 +916812,14 @@ _081BF758: .4byte gUnknown_2037C74 _081BF75C: .4byte gUnknown_3002360 _081BF760: ldr r0, _081BF770 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081BF774 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _081BF77A .align 2, 0 -_081BF770: .4byte sub_081BF430 -_081BF774: .4byte sub_081BF414 +_081BF770: .4byte SummaryScreen_VBlank +_081BF774: .4byte CallBattlePyramidFunction _081BF778: movs r0, #0 _081BF77A: @@ -916828,10 +916828,10 @@ _081BF77A: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081BF470 + thumb_func_end SummaryScreen_LoadGraphics - thumb_func_start sub_081BF784 -sub_081BF784: @ 0x081BF784 + thumb_func_start InitBGs +InitBGs: @ 0x081BF784 push {r4, lr} movs r0, #0 bl ResetBgsAndClearDma3BusyFlags @@ -916844,23 +916844,23 @@ sub_081BF784: @ 0x081BF784 ldr r0, _081BF808 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081BF80C adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] adds r1, #0xbc movs r0, #3 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 @@ -916869,13 +916869,13 @@ sub_081BF784: @ 0x081BF784 movs r1, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg pop {r4} pop {r0} bx r0 @@ -916884,10 +916884,10 @@ _081BF800: .4byte gUnknown_85ECE88 _081BF804: .4byte gUnknown_203CBE8 _081BF808: .4byte 0x000020BC _081BF80C: .4byte 0x000010BC - thumb_func_end sub_081BF784 + thumb_func_end InitBGs - thumb_func_start sub_081BF810 -sub_081BF810: @ 0x081BF810 + thumb_func_start SummaryScreen_DecompressGraphics +SummaryScreen_DecompressGraphics: @ 0x081BF810 push {r4, lr} sub sp, #4 ldr r1, _081BF834 @@ -916932,12 +916932,12 @@ _081BF874: movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _081BF9A6 .align 2, 0 _081BF88C: .4byte gUnknown_8D97DD0 _081BF890: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -917006,11 +917006,11 @@ _081BF920: movs r2, #0x80 lsls r2, r2, #1 movs r1, #0 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081BF944 movs r1, #0x81 movs r2, #0x1e - bl sub_080A1200 + bl LoadPalette ldr r0, _081BF948 ldr r1, [r0] ldr r2, _081BF94C @@ -917023,13 +917023,13 @@ _081BF948: .4byte gUnknown_203CBE8 _081BF94C: .4byte 0x000040F0 _081BF950: ldr r0, _081BF958 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _081BF9A6 .align 2, 0 _081BF958: .4byte gUnknown_85ED40C _081BF95C: ldr r0, _081BF96C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081BF970 ldr r1, [r0] ldr r2, _081BF974 @@ -917041,13 +917041,13 @@ _081BF970: .4byte gUnknown_203CBE8 _081BF974: .4byte 0x000040F0 _081BF978: ldr r0, _081BF980 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _081BF9A6 .align 2, 0 _081BF980: .4byte gUnknown_85ED548 _081BF984: ldr r0, _081BF994 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _081BF998 ldr r1, [r0] ldr r2, _081BF99C @@ -917059,7 +917059,7 @@ _081BF998: .4byte gUnknown_203CBE8 _081BF99C: .4byte 0x000040F0 _081BF9A0: ldr r0, _081BF9B8 - bl sub_080343E4 + bl LoadCompressedSpritePalette _081BF9A6: ldr r0, _081BF9BC ldr r1, [r0] @@ -917080,7 +917080,7 @@ _081BF9C4: movs r1, #0xe8 lsls r1, r1, #1 movs r2, #0x60 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081BF9E4 ldr r0, [r0] ldr r1, _081BF9E8 @@ -917101,10 +917101,10 @@ _081BF9EE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081BF810 + thumb_func_end SummaryScreen_DecompressGraphics - thumb_func_start sub_081BF9F8 -sub_081BF9F8: @ 0x081BF9F8 + thumb_func_start CopyMonToSummaryStruct +CopyMonToSummaryStruct: @ 0x081BF9F8 push {r4, lr} adds r3, r0, #0 ldr r0, _081BFA24 @@ -917139,17 +917139,17 @@ _081BFA30: lsls r1, r1, #4 adds r0, r0, r1 adds r1, r3, #0 - bl sub_08068B44 + bl BoxMonToMon _081BFA46: pop {r4} pop {r0} bx r0 .align 2, 0 _081BFA4C: .4byte 0x000040BE - thumb_func_end sub_081BF9F8 + thumb_func_end CopyMonToSummaryStruct - thumb_func_start sub_081BFA50 -sub_081BFA50: @ 0x081BFA50 + thumb_func_start ExtractMonDataToSummaryStruct +ExtractMonDataToSummaryStruct: @ 0x081BFA50 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -917183,35 +917183,35 @@ _081BFA8A: _081BFA8C: adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x41 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #2] adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A058 + bl GetMonData str r0, [r5, #0x10] adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData strb r0, [r5, #5] adds r0, r4, #0 movs r1, #0x2e - bl sub_0806A058 + bl GetMonData strb r0, [r5, #8] adds r0, r4, #0 movs r1, #0xc - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x2e] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r5, #0xc] adds r0, r4, #0 movs r1, #4 - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xa5 strb r0, [r1] @@ -917224,7 +917224,7 @@ _081BFA8C: _081BFAEC: adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData strb r0, [r5, #4] b _081BFC58 _081BFAF8: @@ -917239,12 +917239,12 @@ _081BFB06: adds r1, r5, #0 adds r1, #0xd adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData strh r0, [r6] adds r1, r5, #0 adds r1, #0x11 adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData adds r1, r7, r5 strb r0, [r1] adds r6, #2 @@ -917253,7 +917253,7 @@ _081BFB06: bls _081BFB06 adds r0, r4, #0 movs r1, #0x15 - bl sub_0806A058 + bl GetMonData mov r1, r8 strb r0, [r1] b _081BFC58 @@ -917269,33 +917269,33 @@ _081BFB36: bne _081BFBA0 _081BFB48: adds r0, r4, #0 - bl sub_0806CB34 + bl GetNature adds r1, r6, #0 adds r1, #0xa3 strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x20] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x22] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x24] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x26] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x28] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x2a] adds r0, r4, #0 movs r1, #0x3d @@ -917305,38 +917305,38 @@ _081BFB98: .4byte gUnknown_2024190 _081BFB9C: .4byte 0x000040BC _081BFBA0: adds r0, r4, #0 - bl sub_0806CB34 + bl GetNature adds r1, r6, #0 adds r1, #0xa3 strb r0, [r1] adds r0, r4, #0 movs r1, #0x39 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x20] adds r0, r4, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x22] adds r0, r4, #0 movs r1, #0x54 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x24] adds r0, r4, #0 movs r1, #0x55 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x26] adds r0, r4, #0 movs r1, #0x57 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x28] adds r0, r4, #0 movs r1, #0x58 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x2a] adds r0, r4, #0 movs r1, #0x56 _081BFBEC: - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x2c] b _081BFC58 _081BFBF4: @@ -917344,41 +917344,41 @@ _081BFBF4: adds r2, #0xa6 adds r0, r4, #0 movs r1, #7 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 - bl sub_081B1D2C + bl GetMonAilment strb r0, [r5, #7] adds r0, r4, #0 movs r1, #0x31 - bl sub_0806A058 + bl GetMonData adds r1, r6, #0 adds r1, #0xa2 strb r0, [r1] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData str r0, [r5, #0x48] adds r0, r4, #0 movs r1, #0x23 - bl sub_0806A058 + bl GetMonData strb r0, [r5, #9] adds r0, r4, #0 movs r1, #0x24 - bl sub_0806A058 + bl GetMonData strb r0, [r5, #0xa] adds r0, r4, #0 movs r1, #0x25 - bl sub_0806A058 + bl GetMonData strb r0, [r5, #0xb] adds r0, r4, #0 movs r1, #0x20 - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0x30] b _081BFC58 _081BFC4A: adds r0, r4, #0 movs r1, #0x52 - bl sub_0806A058 + bl GetMonData strb r0, [r5, #6] movs r0, #1 b _081BFC68 @@ -917400,7 +917400,7 @@ _081BFC68: .align 2, 0 _081BFC74: .4byte gUnknown_203CBE8 _081BFC78: .4byte 0x000040F0 - thumb_func_end sub_081BFA50 + thumb_func_end ExtractMonDataToSummaryStruct thumb_func_start sub_081BFC7C sub_081BFC7C: @ 0x081BFC7C @@ -917435,7 +917435,7 @@ _081BFCB0: adds r0, #0x84 adds r0, r0, r1 ldrh r0, [r0] - bl sub_081C1D40 + bl DrawContestMoveHearts ldr r0, [r6] ldr r5, _081BFD28 adds r0, r0, r5 @@ -917451,20 +917451,20 @@ _081BFCB0: ldr r1, [r6] adds r1, r1, r4 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r6] adds r1, r1, r5 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer movs r1, #0x80 lsls r1, r1, #9 movs r0, #2 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap _081BFD0C: ldr r0, _081BFD30 ldr r1, [r0] @@ -917492,13 +917492,13 @@ _081BFD34: cmp r0, #1 bls _081BFD4A movs r0, #0xd - bl sub_0800365C + bl PutWindowTilemap _081BFD4A: - bl sub_081C1E58 + bl LimitEggSummaryPageDisplay ldr r0, _081BFD64 ldr r0, [r0] adds r0, #0xc - bl sub_081C1B5C + bl DrawPokerusCuredSymbol pop {r4, r5, r6} pop {r0} bx r0 @@ -917510,18 +917510,18 @@ _081BFD64: .4byte gUnknown_203CBE8 thumb_func_start sub_081BFD68 sub_081BFD68: @ 0x081BFD68 push {lr} - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _081BFD7C ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 _081BFD7C: .4byte gUnknown_203CBE8 thumb_func_end sub_081BFD68 - thumb_func_start sub_081BFD80 -sub_081BFD80: @ 0x081BFD80 + thumb_func_start BeginCloseSummaryScreen +BeginCloseSummaryScreen: @ 0x081BFD80 push {r4, lr} sub sp, #4 adds r4, r0, #0 @@ -917533,7 +917533,7 @@ sub_081BFD80: @ 0x081BFD80 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081BFDB0 lsls r0, r4, #2 adds r0, r0, r4 @@ -917547,11 +917547,11 @@ sub_081BFD80: @ 0x081BFD80 bx r0 .align 2, 0 _081BFDB0: .4byte gUnknown_3005B60 -_081BFDB4: .4byte sub_081BFDB8 - thumb_func_end sub_081BFD80 +_081BFDB4: .4byte CloseSummaryScreen + thumb_func_end BeginCloseSummaryScreen - thumb_func_start sub_081BFDB8 -sub_081BFDB8: @ 0x081BFDB8 + thumb_func_start CloseSummaryScreen +CloseSummaryScreen: @ 0x081BFDB8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -917569,14 +917569,14 @@ sub_081BFDB8: @ 0x081BFDB8 ldr r4, _081BFE2C ldr r0, [r4] ldr r0, [r0, #4] - bl sub_08000540 + bl SetMainCallback2 ldr r1, _081BFE30 ldr r0, [r4] ldr r2, _081BFE34 adds r0, r0, r2 ldrb r0, [r0] strb r0, [r1] - bl sub_081C40A0 + bl SummaryScreen_DestroyUnknownTask bl ResetSpriteData bl FreeAllSpritePalettes bl sub_080A2F64 @@ -917594,7 +917594,7 @@ sub_081BFDB8: @ 0x081BFDB8 _081BFE16: bl sub_081BFD68 adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081BFE20: pop {r4, r5} pop {r0} @@ -917607,10 +917607,10 @@ _081BFE34: .4byte 0x000040BE _081BFE38: .4byte gUnknown_30074D0 _081BFE3C: .4byte 0x0000FFFF _081BFE40: .4byte gUnknown_2024178 - thumb_func_end sub_081BFDB8 + thumb_func_end CloseSummaryScreen - thumb_func_start sub_081BFE44 -sub_081BFE44: @ 0x081BFE44 + thumb_func_start HandleInput +HandleInput: @ 0x081BFE44 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -917635,7 +917635,7 @@ sub_081BFE44: @ 0x081BFE44 movs r1, #1 rsbs r1, r1, #0 adds r0, r4, #0 - bl sub_081BFF38 + bl ChangeSummaryPokemon b _081BFF32 .align 2, 0 _081BFE7C: .4byte gUnknown_2037C74 @@ -917647,14 +917647,14 @@ _081BFE84: beq _081BFE96 adds r0, r4, #0 movs r1, #1 - bl sub_081BFF38 + bl ChangeSummaryPokemon b _081BFF32 _081BFE96: movs r0, #0x20 ands r0, r1 cmp r0, #0 bne _081BFEAA - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -917663,7 +917663,7 @@ _081BFEAA: movs r1, #1 rsbs r1, r1, #0 adds r0, r4, #0 - bl sub_081C03C0 + bl ChangePage b _081BFF32 _081BFEB6: ldrh r1, [r5, #0x2e] @@ -917671,7 +917671,7 @@ _081BFEB6: ands r0, r1 cmp r0, #0 bne _081BFECC - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -917679,7 +917679,7 @@ _081BFEB6: _081BFECC: adds r0, r4, #0 movs r1, #1 - bl sub_081C03C0 + bl ChangePage b _081BFF32 _081BFED6: ldrh r1, [r5, #0x2e] @@ -917696,11 +917696,11 @@ _081BFED6: beq _081BFF32 cmp r0, #0 bne _081BFF0C - bl sub_081C40F8 + bl StopPokemonAnimations movs r0, #5 bl sub_080A306C adds r0, r4, #0 - bl sub_081BFD80 + bl BeginCloseSummaryScreen b _081BFF32 .align 2, 0 _081BFF04: .4byte gUnknown_203CBE8 @@ -917716,19 +917716,19 @@ _081BFF1A: ands r0, r1 cmp r0, #0 beq _081BFF32 - bl sub_081C40F8 + bl StopPokemonAnimations movs r0, #5 bl sub_080A306C adds r0, r4, #0 - bl sub_081BFD80 + bl BeginCloseSummaryScreen _081BFF32: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081BFE44 + thumb_func_end HandleInput - thumb_func_start sub_081BFF38 -sub_081BFF38: @ 0x081BFF38 + thumb_func_start ChangeSummaryPokemon +ChangeSummaryPokemon: @ 0x081BFF38 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r7, r0, #0x18 @@ -917786,7 +917786,7 @@ _081BFF90: .align 2, 0 _081BFFA8: .4byte 0x000040BE _081BFFAC: - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -917820,9 +917820,9 @@ _081BFFCA: movs r1, #1 bl SetSpriteInvisibility movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0 movs r1, #2 bl sub_081C19A8 @@ -917849,7 +917849,7 @@ _081C0028: .4byte gUnknown_203CBE8 _081C002C: .4byte 0x000040BE _081C0030: .4byte gUnknown_3005B60 _081C0034: .4byte sub_081C0038 - thumb_func_end sub_081BFF38 + thumb_func_end ChangeSummaryPokemon thumb_func_start sub_081C0038 sub_081C0038: @ 0x081C0038 @@ -917893,7 +917893,7 @@ _081C0098: bl sub_080A2F64 b _081C0220 _081C009E: - bl sub_081C40A0 + bl SummaryScreen_DestroyUnknownTask ldr r0, _081C00AC ldr r0, [r0] ldr r1, _081C00B0 @@ -917923,7 +917923,7 @@ _081C00DC: ldr r4, _081C00F4 ldr r0, [r4] adds r0, #0xc - bl sub_081BF9F8 + bl CopyMonToSummaryStruct ldr r0, [r4] ldr r1, _081C00F8 adds r0, r0, r1 @@ -917937,7 +917937,7 @@ _081C00FC: ldr r0, _081C0110 ldr r0, [r0] adds r0, #0xc - bl sub_081BFA50 + bl ExtractMonDataToSummaryStruct lsls r0, r0, #0x18 cmp r0, #0 bne _081C010E @@ -917950,7 +917950,7 @@ _081C0114: ldr r0, _081C0120 ldr r0, [r0] adds r0, #0xc - bl sub_081C41E8 + bl RemoveAndCreateMonMarkingsSprite b _081C0220 .align 2, 0 _081C0120: .4byte gUnknown_203CBE8 @@ -917958,7 +917958,7 @@ _081C0124: ldr r0, _081C0130 ldr r0, [r0] adds r0, #0xc - bl sub_081C4210 + bl CreateCaughtBallSprite b _081C0220 .align 2, 0 _081C0130: .4byte gUnknown_203CBE8 @@ -917976,7 +917976,7 @@ _081C0134: _081C014A: ldr r0, [r4] adds r0, #0xc - bl sub_081C1B5C + bl DrawPokerusCuredSymbol movs r0, #0 strh r0, [r5, #2] b _081C0220 @@ -917987,7 +917987,7 @@ _081C015C: ldr r0, [r4] adds r0, #0xc adds r1, r5, #2 - bl sub_081C3E18 + bl CreatePokemonSprite ldr r1, [r4] ldr r2, _081C0198 adds r1, r1, r2 @@ -918014,7 +918014,7 @@ _081C0194: .4byte gUnknown_203CBE8 _081C0198: .4byte 0x000040D3 _081C019C: .4byte gUnknown_20205AC _081C01A0: - bl sub_081C3AA4 + bl SetTypeIcons b _081C0220 _081C01A6: bl sub_081C1F1C @@ -918025,8 +918025,8 @@ _081C01AC: ldr r1, _081C01C4 adds r0, r0, r1 ldrb r0, [r0] - bl sub_081C2690 - bl sub_081C1E58 + bl PrintPageSpecificText + bl LimitEggSummaryPageDisplay b _081C0220 .align 2, 0 _081C01C0: .4byte gUnknown_203CBE8 @@ -918055,7 +918055,7 @@ _081C01F0: cmp r0, #0 bne _081C0226 ldr r0, _081C0218 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -918069,7 +918069,7 @@ _081C01F0: b _081C0226 .align 2, 0 _081C0218: .4byte sub_081C1A24 -_081C021C: .4byte sub_081BFE44 +_081C021C: .4byte HandleInput _081C0220: ldrh r0, [r5] adds r0, #1 @@ -918168,7 +918168,7 @@ _081C02D0: muls r0, r4, r0 adds r0, r7, r0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081C029C adds r0, r4, #0 @@ -918267,7 +918267,7 @@ sub_081C0384: @ 0x081C0384 push {r4, lr} adds r4, r0, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081C03B8 ldr r0, _081C03B0 @@ -918279,7 +918279,7 @@ sub_081C0384: @ 0x081C0384 bne _081C03AC adds r0, r4, #0 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081C03B8 _081C03AC: @@ -918296,8 +918296,8 @@ _081C03BA: bx r1 thumb_func_end sub_081C0384 - thumb_func_start sub_081C03C0 -sub_081C03C0: @ 0x081C03C0 + thumb_func_start ChangePage +ChangePage: @ 0x081C03C0 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -918386,7 +918386,7 @@ _081C046C: .4byte gUnknown_3005B68 _081C0470: .4byte 0x000040C0 _081C0474: .4byte 0x000040C1 _081C0478: .4byte 0x000040C2 -_081C047C: .4byte sub_081C04C0 +_081C047C: .4byte PssScrollRight _081C0480: ldr r1, _081C04B4 mov r0, sb @@ -918401,7 +918401,7 @@ _081C0490: ldr r2, _081C04BC adds r0, r0, r2 ldrb r0, [r0] - bl sub_081C26D8 + bl CreateTextPrinterTask bl HidePageSpecificSprites _081C04A2: add sp, #0xc @@ -918413,13 +918413,13 @@ _081C04A2: pop {r0} bx r0 .align 2, 0 -_081C04B4: .4byte sub_081C05F8 +_081C04B4: .4byte PssScrollLeft _081C04B8: .4byte gUnknown_203CBE8 _081C04BC: .4byte 0x000040C0 - thumb_func_end sub_081C03C0 + thumb_func_end ChangePage - thumb_func_start sub_081C04C0 -sub_081C04C0: @ 0x081C04C0 + thumb_func_start PssScrollRight +PssScrollRight: @ 0x081C04C0 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -918444,13 +918444,13 @@ sub_081C04C0: @ 0x081C04C0 movs r0, #1 movs r1, #7 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081C0532 .align 2, 0 _081C0508: .4byte gUnknown_3005B68 @@ -918462,18 +918462,18 @@ _081C0514: movs r0, #2 movs r1, #7 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081C0532: ldrb r0, [r4, #2] movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX ldrb r0, [r4, #2] ldr r1, _081C058C ldr r1, [r1] @@ -918483,17 +918483,17 @@ _081C0532: lsls r2, r2, #0xc adds r2, #0xbc adds r1, r1, r2 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg _081C055E: ldrb r0, [r4, #2] movs r1, #0x80 lsls r1, r1, #6 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX ldrh r0, [r4] adds r0, #0x20 strh r0, [r4] @@ -918516,11 +918516,11 @@ _081C0586: _081C058C: .4byte gUnknown_203CBE8 _081C0590: .4byte 0x000040C0 _081C0594: .4byte gUnknown_3005B60 -_081C0598: .4byte sub_081C059C - thumb_func_end sub_081C04C0 +_081C0598: .4byte PssScrollRightEnd + thumb_func_end PssScrollRight - thumb_func_start sub_081C059C -sub_081C059C: @ 0x081C059C + thumb_func_start PssScrollRightEnd +PssScrollRightEnd: @ 0x081C059C push {r4, r5, lr} adds r4, r0, #0 lsls r4, r4, #0x18 @@ -918541,13 +918541,13 @@ sub_081C059C: @ 0x081C059C strb r0, [r3] strh r1, [r2, #2] strh r1, [r2] - bl sub_081C14D4 + bl DrawPagination ldr r0, [r5] ldr r1, _081C05F4 adds r0, r0, r1 ldrb r0, [r0] bl sub_081C23D4 - bl sub_081C3AA4 + bl SetTypeIcons bl CheckExperienceProgressBar adds r0, r4, #0 bl SwitchTaskToFollowupFunc @@ -918559,10 +918559,10 @@ _081C05E8: .4byte gUnknown_3005B68 _081C05EC: .4byte gUnknown_203CBE8 _081C05F0: .4byte 0x000040C9 _081C05F4: .4byte 0x000040C0 - thumb_func_end sub_081C059C + thumb_func_end PssScrollRightEnd - thumb_func_start sub_081C05F8 -sub_081C05F8: @ 0x081C05F8 + thumb_func_start PssScrollLeft +PssScrollLeft: @ 0x081C05F8 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -918596,13 +918596,13 @@ _081C0632: movs r1, #0x80 lsls r1, r1, #9 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX _081C0640: ldrb r0, [r4, #2] movs r1, #0x80 lsls r1, r1, #6 movs r2, #2 - bl sub_08001D1C + bl ChangeBgX ldrh r0, [r4] adds r0, #0x20 strh r0, [r4] @@ -918623,11 +918623,11 @@ _081C0668: bx r0 .align 2, 0 _081C0670: .4byte gUnknown_3005B60 -_081C0674: .4byte sub_081C0678 - thumb_func_end sub_081C05F8 +_081C0674: .4byte PssScrollLeftEnd + thumb_func_end PssScrollLeft - thumb_func_start sub_081C0678 -sub_081C0678: @ 0x081C0678 + thumb_func_start PssScrollLeftEnd +PssScrollLeftEnd: @ 0x081C0678 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -918646,13 +918646,13 @@ sub_081C0678: @ 0x081C0678 movs r0, #1 movs r1, #7 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081C06DA .align 2, 0 _081C06B4: .4byte gUnknown_3005B68 @@ -918662,13 +918662,13 @@ _081C06C0: movs r0, #2 movs r1, #7 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 movs r1, #7 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081C06DA: ldr r6, _081C0748 ldr r2, [r6] @@ -918683,17 +918683,17 @@ _081C06DA: ldr r3, _081C0750 adds r1, r1, r3 adds r1, r2, r1 - bl sub_0800212C + bl SetBgTilemapBuffer ldrb r0, [r4, #2] movs r1, #0x80 lsls r1, r1, #9 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX _081C0704: movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r2, [r6] ldr r0, _081C0754 adds r2, r2, r0 @@ -918704,12 +918704,12 @@ _081C0704: strb r0, [r2] strh r1, [r4, #2] strh r1, [r4] - bl sub_081C14D4 + bl DrawPagination ldr r0, [r6] adds r0, r0, r7 ldrb r0, [r0] bl sub_081C23D4 - bl sub_081C3AA4 + bl SetTypeIcons bl CheckExperienceProgressBar adds r0, r5, #0 bl SwitchTaskToFollowupFunc @@ -918721,7 +918721,7 @@ _081C0748: .4byte gUnknown_203CBE8 _081C074C: .4byte 0x000040C0 _081C0750: .4byte 0xFFFFF0BC _081C0754: .4byte 0x000040C9 - thumb_func_end sub_081C0678 + thumb_func_end PssScrollLeftEnd thumb_func_start CheckExperienceProgressBar CheckExperienceProgressBar: @ 0x081C0758 @@ -918735,7 +918735,7 @@ CheckExperienceProgressBar: @ 0x081C0758 bne _081C0770 adds r0, r1, #0 adds r0, #0xc - bl sub_081C1C00 + bl DrawExperienceProgressBar _081C0770: pop {r0} bx r0 @@ -918766,7 +918766,7 @@ sub_081C077C: @ 0x081C077C ldrh r6, [r1] mov r8, r6 movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap ldr r2, _081C085C ldr r0, [r5] ldr r1, _081C0860 @@ -918782,7 +918782,7 @@ sub_081C077C: @ 0x081C077C cmp r0, #0 blt _081C07CA movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap _081C07CA: movs r4, #3 rsbs r4, r4, #0 @@ -918800,9 +918800,9 @@ _081C07CA: cmp r0, #0 bne _081C07F8 movs r0, #5 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #6 - bl sub_0800365C + bl PutWindowTilemap _081C07F8: ldr r0, [r5] ldr r1, _081C0868 @@ -918817,15 +918817,15 @@ _081C07F8: movs r2, #0 bl sub_081C1AC8 mov r0, r8 - bl sub_081C36D4 + bl PrintMoveDetails bl sub_081C377C - bl sub_081C3D14 + bl SetNewMoveTypeIcon movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #8 bl sub_081C4300 ldr r1, _081C0870 @@ -918849,11 +918849,11 @@ _081C0864: .4byte 0x000040C8 _081C0868: .4byte 0x000020BC _081C086C: .4byte 0x000030BC _081C0870: .4byte gUnknown_3005B60 -_081C0874: .4byte sub_081C0878 +_081C0874: .4byte HandleInput_MoveSelect thumb_func_end sub_081C077C - thumb_func_start sub_081C0878 -sub_081C0878: @ 0x081C0878 + thumb_func_start HandleInput_MoveSelect +HandleInput_MoveSelect: @ 0x081C0878 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -918967,7 +918967,7 @@ _081C096E: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081C0878 + thumb_func_end HandleInput_MoveSelect thumb_func_start sub_081C0974 sub_081C0974: @ 0x081C0974 @@ -919063,13 +919063,13 @@ _081C09F6: ble _081C09D0 _081C0A16: adds r0, r5, #0 - bl sub_081C1D40 + bl DrawContestMoveHearts movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r5, #0 - bl sub_081C36D4 + bl PrintMoveDetails mov r1, r8 ldrb r0, [r1] cmp r0, #4 @@ -919088,7 +919088,7 @@ _081C0A44: bne _081C0A92 _081C0A4C: movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap ldr r2, _081C0AF4 ldr r0, _081C0AEC ldr r0, [r0] @@ -919105,10 +919105,10 @@ _081C0A4C: cmp r0, #0 blt _081C0A76 movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap _081C0A76: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r4, #3 rsbs r4, r4, #0 movs r0, #9 @@ -919135,11 +919135,11 @@ _081C0A92: cmp r0, #0 bne _081C0AD4 movs r0, #0xe - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xf - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0 movs r1, #3 bl sub_081C16D8 @@ -919196,11 +919196,11 @@ sub_081C0B28: @ 0x081C0B28 movs r0, #8 bl sub_081C4468 movs r0, #6 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_081C36D4 + bl PrintMoveDetails ldr r4, _081C0BB8 ldr r0, [r4] ldr r1, _081C0BBC @@ -919222,9 +919222,9 @@ sub_081C0B28: @ 0x081C0B28 cmp r0, #4 beq _081C0B92 movs r0, #0xe - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xf - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 movs r1, #3 bl sub_081C16D8 @@ -919234,11 +919234,11 @@ sub_081C0B28: @ 0x081C0B28 bl sub_081C1830 _081C0B92: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r0, _081C0BC8 lsls r1, r5, #2 adds r1, r1, r5 @@ -919255,7 +919255,7 @@ _081C0BBC: .4byte 0x000020BC _081C0BC0: .4byte 0x000030BC _081C0BC4: .4byte 0x000040C6 _081C0BC8: .4byte gUnknown_3005B60 -_081C0BCC: .4byte sub_081BFE44 +_081C0BCC: .4byte HandleInput thumb_func_end sub_081C0B28 thumb_func_start sub_081C0BD0 @@ -919453,7 +919453,7 @@ _081C0D64: ldr r5, _081C0DE0 ldr r0, [r5] adds r0, #0xc - bl sub_081BF9F8 + bl CopyMonToSummaryStruct ldr r1, [r5] ldr r6, _081C0DDC adds r0, r1, r6 @@ -919484,13 +919484,13 @@ _081C0D98: adds r1, r1, r0 ldrh r4, [r1] adds r0, r4, #0 - bl sub_081C36D4 + bl PrintMoveDetails adds r0, r4, #0 - bl sub_081C1D40 + bl DrawContestMoveHearts movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldr r1, _081C0DE8 lsls r0, r7, #2 adds r0, r0, r7 @@ -919507,7 +919507,7 @@ _081C0DDC: .4byte 0x000040C6 _081C0DE0: .4byte gUnknown_203CBE8 _081C0DE4: .4byte 0x000040C7 _081C0DE8: .4byte gUnknown_3005B60 -_081C0DEC: .4byte sub_081C0878 +_081C0DEC: .4byte HandleInput_MoveSelect thumb_func_end sub_081C0CE4 thumb_func_start sub_081C0DF0 @@ -919608,26 +919608,26 @@ sub_081C0DF0: @ 0x081C0DF0 adds r1, #0xd adds r0, r7, #0 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r1, r6, #0 adds r1, #0xd adds r0, r7, #0 ldr r2, [sp, #0x1c] - bl sub_0806A774 + bl SetMonData adds r4, #0x11 adds r0, r7, #0 adds r1, r4, #0 ldr r2, [sp, #0x20] - bl sub_0806A774 + bl SetMonData adds r6, #0x11 adds r0, r7, #0 adds r1, r6, #0 ldr r2, [sp, #0x24] - bl sub_0806A774 + bl SetMonData adds r0, r7, #0 movs r1, #0x15 adds r2, r5, #0 - bl sub_0806A774 + bl SetMonData mov r0, sp ldrh r0, [r0] ldr r1, [sp, #8] @@ -919758,26 +919758,26 @@ sub_081C0F20: @ 0x081C0F20 adds r1, #0xd adds r0, r7, #0 mov r2, sp - bl sub_0806A864 + bl SetBoxMonData adds r1, r6, #0 adds r1, #0xd adds r0, r7, #0 ldr r2, [sp, #0x1c] - bl sub_0806A864 + bl SetBoxMonData adds r4, #0x11 adds r0, r7, #0 adds r1, r4, #0 ldr r2, [sp, #0x20] - bl sub_0806A864 + bl SetBoxMonData adds r6, #0x11 adds r0, r7, #0 adds r1, r6, #0 ldr r2, [sp, #0x24] - bl sub_0806A864 + bl SetBoxMonData adds r0, r7, #0 movs r1, #0x15 adds r2, r5, #0 - bl sub_0806A864 + bl SetBoxMonData mov r0, sp ldrh r0, [r0] ldr r1, [sp, #8] @@ -919816,7 +919816,7 @@ sub_081C1050: @ 0x081C1050 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081C3D14 + bl SetNewMoveTypeIcon movs r0, #8 bl sub_081C4300 ldr r1, _081C1078 @@ -919831,11 +919831,11 @@ sub_081C1050: @ 0x081C1050 bx r0 .align 2, 0 _081C1078: .4byte gUnknown_3005B60 -_081C107C: .4byte sub_081C1080 +_081C107C: .4byte HandleReplaceMoveInput thumb_func_end sub_081C1050 - thumb_func_start sub_081C1080 -sub_081C1080: @ 0x081C1080 + thumb_func_start HandleReplaceMoveInput +HandleReplaceMoveInput: @ 0x081C1080 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -919906,7 +919906,7 @@ _081C1110: ands r0, r1 cmp r0, #0 bne _081C1124 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -919915,7 +919915,7 @@ _081C1124: movs r1, #1 rsbs r1, r1, #0 adds r0, r5, #0 - bl sub_081C03C0 + bl ChangePage b _081C11CE _081C1130: ldrh r1, [r6, #0x2e] @@ -919923,7 +919923,7 @@ _081C1130: ands r0, r1 cmp r0, #0 bne _081C1146 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -919931,7 +919931,7 @@ _081C1130: _081C1146: adds r0, r5, #0 movs r1, #1 - bl sub_081C03C0 + bl ChangePage b _081C11CE _081C1150: ldrh r1, [r6, #0x2e] @@ -919939,12 +919939,12 @@ _081C1150: ands r0, r1 cmp r0, #0 beq _081C11AA - bl sub_081C11DC + bl CanReplaceMove lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bne _081C119C - bl sub_081C40F8 + bl StopPokemonAnimations movs r0, #5 bl sub_080A306C ldr r2, _081C118C @@ -919958,7 +919958,7 @@ _081C1150: ldrb r0, [r2] strh r0, [r1] adds r0, r5, #0 - bl sub_081BFD80 + bl BeginCloseSummaryScreen b _081C11CE .align 2, 0 _081C118C: .4byte gUnknown_203CBED @@ -919969,14 +919969,14 @@ _081C119C: movs r0, #0x20 bl sub_080A306C adds r0, r5, #0 - bl sub_081C1228 + bl ShowHMMovesCantBeForgottenWindow b _081C11CE _081C11AA: movs r0, #2 ands r0, r1 cmp r0, #0 beq _081C11CE - bl sub_081C40F8 + bl StopPokemonAnimations movs r0, #5 bl sub_080A306C ldr r1, _081C11D4 @@ -919986,7 +919986,7 @@ _081C11AA: movs r0, #4 strh r0, [r1] adds r0, r5, #0 - bl sub_081BFD80 + bl BeginCloseSummaryScreen _081C11CE: pop {r4, r5, r6} pop {r0} @@ -919994,10 +919994,10 @@ _081C11CE: .align 2, 0 _081C11D4: .4byte gUnknown_203CBED _081C11D8: .4byte gUnknown_2037282 - thumb_func_end sub_081C1080 + thumb_func_end HandleReplaceMoveInput - thumb_func_start sub_081C11DC -sub_081C11DC: @ 0x081C11DC + thumb_func_start CanReplaceMove +CanReplaceMove: @ 0x081C11DC push {lr} ldr r0, _081C1214 ldr r2, [r0] @@ -920017,7 +920017,7 @@ sub_081C11DC: @ 0x081C11DC adds r0, #0x84 adds r0, r0, r1 ldrh r0, [r0] - bl sub_081B69CC + bl IsMoveHm lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -920035,20 +920035,20 @@ _081C1222: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C11DC + thumb_func_end CanReplaceMove - thumb_func_start sub_081C1228 -sub_081C1228: @ 0x081C1228 + thumb_func_start ShowHMMovesCantBeForgottenWindow +ShowHMMovesCantBeForgottenWindow: @ 0x081C1228 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0xe - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xf - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0 movs r1, #3 bl sub_081C16D8 @@ -920056,7 +920056,7 @@ sub_081C1228: @ 0x081C1228 movs r1, #3 movs r2, #0 bl sub_081C1830 - bl sub_081C3978 + bl PrintHMMovesCantBeForgotten ldr r1, _081C126C lsls r0, r4, #2 adds r0, r0, r4 @@ -920069,11 +920069,11 @@ sub_081C1228: @ 0x081C1228 bx r0 .align 2, 0 _081C126C: .4byte gUnknown_3005B60 -_081C1270: .4byte sub_081C1274 - thumb_func_end sub_081C1228 +_081C1270: .4byte HandleHMMovesCantBeForgottenInput + thumb_func_end ShowHMMovesCantBeForgottenWindow - thumb_func_start sub_081C1274 -sub_081C1274: @ 0x081C1274 + thumb_func_start HandleHMMovesCantBeForgottenInput +HandleHMMovesCantBeForgottenInput: @ 0x081C1274 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -920089,7 +920089,7 @@ sub_081C1274: @ 0x081C1274 mov r4, r8 add r4, sb ldr r0, _081C12D4 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -920151,7 +920151,7 @@ _081C1310: ands r0, r1 cmp r0, #0 bne _081C1324 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -920167,7 +920167,7 @@ _081C1324: b _081C14A8 _081C1334: movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap ldr r2, _081C1388 ldr r0, [r4] ldr r1, _081C138C @@ -920183,7 +920183,7 @@ _081C1334: cmp r0, #0 blt _081C135C movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap _081C135C: ldr r1, [r4] ldr r2, _081C1390 @@ -920208,14 +920208,14 @@ _081C1384: .4byte 0x000040C0 _081C1388: .4byte gUnknown_20205AC _081C138C: .4byte 0x000040D5 _081C1390: .4byte 0x000040C6 -_081C1394: .4byte sub_081C1080 +_081C1394: .4byte HandleReplaceMoveInput _081C1398: ldrh r1, [r6, #0x2e] movs r0, #0x10 ands r0, r1 cmp r0, #0 bne _081C13AE - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -920229,7 +920229,7 @@ _081C13AE: cmp r0, #3 beq _081C14A8 movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap ldr r2, _081C1428 ldr r0, [r4] ldr r1, _081C142C @@ -920245,7 +920245,7 @@ _081C13AE: cmp r0, #0 blt _081C13E4 movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap _081C13E4: ldr r1, [r4] ldr r2, _081C1430 @@ -920263,7 +920263,7 @@ _081C13E4: adds r0, r7, #0 movs r1, #1 _081C1402: - bl sub_081C03C0 + bl ChangePage movs r4, #2 rsbs r4, r4, #0 movs r0, #9 @@ -920280,7 +920280,7 @@ _081C1424: .4byte 0x000040C0 _081C1428: .4byte gUnknown_20205AC _081C142C: .4byte 0x000040D5 _081C1430: .4byte 0x000040C6 -_081C1434: .4byte sub_081C1080 +_081C1434: .4byte HandleReplaceMoveInput _081C1438: ldrh r1, [r6, #0x2e] movs r0, #3 @@ -920288,7 +920288,7 @@ _081C1438: cmp r0, #0 beq _081C14A8 movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap ldr r2, _081C14B4 ldr r4, _081C14B8 ldr r0, [r4] @@ -920305,7 +920305,7 @@ _081C1438: cmp r0, #0 blt _081C146C movs r0, #0xd - bl sub_08003774 + bl ClearWindowTilemap _081C146C: ldr r1, [r4] ldr r2, _081C14C0 @@ -920316,9 +920316,9 @@ _081C146C: adds r1, r1, r0 ldrh r5, [r1] adds r0, r5, #0 - bl sub_081C36D4 + bl PrintMoveDetails movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r4, #3 rsbs r4, r4, #0 movs r0, #9 @@ -920346,8 +920346,8 @@ _081C14B4: .4byte gUnknown_20205AC _081C14B8: .4byte gUnknown_203CBE8 _081C14BC: .4byte 0x000040D5 _081C14C0: .4byte 0x000040C6 -_081C14C4: .4byte sub_081C1080 - thumb_func_end sub_081C1274 +_081C14C4: .4byte HandleReplaceMoveInput + thumb_func_end HandleHMMovesCantBeForgottenInput thumb_func_start sub_081C14C8 sub_081C14C8: @ 0x081C14C8 @@ -920358,8 +920358,8 @@ sub_081C14C8: @ 0x081C14C8 _081C14D0: .4byte gUnknown_203CBED thumb_func_end sub_081C14C8 - thumb_func_start sub_081C14D4 -sub_081C14D4: @ 0x081C14D4 + thumb_func_start DrawPagination +DrawPagination: @ 0x081C14D4 push {r4, r5, r6, r7, lr} sub sp, #0xc movs r0, #0x20 @@ -920492,15 +920492,15 @@ _081C15AC: movs r3, #0 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r4, #0 - bl sub_08000BF0 + bl Free add sp, #0xc pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C14D4 + thumb_func_end DrawPagination thumb_func_start sub_081C15E4 sub_081C15E4: @ 0x081C15E4 @@ -920617,7 +920617,7 @@ _081C16BE: cmp r5, r0 blo _081C169C adds r0, r7, #0 - bl sub_08000BF0 + bl Free add sp, #4 pop {r3} mov r8, r3 @@ -920665,14 +920665,14 @@ _081C1718: .4byte 0x000020BC _081C171C: ldr r5, _081C174C adds r0, r5, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff bne _081C1738 adds r0, r5, #0 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 _081C1738: @@ -920753,7 +920753,7 @@ _081C17B4: cmp r0, #2 bne _081C1808 movs r0, #0xe - bl sub_0800365C + bl PutWindowTilemap b _081C1808 .align 2, 0 _081C17D0: .4byte gUnknown_85ED04C @@ -920776,20 +920776,20 @@ _081C17E0: cmp r0, #0 blt _081C1802 movs r0, #0xd - bl sub_0800365C + bl PutWindowTilemap _081C1802: movs r0, #0x13 - bl sub_0800365C + bl PutWindowTilemap _081C1808: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _081C1814: movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -920838,14 +920838,14 @@ _081C1874: .4byte 0x000030BC _081C1878: ldr r5, _081C18AC adds r0, r5, #0 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff bne _081C1894 adds r0, r5, #0 movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r2, r0, #0x18 _081C1894: @@ -920927,22 +920927,22 @@ _081C1914: cmp r0, #3 bne _081C193A ldr r0, _081C1954 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 cmp r0, #0 bne _081C193A movs r0, #0xf - bl sub_0800365C + bl PutWindowTilemap _081C193A: ldrh r0, [r4, #4] - bl sub_081C1D40 + bl DrawContestMoveHearts b _081C1980 .align 2, 0 _081C1944: .4byte gUnknown_85ED058 _081C1948: .4byte gUnknown_203CBE8 _081C194C: .4byte 0x000030BC _081C1950: .4byte 0x000040C0 -_081C1954: .4byte sub_081C04C0 +_081C1954: .4byte PssScrollRight _081C1958: ldr r2, _081C19A0 ldr r0, [r5] @@ -920959,20 +920959,20 @@ _081C1958: cmp r0, #0 blt _081C197A movs r0, #0xd - bl sub_0800365C + bl PutWindowTilemap _081C197A: movs r0, #0x13 - bl sub_0800365C + bl PutWindowTilemap _081C1980: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _081C198C: movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5, r6, r7} pop {r0} bx r0 @@ -921025,7 +921025,7 @@ _081C19F8: .4byte gUnknown_85ED040 _081C19FC: ldr r0, _081C1A1C movs r1, #8 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081C1A20 @@ -921092,7 +921092,7 @@ _081C1A64: movs r3, #0 bl sub_081C15E4 movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #2 ldrsh r0, [r5, r1] cmp r0, #0 @@ -921107,12 +921107,12 @@ _081C1A96: bge _081C1AAE bl sub_081C4290 movs r0, #0xd - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081C1AAE: adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _081C1AB4: pop {r4, r5, r6, r7} pop {r0} @@ -921202,18 +921202,18 @@ _081C1B50: _081C1B58: .4byte gUnknown_85ECFBC thumb_func_end sub_081C1AC8 - thumb_func_start sub_081C1B5C -sub_081C1B5C: @ 0x081C1B5C + thumb_func_start DrawPokerusCuredSymbol +DrawPokerusCuredSymbol: @ 0x081C1B5C push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_0806D810 + bl CheckPartyPokerus lsls r0, r0, #0x18 cmp r0, #0 bne _081C1B90 adds r0, r4, #0 movs r1, #0 - bl sub_0806D878 + bl CheckPartyHasHadPokerus lsls r0, r0, #0x18 cmp r0, #0 beq _081C1B90 @@ -921238,7 +921238,7 @@ _081C1B9A: adds r0, r0, r1 strh r2, [r0] movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -921247,7 +921247,7 @@ _081C1BB0: .4byte gUnknown_203CBE8 _081C1BB4: .4byte 0x00000482 _081C1BB8: .4byte 0x0000081A _081C1BBC: .4byte 0x00000C82 - thumb_func_end sub_081C1B5C + thumb_func_end DrawPokerusCuredSymbol thumb_func_start sub_081C1BC0 sub_081C1BC0: @ 0x081C1BC0 @@ -921278,14 +921278,14 @@ _081C1BE0: bl sub_081998C8 _081C1BF4: movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r0} bx r0 thumb_func_end sub_081C1BC0 - thumb_func_start sub_081C1C00 -sub_081C1C00: @ 0x081C1C00 + thumb_func_start DrawExperienceProgressBar +DrawExperienceProgressBar: @ 0x081C1C00 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -921422,7 +921422,7 @@ _081C1CFC: cmp r0, #7 bls _081C1C8A movs r0, #1 - bl sub_08002194 + bl GetBgTilemapBuffer ldr r1, _081C1D24 ldr r1, [r1] ldr r2, _081C1D28 @@ -921430,14 +921430,14 @@ _081C1CFC: cmp r0, r1 bne _081C1D2C movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram b _081C1D32 .align 2, 0 _081C1D24: .4byte gUnknown_203CBE8 _081C1D28: .4byte 0x000010BC _081C1D2C: movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081C1D32: pop {r3, r4, r5} mov r8, r3 @@ -921446,10 +921446,10 @@ _081C1D32: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081C1C00 + thumb_func_end DrawExperienceProgressBar - thumb_func_start sub_081C1D40 -sub_081C1D40: @ 0x081C1D40 + thumb_func_start DrawContestMoveHearts +DrawContestMoveHearts: @ 0x081C1D40 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -921589,10 +921589,10 @@ _081C1E44: bx r0 .align 2, 0 _081C1E54: .4byte 0x0000103D - thumb_func_end sub_081C1D40 + thumb_func_end DrawContestMoveHearts - thumb_func_start sub_081C1E58 -sub_081C1E58: @ 0x081C1E58 + thumb_func_start LimitEggSummaryPageDisplay +LimitEggSummaryPageDisplay: @ 0x081C1E58 push {lr} ldr r0, _081C1E74 ldr r0, [r0] @@ -921604,7 +921604,7 @@ sub_081C1E58: @ 0x081C1E58 lsls r1, r1, #9 movs r0, #3 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX b _081C1E82 .align 2, 0 _081C1E74: .4byte gUnknown_203CBE8 @@ -921612,24 +921612,24 @@ _081C1E78: movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX _081C1E82: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C1E58 + thumb_func_end LimitEggSummaryPageDisplay - thumb_func_start sub_081C1E88 -sub_081C1E88: @ 0x081C1E88 + thumb_func_start ResetWindows +ResetWindows: @ 0x081C1E88 push {r4, r5, lr} ldr r0, _081C1ECC - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r4, #0 _081C1E96: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -921658,10 +921658,10 @@ _081C1EB0: _081C1ECC: .4byte gUnknown_85ED06C _081C1ED0: .4byte gUnknown_203CBE8 _081C1ED4: .4byte 0x000040CB - thumb_func_end sub_081C1E88 + thumb_func_end ResetWindows - thumb_func_start sub_081C1ED8 -sub_081C1ED8: @ 0x081C1ED8 + thumb_func_start SummaryScreen_PrintTextOnWindow +SummaryScreen_PrintTextOnWindow: @ 0x081C1ED8 push {r4, r5, r6, lr} sub sp, #0x14 ldr r4, [sp, #0x24] @@ -921687,27 +921687,27 @@ sub_081C1ED8: @ 0x081C1ED8 str r6, [sp, #0xc] str r1, [sp, #0x10] movs r1, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 _081C1F18: .4byte gUnknown_85ED17C - thumb_func_end sub_081C1ED8 + thumb_func_end SummaryScreen_PrintTextOnWindow thumb_func_start sub_081C1F1C sub_081C1F1C: @ 0x081C1F1C push {lr} movs r0, #0x11 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x12 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x13 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r0, _081C1F48 ldr r0, [r0] adds r0, #0x74 @@ -921722,7 +921722,7 @@ _081C1F4C: bl sub_081C20D8 _081C1F50: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 .align 2, 0 @@ -921742,7 +921742,7 @@ sub_081C1F5C: @ 0x081C1F5C adds r7, r0, #0 adds r7, #0x70 ldrh r0, [r7] - bl sub_0806DE54 + bl SpeciesToPokedexNum lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _081C1FD0 @@ -921762,7 +921762,7 @@ sub_081C1F5C: @ 0x081C1F5C adds r1, r4, #0 bl StringAppend mov r0, r8 - bl sub_0806E630 + bl IsMonShiny lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -921774,7 +921774,7 @@ sub_081C1F5C: @ 0x081C1F5C adds r1, r6, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow movs r0, #0 bl sub_081C1BC0 b _081C1FFA @@ -921793,18 +921793,18 @@ _081C1FE0: adds r1, r6, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow movs r0, #1 bl sub_081C1BC0 _081C1FFA: movs r0, #0x11 - bl sub_0800365C + bl PutWindowTilemap b _081C2022 _081C2002: movs r0, #0x11 - bl sub_08003774 + bl ClearWindowTilemap mov r0, r8 - bl sub_0806E630 + bl IsMonShiny lsls r0, r0, #0x18 cmp r0, #0 bne _081C201C @@ -921836,10 +921836,10 @@ _081C2022: adds r1, r6, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow mov r0, r8 adds r1, r6, #0 - bl sub_081B1814 + bl GetMonNickname ldrb r0, [r7, #5] cmp r0, #9 bhi _081C2084 @@ -921849,7 +921849,7 @@ _081C2022: adds r1, r6, #0 movs r2, #0x18 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C2094 .align 2, 0 _081C2078: .4byte gUnknown_2021C40 @@ -921862,7 +921862,7 @@ _081C2084: adds r1, r6, #0 movs r2, #0x20 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C2094: ldrh r0, [r7, #2] lsls r1, r0, #1 @@ -921877,14 +921877,14 @@ _081C2094: movs r0, #0x13 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldrh r1, [r7, #2] mov r0, r8 - bl sub_081C2120 + bl GetBgType movs r0, #0x12 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0x13 - bl sub_0800365C + bl PutWindowTilemap add sp, #8 pop {r3} mov r8, r3 @@ -921904,7 +921904,7 @@ sub_081C20D8: @ 0x081C20D8 adds r0, #0xc ldr r4, _081C211C adds r1, r4, #0 - bl sub_081B1814 + bl GetMonNickname movs r0, #0 str r0, [sp] movs r0, #1 @@ -921913,13 +921913,13 @@ sub_081C20D8: @ 0x081C20D8 adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow movs r0, #0x12 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0x11 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0x13 - bl sub_08003774 + bl ClearWindowTilemap add sp, #8 pop {r4} pop {r0} @@ -921929,8 +921929,8 @@ _081C2118: .4byte gUnknown_203CBE8 _081C211C: .4byte gUnknown_2021C40 thumb_func_end sub_081C20D8 - thumb_func_start sub_081C2120 -sub_081C2120: @ 0x081C2120 + thumb_func_start GetBgType +GetBgType: @ 0x081C2120 push {r4, r5, lr} sub sp, #8 adds r5, r0, #0 @@ -921949,7 +921949,7 @@ sub_081C2120: @ 0x081C2120 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r5, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -921968,7 +921968,7 @@ _081C215C: str r0, [sp, #4] movs r0, #0x13 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C218E .align 2, 0 _081C2174: .4byte gUnknown_85C940A @@ -921982,7 +921982,7 @@ _081C2178: str r0, [sp, #4] movs r0, #0x13 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C218E: add sp, #8 pop {r4, r5} @@ -921990,7 +921990,7 @@ _081C218E: bx r0 .align 2, 0 _081C2198: .4byte gUnknown_85C940C - thumb_func_end sub_081C2120 + thumb_func_end GetBgType thumb_func_start sub_081C219C sub_081C219C: @ 0x081C219C @@ -922031,28 +922031,28 @@ sub_081C21CC: @ 0x081C21CC movs r0, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C2378 str r4, [sp] str r5, [sp, #4] movs r0, #1 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C237C str r4, [sp] str r5, [sp, #4] movs r0, #2 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C2380 str r4, [sp] str r5, [sp, #4] movs r0, #3 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow movs r0, #4 movs r1, #0 bl sub_081C219C @@ -922062,7 +922062,7 @@ sub_081C21CC: @ 0x081C21CC movs r0, #4 movs r2, #0x10 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow movs r0, #5 movs r1, #0 bl sub_081C219C @@ -922072,7 +922072,7 @@ sub_081C21CC: @ 0x081C21CC movs r0, #5 movs r2, #0x10 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow movs r0, #6 movs r1, #0 bl sub_081C219C @@ -922082,126 +922082,126 @@ sub_081C21CC: @ 0x081C21CC movs r0, #6 movs r2, #0x10 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C2390 str r4, [sp] str r5, [sp, #4] movs r0, #7 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C2394 str r4, [sp] str r5, [sp, #4] movs r0, #8 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C2398 str r4, [sp] str r5, [sp, #4] movs r0, #0x10 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C239C str r4, [sp] str r4, [sp, #4] movs r0, #9 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23A0 str r4, [sp] str r5, [sp, #4] movs r0, #0xa movs r2, #8 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23A4 str r4, [sp] str r5, [sp, #4] movs r0, #0xa movs r2, #0 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23A8 str r4, [sp] str r5, [sp, #4] movs r0, #0xa movs r2, #0 movs r3, #0x22 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23AC str r4, [sp] str r5, [sp, #4] movs r0, #0xb movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23B0 str r4, [sp] str r5, [sp, #4] movs r0, #0xb movs r2, #0 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23B4 str r4, [sp] str r5, [sp, #4] movs r0, #0xb movs r2, #0 movs r3, #0x22 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23B8 str r4, [sp] str r5, [sp, #4] movs r0, #0xc movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23BC str r4, [sp] str r5, [sp, #4] movs r0, #0xc movs r2, #0 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23C0 str r4, [sp] str r5, [sp, #4] movs r0, #0xd movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23C4 str r4, [sp] str r5, [sp, #4] movs r0, #0xe movs r2, #8 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23C8 str r4, [sp] str r5, [sp, #4] movs r0, #0xe movs r2, #0 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23CC str r4, [sp] str r5, [sp, #4] movs r0, #0xf movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C23D0 str r4, [sp] str r5, [sp, #4] movs r0, #0xf movs r2, #0 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4, r5} pop {r0} @@ -922240,13 +922240,13 @@ sub_081C23D4: @ 0x081C23D4 lsrs r4, r0, #0x18 adds r5, r4, #0 movs r0, #0 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #2 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap cmp r4, #1 beq _081C244C cmp r4, #1 @@ -922262,9 +922262,9 @@ _081C2402: b _081C24EA _081C240C: movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #4 - bl sub_0800365C + bl PutWindowTilemap bl InBattleFactory lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -922277,30 +922277,30 @@ _081C240C: bne _081C2438 _081C2430: movs r0, #8 - bl sub_0800365C + bl PutWindowTilemap b _081C2444 _081C2438: movs r0, #7 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0x10 - bl sub_0800365C + bl PutWindowTilemap _081C2444: movs r0, #9 - bl sub_0800365C + bl PutWindowTilemap b _081C24EA _081C244C: movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xa - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xb - bl sub_0800365C + bl PutWindowTilemap movs r0, #0xc - bl sub_0800365C + bl PutWindowTilemap b _081C24EA _081C2466: movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _081C2494 ldr r1, [r0] ldr r2, _081C2498 @@ -922318,7 +922318,7 @@ _081C2466: cmp r0, r1 beq _081C24EA movs r0, #0xe - bl sub_0800365C + bl PutWindowTilemap b _081C24EA .align 2, 0 _081C2494: .4byte gUnknown_203CBE8 @@ -922326,11 +922326,11 @@ _081C2498: .4byte 0x000040BC _081C249C: .4byte 0x00FFFFFF _081C24A0: movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap b _081C24EA _081C24A8: movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap ldr r0, _081C24D8 ldr r1, [r0] ldr r2, _081C24DC @@ -922348,7 +922348,7 @@ _081C24A8: cmp r0, r1 beq _081C24EA movs r0, #0xf - bl sub_0800365C + bl PutWindowTilemap b _081C24EA .align 2, 0 _081C24D8: .4byte gUnknown_203CBE8 @@ -922356,7 +922356,7 @@ _081C24DC: .4byte 0x000040BC _081C24E0: .4byte 0x00FFFFFF _081C24E4: movs r0, #5 - bl sub_0800365C + bl PutWindowTilemap _081C24EA: movs r4, #0 ldr r5, _081C2514 @@ -922366,14 +922366,14 @@ _081C24EE: adds r0, r0, r1 adds r0, r0, r4 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #7 bls _081C24EE movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 @@ -922403,7 +922403,7 @@ _081C2532: b _081C2602 _081C253C: movs r0, #4 - bl sub_08003774 + bl ClearWindowTilemap bl InBattleFactory lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -922416,24 +922416,24 @@ _081C253C: bne _081C2562 _081C255A: movs r0, #8 - bl sub_08003774 + bl ClearWindowTilemap b _081C256E _081C2562: movs r0, #7 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0x10 - bl sub_08003774 + bl ClearWindowTilemap _081C256E: movs r0, #9 - bl sub_08003774 + bl ClearWindowTilemap b _081C2602 _081C2576: movs r0, #0xa - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xb - bl sub_08003774 + bl ClearWindowTilemap movs r0, #0xc - bl sub_08003774 + bl ClearWindowTilemap b _081C2602 _081C258A: ldr r0, _081C25B4 @@ -922453,7 +922453,7 @@ _081C258A: cmp r0, r1 beq _081C2602 movs r0, #0xe - bl sub_08003774 + bl ClearWindowTilemap b _081C2602 .align 2, 0 _081C25B4: .4byte gUnknown_203CBE8 @@ -922461,7 +922461,7 @@ _081C25B8: .4byte 0x000040BC _081C25BC: .4byte 0x00FFFFFF _081C25C0: movs r0, #5 - bl sub_08003774 + bl ClearWindowTilemap b _081C2602 _081C25C8: ldr r0, _081C25F0 @@ -922481,7 +922481,7 @@ _081C25C8: cmp r0, r1 beq _081C2602 movs r0, #0xf - bl sub_08003774 + bl ClearWindowTilemap b _081C2602 .align 2, 0 _081C25F0: .4byte gUnknown_203CBE8 @@ -922489,26 +922489,26 @@ _081C25F4: .4byte 0x000040BC _081C25F8: .4byte 0x00FFFFFF _081C25FC: movs r0, #5 - bl sub_08003774 + bl ClearWindowTilemap _081C2602: movs r4, #0 _081C2604: adds r0, r4, #0 - bl sub_081C265C + bl SummaryScreen_RemoveWindowByIndex adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #7 bls _081C2604 movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 thumb_func_end sub_081C251C - thumb_func_start sub_081C2620 -sub_081C2620: @ 0x081C2620 + thumb_func_start AddWindowFromTemplateList +AddWindowFromTemplateList: @ 0x081C2620 push {r4, lr} adds r3, r0, #0 lsls r1, r1, #0x18 @@ -922523,11 +922523,11 @@ sub_081C2620: @ 0x081C2620 bne _081C264A lsls r0, r2, #3 adds r0, r3, r0 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer _081C264A: ldrb r0, [r4] pop {r4} @@ -922536,10 +922536,10 @@ _081C264A: .align 2, 0 _081C2654: .4byte gUnknown_203CBE8 _081C2658: .4byte 0x000040CB - thumb_func_end sub_081C2620 + thumb_func_end AddWindowFromTemplateList - thumb_func_start sub_081C265C -sub_081C265C: @ 0x081C265C + thumb_func_start SummaryScreen_RemoveWindowByIndex +SummaryScreen_RemoveWindowByIndex: @ 0x081C265C push {r4, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -922551,9 +922551,9 @@ sub_081C265C: @ 0x081C265C ldrb r0, [r4] cmp r0, #0xff beq _081C2680 - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] _081C2680: @@ -922563,10 +922563,10 @@ _081C2680: .align 2, 0 _081C2688: .4byte gUnknown_203CBE8 _081C268C: .4byte 0x000040CB - thumb_func_end sub_081C265C + thumb_func_end SummaryScreen_RemoveWindowByIndex - thumb_func_start sub_081C2690 -sub_081C2690: @ 0x081C2690 + thumb_func_start PrintPageSpecificText +PrintPageSpecificText: @ 0x081C2690 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -922581,7 +922581,7 @@ _081C2698: cmp r0, #0xff beq _081C26AE movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer _081C26AE: adds r0, r4, #1 lsls r0, r0, #0x10 @@ -922593,7 +922593,7 @@ _081C26AE: adds r1, r1, r0 ldr r0, [r1] bl _call_via_r0 - thumb_func_end sub_081C2690 + thumb_func_end PrintPageSpecificText thumb_func_start sub_081C26C4 sub_081C26C4: @ 0x081C26C4 @@ -922606,8 +922606,8 @@ _081C26D0: .4byte 0x000040CB _081C26D4: .4byte gUnknown_85ED2A4 thumb_func_end sub_081C26C4 - thumb_func_start sub_081C26D8 -sub_081C26D8: @ 0x081C26D8 + thumb_func_start CreateTextPrinterTask +CreateTextPrinterTask: @ 0x081C26D8 push {lr} lsls r0, r0, #0x18 ldr r1, _081C26F0 @@ -922615,15 +922615,15 @@ sub_081C26D8: @ 0x081C26D8 adds r0, r0, r1 ldr r0, [r0] movs r1, #0x10 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 _081C26F0: .4byte gUnknown_85ED2B4 - thumb_func_end sub_081C26D8 + thumb_func_end CreateTextPrinterTask - thumb_func_start sub_081C26F4 -sub_081C26F4: @ 0x081C26F4 + thumb_func_start PrintInfoPageText +PrintInfoPageText: @ 0x081C26F4 push {lr} ldr r0, _081C2714 ldr r0, [r0] @@ -922633,8 +922633,8 @@ sub_081C26F4: @ 0x081C26F4 beq _081C2718 bl sub_081C2C54 bl sub_081C2C84 - bl sub_081C2CB4 - bl sub_081C2D28 + bl PrintEggState + bl PrintEggMemo b _081C2730 .align 2, 0 _081C2714: .4byte gUnknown_203CBE8 @@ -922644,14 +922644,14 @@ _081C2718: bl sub_081C288C bl sub_081C28E0 bl sub_081C2934 - bl sub_081C2A4C + bl PrintMonTrainerMemo _081C2730: pop {r0} bx r0 - thumb_func_end sub_081C26F4 + thumb_func_end PrintInfoPageText - thumb_func_start sub_081C2734 -sub_081C2734: @ 0x081C2734 + thumb_func_start Task_PrintInfoPage +Task_PrintInfoPage: @ 0x081C2734 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -922698,11 +922698,11 @@ _081C2798: bl sub_081C2934 b _081C27AC _081C279E: - bl sub_081C2A4C + bl PrintMonTrainerMemo b _081C27AC _081C27A4: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _081C27B2 _081C27AC: ldrh r0, [r4] @@ -922712,7 +922712,7 @@ _081C27B2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C2734 + thumb_func_end Task_PrintInfoPage thumb_func_start sub_081C27B8 sub_081C27B8: @ 0x081C27B8 @@ -922730,7 +922730,7 @@ sub_081C27B8: @ 0x081C27B8 beq _081C2822 ldr r0, _081C2804 movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r3, r0, #0x18 ldr r0, _081C2808 @@ -922748,7 +922748,7 @@ sub_081C27B8: @ 0x081C27B8 adds r0, r3, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C2822 .align 2, 0 _081C2804: .4byte gUnknown_85ED114 @@ -922763,7 +922763,7 @@ _081C280C: adds r0, r3, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C2822: add sp, #8 pop {r0} @@ -922795,7 +922795,7 @@ sub_081C2828: @ 0x081C2828 bl sub_080089D8 ldr r0, _081C2888 movs r1, #1 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -922805,7 +922805,7 @@ sub_081C2828: @ 0x081C2828 adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C2876: add sp, #8 pop {r4} @@ -922828,13 +922828,13 @@ sub_081C288C: @ 0x081C288C ldrh r0, [r0] adds r1, #0x78 ldrb r1, [r1] - bl sub_0806B15C + bl GetAbilityBySpecies adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _081C28D8 movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r4, #3 @@ -922847,7 +922847,7 @@ sub_081C288C: @ 0x081C288C adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -922869,13 +922869,13 @@ sub_081C28E0: @ 0x081C28E0 ldrh r0, [r0] adds r1, #0x78 ldrb r1, [r1] - bl sub_0806B15C + bl GetAbilityBySpecies adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 ldr r0, _081C292C movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r4, #2 @@ -922888,7 +922888,7 @@ sub_081C28E0: @ 0x081C28E0 str r2, [sp] str r2, [sp, #4] movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -922924,7 +922924,7 @@ sub_081C2934: @ 0x081C2934 lsrs r0, r0, #0x18 cmp r0, #1 beq _081C297A - bl sub_081C2BFC + bl IsInGamePartnerMon lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -922932,7 +922932,7 @@ sub_081C2934: @ 0x081C2934 _081C297A: ldr r0, _081C2990 ldr r1, _081C2994 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _081C2A3A .align 2, 0 _081C2984: .4byte gUnknown_203CBE8 @@ -922948,7 +922948,7 @@ _081C2998: bl sub_08000BC8 adds r5, r0, #0 adds r0, r6, #0 - bl sub_081C2AC4 + bl GetMetLevelString ldrb r0, [r4, #9] cmp r0, #0xd4 bhi _081C29C4 @@ -922959,7 +922959,7 @@ _081C2998: adds r1, r5, #0 bl DynamicPlaceholderTextUtil_SetPlaceholderPtr _081C29C4: - bl sub_081C2AF4 + bl DoesMonOTMatchOwner lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -922997,7 +922997,7 @@ _081C2A0C: .4byte gUnknown_85CA512 _081C2A10: cmp r0, #0xfe beq _081C2A26 - bl sub_081C2BB4 + bl DidMonComeFromGBAGames lsls r0, r0, #0x18 cmp r0, #0 beq _081C2A26 @@ -923009,11 +923009,11 @@ _081C2A26: ldr r1, _081C2A44 _081C2A28: ldr r0, _081C2A48 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders adds r0, r6, #0 - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_08000BF0 + bl Free _081C2A3A: pop {r4, r5, r6} pop {r0} @@ -923024,13 +923024,13 @@ _081C2A44: .4byte gUnknown_85CA4F2 _081C2A48: .4byte gUnknown_2021C7C thumb_func_end sub_081C2934 - thumb_func_start sub_081C2A4C -sub_081C2A4C: @ 0x081C2A4C + thumb_func_start PrintMonTrainerMemo +PrintMonTrainerMemo: @ 0x081C2A4C push {lr} sub sp, #8 ldr r0, _081C2A70 movs r1, #3 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081C2A74 @@ -923038,14 +923038,14 @@ sub_081C2A4C: @ 0x081C2A4C str r2, [sp] str r2, [sp, #4] movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r0} bx r0 .align 2, 0 _081C2A70: .4byte gUnknown_85ED114 _081C2A74: .4byte gUnknown_2021C7C - thumb_func_end sub_081C2A4C + thumb_func_end PrintMonTrainerMemo thumb_func_start sub_081C2A78 sub_081C2A78: @ 0x081C2A78 @@ -923086,8 +923086,8 @@ _081C2AB8: _081C2AC0: .4byte gUnknown_85CA3D8 thumb_func_end sub_081C2A78 - thumb_func_start sub_081C2AC4 -sub_081C2AC4: @ 0x081C2AC4 + thumb_func_start GetMetLevelString +GetMetLevelString: @ 0x081C2AC4 push {r4, lr} adds r4, r0, #0 ldr r0, _081C2AF0 @@ -923110,10 +923110,10 @@ _081C2AD6: bx r0 .align 2, 0 _081C2AF0: .4byte gUnknown_203CBE8 - thumb_func_end sub_081C2AC4 + thumb_func_end GetMetLevelString - thumb_func_start sub_081C2AF4 -sub_081C2AF4: @ 0x081C2AF4 + thumb_func_start DoesMonOTMatchOwner +DoesMonOTMatchOwner: @ 0x081C2AF4 push {r4, r5, r6, lr} ldr r0, _081C2B30 ldr r0, [r0] @@ -923123,7 +923123,7 @@ sub_081C2AF4: @ 0x081C2AF4 ldr r0, _081C2B34 cmp r1, r0 bne _081C2B40 - bl sub_0800A02C + bl GetMultiplayerId movs r1, #1 eors r0, r1 lsls r0, r0, #0x18 @@ -923208,10 +923208,10 @@ _081C2BA8: bx r1 .align 2, 0 _081C2BB0: .4byte gUnknown_2021C40 - thumb_func_end sub_081C2AF4 + thumb_func_end DoesMonOTMatchOwner - thumb_func_start sub_081C2BB4 -sub_081C2BB4: @ 0x081C2BB4 + thumb_func_start DidMonComeFromGBAGames +DidMonComeFromGBAGames: @ 0x081C2BB4 push {lr} ldr r0, _081C2BCC ldr r0, [r0] @@ -923232,10 +923232,10 @@ _081C2BD2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C2BB4 + thumb_func_end DidMonComeFromGBAGames - thumb_func_start sub_081C2BD8 -sub_081C2BD8: @ 0x081C2BD8 + thumb_func_start DidMonComeFromRSE +DidMonComeFromRSE: @ 0x081C2BD8 push {lr} ldr r0, _081C2BF0 ldr r0, [r0] @@ -923256,10 +923256,10 @@ _081C2BF6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C2BD8 + thumb_func_end DidMonComeFromRSE - thumb_func_start sub_081C2BFC -sub_081C2BFC: @ 0x081C2BFC + thumb_func_start IsInGamePartnerMon +IsInGamePartnerMon: @ 0x081C2BFC push {lr} ldr r0, _081C2C38 ldr r0, [r0] @@ -923302,7 +923302,7 @@ _081C2C4E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C2BFC + thumb_func_end IsInGamePartnerMon thumb_func_start sub_081C2C54 sub_081C2C54: @ 0x081C2C54 @@ -923310,7 +923310,7 @@ sub_081C2C54: @ 0x081C2C54 sub sp, #8 ldr r0, _081C2C7C movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081C2C80 @@ -923320,7 +923320,7 @@ sub_081C2C54: @ 0x081C2C54 str r2, [sp, #4] movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r0} bx r0 @@ -923335,7 +923335,7 @@ sub_081C2C84: @ 0x081C2C84 sub sp, #8 ldr r0, _081C2CAC movs r1, #1 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081C2CB0 @@ -923345,7 +923345,7 @@ sub_081C2C84: @ 0x081C2C84 str r2, [sp, #4] movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r0} bx r0 @@ -923354,8 +923354,8 @@ _081C2CAC: .4byte gUnknown_85ED114 _081C2CB0: .4byte gUnknown_85C93F9 thumb_func_end sub_081C2C84 - thumb_func_start sub_081C2CB4 -sub_081C2CB4: @ 0x081C2CB4 + thumb_func_start PrintEggState +PrintEggState: @ 0x081C2CB4 push {r4, lr} sub sp, #8 ldr r0, _081C2CCC @@ -923394,7 +923394,7 @@ _081C2CF0: _081C2CF8: ldr r0, _081C2D24 movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -923403,7 +923403,7 @@ _081C2CF8: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -923412,10 +923412,10 @@ _081C2CF8: _081C2D1C: .4byte gUnknown_85CA40C _081C2D20: .4byte gUnknown_85CA425 _081C2D24: .4byte gUnknown_85ED114 - thumb_func_end sub_081C2CB4 + thumb_func_end PrintEggState - thumb_func_start sub_081C2D28 -sub_081C2D28: @ 0x081C2D28 + thumb_func_start PrintEggMemo +PrintEggMemo: @ 0x081C2D28 push {r4, lr} sub sp, #8 ldr r0, _081C2D48 @@ -923435,11 +923435,11 @@ sub_081C2D28: @ 0x081C2D28 _081C2D48: .4byte gUnknown_203CBE8 _081C2D4C: .4byte gUnknown_85CA5D5 _081C2D50: - bl sub_081C2BB4 + bl DidMonComeFromGBAGames lsls r0, r0, #0x18 cmp r0, #0 beq _081C2D64 - bl sub_081C2AF4 + bl DoesMonOTMatchOwner lsls r0, r0, #0x18 cmp r0, #0 bne _081C2D6C @@ -923452,7 +923452,7 @@ _081C2D6C: ldrb r0, [r4, #9] cmp r0, #0xfd bne _081C2D8C - bl sub_081C2BD8 + bl DidMonComeFromRSE lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r4, _081C2D84 @@ -923468,7 +923468,7 @@ _081C2D8C: _081C2D8E: ldr r0, _081C2DB8 movs r1, #3 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -923477,7 +923477,7 @@ _081C2D8E: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -923485,25 +923485,25 @@ _081C2D8E: .align 2, 0 _081C2DB4: .4byte gUnknown_85CA5B6 _081C2DB8: .4byte gUnknown_85ED114 - thumb_func_end sub_081C2D28 + thumb_func_end PrintEggMemo - thumb_func_start sub_081C2DBC -sub_081C2DBC: @ 0x081C2DBC + thumb_func_start PrintSkillsPageText +PrintSkillsPageText: @ 0x081C2DBC push {lr} bl sub_081C2E70 bl sub_081C2F08 - bl sub_081C2F74 + bl BufferLeftColumnStats bl sub_081C303C - bl sub_081C3068 + bl BufferRightColumnStats bl sub_081C30F0 bl sub_081C311C pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C2DBC + thumb_func_end PrintSkillsPageText - thumb_func_start sub_081C2DE0 -sub_081C2DE0: @ 0x081C2DE0 + thumb_func_start Task_PrintSkillsPage +Task_PrintSkillsPage: @ 0x081C2DE0 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -923542,13 +923542,13 @@ _081C2E36: bl sub_081C2F08 b _081C2E62 _081C2E3C: - bl sub_081C2F74 + bl BufferLeftColumnStats b _081C2E62 _081C2E42: bl sub_081C303C b _081C2E62 _081C2E48: - bl sub_081C3068 + bl BufferRightColumnStats b _081C2E62 _081C2E4E: bl sub_081C30F0 @@ -923558,7 +923558,7 @@ _081C2E54: b _081C2E62 _081C2E5A: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _081C2E68 _081C2E62: ldrh r0, [r4] @@ -923569,7 +923569,7 @@ _081C2E68: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C2DE0 + thumb_func_end Task_PrintSkillsPage thumb_func_start sub_081C2E70 sub_081C2E70: @ 0x081C2E70 @@ -923581,7 +923581,7 @@ sub_081C2E70: @ 0x081C2E70 ldrh r0, [r0] cmp r0, #0xaf bne _081C2EB4 - bl sub_081B0F20 + bl IsMultiBattle lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -923625,7 +923625,7 @@ _081C2ED0: _081C2EDA: ldr r0, _081C2F04 movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -923634,7 +923634,7 @@ _081C2EDA: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -923669,11 +923669,11 @@ _081C2F28: ldr r4, _081C2F68 ldr r1, _081C2F6C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _081C2F3E: ldr r0, _081C2F70 movs r1, #1 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -923682,7 +923682,7 @@ _081C2F3E: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -923694,8 +923694,8 @@ _081C2F6C: .4byte gUnknown_85CA3CF _081C2F70: .4byte gUnknown_85ED134 thumb_func_end sub_081C2F08 - thumb_func_start sub_081C2F74 -sub_081C2F74: @ 0x081C2F74 + thumb_func_start BufferLeftColumnStats +BufferLeftColumnStats: @ 0x081C2F74 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -923756,15 +923756,15 @@ sub_081C2F74: @ 0x081C2F74 bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, _081C3034 ldr r1, _081C3038 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders mov r0, sb - bl sub_08000BF0 + bl Free mov r0, r8 - bl sub_08000BF0 + bl Free adds r0, r6, #0 - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_08000BF0 + bl Free pop {r3, r4} mov r8, r3 mov sb, r4 @@ -923775,7 +923775,7 @@ sub_081C2F74: @ 0x081C2F74 _081C3030: .4byte gUnknown_203CBE8 _081C3034: .4byte gUnknown_2021C7C _081C3038: .4byte gUnknown_85ED2D2 - thumb_func_end sub_081C2F74 + thumb_func_end BufferLeftColumnStats thumb_func_start sub_081C303C sub_081C303C: @ 0x081C303C @@ -923783,7 +923783,7 @@ sub_081C303C: @ 0x081C303C sub sp, #8 ldr r0, _081C3060 movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081C3064 @@ -923791,7 +923791,7 @@ sub_081C303C: @ 0x081C303C str r2, [sp] str r2, [sp, #4] movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r0} bx r0 @@ -923800,8 +923800,8 @@ _081C3060: .4byte gUnknown_85ED134 _081C3064: .4byte gUnknown_2021C7C thumb_func_end sub_081C303C - thumb_func_start sub_081C3068 -sub_081C3068: @ 0x081C3068 + thumb_func_start BufferRightColumnStats +BufferRightColumnStats: @ 0x081C3068 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -923843,7 +923843,7 @@ sub_081C3068: @ 0x081C3068 bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, _081C30E8 ldr r1, _081C30EC - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -923856,7 +923856,7 @@ _081C30E0: .4byte gUnknown_2021C54 _081C30E4: .4byte gUnknown_2021C68 _081C30E8: .4byte gUnknown_2021C7C _081C30EC: .4byte gUnknown_85ED2DE - thumb_func_end sub_081C3068 + thumb_func_end BufferRightColumnStats thumb_func_start sub_081C30F0 sub_081C30F0: @ 0x081C30F0 @@ -923864,7 +923864,7 @@ sub_081C30F0: @ 0x081C30F0 sub sp, #8 ldr r0, _081C3114 movs r1, #3 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081C3118 @@ -923872,7 +923872,7 @@ sub_081C30F0: @ 0x081C30F0 str r2, [sp] str r2, [sp, #4] movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r0} bx r0 @@ -923891,7 +923891,7 @@ sub_081C311C: @ 0x081C311C adds r6, #0x70 ldr r0, _081C3198 movs r1, #4 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r7, r0, #0x18 ldr r5, _081C319C @@ -923907,14 +923907,14 @@ sub_081C311C: @ 0x081C311C adds r1, r5, #0 movs r2, #8 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C31A0 str r4, [sp] str r4, [sp, #4] adds r0, r7, #0 movs r2, #0 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldrb r0, [r6, #5] cmp r0, #0x63 bhi _081C31AC @@ -923960,7 +923960,7 @@ _081C31AE: adds r1, r4, #0 movs r2, #0x10 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4, r5, r6, r7} pop {r0} @@ -923969,17 +923969,17 @@ _081C31AE: _081C31D4: .4byte gUnknown_2021C40 thumb_func_end sub_081C311C - thumb_func_start sub_081C31D8 -sub_081C31D8: @ 0x081C31D8 + thumb_func_start PrintBattleMoves +PrintBattleMoves: @ 0x081C31D8 push {r4, lr} movs r0, #0 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle movs r0, #1 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle movs r0, #2 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle movs r0, #3 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle ldr r4, _081C3220 ldr r0, [r4] ldr r1, _081C3224 @@ -923999,7 +923999,7 @@ sub_081C31D8: @ 0x081C31D8 ldrh r0, [r1] cmp r0, #0 beq _081C323E - bl sub_081C36D4 + bl PrintMoveDetails b _081C323E .align 2, 0 _081C3220: .4byte gUnknown_203CBE8 @@ -924012,15 +924012,15 @@ _081C3230: adds r1, #0x84 adds r1, r1, r0 ldrh r0, [r1] - bl sub_081C36D4 + bl PrintMoveDetails _081C323E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C31D8 + thumb_func_end PrintBattleMoves - thumb_func_start sub_081C3244 -sub_081C3244: @ 0x081C3244 + thumb_func_start Task_PrintBattleMoves +Task_PrintBattleMoves: @ 0x081C3244 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -924054,19 +924054,19 @@ _081C3274: @ jump table .4byte _081C3348 @ case 7 _081C3294: movs r0, #0 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C3350 _081C329C: movs r0, #1 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C3350 _081C32A4: movs r0, #2 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C3350 _081C32AC: movs r0, #3 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C3350 _081C32B4: ldr r0, _081C32C8 @@ -924130,7 +924130,7 @@ _081C3312: cmp r0, r1 beq _081C3350 ldrh r0, [r4, #2] - bl sub_081C36D4 + bl PrintMoveDetails b _081C3350 .align 2, 0 _081C333C: .4byte gUnknown_203CBE8 @@ -924138,7 +924138,7 @@ _081C3340: .4byte 0x000040BC _081C3344: .4byte 0x00FFFFFF _081C3348: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _081C3356 _081C3350: ldrh r0, [r4] @@ -924148,10 +924148,10 @@ _081C3356: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C3244 + thumb_func_end Task_PrintBattleMoves - thumb_func_start sub_081C335C -sub_081C335C: @ 0x081C335C + thumb_func_start CB2_HandleStartMultiPartnerBattle +CB2_HandleStartMultiPartnerBattle: @ 0x081C335C push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -924166,13 +924166,13 @@ sub_081C335C: @ 0x081C335C ldr r4, _081C343C adds r0, r4, #0 movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 adds r0, r4, #0 movs r1, #1 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 @@ -924188,7 +924188,7 @@ sub_081C335C: @ 0x081C335C ldrb r1, [r0] adds r0, r5, #0 adds r2, r7, #0 - bl sub_0806B424 + bl CalculatePPWithBonus adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -924206,7 +924206,7 @@ sub_081C335C: @ 0x081C335C mov r0, sb movs r2, #0 adds r3, r4, #0 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C3444 mov sb, r1 mov r5, r8 @@ -924234,7 +924234,7 @@ sub_081C335C: @ 0x081C335C mov r8, r1 ldr r1, _081C3450 mov r0, r8 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldrb r0, [r5] adds r1, r6, #0 bl GetCurrentPpToMaxPpState @@ -924248,7 +924248,7 @@ sub_081C335C: @ 0x081C335C mov r1, r8 movs r2, #0 adds r3, r4, #0 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C3480 .align 2, 0 _081C3438: .4byte gUnknown_203CBE8 @@ -924270,7 +924270,7 @@ _081C3454: mov r0, sb movs r2, #0 adds r3, r4, #0 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C3494 str r5, [sp] movs r0, #0xc @@ -924278,7 +924278,7 @@ _081C3454: mov r0, sl movs r2, #8 adds r3, r4, #0 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C3480: add sp, #8 pop {r3, r4, r5} @@ -924291,10 +924291,10 @@ _081C3480: .align 2, 0 _081C3490: .4byte gUnknown_85C9401 _081C3494: .4byte gUnknown_85C9403 - thumb_func_end sub_081C335C + thumb_func_end CB2_HandleStartMultiPartnerBattle - thumb_func_start sub_081C3498 -sub_081C3498: @ 0x081C3498 + thumb_func_start PrintMovePowerAndAccuracy +PrintMovePowerAndAccuracy: @ 0x081C3498 push {r4, r5, r6, lr} sub sp, #8 lsls r0, r0, #0x10 @@ -924339,7 +924339,7 @@ _081C34E8: movs r0, #0xe movs r2, #0x28 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow ldr r1, _081C3510 adds r0, r6, r5 lsls r0, r0, #2 @@ -924368,7 +924368,7 @@ _081C3528: movs r0, #0xe movs r2, #0x28 movs r3, #0x12 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C3538: add sp, #8 pop {r4, r5, r6} @@ -924376,19 +924376,19 @@ _081C3538: bx r0 .align 2, 0 _081C3540: .4byte gUnknown_2021C40 - thumb_func_end sub_081C3498 + thumb_func_end PrintMovePowerAndAccuracy - thumb_func_start sub_081C3544 -sub_081C3544: @ 0x081C3544 + thumb_func_start PrintContestMoves +PrintContestMoves: @ 0x081C3544 push {r4, lr} movs r0, #0 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle movs r0, #1 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle movs r0, #2 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle movs r0, #3 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle ldr r4, _081C3584 ldr r0, [r4] ldr r1, _081C3588 @@ -924401,7 +924401,7 @@ sub_081C3544: @ 0x081C3544 ldr r1, _081C358C adds r0, r0, r1 ldrb r0, [r0] - bl sub_081C3668 + bl PrintContestMoveDescription _081C357C: pop {r4} pop {r0} @@ -924410,10 +924410,10 @@ _081C357C: _081C3584: .4byte gUnknown_203CBE8 _081C3588: .4byte 0x000040BC _081C358C: .4byte 0x000040C6 - thumb_func_end sub_081C3544 + thumb_func_end PrintContestMoves - thumb_func_start sub_081C3590 -sub_081C3590: @ 0x081C3590 + thumb_func_start Task_PrintContestMoves +Task_PrintContestMoves: @ 0x081C3590 push {r4, lr} lsls r0, r0, #0x18 lsrs r2, r0, #0x18 @@ -924446,19 +924446,19 @@ _081C35C0: @ jump table .4byte _081C3654 @ case 6 _081C35DC: movs r0, #0 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C365C _081C35E4: movs r0, #1 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C365C _081C35EC: movs r0, #2 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C365C _081C35F4: movs r0, #3 - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle b _081C365C _081C35FC: ldr r0, _081C3610 @@ -924493,7 +924493,7 @@ _081C3618: ldr r1, _081C3650 adds r0, r2, r1 ldrb r0, [r0] - bl sub_081C3668 + bl PrintContestMoveDescription b _081C365C .align 2, 0 _081C3644: .4byte gUnknown_203CBE8 @@ -924502,7 +924502,7 @@ _081C364C: .4byte 0x00FFFFFF _081C3650: .4byte 0x000040C6 _081C3654: adds r0, r2, #0 - bl sub_080A8964 + bl DestroyTask b _081C3662 _081C365C: ldrh r0, [r4] @@ -924512,10 +924512,10 @@ _081C3662: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C3590 + thumb_func_end Task_PrintContestMoves - thumb_func_start sub_081C3668 -sub_081C3668: @ 0x081C3668 + thumb_func_start PrintContestMoveDescription +PrintContestMoveDescription: @ 0x081C3668 push {r4, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -924541,7 +924541,7 @@ _081C368C: beq _081C36BC ldr r0, _081C36C8 movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r3, _081C36CC @@ -924556,7 +924556,7 @@ _081C368C: str r2, [sp] str r2, [sp, #4] movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C36BC: add sp, #8 pop {r4} @@ -924567,10 +924567,10 @@ _081C36C4: .4byte gUnknown_203CBE8 _081C36C8: .4byte gUnknown_85ED15C _081C36CC: .4byte gUnknown_8560BB4 _081C36D0: .4byte gUnknown_8565FCC - thumb_func_end sub_081C3668 + thumb_func_end PrintContestMoveDescription - thumb_func_start sub_081C36D4 -sub_081C36D4: @ 0x081C36D4 + thumb_func_start PrintMoveDetails +PrintMoveDetails: @ 0x081C36D4 push {r4, r5, r6, lr} sub sp, #8 lsls r0, r0, #0x10 @@ -924578,12 +924578,12 @@ sub_081C36D4: @ 0x081C36D4 adds r6, r4, #0 ldr r0, _081C3728 movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r4, #0 beq _081C3768 ldr r0, _081C372C @@ -924594,7 +924594,7 @@ sub_081C36D4: @ 0x081C36D4 cmp r0, #2 bne _081C3738 adds r0, r4, #0 - bl sub_081C3498 + bl PrintMovePowerAndAccuracy lsls r1, r4, #3 subs r1, r1, r4 lsls r1, r1, #3 @@ -924606,7 +924606,7 @@ sub_081C36D4: @ 0x081C36D4 adds r0, r5, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C3758 .align 2, 0 _081C3728: .4byte gUnknown_85ED15C @@ -924628,25 +924628,25 @@ _081C3738: adds r0, r5, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C3758: adds r0, r5, #0 - bl sub_0800365C + bl PutWindowTilemap b _081C376E .align 2, 0 _081C3760: .4byte gUnknown_8560BB4 _081C3764: .4byte gUnknown_8565FCC _081C3768: adds r0, r5, #0 - bl sub_08003774 + bl ClearWindowTilemap _081C376E: movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #8 pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081C36D4 + thumb_func_end PrintMoveDetails thumb_func_start sub_081C377C sub_081C377C: @ 0x081C377C @@ -924657,13 +924657,13 @@ sub_081C377C: @ 0x081C377C ldr r4, _081C37C4 adds r0, r4, #0 movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r7, r6, #0 adds r0, r4, #0 movs r1, #1 - bl sub_081C2620 + bl AddWindowFromTemplateList lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -924681,7 +924681,7 @@ sub_081C377C: @ 0x081C377C adds r0, r6, #0 movs r2, #0 movs r3, #0x42 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C3866 .align 2, 0 _081C37C4: .4byte gUnknown_85ED15C @@ -924705,7 +924705,7 @@ _081C37D4: adds r0, r6, #0 movs r2, #0 movs r3, #0x42 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow b _081C381C .align 2, 0 _081C37FC: .4byte 0x000040C0 @@ -924721,7 +924721,7 @@ _081C3804: adds r0, r7, #0 movs r2, #0 movs r3, #0x42 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C381C: ldr r4, _081C3878 ldr r1, _081C387C @@ -924744,7 +924744,7 @@ _081C381C: ldr r4, _081C3880 ldr r1, _081C3884 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, #0 str r0, [sp] movs r0, #0xc @@ -924753,7 +924753,7 @@ _081C381C: adds r1, r4, #0 movs r2, #0 movs r3, #0x42 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow _081C3866: add sp, #8 pop {r3} @@ -924775,7 +924775,7 @@ sub_081C3888: @ 0x081C3888 sub sp, #8 ldr r0, _081C38C0 movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -924790,7 +924790,7 @@ sub_081C3888: @ 0x081C3888 bl sub_08003A34 adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #8 pop {r4} pop {r0} @@ -924819,13 +924819,13 @@ sub_081C38C4: @ 0x081C38C4 ldr r5, _081C3974 adds r0, r5, #0 movs r1, #0 - bl sub_081C2620 + bl AddWindowFromTemplateList adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r5, #0 movs r1, #1 - bl sub_081C2620 + bl AddWindowFromTemplateList adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -924870,9 +924870,9 @@ sub_081C38C4: @ 0x081C38C4 adds r3, r7, #0 bl sub_08003A34 mov r0, sb - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle mov r0, sl - bl sub_081C335C + bl CB2_HandleStartMultiPartnerBattle add sp, #8 pop {r3, r4, r5} mov r8, r3 @@ -924885,19 +924885,19 @@ sub_081C38C4: @ 0x081C38C4 _081C3974: .4byte gUnknown_85ED15C thumb_func_end sub_081C38C4 - thumb_func_start sub_081C3978 -sub_081C3978: @ 0x081C3978 + thumb_func_start PrintHMMovesCantBeForgotten +PrintHMMovesCantBeForgotten: @ 0x081C3978 push {r4, lr} sub sp, #8 ldr r0, _081C39AC movs r1, #2 - bl sub_081C2620 + bl AddWindowFromTemplateList adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r1, _081C39B0 movs r0, #0 str r0, [sp] @@ -924905,7 +924905,7 @@ sub_081C3978: @ 0x081C3978 adds r0, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C1ED8 + bl SummaryScreen_PrintTextOnWindow add sp, #8 pop {r4} pop {r0} @@ -924913,7 +924913,7 @@ sub_081C3978: @ 0x081C3978 .align 2, 0 _081C39AC: .4byte gUnknown_85ED15C _081C39B0: .4byte gUnknown_85CA487 - thumb_func_end sub_081C3978 + thumb_func_end PrintHMMovesCantBeForgotten thumb_func_start ResetSpriteIds ResetSpriteIds: @ 0x081C39B4 @@ -924942,8 +924942,8 @@ _081C39DC: .4byte gUnknown_203CBE8 _081C39E0: .4byte 0x000040D3 thumb_func_end ResetSpriteIds - thumb_func_start sub_081C39E4 -sub_081C39E4: @ 0x081C39E4 + thumb_func_start DestroySpriteInArray +DestroySpriteInArray: @ 0x081C39E4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -924976,7 +924976,7 @@ _081C3A16: _081C3A1C: .4byte gUnknown_203CBE8 _081C3A20: .4byte 0x000040D3 _081C3A24: .4byte gUnknown_20205AC - thumb_func_end sub_081C39E4 + thumb_func_end DestroySpriteInArray thumb_func_start SetSpriteInvisibility SetSpriteInvisibility: @ 0x081C3A28 @@ -925045,8 +925045,8 @@ _081C3A9C: .4byte gUnknown_203CBE8 _081C3AA0: .4byte 0x000040D3 thumb_func_end HidePageSpecificSprites - thumb_func_start sub_081C3AA4 -sub_081C3AA4: @ 0x081C3AA4 + thumb_func_start SetTypeIcons +SetTypeIcons: @ 0x081C3AA4 push {lr} ldr r0, _081C3AC0 ldr r0, [r0] @@ -925068,23 +925068,23 @@ _081C3AC8: beq _081C3ADE b _081C3AE6 _081C3ACE: - bl sub_081C3BC4 + bl SetMonTypeIcons b _081C3AE6 _081C3AD4: - bl sub_081C3C44 - bl sub_081C3D14 + bl SetMoveTypeIcons + bl SetNewMoveTypeIcon b _081C3AE6 _081C3ADE: - bl sub_081C3CA8 - bl sub_081C3D14 + bl SetContestMoveTypeIcons + bl SetNewMoveTypeIcon _081C3AE6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C3AA4 + thumb_func_end SetTypeIcons - thumb_func_start sub_081C3AEC -sub_081C3AEC: @ 0x081C3AEC + thumb_func_start CreateMoveTypeIcons +CreateMoveTypeIcons: @ 0x081C3AEC push {r4, r5, lr} movs r4, #3 ldr r5, _081C3B30 @@ -925100,7 +925100,7 @@ _081C3AF2: movs r1, #0 movs r2, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite ldr r1, [r5] ldr r2, _081C3B34 adds r1, r1, r2 @@ -925122,10 +925122,10 @@ _081C3B16: _081C3B30: .4byte gUnknown_203CBE8 _081C3B34: .4byte 0x000040D3 _081C3B38: .4byte gUnknown_85ED414 - thumb_func_end sub_081C3AEC + thumb_func_end CreateMoveTypeIcons - thumb_func_start sub_081C3B3C -sub_081C3B3C: @ 0x081C3B3C + thumb_func_start SetMoveTypeSpritePosAndType +SetMoveTypeSpritePosAndType: @ 0x081C3B3C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -925188,10 +925188,10 @@ _081C3BB4: .4byte gUnknown_203CBE8 _081C3BB8: .4byte 0x000040D3 _081C3BBC: .4byte gUnknown_20205AC _081C3BC0: .4byte gUnknown_85ED42C - thumb_func_end sub_081C3B3C + thumb_func_end SetMoveTypeSpritePosAndType - thumb_func_start sub_081C3BC4 -sub_081C3BC4: @ 0x081C3BC4 + thumb_func_start SetMonTypeIcons +SetMonTypeIcons: @ 0x081C3BC4 push {r4, r5, lr} ldr r0, _081C3BEC ldr r0, [r0] @@ -925204,7 +925204,7 @@ sub_081C3BC4: @ 0x081C3BC4 movs r1, #0x78 movs r2, #0x30 movs r3, #3 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType movs r0, #4 movs r1, #1 bl SetSpriteInvisibility @@ -925222,7 +925222,7 @@ _081C3BF0: movs r1, #0x78 movs r2, #0x30 movs r3, #3 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType ldrh r1, [r5] lsls r0, r1, #3 subs r0, r0, r1 @@ -925236,7 +925236,7 @@ _081C3BF0: movs r1, #0xa0 movs r2, #0x30 movs r3, #4 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType movs r0, #4 movs r1, #0 bl SetSpriteInvisibility @@ -925252,10 +925252,10 @@ _081C3C3C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C3BC4 + thumb_func_end SetMonTypeIcons - thumb_func_start sub_081C3C44 -sub_081C3C44: @ 0x081C3C44 + thumb_func_start SetMoveTypeIcons +SetMoveTypeIcons: @ 0x081C3C44 push {r4, r5, r6, lr} ldr r0, _081C3C84 ldr r0, [r0] @@ -925286,7 +925286,7 @@ _081C3C52: lsls r3, r3, #0x18 lsrs r3, r3, #0x18 movs r1, #0x57 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType b _081C3C98 .align 2, 0 _081C3C84: .4byte gUnknown_203CBE8 @@ -925306,10 +925306,10 @@ _081C3C98: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081C3C44 + thumb_func_end SetMoveTypeIcons - thumb_func_start sub_081C3CA8 -sub_081C3CA8: @ 0x081C3CA8 + thumb_func_start SetContestMoveTypeIcons +SetContestMoveTypeIcons: @ 0x081C3CA8 push {r4, r5, lr} ldr r0, _081C3CF0 ldr r0, [r0] @@ -925343,7 +925343,7 @@ _081C3CB4: lsls r3, r3, #0x18 lsrs r3, r3, #0x18 movs r1, #0x57 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType b _081C3D04 .align 2, 0 _081C3CF0: .4byte gUnknown_203CBE8 @@ -925363,10 +925363,10 @@ _081C3D04: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081C3CA8 + thumb_func_end SetContestMoveTypeIcons - thumb_func_start sub_081C3D14 -sub_081C3D14: @ 0x081C3D14 + thumb_func_start SetNewMoveTypeIcon +SetNewMoveTypeIcon: @ 0x081C3D14 push {lr} ldr r0, _081C3D30 ldr r1, [r0] @@ -925398,7 +925398,7 @@ _081C3D38: movs r1, #0x57 movs r2, #0x60 movs r3, #7 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType b _081C3D84 .align 2, 0 _081C3D5C: .4byte 0x000040C0 @@ -925418,13 +925418,13 @@ _081C3D64: movs r1, #0x57 movs r2, #0x60 movs r3, #7 - bl sub_081C3B3C + bl SetMoveTypeSpritePosAndType _081C3D84: pop {r0} bx r0 .align 2, 0 _081C3D88: .4byte gUnknown_8565FCC - thumb_func_end sub_081C3D14 + thumb_func_end SetNewMoveTypeIcon thumb_func_start sub_081C3D8C sub_081C3D8C: @ 0x081C3D8C @@ -925497,8 +925497,8 @@ _081C3E10: .4byte 0x000040D3 _081C3E14: .4byte gUnknown_20205AC thumb_func_end sub_081C3D8C - thumb_func_start sub_081C3E18 -sub_081C3E18: @ 0x081C3E18 + thumb_func_start CreatePokemonSprite +CreatePokemonSprite: @ 0x081C3E18 push {r4, r5, r6, lr} adds r3, r0, #0 adds r6, r1, #0 @@ -925653,12 +925653,12 @@ _081C3F58: ldrh r0, [r5, #2] ldr r1, [r5, #0x48] ldr r2, [r5, #0xc] - bl sub_0806E258 + bl GetMonSpritePalStructFromOtIdPersonality adds r4, r0, #0 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldrh r0, [r4, #4] movs r1, #1 - bl sub_08069BA8 + bl SetMultiuseSpriteTemplateToPokemon _081C3F70: ldrh r0, [r6] adds r0, #1 @@ -925669,10 +925669,10 @@ _081C3F78: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C3E18 + thumb_func_end CreatePokemonSprite - thumb_func_start sub_081C3F80 -sub_081C3F80: @ 0x081C3F80 + thumb_func_start PlayMonCry +PlayMonCry: @ 0x081C3F80 push {r4, lr} ldr r0, _081C3FA8 ldr r1, [r0] @@ -925683,13 +925683,13 @@ sub_081C3F80: @ 0x081C3F80 bne _081C3FB6 adds r0, r1, #0 adds r0, #0xc - bl sub_0805ED2C + bl ShouldPlayNormalMonCry cmp r0, #1 bne _081C3FAC ldrh r0, [r4, #2] movs r1, #0 movs r2, #0 - bl sub_080A2BAC + bl PlayCry3 b _081C3FB6 .align 2, 0 _081C3FA8: .4byte gUnknown_203CBE8 @@ -925697,12 +925697,12 @@ _081C3FAC: ldrh r0, [r4, #2] movs r1, #0 movs r2, #0xb - bl sub_080A2BAC + bl PlayCry3 _081C3FB6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C3F80 + thumb_func_end PlayMonCry thumb_func_start sub_081C3FBC sub_081C3FBC: @ 0x081C3FBC @@ -925716,7 +925716,7 @@ sub_081C3FBC: @ 0x081C3FBC movs r1, #0x28 movs r2, #0x40 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -925756,7 +925756,7 @@ sub_081C3FBC: @ 0x081C3FBC _081C4020: .4byte gUnknown_203CBE8 _081C4024: .4byte gUnknown_2024640 _081C4028: .4byte gUnknown_20205AC -_081C402C: .4byte sub_081C404C +_081C402C: .4byte SpriteCB_Pokemon _081C4030: adds r2, r7, #0 adds r2, #0x3f @@ -925775,8 +925775,8 @@ _081C403E: .align 2, 0 thumb_func_end sub_081C3FBC - thumb_func_start sub_081C404C -sub_081C404C: @ 0x081C404C + thumb_func_start SpriteCB_Pokemon +SpriteCB_Pokemon: @ 0x081C404C push {r4, r5, lr} adds r4, r0, #0 ldr r0, _081C408C @@ -925798,11 +925798,11 @@ sub_081C404C: @ 0x081C404C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0x30] - bl sub_081C3F80 + bl PlayMonCry ldrh r1, [r4, #0x2e] ldrb r2, [r5, #4] adds r0, r4, #0 - bl sub_0806E898 + bl PokemonSummaryDoMonAnimation _081C4086: pop {r4, r5} pop {r0} @@ -925810,7 +925810,7 @@ _081C4086: .align 2, 0 _081C408C: .4byte gUnknown_203CBE8 _081C4090: .4byte gUnknown_2037C74 - thumb_func_end sub_081C404C + thumb_func_end SpriteCB_Pokemon thumb_func_start sub_081C4094 sub_081C4094: @ 0x081C4094 @@ -925821,14 +925821,14 @@ sub_081C4094: @ 0x081C4094 _081C409C: .4byte gUnknown_203CBF0 thumb_func_end sub_081C4094 - thumb_func_start sub_081C40A0 -sub_081C40A0: @ 0x081C40A0 + thumb_func_start SummaryScreen_DestroyUnknownTask +SummaryScreen_DestroyUnknownTask: @ 0x081C40A0 push {r4, lr} ldr r4, _081C40B8 ldrb r0, [r4] cmp r0, #0xff beq _081C40B2 - bl sub_080A8964 + bl DestroyTask movs r0, #0xff strb r0, [r4] _081C40B2: @@ -925837,10 +925837,10 @@ _081C40B2: bx r0 .align 2, 0 _081C40B8: .4byte gUnknown_203CBF0 - thumb_func_end sub_081C40A0 + thumb_func_end SummaryScreen_DestroyUnknownTask - thumb_func_start sub_081C40BC -sub_081C40BC: @ 0x081C40BC + thumb_func_start SummaryScreen_DoesSpriteHaveCallback +SummaryScreen_DoesSpriteHaveCallback: @ 0x081C40BC push {lr} ldr r2, _081C40E0 ldr r0, _081C40E4 @@ -925870,10 +925870,10 @@ _081C40F2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C40BC + thumb_func_end SummaryScreen_DoesSpriteHaveCallback - thumb_func_start sub_081C40F8 -sub_081C40F8: @ 0x081C40F8 + thumb_func_start StopPokemonAnimations +StopPokemonAnimations: @ 0x081C40F8 push {r4, r5, r6, lr} ldr r6, _081C4174 ldr r5, _081C4178 @@ -925901,7 +925901,7 @@ sub_081C40F8: @ 0x081C40F8 adds r0, r0, r1 ldr r1, _081C4180 str r1, [r0] - bl sub_0806E924 + bl StopPokemonAnimationDelayTask ldr r0, [r5] adds r0, r0, r4 ldrb r1, [r0] @@ -925942,10 +925942,10 @@ _081C417C: .4byte 0x000040D3 _081C4180: .4byte sub_08007140 _081C4184: .4byte gUnknown_20373B4 _081C4188: .4byte gUnknown_20377B4 - thumb_func_end sub_081C40F8 + thumb_func_end StopPokemonAnimations - thumb_func_start sub_081C418C -sub_081C418C: @ 0x081C418C + thumb_func_start CreateMonMarkingsSprite +CreateMonMarkingsSprite: @ 0x081C418C push {r4, r5, r6, lr} adds r5, r0, #0 ldr r1, _081C41DC @@ -925960,7 +925960,7 @@ sub_081C418C: @ 0x081C418C beq _081C41D6 adds r0, r5, #0 movs r1, #8 - bl sub_0806A058 + bl GetMonData adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -925988,10 +925988,10 @@ _081C41D6: _081C41DC: .4byte 0x00007533 _081C41E0: .4byte gUnknown_85ED570 _081C41E4: .4byte gUnknown_203CBE8 - thumb_func_end sub_081C418C + thumb_func_end CreateMonMarkingsSprite - thumb_func_start sub_081C41E8 -sub_081C41E8: @ 0x081C41E8 + thumb_func_start RemoveAndCreateMonMarkingsSprite +RemoveAndCreateMonMarkingsSprite: @ 0x081C41E8 push {r4, lr} adds r4, r0, #0 ldr r0, _081C4208 @@ -926001,28 +926001,28 @@ sub_081C41E8: @ 0x081C41E8 ldr r0, _081C420C bl FreeSpriteTilesByTag adds r0, r4, #0 - bl sub_081C418C + bl CreateMonMarkingsSprite pop {r4} pop {r0} bx r0 .align 2, 0 _081C4208: .4byte gUnknown_203CBE8 _081C420C: .4byte 0x00007533 - thumb_func_end sub_081C41E8 + thumb_func_end RemoveAndCreateMonMarkingsSprite - thumb_func_start sub_081C4210 -sub_081C4210: @ 0x081C4210 + thumb_func_start CreateCaughtBallSprite +CreateCaughtBallSprite: @ 0x081C4210 push {r4, lr} movs r1, #0x26 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_08170B68 + bl ItemIdToBallId adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_08076480 + bl LoadBallGfx lsls r0, r4, #1 adds r0, r0, r4 lsls r0, r0, #3 @@ -926031,7 +926031,7 @@ sub_081C4210: @ 0x081C4210 movs r1, #0x10 movs r2, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite ldr r2, _081C4280 ldr r1, [r2] ldr r3, _081C4284 @@ -926067,7 +926067,7 @@ _081C4280: .4byte gUnknown_203CBE8 _081C4284: .4byte 0x000040D4 _081C4288: .4byte gUnknown_20205AC _081C428C: .4byte sub_08007140 - thumb_func_end sub_081C4210 + thumb_func_end CreateCaughtBallSprite thumb_func_start sub_081C4290 sub_081C4290: @ 0x081C4290 @@ -926083,12 +926083,12 @@ sub_081C4290: @ 0x081C4290 movs r1, #0x40 movs r2, #0x90 movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4] _081C42AE: ldr r0, [r5] adds r0, #0xc - bl sub_081B1D2C + bl GetMonAilment lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0 @@ -926163,7 +926163,7 @@ _081C4338: ldr r0, _081C4378 movs r2, #0x28 mov r3, sb - bl sub_08006B0C + bl CreateSprite adds r1, r7, r5 strb r0, [r1] adds r4, r1, #0 @@ -926322,7 +926322,7 @@ _081C4470: adds r0, r5, r4 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_081C39E4 + bl DestroySpriteInArray adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -926477,7 +926477,7 @@ sub_081C4578: @ 0x081C4578 lsrs r0, r0, #0x1e movs r1, #8 movs r2, #0 - bl sub_08001B70 + bl SetBgAttribute ldr r3, [r5] lsls r0, r3, #0x1e lsrs r0, r0, #0x1e @@ -926486,7 +926486,7 @@ sub_081C4578: @ 0x081C4578 lsrs r3, r3, #0x18 str r4, [sp] movs r2, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, [r5] lsls r0, r0, #0x1e lsrs r0, r0, #0x1e @@ -926495,7 +926495,7 @@ sub_081C4578: @ 0x081C4578 str r2, [sp] movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, [r5] lsls r1, r1, #0x16 lsrs r1, r1, #0x18 @@ -926513,13 +926513,13 @@ _081C45E4: lsrs r0, r0, #0x1e movs r1, #8 movs r2, #2 - bl sub_08001B70 + bl SetBgAttribute ldr r0, [r5] lsls r0, r0, #0x1e lsrs r0, r0, #0x1e movs r1, #9 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r3, [r5] lsls r0, r3, #0x1e lsrs r0, r0, #0x1e @@ -926528,7 +926528,7 @@ _081C45E4: lsrs r3, r3, #0x18 movs r2, #0 str r2, [sp] - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, [r5] lsls r0, r0, #0x1e lsrs r0, r0, #0x1e @@ -926537,7 +926537,7 @@ _081C45E4: str r4, [sp] movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, [r5] lsls r1, r1, #0x16 lsrs r1, r1, #0x18 @@ -926551,19 +926551,19 @@ _081C4636: lsrs r0, r0, #0x1e movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX ldr r0, [r5] lsls r0, r0, #0x1e lsrs r0, r0, #0x1e movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r0, [r5] lsls r0, r0, #0x1e lsrs r0, r0, #0x1e movs r1, #4 movs r2, #1 - bl sub_08001B70 + bl SetBgAttribute ldr r0, _081C4688 ldr r1, _081C468C ldr r2, _081C4690 @@ -926590,7 +926590,7 @@ _081C4694: .4byte gUnknown_203CBF4 thumb_func_start sub_081C4698 sub_081C4698: @ 0x081C4698 push {lr} - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _081C46A8 @@ -926600,7 +926600,7 @@ _081C46A8: ldr r0, _081C46B8 ldr r0, [r0] ldrb r0, [r0] - bl sub_08001B48 + bl ShowBg movs r0, #0 _081C46B4: pop {r1} @@ -926616,7 +926616,7 @@ sub_081C46BC: @ 0x081C46BC ldr r0, [r4] cmp r0, #0 beq _081C46CE - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _081C46CE: @@ -926636,15 +926636,15 @@ sub_081C46D8: @ 0x081C46D8 ldrb r0, [r0] lsls r1, r1, #8 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 _081C46F0: .4byte gUnknown_203CBF4 thumb_func_end sub_081C46D8 - thumb_func_start sub_081C46F4 -sub_081C46F4: @ 0x081C46F4 + thumb_func_start InitBattlePyramidBagCursorPosition +InitBattlePyramidBagCursorPosition: @ 0x081C46F4 ldr r1, _081C4700 movs r0, #0 strh r0, [r1, #6] @@ -926652,10 +926652,10 @@ sub_081C46F4: @ 0x081C46F4 bx lr .align 2, 0 _081C4700: .4byte gUnknown_203CBFC - thumb_func_end sub_081C46F4 + thumb_func_end InitBattlePyramidBagCursorPosition - thumb_func_start sub_081C4704 -sub_081C4704: @ 0x081C4704 + thumb_func_start CB2_PyramidBagMenuFromStartMenu +CB2_PyramidBagMenuFromStartMenu: @ 0x081C4704 push {lr} ldr r1, _081C4714 movs r0, #0 @@ -926663,8 +926663,8 @@ sub_081C4704: @ 0x081C4704 pop {r0} bx r0 .align 2, 0 -_081C4714: .4byte sub_08085AFC - thumb_func_end sub_081C4704 +_081C4714: .4byte CB2_ReturnToFieldWithOpenMenu + thumb_func_end CB2_PyramidBagMenuFromStartMenu thumb_func_start sub_081C4718 sub_081C4718: @ 0x081C4718 @@ -926684,10 +926684,10 @@ sub_081C472C: @ 0x081C472C bl sub_080987DC movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen ldr r0, _081C4748 movs r1, #0xa - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -926705,7 +926705,7 @@ sub_081C474C: @ 0x081C474C ands r0, r1 cmp r0, #0 bne _081C4776 - bl sub_0808569C + bl CleanupOverworldWindowsAndTilemaps ldr r0, _081C4780 ldr r1, _081C4784 str r1, [r0] @@ -926713,7 +926713,7 @@ sub_081C474C: @ 0x081C474C movs r0, #3 bl sub_081C47A0 adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081C4776: pop {r4} pop {r0} @@ -926721,7 +926721,7 @@ _081C4776: .align 2, 0 _081C477C: .4byte gUnknown_2037C74 _081C4780: .4byte gUnknown_3005B10 -_081C4784: .4byte sub_081B9068 +_081C4784: .4byte hm_add_c3_without_phase_2 _081C4788: .4byte sub_08085A30 thumb_func_end sub_081C474C @@ -926746,7 +926746,7 @@ sub_081C47A0: @ 0x081C47A0 lsrs r4, r0, #0x18 ldr r6, _081C4804 ldr r0, _081C4808 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] cmp r4, #4 beq _081C47BA @@ -926784,7 +926784,7 @@ _081C47C2: movs r2, #5 bl memset ldr r0, _081C4820 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5, r6} pop {r0} bx r0 @@ -926802,11 +926802,11 @@ _081C4820: .4byte sub_081C4854 thumb_func_start sub_081C4824 sub_081C4824: @ 0x081C4824 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -926815,8 +926815,8 @@ sub_081C4824: @ 0x081C4824 thumb_func_start sub_081C4840 sub_081C4840: @ 0x081C4840 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 @@ -926888,11 +926888,11 @@ _081C48A8: @ jump table .4byte _081C4982 @ case 15 .4byte _081C4990 @ case 16 _081C48EC: - bl sub_08121E58 + bl SetVBlankHBlankCallbacksToNull bl sub_08199640 b _081C49AA _081C48F6: - bl sub_080B9710 + bl ScanlineEffect_Stop b _081C49AA _081C48FC: bl FreeAllSpritePalettes @@ -926914,7 +926914,7 @@ _081C491A: lsls r0, r0, #0x18 cmp r0, #0 bne _081C49AA - bl sub_080A8818 + bl ResetTasks b _081C49AA _081C492A: bl sub_081C49E4 @@ -926943,7 +926943,7 @@ _081C4956: bl sub_081C521C b _081C49AA _081C4964: - bl sub_081C4B1C + bl SetBagItemsListTemplate b _081C49AA _081C496A: bl sub_081C4EF4 @@ -926952,7 +926952,7 @@ _081C4970: bl sub_081C66B4 b _081C49AA _081C4976: - bl sub_081C4E70 + bl AddScrollArrow b _081C49AA _081C497C: bl sub_081C67CC @@ -926962,7 +926962,7 @@ _081C4982: rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes b _081C49AA _081C4990: movs r0, #1 @@ -926971,7 +926971,7 @@ _081C4990: str r1, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r2, _081C49BC ldrb r1, [r2, #8] movs r0, #0x7f @@ -926992,9 +926992,9 @@ _081C49BC: .4byte gUnknown_2037C74 _081C49C0: .4byte gUnknown_3002360 _081C49C4: ldr r0, _081C49D4 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081C49D8 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 b _081C49DE .align 2, 0 @@ -927011,7 +927011,7 @@ _081C49DE: thumb_func_start sub_081C49E4 sub_081C49E4: @ 0x081C49E4 push {lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081C4A38 @@ -927022,20 +927022,20 @@ sub_081C49E4: @ 0x081C49E4 ldr r1, [r0] adds r1, #4 movs r0, #2 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -927081,12 +927081,12 @@ _081C4A80: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram b _081C4AE0 .align 2, 0 _081C4A98: .4byte gUnknown_8D9A7CC _081C4A9C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -927105,13 +927105,13 @@ _081C4AC0: ldr r0, _081C4ACC movs r1, #0 movs r2, #0x20 - bl sub_080A11BC + bl LoadCompressedPalette b _081C4AE0 .align 2, 0 _081C4ACC: .4byte gUnknown_8D9B13C _081C4AD0: ldr r0, _081C4AD8 - bl sub_08034388 + bl LoadCompressedSpriteSheet b _081C4AE0 .align 2, 0 _081C4AD8: .4byte gUnknown_85EF81C @@ -927151,8 +927151,8 @@ _081C4B12: .align 2, 0 thumb_func_end sub_081C4A40 - thumb_func_start sub_081C4B1C -sub_081C4B1C: @ 0x081C4B1C + thumb_func_start SetBagItemsListTemplate +SetBagItemsListTemplate: @ 0x081C4B1C push {r4, r5, r6, r7, lr} ldr r0, _081C4BE4 ldr r2, [r0] @@ -927187,7 +927187,7 @@ _081C4B4C: adds r0, r0, r4 adds r1, r1, r7 ldrh r1, [r1] - bl sub_081C4C14 + bl PyramidBag_CopyItemName ldr r1, [r5] lsls r2, r6, #3 ldr r3, _081C4BFC @@ -927266,10 +927266,10 @@ _081C4C04: .4byte gUnknown_85C9448 _081C4C08: .4byte gUnknown_3006050 _081C4C0C: .4byte gUnknown_85EF710 _081C4C10: .4byte 0x00000822 - thumb_func_end sub_081C4B1C + thumb_func_end SetBagItemsListTemplate - thumb_func_start sub_081C4C14 -sub_081C4C14: @ 0x081C4C14 + thumb_func_start PyramidBag_CopyItemName +PyramidBag_CopyItemName: @ 0x081C4C14 push {r4, r5, lr} adds r5, r0, #0 lsls r1, r1, #0x10 @@ -927291,7 +927291,7 @@ sub_081C4C14: @ 0x081C4C14 bl sub_080D5EC8 ldr r1, _081C4C54 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders b _081C4C60 .align 2, 0 _081C4C4C: .4byte gUnknown_2021C40 @@ -927306,10 +927306,10 @@ _081C4C60: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C4C14 + thumb_func_end PyramidBag_CopyItemName - thumb_func_start sub_081C4C68 -sub_081C4C68: @ 0x081C4C68 + thumb_func_start PyramidBagMoveCursorFunc +PyramidBagMoveCursorFunc: @ 0x081C4C68 push {r4, r5, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -927357,7 +927357,7 @@ _081C4C7E: ldr r2, _081C4CE4 adds r1, r1, r2 ldrb r1, [r1] - bl sub_081C6750 + bl ShowItemImage b _081C4CF6 .align 2, 0 _081C4CD0: .4byte gUnknown_203CBF8 @@ -927372,7 +927372,7 @@ _081C4CE8: ldr r2, _081C4D18 adds r1, r1, r2 ldrb r1, [r1] - bl sub_081C6750 + bl ShowItemImage _081C4CF6: ldr r0, _081C4D1C ldr r1, [r0] @@ -927383,7 +927383,7 @@ _081C4CF6: eors r0, r2 strb r0, [r1] adds r0, r4, #0 - bl sub_081C4DD4 + bl PrintItemDescription _081C4D0C: pop {r4, r5} pop {r0} @@ -927392,10 +927392,10 @@ _081C4D0C: _081C4D14: .4byte 0x0000FFFF _081C4D18: .4byte 0x00000815 _081C4D1C: .4byte gUnknown_203CBF8 - thumb_func_end sub_081C4C68 + thumb_func_end PyramidBagMoveCursorFunc - thumb_func_start sub_081C4D20 -sub_081C4D20: @ 0x081C4D20 + thumb_func_start PrintItemQuantity +PrintItemQuantity: @ 0x081C4D20 push {r4, r5, r6, lr} sub sp, #0x10 adds r4, r1, #0 @@ -927452,7 +927452,7 @@ _081C4D68: ldr r4, _081C4DCC ldr r1, _081C4DD0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r1, #0 str r1, [sp] str r1, [sp, #4] @@ -927463,7 +927463,7 @@ _081C4D68: adds r1, r4, #0 movs r2, #0x60 adds r3, r5, #0 - bl sub_081C6454 + bl PrintOnWindow_Font1 _081C4DB2: add sp, #0x10 pop {r4, r5, r6} @@ -927476,10 +927476,10 @@ _081C4DC4: .4byte 0x00000CA9 _081C4DC8: .4byte 0x00000E54 _081C4DCC: .4byte gUnknown_2021C7C _081C4DD0: .4byte gUnknown_85C943C - thumb_func_end sub_081C4D20 + thumb_func_end PrintItemQuantity - thumb_func_start sub_081C4DD4 -sub_081C4DD4: @ 0x081C4DD4 + thumb_func_start PrintItemDescription +PrintItemDescription: @ 0x081C4DD4 push {r4, lr} sub sp, #0x10 adds r3, r0, #0 @@ -927522,11 +927522,11 @@ _081C4E18: ldr r4, _081C4E68 ldr r1, _081C4E6C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders _081C4E34: movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -927536,7 +927536,7 @@ _081C4E34: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C6454 + bl PrintOnWindow_Font1 add sp, #0x10 pop {r4} pop {r0} @@ -927547,10 +927547,10 @@ _081C4E60: .4byte gUnknown_85C9728 _081C4E64: .4byte gUnknown_203CBFC _081C4E68: .4byte gUnknown_2021C7C _081C4E6C: .4byte gUnknown_85C9738 - thumb_func_end sub_081C4DD4 + thumb_func_end PrintItemDescription - thumb_func_start sub_081C4E70 -sub_081C4E70: @ 0x081C4E70 + thumb_func_start AddScrollArrow +AddScrollArrow: @ 0x081C4E70 push {r4, lr} sub sp, #0x10 ldr r4, _081C4EB8 @@ -927577,7 +927577,7 @@ sub_081C4E70: @ 0x081C4E70 movs r1, #0xac movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r4] ldr r2, _081C4EBC adds r1, r1, r2 @@ -927592,7 +927592,7 @@ _081C4EB8: .4byte gUnknown_203CBF8 _081C4EBC: .4byte 0x00000816 _081C4EC0: .4byte 0x00000B5E _081C4EC4: .4byte gUnknown_203CC04 - thumb_func_end sub_081C4E70 + thumb_func_end AddScrollArrow thumb_func_start sub_081C4EC8 sub_081C4EC8: @ 0x081C4EC8 @@ -927604,7 +927604,7 @@ sub_081C4EC8: @ 0x081C4EC8 ldrb r0, [r1] cmp r0, #0xff beq _081C4EE6 - bl sub_081AF2F8 + bl RemoveScrollIndicatorArrowPair ldr r0, [r4] ldr r1, _081C4EF0 adds r0, r0, r1 @@ -927624,7 +927624,7 @@ sub_081C4EF4: @ 0x081C4EF4 push {r4, lr} ldr r0, _081C4F24 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -927636,7 +927636,7 @@ sub_081C4EF4: @ 0x081C4EF4 ldr r2, _081C4F30 ldrh r1, [r2, #8] ldrh r2, [r2, #6] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -927644,7 +927644,7 @@ sub_081C4EF4: @ 0x081C4EF4 pop {r0} bx r0 .align 2, 0 -_081C4F24: .4byte sub_081C53C4 +_081C4F24: .4byte Task_HandlePyramidBagInput _081C4F28: .4byte gUnknown_3005B68 _081C4F2C: .4byte gUnknown_3006050 _081C4F30: .4byte gUnknown_203CBFC @@ -927707,8 +927707,8 @@ _081C4F9C: .4byte 0x00000E2C _081C4FA0: .4byte 0x00000E54 thumb_func_end SwapItems - thumb_func_start sub_081C4FA4 -sub_081C4FA4: @ 0x081C4FA4 + thumb_func_start MovePyramidBagItemSlotInList +MovePyramidBagItemSlotInList: @ 0x081C4FA4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -927808,7 +927808,7 @@ _081C505E: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081C4FA4 + thumb_func_end MovePyramidBagItemSlotInList thumb_func_start CompactItems CompactItems: @ 0x081C5068 @@ -928110,7 +928110,7 @@ sub_081C5294: @ 0x081C5294 lsrs r0, r0, #0x18 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081AE564 + bl ListMenuGetYCoordForPrintingArrowCursor lsls r0, r0, #0x18 lsrs r0, r0, #0x18 adds r1, r4, #0 @@ -928158,7 +928158,7 @@ _081C52F0: str r2, [sp, #0xc] movs r2, #0 adds r3, r5, #0 - bl sub_081C6454 + bl PrintOnWindow_Font1 _081C5304: add sp, #0x10 pop {r4, r5} @@ -928181,7 +928181,7 @@ sub_081C5310: @ 0x081C5310 str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081C5340 lsls r0, r4, #2 adds r0, r0, r4 @@ -928218,13 +928218,13 @@ sub_081C5348: @ 0x081C5348 ldr r4, _081C5388 subs r2, r4, #2 adds r1, r4, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask ldr r0, _081C538C ldr r0, [r0] ldr r0, [r0] cmp r0, #0 beq _081C5390 - bl sub_08000540 + bl SetMainCallback2 b _081C539A .align 2, 0 _081C5380: .4byte gUnknown_3005B68 @@ -928235,17 +928235,17 @@ _081C5390: adds r0, r4, #0 subs r0, #8 ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 _081C539A: bl sub_081C4EC8 bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_080034D4 + bl FreeAllWindowBuffers ldr r0, _081C53C0 ldr r0, [r0] - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081C53B8: pop {r4, r5} pop {r0} @@ -928254,8 +928254,8 @@ _081C53B8: _081C53C0: .4byte gUnknown_203CBF8 thumb_func_end sub_081C5348 - thumb_func_start sub_081C53C4 -sub_081C53C4: @ 0x081C53C4 + thumb_func_start Task_HandlePyramidBagInput +Task_HandlePyramidBagInput: @ 0x081C53C4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -928325,7 +928325,7 @@ _081C5450: .4byte gUnknown_203CBF8 _081C5454: .4byte 0x00000821 _081C5458: ldrb r0, [r7] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r6, r0, #0 ldrb r0, [r7] ldr r1, _081C5480 @@ -928412,7 +928412,7 @@ _081C5512: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081C53C4 + thumb_func_end Task_HandlePyramidBagInput thumb_func_start sub_081C551C sub_081C551C: @ 0x081C551C @@ -928508,10 +928508,10 @@ _081C55D6: ldr r4, _081C5630 ldr r1, _081C5634 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -928521,7 +928521,7 @@ _081C55D6: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C6454 + bl PrintOnWindow_Font1 ldr r0, _081C561C ldr r0, [r0] movs r1, #0x82 @@ -928577,7 +928577,7 @@ _081C565E: .align 2, 0 _081C567C: .4byte gUnknown_203CBF8 _081C5680: .4byte gUnknown_3005B60 -_081C5684: .4byte sub_081C5810 +_081C5684: .4byte HandleMenuActionInput _081C5688: ldr r0, _081C56A0 lsls r1, r5, #2 @@ -928593,7 +928593,7 @@ _081C5694: bx r0 .align 2, 0 _081C56A0: .4byte gUnknown_3005B60 -_081C56A4: .4byte sub_081C5794 +_081C56A4: .4byte HandleFewMenuActionsInput thumb_func_end sub_081C551C thumb_func_start sub_081C56A8 @@ -928627,10 +928627,10 @@ sub_081C56A8: @ 0x081C56A8 movs r1, #1 movs r2, #8 movs r3, #2 - bl sub_081989B4 + bl AddItemMenuActionTextPrinters movs r0, #1 movs r1, #1 - bl sub_080061B4 + bl GetFontAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 str r0, [sp] @@ -928713,8 +928713,8 @@ _081C578C: .4byte gUnknown_203CBF8 _081C5790: .4byte 0x00000818 thumb_func_end sub_081C5724 - thumb_func_start sub_081C5794 -sub_081C5794: @ 0x081C5794 + thumb_func_start HandleFewMenuActionsInput +HandleFewMenuActionsInput: @ 0x081C5794 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -928724,7 +928724,7 @@ sub_081C5794: @ 0x081C5794 lsrs r0, r0, #0x18 cmp r0, #1 beq _081C57FC - bl sub_081986E8 + bl Menu_ProcessInputNoWrap lsls r0, r0, #0x18 asrs r4, r0, #0x18 movs r0, #2 @@ -928770,10 +928770,10 @@ _081C57FC: _081C5804: .4byte gUnknown_85EF728 _081C5808: .4byte gUnknown_203CBF8 _081C580C: .4byte 0x00000818 - thumb_func_end sub_081C5794 + thumb_func_end HandleFewMenuActionsInput - thumb_func_start sub_081C5810 -sub_081C5810: @ 0x081C5810 + thumb_func_start HandleMenuActionInput +HandleMenuActionInput: @ 0x081C5810 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -928784,7 +928784,7 @@ sub_081C5810: @ 0x081C5810 bne _081C5824 b _081C598C _081C5824: - bl sub_08198670 + bl Menu_GetCursorPos lsls r0, r0, #0x18 lsrs r4, r0, #0x18 ldr r5, _081C5868 @@ -928802,7 +928802,7 @@ _081C5842: subs r0, #2 lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_081C5998 + bl IsValidMenuAction lsls r0, r0, #0x18 cmp r0, #0 bne _081C5854 @@ -928838,7 +928838,7 @@ _081C588C: adds r0, r1, #2 lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_081C5998 + bl IsValidMenuAction lsls r0, r0, #0x18 cmp r0, #0 beq _081C598C @@ -928855,7 +928855,7 @@ _081C58B0: ands r0, r1 cmp r0, #0 bne _081C58C4 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -928870,7 +928870,7 @@ _081C58C4: subs r0, r1, #1 lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_081C5998 + bl IsValidMenuAction lsls r0, r0, #0x18 cmp r0, #0 beq _081C598C @@ -928885,7 +928885,7 @@ _081C58EC: ands r0, r1 cmp r0, #0 bne _081C5902 - bl sub_081220DC + bl GetLRKeysState lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -928900,7 +928900,7 @@ _081C5902: adds r0, r1, #1 lsls r0, r0, #0x18 asrs r0, r0, #0x18 - bl sub_081C5998 + bl IsValidMenuAction lsls r0, r0, #0x18 cmp r0, #0 beq _081C598C @@ -928959,10 +928959,10 @@ _081C598C: bx r0 .align 2, 0 _081C5994: .4byte gUnknown_85EF728 - thumb_func_end sub_081C5810 + thumb_func_end HandleMenuActionInput - thumb_func_start sub_081C5998 -sub_081C5998: @ 0x081C5998 + thumb_func_start IsValidMenuAction +IsValidMenuAction: @ 0x081C5998 push {lr} lsls r0, r0, #0x18 asrs r1, r0, #0x18 @@ -928994,7 +928994,7 @@ _081C59CE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C5998 + thumb_func_end IsValidMenuAction thumb_func_start sub_081C59D4 sub_081C59D4: @ 0x081C59D4 @@ -929027,8 +929027,8 @@ _081C5A06: .align 2, 0 thumb_func_end sub_081C59D4 - thumb_func_start sub_081C5A0C -sub_081C5A0C: @ 0x081C5A0C + thumb_func_start BagAction_UseOnField +BagAction_UseOnField: @ 0x081C5A0C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -929068,9 +929068,9 @@ _081C5A54: bl sub_081C59D4 movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrh r0, [r4] bl sub_080D6DF8 adds r1, r0, #0 @@ -929080,10 +929080,10 @@ _081C5A7E: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081C5A0C + thumb_func_end BagAction_UseOnField - thumb_func_start sub_081C5A84 -sub_081C5A84: @ 0x081C5A84 + thumb_func_start BagAction_Cancel +BagAction_Cancel: @ 0x081C5A84 push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -929096,11 +929096,11 @@ sub_081C5A84: @ 0x081C5A84 bl sub_081C59D4 movs r1, #2 ldrsh r0, [r4, r1] - bl sub_081C4DD4 + bl PrintItemDescription movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, #0 bl sub_081C5294 @@ -929111,7 +929111,7 @@ sub_081C5A84: @ 0x081C5A84 bx r0 .align 2, 0 _081C5AC4: .4byte gUnknown_3005B68 - thumb_func_end sub_081C5A84 + thumb_func_end BagAction_Cancel thumb_func_start sub_081C5AC8 sub_081C5AC8: @ 0x081C5AC8 @@ -929119,7 +929119,7 @@ sub_081C5AC8: @ 0x081C5AC8 adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081C4E70 + bl AddScrollArrow ldr r1, _081C5AE8 lsls r0, r4, #2 adds r0, r0, r4 @@ -929132,11 +929132,11 @@ sub_081C5AC8: @ 0x081C5AC8 bx r0 .align 2, 0 _081C5AE8: .4byte gUnknown_3005B60 -_081C5AEC: .4byte sub_081C53C4 +_081C5AEC: .4byte Task_HandlePyramidBagInput thumb_func_end sub_081C5AC8 - thumb_func_start sub_081C5AF0 -sub_081C5AF0: @ 0x081C5AF0 + thumb_func_start BagAction_Toss +BagAction_Toss: @ 0x081C5AF0 push {r4, r5, r6, r7, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -929166,10 +929166,10 @@ _081C5B20: ldr r4, _081C5B70 ldr r1, _081C5B74 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -929179,7 +929179,7 @@ _081C5B20: adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C6454 + bl PrintOnWindow_Font1 bl sub_081C5C30 adds r0, r7, #0 subs r0, #8 @@ -929197,7 +929197,7 @@ _081C5B6C: .4byte gUnknown_2021C40 _081C5B70: .4byte gUnknown_2021C7C _081C5B74: .4byte gUnknown_85C9523 _081C5B78: .4byte sub_081C5CC4 - thumb_func_end sub_081C5AF0 + thumb_func_end BagAction_Toss thumb_func_start sub_081C5B7C sub_081C5B7C: @ 0x081C5B7C @@ -929224,10 +929224,10 @@ sub_081C5B7C: @ 0x081C5B7C ldr r4, _081C5BF0 ldr r1, _081C5BF4 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -929237,7 +929237,7 @@ sub_081C5B7C: @ 0x081C5B7C adds r1, r4, #0 movs r2, #0 movs r3, #2 - bl sub_081C6454 + bl PrintOnWindow_Font1 ldr r1, _081C5BF8 adds r0, r5, #0 bl sub_081C656C @@ -929255,8 +929255,8 @@ _081C5BF4: .4byte gUnknown_85C9540 _081C5BF8: .4byte gUnknown_85EF764 thumb_func_end sub_081C5B7C - thumb_func_start sub_081C5BFC -sub_081C5BFC: @ 0x081C5BFC + thumb_func_start DontTossItem +DontTossItem: @ 0x081C5BFC push {r4, r5, lr} adds r5, r0, #0 lsls r5, r5, #0x18 @@ -929268,7 +929268,7 @@ sub_081C5BFC: @ 0x081C5BFC adds r4, r4, r0 movs r1, #2 ldrsh r0, [r4, r1] - bl sub_081C4DD4 + bl PrintItemDescription ldrb r0, [r4] movs r1, #0 bl sub_081C5294 @@ -929279,7 +929279,7 @@ sub_081C5BFC: @ 0x081C5BFC bx r0 .align 2, 0 _081C5C2C: .4byte gUnknown_3005B68 - thumb_func_end sub_081C5BFC + thumb_func_end DontTossItem thumb_func_start sub_081C5C30 sub_081C5C30: @ 0x081C5C30 @@ -929293,7 +929293,7 @@ sub_081C5C30: @ 0x081C5C30 ldr r4, _081C5C74 ldr r1, _081C5C78 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #3 bl sub_081C64AC movs r0, #2 @@ -929330,7 +929330,7 @@ sub_081C5C7C: @ 0x081C5C7C ldr r4, _081C5CBC ldr r1, _081C5CC0 adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #2 str r0, [sp] movs r0, #0 @@ -929365,7 +929365,7 @@ sub_081C5CC4: @ 0x081C5CC4 adds r0, r4, #0 adds r0, #0x10 ldrh r1, [r4, #4] - bl sub_08122040 + bl AdjustQuantityAccordingToDPadInput lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -929389,9 +929389,9 @@ _081C5CF8: movs r1, #0 bl sub_08198134 movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r5, #0 bl sub_081C5B7C b _081C5D54 @@ -929408,11 +929408,11 @@ _081C5D2C: movs r1, #0 bl sub_08198134 movs r0, #3 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r6, #0 - bl sub_081C5BFC + bl DontTossItem _081C5D54: pop {r4, r5, r6} pop {r0} @@ -929420,8 +929420,8 @@ _081C5D54: .align 2, 0 thumb_func_end sub_081C5CC4 - thumb_func_start sub_081C5D5C -sub_081C5D5C: @ 0x081C5D5C + thumb_func_start TossItem +TossItem: @ 0x081C5D5C push {r4, r5, r6, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -929444,10 +929444,10 @@ sub_081C5D5C: @ 0x081C5D5C ldr r6, _081C5DD0 ldr r1, _081C5DD4 adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0 str r0, [sp] str r0, [sp, #4] @@ -929457,7 +929457,7 @@ sub_081C5D5C: @ 0x081C5D5C adds r1, r6, #0 movs r2, #0 movs r3, #2 - bl sub_081C6454 + bl PrintOnWindow_Font1 subs r5, #8 adds r4, r4, r5 ldr r0, _081C5DD8 @@ -929474,7 +929474,7 @@ _081C5DCC: .4byte gUnknown_2021C54 _081C5DD0: .4byte gUnknown_2021C7C _081C5DD4: .4byte gUnknown_85C9532 _081C5DD8: .4byte sub_081C5DDC - thumb_func_end sub_081C5D5C + thumb_func_end TossItem thumb_func_start sub_081C5DDC sub_081C5DDC: @ 0x081C5DDC @@ -929499,23 +929499,23 @@ sub_081C5DDC: @ 0x081C5DDC ldr r0, _081C5E50 ldrh r0, [r0] ldrh r1, [r4, #0x10] - bl sub_080D6B4C + bl RemovePyramidBagItem ldrb r0, [r4] adds r1, r6, #0 adds r2, r7, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask bl sub_081C5120 bl sub_081C51B8 - bl sub_081C4B1C + bl SetBagItemsListTemplate ldr r0, _081C5E54 ldrh r1, [r6] ldrh r2, [r7] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram adds r0, r5, #0 bl sub_081C5AC8 _081C5E3E: @@ -929530,8 +929530,8 @@ _081C5E50: .4byte gUnknown_203CB48 _081C5E54: .4byte gUnknown_3006050 thumb_func_end sub_081C5DDC - thumb_func_start sub_081C5E58 -sub_081C5E58: @ 0x081C5E58 + thumb_func_start BagAction_Give +BagAction_Give: @ 0x081C5E58 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -929576,7 +929576,7 @@ _081C5EB6: pop {r4, r5, r6} pop {r0} bx r0 - thumb_func_end sub_081C5E58 + thumb_func_end BagAction_Give thumb_func_start sub_081C5EBC sub_081C5EBC: @ 0x081C5EBC @@ -929591,7 +929591,7 @@ sub_081C5EBC: @ 0x081C5EBC ldr r5, _081C5EF0 ldr r1, _081C5EF4 adds r0, r5, #0 - bl sub_08008BCC + bl StringExpandPlaceholders ldr r2, _081C5EF8 adds r0, r4, #0 adds r1, r5, #0 @@ -929644,7 +929644,7 @@ sub_081C5F24: @ 0x081C5F24 bl sub_081C65DC movs r1, #2 ldrsh r0, [r4, r1] - bl sub_081C4DD4 + bl PrintItemDescription ldrb r0, [r4] movs r1, #0 bl sub_081C5294 @@ -929665,7 +929665,7 @@ sub_081C5F5C: @ 0x081C5F5C adds r6, r4, #0 ldr r5, _081C5F80 ldrh r0, [r5] - bl sub_08122188 + bl itemid_80BF6D8_mail_related lsls r0, r0, #0x18 cmp r0, #0 bne _081C5F8C @@ -929696,8 +929696,8 @@ _081C5FA6: bx r0 thumb_func_end sub_081C5F5C - thumb_func_start sub_081C5FAC -sub_081C5FAC: @ 0x081C5FAC + thumb_func_start BagAction_UseInBattle +BagAction_UseInBattle: @ 0x081C5FAC push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -929718,7 +929718,7 @@ _081C5FD0: bx r0 .align 2, 0 _081C5FD8: .4byte gUnknown_203CB48 - thumb_func_end sub_081C5FAC + thumb_func_end BagAction_UseInBattle thumb_func_start sub_081C5FDC sub_081C5FDC: @ 0x081C5FDC @@ -929753,7 +929753,7 @@ sub_081C5FDC: @ 0x081C5FDC ldrb r0, [r1] movs r1, #0x10 movs r2, #1 - bl sub_081AEE34 + bl ListMenuSetUnkIndicatorsStructField ldr r0, _081C60AC ldr r3, [r0] mov r0, r8 @@ -929778,10 +929778,10 @@ sub_081C5FDC: @ 0x081C5FDC ldr r6, _081C60BC ldr r1, _081C60C0 adds r0, r6, #0 - bl sub_08008BCC + bl StringExpandPlaceholders movs r0, #1 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer str r5, [sp] str r5, [sp, #4] str r5, [sp, #8] @@ -929790,7 +929790,7 @@ sub_081C5FDC: @ 0x081C5FDC adds r1, r6, #0 movs r2, #0 movs r3, #2 - bl sub_081C6454 + bl PrintOnWindow_Font1 mov r1, r8 ldrb r0, [r1] movs r1, #1 @@ -929822,11 +929822,11 @@ _081C60B4: .4byte 0x00000E2C _081C60B8: .4byte gUnknown_2021C40 _081C60BC: .4byte gUnknown_2021C7C _081C60C0: .4byte gUnknown_85C947F -_081C60C4: .4byte sub_081C60C8 +_081C60C4: .4byte Task_ItemSwapHandleInput thumb_func_end sub_081C5FDC - thumb_func_start sub_081C60C8 -sub_081C60C8: @ 0x081C60C8 + thumb_func_start Task_ItemSwapHandleInput +Task_ItemSwapHandleInput: @ 0x081C60C8 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -929859,7 +929859,7 @@ _081C6108: .4byte gUnknown_3002360 _081C610C: .4byte gUnknown_203CC04 _081C6110: ldrb r0, [r4] - bl sub_081AE2DC + bl ListMenu_ProcessInput adds r6, r0, #0 ldrb r0, [r4] ldr r4, _081C6144 @@ -929891,7 +929891,7 @@ _081C6148: beq _081C6160 _081C6158: adds r0, r5, #0 - bl sub_081C617C + bl PerformItemSwap b _081C6174 _081C6160: adds r0, r5, #0 @@ -929901,16 +929901,16 @@ _081C6168: movs r0, #5 bl sub_080A306C adds r0, r5, #0 - bl sub_081C617C + bl PerformItemSwap _081C6174: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C60C8 + thumb_func_end Task_ItemSwapHandleInput - thumb_func_start sub_081C617C -sub_081C617C: @ 0x081C617C + thumb_func_start PerformItemSwap +PerformItemSwap: @ 0x081C617C push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -929947,7 +929947,7 @@ _081C61C0: ldrb r0, [r5, #2] lsls r1, r4, #0x18 lsrs r1, r1, #0x18 - bl sub_081C4FA4 + bl MovePyramidBagItemSlotInList ldr r0, _081C6220 ldr r0, [r0] ldr r1, _081C6224 @@ -929959,7 +929959,7 @@ _081C61C0: ldrb r0, [r5] adds r1, r7, #0 mov r2, r8 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r3, #2 ldrsh r0, [r5, r3] cmp r0, r4 @@ -929970,12 +929970,12 @@ _081C61C0: subs r0, #1 strh r0, [r1, #6] _081C61F8: - bl sub_081C4B1C + bl SetBagItemsListTemplate ldr r0, _081C6228 ldrh r1, [r7] mov r3, r8 ldrh r2, [r3] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5] @@ -929991,7 +929991,7 @@ _081C6214: _081C6220: .4byte gUnknown_203CBF8 _081C6224: .4byte 0x00000814 _081C6228: .4byte gUnknown_3006050 - thumb_func_end sub_081C617C + thumb_func_end PerformItemSwap thumb_func_start sub_081C622C sub_081C622C: @ 0x081C622C @@ -930017,7 +930017,7 @@ sub_081C622C: @ 0x081C622C ldrb r0, [r4] adds r1, r5, #0 adds r2, r7, #0 - bl sub_081AE3A0 + bl DestroyListMenuTask movs r0, #2 ldrsh r2, [r4, r0] ldrh r0, [r5] @@ -930031,11 +930031,11 @@ sub_081C622C: @ 0x081C622C subs r0, #1 strh r0, [r1, #6] _081C6276: - bl sub_081C4B1C + bl SetBagItemsListTemplate ldr r0, _081C62A8 ldrh r1, [r5] ldrh r2, [r7] - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -930105,7 +930105,7 @@ _081C6310: muls r0, r6, r0 add r0, sb movs r1, #0xc - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r1, sp @@ -930113,7 +930113,7 @@ _081C6310: cmp r0, #0 beq _081C63A0 movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 cmp r0, #0 bne _081C63A0 @@ -930148,9 +930148,9 @@ _081C6310: movs r2, #0xa bl memcpy adds r0, r7, #0 - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_08000BF0 + bl Free ldr r1, _081C639C movs r0, #1 strh r0, [r1] @@ -930179,7 +930179,7 @@ _081C63B4: add r0, sb movs r1, #0xc mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r6, #1 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 @@ -930189,9 +930189,9 @@ _081C63B4: movs r0, #0 strh r0, [r1] adds r0, r7, #0 - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_08000BF0 + bl Free _081C63DE: add sp, #4 pop {r3, r4} @@ -930208,7 +930208,7 @@ _081C63EC: .4byte gUnknown_2037290 sub_081C63F0: @ 0x081C63F0 push {r4, lr} ldr r0, _081C644C - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #1 @@ -930217,29 +930217,29 @@ sub_081C63F0: @ 0x081C63F0 movs r0, #0 movs r1, #0xa movs r2, #0xd0 - bl sub_08098104 + bl LoadMessageBoxGfx ldr r0, _081C6450 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r4, #0 _081C641C: adds r0, r4, #0 movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #4 bls _081C641C movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4} pop {r0} bx r0 @@ -930248,8 +930248,8 @@ _081C644C: .4byte gUnknown_85EF778 _081C6450: .4byte gUnknown_85D7B04 thumb_func_end sub_081C63F0 - thumb_func_start sub_081C6454 -sub_081C6454: @ 0x081C6454 + thumb_func_start PrintOnWindow_Font1 +PrintOnWindow_Font1: @ 0x081C6454 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -930284,7 +930284,7 @@ sub_081C6454: @ 0x081C6454 str r4, [sp, #0xc] str r1, [sp, #0x10] movs r1, #1 - bl sub_08199B84 + bl AddTextPrinterParameterized4 add sp, #0x14 pop {r3} mov r8, r3 @@ -930293,7 +930293,7 @@ sub_081C6454: @ 0x081C6454 bx r0 .align 2, 0 _081C64A8: .4byte gUnknown_85EF76C - thumb_func_end sub_081C6454 + thumb_func_end PrintOnWindow_Font1 thumb_func_start sub_081C64AC sub_081C64AC: @ 0x081C64AC @@ -930303,9 +930303,9 @@ sub_081C64AC: @ 0x081C64AC movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 .align 2, 0 @@ -930343,15 +930343,15 @@ sub_081C64E4: @ 0x081C64E4 lsls r0, r2, #3 ldr r1, _081C6528 adds r0, r0, r1 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram _081C6518: ldrb r0, [r4] pop {r4} @@ -930379,11 +930379,11 @@ sub_081C652C: @ 0x081C652C movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #0xff strb r0, [r4] _081C655E: @@ -930431,7 +930431,7 @@ sub_081C6598: @ 0x081C6598 lsrs r4, r4, #0x18 movs r0, #2 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer bl GetPlayerTextSpeedDelay lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -930444,9 +930444,9 @@ sub_081C6598: @ 0x081C6598 movs r1, #2 movs r2, #0xa movs r3, #0xd - bl sub_08121E6C + bl DisplayMessageAndContinueTask movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram add sp, #0x10 pop {r4, r5, r6} pop {r0} @@ -930461,9 +930461,9 @@ sub_081C65DC: @ 0x081C65DC movs r1, #0 bl sub_08197EBC movs r0, #2 - bl sub_08003774 + bl ClearWindowTilemap movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r0} bx r0 .align 2, 0 @@ -930542,7 +930542,7 @@ sub_081C6658: @ 0x081C6658 mov r0, sp bl LoadSpritePalette adds r0, r4, #0 - bl sub_08000BF0 + bl Free add sp, #8 pop {r4} pop {r0} @@ -930566,7 +930566,7 @@ sub_081C66B4: @ 0x081C66B4 movs r1, #0x44 movs r2, #0x38 movs r3, #0 - bl sub_08006B0C + bl CreateSprite strb r0, [r4] pop {r4} pop {r0} @@ -930636,8 +930636,8 @@ _081C6744: _081C674C: .4byte sub_08007140 thumb_func_end sub_081C6728 - thumb_func_start sub_081C6750 -sub_081C6750: @ 0x081C6750 + thumb_func_start ShowItemImage +ShowItemImage: @ 0x081C6750 push {r4, r5, r6, lr} lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -930660,7 +930660,7 @@ sub_081C6750: @ 0x081C6750 adds r0, r4, #0 adds r1, r4, #0 adds r2, r6, #0 - bl sub_081AFB48 + bl AddItemIconSprite lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0x40 @@ -930684,7 +930684,7 @@ _081C67A8: .4byte gUnknown_203CBF8 _081C67AC: .4byte 0x00000805 _081C67B0: .4byte 0x00001025 _081C67B4: .4byte gUnknown_20205AC - thumb_func_end sub_081C6750 + thumb_func_end ShowItemImage thumb_func_start sub_081C67B8 sub_081C67B8: @ 0x081C67B8 @@ -930758,12 +930758,12 @@ _081C6830: .4byte gUnknown_203CBF8 _081C6834: .4byte 0x00000807 thumb_func_end sub_081C680C - thumb_func_start sub_081C6838 -sub_081C6838: @ 0x081C6838 + thumb_func_start CreateLoopedTask +CreateLoopedTask: @ 0x081C6838 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 - bl sub_080856F4 + bl IsUpdateLinkStateCBActive cmp r0, #0 bne _081C6850 ldr r0, _081C684C @@ -930775,7 +930775,7 @@ _081C6850: _081C6852: lsls r1, r4, #0x18 lsrs r1, r1, #0x18 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r4, r0, #0x18 adds r0, r4, #0 @@ -930800,13 +930800,13 @@ _081C6852: pop {r1} bx r1 .align 2, 0 -_081C688C: .4byte sub_081C69A4 +_081C688C: .4byte Task_RunLoopedTask_LinkMode _081C6890: .4byte gUnknown_3005B60 _081C6894: .4byte gUnknown_203CC08 - thumb_func_end sub_081C6838 + thumb_func_end CreateLoopedTask - thumb_func_start sub_081C6898 -sub_081C6898: @ 0x081C6898 + thumb_func_start IsLoopedTaskActive +IsLoopedTaskActive: @ 0x081C6898 push {lr} ldr r1, _081C68CC ands r1, r0 @@ -930837,17 +930837,17 @@ _081C68BE: _081C68CC: .4byte 0x0000FFFF _081C68D0: .4byte gUnknown_3005B60 _081C68D4: .4byte sub_081C6930 -_081C68D8: .4byte sub_081C69A4 +_081C68D8: .4byte Task_RunLoopedTask_LinkMode _081C68DC: movs r0, #0 _081C68DE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C6898 + thumb_func_end IsLoopedTaskActive - thumb_func_start sub_081C68E4 -sub_081C68E4: @ 0x081C68E4 + thumb_func_start FuncIsActiveLoopedTask +FuncIsActiveLoopedTask: @ 0x081C68E4 push {r4, r5, r6, lr} adds r6, r0, #0 movs r5, #0 @@ -930875,7 +930875,7 @@ _081C6900: .align 2, 0 _081C6914: .4byte gUnknown_3005B60 _081C6918: .4byte sub_081C6930 -_081C691C: .4byte sub_081C69A4 +_081C691C: .4byte Task_RunLoopedTask_LinkMode _081C6920: adds r4, #0x28 adds r5, #1 @@ -930886,7 +930886,7 @@ _081C692A: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081C68E4 + thumb_func_end FuncIsActiveLoopedTask thumb_func_start sub_081C6930 sub_081C6930: @ 0x081C6930 @@ -930934,7 +930934,7 @@ _081C6986: b _081C699E _081C698E: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _081C699E _081C6996: subs r0, #5 @@ -930949,8 +930949,8 @@ _081C699E: bx r0 thumb_func_end sub_081C6930 - thumb_func_start sub_081C69A4 -sub_081C69A4: @ 0x081C69A4 + thumb_func_start Task_RunLoopedTask_LinkMode +Task_RunLoopedTask_LinkMode: @ 0x081C69A4 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -930991,7 +930991,7 @@ _081C69F8: b _081C6A08 _081C69FE: adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _081C6A0A _081C6A06: subs r0, #5 @@ -931001,7 +931001,7 @@ _081C6A0A: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081C69A4 + thumb_func_end Task_RunLoopedTask_LinkMode thumb_func_start sub_081C6A10 sub_081C6A10: @ 0x081C6A10 @@ -931013,23 +931013,23 @@ sub_081C6A10: @ 0x081C6A10 cmp r0, #0 bne _081C6A30 ldr r0, _081C6A2C - bl sub_08000540 + bl SetMainCallback2 b _081C6A52 .align 2, 0 _081C6A28: .4byte gUnknown_203CC0C -_081C6A2C: .4byte sub_08085AFC +_081C6A2C: .4byte CB2_ReturnToFieldWithOpenMenu _081C6A30: bl InitPokenavResources - bl sub_080A8818 + bl ResetTasks movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081C6A58 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _081C6A5C - bl sub_08000540 + bl SetMainCallback2 ldr r0, _081C6A60 - bl sub_080006F0 + bl SetVBlankCallback _081C6A52: pop {r4} pop {r0} @@ -931037,17 +931037,17 @@ _081C6A52: .align 2, 0 _081C6A58: .4byte sub_081C6BEC _081C6A5C: .4byte sub_081C6BC0 -_081C6A60: .4byte sub_081C6BD8 +_081C6A60: .4byte VBlankCB_Pokenav thumb_func_end sub_081C6A10 thumb_func_start sub_081C6A64 sub_081C6A64: @ 0x081C6A64 push {lr} ldr r0, _081C6A78 - bl sub_08000540 + bl SetMainCallback2 movs r0, #1 movs r1, #0 - bl sub_080AB5CC + bl FadeScreen pop {r0} bx r0 .align 2, 0 @@ -931057,7 +931057,7 @@ _081C6A78: .4byte sub_081C6A7C thumb_func_start sub_081C6A7C sub_081C6A7C: @ 0x081C6A7C push {r4, lr} - bl sub_080A12E4 + bl UpdatePaletteFade ldr r0, _081C6AA4 ldrb r1, [r0, #7] movs r0, #0x80 @@ -931071,29 +931071,29 @@ sub_081C6A7C: @ 0x081C6A7C cmp r0, #0 bne _081C6AB0 ldr r0, _081C6AAC - bl sub_08000540 + bl SetMainCallback2 b _081C6AE0 .align 2, 0 _081C6AA4: .4byte gUnknown_2037C74 _081C6AA8: .4byte gUnknown_203CC0C -_081C6AAC: .4byte sub_08085B34 +_081C6AAC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _081C6AB0: bl InitPokenavResources ldr r1, [r4] movs r0, #1 strh r0, [r1, #8] - bl sub_080A8818 + bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081C6AE8 movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _081C6AEC - bl sub_08000540 + bl SetMainCallback2 ldr r0, _081C6AF0 - bl sub_080006F0 + bl SetVBlankCallback _081C6AE0: pop {r4} pop {r0} @@ -931101,22 +931101,22 @@ _081C6AE0: .align 2, 0 _081C6AE8: .4byte sub_081C6BEC _081C6AEC: .4byte sub_081C6BC0 -_081C6AF0: .4byte sub_081C6BD8 +_081C6AF0: .4byte VBlankCB_Pokenav thumb_func_end sub_081C6A7C - thumb_func_start sub_081C6AF4 -sub_081C6AF4: @ 0x081C6AF4 + thumb_func_start FreePokenavResources +FreePokenavResources: @ 0x081C6AF4 push {r4, lr} movs r4, #0 _081C6AF8: adds r0, r4, #0 - bl sub_081C6E10 + bl FreePokenavSubstruct adds r4, #1 cmp r4, #0x12 ble _081C6AF8 ldr r4, _081C6B1C ldr r0, [r4] - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] bl InitKeys @@ -931125,7 +931125,7 @@ _081C6AF8: bx r0 .align 2, 0 _081C6B1C: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6AF4 + thumb_func_end FreePokenavResources thumb_func_start InitPokenavResources InitPokenavResources: @ 0x081C6B20 @@ -931143,7 +931143,7 @@ _081C6B2A: movs r4, #0 strh r4, [r5, #8] str r4, [r5, #4] - bl sub_081C6B48 + bl AnyMonHasRibbon str r0, [r5, #0xc] str r4, [r5] pop {r4, r5} @@ -931151,8 +931151,8 @@ _081C6B2A: bx r0 thumb_func_end InitPokenavResources - thumb_func_start sub_081C6B48 -sub_081C6B48: @ 0x081C6B48 + thumb_func_start AnyMonHasRibbon +AnyMonHasRibbon: @ 0x081C6B48 push {r4, r5, r6, lr} movs r5, #0 _081C6B4C: @@ -931163,17 +931163,17 @@ _081C6B4C: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081C6B7A adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081C6B7A adds r0, r4, #0 movs r1, #0x52 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081C6BA2 _081C6B7A: @@ -931187,14 +931187,14 @@ _081C6B82: _081C6B86: adds r0, r4, #0 adds r1, r5, #0 - bl sub_080D1B10 + bl CheckBoxMonSanityAt cmp r0, #0 beq _081C6BAC lsls r1, r5, #0x18 lsrs r1, r1, #0x18 lsrs r0, r6, #0x18 movs r2, #0x52 - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 beq _081C6BAC _081C6BA2: @@ -931214,30 +931214,30 @@ _081C6BBA: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081C6B48 + thumb_func_end AnyMonHasRibbon thumb_func_start sub_081C6BC0 sub_081C6BC0: @ 0x081C6BC0 push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_080A12E4 + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081C6BC0 - thumb_func_start sub_081C6BD8 -sub_081C6BD8: @ 0x081C6BD8 + thumb_func_start VBlankCB_Pokenav +VBlankCB_Pokenav: @ 0x081C6BD8 push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C6BD8 + thumb_func_end VBlankCB_Pokenav thumb_func_start sub_081C6BEC sub_081C6BEC: @ 0x081C6BEC @@ -931271,16 +931271,16 @@ _081C6C18: @ jump table .4byte _081C6CDE @ case 4 .4byte _081C6CEC @ case 5 _081C6C30: - bl sub_081C6E84 + bl InitPokenavMainMenu movs r0, #1 strh r0, [r7] b _081C6D22 _081C6C3A: - bl sub_081C6EBC + bl PokenavMainMenuLoopedTaskIsActive cmp r0, #0 bne _081C6D22 ldr r0, _081C6C4C - bl sub_081C6D2C + bl SetActivePokenavMenu b _081C6CA8 .align 2, 0 _081C6C4C: .4byte 0x000186A0 @@ -931322,7 +931322,7 @@ _081C6C5C: ldr r0, [r0] bl _call_via_r0 adds r0, r6, #0 - bl sub_081C6D2C + bl SetActivePokenavMenu cmp r0, #0 beq _081C6CBC _081C6CA8: @@ -931334,7 +931334,7 @@ _081C6CB0: .4byte 0x0001869F _081C6CB4: .4byte gUnknown_85EF83C _081C6CB8: .4byte gUnknown_203CC0C _081C6CBC: - bl sub_081C6ED0 + bl CB2_TradeEvolutionSceneUpdate movs r0, #5 strh r0, [r7] b _081C6D22 @@ -931357,7 +931357,7 @@ _081C6CDE: strh r0, [r7] b _081C6D22 _081C6CEC: - bl sub_081C6EF8 + bl WaitForPokenavShutdownFade cmp r0, #0 bne _081C6D22 ldr r0, _081C6D14 @@ -931367,32 +931367,32 @@ _081C6CEC: orrs r4, r0 lsrs r4, r4, #0x1f bl sub_081C8BDC - bl sub_081C6AF4 + bl FreePokenavResources cmp r4, #0 beq _081C6D1C ldr r0, _081C6D18 - bl sub_08000540 + bl SetMainCallback2 b _081C6D22 .align 2, 0 _081C6D14: .4byte gUnknown_203CC0C -_081C6D18: .4byte sub_08085B34 +_081C6D18: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _081C6D1C: ldr r0, _081C6D28 - bl sub_08000540 + bl SetMainCallback2 _081C6D22: pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 -_081C6D28: .4byte sub_08085AFC +_081C6D28: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_081C6BEC - thumb_func_start sub_081C6D2C -sub_081C6D2C: @ 0x081C6D2C + thumb_func_start SetActivePokenavMenu +SetActivePokenavMenu: @ 0x081C6D2C push {r4, r5, r6, lr} ldr r1, _081C6D80 adds r6, r0, r1 - bl sub_081C6DB4 + bl SetVBlankCallback_ ldr r5, _081C6D84 lsls r0, r6, #3 subs r0, r0, r6 @@ -931401,7 +931401,7 @@ sub_081C6D2C: @ 0x081C6D2C ldr r0, [r0] bl _call_via_r0 cmp r0, #0 - thumb_func_end sub_081C6D2C + thumb_func_end SetActivePokenavMenu thumb_func_start sub_081C6D48 sub_081C6D48: @ 0x081C6D48 @@ -931469,37 +931469,37 @@ sub_081C6DAC: @ 0x081C6DAC _081C6DB0: .4byte gUnknown_203CC0C thumb_func_end sub_081C6DAC - thumb_func_start sub_081C6DB4 -sub_081C6DB4: @ 0x081C6DB4 + thumb_func_start SetVBlankCallback_ +SetVBlankCallback_: @ 0x081C6DB4 push {lr} bl InitKeys pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C6DB4 + thumb_func_end SetVBlankCallback_ thumb_func_start sub_081C6DC0 sub_081C6DC0: @ 0x081C6DC0 push {lr} - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081C6DC0 - thumb_func_start sub_081C6DCC -sub_081C6DCC: @ 0x081C6DCC + thumb_func_start SetPokenavVBlankCallback +SetPokenavVBlankCallback: @ 0x081C6DCC push {lr} ldr r0, _081C6DD8 - bl sub_080006F0 + bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_081C6DD8: .4byte sub_081C6BD8 - thumb_func_end sub_081C6DCC +_081C6DD8: .4byte VBlankCB_Pokenav + thumb_func_end SetPokenavVBlankCallback - thumb_func_start sub_081C6DDC -sub_081C6DDC: @ 0x081C6DDC + thumb_func_start AllocSubstruct +AllocSubstruct: @ 0x081C6DDC push {r4, lr} adds r4, r0, #0 adds r0, r1, #0 @@ -931515,10 +931515,10 @@ sub_081C6DDC: @ 0x081C6DDC bx r1 .align 2, 0 _081C6DF8: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6DDC + thumb_func_end AllocSubstruct - thumb_func_start sub_081C6DFC -sub_081C6DFC: @ 0x081C6DFC + thumb_func_start GetSubstructPtr +GetSubstructPtr: @ 0x081C6DFC ldr r1, _081C6E0C ldr r1, [r1] lsls r0, r0, #2 @@ -931528,10 +931528,10 @@ sub_081C6DFC: @ 0x081C6DFC bx lr .align 2, 0 _081C6E0C: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6DFC + thumb_func_end GetSubstructPtr - thumb_func_start sub_081C6E10 -sub_081C6E10: @ 0x081C6E10 + thumb_func_start FreePokenavSubstruct +FreePokenavSubstruct: @ 0x081C6E10 push {r4, r5, lr} ldr r5, _081C6E38 ldr r1, [r5] @@ -931541,7 +931541,7 @@ sub_081C6E10: @ 0x081C6E10 ldr r0, [r1] cmp r0, #0 beq _081C6E30 - bl sub_08000BF0 + bl Free ldr r0, [r5] adds r0, #0x10 adds r0, r0, r4 @@ -931553,27 +931553,27 @@ _081C6E30: bx r0 .align 2, 0 _081C6E38: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6E10 + thumb_func_end FreePokenavSubstruct - thumb_func_start sub_081C6E3C -sub_081C6E3C: @ 0x081C6E3C + thumb_func_start GetPokenavMode +GetPokenavMode: @ 0x081C6E3C ldr r0, _081C6E44 ldr r0, [r0] ldrh r0, [r0, #8] bx lr .align 2, 0 _081C6E44: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6E3C + thumb_func_end GetPokenavMode - thumb_func_start sub_081C6E48 -sub_081C6E48: @ 0x081C6E48 + thumb_func_start SetPokenavMode +SetPokenavMode: @ 0x081C6E48 ldr r1, _081C6E50 ldr r1, [r1] strh r0, [r1, #8] bx lr .align 2, 0 _081C6E50: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6E48 + thumb_func_end SetPokenavMode thumb_func_start sub_081C6E54 sub_081C6E54: @ 0x081C6E54 @@ -931602,22 +931602,22 @@ sub_081C6E6C: @ 0x081C6E6C _081C6E74: .4byte gUnknown_203CC0C thumb_func_end sub_081C6E6C - thumb_func_start sub_081C6E78 -sub_081C6E78: @ 0x081C6E78 + thumb_func_start CanViewRibbonsMenu +CanViewRibbonsMenu: @ 0x081C6E78 ldr r0, _081C6E80 ldr r0, [r0] ldr r0, [r0, #0xc] bx lr .align 2, 0 _081C6E80: .4byte gUnknown_203CC0C - thumb_func_end sub_081C6E78 + thumb_func_end CanViewRibbonsMenu - thumb_func_start sub_081C6E84 -sub_081C6E84: @ 0x081C6E84 + thumb_func_start InitPokenavMainMenu +InitPokenavMainMenu: @ 0x081C6E84 push {r4, lr} ldr r1, _081C6EAC movs r0, #0 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081C6EB4 @@ -931625,35 +931625,35 @@ sub_081C6E84: @ 0x081C6E84 bl FreeAllSpritePalettes ldr r0, _081C6EB0 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #0xc] movs r0, #1 b _081C6EB6 .align 2, 0 _081C6EAC: .4byte 0x0000082C -_081C6EB0: .4byte sub_081C6F24 +_081C6EB0: .4byte LoopedTask_InitPokenavMenu _081C6EB4: movs r0, #0 _081C6EB6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081C6E84 + thumb_func_end InitPokenavMainMenu - thumb_func_start sub_081C6EBC -sub_081C6EBC: @ 0x081C6EBC + thumb_func_start PokenavMainMenuLoopedTaskIsActive +PokenavMainMenuLoopedTaskIsActive: @ 0x081C6EBC push {lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0xc] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C6EBC + thumb_func_end PokenavMainMenuLoopedTaskIsActive - thumb_func_start sub_081C6ED0 -sub_081C6ED0: @ 0x081C6ED0 + thumb_func_start CB2_TradeEvolutionSceneUpdate +CB2_TradeEvolutionSceneUpdate: @ 0x081C6ED0 push {lr} sub sp, #4 movs r0, #0x6f @@ -931666,15 +931666,15 @@ sub_081C6ED0: @ 0x081C6ED0 adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade add sp, #4 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C6ED0 + thumb_func_end CB2_TradeEvolutionSceneUpdate - thumb_func_start sub_081C6EF8 -sub_081C6EF8: @ 0x081C6EF8 + thumb_func_start WaitForPokenavShutdownFade +WaitForPokenavShutdownFade: @ 0x081C6EF8 push {lr} ldr r0, _081C6F0C ldrb r1, [r0, #7] @@ -931688,17 +931688,17 @@ sub_081C6EF8: @ 0x081C6EF8 _081C6F0C: .4byte gUnknown_2037C74 _081C6F10: bl sub_081C9180 - bl sub_081C7454 - bl sub_080034D4 + bl CleanupPokenavMainMenuResources + bl FreeAllWindowBuffers movs r0, #0 _081C6F1E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C6EF8 + thumb_func_end WaitForPokenavShutdownFade - thumb_func_start sub_081C6F24 -sub_081C6F24: @ 0x081C6F24 + thumb_func_start LoopedTask_InitPokenavMenu +LoopedTask_InitPokenavMenu: @ 0x081C6F24 push {r4, lr} sub sp, #4 cmp r0, #1 @@ -931719,7 +931719,7 @@ _081C6F40: lsls r1, r1, #5 movs r0, #0 bl SetGpuReg - bl sub_080034D4 + bl FreeAllWindowBuffers movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081C6F6C @@ -931734,29 +931734,29 @@ _081C6F40: _081C6F6C: .4byte gUnknown_85F13C8 _081C6F70: movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r1, _081C6FB0 movs r0, #0 str r0, [sp] movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram adds r4, #0x2c movs r0, #0 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081C6FB4 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r0, _081C6FB8 movs r1, #0 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #0 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 b _081C6FEC .align 2, 0 @@ -931764,7 +931764,7 @@ _081C6FB0: .4byte gUnknown_85EFA00 _081C6FB4: .4byte gUnknown_85EFC2C _081C6FB8: .4byte gUnknown_85EF9E0 _081C6FBC: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081C6FD8 @@ -931772,7 +931772,7 @@ _081C6FBC: movs r0, #0 b _081C6FEC _081C6FCE: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081C6FDC @@ -931780,10 +931780,10 @@ _081C6FD8: movs r0, #2 b _081C6FEC _081C6FDC: - bl sub_081C73E8 - bl sub_081C74E8 + bl InitPokenavMainMenuResources + bl InitHoennMapHeaderSprites movs r0, #0 - bl sub_08001B48 + bl ShowBg _081C6FEA: movs r0, #4 _081C6FEC: @@ -931791,7 +931791,7 @@ _081C6FEC: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081C6F24 + thumb_func_end LoopedTask_InitPokenavMenu thumb_func_start sub_081C6FF4 sub_081C6FF4: @ 0x081C6FF4 @@ -931799,7 +931799,7 @@ sub_081C6FF4: @ 0x081C6FF4 adds r4, r0, #0 adds r5, r1, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr str r4, [r0] str r5, [r0, #4] movs r1, #0 @@ -931815,7 +931815,7 @@ sub_081C7010: @ 0x081C7010 push {r4, lr} adds r4, r0, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0 str r1, [r0, #8] ldr r1, [r0] @@ -931830,7 +931830,7 @@ sub_081C7010: @ 0x081C7010 sub_081C702C: @ 0x081C702C push {lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] bl _call_via_r0 pop {r1} @@ -931846,50 +931846,50 @@ sub_081C703C: @ 0x081C703C sub_081C7040: @ 0x081C7040 push {r4, lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C705C movs r1, #4 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #0xc] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C705C: .4byte sub_081C7094 +_081C705C: .4byte LoopedTask_ScrollMenuHeaderDown thumb_func_end sub_081C7040 thumb_func_start sub_081C7060 sub_081C7060: @ 0x081C7060 push {r4, lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C707C movs r1, #4 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #0xc] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C707C: .4byte sub_081C70DC +_081C707C: .4byte LoopedTask_ScrollMenuHeaderUp thumb_func_end sub_081C7060 - thumb_func_start sub_081C7080 -sub_081C7080: @ 0x081C7080 + thumb_func_start MainMenuLoopedTaskIsBusy +MainMenuLoopedTaskIsBusy: @ 0x081C7080 push {lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0xc] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C7080 + thumb_func_end MainMenuLoopedTaskIsBusy - thumb_func_start sub_081C7094 -sub_081C7094: @ 0x081C7094 + thumb_func_start LoopedTask_ScrollMenuHeaderDown +LoopedTask_ScrollMenuHeaderDown: @ 0x081C7094 push {lr} cmp r0, #1 beq _081C70AA @@ -931910,7 +931910,7 @@ _081C70AE: lsls r1, r1, #1 movs r0, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY ldr r1, _081C70C4 cmp r0, r1 bhi _081C70C8 @@ -931923,23 +931923,23 @@ _081C70C8: lsls r1, r1, #6 movs r0, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY _081C70D4: movs r0, #4 _081C70D6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C7094 + thumb_func_end LoopedTask_ScrollMenuHeaderDown - thumb_func_start sub_081C70DC -sub_081C70DC: @ 0x081C70DC + thumb_func_start LoopedTask_ScrollMenuHeaderUp +LoopedTask_ScrollMenuHeaderUp: @ 0x081C70DC push {lr} movs r1, #0xc0 lsls r1, r1, #1 movs r0, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY cmp r0, #0 ble _081C70F2 movs r0, #2 @@ -931948,16 +931948,16 @@ _081C70F2: movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #4 _081C70FE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C70DC + thumb_func_end LoopedTask_ScrollMenuHeaderUp - thumb_func_start sub_081C7104 -sub_081C7104: @ 0x081C7104 + thumb_func_start ClearBottomWindow +ClearBottomWindow: @ 0x081C7104 push {lr} lsls r1, r1, #1 ldr r3, _081C7118 @@ -931969,10 +931969,10 @@ sub_081C7104: @ 0x081C7104 bx r0 .align 2, 0 _081C7118: .4byte gUnknown_20373B4 - thumb_func_end sub_081C7104 + thumb_func_end ClearBottomWindow - thumb_func_start sub_081C711C -sub_081C711C: @ 0x081C711C + thumb_func_start Pokenav_AllocAndLoadPalettes +Pokenav_AllocAndLoadPalettes: @ 0x081C711C push {r4, lr} adds r4, r0, #0 b _081C7134 @@ -931983,7 +931983,7 @@ _081C7122: adds r1, r0, r2 ldr r0, [r4] movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow adds r4, #8 _081C7134: ldr r0, [r4] @@ -932000,7 +932000,7 @@ _081C7148: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C711C + thumb_func_end Pokenav_AllocAndLoadPalettes thumb_func_start sub_081C7150 sub_081C7150: @ 0x081C7150 @@ -932168,7 +932168,7 @@ sub_081C7280: @ 0x081C7280 sub sp, #4 adds r4, r0, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr cmp r4, #1 beq _081C72B0 cmp r4, #1 @@ -932197,7 +932197,7 @@ _081C72B0: str r2, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade b _081C72EC _081C72C4: movs r0, #1 @@ -932208,7 +932208,7 @@ _081C72C4: str r2, [sp] _081C72D0: movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _081C72EC _081C72D8: movs r0, #1 @@ -932219,7 +932219,7 @@ _081C72D8: str r2, [sp] movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade _081C72EC: add sp, #4 pop {r4} @@ -932243,15 +932243,15 @@ sub_081C7300: @ 0x081C7300 ldr r0, _081C7310 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes pop {r0} bx r0 .align 2, 0 _081C7310: .4byte 0xFFFEFFFE thumb_func_end sub_081C7300 - thumb_func_start sub_081C7314 -sub_081C7314: @ 0x081C7314 + thumb_func_start InitBgTemplates +InitBgTemplates: @ 0x081C7314 push {r4, r5, lr} adds r5, r0, #0 cmp r1, #0 @@ -932269,24 +932269,24 @@ _081C732C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C7314 + thumb_func_end InitBgTemplates thumb_func_start sub_081C7334 sub_081C7334: @ 0x081C7334 push {r4, lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C7360 - bl sub_08003090 + bl InitWindows movs r0, #0 str r0, [r4, #0x10] bl sub_081C73B8 ldrb r0, [r4, #0x10] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #0x10] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -932300,7 +932300,7 @@ sub_081C7364: @ 0x081C7364 sub sp, #0xc adds r4, r0, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, [r5, #0x10] bl sub_081C73B8 @@ -932317,7 +932317,7 @@ sub_081C7364: @ 0x081C7364 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4, r5} pop {r0} @@ -932330,7 +932330,7 @@ _081C73A4: .4byte gUnknown_85F13DC thumb_func_start sub_081C73A8 sub_081C73A8: @ 0x081C73A8 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -932347,7 +932347,7 @@ sub_081C73B8: @ 0x081C73B8 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0x44 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r0, #0x80 str r0, [sp] movs r0, #1 @@ -932364,25 +932364,25 @@ sub_081C73B8: @ 0x081C73B8 .align 2, 0 thumb_func_end sub_081C73B8 - thumb_func_start sub_081C73E8 -sub_081C73E8: @ 0x081C73E8 + thumb_func_start InitPokenavMainMenuResources +InitPokenavMainMenuResources: @ 0x081C73E8 push {r4, r5, r6, lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 movs r5, #0 ldr r4, _081C7444 _081C73F6: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #0 beq _081C73F6 ldr r0, _081C7448 - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes movs r0, #0 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0x80 @@ -932396,7 +932396,7 @@ _081C73F6: movs r1, #0xdc movs r2, #0xc movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -932413,13 +932413,13 @@ _081C7444: .4byte gUnknown_85F1410 _081C7448: .4byte gUnknown_85F1418 _081C744C: .4byte gUnknown_85F14C8 _081C7450: .4byte gUnknown_20205AC - thumb_func_end sub_081C73E8 + thumb_func_end InitPokenavMainMenuResources - thumb_func_start sub_081C7454 -sub_081C7454: @ 0x081C7454 + thumb_func_start CleanupPokenavMainMenuResources +CleanupPokenavMainMenuResources: @ 0x081C7454 push {lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x18] bl DestroySprite movs r0, #0 @@ -932429,14 +932429,14 @@ sub_081C7454: @ 0x081C7454 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C7454 + thumb_func_end CleanupPokenavMainMenuResources - thumb_func_start sub_081C7474 -sub_081C7474: @ 0x081C7474 + thumb_func_start SpriteCB_SpinningPokenav +SpriteCB_SpinningPokenav: @ 0x081C7474 push {r4, lr} adds r4, r0, #0 movs r0, #0 - bl sub_08001FD0 + bl GetBgY lsrs r0, r0, #8 rsbs r0, r0, #0 strh r0, [r4, #0x26] @@ -932444,13 +932444,13 @@ sub_081C7474: @ 0x081C7474 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C7474 + thumb_func_end SpriteCB_SpinningPokenav - thumb_func_start sub_081C748C -sub_081C748C: @ 0x081C748C + thumb_func_start PauseSpinningPokenavSprite +PauseSpinningPokenavSprite: @ 0x081C748C push {lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x18] ldr r1, _081C74A0 str r1, [r0, #0x1c] @@ -932458,13 +932458,13 @@ sub_081C748C: @ 0x081C748C bx r1 .align 2, 0 _081C74A0: .4byte sub_08007140 - thumb_func_end sub_081C748C + thumb_func_end PauseSpinningPokenavSprite thumb_func_start ResumeSpinningPokenavSprite ResumeSpinningPokenavSprite: @ 0x081C74A4 push {r4, lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr ldr r2, [r0, #0x18] movs r4, #0 movs r1, #0xdc @@ -932494,19 +932494,19 @@ ResumeSpinningPokenavSprite: @ 0x081C74A4 pop {r0} bx r0 .align 2, 0 -_081C74E4: .4byte sub_081C7474 +_081C74E4: .4byte SpriteCB_SpinningPokenav thumb_func_end ResumeSpinningPokenavSprite - thumb_func_start sub_081C74E8 -sub_081C74E8: @ 0x081C74E8 + thumb_func_start InitHoennMapHeaderSprites +InitHoennMapHeaderSprites: @ 0x081C74E8 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 ldr r0, _081C75A4 - bl sub_08034388 + bl LoadCompressedSpriteSheet movs r0, #1 bl AllocSpritePalette movs r0, #2 @@ -932520,7 +932520,7 @@ _081C7510: movs r1, #0 movs r2, #0 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 lsls r4, r5, #2 @@ -932543,7 +932543,7 @@ _081C7510: movs r1, #0 movs r2, #0 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r1, r0, #0x18 adds r2, r6, #0 @@ -932594,10 +932594,10 @@ _081C75AC: .4byte gUnknown_85F14F0 _081C75B0: .4byte gUnknown_85F1508 _081C75B4: .4byte 0x000003FF _081C75B8: .4byte 0xFFFFFC00 - thumb_func_end sub_081C74E8 + thumb_func_end InitHoennMapHeaderSprites - thumb_func_start sub_081C75BC -sub_081C75BC: @ 0x081C75BC + thumb_func_start LoadLeftHeaderGfxForIndex +LoadLeftHeaderGfxForIndex: @ 0x081C75BC push {lr} cmp r0, #5 bhi _081C75C8 @@ -932605,19 +932605,19 @@ sub_081C75BC: @ 0x081C75BC b _081C75CE _081C75C8: subs r0, #6 - bl sub_081C76CC + bl LoadLeftHeaderGfxForSubMenu _081C75CE: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C75BC + thumb_func_end LoadLeftHeaderGfxForIndex thumb_func_start sub_081C75D4 sub_081C75D4: @ 0x081C75D4 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #4 bne _081C75F0 @@ -932658,7 +932658,7 @@ sub_081C7618: @ 0x081C7618 cmp r6, #5 bhi _081C76A8 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr mov sb, r0 ldr r0, _081C76B4 lsls r6, r6, #3 @@ -932666,13 +932666,13 @@ sub_081C7618: @ 0x081C7618 ldrh r4, [r6, #6] ldr r0, [r6] mov r8, r0 - bl sub_080347CC + bl GetDecompressedDataSize adds r5, r0, #0 lsls r4, r4, #5 ldr r0, _081C76B8 adds r4, r4, r0 movs r0, #1 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #4 @@ -932682,7 +932682,7 @@ sub_081C7618: @ 0x081C7618 lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r4, _081C76BC mov r0, r8 adds r1, r4, #0 @@ -932730,8 +932730,8 @@ _081C76C4: .4byte 0x000003FF _081C76C8: .4byte 0xFFFFFC00 thumb_func_end sub_081C7618 - thumb_func_start sub_081C76CC -sub_081C76CC: @ 0x081C76CC + thumb_func_start LoadLeftHeaderGfxForSubMenu +LoadLeftHeaderGfxForSubMenu: @ 0x081C76CC push {r4, r5, r6, lr} cmp r0, #6 bhi _081C7732 @@ -932743,13 +932743,13 @@ sub_081C76CC: @ 0x081C76CC adds r1, r1, r2 ldr r6, [r1] adds r0, r6, #0 - bl sub_080347CC + bl GetDecompressedDataSize adds r5, r0, #0 lsls r4, r4, #5 ldr r0, _081C773C adds r4, r4, r0 movs r0, #2 - bl sub_0800851C + bl IndexOfSpritePaletteTag adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #4 @@ -932759,7 +932759,7 @@ sub_081C76CC: @ 0x081C76CC lsrs r1, r1, #0x10 adds r0, r4, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r4, _081C7740 adds r0, r6, #0 adds r1, r4, #0 @@ -932786,7 +932786,7 @@ _081C7738: .4byte gUnknown_85F1460 _081C773C: .4byte gUnknown_85F021C _081C7740: .4byte gUnknown_201D000 _081C7744: .4byte 0x06010800 - thumb_func_end sub_081C76CC + thumb_func_end LoadLeftHeaderGfxForSubMenu thumb_func_start sub_081C7748 sub_081C7748: @ 0x081C7748 @@ -932800,11 +932800,11 @@ _081C7754: cmp r3, #5 bhi _081C7760 adds r1, r2, #0 - bl sub_081C77E4 + bl ShowLeftHeaderSprites b _081C7766 _081C7760: adds r1, r2, #0 - bl sub_081C7830 + bl ShowLeftHeaderSubmenuSprites _081C7766: pop {r0} bx r0 @@ -932817,11 +932817,11 @@ sub_081C776C: @ 0x081C776C cmp r0, #5 bhi _081C777A adds r0, r1, #0 - bl sub_081C787C + bl HideLeftHeaderSprites b _081C7780 _081C777A: adds r0, r1, #0 - bl sub_081C78B8 + bl HideLeftHeaderSubmenuSprites _081C7780: pop {r0} bx r0 @@ -932831,7 +932831,7 @@ _081C7780: sub_081C7784: @ 0x081C7784 push {r4, lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr movs r4, #4 adds r2, r0, #0 adds r2, #0x1c @@ -932861,7 +932861,7 @@ _081C7794: sub_081C77B8: @ 0x081C77B8 push {lr} movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 ldr r0, [r1, #0x1c] ldr r2, [r0, #0x1c] @@ -932884,15 +932884,15 @@ _081C77DE: .align 2, 0 thumb_func_end sub_081C77B8 - thumb_func_start sub_081C77E4 -sub_081C77E4: @ 0x081C77E4 + thumb_func_start ShowLeftHeaderSprites +ShowLeftHeaderSprites: @ 0x081C77E4 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} mov r8, r0 adds r4, r1, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr cmp r4, #0 bne _081C7800 movs r7, #0x60 @@ -932915,7 +932915,7 @@ _081C780C: adds r1, r7, #0 adds r2, r6, #0 movs r3, #0xc - bl sub_081C78F4 + bl MoveLeftHeader subs r5, #1 cmp r5, #0 bge _081C780C @@ -932925,17 +932925,17 @@ _081C780C: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C77E4 + thumb_func_end ShowLeftHeaderSprites - thumb_func_start sub_081C7830 -sub_081C7830: @ 0x081C7830 + thumb_func_start ShowLeftHeaderSubmenuSprites +ShowLeftHeaderSubmenuSprites: @ 0x081C7830 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} mov r8, r0 adds r4, r1, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr cmp r4, #0 bne _081C784C movs r7, #0x60 @@ -932958,7 +932958,7 @@ _081C7858: adds r1, r7, #0 adds r2, r6, #0 movs r3, #0xc - bl sub_081C78F4 + bl MoveLeftHeader subs r5, #1 cmp r5, #0 bge _081C7858 @@ -932968,14 +932968,14 @@ _081C7858: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C7830 + thumb_func_end ShowLeftHeaderSubmenuSprites - thumb_func_start sub_081C787C -sub_081C787C: @ 0x081C787C + thumb_func_start HideLeftHeaderSprites +HideLeftHeaderSprites: @ 0x081C787C push {r4, r5, r6, r7, lr} adds r4, r0, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr cmp r4, #0 bne _081C7892 movs r6, #0x20 @@ -932995,7 +932995,7 @@ _081C789E: adds r1, r6, #0 adds r2, r5, #0 movs r3, #0xc - bl sub_081C78F4 + bl MoveLeftHeader subs r4, #1 cmp r4, #0 bge _081C789E @@ -933003,14 +933003,14 @@ _081C789E: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C787C + thumb_func_end HideLeftHeaderSprites - thumb_func_start sub_081C78B8 -sub_081C78B8: @ 0x081C78B8 + thumb_func_start HideLeftHeaderSubmenuSprites +HideLeftHeaderSubmenuSprites: @ 0x081C78B8 push {r4, r5, r6, r7, lr} adds r4, r0, #0 movs r0, #0 - bl sub_081C6DFC + bl GetSubstructPtr cmp r4, #0 bne _081C78CE movs r6, #0x10 @@ -933030,7 +933030,7 @@ _081C78DA: adds r1, r6, #0 adds r2, r5, #0 movs r3, #0xc - bl sub_081C78F4 + bl MoveLeftHeader subs r4, #1 cmp r4, #0 bge _081C78DA @@ -933038,10 +933038,10 @@ _081C78DA: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C78B8 + thumb_func_end HideLeftHeaderSubmenuSprites - thumb_func_start sub_081C78F4 -sub_081C78F4: @ 0x081C78F4 + thumb_func_start MoveLeftHeader +MoveLeftHeader: @ 0x081C78F4 push {r4, r5, r6, lr} adds r4, r0, #0 adds r0, r1, #0 @@ -933064,7 +933064,7 @@ sub_081C78F4: @ 0x081C78F4 bx r0 .align 2, 0 _081C7920: .4byte SpriteCB_MoveLeftHeader - thumb_func_end sub_081C78F4 + thumb_func_end MoveLeftHeader thumb_func_start SpriteCB_MoveLeftHeader SpriteCB_MoveLeftHeader: @ 0x081C7924 @@ -933125,7 +933125,7 @@ sub_081C797C: @ 0x081C797C adds r7, r2, #0 ldr r1, _081C79B8 movs r0, #0x11 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081C79C4 @@ -933142,13 +933142,13 @@ sub_081C797C: @ 0x081C797C beq _081C79C4 ldr r0, _081C79C0 movs r1, #6 - bl sub_081C6838 + bl CreateLoopedTask movs r0, #1 b _081C79C6 .align 2, 0 _081C79B8: .4byte 0x000008A4 _081C79BC: .4byte 0x00000888 -_081C79C0: .4byte sub_081C79FC +_081C79C0: .4byte LoopedTask_sub_81C8254 _081C79C4: movs r0, #0 _081C79C6: @@ -933161,39 +933161,39 @@ _081C79C6: sub_081C79CC: @ 0x081C79CC push {lr} ldr r0, _081C79D8 - bl sub_081C68E4 + bl FuncIsActiveLoopedTask pop {r1} bx r1 .align 2, 0 -_081C79D8: .4byte sub_081C79FC +_081C79D8: .4byte LoopedTask_sub_81C8254 thumb_func_end sub_081C79CC thumb_func_start sub_081C79DC sub_081C79DC: @ 0x081C79DC push {r4, lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081C8794 ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0x11 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 thumb_func_end sub_081C79DC - thumb_func_start sub_081C79FC -sub_081C79FC: @ 0x081C79FC + thumb_func_start LoopedTask_sub_81C8254 +LoopedTask_sub_81C8254: @ 0x081C79FC push {r4, lr} adds r4, r0, #0 - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081C7A68 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r2, r0, #0 cmp r4, #4 bhi _081C7A7E @@ -933253,7 +933253,7 @@ _081C7A80: bx r1 .align 2, 0 _081C7A88: .4byte 0x00000888 - thumb_func_end sub_081C79FC + thumb_func_end LoopedTask_sub_81C8254 thumb_func_start sub_081C7A8C sub_081C7A8C: @ 0x081C7A8C @@ -933280,7 +933280,7 @@ sub_081C7A8C: @ 0x081C7A8C ldrb r0, [r5] adds r1, r5, #0 adds r1, #0x88 - bl sub_0800212C + bl SetBgTilemapBuffer ldrb r0, [r5] movs r1, #0x20 str r1, [sp] @@ -933292,18 +933292,18 @@ sub_081C7A8C: @ 0x081C7A8C ldrb r0, [r5] movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldrb r0, [r5] movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX ldrb r0, [r5] ldrb r1, [r5, #3] lsls r1, r1, #0xb movs r2, #2 - bl sub_08001E94 + bl ChangeBgY ldrb r0, [r5] - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r4, r5} pop {r0} @@ -933317,12 +933317,12 @@ sub_081C7B04: @ 0x081C7B04 adds r4, r0, #0 ldrb r0, [r4, #8] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #8] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #8] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -933377,33 +933377,33 @@ sub_081C7B54: @ 0x081C7B54 str r0, [r1, #0x10] ldr r0, _081C7B84 movs r1, #5 - bl sub_081C6838 + bl CreateLoopedTask _081C7B7E: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_081C7B84: .4byte sub_081C7B98 +_081C7B84: .4byte LoopedTask_sub_81C83F0 thumb_func_end sub_081C7B54 thumb_func_start sub_081C7B88 sub_081C7B88: @ 0x081C7B88 push {lr} ldr r0, _081C7B94 - bl sub_081C68E4 + bl FuncIsActiveLoopedTask pop {r1} bx r1 .align 2, 0 -_081C7B94: .4byte sub_081C7B98 +_081C7B94: .4byte LoopedTask_sub_81C83F0 thumb_func_end sub_081C7B88 - thumb_func_start sub_081C7B98 -sub_081C7B98: @ 0x081C7B98 + thumb_func_start LoopedTask_sub_81C83F0 +LoopedTask_sub_81C83F0: @ 0x081C7B98 push {r4, r5, r6, r7, lr} sub sp, #0xc adds r6, r0, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r6, #0 beq _081C7BB0 @@ -933457,12 +933457,12 @@ _081C7BDC: beq _081C7C16 ldrb r0, [r4, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _081C7C1E _081C7C16: ldrb r0, [r4, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081C7C1E: movs r0, #0 b _081C7C44 @@ -933477,7 +933477,7 @@ _081C7C22: movs r0, #3 b _081C7C44 _081C7C34: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081C7C42 @@ -933490,13 +933490,13 @@ _081C7C44: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081C7B98 + thumb_func_end LoopedTask_sub_81C83F0 - thumb_func_start sub_081C7C4C -sub_081C7C4C: @ 0x081C7C4C + thumb_func_start ShouldShowUpArrow +ShouldShowUpArrow: @ 0x081C7C4C push {lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081C7C64 adds r0, r0, r1 ldrh r1, [r0] @@ -933507,13 +933507,13 @@ sub_081C7C4C: @ 0x081C7C4C bx r1 .align 2, 0 _081C7C64: .4byte 0x00000888 - thumb_func_end sub_081C7C4C + thumb_func_end ShouldShowUpArrow - thumb_func_start sub_081C7C68 -sub_081C7C68: @ 0x081C7C68 + thumb_func_start ShouldShowDownArrow +ShouldShowDownArrow: @ 0x081C7C68 push {lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081C7C8C adds r0, r0, r1 movs r3, #0 @@ -933530,16 +933530,16 @@ _081C7C84: bx r1 .align 2, 0 _081C7C8C: .4byte 0x00000888 - thumb_func_end sub_081C7C68 + thumb_func_end ShouldShowDownArrow - thumb_func_start sub_081C7C90 -sub_081C7C90: @ 0x081C7C90 + thumb_func_start MatchCall_MoveWindow +MatchCall_MoveWindow: @ 0x081C7C90 push {r4, r5, r6, r7, lr} sub sp, #8 adds r6, r0, #0 adds r4, r1, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r7, r0, #0 ldr r0, _081C7CC8 adds r5, r7, r0 @@ -933598,7 +933598,7 @@ _081C7CF6: bx r0 .align 2, 0 _081C7D0C: .4byte gUnknown_203CC10 - thumb_func_end sub_081C7C90 + thumb_func_end MatchCall_MoveWindow thumb_func_start sub_081C7D10 sub_081C7D10: @ 0x081C7D10 @@ -933606,7 +933606,7 @@ sub_081C7D10: @ 0x081C7D10 adds r5, r0, #0 adds r4, r1, #0 ldrb r0, [r4] - bl sub_08001FD0 + bl GetBgY str r0, [r4, #0x20] lsls r1, r5, #0xc adds r0, r0, r1 @@ -933622,21 +933622,21 @@ _081C7D2E: str r5, [r4, #0x2c] ldr r0, _081C7D44 movs r1, #6 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #0x28] pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_081C7D44: .4byte sub_081C7D48 +_081C7D44: .4byte LoopedTask_sub_81C85A0 thumb_func_end sub_081C7D10 - thumb_func_start sub_081C7D48 -sub_081C7D48: @ 0x081C7D48 + thumb_func_start LoopedTask_sub_81C85A0 +LoopedTask_sub_81C85A0: @ 0x081C7D48 push {r4, r5, r6, lr} adds r5, r0, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r5, #0 beq _081C7D60 @@ -933653,7 +933653,7 @@ _081C7D60: _081C7D6C: movs r6, #0 ldrb r0, [r4] - bl sub_08001FD0 + bl GetBgY adds r5, r0, #0 ldrb r0, [r4] movs r1, #0x80 @@ -933661,7 +933661,7 @@ _081C7D6C: ldr r2, [r4, #0x30] lsls r2, r2, #0x18 lsrs r2, r2, #0x18 - bl sub_08001E94 + bl ChangeBgY adds r1, r0, #0 ldr r0, [r4, #0x30] cmp r0, #2 @@ -933700,7 +933700,7 @@ _081C7DB6: ldrb r0, [r4] adds r1, r2, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #4 b _081C7DD2 _081C7DD0: @@ -933709,37 +933709,37 @@ _081C7DD2: pop {r4, r5, r6} pop {r1} bx r1 - thumb_func_end sub_081C7D48 + thumb_func_end LoopedTask_sub_81C85A0 - thumb_func_start sub_081C7DD8 -sub_081C7DD8: @ 0x081C7DD8 + thumb_func_start MatchCall_GetMessage_Type2 +MatchCall_GetMessage_Type2: @ 0x081C7DD8 push {lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x28] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C7DD8 + thumb_func_end MatchCall_GetMessage_Type2 - thumb_func_start sub_081C7DEC -sub_081C7DEC: @ 0x081C7DEC + thumb_func_start GetMatchCallWindowStruct +GetMatchCallWindowStruct: @ 0x081C7DEC push {lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081C7DFC adds r0, r0, r1 pop {r1} bx r1 .align 2, 0 _081C7DFC: .4byte 0x00000888 - thumb_func_end sub_081C7DEC + thumb_func_end GetMatchCallWindowStruct thumb_func_start MatchCall_MoveCursorUp MatchCall_MoveCursorUp: @ 0x081C7E00 push {lr} - bl sub_081C7DEC + bl GetMatchCallWindowStruct adds r1, r0, #0 ldrh r0, [r1, #6] cmp r0, #0 @@ -933749,7 +933749,7 @@ MatchCall_MoveCursorUp: @ 0x081C7E00 movs r0, #1 b _081C7E2E _081C7E16: - bl sub_081C7C4C + bl ShouldShowUpArrow cmp r0, #0 bne _081C7E22 movs r0, #0 @@ -933758,7 +933758,7 @@ _081C7E22: movs r0, #1 rsbs r0, r0, #0 movs r1, #1 - bl sub_081C7C90 + bl MatchCall_MoveWindow movs r0, #2 _081C7E2E: pop {r1} @@ -933769,7 +933769,7 @@ _081C7E2E: thumb_func_start MatchCall_MoveCursorDown MatchCall_MoveCursorDown: @ 0x081C7E34 push {lr} - bl sub_081C7DEC + bl GetMatchCallWindowStruct adds r2, r0, #0 ldrh r1, [r2] ldrh r3, [r2, #6] @@ -933787,7 +933787,7 @@ MatchCall_MoveCursorDown: @ 0x081C7E34 movs r0, #1 b _081C7E70 _081C7E5A: - bl sub_081C7C68 + bl ShouldShowDownArrow cmp r0, #0 bne _081C7E66 _081C7E62: @@ -933796,7 +933796,7 @@ _081C7E62: _081C7E66: movs r0, #1 movs r1, #1 - bl sub_081C7C90 + bl MatchCall_MoveWindow movs r0, #2 _081C7E70: pop {r1} @@ -933806,9 +933806,9 @@ _081C7E70: thumb_func_start MatchCall_PageUp MatchCall_PageUp: @ 0x081C7E74 push {r4, lr} - bl sub_081C7DEC + bl GetMatchCallWindowStruct adds r4, r0, #0 - bl sub_081C7C4C + bl ShouldShowUpArrow adds r1, r0, #0 cmp r1, #0 beq _081C7EA0 @@ -933823,7 +933823,7 @@ _081C7E92: _081C7E94: rsbs r0, r0, #0 movs r1, #1 - bl sub_081C7C90 + bl MatchCall_MoveWindow movs r0, #2 b _081C7EAE _081C7EA0: @@ -933844,9 +933844,9 @@ _081C7EAE: thumb_func_start MatchCall_PageDown MatchCall_PageDown: @ 0x081C7EB4 push {r4, lr} - bl sub_081C7DEC + bl GetMatchCallWindowStruct adds r4, r0, #0 - bl sub_081C7C68 + bl ShouldShowDownArrow cmp r0, #0 beq _081C7EDE ldrh r0, [r4] @@ -933859,7 +933859,7 @@ MatchCall_PageDown: @ 0x081C7EB4 adds r0, r3, #0 _081C7ED4: movs r1, #1 - bl sub_081C7C90 + bl MatchCall_MoveWindow movs r0, #2 b _081C7EFE _081C7EDE: @@ -933888,10 +933888,10 @@ _081C7EFE: bx r1 thumb_func_end MatchCall_PageDown - thumb_func_start sub_081C7F04 -sub_081C7F04: @ 0x081C7F04 + thumb_func_start GetSelectedMatchCall +GetSelectedMatchCall: @ 0x081C7F04 push {lr} - bl sub_081C7DEC + bl GetMatchCallWindowStruct adds r1, r0, #0 ldrh r0, [r1] ldrh r1, [r1, #6] @@ -933899,22 +933899,22 @@ sub_081C7F04: @ 0x081C7F04 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C7F04 + thumb_func_end GetSelectedMatchCall - thumb_func_start sub_081C7F18 -sub_081C7F18: @ 0x081C7F18 + thumb_func_start GetMatchCallListTopIndex +GetMatchCallListTopIndex: @ 0x081C7F18 push {lr} - bl sub_081C7DEC + bl GetMatchCallWindowStruct ldrh r0, [r0] pop {r1} bx r1 - thumb_func_end sub_081C7F18 + thumb_func_end GetMatchCallListTopIndex thumb_func_start sub_081C7F24 sub_081C7F24: @ 0x081C7F24 push {r4, lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C7F4C adds r1, r4, r0 @@ -933922,7 +933922,7 @@ sub_081C7F24: @ 0x081C7F24 str r0, [r1] ldr r0, _081C7F50 movs r1, #6 - bl sub_081C6838 + bl CreateLoopedTask movs r1, #0x8a lsls r1, r1, #4 adds r4, r4, r1 @@ -933932,7 +933932,7 @@ sub_081C7F24: @ 0x081C7F24 bx r0 .align 2, 0 _081C7F4C: .4byte 0x0000089C -_081C7F50: .4byte sub_081C8018 +_081C7F50: .4byte LoopedTask_sub_81C8870 thumb_func_end sub_081C7F24 thumb_func_start sub_081C7F54 @@ -933942,7 +933942,7 @@ sub_081C7F54: @ 0x081C7F54 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081C7F8C adds r1, r5, r0 @@ -933955,7 +933955,7 @@ sub_081C7F54: @ 0x081C7F54 str r2, [r0] ldr r0, _081C7F94 movs r1, #6 - bl sub_081C6838 + bl CreateLoopedTask movs r1, #0x8a lsls r1, r1, #4 adds r5, r5, r1 @@ -933966,14 +933966,14 @@ sub_081C7F54: @ 0x081C7F54 .align 2, 0 _081C7F8C: .4byte 0x00000888 _081C7F90: .4byte 0x0000089C -_081C7F94: .4byte sub_081C8100 +_081C7F94: .4byte LoopedTask_sub_81C8958 thumb_func_end sub_081C7F54 thumb_func_start sub_081C7F98 sub_081C7F98: @ 0x081C7F98 push {r4, lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C7FC0 adds r1, r4, r0 @@ -933981,7 +933981,7 @@ sub_081C7F98: @ 0x081C7F98 str r0, [r1] ldr r0, _081C7FC4 movs r1, #6 - bl sub_081C6838 + bl CreateLoopedTask movs r1, #0x8a lsls r1, r1, #4 adds r4, r4, r1 @@ -933991,19 +933991,19 @@ sub_081C7F98: @ 0x081C7F98 bx r0 .align 2, 0 _081C7FC0: .4byte 0x0000089C -_081C7FC4: .4byte sub_081C81D0 +_081C7FC4: .4byte LoopedTask_sub_81C8A28 thumb_func_end sub_081C7F98 thumb_func_start sub_081C7FC8 sub_081C7FC8: @ 0x081C7FC8 push {lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0x8a lsls r1, r1, #4 adds r0, r0, r1 ldr r0, [r0] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 thumb_func_end sub_081C7FC8 @@ -934012,7 +934012,7 @@ sub_081C7FC8: @ 0x081C7FC8 sub_081C7FE0: @ 0x081C7FE0 push {r4, lr} movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C8014 adds r2, r4, r0 @@ -934028,7 +934028,7 @@ sub_081C7FE0: @ 0x081C7FE0 bl _call_via_r3 ldrb r0, [r4, #8] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -934036,12 +934036,12 @@ sub_081C7FE0: @ 0x081C7FE0 _081C8014: .4byte 0x00000888 thumb_func_end sub_081C7FE0 - thumb_func_start sub_081C8018 -sub_081C8018: @ 0x081C8018 + thumb_func_start LoopedTask_sub_81C8870 +LoopedTask_sub_81C8870: @ 0x081C8018 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r5, #4 bhi _081C80F4 @@ -934061,7 +934061,7 @@ _081C8038: @ jump table _081C804C: adds r0, r4, #0 movs r1, #1 - bl sub_081C87BC + bl ToggleMatchCallArrows _081C8054: ldr r0, _081C8078 adds r5, r4, r0 @@ -934085,7 +934085,7 @@ _081C8072: _081C8078: .4byte 0x0000089C _081C807C: .4byte 0x0000088E _081C8080: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081C80EA @@ -934115,7 +934115,7 @@ _081C80A4: .align 2, 0 _081C80BC: .4byte 0x0000088E _081C80C0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081C80EA @@ -934125,12 +934125,12 @@ _081C80C0: cmp r0, #0 beq _081C80F4 movs r1, #0 - bl sub_081C7C90 + bl MatchCall_MoveWindow b _081C8072 .align 2, 0 _081C80DC: .4byte 0x0000088E _081C80E0: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 adds r1, r0, #0 cmp r1, #0 beq _081C80EE @@ -934149,16 +934149,16 @@ _081C80F6: bx r1 .align 2, 0 _081C80FC: .4byte 0x0000088E - thumb_func_end sub_081C8018 + thumb_func_end LoopedTask_sub_81C8870 - thumb_func_start sub_081C8100 -sub_081C8100: @ 0x081C8100 + thumb_func_start LoopedTask_sub_81C8958 +LoopedTask_sub_81C8958: @ 0x081C8100 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081C811A @@ -934194,7 +934194,7 @@ _081C8158: .4byte 0x00000888 _081C815C: adds r0, r4, #0 movs r1, #0 - bl sub_081C8564 + bl PrintMatchCallFieldNames b _081C81C8 _081C8166: ldr r1, _081C8174 @@ -934208,7 +934208,7 @@ _081C8174: .4byte 0x00000888 _081C8178: adds r0, r4, #0 movs r1, #1 - bl sub_081C8564 + bl PrintMatchCallFieldNames b _081C81C8 _081C8182: ldr r1, _081C8190 @@ -934222,7 +934222,7 @@ _081C8190: .4byte 0x00000888 _081C8194: adds r0, r4, #0 movs r1, #2 - bl sub_081C8564 + bl PrintMatchCallFieldNames b _081C81C8 _081C819E: ldr r1, _081C81AC @@ -934251,19 +934251,19 @@ _081C81CA: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081C8100 + thumb_func_end LoopedTask_sub_81C8958 - thumb_func_start sub_081C81D0 -sub_081C81D0: @ 0x081C81D0 + thumb_func_start LoopedTask_sub_81C8A28 +LoopedTask_sub_81C8A28: @ 0x081C81D0 push {r4, r5, r6, r7, lr} sub sp, #8 adds r5, r0, #0 - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081C824E movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C8200 adds r6, r4, r0 @@ -934349,13 +934349,13 @@ _081C8290: adds r0, r4, r2 ldr r0, [r0] movs r1, #0 - bl sub_081C7C90 + bl MatchCall_MoveWindow movs r0, #0 b _081C830E .align 2, 0 _081C82A0: .4byte 0x0000089C _081C82A4: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 adds r1, r0, #0 cmp r1, #0 bne _081C824E @@ -934406,7 +934406,7 @@ _081C8300: .4byte 0x0000089C _081C8304: adds r0, r2, #0 movs r1, #0 - bl sub_081C87BC + bl ToggleMatchCallArrows _081C830C: movs r0, #4 _081C830E: @@ -934415,7 +934415,7 @@ _081C830E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081C81D0 + thumb_func_end LoopedTask_sub_81C8A28 thumb_func_start sub_081C8318 sub_081C8318: @ 0x081C8318 @@ -934430,7 +934430,7 @@ sub_081C8318: @ 0x081C8318 adds r6, r2, #0 ldrb r0, [r0, #8] movs r1, #7 - bl sub_0800401C + bl GetWindowAttribute mov sl, r0 mov r1, sb ldrb r0, [r1, #4] @@ -934460,7 +934460,7 @@ sub_081C8318: @ 0x081C8318 mov r1, sb ldrb r0, [r1, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _081C83C6 .align 2, 0 _081C8374: .4byte 0x11111111 @@ -934499,7 +934499,7 @@ _081C837C: mov r1, sb ldrb r0, [r1, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081C83C6: subs r6, #1 movs r0, #1 @@ -934522,7 +934522,7 @@ _081C83E8: mov r1, sb ldrb r0, [r1, #8] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5} mov r8, r3 @@ -934543,10 +934543,10 @@ sub_081C840C: @ 0x081C840C adds r4, r1, #0 ldrb r0, [r5, #8] movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08002194 + bl GetBgTilemapBuffer adds r2, r0, #0 ldrh r0, [r5, #0xa] lsls r0, r0, #6 @@ -934635,7 +934635,7 @@ sub_081C8484: @ 0x081C8484 str r6, [sp, #8] movs r1, #1 movs r2, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r4, #0 movs r1, #1 bl sub_081C840C @@ -934648,7 +934648,7 @@ sub_081C8484: @ 0x081C8484 str r1, [sp, #4] movs r1, #3 movs r2, #0 - bl sub_080035A8 + bl CopyWindowRectToVram add sp, #0x10 pop {r4, r5, r6} pop {r0} @@ -934708,7 +934708,7 @@ sub_081C8510: @ 0x081C8510 bl sub_081C840C ldrb r0, [r4, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -934716,8 +934716,8 @@ sub_081C8510: @ 0x081C8510 .align 2, 0 thumb_func_end sub_081C8510 - thumb_func_start sub_081C8564 -sub_081C8564: @ 0x081C8564 + thumb_func_start PrintMatchCallFieldNames +PrintMatchCallFieldNames: @ 0x081C8564 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 @@ -934769,7 +934769,7 @@ sub_081C8564: @ 0x081C8564 movs r1, #1 movs r2, #0 adds r3, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrh r0, [r6, #8] lsls r4, r4, #1 ldrb r1, [r6, #4] @@ -934778,7 +934778,7 @@ sub_081C8564: @ 0x081C8564 str r1, [sp, #4] movs r2, #0 adds r3, r4, #0 - bl sub_080035A8 + bl CopyWindowRectToVram add sp, #0x1c pop {r3, r4} mov r8, r3 @@ -934789,7 +934789,7 @@ sub_081C8564: @ 0x081C8564 .align 2, 0 _081C85F4: .4byte gUnknown_85F15AC _081C85F8: .4byte gUnknown_85F15B8 - thumb_func_end sub_081C8564 + thumb_func_end PrintMatchCallFieldNames thumb_func_start sub_081C85FC sub_081C85FC: @ 0x081C85FC @@ -934805,7 +934805,7 @@ sub_081C85FC: @ 0x081C85FC movs r2, #0xf ands r7, r2 ldrh r0, [r0] - bl sub_081CA77C + bl GroundEffect_DeepSandTracks adds r6, r0, #0 cmp r6, #0 beq _081C8634 @@ -934849,7 +934849,7 @@ _081C8642: movs r1, #2 str r1, [sp, #4] movs r2, #0 - bl sub_080035A8 + bl CopyWindowRectToVram _081C8674: add sp, #0xc pop {r4, r5, r6, r7} @@ -934864,13 +934864,13 @@ sub_081C867C: @ 0x081C867C ldr r4, _081C869C _081C8682: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #0 beq _081C8682 ldr r0, _081C86A0 - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes pop {r4, r5} pop {r0} bx r0 @@ -934898,7 +934898,7 @@ sub_081C86A4: @ 0x081C86A4 adds r2, #1 lsls r2, r2, #3 movs r3, #7 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 lsls r0, r3, #4 @@ -934926,7 +934926,7 @@ sub_081C86A4: @ 0x081C86A4 mov r0, sl adds r1, r6, #0 movs r3, #7 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 lsls r2, r3, #4 @@ -934955,7 +934955,7 @@ sub_081C86A4: @ 0x081C86A4 mov r0, sl adds r1, r6, #0 movs r3, #7 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 lsls r1, r3, #4 @@ -934989,8 +934989,8 @@ _081C877C: .4byte gUnknown_20205AC _081C8780: .4byte gUnknown_85F1600 _081C8784: .4byte 0x000003FF _081C8788: .4byte 0xFFFFFC00 -_081C878C: .4byte sub_081C8854 -_081C8790: .4byte sub_081C88A8 +_081C878C: .4byte SpriteCB_MatchCallDownArrow +_081C8790: .4byte SpriteCB_MatchCallUpArrow thumb_func_end sub_081C86A4 thumb_func_start sub_081C8794 @@ -935012,8 +935012,8 @@ sub_081C8794: @ 0x081C8794 bx r0 thumb_func_end sub_081C8794 - thumb_func_start sub_081C87BC -sub_081C87BC: @ 0x081C87BC + thumb_func_start ToggleMatchCallArrows +ToggleMatchCallArrows: @ 0x081C87BC push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 @@ -935069,17 +935069,17 @@ _081C87EE: pop {r0} bx r0 .align 2, 0 -_081C8828: .4byte sub_081C8834 -_081C882C: .4byte sub_081C88A8 -_081C8830: .4byte sub_081C8854 - thumb_func_end sub_081C87BC +_081C8828: .4byte c3_0802FDF4 +_081C882C: .4byte SpriteCB_MatchCallUpArrow +_081C8830: .4byte SpriteCB_MatchCallDownArrow + thumb_func_end ToggleMatchCallArrows - thumb_func_start sub_081C8834 -sub_081C8834: @ 0x081C8834 + thumb_func_start c3_0802FDF4 +c3_0802FDF4: @ 0x081C8834 push {r4, lr} adds r4, r0, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081C8850 adds r0, r0, r1 ldrh r0, [r0] @@ -935090,17 +935090,17 @@ sub_081C8834: @ 0x081C8834 bx r0 .align 2, 0 _081C8850: .4byte 0x0000088E - thumb_func_end sub_081C8834 + thumb_func_end c3_0802FDF4 - thumb_func_start sub_081C8854 -sub_081C8854: @ 0x081C8854 + thumb_func_start SpriteCB_MatchCallDownArrow +SpriteCB_MatchCallDownArrow: @ 0x081C8854 push {r4, lr} adds r4, r0, #0 movs r1, #0x3c ldrsh r0, [r4, r1] cmp r0, #0 bne _081C8876 - bl sub_081C7C68 + bl ShouldShowDownArrow cmp r0, #0 beq _081C8876 adds r2, r4, #0 @@ -935138,17 +935138,17 @@ _081C88A0: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C8854 + thumb_func_end SpriteCB_MatchCallDownArrow - thumb_func_start sub_081C88A8 -sub_081C88A8: @ 0x081C88A8 + thumb_func_start SpriteCB_MatchCallUpArrow +SpriteCB_MatchCallUpArrow: @ 0x081C88A8 push {r4, lr} adds r4, r0, #0 movs r1, #0x3c ldrsh r0, [r4, r1] cmp r0, #0 bne _081C88CA - bl sub_081C7C4C + bl ShouldShowUpArrow cmp r0, #0 beq _081C88CA adds r2, r4, #0 @@ -935186,14 +935186,14 @@ _081C88F6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C88A8 + thumb_func_end SpriteCB_MatchCallUpArrow - thumb_func_start sub_081C88FC -sub_081C88FC: @ 0x081C88FC + thumb_func_start ToggleMatchCallVerticalArrows +ToggleMatchCallVerticalArrows: @ 0x081C88FC push {r4, lr} adds r4, r0, #0 movs r0, #0x11 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #0x40] strh r4, [r1, #0x3c] ldr r0, [r0, #0x44] @@ -935201,7 +935201,7 @@ sub_081C88FC: @ 0x081C88FC pop {r4} pop {r0} bx r0 - thumb_func_end sub_081C88FC + thumb_func_end ToggleMatchCallVerticalArrows thumb_func_start sub_081C8914 sub_081C8914: @ 0x081C8914 @@ -935306,7 +935306,7 @@ sub_081C8960: @ 0x081C8960 orrs r0, r3 str r0, [sp, #4] mov r0, sp - bl sub_08003250 + bl AddWindow strh r0, [r7, #8] lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -935338,8 +935338,8 @@ _081C8A06: .align 2, 0 thumb_func_end sub_081C8960 - thumb_func_start sub_081C8A14 -sub_081C8A14: @ 0x081C8A14 + thumb_func_start GetPokenavMainMenuType +GetPokenavMainMenuType: @ 0x081C8A14 push {r4, lr} movs r0, #0x98 lsls r0, r0, #1 @@ -935362,18 +935362,18 @@ _081C8A36: bx r1 .align 2, 0 _081C8A40: .4byte 0x0000089B - thumb_func_end sub_081C8A14 + thumb_func_end GetPokenavMainMenuType thumb_func_start sub_081C8A44 sub_081C8A44: @ 0x081C8A44 push {r4, lr} movs r0, #1 movs r1, #0x10 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081C8A70 - bl sub_081C8A14 + bl GetPokenavMainMenuType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -935398,11 +935398,11 @@ sub_081C8A78: @ 0x081C8A78 push {r4, lr} movs r0, #1 movs r1, #0x10 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081C8AA6 - bl sub_081C8A14 + bl GetPokenavMainMenuType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -935429,11 +935429,11 @@ sub_081C8AB0: @ 0x081C8AB0 push {r4, lr} movs r0, #1 movs r1, #0x10 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081C8ADA - bl sub_081C8A14 + bl GetPokenavMainMenuType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -935458,7 +935458,7 @@ sub_081C8AE4: @ 0x081C8AE4 push {lr} movs r0, #1 movs r1, #0x10 - bl sub_081C6DDC + bl AllocSubstruct adds r2, r0, #0 cmp r2, #0 beq _081C8B0C @@ -935486,7 +935486,7 @@ sub_081C8B14: @ 0x081C8B14 push {r4, r5, lr} movs r0, #1 movs r1, #0x10 - bl sub_081C6DDC + bl AllocSubstruct adds r5, r0, #0 cmp r5, #0 beq _081C8B40 @@ -935532,7 +935532,7 @@ _081C8B60: @ jump table .4byte _081C8B88 @ case 4 _081C8B74: movs r0, #0 - bl sub_081C6E48 + bl SetPokenavMode _081C8B7A: bl sub_081C8B98 b _081C8B8A @@ -935556,7 +935556,7 @@ _081C8B94: .4byte sub_081C8EA8 thumb_func_start sub_081C8B98 sub_081C8B98: @ 0x081C8B98 push {lr} - bl sub_081C6E3C + bl GetPokenavMode cmp r0, #1 beq _081C8BB4 cmp r0, #1 @@ -935586,7 +935586,7 @@ _081C8BC4: .4byte sub_081C8D34 sub_081C8BC8: @ 0x081C8BC8 push {lr} movs r0, #1 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #0xc] bl _call_via_r1 pop {r1} @@ -935598,7 +935598,7 @@ sub_081C8BC8: @ 0x081C8BC8 sub_081C8BDC: @ 0x081C8BDC push {lr} movs r0, #1 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 thumb_func_end sub_081C8BDC @@ -935685,7 +935685,7 @@ _081C8C80: .align 2, 0 _081C8C88: .4byte 0x000186AB _081C8C8C: - bl sub_081C6E78 + bl CanViewRibbonsMenu cmp r0, #0 beq _081C8CA8 movs r0, #9 @@ -936090,7 +936090,7 @@ sub_081C8F68: @ 0x081C8F68 sub_081C8F6C: @ 0x081C8F6C push {r4, lr} adds r4, r0, #0 - bl sub_081C8A14 + bl GetPokenavMainMenuType lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -936205,7 +936205,7 @@ _081C903A: sub_081C9040: @ 0x081C9040 push {lr} movs r0, #1 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -936216,7 +936216,7 @@ sub_081C9040: @ 0x081C9040 sub_081C9050: @ 0x081C9050 push {lr} movs r0, #1 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #2 ldrsh r0, [r0, r1] pop {r1} @@ -936227,7 +936227,7 @@ sub_081C9050: @ 0x081C9050 sub_081C9060: @ 0x081C9060 push {lr} movs r0, #1 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0, #4] pop {r1} bx r1 @@ -936238,7 +936238,7 @@ sub_081C9060: @ 0x081C9060 sub_081C9070: @ 0x081C9070 push {lr} movs r0, #1 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0, #6] pop {r1} bx r1 @@ -936329,7 +936329,7 @@ sub_081C9104: @ 0x081C9104 push {r4, lr} ldr r1, _081C9130 movs r0, #2 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081C9126 @@ -936337,7 +936337,7 @@ sub_081C9104: @ 0x081C9104 strb r0, [r4, #0xc] ldr r0, _081C9134 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081C9138 str r0, [r4] @@ -936357,14 +936357,14 @@ sub_081C913C: @ 0x081C913C push {r4, r5, lr} adds r4, r0, #0 movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081C9164 lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5, #4] ldr r0, _081C9168 str r0, [r5] @@ -936380,7 +936380,7 @@ _081C9168: .4byte sub_081C91A8 sub_081C916C: @ 0x081C916C push {lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -936396,15 +936396,15 @@ sub_081C917C: @ 0x081C917C sub_081C9180: @ 0x081C9180 push {r4, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081C9FA0 ldrb r0, [r4, #8] - bl sub_08003444 - bl sub_081C9798 + bl RemoveWindow + bl PrintLeftColumnStats bl sub_081CA140 movs r0, #2 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 @@ -936414,9 +936414,9 @@ sub_081C9180: @ 0x081C9180 sub_081C91A8: @ 0x081C91A8 push {lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -936428,7 +936428,7 @@ sub_081C91BC: @ 0x081C91BC sub sp, #4 adds r4, r0, #0 movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #9 bls _081C91D0 @@ -936455,53 +936455,53 @@ _081C91E0: @ jump table _081C9208: ldr r0, _081C9288 movs r1, #3 - bl sub_081C7314 + bl InitBgTemplates ldr r1, _081C928C movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram adds r1, r5, #0 adds r1, #0x8c movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081C9290 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _081C9294 movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY _081C9282: movs r0, #0 b _081C940E @@ -936511,7 +936511,7 @@ _081C928C: .4byte gUnknown_85F1730 _081C9290: .4byte gUnknown_85F1780 _081C9294: .4byte gUnknown_85F1710 _081C9298: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -936523,25 +936523,25 @@ _081C92A6: movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081C92D4 movs r0, #1 str r0, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _081C92D8 movs r1, #0x20 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow b _081C9282 .align 2, 0 _081C92D0: .4byte gUnknown_85F1858 _081C92D4: .4byte gUnknown_85F1AE0 _081C92D8: .4byte gUnknown_85F1838 _081C92DC: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -936553,18 +936553,18 @@ _081C92EA: movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081C932C movs r0, #1 str r0, [sp] movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _081C9330 movs r1, #0x30 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow bl sub_081C9040 cmp r0, #3 beq _081C9322 @@ -936572,14 +936572,14 @@ _081C92EA: cmp r0, #4 bne _081C9282 _081C9322: - bl sub_081C9FFC + bl Overworld_ResetStateAfterFly b _081C9282 .align 2, 0 _081C9328: .4byte gUnknown_85F165C _081C932C: .4byte gUnknown_85F1670 _081C9330: .4byte gUnknown_85F163C _081C9334: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081C9408 @@ -936604,11 +936604,11 @@ _081C9362: b _081C9346 _081C936C: movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg ldrb r0, [r5, #0xd] cmp r0, #0 beq _081C938C @@ -936627,14 +936627,14 @@ _081C9398: cmp r0, #4 bne _081C93B2 movs r0, #7 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex _081C93AA: movs r0, #1 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex b _081C9282 _081C93B2: movs r0, #0 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex b _081C9282 _081C93BA: bl sub_081C72F4 @@ -936752,7 +936752,7 @@ _081C9488: bne _081C94E0 bl sub_081C9874 movs r0, #1 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex movs r0, #0 b _081C94EA _081C94A6: @@ -936824,7 +936824,7 @@ _081C951E: bne _081C9576 bl sub_081C9874 movs r0, #0 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex movs r0, #0 b _081C9580 _081C953C: @@ -936890,7 +936890,7 @@ _081C95B0: cmp r0, #0 bne _081C95F4 movs r0, #7 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex bl sub_081C9874 movs r0, #0 b _081C95FE @@ -936999,7 +936999,7 @@ _081C9680: movs r0, #0 b _081C969E _081C968E: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081C969C @@ -937028,7 +937028,7 @@ _081C96B0: movs r0, #0 b _081C96CE _081C96BE: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081C96CC @@ -937127,13 +937127,13 @@ sub_081C9770: @ 0x081C9770 ldr r4, _081C9790 _081C9776: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #1 bls _081C9776 ldr r0, _081C9794 - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes pop {r4, r5} pop {r0} bx r0 @@ -937142,8 +937142,8 @@ _081C9790: .4byte gUnknown_85F272C _081C9794: .4byte gUnknown_85F273C thumb_func_end sub_081C9770 - thumb_func_start sub_081C9798 -sub_081C9798: @ 0x081C9798 + thumb_func_start PrintLeftColumnStats +PrintLeftColumnStats: @ 0x081C9798 push {lr} movs r0, #3 bl FreeSpriteTilesByTag @@ -937166,7 +937166,7 @@ sub_081C9798: @ 0x081C9798 pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081C9798 + thumb_func_end PrintLeftColumnStats thumb_func_start sub_081C97D8 sub_081C97D8: @ 0x081C97D8 @@ -937174,7 +937174,7 @@ sub_081C97D8: @ 0x081C97D8 mov r7, r8 push {r7} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr movs r2, #0 adds r0, #0x2c mov r8, r0 @@ -937195,7 +937195,7 @@ _081C9800: movs r1, #0x8c asrs r2, r5, #0x10 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -937226,7 +937226,7 @@ _081C983C: .4byte gUnknown_20205AC sub_081C9840: @ 0x081C9840 push {r4, r5, r6, r7, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0 adds r7, r0, #0 adds r7, #0x2c @@ -937283,7 +937283,7 @@ sub_081C9898: @ 0x081C9898 str r1, [sp, #0x14] str r2, [sp] movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr mov sl, r0 movs r0, #3 bl GetSpriteTileStartByTag @@ -937335,7 +937335,7 @@ _081C98EA: adds r0, #4 lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r3, [r4] lsls r0, r0, #4 ldrb r2, [r3, #5] @@ -937426,7 +937426,7 @@ sub_081C99B8: @ 0x081C99B8 mov r7, r8 push {r7} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 bl sub_081C9050 mov r8, r0 @@ -937482,7 +937482,7 @@ _081C9A10: sub_081C9A24: @ 0x081C9A24 push {r4, r5, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081C9050 adds r3, r0, #0 @@ -937535,7 +937535,7 @@ _081C9A5E: sub_081C9A88: @ 0x081C9A88 push {r4, r5, r6, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 movs r5, #0 adds r4, r6, #0 @@ -937575,7 +937575,7 @@ _081C9AC2: sub_081C9AD0: @ 0x081C9AD0 push {r4, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r3, r0, #0 movs r2, #0 ldr r4, _081C9AFC @@ -937659,7 +937659,7 @@ sub_081C9B60: @ 0x081C9B60 push {r7} adds r4, r0, #0 movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r7, r0, #0 movs r5, #0 mov r8, r5 @@ -937701,7 +937701,7 @@ _081C9B74: bl SetGpuReg ldr r0, _081C9BEC movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081C9BF0 @@ -937980,7 +937980,7 @@ _081C9DA2: cmp r0, #0xc bne _081C9DE4 movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr ldrb r1, [r0, #0xc] subs r1, #1 strb r1, [r0, #0xc] @@ -937989,7 +937989,7 @@ _081C9DA2: movs r0, #0x52 bl SetGpuReg adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _081C9DE4 _081C9DE0: subs r0, #1 @@ -938005,13 +938005,13 @@ _081C9DE4: sub_081C9DEC: @ 0x081C9DEC push {r4, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C9E24 movs r1, #0x10 movs r2, #0x60 movs r3, #4 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -938049,7 +938049,7 @@ _081C9E3C: sub_081C9E44: @ 0x081C9E44 push {lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x28] bl DestroySprite pop {r0} @@ -938092,20 +938092,20 @@ _081C9E86: sub_081C9E8C: @ 0x081C9E8C push {r4, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C9EBC - bl sub_08003250 + bl AddWindow strh r0, [r4, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #8] movs r1, #0x66 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -938118,7 +938118,7 @@ sub_081C9EC0: @ 0x081C9EC0 push {r4, r5, r6, lr} sub sp, #0xc movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 bl sub_081C9060 ldr r1, _081C9F14 @@ -938133,7 +938133,7 @@ sub_081C9EC0: @ 0x081C9EC0 adds r4, r0, #0 ldrb r0, [r5, #8] movs r1, #0x66 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #8] movs r2, #0xb0 subs r2, r2, r4 @@ -938147,7 +938147,7 @@ sub_081C9EC0: @ 0x081C9EC0 str r6, [sp, #8] movs r1, #1 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -938162,7 +938162,7 @@ sub_081C9F1C: @ 0x081C9F1C push {r4, r5, r6, lr} sub sp, #0xc movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r6, _081C9F68 movs r2, #1 @@ -938173,7 +938173,7 @@ sub_081C9F1C: @ 0x081C9F1C adds r4, r0, #0 ldrb r0, [r5, #8] movs r1, #0x66 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #8] movs r2, #0xb0 subs r2, r2, r4 @@ -938187,7 +938187,7 @@ sub_081C9F1C: @ 0x081C9F1C str r6, [sp, #8] movs r1, #1 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -938200,7 +938200,7 @@ _081C9F6C: .4byte gUnknown_85F2877 thumb_func_start sub_081C9F70 sub_081C9F70: @ 0x081C9F70 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -938212,11 +938212,11 @@ sub_081C9F70: @ 0x081C9F70 sub_081C9F80: @ 0x081C9F80 push {r4, lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, _081C9F9C movs r1, #2 - bl sub_080A8878 + bl CreateTask strb r0, [r4, #0xa] pop {r4} pop {r0} @@ -938229,9 +938229,9 @@ _081C9F9C: .4byte sub_081C9FB4 sub_081C9FA0: @ 0x081C9FA0 push {lr} movs r0, #2 - bl sub_081C6DFC + bl GetSubstructPtr ldrb r0, [r0, #0xa] - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 @@ -938243,7 +938243,7 @@ sub_081C9FB4: @ 0x081C9FB4 movs r0, #3 movs r1, #0x80 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX pop {r0} bx r0 thumb_func_end sub_081C9FB4 @@ -938253,7 +938253,7 @@ sub_081C9FC4: @ 0x081C9FC4 push {r4, r5, lr} ldr r0, _081C9FF4 movs r1, #3 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -938275,25 +938275,25 @@ _081C9FF4: .4byte sub_081CA05C _081C9FF8: .4byte gUnknown_85F163E thumb_func_end sub_081C9FC4 - thumb_func_start sub_081C9FFC -sub_081C9FFC: @ 0x081C9FFC + thumb_func_start Overworld_ResetStateAfterFly +Overworld_ResetStateAfterFly: @ 0x081C9FFC push {lr} ldr r0, _081CA00C movs r1, #0x31 movs r2, #4 - bl sub_081C7104 + bl ClearBottomWindow pop {r0} bx r0 .align 2, 0 _081CA00C: .4byte gUnknown_85F164A - thumb_func_end sub_081C9FFC + thumb_func_end Overworld_ResetStateAfterFly thumb_func_start sub_081CA010 sub_081CA010: @ 0x081CA010 push {r4, r5, lr} ldr r0, _081CA040 movs r1, #3 - bl sub_080A8878 + bl CreateTask adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -938319,7 +938319,7 @@ _081CA044: .4byte gUnknown_85F164A sub_081CA048: @ 0x081CA048 push {lr} ldr r0, _081CA058 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -938362,13 +938362,13 @@ sub_081CA05C: @ 0x081CA05C add r0, sp, #8 movs r1, #0x31 movs r2, #4 - bl sub_080A1200 + bl LoadPalette movs r1, #0 ldrsh r0, [r4, r1] cmp r0, #0xc bne _081CA0B4 adds r0, r6, #0 - bl sub_080A8964 + bl DestroyTask _081CA0B4: add sp, #0xc pop {r4, r5, r6} @@ -938382,9 +938382,9 @@ _081CA0BC: .4byte gUnknown_3005B68 sub_081CA0C0: @ 0x081CA0C0 push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 - bl sub_080B9800 + bl LoadOam + bl ProcessSpriteCopyRequests + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -938402,28 +938402,28 @@ sub_081CA0D8: @ 0x081CA0D8 movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x48 movs r1, #0x3f - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x4a movs r1, #0x1f - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x44 movs r1, #0xa0 - bl sub_08001200 - bl sub_080B9710 + bl SetGpuRegBits + bl ScanlineEffect_Stop bl sub_081CA1E8 ldr r2, _081CA134 ldr r0, [r2] ldr r1, [r2, #4] ldr r2, [r2, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldr r0, _081CA138 bl sub_081C6DC0 ldr r0, _081CA13C movs r1, #3 - bl sub_080A8878 + bl CreateTask pop {r0} bx r0 .align 2, 0 @@ -938441,14 +938441,14 @@ sub_081CA140: @ 0x081CA140 movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 - bl sub_080B9710 + bl ClearGpuRegBits + bl ScanlineEffect_Stop ldr r0, _081CA170 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 - bl sub_081C6DCC + bl DestroyTask + bl SetPokenavVBlankCallback pop {r0} bx r0 .align 2, 0 @@ -938609,7 +938609,7 @@ sub_081CA294: @ 0x081CA294 movs r1, #0xd4 lsls r1, r1, #1 movs r0, #5 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CA2C8 @@ -938620,7 +938620,7 @@ sub_081CA294: @ 0x081CA294 str r0, [r4, #0x10] ldr r0, _081CA2C4 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #0x14] movs r0, #1 b _081CA2CA @@ -938639,7 +938639,7 @@ _081CA2CA: sub_081CA2D0: @ 0x081CA2D0 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #0x18] bl _call_via_r1 pop {r1} @@ -938651,7 +938651,7 @@ sub_081CA2D0: @ 0x081CA2D0 sub_081CA2E4: @ 0x081CA2E4 push {lr} movs r0, #5 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 thumb_func_end sub_081CA2E4 @@ -938703,7 +938703,7 @@ _081CA330: ldr r0, _081CA364 str r0, [r4, #0x18] strh r2, [r4] - bl sub_081C7F04 + bl GetSelectedMatchCall lsls r0, r0, #2 adds r1, r4, r0 ldrb r0, [r1, #0x1c] @@ -938736,7 +938736,7 @@ _081CA37C: ands r0, r1 cmp r0, #0 beq _081CA39E - bl sub_081C6E3C + bl GetPokenavMode cmp r0, #1 beq _081CA398 ldr r0, _081CA394 @@ -938819,11 +938819,11 @@ _081CA40A: bne _081CA444 b _081CA452 _081CA410: - bl sub_081C6E3C + bl GetPokenavMode cmp r0, #1 bne _081CA41E movs r0, #2 - bl sub_081C6E48 + bl SetPokenavMode _081CA41E: ldr r0, _081CA430 str r0, [r4, #0x18] @@ -938934,7 +938934,7 @@ sub_081CA4CC: @ 0x081CA4CC push {r4, r5, r6, r7, lr} adds r5, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r5, #1 beq _081CA4F8 @@ -938960,7 +938960,7 @@ _081CA4F8: ldrh r5, [r4, #8] _081CA4FC: adds r0, r5, #0 - bl sub_081D0D10 + bl MatchCallFlagGetByIndex cmp r0, #0 beq _081CA52C ldrh r0, [r4, #0xa] @@ -938973,7 +938973,7 @@ _081CA4FC: movs r1, #1 strb r1, [r0, #0x1c] adds r0, r5, #0 - bl sub_081D0DF8 + bl MatchCallMapSecGetByIndex ldrh r1, [r4, #0xa] lsls r1, r1, #2 adds r1, r4, r1 @@ -939081,7 +939081,7 @@ _081CA5D0: sub_081CA5D4: @ 0x081CA5D4 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x10] pop {r1} bx r1 @@ -939092,7 +939092,7 @@ sub_081CA5D4: @ 0x081CA5D4 sub_081CA5E4: @ 0x081CA5E4 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0, #0xa] pop {r1} bx r1 @@ -939103,32 +939103,32 @@ sub_081CA5E4: @ 0x081CA5E4 sub_081CA5F4: @ 0x081CA5F4 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0, #0xc] pop {r1} bx r1 .align 2, 0 thumb_func_end sub_081CA5F4 - thumb_func_start sub_081CA604 -sub_081CA604: @ 0x081CA604 + thumb_func_start unref_sub_81CAE58 +unref_sub_81CAE58: @ 0x081CA604 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 ldrh r0, [r1, #0xa] ldrh r1, [r1, #0xc] subs r0, r0, r1 pop {r1} bx r1 - thumb_func_end sub_081CA604 + thumb_func_end unref_sub_81CAE58 - thumb_func_start sub_081CA618 -sub_081CA618: @ 0x081CA618 + thumb_func_start unref_sub_81CAE6C +unref_sub_81CAE6C: @ 0x081CA618 push {r4, lr} adds r4, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 ldrh r0, [r1, #0xc] adds r4, r4, r0 @@ -939146,13 +939146,13 @@ _081CA638: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081CA618 + thumb_func_end unref_sub_81CAE6C thumb_func_start sub_081CA640 sub_081CA640: @ 0x081CA640 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r0, #0x1c pop {r1} bx r1 @@ -939164,7 +939164,7 @@ sub_081CA650: @ 0x081CA650 push {r4, lr} adds r4, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr lsls r4, r4, #2 adds r0, r0, r4 ldrb r0, [r0, #0x1d] @@ -939179,7 +939179,7 @@ sub_081CA668: @ 0x081CA668 push {r4, lr} adds r4, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr lsls r1, r4, #2 adds r1, r0, r1 ldrb r0, [r1, #0x1c] @@ -939189,7 +939189,7 @@ sub_081CA668: @ 0x081CA668 b _081CA688 _081CA680: ldrh r0, [r1, #0x1e] - bl sub_081D0F70 + bl MatchCall_GetRematchTableIdx adds r4, r0, #0 _081CA688: cmp r4, #0x4e @@ -939220,14 +939220,14 @@ sub_081CA6B0: @ 0x081CA6B0 push {r4, r5, lr} adds r4, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr lsls r1, r4, #2 adds r1, r0, r1 ldrb r0, [r1, #0x1c] cmp r0, #0 bne _081CA6DC ldrh r0, [r1, #0x1e] - bl sub_081D0CD8 + bl GetTrainerIdxByRematchIdx adds r4, r0, #0 ldr r1, _081CA6D8 lsls r0, r4, #5 @@ -939239,7 +939239,7 @@ _081CA6D8: .4byte gUnknown_82E383C _081CA6DC: ldrh r5, [r1, #0x1e] adds r0, r5, #0 - bl sub_081D0F70 + bl MatchCall_GetRematchTableIdx adds r4, r0, #0 cmp r4, #0x4e bne _081CA700 @@ -939254,7 +939254,7 @@ _081CA6DC: _081CA6FC: .4byte gUnknown_82EFF00 _081CA700: adds r0, r4, #0 - bl sub_081D0CD8 + bl GetTrainerIdxByRematchIdx adds r4, r0, #0 ldr r0, _081CA718 lsls r1, r4, #5 @@ -939274,7 +939274,7 @@ sub_081CA71C: @ 0x081CA71C adds r5, r0, #0 adds r6, r1, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r0, #0 strb r0, [r6] @@ -939296,9 +939296,9 @@ _081CA748: cmp r0, #0 bne _081CA768 ldrh r0, [r1, #0x1e] - bl sub_081D0CD8 + bl GetTrainerIdxByRematchIdx ldr r1, _081CA764 - bl sub_081963AC + bl SelectMatchCallMessage strb r0, [r6] b _081CA770 .align 2, 0 @@ -939306,7 +939306,7 @@ _081CA764: .4byte gUnknown_2021C7C _081CA768: ldrh r0, [r1, #0x1e] ldr r1, _081CA778 - bl sub_081D0FB8 + bl MatchCall_GetMessage _081CA770: ldr r0, _081CA778 _081CA772: @@ -939317,20 +939317,20 @@ _081CA772: _081CA778: .4byte gUnknown_2021C7C thumb_func_end sub_081CA71C - thumb_func_start sub_081CA77C -sub_081CA77C: @ 0x081CA77C + thumb_func_start GroundEffect_DeepSandTracks +GroundEffect_DeepSandTracks: @ 0x081CA77C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr lsls r4, r4, #2 adds r4, r0, r4 ldrb r0, [r4, #0x1c] cmp r0, #0 beq _081CA7A8 ldrh r0, [r4, #0x1e] - bl sub_081D0F70 + bl MatchCall_GetRematchTableIdx adds r1, r0, #0 cmp r1, #0x4e bne _081CA7AA @@ -939353,13 +939353,13 @@ _081CA7B6: bx r1 .align 2, 0 _081CA7BC: .4byte gUnknown_85F39B4 - thumb_func_end sub_081CA77C + thumb_func_end GroundEffect_DeepSandTracks thumb_func_start sub_081CA7C0 sub_081CA7C0: @ 0x081CA7C0 push {lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -939371,7 +939371,7 @@ sub_081CA7D0: @ 0x081CA7D0 push {r4, lr} adds r4, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 ldrh r0, [r1, #2] cmp r0, r4 @@ -939389,8 +939389,8 @@ _081CA7EC: .align 2, 0 thumb_func_end sub_081CA7D0 - thumb_func_start sub_081CA7F4 -sub_081CA7F4: @ 0x081CA7F4 + thumb_func_start DoHitAnimHealthboxEffect +DoHitAnimHealthboxEffect: @ 0x081CA7F4 push {r4, r5, lr} sub sp, #8 adds r4, r0, #0 @@ -939403,7 +939403,7 @@ sub_081CA7F4: @ 0x081CA7F4 cmp r0, #0 bne _081CA834 ldrh r0, [r4, #2] - bl sub_081D0CD8 + bl GetTrainerIdxByRematchIdx lsls r0, r0, #5 ldr r1, _081CA82C adds r0, r0, r1 @@ -939447,7 +939447,7 @@ _081CA864: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081CA7F4 + thumb_func_end DoHitAnimHealthboxEffect thumb_func_start sub_081CA86C sub_081CA86C: @ 0x081CA86C @@ -939471,7 +939471,7 @@ sub_081CA888: @ 0x081CA888 push {r4, r5, r6, r7, lr} adds r5, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r7, r0, #0 movs r6, #1 adds r5, #1 @@ -939512,7 +939512,7 @@ sub_081CA8CC: @ 0x081CA8CC push {r4, r5, r6, lr} adds r5, r0, #0 movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 movs r6, #1 rsbs r6, r6, #0 @@ -939548,8 +939548,8 @@ _081CA908: .align 2, 0 thumb_func_end sub_081CA8CC - thumb_func_start sub_081CA910 -sub_081CA910: @ 0x081CA910 + thumb_func_start unref_sub_81CB16C +unref_sub_81CB16C: @ 0x081CA910 push {r4, lr} movs r4, #0 _081CA914: @@ -939572,11 +939572,11 @@ _081CA92E: movs r4, #0 _081CA936: adds r0, r4, #0 - bl sub_081D0D10 + bl MatchCallFlagGetByIndex cmp r0, #0 beq _081CA964 adds r0, r4, #0 - bl sub_081D0F70 + bl MatchCall_GetRematchTableIdx ldr r1, _081CA95C ldr r1, [r1] ldr r2, _081CA960 @@ -939601,15 +939601,15 @@ _081CA96C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081CA910 + thumb_func_end unref_sub_81CB16C thumb_func_start sub_081CA974 sub_081CA974: @ 0x081CA974 push {r4, lr} movs r0, #5 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall adds r1, r0, #0 lsls r0, r1, #2 adds r4, r4, r0 @@ -939678,7 +939678,7 @@ sub_081CAA04: @ 0x081CAA04 push {r4, lr} ldr r1, _081CAA2C movs r0, #6 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CAA38 @@ -939686,7 +939686,7 @@ sub_081CAA04: @ 0x081CAA04 strb r0, [r4, #0x19] ldr r0, _081CAA30 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081CAA34 str r0, [r4] @@ -939709,14 +939709,14 @@ sub_081CAA40: @ 0x081CAA40 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081CAA68 lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5, #4] ldr r0, _081CAA6C str r0, [r5] @@ -939732,7 +939732,7 @@ _081CAA6C: .4byte sub_081CAAB4 sub_081CAA70: @ 0x081CAA70 push {lr} movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -939748,18 +939748,18 @@ sub_081CAA80: @ 0x081CAA80 sub_081CAA84: @ 0x081CAA84 push {r4, lr} movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081CBA08 bl sub_081CB38C ldrb r0, [r4, #0x12] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0x10] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0x14] - bl sub_08003444 + bl RemoveWindow movs r0, #6 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 @@ -939769,9 +939769,9 @@ sub_081CAA84: @ 0x081CAA84 sub_081CAAB4: @ 0x081CAAB4 push {lr} movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -939783,7 +939783,7 @@ sub_081CAAC8: @ 0x081CAAC8 sub sp, #8 adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #7 bls _081CAADC @@ -939808,37 +939808,37 @@ _081CAAEC: @ jump table _081CAB0C: ldr r0, _081CAB64 movs r1, #3 - bl sub_081C7314 + bl InitBgTemplates movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r1, _081CAB68 movs r0, #0 str r0, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _081CAB6C adds r1, r5, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081CAB70 movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _081CAB74 movs r1, #0x20 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #2 b _081CABBC .align 2, 0 @@ -939848,7 +939848,7 @@ _081CAB6C: .4byte 0x00001024 _081CAB70: .4byte gUnknown_85F3F74 _081CAB74: .4byte gUnknown_85F3EB0 _081CAB78: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _081CAB84 @@ -939862,7 +939862,7 @@ _081CAB84: adds r1, r5, #0 adds r1, #0x24 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer movs r1, #0x80 lsls r1, r1, #5 movs r0, #0x20 @@ -939876,16 +939876,16 @@ _081CAB84: ldr r0, _081CABC4 movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #1 _081CABBC: - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 b _081CACAA .align 2, 0 _081CABC4: .4byte gUnknown_85F4080 _081CABC8: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -939897,15 +939897,15 @@ _081CABC8: movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _081CAC04 movs r1, #0x30 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow ldr r0, _081CAC08 movs r1, #0x50 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #0 b _081CACAA .align 2, 0 @@ -939913,7 +939913,7 @@ _081CAC00: .4byte gUnknown_85F4100 _081CAC04: .4byte gUnknown_85F40A0 _081CAC08: .4byte gUnknown_85F40C0 _081CAC0C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CAC9E @@ -939943,20 +939943,20 @@ _081CAC4A: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg bl sub_081CB968 movs r0, #3 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex movs r0, #3 movs r1, #1 movs r2, #0 @@ -939993,7 +939993,7 @@ sub_081CACB4: @ 0x081CACB4 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CACF4 @@ -940023,7 +940023,7 @@ _081CACF0: movs r0, #7 b _081CAD18 _081CACF4: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CAD12 _081CACFC: @@ -940034,7 +940034,7 @@ _081CAD04: movs r0, #0 b _081CAD18 _081CAD08: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CAD16 @@ -940055,7 +940055,7 @@ sub_081CAD20: @ 0x081CAD20 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CAD60 @@ -940085,7 +940085,7 @@ _081CAD5C: movs r0, #7 b _081CAD84 _081CAD60: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CAD7E _081CAD68: @@ -940096,7 +940096,7 @@ _081CAD70: movs r0, #0 b _081CAD84 _081CAD74: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CAD82 @@ -940117,7 +940117,7 @@ sub_081CAD8C: @ 0x081CAD8C push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CADCC @@ -940147,7 +940147,7 @@ _081CADC8: movs r0, #7 b _081CADF0 _081CADCC: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CADEA _081CADD4: @@ -940158,7 +940158,7 @@ _081CADDC: movs r0, #0 b _081CADF0 _081CADE0: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CADEE @@ -940174,12 +940174,12 @@ _081CADF0: .align 2, 0 thumb_func_end sub_081CAD8C - thumb_func_start sub_081CADF8 -sub_081CADF8: @ 0x081CADF8 + thumb_func_start DestroyFog1Sprites +DestroyFog1Sprites: @ 0x081CADF8 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CAE38 @@ -940209,7 +940209,7 @@ _081CAE34: movs r0, #7 b _081CAE5C _081CAE38: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CAE56 _081CAE40: @@ -940220,7 +940220,7 @@ _081CAE48: movs r0, #0 b _081CAE5C _081CAE4C: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CAE5A @@ -940234,14 +940234,14 @@ _081CAE5C: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081CADF8 + thumb_func_end DestroyFog1Sprites thumb_func_start sub_081CAE64 sub_081CAE64: @ 0x081CAE64 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #0 beq _081CAE7A @@ -940279,7 +940279,7 @@ sub_081CAEA8: @ 0x081CAEA8 movs r0, #5 bl sub_080A306C movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081CA7C0 adds r1, r0, #0 @@ -940298,7 +940298,7 @@ sub_081CAED0: @ 0x081CAED0 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #0 beq _081CAEE6 @@ -940335,7 +940335,7 @@ sub_081CAF14: @ 0x081CAF14 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CAF48 @@ -940352,14 +940352,14 @@ _081CAF2E: b _081CAF8E _081CAF38: movs r0, #1 - bl sub_081C88FC + bl ToggleMatchCallVerticalArrows adds r0, r5, #0 bl sub_081CB7A4 movs r0, #0 b _081CAF90 _081CAF48: adds r0, r5, #0 - bl sub_081CB81C + bl OpponentHandlePaletteFade adds r4, r0, #0 cmp r4, #0 bne _081CAF8A @@ -940403,7 +940403,7 @@ sub_081CAF98: @ 0x081CAF98 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CAFD2 @@ -940422,14 +940422,14 @@ _081CAFB8: adds r0, r5, #0 bl sub_081CB7E8 movs r0, #1 - bl sub_081C88FC + bl ToggleMatchCallVerticalArrows movs r0, #1 strb r0, [r5, #0xe] movs r0, #0 b _081CAFF6 _081CAFD2: adds r0, r5, #0 - bl sub_081CB81C + bl OpponentHandlePaletteFade cmp r0, #0 bne _081CAFF0 adds r0, r5, #0 @@ -940457,7 +940457,7 @@ sub_081CAFFC: @ 0x081CAFFC push {r4, r5, r6, lr} adds r5, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r6, #0 cmp r5, #6 @@ -940525,13 +940525,13 @@ _081CB080: movs r6, #1 b _081CB0A8 _081CB096: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081CB060 _081CB0A0: movs r0, #0 - bl sub_081C88FC + bl ToggleMatchCallVerticalArrows movs r6, #4 _081CB0A8: adds r0, r6, #0 @@ -940545,7 +940545,7 @@ sub_081CB0B0: @ 0x081CB0B0 push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CB0E8 @@ -940615,7 +940615,7 @@ sub_081CB13C: @ 0x081CB13C push {r4, r5, lr} adds r5, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r5, #4 bhi _081CB1D4 @@ -940633,7 +940633,7 @@ _081CB15C: @ jump table .4byte _081CB1B4 @ case 3 .4byte _081CB1BE @ case 4 _081CB170: - bl sub_081C7F18 + bl GetMatchCallListTopIndex bl sub_081CA888 adds r5, r0, #0 cmp r5, #0 @@ -940691,7 +940691,7 @@ sub_081CB1DC: @ 0x081CB1DC push {r4, r5, lr} adds r4, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CB210 @@ -940727,7 +940727,7 @@ _081CB210: movs r0, #0 b _081CB242 _081CB232: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CB240 @@ -940747,7 +940747,7 @@ sub_081CB248: @ 0x081CB248 push {r4, r5, lr} adds r5, r0, #0 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r5, #4 bhi _081CB2E0 @@ -940765,7 +940765,7 @@ _081CB268: @ jump table .4byte _081CB2C0 @ case 3 .4byte _081CB2CA @ case 4 _081CB27C: - bl sub_081C7F18 + bl GetMatchCallListTopIndex bl sub_081CA8CC adds r5, r0, #0 cmp r5, #0 @@ -940840,7 +940840,7 @@ _081CB30E: bl sub_081C72F4 cmp r0, #0 bne _081CB31E - bl sub_081C7080 + bl MainMenuLoopedTaskIsBusy cmp r0, #0 beq _081CB322 _081CB31E: @@ -940888,12 +940888,12 @@ sub_081CB32C: @ 0x081CB32C bl sub_081C797C ldr r0, _081CB388 movs r1, #7 - bl sub_080A8878 + bl CreateTask add sp, #0x18 pop {r0} bx r0 .align 2, 0 -_081CB37C: .4byte sub_081CA7F4 +_081CB37C: .4byte DoHitAnimHealthboxEffect _081CB380: .4byte sub_081CB45C _081CB384: .4byte gUnknown_85F4134 _081CB388: .4byte sub_081CB3D4 @@ -940904,10 +940904,10 @@ sub_081CB38C: @ 0x081CB38C push {lr} bl sub_081C79DC ldr r0, _081CB3A4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask pop {r0} bx r0 .align 2, 0 @@ -940919,7 +940919,7 @@ sub_081CB3A8: @ 0x081CB3A8 push {r4, lr} adds r4, r0, #0 ldr r0, _081CB3CC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r2, r0, #0x18 cmp r2, #0xff @@ -941012,10 +941012,10 @@ sub_081CB45C: @ 0x081CB45C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08002194 + bl GetBgTilemapBuffer adds r6, r0, #0 lsls r4, r4, #7 adds r4, #0x3a @@ -941058,10 +941058,10 @@ sub_081CB4B8: @ 0x081CB4B8 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 - bl sub_0800401C + bl GetWindowAttribute lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_08002194 + bl GetBgTilemapBuffer lsls r4, r4, #7 adds r4, #0x3a adds r0, r0, r4 @@ -941082,24 +941082,24 @@ sub_081CB4E8: @ 0x081CB4E8 push {r4, lr} adds r4, r0, #0 ldr r0, _081CB528 - bl sub_08003250 + bl AddWindow strh r0, [r4, #0x10] ldr r0, _081CB52C - bl sub_08003250 + bl AddWindow strh r0, [r4, #0x12] ldrb r0, [r4, #0x10] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #0x10] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #0x12] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #0x12] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #0x10] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -941114,7 +941114,7 @@ sub_081CB530: @ 0x081CB530 adds r4, r0, #0 ldrb r0, [r4, #0x12] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrh r0, [r4, #0x12] bl sub_081CB564 ldrh r0, [r4, #0x12] @@ -941125,7 +941125,7 @@ sub_081CB530: @ 0x081CB530 bl sub_081CB5C0 ldrb r0, [r4, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -941190,7 +941190,7 @@ sub_081CB5C0: @ 0x081CB5C0 lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #9 - bl sub_08084180 + bl GetGameStat adds r1, r0, #0 ldr r0, _081CB5F4 cmp r1, r0 @@ -941257,7 +941257,7 @@ sub_081CB640: @ 0x081CB640 sub sp, #0x1c adds r5, r0, #0 adds r4, r1, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall adds r0, r0, r4 bl sub_081CA650 lsls r0, r0, #0x10 @@ -941266,7 +941266,7 @@ sub_081CB640: @ 0x081CB640 beq _081CB664 add r0, sp, #0xc movs r2, #0 - bl sub_08124578 + bl GetMapName b _081CB66C _081CB664: ldr r1, _081CB6A8 @@ -941282,7 +941282,7 @@ _081CB66C: subs r4, r4, r0 ldrb r0, [r5, #0x10] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #0x10] lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -941310,7 +941310,7 @@ sub_081CB6AC: @ 0x081CB6AC adds r5, r0, #0 ldrb r0, [r5, #0x12] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer movs r4, #0 movs r6, #0x80 lsls r6, r6, #0x12 @@ -941346,7 +941346,7 @@ _081CB6E8: _081CB6FA: ldrb r0, [r5, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -941359,7 +941359,7 @@ _081CB70C: .4byte gUnknown_85F4188 sub_081CB710: @ 0x081CB710 push {r4, lr} adds r4, r0, #0 - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CB722 @@ -941395,7 +941395,7 @@ sub_081CB73C: @ 0x081CB73C thumb_func_start sub_081CB750 sub_081CB750: @ 0x081CB750 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -941410,10 +941410,10 @@ sub_081CB760: @ 0x081CB760 bl sub_081CBA84 ldrb r0, [r4, #0x12] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #0x12] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -941425,7 +941425,7 @@ sub_081CB780: @ 0x081CB780 push {r4, lr} adds r4, r0, #0 ldr r0, _081CB7A0 - bl sub_08003250 + bl AddWindow strh r0, [r4, #0x14] ldrh r0, [r4, #0x14] movs r1, #1 @@ -941453,13 +941453,13 @@ sub_081CB7A4: @ 0x081CB7A4 bl sub_08196DB8 ldrb r0, [r4, #0x14] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #0x14] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #0x14] movs r1, #3 - bl sub_08003528 - bl sub_081C748C + bl CopyWindowToVram + bl PauseSpinningPokenavSprite movs r2, #0 movs r1, #0x18 strh r1, [r0, #0x20] @@ -941482,30 +941482,30 @@ sub_081CB7E8: @ 0x081CB7E8 ldrb r0, [r4, #0x14] movs r1, #1 movs r2, #4 - bl sub_080981E0 + bl DrawTextBorderOuter ldrb r0, [r4, #0x14] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r4, #0x14] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #0x14] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 thumb_func_end sub_081CB7E8 - thumb_func_start sub_081CB81C -sub_081CB81C: @ 0x081CB81C + thumb_func_start OpponentHandlePaletteFade +OpponentHandlePaletteFade: @ 0x081CB81C push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081CB81C + thumb_func_end OpponentHandlePaletteFade thumb_func_start sub_081CB82C sub_081CB82C: @ 0x081CB82C @@ -941584,7 +941584,7 @@ sub_081CB8AC: @ 0x081CB8AC push {r4, r5, lr} sub sp, #0xc adds r4, r0, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall adds r1, r4, #0 adds r1, #0xf bl sub_081CA71C @@ -941663,7 +941663,7 @@ sub_081CB930: @ 0x081CB930 movs r3, #0 bl FillBgTilemapBufferRect_Palette0 movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram add sp, #8 pop {r0} bx r0 @@ -941672,7 +941672,7 @@ sub_081CB930: @ 0x081CB930 thumb_func_start sub_081CB958 sub_081CB958: @ 0x081CB958 push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -941685,19 +941685,19 @@ sub_081CB968: @ 0x081CB968 push {r4, r5, r6, lr} sub sp, #8 movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 movs r5, #0 ldr r4, _081CB9EC _081CB978: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #0 beq _081CB978 ldr r0, _081CB9F0 - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes movs r0, #0 str r0, [r6, #0x1c] ldr r1, _081CB9F4 @@ -941716,7 +941716,7 @@ _081CB978: orrs r0, r1 str r0, [sp, #4] mov r0, sp - bl sub_08008210 + bl LoadSpriteSheet ldr r2, _081CBA00 adds r1, r6, r2 lsls r0, r0, #0x10 @@ -941757,7 +941757,7 @@ _081CBA04: .4byte 0x06010000 sub_081CBA08: @ 0x081CBA08 push {r4, lr} movs r0, #6 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r0, [r4, #0x1c] cmp r0, #0 @@ -941794,7 +941794,7 @@ sub_081CBA44: @ 0x081CBA44 movs r1, #8 movs r2, #0x50 movs r3, #5 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -941866,7 +941866,7 @@ sub_081CBAC4: @ 0x081CBAC4 movs r1, #0x2c movs r2, #0x68 movs r3, #6 - bl sub_08006B0C + bl CreateSprite adds r1, r0, #0 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 @@ -941886,7 +941886,7 @@ _081CBAEC: .4byte gUnknown_20205AC sub_081CBAF0: @ 0x081CBAF0 push {r4, r5, r6, r7, lr} adds r7, r0, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall bl sub_081CA6B0 cmp r0, #0 blt _081CBB54 @@ -941897,7 +941897,7 @@ sub_081CBAF0: @ 0x081CBAF0 adds r5, r7, r1 adds r1, r5, #0 movs r2, #0 - bl sub_08034448 + bl DecompressPicFromTable ldr r0, _081CBB64 adds r4, r4, r0 ldr r0, [r4] @@ -941919,7 +941919,7 @@ sub_081CBAF0: @ 0x081CBAF0 ldrh r1, [r7, #0x1a] adds r0, r6, #0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r1, [r7, #0x20] movs r0, #0 strh r0, [r1, #0x2e] @@ -942053,13 +942053,13 @@ sub_081CBC28: @ 0x081CBC28 push {r4, lr} movs r0, #3 movs r1, #0x14 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CBC44 ldr r1, _081CBC48 movs r0, #0x10 - bl sub_081C6DDC + bl AllocSubstruct cmp r0, #0 bne _081CBC4C _081CBC44: @@ -942108,9 +942108,9 @@ sub_081CBC78: @ 0x081CBC78 orrs r0, r1 strb r0, [r3, #0x15] movs r0, #0x10 - bl sub_081C6E10 + bl FreePokenavSubstruct movs r0, #3 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 .align 2, 0 @@ -942121,7 +942121,7 @@ _081CBCA4: .4byte gUnknown_3005AF0 sub_081CBCA8: @ 0x081CBCA8 push {lr} movs r0, #3 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #0x10] bl _call_via_r1 pop {r1} @@ -942212,7 +942212,7 @@ _081CBD34: .4byte 0x000186A1 sub_081CBD38: @ 0x081CBD38 push {lr} movs r0, #3 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0xc] pop {r1} bx r1 @@ -942224,13 +942224,13 @@ sub_081CBD48: @ 0x081CBD48 push {r4, lr} ldr r1, _081CBD6C movs r0, #4 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CBD78 ldr r0, _081CBD70 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081CBD74 str r0, [r4] @@ -942253,14 +942253,14 @@ sub_081CBD80: @ 0x081CBD80 push {r4, r5, lr} adds r4, r0, #0 movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081CBDA8 lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5, #4] ldr r0, _081CBDAC str r0, [r5] @@ -942272,15 +942272,15 @@ _081CBDA8: .4byte gUnknown_85F4D08 _081CBDAC: .4byte sub_081CBE10 thumb_func_end sub_081CBD80 - thumb_func_start sub_081CBDB0 -sub_081CBDB0: @ 0x081CBDB0 + thumb_func_start PlayerHandleOneReturnValue +PlayerHandleOneReturnValue: @ 0x081CBDB0 push {lr} movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} - thumb_func_end sub_081CBDB0 + thumb_func_end PlayerHandleOneReturnValue thumb_func_start sub_081CBDC0 sub_081CBDC0: @ 0x081CBDC0 @@ -942288,35 +942288,35 @@ sub_081CBDC0: @ 0x081CBDC0 .align 2, 0 thumb_func_end sub_081CBDC0 - thumb_func_start sub_081CBDC4 -sub_081CBDC4: @ 0x081CBDC4 + thumb_func_start Cb_PlaceMon +Cb_PlaceMon: @ 0x081CBDC4 push {r4, lr} movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 - bl sub_08123068 + bl FreeRegionMapIconResources bl sub_081CC140 ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0x10 - bl sub_081C6E10 + bl FreePokenavSubstruct movs r0, #4 - bl sub_081C6E10 - bl sub_081C6DCC + bl FreePokenavSubstruct + bl SetPokenavVBlankCallback movs r0, #0 - bl sub_0800194C + bl SetBgMode pop {r4} pop {r0} bx r0 - thumb_func_end sub_081CBDC4 + thumb_func_end Cb_PlaceMon thumb_func_start sub_081CBDF8 sub_081CBDF8: @ 0x081CBDF8 push {lr} bl TransferPlttBuffer - bl sub_08006EA0 - bl sub_08007144 - bl sub_081237C0 + bl LoadOam + bl ProcessSpriteCopyRequests + bl UpdateRegionMapVideoRegs pop {r0} bx r0 .align 2, 0 @@ -942326,9 +942326,9 @@ sub_081CBDF8: @ 0x081CBDF8 sub_081CBE10: @ 0x081CBE10 push {lr} movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -942362,7 +942362,7 @@ sub_081CBE48: @ 0x081CBE48 push {r4, r5, lr} adds r4, r0, #0 movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #7 bls _081CBE5A @@ -942388,19 +942388,19 @@ _081CBE88: movs r0, #0 bl sub_081C6DC0 movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #1 - bl sub_0800194C + bl SetBgMode ldr r4, _081CBED4 adds r0, r4, #0 movs r1, #2 - bl sub_081C7314 + bl InitBgTemplates movs r0, #0x10 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 adds r4, #4 bl sub_081CBE24 @@ -942410,7 +942410,7 @@ _081CBE88: adds r0, r5, #0 adds r1, r4, #0 bl sub_08122D04 - bl sub_081CC114 + bl InitMoveRelearnerWindows _081CBED0: movs r0, #0 b _081CBF94 @@ -942426,10 +942426,10 @@ _081CBED8: bne _081CBF00 movs r0, #4 movs r1, #9 - bl sub_08124294 + bl CreateRegionMapPlayerIcon movs r0, #5 movs r1, #0xa - bl sub_081240E0 + bl CreateRegionMapCursor bl sub_08124558 b _081CBED0 _081CBF00: @@ -942463,9 +942463,9 @@ _081CBF36: cmp r0, #0 bne _081CBF8E movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg ldr r0, _081CBF54 bl sub_081C6DC0 b _081CBED0 @@ -942480,7 +942480,7 @@ _081CBF58: movs r4, #4 _081CBF66: adds r0, r4, #0 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex adds r0, r4, #0 movs r1, #1 movs r2, #1 @@ -942512,7 +942512,7 @@ sub_081CBF9C: @ 0x081CBF9C push {r4, lr} adds r4, r0, #0 movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr cmp r4, #0 beq _081CBFB0 cmp r4, #1 @@ -942593,7 +942593,7 @@ sub_081CC02C: @ 0x081CC02C push {r4, r5, lr} adds r4, r0, #0 movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CC060 @@ -942686,7 +942686,7 @@ _081CC0D6: movs r0, #0 b _081CC10E _081CC0EA: - bl sub_081C7080 + bl MainMenuLoopedTaskIsBusy cmp r0, #0 beq _081CC0F6 _081CC0F2: @@ -942694,11 +942694,11 @@ _081CC0F2: b _081CC10E _081CC0F6: movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #0 b _081CC10E _081CC10C: @@ -942709,20 +942709,20 @@ _081CC10E: .align 2, 0 thumb_func_end sub_081CC0B0 - thumb_func_start sub_081CC114 -sub_081CC114: @ 0x081CC114 + thumb_func_start InitMoveRelearnerWindows +InitMoveRelearnerWindows: @ 0x081CC114 push {r4, r5, lr} movs r5, #0 ldr r4, _081CC138 _081CC11A: adds r0, r4, #0 - bl sub_08034388 + bl LoadCompressedSpriteSheet adds r4, #8 adds r5, #1 cmp r5, #0 beq _081CC11A ldr r0, _081CC13C - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes bl sub_081CC598 pop {r4, r5} pop {r0} @@ -942730,13 +942730,13 @@ _081CC11A: .align 2, 0 _081CC138: .4byte gUnknown_85F4D1C _081CC13C: .4byte gUnknown_85F4D24 - thumb_func_end sub_081CC114 + thumb_func_end InitMoveRelearnerWindows thumb_func_start sub_081CC140 sub_081CC140: @ 0x081CC140 push {r4, r5, lr} movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r0, #6 bl FreeSpriteTilesByTag @@ -942785,9 +942785,9 @@ sub_081CC170: @ 0x081CC170 bl CpuSet movs r0, #1 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r0, _081CC220 - bl sub_08003250 + bl AddWindow movs r4, #0 strh r0, [r5, #8] lsls r0, r0, #0x18 @@ -942798,29 +942798,29 @@ sub_081CC170: @ 0x081CC170 ldrb r0, [r5, #8] movs r1, #0x42 movs r2, #4 - bl sub_080981E0 + bl DrawTextBorderOuter ldr r1, _081CC224 str r4, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldrb r0, [r5, #8] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #8] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r5, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _081CC228 movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow ldr r0, _081CC22C movs r1, #0x30 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow bl sub_08124664 lsls r0, r0, #0x18 cmp r0, #0 @@ -942828,7 +942828,7 @@ sub_081CC170: @ 0x081CC170 ldr r1, _081CC230 movs r0, #1 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY b _081CC23E .align 2, 0 _081CC21C: .4byte 0x01000400 @@ -942841,12 +942841,12 @@ _081CC234: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY _081CC23E: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX add sp, #8 pop {r4, r5} pop {r0} @@ -942856,7 +942856,7 @@ _081CC23E: thumb_func_start sub_081CC250 sub_081CC250: @ 0x081CC250 push {lr} - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -942870,7 +942870,7 @@ sub_081CC260: @ 0x081CC260 sub sp, #0xc adds r5, r0, #0 movs r0, #0x10 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 ldrb r0, [r6, #2] cmp r0, #4 @@ -942897,7 +942897,7 @@ _081CC298: movs r1, #0 movs r2, #0 movs r3, #0xc - bl sub_080037C4 + bl PutWindowRectTilemap ldrb r0, [r5, #8] adds r2, r6, #4 str r4, [sp] @@ -942914,7 +942914,7 @@ _081CC298: bl sub_081CC4B0 ldrb r0, [r5, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #0 bl sub_081CC6E4 b _081CC380 @@ -942925,7 +942925,7 @@ _081CC2D8: movs r1, #0 movs r2, #0 movs r3, #0xc - bl sub_080037C4 + bl PutWindowRectTilemap ldrb r0, [r5, #8] adds r2, r6, #4 str r4, [sp] @@ -942953,9 +942953,9 @@ _081CC318: .4byte 0x00001041 _081CC31C: ldrb r0, [r5, #8] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #8] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r5, #8] adds r2, r6, #4 movs r1, #2 @@ -942974,7 +942974,7 @@ _081CC31C: _081CC34C: ldrb r0, [r5, #8] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 bl sub_081CC6E4 b _081CC380 @@ -942991,7 +942991,7 @@ _081CC35C: movs r3, #4 bl FillBgTilemapBufferRect movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #1 bl sub_081CC6E4 _081CC380: @@ -943006,7 +943006,7 @@ _081CC388: .4byte 0x00001041 thumb_func_start sub_081CC38C sub_081CC38C: @ 0x081CC38C push {lr} - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -943020,7 +943020,7 @@ sub_081CC39C: @ 0x081CC39C adds r4, r0, #0 ldr r0, _081CC3C0 movs r1, #3 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r2, _081CC3C4 @@ -943041,7 +943041,7 @@ _081CC3C4: .4byte gUnknown_3005B60 sub_081CC3C8: @ 0x081CC3C8 push {lr} ldr r0, _081CC3D8 - bl sub_080A8AAC + bl FuncIsActiveTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r1} @@ -943069,15 +943069,15 @@ sub_081CC3DC: @ 0x081CC3DC lsls r1, r1, #3 movs r0, #1 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY cmp r0, #0 blt _081CC416 movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY adds r0, r4, #0 - bl sub_080A8964 + bl DestroyTask _081CC416: bl sub_081CC6B8 b _081CC444 @@ -943088,15 +943088,15 @@ _081CC420: lsls r1, r1, #3 movs r0, #1 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY ldr r1, _081CC44C cmp r0, r1 bgt _081CC440 movs r0, #1 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081CC440: bl sub_081CC6B8 _081CC444: @@ -943112,7 +943112,7 @@ sub_081CC450: @ 0x081CC450 push {lr} ldr r0, _081CC460 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask pop {r0} bx r0 .align 2, 0 @@ -943123,7 +943123,7 @@ _081CC460: .4byte sub_081CC474 sub_081CC464: @ 0x081CC464 push {lr} ldr r0, _081CC470 - bl sub_081C68E4 + bl FuncIsActiveLoopedTask pop {r1} bx r1 .align 2, 0 @@ -943135,7 +943135,7 @@ sub_081CC474: @ 0x081CC474 push {r4, lr} adds r4, r0, #0 movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r2, r0, #0 cmp r4, #0x15 ble _081CC488 @@ -943271,7 +943271,7 @@ _081CC574: mov r1, r8 lsrs r0, r1, #0x18 lsrs r1, r7, #0x18 - bl sub_08145DB4 + bl GetLandmarkName adds r1, r0, #0 cmp r1, #0 bne _081CC548 @@ -943291,7 +943291,7 @@ sub_081CC598: @ 0x081CC598 mov r7, r8 push {r7} movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_08124664 lsls r0, r0, #0x18 @@ -943311,7 +943311,7 @@ _081CC5C0: ldr r0, _081CC624 asrs r2, r7, #0x10 movs r3, #8 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r2, r0, #4 @@ -943443,10 +943443,10 @@ _081CC6B0: sub_081CC6B8: @ 0x081CC6B8 push {r4, lr} movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r0, #1 - bl sub_08001FD0 + bl GetBgY asrs r0, r0, #8 movs r1, #0x84 subs r1, r1, r0 @@ -943469,7 +943469,7 @@ sub_081CC6E4: @ 0x081CC6E4 push {r4, r5, r6, lr} adds r4, r0, #0 movs r0, #4 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #1 ands r4, r1 lsls r5, r4, #2 @@ -943499,7 +943499,7 @@ sub_081CC718: @ 0x081CC718 push {r4, lr} ldr r1, _081CC748 movs r0, #0xb - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CC75C @@ -943535,7 +943535,7 @@ sub_081CC764: @ 0x081CC764 push {r4, lr} ldr r1, _081CC794 movs r0, #0xb - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CC7A8 @@ -943570,7 +943570,7 @@ _081CC7AA: sub_081CC7B0: @ 0x081CC7B0 push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr ldr r2, _081CC7C8 adds r1, r0, r2 ldr r1, [r1] @@ -943586,7 +943586,7 @@ sub_081CC7CC: @ 0x081CC7CC push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 adds r0, r4, #0 bl sub_081CC924 @@ -943666,7 +943666,7 @@ sub_081CC850: @ 0x081CC850 adds r1, r4, r1 strb r0, [r1] movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r1, [r0, #2] lsls r1, r1, #2 adds r0, r0, r1 @@ -943686,7 +943686,7 @@ sub_081CC850: @ 0x081CC850 adds r0, r0, r1 movs r1, #8 mov r2, sp - bl sub_0806A774 + bl SetMonData b _081CC8C0 .align 2, 0 _081CC8A8: .4byte 0x00006786 @@ -943697,7 +943697,7 @@ _081CC8B4: adds r1, r3, #0 movs r2, #8 mov r3, sp - bl sub_080D1614 + bl SetBoxMonDataAt _081CC8C0: ldr r0, _081CC8D4 adds r1, r6, r0 @@ -943741,7 +943741,7 @@ _081CC8FC: .4byte 0x000186A2 sub_081CC900: @ 0x081CC900 push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0xc6 lsls r1, r1, #7 adds r0, r0, r1 @@ -943749,10 +943749,10 @@ sub_081CC900: @ 0x081CC900 cmp r0, #0 bne _081CC91A movs r0, #0x12 - bl sub_081C6E10 + bl FreePokenavSubstruct _081CC91A: movs r0, #0xb - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 thumb_func_end sub_081CC900 @@ -943762,7 +943762,7 @@ sub_081CC924: @ 0x081CC924 push {r4, lr} adds r4, r0, #0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r2, r0, #0 movs r3, #0 ldr r0, _081CC95C @@ -943828,10 +943828,10 @@ sub_081CC998: @ 0x081CC998 lsrs r0, r0, #0x18 mov r8, r0 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 mov r0, r8 cmp r0, #0 @@ -944011,10 +944011,10 @@ _081CCAFA: sub_081CCB04: @ 0x081CCB04 push {r4, lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r2, r0, #0 ldr r1, _081CCB2C adds r0, r4, r1 @@ -944206,7 +944206,7 @@ sub_081CCC88: @ 0x081CCC88 lsrs r4, r0, #0x18 adds r5, r4, #0 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 cmp r4, #1 beq _081CCCC8 @@ -944333,7 +944333,7 @@ sub_081CCD64: @ 0x081CCD64 lsrs r2, r2, #0x18 mov sl, r2 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr lsls r4, r4, #2 adds r0, r0, r4 ldrb r4, [r0, #4] @@ -944359,7 +944359,7 @@ sub_081CCD64: @ 0x081CCD64 adds r1, r6, #0 movs r2, #0x2d movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData cmp r0, #0 beq _081CCDD0 ldr r1, _081CCDCC @@ -944375,14 +944375,14 @@ _081CCDD0: adds r1, r6, #0 movs r2, #2 adds r3, r5, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r0, r5, #0 - bl sub_0800885C + bl StringGetEnd10 adds r0, r4, #0 adds r1, r6, #0 movs r2, #0xb movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 cmp r4, #0xe @@ -944394,12 +944394,12 @@ _081CCDD0: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r6, r0, #0x18 b _081CCE3E @@ -944408,9 +944408,9 @@ _081CCE1C: .4byte gUnknown_2024190 _081CCE20: mov r0, r8 mov r1, sb - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r4, #0 @@ -944602,10 +944602,10 @@ sub_081CCF84: @ 0x081CCF84 lsls r1, r1, #0x18 lsrs r6, r1, #0x18 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r7, r0, #0 mov r1, r8 lsls r0, r1, #0x10 @@ -944757,11 +944757,11 @@ _081CD0CC: .4byte 0x00006320 sub_081CD0D0: @ 0x081CD0D0 push {r4, r5, r6, r7, lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r7, r0, #0 ldr r1, _081CD0F4 movs r0, #0x12 - bl sub_081C6DDC + bl AllocSubstruct adds r6, r0, #0 movs r0, #0xc6 lsls r0, r0, #7 @@ -944779,7 +944779,7 @@ _081CD0F8: ldr r1, _081CD150 adds r0, r0, r1 movs r1, #0x2d - bl sub_0806A058 + bl GetMonData adds r2, r0, #0 cmp r2, #0 bne _081CD11E @@ -944827,7 +944827,7 @@ _081CD154: .4byte 0x0000678A sub_081CD158: @ 0x081CD158 push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0xc6 lsls r1, r1, #7 adds r2, r0, r1 @@ -944855,10 +944855,10 @@ sub_081CD17C: @ 0x081CD17C lsrs r1, r1, #0x18 mov sb, r1 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr mov r8, r0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 lsls r0, r6, #0x10 asrs r5, r0, #0x10 @@ -944884,7 +944884,7 @@ _081CD1BA: adds r1, r7, #0 movs r2, #0x16 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r1, sb lsls r5, r1, #2 adds r4, r5, r1 @@ -944896,7 +944896,7 @@ _081CD1BA: adds r1, r7, #0 movs r2, #0x2f movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData ldr r1, _081CD260 add r1, r8 adds r1, r1, r4 @@ -944905,7 +944905,7 @@ _081CD1BA: adds r1, r7, #0 movs r2, #0x21 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData ldr r1, _081CD264 add r1, r8 adds r1, r1, r4 @@ -944914,7 +944914,7 @@ _081CD1BA: adds r1, r7, #0 movs r2, #0x18 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData ldr r1, _081CD268 add r1, r8 adds r1, r1, r4 @@ -944923,7 +944923,7 @@ _081CD1BA: adds r1, r7, #0 movs r2, #0x17 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData ldr r1, _081CD26C add r1, r8 adds r1, r1, r4 @@ -944937,14 +944937,14 @@ _081CD1BA: adds r1, r7, #0 movs r2, #0x30 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData cmp r0, #0xff beq _081CD270 adds r0, r6, #0 adds r1, r7, #0 movs r2, #0x30 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData movs r1, #0x1d bl __udivsi3 b _081CD272 @@ -944962,7 +944962,7 @@ _081CD272: adds r1, r7, #0 movs r2, #8 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData ldr r1, _081CD2A0 add r1, r8 add r1, sb @@ -945037,10 +945037,10 @@ sub_081CD2F8: @ 0x081CD2F8 lsrs r1, r1, #0x18 mov sb, r1 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r7, r0, #0 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 lsls r0, r6, #0x10 asrs r5, r0, #0x10 @@ -945064,7 +945064,7 @@ _081CD330: adds r1, r6, #0 movs r2, #0x41 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -945072,13 +945072,13 @@ _081CD330: adds r1, r6, #0 movs r2, #1 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r8, r0 adds r0, r5, #0 adds r1, r6, #0 movs r2, #0 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r5, r0, #0 lsls r0, r4, #3 ldr r1, _081CD3AC @@ -945097,7 +945097,7 @@ _081CD330: adds r0, r4, #0 mov r1, r8 adds r2, r5, #0 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality mov r2, sb lsls r1, r2, #7 adds r1, r7, r1 @@ -945118,7 +945118,7 @@ _081CD3AC: .4byte gUnknown_82DDA1C sub_081CD3B0: @ 0x081CD3B0 push {lr} movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -945129,7 +945129,7 @@ sub_081CD3B0: @ 0x081CD3B0 sub_081CD3C0: @ 0x081CD3C0 push {lr} movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0, #2] pop {r1} bx r1 @@ -945140,7 +945140,7 @@ sub_081CD3C0: @ 0x081CD3C0 sub_081CD3D0: @ 0x081CD3D0 push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081CD3E0 adds r0, r0, r1 pop {r1} @@ -945153,7 +945153,7 @@ _081CD3E0: .4byte 0x00006428 sub_081CD3E4: @ 0x081CD3E4 push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081CD3F8 adds r0, r0, r1 ldrb r0, [r0] @@ -945167,7 +945167,7 @@ _081CD3F8: .4byte 0x00006786 sub_081CD3FC: @ 0x081CD3FC push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081CD410 adds r0, r0, r1 ldrb r0, [r0] @@ -945184,7 +945184,7 @@ sub_081CD414: @ 0x081CD414 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr lsls r4, r4, #0xd movs r1, #0xc0 lsls r1, r1, #2 @@ -945203,7 +945203,7 @@ sub_081CD434: @ 0x081CD434 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr lsls r4, r4, #7 adds r0, r0, r4 pop {r4} @@ -945215,7 +945215,7 @@ sub_081CD434: @ 0x081CD434 sub_081CD44C: @ 0x081CD44C push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081CD460 adds r0, r0, r1 ldrb r0, [r0] @@ -945232,7 +945232,7 @@ sub_081CD464: @ 0x081CD464 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr lsls r4, r4, #6 ldr r1, _081CD480 adds r4, r4, r1 @@ -945251,7 +945251,7 @@ sub_081CD484: @ 0x081CD484 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr lsls r1, r4, #1 adds r1, r1, r4 lsls r1, r1, #3 @@ -945269,7 +945269,7 @@ _081CD4A4: .4byte 0x00006320 sub_081CD4A8: @ 0x081CD4A8 push {lr} movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr ldrh r1, [r0, #2] lsls r1, r1, #2 adds r0, r0, r1 @@ -945282,7 +945282,7 @@ sub_081CD4A8: @ 0x081CD4A8 sub_081CD4BC: @ 0x081CD4BC push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0xc6 lsls r1, r1, #7 adds r0, r0, r1 @@ -945303,7 +945303,7 @@ _081CD4D6: sub_081CD4DC: @ 0x081CD4DC push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr adds r2, r0, #0 movs r1, #0xc6 lsls r1, r1, #7 @@ -945333,7 +945333,7 @@ _081CD50C: .4byte 0x00006786 sub_081CD510: @ 0x081CD510 push {lr} movs r0, #0xb - bl sub_081C6DFC + bl GetSubstructPtr ldr r2, _081CD530 adds r1, r0, r2 ldrb r1, [r1] @@ -945354,7 +945354,7 @@ sub_081CD534: @ 0x081CD534 push {r4, lr} ldr r1, _081CD56C movs r0, #0xc - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CD584 @@ -945364,7 +945364,7 @@ sub_081CD534: @ 0x081CD534 strb r0, [r1] ldr r0, _081CD574 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4] ldr r0, _081CD578 adds r1, r4, r0 @@ -945396,14 +945396,14 @@ sub_081CD58C: @ 0x081CD58C push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081CD5B8 lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5] ldr r0, _081CD5BC adds r5, r5, r0 @@ -945422,7 +945422,7 @@ _081CD5C0: .4byte sub_081CD5E0 sub_081CD5C4: @ 0x081CD5C4 push {lr} movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081CD5DC adds r0, r0, r1 ldr r0, [r0] @@ -945441,9 +945441,9 @@ _081CD5DC: .4byte 0x00001810 sub_081CD5E0: @ 0x081CD5E0 push {lr} movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -945455,7 +945455,7 @@ sub_081CD5F4: @ 0x081CD5F4 sub sp, #0xc adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #0x14 bls _081CD608 @@ -945500,31 +945500,31 @@ _081CD676: _081CD678: ldr r0, _081CD6E0 movs r1, #3 - bl sub_081C7314 + bl InitBgTemplates movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #3 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldr r1, _081CD6E4 movs r0, #0 bl SetGpuReg @@ -945546,7 +945546,7 @@ _081CD6E8: .4byte 0x00000844 _081CD6EC: .4byte 0x0000040B _081CD6F0: .4byte gUnknown_85F4E6C _081CD6F4: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #0 @@ -945559,14 +945559,14 @@ _081CD702: _081CD708: movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _081CD710: movs r0, #0 b _081CDA26 .align 2, 0 _081CD714: .4byte gUnknown_85F57EC _081CD718: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _081CD724 @@ -945578,7 +945578,7 @@ _081CD724: bl LZ77UnCompVram movs r0, #3 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer bl sub_081CD4BC cmp r0, #1 bne _081CD752 @@ -945593,15 +945593,15 @@ _081CD724: bl CopyToBgTilemapBufferRect _081CD752: movs r0, #3 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _081CD780 movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow ldr r0, _081CD784 movs r1, #0xf0 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow ldr r0, _081CD788 adds r1, r5, r0 ldr r0, _081CD78C @@ -945615,7 +945615,7 @@ _081CD784: .4byte gUnknown_85F4E4C _081CD788: .4byte 0x00001814 _081CD78C: .4byte 0x0000FFB0 _081CD790: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _081CD79C @@ -945628,13 +945628,13 @@ _081CD79C: bl LZ77UnCompVram movs r0, #2 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #2 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _081CD7D0 movs r1, #0x30 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #2 bl sub_081D1824 b _081CD710 @@ -945663,20 +945663,20 @@ _081CD7D4: bl CpuSet movs r0, #1 adds r1, r4, #0 - bl sub_0800212C + bl SetBgTilemapBuffer b _081CD710 .align 2, 0 _081CD808: .4byte 0x00000804 _081CD80C: .4byte 0x05000200 _081CD810: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 beq _081CD81C b _081CDA20 _081CD81C: ldr r0, _081CD85C - bl sub_08003250 + bl AddWindow movs r2, #0xc1 lsls r2, r2, #5 adds r1, r5, r2 @@ -945685,17 +945685,17 @@ _081CD81C: cmp r0, #1 bne _081CD856 ldr r0, _081CD860 - bl sub_08003250 + bl AddWindow ldr r2, _081CD864 adds r1, r5, r2 strb r0, [r1] ldr r0, _081CD868 - bl sub_08003250 + bl AddWindow ldr r2, _081CD86C adds r1, r5, r2 strb r0, [r1] ldr r0, _081CD870 - bl sub_08003250 + bl AddWindow ldr r2, _081CD874 adds r1, r5, r2 strb r0, [r1] @@ -945750,7 +945750,7 @@ _081CD8B6: movs r0, #2 _081CD8C4: movs r2, #1 - bl sub_081CDEB4 + bl GiveMailToMon b _081CD710 _081CD8CC: bl sub_081CD3E4 @@ -945760,7 +945760,7 @@ _081CD8CC: lsrs r1, r1, #0x10 movs r0, #3 movs r2, #1 - bl sub_081CDEB4 + bl GiveMailToMon cmp r0, #1 beq _081CD8E6 b _081CDA20 @@ -945769,7 +945769,7 @@ _081CD8E6: lsls r1, r1, #5 adds r0, r5, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap bl sub_081CD4BC cmp r0, #1 beq _081CD8FC @@ -945778,15 +945778,15 @@ _081CD8FC: ldr r2, _081CD91C adds r0, r5, r2 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r1, _081CD920 adds r0, r5, r1 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap ldr r2, _081CD924 adds r0, r5, r2 ldrb r0, [r0] - bl sub_0800365C + bl PutWindowTilemap b _081CD710 .align 2, 0 _081CD91C: .4byte 0x00001821 @@ -945794,11 +945794,11 @@ _081CD920: .4byte 0x00001822 _081CD924: .4byte 0x00001823 _081CD928: movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B48 + bl ShowBg bl sub_081CD4BC cmp r0, #1 beq _081CD944 @@ -945816,7 +945816,7 @@ _081CD94C: b _081CD710 _081CD95C: movs r0, #6 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex movs r0, #1 movs r1, #1 movs r2, #0 @@ -945914,7 +945914,7 @@ sub_081CDA30: @ 0x081CDA30 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CDA68 @@ -945966,7 +945966,7 @@ _081CDA9E: bl sub_081C72F4 cmp r0, #0 bne _081CDAAE - bl sub_081C7080 + bl MainMenuLoopedTaskIsBusy cmp r0, #0 beq _081CDAB2 _081CDAAE: @@ -945977,11 +945977,11 @@ _081CDAB2: adds r0, r5, r1 bl sub_081D2B7C movs r0, #1 - bl sub_08001B5C + bl HideBg movs r0, #2 - bl sub_08001B5C + bl HideBg movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #1 b _081CDAD6 .align 2, 0 @@ -945999,7 +945999,7 @@ sub_081CDADC: @ 0x081CDADC push {r4, r5, r6, lr} adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 bl sub_081CD3D0 adds r2, r0, #0 @@ -946087,7 +946087,7 @@ _081CDB98: movs r0, #2 _081CDBA6: movs r2, #0 - bl sub_081CDEB4 + bl GiveMailToMon b _081CDB36 _081CDBAE: bl sub_081CD3E4 @@ -946097,7 +946097,7 @@ _081CDBAE: lsrs r1, r1, #0x10 movs r0, #3 movs r2, #0 - bl sub_081CDEB4 + bl GiveMailToMon cmp r0, #1 beq _081CDB36 b _081CDC2C @@ -946158,7 +946158,7 @@ sub_081CDC38: @ 0x081CDC38 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #8 bhi _081CDD3C @@ -946223,7 +946223,7 @@ _081CDCBE: movs r0, #2 _081CDCCC: movs r2, #0 - bl sub_081CDEB4 + bl GiveMailToMon movs r0, #1 b _081CDD3E _081CDCD6: @@ -946234,7 +946234,7 @@ _081CDCD6: lsrs r1, r1, #0x10 movs r0, #3 movs r2, #0 - bl sub_081CDEB4 + bl GiveMailToMon cmp r0, #1 bne _081CDD38 movs r0, #1 @@ -946283,7 +946283,7 @@ sub_081CDD44: @ 0x081CDD44 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #7 bhi _081CDE12 @@ -946358,7 +946358,7 @@ _081CDDE0: movs r0, #2 _081CDDEE: movs r2, #0 - bl sub_081CDEB4 + bl GiveMailToMon b _081CDD8E _081CDDF6: bl sub_081CD3E4 @@ -946368,7 +946368,7 @@ _081CDDF6: lsrs r1, r1, #0x10 movs r0, #3 movs r2, #0 - bl sub_081CDEB4 + bl GiveMailToMon cmp r0, #1 beq _081CDD8E _081CDE0E: @@ -946476,8 +946476,8 @@ sub_081CDE98: @ 0x081CDE98 _081CDEB0: .4byte gUnknown_85CB7CE thumb_func_end sub_081CDE98 - thumb_func_start sub_081CDEB4 -sub_081CDEB4: @ 0x081CDEB4 + thumb_func_start GiveMailToMon +GiveMailToMon: @ 0x081CDEB4 push {r4, r5, r6, r7, lr} sub sp, #0x1c lsls r0, r0, #0x18 @@ -946487,7 +946487,7 @@ sub_081CDEB4: @ 0x081CDEB4 lsls r2, r2, #0x18 lsrs r4, r2, #0x18 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 cmp r7, #1 beq _081CDF10 @@ -946508,7 +946508,7 @@ _081CDEE4: adds r0, r6, r1 ldrb r0, [r0] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer bl sub_081CD4BC cmp r0, #1 beq _081CDEFC @@ -946518,7 +946518,7 @@ _081CDEFC: adds r0, r6, r1 ldrb r0, [r0] movs r1, #0 - bl sub_08003B18 + bl FillWindowPixelBuffer b _081CE05C .align 2, 0 _081CDF0C: .4byte 0x00001821 @@ -946597,7 +946597,7 @@ _081CDF5C: ldr r4, _081CDFCC adds r0, r4, #0 add r1, sp, #0xc - bl sub_08008BCC + bl StringExpandPlaceholders ldr r1, _081CDFD0 adds r0, r6, r1 ldrb r0, [r0] @@ -946632,7 +946632,7 @@ _081CDFE8: adds r0, r6, r1 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _081CE00A _081CDFFC: movs r1, #0xc1 @@ -946640,7 +946640,7 @@ _081CDFFC: adds r0, r6, r1 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081CE00A: bl sub_081CD4BC cmp r0, #1 @@ -946660,7 +946660,7 @@ _081CE024: adds r0, r6, r1 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram b _081CE048 .align 2, 0 _081CE038: .4byte 0x00001821 @@ -946669,7 +946669,7 @@ _081CE03C: adds r0, r6, r1 ldrb r0, [r0] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081CE048: ldr r0, _081CE058 adds r1, r6, r0 @@ -946688,24 +946688,24 @@ _081CE05E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081CDEB4 + thumb_func_end GiveMailToMon thumb_func_start sub_081CE068 sub_081CE068: @ 0x081CE068 push {r4, lr} movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldr r1, _081CE090 adds r0, r4, r1 ldrb r0, [r0] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram ldr r0, _081CE094 adds r4, r4, r0 ldrb r0, [r4] movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram pop {r4} pop {r0} bx r0 @@ -946758,7 +946758,7 @@ sub_081CE0C4: @ 0x081CE0C4 _081CE0E4: movs r0, #0x66 _081CE0E6: - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #4 ldrb r2, [r5, #5] movs r1, #0xf @@ -946795,7 +946795,7 @@ sub_081CE118: @ 0x081CE118 push {r5, r6, r7} sub sp, #0x58 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 add r4, sp, #0x20 add r5, sp, #0x38 @@ -946835,7 +946835,7 @@ sub_081CE118: @ 0x081CE118 adds r1, r6, r2 str r0, [r1] movs r0, #0x69 - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 movs r1, #0 @@ -946853,7 +946853,7 @@ _081CE1AC: mov r0, sp bl LoadSpriteSheets mov r0, sl - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes movs r4, #0 add r0, sp, #0x50 mov r8, r0 @@ -946869,7 +946869,7 @@ _081CE1C0: adds r0, r7, #0 movs r1, #0xe2 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -946931,7 +946931,7 @@ _081CE23E: adds r0, r7, #0 movs r1, #0xe6 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -946976,7 +946976,7 @@ _081CE290: adds r0, r7, #0 movs r1, #0xde movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 cmp r3, #0x40 @@ -947018,12 +947018,12 @@ _081CE2FA: mov r1, sl bl sub_081D28E0 mov r0, r8 - bl sub_08008210 + bl LoadSpriteSheet movs r0, #0 mov r3, sl str r0, [r3, #8] mov r0, sl - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes add sp, #0x58 pop {r3, r4, r5} mov r8, r3 @@ -947117,28 +947117,28 @@ _081CE3D0: .4byte 0x00001816 sub_081CE3D4: @ 0x081CE3D4 push {r4, lr} movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 movs r1, #0xc1 lsls r1, r1, #5 adds r0, r4, r1 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow bl sub_081CD4BC cmp r0, #1 bne _081CE420 ldr r1, _081CE414 adds r0, r4, r1 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r1, _081CE418 adds r0, r4, r1 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow ldr r1, _081CE41C adds r0, r4, r1 ldrb r0, [r0] - bl sub_08003444 + bl RemoveWindow b _081CE424 .align 2, 0 _081CE414: .4byte 0x00001821 @@ -947155,7 +947155,7 @@ _081CE424: bl sub_081CE328 bl sub_081CE59C movs r0, #0xc - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 @@ -947166,7 +947166,7 @@ sub_081CE444: @ 0x081CE444 push {r4, lr} adds r4, r0, #0 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, _081CE460 adds r0, r0, r1 ldrh r0, [r0] @@ -947188,7 +947188,7 @@ sub_081CE464: @ 0x081CE464 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr mov r8, r0 ldr r7, _081CE4E4 add r7, r8 @@ -947215,7 +947215,7 @@ sub_081CE464: @ 0x081CE464 add r4, r8 strh r0, [r4] adds r0, r5, #0 - bl sub_08008210 + bl LoadSpriteSheet ldr r5, _081CE4EC add r5, r8 strh r0, [r5] @@ -947223,7 +947223,7 @@ sub_081CE464: @ 0x081CE464 movs r1, #0x26 movs r2, #0x68 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strb r0, [r7] @@ -947288,7 +947288,7 @@ _081CE530: add r1, r8 ldrh r1, [r1] movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _081CE55A: add sp, #0x28 pop {r3} @@ -947308,12 +947308,12 @@ sub_081CE578: @ 0x081CE578 push {r4, lr} bl sub_081CD3D0 adds r4, r0, #0 - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer adds r0, r4, #0 bl sub_081D1750 - bl sub_080B9800 + bl ScanlineEffect_InitHBlankDmaTransfer pop {r4} pop {r0} bx r0 @@ -947322,7 +947322,7 @@ sub_081CE578: @ 0x081CE578 thumb_func_start sub_081CE59C sub_081CE59C: @ 0x081CE59C push {lr} - bl sub_081C6DCC + bl SetPokenavVBlankCallback pop {r0} bx r0 .align 2, 0 @@ -947335,11 +947335,11 @@ sub_081CE5A8: @ 0x081CE5A8 cmp r0, #0 beq _081CE5B8 movs r0, #2 - bl sub_08001B48 + bl ShowBg b _081CE5BE _081CE5B8: movs r0, #2 - bl sub_08001B5C + bl HideBg _081CE5BE: pop {r0} bx r0 @@ -947416,7 +947416,7 @@ _081CE640: sub_081CE648: @ 0x081CE648 push {r4, lr} movs r0, #0xc - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081CD4BC cmp r0, #1 @@ -947440,13 +947440,13 @@ sub_081CE670: @ 0x081CE670 push {r4, lr} movs r0, #7 movs r1, #0x24 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CE6C4 ldr r1, _081CE6B4 movs r0, #0x12 - bl sub_081C6DDC + bl AllocSubstruct str r0, [r4, #0x20] cmp r0, #0 beq _081CE6C4 @@ -947454,7 +947454,7 @@ sub_081CE670: @ 0x081CE670 str r0, [r4] ldr r0, _081CE6BC movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] movs r0, #0 str r0, [r4, #0x18] @@ -947484,12 +947484,12 @@ sub_081CE6CC: @ 0x081CE6CC push {r4, lr} movs r0, #7 movs r1, #0x24 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CE708 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr str r0, [r4, #0x20] ldr r0, _081CE700 str r0, [r4] @@ -947518,7 +947518,7 @@ _081CE70A: sub_081CE710: @ 0x081CE710 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0] bl _call_via_r1 pop {r1} @@ -947530,15 +947530,15 @@ sub_081CE710: @ 0x081CE710 sub_081CE724: @ 0x081CE724 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x1c] cmp r0, #0 bne _081CE738 movs r0, #0x12 - bl sub_081C6E10 + bl FreePokenavSubstruct _081CE738: movs r0, #7 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 .align 2, 0 @@ -947549,7 +947549,7 @@ sub_081CE744: @ 0x081CE744 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #4] - bl sub_081C6898 + bl IsLoopedTaskActive cmp r0, #0 bne _081CE756 ldr r0, _081CE760 @@ -947622,7 +947622,7 @@ _081CE7BC: movs r0, #0 b _081CE7DA _081CE7CA: - bl sub_081C7F04 + bl GetSelectedMatchCall ldr r1, [r4, #0x20] strh r0, [r1, #2] str r5, [r4, #0x1c] @@ -947657,7 +947657,7 @@ _081CE7F0: .4byte 0x000186A9 sub_081CE7F4: @ 0x081CE7F4 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x18] pop {r1} bx r1 @@ -947668,7 +947668,7 @@ sub_081CE7F4: @ 0x081CE7F4 sub_081CE804: @ 0x081CE804 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x20] adds r0, #4 pop {r1} @@ -947679,7 +947679,7 @@ sub_081CE804: @ 0x081CE804 sub_081CE814: @ 0x081CE814 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x20] ldrh r0, [r0] pop {r1} @@ -947690,9 +947690,9 @@ sub_081CE814: @ 0x081CE814 sub_081CE824: @ 0x081CE824 push {r4, lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall ldr r1, [r4, #0x20] lsls r0, r0, #2 adds r1, r1, r0 @@ -947706,7 +947706,7 @@ sub_081CE824: @ 0x081CE824 sub_081CE840: @ 0x081CE840 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x20] ldrh r0, [r0, #2] pop {r1} @@ -947732,7 +947732,7 @@ sub_081CE868: @ 0x081CE868 push {r4, r5, r6, lr} sub sp, #4 movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 ldr r0, [r6, #0x20] movs r1, #0 @@ -947754,12 +947754,12 @@ _081CE88C: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081CE8DE adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081CE8D8 lsls r1, r5, #0x18 @@ -947771,7 +947771,7 @@ _081CE88C: str r0, [sp] ldr r1, [r6, #0x14] adds r0, r4, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 ldr r2, _081CE8F4 ldr r1, [sp] @@ -947802,7 +947802,7 @@ _081CE8F4: .4byte 0x0000FFFF sub_081CE8F8: @ 0x081CE8F8 push {lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0 str r1, [r0, #0x10] str r1, [r0, #0xc] @@ -947818,7 +947818,7 @@ sub_081CE90C: @ 0x081CE90C push {r7} sub sp, #4 movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 ldr r5, [r6, #0xc] ldr r4, [r6, #0x10] @@ -947834,7 +947834,7 @@ _081CE928: _081CE930: adds r0, r5, #0 adds r1, r4, #0 - bl sub_080D1B10 + bl CheckBoxMonSanityAt cmp r0, #0 beq _081CE96E ldr r1, _081CE984 @@ -947850,7 +947850,7 @@ _081CE930: str r0, [sp] ldr r2, [r6, #0x14] adds r0, r7, #0 - bl sub_080D15D0 + bl GetBoxMonDataAt lsls r0, r0, #0x10 ldr r2, _081CE98C ldr r1, [sp] @@ -947899,7 +947899,7 @@ _081CE99E: sub_081CE9AC: @ 0x081CE9AC push {r4, r5, r6, lr} movs r0, #7 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, [r5, #0x20] ldrh r6, [r0] @@ -948010,13 +948010,13 @@ sub_081CEA64: @ 0x081CEA64 movs r1, #0x81 lsls r1, r1, #4 movs r0, #8 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CEA94 ldr r0, _081CEA8C movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081CEA90 str r0, [r4] @@ -948041,13 +948041,13 @@ sub_081CEA9C: @ 0x081CEA9C movs r1, #0x81 lsls r1, r1, #4 movs r0, #8 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CEACC ldr r0, _081CEAC4 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081CEAC8 str r0, [r4] @@ -948070,14 +948070,14 @@ sub_081CEAD4: @ 0x081CEAD4 push {r4, r5, lr} adds r4, r0, #0 movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081CEAFC lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5, #4] ldr r0, _081CEB00 str r0, [r5] @@ -948093,7 +948093,7 @@ _081CEB00: .4byte sub_081CEB18 sub_081CEB04: @ 0x081CEB04 push {lr} movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -948109,9 +948109,9 @@ sub_081CEB14: @ 0x081CEB14 sub_081CEB18: @ 0x081CEB18 push {lr} movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -948121,13 +948121,13 @@ sub_081CEB18: @ 0x081CEB18 sub_081CEB2C: @ 0x081CEB2C push {r4, lr} movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081C79DC ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #8 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 @@ -948139,7 +948139,7 @@ sub_081CEB4C: @ 0x081CEB4C sub sp, #4 adds r4, r0, #0 movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #5 bls _081CEB60 @@ -948162,31 +948162,31 @@ _081CEB70: @ jump table _081CEB88: ldr r0, _081CEBD0 movs r1, #2 - bl sub_081C7314 + bl InitBgTemplates ldr r1, _081CEBD4 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram adds r1, r5, #0 adds r1, #0x10 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081CEBD8 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram ldr r0, _081CEBDC movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _081CEBCC: movs r0, #0 b _081CECA4 @@ -948196,7 +948196,7 @@ _081CEBD4: .4byte gUnknown_85F59F0 _081CEBD8: .4byte gUnknown_85F5AB8 _081CEBDC: .4byte gUnknown_85F59D0 _081CEBE0: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CEC9E @@ -948205,14 +948205,14 @@ _081CEBE0: beq _081CEC9E b _081CEBCC _081CEBF4: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CEC9E ldr r0, _081CEC10 movs r1, #0x20 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow bl sub_081CEF4C b _081CEBCC .align 2, 0 @@ -948227,24 +948227,24 @@ _081CEC14: bl sub_081C7364 b _081CEBCC _081CEC2A: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CEC9E movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B5C + bl HideBg ldr r0, [r5, #0xc] cmp r0, #0 bne _081CEC86 @@ -948254,7 +948254,7 @@ _081CEC2A: lsls r4, r4, #0x18 lsrs r4, r4, #0x18 adds r0, r4, #0 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex adds r0, r4, #0 movs r1, #1 movs r2, #0 @@ -948291,7 +948291,7 @@ sub_081CECAC: @ 0x081CECAC push {r4, r5, lr} adds r4, r0, #0 movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CECEC @@ -948321,7 +948321,7 @@ _081CECE8: movs r0, #7 b _081CED0E _081CECEC: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CED08 _081CECF4: @@ -948331,7 +948331,7 @@ _081CECFA: movs r0, #0 b _081CED0E _081CECFE: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CED0C @@ -948351,7 +948351,7 @@ sub_081CED14: @ 0x081CED14 push {r4, r5, lr} adds r4, r0, #0 movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CED54 @@ -948381,7 +948381,7 @@ _081CED50: movs r0, #7 b _081CED76 _081CED54: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CED70 _081CED5C: @@ -948391,7 +948391,7 @@ _081CED62: movs r0, #0 b _081CED76 _081CED66: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CED74 @@ -948411,7 +948411,7 @@ sub_081CED7C: @ 0x081CED7C push {r4, r5, lr} adds r4, r0, #0 movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CEDBC @@ -948441,7 +948441,7 @@ _081CEDB8: movs r0, #7 b _081CEDDE _081CEDBC: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CEDD8 _081CEDC4: @@ -948451,7 +948451,7 @@ _081CEDCA: movs r0, #0 b _081CEDDE _081CEDCE: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CEDDC @@ -948471,7 +948471,7 @@ sub_081CEDE4: @ 0x081CEDE4 push {r4, r5, lr} adds r4, r0, #0 movs r0, #8 - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CEE24 @@ -948501,7 +948501,7 @@ _081CEE20: movs r0, #7 b _081CEE46 _081CEE24: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CEE40 _081CEE2C: @@ -948511,7 +948511,7 @@ _081CEE32: movs r0, #0 b _081CEE46 _081CEE36: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CEE44 @@ -948546,7 +948546,7 @@ _081CEE6C: bl sub_081C72F4 cmp r0, #0 bne _081CEE7C - bl sub_081C7080 + bl MainMenuLoopedTaskIsBusy cmp r0, #0 beq _081CEE80 _081CEE7C: @@ -948562,8 +948562,8 @@ _081CEE86: .align 2, 0 thumb_func_end sub_081CEE4C - thumb_func_start sub_081CEE8C -sub_081CEE8C: @ 0x081CEE8C + thumb_func_start CB2_MoveRelearnerMain +CB2_MoveRelearnerMain: @ 0x081CEE8C push {lr} cmp r0, #0 beq _081CEE98 @@ -948589,21 +948589,21 @@ _081CEEB6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081CEE8C + thumb_func_end CB2_MoveRelearnerMain thumb_func_start sub_081CEEBC sub_081CEEBC: @ 0x081CEEBC push {r4, lr} adds r4, r0, #0 ldr r0, _081CEEE4 - bl sub_08003250 + bl AddWindow strh r0, [r4, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r4, #8] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram adds r0, r4, #0 bl sub_081CEEE8 pop {r4} @@ -948633,7 +948633,7 @@ sub_081CEEE8: @ 0x081CEEE8 ldr r4, _081CEF44 ldr r1, _081CEF48 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldrb r0, [r6, #8] movs r1, #2 str r1, [sp] @@ -948647,7 +948647,7 @@ sub_081CEEE8: @ 0x081CEEE8 bl AddTextPrinterParameterized ldrb r0, [r6, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5, r6} pop {r0} @@ -948716,7 +948716,7 @@ sub_081CEFA0: @ 0x081CEFA0 ldr r0, _081CEFE0 adds r4, r4, r0 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r4, #0 @@ -948726,7 +948726,7 @@ sub_081CEFA0: @ 0x081CEFA0 ldr r2, _081CEFE4 adds r0, r4, #0 movs r1, #2 - bl sub_0806A058 + bl GetMonData b _081CF00E .align 2, 0 _081CEFE0: .4byte gUnknown_2024190 @@ -948734,9 +948734,9 @@ _081CEFE4: .4byte gUnknown_2021C68 _081CEFE8: ldrb r0, [r4] ldrb r1, [r4, #1] - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r7, r0, #0x18 adds r0, r4, #0 @@ -948750,7 +948750,7 @@ _081CEFE8: _081CF00E: ldr r4, _081CF060 adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 ldr r6, _081CF064 adds r0, r6, #0 adds r1, r4, #0 @@ -948796,7 +948796,7 @@ _081CF078: ldr r1, _081CF08C _081CF07A: mov r0, r8 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -948811,13 +948811,13 @@ sub_081CF090: @ 0x081CF090 push {r4, lr} movs r0, #9 movs r1, #0x20 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CF0D0 ldr r1, _081CF0C4 movs r0, #0x12 - bl sub_081C6DDC + bl AllocSubstruct str r0, [r4, #0x1c] cmp r0, #0 beq _081CF0D0 @@ -948825,7 +948825,7 @@ sub_081CF090: @ 0x081CF090 str r0, [r4] ldr r0, _081CF0CC movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] movs r0, #0 str r0, [r4, #0x14] @@ -948848,12 +948848,12 @@ sub_081CF0D8: @ 0x081CF0D8 push {r4, lr} movs r0, #9 movs r1, #0x20 - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CF100 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr str r0, [r4, #0x1c] ldr r0, _081CF0FC str r0, [r4] @@ -948874,7 +948874,7 @@ _081CF102: sub_081CF108: @ 0x081CF108 push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0] bl _call_via_r1 pop {r1} @@ -948886,15 +948886,15 @@ sub_081CF108: @ 0x081CF108 sub_081CF11C: @ 0x081CF11C push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x18] cmp r0, #0 bne _081CF130 movs r0, #0x12 - bl sub_081C6E10 + bl FreePokenavSubstruct _081CF130: movs r0, #9 - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 .align 2, 0 @@ -948905,7 +948905,7 @@ sub_081CF13C: @ 0x081CF13C push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #4] - bl sub_081C6898 + bl IsLoopedTaskActive cmp r0, #0 bne _081CF14E ldr r0, _081CF158 @@ -948978,7 +948978,7 @@ _081CF1B4: movs r0, #0 b _081CF1D2 _081CF1C2: - bl sub_081C7F04 + bl GetSelectedMatchCall ldr r1, [r4, #0x1c] strh r0, [r1, #2] str r5, [r4, #0x18] @@ -949013,7 +949013,7 @@ _081CF1E8: .4byte 0x000186AD sub_081CF1EC: @ 0x081CF1EC push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x14] pop {r1} bx r1 @@ -949024,7 +949024,7 @@ sub_081CF1EC: @ 0x081CF1EC sub_081CF1FC: @ 0x081CF1FC push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x1c] adds r0, #4 pop {r1} @@ -949035,7 +949035,7 @@ sub_081CF1FC: @ 0x081CF1FC sub_081CF20C: @ 0x081CF20C push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x1c] ldrh r0, [r0] pop {r1} @@ -949046,9 +949046,9 @@ sub_081CF20C: @ 0x081CF20C sub_081CF21C: @ 0x081CF21C push {r4, lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall ldr r1, [r4, #0x1c] lsls r0, r0, #2 adds r1, r1, r0 @@ -949062,7 +949062,7 @@ sub_081CF21C: @ 0x081CF21C sub_081CF238: @ 0x081CF238 push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #0x1c] ldrh r0, [r0, #2] pop {r1} @@ -949088,7 +949088,7 @@ sub_081CF260: @ 0x081CF260 push {r4, r5, r6, lr} sub sp, #4 movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr adds r6, r0, #0 ldr r0, [r6, #0x1c] movs r1, #0 @@ -949110,22 +949110,22 @@ _081CF284: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081CF2E4 adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081CF2DE adds r0, r4, #0 movs r1, #4 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081CF2DE adds r0, r4, #0 movs r1, #0x52 - bl sub_0806A058 + bl GetMonData adds r3, r0, #0 cmp r3, #0 beq _081CF2DE @@ -949164,7 +949164,7 @@ _081CF2FC: .4byte 0x0000FFFF sub_081CF300: @ 0x081CF300 push {lr} movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr movs r1, #0 str r1, [r0, #0x10] str r1, [r0, #0xc] @@ -949181,7 +949181,7 @@ sub_081CF314: @ 0x081CF314 push {r6, r7} sub sp, #4 movs r0, #9 - bl sub_081C6DFC + bl GetSubstructPtr mov r8, r0 ldr r7, [r0, #0xc] ldr r6, [r0, #0x10] @@ -949193,7 +949193,7 @@ sub_081CF314: @ 0x081CF314 _081CF334: adds r0, r7, #0 adds r1, r6, #0 - bl sub_080D1B10 + bl CheckBoxMonSanityAt cmp r0, #0 beq _081CF37A lsls r0, r7, #0x18 @@ -949203,7 +949203,7 @@ _081CF334: adds r0, r5, #0 adds r1, r4, #0 movs r2, #0x52 - bl sub_080D15D0 + bl GetBoxMonDataAt adds r3, r0, #0 cmp r3, #0 beq _081CF37A @@ -949338,17 +949338,17 @@ _081CF430: adds r4, r1, r0 adds r0, r4, #0 movs r1, #5 - bl sub_0806A058 + bl GetMonData cmp r0, #0 beq _081CF45E adds r0, r4, #0 movs r1, #6 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081CF45E adds r0, r4, #0 movs r1, #0x53 - bl sub_0806A058 + bl GetMonData cmp r0, #0 bne _081CF486 _081CF45E: @@ -949362,14 +949362,14 @@ _081CF466: _081CF46A: adds r0, r5, #0 adds r1, r4, #0 - bl sub_080D1B10 + bl CheckBoxMonSanityAt cmp r0, #0 beq _081CF490 lsls r1, r4, #0x18 lsrs r1, r1, #0x18 lsrs r0, r6, #0x18 movs r2, #0x53 - bl sub_080D15D0 + bl GetBoxMonDataAt cmp r0, #0 beq _081CF490 _081CF486: @@ -949397,13 +949397,13 @@ sub_081CF4A4: @ 0x081CF4A4 movs r1, #0x81 lsls r1, r1, #4 movs r0, #0xa - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CF4D4 ldr r0, _081CF4CC movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081CF4D0 str r0, [r4] @@ -949428,13 +949428,13 @@ sub_081CF4DC: @ 0x081CF4DC movs r1, #0x81 lsls r1, r1, #4 movs r0, #0xa - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CF50C ldr r0, _081CF504 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081CF508 str r0, [r4] @@ -949457,14 +949457,14 @@ sub_081CF514: @ 0x081CF514 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081CF53C lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5, #4] ldr r0, _081CF540 str r0, [r5] @@ -949480,7 +949480,7 @@ _081CF540: .4byte sub_081CF558 sub_081CF544: @ 0x081CF544 push {lr} movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -949496,9 +949496,9 @@ sub_081CF554: @ 0x081CF554 sub_081CF558: @ 0x081CF558 push {lr} movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -949508,13 +949508,13 @@ sub_081CF558: @ 0x081CF558 sub_081CF56C: @ 0x081CF56C push {r4, lr} movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 bl sub_081C79DC ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow movs r0, #0xa - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 @@ -949526,7 +949526,7 @@ sub_081CF58C: @ 0x081CF58C sub sp, #4 adds r4, r0, #0 movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #5 bls _081CF5A0 @@ -949549,29 +949549,29 @@ _081CF5B0: @ jump table _081CF5C8: ldr r0, _081CF60C movs r1, #2 - bl sub_081C7314 + bl InitBgTemplates ldr r1, _081CF610 movs r0, #0 str r0, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram adds r1, r5, #0 adds r1, #0x10 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081CF614 movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r0, _081CF618 movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram _081CF606: movs r0, #0 b _081CF6C8 @@ -949581,7 +949581,7 @@ _081CF610: .4byte gUnknown_85F5BF4 _081CF614: .4byte gUnknown_85F5CBC _081CF618: .4byte gUnknown_85F5BD4 _081CF61C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CF6C2 @@ -949591,23 +949591,23 @@ _081CF61C: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 - bl sub_08001B48 + bl ShowBg b _081CF606 _081CF64A: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CF6C2 ldr r0, _081CF664 movs r1, #0x20 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow bl sub_081CF9A4 b _081CF606 .align 2, 0 @@ -949620,14 +949620,14 @@ _081CF668: bl sub_081CF8E0 b _081CF606 _081CF678: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081CF6C2 movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #9 bl sub_081C7364 movs r0, #1 @@ -949636,7 +949636,7 @@ _081CF678: cmp r0, #0 bne _081CF606 movs r0, #2 - bl sub_081C75BC + bl LoadLeftHeaderGfxForIndex movs r0, #2 movs r1, #1 movs r2, #0 @@ -949666,7 +949666,7 @@ sub_081CF6D0: @ 0x081CF6D0 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CF710 @@ -949696,7 +949696,7 @@ _081CF70C: movs r0, #7 b _081CF732 _081CF710: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CF72C _081CF718: @@ -949706,7 +949706,7 @@ _081CF71E: movs r0, #0 b _081CF732 _081CF722: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CF730 @@ -949726,7 +949726,7 @@ sub_081CF738: @ 0x081CF738 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CF778 @@ -949756,7 +949756,7 @@ _081CF774: movs r0, #7 b _081CF79A _081CF778: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CF794 _081CF780: @@ -949766,7 +949766,7 @@ _081CF786: movs r0, #0 b _081CF79A _081CF78A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CF798 @@ -949786,7 +949786,7 @@ sub_081CF7A0: @ 0x081CF7A0 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CF7E0 @@ -949816,7 +949816,7 @@ _081CF7DC: movs r0, #7 b _081CF802 _081CF7E0: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CF7FC _081CF7E8: @@ -949826,7 +949826,7 @@ _081CF7EE: movs r0, #0 b _081CF802 _081CF7F2: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CF800 @@ -949846,7 +949846,7 @@ sub_081CF808: @ 0x081CF808 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xa - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081CF848 @@ -949876,7 +949876,7 @@ _081CF844: movs r0, #7 b _081CF86A _081CF848: - bl sub_081C7DD8 + bl MatchCall_GetMessage_Type2 cmp r0, #0 bne _081CF864 _081CF850: @@ -949886,7 +949886,7 @@ _081CF856: movs r0, #0 b _081CF86A _081CF85A: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081CF868 @@ -949921,7 +949921,7 @@ _081CF890: bl sub_081C72F4 cmp r0, #0 bne _081CF8A0 - bl sub_081C7080 + bl MainMenuLoopedTaskIsBusy cmp r0, #0 beq _081CF8A4 _081CF8A0: @@ -949972,12 +949972,12 @@ sub_081CF8E0: @ 0x081CF8E0 sub sp, #0xc adds r5, r0, #0 ldr r0, _081CF94C - bl sub_08003250 + bl AddWindow movs r6, #0 strh r0, [r5, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap bl sub_081CF20C adds r1, r0, #0 ldr r4, _081CF950 @@ -949992,7 +949992,7 @@ sub_081CF8E0: @ 0x081CF8E0 ldr r4, _081CF954 ldr r1, _081CF958 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldrb r0, [r5, #8] movs r1, #2 str r1, [sp] @@ -950005,7 +950005,7 @@ sub_081CF8E0: @ 0x081CF8E0 bl AddTextPrinterParameterized ldrb r0, [r5, #8] movs r1, #1 - bl sub_08003528 + bl CopyWindowToVram adds r0, r5, #0 bl sub_081CF95C add sp, #0xc @@ -950024,7 +950024,7 @@ sub_081CF95C: @ 0x081CF95C push {r4, r5, lr} sub sp, #0xc adds r5, r0, #0 - bl sub_081C7F04 + bl GetSelectedMatchCall adds r1, r0, #0 ldr r4, _081CF9A0 adds r1, #1 @@ -950045,7 +950045,7 @@ sub_081CF95C: @ 0x081CF95C bl AddTextPrinterParameterized ldrb r0, [r5, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -950113,7 +950113,7 @@ sub_081CF9F8: @ 0x081CF9F8 ldr r0, _081CFA3C adds r4, r4, r0 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r4, #0 @@ -950123,7 +950123,7 @@ sub_081CF9F8: @ 0x081CF9F8 ldr r2, _081CFA40 adds r0, r4, #0 movs r1, #2 - bl sub_0806A058 + bl GetMonData b _081CFA6A .align 2, 0 _081CFA3C: .4byte gUnknown_2024190 @@ -950131,9 +950131,9 @@ _081CFA40: .4byte gUnknown_2021C68 _081CFA44: ldrb r0, [r7] ldrb r1, [r7, #1] - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r4, #0 @@ -950147,7 +950147,7 @@ _081CFA44: _081CFA6A: ldr r4, _081CFAD0 adds r0, r4, #0 - bl sub_0800885C + bl StringGetEnd10 ldr r0, _081CFAD4 mov r8, r0 adds r1, r4, #0 @@ -950201,7 +950201,7 @@ _081CFAE8: ldr r1, _081CFAFC _081CFAEA: mov r0, sb - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders pop {r3, r4} mov r8, r3 mov sb, r4 @@ -950217,12 +950217,12 @@ sub_081CFB00: @ 0x081CFB00 push {r4, lr} movs r0, #0xd movs r1, #0x9c - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081CFB48 movs r0, #0x12 - bl sub_081C6DFC + bl GetSubstructPtr str r0, [r4, #8] cmp r0, #0 beq _081CFB48 @@ -950256,7 +950256,7 @@ _081CFB4A: sub_081CFB50: @ 0x081CFB50 push {lr} movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 adds r1, #0x98 ldr r1, [r1] @@ -950270,7 +950270,7 @@ sub_081CFB50: @ 0x081CFB50 sub_081CFB68: @ 0x081CFB68 push {lr} movs r0, #0xd - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r0} bx r0 thumb_func_end sub_081CFB68 @@ -950585,7 +950585,7 @@ _081CFD6E: sub_081CFD74: @ 0x081CFD74 push {lr} movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #8] ldrh r0, [r0, #2] pop {r1} @@ -950596,21 +950596,21 @@ sub_081CFD74: @ 0x081CFD74 sub_081CFD84: @ 0x081CFD84 push {lr} movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #8] ldrh r0, [r0] pop {r1} bx r1 thumb_func_end sub_081CFD84 - thumb_func_start sub_081CFD94 -sub_081CFD94: @ 0x081CFD94 + thumb_func_start GetCurrMonInfo1 +GetCurrMonInfo1: @ 0x081CFD94 push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r7, r1, #0 adds r6, r2, #0 movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #8] ldrh r0, [r1, #2] lsls r0, r0, #2 @@ -950628,12 +950628,12 @@ sub_081CFD94: @ 0x081CFD94 adds r0, r4, #0 movs r1, #2 adds r2, r5, #0 - bl sub_0806A058 + bl GetMonData adds r0, r4, #0 bl GetLevelFromMonExp strb r0, [r7] adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender strb r0, [r6] b _081CFE02 .align 2, 0 @@ -950641,9 +950641,9 @@ _081CFDDC: .4byte gUnknown_2024190 _081CFDE0: ldrb r0, [r1] ldrb r1, [r1, #1] - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 - bl sub_08069B04 + bl GetBoxMonGender strb r0, [r6] adds r0, r4, #0 bl GetLevelFromBoxMonExp @@ -950654,21 +950654,21 @@ _081CFDE0: bl sub_0806A1B4 _081CFE02: adds r0, r5, #0 - bl sub_0800885C + bl StringGetEnd10 pop {r4, r5, r6, r7} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081CFD94 + thumb_func_end GetCurrMonInfo1 - thumb_func_start sub_081CFE10 -sub_081CFE10: @ 0x081CFE10 + thumb_func_start GetCurrMonInfo2 +GetCurrMonInfo2: @ 0x081CFE10 push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r6, r1, #0 adds r7, r2, #0 movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #8] ldrh r0, [r1, #2] lsls r0, r0, #2 @@ -950685,22 +950685,22 @@ sub_081CFE10: @ 0x081CFE10 adds r4, r4, r0 adds r0, r4, #0 movs r1, #0xb - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0 - bl sub_0806A058 + bl GetMonData str r0, [r6] adds r0, r4, #0 movs r1, #1 - bl sub_0806A058 + bl GetMonData b _081CFE80 .align 2, 0 _081CFE58: .4byte gUnknown_2024190 _081CFE5C: ldrb r0, [r1] ldrb r1, [r1, #1] - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 movs r1, #0xb bl sub_0806A1B4 @@ -950717,13 +950717,13 @@ _081CFE80: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081CFE10 + thumb_func_end GetCurrMonInfo2 - thumb_func_start sub_081CFE88 -sub_081CFE88: @ 0x081CFE88 + thumb_func_start GetCurrMonRibbonCount +GetCurrMonRibbonCount: @ 0x081CFE88 push {lr} movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldr r1, [r0, #8] ldrh r0, [r1, #2] lsls r0, r0, #2 @@ -950734,7 +950734,7 @@ sub_081CFE88: @ 0x081CFE88 beq _081CFEAA ldrb r1, [r1, #1] movs r2, #0x52 - bl sub_080D15D0 + bl GetBoxMonDataAt b _081CFEBA _081CFEAA: ldrb r1, [r1, #1] @@ -950743,13 +950743,13 @@ _081CFEAA: ldr r1, _081CFEC0 adds r0, r0, r1 movs r1, #0x52 - bl sub_0806A058 + bl GetMonData _081CFEBA: pop {r1} bx r1 .align 2, 0 _081CFEC0: .4byte gUnknown_2024190 - thumb_func_end sub_081CFE88 + thumb_func_end GetCurrMonRibbonCount thumb_func_start sub_081CFEC4 sub_081CFEC4: @ 0x081CFEC4 @@ -950773,7 +950773,7 @@ sub_081CFEC4: @ 0x081CFEC4 ldr r1, _081CFEF4 adds r0, r0, r1 movs r1, #0x53 - bl sub_0806A058 + bl GetMonData b _081CFF02 .align 2, 0 _081CFEF4: .4byte gUnknown_2024190 @@ -950781,7 +950781,7 @@ _081CFEF8: ldrb r0, [r1] ldrb r1, [r1, #1] movs r2, #0x53 - bl sub_080D15D0 + bl GetBoxMonDataAt _081CFF02: mov ip, r0 movs r0, #0 @@ -950893,7 +950893,7 @@ sub_081CFFC4: @ 0x081CFFC4 push {r4, lr} adds r4, r0, #0 movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldrh r1, [r0, #0x10] str r1, [r4] adds r0, #0x14 @@ -950908,7 +950908,7 @@ sub_081CFFDC: @ 0x081CFFDC push {r4, lr} adds r4, r0, #0 movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldrh r1, [r0, #0x12] str r1, [r4] adds r0, #0x78 @@ -950922,7 +950922,7 @@ sub_081CFFDC: @ 0x081CFFDC sub_081CFFF4: @ 0x081CFFF4 push {lr} movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr ldrh r0, [r0, #0xc] pop {r1} bx r1 @@ -950933,7 +950933,7 @@ sub_081CFFF4: @ 0x081CFFF4 sub_081D0004: @ 0x081D0004 push {lr} movs r0, #0xd - bl sub_081C6DFC + bl GetSubstructPtr adds r1, r0, #0 ldrh r0, [r1, #0xc] cmp r0, #0x18 @@ -950957,13 +950957,13 @@ sub_081D0028: @ 0x081D0028 push {r4, lr} ldr r1, _081D004C movs r0, #0xe - bl sub_081C6DDC + bl AllocSubstruct adds r4, r0, #0 cmp r4, #0 beq _081D0058 ldr r0, _081D0050 movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r4, #4] ldr r0, _081D0054 str r0, [r4] @@ -950986,14 +950986,14 @@ sub_081D0060: @ 0x081D0060 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 ldr r0, _081D0088 lsls r4, r4, #2 adds r4, r4, r0 ldr r0, [r4] movs r1, #1 - bl sub_081C6838 + bl CreateLoopedTask str r0, [r5, #4] ldr r0, _081D008C str r0, [r5] @@ -951009,7 +951009,7 @@ _081D008C: .4byte sub_081D0108 sub_081D0090: @ 0x081D0090 push {lr} movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -951025,16 +951025,16 @@ sub_081D00A0: @ 0x081D00A0 sub_081D00A4: @ 0x081D00A4 push {r4, lr} movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 ldrb r0, [r4, #0xa] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #8] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0xc] - bl sub_08003444 + bl RemoveWindow ldrb r0, [r4, #0xe] - bl sub_08003444 + bl RemoveWindow adds r0, r4, #0 bl sub_081D0894 movs r0, #9 @@ -951054,7 +951054,7 @@ sub_081D00A4: @ 0x081D00A4 ldr r0, [r4, #0x14] bl DestroySprite movs r0, #0xe - bl sub_081C6E10 + bl FreePokenavSubstruct pop {r4} pop {r0} bx r0 @@ -951064,9 +951064,9 @@ sub_081D00A4: @ 0x081D00A4 sub_081D0108: @ 0x081D0108 push {lr} movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr ldr r0, [r0, #4] - bl sub_081C6898 + bl IsLoopedTaskActive pop {r1} bx r1 .align 2, 0 @@ -951078,7 +951078,7 @@ sub_081D011C: @ 0x081D011C sub sp, #8 adds r4, r0, #0 movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #9 bls _081D0130 @@ -951105,27 +951105,27 @@ _081D0140: @ jump table _081D0168: ldr r0, _081D01A4 movs r1, #2 - bl sub_081C7314 + bl InitBgTemplates ldr r1, _081D01A8 movs r0, #0 str r0, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram adds r1, r5, #0 adds r1, #0x1c movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, _081D01AC movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_080021CC + bl CopyToBgTilemapBuffer ldr r0, _081D01B0 movs r1, #0x10 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow b _081D026A .align 2, 0 _081D01A4: .4byte gUnknown_85F7214 @@ -951133,7 +951133,7 @@ _081D01A8: .4byte gUnknown_85F64AC _081D01AC: .4byte gUnknown_85F65A8 _081D01B0: .4byte gUnknown_85F648C _081D01B4: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r4, r0, #0x18 cmp r4, #0 @@ -951150,11 +951150,11 @@ _081D01C2: movs r0, #1 movs r2, #0 movs r3, #1 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r0, _081D0218 adds r1, r5, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer movs r0, #0x20 str r0, [sp] movs r0, #0x14 @@ -951167,11 +951167,11 @@ _081D01C2: ldr r0, _081D021C movs r1, #0x20 movs r2, #0xa0 - bl sub_081C7104 + bl ClearBottomWindow ldr r0, _081D0220 movs r1, #0xa0 movs r2, #0x20 - bl sub_081C7104 + bl ClearBottomWindow movs r0, #1 b _081D026C .align 2, 0 @@ -951180,7 +951180,7 @@ _081D0218: .4byte 0x0000081C _081D021C: .4byte gUnknown_85F6674 _081D0220: .4byte gUnknown_85F6714 _081D0224: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D02F4 @@ -951189,7 +951189,7 @@ _081D0224: movs r0, #0 b _081D02FA _081D0238: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D02F4 @@ -951198,7 +951198,7 @@ _081D0238: movs r0, #0 b _081D02FA _081D024C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D02F4 @@ -951207,18 +951207,18 @@ _081D024C: movs r0, #0 b _081D02FA _081D0260: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081D02F4 _081D026A: movs r0, #2 _081D026C: - bl sub_08002248 + bl CopyBgTilemapBufferToVram movs r0, #0 b _081D02FA _081D0274: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081D02F4 @@ -951234,7 +951234,7 @@ _081D0288: movs r0, #0 b _081D02FA _081D0298: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081D02F4 @@ -951243,25 +951243,25 @@ _081D0298: movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B5C + bl HideBg movs r0, #1 bl sub_081C7280 movs r0, #0 @@ -951317,7 +951317,7 @@ sub_081D0334: @ 0x081D0334 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r4, r0, #0 cmp r5, #6 bhi _081D03D4 @@ -951368,7 +951368,7 @@ _081D03A8: movs r0, #1 b _081D03D6 _081D03B2: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 bne _081D03D0 @@ -951397,7 +951397,7 @@ sub_081D03DC: @ 0x081D03DC push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081D040C @@ -951429,7 +951429,7 @@ _081D040C: movs r0, #0 b _081D0436 _081D0426: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081D0434 @@ -951449,7 +951449,7 @@ sub_081D043C: @ 0x081D043C push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081D0470 @@ -951490,7 +951490,7 @@ _081D0484: movs r0, #0 b _081D04A8 _081D0498: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081D04A6 @@ -951511,7 +951511,7 @@ sub_081D04B0: @ 0x081D04B0 push {r4, r5, lr} adds r4, r0, #0 movs r0, #0xe - bl sub_081C6DFC + bl GetSubstructPtr adds r5, r0, #0 cmp r4, #1 beq _081D04E0 @@ -951543,7 +951543,7 @@ _081D04E0: movs r0, #0 b _081D050A _081D04FA: - bl sub_08001AEC + bl IsDma3ManagerBusyWithBgCopy lsls r0, r0, #0x18 cmp r0, #0 beq _081D0508 @@ -951563,11 +951563,11 @@ sub_081D0510: @ 0x081D0510 push {r4, lr} adds r4, r0, #0 ldr r0, _081D0530 - bl sub_08003250 + bl AddWindow strh r0, [r4, #0xa] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 bl sub_081D0534 pop {r4} @@ -951587,7 +951587,7 @@ sub_081D0534: @ 0x081D0534 movs r2, #3 bl memcpy ldr r4, _081D05A0 - bl sub_081CFE88 + bl GetCurrMonRibbonCount adds r1, r0, #0 adds r0, r4, #0 movs r2, #0 @@ -951600,10 +951600,10 @@ sub_081D0534: @ 0x081D0534 ldr r4, _081D05A4 ldr r1, _081D05A8 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldrb r0, [r5, #0xa] movs r1, #0x44 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #0xa] add r1, sp, #0xc str r1, [sp] @@ -951614,10 +951614,10 @@ sub_081D0534: @ 0x081D0534 movs r1, #1 movs r2, #0 movs r3, #2 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldrb r0, [r5, #0xa] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r4, r5} pop {r0} @@ -951644,7 +951644,7 @@ sub_081D05AC: @ 0x081D05AC bl memcpy ldrb r0, [r7, #0xa] movs r1, #0x44 - bl sub_08003B18 + bl FillWindowPixelBuffer cmp r5, #0x18 bhi _081D0610 lsls r1, r5, #3 @@ -951665,7 +951665,7 @@ _081D05DE: str r1, [sp, #8] movs r1, #1 movs r2, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0x80 lsls r0, r0, #0x15 adds r5, r5, r0 @@ -951707,7 +951707,7 @@ _081D062C: str r1, [sp, #8] movs r1, #1 movs r2, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0x80 lsls r0, r0, #0x15 adds r6, r6, r0 @@ -951717,7 +951717,7 @@ _081D062C: _081D065A: ldrb r0, [r7, #0xa] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram _081D0662: add sp, #0x10 pop {r3} @@ -951736,11 +951736,11 @@ sub_081D067C: @ 0x081D067C push {r4, lr} adds r4, r0, #0 ldr r0, _081D069C - bl sub_08003250 + bl AddWindow strh r0, [r4, #8] lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0800365C + bl PutWindowTilemap adds r0, r4, #0 bl sub_081D06A0 pop {r4} @@ -951764,7 +951764,7 @@ sub_081D06A0: @ 0x081D06A0 adds r0, r4, #0 add r1, sp, #0xc mov r2, r8 - bl sub_081CFD94 + bl GetCurrMonInfo1 ldr r6, _081D0710 adds r0, r6, #0 adds r1, r4, #0 @@ -951813,10 +951813,10 @@ _081D0724: _081D0726: ldr r4, _081D0768 adds r0, r4, #0 - bl sub_081AF900 + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldrb r0, [r7, #8] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r7, #8] movs r1, #2 str r1, [sp] @@ -951830,7 +951830,7 @@ _081D0726: bl AddTextPrinterParameterized ldrb r0, [r7, #8] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0x10 pop {r3} mov r8, r3 @@ -951848,24 +951848,24 @@ sub_081D076C: @ 0x081D076C adds r5, r0, #0 ldr r4, _081D07B4 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow strh r0, [r5, #0xc] adds r4, #8 adds r0, r4, #0 - bl sub_08003250 + bl AddWindow strh r0, [r5, #0xe] ldrb r0, [r5, #0xc] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #0xe] movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldrb r0, [r5, #0xc] - bl sub_0800365C + bl PutWindowTilemap ldrb r0, [r5, #0xe] - bl sub_0800365C + bl PutWindowTilemap ldrh r0, [r5, #0xe] - bl sub_081D07B8 + bl DisplayItemMessageInBattlePyramid adds r0, r5, #0 bl sub_081D081C pop {r4, r5} @@ -951875,8 +951875,8 @@ sub_081D076C: @ 0x081D076C _081D07B4: .4byte gUnknown_85F7248 thumb_func_end sub_081D076C - thumb_func_start sub_081D07B8 -sub_081D07B8: @ 0x081D07B8 + thumb_func_start DisplayItemMessageInBattlePyramid +DisplayItemMessageInBattlePyramid: @ 0x081D07B8 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -951886,7 +951886,7 @@ sub_081D07B8: @ 0x081D07B8 lsrs r4, r4, #0x18 adds r0, r4, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r6, _081D0818 movs r0, #0 mov r8, r0 @@ -951912,7 +951912,7 @@ sub_081D07B8: @ 0x081D07B8 bl AddTextPrinterParameterized adds r0, r4, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r3} mov r8, r3 @@ -951921,7 +951921,7 @@ sub_081D07B8: @ 0x081D07B8 bx r0 .align 2, 0 _081D0818: .4byte gUnknown_2021C40 - thumb_func_end sub_081D07B8 + thumb_func_end DisplayItemMessageInBattlePyramid thumb_func_start sub_081D081C sub_081D081C: @ 0x081D081C @@ -951949,7 +951949,7 @@ sub_081D081C: @ 0x081D081C bl AddTextPrinterParameterized ldrb r0, [r5, #0xc] movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram add sp, #0xc pop {r4, r5} pop {r0} @@ -951966,7 +951966,7 @@ sub_081D0864: @ 0x081D0864 add r1, sp, #4 add r2, sp, #8 mov r0, sp - bl sub_081CFE10 + bl GetCurrMonInfo2 bl ResetAllPicSprites movs r0, #0x28 movs r1, #0x68 @@ -951986,7 +951986,7 @@ sub_081D0864: @ 0x081D0864 sub_081D0894: @ 0x081D0894 push {lr} ldrh r0, [r0, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite pop {r0} bx r0 thumb_func_end sub_081D0894 @@ -951998,7 +951998,7 @@ sub_081D08A0: @ 0x081D08A0 add r1, sp, #0x14 add r2, sp, #0x18 add r0, sp, #0x10 - bl sub_081CFE10 + bl GetCurrMonInfo2 add r0, sp, #0x10 ldrh r0, [r0] ldr r1, [sp, #0x18] @@ -952058,7 +952058,7 @@ sub_081D0918: @ 0x081D0918 push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x10] - bl sub_0818D54C + bl FreeAndDestroyMonPicSprite movs r5, #0x20 rsbs r5, r5, #0 adds r0, r5, #0 @@ -952228,7 +952228,7 @@ _081D0A3E: blo _081D0A3E _081D0A56: movs r0, #1 - bl sub_08002248 + bl CopyBgTilemapBufferToVram pop {r4, r5, r6} pop {r0} bx r0 @@ -952334,14 +952334,14 @@ sub_081D0B18: @ 0x081D0B18 push {r4, lr} adds r4, r0, #0 ldr r0, _081D0B54 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D0B58 - bl sub_081C711C + bl Pokenav_AllocAndLoadPalettes ldr r0, _081D0B5C movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #4 @@ -952415,7 +952415,7 @@ sub_081D0B64: @ 0x081D0B64 adds r0, #0xf lsls r0, r0, #0x10 lsrs r0, r0, #0x10 - bl sub_0800851C + bl IndexOfSpritePaletteTag ldr r3, [r6, #0x14] lsls r0, r0, #4 ldrb r2, [r3, #5] @@ -952519,8 +952519,8 @@ _081D0C86: _081D0C8C: .4byte sub_08007140 thumb_func_end sub_081D0C54 - thumb_func_start sub_081D0C90 -sub_081D0C90: @ 0x081D0C90 + thumb_func_start MatchCallGetFunctionIndex +MatchCallGetFunctionIndex: @ 0x081D0C90 push {lr} ldrb r0, [r0] cmp r0, #5 @@ -952557,10 +952557,10 @@ _081D0CD2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D0C90 + thumb_func_end MatchCallGetFunctionIndex - thumb_func_start sub_081D0CD8 -sub_081D0CD8: @ 0x081D0CD8 + thumb_func_start GetTrainerIdxByRematchIdx +GetTrainerIdxByRematchIdx: @ 0x081D0CD8 ldr r1, _081D0CE4 lsls r0, r0, #4 adds r0, r0, r1 @@ -952568,10 +952568,10 @@ sub_081D0CD8: @ 0x081D0CD8 bx lr .align 2, 0 _081D0CE4: .4byte gUnknown_852AD40 - thumb_func_end sub_081D0CD8 + thumb_func_end GetTrainerIdxByRematchIdx - thumb_func_start sub_081D0CE8 -sub_081D0CE8: @ 0x081D0CE8 + thumb_func_start GetRematchIdxByTrainerIdx +GetRematchIdxByTrainerIdx: @ 0x081D0CE8 push {lr} adds r3, r0, #0 movs r1, #0 @@ -952594,10 +952594,10 @@ _081D0D00: _081D0D0C: pop {r1} bx r1 - thumb_func_end sub_081D0CE8 + thumb_func_end GetRematchIdxByTrainerIdx - thumb_func_start sub_081D0D10 -sub_081D0D10: @ 0x081D0D10 + thumb_func_start MatchCallFlagGetByIndex +MatchCallFlagGetByIndex: @ 0x081D0D10 push {r4, lr} cmp r0, #0x14 bhi _081D0D3C @@ -952606,7 +952606,7 @@ sub_081D0D10: @ 0x081D0D10 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex ldr r1, _081D0D38 lsls r0, r0, #2 adds r0, r0, r1 @@ -952623,7 +952623,7 @@ _081D0D3E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081D0D10 + thumb_func_end MatchCallFlagGetByIndex thumb_func_start sub_081D0D44 sub_081D0D44: @ 0x081D0D44 @@ -952694,8 +952694,8 @@ _081D0DAA: .align 2, 0 thumb_func_end sub_081D0D8C - thumb_func_start sub_081D0DB0 -sub_081D0DB0: @ 0x081D0DB0 + thumb_func_start MatchCallGetFlag_Type4 +MatchCallGetFlag_Type4: @ 0x081D0DB0 push {lr} adds r2, r0, #0 ldr r0, _081D0DC4 @@ -952726,10 +952726,10 @@ _081D0DE2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D0DB0 + thumb_func_end MatchCallGetFlag_Type4 - thumb_func_start sub_081D0DE8 -sub_081D0DE8: @ 0x081D0DE8 + thumb_func_start MatchCallGetFlag_Type3 +MatchCallGetFlag_Type3: @ 0x081D0DE8 push {lr} ldrh r0, [r0, #2] bl FlagGet @@ -952737,10 +952737,10 @@ sub_081D0DE8: @ 0x081D0DE8 lsrs r0, r0, #0x18 pop {r1} bx r1 - thumb_func_end sub_081D0DE8 + thumb_func_end MatchCallGetFlag_Type3 - thumb_func_start sub_081D0DF8 -sub_081D0DF8: @ 0x081D0DF8 + thumb_func_start MatchCallMapSecGetByIndex +MatchCallMapSecGetByIndex: @ 0x081D0DF8 push {r4, lr} cmp r0, #0x14 bhi _081D0E28 @@ -952749,7 +952749,7 @@ sub_081D0DF8: @ 0x081D0DF8 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex ldr r1, _081D0E24 lsls r0, r0, #2 adds r0, r0, r1 @@ -952768,7 +952768,7 @@ _081D0E2A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081D0DF8 + thumb_func_end MatchCallMapSecGetByIndex thumb_func_start sub_081D0E30 sub_081D0E30: @ 0x081D0E30 @@ -952825,8 +952825,8 @@ sub_081D0E70: @ 0x081D0E70 bx lr thumb_func_end sub_081D0E70 - thumb_func_start sub_081D0E74 -sub_081D0E74: @ 0x081D0E74 + thumb_func_start MatchCall_IsRematchable +MatchCall_IsRematchable: @ 0x081D0E74 push {r4, lr} cmp r0, #0x14 bhi _081D0EA0 @@ -952835,7 +952835,7 @@ sub_081D0E74: @ 0x081D0E74 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex ldr r1, _081D0E9C lsls r0, r0, #2 adds r0, r0, r1 @@ -952852,7 +952852,7 @@ _081D0EA2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081D0E74 + thumb_func_end MatchCall_IsRematchable thumb_func_start sub_081D0EA8 sub_081D0EA8: @ 0x081D0EA8 @@ -952860,8 +952860,8 @@ sub_081D0EA8: @ 0x081D0EA8 bx lr thumb_func_end sub_081D0EA8 - thumb_func_start sub_081D0EAC -sub_081D0EAC: @ 0x081D0EAC + thumb_func_start MatchCall_IsRematchable_Type1 +MatchCall_IsRematchable_Type1: @ 0x081D0EAC push {lr} adds r1, r0, #0 ldrh r0, [r1, #4] @@ -952887,7 +952887,7 @@ _081D0ED6: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D0EAC + thumb_func_end MatchCall_IsRematchable_Type1 thumb_func_start MatchCall_IsRematchable_Type2 MatchCall_IsRematchable_Type2: @ 0x081D0EDC @@ -952930,7 +952930,7 @@ sub_081D0F04: @ 0x081D0F04 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex adds r2, r0, #0 ldr r1, _081D0F38 lsls r0, r2, #2 @@ -952997,8 +952997,8 @@ sub_081D0F6C: @ 0x081D0F6C bx lr thumb_func_end sub_081D0F6C - thumb_func_start sub_081D0F70 -sub_081D0F70: @ 0x081D0F70 + thumb_func_start MatchCall_GetRematchTableIdx +MatchCall_GetRematchTableIdx: @ 0x081D0F70 push {r4, lr} cmp r0, #0x14 bhi _081D0F9C @@ -953007,7 +953007,7 @@ sub_081D0F70: @ 0x081D0F70 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex ldr r1, _081D0F98 lsls r0, r0, #2 adds r0, r0, r1 @@ -953024,7 +953024,7 @@ _081D0F9E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081D0F70 + thumb_func_end MatchCall_GetRematchTableIdx thumb_func_start sub_081D0FA4 sub_081D0FA4: @ 0x081D0FA4 @@ -953056,8 +953056,8 @@ sub_081D0FB4: @ 0x081D0FB4 bx lr thumb_func_end sub_081D0FB4 - thumb_func_start sub_081D0FB8 -sub_081D0FB8: @ 0x081D0FB8 + thumb_func_start MatchCall_GetMessage +MatchCall_GetMessage: @ 0x081D0FB8 push {r4, r5, lr} adds r5, r1, #0 cmp r0, #0x14 @@ -953067,7 +953067,7 @@ sub_081D0FB8: @ 0x081D0FB8 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex ldr r1, _081D0FE8 lsls r0, r0, #2 adds r0, r0, r1 @@ -953082,19 +953082,19 @@ _081D0FDE: .align 2, 0 _081D0FE4: .4byte gUnknown_85F79B4 _081D0FE8: .4byte gUnknown_85F7A6C - thumb_func_end sub_081D0FB8 + thumb_func_end MatchCall_GetMessage - thumb_func_start sub_081D0FEC -sub_081D0FEC: @ 0x081D0FEC + thumb_func_start MatchCall_GetMessage_Type0 +MatchCall_GetMessage_Type0: @ 0x081D0FEC push {lr} ldr r0, [r0, #0xc] bl sub_081D103C pop {r0} bx r0 - thumb_func_end sub_081D0FEC + thumb_func_end MatchCall_GetMessage_Type0 - thumb_func_start sub_081D0FF8 -sub_081D0FF8: @ 0x081D0FF8 + thumb_func_start MatchCall_GetMessage_Type1 +MatchCall_GetMessage_Type1: @ 0x081D0FF8 push {lr} adds r3, r0, #0 adds r2, r1, #0 @@ -953111,7 +953111,7 @@ _081D100C: _081D1014: pop {r0} bx r0 - thumb_func_end sub_081D0FF8 + thumb_func_end MatchCall_GetMessage_Type1 thumb_func_start sub_081D1018 sub_081D1018: @ 0x081D1018 @@ -953122,23 +953122,23 @@ sub_081D1018: @ 0x081D1018 bx r0 thumb_func_end sub_081D1018 - thumb_func_start sub_081D1024 -sub_081D1024: @ 0x081D1024 + thumb_func_start MatchCall_GetMessage_Type4 +MatchCall_GetMessage_Type4: @ 0x081D1024 push {lr} ldr r0, [r0, #0xc] bl sub_081D103C pop {r0} bx r0 - thumb_func_end sub_081D1024 + thumb_func_end MatchCall_GetMessage_Type4 - thumb_func_start sub_081D1030 -sub_081D1030: @ 0x081D1030 + thumb_func_start MatchCall_GetMessage_Type3 +MatchCall_GetMessage_Type3: @ 0x081D1030 push {lr} adds r0, r1, #0 bl sub_08196C74 pop {r0} bx r0 - thumb_func_end sub_081D1030 + thumb_func_end MatchCall_GetMessage_Type3 thumb_func_start sub_081D103C sub_081D103C: @ 0x081D103C @@ -953183,7 +953183,7 @@ _081D1074: _081D1086: ldr r1, [r4] mov r0, r8 - bl sub_08008BCC + bl StringExpandPlaceholders pop {r3} mov r8, r3 pop {r4, r5, r6, r7} @@ -953255,7 +953255,7 @@ _081D10F8: _081D110A: ldr r1, [r4] mov r0, sl - bl sub_08008BCC + bl StringExpandPlaceholders b _081D115C .align 2, 0 _081D1114: .4byte 0x0000FFFE @@ -953281,7 +953281,7 @@ _081D1124: cmp r0, #0 bne _081D111C adds r0, r7, #0 - bl sub_080B1C04 + bl CountBattledRematchTeams lsls r0, r0, #0x10 lsrs r0, r0, #0x10 cmp r0, #1 @@ -953292,7 +953292,7 @@ _081D1150: adds r0, r0, r6 ldr r1, [r0] mov r0, sl - bl sub_08008BCC + bl StringExpandPlaceholders _081D115C: pop {r3, r4, r5} mov r8, r3 @@ -953319,7 +953319,7 @@ sub_081D1178: @ 0x081D1178 adds r0, r0, r1 ldr r4, [r0] adds r0, r4, #0 - bl sub_081D0C90 + bl MatchCallGetFunctionIndex ldr r1, _081D11AC lsls r0, r0, #2 adds r0, r0, r1 @@ -953356,7 +953356,7 @@ MatchCall_GetNameAndDesc_Type1: @ 0x081D11BC cmp r0, #0 bne _081D11D0 ldrh r0, [r4, #4] - bl sub_081D120C + bl MatchCall_GetNameAndDescByRematchIdx b _081D11D2 _081D11D0: str r0, [r2] @@ -953374,7 +953374,7 @@ MatchCall_GetNameAndDesc_Type2: @ 0x081D11DC adds r4, r0, #0 adds r5, r1, #0 ldrh r0, [r4, #4] - bl sub_081D120C + bl MatchCall_GetNameAndDescByRematchIdx ldr r0, [r4, #8] str r0, [r5] pop {r4, r5} @@ -953403,12 +953403,12 @@ sub_081D1200: @ 0x081D1200 .align 2, 0 thumb_func_end sub_081D1200 - thumb_func_start sub_081D120C -sub_081D120C: @ 0x081D120C + thumb_func_start MatchCall_GetNameAndDescByRematchIdx +MatchCall_GetNameAndDescByRematchIdx: @ 0x081D120C push {r4, r5, lr} adds r4, r1, #0 adds r5, r2, #0 - bl sub_081D0CD8 + bl GetTrainerIdxByRematchIdx lsls r0, r0, #5 ldr r1, _081D1234 adds r0, r0, r1 @@ -953426,7 +953426,7 @@ sub_081D120C: @ 0x081D120C .align 2, 0 _081D1234: .4byte gUnknown_82E383C _081D1238: .4byte gUnknown_82E3564 - thumb_func_end sub_081D120C + thumb_func_end MatchCall_GetNameAndDescByRematchIdx thumb_func_start sub_081D123C sub_081D123C: @ 0x081D123C @@ -953540,7 +953540,7 @@ sub_081D12F4: @ 0x081D12F4 movs r4, #0 _081D12FA: adds r0, r4, #0 - bl sub_081D0F70 + bl MatchCall_GetRematchTableIdx cmp r0, #0x4e beq _081D130C cmp r0, r5 @@ -953559,12 +953559,12 @@ _081D1314: .align 2, 0 thumb_func_end sub_081D12F4 - thumb_func_start sub_081D131C -sub_081D131C: @ 0x081D131C + thumb_func_start SetMatchCallRegisteredFlag +SetMatchCallRegisteredFlag: @ 0x081D131C push {lr} ldr r0, _081D133C ldrh r0, [r0] - bl sub_081D0CE8 + bl GetRematchIdxByTrainerIdx cmp r0, #0 blt _081D1338 movs r1, #0xae @@ -953578,7 +953578,7 @@ _081D1338: bx r0 .align 2, 0 _081D133C: .4byte gUnknown_2037280 - thumb_func_end sub_081D131C + thumb_func_end SetMatchCallRegisteredFlag thumb_func_start sub_081D1340 sub_081D1340: @ 0x081D1340 @@ -953618,8 +953618,8 @@ _081D1376: _081D137C: .4byte gUnknown_203CC14 thumb_func_end sub_081D1340 - thumb_func_start sub_081D1380 -sub_081D1380: @ 0x081D1380 + thumb_func_start UpdateWorldOfMastersAndPutItOnTheAir +UpdateWorldOfMastersAndPutItOnTheAir: @ 0x081D1380 push {r4, lr} lsls r0, r0, #0x18 lsrs r1, r0, #0x18 @@ -953631,11 +953631,11 @@ sub_081D1380: @ 0x081D1380 lsls r0, r1, #3 ldr r1, _081D13B0 adds r0, r0, r1 - bl sub_08003250 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, #0 - bl sub_08197638 + bl SetStandardWindowBorderStyle _081D13A4: ldrb r0, [r4] pop {r4} @@ -953644,7 +953644,7 @@ _081D13A4: .align 2, 0 _081D13AC: .4byte gUnknown_203CC14 _081D13B0: .4byte gUnknown_85F7AF4 - thumb_func_end sub_081D1380 + thumb_func_end UpdateWorldOfMastersAndPutItOnTheAir thumb_func_start sub_081D13B4 sub_081D13B4: @ 0x081D13B4 @@ -953658,9 +953658,9 @@ sub_081D13B4: @ 0x081D13B4 movs r1, #0 bl sub_08198134 ldrb r0, [r4] - bl sub_08003774 + bl ClearWindowTilemap ldrb r0, [r4] - bl sub_08003444 + bl RemoveWindow movs r0, #0xff strb r0, [r4] pop {r4} @@ -953745,7 +953745,7 @@ _081D1440: strb r4, [r6, #0x11] movs r0, #1 movs r1, #0 - bl sub_080061B4 + bl GetFontAttribute strb r0, [r6, #0x12] strb r4, [r6, #0x13] movs r0, #8 @@ -953764,7 +953764,7 @@ _081D1440: ldrh r1, [r7, #2] ldrh r2, [r7] adds r0, r6, #0 - bl sub_081AE25C + bl ListMenuInit lsls r0, r0, #0x18 lsrs r0, r0, #0x18 pop {r3, r4, r5} @@ -953817,7 +953817,7 @@ sub_081D14D8: @ 0x081D14D8 movs r1, #0xc8 movs r2, #0xc movs r3, #0x94 - bl sub_081AF178 + bl AddScrollIndicatorArrowPairParameterized strb r0, [r4, #9] add sp, #0x10 pop {r4} @@ -953830,7 +953830,7 @@ sub_081D1508: @ 0x081D1508 push {lr} ldr r0, _081D1518 ldr r0, [r0] - bl sub_08000BF0 + bl Free pop {r0} bx r0 .align 2, 0 @@ -954113,7 +954113,7 @@ sub_081D1704: @ 0x081D1704 .align 2, 0 _081D1718: .4byte 0x00000355 _081D171C: - bl sub_080B9750 + bl ScanlineEffect_Clear ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -954127,7 +954127,7 @@ _081D172A: ldr r0, [sp] ldr r1, [sp, #4] ldr r2, [sp, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams ldrb r0, [r4] adds r0, #1 strb r0, [r4] @@ -954160,7 +954160,7 @@ sub_081D1750: @ 0x081D1750 adds r0, r6, #0 bl sub_081D1AEC adds r0, r6, #0 - bl sub_081D1C48 + bl MatchCallGetMapSec_Type2 movs r7, #0 ldr r5, _081D1818 mov ip, r5 @@ -954810,8 +954810,8 @@ _081D1C40: bx r0 thumb_func_end sub_081D1AEC - thumb_func_start sub_081D1C48 -sub_081D1C48: @ 0x081D1C48 + thumb_func_start MatchCallGetMapSec_Type2 +MatchCallGetMapSec_Type2: @ 0x081D1C48 push {r4, r5, r6, r7, lr} sub sp, #8 adds r4, r0, #0 @@ -954965,7 +954965,7 @@ _081D1D62: bx r0 .align 2, 0 _081D1D6C: .4byte 0x0000024A - thumb_func_end sub_081D1C48 + thumb_func_end MatchCallGetMapSec_Type2 thumb_func_start sub_081D1D70 sub_081D1D70: @ 0x081D1D70 @@ -955085,7 +955085,7 @@ sub_081D1E40: @ 0x081D1E40 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 ldr r0, _081D1E90 - bl sub_08003090 + bl InitWindows bl sub_08004480 movs r0, #0 movs r1, #1 @@ -955094,12 +955094,12 @@ sub_081D1E40: @ 0x081D1E40 ldr r0, _081D1E94 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette movs r4, #0 _081D1E66: adds r0, r4, #0 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer adds r0, r4, #1 lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -955108,42 +955108,42 @@ _081D1E66: cmp r5, #0 bne _081D1E98 movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette b _081D1EAA .align 2, 0 _081D1E90: .4byte gUnknown_85F7C18 _081D1E94: .4byte gUnknown_85D7B04 _081D1E98: movs r0, #1 - bl sub_0800365C + bl PutWindowTilemap movs r0, #1 movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette _081D1EAA: movs r0, #2 - bl sub_0800365C + bl PutWindowTilemap movs r0, #3 - bl sub_0800365C + bl PutWindowTilemap movs r0, #2 movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette movs r0, #3 movs r1, #0 movs r2, #1 movs r3, #0xe - bl sub_08197F44 + bl DrawStdFrameWithCustomTileAndPalette bl sub_081D1EE0 movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram pop {r4, r5} pop {r0} bx r0 @@ -955261,8 +955261,8 @@ _081D1FD0: .4byte gUnknown_85F7C75 _081D1FD4: .4byte gUnknown_85F7C7A thumb_func_end sub_081D1EE0 - thumb_func_start sub_081D1FD8 -sub_081D1FD8: @ 0x081D1FD8 + thumb_func_start LoadMoveRelearnerMovesList +LoadMoveRelearnerMovesList: @ 0x081D1FD8 push {r4, r5, r6, r7, lr} lsls r1, r1, #0x10 lsrs r4, r1, #0x10 @@ -955290,7 +955290,7 @@ _081D2004: pop {r4, r5, r6, r7} pop {r1} bx r1 - thumb_func_end sub_081D1FD8 + thumb_func_end LoadMoveRelearnerMovesList thumb_func_start sub_081D200C sub_081D200C: @ 0x081D200C @@ -955366,10 +955366,10 @@ _081D2024: bne _081D20B8 movs r0, #0 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram movs r0, #1 movs r1, #2 - bl sub_08003528 + bl CopyWindowToVram b _081D21E4 _081D20B8: ldr r1, _081D20F4 @@ -955512,7 +955512,7 @@ _081D2170: bl AddTextPrinterParameterized _081D21E4: adds r0, r7, #0 - bl sub_08161280 + bl MoveRelearnerShowHideHearts add sp, #0x14 pop {r3} mov r8, r3 @@ -955526,14 +955526,14 @@ _081D2200: .4byte gUnknown_8565FCC _081D2204: .4byte gUnknown_8560BB4 thumb_func_end sub_081D200C - thumb_func_start sub_081D2208 -sub_081D2208: @ 0x081D2208 + thumb_func_start MoveRelearnerPrintText +MoveRelearnerPrintText: @ 0x081D2208 push {r4, lr} sub sp, #0x10 adds r4, r0, #0 movs r0, #3 movs r1, #0x11 - bl sub_08003B18 + bl FillWindowPixelBuffer ldr r2, _081D224C ldrb r0, [r2] movs r1, #1 @@ -955553,17 +955553,17 @@ sub_081D2208: @ 0x081D2208 str r0, [sp, #0xc] movs r1, #1 adds r2, r4, #0 - bl sub_08196E2C + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4} pop {r0} bx r0 .align 2, 0 _081D224C: .4byte gUnknown_30030B4 - thumb_func_end sub_081D2208 + thumb_func_end MoveRelearnerPrintText - thumb_func_start sub_081D2250 -sub_081D2250: @ 0x081D2250 + thumb_func_start MoveRelearnerRunTextPrinters +MoveRelearnerRunTextPrinters: @ 0x081D2250 push {lr} bl sub_08004630 movs r0, #3 @@ -955572,10 +955572,10 @@ sub_081D2250: @ 0x081D2250 lsrs r0, r0, #0x10 pop {r1} bx r1 - thumb_func_end sub_081D2250 + thumb_func_end MoveRelearnerRunTextPrinters - thumb_func_start sub_081D2264 -sub_081D2264: @ 0x081D2264 + thumb_func_start MoveRelearnerCreateYesNoMenu +MoveRelearnerCreateYesNoMenu: @ 0x081D2264 push {lr} ldr r0, _081D2278 movs r1, #1 @@ -955586,10 +955586,10 @@ sub_081D2264: @ 0x081D2264 bx r0 .align 2, 0 _081D2278: .4byte gUnknown_85F7C48 - thumb_func_end sub_081D2264 + thumb_func_end MoveRelearnerCreateYesNoMenu - thumb_func_start sub_081D227C -sub_081D227C: @ 0x081D227C + thumb_func_start GetBoxOrPartyMonData +GetBoxOrPartyMonData: @ 0x081D227C push {lr} lsls r0, r0, #0x10 lsrs r0, r0, #0x10 @@ -955608,7 +955608,7 @@ _081D2292: adds r0, r0, r1 adds r1, r2, #0 adds r2, r3, #0 - bl sub_0806A058 + bl GetMonData b _081D22DE .align 2, 0 _081D22A4: .4byte gUnknown_2024190 @@ -955618,7 +955618,7 @@ _081D22A8: ldr r1, _081D22B8 adds r0, r0, r1 adds r1, r2, #0 - bl sub_0806A058 + bl GetMonData b _081D22DE .align 2, 0 _081D22B8: .4byte gUnknown_2024190 @@ -955632,19 +955632,19 @@ _081D22C4: lsrs r0, r0, #0x18 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080D1770 + bl GetAndCopyBoxMonDataAt b _081D22DE _081D22D2: lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 - bl sub_080D15D0 + bl GetBoxMonDataAt _081D22DE: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D227C + thumb_func_end GetBoxOrPartyMonData thumb_func_start sub_081D22E4 sub_081D22E4: @ 0x081D22E4 @@ -955675,7 +955675,7 @@ sub_081D22E4: @ 0x081D22E4 adds r1, r6, #0 movs r2, #0x2d movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData cmp r0, #0 beq _081D2334 ldr r1, _081D2330 @@ -955691,14 +955691,14 @@ _081D2334: adds r1, r6, #0 movs r2, #2 adds r3, r5, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r0, r5, #0 - bl sub_0800885C + bl StringGetEnd10 adds r0, r4, #0 adds r1, r6, #0 movs r2, #0xb movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData lsls r0, r0, #0x10 lsrs r7, r0, #0x10 cmp r4, #0xe @@ -955710,12 +955710,12 @@ _081D2334: adds r4, r4, r0 adds r0, r4, #0 movs r1, #0x38 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 mov r8, r0 adds r0, r4, #0 - bl sub_08069AF4 + bl GetMonGender lsls r0, r0, #0x18 lsrs r6, r0, #0x18 b _081D23A6 @@ -955726,9 +955726,9 @@ _081D2384: lsrs r0, r0, #0x18 lsls r1, r6, #0x18 lsrs r1, r1, #0x18 - bl sub_080D1934 + bl GetBoxedMonPtr adds r4, r0, #0 - bl sub_08069B04 + bl GetBoxMonGender lsls r0, r0, #0x18 lsrs r6, r0, #0x18 adds r0, r4, #0 @@ -956055,7 +956055,7 @@ _081D25E0: adds r1, r6, #0 movs r2, #0x16 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r1, sb lsls r5, r1, #2 adds r4, r5, r1 @@ -956066,7 +956066,7 @@ _081D25E0: adds r1, r6, #0 movs r2, #0x2f movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r1, r8 adds r1, #1 adds r1, r1, r4 @@ -956075,7 +956075,7 @@ _081D25E0: adds r1, r6, #0 movs r2, #0x21 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r1, r8 adds r1, #2 adds r1, r1, r4 @@ -956084,7 +956084,7 @@ _081D25E0: adds r1, r6, #0 movs r2, #0x18 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r1, r8 adds r1, #3 adds r1, r1, r4 @@ -956093,7 +956093,7 @@ _081D25E0: adds r1, r6, #0 movs r2, #0x17 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData mov r1, r8 adds r1, #4 adds r1, r1, r4 @@ -956104,14 +956104,14 @@ _081D25E0: adds r1, r6, #0 movs r2, #0x30 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData cmp r0, #0xff beq _081D2674 adds r0, r7, #0 adds r1, r6, #0 movs r2, #0x30 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData movs r1, #0x1d bl __udivsi3 b _081D2676 @@ -956194,7 +956194,7 @@ _081D26F4: adds r1, r5, #0 movs r2, #0x41 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 @@ -956202,13 +956202,13 @@ _081D26F4: adds r1, r5, #0 movs r2, #1 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r6, r0, #0 adds r0, r7, #0 adds r1, r5, #0 movs r2, #0 movs r3, #0 - bl sub_081D227C + bl GetBoxOrPartyMonData adds r5, r0, #0 lsls r0, r4, #3 ldr r1, _081D2758 @@ -956222,7 +956222,7 @@ _081D26F4: adds r0, r4, #0 adds r1, r6, #0 adds r2, r5, #0 - bl sub_0806E1CC + bl GetMonSpritePalFromSpeciesAndPersonality mov r1, sb bl LZ77UnCompWram _081D274A: @@ -956739,7 +956739,7 @@ _081D2AD2: movs r1, #0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r3, r0, #0x18 adds r6, r3, #0 @@ -956959,8 +956959,8 @@ _081D2C66: _081D2C6C: .4byte gUnknown_20205AC thumb_func_end sub_081D2C18 - thumb_func_start sub_081D2C70 -sub_081D2C70: @ 0x081D2C70 + thumb_func_start DrawLevelUpWindowPg1 +DrawLevelUpWindowPg1: @ 0x081D2C70 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -956991,7 +956991,7 @@ sub_081D2C70: @ 0x081D2C70 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 str r3, [sp, #0x28] - bl sub_08003B18 + bl FillWindowPixelBuffer add r2, sp, #0xc ldrh r0, [r5] ldrh r1, [r6] @@ -957047,7 +957047,7 @@ _081D2CFA: movs r1, #1 movs r2, #0 adds r3, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 lsls r0, r7, #1 mov r4, sp adds r4, r4, r0 @@ -957070,7 +957070,7 @@ _081D2D34: movs r1, #1 movs r2, #0x36 adds r3, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0 ldrsh r1, [r4, r0] adds r0, r1, #0 @@ -957101,7 +957101,7 @@ _081D2D6A: mov r0, r8 movs r1, #1 adds r3, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r7, #1 lsls r0, r0, #0x10 lsrs r7, r0, #0x10 @@ -957119,10 +957119,10 @@ _081D2D6A: _081D2DA8: .4byte gUnknown_85FA9CC _081D2DAC: .4byte gUnknown_85FA9C7 _081D2DB0: .4byte gUnknown_85FA9C4 - thumb_func_end sub_081D2C70 + thumb_func_end DrawLevelUpWindowPg1 - thumb_func_start sub_081D2DB4 -sub_081D2DB4: @ 0x081D2DB4 + thumb_func_start DrawLevelUpWindowPg2 +DrawLevelUpWindowPg2: @ 0x081D2DB4 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -957148,7 +957148,7 @@ sub_081D2DB4: @ 0x081D2DB4 lsls r1, r1, #0x18 lsrs r1, r1, #0x18 str r2, [sp, #0x28] - bl sub_08003B18 + bl FillWindowPixelBuffer add r1, sp, #0xc ldrh r0, [r5] strh r0, [r1] @@ -957220,7 +957220,7 @@ _081D2E38: movs r1, #1 movs r2, #0 adds r3, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r4, #0x36 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -957234,7 +957234,7 @@ _081D2E38: movs r1, #1 adds r2, r4, #0 adds r3, r5, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r0, r6, #1 lsls r0, r0, #0x10 lsrs r6, r0, #0x10 @@ -957250,41 +957250,41 @@ _081D2E38: bx r0 .align 2, 0 _081D2EB4: .4byte gUnknown_85FA9CC - thumb_func_end sub_081D2DB4 + thumb_func_end DrawLevelUpWindowPg2 - thumb_func_start sub_081D2EB8 -sub_081D2EB8: @ 0x081D2EB8 + thumb_func_start GetMonLevelUpWindowStats +GetMonLevelUpWindowStats: @ 0x081D2EB8 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 movs r1, #0x3a - bl sub_0806A058 + bl GetMonData strh r0, [r5] adds r0, r4, #0 movs r1, #0x3b - bl sub_0806A058 + bl GetMonData strh r0, [r5, #2] adds r0, r4, #0 movs r1, #0x3c - bl sub_0806A058 + bl GetMonData strh r0, [r5, #4] adds r0, r4, #0 movs r1, #0x3d - bl sub_0806A058 + bl GetMonData strh r0, [r5, #6] adds r0, r4, #0 movs r1, #0x3e - bl sub_0806A058 + bl GetMonData strh r0, [r5, #8] adds r0, r4, #0 movs r1, #0x3f - bl sub_0806A058 + bl GetMonData strh r0, [r5, #0xa] pop {r4, r5} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D2EB8 + thumb_func_end GetMonLevelUpWindowStats thumb_func_start sub_081D2F00 sub_081D2F00: @ 0x081D2F00 @@ -957308,8 +957308,8 @@ _081D2F20: .4byte gUnknown_3005AEC _081D2F24: .4byte 0x00003D6D thumb_func_end sub_081D2F00 - thumb_func_start sub_081D2F28 -sub_081D2F28: @ 0x081D2F28 + thumb_func_start Struct_Unk81D38FC_ValidateChecksum +Struct_Unk81D38FC_ValidateChecksum: @ 0x081D2F28 push {r4, r5, lr} adds r4, r0, #0 movs r5, #0x9b @@ -957329,7 +957329,7 @@ _081D2F44: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D2F28 + thumb_func_end Struct_Unk81D38FC_ValidateChecksum thumb_func_start sub_081D2F4C sub_081D2F4C: @ 0x081D2F4C @@ -957346,7 +957346,7 @@ sub_081D2F4C: @ 0x081D2F4C adds r4, #8 _081D2F62: adds r0, r4, #0 - bl sub_081D2F28 + bl Struct_Unk81D38FC_ValidateChecksum cmp r0, #0 beq _081D2F94 movs r0, #0x9c @@ -957377,8 +957377,8 @@ _081D2F96: bx r1 thumb_func_end sub_081D2F4C - thumb_func_start sub_081D2F9C -sub_081D2F9C: @ 0x081D2F9C + thumb_func_start TrainerHill_VerifyChecksum +TrainerHill_VerifyChecksum: @ 0x081D2F9C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] @@ -957402,7 +957402,7 @@ _081D2FC0: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D2F9C + thumb_func_end TrainerHill_VerifyChecksum thumb_func_start sub_081D2FC8 sub_081D2FC8: @ 0x081D2FC8 @@ -957564,7 +957564,7 @@ _081D30FC: mov r1, sb str r0, [r1, #4] movs r0, #0x1e - bl sub_08153570 + bl TryWriteSpecialSaveSection cmp r0, #1 bne _081D311C movs r0, #1 @@ -957591,14 +957591,14 @@ sub_081D3130: @ 0x081D3130 adds r4, r0, #0 movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 adds r0, r4, #0 adds r1, r5, #0 bl sub_081D2FC8 adds r4, r0, #0 adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r4, #0 pop {r4, r5} pop {r1} @@ -957606,13 +957606,13 @@ sub_081D3130: @ 0x081D3130 .align 2, 0 thumb_func_end sub_081D3130 - thumb_func_start sub_081D3158 -sub_081D3158: @ 0x081D3158 + thumb_func_start TryReadTrainerHill_r +TryReadTrainerHill_r: @ 0x081D3158 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 movs r0, #0x1e - bl sub_08153518 + bl TryReadSpecialSaveSection cmp r0, #1 bne _081D3184 ldr r2, _081D3180 @@ -957620,7 +957620,7 @@ sub_081D3158: @ 0x081D3158 adds r1, r4, #0 bl memcpy adds r0, r5, #0 - bl sub_081D2F9C + bl TrainerHill_VerifyChecksum cmp r0, #0 beq _081D3184 movs r0, #1 @@ -957633,48 +957633,48 @@ _081D3186: pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081D3158 + thumb_func_end TryReadTrainerHill_r - thumb_func_start sub_081D318C -sub_081D318C: @ 0x081D318C + thumb_func_start TryReadTrainerHill +TryReadTrainerHill: @ 0x081D318C push {r4, r5, lr} adds r4, r0, #0 movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed adds r5, r0, #0 adds r0, r4, #0 adds r1, r5, #0 - bl sub_081D3158 + bl TryReadTrainerHill_r adds r4, r0, #0 adds r0, r5, #0 - bl sub_08000BF0 + bl Free adds r0, r4, #0 pop {r4, r5} pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D318C + thumb_func_end TryReadTrainerHill - thumb_func_start sub_081D31B4 -sub_081D31B4: @ 0x081D31B4 + thumb_func_start ReadTrainerHillAndValidate +ReadTrainerHillAndValidate: @ 0x081D31B4 push {r4, r5, lr} movs r0, #0x80 lsls r0, r0, #5 - bl sub_08000BDC + bl AllocZeroed adds r4, r0, #0 - bl sub_081D318C + bl TryReadTrainerHill adds r5, r0, #0 adds r0, r4, #0 - bl sub_08000BF0 + bl Free adds r0, r5, #0 pop {r4, r5} pop {r1} bx r1 - thumb_func_end sub_081D31B4 + thumb_func_end ReadTrainerHillAndValidate - thumb_func_start sub_081D31D4 -sub_081D31D4: @ 0x081D31D4 + thumb_func_start unref_sub_81D3B54 +unref_sub_81D3B54: @ 0x081D31D4 push {r4, r5, r6, r7, lr} sub sp, #4 adds r6, r0, #0 @@ -957745,10 +957745,10 @@ _081D3242: .align 2, 0 _081D3260: .4byte gUnknown_30012C0 _081D3264: .4byte 0x05000006 - thumb_func_end sub_081D31D4 + thumb_func_end unref_sub_81D3B54 - thumb_func_start sub_081D3268 -sub_081D3268: @ 0x081D3268 + thumb_func_start unref_sub_81D3BE8 +unref_sub_81D3BE8: @ 0x081D3268 push {r4, r5, r6, lr} sub sp, #4 adds r5, r0, #0 @@ -957818,7 +957818,7 @@ _081D32D6: .align 2, 0 _081D32F4: .4byte gUnknown_30012C0 _081D32F8: .4byte 0x05000006 - thumb_func_end sub_081D3268 + thumb_func_end unref_sub_81D3BE8 thumb_func_start sub_081D32FC sub_081D32FC: @ 0x081D32FC @@ -958585,8 +958585,8 @@ _081D38D0: .4byte gUnknown_30012C0 _081D38D4: .4byte 0x05000006 thumb_func_end sub_081D38B8 - thumb_func_start sub_081D38D8 -sub_081D38D8: @ 0x081D38D8 + thumb_func_start GetMewEventObjectId +GetMewEventObjectId: @ 0x081D38D8 push {lr} sub sp, #4 ldr r0, _081D38F8 @@ -958603,16 +958603,16 @@ sub_081D38D8: @ 0x081D38D8 bx r1 .align 2, 0 _081D38F8: .4byte gUnknown_3005AEC - thumb_func_end sub_081D38D8 + thumb_func_end GetMewEventObjectId - thumb_func_start sub_081D38FC -sub_081D38FC: @ 0x081D38FC + thumb_func_start GetMewMoveDirection +GetMewMoveDirection: @ 0x081D38FC push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb mov r5, r8 push {r5, r6, r7} - bl sub_081D38D8 + bl GetMewEventObjectId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -958797,7 +958797,7 @@ _081D3A4A: asrs r0, r0, #0x10 movs r2, #0x12 ldrsh r1, [r5, r2] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3AC6 @@ -958828,7 +958828,7 @@ _081D3A90: asrs r0, r0, #0x10 movs r2, #0x12 ldrsh r1, [r5, r2] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3AC6 @@ -958856,7 +958856,7 @@ _081D3AC6: subs r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3B1E @@ -958873,7 +958873,7 @@ _081D3B08: adds r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 bne _081D3BB8 @@ -958950,7 +958950,7 @@ _081D3B7A: adds r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3BF6 @@ -958981,7 +958981,7 @@ _081D3BC0: subs r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3BF6 @@ -959008,7 +959008,7 @@ _081D3BF6: subs r0, #1 lsls r0, r0, #0x10 asrs r0, r0, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3C50 @@ -959025,7 +959025,7 @@ _081D3C38: asrs r0, r0, #0x10 movs r2, #0x12 ldrsh r1, [r5, r2] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3C50 @@ -959176,7 +959176,7 @@ _081D3D50: subs r1, r2, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3D8C @@ -959201,7 +959201,7 @@ _081D3D8C: adds r1, r2, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3DBE @@ -959213,7 +959213,7 @@ _081D3DBE: subs r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3DD6 @@ -959225,7 +959225,7 @@ _081D3DD6: adds r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3DEE @@ -959255,7 +959255,7 @@ _081D3DEE: asrs r0, r0, #0x10 movs r6, #0x12 ldrsh r1, [r5, r6] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3E2A @@ -959280,7 +959280,7 @@ _081D3E2A: asrs r0, r0, #0x10 movs r4, #0x12 ldrsh r1, [r5, r4] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3E5C @@ -959292,7 +959292,7 @@ _081D3E5C: asrs r0, r0, #0x10 movs r6, #0x12 ldrsh r1, [r5, r6] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3E74 @@ -959304,7 +959304,7 @@ _081D3E74: asrs r0, r0, #0x10 movs r2, #0x12 ldrsh r1, [r5, r2] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D3E8C @@ -959328,10 +959328,10 @@ _081D3EA4: .4byte gUnknown_30012F2 _081D3EA8: .4byte gUnknown_2036FF0 _081D3EAC: .4byte gUnknown_2037230 _081D3EB0: .4byte gUnknown_30012F0 - thumb_func_end sub_081D38FC + thumb_func_end GetMewMoveDirection - thumb_func_start sub_081D3EB4 -sub_081D3EB4: @ 0x081D3EB4 + thumb_func_start CanMewWalkToCoords +CanMewWalkToCoords: @ 0x081D3EB4 push {r4, lr} lsls r0, r0, #0x10 lsls r1, r1, #0x10 @@ -959376,7 +959376,7 @@ _081D3F08: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D3EB4 + thumb_func_end CanMewWalkToCoords thumb_func_start sub_081D3F10 sub_081D3F10: @ 0x081D3F10 @@ -959384,7 +959384,7 @@ sub_081D3F10: @ 0x081D3F10 lsls r0, r0, #0x18 lsrs r6, r0, #0x18 movs r5, #0 - bl sub_081D38D8 + bl GetMewEventObjectId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -959409,7 +959409,7 @@ _081D3F30: subs r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -959430,7 +959430,7 @@ _081D3F68: asrs r0, r0, #0x10 movs r2, #0x12 ldrsh r1, [r4, r2] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -959451,7 +959451,7 @@ _081D3F92: adds r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 lsrs r1, r0, #0x18 cmp r1, #1 @@ -959471,7 +959471,7 @@ _081D3FBA: asrs r0, r0, #0x10 movs r2, #0x12 ldrsh r1, [r4, r2] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -959512,8 +959512,8 @@ _081D4010: .4byte gUnknown_30012F4 _081D4014: .4byte 0x0000403A thumb_func_end sub_081D3F10 - thumb_func_start sub_081D4018 -sub_081D4018: @ 0x081D4018 + thumb_func_start UpdateFarawayIslandStepCounter +UpdateFarawayIslandStepCounter: @ 0x081D4018 push {r4, lr} ldr r4, _081D4048 adds r0, r4, #0 @@ -959550,10 +959550,10 @@ _081D4060: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D4018 + thumb_func_end UpdateFarawayIslandStepCounter - thumb_func_start sub_081D4068 -sub_081D4068: @ 0x081D4068 + thumb_func_start EventObjectIsFarawayIslandMew +EventObjectIsFarawayIslandMew: @ 0x081D4068 push {lr} adds r2, r0, #0 ldr r0, _081D4084 @@ -959576,10 +959576,10 @@ _081D408E: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D4068 + thumb_func_end EventObjectIsFarawayIslandMew - thumb_func_start sub_081D4094 -sub_081D4094: @ 0x081D4094 + thumb_func_start IsMewPlayingHideAndSeek +IsMewPlayingHideAndSeek: @ 0x081D4094 push {lr} ldr r0, _081D40C4 ldr r0, [r0] @@ -959612,7 +959612,7 @@ _081D40D2: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D4094 + thumb_func_end IsMewPlayingHideAndSeek thumb_func_start sub_081D40D8 sub_081D40D8: @ 0x081D40D8 @@ -959649,7 +959649,7 @@ _081D410A: sub_081D4110: @ 0x081D4110 push {r4, r5, r6, lr} sub sp, #4 - bl sub_081D38D8 + bl GetMewEventObjectId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r1, r0, #3 @@ -959733,10 +959733,10 @@ _081D41BA: adds r0, r4, #0 bl LoadSpritePalette ldrh r0, [r4, #4] - bl sub_0800851C + bl IndexOfSpritePaletteTag lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080AB714 + bl UpdateSpritePaletteWithWeather ldrh r1, [r5, #0x10] mov r0, sp strh r1, [r0] @@ -959766,7 +959766,7 @@ _081D41BA: subs r3, #1 lsls r3, r3, #0x18 lsrs r3, r3, #0x18 - bl sub_08006B60 + bl CreateSpriteAtEnd ldr r1, _081D4264 strb r0, [r1] lsls r0, r0, #0x18 @@ -959848,7 +959848,7 @@ sub_081D4294: @ 0x081D4294 subs r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D42D0 @@ -959886,7 +959886,7 @@ sub_081D42D8: @ 0x081D42D8 asrs r0, r0, #0x10 movs r3, #0x12 ldrsh r1, [r2, r3] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D4314 @@ -959924,7 +959924,7 @@ sub_081D431C: @ 0x081D431C adds r1, #1 lsls r1, r1, #0x10 asrs r1, r1, #0x10 - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D4358 @@ -959962,7 +959962,7 @@ sub_081D4360: @ 0x081D4360 asrs r0, r0, #0x10 movs r3, #0x12 ldrsh r1, [r2, r3] - bl sub_081D3EB4 + bl CanMewWalkToCoords lsls r0, r0, #0x18 cmp r0, #0 beq _081D439C @@ -960067,7 +960067,7 @@ sub_081D4438: @ 0x081D4438 strh r0, [r4] bl sub_081D38B8 bl sub_081D3874 - bl sub_08000714 + bl RestoreSerialTimer3IntrHandlers mov r0, sp ldrh r0, [r0] strh r0, [r4] @@ -960132,7 +960132,7 @@ sub_081D44B0: @ 0x081D44B0 ldr r2, _081D44DC adds r0, r2, #0 strh r0, [r1] - bl sub_080092D0 + bl OpenLink movs r0, #1 bl sub_0800AE0C pop {r0} @@ -960196,11 +960196,11 @@ _081D453A: thumb_func_start sub_081D4540 sub_081D4540: @ 0x081D4540 push {lr} - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 beq _081D455C - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -960255,11 +960255,11 @@ _081D45A0: @ jump table .4byte _081D466C @ case 4 .4byte _081D4678 @ case 5 _081D45B8: - bl sub_0800A780 + bl IsLinkMaster lsls r0, r0, #0x18 cmp r0, #0 beq _081D4608 - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -960281,7 +960281,7 @@ _081D45D4: strb r0, [r4] b _081D468C _081D45EC: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #2 @@ -960318,7 +960318,7 @@ _081D4620: movs r0, #5 b _081D468E _081D4636: - bl sub_0800ADFC + bl IsLinkConnectionEstablished lsls r0, r0, #0x18 cmp r0, #0 beq _081D468C @@ -960326,7 +960326,7 @@ _081D4636: ldrb r0, [r0] cmp r0, #0 beq _081D4666 - bl sub_08009E00 + bl IsLinkPlayerDataExchangeComplete lsls r0, r0, #0x18 cmp r0, #0 beq _081D4660 @@ -960373,7 +960373,7 @@ sub_081D4694: @ 0x081D4694 push {r4, lr} ldr r0, _081D46D4 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 lsls r4, r0, #2 @@ -960395,7 +960395,7 @@ sub_081D4694: @ 0x081D4694 strh r0, [r4, #6] strb r1, [r4, #0xe] movs r0, #0x40 - bl sub_08000BDC + bl AllocZeroed str r0, [r4, #0x10] pop {r4} pop {r0} @@ -960490,7 +960490,7 @@ _081D479C: adds r0, r4, #0 adds r0, #9 ldr r1, _081D47B4 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 bne _081D47AC b _081D4B0A @@ -960524,19 +960524,19 @@ _081D47DC: beq _081D47E6 b _081D497C _081D47E6: - bl sub_08009384 + bl CloseLink b _081D48DC _081D47EC: adds r0, r4, #0 adds r0, #9 ldr r1, _081D4810 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 bne _081D47FC b _081D4B0A _081D47FC: ldr r0, _081D4814 - bl sub_0801832C + bl AddTextPrinterToWindow1 adds r0, r4, #0 bl sub_081D46DC movs r0, #5 @@ -960580,21 +960580,21 @@ _081D4850: beq _081D4874 movs r0, #5 bl sub_080A306C - bl sub_08009384 + bl CloseLink adds r0, r4, #0 bl sub_081D46DC b _081D49DA .align 2, 0 _081D4870: .4byte gUnknown_3002360 _081D4874: - bl sub_0800A770 + bl GetLinkPlayerCount_2 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 bls _081D4890 adds r0, r4, #0 bl sub_081D46DC - bl sub_08009384 + bl CloseLink movs r0, #7 strb r0, [r4, #8] b _081D4B0A @@ -960604,7 +960604,7 @@ _081D4890: beq _081D48AE movs r0, #5 bl sub_080A306C - bl sub_08009384 + bl CloseLink adds r0, r4, #0 bl sub_081D46DC movs r0, #8 @@ -960618,7 +960618,7 @@ _081D48AE: bne _081D48BC b _081D4B0A _081D48BC: - bl sub_08009384 + bl CloseLink bl sub_081D44B0 adds r0, r4, #0 bl sub_081D46DC @@ -960627,7 +960627,7 @@ _081D48CC: adds r0, r4, #0 adds r0, #9 ldr r1, _081D48E4 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 bne _081D48DC b _081D4B0A @@ -960639,7 +960639,7 @@ _081D48DC: _081D48E4: .4byte gUnknown_85CCF72 _081D48E8: ldr r0, _081D4900 - bl sub_0801832C + bl AddTextPrinterToWindow1 ldr r0, _081D4904 ldr r1, _081D4908 ldr r2, _081D490C @@ -960682,7 +960682,7 @@ _081D4940: adds r0, r4, #0 bl sub_081D46DC ldr r0, _081D4958 - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #0xb strb r0, [r4, #8] b _081D4B0A @@ -960704,7 +960704,7 @@ _081D496C: _081D4972: bl sub_081D44B0 ldr r0, _081D4984 - bl sub_0801832C + bl AddTextPrinterToWindow1 _081D497C: movs r0, #0xd strb r0, [r4, #8] @@ -960736,7 +960736,7 @@ _081D49A8: @ jump table .4byte _081D49E0 @ case 5 _081D49C0: ldr r0, _081D49CC - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #0xe strb r0, [r4, #8] b _081D4B0A @@ -960745,13 +960745,13 @@ _081D49CC: .4byte gUnknown_85CCFAD _081D49D0: movs r0, #5 bl sub_080A306C - bl sub_08009384 + bl CloseLink _081D49DA: movs r0, #0x17 strb r0, [r4, #8] b _081D4B0A _081D49E0: - bl sub_08009384 + bl CloseLink movs r0, #0x15 strb r0, [r4, #8] b _081D4B0A @@ -960761,16 +960761,16 @@ _081D49EA: cmp r0, #0 beq _081D49FA _081D49F4: - bl sub_08009384 + bl CloseLink b _081D4A40 _081D49FA: - bl sub_0800A114 + bl GetBlockReceivedStatus lsls r0, r0, #0x18 cmp r0, #0 bne _081D4A06 b _081D4B0A _081D4A06: - bl sub_0800A178 + bl ResetBlockReceivedFlags movs r0, #0xf strb r0, [r4, #8] b _081D4B0A @@ -960808,7 +960808,7 @@ _081D4A46: cmp r0, #0 beq _081D4A6C ldr r0, _081D4A68 - bl sub_0801832C + bl AddTextPrinterToWindow1 adds r0, r4, #0 bl sub_081D46DC movs r0, #0x12 @@ -960828,17 +960828,17 @@ _081D4A72: cmp r0, #0 beq _081D4B0A ldr r0, _081D4A94 - bl sub_0801832C + bl AddTextPrinterToWindow1 movs r0, #0xb9 lsls r0, r0, #1 - bl sub_080A29AC + bl PlayFanfare movs r0, #0x13 strb r0, [r4, #8] b _081D4B0A .align 2, 0 _081D4A94: .4byte gUnknown_85CD01D _081D4A98: - bl sub_080A29E8 + bl IsFanfareTaskInactive lsls r0, r0, #0x18 cmp r0, #0 beq _081D4B0A @@ -960853,7 +960853,7 @@ _081D4AB0: adds r0, r4, #0 adds r0, #9 ldr r1, _081D4AC4 - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton _081D4ABA: cmp r0, #0 beq _081D4B0A @@ -960881,7 +960881,7 @@ _081D4AE0: adds r0, #9 ldr r1, _081D4AF4 _081D4AE6: - bl sub_080183A4 + bl MG_PrintTextOnWindow1AndWaitButton cmp r0, #0 beq _081D4B0A _081D4AEE: @@ -960892,23 +960892,23 @@ _081D4AEE: _081D4AF4: .4byte gUnknown_85CD043 _081D4AF8: ldr r0, [r4, #0x10] - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask ldr r0, _081D4B10 - bl sub_08000540 + bl SetMainCallback2 _081D4B0A: pop {r4, r5} pop {r0} bx r0 .align 2, 0 -_081D4B10: .4byte sub_08018138 +_081D4B10: .4byte MainCB_FreeAllBuffersAndReturnToInitTitleScreen thumb_func_end sub_081D4704 thumb_func_start sub_081D4B14 sub_081D4B14: @ 0x081D4B14 push {lr} - bl sub_081D4D0C + bl SetUpDataStruct ldr r1, _081D4B34 ldr r0, _081D4B38 ldrh r0, [r0] @@ -960958,8 +960958,8 @@ _081D4B78: .4byte gUnknown_3005AEC _081D4B7C: .4byte 0x00003D68 thumb_func_end sub_081D4B3C - thumb_func_start sub_081D4B80 -sub_081D4B80: @ 0x081D4B80 + thumb_func_start GetFloorId +GetFloorId: @ 0x081D4B80 ldr r0, _081D4B8C ldrb r0, [r0, #0x12] adds r0, #0x61 @@ -960968,10 +960968,10 @@ sub_081D4B80: @ 0x081D4B80 bx lr .align 2, 0 _081D4B8C: .4byte gUnknown_2036FB8 - thumb_func_end sub_081D4B80 + thumb_func_end GetFloorId - thumb_func_start sub_081D4B90 -sub_081D4B90: @ 0x081D4B90 + thumb_func_start GetTrainerHillOpponentClass +GetTrainerHillOpponentClass: @ 0x081D4B90 lsls r0, r0, #0x18 movs r1, #0xff lsls r1, r1, #0x18 @@ -960989,10 +960989,10 @@ sub_081D4B90: @ 0x081D4B90 .align 2, 0 _081D4BAC: .4byte gUnknown_82EFF52 _081D4BB0: .4byte gUnknown_203CC24 - thumb_func_end sub_081D4B90 + thumb_func_end GetTrainerHillOpponentClass - thumb_func_start sub_081D4BB4 -sub_081D4BB4: @ 0x081D4BB4 + thumb_func_start ScrCmd_showmonpic +ScrCmd_showmonpic: @ 0x081D4BB4 push {r4, lr} adds r4, r0, #0 lsls r1, r1, #0x18 @@ -961017,15 +961017,15 @@ _081D4BCA: bx r0 .align 2, 0 _081D4BE0: .4byte gUnknown_203CC24 - thumb_func_end sub_081D4BB4 + thumb_func_end ScrCmd_showmonpic - thumb_func_start sub_081D4BE4 -sub_081D4BE4: @ 0x081D4BE4 + thumb_func_start GetTrainerHillTrainerFrontSpriteId +GetTrainerHillTrainerFrontSpriteId: @ 0x081D4BE4 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_081D4D0C + bl SetUpDataStruct subs r4, #1 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -961055,7 +961055,7 @@ sub_081D4BE4: @ 0x081D4BE4 .align 2, 0 _081D4C28: .4byte gUnknown_203CC20 _081D4C2C: .4byte gUnknown_82EFF00 - thumb_func_end sub_081D4BE4 + thumb_func_end GetTrainerHillTrainerFrontSpriteId thumb_func_start sub_081D4C30 sub_081D4C30: @ 0x081D4C30 @@ -961064,10 +961064,10 @@ sub_081D4C30: @ 0x081D4C30 mov r6, sb mov r5, r8 push {r5, r6, r7} - bl sub_081D4D0C + bl SetUpDataStruct ldr r4, _081D4CE0 movs r0, #0x14 - bl sub_08000BDC + bl AllocZeroed str r0, [r4] movs r6, #0 ldr r0, _081D4CE4 @@ -961158,7 +961158,7 @@ sub_081D4CF0: @ 0x081D4CF0 ldr r0, [r4] cmp r0, #0 beq _081D4D02 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _081D4D02: @@ -961169,26 +961169,26 @@ _081D4D02: _081D4D08: .4byte gUnknown_203CC24 thumb_func_end sub_081D4CF0 - thumb_func_start sub_081D4D0C -sub_081D4D0C: @ 0x081D4D0C + thumb_func_start SetUpDataStruct +SetUpDataStruct: @ 0x081D4D0C push {r4, lr} ldr r4, _081D4D38 ldr r0, [r4] cmp r0, #0 bne _081D4D54 ldr r0, _081D4D3C - bl sub_08000BDC + bl AllocZeroed str r0, [r4] ldr r1, _081D4D40 ldrb r1, [r1, #0x12] adds r1, #0x61 strb r1, [r0] - bl sub_081D31B4 + bl ReadTrainerHillAndValidate cmp r0, #1 bne _081D4D44 ldr r0, [r4] adds r0, #4 - bl sub_081D318C + bl TryReadTrainerHill b _081D4D54 .align 2, 0 _081D4D38: .4byte gUnknown_203CC20 @@ -961208,7 +961208,7 @@ _081D4D54: .align 2, 0 _081D4D5C: .4byte gUnknown_85FAF38 _081D4D60: .4byte 0x040003B2 - thumb_func_end sub_081D4D0C + thumb_func_end SetUpDataStruct thumb_func_start sub_081D4D64 sub_081D4D64: @ 0x081D4D64 @@ -961217,7 +961217,7 @@ sub_081D4D64: @ 0x081D4D64 ldr r0, [r4] cmp r0, #0 beq _081D4D76 - bl sub_08000BF0 + bl Free movs r0, #0 str r0, [r4] _081D4D76: @@ -961228,8 +961228,8 @@ _081D4D76: _081D4D7C: .4byte gUnknown_203CC20 thumb_func_end sub_081D4D64 - thumb_func_start sub_081D4D80 -sub_081D4D80: @ 0x081D4D80 + thumb_func_start CopyTrainerHillTrainerText +CopyTrainerHillTrainerText: @ 0x081D4D80 push {r4, r5, r6, lr} adds r4, r1, #0 lsls r0, r0, #0x18 @@ -961237,8 +961237,8 @@ sub_081D4D80: @ 0x081D4D80 adds r6, r5, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_081D4D0C - bl sub_081D4B80 + bl SetUpDataStruct + bl GetFloorId lsls r0, r0, #0x18 lsrs r2, r0, #0x18 subs r4, #1 @@ -961274,7 +961274,7 @@ _081D4DB8: lsls r0, r0, #2 adds r0, r0, r1 adds r0, #0x10 - bl sub_081637CC + bl FrontierSpeechToString b _081D4E60 .align 2, 0 _081D4DE0: .4byte gUnknown_203CC20 @@ -961295,7 +961295,7 @@ _081D4DE4: lsls r0, r0, #2 adds r0, r0, r1 adds r0, #0x1c - bl sub_081637CC + bl FrontierSpeechToString b _081D4E60 .align 2, 0 _081D4E0C: .4byte gUnknown_203CC20 @@ -961316,7 +961316,7 @@ _081D4E10: lsls r0, r0, #2 adds r0, r0, r1 adds r0, #0x28 - bl sub_081637CC + bl FrontierSpeechToString b _081D4E60 .align 2, 0 _081D4E38: .4byte gUnknown_203CC20 @@ -961337,7 +961337,7 @@ _081D4E3C: lsls r0, r0, #2 adds r0, r0, r1 adds r0, #0x34 - bl sub_081637CC + bl FrontierSpeechToString _081D4E60: bl sub_081D4D64 pop {r4, r5, r6} @@ -961345,13 +961345,13 @@ _081D4E60: bx r0 .align 2, 0 _081D4E6C: .4byte gUnknown_203CC20 - thumb_func_end sub_081D4D80 + thumb_func_end CopyTrainerHillTrainerText - thumb_func_start sub_081D4E70 -sub_081D4E70: @ 0x081D4E70 + thumb_func_start TrainerHillStartChallenge +TrainerHillStartChallenge: @ 0x081D4E70 push {r4, r5, r6, lr} bl sub_081D5360 - bl sub_081D31B4 + bl ReadTrainerHillAndValidate cmp r0, #0 bne _081D4E98 ldr r3, _081D4E90 @@ -961435,7 +961435,7 @@ _081D4F1C: .4byte 0x00003D6C _081D4F20: .4byte 0x00003D64 _081D4F24: .4byte gUnknown_3005AF0 _081D4F28: .4byte gUnknown_2023FDE - thumb_func_end sub_081D4E70 + thumb_func_end TrainerHillStartChallenge thumb_func_start sub_081D4F2C sub_081D4F2C: @ 0x081D4F2C @@ -961482,7 +961482,7 @@ sub_081D4F78: @ 0x081D4F78 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - bl sub_081D5F98 + bl AllocOamMatrix lsls r0, r0, #0x10 lsrs r5, r0, #0x10 ldr r0, _081D4FB0 @@ -961514,7 +961514,7 @@ _081D4FBC: .4byte gUnknown_2037290 _081D4FC0: adds r0, r5, #0 movs r1, #1 - bl sub_080D6140 + bl AddBagItem lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #1 @@ -961623,8 +961623,8 @@ _081D50A0: .4byte gUnknown_3005AEC _081D50A4: .4byte 0x00003D6E thumb_func_end sub_081D5024 - thumb_func_start sub_081D50A8 -sub_081D50A8: @ 0x081D50A8 + thumb_func_start TrainerHillResumeTimer +TrainerHillResumeTimer: @ 0x081D50A8 push {lr} ldr r0, _081D50D0 ldr r2, [r0] @@ -961656,10 +961656,10 @@ _081D50E6: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D50A8 + thumb_func_end TrainerHillResumeTimer - thumb_func_start sub_081D50EC -sub_081D50EC: @ 0x081D50EC + thumb_func_start TrainerHillSetPlayerLost +TrainerHillSetPlayerLost: @ 0x081D50EC ldr r0, _081D5100 ldr r1, [r0] ldr r0, _081D5104 @@ -961672,10 +961672,10 @@ sub_081D50EC: @ 0x081D50EC .align 2, 0 _081D5100: .4byte gUnknown_3005AEC _081D5104: .4byte 0x00003D6E - thumb_func_end sub_081D50EC + thumb_func_end TrainerHillSetPlayerLost - thumb_func_start sub_081D5108 -sub_081D5108: @ 0x081D5108 + thumb_func_start TrainerHillGetChallengeStatus +TrainerHillGetChallengeStatus: @ 0x081D5108 push {lr} ldr r0, _081D512C ldr r0, [r0] @@ -961720,7 +961720,7 @@ _081D5158: bx r0 .align 2, 0 _081D5160: .4byte gUnknown_2037290 - thumb_func_end sub_081D5108 + thumb_func_end TrainerHillGetChallengeStatus thumb_func_start sub_081D5164 sub_081D5164: @ 0x081D5164 @@ -961788,7 +961788,7 @@ _081D51F0: .4byte gUnknown_2021C68 thumb_func_start sub_081D51F4 sub_081D51F4: @ 0x081D51F4 push {lr} - bl sub_081D4D0C + bl SetUpDataStruct ldr r0, _081D5218 ldr r1, [r0] ldrb r0, [r1, #6] @@ -961821,7 +961821,7 @@ _081D5234: .4byte gUnknown_2037290 thumb_func_start sub_081D5238 sub_081D5238: @ 0x081D5238 push {r4, lr} - bl sub_081D4D0C + bl SetUpDataStruct ldr r0, _081D5260 ldrh r1, [r0, #0x12] movs r0, #0xcf @@ -961859,7 +961859,7 @@ _081D526C: ands r0, r1 cmp r0, #0 bne _081D52DC - bl sub_081D31B4 + bl ReadTrainerHillAndValidate cmp r0, #0 bne _081D52DC _081D5296: @@ -961922,7 +961922,7 @@ sub_081D52F0: @ 0x081D52F0 ands r0, r1 cmp r0, #0 bne _081D531A - bl sub_081D5A38 + bl GetCurrentTrainerHillMapId lsls r0, r0, #0x18 cmp r0, #0 bne _081D532C @@ -962034,7 +962034,7 @@ sub_081D53CC: @ 0x081D53CC add r0, sp, #0xc movs r2, #0xa bl memcpy - bl sub_081D4D0C + bl SetUpDataStruct movs r0, #0xd8 str r0, [sp] movs r0, #0x90 @@ -962055,7 +962055,7 @@ sub_081D53CC: @ 0x081D53CC movs r1, #1 movs r2, #0x44 movs r3, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r7, [sp] movs r1, #0 str r1, [sp, #4] @@ -962065,7 +962065,7 @@ sub_081D53CC: @ 0x081D53CC movs r1, #1 movs r2, #0 movs r3, #0x78 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _081D5570 ldr r0, [r0] ldrb r0, [r0, #6] @@ -962114,7 +962114,7 @@ sub_081D53CC: @ 0x081D53CC ldr r4, _081D5588 ldr r1, _081D558C adds r0, r4, #0 - bl sub_08008BCC + bl StringExpandPlaceholders str r7, [sp] movs r0, #0 str r0, [sp, #4] @@ -962122,7 +962122,7 @@ sub_081D53CC: @ 0x081D53CC movs r1, #1 movs r2, #0x30 movs r3, #0x84 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _081D5590 ldr r0, [r0] ldr r1, _081D5594 @@ -962158,7 +962158,7 @@ _081D54D2: movs r0, #0 movs r1, #1 movs r2, #0xc - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r0, _081D5574 ldr r0, [r0] ldr r1, _081D5578 @@ -962193,7 +962193,7 @@ _081D551E: movs r1, #1 movs r2, #0x24 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r7, [sp] str r6, [sp, #4] mov r0, sb @@ -962202,7 +962202,7 @@ _081D551E: movs r1, #1 movs r2, #0x90 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r5, #1 cmp r5, #1 ble _081D551E @@ -962271,7 +962271,7 @@ _081D55BE: movs r1, #1 movs r2, #0x24 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 ldr r1, _081D5640 str r1, [sp] movs r2, #0 @@ -962286,7 +962286,7 @@ _081D55BE: movs r1, #1 movs r2, #0x90 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r0, #0xa2 lsls r0, r0, #1 adds r7, r7, r0 @@ -962329,7 +962329,7 @@ _081D5650: movs r0, #0 movs r1, #1 movs r2, #0xc - bl sub_08199AFC + bl AddTextPrinterParameterized3 movs r5, #0 lsls r0, r4, #1 mov r8, r0 @@ -962352,7 +962352,7 @@ _081D567E: movs r1, #1 movs r2, #0x24 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 str r7, [sp] str r6, [sp, #4] mov r0, sb @@ -962361,7 +962361,7 @@ _081D567E: movs r1, #1 movs r2, #0x90 adds r3, r4, #0 - bl sub_08199AFC + bl AddTextPrinterParameterized3 adds r5, #1 cmp r5, #1 ble _081D567E @@ -962370,10 +962370,10 @@ _081D567E: ble _081D5650 _081D56C2: movs r0, #0 - bl sub_0800365C + bl PutWindowTilemap movs r0, #0 movs r1, #3 - bl sub_08003528 + bl CopyWindowToVram bl sub_081D4D64 add sp, #0x20 pop {r3, r4, r5} @@ -962416,7 +962416,7 @@ sub_081D56F0: @ 0x081D56F0 bl sub_081D5840 cmp r0, #0 beq _081D5806 - bl sub_081D4D0C + bl SetUpDataStruct movs r7, #0 ldr r4, _081D581C ldr r3, _081D5820 @@ -962445,7 +962445,7 @@ _081D571E: ldr r2, _081D5828 mov r0, sp bl CpuSet - bl sub_081D4B80 + bl GetFloorId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -962483,7 +962483,7 @@ _081D575C: adds r0, r0, r4 adds r1, r1, r0 ldrb r0, [r1, #0x18] - bl sub_08165EC4 + bl FacilityClassToGraphicsId strb r0, [r5, #1] mov r0, sl ldr r3, [r0] @@ -962563,7 +962563,7 @@ sub_081D5840: @ 0x081D5840 push {r4, r5, lr} sub sp, #4 movs r5, #1 - bl sub_081D4D0C + bl SetUpDataStruct ldr r4, _081D589C ldr r3, [r4] ldr r0, _081D58A0 @@ -962581,7 +962581,7 @@ sub_081D5840: @ 0x081D5840 ands r0, r1 cmp r0, #0 bne _081D588E - bl sub_081D31B4 + bl ReadTrainerHillAndValidate cmp r0, #0 bne _081D588E _081D5874: @@ -962667,16 +962667,16 @@ sub_081D590C: @ 0x081D590C mov r6, r8 push {r6, r7} adds r4, r0, #0 - bl sub_081D5A38 + bl GetCurrentTrainerHillMapId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 cmp r0, #6 bne _081D592A - bl sub_080876D8 + bl InitMapFromSavedGame b _081D59FC _081D592A: - bl sub_081D4D0C + bl SetUpDataStruct ldr r0, _081D5964 ldr r3, [r0] ldr r0, _081D5968 @@ -962694,7 +962694,7 @@ _081D592A: ands r0, r1 cmp r0, #0 bne _081D5974 - bl sub_081D31B4 + bl ReadTrainerHillAndValidate cmp r0, #0 bne _081D5974 _081D5958: @@ -962710,11 +962710,11 @@ _081D5974: mov r0, sb cmp r0, #5 bne _081D5984 - bl sub_080876D8 + bl InitMapFromSavedGame bl sub_081D4D64 b _081D59FC _081D5984: - bl sub_081D4B80 + bl GetFloorId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sb, r0 @@ -962809,8 +962809,8 @@ _081D5A30: .4byte gUnknown_2036FB8 _081D5A34: .4byte 0xFFFFFE61 thumb_func_end InTrainerHill - thumb_func_start sub_081D5A38 -sub_081D5A38: @ 0x081D5A38 + thumb_func_start GetCurrentTrainerHillMapId +GetCurrentTrainerHillMapId: @ 0x081D5A38 push {lr} ldr r0, _081D5A48 ldrh r2, [r0, #0x12] @@ -962864,7 +962864,7 @@ _081D5A94: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D5A38 + thumb_func_end GetCurrentTrainerHillMapId thumb_func_start sub_081D5A9C sub_081D5A9C: @ 0x081D5A9C @@ -962956,13 +962956,13 @@ _081D5B30: .4byte gUnknown_3005AF0 _081D5B34: .4byte 0x00000CB2 thumb_func_end sub_081D5B1C - thumb_func_start sub_081D5B38 -sub_081D5B38: @ 0x081D5B38 + thumb_func_start GetHillTrainerFlag +GetHillTrainerFlag: @ 0x081D5B38 push {r4, lr} adds r4, r0, #0 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - bl sub_081D4B80 + bl GetFloorId lsls r0, r0, #0x18 lsrs r0, r0, #0x17 ldr r2, _081D5B78 @@ -962992,14 +962992,14 @@ sub_081D5B38: @ 0x081D5B38 _081D5B78: .4byte gUnknown_2036FF0 _081D5B7C: .4byte gUnknown_3005AF0 _081D5B80: .4byte gUnknown_82FACB4 - thumb_func_end sub_081D5B38 + thumb_func_end GetHillTrainerFlag - thumb_func_start sub_081D5B84 -sub_081D5B84: @ 0x081D5B84 + thumb_func_start SetHillTrainerFlag +SetHillTrainerFlag: @ 0x081D5B84 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - bl sub_081D4B80 + bl GetFloorId lsls r0, r0, #0x19 lsrs r4, r0, #0x18 movs r3, #0 @@ -963092,7 +963092,7 @@ _081D5C3E: pop {r4, r5, r6, r7} pop {r0} bx r0 - thumb_func_end sub_081D5B84 + thumb_func_end SetHillTrainerFlag thumb_func_start sub_081D5C48 sub_081D5C48: @ 0x081D5C48 @@ -963108,7 +963108,7 @@ sub_081D5C50: @ 0x081D5C50 ldr r0, _081D5C64 ldrh r1, [r0] movs r0, #5 - bl sub_081D4D80 + bl CopyTrainerHillTrainerText bl sub_08097C40 pop {r0} bx r0 @@ -963135,12 +963135,12 @@ sub_081D5C68: @ 0x081D5C68 bhi _081D5D06 lsls r0, r1, #0x18 lsrs r6, r0, #0x18 - bl sub_081D4D0C - bl sub_08165AC0 + bl SetUpDataStruct + bl GetHighestLevelInPlayerParty lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov sl, r0 - bl sub_081D4B80 + bl GetFloorId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r8, r0 @@ -963207,8 +963207,8 @@ _081D5D18: .4byte gUnknown_20243E8 _081D5D1C: .4byte gUnknown_203CC20 thumb_func_end sub_081D5C68 - thumb_func_start sub_081D5D20 -sub_081D5D20: @ 0x081D5D20 + thumb_func_start FillHillTrainerParty +FillHillTrainerParty: @ 0x081D5D20 push {lr} bl ZeroEnemyPartyMons ldr r0, _081D5D34 @@ -963219,10 +963219,10 @@ sub_081D5D20: @ 0x081D5D20 bx r0 .align 2, 0 _081D5D34: .4byte gUnknown_203886A - thumb_func_end sub_081D5D20 + thumb_func_end FillHillTrainerParty - thumb_func_start sub_081D5D38 -sub_081D5D38: @ 0x081D5D38 + thumb_func_start FillHillTrainersParties +FillHillTrainersParties: @ 0x081D5D38 push {lr} bl ZeroEnemyPartyMons ldr r0, _081D5D58 @@ -963238,7 +963238,7 @@ sub_081D5D38: @ 0x081D5D38 .align 2, 0 _081D5D58: .4byte gUnknown_203886A _081D5D5C: .4byte gUnknown_203886C - thumb_func_end sub_081D5D38 + thumb_func_end FillHillTrainersParties thumb_func_start sub_081D5D60 sub_081D5D60: @ 0x081D5D60 @@ -963252,7 +963252,7 @@ sub_081D5D64: @ 0x081D5D64 adds r4, r0, #0 lsls r4, r4, #0x10 lsrs r4, r4, #0x10 - bl sub_081D4D0C + bl SetUpDataStruct subs r4, #1 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 @@ -963310,7 +963310,7 @@ sub_081D5DCC: @ 0x081D5DCC adds r0, r4, #0 movs r1, #0xb movs r2, #0 - bl sub_0806A058 + bl GetMonData lsls r0, r0, #0x10 lsrs r0, r0, #0x10 ldr r5, _081D5E28 @@ -963333,13 +963333,13 @@ sub_081D5DCC: @ 0x081D5DCC add r2, sp, #4 adds r0, r4, #0 movs r1, #0x19 - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 movs r1, #0x38 mov r2, sp - bl sub_0806A774 + bl SetMonData adds r0, r4, #0 - bl sub_0806884C + bl CalculateMonStats add sp, #8 pop {r4, r5} pop {r0} @@ -963352,7 +963352,7 @@ _081D5E2C: .4byte gUnknown_82F0D54 thumb_func_start sub_081D5E30 sub_081D5E30: @ 0x081D5E30 push {r4, lr} - bl sub_081D4D0C + bl SetUpDataStruct ldr r0, _081D5E48 ldr r0, [r0] ldrb r4, [r0, #6] @@ -963388,7 +963388,7 @@ sub_081D5E60: @ 0x081D5E60 ldr r0, _081D5E78 movs r1, #0x70 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette _081D5E74: pop {r0} bx r0 @@ -963452,7 +963452,7 @@ sub_081D5ED4: @ 0x081D5ED4 lsls r0, r0, #0x18 cmp r0, #0 beq _081D5F00 - bl sub_081D5A38 + bl GetCurrentTrainerHillMapId lsls r0, r0, #0x18 lsrs r0, r0, #0x18 cmp r0, #6 @@ -963553,8 +963553,8 @@ _081D5F82: _081D5F94: .4byte gUnknown_203CC20 thumb_func_end sub_081D5F40 - thumb_func_start sub_081D5F98 -sub_081D5F98: @ 0x081D5F98 + thumb_func_start AllocOamMatrix +AllocOamMatrix: @ 0x081D5F98 push {r4, lr} movs r3, #0 movs r2, #0 @@ -963650,10 +963650,10 @@ _081D6042: _081D6050: .4byte gUnknown_85FB8B8 _081D6054: .4byte gUnknown_3005AEC _081D6058: .4byte 0x00003D64 - thumb_func_end sub_081D5F98 + thumb_func_end AllocOamMatrix - thumb_func_start sub_081D605C -sub_081D605C: @ 0x081D605C + thumb_func_start DoRayquazaScene +DoRayquazaScene: @ 0x081D605C push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -963666,7 +963666,7 @@ sub_081D605C: @ 0x081D605C lsrs r5, r5, #0x18 ldr r6, _081D609C ldr r0, _081D60A0 - bl sub_08000BDC + bl AllocZeroed str r0, [r6] ldr r1, _081D60A4 adds r0, r0, r1 @@ -963678,7 +963678,7 @@ sub_081D605C: @ 0x081D605C adds r0, r0, r1 strb r5, [r0] ldr r0, _081D60AC - bl sub_08000540 + bl SetMainCallback2 pop {r3} mov r8, r3 pop {r4, r5, r6} @@ -963689,23 +963689,23 @@ _081D609C: .4byte gUnknown_203CC2C _081D60A0: .4byte 0x00002018 _081D60A4: .4byte 0x00002006 _081D60A8: .4byte 0x00002007 -_081D60AC: .4byte sub_081D60B0 - thumb_func_end sub_081D605C +_081D60AC: .4byte CB2_InitRayquazaScene + thumb_func_end DoRayquazaScene - thumb_func_start sub_081D60B0 -sub_081D60B0: @ 0x081D60B0 + thumb_func_start CB2_InitRayquazaScene +CB2_InitRayquazaScene: @ 0x081D60B0 push {lr} - bl sub_08121E58 + bl SetVBlankHBlankCallbacksToNull bl sub_08199640 - bl sub_080B9710 + bl ScanlineEffect_Stop bl FreeAllSpritePalettes bl ResetPaletteFade bl ResetSpriteData - bl sub_080A8818 + bl ResetTasks movs r0, #0 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1238 + bl FillPalette ldr r1, _081D60FC ldr r0, _081D6100 ldr r0, [r0] @@ -963716,9 +963716,9 @@ sub_081D60B0: @ 0x081D60B0 adds r0, r0, r1 ldr r0, [r0] movs r1, #0 - bl sub_080A8878 + bl CreateTask ldr r0, _081D6108 - bl sub_08000540 + bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 @@ -963726,34 +963726,34 @@ _081D60FC: .4byte gUnknown_85FB99C _081D6100: .4byte gUnknown_203CC2C _081D6104: .4byte 0x00002006 _081D6108: .4byte sub_081D610C - thumb_func_end sub_081D60B0 + thumb_func_end CB2_InitRayquazaScene thumb_func_start sub_081D610C sub_081D610C: @ 0x081D610C push {lr} - bl sub_080A89D4 - bl sub_080066D8 + bl RunTasks + bl AnimateSprites bl BuildOamBuffer - bl sub_08199668 - bl sub_080A12E4 + bl do_scheduled_bg_tilemap_copies_to_vram + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 thumb_func_end sub_081D610C - thumb_func_start sub_081D6128 -sub_081D6128: @ 0x081D6128 + thumb_func_start VBlankCB_RayquazaScene +VBlankCB_RayquazaScene: @ 0x081D6128 push {lr} - bl sub_08006EA0 - bl sub_08007144 + bl LoadOam + bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D6128 + thumb_func_end VBlankCB_RayquazaScene - thumb_func_start sub_081D613C -sub_081D613C: @ 0x081D613C + thumb_func_start Task_EndAfterFadeScreen +Task_EndAfterFadeScreen: @ 0x081D613C push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -963768,11 +963768,11 @@ sub_081D613C: @ 0x081D613C ldr r4, _081D6178 ldr r0, [r4] ldr r0, [r0] - bl sub_08000540 + bl SetMainCallback2 ldr r0, [r4] - bl sub_08000BF0 + bl Free adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081D616C: pop {r4, r5} pop {r0} @@ -963780,10 +963780,10 @@ _081D616C: .align 2, 0 _081D6174: .4byte gUnknown_2037C74 _081D6178: .4byte gUnknown_203CC2C - thumb_func_end sub_081D613C + thumb_func_end Task_EndAfterFadeScreen - thumb_func_start sub_081D617C -sub_081D617C: @ 0x081D617C + thumb_func_start Task_SetNextAnim +Task_SetNextAnim: @ 0x081D617C push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r3, r0, #0x18 @@ -963815,7 +963815,7 @@ _081D61B0: .4byte gUnknown_2037C74 _081D61B4: .4byte gUnknown_203CC2C _081D61B8: .4byte 0x00002007 _081D61BC: .4byte gUnknown_3005B60 -_081D61C0: .4byte sub_081D613C +_081D61C0: .4byte Task_EndAfterFadeScreen _081D61C4: ldr r4, _081D61F4 adds r1, r1, r4 @@ -963848,7 +963848,7 @@ _081D61F4: .4byte 0x00002006 _081D61F8: .4byte 0x00002004 _081D61FC: .4byte gUnknown_3005B60 _081D6200: .4byte gUnknown_85FB99C - thumb_func_end sub_081D617C + thumb_func_end Task_SetNextAnim thumb_func_start sub_081D6204 sub_081D6204: @ 0x081D6204 @@ -963892,8 +963892,8 @@ sub_081D6240: @ 0x081D6240 .align 2, 0 thumb_func_end sub_081D6240 - thumb_func_start sub_081D6258 -sub_081D6258: @ 0x081D6258 + thumb_func_start Task_HandleDuoFightPre +Task_HandleDuoFightPre: @ 0x081D6258 push {r4, r5, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -963933,7 +963933,7 @@ _081D629A: bne _081D62B4 adds r0, r4, #0 movs r1, #0 - bl sub_081D6EF0 + bl DuoFightEnd b _081D62BA _081D62B0: bl sub_081D6E04 @@ -963945,7 +963945,7 @@ _081D62BA: pop {r4, r5} pop {r0} bx r0 - thumb_func_end sub_081D6258 + thumb_func_end Task_HandleDuoFightPre thumb_func_start sub_081D62C0 sub_081D62C0: @ 0x081D62C0 @@ -963957,7 +963957,7 @@ sub_081D62C0: @ 0x081D62C0 movs r1, #0x58 movs r2, #0x48 movs r3, #3 - bl sub_08006B0C + bl CreateSprite adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -963977,7 +963977,7 @@ sub_081D62C0: @ 0x081D62C0 movs r1, #0x38 movs r2, #0x68 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -963985,7 +963985,7 @@ sub_081D62C0: @ 0x081D62C0 movs r1, #0x4b movs r2, #0x65 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #2] @@ -963993,7 +963993,7 @@ sub_081D62C0: @ 0x081D62C0 movs r1, #0x6d movs r2, #0x72 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #4] @@ -964211,7 +964211,7 @@ sub_081D64B8: @ 0x081D64B8 movs r1, #0x88 movs r2, #0x60 movs r3, #1 - bl sub_08006B0C + bl CreateSprite mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -964233,14 +964233,14 @@ sub_081D64B8: @ 0x081D64B8 movs r1, #0xa8 movs r2, #0x60 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4] adds r0, r5, #0 movs r1, #0x88 movs r2, #0x70 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4] @@ -964250,14 +964250,14 @@ sub_081D64B8: @ 0x081D64B8 movs r1, #0xa8 movs r2, #0x70 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #2] adds r0, r5, #0 movs r1, #0x88 movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -964267,14 +964267,14 @@ sub_081D64B8: @ 0x081D64B8 movs r1, #0xa8 movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #4] adds r0, r5, #0 movs r1, #0x68 movs r2, #0x80 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -964284,14 +964284,14 @@ sub_081D64B8: @ 0x081D64B8 movs r1, #0x88 movs r2, #0x80 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #6] adds r0, r5, #0 movs r1, #0xb8 movs r2, #0x80 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #6] @@ -964301,14 +964301,14 @@ sub_081D64B8: @ 0x081D64B8 movs r1, #0xd0 movs r2, #0x84 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #8] ldr r0, _081D6658 movs r1, #0xc8 movs r2, #0x78 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #8] @@ -964748,20 +964748,20 @@ _081D6904: .align 2, 0 thumb_func_end sub_081D665C - thumb_func_start sub_081D690C -sub_081D690C: @ 0x081D690C + thumb_func_start VBlankCB_DuoFight +VBlankCB_DuoFight: @ 0x081D690C push {lr} - bl sub_081D6128 - bl sub_080B9800 + bl VBlankCB_RayquazaScene + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D690C + thumb_func_end VBlankCB_DuoFight thumb_func_start sub_081D691C sub_081D691C: @ 0x081D691C push {r4, lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081D6998 @@ -964772,34 +964772,34 @@ sub_081D691C: @ 0x081D691C ldr r1, [r4] adds r1, #4 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D69A0 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D69A4 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -964823,9 +964823,9 @@ sub_081D69A8: @ 0x081D69A8 str r0, [sp] movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _081D69BE: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D69BE @@ -964847,23 +964847,23 @@ _081D69BE: ldr r0, _081D6A4C movs r1, #0 movs r2, #0x40 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081D6A50 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D6A54 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D6A58 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D6A5C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D6A60 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D6A64 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D6A68 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _081D6A6C - bl sub_080343E4 + bl LoadCompressedSpritePalette add sp, #4 pop {r4} pop {r0} @@ -964887,8 +964887,8 @@ _081D6A68: .4byte gUnknown_85FBBC8 _081D6A6C: .4byte gUnknown_85FBCD8 thumb_func_end sub_081D69A8 - thumb_func_start sub_081D6A70 -sub_081D6A70: @ 0x081D6A70 + thumb_func_start Task_DuoFightAnim +Task_DuoFightAnim: @ 0x081D6A70 push {r4, r5, r6, r7, lr} sub sp, #8 lsls r0, r0, #0x18 @@ -964898,7 +964898,7 @@ sub_081D6A70: @ 0x081D6A70 lsls r6, r1, #3 ldr r7, _081D6AE8 adds r5, r6, r7 - bl sub_080B9750 + bl ScanlineEffect_Clear bl sub_081D691C bl sub_081D69A8 movs r4, #0 @@ -964911,11 +964911,11 @@ sub_081D6A70: @ 0x081D6A70 ldr r0, [r2] ldr r1, [r2, #4] ldr r2, [r2, #8] - bl sub_080B9790 + bl ScanlineEffect_SetParams strh r4, [r5] ldr r0, _081D6AF8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r5, #2] @@ -964948,7 +964948,7 @@ _081D6AF4: .4byte gUnknown_85FBB78 _081D6AF8: .4byte sub_081D6B64 _081D6AFC: .4byte gUnknown_203CC2C _081D6B00: .4byte 0x00002006 -_081D6B04: .4byte sub_081D6258 +_081D6B04: .4byte Task_HandleDuoFightPre _081D6B08: bl sub_081D6FA0 lsls r0, r0, #0x18 @@ -964963,23 +964963,23 @@ _081D6B08: adds r0, r6, r0 ldr r1, _081D6B5C str r1, [r0] - bl sub_080A27F8 + bl StopMapMusic _081D6B2A: movs r4, #1 rsbs r4, r4, #0 adds r0, r4, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes movs r0, #0 str r0, [sp] adds r0, r4, #0 movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r0, _081D6B60 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0x53 bl sub_080A306C add sp, #8 @@ -964987,9 +964987,9 @@ _081D6B2A: pop {r0} bx r0 .align 2, 0 -_081D6B5C: .4byte sub_081D6CA8 -_081D6B60: .4byte sub_081D690C - thumb_func_end sub_081D6A70 +_081D6B5C: .4byte Task_HandleDuoFight +_081D6B60: .4byte VBlankCB_DuoFight + thumb_func_end Task_DuoFightAnim thumb_func_start sub_081D6B64 sub_081D6B64: @ 0x081D6B64 @@ -965162,8 +965162,8 @@ _081D6C9A: bx r0 thumb_func_end sub_081D6B64 - thumb_func_start sub_081D6CA8 -sub_081D6CA8: @ 0x081D6CA8 + thumb_func_start Task_HandleDuoFight +Task_HandleDuoFight: @ 0x081D6CA8 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r5, r0, #0x18 @@ -965213,7 +965213,7 @@ _081D6CFC: bne _081D6D64 adds r0, r5, #0 movs r1, #2 - bl sub_081D6EF0 + bl DuoFightEnd b _081D6D6A _081D6D14: movs r1, #0x91 @@ -965253,7 +965253,7 @@ _081D6D14: adds r0, r0, r2 ldrh r1, [r4, #6] strh r1, [r0, #0xe] - bl sub_080B9710 + bl ScanlineEffect_Stop _081D6D64: ldrh r0, [r4] adds r0, #1 @@ -965264,7 +965264,7 @@ _081D6D6A: bx r0 .align 2, 0 _081D6D70: .4byte sub_081D6E68 - thumb_func_end sub_081D6CA8 + thumb_func_end Task_HandleDuoFight thumb_func_start sub_081D6D74 sub_081D6D74: @ 0x081D6D74 @@ -965376,12 +965376,12 @@ sub_081D6E48: @ 0x081D6E48 lsls r1, r1, #3 movs r0, #2 movs r2, #1 - bl sub_08001D1C + bl ChangeBgX movs r1, #0x80 lsls r1, r1, #4 movs r0, #2 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY pop {r0} bx r0 .align 2, 0 @@ -965413,11 +965413,11 @@ sub_081D6E68: @ 0x081D6E68 adds r0, r0, r4 bl sub_081D7650 movs r0, #1 - bl sub_08001FD0 + bl GetBgY lsls r0, r0, #0x10 lsrs r4, r0, #0x10 movs r0, #1 - bl sub_08001FD0 + bl GetBgY cmp r0, #0 beq _081D6EB6 movs r0, #0x80 @@ -965429,7 +965429,7 @@ _081D6EB6: lsls r1, r1, #3 movs r0, #1 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY _081D6EC2: ldrh r2, [r5] movs r1, #0 @@ -965455,8 +965455,8 @@ _081D6EE8: .4byte gUnknown_3005B68 _081D6EEC: .4byte gUnknown_20205AC thumb_func_end sub_081D6E68 - thumb_func_start sub_081D6EF0 -sub_081D6EF0: @ 0x081D6EF0 + thumb_func_start DuoFightEnd +DuoFightEnd: @ 0x081D6EF0 push {r4, r5, lr} sub sp, #4 adds r5, r0, #0 @@ -965476,7 +965476,7 @@ sub_081D6EF0: @ 0x081D6EF0 adds r1, r4, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081D6F34 lsls r0, r5, #2 adds r0, r0, r5 @@ -965490,11 +965490,11 @@ sub_081D6EF0: @ 0x081D6EF0 bx r0 .align 2, 0 _081D6F34: .4byte gUnknown_3005B60 -_081D6F38: .4byte sub_081D6F3C - thumb_func_end sub_081D6EF0 +_081D6F38: .4byte Task_DuoFightEnd + thumb_func_end DuoFightEnd - thumb_func_start sub_081D6F3C -sub_081D6F3C: @ 0x081D6F3C + thumb_func_start Task_DuoFightEnd +Task_DuoFightEnd: @ 0x081D6F3C push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -965513,14 +965513,14 @@ sub_081D6F3C: @ 0x081D6F3C cmp r4, #0 bne _081D6F8E ldrb r0, [r5, #2] - bl sub_080A8964 + bl DestroyTask movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r0, #0 - bl sub_080006F0 - bl sub_080B9710 + bl SetVBlankCallback + bl ScanlineEffect_Stop bl ResetSpriteData bl FreeAllSpritePalettes strh r4, [r5] @@ -965536,8 +965536,8 @@ _081D6F8E: .align 2, 0 _081D6F94: .4byte gUnknown_3005B68 _081D6F98: .4byte gUnknown_2037C74 -_081D6F9C: .4byte sub_081D617C - thumb_func_end sub_081D6F3C +_081D6F9C: .4byte Task_SetNextAnim + thumb_func_end Task_DuoFightEnd thumb_func_start sub_081D6FA0 sub_081D6FA0: @ 0x081D6FA0 @@ -965549,7 +965549,7 @@ sub_081D6FA0: @ 0x081D6FA0 movs r1, #0x62 movs r2, #0x48 movs r3, #3 - bl sub_08006B0C + bl CreateSprite adds r5, r0, #0 lsls r5, r5, #0x18 lsrs r5, r5, #0x18 @@ -965569,7 +965569,7 @@ sub_081D6FA0: @ 0x081D6FA0 movs r1, #0x42 movs r2, #0x68 movs r3, #3 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4] @@ -965577,7 +965577,7 @@ sub_081D6FA0: @ 0x081D6FA0 movs r1, #0x55 movs r2, #0x65 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #2] @@ -965585,7 +965585,7 @@ sub_081D6FA0: @ 0x081D6FA0 movs r1, #0x77 movs r2, #0x72 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #4] @@ -965855,7 +965855,7 @@ sub_081D71F8: @ 0x081D71F8 movs r1, #0x7e movs r2, #0x60 movs r3, #1 - bl sub_08006B0C + bl CreateSprite mov r8, r0 mov r0, r8 lsls r0, r0, #0x18 @@ -965877,14 +965877,14 @@ sub_081D71F8: @ 0x081D71F8 movs r1, #0x9e movs r2, #0x60 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4] adds r0, r5, #0 movs r1, #0x7e movs r2, #0x70 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4] @@ -965894,14 +965894,14 @@ sub_081D71F8: @ 0x081D71F8 movs r1, #0x9e movs r2, #0x70 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #2] adds r0, r5, #0 movs r1, #0x7e movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #2] @@ -965911,14 +965911,14 @@ sub_081D71F8: @ 0x081D71F8 movs r1, #0x9e movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #4] adds r0, r5, #0 movs r1, #0x5e movs r2, #0x80 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #4] @@ -965928,14 +965928,14 @@ sub_081D71F8: @ 0x081D71F8 movs r1, #0x7e movs r2, #0x80 movs r3, #2 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #6] adds r0, r5, #0 movs r1, #0xae movs r2, #0x80 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #6] @@ -965945,14 +965945,14 @@ sub_081D71F8: @ 0x081D71F8 movs r1, #0xc6 movs r2, #0x84 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #8 strh r0, [r4, #8] ldr r0, _081D7398 movs r1, #0xbe movs r2, #0x78 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldrh r1, [r4, #8] @@ -966525,10 +966525,10 @@ _081D7744: _081D7748: .4byte gUnknown_20205AC thumb_func_end sub_081D7650 - thumb_func_start sub_081D774C -sub_081D774C: @ 0x081D774C + thumb_func_start MoveSelectionDisplayPpString +MoveSelectionDisplayPpString: @ 0x081D774C push {r4, lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081D77C8 @@ -966539,34 +966539,34 @@ sub_081D774C: @ 0x081D774C ldr r1, [r4] adds r1, #4 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D77D0 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D77D4 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -966578,7 +966578,7 @@ _081D77C8: .4byte gUnknown_85FBD50 _081D77CC: .4byte gUnknown_203CC2C _081D77D0: .4byte 0x00000804 _081D77D4: .4byte 0x00001004 - thumb_func_end sub_081D774C + thumb_func_end MoveSelectionDisplayPpString thumb_func_start sub_081D77D8 sub_081D77D8: @ 0x081D77D8 @@ -966591,21 +966591,21 @@ sub_081D77D8: @ 0x081D77D8 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081D785C str r4, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081D7860 str r4, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _081D780C: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D780C @@ -966627,11 +966627,11 @@ _081D780C: ldr r0, _081D787C movs r1, #0 movs r2, #0x40 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081D7880 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D7884 - bl sub_080343E4 + bl LoadCompressedSpritePalette add sp, #4 pop {r4} pop {r0} @@ -966651,8 +966651,8 @@ _081D7880: .4byte gUnknown_85FBD8C _081D7884: .4byte gUnknown_85FBD94 thumb_func_end sub_081D77D8 - thumb_func_start sub_081D7888 -sub_081D7888: @ 0x081D7888 + thumb_func_start Task_RayTakesFlightAnim +Task_RayTakesFlightAnim: @ 0x081D7888 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -966663,8 +966663,8 @@ sub_081D7888: @ 0x081D7888 adds r6, r4, r5 movs r0, #0xe8 lsls r0, r0, #1 - bl sub_080A27D8 - bl sub_081D774C + bl PlayNewMapMusic + bl MoveSelectionDisplayPpString bl sub_081D77D8 movs r1, #0x94 lsls r1, r1, #2 @@ -966677,12 +966677,12 @@ sub_081D7888: @ 0x081D7888 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _081D78F0 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081D78F4 movs r1, #0 - bl sub_080A8878 + bl CreateTask movs r0, #0 strh r0, [r6] strh r0, [r6, #2] @@ -966696,13 +966696,13 @@ sub_081D7888: @ 0x081D7888 .align 2, 0 _081D78E8: .4byte gUnknown_3005B68 _081D78EC: .4byte 0x00000808 -_081D78F0: .4byte sub_081D6128 +_081D78F0: .4byte VBlankCB_RayquazaScene _081D78F4: .4byte sub_081D7AE0 -_081D78F8: .4byte sub_081D78FC - thumb_func_end sub_081D7888 +_081D78F8: .4byte Task_HandleRayTakesFlight + thumb_func_end Task_RayTakesFlightAnim - thumb_func_start sub_081D78FC -sub_081D78FC: @ 0x081D78FC + thumb_func_start Task_HandleRayTakesFlight +Task_HandleRayTakesFlight: @ 0x081D78FC push {r4, r5, r6, lr} sub sp, #0x10 lsls r0, r0, #0x18 @@ -966743,7 +966743,7 @@ _081D7930: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade strh r5, [r4, #4] movs r0, #0x1e strh r0, [r4, #6] @@ -966821,7 +966821,7 @@ _081D79B4: str r0, [sp, #0xc] movs r0, #2 movs r3, #0x78 - bl sub_0800200C + bl SetBgAffine b _081D7A96 _081D79E0: ldrh r0, [r4, #2] @@ -966850,7 +966850,7 @@ _081D79E0: str r5, [sp, #0xc] movs r0, #2 movs r3, #0x78 - bl sub_0800200C + bl SetBgAffine ldrh r0, [r4, #0xe] ldrh r1, [r4, #0xc] adds r0, r0, r1 @@ -966882,7 +966882,7 @@ _081D7A30: movs r1, #6 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade b _081D7A96 .align 2, 0 _081D7A5C: .4byte 0x00000127 @@ -966909,19 +966909,19 @@ _081D7A60: str r0, [sp, #0xc] movs r0, #2 movs r3, #0x78 - bl sub_0800200C + bl SetBgAffine adds r0, r6, #0 - bl sub_081D7AA0 + bl Task_RayTakesFlightEnd _081D7A96: add sp, #0x10 pop {r4, r5, r6} pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D78FC + thumb_func_end Task_HandleRayTakesFlight - thumb_func_start sub_081D7AA0 -sub_081D7AA0: @ 0x081D7AA0 + thumb_func_start Task_RayTakesFlightEnd +Task_RayTakesFlightEnd: @ 0x081D7AA0 push {r4, lr} lsls r0, r0, #0x18 lsrs r4, r0, #0x18 @@ -966932,7 +966932,7 @@ sub_081D7AA0: @ 0x081D7AA0 cmp r0, #0 bne _081D7ACE movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes ldr r0, _081D7AD8 @@ -966949,8 +966949,8 @@ _081D7ACE: .align 2, 0 _081D7AD4: .4byte gUnknown_2037C74 _081D7AD8: .4byte gUnknown_3005B60 -_081D7ADC: .4byte sub_081D617C - thumb_func_end sub_081D7AA0 +_081D7ADC: .4byte Task_SetNextAnim + thumb_func_end Task_RayTakesFlightEnd thumb_func_start sub_081D7AE0 sub_081D7AE0: @ 0x081D7AE0 @@ -966992,7 +966992,7 @@ sub_081D7AE0: @ 0x081D7AE0 adds r2, r2, r3 asrs r2, r2, #0x10 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 ldr r1, _081D7B88 @@ -967026,7 +967026,7 @@ sub_081D7AE0: @ 0x081D7AE0 cmp r0, #9 bne _081D7B8C adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask b _081D7B96 .align 2, 0 _081D7B7C: .4byte gUnknown_3005B68 @@ -967094,7 +967094,7 @@ _081D7BE8: .4byte gUnknown_85FBDB4 thumb_func_start sub_081D7BEC sub_081D7BEC: @ 0x081D7BEC push {r4, lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081D7C80 @@ -967105,43 +967105,43 @@ sub_081D7BEC: @ 0x081D7BEC ldr r1, [r4] adds r1, #4 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D7C88 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D7C8C adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D7C90 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0x82 lsls r1, r1, #5 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -967167,16 +967167,16 @@ sub_081D7C94: @ 0x081D7C94 movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081D7D44 str r4, [sp] movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram add r7, sp, #8 _081D7CBC: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r6, #0 @@ -967216,18 +967216,18 @@ _081D7CBC: ldr r0, _081D7D6C movs r1, #0 movs r2, #0x40 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081D7D70 ldr r1, _081D7D74 strh r1, [r0] ldr r0, _081D7D78 strh r1, [r0] ldr r0, _081D7D7C - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D7D80 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D7D84 - bl sub_080343E4 + bl LoadCompressedSpritePalette add sp, #0xc pop {r4, r5, r6, r7} pop {r0} @@ -967335,8 +967335,8 @@ _081D7E1C: _081D7E24: .4byte 0x0000200A thumb_func_end sub_081D7D88 - thumb_func_start sub_081D7E28 -sub_081D7E28: @ 0x081D7E28 + thumb_func_start Task_RayDescendsAnim +Task_RayDescendsAnim: @ 0x081D7E28 push {r4, r5, r6, lr} mov r6, r8 push {r6} @@ -967351,7 +967351,7 @@ sub_081D7E28: @ 0x081D7E28 bl sub_081D7C94 ldr r1, _081D7EA0 movs r0, #0x50 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x80 lsls r0, r0, #5 mov r8, r0 @@ -967362,9 +967362,9 @@ sub_081D7E28: @ 0x081D7E28 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _081D7EA4 - bl sub_080006F0 + bl SetVBlankCallback ldr r0, _081D7EA8 ldr r0, [r0] ldr r1, _081D7EAC @@ -967392,15 +967392,15 @@ sub_081D7E28: @ 0x081D7E28 .align 2, 0 _081D7E9C: .4byte gUnknown_3005B68 _081D7EA0: .4byte 0x00001E41 -_081D7EA4: .4byte sub_081D6128 +_081D7EA4: .4byte VBlankCB_RayquazaScene _081D7EA8: .4byte gUnknown_203CC2C _081D7EAC: .4byte 0x00002008 _081D7EB0: .4byte 0x0000200A -_081D7EB4: .4byte sub_081D7EB8 - thumb_func_end sub_081D7E28 +_081D7EB4: .4byte Task_HandleRayDescends + thumb_func_end Task_RayDescendsAnim - thumb_func_start sub_081D7EB8 -sub_081D7EB8: @ 0x081D7EB8 + thumb_func_start Task_HandleRayDescends +Task_HandleRayDescends: @ 0x081D7EB8 push {r4, r5, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -967441,7 +967441,7 @@ _081D7EF8: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade strh r4, [r5, #2] b _081D7F8A _081D7F18: @@ -967463,7 +967463,7 @@ _081D7F18: adds r0, #1 strh r0, [r5] ldr r0, _081D7F4C - bl sub_080006FC + bl SetHBlankCallback movs r0, #3 bl EnableInterrupts b _081D7FB0 @@ -967514,7 +967514,7 @@ _081D7F92: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081D7FB8 lsls r0, r4, #2 adds r0, r0, r4 @@ -967530,7 +967530,7 @@ _081D7FB0: .align 2, 0 _081D7FB8: .4byte gUnknown_3005B60 _081D7FBC: .4byte sub_081D7FC0 - thumb_func_end sub_081D7EB8 + thumb_func_end Task_HandleRayDescends thumb_func_start sub_081D7FC0 sub_081D7FC0: @ 0x081D7FC0 @@ -967544,9 +967544,9 @@ sub_081D7FC0: @ 0x081D7FC0 cmp r0, #0 bne _081D7FF4 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 - bl sub_080006FC + bl SetHBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes ldr r0, _081D8000 @@ -967563,7 +967563,7 @@ _081D7FF4: .align 2, 0 _081D7FFC: .4byte gUnknown_2037C74 _081D8000: .4byte gUnknown_3005B60 -_081D8004: .4byte sub_081D617C +_081D8004: .4byte Task_SetNextAnim thumb_func_end sub_081D7FC0 thumb_func_start sub_081D8008 @@ -967575,7 +967575,7 @@ sub_081D8008: @ 0x081D8008 movs r1, #0xa0 movs r2, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite adds r6, r0, #0 lsls r6, r6, #0x18 lsrs r6, r6, #0x18 @@ -967590,7 +967590,7 @@ sub_081D8008: @ 0x081D8008 rsbs r2, r2, #0 movs r1, #0xb8 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 mov r1, r8 @@ -967753,7 +967753,7 @@ _081D8160: .4byte gUnknown_20205AC thumb_func_start sub_081D8164 sub_081D8164: @ 0x081D8164 push {r4, lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081D81F8 @@ -967764,43 +967764,43 @@ sub_081D8164: @ 0x081D8164 ldr r1, [r4] adds r1, #4 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D8200 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D8204 adds r1, r1, r0 movs r0, #2 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D8208 adds r1, r1, r0 movs r0, #3 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #3 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0xc1 lsls r1, r1, #6 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #3 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -967826,21 +967826,21 @@ sub_081D820C: @ 0x081D820C movs r0, #1 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081D8290 str r4, [sp] movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081D8294 str r4, [sp] movs r0, #3 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _081D8240: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D8240 @@ -967867,7 +967867,7 @@ _081D8240: ldr r0, _081D82B8 movs r1, #0 movs r2, #0x80 - bl sub_080A11BC + bl LoadCompressedPalette add sp, #4 pop {r4} pop {r0} @@ -967887,8 +967887,8 @@ _081D82B4: .4byte 0x00001804 _081D82B8: .4byte gUnknown_8DA912C thumb_func_end sub_081D820C - thumb_func_start sub_081D82BC -sub_081D82BC: @ 0x081D82BC + thumb_func_start Task_RayChargesAnim +Task_RayChargesAnim: @ 0x081D82BC push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -967904,15 +967904,15 @@ sub_081D82BC: @ 0x081D82BC rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _081D8310 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 strh r0, [r6] strh r0, [r6, #2] ldr r0, _081D8314 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #4] @@ -967925,13 +967925,13 @@ sub_081D82BC: @ 0x081D82BC bx r0 .align 2, 0 _081D830C: .4byte gUnknown_3005B68 -_081D8310: .4byte sub_081D6128 +_081D8310: .4byte VBlankCB_RayquazaScene _081D8314: .4byte sub_081D8414 -_081D8318: .4byte sub_081D831C - thumb_func_end sub_081D82BC +_081D8318: .4byte Task_HandleRayCharges + thumb_func_end Task_RayChargesAnim - thumb_func_start sub_081D831C -sub_081D831C: @ 0x081D831C + thumb_func_start Task_HandleRayCharges +Task_HandleRayCharges: @ 0x081D831C push {r4, r5, r6, lr} sub sp, #4 lsls r0, r0, #0x18 @@ -967990,7 +967990,7 @@ _081D837A: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade strh r5, [r4, #2] b _081D83D6 _081D8398: @@ -968040,7 +968040,7 @@ _081D83E4: str r1, [sp] movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldr r1, _081D840C lsls r0, r6, #2 adds r0, r0, r6 @@ -968056,8 +968056,8 @@ _081D8402: bx r0 .align 2, 0 _081D840C: .4byte gUnknown_3005B60 -_081D8410: .4byte sub_081D8528 - thumb_func_end sub_081D831C +_081D8410: .4byte Task_RayChargesEnd + thumb_func_end Task_HandleRayCharges thumb_func_start sub_081D8414 sub_081D8414: @ 0x081D8414 @@ -968082,7 +968082,7 @@ sub_081D8414: @ 0x081D8414 lsls r1, r1, #8 movs r0, #1 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX bl Random ands r4, r0 subs r4, #4 @@ -968090,7 +968090,7 @@ sub_081D8414: @ 0x081D8414 movs r0, #1 adds r1, r4, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY _081D8458: ldrh r0, [r5, #0x1e] adds r0, #1 @@ -968119,11 +968119,11 @@ sub_081D8468: @ 0x081D8468 movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #1 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY ldrh r0, [r4] adds r0, #1 strh r0, [r4] @@ -968143,13 +968143,13 @@ _081D84AC: lsls r1, r1, #8 movs r0, #1 movs r2, #2 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 ldrsh r1, [r4, r0] lsls r1, r1, #8 movs r0, #1 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY ldrh r0, [r4, #4] ldrh r1, [r4, #2] adds r0, r0, r1 @@ -968180,28 +968180,28 @@ sub_081D84F0: @ 0x081D84F0 movs r0, #2 adds r1, r4, #0 movs r2, #2 - bl sub_08001D1C + bl ChangeBgX movs r0, #2 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY movs r4, #0x80 lsls r4, r4, #4 movs r0, #0 adds r1, r4, #0 movs r2, #2 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 adds r1, r4, #0 movs r2, #1 - bl sub_08001E94 + bl ChangeBgY pop {r4} pop {r0} bx r0 thumb_func_end sub_081D84F0 - thumb_func_start sub_081D8528 -sub_081D8528: @ 0x081D8528 + thumb_func_start Task_RayChargesEnd +Task_RayChargesEnd: @ 0x081D8528 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -968218,10 +968218,10 @@ sub_081D8528: @ 0x081D8528 cmp r0, #0 bne _081D8562 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl sub_081D6240 ldrb r0, [r4, #4] - bl sub_080A8964 + bl DestroyTask adds r0, r6, #0 subs r0, #8 adds r0, r5, r0 @@ -968234,13 +968234,13 @@ _081D8562: .align 2, 0 _081D8568: .4byte gUnknown_3005B68 _081D856C: .4byte gUnknown_2037C74 -_081D8570: .4byte sub_081D617C - thumb_func_end sub_081D8528 +_081D8570: .4byte Task_SetNextAnim + thumb_func_end Task_RayChargesEnd thumb_func_start sub_081D8574 sub_081D8574: @ 0x081D8574 push {r4, lr} - bl sub_08121D90 + bl ResetVramOamAndBgCntRegs movs r0, #0 bl ResetBgsAndClearDma3BusyFlags ldr r1, _081D85F0 @@ -968251,34 +968251,34 @@ sub_081D8574: @ 0x081D8574 ldr r1, [r4] adds r1, #4 movs r0, #0 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D85F8 adds r1, r1, r0 movs r0, #1 - bl sub_0800212C + bl SetBgTilemapBuffer ldr r1, [r4] ldr r0, _081D85FC adds r1, r1, r0 movs r0, #2 - bl sub_0800212C - bl sub_08121E00 + bl SetBgTilemapBuffer + bl ResetAllBgsCoordinates movs r0, #0 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #1 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r0, #2 - bl sub_08199654 + bl schedule_bg_copy_tilemap_to_vram movs r1, #0xc1 lsls r1, r1, #6 movs r0, #0 bl SetGpuReg movs r0, #0 - bl sub_08001B48 + bl ShowBg movs r0, #1 - bl sub_08001B48 + bl ShowBg movs r0, #2 - bl sub_08001B48 + bl ShowBg movs r0, #0x50 movs r1, #0 bl SetGpuReg @@ -968303,15 +968303,15 @@ sub_081D8600: @ 0x081D8600 movs r0, #2 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram ldr r1, _081D86A8 str r4, [sp] movs r0, #0 movs r2, #0 movs r3, #0 - bl sub_08199728 + bl decompress_and_copy_tile_data_to_vram _081D8626: - bl sub_081996DC + bl free_temp_tile_data_buffers_if_possible lsls r0, r0, #0x18 cmp r0, #0 bne _081D8626 @@ -968333,27 +968333,27 @@ _081D8626: ldr r0, _081D86C4 movs r1, #0 movs r2, #0x60 - bl sub_080A11BC + bl LoadCompressedPalette ldr r0, _081D86C8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D86CC - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D86D0 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D86D4 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D86D8 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D86DC - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D86E0 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _081D86E4 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _081D86E8 - bl sub_080343E4 + bl LoadCompressedSpritePalette ldr r0, _081D86EC - bl sub_080343E4 + bl LoadCompressedSpritePalette add sp, #4 pop {r4} pop {r0} @@ -968380,8 +968380,8 @@ _081D86E8: .4byte gUnknown_85FBF64 _081D86EC: .4byte gUnknown_85FBF6C thumb_func_end sub_081D8600 - thumb_func_start sub_081D86F0 -sub_081D86F0: @ 0x081D86F0 + thumb_func_start Task_RayChasesAwayAnim +Task_RayChasesAwayAnim: @ 0x081D86F0 push {r4, r5, r6, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -968396,7 +968396,7 @@ sub_081D86F0: @ 0x081D86F0 movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits ldr r1, _081D87A8 movs r0, #0x50 bl SetGpuReg @@ -968407,9 +968407,9 @@ sub_081D86F0: @ 0x081D86F0 rsbs r0, r0, #0 movs r1, #0x10 movs r2, #0 - bl sub_080A22E8 + bl BlendPalettes ldr r0, _081D87B0 - bl sub_080006F0 + bl SetVBlankCallback movs r0, #0 strh r0, [r6] strh r0, [r6, #2] @@ -968419,7 +968419,7 @@ sub_081D86F0: @ 0x081D86F0 str r0, [r4] ldr r0, _081D87B8 movs r1, #0 - bl sub_080A8878 + bl CreateTask lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r6, #4] @@ -968467,13 +968467,13 @@ sub_081D86F0: @ 0x081D86F0 _081D87A4: .4byte gUnknown_3005B68 _081D87A8: .4byte 0x00000241 _081D87AC: .4byte 0x00000E09 -_081D87B0: .4byte sub_081D6128 -_081D87B4: .4byte sub_081D87BC +_081D87B0: .4byte VBlankCB_RayquazaScene +_081D87B4: .4byte Task_HandleRayChasesAway _081D87B8: .4byte sub_081D88EC - thumb_func_end sub_081D86F0 + thumb_func_end Task_RayChasesAwayAnim - thumb_func_start sub_081D87BC -sub_081D87BC: @ 0x081D87BC + thumb_func_start Task_HandleRayChasesAway +Task_HandleRayChasesAway: @ 0x081D87BC push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -968517,7 +968517,7 @@ _081D87F6: movs r1, #0 movs r2, #0x10 movs r3, #0 - bl sub_080A139C + bl BeginNormalPaletteFade strh r5, [r4, #2] b _081D886C _081D881A: @@ -968608,7 +968608,7 @@ _081D88C0: movs r1, #4 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade mov r0, r8 subs r0, #8 adds r0, r7, r0 @@ -968622,8 +968622,8 @@ _081D88DC: pop {r0} bx r0 .align 2, 0 -_081D88E8: .4byte sub_081D8970 - thumb_func_end sub_081D87BC +_081D88E8: .4byte Task_RayChasesAwayEnd + thumb_func_end Task_HandleRayChasesAway thumb_func_start sub_081D88EC sub_081D88EC: @ 0x081D88EC @@ -968698,8 +968698,8 @@ _081D8960: _081D896C: .4byte gUnknown_3005B68 thumb_func_end sub_081D88EC - thumb_func_start sub_081D8970 -sub_081D8970: @ 0x081D8970 + thumb_func_start Task_RayChasesAwayEnd +Task_RayChasesAwayEnd: @ 0x081D8970 push {r4, r5, r6, r7, lr} lsls r0, r0, #0x18 lsrs r0, r0, #0x18 @@ -968716,18 +968716,18 @@ sub_081D8970: @ 0x081D8970 lsrs r5, r0, #0x18 cmp r5, #0 bne _081D89DC - bl sub_080A27F8 + bl StopMapMusic movs r1, #2 ldrsh r0, [r4, r1] cmp r0, #0 bne _081D89B4 movs r0, #0 - bl sub_080006F0 + bl SetVBlankCallback bl sub_081D6240 bl ResetSpriteData bl FreeAllSpritePalettes ldrb r0, [r4, #4] - bl sub_080A8964 + bl DestroyTask _081D89B4: ldrh r1, [r4, #2] movs r2, #2 @@ -968744,7 +968744,7 @@ _081D89B4: .align 2, 0 _081D89CC: .4byte gUnknown_3005B68 _081D89D0: .4byte gUnknown_2037C74 -_081D89D4: .4byte sub_081D617C +_081D89D4: .4byte Task_SetNextAnim _081D89D8: adds r0, r1, #1 strh r0, [r4, #2] @@ -968753,7 +968753,7 @@ _081D89DC: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D8970 + thumb_func_end Task_RayChasesAwayEnd thumb_func_start sub_081D89E4 sub_081D89E4: @ 0x081D89E4 @@ -968773,7 +968773,7 @@ sub_081D89E4: @ 0x081D89E4 movs r1, #0x40 movs r2, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #6] @@ -968789,7 +968789,7 @@ sub_081D89E4: @ 0x081D89E4 movs r1, #0x10 movs r2, #0x82 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7] @@ -968830,7 +968830,7 @@ sub_081D89E4: @ 0x081D89E4 movs r1, #0xa0 movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #8] @@ -968845,7 +968845,7 @@ sub_081D89E4: @ 0x081D89E4 movs r1, #0xc0 movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7] @@ -968853,7 +968853,7 @@ sub_081D89E4: @ 0x081D89E4 movs r1, #0xe0 movs r2, #0x80 movs r3, #1 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #2] @@ -968914,7 +968914,7 @@ sub_081D89E4: @ 0x081D89E4 rsbs r2, r2, #0 movs r1, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r4, #0xa] @@ -968930,7 +968930,7 @@ sub_081D89E4: @ 0x081D89E4 rsbs r2, r2, #0 movs r1, #0x78 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7] @@ -969368,7 +969368,7 @@ _081D8E8C: movs r1, #0x98 movs r2, #0x84 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x3c] @@ -969391,7 +969391,7 @@ _081D8E8C: movs r1, #0xe0 movs r2, #0x84 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r0, r0, #0x18 strh r0, [r7, #0x3c] @@ -969599,10 +969599,10 @@ _081D903C: movs r0, #0xcb lsls r0, r0, #1 movs r1, #0 - bl sub_080A2B3C + bl PlayCry1 ldr r0, _081D9084 movs r1, #0 - bl sub_080A8878 + bl CreateTask b _081D90DA .align 2, 0 _081D9080: .4byte gUnknown_20205AC @@ -969640,7 +969640,7 @@ _081D90C4: .4byte gUnknown_20205AC _081D90C8: .4byte sub_081D911C _081D90CC: ldr r0, _081D9114 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 bl sub_081D8BB0 @@ -969677,7 +969677,7 @@ _081D910E: pop {r0} bx r0 .align 2, 0 -_081D9114: .4byte sub_081D87BC +_081D9114: .4byte Task_HandleRayChasesAway _081D9118: .4byte gUnknown_20205AC thumb_func_end sub_081D8F58 @@ -969833,11 +969833,11 @@ _081D921E: movs r0, #2 adds r1, r2, #0 movs r3, #0x78 - bl sub_0800200C + bl SetBgAffine movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits movs r0, #0x10 strh r0, [r4, #8] b _081D925E @@ -969905,7 +969905,7 @@ _081D9290: movs r0, #2 adds r1, r2, #0 movs r3, #0x78 - bl sub_0800200C + bl SetBgAffine movs r1, #2 ldrsh r0, [r4, r1] cmp r0, #0xff @@ -969923,9 +969923,9 @@ _081D92E0: movs r1, #0x80 lsls r1, r1, #3 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits adds r0, r5, #0 - bl sub_080A8964 + bl DestroyTask _081D92F0: add sp, #0x10 pop {r4, r5} @@ -969933,8 +969933,8 @@ _081D92F0: bx r0 thumb_func_end sub_081D91F0 - thumb_func_start sub_081D92F8 -sub_081D92F8: @ 0x081D92F8 + thumb_func_start TryBufferWaldaPhrase +TryBufferWaldaPhrase: @ 0x081D92F8 push {r4, lr} bl IsWaldaPhraseEmpty cmp r0, #0 @@ -969954,10 +969954,10 @@ _081D931A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_081D92F8 + thumb_func_end TryBufferWaldaPhrase - thumb_func_start sub_081D9320 -sub_081D9320: @ 0x081D9320 + thumb_func_start DoWaldaNamingScreen +DoWaldaNamingScreen: @ 0x081D9320 push {r4, lr} sub sp, #8 ldr r4, _081D9350 @@ -969973,23 +969973,23 @@ sub_081D9320: @ 0x081D9320 adds r1, r4, #0 movs r2, #0 movs r3, #0 - bl sub_080E2244 + bl DoNamingScreen add sp, #8 pop {r4} pop {r0} bx r0 .align 2, 0 _081D9350: .4byte gUnknown_2021C54 -_081D9354: .4byte sub_081D9358 - thumb_func_end sub_081D9320 +_081D9354: .4byte CB2_HandleGivenWaldaPhrase + thumb_func_end DoWaldaNamingScreen - thumb_func_start sub_081D9358 -sub_081D9358: @ 0x081D9358 + thumb_func_start CB2_HandleGivenWaldaPhrase +CB2_HandleGivenWaldaPhrase: @ 0x081D9358 push {r4, r5, lr} ldr r4, _081D9378 ldr r5, _081D937C adds r0, r5, #0 - bl sub_081D93D4 + bl GetWaldaPhraseInputCase strh r0, [r4] ldrh r0, [r4] cmp r0, #1 @@ -970009,7 +970009,7 @@ _081D9380: cmp r0, #0 beq _081D9398 ldr r0, _081D9394 - bl sub_080D1DFC + bl SetWaldaPhrase b _081D93A4 .align 2, 0 _081D9394: .4byte gUnknown_85FC010 @@ -970019,7 +970019,7 @@ _081D9398: b _081D93A4 _081D939E: adds r0, r5, #0 - bl sub_080D1DFC + bl SetWaldaPhrase _081D93A4: ldr r4, _081D93C4 bl sub_080D1DE8 @@ -970030,19 +970030,19 @@ _081D93A4: ldr r0, _081D93CC str r0, [r1] ldr r0, _081D93D0 - bl sub_08000540 + bl SetMainCallback2 pop {r4, r5} pop {r0} bx r0 .align 2, 0 _081D93C4: .4byte gUnknown_2021C40 _081D93C8: .4byte gUnknown_3005B0C -_081D93CC: .4byte sub_080AEA64 +_081D93CC: .4byte FieldCallback_ReturnToEventScript2 _081D93D0: .4byte sub_08085A30 - thumb_func_end sub_081D9358 + thumb_func_end CB2_HandleGivenWaldaPhrase - thumb_func_start sub_081D93D4 -sub_081D93D4: @ 0x081D93D4 + thumb_func_start GetWaldaPhraseInputCase +GetWaldaPhraseInputCase: @ 0x081D93D4 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4] @@ -970066,10 +970066,10 @@ _081D93F8: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D93D4 + thumb_func_end GetWaldaPhraseInputCase - thumb_func_start sub_081D9400 -sub_081D9400: @ 0x081D9400 + thumb_func_start TryGetWallpaperWithWaldaPhrase +TryGetWallpaperWithWaldaPhrase: @ 0x081D9400 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} @@ -970112,7 +970112,7 @@ sub_081D9400: @ 0x081D9400 _081D945A: mov r1, r8 ldrh r0, [r1] - bl sub_080D1D20 + bl SetWaldaWallpaperLockedOrUnlocked mov r1, r8 ldrb r0, [r1] add sp, #0x10 @@ -970124,7 +970124,7 @@ _081D945A: .align 2, 0 _081D9474: .4byte gUnknown_3005AF0 _081D9478: .4byte gUnknown_2037290 - thumb_func_end sub_081D9400 + thumb_func_end TryGetWallpaperWithWaldaPhrase thumb_func_start sub_081D947C sub_081D947C: @ 0x081D947C @@ -970521,7 +970521,7 @@ _081D9750: adds r0, r0, r1 movs r1, #0x36 _081D9760: - bl sub_0806A058 + bl GetMonData strb r0, [r4] ldr r5, _081D97AC ldr r4, _081D97B0 @@ -970714,7 +970714,7 @@ _081D98D6: ldrb r0, [r4] cmp r0, #4 beq _081D9964 - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _081D9964 @@ -970853,7 +970853,7 @@ sub_081D99E4: @ 0x081D99E4 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 movs r0, #0 - bl sub_080DC5BC + bl SortContestants ldr r1, _081D9A04 ldr r2, _081D9A08 adds r0, r4, #0 @@ -970863,7 +970863,7 @@ sub_081D99E4: @ 0x081D99E4 bx r0 .align 2, 0 _081D9A04: .4byte sub_080FD824 -_081D9A08: .4byte sub_080F8F98 +_081D9A08: .4byte ReceiveOldManData thumb_func_end sub_081D99E4 thumb_func_start sub_081D9A0C @@ -970898,7 +970898,7 @@ sub_081D9A0C: @ 0x081D9A0C .align 2, 0 _081D9A48: .4byte gUnknown_3005B68 _081D9A4C: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081D9ABE @@ -970994,11 +970994,11 @@ sub_081D9AD4: @ 0x081D9AD4 .align 2, 0 _081D9B10: .4byte gUnknown_3005B68 _081D9B14: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _081D9B5E - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081D9B64 @@ -971080,7 +971080,7 @@ sub_081D9B78: @ 0x081D9B78 .align 2, 0 _081D9BC4: .4byte gUnknown_3005B68 _081D9BC8: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081D9C2E @@ -971186,7 +971186,7 @@ sub_081D9C48: @ 0x081D9C48 .align 2, 0 _081D9C94: .4byte gUnknown_3005B68 _081D9C98: - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081D9CFE @@ -971283,11 +971283,11 @@ sub_081D9D18: @ 0x081D9D18 .align 2, 0 _081D9D54: .4byte gUnknown_3005B68 _081D9D58: - bl sub_0800A02C + bl GetMultiplayerId lsls r0, r0, #0x18 cmp r0, #0 bne _081D9DB2 - bl sub_0800A0E4 + bl IsLinkTaskFinished lsls r0, r0, #0x18 cmp r0, #0 beq _081D9DB8 @@ -971337,8 +971337,8 @@ _081D9DC4: .4byte gUnknown_2039AA0 _081D9DC8: .4byte gUnknown_202207C thumb_func_end sub_081D9D18 - thumb_func_start sub_081D9DCC -sub_081D9DCC: @ 0x081D9DCC + thumb_func_start UpdateGymLeaderRematch +UpdateGymLeaderRematch: @ 0x081D9DCC push {lr} ldr r0, _081D9E08 bl FlagGet @@ -971362,7 +971362,7 @@ sub_081D9DCC: @ 0x081D9DCC ldr r0, _081D9E0C movs r1, #8 movs r2, #5 - bl sub_081D9E24 + bl UpdateGymLeaderRematchFromArray b _081D9E1A .align 2, 0 _081D9E08: .4byte 0x00000864 @@ -971371,16 +971371,16 @@ _081D9E10: ldr r0, _081D9E20 movs r1, #7 movs r2, #1 - bl sub_081D9E24 + bl UpdateGymLeaderRematchFromArray _081D9E1A: pop {r0} bx r0 .align 2, 0 _081D9E20: .4byte gUnknown_85FC02C - thumb_func_end sub_081D9DCC + thumb_func_end UpdateGymLeaderRematch - thumb_func_start sub_081D9E24 -sub_081D9E24: @ 0x081D9E24 + thumb_func_start UpdateGymLeaderRematchFromArray +UpdateGymLeaderRematchFromArray: @ 0x081D9E24 push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -971408,7 +971408,7 @@ _081D9E44: cmp r0, #0 bne _081D9E64 adds r0, r1, #0 - bl sub_081D9F1C + bl GetRematchIndex cmp r8, r0 ble _081D9E62 mov r8, r0 @@ -971440,7 +971440,7 @@ _081D9E7E: cmp r0, #0 bne _081D9E9C adds r0, r1, #0 - bl sub_081D9F1C + bl GetRematchIndex cmp r0, r8 bne _081D9E9C adds r6, #1 @@ -971475,7 +971475,7 @@ _081D9EC4: adds r0, r1, #0 str r2, [sp] str r3, [sp, #4] - bl sub_081D9F1C + bl GetRematchIndex ldr r2, [sp] ldr r3, [sp, #4] cmp r0, r8 @@ -971509,10 +971509,10 @@ _081D9F0A: pop {r0} bx r0 .align 2, 0 - thumb_func_end sub_081D9E24 + thumb_func_end UpdateGymLeaderRematchFromArray - thumb_func_start sub_081D9F1C -sub_081D9F1C: @ 0x081D9F1C + thumb_func_start GetRematchIndex +GetRematchIndex: @ 0x081D9F1C push {r4, r5, r6, lr} adds r5, r0, #0 movs r4, #0 @@ -971523,7 +971523,7 @@ _081D9F24: adds r0, r0, r1 adds r0, r0, r6 ldrh r0, [r0] - bl sub_080B108C + bl HasTrainerBeenFought lsls r0, r0, #0x18 cmp r0, #0 bne _081D9F40 @@ -971541,10 +971541,10 @@ _081D9F48: pop {r1} bx r1 .align 2, 0 - thumb_func_end sub_081D9F1C + thumb_func_end GetRematchIndex - thumb_func_start sub_081D9F50 -sub_081D9F50: @ 0x081D9F50 + thumb_func_start StopCry +StopCry: @ 0x081D9F50 push {lr} sub sp, #8 add r1, sp, #4 @@ -971559,9 +971559,9 @@ sub_081D9F50: @ 0x081D9F50 ldr r0, _081D9F90 movs r1, #0xf0 movs r2, #0x20 - bl sub_080A1200 + bl LoadPalette ldr r0, _081D9F94 - bl sub_08034388 + bl LoadCompressedSpriteSheet ldr r0, _081D9F98 bl LoadSpritePalette add sp, #8 @@ -971573,7 +971573,7 @@ _081D9F8C: .4byte gUnknown_85FC218 _081D9F90: .4byte gUnknown_85FC824 _081D9F94: .4byte gUnknown_85FCA0C _081D9F98: .4byte gUnknown_85FCA14 - thumb_func_end sub_081D9F50 + thumb_func_end StopCry thumb_func_start sub_081D9F9C sub_081D9F9C: @ 0x081D9F9C @@ -971610,7 +971610,7 @@ sub_081D9F9C: @ 0x081D9F9C adds r1, r5, #0 adds r2, r6, #0 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r5, r0, #0x18 cmp r7, #1 @@ -971813,7 +971813,7 @@ sub_081DA10C: @ 0x081DA10C adds r1, r6, #0 mov r2, r8 movs r3, #0 - bl sub_08006B0C + bl CreateSprite lsls r0, r0, #0x18 lsrs r6, r0, #0x18 cmp r5, #1 @@ -971911,7 +971911,7 @@ sub_081DA20C: @ 0x081DA20C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x32] - bl sub_0806EFF4 + bl Sin2 lsls r0, r0, #0x10 asrs r0, r0, #0x10 movs r2, #0x36 @@ -972054,7 +972054,7 @@ sub_081DA31C: @ 0x081DA31C ldrsh r0, [r4, r1] cmp r0, #0 beq _081DA370 - bl sub_081D9F50 + bl StopCry ldr r1, _081DA36C movs r0, #0x50 bl SetGpuReg @@ -972065,16 +972065,16 @@ sub_081DA31C: @ 0x081DA31C movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001D1C + bl ChangeBgX movs r0, #0 movs r1, #0 movs r2, #0 - bl sub_08001E94 + bl ChangeBgY movs r1, #0xa0 lsls r1, r1, #3 movs r0, #0 movs r2, #2 - bl sub_08001E94 + bl ChangeBgY movs r0, #0 strh r0, [r4, #0xa] ldrh r0, [r4, #8] @@ -972088,15 +972088,15 @@ _081DA370: movs r1, #0x80 lsls r1, r1, #6 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r1, #0x80 lsls r1, r1, #7 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits movs r1, #0x80 lsls r1, r1, #1 movs r0, #0 - bl sub_08001220 + bl ClearGpuRegBits ldrh r0, [r4, #0xa] adds r0, #1 strh r0, [r4, #0xa] @@ -972119,7 +972119,7 @@ sub_081DA39C: @ 0x081DA39C movs r1, #0x80 lsls r1, r1, #1 movs r0, #0 - bl sub_08001200 + bl SetGpuRegBits _081DA3B4: ldrh r1, [r4, #0xc] movs r2, #0xc @@ -972138,7 +972138,7 @@ _081DA3B4: adds r0, r1, #0 movs r2, #0 movs r3, #0x10 - bl sub_080A139C + bl BeginNormalPaletteFade ldrh r0, [r4, #8] adds r0, #1 strh r0, [r4, #8] @@ -972286,10 +972286,10 @@ sub_081DA4D0: @ 0x081DA4D0 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DA500 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DA4F4: movs r0, #0 pop {r1} @@ -972397,10 +972397,10 @@ sub_081DA5A8: @ 0x081DA5A8 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DA5D8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DA5CC: movs r0, #0 pop {r1} @@ -972518,10 +972518,10 @@ sub_081DA694: @ 0x081DA694 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DA6C4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DA6B8: movs r0, #0 pop {r1} @@ -972641,10 +972641,10 @@ sub_081DA784: @ 0x081DA784 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DA7B4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DA7A8: movs r0, #0 pop {r1} @@ -972771,10 +972771,10 @@ sub_081DA87C: @ 0x081DA87C adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DA8AC - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DA8A0: movs r0, #0 pop {r1} @@ -972901,10 +972901,10 @@ sub_081DA974: @ 0x081DA974 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DA9A4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DA998: movs r0, #0 pop {r1} @@ -973035,10 +973035,10 @@ sub_081DAA74: @ 0x081DAA74 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DAAA4 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DAA98: movs r0, #0 pop {r1} @@ -973171,10 +973171,10 @@ sub_081DAB78: @ 0x081DAB78 adds r0, r2, #0 bl sub_081DA270 ldr r0, _081DABA8 - bl sub_080A8AE4 + bl FindTaskIdByFunc lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_080A8964 + bl DestroyTask _081DAB9C: movs r0, #0 pop {r1} diff --git a/graph_search.py b/graph_search.py index 6def6f1..81b6576 100644 --- a/graph_search.py +++ b/graph_search.py @@ -209,7 +209,6 @@ def match_iter(instrs, graph, slices=10): # Iteratively try to find a match return matches[0][1] elif not matches: # No match anywhere return None - return None potential = {t[1] for t in matches} # All potential matches for _ in range(slices): # Slice the list randomly and search for matches start = random.randint(1, len(instrs)) @@ -219,8 +218,7 @@ def match_iter(instrs, graph, slices=10): # Iteratively try to find a match elif end < start: start, end = end, start matches = match_instrs(instrs[start:end], graph) - min_len = max((end - start) // 2, 1) - new_set = {t[1]-2*start for t in matches if t[0] >= min_len} + new_set = {t[1]-2*start for t in matches} potential = potential & new_set # Take intersection of old and new locations if not potential: return None diff --git a/pokeemerald_jp.cfg b/pokeemerald_jp.cfg index 7f4269c..fea5b8d 100644 --- a/pokeemerald_jp.cfg +++ b/pokeemerald_jp.cfg @@ -6,41 +6,41 @@ arm_func 0x8000374 _intr.ret thumb_func 0x80003a4 AgbMain thumb_func 0x80004d8 UpdateLinkAndCallCallbacks thumb_func 0x800051c InitMainCallbacks -thumb_func 0x8000540 -thumb_func 0x8000554 -thumb_func 0x8000560 +thumb_func 0x8000540 SetMainCallback2 +thumb_func 0x8000554 StartTimer1 +thumb_func 0x8000560 SeedRngAndSetTrainerId thumb_func 0x8000588 -thumb_func 0x8000594 +thumb_func 0x8000594 EnableVCountIntrAtLine150 thumb_func 0x80005bc InitKeys -thumb_func 0x80005e4 -thumb_func 0x8000684 -thumb_func 0x80006f0 -thumb_func 0x80006fc -thumb_func 0x8000708 -thumb_func 0x8000714 -thumb_func 0x800072c -thumb_func 0x8000738 +thumb_func 0x80005e4 ReadKeys +thumb_func 0x8000684 InitIntrHandlers +thumb_func 0x80006f0 SetVBlankCallback +thumb_func 0x80006fc SetHBlankCallback +thumb_func 0x8000708 SetVCountCallback +thumb_func 0x8000714 RestoreSerialTimer3IntrHandlers +thumb_func 0x800072c SetSerialCallback +thumb_func 0x8000738 VBlankIntr thumb_func 0x8000800 -thumb_func 0x8000814 -thumb_func 0x8000844 -thumb_func 0x8000878 +thumb_func 0x8000814 HBlankIntr +thumb_func 0x8000844 VCountIntr +thumb_func 0x8000878 SerialIntr thumb_func 0x80008a8 nullsub_29 thumb_func 0x80008ac WaitForVBlank thumb_func 0x80008dc thumb_func 0x80008e8 -thumb_func 0x80008f4 -thumb_func 0x8000964 +thumb_func 0x80008f4 DoSoftReset +thumb_func 0x8000964 GetRivalSonDaughterString thumb_func 0x8000988 PutMemBlockHeader thumb_func 0x80009a4 -thumb_func 0x80009b8 +thumb_func 0x80009b8 AllocInternal thumb_func 0x8000a34 -thumb_func 0x8000b14 +thumb_func 0x8000b14 AllocZeroedInternal thumb_func 0x8000b54 CheckMemBlockInternal -thumb_func 0x8000bac +thumb_func 0x8000bac InitHeap thumb_func 0x8000bc8 -thumb_func 0x8000bdc -thumb_func 0x8000bf0 -thumb_func 0x8000c04 +thumb_func 0x8000bdc AllocZeroed +thumb_func 0x8000bf0 Free +thumb_func 0x8000c04 CheckMemBlock thumb_func 0x8000c18 CheckHeap thumb_func 0x8000c48 ClearDma3Requests thumb_func 0x8000c80 ProcessDma3Requests @@ -52,58 +52,58 @@ thumb_func 0x80010cc CopyBufferedValueToGpuReg thumb_func 0x8001110 CopyBufferedValuesToGpuRegs thumb_func 0x8001144 SetGpuReg thumb_func 0x80011d0 GetGpuReg -thumb_func 0x8001200 -thumb_func 0x8001220 +thumb_func 0x8001200 SetGpuRegBits +thumb_func 0x8001220 ClearGpuRegBits thumb_func 0x8001240 SyncRegIE thumb_func 0x8001274 EnableInterrupts thumb_func 0x80012a0 DisableInterrupts -thumb_func 0x80012cc +thumb_func 0x80012cc UpdateRegDispstatIntrBits thumb_func 0x8001308 ResetBgs -thumb_func 0x8001320 -thumb_func 0x800133c +thumb_func 0x8001320 SetBgModeInternal +thumb_func 0x800133c GetBgMode thumb_func 0x800134c ResetBgControlStructs thumb_func 0x800136c Unused_ResetBgControlStruct thumb_func 0x8001398 SetBgControlAttributes -thumb_func 0x80014c4 -thumb_func 0x8001578 -thumb_func 0x8001600 +thumb_func 0x80014c4 GetBgControlAttribute +thumb_func 0x8001578 LoadBgVram +thumb_func 0x8001600 ShowBgInternal thumb_func 0x800167c HideBgInternal -thumb_func 0x80016b0 -thumb_func 0x80016d4 -thumb_func 0x80016f0 +thumb_func 0x80016b0 SyncBgVisibilityAndMode +thumb_func 0x80016d4 SetTextModeAndHideBgs +thumb_func 0x80016f0 SetBgAffineInternal thumb_func 0x80017bc thumb_func 0x80017d0 thumb_func 0x80017d4 ResetBgsAndClearDma3BusyFlags thumb_func 0x8001800 InitBgsFromTemplates thumb_func 0x80018c8 InitBgFromTemplate -thumb_func 0x800194c +thumb_func 0x800194c SetBgMode thumb_func 0x800195c LoadBgTiles thumb_func 0x8001a14 LoadBgTilemap -thumb_func 0x8001a64 -thumb_func 0x8001aec -thumb_func 0x8001b48 -thumb_func 0x8001b5c -thumb_func 0x8001b70 -thumb_func 0x8001c34 -thumb_func 0x8001d1c -thumb_func 0x8001e58 -thumb_func 0x8001e94 -thumb_func 0x8001fd0 -thumb_func 0x800200c -thumb_func 0x800204c -thumb_func 0x800212c -thumb_func 0x8002160 -thumb_func 0x8002194 -thumb_func 0x80021cc -thumb_func 0x8002248 +thumb_func 0x8001a64 Unused_LoadBgPalette +thumb_func 0x8001aec IsDma3ManagerBusyWithBgCopy +thumb_func 0x8001b48 ShowBg +thumb_func 0x8001b5c HideBg +thumb_func 0x8001b70 SetBgAttribute +thumb_func 0x8001c34 GetBgAttribute +thumb_func 0x8001d1c ChangeBgX +thumb_func 0x8001e58 GetBgX +thumb_func 0x8001e94 ChangeBgY +thumb_func 0x8001fd0 GetBgY +thumb_func 0x800200c SetBgAffine +thumb_func 0x800204c Unused_AdjustBgMosaic +thumb_func 0x800212c SetBgTilemapBuffer +thumb_func 0x8002160 UnsetBgTilemapBuffer +thumb_func 0x8002194 GetBgTilemapBuffer +thumb_func 0x80021cc CopyToBgTilemapBuffer +thumb_func 0x8002248 CopyBgTilemapBufferToVram thumb_func 0x80022b0 CopyToBgTilemapBufferRect thumb_func 0x80023b4 CopyToBgTilemapBufferRect_ChangePalette -thumb_func 0x80023f8 +thumb_func 0x80023f8 CopyRectToBgTilemapBufferRect thumb_func 0x80025e0 FillBgTilemapBufferRect_Palette0 thumb_func 0x80026e0 FillBgTilemapBufferRect -thumb_func 0x800271c -thumb_func 0x80028c8 -thumb_func 0x8002938 +thumb_func 0x800271c WriteSequenceToBgTilemapBuffer +thumb_func 0x80028c8 GetBgMetricTextMode +thumb_func 0x8002938 GetBgMetricAffineMode thumb_func 0x8002990 GetTileMapIndexFromCoords thumb_func 0x80029c8 CopyTileMapEntry thumb_func 0x8002a24 @@ -111,83 +111,83 @@ thumb_func 0x8002a78 thumb_func 0x8002a8c IsTileMapOutsideWram thumb_func 0x8002ab8 BlitBitmapRect4BitWithoutColorKey thumb_func 0x8002afc BlitBitmapRect4Bit -thumb_func 0x8002cdc +thumb_func 0x8002cdc FillBitmapRect4Bit thumb_func 0x8002d98 BlitBitmapRect4BitTo8Bit thumb_func 0x8002fe8 FillBitmapRect8Bit thumb_func 0x800308c nullsub_420 -thumb_func 0x8003090 -thumb_func 0x8003250 -thumb_func 0x80033a8 -thumb_func 0x8003444 -thumb_func 0x80034d4 -thumb_func 0x8003528 -thumb_func 0x80035a8 -thumb_func 0x800365c -thumb_func 0x80036bc -thumb_func 0x8003774 -thumb_func 0x80037c4 +thumb_func 0x8003090 InitWindows +thumb_func 0x8003250 AddWindow +thumb_func 0x80033a8 AddWindowWithoutTileMap +thumb_func 0x8003444 RemoveWindow +thumb_func 0x80034d4 FreeAllWindowBuffers +thumb_func 0x8003528 CopyWindowToVram +thumb_func 0x80035a8 CopyWindowRectToVram +thumb_func 0x800365c PutWindowTilemap +thumb_func 0x80036bc PutWindowRectTilemapOverridePalette +thumb_func 0x8003774 ClearWindowTilemap +thumb_func 0x80037c4 PutWindowRectTilemap thumb_func 0x8003874 BlitBitmapToWindow -thumb_func 0x80038ac -thumb_func 0x800396c +thumb_func 0x80038ac BlitBitmapRectToWindow +thumb_func 0x800396c BlitBitmapRectToWindowWithColorKey thumb_func 0x8003a34 -thumb_func 0x8003ac0 -thumb_func 0x8003b18 +thumb_func 0x8003ac0 CopyToWindowPixelBuffer +thumb_func 0x8003b18 FillWindowPixelBuffer thumb_func 0x8003b64 ScrollWindow -thumb_func 0x8003f28 -thumb_func 0x8003f78 -thumb_func 0x800401c +thumb_func 0x8003f28 CallWindowFunction +thumb_func 0x8003f78 SetWindowAttribute +thumb_func 0x800401c GetWindowAttribute thumb_func 0x8004100 thumb_func 0x800412c nullsub_301 -thumb_func 0x8004130 +thumb_func 0x8004130 AddWindow8Bit thumb_func 0x8004238 FillWindowPixelBuffer8Bit thumb_func 0x8004278 FillWindowPixelRect8Bit thumb_func 0x8004304 BlitBitmapRectToWindow4BitTo8Bit -thumb_func 0x80043d0 +thumb_func 0x80043d0 CopyWindowToVram8Bit thumb_func 0x8004448 thumb_func 0x8004474 thumb_func 0x8004480 thumb_func 0x800449c AddTextPrinterParameterized -thumb_func 0x8004548 +thumb_func 0x8004548 AddTextPrinter thumb_func 0x8004630 thumb_func 0x80046a8 -thumb_func 0x80046b8 +thumb_func 0x80046b8 RenderFont thumb_func 0x80046e4 thumb_func 0x8004798 SaveTextColors -thumb_func 0x80047b8 +thumb_func 0x80047b8 RestoreTextColors thumb_func 0x80047c8 thumb_func 0x8004808 GetLastTextColor thumb_func 0x8004850 -thumb_func 0x8004e50 -thumb_func 0x8005358 -thumb_func 0x800538c -thumb_func 0x80053c4 -thumb_func 0x80053fc -thumb_func 0x8005434 -thumb_func 0x800546c -thumb_func 0x80054a4 -thumb_func 0x80054d4 -thumb_func 0x80055ac +thumb_func 0x8004e50 EReader_IsReceivedDataValid +thumb_func 0x8005358 Font0Func +thumb_func 0x800538c Font1Func +thumb_func 0x80053c4 Font2Func +thumb_func 0x80053fc Font3Func +thumb_func 0x8005434 Font4Func +thumb_func 0x800546c Font5Func +thumb_func 0x80054a4 TextPrinterInitDownArrowCounters +thumb_func 0x80054d4 TextPrinterDrawDownArrow +thumb_func 0x80055ac TextPrinterClearDownArrow thumb_func 0x80055e0 TextPrinterWaitAutoMode -thumb_func 0x80055fc -thumb_func 0x8005648 -thumb_func 0x800568c -thumb_func 0x8005760 -thumb_func 0x8005c48 -thumb_func 0x8005d7c +thumb_func 0x80055fc TextPrinterWaitWithDownArrow +thumb_func 0x8005648 TextPrinterWait +thumb_func 0x800568c DrawDownArrow +thumb_func 0x8005760 RenderText +thumb_func 0x8005c48 GetStringWidthFixedWidthFont +thumb_func 0x8005d7c GetFontWidthFunc thumb_func 0x8005dac -thumb_func 0x8005f7c -thumb_func 0x8006124 -thumb_func 0x8006174 -thumb_func 0x8006184 -thumb_func 0x8006194 -thumb_func 0x80061a4 -thumb_func 0x80061b4 +thumb_func 0x8005f7c RenderTextFont9 +thumb_func 0x8006124 DrawKeypadIcon +thumb_func 0x8006174 GetKeypadIconTileOffset +thumb_func 0x8006184 GetKeypadIconWidth +thumb_func 0x8006194 GetKeypadIconHeight +thumb_func 0x80061a4 SetDefaultFontsPointer +thumb_func 0x80061b4 GetFontAttribute thumb_func 0x800629c -thumb_func 0x80062b4 +thumb_func 0x80062b4 DecompressGlyphFont9 thumb_func 0x8006300 thumb_func 0x8006304 thumb_func 0x8006350 -thumb_func 0x8006354 +thumb_func 0x8006354 ether_effect_related thumb_func 0x80063f8 thumb_func 0x8006418 thumb_func 0x80064b4 @@ -197,42 +197,42 @@ thumb_func 0x800657c thumb_func 0x8006620 thumb_func 0x8006640 thumb_func 0x800668c ResetSpriteData -thumb_func 0x80066d8 +thumb_func 0x80066d8 AnimateSprites thumb_func 0x8006724 BuildOamBuffer -thumb_func 0x8006770 +thumb_func 0x8006770 UpdateOamCoords thumb_func 0x8006834 BuildSpritePriorities -thumb_func 0x8006874 +thumb_func 0x8006874 SortSprites thumb_func 0x8006a34 CopyMatricesToOamBuffer thumb_func 0x8006a80 AddSpritesToOamBuffer -thumb_func 0x8006b0c -thumb_func 0x8006b60 -thumb_func 0x8006bcc -thumb_func 0x8006c14 -thumb_func 0x8006d6c +thumb_func 0x8006b0c CreateSprite +thumb_func 0x8006b60 CreateSpriteAtEnd +thumb_func 0x8006bcc CreateInvisibleSprite +thumb_func 0x8006c14 CreateSpriteAt +thumb_func 0x8006d6c CreateSpriteAndAnimate thumb_func 0x8006e00 DestroySprite thumb_func 0x8006e68 ResetOamRange -thumb_func 0x8006ea0 +thumb_func 0x8006ea0 LoadOam thumb_func 0x8006ed0 ClearSpriteCopyRequests thumb_func 0x8006f10 ResetOamMatrices thumb_func 0x8006f3c SetOamMatrix -thumb_func 0x8006f5c +thumb_func 0x8006f5c ResetSprite thumb_func 0x8006f70 CalcCenterToCornerVec -thumb_func 0x8006fb4 -thumb_func 0x80070d0 +thumb_func 0x8006fb4 AllocSpriteTiles +thumb_func 0x80070d0 SpriteTileAllocBitmapOp thumb_func 0x8007140 nullsub_141 -thumb_func 0x8007144 +thumb_func 0x8007144 ProcessSpriteCopyRequests thumb_func 0x80071a0 RequestSpriteFrameImageCopy thumb_func 0x8007204 RequestSpriteCopy thumb_func 0x8007254 CopyFromSprites thumb_func 0x800727c CopyToSprites thumb_func 0x80072a4 ResetAllSprites thumb_func 0x80072e0 FreeSpriteTiles -thumb_func 0x80072fc +thumb_func 0x80072fc FreeSpritePalette thumb_func 0x800730c FreeSpriteOamMatrix thumb_func 0x8007338 DestroySpriteAndFreeResources -thumb_func 0x8007358 +thumb_func 0x8007358 AnimateSprite thumb_func 0x80073a0 BeginAnim -thumb_func 0x8007490 +thumb_func 0x8007490 ContinueAnim thumb_func 0x8007530 AnimCmd_frame thumb_func 0x80075dc AnimCmd_end thumb_func 0x80075f4 AnimCmd_jump @@ -241,7 +241,7 @@ thumb_func 0x80076dc BeginAnimLoop thumb_func 0x8007714 ContinueAnimLoop thumb_func 0x8007734 JumpToTopOfAnimLoop thumb_func 0x80077a8 BeginAffineAnim -thumb_func 0x800783c +thumb_func 0x800783c ContinueAffineAnim thumb_func 0x80078f0 AffineAnimDelay thumb_func 0x8007924 AffineAnimCmd_loop thumb_func 0x8007958 BeginAffineAnimLoop @@ -254,7 +254,7 @@ thumb_func 0x8007af0 CopyOamMatrix thumb_func 0x8007b10 GetSpriteMatrixNum thumb_func 0x8007b30 thumb_func 0x8007b40 -thumb_func 0x8007b6c +thumb_func 0x8007b6c obj_update_pos2 thumb_func 0x8007c08 SetSpriteOamFlipBits thumb_func 0x8007c7c AffineAnimStateRestartAnim thumb_func 0x8007c98 AffineAnimStateStartAnim @@ -262,7 +262,7 @@ thumb_func 0x8007cc0 AffineAnimStateReset thumb_func 0x8007ce8 ApplyAffineAnimFrameAbsolute thumb_func 0x8007d0c DecrementAnimDelayCounter thumb_func 0x8007d34 DecrementAffineAnimDelayCounter -thumb_func 0x8007d64 +thumb_func 0x8007d64 ApplyAffineAnimFrameRelativeAndUpdateMatrix thumb_func 0x8007dfc thumb_func 0x8007e14 GetAffineAnimFrame thumb_func 0x8007e80 ApplyAffineAnimFrame @@ -278,8 +278,8 @@ thumb_func 0x8008094 ResetAffineAnimData thumb_func 0x80080c8 thumb_func 0x8008100 FreeOamMatrix thumb_func 0x8008140 InitSpriteAffineAnim -thumb_func 0x8008190 -thumb_func 0x8008210 +thumb_func 0x8008190 SetOamMatrixRotationScaling +thumb_func 0x8008210 LoadSpriteSheet thumb_func 0x8008254 LoadSpriteSheets thumb_func 0x8008280 FreeSpriteTilesByTag thumb_func 0x80082f8 FreeSpriteTileRanges @@ -290,17 +290,17 @@ thumb_func 0x80083dc AllocSpriteTileRange thumb_func 0x8008424 FreeAllSpritePalettes thumb_func 0x800845c LoadSpritePalette thumb_func 0x80084a8 LoadSpritePalettes -thumb_func 0x80084d4 +thumb_func 0x80084d4 DoLoadSpritePalette thumb_func 0x80084ec AllocSpritePalette -thumb_func 0x800851c +thumb_func 0x800851c IndexOfSpritePaletteTag thumb_func 0x8008554 thumb_func 0x8008564 FreeSpritePaletteByTag -thumb_func 0x800858c -thumb_func 0x8008598 -thumb_func 0x8008604 -thumb_func 0x8008828 -thumb_func 0x800885c -thumb_func 0x8008888 +thumb_func 0x800858c SetSubspriteTables +thumb_func 0x8008598 AddSpriteToOamBuffer +thumb_func 0x8008604 AddSubspritesToOamBuffer +thumb_func 0x8008828 StringCopy10 +thumb_func 0x800885c StringGetEnd10 +thumb_func 0x8008888 StringCopy7 thumb_func 0x80088b8 StringCopy thumb_func 0x80088d8 StringAppend thumb_func 0x80088f0 StringCopyN @@ -312,8 +312,8 @@ thumb_func 0x80089ac IsStringLengthAtLeast thumb_func 0x80089d8 thumb_func 0x8008a78 thumb_func 0x8008b18 -thumb_func 0x8008bcc -thumb_func 0x8008cb8 +thumb_func 0x8008bcc StringExpandPlaceholders +thumb_func 0x8008cb8 StringBraille thumb_func 0x8008d18 thumb_func 0x8008d20 thumb_func 0x8008d2c @@ -328,52 +328,52 @@ thumb_func 0x8008da4 thumb_func 0x8008dac thumb_func 0x8008db4 thumb_func 0x8008dbc -thumb_func 0x8008dc4 +thumb_func 0x8008dc4 GetExpandedPlaceholder thumb_func 0x8008de8 StringFill thumb_func 0x8008e14 StringCopyPadded -thumb_func 0x8008e68 +thumb_func 0x8008e68 StringFillWithTerminator thumb_func 0x8008e78 StringCopyN_Multibyte thumb_func 0x8008eb8 StringLength_Multibyte thumb_func 0x8008ed8 WriteColorChangeControlCode thumb_func 0x8008f14 IsStringJapanese thumb_func 0x8008f38 -thumb_func 0x8008f68 -thumb_func 0x8008fa0 -thumb_func 0x8008fb0 +thumb_func 0x8008f68 LoadHeldItemIcons +thumb_func 0x8008fa0 Task_DestroySelf +thumb_func 0x8008fb0 InitLinkTestBG thumb_func 0x8009088 -thumb_func 0x800910c -thumb_func 0x80091c4 -thumb_func 0x80091d4 +thumb_func 0x800910c LinkTestScreen +thumb_func 0x80091c4 SetLocalLinkPlayerId +thumb_func 0x80091d4 InitLocalLinkPlayer thumb_func 0x8009258 -thumb_func 0x800926c -thumb_func 0x8009298 -thumb_func 0x80092d0 -thumb_func 0x8009384 -thumb_func 0x80093b4 -thumb_func 0x800949c -thumb_func 0x8009558 -thumb_func 0x800957c -thumb_func 0x80095f4 -thumb_func 0x800963c -thumb_func 0x8009928 +thumb_func 0x800926c InitLink +thumb_func 0x8009298 Task_TriggerHandshake +thumb_func 0x80092d0 OpenLink +thumb_func 0x8009384 CloseLink +thumb_func 0x80093b4 TestBlockTransfer +thumb_func 0x800949c LinkTestProcessKeyInput +thumb_func 0x8009558 CB2_LinkTest +thumb_func 0x800957c LinkMain2 +thumb_func 0x80095f4 HandleReceiveRemoteLinkPlayer +thumb_func 0x800963c EmeraldBattleTowerRecordToRuby +thumb_func 0x8009928 BuildSendCmd thumb_func 0x8009ab0 -thumb_func 0x8009ad4 +thumb_func 0x8009ad4 IsSendingKeysToLink thumb_func 0x8009b08 thumb_func 0x8009b24 thumb_func 0x8009b44 -thumb_func 0x8009b64 +thumb_func 0x8009b64 GetLinkPlayerCount thumb_func 0x8009b90 thumb_func 0x8009bd4 thumb_func 0x8009c04 -thumb_func 0x8009c28 +thumb_func 0x8009c28 Link_AnyPartnersPlayingRubyOrSapphire thumb_func 0x8009c40 -thumb_func 0x8009c70 -thumb_func 0x8009c8c -thumb_func 0x8009e00 +thumb_func 0x8009c70 OpenLinkTimed +thumb_func 0x8009c8c GetLinkPlayerDataExchangeStatusTimed +thumb_func 0x8009e00 IsLinkPlayerDataExchangeComplete thumb_func 0x8009e68 GetLinkPlayerTrainerId -thumb_func 0x8009e80 -thumb_func 0x8009ea4 -thumb_func 0x8009eb8 +thumb_func 0x8009e80 ResetLinkPlayers +thumb_func 0x8009ea4 ResetBlockSend +thumb_func 0x8009eb8 InitBlockSend thumb_func 0x8009f28 LinkCB_BlockSendBegin thumb_func 0x8009f4c LinkCB_BlockSend thumb_func 0x8009fb0 @@ -381,25 +381,25 @@ thumb_func 0x8009fbc thumb_func 0x8009fdc thumb_func 0x800a010 thumb_func 0x800a01c -thumb_func 0x800a02c +thumb_func 0x800a02c GetMultiplayerId thumb_func 0x800a054 bitmask_all_link_players_but_self -thumb_func 0x800a070 +thumb_func 0x800a070 SendBlock thumb_func 0x800a09c -thumb_func 0x800a0e4 -thumb_func 0x800a114 -thumb_func 0x800a14c -thumb_func 0x800a178 -thumb_func 0x800a1b0 +thumb_func 0x800a0e4 IsLinkTaskFinished +thumb_func 0x800a114 GetBlockReceivedStatus +thumb_func 0x800a14c SetBlockReceivedFlag +thumb_func 0x800a178 ResetBlockReceivedFlags +thumb_func 0x800a1b0 ResetBlockReceivedFlag thumb_func 0x800a1e4 CheckShouldAdvanceLinkState thumb_func 0x800a20c LinkTestCalcBlockChecksum thumb_func 0x800a23c LinkTest_prnthexchar thumb_func 0x800a274 LinkTest_prntchar thumb_func 0x800a2ac LinkTest_prnthex -thumb_func 0x800a300 +thumb_func 0x800a300 LinkTest_prntint thumb_func 0x800a3a0 LinkTest_prntstr -thumb_func 0x800a3e8 +thumb_func 0x800a3e8 LinkCB_RequestPlayerDataExchange thumb_func 0x800a414 -thumb_func 0x800a558 +thumb_func 0x800a558 SetLinkDebugValues thumb_func 0x800a56c thumb_func 0x800a59c thumb_func 0x800a5c8 @@ -409,8 +409,8 @@ thumb_func 0x800a624 thumb_func 0x800a6b8 thumb_func 0x800a6dc thumb_func 0x800a75c -thumb_func 0x800a770 -thumb_func 0x800a780 +thumb_func 0x800a770 GetLinkPlayerCount_2 +thumb_func 0x800a780 IsLinkMaster thumb_func 0x800a7ac thumb_func 0x800a7b8 thumb_func 0x800a7f8 @@ -419,47 +419,47 @@ thumb_func 0x800a870 thumb_func 0x800a8d4 thumb_func 0x800a90c thumb_func 0x800a938 -thumb_func 0x800a990 +thumb_func 0x800a990 CheckErrorStatus thumb_func 0x800a9f4 -thumb_func 0x800aa0c +thumb_func 0x800aa0c CB2_LinkError thumb_func 0x800ab5c -thumb_func 0x800ac14 -thumb_func 0x800ac7c -thumb_func 0x800adc4 +thumb_func 0x800ac14 BtlController_EmitCmd42 +thumb_func 0x800ac7c CB2_PrintErrorMessage +thumb_func 0x800adc4 GetSioMultiSI thumb_func 0x800add4 IsSioMultiMaster -thumb_func 0x800adfc +thumb_func 0x800adfc IsLinkConnectionEstablished thumb_func 0x800ae0c thumb_func 0x800ae18 thumb_func 0x800ae24 thumb_func 0x800ae80 -thumb_func 0x800aee0 +thumb_func 0x800aee0 HandleLinkConnection thumb_func 0x800af5c thumb_func 0x800af78 thumb_func 0x800af94 -thumb_func 0x800afb0 +thumb_func 0x800afb0 GetLinkRecvQueueLength thumb_func 0x800afd8 thumb_func 0x800afec -thumb_func 0x800aff8 -thumb_func 0x800b050 -thumb_func 0x800b0e4 -thumb_func 0x800b0f4 -thumb_func 0x800b220 -thumb_func 0x800b24c -thumb_func 0x800b27c -thumb_func 0x800b364 -thumb_func 0x800b474 -thumb_func 0x800b4e4 -thumb_func 0x800b4f4 +thumb_func 0x800aff8 DisableSerial +thumb_func 0x800b050 EnableSerial +thumb_func 0x800b0e4 ResetSerial +thumb_func 0x800b0f4 LinkMain1 +thumb_func 0x800b220 CheckMasterOrSlave +thumb_func 0x800b24c InitTimer +thumb_func 0x800b27c EnqueueSendCmd +thumb_func 0x800b364 DequeueRecvCmds +thumb_func 0x800b474 LinkVSync +thumb_func 0x800b4e4 Timer3Intr +thumb_func 0x800b4f4 SerialCB thumb_func 0x800b57c -thumb_func 0x800b58c -thumb_func 0x800b688 -thumb_func 0x800b7a0 +thumb_func 0x800b58c DoHandshake +thumb_func 0x800b688 DoRecv +thumb_func 0x800b7a0 DoSend thumb_func 0x800b854 StopTimer -thumb_func 0x800b888 +thumb_func 0x800b888 SendRecvDone thumb_func 0x800b8b8 ResetSendBuffer thumb_func 0x800b90c ResetRecvBuffer thumb_func 0x800b97c -thumb_func 0x800b9c8 +thumb_func 0x800b9c8 rfu_REQ_sendData_wrapper thumb_func 0x800ba08 thumb_func 0x800ba5c thumb_func 0x800ba88 @@ -470,7 +470,7 @@ thumb_func 0x800bbe8 thumb_func 0x800bccc thumb_func 0x800bd38 thumb_func 0x800be28 -thumb_func 0x800bfec +thumb_func 0x800bfec rfu_syncVBlank_ thumb_func 0x800c008 thumb_func 0x800c200 thumb_func 0x800c270 @@ -511,17 +511,17 @@ thumb_func 0x800d860 thumb_func 0x800d948 thumb_func 0x800da00 thumb_func 0x800da5c -thumb_func 0x800da80 -thumb_func 0x800db50 -thumb_func 0x800dbb4 +thumb_func 0x800da80 CreateWirelessStatusIndicatorSprite +thumb_func 0x800db50 DestroyWirelessStatusIndicatorSprite +thumb_func 0x800dbb4 LoadWirelessStatusIndicatorSpriteGfx thumb_func 0x800dbf0 thumb_func 0x800dc28 thumb_func 0x800dc40 -thumb_func 0x800de44 +thumb_func 0x800de44 CopyTrainerRecord thumb_func 0x800de54 NameIsNotEmpty -thumb_func 0x800de74 +thumb_func 0x800de74 RecordMixTrainerNames thumb_func 0x800e004 -thumb_func 0x800e070 +thumb_func 0x800e070 WipeTrainerNameRecords thumb_func 0x800e0c0 nullsub_5 thumb_func 0x800e0c4 nullsub_4 thumb_func 0x800e0c8 @@ -535,7 +535,7 @@ thumb_func 0x800e578 thumb_func 0x800e5c0 thumb_func 0x800e608 thumb_func 0x800e7d0 -thumb_func 0x800e7e8 +thumb_func 0x800e7e8 SaveSuccessCallback thumb_func 0x800e7f4 thumb_func 0x800e87c thumb_func 0x800e894 @@ -550,8 +550,8 @@ thumb_func 0x800ea3c thumb_func 0x800ea48 thumb_func 0x800ea70 thumb_func 0x800ead4 -thumb_func 0x800eb08 -thumb_func 0x800eb78 +thumb_func 0x800eb08 BattleAICmd_if_in_hwords +thumb_func 0x800eb78 IsRfuRecvQueueEmpty thumb_func 0x800ebb8 thumb_func 0x800eca0 thumb_func 0x800ef58 @@ -560,7 +560,7 @@ thumb_func 0x800f0f8 thumb_func 0x800f1bc thumb_func 0x800f1e8 thumb_func 0x800f20c -thumb_func 0x800f254 +thumb_func 0x800f254 rfu_func_080F97B8 thumb_func 0x800f29c thumb_func 0x800f2a4 IsSendingKeysToRfu thumb_func 0x800f2c4 @@ -575,18 +575,18 @@ thumb_func 0x800f7bc thumb_func 0x800f7f8 thumb_func 0x800f934 thumb_func 0x800f968 -thumb_func 0x800fa4c +thumb_func 0x800fa4c rfufunc_80F9F44 thumb_func 0x800fab0 -thumb_func 0x800fb28 +thumb_func 0x800fb28 rfufunc_80FA020 thumb_func 0x800fc00 thumb_func 0x800fc1c thumb_func 0x800fc48 thumb_func 0x800fc68 -thumb_func 0x800fc98 +thumb_func 0x800fc98 OpponentHandleEndBounceEffect thumb_func 0x800fccc thumb_func 0x800fd2c thumb_func 0x800fd64 -thumb_func 0x800fd94 +thumb_func 0x800fd94 task_add_05_task_del_08FA224_when_no_RfuFunc thumb_func 0x800fdb8 thumb_func 0x800fe58 thumb_func 0x800fe90 @@ -594,7 +594,7 @@ thumb_func 0x800ff34 thumb_func 0x800ff54 thumb_func 0x800ff8c thumb_func 0x800ffb0 -thumb_func 0x800ffd0 +thumb_func 0x800ffd0 rfu_get_multiplayer_id thumb_func 0x800fff4 thumb_func 0x8010000 thumb_func 0x8010028 @@ -613,7 +613,7 @@ thumb_func 0x8010568 thumb_func 0x80105a4 thumb_func 0x80107fc thumb_func 0x80108a4 -thumb_func 0x8010990 +thumb_func 0x8010990 rfu_REQ_recvData_then_sendData thumb_func 0x80109b0 thumb_func 0x8010a0c thumb_func 0x8010a38 @@ -641,11 +641,11 @@ thumb_func 0x8011554 thumb_func 0x8011564 thumb_func 0x8011570 thumb_func 0x801158c -thumb_func 0x801159c +thumb_func 0x801159c Rfu_IsMaster thumb_func 0x80115a8 thumb_func 0x80115b4 thumb_func 0x80115d4 -thumb_func 0x80115e8 +thumb_func 0x80115e8 atk57 thumb_func 0x801167c thumb_func 0x8011690 thumb_func 0x80116bc @@ -676,7 +676,7 @@ thumb_func 0x8011fd8 thumb_func 0x80120a8 thumb_func 0x8012134 thumb_func 0x80121d4 -thumb_func 0x8012244 +thumb_func 0x8012244 BerryBlenderLinkBecomeLeader thumb_func 0x8012288 thumb_func 0x8012a64 thumb_func 0x8012ac4 @@ -687,7 +687,7 @@ thumb_func 0x8012d0c thumb_func 0x8012d7c thumb_func 0x8012dd8 thumb_func 0x8012e9c -thumb_func 0x8012fa8 +thumb_func 0x8012fa8 BerryBlenderLinkJoinGroup thumb_func 0x8012fec thumb_func 0x8013690 thumb_func 0x80136dc @@ -711,25 +711,25 @@ thumb_func 0x8013f14 thumb_func 0x8014298 thumb_func 0x80144cc thumb_func 0x80144e0 -thumb_func 0x8014508 +thumb_func 0x8014508 MEvent_CreateTask_Leader thumb_func 0x8014548 thumb_func 0x8014a04 thumb_func 0x8014a50 -thumb_func 0x8014db0 +thumb_func 0x8014db0 MEvent_CreateTask_CardOrNewsOverWireless thumb_func 0x8014dfc -thumb_func 0x8015114 +thumb_func 0x8015114 UnionRoomSpecial thumb_func 0x8015160 thumb_func 0x801516c thumb_func 0x8015194 thumb_func 0x80151b8 thumb_func 0x80151d0 thumb_func 0x80151e8 -thumb_func 0x8016398 +thumb_func 0x8016398 var_800D_set_xB thumb_func 0x80163b0 thumb_func 0x80163f0 thumb_func 0x8016448 thumb_func 0x8016490 -thumb_func 0x80165e4 +thumb_func 0x80165e4 sp182_move_string thumb_func 0x8016610 thumb_func 0x80167b0 thumb_func 0x8016900 @@ -740,14 +740,14 @@ thumb_func 0x8016ad0 thumb_func 0x8016b00 thumb_func 0x8016b30 thumb_func 0x8016b5c -thumb_func 0x8016b74 +thumb_func 0x8016b74 PrintOnTextbox thumb_func 0x8016bc8 thumb_func 0x8016c28 thumb_func 0x8016c78 thumb_func 0x8016c88 -thumb_func 0x8016d5c +thumb_func 0x8016d5c MainMenu_FormatSavegameBadges thumb_func 0x8016e74 -thumb_func 0x8016e98 +thumb_func 0x8016e98 Contest_RunTextPrinters thumb_func 0x8016ea4 thumb_func 0x8017044 thumb_func 0x80170b0 @@ -759,11 +759,11 @@ thumb_func 0x801727c thumb_func 0x8017360 thumb_func 0x80173fc thumb_func 0x8017440 -thumb_func 0x8017468 +thumb_func 0x8017468 StartFieldEffectForEventObject thumb_func 0x8017484 thumb_func 0x80175ec nullsub_30 thumb_func 0x80175f0 -thumb_func 0x80176b0 +thumb_func 0x80176b0 UpdateHpTextInHealthbox thumb_func 0x8017770 thumb_func 0x80177b8 thumb_func 0x80177c4 @@ -783,51 +783,51 @@ thumb_func 0x8017c88 thumb_func 0x8017c98 thumb_func 0x8017cdc thumb_func 0x8017ebc -thumb_func 0x8017ed0 -thumb_func 0x8017ee8 +thumb_func 0x8017ed0 c2_mystery_gift_e_reader_run +thumb_func 0x8017ee8 HandleMysteryGiftOrEReaderSetup thumb_func 0x80180e4 -thumb_func 0x8018110 -thumb_func 0x8018138 +thumb_func 0x8018110 c2_ereader +thumb_func 0x8018138 MainCB_FreeAllBuffersAndReturnToInitTitleScreen thumb_func 0x8018180 -thumb_func 0x801822c -thumb_func 0x8018240 -thumb_func 0x80182e0 -thumb_func 0x801832c -thumb_func 0x8018388 -thumb_func 0x80183a4 -thumb_func 0x8018438 -thumb_func 0x8018460 -thumb_func 0x8018488 -thumb_func 0x80184c8 -thumb_func 0x80184fc -thumb_func 0x8018560 -thumb_func 0x80186b4 -thumb_func 0x8018804 -thumb_func 0x8018818 -thumb_func 0x8018874 +thumb_func 0x801822c MG_DrawTextBorder +thumb_func 0x8018240 MG_DrawCheckerboardPattern +thumb_func 0x80182e0 ClearScreenInBg0 +thumb_func 0x801832c AddTextPrinterToWindow1 +thumb_func 0x8018388 ClearTextWindow +thumb_func 0x80183a4 MG_PrintTextOnWindow1AndWaitButton +thumb_func 0x8018438 HideDownArrow +thumb_func 0x8018460 ShowDownArrow +thumb_func 0x8018488 unref_HideDownArrowAndWaitButton +thumb_func 0x80184c8 PrintStringAndWait2Seconds +thumb_func 0x80184fc MysteryGift_HandleThreeOptionMenu +thumb_func 0x8018560 mevent_message_print_and_prompt_yes_no +thumb_func 0x80186b4 BufferMonTrainerMemo +thumb_func 0x8018804 ValidateCardOrNews +thumb_func 0x8018818 HandleLoadWonderCardOrNews +thumb_func 0x8018874 DestroyNewsOrCard thumb_func 0x801888c -thumb_func 0x80188b8 -thumb_func 0x80188dc -thumb_func 0x80188fc -thumb_func 0x8018974 -thumb_func 0x8018aa4 -thumb_func 0x8018b0c +thumb_func 0x80188b8 mevent_message_prompt_discard +thumb_func 0x80188dc mevent_message_was_thrown_away +thumb_func 0x80188fc mevent_save_game +thumb_func 0x8018974 mevent_message +thumb_func 0x8018aa4 PrintMGSuccessMessage +thumb_func 0x8018b0c mevent_message_stamp_card_etc_send_status thumb_func 0x8018bdc -thumb_func 0x8018c14 -thumb_func 0x8018c5c +thumb_func 0x8018c14 task_add_00_mystery_gift +thumb_func 0x8018c5c PrintMGSendStatus thumb_func 0x8019328 -thumb_func 0x8019330 -thumb_func 0x8019350 +thumb_func 0x8019330 bgid_upload_textbox_1 +thumb_func 0x8019350 is_walking_or_running thumb_func 0x8019370 thumb_func 0x8019388 thumb_func 0x80193d8 -thumb_func 0x8019428 +thumb_func 0x8019428 IsUnionRoomPlayerHidden thumb_func 0x8019444 thumb_func 0x801945c -thumb_func 0x8019474 -thumb_func 0x8019490 -thumb_func 0x80194b0 -thumb_func 0x80194d0 +thumb_func 0x8019474 SetUnionRoomPlayerGfx +thumb_func 0x8019490 CreateUnionRoomPlayerEventObject +thumb_func 0x80194b0 RemoveUnionRoomPlayerEventObject +thumb_func 0x80194d0 SetUnionRoomPlayerEnterExitMovement thumb_func 0x8019548 thumb_func 0x80195b4 thumb_func 0x801960c @@ -836,8 +836,8 @@ thumb_func 0x8019720 thumb_func 0x801976c thumb_func 0x80197ac thumb_func 0x8019838 -thumb_func 0x8019878 -thumb_func 0x80198bc +thumb_func 0x8019878 unknown_ItemMenu_Show +thumb_func 0x80198bc DestroyWonderNews thumb_func 0x80198d8 thumb_func 0x801990c thumb_func 0x80199a0 @@ -880,27 +880,27 @@ thumb_func 0x801ab1c thumb_func 0x801ab30 thumb_func 0x801ab44 thumb_func 0x801ab50 -thumb_func 0x801aba0 +thumb_func 0x801aba0 ItemUseInBattle_Escape thumb_func 0x801abe4 -thumb_func 0x801abf8 +thumb_func 0x801abf8 WonderNews_Test_Unk_02 thumb_func 0x801ac1c thumb_func 0x801ac50 thumb_func 0x801ac74 -thumb_func 0x801acb0 +thumb_func 0x801acb0 DestroyWonderCard thumb_func 0x801ace4 -thumb_func 0x801ad40 +thumb_func 0x801ad40 CreateSetStatusSprite thumb_func 0x801ad8c thumb_func 0x801adc8 thumb_func 0x801adf0 thumb_func 0x801ae28 -thumb_func 0x801ae5c +thumb_func 0x801ae5c GetWonderCardFlagID thumb_func 0x801ae80 WonderCard_ResetInternalReceivedFlag thumb_func 0x801ae98 IsWonderCardFlagIDInValidRange -thumb_func 0x801aeb8 +thumb_func 0x801aeb8 CheckReceivedGiftFromWonderCard thumb_func 0x801aef8 thumb_func 0x801af20 thumb_func 0x801af64 -thumb_func 0x801af8c +thumb_func 0x801af8c special_0x4a thumb_func 0x801afc8 thumb_func 0x801b040 thumb_func 0x801b160 @@ -908,17 +908,17 @@ thumb_func 0x801b1ac thumb_func 0x801b1c8 thumb_func 0x801b208 MEventStruct_Unk1442CC_CompareField_unk_16 thumb_func 0x801b230 -thumb_func 0x801b244 -thumb_func 0x801b2b0 +thumb_func 0x801b244 MEventStruct_Unk1442CC_GetValueNFrom_unk_20 +thumb_func 0x801b2b0 MovementType_FaceDownAndRight_callback thumb_func 0x801b354 thumb_func 0x801b458 thumb_func 0x801b464 -thumb_func 0x801b4a8 +thumb_func 0x801b4a8 WonderCard_Test_Unk_08_6 thumb_func 0x801b524 thumb_func 0x801b550 thumb_func 0x801b5b8 thumb_func 0x801b5d8 -thumb_func 0x801b670 +thumb_func 0x801b670 DestroyWonderCardResources thumb_func 0x801b69c thumb_func 0x801b8b0 thumb_func 0x801b9f0 @@ -926,7 +926,7 @@ thumb_func 0x801bca4 thumb_func 0x801c04c thumb_func 0x801c17c thumb_func 0x801c224 -thumb_func 0x801c280 +thumb_func 0x801c280 DestroyWonderNewsResources thumb_func 0x801c2ac thumb_func 0x801c588 thumb_func 0x801c754 @@ -935,49 +935,49 @@ thumb_func 0x801c7d4 thumb_func 0x801c8b4 thumb_func 0x801c95c thumb_func 0x801ca6c -thumb_func 0x801cb24 +thumb_func 0x801cb24 mevent_srv_init_wnews thumb_func 0x801cb48 thumb_func 0x801cb6c -thumb_func 0x801cba8 -thumb_func 0x801cbfc +thumb_func 0x801cba8 mevent_srv_init_common +thumb_func 0x801cbfc mevent_srv_free_resources thumb_func 0x801cc20 -thumb_func 0x801cc60 +thumb_func 0x801cc60 mevent_first_if_not_null_else_second thumb_func 0x801cc6c mevent_compare_pointers -thumb_func 0x801cc84 -thumb_func 0x801cc8c +thumb_func 0x801cc84 common_mainseq_0 +thumb_func 0x801cc8c common_mainseq_1 thumb_func 0x801cc90 thumb_func 0x801ccac thumb_func 0x801ccc8 thumb_func 0x801d240 -thumb_func 0x801d294 -thumb_func 0x801d2b8 -thumb_func 0x801d2f4 -thumb_func 0x801d304 -thumb_func 0x801d310 -thumb_func 0x801d31c -thumb_func 0x801d36c -thumb_func 0x801d390 -thumb_func 0x801d3ac -thumb_func 0x801d3e0 +thumb_func 0x801d294 mevent_client_do_init +thumb_func 0x801d2b8 mevent_client_do_exec +thumb_func 0x801d2f4 mevent_client_inc_flag +thumb_func 0x801d304 mevent_client_get_buffer +thumb_func 0x801d310 mevent_client_set_param +thumb_func 0x801d31c mevent_client_init +thumb_func 0x801d36c mevent_client_free_resources +thumb_func 0x801d390 mevent_client_jmp_buffer +thumb_func 0x801d3ac mevent_client_send_word +thumb_func 0x801d3e0 mainseq_0 thumb_func 0x801d408 thumb_func 0x801d40c mainseq_2 thumb_func 0x801d42c mainseq_3 -thumb_func 0x801d44c +thumb_func 0x801d44c mainseq_4 thumb_func 0x801d620 mainseq_5 -thumb_func 0x801d638 -thumb_func 0x801d670 -thumb_func 0x801d6a4 -thumb_func 0x801d6d0 -thumb_func 0x801d6dc +thumb_func 0x801d638 mainseq_6 +thumb_func 0x801d670 mainseq_7 +thumb_func 0x801d6a4 mevent_client_exec +thumb_func 0x801d6d0 mevent_srv_sub_recv +thumb_func 0x801d6dc mevent_srv_sub_send thumb_func 0x801d6e8 mevent_srv_sub_init thumb_func 0x801d714 mevent_srv_sub_init_send -thumb_func 0x801d738 -thumb_func 0x801d748 -thumb_func 0x801d764 +thumb_func 0x801d738 mevent_srv_sub_init_recv +thumb_func 0x801d748 mevent_recv_block +thumb_func 0x801d764 mevent_has_received thumb_func 0x801d788 -thumb_func 0x801d798 -thumb_func 0x801d86c -thumb_func 0x801d978 +thumb_func 0x801d798 mevent_receive_func +thumb_func 0x801d86c mevent_send_func +thumb_func 0x801d978 GenerateRandomNews thumb_func 0x801d9d0 thumb_func 0x801d9ec thumb_func 0x801da30 @@ -989,9 +989,9 @@ thumb_func 0x801db54 thumb_func 0x801dbbc thumb_func 0x801dbf4 thumb_func 0x801dc54 -thumb_func 0x801dc78 -thumb_func 0x801dd44 -thumb_func 0x801dd5c +thumb_func 0x801dc78 c2_081284E0 +thumb_func 0x801dd44 FoundBlackGlasses +thumb_func 0x801dd5c ScrCmd_startcontest thumb_func 0x801dd78 thumb_func 0x801ddc0 thumb_func 0x801ddd0 @@ -1036,7 +1036,7 @@ thumb_func 0x801ef8c thumb_func 0x801ef98 thumb_func 0x801efa4 thumb_func 0x801efe0 -thumb_func 0x801efec +thumb_func 0x801efec copy_strings_to_sav1 thumb_func 0x801f0c4 thumb_func 0x801f2e0 thumb_func 0x801f344 @@ -1118,9 +1118,9 @@ thumb_func 0x8020b58 thumb_func 0x8020b68 thumb_func 0x8020b74 thumb_func 0x8020c90 -thumb_func 0x8020ca4 +thumb_func 0x8020ca4 PlaySE thumb_func 0x8020cbc -thumb_func 0x8020ce0 +thumb_func 0x8020ce0 PutPokeblockListMenuString thumb_func 0x8020d74 thumb_func 0x8021038 thumb_func 0x802117c @@ -1184,18 +1184,18 @@ thumb_func 0x80243d0 thumb_func 0x8024410 thumb_func 0x8024434 thumb_func 0x8024448 -thumb_func 0x802445c -thumb_func 0x8024478 -thumb_func 0x80244a0 -thumb_func 0x80244cc -thumb_func 0x802450c -thumb_func 0x8024548 +thumb_func 0x802445c ApplyNewEncryptionKeyToBerryPowder +thumb_func 0x8024478 HasEnoughBerryPowder_ +thumb_func 0x80244a0 HasEnoughBerryPowder +thumb_func 0x80244cc GiveBerryPowder +thumb_func 0x802450c TakeBerryPowder_ +thumb_func 0x8024548 TakeBerryPowder thumb_func 0x8024588 GetBerryPowder -thumb_func 0x80245a0 -thumb_func 0x80245f8 +thumb_func 0x80245a0 PrintBerryPowderAmount +thumb_func 0x80245f8 DrawPlayerPowderAmount thumb_func 0x8024654 thumb_func 0x8024678 -thumb_func 0x80246e0 +thumb_func 0x80246e0 RemoveBerryPowderVendorMenu thumb_func 0x8024704 thumb_func 0x80247e4 thumb_func 0x80247f8 @@ -1228,7 +1228,7 @@ thumb_func 0x8025acc thumb_func 0x8025b18 thumb_func 0x8025bd4 thumb_func 0x8025ca0 -thumb_func 0x8025d10 +thumb_func 0x8025d10 BagMenu_SwapItems thumb_func 0x8025e0c thumb_func 0x8025f94 thumb_func 0x8025fac @@ -1278,14 +1278,14 @@ thumb_func 0x802760c thumb_func 0x80276fc thumb_func 0x802771c thumb_func 0x8027788 -thumb_func 0x80277e8 -thumb_func 0x80277f8 +thumb_func 0x80277e8 IncrementWithLimit +thumb_func 0x80277f8 Min thumb_func 0x8027808 thumb_func 0x802781c thumb_func 0x802786c thumb_func 0x802788c thumb_func 0x802792c -thumb_func 0x8027a4c +thumb_func 0x8027a4c AddWallpaperSetsMenu thumb_func 0x8027a64 thumb_func 0x8027afc thumb_func 0x8027b28 @@ -1436,7 +1436,7 @@ thumb_func 0x802c494 thumb_func 0x802c4b0 thumb_func 0x802c4d4 thumb_func 0x802c4fc -thumb_func 0x802c50c +thumb_func 0x802c50c SafariHandleStatusAnimation thumb_func 0x802c52c thumb_func 0x802c574 thumb_func 0x802c5a0 @@ -1551,23 +1551,23 @@ thumb_func 0x802eac0 thumb_func 0x802ebb4 thumb_func 0x802ec0c thumb_func 0x802ec60 -thumb_func 0x802ed30 -thumb_func 0x802ed48 +thumb_func 0x802ed30 RtcDisableInterrupts +thumb_func 0x802ed48 RtcRestoreInterrupts thumb_func 0x802ed5c ConvertBcdToBinary -thumb_func 0x802ed84 +thumb_func 0x802ed84 IsLeapYear thumb_func 0x802edb8 ConvertDateToDayCount thumb_func 0x802ee44 RtcGetDayCount -thumb_func 0x802ee80 +thumb_func 0x802ee80 RtcInit thumb_func 0x802eee0 -thumb_func 0x802eeec -thumb_func 0x802ef1c -thumb_func 0x802ef34 +thumb_func 0x802eeec RtcGetInfo +thumb_func 0x802ef1c RtcGetDateTime +thumb_func 0x802ef34 RtcGetStatus thumb_func 0x802ef4c RtcGetRawInfo -thumb_func 0x802ef60 -thumb_func 0x802f05c +thumb_func 0x802ef60 RtcCheckInfo +thumb_func 0x802f05c RtcReset thumb_func 0x802f070 thumb_func 0x802f0a8 -thumb_func 0x802f0e0 +thumb_func 0x802f0e0 FormatHexRtcTime thumb_func 0x802f0f8 thumb_func 0x802f130 thumb_func 0x802f168 RtcCalcTimeDifference @@ -1576,102 +1576,102 @@ thumb_func 0x802f218 RtcInitLocalTimeOffset thumb_func 0x802f22c RtcCalcLocalTimeOffset thumb_func 0x802f260 CalcTimeDifference thumb_func 0x802f2c8 RtcGetMinuteCount -thumb_func 0x802f300 -thumb_func 0x802f314 +thumb_func 0x802f300 RtcGetLocalDayCount +thumb_func 0x802f314 CB2_MainMenu thumb_func 0x802f32c thumb_func 0x802f340 -thumb_func 0x802f34c -thumb_func 0x802f358 -thumb_func 0x802f53c +thumb_func 0x802f34c CB2_ReinitMainMenu +thumb_func 0x802f358 InitMainMenu +thumb_func 0x802f53c BuyMenuBuildListMenuTemplate thumb_func 0x802f718 -thumb_func 0x802f76c +thumb_func 0x802f76c Task_MainMenuCheckBattery thumb_func 0x802f80c thumb_func 0x802f860 -thumb_func 0x802fdb0 -thumb_func 0x802fde0 +thumb_func 0x802fdb0 Task_HighlightSelectedMainMenuItem +thumb_func 0x802fde0 HandleMainMenuInput thumb_func 0x802ff4c Task_HandleMainMenuInput thumb_func 0x802ff7c -thumb_func 0x8030284 -thumb_func 0x80302e4 -thumb_func 0x80303d8 -thumb_func 0x80304f0 +thumb_func 0x8030284 Task_HandleMainMenuBPressed +thumb_func 0x80302e4 Task_DisplayMainMenuInvalidActionError +thumb_func 0x80303d8 HighlightSelectedMainMenuItem +thumb_func 0x80304f0 Task_NewGameBirchSpeech_Init thumb_func 0x803058c -thumb_func 0x80305f0 -thumb_func 0x8030668 -thumb_func 0x803070c -thumb_func 0x803076c -thumb_func 0x80307b0 -thumb_func 0x8030854 -thumb_func 0x803090c -thumb_func 0x8030958 -thumb_func 0x80309d0 -thumb_func 0x8030a14 +thumb_func 0x80305f0 Task_NewGameBirchSpeech_WaitToShowBirch +thumb_func 0x8030668 Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome +thumb_func 0x803070c Task_NewGameBirchSpeech_ThisIsAPokemon +thumb_func 0x803076c Task_NewGameBirchSpeech_MainSpeech +thumb_func 0x80307b0 Task_NewGameBirchSpeechSub_InitPokeBall +thumb_func 0x8030854 Task_NewGameBirchSpeechSub_WaitForLotad +thumb_func 0x803090c Task_NewGameBirchSpeech_AndYouAre +thumb_func 0x8030958 Task_NewGameBirchSpeech_StartBirchLotadPlatformFade +thumb_func 0x80309d0 Task_NewGameBirchSpeech_SlidePlatformAway +thumb_func 0x8030a14 Task_NewGameBirchSpeech_StartPlayerFadeIn thumb_func 0x8030ac4 Task_NewGameBirchSpeech_WaitForPlayerFadeIn -thumb_func 0x8030b08 -thumb_func 0x8030b48 -thumb_func 0x8030b78 -thumb_func 0x8030c14 -thumb_func 0x8030cbc +thumb_func 0x8030b08 Task_NewGameBirchSpeech_BoyOrGirl +thumb_func 0x8030b48 Task_NewGameBirchSpeech_WaitToShowGenderMenu +thumb_func 0x8030b78 Task_NewGameBirchSpeech_ChooseGender +thumb_func 0x8030c14 Task_NewGameBirchSpeech_SlideOutOldGenderSprite +thumb_func 0x8030cbc Task_NewGameBirchSpeech_SlideInNewGenderSprite thumb_func 0x8030d14 -thumb_func 0x8030d54 -thumb_func 0x8030d80 -thumb_func 0x8030dd0 +thumb_func 0x8030d54 Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint +thumb_func 0x8030d80 Task_NewGameBirchSpeech_WaitPressBeforeNameChoice +thumb_func 0x8030dd0 Task_NewGameBirchSpeech_StartNamingScreen thumb_func 0x8030e44 -thumb_func 0x8030e84 -thumb_func 0x8030ec8 -thumb_func 0x8030f60 -thumb_func 0x8030f98 -thumb_func 0x803107c -thumb_func 0x8031124 -thumb_func 0x8031204 +thumb_func 0x8030e84 Task_NewGameBirchSpeech_CreateNameYesNo +thumb_func 0x8030ec8 Task_NewGameBirchSpeech_ProcessNameYesNoMenu +thumb_func 0x8030f60 Task_NewGameBirchSpeech_SlidePlatformAway2 +thumb_func 0x8030f98 Task_NewGameBirchSpeech_ReshowBirchLotad +thumb_func 0x803107c Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter +thumb_func 0x8031124 Task_NewGameBirchSpeech_AreYouReady +thumb_func 0x8031204 Task_NewGameBirchSpeech_ShrinkPlayer thumb_func 0x80312c0 Task_NewGameBirchSpeech_WaitForPlayerShrink -thumb_func 0x80312fc +thumb_func 0x80312fc Task_NewGameBirchSpeech_FadePlayerToWhite thumb_func 0x8031370 -thumb_func 0x80313b8 +thumb_func 0x80313b8 CB2_NewGameBirchSpeech_ReturnFromNamingScreen thumb_func 0x8031614 nullsub_35 thumb_func 0x8031618 SpriteCB_MovePlayerDownWhileShrinking -thumb_func 0x8031634 -thumb_func 0x803166c -thumb_func 0x803179c -thumb_func 0x803180c -thumb_func 0x803187c -thumb_func 0x80318ec -thumb_func 0x803195c -thumb_func 0x80319c8 -thumb_func 0x8031a08 -thumb_func 0x8031a74 +thumb_func 0x8031634 NewGameBirchSpeech_CreateLotadSprite +thumb_func 0x803166c AddBirchSpeechObjects +thumb_func 0x803179c Task_NewGameBirchSpeech_FadeOutTarget1InTarget2 +thumb_func 0x803180c NewGameBirchSpeech_StartFadeOutTarget1InTarget2 +thumb_func 0x803187c Task_NewGameBirchSpeech_FadeInTarget1OutTarget2 +thumb_func 0x80318ec NewGameBirchSpeech_StartFadeInTarget1OutTarget2 +thumb_func 0x803195c Task_NewGameBirchSpeech_FadePlatformIn +thumb_func 0x80319c8 NewGameBirchSpeech_StartFadePlatformIn +thumb_func 0x8031a08 Task_NewGameBirchSpeech_FadePlatformOut +thumb_func 0x8031a74 NewGameBirchSpeech_StartFadePlatformOut thumb_func 0x8031ab4 -thumb_func 0x8031b20 -thumb_func 0x8031b30 +thumb_func 0x8031b20 NewGameBirchSpeech_ProcessGenderMenuInput +thumb_func 0x8031b30 NewGameBirchSpeech_SetDefaultPlayerName thumb_func 0x8031b84 thumb_func 0x8031be8 thumb_func 0x8031c00 thumb_func 0x8031c4c thumb_func 0x8031cb0 thumb_func 0x8031d28 -thumb_func 0x8031d9c -thumb_func 0x8031de4 -thumb_func 0x8031f48 -thumb_func 0x8031f90 +thumb_func 0x8031d9c LoadMainMenuWindowFrameTiles +thumb_func 0x8031de4 DrawMainMenuWindowBorder +thumb_func 0x8031f48 ClearMainMenuWindowTilemap +thumb_func 0x8031f90 NewGameBirchSpeech_ClearGenderWindowTilemap thumb_func 0x8031fd8 -thumb_func 0x8032010 -thumb_func 0x8032098 -thumb_func 0x80320c4 +thumb_func 0x8032010 NewGameBirchSpeech_ClearWindow +thumb_func 0x8032098 NewGameBirchSpeech_ShowPokeBallPrinterCallback +thumb_func 0x80320c4 CreateYesNoMenuParameterized thumb_func 0x803213c thumb_func 0x8032174 -thumb_func 0x80324b4 -thumb_func 0x80324ec -thumb_func 0x8032534 +thumb_func 0x80324b4 Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox +thumb_func 0x80324ec HandleLinkBattleSetup +thumb_func 0x8032534 SetUpBattleVarsAndBirchZigzagoon thumb_func 0x8032600 -thumb_func 0x80326bc -thumb_func 0x8032b58 -thumb_func 0x8032ee8 -thumb_func 0x8033050 -thumb_func 0x80330dc +thumb_func 0x80326bc InitSinglePlayerBtlControllers +thumb_func 0x8032b58 InitLinkBtlControllers +thumb_func 0x8032ee8 SetBattlePartyIds +thumb_func 0x8033050 PrepareBufferDataTransfer +thumb_func 0x80330dc CreateTasksForSendRecvLinkBuffers thumb_func 0x803318c PrepareBufferDataTransferLink -thumb_func 0x803330c +thumb_func 0x803330c Task_HandleSendLinkBuffersData thumb_func 0x80334e0 -thumb_func 0x80335f4 +thumb_func 0x80335f4 Task_HandleCopyReceivedLinkBuffersData thumb_func 0x803374c BtlController_EmitGetMonData thumb_func 0x8033770 BtlController_EmitGetRawMonData thumb_func 0x8033798 BtlController_EmitSetMonData @@ -1687,68 +1687,68 @@ thumb_func 0x80338fc BtlController_EmitPaletteFade thumb_func 0x803391c BtlController_EmitSuccessBallThrowAnim thumb_func 0x803393c BtlController_EmitBallThrowAnim thumb_func 0x803395c BtlController_EmitPause -thumb_func 0x80339a4 -thumb_func 0x8033a7c +thumb_func 0x80339a4 BtlController_EmitMoveAnimation +thumb_func 0x8033a7c BtlController_EmitPrintSelectionString thumb_func 0x8033b74 -thumb_func 0x8033c3c -thumb_func 0x8033c68 -thumb_func 0x8033c88 -thumb_func 0x8033cc4 -thumb_func 0x8033cf8 -thumb_func 0x8033d34 -thumb_func 0x8033d54 -thumb_func 0x8033d8c -thumb_func 0x8033dc0 -thumb_func 0x8033e14 -thumb_func 0x8033e50 -thumb_func 0x8033e70 -thumb_func 0x8033eb8 -thumb_func 0x8033f20 -thumb_func 0x8033f68 -thumb_func 0x8033fb0 -thumb_func 0x8033fdc -thumb_func 0x8034014 -thumb_func 0x8034040 -thumb_func 0x803406c -thumb_func 0x803408c -thumb_func 0x80340ac -thumb_func 0x80340cc -thumb_func 0x80340ec +thumb_func 0x8033c3c BtlController_EmitChooseAction +thumb_func 0x8033c68 BtlController_EmitUnknownYesNoBox +thumb_func 0x8033c88 BtlController_EmitChooseMove +thumb_func 0x8033cc4 BtlController_EmitChooseItem +thumb_func 0x8033cf8 BtlController_EmitChoosePokemon +thumb_func 0x8033d34 BtlController_EmitCmd23 +thumb_func 0x8033d54 BtlController_EmitHealthBarUpdate +thumb_func 0x8033d8c BtlController_EmitExpUpdate +thumb_func 0x8033dc0 BtlController_EmitStatusIconUpdate +thumb_func 0x8033e14 BtlController_EmitStatusAnimation +thumb_func 0x8033e50 BtlController_EmitStatusXor +thumb_func 0x8033e70 BtlController_EmitDataTransfer +thumb_func 0x8033eb8 BtlController_EmitDMA3Transfer +thumb_func 0x8033f20 BtlController_EmitPlayBGM +thumb_func 0x8033f68 BtlController_EmitCmd32 +thumb_func 0x8033fb0 BtlController_EmitTwoReturnValues +thumb_func 0x8033fdc BtlController_EmitChosenMonReturnValue +thumb_func 0x8034014 BtlController_EmitOneReturnValue +thumb_func 0x8034040 BtlController_EmitOneReturnValue_Duplicate +thumb_func 0x803406c BtlController_EmitCmd37 +thumb_func 0x803408c BtlController_EmitCmd38 +thumb_func 0x80340ac BtlController_EmitCmd39 +thumb_func 0x80340cc BtlController_EmitCmd40 +thumb_func 0x80340ec BtlController_EmitHitAnimation thumb_func 0x803410c -thumb_func 0x803412c -thumb_func 0x8034158 -thumb_func 0x8034184 -thumb_func 0x80341a4 -thumb_func 0x80341c4 -thumb_func 0x80341e4 -thumb_func 0x803422c -thumb_func 0x803424c -thumb_func 0x803426c -thumb_func 0x8034290 -thumb_func 0x80342bc -thumb_func 0x8034300 -thumb_func 0x8034320 +thumb_func 0x803412c BtlController_EmitPlaySE +thumb_func 0x8034158 BtlController_EmitPlayFanfareOrBGM +thumb_func 0x8034184 BtlController_EmitFaintingCry +thumb_func 0x80341a4 BtlController_EmitIntroSlide +thumb_func 0x80341c4 BtlController_EmitIntroTrainerBallThrow +thumb_func 0x80341e4 BtlController_EmitDrawPartyStatusSummary +thumb_func 0x803422c BtlController_EmitHidePartyStatusSummary +thumb_func 0x803424c BtlController_EmitEndBounceEffect +thumb_func 0x803426c BtlController_EmitSpriteInvisibility +thumb_func 0x8034290 BtlController_EmitBattleAnimation +thumb_func 0x80342bc BtlController_EmitLinkStandbyMsg +thumb_func 0x8034300 BtlController_EmitResetActionMoveSelection +thumb_func 0x8034320 BtlController_EmitCmd55 thumb_func 0x8034370 thumb_func 0x803437c -thumb_func 0x8034388 -thumb_func 0x80343bc -thumb_func 0x80343e4 -thumb_func 0x8034418 -thumb_func 0x8034448 +thumb_func 0x8034388 LoadCompressedSpriteSheet +thumb_func 0x80343bc LoadCompressedSpriteSheetOverrideBuffer +thumb_func 0x80343e4 LoadCompressedSpritePalette +thumb_func 0x8034418 LoadCompressedSpritePaletteOverrideBuffer +thumb_func 0x8034448 DecompressPicFromTable thumb_func 0x8034480 HandleLoadSpecialPokePic thumb_func 0x80344ac -thumb_func 0x8034568 +thumb_func 0x8034568 Unused_LZDecompressWramIndirect thumb_func 0x8034574 -thumb_func 0x80347cc -thumb_func 0x80347e0 -thumb_func 0x803481c +thumb_func 0x80347cc GetDecompressedDataSize +thumb_func 0x80347e0 LoadCompressedSpriteSheetUsingHeap +thumb_func 0x803481c LoadCompressedSpritePaletteUsingHeap thumb_func 0x8034860 thumb_func 0x8034898 thumb_func 0x8034954 HandleLoadSpecialPokePic_2 -thumb_func 0x8034980 +thumb_func 0x8034980 DecompressPicFromTable_DontHandleDeoxys thumb_func 0x80349a8 HandleLoadSpecialPokePic_DontHandleDeoxys -thumb_func 0x80349d4 -thumb_func 0x8034a88 +thumb_func 0x80349d4 LoadSpecialPokePic_DontHandleDeoxys +thumb_func 0x8034a88 DuplicateDeoxysTiles thumb_func 0x8034aac thumb_func 0x8034b20 thumb_func 0x8034b6c @@ -1760,41 +1760,41 @@ thumb_func 0x8035118 thumb_func 0x8035234 thumb_func 0x80352d4 thumb_func 0x8035370 -thumb_func 0x80353c8 -thumb_func 0x803540c +thumb_func 0x80353c8 SharesTileWithAnyActive +thumb_func 0x803540c SharesPalWithAnyActive thumb_func 0x8035450 thumb_func 0x8035460 thumb_func 0x80354a0 -thumb_func 0x80354b0 +thumb_func 0x80354b0 BattleInitBgsAndWindows thumb_func 0x8035528 -thumb_func 0x8035564 -thumb_func 0x80355c8 +thumb_func 0x8035564 LoadBattleMenuWindowGfx +thumb_func 0x80355c8 DrawMainBattleBackground thumb_func 0x80358f8 thumb_func 0x8035938 thumb_func 0x8035aa0 -thumb_func 0x8035bc8 -thumb_func 0x8035fb8 +thumb_func 0x8035bc8 UpdateFastPaletteFade +thumb_func 0x8035fb8 DrawBattleEntryBackground thumb_func 0x8036224 -thumb_func 0x80365b4 -thumb_func 0x8036628 +thumb_func 0x80365b4 CB2_InitBattle +thumb_func 0x8036628 CB2_InitBattleInternal thumb_func 0x80368b0 -thumb_func 0x8036998 -thumb_func 0x8036a5c +thumb_func 0x8036998 SetPlayerBerryDataInBattleStruct +thumb_func 0x8036a5c SetAllPlayersBerryData thumb_func 0x8036d0c -thumb_func 0x8036e00 +thumb_func 0x8036e00 CB2_HandleStartBattle thumb_func 0x8037274 thumb_func 0x8037770 -thumb_func 0x803782c -thumb_func 0x8037a7c -thumb_func 0x8037b44 -thumb_func 0x80380fc -thumb_func 0x8038178 -thumb_func 0x80381c0 +thumb_func 0x803782c CB2_PreInitMultiBattle +thumb_func 0x8037a7c CB2_PreInitIngamePlayerPartnerBattle +thumb_func 0x8037b44 CB2_HandleStartMultiBattle +thumb_func 0x80380fc BattleMainCB2 +thumb_func 0x8038178 FreeRestoreBattleData +thumb_func 0x80381c0 CB2_QuitRecordedBattle thumb_func 0x8038204 thumb_func 0x8038214 thumb_func 0x80382c4 thumb_func 0x80386b8 -thumb_func 0x80386dc +thumb_func 0x80386dc VBlankCB_Battle thumb_func 0x80387b4 nullsub_34 thumb_func 0x80387b8 thumb_func 0x8038828 @@ -1806,15 +1806,15 @@ thumb_func 0x8038e94 thumb_func 0x8038f5c thumb_func 0x8039030 thumb_func 0x8039050 -thumb_func 0x8039420 +thumb_func 0x8039420 SpriteCb_WildMon thumb_func 0x8039450 SpriteCb_MoveWildMonToRight -thumb_func 0x803947c -thumb_func 0x80394d8 +thumb_func 0x803947c SpriteCb_WildMonShowHealthbox +thumb_func 0x80394d8 SpriteCb_WildMonAnimate thumb_func 0x80394fc nullsub_37 thumb_func 0x8039500 thumb_func 0x8039514 -thumb_func 0x8039578 -thumb_func 0x803968c +thumb_func 0x8039578 SpriteCB_FaintOpponentMon +thumb_func 0x803968c SpriteCB_AnimFaintOpponent thumb_func 0x803971c thumb_func 0x8039738 thumb_func 0x8039770 @@ -1824,9 +1824,9 @@ thumb_func 0x8039804 oac_poke_ally_ thumb_func 0x8039834 thumb_func 0x8039840 nullsub_38 thumb_func 0x8039844 -thumb_func 0x803986c -thumb_func 0x803998c -thumb_func 0x8039a3c +thumb_func 0x803986c DoBounceEffect +thumb_func 0x803998c EndBounceEffect +thumb_func 0x8039a3c SpriteCB_BounceEffect thumb_func 0x8039a88 thumb_func 0x8039aa4 thumb_func 0x8039ac8 @@ -1835,162 +1835,162 @@ thumb_func 0x8039b0c nullsub_39 thumb_func 0x8039b10 BeginBattleIntro thumb_func 0x8039b34 thumb_func 0x8039b40 -thumb_func 0x8039b84 -thumb_func 0x8039ec8 -thumb_func 0x803a3a0 -thumb_func 0x803a804 -thumb_func 0x803a878 -thumb_func 0x803a8c8 -thumb_func 0x803abc4 -thumb_func 0x803ad64 -thumb_func 0x803ad9c -thumb_func 0x803adc4 -thumb_func 0x803ae20 -thumb_func 0x803aea0 -thumb_func 0x803af58 +thumb_func 0x8039b84 BattleStartClearSetData +thumb_func 0x8039ec8 SwitchInClearSetData +thumb_func 0x803a3a0 FaintClearSetData +thumb_func 0x803a804 BattleIntroGetMonsData +thumb_func 0x803a878 BattleIntroPrepareBackgroundSlide +thumb_func 0x803a8c8 BattleIntroDrawTrainersOrMonsSprites +thumb_func 0x803abc4 BattleIntroDrawPartySummaryScreens +thumb_func 0x803ad64 BattleIntroPrintTrainerWantsToBattle +thumb_func 0x803ad9c BattleIntroPrintWildMonAttacked +thumb_func 0x803adc4 BattleIntroPrintOpponentSendsOut +thumb_func 0x803ae20 BattleIntroOpponent2SendsOutMonAnimation +thumb_func 0x803aea0 BattleIntroOpponent1SendsOutMonAnimation +thumb_func 0x803af58 BattleIntroRecordMonsToDex thumb_func 0x803aff0 -thumb_func 0x803b010 -thumb_func 0x803b070 -thumb_func 0x803b10c +thumb_func 0x803b010 BattleIntroPrintPlayerSendsOut +thumb_func 0x803b070 BattleIntroPlayer2SendsOutMonAnimation +thumb_func 0x803b10c BattleIntroPlayer1SendsOutMonAnimation thumb_func 0x803b1dc -thumb_func 0x803b26c -thumb_func 0x803b548 -thumb_func 0x803b600 -thumb_func 0x803b7cc +thumb_func 0x803b26c TryDoEventsBeforeFirstTurn +thumb_func 0x803b548 HandleEndTurn_ContinueBattle +thumb_func 0x803b600 BattleTurnPassed +thumb_func 0x803b7cc IsRunningFromBattleImpossible thumb_func 0x803b9e4 -thumb_func 0x803bab8 -thumb_func 0x803c9fc +thumb_func 0x803bab8 HandleTurnActionSelectionState +thumb_func 0x803c9fc AllAtActionConfirmed thumb_func 0x803ca3c thumb_func 0x803cb20 SwapTurnOrder -thumb_func 0x803cb54 -thumb_func 0x803cf2c -thumb_func 0x803d1c4 +thumb_func 0x803cb54 GetWhoStrikesFirst +thumb_func 0x803cf2c SetActionsAndBattlersTurnOrder +thumb_func 0x803d1c4 TurnValuesCleanUp thumb_func 0x803d2e4 SpecialStatusesClear -thumb_func 0x803d334 -thumb_func 0x803d45c +thumb_func 0x803d334 CheckFocusPunch_ClearVarsBeforeTurnStarts +thumb_func 0x803d45c RunTurnActionsFunctions thumb_func 0x803d488 -thumb_func 0x803d504 -thumb_func 0x803d700 -thumb_func 0x803d7e0 +thumb_func 0x803d504 HandleEndTurn_BattleWon +thumb_func 0x803d700 HandleEndTurn_BattleLost +thumb_func 0x803d7e0 HandleEndTurn_RanFromBattle thumb_func 0x803d8c4 HandleEndTurn_MonFled -thumb_func 0x803d918 -thumb_func 0x803da80 -thumb_func 0x803daf4 +thumb_func 0x803d918 HandleEndTurn_FinishBattle +thumb_func 0x803da80 FreeResetData_ReturnToOvOrDoEvolutions +thumb_func 0x803daf4 TryEvolvePokemon thumb_func 0x803db88 WaitForEvoSceneToFinish -thumb_func 0x803dbb0 -thumb_func 0x803dc58 +thumb_func 0x803dbb0 ReturnFromBattleToOverworld +thumb_func 0x803dc58 RunBattleScriptCommands_PopCallbacksStack thumb_func 0x803dccc -thumb_func 0x803dcf8 +thumb_func 0x803dcf8 HandleAction_UseMove thumb_func 0x803e4a8 HandleAction_Switch -thumb_func 0x803e54c -thumb_func 0x803e860 -thumb_func 0x803ea88 +thumb_func 0x803e54c HandleAction_UseItem +thumb_func 0x803e860 TryRunFromBattle +thumb_func 0x803ea88 HandleAction_Run thumb_func 0x803ebe8 HandleAction_WatchesCarefully thumb_func 0x803ec30 HandleAction_SafariZoneBallThrow -thumb_func 0x803ec90 -thumb_func 0x803ed60 -thumb_func 0x803ee30 +thumb_func 0x803ec90 HandleAction_ThrowPokeblock +thumb_func 0x803ed60 HandleAction_GoNear +thumb_func 0x803ee30 HandleAction_SafariZoneRun thumb_func 0x803ee6c HandleAction_WallyBallThrow thumb_func 0x803eee4 HandleAction_TryFinish thumb_func 0x803ef0c HandleAction_NothingIsFainted -thumb_func 0x803ef40 -thumb_func 0x803f00c -thumb_func 0x803f0c0 -thumb_func 0x803f188 -thumb_func 0x803f2bc -thumb_func 0x803f3d0 -thumb_func 0x803f440 +thumb_func 0x803ef40 HandleAction_ActionFinished +thumb_func 0x803f00c GetBattlerForBattleScript +thumb_func 0x803f0c0 PressurePPLose +thumb_func 0x803f188 PressurePPLoseOnUsingImprison +thumb_func 0x803f2bc PressurePPLoseOnUsingPerishSong +thumb_func 0x803f3d0 MarkAllBattlersForControllerExec +thumb_func 0x803f440 MarkBattlerForControllerExec thumb_func 0x803f490 thumb_func 0x803f4e0 CancelMultiTurnMoves -thumb_func 0x803f54c -thumb_func 0x803f5a4 +thumb_func 0x803f54c WasUnableToUseMove +thumb_func 0x803f5a4 PrepareStringBattle thumb_func 0x803f5c8 ResetSentPokesToOpponentValue thumb_func 0x803f62c thumb_func 0x803f6b0 thumb_func 0x803f718 BattleScriptPush thumb_func 0x803f73c BattleScriptPushCursor thumb_func 0x803f764 BattleScriptPop -thumb_func 0x803f78c -thumb_func 0x803fb0c -thumb_func 0x803fd08 -thumb_func 0x803fd70 -thumb_func 0x803fe10 -thumb_func 0x8040564 -thumb_func 0x8040fa4 -thumb_func 0x8041368 +thumb_func 0x803f78c TrySetCantSelectMoveBattleScript +thumb_func 0x803fb0c CheckMoveLimitations +thumb_func 0x803fd08 AreAllMovesUnusable +thumb_func 0x803fd70 GetImprisonedMovesCount +thumb_func 0x803fe10 DoFieldEndTurnEffects +thumb_func 0x8040564 DoBattlerEndTurnEffects +thumb_func 0x8040fa4 HandleWishPerishSongOnTurnEnd +thumb_func 0x8041368 HandleFaintedMonActions thumb_func 0x804165c TryClearRageStatuses thumb_func 0x80416ac -thumb_func 0x8042034 -thumb_func 0x80422fc -thumb_func 0x8042468 +thumb_func 0x8042034 HasNoMonsToSwitch +thumb_func 0x80422fc CastformDataTypeChange +thumb_func 0x8042468 AbilityBattleEffects thumb_func 0x8044098 BattleScriptExecute thumb_func 0x80440d8 BattleScriptPushCursorAndCallback -thumb_func 0x804411c +thumb_func 0x804411c ItemBattleEffects thumb_func 0x80454a8 ClearFuryCutterDestinyBondGrudge thumb_func 0x80454f4 -thumb_func 0x8045520 -thumb_func 0x8045884 -thumb_func 0x80458fc -thumb_func 0x8045c3c -thumb_func 0x8045fec -thumb_func 0x804607c +thumb_func 0x8045520 GetMoveTarget +thumb_func 0x8045884 HasObedientBitSet +thumb_func 0x80458fc IsMonDisobedient +thumb_func 0x8045c3c atk00_attackcanceler +thumb_func 0x8045fec JumpIfMoveFailed +thumb_func 0x804607c atk40_jumpifaffectedbyprotect thumb_func 0x80460ec JumpIfMoveAffectedByProtect -thumb_func 0x8046158 -thumb_func 0x80462a0 +thumb_func 0x8046158 AccuracyCalcHelper +thumb_func 0x80462a0 atk01_accuracycheck thumb_func 0x8046628 atk02_attackstring -thumb_func 0x804667c -thumb_func 0x8046858 -thumb_func 0x80469cc -thumb_func 0x8046abc -thumb_func 0x8046ba0 -thumb_func 0x8046c78 -thumb_func 0x8046ee8 -thumb_func 0x804716c -thumb_func 0x8047224 -thumb_func 0x80473fc -thumb_func 0x80474f8 -thumb_func 0x8047534 -thumb_func 0x80476e4 -thumb_func 0x8047870 +thumb_func 0x804667c atk03_ppreduce +thumb_func 0x8046858 atk04_critcalc +thumb_func 0x80469cc atk05_damagecalc +thumb_func 0x8046abc AI_CalcDmg +thumb_func 0x8046ba0 ModulateDmgByType +thumb_func 0x8046c78 atk06_typecalc +thumb_func 0x8046ee8 CheckWonderGuardAndLevitate +thumb_func 0x804716c ModulateDmgByType2 +thumb_func 0x8047224 TypeCalc +thumb_func 0x80473fc AI_TypeCalc +thumb_func 0x80474f8 Unused_ApplyRandomDmgMultiplier +thumb_func 0x8047534 atk07_adjustnormaldamage +thumb_func 0x80476e4 atk08_adjustnormaldamage2 +thumb_func 0x8047870 atk09_attackanimation thumb_func 0x8047a08 -thumb_func 0x8047a28 -thumb_func 0x8047b04 +thumb_func 0x8047a28 atk0B_healthbarupdate +thumb_func 0x8047b04 atk0C_datahpupdate thumb_func 0x8047efc atk0D_critmessage -thumb_func 0x8047f50 -thumb_func 0x8048020 +thumb_func 0x8047f50 atk0E_effectivenesssound +thumb_func 0x8048020 atk0F_resultmessage thumb_func 0x80481d0 atk10_printstring -thumb_func 0x8048210 -thumb_func 0x8048254 +thumb_func 0x8048210 atk11_printselectionstring +thumb_func 0x8048254 atk12_waitmessage thumb_func 0x80482b0 atk13_printfromtable -thumb_func 0x8048304 +thumb_func 0x8048304 atk14_printselectionstringfromtable thumb_func 0x8048368 GetBattlerTurnOrderNum -thumb_func 0x80483a0 -thumb_func 0x8049614 -thumb_func 0x8049700 -thumb_func 0x8049710 -thumb_func 0x8049720 -thumb_func 0x804979c -thumb_func 0x8049a80 -thumb_func 0x8049abc -thumb_func 0x8049b44 -thumb_func 0x8049bbc -thumb_func 0x8049c34 -thumb_func 0x8049d1c -thumb_func 0x8049d94 -thumb_func 0x8049e8c -thumb_func 0x8049f10 -thumb_func 0x8049f6c -thumb_func 0x804a900 +thumb_func 0x80483a0 SetMoveEffect +thumb_func 0x8049614 atk15_seteffectwithchance +thumb_func 0x8049700 atk16_seteffectprimary +thumb_func 0x8049710 atk17_seteffectsecondary +thumb_func 0x8049720 atk18_clearstatusfromeffect +thumb_func 0x804979c atk19_tryfaintmon +thumb_func 0x8049a80 atk1A_dofaintanimation +thumb_func 0x8049abc atk1B_cleareffectsonfaint +thumb_func 0x8049b44 atk1C_jumpifstatus +thumb_func 0x8049bbc atk1D_jumpifstatus2 +thumb_func 0x8049c34 atk1E_jumpifability +thumb_func 0x8049d1c atk1F_jumpifsideaffecting +thumb_func 0x8049d94 atk20_jumpifstat +thumb_func 0x8049e8c atk21_jumpifstatus3condition +thumb_func 0x8049f10 atk22_jumpiftype +thumb_func 0x8049f6c atk23_getexp +thumb_func 0x804a900 atk24 thumb_func 0x804ab60 MoveValuesCleanUp -thumb_func 0x804aba0 -thumb_func 0x804abb8 -thumb_func 0x804abd0 +thumb_func 0x804aba0 atk25_movevaluescleanup +thumb_func 0x804abb8 atk26_setmultihit +thumb_func 0x804abd0 atk27_decrementmultihit thumb_func 0x804ac18 atk28_goto -thumb_func 0x804ac38 -thumb_func 0x804acd8 -thumb_func 0x804ad80 -thumb_func 0x804ae34 -thumb_func 0x804aebc +thumb_func 0x804ac38 atk29_jumpifbyte +thumb_func 0x804acd8 atk2A_jumpifhalfword +thumb_func 0x804ad80 atk2B_jumpifword +thumb_func 0x804ae34 atk2C_jumpifarrayequal +thumb_func 0x804aebc atk2D_jumpifarraynotequal thumb_func 0x804af40 atk2E_setbyte thumb_func 0x804af68 atk2F_addbyte thumb_func 0x804af94 atk30_subbyte @@ -2004,234 +2004,234 @@ thumb_func 0x804b154 atk37_bichalfword thumb_func 0x804b18c atk38_bicword thumb_func 0x804b1d0 atk39_pause thumb_func 0x804b210 -thumb_func 0x804b230 -thumb_func 0x804b288 -thumb_func 0x804b294 -thumb_func 0x804b2d4 -thumb_func 0x804b2ec -thumb_func 0x804b328 -thumb_func 0x804b358 -thumb_func 0x804b3b4 -thumb_func 0x804b400 -thumb_func 0x804b41c -thumb_func 0x804b4e0 -thumb_func 0x804b5ac -thumb_func 0x804b608 -thumb_func 0x804b7fc -thumb_func 0x804c224 -thumb_func 0x804c474 -thumb_func 0x804c4c4 -thumb_func 0x804c534 -thumb_func 0x804c718 -thumb_func 0x804c7e0 +thumb_func 0x804b230 atk3B_healthbar_update +thumb_func 0x804b288 atk3C_return +thumb_func 0x804b294 atk3D_end +thumb_func 0x804b2d4 atk3E_end2 +thumb_func 0x804b2ec atk3F_end3 +thumb_func 0x804b328 atk41_call +thumb_func 0x804b358 atk42_jumpiftype2 +thumb_func 0x804b3b4 atk43_jumpifabilitypresent +thumb_func 0x804b400 atk44_endselectionscript +thumb_func 0x804b41c atk45_playanimation +thumb_func 0x804b4e0 atk46_playanimation2 +thumb_func 0x804b5ac atk47_setgraphicalstatchangevalues +thumb_func 0x804b608 atk48_playstatchangeanimation +thumb_func 0x804b7fc atk49_moveend +thumb_func 0x804c224 atk4A_typecalc2 +thumb_func 0x804c474 atk4B_returnatktoball +thumb_func 0x804c4c4 atk4C_getswitchedmondata +thumb_func 0x804c534 atk4D_switchindataupdate +thumb_func 0x804c718 atk4E_switchinanim +thumb_func 0x804c7e0 atk4F_jumpifcantswitch thumb_func 0x804cb40 thumb_func 0x804cbb8 -thumb_func 0x804d450 -thumb_func 0x804d6dc +thumb_func 0x804d450 atk51_switchhandleorder +thumb_func 0x804d6dc atk52_switchineffects thumb_func 0x804d9d8 -thumb_func 0x804da08 -thumb_func 0x804da44 -thumb_func 0x804da80 +thumb_func 0x804da08 atk54_playse +thumb_func 0x804da44 atk55_fanfare +thumb_func 0x804da80 atk56_playfaintcry thumb_func 0x804dab0 -thumb_func 0x804dae8 -thumb_func 0x804db1c -thumb_func 0x804dc68 -thumb_func 0x804dff8 -thumb_func 0x804e138 -thumb_func 0x804e1c8 -thumb_func 0x804e2f0 -thumb_func 0x804e37c -thumb_func 0x804e430 -thumb_func 0x804e480 -thumb_func 0x804e4b0 -thumb_func 0x804e578 -thumb_func 0x804e5a8 -thumb_func 0x804e60c -thumb_func 0x804e69c -thumb_func 0x804e744 -thumb_func 0x804e7d8 +thumb_func 0x804dae8 atk58_returntoball +thumb_func 0x804db1c atk59_handlelearnnewmove +thumb_func 0x804dc68 atk5A_yesnoboxlearnmove +thumb_func 0x804dff8 RegionMap_GetMarineCaveCoords +thumb_func 0x804e138 atk5C_hitanimation +thumb_func 0x804e1c8 RubyBattleTowerRecordToEmerald +thumb_func 0x804e2f0 atk5D_getmoneyreward +thumb_func 0x804e37c atk5E +thumb_func 0x804e430 atk5F_swapattackerwithtarget +thumb_func 0x804e480 atk60_incrementgamestat +thumb_func 0x804e4b0 atk61_drawpartystatussummary +thumb_func 0x804e578 atk62_hidepartystatussummary +thumb_func 0x804e5a8 atk63_jumptocalledmove +thumb_func 0x804e60c atk64_statusanimation +thumb_func 0x804e69c atk65_status2animation +thumb_func 0x804e744 atk66_chosenstatusanimation +thumb_func 0x804e7d8 atk67_yesnobox thumb_func 0x804e8bc atk68_cancelallactions -thumb_func 0x804e8f4 -thumb_func 0x804ea70 +thumb_func 0x804e8f4 atk69_adjustsetdamage +thumb_func 0x804ea70 atk6A_removeitem thumb_func 0x804eae0 atk6B_atknameinbuff1 -thumb_func 0x804eb1c -thumb_func 0x804ed18 -thumb_func 0x804ed5c +thumb_func 0x804eb1c atk6C_drawlvlupbox +thumb_func 0x804ed18 DrawLevelUpWindow1 +thumb_func 0x804ed5c DrawLevelUpWindow2 thumb_func 0x804ed94 thumb_func 0x804ede4 -thumb_func 0x804ee38 +thumb_func 0x804ee38 PutLevelAndGenderOnLvlUpBox thumb_func 0x804ef50 -thumb_func 0x804ef90 -thumb_func 0x804f05c -thumb_func 0x804f0a4 -thumb_func 0x804f0e0 -thumb_func 0x804f0f8 -thumb_func 0x804f118 -thumb_func 0x804f14c +thumb_func 0x804ef90 PutMonIconOnLvlUpBox +thumb_func 0x804f05c SpriteCB_MonIconOnLvlUpBox +thumb_func 0x804f0a4 IsMonGettingExpSentOut +thumb_func 0x804f0e0 atk6D_resetsentmonsvalue +thumb_func 0x804f0f8 atk6E_setatktoplayer0 +thumb_func 0x804f118 atk6F_makevisible +thumb_func 0x804f14c atk70_recordlastability thumb_func 0x804f180 BufferMoveToLearnIntoBattleTextBuff2 -thumb_func 0x804f1a8 -thumb_func 0x804f1c0 -thumb_func 0x804f204 -thumb_func 0x804f2b0 -thumb_func 0x804f360 -thumb_func 0x804f3b8 -thumb_func 0x804f998 -thumb_func 0x804fad4 -thumb_func 0x804fbf0 -thumb_func 0x804fc50 -thumb_func 0x804fcf4 -thumb_func 0x804fd70 -thumb_func 0x804fed8 -thumb_func 0x804ff2c -thumb_func 0x804fff8 -thumb_func 0x80500b8 -thumb_func 0x8050138 -thumb_func 0x8050208 -thumb_func 0x8050250 -thumb_func 0x8050260 -thumb_func 0x80502fc -thumb_func 0x8050378 -thumb_func 0x80503f4 -thumb_func 0x8050514 +thumb_func 0x804f1a8 atk71_buffermovetolearn +thumb_func 0x804f1c0 atk72_jumpifplayerran +thumb_func 0x804f204 atk73_hpthresholds +thumb_func 0x804f2b0 atk74_hpthresholds2 +thumb_func 0x804f360 atk75_useitemonopponent +thumb_func 0x804f3b8 atk76_various +thumb_func 0x804f998 atk77_setprotectlike +thumb_func 0x804fad4 atk78_faintifabilitynotdamp +thumb_func 0x804fbf0 atk79_setatkhptozero +thumb_func 0x804fc50 atk7A_jumpifnexttargetvalid +thumb_func 0x804fcf4 atk7B_tryhealhalfhealth +thumb_func 0x804fd70 atk7C_trymirrormove +thumb_func 0x804fed8 atk7D_setrain +thumb_func 0x804ff2c atk7E_setreflect +thumb_func 0x804fff8 atk7F_setseeded +thumb_func 0x80500b8 atk80_manipulatedamage +thumb_func 0x8050138 atk81_trysetrest +thumb_func 0x8050208 atk82_jumpifnotfirstturn +thumb_func 0x8050250 atk83_nop +thumb_func 0x8050260 UproarWakeUpCheck +thumb_func 0x80502fc atk84_jumpifcantmakeasleep +thumb_func 0x8050378 atk85_stockpile +thumb_func 0x80503f4 atk86_stockpiletobasedamage +thumb_func 0x8050514 atk87_stockpiletohpheal thumb_func 0x80505f8 atk88_negativedamage -thumb_func 0x805062c +thumb_func 0x805062c ChangeStatBuffs thumb_func 0x8050ab0 atk89_statbuffchange thumb_func 0x8050afc atk8A_normalisebuffs thumb_func 0x8050b50 atk8B_setbide thumb_func 0x8050bc0 atk8C_confuseifrepeatingattackends -thumb_func 0x8050c00 +thumb_func 0x8050c00 atk8D_setmultihitcounter thumb_func 0x8050c4c atk8E_initmultihitstring -thumb_func 0x8050c74 -thumb_func 0x8050d3c -thumb_func 0x8051034 -thumb_func 0x80511d8 -thumb_func 0x8051274 -thumb_func 0x8051340 +thumb_func 0x8050c74 TryDoForceSwitchOut +thumb_func 0x8050d3c atk8F_forcerandomswitch +thumb_func 0x8051034 atk90_tryconversiontypechange +thumb_func 0x80511d8 atk91_givepaydaymoney +thumb_func 0x8051274 atk92_setlightscreen +thumb_func 0x8051340 atk93_tryKO thumb_func 0x8051694 atk94_damagetohalftargethp -thumb_func 0x80516d0 -thumb_func 0x8051728 -thumb_func 0x80518a0 -thumb_func 0x8051a58 -thumb_func 0x8051b68 -thumb_func 0x8051c10 -thumb_func 0x8051c6c -thumb_func 0x8051e0c +thumb_func 0x80516d0 atk95_setsandstorm +thumb_func 0x8051728 atk96_weatherdamage +thumb_func 0x80518a0 atk97_tryinfatuating +thumb_func 0x8051a58 atk98_updatestatusicon +thumb_func 0x8051b68 atk99_setmist +thumb_func 0x8051c10 atk9A_setfocusenergy +thumb_func 0x8051c6c atk9B_transformdataexecution +thumb_func 0x8051e0c atk9C_setsubstitute thumb_func 0x8051ec8 IsMoveUncopyableByMimic -thumb_func 0x8051f10 -thumb_func 0x80520ec +thumb_func 0x8051f10 atk9D_mimicattackcopy +thumb_func 0x80520ec atk9E_metronome thumb_func 0x8052194 atk9F_dmgtolevel -thumb_func 0x80521c4 -thumb_func 0x8052218 -thumb_func 0x8052310 -thumb_func 0x8052408 -thumb_func 0x805254c -thumb_func 0x8052680 -thumb_func 0x8052744 +thumb_func 0x80521c4 atkA0_psywavedamageeffect +thumb_func 0x8052218 atkA1_counterdamagecalculator +thumb_func 0x8052310 atkA2_mirrorcoatdamagecalculator +thumb_func 0x8052408 atkA3_disablelastusedattack +thumb_func 0x805254c atkA4_trysetencore +thumb_func 0x8052680 atkA5_painsplitdmgcalc +thumb_func 0x8052744 atkA6_settypetorandomresistance thumb_func 0x8052944 atkA7_setalwayshitflag -thumb_func 0x805299c -thumb_func 0x8052b58 +thumb_func 0x805299c atkA8_copymovepermanently +thumb_func 0x8052b58 IsTwoTurnsMove thumb_func 0x8052b94 IsInvalidForSleepTalkOrAssist -thumb_func 0x8052bbc -thumb_func 0x8052c28 +thumb_func 0x8052bbc AttacksThisTurn +thumb_func 0x8052c28 atkA9_trychoosesleeptalkmove thumb_func 0x8052d60 atkAA_setdestinybond -thumb_func 0x8052d90 -thumb_func 0x8052df0 -thumb_func 0x8052e08 -thumb_func 0x8052e70 -thumb_func 0x8053048 -thumb_func 0x805332c -thumb_func 0x80533b0 +thumb_func 0x8052d90 TrySetDestinyBondToHappen +thumb_func 0x8052df0 atkAB_trysetdestinybondtohappen +thumb_func 0x8052e08 atkAC_remaininghptopower +thumb_func 0x8052e70 atkAD_tryspiteppreduce +thumb_func 0x8053048 atkAE_healpartystatus +thumb_func 0x805332c atkAF_cursetarget +thumb_func 0x80533b0 atkB0_trysetspikes thumb_func 0x805343c atkB1_setforesight -thumb_func 0x805346c -thumb_func 0x8053524 -thumb_func 0x80536a0 -thumb_func 0x8053708 -thumb_func 0x80537bc -thumb_func 0x8053840 -thumb_func 0x805390c -thumb_func 0x80539b4 -thumb_func 0x8053ad8 -thumb_func 0x8053c6c -thumb_func 0x8053cc4 +thumb_func 0x805346c atkB2_trysetperishsong +thumb_func 0x8053524 atkB3_rolloutdamagecalculation +thumb_func 0x80536a0 atkB4_jumpifconfusedandstatmaxed +thumb_func 0x8053708 atkB5_furycuttercalc +thumb_func 0x80537bc atkB6_happinesstodamagecalculation +thumb_func 0x8053840 atkB7_presentdamagecalculation +thumb_func 0x805390c atkB8_setsafeguard +thumb_func 0x80539b4 atkB9_magnitudedamagecalculation +thumb_func 0x8053ad8 atkBA_jumpifnopursuitswitchdmg +thumb_func 0x8053c6c atkBB_setsunny +thumb_func 0x8053cc4 atkBC_maxattackhalvehp thumb_func 0x8053d44 atkBD_copyfoestats -thumb_func 0x8053d8c +thumb_func 0x8053d8c atkBE_rapidspinfree thumb_func 0x8053ed8 atkBF_setdefensecurlbit -thumb_func 0x8053f08 -thumb_func 0x8054010 +thumb_func 0x8053f08 atkC0_recoverbasedonsunlight +thumb_func 0x8054010 atkC1_hiddenpowercalc thumb_func 0x8054134 atkC2_selectfirstvalidtarget -thumb_func 0x80541a8 -thumb_func 0x80542f4 -thumb_func 0x8054504 -thumb_func 0x8054588 +thumb_func 0x80541a8 atkC3_trysetfutureattack +thumb_func 0x80542f4 atkC4_trydobeatup +thumb_func 0x8054504 atkC5_setsemiinvulnerablebit +thumb_func 0x8054588 atkC6_clearsemiinvulnerablebit thumb_func 0x8054618 atkC7_setminimize -thumb_func 0x8054658 -thumb_func 0x80546b0 -thumb_func 0x805474c +thumb_func 0x8054658 atkC8_sethail +thumb_func 0x80546b0 atkC9_jumpifattackandspecialattackcannotfall +thumb_func 0x805474c atkCA_setforcedtarget thumb_func 0x8054798 atkCB_setcharge -thumb_func 0x80547fc -thumb_func 0x8054870 -thumb_func 0x80548f4 -thumb_func 0x805494c -thumb_func 0x80549a8 -thumb_func 0x8054a1c -thumb_func 0x8054ac4 -thumb_func 0x8054d58 -thumb_func 0x8054dd0 -thumb_func 0x8054ea4 +thumb_func 0x80547fc atkCC_callterrainattack +thumb_func 0x8054870 atkCD_cureifburnedparalysedorpoisoned +thumb_func 0x80548f4 atkCE_settorment +thumb_func 0x805494c atkCF_jumpifnodamage +thumb_func 0x80549a8 atkD0_settaunt +thumb_func 0x8054a1c atkD1_trysethelpinghand +thumb_func 0x8054ac4 atkD2_tryswapitems +thumb_func 0x8054d58 atkD3_trycopyability +thumb_func 0x8054dd0 atkD4_trywish +thumb_func 0x8054ea4 atkD5_trysetroots thumb_func 0x8054efc atkD6_doubledamagedealtifdamaged -thumb_func 0x8054f5c -thumb_func 0x8054fcc -thumb_func 0x8055038 -thumb_func 0x805509c -thumb_func 0x8055134 -thumb_func 0x805523c -thumb_func 0x8055294 -thumb_func 0x805532c -thumb_func 0x80554ac -thumb_func 0x8055530 -thumb_func 0x80555ac -thumb_func 0x8055688 -thumb_func 0x8055704 -thumb_func 0x8055758 -thumb_func 0x8055810 -thumb_func 0x8055a0c -thumb_func 0x8055a74 -thumb_func 0x8055ab4 -thumb_func 0x8055b6c -thumb_func 0x8055c24 -thumb_func 0x8055ccc -thumb_func 0x8055d7c -thumb_func 0x8055e40 -thumb_func 0x8055e94 -thumb_func 0x8055f10 -thumb_func 0x80562b8 -thumb_func 0x8056460 -thumb_func 0x80564dc -thumb_func 0x805664c -thumb_func 0x8056784 -thumb_func 0x80567bc -thumb_func 0x80567fc +thumb_func 0x8054f5c atkD7_setyawn +thumb_func 0x8054fcc atkD8_setdamagetohealthdifference +thumb_func 0x8055038 atkD9_scaledamagebyhealthratio +thumb_func 0x805509c atkDA_tryswapabilities +thumb_func 0x8055134 atkDB_tryimprison +thumb_func 0x805523c atkDC_trysetgrudge +thumb_func 0x8055294 atkDD_weightdamagecalculation +thumb_func 0x805532c atkDE_assistattackselect +thumb_func 0x80554ac atkDF_trysetmagiccoat +thumb_func 0x8055530 atkE0_trysetsnatch +thumb_func 0x80555ac atkE1_trygetintimidatetarget +thumb_func 0x8055688 atkE2_switchoutabilities +thumb_func 0x8055704 atkE3_jumpifhasnohp +thumb_func 0x8055758 atkE4_getsecretpowereffect +thumb_func 0x8055810 atkE5_pickup +thumb_func 0x8055a0c atkE6_docastformchangeanimation +thumb_func 0x8055a74 atkE7_trycastformdatachange +thumb_func 0x8055ab4 atkE8_settypebasedhalvers +thumb_func 0x8055b6c atkE9_setweatherballtype +thumb_func 0x8055c24 atkEA_tryrecycleitem +thumb_func 0x8055ccc atkEB_settypetoterrain +thumb_func 0x8055d7c atkEC_pursuitrelated +thumb_func 0x8055e40 atkEF_snatchsetbattlers +thumb_func 0x8055e94 atkEE_removelightscreenreflect +thumb_func 0x8055f10 atkEF_handleballthrow +thumb_func 0x80562b8 atkF0_givecaughtmon +thumb_func 0x8056460 atkF1_trysetcaughtmondexflags +thumb_func 0x80564dc atkF2_displaydexinfo +thumb_func 0x805664c HandleBattleWindow +thumb_func 0x8056784 BattleCreateYesNoCursorAt +thumb_func 0x80567bc BattleDestroyYesNoCursorAt +thumb_func 0x80567fc atkF3_trygivecaughtmonnick thumb_func 0x8056a88 atkF4_subattackerhpbydmg thumb_func 0x8056ab8 atkF5_removeattackerstatus1 -thumb_func 0x8056ae0 -thumb_func 0x8056aec -thumb_func 0x8056b08 -thumb_func 0x8056b38 -thumb_func 0x8056c38 -thumb_func 0x8056d04 +thumb_func 0x8056ae0 atkF6_finishaction +thumb_func 0x8056aec atkF7_finishturn +thumb_func 0x8056b08 atkF8_trainerslideout +thumb_func 0x8056b38 AllocateBattleResources +thumb_func 0x8056c38 FreeBattleResources +thumb_func 0x8056d04 AdjustFriendshipOnBattleFaint thumb_func 0x8056dec thumb_func 0x8056e6c thumb_func 0x8057068 nullsub_401 thumb_func 0x805706c SetControllerToPlayer -thumb_func 0x805709c +thumb_func 0x805709c PlayerBufferExecCompleted thumb_func 0x8057114 thumb_func 0x8057164 CompleteOnBankSpritePosX_0 thumb_func 0x8057198 thumb_func 0x8057400 -thumb_func 0x8057434 -thumb_func 0x805780c +thumb_func 0x8057434 HandleInputChooseTarget +thumb_func 0x805780c HandleInputChooseMove thumb_func 0x8057bcc -thumb_func 0x8057d48 +thumb_func 0x8057d48 HandleMoveSwitching thumb_func 0x8058308 thumb_func 0x80583c0 thumb_func 0x8058454 @@ -2247,158 +2247,158 @@ thumb_func 0x8058d10 thumb_func 0x8058d40 thumb_func 0x8058db0 thumb_func 0x8058dc8 -thumb_func 0x8058f40 +thumb_func 0x8058f40 Task_PrepareToGiveExpWithExpBar thumb_func 0x8059010 -thumb_func 0x8059154 -thumb_func 0x80591b4 -thumb_func 0x805926c +thumb_func 0x8059154 Task_LaunchLvlUpAnim +thumb_func 0x80591b4 Task_UpdateLvlInHealthbox +thumb_func 0x805926c DestroyExpTaskAndCompleteOnInactiveTextPrinter thumb_func 0x80592b8 thumb_func 0x8059354 thumb_func 0x80593c4 -thumb_func 0x80593dc -thumb_func 0x8059438 -thumb_func 0x80594b4 -thumb_func 0x80594f0 +thumb_func 0x80593dc OpenPartyMenuToChooseMon +thumb_func 0x8059438 WaitForMonSelection +thumb_func 0x80594b4 OpenBagAndChooseItem +thumb_func 0x80594f0 CompleteWhenChoseItem thumb_func 0x805952c thumb_func 0x8059568 -thumb_func 0x80595e4 +thumb_func 0x80595e4 PlayerHandleUnknownYesNoInput thumb_func 0x80596bc thumb_func 0x8059734 -thumb_func 0x805976c +thumb_func 0x805976c MoveSelectionDisplayPpNumber thumb_func 0x80597e0 -thumb_func 0x805983c +thumb_func 0x805983c MoveSelectionCreateCursorAt thumb_func 0x8059884 -thumb_func 0x80598c8 -thumb_func 0x8059910 +thumb_func 0x80598c8 ActionSelectionCreateCursorAt +thumb_func 0x8059910 MoveSelectionDestroyCursorAt thumb_func 0x805995c thumb_func 0x805996c thumb_func 0x805997c thumb_func 0x80599ac -thumb_func 0x80599dc +thumb_func 0x80599dc PrintLinkStandbyMsg thumb_func 0x8059a10 -thumb_func 0x8059a84 -thumb_func 0x805a230 +thumb_func 0x8059a84 CopyPlayerMonData +thumb_func 0x805a230 PlayerHandleGetRawMonData thumb_func 0x805a2b8 -thumb_func 0x805a310 -thumb_func 0x805ad0c +thumb_func 0x805a310 SetPlayerMonData +thumb_func 0x805ad0c PlayerHandleSetRawMonData thumb_func 0x805ad80 PlayerHandleLoadMonSprite thumb_func 0x805ade8 PlayerHandleSwitchInAnim thumb_func 0x805ae74 -thumb_func 0x805aff0 +thumb_func 0x805aff0 PlayerHandleReturnMonToBall thumb_func 0x805b080 -thumb_func 0x805b10c -thumb_func 0x805b480 -thumb_func 0x805b614 -thumb_func 0x805b6d4 -thumb_func 0x805b7c0 -thumb_func 0x805b7e0 -thumb_func 0x805b834 -thumb_func 0x805b894 -thumb_func 0x805b8c4 +thumb_func 0x805b10c PlayerHandleDrawTrainerPic +thumb_func 0x805b480 PlayerHandleTrainerSlide +thumb_func 0x805b614 PlayerHandleTrainerSlideBack +thumb_func 0x805b6d4 PlayerHandleFaintAnimation +thumb_func 0x805b7c0 PlayerHandlePaletteFade +thumb_func 0x805b7e0 PlayerHandleSuccessBallThrowAnim +thumb_func 0x805b834 PlayerHandleBallThrowAnim +thumb_func 0x805b894 PlayerHandlePause +thumb_func 0x805b8c4 PlayerHandleMoveAnimation thumb_func 0x805ba18 -thumb_func 0x805bb9c -thumb_func 0x805bbfc +thumb_func 0x805bb9c PlayerHandlePrintString +thumb_func 0x805bbfc PlayerHandlePrintSelectionString thumb_func 0x805bc20 -thumb_func 0x805bc60 -thumb_func 0x805bccc -thumb_func 0x805bd30 -thumb_func 0x805bd74 -thumb_func 0x805bdc4 -thumb_func 0x805be2c -thumb_func 0x805be64 -thumb_func 0x805bec8 -thumb_func 0x805c008 -thumb_func 0x805c02c -thumb_func 0x805c144 -thumb_func 0x805c1e0 +thumb_func 0x805bc60 PlayerHandleChooseAction +thumb_func 0x805bccc PlayerHandleUnknownYesNoBox +thumb_func 0x805bd30 HandleChooseMoveAfterDma3 +thumb_func 0x805bd74 PlayerChooseMoveInBattlePalace +thumb_func 0x805bdc4 PlayerHandleChooseMove +thumb_func 0x805be2c InitMoveSelectionsVarsAndStrings +thumb_func 0x805be64 PlayerHandleChooseItem +thumb_func 0x805bec8 PlayerHandleChoosePokemon +thumb_func 0x805c008 PlayerHandleCmd23 +thumb_func 0x805c02c PlayerHandleHealthBarUpdate +thumb_func 0x805c144 PlayerHandleExpUpdate +thumb_func 0x805c1e0 PlayerHandleStatusIconUpdate thumb_func 0x805c258 PlayerHandleStatusAnimation -thumb_func 0x805c2c0 +thumb_func 0x805c2c0 PlayerHandleStatusXor thumb_func 0x805c32c -thumb_func 0x805c338 -thumb_func 0x805c3ec -thumb_func 0x805c41c +thumb_func 0x805c338 PlayerHandleDMA3Transfer +thumb_func 0x805c3ec PlayerHandlePlayBGM +thumb_func 0x805c41c ScrCmd_choosecontestmon thumb_func 0x805c428 thumb_func 0x805c43c thumb_func 0x805c450 thumb_func 0x805c464 thumb_func 0x805c478 -thumb_func 0x805c494 -thumb_func 0x805c4cc -thumb_func 0x805c4e4 +thumb_func 0x805c494 PlayerHandleCmd38 +thumb_func 0x805c4cc PlayerHandleCmd39 +thumb_func 0x805c4e4 PlayerHandleCmd40 thumb_func 0x805c50c thumb_func 0x805c57c -thumb_func 0x805c588 -thumb_func 0x805c5cc -thumb_func 0x805c628 +thumb_func 0x805c588 PlayerHandlePlaySE +thumb_func 0x805c5cc PlayerHandlePlayFanfareOrBGM +thumb_func 0x805c628 PlayerHandleFaintingCry thumb_func 0x805c668 -thumb_func 0x805c69c +thumb_func 0x805c69c PlayerHandleIntroTrainerBallThrow thumb_func 0x805c81c -thumb_func 0x805c884 -thumb_func 0x805c990 +thumb_func 0x805c884 task05_08033660 +thumb_func 0x805c990 PlayerHandleDrawPartyStatusSummary thumb_func 0x805ca54 -thumb_func 0x805ca9c -thumb_func 0x805caec -thumb_func 0x805cb10 -thumb_func 0x805cb70 -thumb_func 0x805cbe4 -thumb_func 0x805cc48 -thumb_func 0x805ccb0 +thumb_func 0x805ca9c PlayerHandleHidePartyStatusSummary +thumb_func 0x805caec PlayerHandleEndBounceEffect +thumb_func 0x805cb10 PlayerHandleSpriteInvisibility +thumb_func 0x805cb70 PlayerHandleBattleAnimation +thumb_func 0x805cbe4 PlayerHandleLinkStandbyMsg +thumb_func 0x805cc48 PlayerHandleResetActionMoveSelection +thumb_func 0x805ccb0 PlayerHandleCmd55 thumb_func 0x805cd30 nullsub_41 -thumb_func 0x805cd34 -thumb_func 0x805cd74 -thumb_func 0x805cdb8 +thumb_func 0x805cd34 GetSecretBaseMapName +thumb_func 0x805cd74 FreeBattleSpritesData +thumb_func 0x805cdb8 ChooseMoveAndTargetInBattlePalace thumb_func 0x805d0c4 -thumb_func 0x805d210 +thumb_func 0x805d210 BattlePalaceGetTargetRetValue thumb_func 0x805d330 thumb_func 0x805d38c thumb_func 0x805d3c8 thumb_func 0x805d408 -thumb_func 0x805d424 -thumb_func 0x805d524 +thumb_func 0x805d424 InitAndLaunchChosenStatusAnimation +thumb_func 0x805d524 TryHandleLaunchBattleTableAnimation thumb_func 0x805d664 thumb_func 0x805d674 thumb_func 0x805d6bc ShouldAnimBeDoneRegardlessOfSubsitute -thumb_func 0x805d6e0 +thumb_func 0x805d6e0 InitAndLaunchSpecialAnimation thumb_func 0x805d750 thumb_func 0x805d760 thumb_func 0x805d7a8 -thumb_func 0x805d7ac -thumb_func 0x805d828 -thumb_func 0x805d998 +thumb_func 0x805d7ac mplay_80342A4 +thumb_func 0x805d828 BattleLoadOpponentMonSpriteGfx +thumb_func 0x805d998 BattleLoadPlayerMonSpriteGfx thumb_func 0x805db4c nullsub_40 thumb_func 0x805db50 nullsub_9 -thumb_func 0x805db54 -thumb_func 0x805dba0 +thumb_func 0x805db54 DecompressTrainerFrontPic +thumb_func 0x805dba0 DecompressTrainerBackPic thumb_func 0x805dbfc nullsub_8 -thumb_func 0x805dc00 -thumb_func 0x805dc18 -thumb_func 0x805dca8 -thumb_func 0x805ddd4 -thumb_func 0x805ddf4 -thumb_func 0x805df6c -thumb_func 0x805df94 +thumb_func 0x805dc00 FreeTrainerFrontPicPalette +thumb_func 0x805dc18 BattleLoadAllHealthBoxesGfxAtOnce +thumb_func 0x805dca8 BattleLoadAllHealthBoxesGfx +thumb_func 0x805ddd4 LoadBattleBarGfx +thumb_func 0x805ddf4 BattleInitAllSprites +thumb_func 0x805df6c ClearSpritesHealthboxAnimData +thumb_func 0x805df94 ClearSpritesBattlerHealthboxAnimData thumb_func 0x805dfb0 CopyAllBattleSpritesInvisibilities thumb_func 0x805e024 CopyBattleSpriteInvisibility -thumb_func 0x805e064 +thumb_func 0x805e064 HandleSpeciesGfxDataChange thumb_func 0x805e3f8 -thumb_func 0x805e510 +thumb_func 0x805e510 LoadBattleMonGfxAndAnimate thumb_func 0x805e568 TrySetBehindSubstituteSpriteBit thumb_func 0x805e590 ClearBehindSubstituteBit -thumb_func 0x805e5ac -thumb_func 0x805e67c -thumb_func 0x805e6d0 -thumb_func 0x805e704 +thumb_func 0x805e5ac HandleLowHpMusicChange +thumb_func 0x805e67c BattleStopLowHpSound +thumb_func 0x805e6d0 GetMonHPBarLevel +thumb_func 0x805e704 HandleBattleLowHpMusicChange thumb_func 0x805e7b8 -thumb_func 0x805e8a0 -thumb_func 0x805e98c +thumb_func 0x805e8a0 LoadAndCreateEnemyShadowSprites +thumb_func 0x805e98c SpriteCB_EnemyShadow thumb_func 0x805ea64 -thumb_func 0x805ea70 +thumb_func 0x805ea70 SetBattlerShadowSpriteCallback thumb_func 0x805eafc HideBattlerShadowSprite thumb_func 0x805eb30 thumb_func 0x805eba0 ClearTemporarySpeciesSpriteData -thumb_func 0x805ebd8 -thumb_func 0x805ecb0 -thumb_func 0x805ed2c +thumb_func 0x805ebd8 AllocateMonSpritesGfx +thumb_func 0x805ecb0 FreeMonSpritesGfx +thumb_func 0x805ed2c ShouldPlayNormalMonCry thumb_func 0x805ed7c nullsub_18 thumb_func 0x805ed80 thumb_func 0x805ed9c @@ -2420,47 +2420,47 @@ thumb_func 0x805f8ec thumb_func 0x805f9dc thumb_func 0x805faa4 thumb_func 0x805fad4 -thumb_func 0x805fb04 -thumb_func 0x805fb7c +thumb_func 0x805fb04 OpponentBufferExecCompleted +thumb_func 0x805fb7c OpponentHandleGetMonData thumb_func 0x805fbf0 -thumb_func 0x806039c +thumb_func 0x806039c OpponentHandleGetRawMonData thumb_func 0x8060424 -thumb_func 0x806047c +thumb_func 0x806047c SetOpponentMonData thumb_func 0x8060d9c OpponentHandleSetRawMonData -thumb_func 0x8060e10 +thumb_func 0x8060e10 OpponentHandleLoadMonSprite thumb_func 0x8060f68 OpponentHandleSwitchInAnim thumb_func 0x8060fc8 -thumb_func 0x8061158 +thumb_func 0x8061158 OpponentHandleReturnMonToBall thumb_func 0x80611f0 -thumb_func 0x806127c +thumb_func 0x806127c OpponentHandleDrawTrainerPic thumb_func 0x80614c0 -thumb_func 0x80616d4 +thumb_func 0x80616d4 OpponentHandleTrainerSlideBack thumb_func 0x8061780 -thumb_func 0x806182c +thumb_func 0x806182c RunSaveCallback thumb_func 0x8061838 thumb_func 0x8061844 thumb_func 0x8061850 -thumb_func 0x806185c +thumb_func 0x806185c OpponentHandleMoveAnimation thumb_func 0x8061994 -thumb_func 0x8061b18 +thumb_func 0x8061b18 OpponentHandlePrintString thumb_func 0x8061b74 -thumb_func 0x8061b80 +thumb_func 0x8061b80 OpponentHandleChooseAction thumb_func 0x8061b90 -thumb_func 0x8061b9c -thumb_func 0x8061d40 -thumb_func 0x8061d6c +thumb_func 0x8061b9c OpponentHandleChooseMove +thumb_func 0x8061d40 OpponentHandleChooseItem +thumb_func 0x8061d6c OpponentHandleChoosePokemon thumb_func 0x8061e6c -thumb_func 0x8061e78 +thumb_func 0x8061e78 OpponentHandleHealthBarUpdate thumb_func 0x8061f68 -thumb_func 0x8061f74 -thumb_func 0x8061fec +thumb_func 0x8061f74 OpponentHandleStatusIconUpdate +thumb_func 0x8061fec OpponentHandleStatusAnimation thumb_func 0x8062054 thumb_func 0x8062060 thumb_func 0x806206c thumb_func 0x8062078 thumb_func 0x8062084 -thumb_func 0x8062090 -thumb_func 0x806209c +thumb_func 0x8062090 RfuVSync +thumb_func 0x806209c SwapRentalMons thumb_func 0x80620a8 thumb_func 0x80620b4 thumb_func 0x80620c0 @@ -2469,9 +2469,9 @@ thumb_func 0x8062114 thumb_func 0x806212c thumb_func 0x8062154 thumb_func 0x80621c4 -thumb_func 0x80621d0 +thumb_func 0x80621d0 OpponentHandlePlaySE thumb_func 0x8062214 -thumb_func 0x8062270 +thumb_func 0x8062270 OpponentHandleFaintingCry thumb_func 0x80622ac thumb_func 0x80622e0 thumb_func 0x80623f0 @@ -2480,25 +2480,25 @@ thumb_func 0x80624fc thumb_func 0x8062610 thumb_func 0x8062658 thumb_func 0x80626a8 -thumb_func 0x80626b4 -thumb_func 0x8062714 -thumb_func 0x806277c +thumb_func 0x80626b4 OpponentHandleSpriteInvisibility +thumb_func 0x8062714 OpponentHandleBattleAnimation +thumb_func 0x806277c WallyHandleCmd38 thumb_func 0x8062788 -thumb_func 0x8062794 +thumb_func 0x8062794 OpponentHandleCmd55 thumb_func 0x80627d8 nullsub_43 -thumb_func 0x80627dc -thumb_func 0x806283c -thumb_func 0x8062a38 -thumb_func 0x8062ca4 -thumb_func 0x8062da0 +thumb_func 0x80627dc ShouldSwitchIfPerishSong +thumb_func 0x806283c ShouldSwitchIfWonderGuard +thumb_func 0x8062a38 FindMonThatAbsorbsOpponentsMove +thumb_func 0x8062ca4 ShouldSwitchIfNaturalCure +thumb_func 0x8062da0 HasSuperEffectiveMoveAgainstOpponents thumb_func 0x8062f00 AreStatsRaised -thumb_func 0x8062f48 -thumb_func 0x80631f8 -thumb_func 0x8063464 -thumb_func 0x80635ec -thumb_func 0x8063674 +thumb_func 0x8062f48 FindMonWithFlagsAndSuperEffective +thumb_func 0x80631f8 ShouldSwitch +thumb_func 0x8063464 AI_TrySwitchOrUseItem +thumb_func 0x80635ec ModulateByTypeEffectiveness +thumb_func 0x8063674 GetMostSuitableMonToSwitchInto thumb_func 0x8063a68 GetAI_ItemType -thumb_func 0x8063ac4 +thumb_func 0x8063ac4 ShouldUseItem thumb_func 0x8063f74 nullsub_11 thumb_func 0x8063f78 thumb_func 0x8063f94 @@ -2520,223 +2520,223 @@ thumb_func 0x8064a34 thumb_func 0x8064b24 thumb_func 0x8064bec thumb_func 0x8064c1c -thumb_func 0x8064c4c +thumb_func 0x8064c4c LinkOpponentBufferExecCompleted thumb_func 0x8064cc4 -thumb_func 0x8064d38 +thumb_func 0x8064d38 CopyLinkOpponentMonData thumb_func 0x80654e4 thumb_func 0x80654f0 thumb_func 0x8065548 thumb_func 0x8065e68 -thumb_func 0x8065edc +thumb_func 0x8065edc LinkOpponentHandleLoadMonSprite thumb_func 0x806602c thumb_func 0x8066078 -thumb_func 0x8066208 +thumb_func 0x8066208 LinkOpponentHandleReturnMonToBall thumb_func 0x80662a0 -thumb_func 0x806632c -thumb_func 0x806663c +thumb_func 0x806632c LinkOpponentHandleDrawTrainerPic +thumb_func 0x806663c LinkOpponentHandleTrainerSlide thumb_func 0x8066778 -thumb_func 0x8066824 +thumb_func 0x8066824 LinkOpponentHandleFaintAnimation thumb_func 0x80668d0 thumb_func 0x80668dc -thumb_func 0x80668e8 -thumb_func 0x80668f4 +thumb_func 0x80668e8 LinkOpponentHandleBallThrowAnim +thumb_func 0x80668f4 LinkOpponentHandlePause thumb_func 0x8066900 thumb_func 0x8066a54 -thumb_func 0x8066bd8 +thumb_func 0x8066bd8 LinkOpponentHandlePrintString thumb_func 0x8066c30 -thumb_func 0x8066c3c -thumb_func 0x8066c48 -thumb_func 0x8066c54 -thumb_func 0x8066c60 -thumb_func 0x8066c6c -thumb_func 0x8066c78 -thumb_func 0x8066c84 -thumb_func 0x8066d74 -thumb_func 0x8066d80 -thumb_func 0x8066df8 -thumb_func 0x8066e60 -thumb_func 0x8066e6c -thumb_func 0x8066e78 -thumb_func 0x8066e84 -thumb_func 0x8066e90 -thumb_func 0x8066e9c -thumb_func 0x8066ea8 -thumb_func 0x8066eb4 -thumb_func 0x8066ec0 +thumb_func 0x8066c3c LinkOpponentHandleChooseAction +thumb_func 0x8066c48 LinkOpponentHandleUnknownYesNoBox +thumb_func 0x8066c54 LinkOpponentHandleChooseMove +thumb_func 0x8066c60 LinkOpponentHandleChooseItem +thumb_func 0x8066c6c LinkOpponentHandleChoosePokemon +thumb_func 0x8066c78 LinkOpponentHandleCmd23 +thumb_func 0x8066c84 LinkOpponentHandleHealthBarUpdate +thumb_func 0x8066d74 LinkOpponentHandleExpUpdate +thumb_func 0x8066d80 LinkOpponentHandleStatusIconUpdate +thumb_func 0x8066df8 LinkOpponentHandleStatusAnimation +thumb_func 0x8066e60 LinkOpponentHandleStatusXor +thumb_func 0x8066e6c LinkOpponentHandleDataTransfer +thumb_func 0x8066e78 LinkOpponentHandleDMA3Transfer +thumb_func 0x8066e84 LinkOpponentHandlePlayBGM +thumb_func 0x8066e90 LinkOpponentHandleCmd32 +thumb_func 0x8066e9c LinkOpponentHandleTwoReturnValues +thumb_func 0x8066ea8 LinkOpponentHandleChosenMonReturnValue +thumb_func 0x8066eb4 LinkOpponentHandleOneReturnValue +thumb_func 0x8066ec0 LinkOpponentHandleOneReturnValue_Duplicate thumb_func 0x8066ecc LinkOpponentHandleCmd37 thumb_func 0x8066ee8 LinkOpponentHandleCmd38 thumb_func 0x8066f20 LinkOpponentHandleCmd39 thumb_func 0x8066f38 LinkOpponentHandleCmd40 -thumb_func 0x8066f60 -thumb_func 0x8066fd0 -thumb_func 0x8066fdc +thumb_func 0x8066f60 LinkOpponentHandleHitAnimation +thumb_func 0x8066fd0 LinkOpponentHandleCmd42 +thumb_func 0x8066fdc LinkOpponentHandlePlaySE thumb_func 0x8067020 thumb_func 0x806707c thumb_func 0x80670b8 -thumb_func 0x80670ec +thumb_func 0x80670ec LinkOpponentHandleIntroTrainerBallThrow thumb_func 0x80671fc thumb_func 0x80672e0 thumb_func 0x80672fc thumb_func 0x8067410 thumb_func 0x8067458 LinkOpponentHandleHidePartyStatusSummary -thumb_func 0x80674a8 -thumb_func 0x80674b4 -thumb_func 0x8067514 -thumb_func 0x8067588 -thumb_func 0x80675a8 -thumb_func 0x80675b4 +thumb_func 0x80674a8 LinkOpponentHandleEndBounceEffect +thumb_func 0x80674b4 LinkOpponentHandleSpriteInvisibility +thumb_func 0x8067514 LinkOpponentHandleBattleAnimation +thumb_func 0x8067588 LinkOpponentHandleLinkStandbyMsg +thumb_func 0x80675a8 LinkOpponentHandleResetActionMoveSelection +thumb_func 0x80675b4 LinkOpponentHandleCmd55 thumb_func 0x8067654 nullsub_441 thumb_func 0x8067658 ZeroBoxMonData -thumb_func 0x8067670 +thumb_func 0x8067670 ZeroMonData thumb_func 0x80676f0 ZeroPlayerPartyMons thumb_func 0x8067710 ZeroEnemyPartyMons -thumb_func 0x8067730 -thumb_func 0x80677a0 -thumb_func 0x8067a74 -thumb_func 0x8067adc -thumb_func 0x8067bdc -thumb_func 0x8067c44 -thumb_func 0x8067c84 -thumb_func 0x8067cf8 +thumb_func 0x8067730 CreateMon +thumb_func 0x80677a0 CreateBoxMon +thumb_func 0x8067a74 CreateMonWithNature +thumb_func 0x8067adc CreateMonWithGenderNatureLetter +thumb_func 0x8067bdc CreateMaleMon +thumb_func 0x8067c44 CreateMonWithIVsPersonality +thumb_func 0x8067c84 CreateMonWithIVsOTID +thumb_func 0x8067cf8 CreateMonWithEVSpread thumb_func 0x8067d80 -thumb_func 0x8067ed0 +thumb_func 0x8067ed0 CreateBattleTowerMon2 thumb_func 0x8068080 -thumb_func 0x8068174 +thumb_func 0x8068174 CreateMonWithEVSpreadNatureOTID thumb_func 0x806823c -thumb_func 0x80683e8 +thumb_func 0x80683e8 CreateObedientMon thumb_func 0x8068438 -thumb_func 0x8068550 -thumb_func 0x80685e4 +thumb_func 0x8068550 GetDeoxysStat +thumb_func 0x80685e4 SetDeoxysStats thumb_func 0x8068688 thumb_func 0x80686f0 -thumb_func 0x8068758 +thumb_func 0x8068758 CreateObedientEnemyMon thumb_func 0x80687b8 CalculateBoxMonChecksum -thumb_func 0x806884c -thumb_func 0x8068b44 +thumb_func 0x806884c CalculateMonStats +thumb_func 0x8068b44 BoxMonToMon thumb_func 0x8068b94 GetLevelFromMonExp thumb_func 0x8068c00 GetLevelFromBoxMonExp -thumb_func 0x8068c6c -thumb_func 0x8068c80 -thumb_func 0x8068cf0 -thumb_func 0x8068d34 +thumb_func 0x8068c6c GiveMoveToMon +thumb_func 0x8068c80 GiveMoveToBoxMon +thumb_func 0x8068cf0 GiveMoveToBattleMon +thumb_func 0x8068d34 SetMonMoveSlot thumb_func 0x8068d74 SetBattleMonMoveSlot thumb_func 0x8068da4 thumb_func 0x8068db0 GiveBoxMonInitialMoveset -thumb_func 0x8068e58 -thumb_func 0x8068f64 -thumb_func 0x8069010 -thumb_func 0x80690bc -thumb_func 0x806992c -thumb_func 0x8069a18 -thumb_func 0x8069a74 -thumb_func 0x8069af4 -thumb_func 0x8069b04 -thumb_func 0x8069b60 -thumb_func 0x8069ba8 -thumb_func 0x8069c6c -thumb_func 0x8069d00 +thumb_func 0x8068e58 MonTryLearningNewMove +thumb_func 0x8068f64 DeleteFirstMoveAndGiveMoveToMon +thumb_func 0x8069010 DeleteFirstMoveAndGiveMoveToBoxMon +thumb_func 0x80690bc CalculateBaseDamage +thumb_func 0x806992c CountAliveMonsInBattle +thumb_func 0x8069a18 ShouldGetStatBadgeBoost +thumb_func 0x8069a74 GetDefaultMoveTarget +thumb_func 0x8069af4 GetMonGender +thumb_func 0x8069b04 GetBoxMonGender +thumb_func 0x8069b60 GetGenderFromSpeciesAndPersonality +thumb_func 0x8069ba8 SetMultiuseSpriteTemplateToPokemon +thumb_func 0x8069c6c SetMultiuseSpriteTemplateToTrainerBack +thumb_func 0x8069d00 SetMultiuseSpriteTemplateToTrainerFront thumb_func 0x8069d68 EncryptBoxMon thumb_func 0x8069d8c DecryptBoxMon -thumb_func 0x8069db0 -thumb_func 0x806a058 +thumb_func 0x8069db0 GetSubstruct +thumb_func 0x806a058 GetMonData thumb_func 0x806a1b4 -thumb_func 0x806a774 -thumb_func 0x806a864 +thumb_func 0x806a774 SetMonData +thumb_func 0x806a864 SetBoxMonData thumb_func 0x806aed0 -thumb_func 0x806aedc -thumb_func 0x806af58 +thumb_func 0x806aedc GiveMonToPlayer +thumb_func 0x806af58 SendMonToPC thumb_func 0x806b004 thumb_func 0x806b048 -thumb_func 0x806b08c -thumb_func 0x806b100 -thumb_func 0x806b15c -thumb_func 0x806b1a0 -thumb_func 0x806b1d4 +thumb_func 0x806b08c GetMonsStateToDoubles +thumb_func 0x806b100 GetMonsStateToDoubles_2 +thumb_func 0x806b15c GetAbilityBySpecies +thumb_func 0x806b1a0 GetMonAbility +thumb_func 0x806b1d4 CreateSecretBaseEnemyParty thumb_func 0x806b2f8 thumb_func 0x806b338 -thumb_func 0x806b378 -thumb_func 0x806b3ac +thumb_func 0x806b378 IsPlayerPartyAndPokemonStorageFull +thumb_func 0x806b3ac IsPokemonStorageFull thumb_func 0x806b3dc -thumb_func 0x806b424 -thumb_func 0x806b46c +thumb_func 0x806b424 CalculatePPWithBonus +thumb_func 0x806b46c RemoveMonPPBonus thumb_func 0x806b4a8 RemoveBattleMonPPBonus -thumb_func 0x806b4c0 +thumb_func 0x806b4c0 CopyPlayerPartyMonToBattleData thumb_func 0x806b7c8 ExecuteTableBasedItemEffect -thumb_func 0x806b7ec +thumb_func 0x806b7ec PokemonUseItemEffects thumb_func 0x806c830 -thumb_func 0x806c8a0 +thumb_func 0x806c8a0 GetItemEffectParamOffset thumb_func 0x806c9e8 thumb_func 0x806ca3c -thumb_func 0x806cb34 -thumb_func 0x806cb4c -thumb_func 0x806cb5c +thumb_func 0x806cb34 GetNature +thumb_func 0x806cb4c GetNatureFromPersonality +thumb_func 0x806cb5c GetEvolutionTargetSpecies thumb_func 0x806ce84 thumb_func 0x806ced0 thumb_func 0x806cf1c thumb_func 0x806cf68 thumb_func 0x806cf8c thumb_func 0x806cfb0 -thumb_func 0x806cfd4 +thumb_func 0x806cfd4 SpeciesToCryId thumb_func 0x806d008 -thumb_func 0x806d128 +thumb_func 0x806d128 DrawSpindaSpots thumb_func 0x806d23c thumb_func 0x806d288 -thumb_func 0x806d2c8 -thumb_func 0x806d300 +thumb_func 0x806d2c8 GetLinkTrainerFlankId +thumb_func 0x806d300 GetBattlerMultiplayerId thumb_func 0x806d324 -thumb_func 0x806d36c -thumb_func 0x806d3cc -thumb_func 0x806d570 -thumb_func 0x806d720 -thumb_func 0x806d748 -thumb_func 0x806d810 -thumb_func 0x806d878 -thumb_func 0x806d8d8 -thumb_func 0x806d958 -thumb_func 0x806da08 -thumb_func 0x806daa0 -thumb_func 0x806daf8 -thumb_func 0x806db48 +thumb_func 0x806d36c ModifyStatByNature +thumb_func 0x806d3cc AdjustFriendship +thumb_func 0x806d570 MonGainEVs +thumb_func 0x806d720 GetMonEVCount +thumb_func 0x806d748 RandomlyGivePartyPokerus +thumb_func 0x806d810 CheckPartyPokerus +thumb_func 0x806d878 CheckPartyHasHadPokerus +thumb_func 0x806d8d8 UpdatePartyPokerusTime +thumb_func 0x806d958 PartySpreadPokerus +thumb_func 0x806da08 TryIncrementMonLevel +thumb_func 0x806daa0 CanMonLearnTMHM +thumb_func 0x806daf8 CanSpeciesLearnTMHM +thumb_func 0x806db48 GetMoveRelearnerMoves thumb_func 0x806dc98 GetLevelUpMovesBySpecies -thumb_func 0x806dcf0 -thumb_func 0x806de54 -thumb_func 0x806de8c +thumb_func 0x806dcf0 GetNumberOfRelearnableMoves +thumb_func 0x806de54 SpeciesToPokedexNum +thumb_func 0x806de8c MainMenu_FormatSavegameText thumb_func 0x806dea8 ClearBattleMonForms -thumb_func 0x806dec0 +thumb_func 0x806dec0 GetBattleBGM thumb_func 0x806e0d8 -thumb_func 0x806e0f4 +thumb_func 0x806e0f4 PlayMapChosenOrBattleBGM thumb_func 0x806e120 thumb_func 0x806e158 thumb_func 0x806e194 -thumb_func 0x806e1cc +thumb_func 0x806e1cc GetMonSpritePalFromSpeciesAndPersonality thumb_func 0x806e220 -thumb_func 0x806e258 -thumb_func 0x806e290 +thumb_func 0x806e258 GetMonSpritePalStructFromOtIdPersonality +thumb_func 0x806e290 IsHMMove2 thumb_func 0x806e2cc IsMonSpriteNotFlipped thumb_func 0x806e2e4 thumb_func 0x806e30c -thumb_func 0x806e334 -thumb_func 0x806e360 +thumb_func 0x806e334 IsTradedMon +thumb_func 0x806e360 IsOtherTrainer thumb_func 0x806e3b0 -thumb_func 0x806e3bc -thumb_func 0x806e420 -thumb_func 0x806e4cc -thumb_func 0x806e4f4 -thumb_func 0x806e630 +thumb_func 0x806e3bc BoxMonRestorePP +thumb_func 0x806e420 SetMonPreventsSwitchingString +thumb_func 0x806e4cc GetWildMonTableIdInAlteringCave +thumb_func 0x806e4f4 SetWildMonHeldItem +thumb_func 0x806e630 IsMonShiny thumb_func 0x806e65c IsShinyOtIdPersonality -thumb_func 0x806e684 -thumb_func 0x806e6fc -thumb_func 0x806e738 -thumb_func 0x806e778 -thumb_func 0x806e7cc -thumb_func 0x806e898 -thumb_func 0x806e924 -thumb_func 0x806e940 +thumb_func 0x806e684 GetTrainerPartnerName +thumb_func 0x806e6fc Task_AnimateAfterDelay +thumb_func 0x806e738 Task_PokemonSummaryAnimateAfterDelay +thumb_func 0x806e778 BattleAnimateFrontSprite +thumb_func 0x806e7cc DoMonFrontSpriteAnimation +thumb_func 0x806e898 PokemonSummaryDoMonAnimation +thumb_func 0x806e924 StopPokemonAnimationDelayTask +thumb_func 0x806e940 BattleAnimateBackSprite thumb_func 0x806e994 thumb_func 0x806ea10 thumb_func 0x806ea7c thumb_func 0x806ea8c PlayerGenderToFrontTrainerPicId -thumb_func 0x806eaa8 +thumb_func 0x806eaa8 HandleSetPokedexFlag thumb_func 0x806eb08 thumb_func 0x806eb38 thumb_func 0x806eb58 HasTwoFramesAnimation @@ -2748,18 +2748,18 @@ thumb_func 0x806ef00 thumb_func 0x806ef7c thumb_func 0x806efb8 Sin thumb_func 0x806efd4 Cos -thumb_func 0x806eff4 +thumb_func 0x806eff4 Sin2 thumb_func 0x806f038 Cos2 thumb_func 0x806f050 Random -thumb_func 0x806f07c +thumb_func 0x806f07c SeedRng thumb_func 0x806f094 thumb_func 0x806f0a4 -thumb_func 0x806f0c4 -thumb_func 0x806f100 -thumb_func 0x806f108 +thumb_func 0x806f0c4 CreateInvisibleSpriteWithCallback +thumb_func 0x806f100 StoreWordInTwoHalfwords +thumb_func 0x806f108 LoadWordFromTwoHalfwords thumb_func 0x806f118 SetBgAffineStruct -thumb_func 0x806f144 -thumb_func 0x806f190 +thumb_func 0x806f144 DoBgAffineSet +thumb_func 0x806f190 CopySpriteTiles thumb_func 0x806f32c CountTrailingZeroBits thumb_func 0x806f354 CalcCRC16 thumb_func 0x806f3ac CalcCRC16WithTable @@ -2767,149 +2767,149 @@ thumb_func 0x806f3f0 CalcByteArraySum thumb_func 0x806f410 BlendPalette thumb_func 0x806f4b0 thumb_func 0x806f4d0 -thumb_func 0x806f4f0 -thumb_func 0x806f520 -thumb_func 0x806f58c +thumb_func 0x806f4f0 CountPokemonInDaycare +thumb_func 0x806f520 InitDaycareMailRecordMixing +thumb_func 0x806f58c Daycare_FindEmptySpot thumb_func 0x806f5bc -thumb_func 0x806f64c -thumb_func 0x806f670 -thumb_func 0x806f6a0 -thumb_func 0x806f6fc -thumb_func 0x806f750 +thumb_func 0x806f64c StorePokemonInEmptyDaycareSlot +thumb_func 0x806f670 StoreSelectedPokemonInDaycare +thumb_func 0x806f6a0 ShiftDaycareSlots +thumb_func 0x806f6fc ApplyDaycareExperience +thumb_func 0x806f750 TakeSelectedPokemonFromDaycare thumb_func 0x806f7f4 TakeSelectedPokemonMonFromDaycareShiftSlots thumb_func 0x806f81c TakePokemonFromDaycare -thumb_func 0x806f844 -thumb_func 0x806f880 -thumb_func 0x806f8ac -thumb_func 0x806f8e0 +thumb_func 0x806f844 GetLevelAfterDaycareSteps +thumb_func 0x806f880 GetNumLevelsGainedFromSteps +thumb_func 0x806f8ac GetNumLevelsGainedForDaycareMon +thumb_func 0x806f8e0 GetDaycareCostForSelectedMon thumb_func 0x806f918 GetDaycareCostForMon thumb_func 0x806f930 GetDaycareCost thumb_func 0x806f95c Debug_AddDaycareSteps -thumb_func 0x806f988 -thumb_func 0x806f9d8 -thumb_func 0x806fa08 +thumb_func 0x806f988 GetNumLevelsGainedFromDaycare +thumb_func 0x806f9d8 ClearDaycareMonMail +thumb_func 0x806fa08 ClearDaycareMon thumb_func 0x806fa28 ClearAllDaycareData -thumb_func 0x806fa5c -thumb_func 0x806fadc -thumb_func 0x806fb6c -thumb_func 0x806fc10 -thumb_func 0x806fc38 -thumb_func 0x806fc54 +thumb_func 0x806fa5c GetEggSpecies +thumb_func 0x806fadc GetSlotToInheritNature +thumb_func 0x806fb6c _TriggerPendingDaycareEgg +thumb_func 0x806fc10 _TriggerPendingDaycareMaleEgg +thumb_func 0x806fc38 TriggerPendingDaycareEgg +thumb_func 0x806fc54 TriggerPendingDaycareMaleEgg thumb_func 0x806fc70 RemoveIVIndexFromList -thumb_func 0x806fcb8 -thumb_func 0x806fe20 -thumb_func 0x806fec8 +thumb_func 0x806fcb8 InheritIVs +thumb_func 0x806fe20 GetEggMoves +thumb_func 0x806fec8 BuildEggMoveset thumb_func 0x8070168 RemoveEggFromDayCare -thumb_func 0x8070180 -thumb_func 0x807019c -thumb_func 0x80701fc -thumb_func 0x8070244 -thumb_func 0x8070320 +thumb_func 0x8070180 RejectEggFromDayCare +thumb_func 0x807019c AlterEggSpeciesWithIncenseItem +thumb_func 0x80701fc GiveVoltTackleIfLightBall +thumb_func 0x8070244 DetermineEggSpeciesAndParentSlots +thumb_func 0x8070320 _GiveEggFromDaycare thumb_func 0x80703ac -thumb_func 0x807044c +thumb_func 0x807044c AnimSolarbeamSmallOrb thumb_func 0x80704d0 -thumb_func 0x80704ec +thumb_func 0x80704ec _DoEggActions_CheckHatch thumb_func 0x80705f8 ShouldEggHatch thumb_func 0x8070618 IsEggPending -thumb_func 0x807062c -thumb_func 0x8070680 -thumb_func 0x80706bc -thumb_func 0x80706d8 -thumb_func 0x8070720 +thumb_func 0x807062c _GetDaycareMonNicknames +thumb_func 0x8070680 GetSelectedMonNickAndSpecies +thumb_func 0x80706bc GetDaycareMonNicknames +thumb_func 0x80706d8 GetDaycareState +thumb_func 0x8070720 GetDaycarePokemonCount thumb_func 0x8070744 EggGroupsOverlap -thumb_func 0x8070774 +thumb_func 0x8070774 GetDaycareCompatibilityScore thumb_func 0x8070894 GetDaycareCompatibilityScoreFromSave -thumb_func 0x80708b4 +thumb_func 0x80708b4 SetDaycareCompatibilityString thumb_func 0x80708f4 NameHasGenderSymbol -thumb_func 0x8070970 -thumb_func 0x80709c0 -thumb_func 0x80709dc -thumb_func 0x8070a60 -thumb_func 0x8070ac4 -thumb_func 0x8070b38 +thumb_func 0x8070970 AppendGenderSymbol +thumb_func 0x80709c0 AppendMonGenderSymbol +thumb_func 0x80709dc GetDaycareLevelMenuText +thumb_func 0x8070a60 GetDaycareLevelMenuLevelText +thumb_func 0x8070ac4 DaycareAddTextPrinter +thumb_func 0x8070b38 DaycarePrintMonNick thumb_func 0x8070b74 -thumb_func 0x8070bd8 -thumb_func 0x8070c24 -thumb_func 0x8070ce0 -thumb_func 0x8070d50 -thumb_func 0x8070d68 -thumb_func 0x8070ed0 -thumb_func 0x8070f90 +thumb_func 0x8070bd8 DaycarePrintMonInfo +thumb_func 0x8070c24 Task_HandleDaycareLevelMenuInput +thumb_func 0x8070ce0 ShowDaycareLevelMenu +thumb_func 0x8070d50 FieldCallback_SecretBaseCave +thumb_func 0x8070d68 CreatedHatchedMon +thumb_func 0x8070ed0 AddHatchedMonToParty +thumb_func 0x8070f90 ScriptHatchMon thumb_func 0x8070fa4 thumb_func 0x807101c -thumb_func 0x8071044 -thumb_func 0x8071134 -thumb_func 0x8071148 -thumb_func 0x8071168 +thumb_func 0x8071044 EggHatchCreateMonSprite +thumb_func 0x8071134 VBlankCB_EggHatch +thumb_func 0x8071148 EggHatch +thumb_func 0x8071168 Task_EggHatch thumb_func 0x80711a8 -thumb_func 0x8071400 -thumb_func 0x8071440 -thumb_func 0x8071498 -thumb_func 0x8071844 -thumb_func 0x807189c -thumb_func 0x8071900 +thumb_func 0x8071400 EggHatchSetMonNickname +thumb_func 0x8071440 Task_EggHatchPlayBGM +thumb_func 0x8071498 CB2_EggHatch_1 +thumb_func 0x8071844 SpriteCB_Egg_0 +thumb_func 0x807189c SpriteCB_Egg_1 +thumb_func 0x8071900 SpriteCB_Egg_2 thumb_func 0x80719b4 SpriteCB_Egg_3 -thumb_func 0x80719d8 -thumb_func 0x8071a58 -thumb_func 0x8071af8 -thumb_func 0x8071b50 -thumb_func 0x8071ba4 -thumb_func 0x8071c24 -thumb_func 0x8071c9c +thumb_func 0x80719d8 SpriteCB_Egg_4 +thumb_func 0x8071a58 SpriteCB_Egg_5 +thumb_func 0x8071af8 SpriteCB_EggShard +thumb_func 0x8071b50 CreateRandomEggShardSprite +thumb_func 0x8071ba4 CreateEggShardSprite +thumb_func 0x8071c24 EggHatchPrintMessage +thumb_func 0x8071c9c GetEggStepsToSubtract thumb_func 0x8071cf0 -thumb_func 0x8071d14 +thumb_func 0x8071d14 DummiedOutFunction thumb_func 0x8071d18 thumb_func 0x8071eb8 -thumb_func 0x8071eec -thumb_func 0x8072214 -thumb_func 0x80722b4 -thumb_func 0x80722c4 +thumb_func 0x8071eec CreateBattlerHealthboxSprites +thumb_func 0x8072214 CreateSafariPlayerHealthboxSprites +thumb_func 0x80722b4 GetHealthboxElementGfxPtr +thumb_func 0x80722c4 SpriteCB_HealthBar thumb_func 0x8072334 SpriteCB_HealthBoxOther thumb_func 0x807235c SetBattleBarStruct thumb_func 0x8072394 SetHealthboxSpriteInvisible thumb_func 0x80723e0 SetHealthboxSpriteVisible thumb_func 0x8072434 UpdateSpritePos -thumb_func 0x8072454 +thumb_func 0x8072454 DestoryHealthboxSprite thumb_func 0x8072494 nullsub_7 thumb_func 0x8072498 UpdateOamPriorityInAllHealthboxes -thumb_func 0x8072528 +thumb_func 0x8072528 InitBattlerHealthboxCoords thumb_func 0x80725a4 thumb_func 0x80726f4 -thumb_func 0x80727fc -thumb_func 0x80729d0 +thumb_func 0x80727fc SwapHpBarsWithHpText +thumb_func 0x80729d0 PrintSafariMonInfo thumb_func 0x8072c10 -thumb_func 0x8072ed8 -thumb_func 0x807352c +thumb_func 0x8072ed8 CreatePartyStatusSummarySprites +thumb_func 0x807352c Task_HidePartyStatusSummary thumb_func 0x8073704 thumb_func 0x8073760 thumb_func 0x8073894 thumb_func 0x8073974 SpriteCB_StatusSummaryBar thumb_func 0x807398c -thumb_func 0x80739c0 +thumb_func 0x80739c0 SpriteCB_StatusSummaryBallsOnBattleStart thumb_func 0x8073a54 thumb_func 0x8073ac4 SpriteCB_StatusSummaryBallsOnSwitchout thumb_func 0x8073ae4 -thumb_func 0x8073d80 -thumb_func 0x8073e68 -thumb_func 0x8074118 +thumb_func 0x8073d80 TryAddPokeballIconToHealthbox +thumb_func 0x8073e68 UpdateStatusIconInHealthbox +thumb_func 0x8074118 GetStatusIconForBattlerId thumb_func 0x80741e0 thumb_func 0x8074320 -thumb_func 0x80743f0 -thumb_func 0x8074630 -thumb_func 0x807472c -thumb_func 0x8074948 -thumb_func 0x8074a1c +thumb_func 0x80743f0 UpdateHealthboxAttribute +thumb_func 0x8074630 MoveBattleBar +thumb_func 0x807472c MoveBattleBarGraphically +thumb_func 0x8074948 CalcNewBarValue +thumb_func 0x8074a1c CalcBarFilledPixels thumb_func 0x8074ab8 thumb_func 0x8074b18 -thumb_func 0x8074b78 -thumb_func 0x8074bc4 +thumb_func 0x8074b78 GetScaledExpFraction +thumb_func 0x8074bc4 GetScaledHPFraction thumb_func 0x8074bf0 GetHPBarLevel thumb_func 0x8074c24 thumb_func 0x8074d78 thumb_func 0x8074dbc -thumb_func 0x8074df0 -thumb_func 0x8074e58 -thumb_func 0x8075028 +thumb_func 0x8074df0 DoPokeballSendOutAnimation +thumb_func 0x8074e58 Task_DoPokeballSendOutAnim +thumb_func 0x8075028 SpriteCB_TestBallThrow thumb_func 0x80750dc thumb_func 0x80750e8 thumb_func 0x8075154 @@ -2917,18 +2917,18 @@ thumb_func 0x80751ec thumb_func 0x8075240 thumb_func 0x8075338 thumb_func 0x8075378 -thumb_func 0x80754c4 -thumb_func 0x807571c +thumb_func 0x80754c4 Task_PlayCryWhenReleasedFromBall +thumb_func 0x807571c SpriteCB_ReleaseMonFromBall thumb_func 0x80759bc -thumb_func 0x80759dc +thumb_func 0x80759dc HandleBallAnimEnd thumb_func 0x8075b00 -thumb_func 0x8075bbc -thumb_func 0x8075c0c +thumb_func 0x8075bbc SpriteCB_PlayerMonSendOut_1 +thumb_func 0x8075c0c SpriteCB_PlayerMonSendOut_2 thumb_func 0x8075d7c SpriteCB_ReleaseMon2FromBall -thumb_func 0x8075da0 -thumb_func 0x8075e00 -thumb_func 0x8075e28 -thumb_func 0x8075e40 +thumb_func 0x8075da0 SpriteCB_OpponentMonSendOut +thumb_func 0x8075e00 AnimateBallOpenParticlesForPokeball +thumb_func 0x8075e28 LaunchBallFadeMonTaskForPokeball +thumb_func 0x8075e40 CreatePokeballSpriteToReleaseMon thumb_func 0x8075f2c thumb_func 0x8075fe8 thumb_func 0x8076124 @@ -2940,31 +2940,31 @@ thumb_func 0x8076320 thumb_func 0x80763b0 thumb_func 0x80763d4 thumb_func 0x80763fc -thumb_func 0x8076440 -thumb_func 0x8076480 -thumb_func 0x80764f0 -thumb_func 0x807651c -thumb_func 0x8076570 +thumb_func 0x8076440 SpriteCB_HitAnimHealthoxEffect +thumb_func 0x8076480 LoadBallGfx +thumb_func 0x80764f0 FreeBallGfx +thumb_func 0x807651c GetBattlerPokeballItemId +thumb_func 0x8076570 CheckForFlashMemory thumb_func 0x807659c thumb_func 0x80765c0 -thumb_func 0x80765e4 -thumb_func 0x8076634 -thumb_func 0x807672c +thumb_func 0x80765e4 SetSaveBlocksPointers +thumb_func 0x8076634 MoveSaveBlocks_ResetHeap +thumb_func 0x807672c UseContinueGameWarp thumb_func 0x807673c -thumb_func 0x8076750 -thumb_func 0x8076764 +thumb_func 0x8076750 SetContinueGameWarpStatus +thumb_func 0x8076764 SetContinueGameWarpStatusToDynamicWarp thumb_func 0x8076780 -thumb_func 0x8076794 -thumb_func 0x80767dc +thumb_func 0x8076794 SavePlayerParty +thumb_func 0x80767dc LoadPlayerParty thumb_func 0x8076824 SaveEventObjects thumb_func 0x807686c LoadEventObjects -thumb_func 0x80768b4 -thumb_func 0x80768c4 +thumb_func 0x80768b4 SaveSerializedGame +thumb_func 0x80768c4 LoadSerializedGame thumb_func 0x80768d4 LoadPlayerBag -thumb_func 0x80769e8 -thumb_func 0x8076b08 -thumb_func 0x8076b20 -thumb_func 0x8076b38 +thumb_func 0x80769e8 SavePlayerBag +thumb_func 0x8076b08 ApplyNewEncryptionKeyToHword +thumb_func 0x8076b20 ApplyNewEncryptionKeyToWord +thumb_func 0x8076b38 ApplyNewEncryptionKeyToAllEncryptedData thumb_func 0x8076b78 thumb_func 0x8076bb4 thumb_func 0x8076bc4 @@ -2995,7 +2995,7 @@ thumb_func 0x80785e0 thumb_func 0x80785f4 thumb_func 0x8078618 thumb_func 0x8078650 -thumb_func 0x807869c +thumb_func 0x807869c TradeMenuMoveCursor thumb_func 0x807875c thumb_func 0x80787a0 thumb_func 0x8078900 @@ -3070,11 +3070,11 @@ thumb_func 0x807aff0 thumb_func 0x807b044 thumb_func 0x807b064 thumb_func 0x807b4cc -thumb_func 0x807b510 +thumb_func 0x807b510 SetTradeSceneStrings thumb_func 0x807b600 thumb_func 0x807b624 thumb_func 0x807ca00 -thumb_func 0x807de4c +thumb_func 0x807de4c c2_08053788 thumb_func 0x807df14 thumb_func 0x807df94 thumb_func 0x807e010 @@ -3082,40 +3082,40 @@ thumb_func 0x807e084 thumb_func 0x807e0e4 thumb_func 0x807e174 thumb_func 0x807e1c4 -thumb_func 0x807e228 +thumb_func 0x807e228 _CreateInGameTradePokemon thumb_func 0x807e3b4 -thumb_func 0x807e40c -thumb_func 0x807e448 +thumb_func 0x807e40c GetTradeSpecies +thumb_func 0x807e448 CreateInGameTradePokemon thumb_func 0x807e464 thumb_func 0x807e504 thumb_func 0x807e588 thumb_func 0x807eaa0 -thumb_func 0x807eb1c +thumb_func 0x807eb1c DoInGameTradeScene thumb_func 0x807eb48 thumb_func 0x807eb84 thumb_func 0x807ebd4 thumb_func 0x807ebe0 -thumb_func 0x807ec48 -thumb_func 0x807ed1c +thumb_func 0x807ec48 c3_08054588 +thumb_func 0x807ed1c c3_0805465C thumb_func 0x807edd4 thumb_func 0x807ee9c -thumb_func 0x807f170 -thumb_func 0x807f19c -thumb_func 0x807f210 +thumb_func 0x807f170 Blender_ControlHitPitch +thumb_func 0x807f19c VBlankCB0_BerryBlender +thumb_func 0x807f210 LoadBerryBlenderGfx thumb_func 0x807f408 -thumb_func 0x807f46c +thumb_func 0x807f46c InitBerryBlenderWindows thumb_func 0x807f4b8 thumb_func 0x807f500 thumb_func 0x807f740 thumb_func 0x807f79c thumb_func 0x807f7c8 -thumb_func 0x807f84c +thumb_func 0x807f84c Blender_CopyBerryData thumb_func 0x807f88c thumb_func 0x807f9ac thumb_func 0x807fa20 thumb_func 0x807ff90 thumb_func 0x808002c -thumb_func 0x808007c +thumb_func 0x808007c Blender_SetOpponentsBerryData thumb_func 0x8080154 thumb_func 0x80801c4 thumb_func 0x80802f0 @@ -3139,24 +3139,24 @@ thumb_func 0x80815cc thumb_func 0x80815d8 thumb_func 0x80815e4 thumb_func 0x80815f0 -thumb_func 0x80815fc +thumb_func 0x80815fc Blender_CalculatePokeblock thumb_func 0x8081820 BlenderDebug_CalculatePokeblock thumb_func 0x808183c thumb_func 0x80819b0 -thumb_func 0x80819e4 -thumb_func 0x8081f18 -thumb_func 0x8082060 -thumb_func 0x8082340 +thumb_func 0x80819e4 CB2_HandleBlenderEndGame +thumb_func 0x8081f18 LinkPlayAgainHandleSaving +thumb_func 0x8082060 CB2_HandlePlayerLinkPlayAgainChoice +thumb_func 0x8082340 CB2_HandlePlayerPlayAgainChoice thumb_func 0x80824f0 thumb_func 0x80826d0 -thumb_func 0x8082734 +thumb_func 0x8082734 GetBlenderArrowPosition thumb_func 0x8082744 -thumb_func 0x8082810 +thumb_func 0x8082810 BerryBlender_SetBackgroundsPos thumb_func 0x8082858 thumb_func 0x80828a0 thumb_func 0x8082984 thumb_func 0x80829b8 -thumb_func 0x80829f8 +thumb_func 0x80829f8 Blender_SetParticipantBerryData thumb_func 0x8082a2c thumb_func 0x8082adc thumb_func 0x8082b5c @@ -3171,173 +3171,173 @@ thumb_func 0x8082d9c thumb_func 0x8082e14 thumb_func 0x8082e34 TryUpdateBerryBlenderRecord thumb_func 0x8082e6c -thumb_func 0x80832a0 +thumb_func 0x80832a0 Blender_PrintMadePokeblockString thumb_func 0x8083350 Blender_SortBasedOnPoints -thumb_func 0x80833a8 +thumb_func 0x80833a8 Blender_SortScores thumb_func 0x80834fc thumb_func 0x80837c8 thumb_func 0x80838c4 -thumb_func 0x808391c -thumb_func 0x8083a5c -thumb_func 0x8083b04 +thumb_func 0x808391c TryAddContestLinkTvShow +thumb_func 0x8083a5c Blender_AddTextPrinter +thumb_func 0x8083b04 Blender_PrintText thumb_func 0x8083b6c PlayTimeCounter_Reset thumb_func 0x8083b90 PlayTimeCounter_Start thumb_func 0x8083bb8 thumb_func 0x8083bc4 PlayTimeCounter_Update thumb_func 0x8083c2c PlayTimeCounter_SetToMax -thumb_func 0x8083c54 +thumb_func 0x8083c54 SetTrainerId thumb_func 0x8083c64 GetTrainerId thumb_func 0x8083c7c CopyTrainerId -thumb_func 0x8083c98 +thumb_func 0x8083c98 InitPlayerTrainerId thumb_func 0x8083cc4 SetDefaultOptions -thumb_func 0x8083d18 -thumb_func 0x8083d48 -thumb_func 0x8083d88 -thumb_func 0x8083dd4 -thumb_func 0x8083df4 -thumb_func 0x8083e04 -thumb_func 0x8083e28 -thumb_func 0x8083f54 -thumb_func 0x8083fa8 +thumb_func 0x8083d18 ClearPokedexFlags +thumb_func 0x8083d48 ClearAllContestWinnerPics +thumb_func 0x8083d88 ClearFrontierRecord +thumb_func 0x8083dd4 WarpToTruck +thumb_func 0x8083df4 Sav2_ClearSetDefault +thumb_func 0x8083e04 ResetMenuAndMonGlobals +thumb_func 0x8083e28 NewGameInitData +thumb_func 0x8083f54 ResetMiniGamesResults +thumb_func 0x8083fa8 DoWhiteOut thumb_func 0x8083fe8 -thumb_func 0x8084024 +thumb_func 0x8084024 Overworld_ResetStateAfterTeleport thumb_func 0x808406c -thumb_func 0x80840a8 +thumb_func 0x80840a8 Overworld_ResetStateAfterWhiteOut thumb_func 0x8084110 thumb_func 0x8084130 ResetGameStats thumb_func 0x808414c IncrementGameStat -thumb_func 0x8084180 +thumb_func 0x8084180 GetGameStat thumb_func 0x80841b8 SetGameStat -thumb_func 0x80841ec -thumb_func 0x808421c +thumb_func 0x80841ec ApplyNewEncryptionKeyToGameStats +thumb_func 0x808421c LoadEventObjTemplatesFromHeader thumb_func 0x8084268 LoadSaveblockEventObjScripts -thumb_func 0x8084298 -thumb_func 0x80842d4 -thumb_func 0x8084308 -thumb_func 0x8084330 +thumb_func 0x8084298 Overworld_SetEventObjTemplateCoords +thumb_func 0x80842d4 Overworld_SetEventObjTemplateMovementType +thumb_func 0x8084308 mapdata_load_assets_to_gpu_and_full_redraw +thumb_func 0x8084330 GetMapLayout thumb_func 0x8084358 ApplyCurrentWarp thumb_func 0x808439c SetWarpData thumb_func 0x80843bc IsDummyWarp thumb_func 0x80843f8 Overworld_GetMapHeaderByGroupAndId thumb_func 0x8084410 GetDestinationWarpMapHeader -thumb_func 0x8084434 -thumb_func 0x8084484 -thumb_func 0x80844c4 -thumb_func 0x8084540 +thumb_func 0x8084434 LoadCurrentMapData +thumb_func 0x8084484 LoadSaveblockMapHeader +thumb_func 0x80844c4 SetPlayerCoordsFromWarp +thumb_func 0x8084540 WarpIntoMap thumb_func 0x8084554 SetWarpDestination thumb_func 0x8084590 SetWarpDestinationToMapWarp thumb_func 0x80845b0 SetDynamicWarp thumb_func 0x80845e4 SetDynamicWarpWithCoords -thumb_func 0x808461c -thumb_func 0x8084634 -thumb_func 0x808466c -thumb_func 0x8084684 +thumb_func 0x808461c SetWarpDestinationToDynamicWarp +thumb_func 0x8084634 SetWarpDestinationToHealLocation +thumb_func 0x808466c SetWarpDestinationToLastHealLocation +thumb_func 0x8084684 SetLastHealLocationWarp thumb_func 0x80846c4 UpdateEscapeWarp thumb_func 0x808473c SetEscapeWarp -thumb_func 0x808477c +thumb_func 0x808477c SetWarpDestinationToEscapeWarp thumb_func 0x8084794 SetFixedDiveWarp -thumb_func 0x80847d0 +thumb_func 0x80847d0 SetWarpDestinationToDiveWarp thumb_func 0x80847e8 SetFixedHoleWarp -thumb_func 0x8084824 -thumb_func 0x808487c +thumb_func 0x8084824 SetWarpDestinationToFixedHoleWarp +thumb_func 0x808487c SetWarpDestinationToContinueGameWarp thumb_func 0x8084894 SetContinueGameWarp -thumb_func 0x80848d4 -thumb_func 0x8084914 -thumb_func 0x8084928 -thumb_func 0x8084960 +thumb_func 0x80848d4 SetContinueGameWarpToHealLocation +thumb_func 0x8084914 SetContinueGameWarpToDynamicWarp +thumb_func 0x8084928 GetMapConnection +thumb_func 0x8084960 SetDiveWarp thumb_func 0x80849c0 SetDiveWarpEmerge thumb_func 0x80849e0 SetDiveWarpDive -thumb_func 0x8084a00 -thumb_func 0x8084ac8 -thumb_func 0x8084bd0 -thumb_func 0x8084be0 +thumb_func 0x8084a00 LoadMapFromCameraTransition +thumb_func 0x8084ac8 mli0_load_map +thumb_func 0x8084bd0 ResetInitialPlayerAvatarState +thumb_func 0x8084be0 StoreInitialPlayerAvatarState thumb_func 0x8084c3c GetInitialPlayerAvatarState -thumb_func 0x8084c94 -thumb_func 0x8084cf4 -thumb_func 0x8084db8 -thumb_func 0x8084ddc -thumb_func 0x8084dfc +thumb_func 0x8084c94 GetAdjustedInitialTransitionFlags +thumb_func 0x8084cf4 GetAdjustedInitialDirection +thumb_func 0x8084db8 GetCenterScreenMetatileBehavior +thumb_func 0x8084ddc Overworld_IsBikingAllowed +thumb_func 0x8084dfc SetDefaultFlashLevel thumb_func 0x8084e54 Overworld_SetFlashLevel -thumb_func 0x8084e7c -thumb_func 0x8084e8c +thumb_func 0x8084e7c Overworld_GetFlashLevel +thumb_func 0x8084e8c SetCurrentMapLayout thumb_func 0x8084ea8 thumb_func 0x8084eb4 -thumb_func 0x8084ec0 -thumb_func 0x8084f1c -thumb_func 0x8084f50 -thumb_func 0x8084f80 +thumb_func 0x8084ec0 ShouldLegendaryMusicPlayAtLocation +thumb_func 0x8084f1c NoMusicInSotopolisWithLegendaries +thumb_func 0x8084f50 IsInfiltratedWeatherInstitute +thumb_func 0x8084f80 IsInflitratedSpaceCenter thumb_func 0x8084fc4 GetLocationMusic -thumb_func 0x808503c -thumb_func 0x80850a0 -thumb_func 0x80850e0 -thumb_func 0x80850ec -thumb_func 0x808515c -thumb_func 0x8085168 +thumb_func 0x808503c GetCurrLocationDefaultMusic +thumb_func 0x80850a0 CallBattleArenaFunction +thumb_func 0x80850e0 Overworld_ResetMapMusic +thumb_func 0x80850ec Overworld_PlaySpecialMapMusic +thumb_func 0x808515c Overworld_SetSavedMusic +thumb_func 0x8085168 Overworld_ClearSavedMusic thumb_func 0x8085178 -thumb_func 0x8085200 -thumb_func 0x808522c +thumb_func 0x8085200 Overworld_ChangeMusicToDefault +thumb_func 0x808522c GetTruckCameraBobbingY thumb_func 0x8085258 GetMapMusicFadeoutSpeed -thumb_func 0x8085278 -thumb_func 0x8085308 -thumb_func 0x8085318 -thumb_func 0x8085324 -thumb_func 0x80853a4 -thumb_func 0x8085494 +thumb_func 0x8085278 TryFadeOutOldMapMusic +thumb_func 0x8085308 BGMusicStopped +thumb_func 0x8085318 Overworld_FadeOutMapMusic +thumb_func 0x8085324 PlayAmbientCry +thumb_func 0x80853a4 UpdateAmbientCry +thumb_func 0x8085494 ChooseAmbientCrySpecies thumb_func 0x80854dc GetMapTypeByGroupAndId thumb_func 0x80854f4 GetMapTypeByWarpData thumb_func 0x808550c GetCurrentMapType -thumb_func 0x8085524 +thumb_func 0x8085524 GetLastUsedWarpMapType thumb_func 0x8085538 IsMapTypeOutdoors thumb_func 0x808555c Overworld_MapTypeAllowsTeleportAndFly thumb_func 0x808557c IsMapTypeIndoors thumb_func 0x8085598 GetSavedWarpRegionMapSectionId thumb_func 0x80855c0 GetCurrentRegionMapSectionId thumb_func 0x80855e8 GetCurrentMapBattleScene -thumb_func 0x8085610 -thumb_func 0x808569c +thumb_func 0x8085610 InitOverworldBgs +thumb_func 0x808569c CleanupOverworldWindowsAndTilemaps thumb_func 0x80856e8 -thumb_func 0x80856f4 -thumb_func 0x8085714 +thumb_func 0x80856f4 IsUpdateLinkStateCBActive +thumb_func 0x8085714 DoCB1_Overworld thumb_func 0x808576c CB1_Overworld -thumb_func 0x808578c -thumb_func 0x80857b8 -thumb_func 0x80857c4 +thumb_func 0x808578c OverworldBasic +thumb_func 0x80857b8 CB2_OverworldBasic +thumb_func 0x80857c4 CB2_Overworld thumb_func 0x80857f0 thumb_func 0x80857fc -thumb_func 0x8085808 -thumb_func 0x8085860 -thumb_func 0x80858c0 -thumb_func 0x8085934 -thumb_func 0x8085964 +thumb_func 0x8085808 map_post_load_hook_exec +thumb_func 0x8085860 CB2_NewGame +thumb_func 0x80858c0 CB2_WhiteOut +thumb_func 0x8085934 CB2_LoadMap +thumb_func 0x8085964 CB2_LoadMap2 thumb_func 0x808598c thumb_func 0x80859dc -thumb_func 0x8085a00 +thumb_func 0x8085a00 c2_80567AC thumb_func 0x8085a30 -thumb_func 0x8085a5c -thumb_func 0x8085a80 -thumb_func 0x8085aa8 -thumb_func 0x8085afc -thumb_func 0x8085b18 -thumb_func 0x8085b34 +thumb_func 0x8085a5c CB2_ReturnToFieldLocal +thumb_func 0x8085a80 CB2_ReturnToFieldLink +thumb_func 0x8085aa8 CB2_ReturnToFieldFromMultiplayer +thumb_func 0x8085afc CB2_ReturnToFieldWithOpenMenu +thumb_func 0x8085b18 CB2_ReturnToFieldContinueScript +thumb_func 0x8085b34 CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func 0x8085b50 thumb_func 0x8085b6c -thumb_func 0x8085b98 -thumb_func 0x8085c80 -thumb_func 0x8085ce4 -thumb_func 0x8085cf4 -thumb_func 0x8085d14 -thumb_func 0x8085d5c -thumb_func 0x8085e80 +thumb_func 0x8085b98 CB2_ContinueSavedGame +thumb_func 0x8085c80 FieldClearVBlankHBlankCallbacks +thumb_func 0x8085ce4 SetFieldVBlankCallback +thumb_func 0x8085cf4 VBlankCB_Field +thumb_func 0x8085d14 InitCurrentFlashLevelScanlineEffect +thumb_func 0x8085d5c map_loading_iteration_3 +thumb_func 0x8085e80 load_map_stuff thumb_func 0x8085f9c -thumb_func 0x8085ffc +thumb_func 0x8085ffc map_loading_iteration_2_link thumb_func 0x8086114 do_load_map_stuff_loop -thumb_func 0x808612c +thumb_func 0x808612c CallTrainerHillFunction thumb_func 0x808613c thumb_func 0x80861c4 -thumb_func 0x80861dc +thumb_func 0x80861dc InitOverworldGraphicsRegisters thumb_func 0x80862ec thumb_func 0x8086340 -thumb_func 0x8086368 +thumb_func 0x8086368 mli4_mapscripts_and_other thumb_func 0x80863cc thumb_func 0x80863e4 thumb_func 0x8086410 SetCameraToTrackGuestPlayer @@ -3345,61 +3345,61 @@ thumb_func 0x808642c SetCameraToTrackGuestPlayer_2 thumb_func 0x8086448 thumb_func 0x8086478 thumb_func 0x8086500 CreateLinkPlayerSprites -thumb_func 0x808653c -thumb_func 0x8086590 -thumb_func 0x80865a4 -thumb_func 0x80865b4 -thumb_func 0x80865c8 +thumb_func 0x808653c CB1_UpdateLinkState +thumb_func 0x8086590 ResetAllMultiplayerState +thumb_func 0x80865a4 ClearAllPlayerKeys +thumb_func 0x80865b4 SetKeyInterceptCallback +thumb_func 0x80865c8 CheckRfuKeepAliveTimer thumb_func 0x80865f4 ResetAllTradingStates -thumb_func 0x808660c -thumb_func 0x8086644 -thumb_func 0x808667c +thumb_func 0x808660c AreAllPlayersInTradingState +thumb_func 0x8086644 IsAnyPlayerInTradingState +thumb_func 0x808667c HandleLinkPlayerKeyInput thumb_func 0x808689c UpdateAllLinkPlayers -thumb_func 0x8086904 -thumb_func 0x8086970 +thumb_func 0x8086904 UpdateHeldKeyCode +thumb_func 0x8086970 KeyInterCB_ReadButtons thumb_func 0x80869cc GetDirectionForDpadKey -thumb_func 0x8086a00 -thumb_func 0x8086a14 +thumb_func 0x8086a00 ResetPlayerHeldKeys +thumb_func 0x8086a14 KeyInterCB_SelfIdle thumb_func 0x8086a50 -thumb_func 0x8086a5c +thumb_func 0x8086a5c KeyInterCB_DeferToEventScript thumb_func 0x8086a80 -thumb_func 0x8086aa4 -thumb_func 0x8086ac8 +thumb_func 0x8086aa4 KeyInterCB_DeferToSendQueue +thumb_func 0x8086ac8 KeyInterCB_DoNothingAndKeepAlive thumb_func 0x8086ad4 thumb_func 0x8086b10 thumb_func 0x8086b24 -thumb_func 0x8086b28 -thumb_func 0x8086b60 +thumb_func 0x8086b28 KeyInterCB_WaitForPlayersToExit +thumb_func 0x8086b60 KeyInterCB_SendExitRoomKey thumb_func 0x8086b74 thumb_func 0x8086b78 thumb_func 0x8086be0 thumb_func 0x8086bec thumb_func 0x8086c00 -thumb_func 0x8086c14 +thumb_func 0x8086c14 QueueExitLinkRoomKey thumb_func 0x8086c28 thumb_func 0x8086c3c LoadTradeRoomPlayer thumb_func 0x8086ca4 thumb_func 0x8086cbc -thumb_func 0x8086cd4 +thumb_func 0x8086cd4 TryGetTileEventScript thumb_func 0x8086cec PlayerIsAtSouthExit -thumb_func 0x8086d18 -thumb_func 0x8086de4 +thumb_func 0x8086d18 TryInteractWithPlayer +thumb_func 0x8086de4 GetDirectionForEventScript thumb_func 0x8086e74 -thumb_func 0x8086e80 +thumb_func 0x8086e80 InitLinkRoomStartMenuScript thumb_func 0x8086e94 -thumb_func 0x8086eb0 +thumb_func 0x8086eb0 CreateConfirmLeaveTradeRoomPrompt thumb_func 0x8086ecc thumb_func 0x8086ee8 thumb_func 0x8086efc thumb_func 0x8086f2c thumb_func 0x8086f98 thumb_func 0x8086fd0 -thumb_func 0x8086ff4 -thumb_func 0x8087028 -thumb_func 0x8087030 -thumb_func 0x8087044 +thumb_func 0x8086ff4 GetLinkSendQueueLength +thumb_func 0x8087028 ZeroLinkPlayerEventObject +thumb_func 0x8087030 ClearLinkPlayerEventObjects +thumb_func 0x8087044 ZeroEventObject thumb_func 0x8087054 -thumb_func 0x8087100 +thumb_func 0x8087100 InitLinkPlayerEventObjectPos thumb_func 0x8087140 thumb_func 0x8087170 thumb_func 0x80871bc GetSpriteForLinkedPlayer @@ -3407,51 +3407,51 @@ thumb_func 0x80871dc GetLinkPlayerCoords thumb_func 0x8087204 GetLinkPlayerFacingDirection thumb_func 0x8087224 GetLinkPlayerElevation thumb_func 0x8087248 -thumb_func 0x8087270 -thumb_func 0x80872d0 +thumb_func 0x8087270 GetLinkPlayerIdAt +thumb_func 0x80872d0 SetPlayerFacingDirection thumb_func 0x808733c thumb_func 0x808735c thumb_func 0x8087360 thumb_func 0x8087380 -thumb_func 0x8087384 +thumb_func 0x8087384 FacingHandler_DpadMovement thumb_func 0x80873ec FacingHandler_ForcedFacingChange -thumb_func 0x8087404 -thumb_func 0x808740c -thumb_func 0x8087444 -thumb_func 0x80874a4 -thumb_func 0x8087530 -thumb_func 0x80875f0 -thumb_func 0x80876a8 -thumb_func 0x80876b8 -thumb_func 0x80876d8 -thumb_func 0x8087710 -thumb_func 0x8087748 -thumb_func 0x8087778 -thumb_func 0x80877d4 -thumb_func 0x808782c +thumb_func 0x8087404 MovementStatusHandler_EnterFreeMode +thumb_func 0x808740c MovementStatusHandler_TryAdvanceScript +thumb_func 0x8087444 FlipVerticalAndClearForced +thumb_func 0x80874a4 LinkPlayerDetectCollision +thumb_func 0x8087530 CreateLinkPlayerSprite +thumb_func 0x80875f0 SpriteCB_LinkPlayer +thumb_func 0x80876a8 mapconnection_get_mapheader +thumb_func 0x80876b8 InitMap +thumb_func 0x80876d8 InitMapFromSavedGame +thumb_func 0x8087710 InitBattlePyramidMap +thumb_func 0x8087748 InitTrainerHillMap +thumb_func 0x8087778 InitMapLayoutData +thumb_func 0x80877d4 InitBackupMapLayoutData +thumb_func 0x808782c InitBackupMapLayoutConnections thumb_func 0x80878b8 -thumb_func 0x808791c -thumb_func 0x8087984 -thumb_func 0x80879e4 -thumb_func 0x8087a44 -thumb_func 0x8087aa8 -thumb_func 0x8087b14 -thumb_func 0x8087b88 +thumb_func 0x808791c FillSouthConnection +thumb_func 0x8087984 FillNorthConnection +thumb_func 0x80879e4 FillWestConnection +thumb_func 0x8087a44 FillEastConnection +thumb_func 0x8087aa8 MapGridGetZCoordAt +thumb_func 0x8087b14 MapGridIsImpassableAt +thumb_func 0x8087b88 MapGridGetMetatileIdAt thumb_func 0x8087c20 MapGridGetMetatileBehaviorAt thumb_func 0x8087c38 MapGridGetMetatileLayerTypeAt thumb_func 0x8087c54 MapGridSetMetatileIdAt thumb_func 0x8087c9c MapGridSetMetatileEntryAt -thumb_func 0x8087cd4 +thumb_func 0x8087cd4 GetBehaviorByMetatileId thumb_func 0x8087d28 save_serialize_map -thumb_func 0x8087d9c -thumb_func 0x8087dd8 +thumb_func 0x8087d9c SavedMapViewIsEmpty +thumb_func 0x8087dd8 ClearSavedMapView thumb_func 0x8087e00 thumb_func 0x8087f28 -thumb_func 0x8088000 +thumb_func 0x8088000 GetMapBorderIdAt thumb_func 0x80880ec GetPostCameraMoveMapBorderId -thumb_func 0x8088114 +thumb_func 0x8088114 CanCameraMoveInDirection thumb_func 0x808815c -thumb_func 0x80881e0 +thumb_func 0x80881e0 CameraMove thumb_func 0x80882b4 thumb_func 0x808830c thumb_func 0x8088370 @@ -3459,25 +3459,25 @@ thumb_func 0x808839c thumb_func 0x80883b0 thumb_func 0x80883f0 thumb_func 0x80884a0 -thumb_func 0x80884bc -thumb_func 0x80884d4 -thumb_func 0x80884e4 +thumb_func 0x80884bc GetCameraFocusCoords +thumb_func 0x80884d4 SetPlayerCoords +thumb_func 0x80884e4 GetCameraCoords thumb_func 0x80884f8 -thumb_func 0x8088554 +thumb_func 0x8088554 SkipCopyingMetatileFromSavedMap thumb_func 0x8088598 thumb_func 0x80885dc thumb_func 0x8088620 nullsub_13 thumb_func 0x8088624 nullsub_45 -thumb_func 0x8088628 -thumb_func 0x80886b4 -thumb_func 0x80886c8 -thumb_func 0x80886dc -thumb_func 0x80886f0 -thumb_func 0x8088700 +thumb_func 0x8088628 apply_map_tileset_palette +thumb_func 0x80886b4 copy_map_tileset1_to_vram +thumb_func 0x80886c8 copy_map_tileset2_to_vram +thumb_func 0x80886dc copy_map_tileset2_to_vram_2 +thumb_func 0x80886f0 apply_map_tileset1_palette +thumb_func 0x8088700 apply_map_tileset2_palette thumb_func 0x8088710 copy_map_tileset1_tileset2_to_vram thumb_func 0x8088738 apply_map_tileset1_tileset2_palette thumb_func 0x8088750 -thumb_func 0x8088754 +thumb_func 0x8088754 MetatileBehavior_IsEncounterTile thumb_func 0x8088778 MetatileBehavior_IsJumpEast thumb_func 0x808878c MetatileBehavior_IsJumpWest thumb_func 0x80887a0 MetatileBehavior_IsJumpNorth @@ -3494,7 +3494,7 @@ thumb_func 0x8088894 Unref_MetatileBehavior_IsUnused04 thumb_func 0x80888a8 MetatileBehavior_IsLadder thumb_func 0x80888bc MetatileBehavior_IsNonAnimDoor thumb_func 0x80888d8 MetatileBehavior_IsDeepSouthWarp -thumb_func 0x80888ec +thumb_func 0x80888ec MetatileBehavior_IsSurfableWaterOrUnderwater thumb_func 0x8088910 MetatileBehavior_IsEastArrowWarp thumb_func 0x8088924 MetatileBehavior_IsWestArrowWarp thumb_func 0x8088938 MetatileBehavior_IsNorthArrowWarp @@ -3531,7 +3531,7 @@ thumb_func 0x8088c28 MetatileBehavior_IsBlockDecoration thumb_func 0x8088c3c MetatileBehavior_IsSecretBaseImpassable thumb_func 0x8088c50 MetatileBehavior_IsMB_C6 thumb_func 0x8088c64 MetatileBehavior_IsSecretBasePoster -thumb_func 0x8088c78 +thumb_func 0x8088c78 MetatileBehavior_IsNormal thumb_func 0x8088c8c MetatileBehavior_IsSecretBaseNorthWall thumb_func 0x8088ca0 thumb_func 0x8088cb4 MetatileBehavior_HoldsSmallDecoration @@ -3620,11 +3620,11 @@ thumb_func 0x808946c MetatileBehavior_IsQuestionnaire thumb_func 0x8089480 thumb_func 0x8089494 MetatileBehavior_IsLongGrassSouthEdge thumb_func 0x80894a8 MetatileBehavior_IsTrainerHillTimer -thumb_func 0x80894bc +thumb_func 0x80894bc move_tilemap_camera_to_upper_left_corner_ thumb_func 0x80894cc tilemap_move_something -thumb_func 0x80894e8 -thumb_func 0x80894f8 -thumb_func 0x8089508 +thumb_func 0x80894e8 coords8_add +thumb_func 0x80894f8 move_tilemap_camera_to_upper_left_corner +thumb_func 0x8089508 FieldUpdateBgTilemapScroll thumb_func 0x808956c thumb_func 0x8089598 DrawWholeMapView thumb_func 0x80895c4 DrawWholeMapViewInternal @@ -3636,139 +3636,139 @@ thumb_func 0x8089798 RedrawMapSliceWest thumb_func 0x8089804 CurrentMapDrawMetatileAt thumb_func 0x8089840 DrawDoorMetatileAt thumb_func 0x8089874 DrawMetatileAt -thumb_func 0x80898dc -thumb_func 0x8089a10 +thumb_func 0x80898dc DrawMetatile +thumb_func 0x8089a10 MapPosToBgTilemapOffset thumb_func 0x8089a58 CameraUpdateCallback -thumb_func 0x8089a80 -thumb_func 0x8089a98 -thumb_func 0x8089ad8 -thumb_func 0x8089be8 +thumb_func 0x8089a80 ResetCameraUpdateInfo +thumb_func 0x8089a98 InitCameraUpdateCallback +thumb_func 0x8089ad8 CameraUpdate +thumb_func 0x8089be8 MoveCameraAndRedrawMap thumb_func 0x8089c24 -thumb_func 0x8089c30 +thumb_func 0x8089c30 SetCameraPanning thumb_func 0x8089c48 InstallCameraPanAheadCallback -thumb_func 0x8089c78 -thumb_func 0x8089cc4 -thumb_func 0x8089d64 +thumb_func 0x8089c78 UpdateCameraPanning +thumb_func 0x8089cc4 CameraPanningCB_PanAhead +thumb_func 0x8089d64 CopyDoorTilesToVram thumb_func 0x8089d9c door_build_blockdef thumb_func 0x8089ddc DrawCurrentDoorAnimFrame thumb_func 0x8089e94 DrawClosedDoorTiles -thumb_func 0x8089ecc +thumb_func 0x8089ecc DrawDoor thumb_func 0x8089f54 -thumb_func 0x8089fb8 +thumb_func 0x8089fb8 Task_AnimateDoor thumb_func 0x8089ff0 GetLastDoorFrame thumb_func 0x808a004 GetDoorGraphics -thumb_func 0x808a028 -thumb_func 0x808a08c +thumb_func 0x808a028 StartDoorAnimationTask +thumb_func 0x808a08c DrawClosedDoor thumb_func 0x808a098 DrawOpenedDoor -thumb_func 0x808a0d8 -thumb_func 0x808a130 +thumb_func 0x808a0d8 StartDoorOpenAnimation +thumb_func 0x808a130 StartDoorCloseAnimation thumb_func 0x808a170 cur_mapdata_get_door_x2_at -thumb_func 0x808a1a0 +thumb_func 0x808a1a0 unref_sub_808A83C thumb_func 0x808a1b8 FieldSetDoorOpened thumb_func 0x808a1e4 FieldSetDoorClosed -thumb_func 0x808a210 -thumb_func 0x808a248 -thumb_func 0x808a280 -thumb_func 0x808a294 +thumb_func 0x808a210 FieldAnimateDoorClose +thumb_func 0x808a248 FieldAnimateDoorOpen +thumb_func 0x808a280 FieldIsDoorAnimationRunning +thumb_func 0x808a294 GetDoorSoundEffect thumb_func 0x808a2c8 -thumb_func 0x808a2fc +thumb_func 0x808a2fc MovementType_Player thumb_func 0x808a320 -thumb_func 0x808a324 -thumb_func 0x808a39c +thumb_func 0x808a324 player_step +thumb_func 0x808a39c TryInterruptEventObjectSpecialAnim thumb_func 0x808a400 npc_clear_strange_bits -thumb_func 0x808a424 +thumb_func 0x808a424 MovePlayerAvatarUsingKeypadInput thumb_func 0x808a45c PlayerAllowForcedMovementIfMovingSameDirection -thumb_func 0x808a478 +thumb_func 0x808a478 TryDoMetatileBehaviorForcedMovement thumb_func 0x808a48c -thumb_func 0x808a49c -thumb_func 0x808a4f8 -thumb_func 0x808a544 +thumb_func 0x808a49c GetForcedMovementByMetatileBehavior +thumb_func 0x808a4f8 ForcedMovement_None +thumb_func 0x808a544 DoForcedMovement thumb_func 0x808a5bc DoForcedMovementInCurrentDirection thumb_func 0x808a5f0 -thumb_func 0x808a604 -thumb_func 0x808a61c -thumb_func 0x808a634 -thumb_func 0x808a64c -thumb_func 0x808a664 -thumb_func 0x808a67c -thumb_func 0x808a694 -thumb_func 0x808a6ac +thumb_func 0x808a604 ForcedMovement_WalkSouth +thumb_func 0x808a61c ForcedMovement_WalkNorth +thumb_func 0x808a634 ForcedMovement_WalkWest +thumb_func 0x808a64c ForcedMovement_WalkEast +thumb_func 0x808a664 ForcedMovement_PushedSouthByCurrent +thumb_func 0x808a67c ForcedMovement_PushedNorthByCurrent +thumb_func 0x808a694 ForcedMovement_PushedWestByCurrent +thumb_func 0x808a6ac ForcedMovement_PushedEastByCurrent thumb_func 0x808a6c4 ForcedMovement_Slide -thumb_func 0x808a6fc -thumb_func 0x808a714 -thumb_func 0x808a72c -thumb_func 0x808a744 -thumb_func 0x808a75c -thumb_func 0x808a768 -thumb_func 0x808a774 -thumb_func 0x808a7cc +thumb_func 0x808a6fc ForcedMovement_SlideSouth +thumb_func 0x808a714 ForcedMovement_SlideNorth +thumb_func 0x808a72c ForcedMovement_SlideWest +thumb_func 0x808a744 ForcedMovement_SlideEast +thumb_func 0x808a75c ForcedMovement_0xBB +thumb_func 0x808a768 ForcedMovement_0xBC +thumb_func 0x808a774 ForcedMovement_MuddySlope +thumb_func 0x808a7cc MovePlayerNotOnBike thumb_func 0x808a7f4 -thumb_func 0x808a7fc -thumb_func 0x808a840 -thumb_func 0x808a854 -thumb_func 0x808a864 -thumb_func 0x808a920 +thumb_func 0x808a7fc CheckMovementInputNotOnBike +thumb_func 0x808a840 PlayerNotOnBikeNotMoving +thumb_func 0x808a854 PlayerNotOnBikeTurningInPlace +thumb_func 0x808a864 PlayerNotOnBikeMoving +thumb_func 0x808a920 CheckForPlayerAvatarCollision thumb_func 0x808a98c -thumb_func 0x808a9f8 +thumb_func 0x808a9f8 CheckForEventObjectCollision thumb_func 0x808aac8 thumb_func 0x808ab20 -thumb_func 0x808ab78 +thumb_func 0x808ab78 ShouldJumpLedge thumb_func 0x808ab9c -thumb_func 0x808ac48 -thumb_func 0x808ac88 +thumb_func 0x808ac48 check_acro_bike_metatile +thumb_func 0x808ac88 IsPlayerCollidingWithFarawayIslandMew thumb_func 0x808ad30 SetPlayerAvatarTransitionFlags -thumb_func 0x808ad4c +thumb_func 0x808ad4c DoPlayerAvatarTransition thumb_func 0x808ada0 nullsub_44 -thumb_func 0x808ada4 -thumb_func 0x808add0 -thumb_func 0x808ae04 -thumb_func 0x808ae3c -thumb_func 0x808ae98 -thumb_func 0x808aecc +thumb_func 0x808ada4 PlayerAvatarTransition_Normal +thumb_func 0x808add0 PlayerAvatarTransition_MachBike +thumb_func 0x808ae04 PlayerAvatarTransition_AcroBike +thumb_func 0x808ae3c PlayerAvatarTransition_Surfing +thumb_func 0x808ae98 PlayerAvatarTransition_Underwater +thumb_func 0x808aecc PlayerAvatarTransition_ReturnToField thumb_func 0x808aedc -thumb_func 0x808af20 +thumb_func 0x808af20 player_is_anim_in_certain_ranges thumb_func 0x808af7c thumb_func 0x808afa0 thumb_func 0x808afc4 thumb_func 0x808afe8 PlayerSetCopyableMovement thumb_func 0x808b004 PlayerGetCopyableMovement thumb_func 0x808b020 -thumb_func 0x808b048 -thumb_func 0x808b084 -thumb_func 0x808b09c -thumb_func 0x808b0b4 -thumb_func 0x808b0cc -thumb_func 0x808b0e4 -thumb_func 0x808b0fc -thumb_func 0x808b120 -thumb_func 0x808b138 -thumb_func 0x808b15c +thumb_func 0x808b048 PlayerSetAnimId +thumb_func 0x808b084 PlayerGoSpeed1 +thumb_func 0x808b09c PlayerGoSpeed2 +thumb_func 0x808b0b4 pokemonanimfunc_49 +thumb_func 0x808b0cc PlayerGoSpeed4 +thumb_func 0x808b0e4 PlayerRun +thumb_func 0x808b0fc PlayerOnBikeCollide +thumb_func 0x808b120 PlayerOnBikeCollideWithFarawayIslandMew +thumb_func 0x808b138 PlayerNotOnBikeCollide +thumb_func 0x808b15c PlayerNotOnBikeCollideWithFarawayIslandMew thumb_func 0x808b174 -thumb_func 0x808b18c +thumb_func 0x808b18c PlayerTurnInPlace thumb_func 0x808b1a4 thumb_func 0x808b1c8 -thumb_func 0x808b20c -thumb_func 0x808b224 +thumb_func 0x808b20c PlayerIdleWheelie +thumb_func 0x808b224 PlayerStartWheelie thumb_func 0x808b23c thumb_func 0x808b254 -thumb_func 0x808b278 -thumb_func 0x808b29c -thumb_func 0x808b2c0 -thumb_func 0x808b2e4 +thumb_func 0x808b278 PlayerMovingHoppingWheelie +thumb_func 0x808b29c PlayerLedgeHoppingWheelie +thumb_func 0x808b2c0 PlayerAcroTurnJump +thumb_func 0x808b2e4 PlayerStandingHoppingWheelie thumb_func 0x808b308 thumb_func 0x808b320 thumb_func 0x808b338 -thumb_func 0x808b350 -thumb_func 0x808b3cc +thumb_func 0x808b350 PlayCollisionSoundIfNotFacingWarp +thumb_func 0x808b3cc GetXYCoordsOneStepInFrontOfPlayer thumb_func 0x808b410 PlayerGetDestCoords -thumb_func 0x808b440 +thumb_func 0x808b440 player_get_pos_including_state_based_drift thumb_func 0x808b59c GetPlayerFacingDirection thumb_func 0x808b5bc GetPlayerMovementDirection thumb_func 0x808b5d8 PlayerGetZCoord thumb_func 0x808b5f4 -thumb_func 0x808b624 +thumb_func 0x808b624 TestPlayerAvatarFlags thumb_func 0x808b634 -thumb_func 0x808b640 +thumb_func 0x808b640 GetPlayerAvatarObjectId thumb_func 0x808b64c thumb_func 0x808b658 thumb_func 0x808b6a0 @@ -3778,148 +3778,148 @@ thumb_func 0x808b6e0 thumb_func 0x808b6f0 GetPlayerAvatarGraphicsIdByStateId thumb_func 0x808b70c unref_GetRivalAvatarGenderByGraphicsId thumb_func 0x808b738 GetPlayerAvatarGenderByGraphicsId -thumb_func 0x808b764 +thumb_func 0x808b764 PartyHasMonWithSurf thumb_func 0x808b7b4 IsPlayerSurfingNorth -thumb_func 0x808b7d8 -thumb_func 0x808b864 -thumb_func 0x808b878 -thumb_func 0x808b890 -thumb_func 0x808b8d0 +thumb_func 0x808b7d8 IsPlayerFacingSurfableFishableWater +thumb_func 0x808b864 ClearPlayerAvatarInfo +thumb_func 0x808b878 SetPlayerAvatarStateMask +thumb_func 0x808b890 GetPlayerAvatarStateTransitionByGraphicsId +thumb_func 0x808b8d0 GetPlayerAvatarGraphicsIdByCurrentState thumb_func 0x808b914 SetPlayerAvatarExtraStateTransition -thumb_func 0x808b944 +thumb_func 0x808b944 InitPlayerAvatar thumb_func 0x808ba0c thumb_func 0x808ba78 thumb_func 0x808bac0 thumb_func 0x808bb18 thumb_func 0x808bb8c thumb_func 0x808bbe4 -thumb_func 0x808bc74 -thumb_func 0x808bcb0 +thumb_func 0x808bc74 StartStrengthAnim +thumb_func 0x808bcb0 Task_BumpBoulder thumb_func 0x808bd08 -thumb_func 0x808bd28 +thumb_func 0x808bd28 do_boulder_dust thumb_func 0x808bde8 thumb_func 0x808be3c thumb_func 0x808be5c thumb_func 0x808be8c -thumb_func 0x808bea8 +thumb_func 0x808bea8 PlayerAvatar_DoSecretBaseMatJump thumb_func 0x808bf14 thumb_func 0x808bf34 thumb_func 0x808bf64 -thumb_func 0x808bf80 -thumb_func 0x808bfa8 -thumb_func 0x808c020 -thumb_func 0x808c060 +thumb_func 0x808bf80 PlayerAvatar_SecretBaseMatSpinStep0 +thumb_func 0x808bfa8 PlayerAvatar_SecretBaseMatSpinStep1 +thumb_func 0x808c020 PlayerAvatar_SecretBaseMatSpinStep2 +thumb_func 0x808c060 PlayerAvatar_SecretBaseMatSpinStep3 thumb_func 0x808c0b4 -thumb_func 0x808c10c +thumb_func 0x808c10c taskFF_0805D1D4 thumb_func 0x808c178 -thumb_func 0x808c1f0 +thumb_func 0x808c1f0 StartFishing thumb_func 0x808c224 thumb_func 0x808c25c -thumb_func 0x808c27c -thumb_func 0x808c314 -thumb_func 0x808c338 +thumb_func 0x808c27c Fishing2 +thumb_func 0x808c314 Fishing3 +thumb_func 0x808c338 Fishing4 thumb_func 0x808c384 -thumb_func 0x808c424 +thumb_func 0x808c424 Fishing6 thumb_func 0x808c4d4 -thumb_func 0x808c514 -thumb_func 0x808c56c -thumb_func 0x808c5d4 -thumb_func 0x808c618 -thumb_func 0x808c704 -thumb_func 0x808c774 +thumb_func 0x808c514 Fishing8 +thumb_func 0x808c56c Fishing9 +thumb_func 0x808c5d4 Fishing10 +thumb_func 0x808c618 Fishing11 +thumb_func 0x808c704 Fishing12 +thumb_func 0x808c774 Fishing13 thumb_func 0x808c7e4 Fishing14 -thumb_func 0x808c7fc -thumb_func 0x808c89c -thumb_func 0x808c8e8 +thumb_func 0x808c7fc Fishing15 +thumb_func 0x808c89c Fishing16 +thumb_func 0x808c8e8 AlignFishingAnimationFrames thumb_func 0x808c9e4 thumb_func 0x808c9f0 thumb_func 0x808ca04 thumb_func 0x808cb04 -thumb_func 0x808cb24 +thumb_func 0x808cb24 RunOnLoadMapScript thumb_func 0x808cb38 thumb_func 0x808cb58 thumb_func 0x808cb6c thumb_func 0x808ccfc -thumb_func 0x808cd60 +thumb_func 0x808cd60 ClearEventObject thumb_func 0x808cd80 ClearAllEventObjects -thumb_func 0x808cda8 -thumb_func 0x808cdc0 -thumb_func 0x808ce64 +thumb_func 0x808cda8 ResetEventObjects +thumb_func 0x808cdc0 CreateReflectionEffectSprites +thumb_func 0x808ce64 GetFirstInactiveEventObjectId thumb_func 0x808ce94 GetEventObjectIdByLocalIdAndMap thumb_func 0x808ceb8 TryGetEventObjectIdByLocalIdAndMap thumb_func 0x808cee4 GetEventObjectIdByXY -thumb_func 0x808cf28 -thumb_func 0x808cf78 +thumb_func 0x808cf28 GetEventObjectIdByLocalIdAndMapInternal +thumb_func 0x808cf78 GetEventObjectIdByLocalId thumb_func 0x808cfb4 InitEventObjectStateFromTemplate -thumb_func 0x808d0ec -thumb_func 0x808d180 +thumb_func 0x808d0ec Unref_TryInitLocalEventObject +thumb_func 0x808d180 GetAvailableEventObjectId thumb_func 0x808d220 RemoveEventObject -thumb_func 0x808d234 -thumb_func 0x808d27c +thumb_func 0x808d234 RemoveEventObjectByLocalIdAndMap +thumb_func 0x808d27c RemoveEventObjectInternal thumb_func 0x808d2c8 RemoveAllEventObjectsExceptPlayer -thumb_func 0x808d2fc -thumb_func 0x808d4b0 +thumb_func 0x808d2fc TrySetupEventObjectSprite +thumb_func 0x808d4b0 TrySpawnEventObjectTemplate thumb_func 0x808d578 SpawnSpecialEventObject thumb_func 0x808d5b4 SpawnSpecialEventObjectParameterized thumb_func 0x808d61c TrySpawnEventObject thumb_func 0x808d66c MakeObjectTemplateFromEventObjectGraphicsInfo thumb_func 0x808d6a0 MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex thumb_func 0x808d6c0 MakeObjectTemplateFromEventObjectTemplate -thumb_func 0x808d6d8 -thumb_func 0x808d77c -thumb_func 0x808d8f0 +thumb_func 0x808d6d8 AddPseudoEventObject +thumb_func 0x808d77c sprite_new +thumb_func 0x808d8f0 TrySpawnEventObjects thumb_func 0x808d9fc RemoveEventObjectsOutsideView thumb_func 0x808da5c RemoveEventObjectIfOutsideView thumb_func 0x808dadc thumb_func 0x808db28 thumb_func 0x808dcfc -thumb_func 0x808dd34 -thumb_func 0x808dd68 +thumb_func 0x808dd34 SetPlayerAvatarEventObjectIdAndObjectId +thumb_func 0x808dd68 EventObjectSetGraphicsId thumb_func 0x808de74 EventObjectSetGraphicsIdByLocalIdAndMap -thumb_func 0x808deb4 +thumb_func 0x808deb4 EventObjectTurn thumb_func 0x808df04 EventObjectTurnByLocalIdAndMap thumb_func 0x808df44 PlayerObjectTurn -thumb_func 0x808df64 -thumb_func 0x808e004 -thumb_func 0x808e04c +thumb_func 0x808df64 get_berry_tree_graphics +thumb_func 0x808e004 GetEventObjectGraphicsInfo +thumb_func 0x808e04c SetEventObjectDynamicGraphicsId thumb_func 0x808e068 npc_by_local_id_and_map_set_field_1_bit_x20 thumb_func 0x808e0b8 EventObjectGetLocalIdAndMap thumb_func 0x808e0cc thumb_func 0x808e0fc thumb_func 0x808e154 thumb_func 0x808e19c -thumb_func 0x808e1f0 +thumb_func 0x808e1f0 UpdateShoalTideFlag thumb_func 0x808e204 LoadEventObjectPalette thumb_func 0x808e230 Unused_LoadEventObjectPaletteSet thumb_func 0x808e264 -thumb_func 0x808e28c +thumb_func 0x808e28c PatchObjectPalette thumb_func 0x808e2c4 PatchObjectPaletteRange -thumb_func 0x808e2f0 -thumb_func 0x808e338 -thumb_func 0x808e3a8 +thumb_func 0x808e2f0 FindEventObjectPaletteIndexByTag +thumb_func 0x808e338 LoadPlayerObjectReflectionPalette +thumb_func 0x808e3a8 LoadSpecialObjectReflectionPalette thumb_func 0x808e420 thumb_func 0x808e434 unref_sub_808EAC4 -thumb_func 0x808e454 -thumb_func 0x808e464 +thumb_func 0x808e454 ShiftEventObjectCoords +thumb_func 0x808e464 SetEventObjectCoords thumb_func 0x808e478 MoveEventObjectToMapCoords thumb_func 0x808e518 TryMoveEventObjectToMapCoords -thumb_func 0x808e56c +thumb_func 0x808e56c ShiftStillEventObjectCoords thumb_func 0x808e580 UpdateEventObjectCoordsForCameraUpdate -thumb_func 0x808e5e8 +thumb_func 0x808e5e8 GetEventObjectIdByXYZ thumb_func 0x808e650 EventObjectDoesZCoordMatch thumb_func 0x808e678 UpdateEventObjectsForCameraUpdate -thumb_func 0x808e6a4 -thumb_func 0x808e6e8 +thumb_func 0x808e6a4 AddCameraObject +thumb_func 0x808e6e8 ObjectCB_CameraObject thumb_func 0x808e710 CameraObject_0 thumb_func 0x808e74c CameraObject_1 thumb_func 0x808e784 CameraObject_2 -thumb_func 0x808e7b4 -thumb_func 0x808e7fc +thumb_func 0x808e7b4 FindCameraObject +thumb_func 0x808e7fc CameraObjectReset1 thumb_func 0x808e818 CameraObjectSetFollowedObjectId thumb_func 0x808e834 CameraObjectGetFollowedObjectId -thumb_func 0x808e84c -thumb_func 0x808e85c -thumb_func 0x808e8c0 +thumb_func 0x808e84c CameraObjectReset2 +thumb_func 0x808e85c CopySprite +thumb_func 0x808e8c0 CreateCopySpriteAt thumb_func 0x808e930 SetEventObjectDirection thumb_func 0x808e974 GetEventObjectScriptPointerByLocalIdAndMap thumb_func 0x808e98c GetEventObjectScriptPointerByEventObjectId @@ -3928,33 +3928,33 @@ thumb_func 0x808e9c8 GetEventObjectFlagIdByEventObjectId thumb_func 0x808e9f0 thumb_func 0x808ea2c thumb_func 0x808ea44 -thumb_func 0x808ea80 -thumb_func 0x808ea98 +thumb_func 0x808ea80 EventObjectGetBerryTreeId +thumb_func 0x808ea98 GetEventObjectTemplateByLocalIdAndMap thumb_func 0x808eaec FindEventObjectTemplateByLocalId -thumb_func 0x808eb24 +thumb_func 0x808eb24 GetBaseTemplateForEventObject thumb_func 0x808eb78 OverrideTemplateCoordsForEventObject thumb_func 0x808eb98 OverrideEventObjectTemplateScript thumb_func 0x808ebac TryOverrideTemplateCoordsForEventObject thumb_func 0x808ebc4 TryOverrideEventObjectTemplateCoords -thumb_func 0x808ebfc +thumb_func 0x808ebfc OverrideSecretBaseDecorationSpriteScript thumb_func 0x808ec68 -thumb_func 0x808ecd0 +thumb_func 0x808ecd0 GetObjectPaletteTag thumb_func 0x808ed50 MovementType_None thumb_func 0x808ed74 thumb_func 0x808ed78 MovementType_WanderAround thumb_func 0x808ed9c thumb_func 0x808edb0 -thumb_func 0x808edbc +thumb_func 0x808edbc MovementType_WanderAround_Step0 thumb_func 0x808edd0 MovementType_WanderAround_Step1 -thumb_func 0x808edfc +thumb_func 0x808edfc MovementType_WanderAround_Step2 thumb_func 0x808ee38 MovementType_WanderAround_Step3 -thumb_func 0x808ee58 +thumb_func 0x808ee58 MovementType_WanderAround_Step4 thumb_func 0x808eea4 MovementType_WanderAround_Step5 thumb_func 0x808eed4 MovementType_WanderAround_Step6 -thumb_func 0x808eefc +thumb_func 0x808eefc EventObjectIsTrainerAndCloseToPlayer thumb_func 0x808ef78 GetVectorDirection -thumb_func 0x808efa8 -thumb_func 0x808efb8 +thumb_func 0x808efa8 GetLimitedVectorDirection_SouthNorth +thumb_func 0x808efb8 GetLimitedVectorDirection_WestEast thumb_func 0x808efcc GetLimitedVectorDirection_WestNorth thumb_func 0x808f028 GetLimitedVectorDirection_EastNorth thumb_func 0x808f084 GetLimitedVectorDirection_WestSouth @@ -3963,33 +3963,33 @@ thumb_func 0x808f13c GetLimitedVectorDirection_SouthNorthWest thumb_func 0x808f178 GetLimitedVectorDirection_SouthNorthEast thumb_func 0x808f1b4 GetLimitedVectorDirection_NorthWestEast thumb_func 0x808f1f0 GetLimitedVectorDirection_SouthWestEast -thumb_func 0x808f22c +thumb_func 0x808f22c TryGetTrainerEncounterDirection thumb_func 0x808f2b4 MovementType_LookAround thumb_func 0x808f2d8 thumb_func 0x808f2ec -thumb_func 0x808f2f8 +thumb_func 0x808f2f8 MovementType_LookAround_Step0 thumb_func 0x808f30c MovementType_LookAround_Step1 -thumb_func 0x808f338 +thumb_func 0x808f338 MovementType_LookAround_Step2 thumb_func 0x808f37c MovementType_LookAround_Step3 -thumb_func 0x808f3ac +thumb_func 0x808f3ac MovementType_LookAround_Step4 thumb_func 0x808f3f4 MovementType_WanderUpAndDown thumb_func 0x808f418 thumb_func 0x808f42c -thumb_func 0x808f438 +thumb_func 0x808f438 MovementType_WanderUpAndDown_Step0 thumb_func 0x808f44c MovementType_WanderUpAndDown_Step1 -thumb_func 0x808f478 +thumb_func 0x808f478 MovementType_WanderUpAndDown_Step2 thumb_func 0x808f4b4 MovementType_WanderUpAndDown_Step3 -thumb_func 0x808f4d4 +thumb_func 0x808f4d4 MovementType_WanderUpAndDown_Step4 thumb_func 0x808f520 MovementType_WanderUpAndDown_Step5 thumb_func 0x808f550 MovementType_WanderUpAndDown_Step6 thumb_func 0x808f578 MovementType_WanderLeftAndRight thumb_func 0x808f59c thumb_func 0x808f5b0 -thumb_func 0x808f5bc +thumb_func 0x808f5bc MovementType_WanderLeftAndRight_Step0 thumb_func 0x808f5d0 MovementType_WanderLeftAndRight_Step1 -thumb_func 0x808f5fc +thumb_func 0x808f5fc MovementType_WanderLeftAndRight_Step2 thumb_func 0x808f638 MovementType_WanderLeftAndRight_Step3 -thumb_func 0x808f658 +thumb_func 0x808f658 MovementType_WanderLeftAndRight_Step4 thumb_func 0x808f6a4 MovementType_WanderLeftAndRight_Step5 thumb_func 0x808f6d4 MovementType_WanderLeftAndRight_Step6 thumb_func 0x808f6fc MovementType_FaceDirection @@ -4001,237 +4001,237 @@ thumb_func 0x808f78c thumb_func 0x808f79c MovementType_BerryTreeGrowth thumb_func 0x808f7e0 thumb_func 0x808f7f4 -thumb_func 0x808f800 +thumb_func 0x808f800 MovementType_BerryTreeGrowth_Step0 thumb_func 0x808f8b8 MovementType_BerryTreeGrowth_Step1 -thumb_func 0x808f8d8 +thumb_func 0x808f8d8 MovementType_BerryTreeGrowth_Step2 thumb_func 0x808f924 MovementType_BerryTreeGrowth_Step3 thumb_func 0x808f974 MovementType_BerryTreeGrowth_Step4 thumb_func 0x808f9c0 MovementType_FaceDownAndUp thumb_func 0x808f9e4 thumb_func 0x808f9f8 -thumb_func 0x808fa04 +thumb_func 0x808fa04 MovementType_FaceDownAndUp_Step0 thumb_func 0x808fa18 MovementType_FaceDownAndUp_Step1 -thumb_func 0x808fa44 +thumb_func 0x808fa44 MovementType_FaceDownAndUp_Step2 thumb_func 0x808fa88 MovementType_FaceDownAndUp_Step3 -thumb_func 0x808fab8 +thumb_func 0x808fab8 MovementType_FaceDownAndUp_Step4 thumb_func 0x808fb00 MovementType_FaceLeftAndRight thumb_func 0x808fb24 thumb_func 0x808fb38 -thumb_func 0x808fb44 +thumb_func 0x808fb44 MovementType_FaceLeftAndRight_Step0 thumb_func 0x808fb58 MovementType_FaceLeftAndRight_Step1 -thumb_func 0x808fb84 +thumb_func 0x808fb84 MovementType_FaceLeftAndRight_Step2 thumb_func 0x808fbc8 MovementType_FaceLeftAndRight_Step3 -thumb_func 0x808fbf8 +thumb_func 0x808fbf8 MovementType_FaceLeftAndRight_Step4 thumb_func 0x808fc40 MovementType_FaceUpAndLeft thumb_func 0x808fc64 thumb_func 0x808fc78 -thumb_func 0x808fc84 +thumb_func 0x808fc84 MovementType_FaceUpAndLeft_Step0 thumb_func 0x808fc98 MovementType_FaceUpAndLeft_Step1 -thumb_func 0x808fcc4 +thumb_func 0x808fcc4 MovementType_FaceUpAndLeft_Step2 thumb_func 0x808fd08 MovementType_FaceUpAndLeft_Step3 -thumb_func 0x808fd38 +thumb_func 0x808fd38 MovementType_FaceUpAndLeft_Step4 thumb_func 0x808fd80 MovementType_FaceUpAndRight thumb_func 0x808fda4 thumb_func 0x808fdb8 -thumb_func 0x808fdc4 +thumb_func 0x808fdc4 MovementType_FaceUpAndRight_Step0 thumb_func 0x808fdd8 MovementType_FaceUpAndRight_Step1 -thumb_func 0x808fe04 +thumb_func 0x808fe04 MovementType_FaceUpAndRight_Step2 thumb_func 0x808fe48 MovementType_FaceUpAndRight_Step3 -thumb_func 0x808fe78 +thumb_func 0x808fe78 MovementType_FaceUpAndRight_Step4 thumb_func 0x808fec0 MovementType_FaceDownAndLeft thumb_func 0x808fee4 thumb_func 0x808fef8 -thumb_func 0x808ff04 +thumb_func 0x808ff04 MovementType_FaceDownAndLeft_Step0 thumb_func 0x808ff18 MovementType_FaceDownAndLeft_Step1 -thumb_func 0x808ff44 +thumb_func 0x808ff44 MovementType_FaceDownAndLeft_Step2 thumb_func 0x808ff88 MovementType_FaceDownAndLeft_Step3 -thumb_func 0x808ffb8 +thumb_func 0x808ffb8 MovementType_FaceDownAndLeft_Step4 thumb_func 0x8090000 MovementType_FaceDownAndRight thumb_func 0x8090024 thumb_func 0x8090038 -thumb_func 0x8090044 +thumb_func 0x8090044 MovementType_FaceDownAndRight_Step0 thumb_func 0x8090058 MovementType_FaceDownAndRight_Step1 -thumb_func 0x8090084 +thumb_func 0x8090084 MovementType_FaceDownAndRight_Step2 thumb_func 0x80900c8 MovementType_FaceDownAndRight_Step3 -thumb_func 0x80900f8 +thumb_func 0x80900f8 MovementType_FaceDownAndRight_Step4 thumb_func 0x8090140 MovementType_FaceDownUpAndLeft thumb_func 0x8090164 thumb_func 0x8090178 -thumb_func 0x8090184 +thumb_func 0x8090184 MovementType_FaceDownUpAndLeft_Step0 thumb_func 0x8090198 MovementType_FaceDownUpAndLeft_Step1 -thumb_func 0x80901c4 +thumb_func 0x80901c4 MovementType_FaceDownUpAndLeft_Step2 thumb_func 0x8090208 MovementType_FaceDownUpAndLeft_Step3 -thumb_func 0x8090238 +thumb_func 0x8090238 MovementType_FaceDownUpAndLeft_Step4 thumb_func 0x8090280 MovementType_FaceDownUpAndRight thumb_func 0x80902a4 thumb_func 0x80902b8 -thumb_func 0x80902c4 +thumb_func 0x80902c4 MovementType_FaceDownUpAndRight_Step0 thumb_func 0x80902d8 MovementType_FaceDownUpAndRight_Step1 -thumb_func 0x8090304 +thumb_func 0x8090304 MovementType_FaceDownUpAndRight_Step2 thumb_func 0x8090348 MovementType_FaceDownUpAndRight_Step3 -thumb_func 0x8090378 +thumb_func 0x8090378 MovementType_FaceDownUpAndRight_Step4 thumb_func 0x80903c0 MovementType_FaceUpRightAndLeft thumb_func 0x80903e4 thumb_func 0x80903f8 -thumb_func 0x8090404 +thumb_func 0x8090404 MovementType_FaceUpLeftAndRight_Step0 thumb_func 0x8090418 MovementType_FaceUpLeftAndRight_Step1 -thumb_func 0x8090444 +thumb_func 0x8090444 MovementType_FaceUpLeftAndRight_Step2 thumb_func 0x8090488 MovementType_FaceUpLeftAndRight_Step3 -thumb_func 0x80904b8 +thumb_func 0x80904b8 MovementType_FaceUpLeftAndRight_Step4 thumb_func 0x8090500 MovementType_FaceDownRightAndLeft thumb_func 0x8090524 thumb_func 0x8090538 -thumb_func 0x8090544 +thumb_func 0x8090544 MovementType_FaceDownLeftAndRight_Step0 thumb_func 0x8090558 MovementType_FaceDownLeftAndRight_Step1 -thumb_func 0x8090584 +thumb_func 0x8090584 MovementType_FaceDownLeftAndRight_Step2 thumb_func 0x80905c8 MovementType_FaceDownLeftAndRight_Step3 -thumb_func 0x80905f8 +thumb_func 0x80905f8 MovementType_FaceDownLeftAndRight_Step4 thumb_func 0x8090640 MovementType_RotateCounterclockwise thumb_func 0x8090664 thumb_func 0x8090678 thumb_func 0x8090684 MovementType_RotateCounterclockwise_Step0 thumb_func 0x80906b0 MovementType_RotateCounterclockwise_Step1 thumb_func 0x80906d4 MovementType_RotateCounterclockwise_Step2 -thumb_func 0x8090700 +thumb_func 0x8090700 MovementType_RotateCounterclockwise_Step3 thumb_func 0x8090744 MovementType_RotateClockwise thumb_func 0x8090768 thumb_func 0x809077c thumb_func 0x8090788 MovementType_RotateClockwise_Step0 thumb_func 0x80907b4 MovementType_RotateClockwise_Step1 thumb_func 0x80907d8 MovementType_RotateClockwise_Step2 -thumb_func 0x8090804 +thumb_func 0x8090804 MovementType_RotateClockwise_Step3 thumb_func 0x8090848 MovementType_WalkBackAndForth thumb_func 0x809086c thumb_func 0x8090880 -thumb_func 0x809088c +thumb_func 0x809088c MovementType_WalkBackAndForth_Step0 thumb_func 0x80908a0 MovementType_WalkBackAndForth_Step1 thumb_func 0x80908d8 MovementType_WalkBackAndForth_Step2 thumb_func 0x8090990 MovementType_WalkBackAndForth_Step3 -thumb_func 0x80909b8 +thumb_func 0x80909b8 MovementType_WalkSequence_Step0 thumb_func 0x80909cc MoveNextDirectionInSequence thumb_func 0x8090a80 MovementType_WalkSequence_Step2 thumb_func 0x8090aa8 MovementType_WalkSequenceUpRightLeftDown thumb_func 0x8090acc thumb_func 0x8090ae0 -thumb_func 0x8090aec +thumb_func 0x8090aec MovementType_WalkSequenceUpRightLeftDown_Step1 thumb_func 0x8090b34 MovementType_WalkSequenceRightLeftDownUp thumb_func 0x8090b58 thumb_func 0x8090b6c -thumb_func 0x8090b78 +thumb_func 0x8090b78 MovementType_WalkSequenceRightLeftDownUp_Step1 thumb_func 0x8090bc0 MovementType_WalkSequenceDownUpRightLeft thumb_func 0x8090be4 thumb_func 0x8090bf8 -thumb_func 0x8090c04 +thumb_func 0x8090c04 MovementType_WalkSequenceDownUpRightLeft_Step1 thumb_func 0x8090c4c MovementType_WalkSequenceLeftDownUpRight thumb_func 0x8090c70 thumb_func 0x8090c84 -thumb_func 0x8090c90 +thumb_func 0x8090c90 MovementType_WalkSequenceLeftDownUpRight_Step1 thumb_func 0x8090cd8 MovementType_WalkSequenceUpLeftRightDown thumb_func 0x8090cfc thumb_func 0x8090d10 -thumb_func 0x8090d1c +thumb_func 0x8090d1c MovementType_WalkSequenceUpLeftRightDown_Step1 thumb_func 0x8090d64 MovementType_WalkSequenceLeftRightDownUp thumb_func 0x8090d88 thumb_func 0x8090d9c -thumb_func 0x8090da8 +thumb_func 0x8090da8 MovementType_WalkSequenceLeftRightDownUp_Step1 thumb_func 0x8090df0 MovementType_WalkSequenceDownUpLeftRight thumb_func 0x8090e14 thumb_func 0x8090e28 -thumb_func 0x8090e34 +thumb_func 0x8090e34 MovementType_WalkSequenceDownUpLeftRight_Step1 thumb_func 0x8090e7c MovementType_WalkSequenceRightDownUpLeft thumb_func 0x8090ea0 thumb_func 0x8090eb4 -thumb_func 0x8090ec0 +thumb_func 0x8090ec0 MovementType_WalkSequenceRightDownUpLeft_Step1 thumb_func 0x8090f08 MovementType_WalkSequenceLeftUpDownRight thumb_func 0x8090f2c thumb_func 0x8090f40 -thumb_func 0x8090f4c +thumb_func 0x8090f4c MovementType_WalkSequenceLeftUpDownRight_Step1 thumb_func 0x8090f94 MovementType_WalkSequenceUpDownRightLeft thumb_func 0x8090fb8 thumb_func 0x8090fcc -thumb_func 0x8090fd8 +thumb_func 0x8090fd8 MovementType_WalkSequenceUpDownRightLeft_Step1 thumb_func 0x8091020 MovementType_WalkSequenceRightLeftUpDown thumb_func 0x8091044 thumb_func 0x8091058 -thumb_func 0x8091064 +thumb_func 0x8091064 MovementType_WalkSequenceRightLeftUpDown_Step1 thumb_func 0x80910ac MovementType_WalkSequenceDownRightLeftUp thumb_func 0x80910d0 thumb_func 0x80910e4 -thumb_func 0x80910f0 +thumb_func 0x80910f0 MovementType_WalkSequenceDownRightLeftUp_Step1 thumb_func 0x8091138 MovementType_WalkSequenceRightUpDownLeft thumb_func 0x809115c thumb_func 0x8091170 -thumb_func 0x809117c +thumb_func 0x809117c MovementType_WalkSequenceRightUpDownLeft_Step1 thumb_func 0x80911c4 MovementType_WalkSequenceUpDownLeftRight thumb_func 0x80911e8 thumb_func 0x80911fc -thumb_func 0x8091208 +thumb_func 0x8091208 MovementType_WalkSequenceUpDownLeftRight_Step1 thumb_func 0x8091250 MovementType_WalkSequenceLeftRightUpDown thumb_func 0x8091274 thumb_func 0x8091288 -thumb_func 0x8091294 +thumb_func 0x8091294 MovementType_WalkSequenceLeftRightUpDown_Step1 thumb_func 0x80912dc MovementType_WalkSequenceDownLeftRightUp thumb_func 0x8091300 thumb_func 0x8091314 -thumb_func 0x8091320 +thumb_func 0x8091320 MovementType_WalkSequenceDownLeftRightUp_Step1 thumb_func 0x8091368 MovementType_WalkSequenceUpLeftDownRight thumb_func 0x809138c thumb_func 0x80913a0 -thumb_func 0x80913ac +thumb_func 0x80913ac MovementType_WalkSequenceUpLeftDownRight_Step1 thumb_func 0x80913f4 MovementType_WalkSequenceDownRightUpLeft thumb_func 0x8091418 thumb_func 0x809142c -thumb_func 0x8091438 +thumb_func 0x8091438 MovementType_WalkSequenceDownRightUpLeft_Step1 thumb_func 0x8091480 MovementType_WalkSequenceLeftDownRightUp thumb_func 0x80914a4 thumb_func 0x80914b8 -thumb_func 0x80914c4 +thumb_func 0x80914c4 MovementType_WalkSequenceLeftDownRightUp_Step1 thumb_func 0x809150c MovementType_WalkSequenceRightUpLeftDown thumb_func 0x8091530 thumb_func 0x8091544 -thumb_func 0x8091550 +thumb_func 0x8091550 MovementType_WalkSequenceRightUpLeftDown_Step1 thumb_func 0x8091598 MovementType_WalkSequenceUpRightDownLeft thumb_func 0x80915bc thumb_func 0x80915d0 -thumb_func 0x80915dc +thumb_func 0x80915dc MovementType_WalkSequenceUpRightDownLeft_Step1 thumb_func 0x8091624 MovementType_WalkSequenceDownLeftUpRight thumb_func 0x8091648 thumb_func 0x809165c -thumb_func 0x8091668 +thumb_func 0x8091668 MovementType_WalkSequenceDownLeftUpRight_Step1 thumb_func 0x80916b0 MovementType_WalkSequenceLeftUpRightDown thumb_func 0x80916d4 thumb_func 0x80916e8 -thumb_func 0x80916f4 +thumb_func 0x80916f4 MovementType_WalkSequenceLeftUpRightDown_Step1 thumb_func 0x809173c MovementType_WalkSequenceRightDownLeftUp thumb_func 0x8091760 thumb_func 0x8091774 -thumb_func 0x8091780 +thumb_func 0x8091780 MovementType_WalkSequenceRightDownLeftUp_Step1 thumb_func 0x80917c8 MovementType_CopyPlayer thumb_func 0x80917ec thumb_func 0x8091800 -thumb_func 0x809180c +thumb_func 0x809180c MovementType_CopyPlayer_Step0 thumb_func 0x8091830 thumb_func 0x8091890 MovementType_CopyPlayer_Step2 thumb_func 0x80918b8 thumb_func 0x80918bc CopyablePlayerMovement_FaceDirection -thumb_func 0x8091904 -thumb_func 0x8091a14 -thumb_func 0x8091acc -thumb_func 0x8091b84 +thumb_func 0x8091904 CopyablePlayerMovement_GoSpeed0 +thumb_func 0x8091a14 CopyablePlayerMovement_GoSpeed1 +thumb_func 0x8091acc CopyablePlayerMovement_GoSpeed2 +thumb_func 0x8091b84 CopyablePlayerMovement_Slide thumb_func 0x8091c3c cph_IM_DIFFERENT -thumb_func 0x8091c84 -thumb_func 0x8091d3c +thumb_func 0x8091c84 CopyablePlayerMovement_GoSpeed4 +thumb_func 0x8091d3c CopyablePlayerMovement_Jump thumb_func 0x8091e04 MovementType_CopyPlayerInGrass thumb_func 0x8091e28 thumb_func 0x8091e3c -thumb_func 0x8091e48 -thumb_func 0x8091eac -thumb_func 0x8091f1c -thumb_func 0x8091f28 +thumb_func 0x8091e48 MovementType_CopyPlayerInGrass_Step1 +thumb_func 0x8091eac MovementType_TreeDisguise +thumb_func 0x8091f1c MovementType_Disguise_Callback +thumb_func 0x8091f28 MovementType_MountainDisguise thumb_func 0x8091f98 MovementType_Hidden thumb_func 0x8091ffc thumb_func 0x8092010 -thumb_func 0x809201c +thumb_func 0x809201c MovementType_Hidden_Step0 thumb_func 0x8092028 MovementType_MoveInPlace_Step1 thumb_func 0x8092044 MovementType_WalkInPlace thumb_func 0x8092068 @@ -4272,18 +4272,18 @@ thumb_func 0x809238c thumb_func 0x809239c thumb_func 0x80923ac thumb_func 0x80923bc -thumb_func 0x80923e0 -thumb_func 0x8092428 +thumb_func 0x80923e0 npc_apply_anim_looping +thumb_func 0x8092428 obj_npc_animation_step thumb_func 0x8092468 GetDirectionToFace thumb_func 0x809249c SetTrainerMovementType thumb_func 0x80924e8 thumb_func 0x80924f8 GetCollisionInDirection -thumb_func 0x8092538 -thumb_func 0x80925fc +thumb_func 0x8092538 GetCollisionAtCoords +thumb_func 0x80925fc GetCollisionFlagsAtCoords thumb_func 0x80926c8 IsCoordOutsideEventObjectMovementRange thumb_func 0x8092738 -thumb_func 0x8092790 -thumb_func 0x809280c +thumb_func 0x8092790 DoesObjectCollideWithObjectAt +thumb_func 0x809280c IsBerryTreeSparkling thumb_func 0x8092860 thumb_func 0x80928ac MoveCoords thumb_func 0x80928d0 @@ -4295,14 +4295,14 @@ thumb_func 0x8092a9c GetEventObjectMovingCameraOffset thumb_func 0x8092adc EventObjectMoveDestCoords thumb_func 0x8092afc EventObjectIsMovementOverridden thumb_func 0x8092b14 EventObjectIsHeldMovementActive -thumb_func 0x8092b30 +thumb_func 0x8092b30 EventObjectSetHeldMovement thumb_func 0x8092b78 EventObjectForceSetHeldMovement thumb_func 0x8092b94 EventObjectClearHeldMovementIfActive thumb_func 0x8092bac EventObjectClearHeldMovement thumb_func 0x8092be0 EventObjectCheckHeldMovementStatus thumb_func 0x8092bf4 EventObjectClearHeldMovementIfFinished thumb_func 0x8092c18 EventObjectGetHeldMovementActionId -thumb_func 0x8092c30 +thumb_func 0x8092c30 UpdateEventObjectCurrentMovement thumb_func 0x8092ca0 thumb_func 0x8092ccc thumb_func 0x8092cf8 @@ -4321,31 +4321,31 @@ thumb_func 0x8092f08 thumb_func 0x8092f34 thumb_func 0x8092f60 thumb_func 0x8092f8c EventObjectFaceOppositeDirection -thumb_func 0x8092fb8 +thumb_func 0x8092fb8 HallOfFame_PrintWelcomeText thumb_func 0x8092fe4 thumb_func 0x8093010 thumb_func 0x809303c -thumb_func 0x8093068 +thumb_func 0x8093068 MovementType_FaceUpAndRight_callback thumb_func 0x8093094 thumb_func 0x80930c0 thumb_func 0x80930ec thumb_func 0x8093118 thumb_func 0x8093144 -thumb_func 0x8093170 +thumb_func 0x8093170 GetOppositeDirection thumb_func 0x80931a4 zffu_offset_calc thumb_func 0x80931bc state_to_direction -thumb_func 0x80931fc +thumb_func 0x80931fc EventObjectExecHeldMovementAction thumb_func 0x809321c -thumb_func 0x8093234 +thumb_func 0x8093234 EventObjectExecSingleMovementAction thumb_func 0x8093258 -thumb_func 0x8093274 +thumb_func 0x8093274 EventObjectSetSingleMovement thumb_func 0x809327c FaceDirection -thumb_func 0x80932c0 -thumb_func 0x80932d0 -thumb_func 0x80932e0 -thumb_func 0x80932f0 -thumb_func 0x8093300 -thumb_func 0x809339c +thumb_func 0x80932c0 MovementAction_FaceDown_Step0 +thumb_func 0x80932d0 MovementAction_FaceUp_Step0 +thumb_func 0x80932e0 MovementAction_FaceLeft_Step0 +thumb_func 0x80932f0 MovementAction_FaceRight_Step0 +thumb_func 0x8093300 npc_apply_direction +thumb_func 0x809339c do_go_anim thumb_func 0x80933f8 StartRunningAnim thumb_func 0x8093428 npc_obj_ministep_stop_on_arrival thumb_func 0x8093460 @@ -4384,7 +4384,7 @@ thumb_func 0x80938d4 MovementAction_WalkNormalLeft_Step1 thumb_func 0x80938f4 MovementAction_WalkNormalRight_Step0 thumb_func 0x8093914 MovementAction_WalkNormalRight_Step1 thumb_func 0x8093934 -thumb_func 0x80939f0 +thumb_func 0x80939f0 maybe_shadow_1 thumb_func 0x8093a34 thumb_func 0x8093af8 thumb_func 0x8093b0c @@ -4479,8 +4479,8 @@ thumb_func 0x8094860 MovementAction_JumpSpecialRight_Step0 thumb_func 0x8094880 MovementAction_JumpSpecialRight_Step1 thumb_func 0x80948a8 MovementAction_FacePlayer_Step0 thumb_func 0x8094904 MovementAction_FaceAwayPlayer_Step0 -thumb_func 0x8094968 -thumb_func 0x8094978 +thumb_func 0x8094968 MovementAction_LockFacingDirection_Step0 +thumb_func 0x8094978 MovementAction_UnlockFacingDirection_Step0 thumb_func 0x8094988 MovementAction_JumpDown_Step0 thumb_func 0x80949b4 MovementAction_JumpDown_Step1 thumb_func 0x80949e0 MovementAction_JumpUp_Step0 @@ -4506,43 +4506,43 @@ thumb_func 0x8094d24 MovementAction_JumpInPlaceLeftRight_Step1 thumb_func 0x8094d50 MovementAction_JumpInPlaceRightLeft_Step0 thumb_func 0x8094d7c MovementAction_JumpInPlaceRightLeft_Step1 thumb_func 0x8094da8 MovementAction_FaceOriginalDirection_Step0 -thumb_func 0x8094dc0 -thumb_func 0x8094dd0 -thumb_func 0x8094de0 -thumb_func 0x8094df0 +thumb_func 0x8094dc0 MovementAction_NurseJoyBowDown_Step0 +thumb_func 0x8094dd0 MovementAction_EnableJumpLandingGroundEffect_Step0 +thumb_func 0x8094de0 MovementAction_DisableJumpLandingGroundEffect_Step0 +thumb_func 0x8094df0 MovementAction_DisableAnimation_Step0 thumb_func 0x8094e00 MovementAction_RestoreAnimation_Step0 -thumb_func 0x8094e2c -thumb_func 0x8094e3c -thumb_func 0x8094e4c -thumb_func 0x8094e70 -thumb_func 0x8094e94 -thumb_func 0x8094eb8 -thumb_func 0x8094efc +thumb_func 0x8094e2c MovementAction_SetInvisible_Step0 +thumb_func 0x8094e3c MovementAction_SetVisible_Step0 +thumb_func 0x8094e4c MovementAction_EmoteExclamationMark_Step0 +thumb_func 0x8094e70 MovementAction_EmoteQuestionMark_Step0 +thumb_func 0x8094e94 MovementAction_EmoteHeart_Step0 +thumb_func 0x8094eb8 MovementAction_RevealTrainer_Step0 +thumb_func 0x8094efc MovementAction_RevealTrainer_Step1 thumb_func 0x8094f1c MovementAction_RockSmashBreak_Step0 thumb_func 0x8094f38 MovementAction_RockSmashBreak_Step1 thumb_func 0x8094f5c MovementAction_RockSmashBreak_Step2 thumb_func 0x8094f98 MovementAction_CutTree_Step0 thumb_func 0x8094fb4 MovementAction_CutTree_Step1 thumb_func 0x8094fd8 MovementAction_CutTree_Step2 -thumb_func 0x8095014 -thumb_func 0x8095024 -thumb_func 0x8095034 -thumb_func 0x8095064 -thumb_func 0x8095094 -thumb_func 0x80950a0 -thumb_func 0x80950b0 +thumb_func 0x8095014 MovementAction_SetFixedPriority_Step0 +thumb_func 0x8095024 MovementAction_ClearFixedPriority_Step0 +thumb_func 0x8095034 MovementAction_InitAffineAnim_Step0 +thumb_func 0x8095064 MovementAction_ClearAffineAnim_Step0 +thumb_func 0x8095094 MovementAction_Unknown1_Step0 +thumb_func 0x80950a0 MovementAction_Unknown2_Step0 +thumb_func 0x80950b0 MovementAction_WalkDownStartAffine_Step0 thumb_func 0x80950e4 MovementAction_WalkDownStartAffine_Step1 -thumb_func 0x8095110 +thumb_func 0x8095110 MovementAction_WalkDownAffine_Step0 thumb_func 0x8095144 MovementAction_WalkDownAffine_Step1 -thumb_func 0x8095170 +thumb_func 0x8095170 MovementAction_WalkLeftAffine_Step0 thumb_func 0x80951a4 MovementAction_WalkLeftAffine_Step1 -thumb_func 0x80951d0 +thumb_func 0x80951d0 MovementAction_WalkRightAffine_Step0 thumb_func 0x8095204 MovementAction_WalkRightAffine_Step1 thumb_func 0x8095230 -thumb_func 0x8095270 -thumb_func 0x8095280 -thumb_func 0x8095290 -thumb_func 0x80952a0 +thumb_func 0x8095270 MovementAction_AcroWheelieFaceDown_Step0 +thumb_func 0x8095280 MovementAction_AcroWheelieFaceUp_Step0 +thumb_func 0x8095290 MovementAction_AcroWheelieFaceLeft_Step0 +thumb_func 0x80952a0 MovementAction_AcroWheelieFaceRight_Step0 thumb_func 0x80952b0 MovementAction_AcroPopWheelieDown_Step0 thumb_func 0x80952d4 MovementAction_AcroPopWheelieUp_Step0 thumb_func 0x80952f8 MovementAction_AcroPopWheelieLeft_Step0 @@ -4615,11 +4615,11 @@ thumb_func 0x8095d58 thumb_func 0x8095d78 MovementAction_AcroEndWheelieMoveLeft_Step1 thumb_func 0x8095d98 thumb_func 0x8095db8 MovementAction_AcroEndWheelieMoveRight_Step1 -thumb_func 0x8095dd8 -thumb_func 0x8095dec -thumb_func 0x8095e04 +thumb_func 0x8095dd8 MovementAction_Levitate_Step0 +thumb_func 0x8095dec MovementAction_StopLevitate_Step0 +thumb_func 0x8095e04 MovementAction_DestroyExtraTaskIfAtTop_Step0 thumb_func 0x8095e28 -thumb_func 0x8095e2c +thumb_func 0x8095e2c MovementAction_PauseSpriteAnim thumb_func 0x8095e3c UpdateEventObjectSpriteAnimPause thumb_func 0x8095e58 TryEnableEventObjectAnim thumb_func 0x8095e88 UpdateEventObjectVisibility @@ -4628,63 +4628,63 @@ thumb_func 0x8095f80 UpdateEventObjSpriteVisibility thumb_func 0x8095fa8 GetAllGroundEffectFlags_OnSpawn thumb_func 0x8095ff0 GetAllGroundEffectFlags_OnBeginStep thumb_func 0x8096048 GetAllGroundEffectFlags_OnFinishStep -thumb_func 0x8096098 -thumb_func 0x80960c0 -thumb_func 0x809611c -thumb_func 0x809613c +thumb_func 0x8096098 EventObjectUpdateMetatileBehaviors +thumb_func 0x80960c0 GetGroundEffectFlags_Reflection +thumb_func 0x809611c GetGroundEffectFlags_TallGrassOnSpawn +thumb_func 0x809613c GetGroundEffectFlags_LongGrassOnSpawn thumb_func 0x809615c -thumb_func 0x809617c -thumb_func 0x809619c -thumb_func 0x80961dc -thumb_func 0x809622c -thumb_func 0x8096290 +thumb_func 0x809617c GetGroundEffectFlags_LongGrassOnBeginStep +thumb_func 0x809619c GetGroundEffectFlags_Tracks +thumb_func 0x80961dc GetGroundEffectFlags_SandHeap +thumb_func 0x809622c GetGroundEffectFlags_ShallowFlowingWater +thumb_func 0x8096290 GetGroundEffectFlags_Puddle thumb_func 0x80962c0 -thumb_func 0x80962e0 -thumb_func 0x8096330 -thumb_func 0x8096380 -thumb_func 0x80963a0 -thumb_func 0x80963fc -thumb_func 0x809654c -thumb_func 0x809657c -thumb_func 0x80965d8 -thumb_func 0x8096634 +thumb_func 0x80962e0 GetGroundEffectFlags_ShortGrass +thumb_func 0x8096330 GetGroundEffectFlags_HotSprings +thumb_func 0x8096380 GetGroundEffectFlags_Seaweed +thumb_func 0x80963a0 GetGroundEffectFlags_JumpLanding +thumb_func 0x80963fc EventObjectCheckForReflectiveSurface +thumb_func 0x809654c GetReflectionTypeByMetatileBehavior +thumb_func 0x809657c GetLedgeJumpDirection +thumb_func 0x80965d8 SetEventObjectSpriteOamTableForLongGrass +thumb_func 0x8096634 IsZCoordMismatchAt thumb_func 0x8096670 UpdateEventObjectZCoordAndPriority thumb_func 0x80966cc InitObjectPriorityByZCoord thumb_func 0x8096718 -thumb_func 0x8096728 +thumb_func 0x8096728 EventObjectUpdateZCoord thumb_func 0x809677c SetObjectSubpriorityByZCoord thumb_func 0x80967c4 EventObjectUpdateSubpriority thumb_func 0x80967e0 AreZCoordsCompatible -thumb_func 0x8096800 -thumb_func 0x809684c -thumb_func 0x8096898 -thumb_func 0x80968e4 -thumb_func 0x8096930 -thumb_func 0x809693c -thumb_func 0x8096948 -thumb_func 0x8096958 +thumb_func 0x8096800 GroundEffect_SpawnOnTallGrass +thumb_func 0x809684c GroundEffect_StepOnTallGrass +thumb_func 0x8096898 GroundEffect_SpawnOnLongGrass +thumb_func 0x80968e4 GroundEffect_StepOnLongGrass +thumb_func 0x8096930 GroundEffect_WaterReflection +thumb_func 0x809693c GroundEffect_IceReflection +thumb_func 0x8096948 GroundEffect_FlowingWater +thumb_func 0x8096958 GroundEffect_SandTracks thumb_func 0x8096984 thumb_func 0x80969b0 nullsub_47 -thumb_func 0x80969b4 -thumb_func 0x8096a04 +thumb_func 0x80969b4 DoTracksGroundEffect_Footprints +thumb_func 0x8096a04 DoTracksGroundEffect_BikeTireTracks thumb_func 0x8096a54 -thumb_func 0x8096a60 -thumb_func 0x8096a70 -thumb_func 0x8096a80 -thumb_func 0x8096ad8 -thumb_func 0x8096b00 -thumb_func 0x8096b30 -thumb_func 0x8096b60 -thumb_func 0x8096b90 -thumb_func 0x8096ba0 -thumb_func 0x8096bb0 -thumb_func 0x8096bd0 +thumb_func 0x8096a60 GroundEffect_StepOnPuddle +thumb_func 0x8096a70 GroundEffect_SandHeap +thumb_func 0x8096a80 GroundEffect_JumpOnTallGrass +thumb_func 0x8096ad8 GroundEffect_JumpOnLongGrass +thumb_func 0x8096b00 GroundEffect_JumpOnShallowWater +thumb_func 0x8096b30 GroundEffect_JumpOnWater +thumb_func 0x8096b60 GroundEffect_JumpLandingDust +thumb_func 0x8096b90 GroundEffect_ShortGrass +thumb_func 0x8096ba0 GroundEffect_HotSprings +thumb_func 0x8096bb0 GroundEffect_Seaweed +thumb_func 0x8096bd0 DoFlaggedGroundEffects thumb_func 0x8096c2c filters_out_some_ground_effects thumb_func 0x8096c64 FilterOutStepOnPuddleGroundEffectIfJumping thumb_func 0x8096c80 DoGroundEffects_OnSpawn thumb_func 0x8096ccc DoGroundEffects_OnBeginStep thumb_func 0x8096d20 DoGroundEffects_OnFinishStep -thumb_func 0x8096d74 +thumb_func 0x8096d74 FreezeEventObject thumb_func 0x8096e04 FreezeEventObjects thumb_func 0x8096e40 FreezeEventObjectsExceptOne thumb_func 0x8096e84 UnfreezeEventObject @@ -4694,8 +4694,8 @@ thumb_func 0x8096f3c Step2 thumb_func 0x8096f60 Step3 thumb_func 0x8096f88 Step4 thumb_func 0x8096fac Step8 -thumb_func 0x8096fd0 -thumb_func 0x8096fe4 +thumb_func 0x8096fd0 oamt_npc_ministep_reset +thumb_func 0x8096fe4 obj_npc_ministep thumb_func 0x809704c thumb_func 0x809705c thumb_func 0x8097098 @@ -4708,9 +4708,9 @@ thumb_func 0x80971cc thumb_func 0x8097254 thumb_func 0x80972e8 thumb_func 0x80972ec WaitForMovementDelay -thumb_func 0x8097304 +thumb_func 0x8097304 SetAndStartSpriteAnim thumb_func 0x809732c SpriteAnimEnded -thumb_func 0x8097344 +thumb_func 0x8097344 UpdateEventObjectSpriteVisibility thumb_func 0x8097438 UpdateEventObjectSpriteSubpriorityAndVisibility thumb_func 0x8097460 thumb_func 0x809749c @@ -4725,71 +4725,71 @@ thumb_func 0x80976d8 thumb_func 0x8097724 thumb_func 0x8097758 thumb_func 0x8097780 DoShadowFieldEffect -thumb_func 0x809779c -thumb_func 0x80977d8 -thumb_func 0x8097878 -thumb_func 0x8097900 -thumb_func 0x809792c -thumb_func 0x809796c -thumb_func 0x80979cc +thumb_func 0x809779c DoRippleFieldEffect +thumb_func 0x80977d8 MovementAction_StoreAndLockAnim_Step0 +thumb_func 0x8097878 MovementAction_FreeAndUnlockAnim_Step0 +thumb_func 0x8097900 FindLockedEventObjectIndex +thumb_func 0x809792c CreateLevitateMovementTask +thumb_func 0x809796c ApplyLevitateMovement +thumb_func 0x80979cc DestroyExtraMovementTask thumb_func 0x80979fc -thumb_func 0x8097a48 +thumb_func 0x8097a48 MovementAction_FlyUp_Step0 thumb_func 0x8097a58 MovementAction_FlyUp_Step1 -thumb_func 0x8097a7c +thumb_func 0x8097a7c MovementAction_FlyDown_Step0 thumb_func 0x8097a90 MovementAction_FlyDown_Step1 thumb_func 0x8097aac thumb_func 0x8097ab0 InitFieldMessageBox thumb_func 0x8097adc -thumb_func 0x8097b44 -thumb_func 0x8097b58 -thumb_func 0x8097b74 +thumb_func 0x8097b44 task_add_textbox +thumb_func 0x8097b58 task_del_textbox +thumb_func 0x8097b74 ShowFieldMessage thumb_func 0x8097b9c thumb_func 0x8097bc0 -thumb_func 0x8097c00 +thumb_func 0x8097c00 ShowFieldAutoScrollMessage thumb_func 0x8097c28 thumb_func 0x8097c40 -thumb_func 0x8097c64 +thumb_func 0x8097c64 textbox_fdecode_auto_and_task_add thumb_func 0x8097c8c -thumb_func 0x8097c9c +thumb_func 0x8097c9c HideFieldMessageBox thumb_func 0x8097cb8 thumb_func 0x8097cc4 thumb_func 0x8097ce0 thumb_func 0x8097cfc -thumb_func 0x8097d10 +thumb_func 0x8097d10 walkrun_is_standing_still thumb_func 0x8097d2c thumb_func 0x8097d4c -thumb_func 0x8097d70 +thumb_func 0x8097d70 ScriptFreezeEventObjects thumb_func 0x8097d88 thumb_func 0x8097e04 -thumb_func 0x8097e28 -thumb_func 0x8097e7c +thumb_func 0x8097e28 LockSelectedEventObject +thumb_func 0x8097e7c ScriptUnfreezeEventObjects thumb_func 0x8097eac thumb_func 0x8097efc thumb_func 0x8097f24 thumb_func 0x8097f44 thumb_func 0x8097fb8 thumb_func 0x80980bc -thumb_func 0x80980e0 -thumb_func 0x8098104 +thumb_func 0x80980e0 GetWindowFrameTilesPal +thumb_func 0x8098104 LoadMessageBoxGfx thumb_func 0x8098144 LoadUserWindowBorderGfx_ -thumb_func 0x809815c +thumb_func 0x809815c LoadWindowGfx thumb_func 0x80981b4 LoadUserWindowBorderGfx -thumb_func 0x80981e0 -thumb_func 0x8098368 -thumb_func 0x8098504 -thumb_func 0x80985a0 +thumb_func 0x80981e0 DrawTextBorderOuter +thumb_func 0x8098368 DrawTextBorderInner +thumb_func 0x8098504 rbox_fill_rectangle +thumb_func 0x80985a0 stdpal_get thumb_func 0x80985ec thumb_func 0x80985f4 thumb_func 0x8098640 InitScriptContext -thumb_func 0x809867c -thumb_func 0x8098688 -thumb_func 0x8098690 -thumb_func 0x8098698 +thumb_func 0x809867c SetupBytecodeScript +thumb_func 0x8098688 SetupNativeScript +thumb_func 0x8098690 StopScript +thumb_func 0x8098698 RunScriptCommand thumb_func 0x8098720 ScriptPush thumb_func 0x8098748 ScriptPop thumb_func 0x809876c thumb_func 0x8098770 ScriptCall -thumb_func 0x8098784 +thumb_func 0x8098784 ScriptReturn thumb_func 0x8098794 ScriptReadHalfword thumb_func 0x80987ac ScriptReadWord thumb_func 0x80987dc @@ -4800,38 +4800,38 @@ thumb_func 0x809881c ScriptContext1_Init thumb_func 0x8098844 ScriptContext2_RunScript thumb_func 0x8098880 ScriptContext1_SetupScript thumb_func 0x80988b8 -thumb_func 0x80988c4 +thumb_func 0x80988c4 EnableBothScriptContexts thumb_func 0x80988d8 ScriptContext2_RunNewScript -thumb_func 0x8098910 +thumb_func 0x8098910 MapHeaderGetScriptTable thumb_func 0x8098950 MapHeaderRunScriptType -thumb_func 0x8098968 +thumb_func 0x8098968 MapHeaderCheckScriptTable thumb_func 0x80989c8 -thumb_func 0x80989d4 -thumb_func 0x80989e0 -thumb_func 0x80989ec -thumb_func 0x80989f8 +thumb_func 0x80989d4 RunOnTransitionMapScript +thumb_func 0x80989e0 RunOnResumeMapScript +thumb_func 0x80989ec RunOnReturnToFieldMapScript +thumb_func 0x80989f8 RunOnDiveWarpMapScript thumb_func 0x8098a04 TryRunOnFrameMapScript thumb_func 0x8098a20 TryRunOnWarpIntoMapScript -thumb_func 0x8098a34 +thumb_func 0x8098a34 CalculateRamScriptChecksum thumb_func 0x8098a58 -thumb_func 0x8098a84 -thumb_func 0x8098b10 -thumb_func 0x8098b80 -thumb_func 0x8098bcc +thumb_func 0x8098a84 InitRamScript +thumb_func 0x8098b10 GetRamScript +thumb_func 0x8098b80 ValidateSavedRamScript +thumb_func 0x8098bcc GetSavedRamScriptIfValid thumb_func 0x8098c28 InitRamScript_NoEventObject thumb_func 0x8098c54 thumb_func 0x8098c58 nullsub_48 -thumb_func 0x8098c5c +thumb_func 0x8098c5c ScrCmd_end thumb_func 0x8098c68 ScrCmd_gotonative -thumb_func 0x8098c80 +thumb_func 0x8098c80 ScrCmd_special thumb_func 0x8098c94 -thumb_func 0x8098ca0 +thumb_func 0x8098ca0 ScrCmd_specialvar thumb_func 0x8098cc8 thumb_func 0x8098cd4 thumb_func 0x8098ce0 -thumb_func 0x8098ce4 +thumb_func 0x8098ce4 ScrCmd_waitstate thumb_func 0x8098cf0 ScrCmd_goto -thumb_func 0x8098d08 +thumb_func 0x8098d08 ScrCmd_return thumb_func 0x8098d14 ScrCmd_call thumb_func 0x8098d2c ScrCmd_goto_if thumb_func 0x8098d68 ScrCmd_call_if @@ -4844,9 +4844,9 @@ thumb_func 0x8098e90 ScrCmd_gotostd thumb_func 0x8098ec0 ScrCmd_callstd thumb_func 0x8098ef0 ScrCmd_gotostd_if thumb_func 0x8098f3c ScrCmd_callstd_if -thumb_func 0x8098f88 +thumb_func 0x8098f88 ScrCmd_returnram thumb_func 0x8098f9c ScrCmd_killscript -thumb_func 0x8098fb4 +thumb_func 0x8098fb4 ScrCmd_setmysteryeventstatus thumb_func 0x8098fcc ScrCmd_loadword thumb_func 0x8098ff0 ScrCmd_loadbytefromaddr thumb_func 0x8099014 ScrCmd_writebytetoaddr @@ -4854,9 +4854,9 @@ thumb_func 0x809902c ScrCmd_loadbyte thumb_func 0x8099048 ScrCmd_setptrbyte thumb_func 0x809906c ScrCmd_copylocal thumb_func 0x809908c ScrCmd_copybyte -thumb_func 0x80990a8 -thumb_func 0x80990cc -thumb_func 0x80990f8 +thumb_func 0x80990a8 ScrCmd_setvar +thumb_func 0x80990cc ScrCmd_copyvar +thumb_func 0x80990f8 ScrCmd_setorcopyvar thumb_func 0x8099124 compare_012 thumb_func 0x8099144 ScrCmd_compare_local_to_local thumb_func 0x8099174 ScrCmd_compare_local_to_value @@ -4864,329 +4864,329 @@ thumb_func 0x809919c ScrCmd_compare_local_to_addr thumb_func 0x80991c8 ScrCmd_compare_addr_to_local thumb_func 0x80991f4 ScrCmd_compare_addr_to_value thumb_func 0x8099214 ScrCmd_compare_addr_to_addr -thumb_func 0x8099238 -thumb_func 0x8099268 -thumb_func 0x809929c -thumb_func 0x80992c4 -thumb_func 0x80992f4 -thumb_func 0x8099328 -thumb_func 0x809936c -thumb_func 0x80993b0 -thumb_func 0x80993f4 -thumb_func 0x8099438 -thumb_func 0x8099464 -thumb_func 0x80994a8 -thumb_func 0x80994ec -thumb_func 0x8099518 -thumb_func 0x8099544 -thumb_func 0x8099570 -thumb_func 0x809959c -thumb_func 0x80995b0 -thumb_func 0x80995c4 +thumb_func 0x8099238 ScrCmd_compare_var_to_value +thumb_func 0x8099268 ScrCmd_compare_var_to_var +thumb_func 0x809929c ScrCmd_addvar +thumb_func 0x80992c4 ScrCmd_subvar +thumb_func 0x80992f4 ScrCmd_random +thumb_func 0x8099328 ScrCmd_giveitem +thumb_func 0x809936c ScrCmd_takeitem +thumb_func 0x80993b0 ScrCmd_checkitemspace +thumb_func 0x80993f4 ScrCmd_checkitem +thumb_func 0x8099438 ScrCmd_checkitemtype +thumb_func 0x8099464 ScrCmd_givepcitem +thumb_func 0x80994a8 ScrCmd_checkpcitem +thumb_func 0x80994ec ScrCmd_givedecoration +thumb_func 0x8099518 ScrCmd_takedecoration +thumb_func 0x8099544 ScrCmd_checkdecorspace +thumb_func 0x8099570 ScrCmd_checkdecor +thumb_func 0x809959c ScrCmd_setflag +thumb_func 0x80995b0 ScrCmd_clearflag +thumb_func 0x80995c4 ScrCmd_checkflag thumb_func 0x80995e0 ScrCmd_incrementgamestat -thumb_func 0x80995f8 -thumb_func 0x8099614 -thumb_func 0x8099630 -thumb_func 0x8099650 -thumb_func 0x8099678 -thumb_func 0x80996a8 -thumb_func 0x809971c +thumb_func 0x80995f8 ScrCmd_animateflash +thumb_func 0x8099614 ScrCmd_setflashradius +thumb_func 0x8099630 IsPaletteNotActive +thumb_func 0x8099650 ScrCmd_fadescreen +thumb_func 0x8099678 ScrCmd_fadescreenspeed +thumb_func 0x80996a8 ScrCmd_fadescreenswapbuffers +thumb_func 0x809971c RunPauseTimer thumb_func 0x809973c ScrCmd_delay -thumb_func 0x8099760 -thumb_func 0x8099798 -thumb_func 0x80997a4 -thumb_func 0x80997dc +thumb_func 0x8099760 ScrCmd_initclock +thumb_func 0x8099798 ScrCmd_dotimebasedevents +thumb_func 0x80997a4 ScrCmd_gettime +thumb_func 0x80997dc ScrCmd_setweather thumb_func 0x80997f8 thumb_func 0x8099804 -thumb_func 0x8099810 -thumb_func 0x8099828 -thumb_func 0x8099844 -thumb_func 0x80998cc +thumb_func 0x8099810 ScrCmd_setstepcallback +thumb_func 0x8099828 ScrCmd_setmaplayoutindex +thumb_func 0x8099844 ScrCmd_warp +thumb_func 0x80998cc ScrCmd_warpsilent thumb_func 0x8099954 -thumb_func 0x80999dc -thumb_func 0x8099a50 +thumb_func 0x80999dc ScrCmd_warphole +thumb_func 0x8099a50 ScrCmd_warpteleport thumb_func 0x8099ad8 -thumb_func 0x8099b60 -thumb_func 0x8099be0 -thumb_func 0x8099c64 -thumb_func 0x8099ce4 -thumb_func 0x8099d64 -thumb_func 0x8099de4 -thumb_func 0x8099e20 -thumb_func 0x8099e3c -thumb_func 0x8099e50 -thumb_func 0x8099e68 -thumb_func 0x8099e7c -thumb_func 0x8099e90 -thumb_func 0x8099ea0 -thumb_func 0x8099eb4 -thumb_func 0x8099ee4 -thumb_func 0x8099ef8 -thumb_func 0x8099f04 -thumb_func 0x8099f18 -thumb_func 0x8099f4c -thumb_func 0x8099f70 -thumb_func 0x8099fb4 -thumb_func 0x8099ff8 -thumb_func 0x809a020 -thumb_func 0x809a074 +thumb_func 0x8099b60 ScrCmd_setwarp +thumb_func 0x8099be0 ScrCmd_setdynamicwarp +thumb_func 0x8099c64 ScrCmd_setdivewarp +thumb_func 0x8099ce4 ScrCmd_setholewarp +thumb_func 0x8099d64 ScrCmd_setescapewarp +thumb_func 0x8099de4 ScrCmd_getplayerxy +thumb_func 0x8099e20 ScrCmd_getpartysize +thumb_func 0x8099e3c ScrCmd_playse +thumb_func 0x8099e50 WaitForSoundEffectFinish +thumb_func 0x8099e68 ScrCmd_waitse +thumb_func 0x8099e7c ScrCmd_playfanfare +thumb_func 0x8099e90 WaitForFanfareFinish +thumb_func 0x8099ea0 ScrCmd_waitfanfare +thumb_func 0x8099eb4 ScrCmd_playbgm +thumb_func 0x8099ee4 ScrCmd_savebgm +thumb_func 0x8099ef8 ScrCmd_fadedefaultbgm +thumb_func 0x8099f04 ScrCmd_fadenewbgm +thumb_func 0x8099f18 ScrCmd_fadeoutbgm +thumb_func 0x8099f4c ScrCmd_fadeinbgm +thumb_func 0x8099f70 ScrCmd_setobjectpriority +thumb_func 0x8099fb4 ScrCmd_applymovement_at +thumb_func 0x8099ff8 WaitForMovementFinish +thumb_func 0x809a020 ScrCmd_waitmovement +thumb_func 0x809a074 ScrCmd_waitmovement_at thumb_func 0x809a0c8 -thumb_func 0x809a0f0 -thumb_func 0x809a120 -thumb_func 0x809a148 -thumb_func 0x809a178 -thumb_func 0x809a1e0 -thumb_func 0x809a238 -thumb_func 0x809a260 -thumb_func 0x809a290 +thumb_func 0x809a0f0 ScrCmd_removeobject_at +thumb_func 0x809a120 ScrCmd_addobject +thumb_func 0x809a148 ScrCmd_addobject_at +thumb_func 0x809a178 ScrCmd_setobjectxy +thumb_func 0x809a1e0 ScrCmd_setobjectxyperm +thumb_func 0x809a238 ScrCmd_moveobjectoffscreen +thumb_func 0x809a260 ScrCmd_showobject_at +thumb_func 0x809a290 ScrCmd_hideobject_at thumb_func 0x809a2c0 -thumb_func 0x809a2fc -thumb_func 0x809a32c -thumb_func 0x809a364 -thumb_func 0x809a398 -thumb_func 0x809a3c0 -thumb_func 0x809a430 -thumb_func 0x809a44c -thumb_func 0x809a474 -thumb_func 0x809a4cc -thumb_func 0x809a504 +thumb_func 0x809a2fc ScrCmd_resetobjectpriority +thumb_func 0x809a32c ScrCmd_faceplayer +thumb_func 0x809a364 ScrCmd_turnobject +thumb_func 0x809a398 ScrCmd_setobjectmovementtype +thumb_func 0x809a3c0 ScrCmd_createvobject +thumb_func 0x809a430 ScrCmd_turnvobject +thumb_func 0x809a44c ScrCmd_lockall +thumb_func 0x809a474 ScrCmd_lock +thumb_func 0x809a4cc ScrCmd_releaseall +thumb_func 0x809a504 ScrCmd_release thumb_func 0x809a55c ScrCmd_message thumb_func 0x809a578 ScrCmd_pokenavcall thumb_func 0x809a594 ScrCmd_messageautoscroll -thumb_func 0x809a5c4 -thumb_func 0x809a600 -thumb_func 0x809a614 -thumb_func 0x809a620 -thumb_func 0x809a648 -thumb_func 0x809a65c -thumb_func 0x809a688 +thumb_func 0x809a5c4 ScrCmd_cmdDB +thumb_func 0x809a600 ScrCmd_waitmessage +thumb_func 0x809a614 ScrCmd_closemessage +thumb_func 0x809a620 WaitForAorBPress +thumb_func 0x809a648 ScrCmd_waitbuttonpress +thumb_func 0x809a65c ScrCmd_yesnobox +thumb_func 0x809a688 ScrCmd_multichoice thumb_func 0x809a6c4 thumb_func 0x809a714 -thumb_func 0x809a718 +thumb_func 0x809a718 ScrCmd_multichoicegrid thumb_func 0x809a768 thumb_func 0x809a774 thumb_func 0x809a780 -thumb_func 0x809a7b0 -thumb_func 0x809a7d0 +thumb_func 0x809a7b0 ScrCmd_hidemonpic +thumb_func 0x809a7d0 ScrCmd_showcontestwinner thumb_func 0x809a7f4 thumb_func 0x809a8e4 -thumb_func 0x809a8f0 +thumb_func 0x809a8f0 ScrCmd_vmessage thumb_func 0x809a90c -thumb_func 0x809a950 -thumb_func 0x809a9a0 -thumb_func 0x809a9e8 +thumb_func 0x809a950 ScrCmd_bufferleadmonspeciesname +thumb_func 0x809a9a0 ScrCmd_bufferpartymonnick +thumb_func 0x809a9e8 ScrCmd_bufferitemname thumb_func 0x809aa1c -thumb_func 0x809aa60 -thumb_func 0x809aa9c -thumb_func 0x809aae0 -thumb_func 0x809ab20 -thumb_func 0x809ab48 -thumb_func 0x809ab6c -thumb_func 0x809aba0 -thumb_func 0x809abdc +thumb_func 0x809aa60 ScrCmd_bufferdecorationname +thumb_func 0x809aa9c ScrCmd_buffernumberstring +thumb_func 0x809aae0 ScrCmd_bufferstdstring +thumb_func 0x809ab20 ScrCmd_bufferstring +thumb_func 0x809ab48 ScrCmd_vloadword +thumb_func 0x809ab6c ScrCmd_vbufferstring +thumb_func 0x809aba0 ScrCmd_bufferboxname +thumb_func 0x809abdc ScrCmd_givemon thumb_func 0x809ac5c -thumb_func 0x809ac88 -thumb_func 0x809acb4 +thumb_func 0x809ac88 ScrCmd_setmonmove +thumb_func 0x809acb4 ScrCmd_checkpartymove thumb_func 0x809ad30 thumb_func 0x809ad64 -thumb_func 0x809ad98 -thumb_func 0x809add8 +thumb_func 0x809ad98 ScrCmd_checkmoney +thumb_func 0x809add8 ScrCmd_showmoneybox thumb_func 0x809ae14 -thumb_func 0x809ae20 -thumb_func 0x809ae50 -thumb_func 0x809ae78 -thumb_func 0x809ae8c -thumb_func 0x809aea8 -thumb_func 0x809aebc +thumb_func 0x809ae20 ScrCmd_updatemoneybox +thumb_func 0x809ae50 ScrCmd_showcoinsbox +thumb_func 0x809ae78 ScrCmd_hidecoinsbox +thumb_func 0x809ae8c ScrCmd_updatecoinsbox +thumb_func 0x809aea8 ScrCmd_trainerbattle +thumb_func 0x809aebc ScrCmd_dotrainerbattle thumb_func 0x809aec8 thumb_func 0x809aedc -thumb_func 0x809aef0 -thumb_func 0x809af14 -thumb_func 0x809af30 -thumb_func 0x809af4c -thumb_func 0x809af80 +thumb_func 0x809aef0 ScrCmd_checktrainerflag +thumb_func 0x809af14 ScrCmd_settrainerflag +thumb_func 0x809af30 HideSaveInfoWindow +thumb_func 0x809af4c ScrCmd_setwildbattle +thumb_func 0x809af80 ScrCmd_dowildbattle thumb_func 0x809af90 thumb_func 0x809afa4 thumb_func 0x809afb8 -thumb_func 0x809afcc -thumb_func 0x809aff4 -thumb_func 0x809b030 +thumb_func 0x809afcc ScrCmd_playslotmachine +thumb_func 0x809aff4 ScrCmd_setberrytree +thumb_func 0x809b030 ScrCmd_getpricereduction thumb_func 0x809b05c thumb_func 0x809b06c -thumb_func 0x809b07c +thumb_func 0x809b07c IsPokerusInParty thumb_func 0x809b08c -thumb_func 0x809b0a4 -thumb_func 0x809b0cc -thumb_func 0x809b0fc -thumb_func 0x809b11c -thumb_func 0x809b148 -thumb_func 0x809b164 -thumb_func 0x809b17c +thumb_func 0x809b0a4 ScrCmd_dofieldeffect +thumb_func 0x809b0cc ScrCmd_setfieldeffectarg +thumb_func 0x809b0fc WaitForFieldEffectFinish +thumb_func 0x809b11c ScrCmd_waitfieldeffect +thumb_func 0x809b148 ScrCmd_setrespawn +thumb_func 0x809b164 ScrCmd_checkplayergender +thumb_func 0x809b17c ScrCmd_playmoncry thumb_func 0x809b1b4 -thumb_func 0x809b1c8 -thumb_func 0x809b248 -thumb_func 0x809b2a0 -thumb_func 0x809b2e4 +thumb_func 0x809b1c8 ScrCmd_setmetatile +thumb_func 0x809b248 ScrCmd_opendoor +thumb_func 0x809b2a0 ScrCmd_closedoor +thumb_func 0x809b2e4 IsDoorAnimationStopped thumb_func 0x809b2fc -thumb_func 0x809b310 +thumb_func 0x809b310 ScrCmd_setdooropen thumb_func 0x809b354 -thumb_func 0x809b398 +thumb_func 0x809b398 ScrCmd_addelevmenuitem thumb_func 0x809b3d4 -thumb_func 0x809b3d8 -thumb_func 0x809b3f8 -thumb_func 0x809b430 +thumb_func 0x809b3d8 ScrCmd_checkcoins +thumb_func 0x809b3f8 ScrCmd_givecoins +thumb_func 0x809b430 ScrCmd_takecoins thumb_func 0x809b468 thumb_func 0x809b48c -thumb_func 0x809b498 +thumb_func 0x809b498 ScrCmd_mossdeepgym3 thumb_func 0x809b4b4 -thumb_func 0x809b4c0 -thumb_func 0x809b4d4 -thumb_func 0x809b51c -thumb_func 0x809b554 -thumb_func 0x809b58c -thumb_func 0x809b5b4 -thumb_func 0x809b648 +thumb_func 0x809b4c0 ScrCmd_cmdD8 +thumb_func 0x809b4d4 ScrCmd_cmdD9 +thumb_func 0x809b51c ScrCmd_setmonobedient +thumb_func 0x809b554 ScrCmd_checkmonobedience +thumb_func 0x809b58c ScrCmd_gotoram +thumb_func 0x809b5b4 ScrCmd_warpD1 +thumb_func 0x809b648 ScrCmd_setmonmetlocation thumb_func 0x809b68c -thumb_func 0x809b6a8 +thumb_func 0x809b6a8 ScrCmd_buffertrainerclassname thumb_func 0x809b6e4 thumb_func 0x809b720 -thumb_func 0x809b72c +thumb_func 0x809b72c ScrCmd_warpE0 thumb_func 0x809b7b4 FieldClearPlayerInput -thumb_func 0x809b7e0 -thumb_func 0x809b8ec -thumb_func 0x809ba54 -thumb_func 0x809ba6c -thumb_func 0x809baa8 -thumb_func 0x809bad4 +thumb_func 0x809b7e0 FieldGetPlayerInput +thumb_func 0x809b8ec ProcessPlayerFieldInput +thumb_func 0x809ba54 GetPlayerPosition +thumb_func 0x809ba6c GetInFrontOfPlayerPosition +thumb_func 0x809baa8 GetPlayerCurMetatileBehavior +thumb_func 0x809bad4 TryStartInteractionScript thumb_func 0x809bb48 GetInteractionScript -thumb_func 0x809bba0 -thumb_func 0x809bc5c -thumb_func 0x809bd30 -thumb_func 0x809be10 -thumb_func 0x809c0c4 +thumb_func 0x809bba0 GetInteractedLinkPlayerScript +thumb_func 0x809bc5c GetInteractedEventObjectScript +thumb_func 0x809bd30 GetInteractedBackgroundEventScript +thumb_func 0x809be10 GetInteractedMetatileScript +thumb_func 0x809c0c4 GetInteractedWaterScript thumb_func 0x809c140 -thumb_func 0x809c174 -thumb_func 0x809c1b4 -thumb_func 0x809c210 -thumb_func 0x809c244 -thumb_func 0x809c2cc -thumb_func 0x809c408 -thumb_func 0x809c41c -thumb_func 0x809c458 -thumb_func 0x809c46c +thumb_func 0x809c174 TrySetupDiveEmergeScript +thumb_func 0x809c1b4 TryStartStepBasedScript +thumb_func 0x809c210 TryStartCoordEventScript +thumb_func 0x809c244 TryStartMiscWalkingScripts +thumb_func 0x809c2cc TryStartStepCountScript +thumb_func 0x809c408 Unref_ClearHappinessStepCounter +thumb_func 0x809c41c UpdateHappinessStepCounter +thumb_func 0x809c458 ClearPoisonStepCounter +thumb_func 0x809c46c UpdatePoisonStepCounter thumb_func 0x809c4b4 -thumb_func 0x809c4c0 -thumb_func 0x809c510 -thumb_func 0x809c574 -thumb_func 0x809c66c +thumb_func 0x809c4c0 CheckStandardWildEncounter +thumb_func 0x809c510 TryArrowWarp +thumb_func 0x809c574 TryStartWarpEventScript +thumb_func 0x809c66c IsWarpMetatileBehavior thumb_func 0x809c70c thumb_func 0x809c764 GetWarpEventAtMapPosition -thumb_func 0x809c788 -thumb_func 0x809c850 +thumb_func 0x809c788 SetupWarp +thumb_func 0x809c850 TryDoorWarp thumb_func 0x809c8dc GetWarpEventAtPosition -thumb_func 0x809c924 +thumb_func 0x809c924 TryRunCoordEventScript thumb_func 0x809c964 GetCoordEventScriptAtPosition thumb_func 0x809c9cc GetCoordEventScriptAtMapPosition thumb_func 0x809c9f4 GetBackgroundEventAtPosition -thumb_func 0x809ca44 -thumb_func 0x809cac0 -thumb_func 0x809cb58 -thumb_func 0x809cb94 -thumb_func 0x809cbd8 -thumb_func 0x809cc1c -thumb_func 0x809cc78 +thumb_func 0x809ca44 dive_warp +thumb_func 0x809cac0 TrySetDiveWarp +thumb_func 0x809cb58 GetEventObjectScriptPointerPlayerFacing +thumb_func 0x809cb94 SetCableClubWarp +thumb_func 0x809cbd8 InitEventData +thumb_func 0x809cc1c ClearTempFieldEventData +thumb_func 0x809cc78 ClearDailyFlags thumb_func 0x809cc98 DisableNationalPokedex -thumb_func 0x809ccc0 -thumb_func 0x809cd04 -thumb_func 0x809cd48 -thumb_func 0x809cd58 -thumb_func 0x809cd68 -thumb_func 0x809cd7c -thumb_func 0x809cd8c -thumb_func 0x809cd9c +thumb_func 0x809ccc0 EnableNationalPokedex +thumb_func 0x809cd04 IsNationalPokedexEnabled +thumb_func 0x809cd48 DisableMysteryEvent +thumb_func 0x809cd58 EnableMysteryEvent +thumb_func 0x809cd68 IsMysteryEventEnabled +thumb_func 0x809cd7c DisableMysteryGift +thumb_func 0x809cd8c EnableMysteryGift +thumb_func 0x809cd9c IsMysteryGiftEnabled thumb_func 0x809cdb0 thumb_func 0x809ce48 thumb_func 0x809ceb0 DisableResetRTC thumb_func 0x809cecc EnableResetRTC thumb_func 0x809ceec CanResetRTC -thumb_func 0x809cf20 +thumb_func 0x809cf20 GetVarPointer thumb_func 0x809cf6c VarGet thumb_func 0x809cf88 VarSet thumb_func 0x809cfa8 VarGetEventObjectGraphicsId -thumb_func 0x809cfc4 +thumb_func 0x809cfc4 GetFlagPointer thumb_func 0x809d018 FlagSet thumb_func 0x809d040 FlagClear thumb_func 0x809d068 FlagGet thumb_func 0x809d094 -thumb_func 0x809d0a0 +thumb_func 0x809d0a0 CoordEventWeather_Sunny thumb_func 0x809d0ac thumb_func 0x809d0b8 -thumb_func 0x809d0c4 -thumb_func 0x809d0d0 -thumb_func 0x809d0dc -thumb_func 0x809d0e8 -thumb_func 0x809d0f4 -thumb_func 0x809d100 -thumb_func 0x809d10c -thumb_func 0x809d118 -thumb_func 0x809d124 -thumb_func 0x809d130 -thumb_func 0x809d164 -thumb_func 0x809d190 -thumb_func 0x809d1e0 -thumb_func 0x809d214 -thumb_func 0x809d280 -thumb_func 0x809d2c8 +thumb_func 0x809d0c4 CoordEventWeather_Thunderstorm +thumb_func 0x809d0d0 CoordEventWeather_LightRain +thumb_func 0x809d0dc CoordEventWeather_Snow +thumb_func 0x809d0e8 CoordEventWeather_Ash +thumb_func 0x809d0f4 CoordEventWeather_Fog +thumb_func 0x809d100 CoordEventWeather_DiagonalFog +thumb_func 0x809d10c CoordEventWeather_Drought +thumb_func 0x809d118 CoordEventWeather_Route119Cycle +thumb_func 0x809d124 CoordEventWeather_Route123Cycle +thumb_func 0x809d130 DoCoordEventWeather +thumb_func 0x809d164 Task_RunPerStepCallback +thumb_func 0x809d190 RunTimeBasedEvents +thumb_func 0x809d1e0 Task_RunTimeBasedEvents +thumb_func 0x809d214 SetUpFieldTasks +thumb_func 0x809d280 ActivatePerStepCallback +thumb_func 0x809d2c8 ResetFieldTasksArgs thumb_func 0x809d304 nullsub_49 -thumb_func 0x809d308 -thumb_func 0x809d360 +thumb_func 0x809d308 GetPacifidlogBridgeMetatileOffsets +thumb_func 0x809d360 SetPacifidlogBridgeMetatiles thumb_func 0x809d3e8 UpdateHalfSubmergedBridgeMetatiles thumb_func 0x809d40c UpdateFullySubmergedBridgeMetatiles thumb_func 0x809d430 UpdateFloatingBridgeMetatiles -thumb_func 0x809d454 -thumb_func 0x809d4f0 -thumb_func 0x809d58c -thumb_func 0x809d700 -thumb_func 0x809d764 -thumb_func 0x809d7c8 -thumb_func 0x809d9e0 +thumb_func 0x809d454 StandingOnNewPacifidlogBridge +thumb_func 0x809d4f0 StandingOnSamePacifidlogBridge +thumb_func 0x809d58c PacifidlogBridgePerStepCallback +thumb_func 0x809d700 SetLoweredForetreeBridgeMetatile +thumb_func 0x809d764 SetNormalFortreeBridgeMetatile +thumb_func 0x809d7c8 FortreeBridgePerStepCallback +thumb_func 0x809d9e0 CoordInIcePuzzleRegion thumb_func 0x809da24 MarkIcePuzzleCoordVisited -thumb_func 0x809da5c -thumb_func 0x809daa0 -thumb_func 0x809dafc -thumb_func 0x809dc8c -thumb_func 0x809dd68 +thumb_func 0x809da5c IsIcePuzzleCoordVisited +thumb_func 0x809daa0 SetSootopolisGymCrackedIceMetatiles +thumb_func 0x809dafc SootopolisGymIcePerStepCallback +thumb_func 0x809dc8c AshGrassPerStepCallback +thumb_func 0x809dd68 SetCrackedFloorHoleMetatile thumb_func 0x809dda4 -thumb_func 0x809deb4 -thumb_func 0x809df10 -thumb_func 0x809e050 -thumb_func 0x809e088 -thumb_func 0x809e0c0 -thumb_func 0x809e130 -thumb_func 0x809e18c +thumb_func 0x809deb4 SetMuddySlopeMetatile +thumb_func 0x809df10 Task_MuddySlope +thumb_func 0x809e050 InitTimeBasedEvents +thumb_func 0x809e088 DoTimeBasedEvents +thumb_func 0x809e0c0 UpdatePerDay +thumb_func 0x809e130 UpdatePerMinute +thumb_func 0x809e18c ReturnFromStartWallClock thumb_func 0x809e1a0 -thumb_func 0x809e1c0 -thumb_func 0x809e2dc -thumb_func 0x809e3dc +thumb_func 0x809e1c0 SpriteCB_ResetRtcCursor0 +thumb_func 0x809e2dc SpriteCB_ResetRtcCursor1 +thumb_func 0x809e3dc CreateCursor thumb_func 0x809e464 -thumb_func 0x809e478 -thumb_func 0x809e49c -thumb_func 0x809e58c +thumb_func 0x809e478 HideChooseTimeWindow +thumb_func 0x809e49c PrintTime +thumb_func 0x809e58c ShowChooseTimeWindow thumb_func 0x809e610 MoveTimeUpDown thumb_func 0x809e678 Task_ResetRtc_3 thumb_func 0x809e690 Task_ResetRtc_2 -thumb_func 0x809e6c0 -thumb_func 0x809e7d8 -thumb_func 0x809e860 +thumb_func 0x809e6c0 Task_ResetRtc_1 +thumb_func 0x809e7d8 Task_ResetRtc_0 +thumb_func 0x809e860 CB2_InitResetRtcScreen thumb_func 0x809e920 -thumb_func 0x809e968 +thumb_func 0x809e968 CB2_ResetRtcScreen thumb_func 0x809e984 -thumb_func 0x809e998 -thumb_func 0x809e9d0 -thumb_func 0x809ead8 +thumb_func 0x809e998 ShowMessage +thumb_func 0x809e9d0 Task_ShowResetRtcPrompt +thumb_func 0x809ead8 Task_ResetRtcScreen thumb_func 0x809ecf4 SetDexPokemonPokenavFlags -thumb_func 0x809ed18 -thumb_func 0x809ed88 +thumb_func 0x809ed18 BuildStartMenuActions +thumb_func 0x809ed88 AddStartMenuAction thumb_func 0x809eda4 BuildNormalStartMenu thumb_func 0x809ee10 BuildSafariZoneStartMenu thumb_func 0x809ee40 BuildLinkModeStartMenu @@ -5194,84 +5194,84 @@ thumb_func 0x809ee7c BuildUnionRoomStartMenu thumb_func 0x809eeb8 BuildBattlePikeStartMenu thumb_func 0x809eedc BuildBattlePyramidStartMenu thumb_func 0x809ef0c BuildMultiBattleRoomStartMenu -thumb_func 0x809ef2c -thumb_func 0x809efa0 -thumb_func 0x809f04c -thumb_func 0x809f098 -thumb_func 0x809f16c +thumb_func 0x809ef2c ShowSafariBallsWindow +thumb_func 0x809efa0 ShowPyramidFloorWindow +thumb_func 0x809f04c RemoveExtraStartMenuWindows +thumb_func 0x809f098 PrintStartMenuActions +thumb_func 0x809f16c InitStartMenuStep thumb_func 0x809f270 InitStartMenu -thumb_func 0x809f28c -thumb_func 0x809f2a8 +thumb_func 0x809f28c StartMenuTask +thumb_func 0x809f2a8 CreateStartMenuTask thumb_func 0x809f2d8 thumb_func 0x809f2f0 thumb_func 0x809f30c -thumb_func 0x809f374 -thumb_func 0x809f39c -thumb_func 0x809f48c -thumb_func 0x809f4c8 +thumb_func 0x809f374 ShowStartMenu +thumb_func 0x809f39c HandleStartMenuInput +thumb_func 0x809f48c StartMenuPokedexCallback +thumb_func 0x809f4c8 StartMenuPokemonCallback thumb_func 0x809f4fc thumb_func 0x809f530 -thumb_func 0x809f564 -thumb_func 0x809f5d4 -thumb_func 0x809f5f8 -thumb_func 0x809f63c -thumb_func 0x809f64c +thumb_func 0x809f564 StartMenuPlayerNameCallback +thumb_func 0x809f5d4 StartMenuSaveCallback +thumb_func 0x809f5f8 StartMenuOptionCallback +thumb_func 0x809f63c StartMenuExitCallback +thumb_func 0x809f64c StartMenuSafariZoneRetireCallback thumb_func 0x809f660 -thumb_func 0x809f698 -thumb_func 0x809f6ac -thumb_func 0x809f6cc -thumb_func 0x809f700 -thumb_func 0x809f71c -thumb_func 0x809f774 -thumb_func 0x809f790 -thumb_func 0x809f7ac -thumb_func 0x809f800 +thumb_func 0x809f698 StartMenuBattlePyramidRetireCallback +thumb_func 0x809f6ac CableCarMainCallback_Run +thumb_func 0x809f6cc StartMenuBattlePyramidBagCallback +thumb_func 0x809f700 SaveStartCallback +thumb_func 0x809f71c SaveCallback +thumb_func 0x809f774 BattlePyramidRetireStartCallback +thumb_func 0x809f790 BattlePyramidRetireReturnCallback +thumb_func 0x809f7ac BattlePyramidRetireCallback +thumb_func 0x809f800 InitSave thumb_func 0x809f824 -thumb_func 0x809f858 -thumb_func 0x809f870 -thumb_func 0x809f8a8 +thumb_func 0x809f858 SaveGame +thumb_func 0x809f870 ShowSaveMessage +thumb_func 0x809f8a8 SaveGameTask thumb_func 0x809f8ec thumb_func 0x809f8fc -thumb_func 0x809f908 -thumb_func 0x809f914 -thumb_func 0x809f948 -thumb_func 0x809f978 +thumb_func 0x809f908 SaveStartTimer +thumb_func 0x809f914 SaveSuccesTimer +thumb_func 0x809f948 SaveErrorTimer +thumb_func 0x809f978 SaveConfirmSaveCallback thumb_func 0x809f9c4 -thumb_func 0x809f9e0 -thumb_func 0x809fa54 +thumb_func 0x809f9e0 SaveConfirmInputCallback +thumb_func 0x809fa54 SaveFileExistsCallback thumb_func 0x809fa8c thumb_func 0x809faa8 -thumb_func 0x809fac4 -thumb_func 0x809fb0c -thumb_func 0x809fb24 +thumb_func 0x809fac4 SaveOverwriteInputCallback +thumb_func 0x809fb0c SaveSavingMessageCallback +thumb_func 0x809fb24 SaveDoSaveCallback thumb_func 0x809fb88 -thumb_func 0x809fbb0 -thumb_func 0x809fbd4 +thumb_func 0x809fbb0 SaveReturnSuccessCallback +thumb_func 0x809fbd4 SaveErrorCallback thumb_func 0x809fbfc SaveReturnErrorCallback -thumb_func 0x809fc18 -thumb_func 0x809fc34 +thumb_func 0x809fc18 InitBattlePyramidRetire +thumb_func 0x809fc34 BattlePyramidConfirmRetireCallback thumb_func 0x809fc60 -thumb_func 0x809fc7c +thumb_func 0x809fc7c BattlePyramidRetireInputCallback thumb_func 0x809fcb0 thumb_func 0x809fcbc thumb_func 0x809fdec thumb_func 0x809fe18 thumb_func 0x809fe28 -thumb_func 0x809ff8c +thumb_func 0x809ff8c ShowSaveInfoWindow thumb_func 0x80a0150 thumb_func 0x80a016c thumb_func 0x80a0194 -thumb_func 0x80a01dc -thumb_func 0x80a01fc -thumb_func 0x80a020c -thumb_func 0x80a021c +thumb_func 0x80a01dc HideStartMenuWindow +thumb_func 0x80a01fc HideStartMenu +thumb_func 0x80a020c AppendToList +thumb_func 0x80a021c ResetTilesetAnimBuffer thumb_func 0x80a0248 AppendTilesetAnimToBuffer thumb_func 0x80a0298 TransferTilesetAnimsBuffer -thumb_func 0x80a02e0 -thumb_func 0x80a02f4 -thumb_func 0x80a0300 -thumb_func 0x80a0370 -thumb_func 0x80a03ac +thumb_func 0x80a02e0 InitTilesetAnimations +thumb_func 0x80a02f4 InitSecondaryTilesetAnimation +thumb_func 0x80a0300 UpdateTilesetAnimations +thumb_func 0x80a0370 _InitPrimaryTilesetAnimation +thumb_func 0x80a03ac _InitSecondaryTilesetAnimation thumb_func 0x80a03e8 thumb_func 0x80a0410 thumb_func 0x80a0438 TilesetAnim_General @@ -5320,7 +5320,7 @@ thumb_func 0x80a0b9c QueueAnimTiles_Lavaridge_Steam thumb_func 0x80a0be4 QueueAnimTiles_Pacifidlog_LogBridges thumb_func 0x80a0c0c QueueAnimTiles_Underwater_Seaweed thumb_func 0x80a0c34 QueueAnimTiles_Pacifidlog_WaterCurrents -thumb_func 0x80a0c5c +thumb_func 0x80a0c5c QueueAnimTiles_Mauville_Flowers thumb_func 0x80a0cfc QueueAnimTiles_Rustboro_WindyWater thumb_func 0x80a0d38 QueueAnimTiles_Rustboro_Fountain thumb_func 0x80a0d60 QueueAnimTiles_Lavaridge_Lava @@ -5338,47 +5338,47 @@ thumb_func 0x80a0efc TilesetAnim_BattlePyramid thumb_func 0x80a0f20 TilesetAnim_BattleDome thumb_func 0x80a0f38 TilesetAnim_BattleDome2 thumb_func 0x80a0f50 QueueAnimTiles_Building_TVTurnedOn -thumb_func 0x80a0f78 +thumb_func 0x80a0f78 QueueAnimTiles_SootopolisGym_Waterfalls thumb_func 0x80a0fc0 QueueAnimTiles_EliteFour_WallLights thumb_func 0x80a0fe8 QueueAnimTiles_EliteFour_GroundLights thumb_func 0x80a1010 QueueAnimTiles_MauvilleGym_ElectricGates thumb_func 0x80a1038 QueueAnimTiles_BikeShop_BlinkingLights thumb_func 0x80a1060 QueueAnimTiles_Sootopolis_StormyWater -thumb_func 0x80a1088 +thumb_func 0x80a1088 QueueAnimTiles_BattlePyramid_Torch thumb_func 0x80a10b4 -thumb_func 0x80a10e0 -thumb_func 0x80a114c -thumb_func 0x80a11bc -thumb_func 0x80a1200 -thumb_func 0x80a1238 +thumb_func 0x80a10e0 BlendAnimPalette_BattleDome_FloorLights +thumb_func 0x80a114c BlendAnimPalette_BattleDome_FloorLightsNoBlend +thumb_func 0x80a11bc LoadCompressedPalette +thumb_func 0x80a1200 LoadPalette +thumb_func 0x80a1238 FillPalette thumb_func 0x80a1288 TransferPlttBuffer -thumb_func 0x80a12e4 +thumb_func 0x80a12e4 UpdatePaletteFade thumb_func 0x80a133c ResetPaletteFade thumb_func 0x80a135c ReadPlttIntoBuffers -thumb_func 0x80a139c +thumb_func 0x80a139c BeginNormalPaletteFade thumb_func 0x80a14e4 unref_sub_80A1C1C -thumb_func 0x80a152c -thumb_func 0x80a15a4 -thumb_func 0x80a1708 +thumb_func 0x80a152c unref_sub_80A1C64 +thumb_func 0x80a15a4 unused_sub_80A1CDC +thumb_func 0x80a1708 unused_sub_80A1E40 thumb_func 0x80a17c8 unused_sub_80A1F00 thumb_func 0x80a1820 ResetPaletteStructByUid thumb_func 0x80a183c ResetPaletteStruct thumb_func 0x80a1898 ResetPaletteFadeControl thumb_func 0x80a1910 unref_sub_80A2048 thumb_func 0x80a193c unref_sub_80A2074 -thumb_func 0x80a196c -thumb_func 0x80a19a0 +thumb_func 0x80a196c GetPaletteNumByUid +thumb_func 0x80a19a0 UpdateNormalPaletteFade thumb_func 0x80a1ae0 InvertPlttBuffer thumb_func 0x80a1b28 TintPlttBuffer thumb_func 0x80a1bfc UnfadePlttBuffer thumb_func 0x80a1c58 BeginFastPaletteFade -thumb_func 0x80a1c7c +thumb_func 0x80a1c7c BeginFastPaletteFadeInternal thumb_func 0x80a1d00 -thumb_func 0x80a2078 -thumb_func 0x80a2114 -thumb_func 0x80a2230 -thumb_func 0x80a2284 -thumb_func 0x80a22e8 +thumb_func 0x80a2078 BeginHardwarePaletteFade +thumb_func 0x80a2114 UpdateHardwarePaletteFade +thumb_func 0x80a2230 UpdateBlendRegisters +thumb_func 0x80a2284 IsSoftwarePaletteFadeFinishing +thumb_func 0x80a22e8 BlendPalettes thumb_func 0x80a2324 BlendPalettesUnfaded thumb_func 0x80a2358 TintPalette_GrayScale thumb_func 0x80a23a8 TintPalette_GrayScale2 @@ -5389,68 +5389,68 @@ thumb_func 0x80a25c0 thumb_func 0x80a25fc thumb_func 0x80a2604 thumb_func 0x80a261c -thumb_func 0x80a269c -thumb_func 0x80a26b0 +thumb_func 0x80a269c InitMapMusic +thumb_func 0x80a26b0 MapMusicMain thumb_func 0x80a27a8 ResetMapMusic thumb_func 0x80a27cc -thumb_func 0x80a27d8 -thumb_func 0x80a27f8 +thumb_func 0x80a27d8 PlayNewMapMusic +thumb_func 0x80a27f8 StopMapMusic thumb_func 0x80a2818 FadeOutMapMusic thumb_func 0x80a2850 FadeOutAndPlayNewMapMusic thumb_func 0x80a2884 FadeOutAndFadeInNewMapMusic thumb_func 0x80a28c8 FadeInNewMapMusic thumb_func 0x80a2904 IsNotWaitingForBGMStop -thumb_func 0x80a2928 -thumb_func 0x80a295c -thumb_func 0x80a2994 -thumb_func 0x80a29ac -thumb_func 0x80a29e8 -thumb_func 0x80a2a08 +thumb_func 0x80a2928 PlayFanfareByFanfareNum +thumb_func 0x80a295c WaitFanfare +thumb_func 0x80a2994 StopFanfareByFanfareNum +thumb_func 0x80a29ac PlayFanfare +thumb_func 0x80a29e8 IsFanfareTaskInactive +thumb_func 0x80a2a08 Task_Fanfare thumb_func 0x80a2a38 CreateFanfareTask -thumb_func 0x80a2a5c -thumb_func 0x80a2ab0 -thumb_func 0x80a2ac8 +thumb_func 0x80a2a5c FadeInNewBGM +thumb_func 0x80a2ab0 PlayBattleBGM +thumb_func 0x80a2ac8 IsBGMPausedOrStopped thumb_func 0x80a2af0 thumb_func 0x80a2b08 -thumb_func 0x80a2b20 -thumb_func 0x80a2b3c +thumb_func 0x80a2b20 IsBGMStopped +thumb_func 0x80a2b3c PlayCry1 thumb_func 0x80a2b88 PlayCry2 -thumb_func 0x80a2bac -thumb_func 0x80a2c0c -thumb_func 0x80a2c70 -thumb_func 0x80a2ccc -thumb_func 0x80a2d14 -thumb_func 0x80a2f40 +thumb_func 0x80a2bac PlayCry3 +thumb_func 0x80a2c0c PlayCry4 +thumb_func 0x80a2c70 PlayCry6 +thumb_func 0x80a2ccc PlayCry5 +thumb_func 0x80a2d14 PlayCryInternal +thumb_func 0x80a2f40 IsCryFinished thumb_func 0x80a2f64 thumb_func 0x80a2f7c -thumb_func 0x80a2f90 -thumb_func 0x80a2fb4 -thumb_func 0x80a2fd4 +thumb_func 0x80a2f90 IsCryPlayingOrClearCrySongs +thumb_func 0x80a2fb4 IsCryPlaying +thumb_func 0x80a2fd4 Task_DuckBGMForPokemonCry thumb_func 0x80a301c RestoreBGMVolumeAfterPokemonCry -thumb_func 0x80a3040 +thumb_func 0x80a3040 PlayBGM thumb_func 0x80a306c -thumb_func 0x80a307c +thumb_func 0x80a307c PlaySE12WithPanning thumb_func 0x80a30d0 thumb_func 0x80a3104 -thumb_func 0x80a3138 -thumb_func 0x80a3168 +thumb_func 0x80a3138 SE12PanpotControl +thumb_func 0x80a3168 IsSEPlaying thumb_func 0x80a31ac thumb_func 0x80a31d4 thumb_func 0x80a31fc ClearBattleAnimationVars thumb_func 0x80a32d8 DoMoveAnim -thumb_func 0x80a3310 -thumb_func 0x80a34c4 +thumb_func 0x80a3310 LaunchBattleAnimation +thumb_func 0x80a34c4 DestroyAnimSprite thumb_func 0x80a34e4 DestroyAnimVisualTask thumb_func 0x80a3500 DestroyAnimSoundTask -thumb_func 0x80a351c -thumb_func 0x80a354c -thumb_func 0x80a3580 -thumb_func 0x80a35ac +thumb_func 0x80a351c AddSpriteIndex +thumb_func 0x80a354c ClearSpriteIndex +thumb_func 0x80a3580 WaitAnimFrameCount +thumb_func 0x80a35ac RunAnimScriptCommand thumb_func 0x80a35c0 -thumb_func 0x80a35ec -thumb_func 0x80a3654 -thumb_func 0x80a36a0 -thumb_func 0x80a3794 +thumb_func 0x80a35ec ScriptCmd_loadspritegfx +thumb_func 0x80a3654 ScriptCmd_unloadspritegfx +thumb_func 0x80a36a0 ScriptCmd_createsprite +thumb_func 0x80a3794 ScriptCmd_createvisualtask thumb_func 0x80a3810 ScriptCmd_delay thumb_func 0x80a3850 thumb_func 0x80a3884 nullsub_501 @@ -5458,121 +5458,121 @@ thumb_func 0x80a3888 nullsub_51 thumb_func 0x80a388c thumb_func 0x80a3994 ScriptCmd_playse thumb_func 0x80a39bc -thumb_func 0x80a3aa0 -thumb_func 0x80a3bd8 -thumb_func 0x80a3c54 +thumb_func 0x80a3aa0 ScriptCmd_monbg +thumb_func 0x80a3bd8 IsBattlerSpriteVisible +thumb_func 0x80a3c54 MoveBattlerSpriteToBG thumb_func 0x80a3f68 thumb_func 0x80a3fe8 thumb_func 0x80a4044 -thumb_func 0x80a40a0 -thumb_func 0x80a4178 +thumb_func 0x80a40a0 task_pA_ma0A_obj_to_bg_pal +thumb_func 0x80a4178 ScriptCmd_clearmonbg thumb_func 0x80a4248 -thumb_func 0x80a42e0 -thumb_func 0x80a43a4 +thumb_func 0x80a42e0 ScriptCmd_monbg_22 +thumb_func 0x80a43a4 ScriptCmd_clearmonbg_23 thumb_func 0x80a4478 -thumb_func 0x80a4510 -thumb_func 0x80a4548 -thumb_func 0x80a4570 +thumb_func 0x80a4510 ScriptCmd_setalpha +thumb_func 0x80a4548 ScriptCmd_setbldcnt +thumb_func 0x80a4570 ScriptCmd_blendoff thumb_func 0x80a4594 ScriptCmd_call -thumb_func 0x80a45c8 +thumb_func 0x80a45c8 ScriptCmd_return thumb_func 0x80a45dc ScriptCmd_setarg thumb_func 0x80a4610 ScriptCmd_choosetwoturnanim -thumb_func 0x80a4650 +thumb_func 0x80a4650 ScriptCmd_jumpifmoveturn thumb_func 0x80a4694 ScriptCmd_goto -thumb_func 0x80a46b8 +thumb_func 0x80a46b8 IsContest thumb_func 0x80a46e0 ScriptCmd_fadetobg -thumb_func 0x80a4724 -thumb_func 0x80a47bc -thumb_func 0x80a4890 -thumb_func 0x80a4958 +thumb_func 0x80a4724 ScriptCmd_fadetobgfromset +thumb_func 0x80a47bc Task_FadeToBg +thumb_func 0x80a4890 LoadMoveBg +thumb_func 0x80a4958 LoadDefaultBg thumb_func 0x80a4974 ScriptCmd_restorebg -thumb_func 0x80a49b8 +thumb_func 0x80a49b8 ScriptCmd_waitbgfadeout thumb_func 0x80a49ec thumb_func 0x80a4a20 ScriptCmd_changebg -thumb_func 0x80a4a40 -thumb_func 0x80a4b40 +thumb_func 0x80a4a40 BattleAnimAdjustPanning +thumb_func 0x80a4b40 BattleAnimAdjustPanning2 thumb_func 0x80a4bb4 KeepPanInRange thumb_func 0x80a4bdc CalculatePanIncrement thumb_func 0x80a4c1c ScriptCmd_playsewithpan thumb_func 0x80a4c54 ScriptCmd_setpan thumb_func 0x80a4c80 ScriptCmd_panse_1B -thumb_func 0x80a4d40 +thumb_func 0x80a4d40 Task_PanFromInitialToTarget thumb_func 0x80a4dd0 ScriptCmd_panse_26 thumb_func 0x80a4e64 ScriptCmd_panse_27 -thumb_func 0x80a4f24 +thumb_func 0x80a4f24 ScriptCmd_loopsewithpan thumb_func 0x80a4fac Task_LoopAndPlaySE thumb_func 0x80a5008 ScriptCmd_waitplaysewithpan thumb_func 0x80a507c Task_WaitAndPlaySE -thumb_func 0x80a50c0 -thumb_func 0x80a5134 -thumb_func 0x80a51b8 -thumb_func 0x80a520c -thumb_func 0x80a524c -thumb_func 0x80a52a4 -thumb_func 0x80a52d4 +thumb_func 0x80a50c0 ScriptCmd_createsoundtask +thumb_func 0x80a5134 ScriptCmd_waitsound +thumb_func 0x80a51b8 ScriptCmd_jumpargeq +thumb_func 0x80a520c ScriptCmd_jumpifcontest +thumb_func 0x80a524c ScriptCmd_monbgprio_28 +thumb_func 0x80a52a4 ScriptCmd_monbgprio_29 +thumb_func 0x80a52d4 ScriptCmd_monbgprio_2A thumb_func 0x80a5348 ScriptCmd_invisible thumb_func 0x80a5384 ScriptCmd_visible -thumb_func 0x80a53c4 -thumb_func 0x80a5474 +thumb_func 0x80a53c4 ScriptCmd_doublebattle_2D +thumb_func 0x80a5474 ScriptCmd_doublebattle_2E thumb_func 0x80a550c -thumb_func 0x80a5534 -thumb_func 0x80a5680 -thumb_func 0x80a5868 +thumb_func 0x80a5534 GetBattlerSpriteCoord +thumb_func 0x80a5680 GetBattlerYDelta +thumb_func 0x80a5868 GetBattlerElevation thumb_func 0x80a58d4 GetBattlerSpriteFinal_Y -thumb_func 0x80a5974 +thumb_func 0x80a5974 GetBattlerSpriteCoord2 thumb_func 0x80a5a00 GetBattlerSpriteDefault_Y thumb_func 0x80a5a14 GetSubstituteSpriteDefault_Y -thumb_func 0x80a5a58 -thumb_func 0x80a5b08 -thumb_func 0x80a5b9c -thumb_func 0x80a5ba4 -thumb_func 0x80a5bb4 -thumb_func 0x80a5c14 +thumb_func 0x80a5a58 GetBattlerYCoordWithElevation +thumb_func 0x80a5b08 GetAnimBattlerSpriteId +thumb_func 0x80a5b9c StoreSpriteCallbackInData6 +thumb_func 0x80a5ba4 SetCallbackToStoredInData6 +thumb_func 0x80a5bb4 TranslateSpriteInCircleOverDuration +thumb_func 0x80a5c14 TranslateSpriteInGrowingCircleOverDuration thumb_func 0x80a5c90 -thumb_func 0x80a5d18 +thumb_func 0x80a5d18 TranslateSpriteInEllipseOverDuration thumb_func 0x80a5d78 WaitAnimForDuration thumb_func 0x80a5d98 thumb_func 0x80a5db4 thumb_func 0x80a5e04 TranslateSpriteLinear thumb_func 0x80a5e34 TranslateSpriteLinearFixedPoint -thumb_func 0x80a5e70 +thumb_func 0x80a5e70 TranslateSpriteLinearFixedPointIconFrame thumb_func 0x80a5eb4 -thumb_func 0x80a5ef8 -thumb_func 0x80a5f48 -thumb_func 0x80a5fa4 -thumb_func 0x80a6014 +thumb_func 0x80a5ef8 TranslateMonSpriteLinear +thumb_func 0x80a5f48 TranslateMonSpriteLinearFixedPoint +thumb_func 0x80a5fa4 TranslateSpriteLinearAndFlicker +thumb_func 0x80a6014 DestroySpriteAndMatrix thumb_func 0x80a6028 thumb_func 0x80a606c thumb_func 0x80a6084 RunStoredCallbackWhenAffineAnimEnds thumb_func 0x80a60a0 RunStoredCallbackWhenAnimEnds thumb_func 0x80a60bc -thumb_func 0x80a60dc +thumb_func 0x80a60dc DestroyAnimVisualTaskAndDisableBlend thumb_func 0x80a6100 SetSpriteCoordsToAnimAttackerCoords -thumb_func 0x80a612c -thumb_func 0x80a619c -thumb_func 0x80a61c8 -thumb_func 0x80a61fc +thumb_func 0x80a612c SetAnimSpriteInitialXOffset +thumb_func 0x80a619c InitAnimArcTranslation +thumb_func 0x80a61c8 TranslateAnimHorizontalArc +thumb_func 0x80a61fc TranslateAnimVerticalArc thumb_func 0x80a6230 SetSpritePrimaryCoordsFromSecondaryCoords thumb_func 0x80a6248 InitSpritePosToAnimTarget -thumb_func 0x80a6294 -thumb_func 0x80a62f8 +thumb_func 0x80a6294 InitSpritePosToAnimAttacker +thumb_func 0x80a62f8 GetBattlerSide thumb_func 0x80a630c thumb_func 0x80a631c GetBattlerAtPosition -thumb_func 0x80a6358 -thumb_func 0x80a63e8 +thumb_func 0x80a6358 IsBattlerSpritePresent +thumb_func 0x80a63e8 IsDoubleBattle thumb_func 0x80a63f8 thumb_func 0x80a6458 thumb_func 0x80a64c4 thumb_func 0x80a6530 -thumb_func 0x80a6588 -thumb_func 0x80a65d8 -thumb_func 0x80a6610 +thumb_func 0x80a6588 AnimLoadCompressedBgGfx +thumb_func 0x80a65d8 InitAnimBgTilemapBuffer +thumb_func 0x80a6610 AnimLoadCompressedBgTilemap thumb_func 0x80a6628 thumb_func 0x80a665c thumb_func 0x80a6674 thumb_func 0x80a66b4 -thumb_func 0x80a66dc -thumb_func 0x80a671c +thumb_func 0x80a66dc InitSpriteDataForLinearTranslation +thumb_func 0x80a671c InitAnimLinearTranslation thumb_func 0x80a67b4 thumb_func 0x80a67dc thumb_func 0x80a6804 AnimTranslateLinear @@ -5580,57 +5580,57 @@ thumb_func 0x80a6860 thumb_func 0x80a687c thumb_func 0x80a689c thumb_func 0x80a68c8 -thumb_func 0x80a68f0 +thumb_func 0x80a68f0 InitAnimFastLinearTranslation thumb_func 0x80a6988 thumb_func 0x80a69b0 AnimFastTranslateLinear thumb_func 0x80a6a0c -thumb_func 0x80a6a28 +thumb_func 0x80a6a28 InitAnimFastLinearTranslationWithSpeed thumb_func 0x80a6a54 -thumb_func 0x80a6a7c +thumb_func 0x80a6a7c SetSpriteRotScale thumb_func 0x80a6b00 -thumb_func 0x80a6b38 -thumb_func 0x80a6c0c +thumb_func 0x80a6b38 PrepareBattlerSpriteForRotScale +thumb_func 0x80a6c0c ResetSpriteRotScale thumb_func 0x80a6c68 SetBattlerSpriteYOffsetFromRotation -thumb_func 0x80a6ca8 +thumb_func 0x80a6ca8 TrySetSpriteRotScale thumb_func 0x80a6d64 -thumb_func 0x80a6da4 +thumb_func 0x80a6da4 ArcTan2_ thumb_func 0x80a6dbc ArcTan2Neg -thumb_func 0x80a6dd4 +thumb_func 0x80a6dd4 SetGreyscaleOrOriginalPalette thumb_func 0x80a6e74 thumb_func 0x80a6f8c thumb_func 0x80a7074 -thumb_func 0x80a707c +thumb_func 0x80a707c GetBattlerAtPosition_ thumb_func 0x80a7090 thumb_func 0x80a70e8 TranslateAnimSpriteToTargetMonLocation thumb_func 0x80a7174 thumb_func 0x80a71e4 thumb_func 0x80a7200 -thumb_func 0x80a72b0 -thumb_func 0x80a7324 +thumb_func 0x80a72b0 CloneBattlerSpriteWithBlend +thumb_func 0x80a7324 obj_delete_but_dont_free_vram thumb_func 0x80a733c thumb_func 0x80a73c4 -thumb_func 0x80a7460 +thumb_func 0x80a7460 AnimTask_BlendMonInAndOut thumb_func 0x80a74bc AnimTask_BlendMonInAndOutSetup -thumb_func 0x80a74e4 +thumb_func 0x80a74e4 AnimTask_BlendMonInAndOutStep thumb_func 0x80a757c thumb_func 0x80a75c4 PrepareAffineAnimInTaskData -thumb_func 0x80a75fc -thumb_func 0x80a7734 -thumb_func 0x80a7788 -thumb_func 0x80a77e0 -thumb_func 0x80a7910 -thumb_func 0x80a7918 +thumb_func 0x80a75fc RunAffineAnimFromTaskData +thumb_func 0x80a7734 SetBattlerSpriteYOffsetFromYScale +thumb_func 0x80a7788 SetBattlerSpriteYOffsetFromOtherYScale +thumb_func 0x80a77e0 GetBattlerYDeltaFromSpriteId +thumb_func 0x80a7910 StorePointerInVars +thumb_func 0x80a7918 LoadPointerFromVars thumb_func 0x80a7924 thumb_func 0x80a7990 thumb_func 0x80a7a08 AnimTask_GetFrustrationPowerLevel thumb_func 0x80a7a3c thumb_func 0x80a7b40 thumb_func 0x80a7bac GetBattlerSpriteSubpriority -thumb_func 0x80a7bf0 +thumb_func 0x80a7bf0 GetBattlerSpriteBGPriority thumb_func 0x80a7c2c GetBattlerSpriteBGPriorityRank thumb_func 0x80a7c5c -thumb_func 0x80a7ed8 -thumb_func 0x80a7ee4 +thumb_func 0x80a7ed8 DestroySpriteAndFreeResources_ +thumb_func 0x80a7ee4 GetBattlerSpriteCoordAttr thumb_func 0x80a81ec SetAverageBattlerPositions thumb_func 0x80a8290 thumb_func 0x80a8334 @@ -5643,27 +5643,27 @@ thumb_func 0x80a86c4 thumb_func 0x80a86f8 thumb_func 0x80a8750 thumb_func 0x80a87ac -thumb_func 0x80a8818 -thumb_func 0x80a8878 -thumb_func 0x80a88cc -thumb_func 0x80a8964 -thumb_func 0x80a89d4 +thumb_func 0x80a8818 ResetTasks +thumb_func 0x80a8878 CreateTask +thumb_func 0x80a88cc InsertTask +thumb_func 0x80a8964 DestroyTask +thumb_func 0x80a89d4 RunTasks thumb_func 0x80a8a04 FindFirstActiveTask thumb_func 0x80a8a40 nullsub_50 thumb_func 0x80a8a44 SetTaskFuncWithFollowupFunc thumb_func 0x80a8a78 SwitchTaskToFollowupFunc -thumb_func 0x80a8aac -thumb_func 0x80a8ae4 +thumb_func 0x80a8aac FuncIsActiveTask +thumb_func 0x80a8ae4 FindTaskIdByFunc thumb_func 0x80a8b14 GetTaskCount thumb_func 0x80a8b44 SetWordTaskArg thumb_func 0x80a8b7c GetWordTaskArg thumb_func 0x80a8bbc nullsub_10 -thumb_func 0x80a8bc0 -thumb_func 0x80a8c04 +thumb_func 0x80a8bc0 ReshowBattleScreenAfterMenu +thumb_func 0x80a8c04 CB2_ReshowBattleScreenAfterMenu thumb_func 0x80a8ebc -thumb_func 0x80a8edc -thumb_func 0x80a8fd0 -thumb_func 0x80a93a4 +thumb_func 0x80a8edc LoadBattlerSpriteGfx +thumb_func 0x80a8fd0 CreateBattlerSprite +thumb_func 0x80a93a4 CreateHealthboxSprite thumb_func 0x80a9538 thumb_func 0x80a967c thumb_func 0x80a970c @@ -5673,224 +5673,224 @@ thumb_func 0x80a9898 thumb_func 0x80a98e8 thumb_func 0x80a9998 thumb_func 0x80a99ec -thumb_func 0x80a9a54 +thumb_func 0x80a9a54 AnimTask_StatsChange thumb_func 0x80a9c2c LaunchStatusAnimation thumb_func 0x80a9c7c thumb_func 0x80a9c8c -thumb_func 0x80a9cd4 -thumb_func 0x80a9d3c +thumb_func 0x80a9cd4 SpriteCB_VersionBannerLeft +thumb_func 0x80a9d3c SpriteCB_VersionBannerRight thumb_func 0x80a9d7c SpriteCB_PressStartCopyrightBanner -thumb_func 0x80a9db4 -thumb_func 0x80a9e10 -thumb_func 0x80a9e6c -thumb_func 0x80a9f1c -thumb_func 0x80a9f44 -thumb_func 0x80aa048 +thumb_func 0x80a9db4 CreatePressStartBanner +thumb_func 0x80a9e10 CreateCopyrightBanner +thumb_func 0x80a9e6c SpriteCB_PokemonLogoShine +thumb_func 0x80a9f1c SpriteCB_PokemonLogoShine2 +thumb_func 0x80a9f44 StartPokemonLogoShine +thumb_func 0x80aa048 StopCryAndClearCrySongs thumb_func 0x80aa06c thumb_func 0x80aa400 thumb_func 0x80aa418 -thumb_func 0x80aa528 -thumb_func 0x80aa650 +thumb_func 0x80aa528 Task_TitleScreenPhase2 +thumb_func 0x80aa650 Task_TitleScreenPhase3 thumb_func 0x80aa7b4 thumb_func 0x80aa7d0 thumb_func 0x80aa7ec thumb_func 0x80aa808 -thumb_func 0x80aa824 -thumb_func 0x80aa844 -thumb_func 0x80aa8a0 -thumb_func 0x80aa994 +thumb_func 0x80aa824 CB2_GoToBerryFixScreen +thumb_func 0x80aa844 UsePokeblockOnField +thumb_func 0x80aa8a0 StartWeather +thumb_func 0x80aa994 SetNextWeather thumb_func 0x80aaa00 SetCurrentAndNextWeather thumb_func 0x80aaa2c SetCurrentAndNextWeatherNoDelay -thumb_func 0x80aaa5c -thumb_func 0x80aaaac +thumb_func 0x80aaa5c Task_WeatherInit +thumb_func 0x80aaaac Task_WeatherMain thumb_func 0x80aab4c -thumb_func 0x80aab68 +thumb_func 0x80aab68 None_Init thumb_func 0x80aab88 nullsub_53 thumb_func 0x80aab8c -thumb_func 0x80aab90 -thumb_func 0x80aaca4 -thumb_func 0x80aad30 -thumb_func 0x80aae48 -thumb_func 0x80aaea8 -thumb_func 0x80aaf00 +thumb_func 0x80aab90 BuildGammaShiftTables +thumb_func 0x80aaca4 UpdateWeatherGammaShift +thumb_func 0x80aad30 FadeInScreenWithWeather +thumb_func 0x80aae48 FadeInScreen_RainShowShade +thumb_func 0x80aaea8 FadeInScreen_Drought +thumb_func 0x80aaf00 FadeInScreen_Fog1 thumb_func 0x80aaf3c nullsub_19 -thumb_func 0x80aaf40 -thumb_func 0x80ab144 -thumb_func 0x80ab28c -thumb_func 0x80ab3ac +thumb_func 0x80aaf40 ApplyGammaShift +thumb_func 0x80ab144 ApplyGammaShiftWithBlend +thumb_func 0x80ab28c ApplyDroughtGammaShiftWithBlend +thumb_func 0x80ab3ac ApplyFogBlend thumb_func 0x80ab4c8 MarkFogSpritePalToLighten -thumb_func 0x80ab4fc +thumb_func 0x80ab4fc LightenSpritePaletteInFog thumb_func 0x80ab544 thumb_func 0x80ab578 -thumb_func 0x80ab5cc +thumb_func 0x80ab5cc FadeScreen thumb_func 0x80ab6f8 IsWeatherNotFadingIn -thumb_func 0x80ab714 +thumb_func 0x80ab714 UpdateSpritePaletteWithWeather thumb_func 0x80ab7fc ApplyWeatherGammaShiftToPal thumb_func 0x80ab81c -thumb_func 0x80ab848 -thumb_func 0x80ab878 -thumb_func 0x80ab880 -thumb_func 0x80ab8a0 +thumb_func 0x80ab848 LoadCustomWeatherSpritePalette +thumb_func 0x80ab878 LoadDroughtWeatherPalette +thumb_func 0x80ab880 ResetDroughtWeatherPaletteLoading +thumb_func 0x80ab8a0 LoadDroughtWeatherPalettes thumb_func 0x80ab8dc thumb_func 0x80ab8ec thumb_func 0x80ab918 -thumb_func 0x80aba20 +thumb_func 0x80aba20 Weather_SetBlendCoeffs thumb_func 0x80aba60 Weather_SetTargetBlendCoeffs -thumb_func 0x80abaa4 +thumb_func 0x80abaa4 Weather_UpdateBlend thumb_func 0x80abb70 -thumb_func 0x80abc08 +thumb_func 0x80abc08 GetCurrentWeather thumb_func 0x80abc18 -thumb_func 0x80abc74 +thumb_func 0x80abc74 PlayRainStoppingSoundEffect thumb_func 0x80abcb8 thumb_func 0x80abccc thumb_func 0x80abce0 -thumb_func 0x80abcf4 +thumb_func 0x80abcf4 PreservePaletteInWeather thumb_func 0x80abd24 thumb_func 0x80abd34 Clouds_InitVars thumb_func 0x80abd80 Clouds_InitAll -thumb_func 0x80abdb0 -thumb_func 0x80abe10 +thumb_func 0x80abdb0 Clouds_Main +thumb_func 0x80abe10 Clouds_Finish thumb_func 0x80abe58 Sunny_InitVars -thumb_func 0x80abe7c +thumb_func 0x80abe7c Sunny_InitAll thumb_func 0x80abe88 nullsub_541 thumb_func 0x80abe8c -thumb_func 0x80abe90 -thumb_func 0x80abf5c +thumb_func 0x80abe90 CreateCloudSprites +thumb_func 0x80abf5c DestroyCloudSprites thumb_func 0x80abfb0 UpdateCloudSprite thumb_func 0x80abfcc Drought_InitVars thumb_func 0x80ac000 Drought_InitAll -thumb_func 0x80ac030 +thumb_func 0x80ac030 Drought_Main thumb_func 0x80ac114 -thumb_func 0x80ac118 -thumb_func 0x80ac12c +thumb_func 0x80ac118 StartDroughtWeatherBlend +thumb_func 0x80ac12c UpdateDroughtBlend thumb_func 0x80ac224 LightRain_InitVars thumb_func 0x80ac290 -thumb_func 0x80ac2c0 -thumb_func 0x80ac320 -thumb_func 0x80ac3ac -thumb_func 0x80ac480 -thumb_func 0x80ac584 -thumb_func 0x80ac5b0 +thumb_func 0x80ac2c0 LightRain_Main +thumb_func 0x80ac320 LightRain_Finish +thumb_func 0x80ac3ac StartRainSpriteFall +thumb_func 0x80ac480 UpdateRainSprite +thumb_func 0x80ac584 WaitRainSprite +thumb_func 0x80ac5b0 InitRainSpriteMovement thumb_func 0x80ac664 -thumb_func 0x80ac674 -thumb_func 0x80ac7a8 -thumb_func 0x80ac834 +thumb_func 0x80ac674 CreateRainSprite +thumb_func 0x80ac7a8 UpdateVisibleRainSprites +thumb_func 0x80ac834 DestroyRainSprites thumb_func 0x80ac888 Snow_InitVars thumb_func 0x80ac8d8 Snow_InitAll thumb_func 0x80ac944 Snow_Main -thumb_func 0x80ac980 -thumb_func 0x80ac9e4 -thumb_func 0x80aca60 -thumb_func 0x80acacc -thumb_func 0x80acb00 +thumb_func 0x80ac980 Snow_Finish +thumb_func 0x80ac9e4 UpdateVisibleSnowflakeSprites +thumb_func 0x80aca60 CreateSnowflakeSprite +thumb_func 0x80acacc DestroySnowflakeSprite +thumb_func 0x80acb00 InitSnowflakeSpriteMovement thumb_func 0x80acbac WaitSnowflakeSprite -thumb_func 0x80acc08 +thumb_func 0x80acc08 UpdateSnowflakeSprite thumb_func 0x80acd40 MedRain_InitVars thumb_func 0x80acdb4 MedRain_InitAll thumb_func 0x80acde4 HeavyRain_InitVars thumb_func 0x80ace50 thumb_func 0x80ace80 -thumb_func 0x80ad20c -thumb_func 0x80ad2b8 -thumb_func 0x80ad2f4 +thumb_func 0x80ad20c Rain_Finish +thumb_func 0x80ad2b8 SetThunderCounter +thumb_func 0x80ad2f4 UpdateThunderSound thumb_func 0x80ad35c Fog1_InitVars thumb_func 0x80ad3bc Fog1_InitAll -thumb_func 0x80ad3ec -thumb_func 0x80ad4ac +thumb_func 0x80ad3ec Fog1_Main +thumb_func 0x80ad4ac Fog1_Finish thumb_func 0x80ad548 Fog1SpriteCallback -thumb_func 0x80ad5a8 +thumb_func 0x80ad5a8 CreateFog1Sprites thumb_func 0x80ad664 -thumb_func 0x80ad6b8 +thumb_func 0x80ad6b8 Ash_InitVars thumb_func 0x80ad714 Ash_InitAll -thumb_func 0x80ad744 -thumb_func 0x80ad7f0 -thumb_func 0x80ad858 -thumb_func 0x80ad868 -thumb_func 0x80ad910 +thumb_func 0x80ad744 Ash_Main +thumb_func 0x80ad7f0 Ash_Finish +thumb_func 0x80ad858 LoadAshSpriteSheet +thumb_func 0x80ad868 CreateAshSprites +thumb_func 0x80ad910 DestroyAshSprites thumb_func 0x80ad964 UpdateAshSprite thumb_func 0x80ad9e0 Fog2_InitVars thumb_func 0x80ada64 Fog2_InitAll -thumb_func 0x80ada94 -thumb_func 0x80adaf8 +thumb_func 0x80ada94 Fog2_Main +thumb_func 0x80adaf8 Fog2_Finish thumb_func 0x80adb58 UpdateFog2Movement -thumb_func 0x80adbec -thumb_func 0x80adca4 +thumb_func 0x80adbec CreateFog2Sprites +thumb_func 0x80adca4 DestroyFog2Sprites thumb_func 0x80adcf8 UpdateFog2Sprite thumb_func 0x80add58 Sandstorm_InitVars thumb_func 0x80addd8 Sandstorm_InitAll -thumb_func 0x80ade08 -thumb_func 0x80ade84 +thumb_func 0x80ade08 Sandstorm_Main +thumb_func 0x80ade84 Sandstorm_Finish thumb_func 0x80adee8 UpdateSandstormWaveIndex thumb_func 0x80adf20 UpdateSandstormMovement -thumb_func 0x80adfa0 -thumb_func 0x80ae034 -thumb_func 0x80ae0f4 +thumb_func 0x80adfa0 DestroySandstormSprites +thumb_func 0x80ae034 CreateSandstormSprites +thumb_func 0x80ae0f4 CreateSwirlSandstormSprites thumb_func 0x80ae1f4 UpdateSandstormSprite thumb_func 0x80ae254 WaitSandSwirlSpriteEntrance thumb_func 0x80ae278 UpdateSandstormSwirlSprite thumb_func 0x80ae2ec Shade_InitVars -thumb_func 0x80ae31c +thumb_func 0x80ae31c Shade_InitAll thumb_func 0x80ae328 nullsub_55 thumb_func 0x80ae32c -thumb_func 0x80ae330 +thumb_func 0x80ae330 Bubbles_InitVars thumb_func 0x80ae384 Bubbles_InitAll thumb_func 0x80ae3b4 Bubbles_Main thumb_func 0x80ae428 Bubbles_Finish -thumb_func 0x80ae444 -thumb_func 0x80ae4cc -thumb_func 0x80ae530 -thumb_func 0x80ae590 -thumb_func 0x80ae5a4 -thumb_func 0x80ae624 +thumb_func 0x80ae444 CreateBubbleSprite +thumb_func 0x80ae4cc DestroyBubbleSprites +thumb_func 0x80ae530 UpdateBubbleSprite +thumb_func 0x80ae590 UnusedSetCurrentAlternatingWeather +thumb_func 0x80ae5a4 Task_DoAlternatingWeather +thumb_func 0x80ae624 CreateAlternatingWeatherTask thumb_func 0x80ae678 SetSav1Weather -thumb_func 0x80ae6a8 +thumb_func 0x80ae6a8 GetSav1Weather thumb_func 0x80ae6b8 SetSav1WeatherFromCurrMapHeader thumb_func 0x80ae6ec SetWeather thumb_func 0x80ae704 SetWeather_Unused -thumb_func 0x80ae71c -thumb_func 0x80ae780 -thumb_func 0x80ae7e4 +thumb_func 0x80ae71c DoCurrentWeather +thumb_func 0x80ae780 ResumePausedWeather +thumb_func 0x80ae7e4 TranslateWeatherNum thumb_func 0x80ae8b8 UpdateWeatherPerDay -thumb_func 0x80ae8d8 -thumb_func 0x80ae8f8 +thumb_func 0x80ae8d8 UpdateRainCounter +thumb_func 0x80ae8f8 palette_bg_faded_fill_white thumb_func 0x80ae91c -thumb_func 0x80ae93c +thumb_func 0x80ae93c pal_fill_for_maplights thumb_func 0x80ae988 -thumb_func 0x80ae99c -thumb_func 0x80ae9b0 +thumb_func 0x80ae99c pal_fill_black +thumb_func 0x80ae9b0 WarpFadeScreen thumb_func 0x80ae9f0 -thumb_func 0x80aea08 +thumb_func 0x80aea08 task0A_nop_for_a_while thumb_func 0x80aea24 -thumb_func 0x80aea44 -thumb_func 0x80aea64 +thumb_func 0x80aea44 task0A_asap_script_env_2_enable_and_set_ctx_running +thumb_func 0x80aea64 FieldCallback_ReturnToEventScript2 thumb_func 0x80aea84 -thumb_func 0x80aeaa0 +thumb_func 0x80aeaa0 task_mpl_807DD60 thumb_func 0x80aeb10 thumb_func 0x80aeb30 thumb_func 0x80aebb0 thumb_func 0x80aec10 thumb_func 0x80aec30 -thumb_func 0x80aec94 +thumb_func 0x80aec94 mapldr_default thumb_func 0x80aecac thumb_func 0x80aecc4 thumb_func 0x80aece4 thumb_func 0x80aed08 thumb_func 0x80aed34 -thumb_func 0x80aee4c -thumb_func 0x80aef0c +thumb_func 0x80aee4c task_map_chg_seq_0807E20C +thumb_func 0x80aef0c task_map_chg_seq_0807E2CC thumb_func 0x80aef5c thumb_func 0x80aef84 thumb_func 0x80aefa0 -thumb_func 0x80aefac +thumb_func 0x80aefac task_mpl_807E3C8 thumb_func 0x80aefd0 thumb_func 0x80aefec thumb_func 0x80af00c thumb_func 0x80af018 WaitForWeatherFadeIn -thumb_func 0x80af030 -thumb_func 0x80af068 -thumb_func 0x80af098 -thumb_func 0x80af0cc -thumb_func 0x80af0f0 +thumb_func 0x80af030 DoWarp +thumb_func 0x80af068 DoDiveWarp +thumb_func 0x80af098 ScrCmd_pokemartdecoration2 +thumb_func 0x80af0cc DoDoorWarp +thumb_func 0x80af0f0 DoFallWarp thumb_func 0x80af108 thumb_func 0x80af124 thumb_func 0x80af134 @@ -5899,26 +5899,26 @@ thumb_func 0x80af178 thumb_func 0x80af1b4 thumb_func 0x80af1dc thumb_func 0x80af244 -thumb_func 0x80af268 +thumb_func 0x80af268 Task_ReturnToWorldFromLinkRoom thumb_func 0x80af2f4 thumb_func 0x80af308 thumb_func 0x80af384 -thumb_func 0x80af4f0 +thumb_func 0x80af4f0 task0A_fade_n_map_maybe thumb_func 0x80af55c thumb_func 0x80af594 SetFlashScanlineEffectWindowBoundary thumb_func 0x80af5c0 thumb_func 0x80af64c SetFlash2ScanlineEffectWindowBoundary thumb_func 0x80af678 -thumb_func 0x80af704 -thumb_func 0x80af7c8 +thumb_func 0x80af704 UpdateFlashLevelEffect +thumb_func 0x80af7c8 UpdateFlash2LevelEffect thumb_func 0x80af88c thumb_func 0x80af8b4 thumb_func 0x80af8d8 thumb_func 0x80af938 thumb_func 0x80af998 -thumb_func 0x80af9e4 -thumb_func 0x80afa20 -thumb_func 0x80afa5c +thumb_func 0x80af9e4 WriteFlashScanlineEffectBuffer +thumb_func 0x80afa20 WriteBattlePyramidViewScanlineEffectBuffer +thumb_func 0x80afa5c task0A_mpl_807E31C thumb_func 0x80afab8 thumb_func 0x80afb40 thumb_func 0x80afb64 @@ -5928,105 +5928,105 @@ thumb_func 0x80afc14 thumb_func 0x80afe30 thumb_func 0x80afe88 thumb_func 0x80afeb0 -thumb_func 0x80afec8 -thumb_func 0x80afeec -thumb_func 0x80aff58 -thumb_func 0x80aff94 -thumb_func 0x80affac -thumb_func 0x80affb8 -thumb_func 0x80b0028 -thumb_func 0x80b0078 +thumb_func 0x80afec8 task50_0807F0C8 +thumb_func 0x80afeec Task_BattleStart +thumb_func 0x80aff58 CreateBattleStartTask +thumb_func 0x80aff94 BattleSetup_StartWildBattle +thumb_func 0x80affac BattleSetup_StartBattlePikeWildBattle +thumb_func 0x80affb8 DoStandardWildBattle +thumb_func 0x80b0028 BattleSetup_StartRoamerBattle +thumb_func 0x80b0078 DoSafariBattle thumb_func 0x80b00b0 -thumb_func 0x80b0100 +thumb_func 0x80b0100 DoTrainerBattle thumb_func 0x80b0124 -thumb_func 0x80b0168 -thumb_func 0x80b01a4 -thumb_func 0x80b01e8 -thumb_func 0x80b0230 -thumb_func 0x80b0314 -thumb_func 0x80b0370 -thumb_func 0x80b03f4 -thumb_func 0x80b0468 +thumb_func 0x80b0168 StartWallyTutorialBattle +thumb_func 0x80b01a4 BattleSetup_StartScriptedWildBattle +thumb_func 0x80b01e8 BattleSetup_StartLatiBattle +thumb_func 0x80b0230 BattleSetup_StartLegendaryBattle +thumb_func 0x80b0314 StartGroudonKyogreBattle +thumb_func 0x80b0370 StartRegiBattle +thumb_func 0x80b03f4 CB2_EndWildBattle +thumb_func 0x80b0468 CB2_EndScriptedWildBattle thumb_func 0x80b04cc -thumb_func 0x80b0620 -thumb_func 0x80b0684 +thumb_func 0x80b0620 GetBattleTransitionTypeByMap +thumb_func 0x80b0684 GetSumOfPlayerPartyLevel thumb_func 0x80b06e4 -thumb_func 0x80b07b8 +thumb_func 0x80b07b8 GetWildBattleTransition thumb_func 0x80b0824 thumb_func 0x80b08f8 -thumb_func 0x80b0a24 -thumb_func 0x80b0a44 -thumb_func 0x80b0a94 -thumb_func 0x80b0af0 +thumb_func 0x80b0a24 ChooseStarter +thumb_func 0x80b0a44 CB2_GiveStarter +thumb_func 0x80b0a94 CB2_StartFirstBattle +thumb_func 0x80b0af0 CB2_EndFirstBattle thumb_func 0x80b0b04 thumb_func 0x80b0b20 thumb_func 0x80b0b3c TrainerBattleLoadArg32 -thumb_func 0x80b0b54 +thumb_func 0x80b0b54 TrainerBattleLoadArg16 thumb_func 0x80b0b60 thumb_func 0x80b0b64 thumb_func 0x80b0b7c -thumb_func 0x80b0b94 -thumb_func 0x80b0bd4 -thumb_func 0x80b0be8 -thumb_func 0x80b0c5c -thumb_func 0x80b0ce4 -thumb_func 0x80b0d1c -thumb_func 0x80b0f18 +thumb_func 0x80b0b94 IsPlayerDefeated +thumb_func 0x80b0bd4 ResetTrainerOpponentIds +thumb_func 0x80b0be8 InitTrainerBattleVariables +thumb_func 0x80b0c5c TrainerBattleLoadArgs +thumb_func 0x80b0ce4 SetMapVarsToTrainer +thumb_func 0x80b0d1c BattleSetup_ConfigureTrainerBattle +thumb_func 0x80b0f18 ConfigureAndSetUpOneTrainerBattle thumb_func 0x80b0f5c ConfigureTwoTrainersBattle -thumb_func 0x80b0f90 -thumb_func 0x80b0fa4 -thumb_func 0x80b0fc4 +thumb_func 0x80b0f90 SetUpTwoTrainersBattle +thumb_func 0x80b0fa4 GetTrainerFlagFromScriptPointer +thumb_func 0x80b0fc4 SetUpTrainerMovement thumb_func 0x80b0ff8 -thumb_func 0x80b1004 -thumb_func 0x80b104c -thumb_func 0x80b1078 -thumb_func 0x80b108c +thumb_func 0x80b1004 GetTrainerFlag +thumb_func 0x80b104c SetBattledTrainersFlags +thumb_func 0x80b1078 SetBattledTrainerFlag +thumb_func 0x80b108c HasTrainerBeenFought thumb_func 0x80b10a4 thumb_func 0x80b10b8 SetTrainerFlag -thumb_func 0x80b10cc -thumb_func 0x80b1204 -thumb_func 0x80b1280 -thumb_func 0x80b12d8 -thumb_func 0x80b1300 -thumb_func 0x80b13e4 -thumb_func 0x80b13fc -thumb_func 0x80b144c -thumb_func 0x80b145c -thumb_func 0x80b1558 -thumb_func 0x80b1568 -thumb_func 0x80b1590 -thumb_func 0x80b15cc -thumb_func 0x80b15f0 -thumb_func 0x80b1604 +thumb_func 0x80b10cc BattleSetup_StartTrainerBattle +thumb_func 0x80b1204 CB2_EndTrainerBattle +thumb_func 0x80b1280 CB2_EndRematchBattle +thumb_func 0x80b12d8 BattleSetup_StartRematchBattle +thumb_func 0x80b1300 ShowTrainerIntroSpeech +thumb_func 0x80b13e4 BattleSetup_GetScriptAddrAfterBattle +thumb_func 0x80b13fc BattleSetup_GetTrainerPostBattleScript +thumb_func 0x80b144c ShowTrainerCantBattleSpeech +thumb_func 0x80b145c SetUpTrainerEncounterMusic +thumb_func 0x80b1558 ReturnEmptyStringIfNull +thumb_func 0x80b1568 GetIntroSpeechOfApproachingTrainer +thumb_func 0x80b1590 GetTrainerALoseText +thumb_func 0x80b15cc GetTrainerBLoseText +thumb_func 0x80b15f0 GetTrainerWonSpeech +thumb_func 0x80b1604 GetTrainerCantBattleSpeech thumb_func 0x80b1618 FirstBattleTrainerIdToRematchTableId thumb_func 0x80b163c TrainerIdToRematchTableId thumb_func 0x80b1680 thumb_func 0x80b16a8 SetRematchIdForTrainer -thumb_func 0x80b16e8 +thumb_func 0x80b16e8 UpdateRandomTrainerRematches thumb_func 0x80b1780 UpdateRematchIfDefeated -thumb_func 0x80b17ac +thumb_func 0x80b17ac DoesSomeoneWantRematchIn_ thumb_func 0x80b17f4 IsRematchTrainerIn_ -thumb_func 0x80b1824 -thumb_func 0x80b1860 +thumb_func 0x80b1824 IsFirstTrainerIdReadyForRematch +thumb_func 0x80b1860 IsTrainerReadyForRematch_ thumb_func 0x80b189c GetRematchTrainerIdFromTable thumb_func 0x80b18f0 GetLastBeatenRematchTrainerIdFromTable thumb_func 0x80b1948 ClearTrainerWantRematchState -thumb_func 0x80b1978 -thumb_func 0x80b19a8 +thumb_func 0x80b1978 GetTrainerMatchCallFlag +thumb_func 0x80b19a8 RegisterTrainerInMatchCall thumb_func 0x80b19e0 WasSecondRematchWon -thumb_func 0x80b1a14 -thumb_func 0x80b1a48 -thumb_func 0x80b1a74 +thumb_func 0x80b1a14 HasAtLeastFiveBadges +thumb_func 0x80b1a48 IncrementRematchStepCounter +thumb_func 0x80b1a74 IsRematchStepCounterMaxed thumb_func 0x80b1aa0 TryUpdateRandomTrainerRematches thumb_func 0x80b1ae0 DoesSomeoneWantRematchIn thumb_func 0x80b1b00 IsRematchTrainerIn thumb_func 0x80b1b20 GetRematchTrainerId thumb_func 0x80b1b3c GetLastBeatenRematchTrainerId -thumb_func 0x80b1b58 +thumb_func 0x80b1b58 ShouldTryRematchBattle thumb_func 0x80b1b8c IsTrainerReadyForRematch thumb_func 0x80b1ba8 HandleRematchVarsOnBattleEnd -thumb_func 0x80b1bc4 -thumb_func 0x80b1c04 +thumb_func 0x80b1bc4 ShouldTryGetTrainerScript +thumb_func 0x80b1c04 CountBattledRematchTeams thumb_func 0x80b1c58 thumb_func 0x80b1c9c thumb_func 0x80b1cf8 @@ -6066,164 +6066,164 @@ thumb_func 0x80b29cc thumb_func 0x80b2a00 thumb_func 0x80b2a0c thumb_func 0x80b2a60 -thumb_func 0x80b2b68 -thumb_func 0x80b2cfc +thumb_func 0x80b2b68 Task_BagMenu +thumb_func 0x80b2cfc Cb_PrintCantStoreMail thumb_func 0x80b2d68 -thumb_func 0x80b2e48 -thumb_func 0x80b2e78 +thumb_func 0x80b2e48 CleanupLinkRoomState +thumb_func 0x80b2e78 ExitLinkRoom thumb_func 0x80b2e84 thumb_func 0x80b2f30 thumb_func 0x80b2f58 thumb_func 0x80b2ff0 -thumb_func 0x80b3080 +thumb_func 0x80b3080 PlayerEnteredTradeSeat thumb_func 0x80b30ac thumb_func 0x80b30c0 nullsub_54 -thumb_func 0x80b30c4 +thumb_func 0x80b30c4 ColosseumPlayerSpotTriggered thumb_func 0x80b3100 -thumb_func 0x80b3118 -thumb_func 0x80b3130 +thumb_func 0x80b3118 sp02A_crash_sound +thumb_func 0x80b3130 GetLinkTrainerCardColor thumb_func 0x80b3188 thumb_func 0x80b3204 thumb_func 0x80b3228 thumb_func 0x80b3250 thumb_func 0x80b331c -thumb_func 0x80b3340 -thumb_func 0x80b3458 -thumb_func 0x80b3548 +thumb_func 0x80b3340 CheckForTrainersWantingBattle +thumb_func 0x80b3458 CheckTrainer +thumb_func 0x80b3548 GetTrainerApproachDistance thumb_func 0x80b35f8 GetTrainerApproachDistanceSouth thumb_func 0x80b363c GetTrainerApproachDistanceNorth thumb_func 0x80b3680 GetTrainerApproachDistanceWest thumb_func 0x80b36c4 GetTrainerApproachDistanceEast -thumb_func 0x80b3708 -thumb_func 0x80b37c4 +thumb_func 0x80b3708 CheckPathBetweenTrainerAndPlayer +thumb_func 0x80b37c4 TrainerApproachPlayer thumb_func 0x80b3820 -thumb_func 0x80b3870 +thumb_func 0x80b3870 Task_RunTrainerSeeFuncList thumb_func 0x80b38d0 -thumb_func 0x80b38d4 +thumb_func 0x80b38d4 TrainerExclamationMark thumb_func 0x80b3918 WaitTrainerExclamationMark -thumb_func 0x80b3958 -thumb_func 0x80b39b4 -thumb_func 0x80b3a70 +thumb_func 0x80b3958 TrainerMoveToPlayer +thumb_func 0x80b39b4 PlayerFaceApproachingTrainer +thumb_func 0x80b3a70 WaitPlayerFaceApproachingTrainer thumb_func 0x80b3ab4 -thumb_func 0x80b3ae8 +thumb_func 0x80b3ae8 WaitRevealDisguisedTrainer thumb_func 0x80b3b04 -thumb_func 0x80b3b38 -thumb_func 0x80b3b90 +thumb_func 0x80b3b38 PopOutOfAshHiddenTrainer +thumb_func 0x80b3b90 JumpInPlaceHiddenTrainer thumb_func 0x80b3c04 WaitRevealHiddenTrainer thumb_func 0x80b3c20 thumb_func 0x80b3cd0 -thumb_func 0x80b3d04 -thumb_func 0x80b3d14 -thumb_func 0x80b3d28 -thumb_func 0x80b3d78 -thumb_func 0x80b3db0 -thumb_func 0x80b3de8 -thumb_func 0x80b3e30 -thumb_func 0x80b3e7c -thumb_func 0x80b3f14 -thumb_func 0x80b3f38 +thumb_func 0x80b3d04 EndTrainerApproach +thumb_func 0x80b3d14 Task_DestroyTrainerApproachTask +thumb_func 0x80b3d28 TryPrepareSecondApproachingTrainer +thumb_func 0x80b3d78 FldEff_ExclamationMarkIcon +thumb_func 0x80b3db0 FldEff_QuestionMarkIcon +thumb_func 0x80b3de8 FldEff_HeartIcon +thumb_func 0x80b3e30 SetIconSpriteData +thumb_func 0x80b3e7c SpriteCB_TrainerIcons +thumb_func 0x80b3f14 GetCurrentApproachingTrainerEventObjectId +thumb_func 0x80b3f38 GetChosenApproachingTrainerEventObjectId thumb_func 0x80b3f60 thumb_func 0x80b4010 -thumb_func 0x80b401c -thumb_func 0x80b40dc +thumb_func 0x80b401c GetRoute119WaterTileNum +thumb_func 0x80b40dc CheckFeebas thumb_func 0x80b41f0 thumb_func 0x80b4210 -thumb_func 0x80b4220 -thumb_func 0x80b42dc -thumb_func 0x80b4330 -thumb_func 0x80b43cc -thumb_func 0x80b4450 -thumb_func 0x80b44d0 -thumb_func 0x80b45c0 -thumb_func 0x80b46a4 +thumb_func 0x80b4220 ChooseWildMonIndex_Land +thumb_func 0x80b42dc ChooseWildMonIndex_WaterRock +thumb_func 0x80b4330 ChooseWildMonIndex_Fishing +thumb_func 0x80b43cc ChooseWildMonLevel +thumb_func 0x80b4450 GetCurrentMapWildMonHeaderId +thumb_func 0x80b44d0 PickWildMonNature +thumb_func 0x80b45c0 CreateWildMon +thumb_func 0x80b46a4 TryGenerateWildMon thumb_func 0x80b477c GenerateFishingWildMon -thumb_func 0x80b47b4 -thumb_func 0x80b4834 -thumb_func 0x80b489c -thumb_func 0x80b48c8 -thumb_func 0x80b4994 -thumb_func 0x80b49b8 -thumb_func 0x80b49e0 -thumb_func 0x80b4c64 -thumb_func 0x80b4cd0 -thumb_func 0x80b4e54 -thumb_func 0x80b4e8c -thumb_func 0x80b4ef8 -thumb_func 0x80b4f84 -thumb_func 0x80b4fc8 -thumb_func 0x80b5024 -thumb_func 0x80b508c -thumb_func 0x80b50e8 -thumb_func 0x80b51a8 -thumb_func 0x80b5208 -thumb_func 0x80b5248 -thumb_func 0x80b5270 +thumb_func 0x80b47b4 SetUpMassOutbreakEncounter +thumb_func 0x80b4834 DoMassOutbreakEncounterTest +thumb_func 0x80b489c DoWildEncounterRateDiceRoll +thumb_func 0x80b48c8 DoWildEncounterRateTest +thumb_func 0x80b4994 DoGlobalWildEncounterDiceRoll +thumb_func 0x80b49b8 AreLegendariesInSootopolisPreventingEncounters +thumb_func 0x80b49e0 StandardWildEncounter +thumb_func 0x80b4c64 RockSmashWildEncounter +thumb_func 0x80b4cd0 SweetScentWildEncounter +thumb_func 0x80b4e54 DoesCurrentMapHaveFishingMons +thumb_func 0x80b4e8c FishingWildEncounter +thumb_func 0x80b4ef8 GetLocalWildMon +thumb_func 0x80b4f84 GetLocalWaterMon +thumb_func 0x80b4fc8 UpdateRepelCounter +thumb_func 0x80b5024 IsWildLevelAllowedByRepel +thumb_func 0x80b508c IsAbilityAllowingEncounter +thumb_func 0x80b50e8 TryGetRandomWildMonIndexByType +thumb_func 0x80b51a8 TryGetAbilityInfluencedWildMonIndex +thumb_func 0x80b5208 ApplyFluteEncounterRateMod +thumb_func 0x80b5248 ApplyCleanseTagEncounterRateMod +thumb_func 0x80b5270 FieldEffectStart thumb_func 0x80b52a0 -thumb_func 0x80b52b8 -thumb_func 0x80b52cc -thumb_func 0x80b52e0 -thumb_func 0x80b52f4 +thumb_func 0x80b52b8 FieldEffectCmd_loadtiles +thumb_func 0x80b52cc FieldEffectCmd_loadfadedpal +thumb_func 0x80b52e0 FieldEffectCmd_loadpal +thumb_func 0x80b52f4 FieldEffectCmd_callnative thumb_func 0x80b5308 thumb_func 0x80b530c FieldEffectCmd_loadgfx_callnative thumb_func 0x80b5334 FieldEffectCmd_loadtiles_callnative thumb_func 0x80b5358 FieldEffectCmd_loadfadedpal_callnative thumb_func 0x80b537c FieldEffectScript_ReadWord -thumb_func 0x80b5394 +thumb_func 0x80b5394 FieldEffectScript_LoadTiles thumb_func 0x80b53c4 -thumb_func 0x80b53ec -thumb_func 0x80b5404 +thumb_func 0x80b53ec FieldEffectScript_LoadPalette +thumb_func 0x80b5404 FieldEffectScript_CallNative thumb_func 0x80b5414 -thumb_func 0x80b5420 +thumb_func 0x80b5420 FieldEffectFreeGraphicsResources thumb_func 0x80b5444 FieldEffectStop -thumb_func 0x80b545c -thumb_func 0x80b54c0 +thumb_func 0x80b545c FieldEffectFreeTilesIfUnused +thumb_func 0x80b54c0 FieldEffectFreePaletteIfUnused thumb_func 0x80b5518 FieldEffectActiveListClear thumb_func 0x80b553c FieldEffectActiveListAdd thumb_func 0x80b5568 FieldEffectActiveListRemove thumb_func 0x80b5598 FieldEffectActiveListContains -thumb_func 0x80b55c4 -thumb_func 0x80b5664 -thumb_func 0x80b569c -thumb_func 0x80b56dc -thumb_func 0x80b5740 -thumb_func 0x80b57c8 +thumb_func 0x80b55c4 CreateTrainerSprite +thumb_func 0x80b5664 LoadTrainerGfx_TrainerCard +thumb_func 0x80b569c AddNewGameBirchObject +thumb_func 0x80b56dc CreateMonSprite_PicBox +thumb_func 0x80b5740 CreateMonSprite_FieldMove +thumb_func 0x80b57c8 FreeResourcesAndDestroySprite thumb_func 0x80b57f4 MultiplyInvertedPaletteRGBComponents thumb_func 0x80b5880 MultiplyPaletteRGBComponents -thumb_func 0x80b58f8 +thumb_func 0x80b58f8 FldEff_PokecenterHeal thumb_func 0x80b593c thumb_func 0x80b5960 nullsub_57 thumb_func 0x80b596c PokecenterHealEffect_0 thumb_func 0x80b59a8 PokecenterHealEffect_1 thumb_func 0x80b59e4 thumb_func 0x80b5a0c -thumb_func 0x80b5a4c +thumb_func 0x80b5a4c FldEff_HallOfFameRecord thumb_func 0x80b5a88 thumb_func 0x80b5aac nullsub_58 -thumb_func 0x80b5ab8 +thumb_func 0x80b5ab8 HallOfFameRecordEffect_0 thumb_func 0x80b5b2c HallOfFameRecordEffect_1 thumb_func 0x80b5b5c -thumb_func 0x80b5b84 -thumb_func 0x80b5bc4 +thumb_func 0x80b5b84 HallOfFameRecordEffect_3 +thumb_func 0x80b5bc4 CreatePokeballGlowSprite thumb_func 0x80b5c18 -thumb_func 0x80b5c34 -thumb_func 0x80b5ccc -thumb_func 0x80b5d00 -thumb_func 0x80b5e40 +thumb_func 0x80b5c34 PokeballGlowEffect_0 +thumb_func 0x80b5ccc PokeballGlowEffect_1 +thumb_func 0x80b5d00 PokeballGlowEffect_2 +thumb_func 0x80b5e40 PokeballGlowEffect_3 thumb_func 0x80b5f34 PokeballGlowEffect_4 -thumb_func 0x80b5f50 -thumb_func 0x80b5f58 +thumb_func 0x80b5f50 PokeballGlowEffect_5 +thumb_func 0x80b5f58 PokeballGlowEffect_6 thumb_func 0x80b5f7c nullsub_201 thumb_func 0x80b5f80 SpriteCB_PokeballGlow -thumb_func 0x80b5fa8 -thumb_func 0x80b6004 -thumb_func 0x80b6044 +thumb_func 0x80b5fa8 PokecenterHealEffectHelper +thumb_func 0x80b6004 SpriteCB_PokecenterMonitor +thumb_func 0x80b6044 HallOfFameRecordEffectHelper thumb_func 0x80b60c8 SpriteCB_HallOfFameMonitor thumb_func 0x80b6134 -thumb_func 0x80b6154 -thumb_func 0x80b617c -thumb_func 0x80b61fc -thumb_func 0x80b6264 -thumb_func 0x80b62c0 +thumb_func 0x80b6154 mapldr_080842E8 +thumb_func 0x80b617c task00_8084310 +thumb_func 0x80b61fc mapldr_08084390 +thumb_func 0x80b6264 c3_080843F8 +thumb_func 0x80b62c0 PrintAllVariableNumsOnCardPage2 thumb_func 0x80b62ec thumb_func 0x80b6324 thumb_func 0x80b63cc @@ -6243,29 +6243,29 @@ thumb_func 0x80b6700 thumb_func 0x80b6710 thumb_func 0x80b675c thumb_func 0x80b67a8 -thumb_func 0x80b67b8 +thumb_func 0x80b67b8 CB2_Pokenav thumb_func 0x80b680c thumb_func 0x80b6834 thumb_func 0x80b686c -thumb_func 0x80b68e8 -thumb_func 0x80b6928 +thumb_func 0x80b68e8 MovementAction_AcroEndWheelieMoveLeft_Step0 +thumb_func 0x80b6928 MovementAction_AcroEndWheelieMoveRight_Step0 thumb_func 0x80b6988 thumb_func 0x80b69c8 thumb_func 0x80b6a28 thumb_func 0x80b6a4c -thumb_func 0x80b6aa4 +thumb_func 0x80b6aa4 FldEff_UseWaterfall thumb_func 0x80b6adc thumb_func 0x80b6b0c thumb_func 0x80b6b28 -thumb_func 0x80b6b48 +thumb_func 0x80b6b48 waterfall_1_do_anim_probably thumb_func 0x80b6b84 waterfall_2_wait_anim_finish_probably thumb_func 0x80b6ba8 thumb_func 0x80b6bd0 -thumb_func 0x80b6c28 +thumb_func 0x80b6c28 FldEff_UseDive thumb_func 0x80b6c64 -thumb_func 0x80b6c9c -thumb_func 0x80b6cb0 -thumb_func 0x80b6cd8 +thumb_func 0x80b6c9c dive_1_lock +thumb_func 0x80b6cb0 dive_2_unknown +thumb_func 0x80b6cd8 dive_3_unknown thumb_func 0x80b6d30 thumb_func 0x80b6d48 thumb_func 0x80b6da4 @@ -6280,7 +6280,7 @@ thumb_func 0x80b7044 thumb_func 0x80b7074 thumb_func 0x80b70c0 thumb_func 0x80b7114 -thumb_func 0x80b714c +thumb_func 0x80b714c FldEff_LavaridgeGymWarp thumb_func 0x80b71b0 thumb_func 0x80b71cc thumb_func 0x80b71e4 @@ -6289,29 +6289,29 @@ thumb_func 0x80b7270 thumb_func 0x80b72ec thumb_func 0x80b7324 thumb_func 0x80b734c -thumb_func 0x80b73a0 +thumb_func 0x80b73a0 FldEff_PopOutOfAsh thumb_func 0x80b7404 -thumb_func 0x80b7420 +thumb_func 0x80b7420 StartEscapeRopeFieldEffect thumb_func 0x80b743c -thumb_func 0x80b746c -thumb_func 0x80b748c -thumb_func 0x80b75a0 +thumb_func 0x80b746c EscapeRopeFieldEffect_Step0 +thumb_func 0x80b748c EscapeRopeFieldEffect_Step1 +thumb_func 0x80b75a0 CB2_RayquazaScene thumb_func 0x80b75ec thumb_func 0x80b761c thumb_func 0x80b7640 thumb_func 0x80b7720 thumb_func 0x80b7734 -thumb_func 0x80b7764 -thumb_func 0x80b778c -thumb_func 0x80b781c -thumb_func 0x80b78f0 -thumb_func 0x80b7958 +thumb_func 0x80b7764 TeleportFieldEffectTask1 +thumb_func 0x80b778c TeleportFieldEffectTask2 +thumb_func 0x80b781c TeleportFieldEffectTask3 +thumb_func 0x80b78f0 TeleportFieldEffectTask4 +thumb_func 0x80b7958 mapldr_08085D88 thumb_func 0x80b79a8 thumb_func 0x80b79d8 thumb_func 0x80b7a64 thumb_func 0x80b7b68 -thumb_func 0x80b7bf4 -thumb_func 0x80b7c50 +thumb_func 0x80b7bf4 FldEff_FieldMoveShowMon +thumb_func 0x80b7c50 FldEff_FieldMoveShowMonInit thumb_func 0x80b7cac thumb_func 0x80b7cdc thumb_func 0x80b7d50 @@ -6319,7 +6319,7 @@ thumb_func 0x80b7db8 thumb_func 0x80b7e44 thumb_func 0x80b7e74 thumb_func 0x80b7ec8 -thumb_func 0x80b7f10 +thumb_func 0x80b7f10 overworld_bg_setup_2 thumb_func 0x80b7f64 thumb_func 0x80b7f8c thumb_func 0x80b7fcc @@ -6340,7 +6340,7 @@ thumb_func 0x80b83b8 thumb_func 0x80b8418 thumb_func 0x80b845c thumb_func 0x80b8478 -thumb_func 0x80b849c +thumb_func 0x80b849c FldEff_UseSurf thumb_func 0x80b84dc thumb_func 0x80b850c thumb_func 0x80b856c @@ -6348,9 +6348,9 @@ thumb_func 0x80b85b8 thumb_func 0x80b8600 thumb_func 0x80b867c thumb_func 0x80b86f0 -thumb_func 0x80b8824 +thumb_func 0x80b8824 FldEff_NPCFlyOut thumb_func 0x80b8880 -thumb_func 0x80b88fc +thumb_func 0x80b88fc FldEff_UseFly thumb_func 0x80b892c thumb_func 0x80b895c thumb_func 0x80b89b4 @@ -6369,7 +6369,7 @@ thumb_func 0x80b8cd4 thumb_func 0x80b8d94 thumb_func 0x80b8e08 thumb_func 0x80b8eec -thumb_func 0x80b8f18 +thumb_func 0x80b8f18 FldEff_FlyIn thumb_func 0x80b8f2c thumb_func 0x80b8f5c thumb_func 0x80b9010 @@ -6384,50 +6384,50 @@ thumb_func 0x80b9328 thumb_func 0x80b9340 thumb_func 0x80b9370 thumb_func 0x80b9380 -thumb_func 0x80b93ac +thumb_func 0x80b93ac SpawnLinkPlayerEventObject thumb_func 0x80b9434 thumb_func 0x80b947c thumb_func 0x80b9510 -thumb_func 0x80b9580 -thumb_func 0x80b9634 -thumb_func 0x80b9710 -thumb_func 0x80b9750 -thumb_func 0x80b9790 -thumb_func 0x80b9800 +thumb_func 0x80b9580 Fldeff_MoveDeoxysRock +thumb_func 0x80b9634 Fldeff_MoveDeoxysRock_Step +thumb_func 0x80b9710 ScanlineEffect_Stop +thumb_func 0x80b9750 ScanlineEffect_Clear +thumb_func 0x80b9790 ScanlineEffect_SetParams +thumb_func 0x80b9800 ScanlineEffect_InitHBlankDmaTransfer thumb_func 0x80b988c CopyValue16Bit thumb_func 0x80b98ac CopyValue32Bit -thumb_func 0x80b98cc +thumb_func 0x80b98cc TaskFunc_UpdateWavePerFrame thumb_func 0x80b9a94 GenerateWave -thumb_func 0x80b9adc +thumb_func 0x80b9adc ScanlineEffect_InitWave thumb_func 0x80b9c08 thumb_func 0x80b9c20 -thumb_func 0x80b9c34 +thumb_func 0x80b9c34 CB2_InitOptionMenu thumb_func 0x80b9f94 -thumb_func 0x80b9fc4 -thumb_func 0x80ba1bc -thumb_func 0x80ba260 -thumb_func 0x80ba290 -thumb_func 0x80ba2c0 +thumb_func 0x80b9fc4 Task_OptionMenuProcessInput +thumb_func 0x80ba1bc Task_OptionMenuSave +thumb_func 0x80ba260 Task_OptionMenuFadeOut +thumb_func 0x80ba290 HighlightOptionMenuItem +thumb_func 0x80ba2c0 DrawOptionMenuChoice thumb_func 0x80ba334 thumb_func 0x80ba390 thumb_func 0x80ba3e4 thumb_func 0x80ba40c thumb_func 0x80ba468 thumb_func 0x80ba490 -thumb_func 0x80ba4ec +thumb_func 0x80ba4ec Sound_ProcessInput thumb_func 0x80ba51c -thumb_func 0x80ba584 +thumb_func 0x80ba584 FrameType_ProcessInput thumb_func 0x80ba634 thumb_func 0x80ba724 thumb_func 0x80ba780 -thumb_func 0x80ba800 +thumb_func 0x80ba800 DrawTextOption thumb_func 0x80ba834 thumb_func 0x80ba890 -thumb_func 0x80baa0c -thumb_func 0x80baa94 +thumb_func 0x80baa0c ResetPokedex +thumb_func 0x80baa94 ResetPokedexScrollPositions thumb_func 0x80baaac thumb_func 0x80baac0 ResetPokedexView -thumb_func 0x80bac70 +thumb_func 0x80bac70 CB2_Pokedex thumb_func 0x80baeb0 thumb_func 0x80baec8 thumb_func 0x80baf10 @@ -6440,36 +6440,36 @@ thumb_func 0x80bb524 thumb_func 0x80bb5ac thumb_func 0x80bb5f4 thumb_func 0x80bb7e4 -thumb_func 0x80bb834 +thumb_func 0x80bb834 HandleButtonPress_StartMenu thumb_func 0x80bba10 thumb_func 0x80bba9c thumb_func 0x80bbb18 thumb_func 0x80bbbb8 thumb_func 0x80bbc50 -thumb_func 0x80bbf80 +thumb_func 0x80bbf80 LoadPokedexBgPalette thumb_func 0x80bbfcc thumb_func 0x80bc010 -thumb_func 0x80bc568 -thumb_func 0x80bc5c0 -thumb_func 0x80bc890 -thumb_func 0x80bc930 +thumb_func 0x80bc568 PrintMonDexNumAndName +thumb_func 0x80bc5c0 CreateMonListEntry +thumb_func 0x80bc890 CreateMonDexNum +thumb_func 0x80bc930 CreateCaughtBall thumb_func 0x80bc978 thumb_func 0x80bca2c -thumb_func 0x80bca54 +thumb_func 0x80bca54 CreateInitialPokemonSprites thumb_func 0x80bcba4 -thumb_func 0x80bcd48 +thumb_func 0x80bcd48 CreateNewPokemonSprite thumb_func 0x80bce3c thumb_func 0x80bd070 thumb_func 0x80bd0d0 thumb_func 0x80bd1e0 -thumb_func 0x80bd22c +thumb_func 0x80bd22c GetPokemonSpriteToDisplay thumb_func 0x80bd26c -thumb_func 0x80bd31c +thumb_func 0x80bd31c CreateInterfaceSprites thumb_func 0x80bdbe8 nullsub_59 thumb_func 0x80bdbec thumb_func 0x80bdc10 thumb_func 0x80bdc80 -thumb_func 0x80bdda4 +thumb_func 0x80bdda4 SpriteCB_Scrollbar thumb_func 0x80bddf8 thumb_func 0x80bdef8 thumb_func 0x80bdf20 @@ -6498,18 +6498,18 @@ thumb_func 0x80bf598 thumb_func 0x80bf5b0 thumb_func 0x80bf5c8 thumb_func 0x80bf638 -thumb_func 0x80bf6b0 +thumb_func 0x80bf6b0 CreateDexDisplayMonDataTask thumb_func 0x80bf6f4 thumb_func 0x80bf9e4 -thumb_func 0x80bfa88 +thumb_func 0x80bfa88 blockset_load_palette_to_gpu thumb_func 0x80bfb28 thumb_func 0x80bfb68 -thumb_func 0x80bfb80 -thumb_func 0x80bfbbc +thumb_func 0x80bfb80 GetPokedexHeightWeight +thumb_func 0x80bfbbc GetSetPokedexFlag thumb_func 0x80bfd4c GetNationalPokedexCount -thumb_func 0x80bfd9c +thumb_func 0x80bfd9c GetHoennPokedexCount thumb_func 0x80bfdf4 -thumb_func 0x80bfe3c +thumb_func 0x80bfe3c HasAllHoennMons thumb_func 0x80bfe70 thumb_func 0x80bfe9c thumb_func 0x80bff08 @@ -6522,9 +6522,9 @@ thumb_func 0x80c0288 thumb_func 0x80c0318 thumb_func 0x80c0364 thumb_func 0x80c03c0 -thumb_func 0x80c03f4 +thumb_func 0x80c03f4 CreateMonSpriteFromNationalDexNumber thumb_func 0x80c0450 -thumb_func 0x80c0488 +thumb_func 0x80c0488 save_write_to_flash thumb_func 0x80c07b4 thumb_func 0x80c07cc thumb_func 0x80c0810 @@ -6546,7 +6546,7 @@ thumb_func 0x80c1440 thumb_func 0x80c1538 thumb_func 0x80c1684 thumb_func 0x80c16b8 -thumb_func 0x80c175c +thumb_func 0x80c175c Cb_JumpBox thumb_func 0x80c1838 thumb_func 0x80c1918 thumb_func 0x80c19bc @@ -6555,144 +6555,144 @@ thumb_func 0x80c1af0 thumb_func 0x80c1b38 thumb_func 0x80c1b84 thumb_func 0x80c1c38 -thumb_func 0x80c1cbc +thumb_func 0x80c1cbc VblankCb_TrainerCard thumb_func 0x80c1d00 HblankCb_TrainerCard -thumb_func 0x80c1d3c +thumb_func 0x80c1d3c CB2_TrainerCard thumb_func 0x80c1d54 thumb_func 0x80c1d8c thumb_func 0x80c2104 -thumb_func 0x80c22b4 -thumb_func 0x80c2414 -thumb_func 0x80c242c -thumb_func 0x80c2470 +thumb_func 0x80c22b4 CB2_InitTrainerCard +thumb_func 0x80c2414 GetCappedGameStat +thumb_func 0x80c242c HasAllFrontierSymbols +thumb_func 0x80c2470 CountPlayerTrainerStars thumb_func 0x80c24b4 GetRubyTrainerStars -thumb_func 0x80c24f4 -thumb_func 0x80c2650 -thumb_func 0x80c26d4 -thumb_func 0x80c2750 -thumb_func 0x80c27c0 +thumb_func 0x80c24f4 SetPlayerCardData +thumb_func 0x80c2650 TrainerCard_GenerateCardForLinkPlayer +thumb_func 0x80c26d4 TrainerCard_GenerateCardForPlayer +thumb_func 0x80c2750 CopyTrainerCardData +thumb_func 0x80c27c0 DecompressPicFromTable_2 thumb_func 0x80c28a4 thumb_func 0x80c2918 -thumb_func 0x80c297c -thumb_func 0x80c29b8 -thumb_func 0x80c2a34 +thumb_func 0x80c297c HandleGpuRegs +thumb_func 0x80c29b8 InitBgsAndWindows +thumb_func 0x80c2a34 SetTrainerCardCb2 thumb_func 0x80c2a44 thumb_func 0x80c2a68 -thumb_func 0x80c2ae0 +thumb_func 0x80c2ae0 PrintStringsOnCardPage2 thumb_func 0x80c2b78 thumb_func 0x80c2ba4 -thumb_func 0x80c2c5c +thumb_func 0x80c2c5c Task_PrintTestData thumb_func 0x80c2d14 -thumb_func 0x80c2e20 +thumb_func 0x80c2e20 GetCaughtMonsCount thumb_func 0x80c2e40 -thumb_func 0x80c2f5c +thumb_func 0x80c2f5c WindowFunc_DrawDialogFrameWithCustomTileAndPalette thumb_func 0x80c310c thumb_func 0x80c31fc thumb_func 0x80c323c -thumb_func 0x80c32c0 +thumb_func 0x80c32c0 PrintLinkResultsNumsOnCard thumb_func 0x80c3330 -thumb_func 0x80c33a0 +thumb_func 0x80c33a0 PrintHofTimeOnCard thumb_func 0x80c340c -thumb_func 0x80c34b8 +thumb_func 0x80c34b8 PrintTradesNumOnCard thumb_func 0x80c34e4 -thumb_func 0x80c3584 +thumb_func 0x80c3584 PrintUnionNumOnCard thumb_func 0x80c35c0 -thumb_func 0x80c364c +thumb_func 0x80c364c PrintBerryCrushNumOnCard thumb_func 0x80c3684 -thumb_func 0x80c3710 +thumb_func 0x80c3710 PrintPokeblocksNumOnCard thumb_func 0x80c3760 thumb_func 0x80c37ec thumb_func 0x80c3828 -thumb_func 0x80c38b4 +thumb_func 0x80c38b4 PrintBattleFacilityNumsOnCard thumb_func 0x80c395c -thumb_func 0x80c3a70 +thumb_func 0x80c3a70 TrainerCard_PrintPokemonIconsOnCard thumb_func 0x80c3b0c thumb_func 0x80c3be4 thumb_func 0x80c3c6c thumb_func 0x80c3cc8 -thumb_func 0x80c3ce4 +thumb_func 0x80c3ce4 SetCardBgsAndPals thumb_func 0x80c3e84 thumb_func 0x80c3ef4 -thumb_func 0x80c3f64 +thumb_func 0x80c3f64 TrainerCard_PrintStarsAndBadgesOnCard thumb_func 0x80c4080 thumb_func 0x80c41fc -thumb_func 0x80c4238 +thumb_func 0x80c4238 GetTrainerCardStars thumb_func 0x80c424c thumb_func 0x80c4274 -thumb_func 0x80c4294 +thumb_func 0x80c4294 Phase2Task_GridSquares thumb_func 0x80c42cc thumb_func 0x80c430c thumb_func 0x80c443c thumb_func 0x80c4550 thumb_func 0x80c45b8 -thumb_func 0x80c46e4 +thumb_func 0x80c46e4 ResetGpuRegs thumb_func 0x80c4710 -thumb_func 0x80c4798 +thumb_func 0x80c4798 ShowTrainerCardInLink thumb_func 0x80c47ec -thumb_func 0x80c4858 +thumb_func 0x80c4858 GetSetCardType thumb_func 0x80c48d0 VersionToCardType thumb_func 0x80c48f4 -thumb_func 0x80c49cc -thumb_func 0x80c4ac0 -thumb_func 0x80c4ad4 -thumb_func 0x80c4aec -thumb_func 0x80c4be0 -thumb_func 0x80c4c0c -thumb_func 0x80c4c3c -thumb_func 0x80c4ca8 -thumb_func 0x80c4d34 -thumb_func 0x80c4d48 -thumb_func 0x80c4d6c -thumb_func 0x80c4d80 -thumb_func 0x80c5008 -thumb_func 0x80c50f8 -thumb_func 0x80c5164 -thumb_func 0x80c51d0 -thumb_func 0x80c5230 -thumb_func 0x80c52a0 -thumb_func 0x80c5344 -thumb_func 0x80c54d4 -thumb_func 0x80c56b4 -thumb_func 0x80c57bc +thumb_func 0x80c49cc ResetGpuRegsAndBgs +thumb_func 0x80c4ac0 ShowFrontierPass +thumb_func 0x80c4ad4 LeaveFrontierPass +thumb_func 0x80c4aec AllocateFrontierPassData +thumb_func 0x80c4be0 FreeFrontierPassData +thumb_func 0x80c4c0c AllocateFrontierPassGfx +thumb_func 0x80c4c3c FreeFrontierPassGfx +thumb_func 0x80c4ca8 VblankCb_FrontierPass +thumb_func 0x80c4d34 CB2_FrontierPass +thumb_func 0x80c4d48 CB2_InitFrontierPass +thumb_func 0x80c4d6c CB2_HideFrontierPass +thumb_func 0x80c4d80 InitFrontierPass +thumb_func 0x80c5008 HideFrontierPass +thumb_func 0x80c50f8 GetCursorAreaFromCoords +thumb_func 0x80c5164 CB2_ReshowFrontierPass +thumb_func 0x80c51d0 CB2_ReturnFromRecord +thumb_func 0x80c5230 CB2_ShowFrontierPassFeature +thumb_func 0x80c52a0 TryCallPassAreaFunction +thumb_func 0x80c5344 Task_HandleFrontierPassInput +thumb_func 0x80c54d4 DrawMultichoiceMenu +thumb_func 0x80c56b4 Task_Truck3 +thumb_func 0x80c57bc PrintAreaDescription thumb_func 0x80c5844 thumb_func 0x80c59f0 thumb_func 0x80c5b88 -thumb_func 0x80c5bc8 -thumb_func 0x80c5ce8 +thumb_func 0x80c5bc8 LoadCursorAndSymbolSprites +thumb_func 0x80c5ce8 FreeCursorAndSymbolSprites thumb_func 0x80c5d3c nullsub_601 -thumb_func 0x80c5d40 -thumb_func 0x80c5d84 -thumb_func 0x80c5db8 +thumb_func 0x80c5d40 ShowFrontierMap +thumb_func 0x80c5d84 FreeFrontierMap +thumb_func 0x80c5db8 InitFrontierMap thumb_func 0x80c5f98 -thumb_func 0x80c60a8 +thumb_func 0x80c60a8 Task_HandleFrontierMap thumb_func 0x80c61d4 MapNumToFrontierFacilityId -thumb_func 0x80c6260 -thumb_func 0x80c6480 -thumb_func 0x80c655c +thumb_func 0x80c6260 InitFrontierMapSprites +thumb_func 0x80c6480 PrintOnFrontierMap +thumb_func 0x80c655c HandleFrontierMapCursorMove thumb_func 0x80c666c thumb_func 0x80c66a4 thumb_func 0x80c6738 -thumb_func 0x80c682c -thumb_func 0x80c6860 -thumb_func 0x80c6894 -thumb_func 0x80c68dc -thumb_func 0x80c6938 -thumb_func 0x80c6950 -thumb_func 0x80c6988 +thumb_func 0x80c682c CountMonsInBox +thumb_func 0x80c6860 GetFirstFreeBoxSpot +thumb_func 0x80c6894 CountPartyNonEggMons +thumb_func 0x80c68dc CountPartyAliveNonEggMonsExcept +thumb_func 0x80c6938 CountPartyAliveNonEggMons_IgnoreVar0x8004Slot +thumb_func 0x80c6950 CountPartyMons +thumb_func 0x80c6988 StringCopyAndFillWithSpaces thumb_func 0x80c69b4 thumb_func 0x80c6a30 -thumb_func 0x80c6af4 -thumb_func 0x80c6e04 -thumb_func 0x80c6e34 +thumb_func 0x80c6af4 Task_PokemonStorageSystemPC +thumb_func 0x80c6e04 ShowPokemonStorageSystemPC +thumb_func 0x80c6e34 FieldCb_ReturnToPcMenu thumb_func 0x80c6e88 -thumb_func 0x80c6f10 +thumb_func 0x80c6f10 Cb2_ExitPSS thumb_func 0x80c6f3c -thumb_func 0x80c7008 +thumb_func 0x80c7008 ResetPokemonStorageSystem thumb_func 0x80c7080 thumb_func 0x80c7128 thumb_func 0x80c716c -thumb_func 0x80c717c -thumb_func 0x80c7188 +thumb_func 0x80c717c WallyHandleGetRawMonData +thumb_func 0x80c7188 HandleBoxChooseSelectionInput thumb_func 0x80c71f0 thumb_func 0x80c73d0 thumb_func 0x80c743c @@ -6700,90 +6700,90 @@ thumb_func 0x80c7470 thumb_func 0x80c74a0 thumb_func 0x80c7528 thumb_func 0x80c7590 -thumb_func 0x80c75c4 +thumb_func 0x80c75c4 VblankCb_PSS thumb_func 0x80c75f0 -thumb_func 0x80c7610 -thumb_func 0x80c7688 -thumb_func 0x80c76ec +thumb_func 0x80c7610 Cb2_EnterPSS +thumb_func 0x80c7688 Cb2_ReturnToPSS +thumb_func 0x80c76ec ResetAllBgCoords thumb_func 0x80c7734 thumb_func 0x80c77b8 thumb_func 0x80c77e8 thumb_func 0x80c781c SetPSSCallback -thumb_func 0x80c7844 -thumb_func 0x80c7a48 -thumb_func 0x80c7a94 -thumb_func 0x80c7b48 -thumb_func 0x80c8044 -thumb_func 0x80c8084 -thumb_func 0x80c8100 -thumb_func 0x80c842c +thumb_func 0x80c7844 Cb_InitPSS +thumb_func 0x80c7a48 Cb_ShowPSS +thumb_func 0x80c7a94 Cb_ReshowPSS +thumb_func 0x80c7b48 Cb_MainPSS +thumb_func 0x80c8044 Cb_ShowPartyPokemon +thumb_func 0x80c8084 Cb_HidePartyPokemon +thumb_func 0x80c8100 Cb_OnSelectedMon +thumb_func 0x80c842c Cb_MoveMon thumb_func 0x80c8488 -thumb_func 0x80c84e4 -thumb_func 0x80c852c -thumb_func 0x80c8614 -thumb_func 0x80c8750 -thumb_func 0x80c8940 -thumb_func 0x80c89c4 -thumb_func 0x80c8a78 -thumb_func 0x80c8b34 -thumb_func 0x80c8c4c -thumb_func 0x80c8d34 -thumb_func 0x80c8de8 -thumb_func 0x80c8f0c +thumb_func 0x80c84e4 Cb_ShiftMon +thumb_func 0x80c852c Cb_WithdrawMon +thumb_func 0x80c8614 Cb_DepositMenu +thumb_func 0x80c8750 Cb_ReleaseMon +thumb_func 0x80c8940 Cb_ShowMarkMenu +thumb_func 0x80c89c4 Cb_TakeItemForMoving +thumb_func 0x80c8a78 Cb_GiveMovingItemToMon +thumb_func 0x80c8b34 Cb_ItemToBag +thumb_func 0x80c8c4c Cb_SwitchSelectedItem +thumb_func 0x80c8d34 Cb_ShowItemInfo +thumb_func 0x80c8de8 Cb_CloseBoxWhileHoldingItem +thumb_func 0x80c8f0c Cb_HandleMovingMonFromParty thumb_func 0x80c8f54 -thumb_func 0x80c8fc8 -thumb_func 0x80c90c0 +thumb_func 0x80c8fc8 Cb_HandleBoxOptions +thumb_func 0x80c90c0 Cb_HandleWallpapers thumb_func 0x80c9274 -thumb_func 0x80c9364 -thumb_func 0x80c93c4 -thumb_func 0x80c9424 -thumb_func 0x80c9484 +thumb_func 0x80c9364 BattleSetup_GetTerrainId +thumb_func 0x80c93c4 Cb_ShowMonSummary +thumb_func 0x80c9424 Cb_GiveItemFromBag +thumb_func 0x80c9484 Cb_OnCloseBoxPressed thumb_func 0x80c95b8 thumb_func 0x80c96ec -thumb_func 0x80c97e0 -thumb_func 0x80c983c -thumb_func 0x80c9860 -thumb_func 0x80c989c -thumb_func 0x80c98b8 +thumb_func 0x80c97e0 GiveChosenBagItem +thumb_func 0x80c983c FreePSSData +thumb_func 0x80c9860 SetScrollingBackground +thumb_func 0x80c989c ScrollBackground +thumb_func 0x80c98b8 LoadPSSMenuGfx thumb_func 0x80c9918 -thumb_func 0x80c993c +thumb_func 0x80c993c LoadWaveformSpritePalette thumb_func 0x80c994c thumb_func 0x80c99c8 thumb_func 0x80c9a38 -thumb_func 0x80c9aa4 -thumb_func 0x80c9ad4 +thumb_func 0x80c9aa4 RefreshCursorMonData +thumb_func 0x80c9ad4 BoxSetMosaic thumb_func 0x80c9b2c thumb_func 0x80c9b44 -thumb_func 0x80c9b8c -thumb_func 0x80c9cc0 +thumb_func 0x80c9b8c LoadCursorMonSprite +thumb_func 0x80c9cc0 LoadCursorMonGfx thumb_func 0x80c9d70 thumb_func 0x80c9ec0 thumb_func 0x80c9f68 -thumb_func 0x80ca038 -thumb_func 0x80ca070 -thumb_func 0x80ca0ec -thumb_func 0x80ca12c +thumb_func 0x80ca038 SetUpShowPartyMenu +thumb_func 0x80ca070 ShowPartyMenu +thumb_func 0x80ca0ec SetUpHidePartyMenu +thumb_func 0x80ca12c HidePartyMenu thumb_func 0x80ca1e8 thumb_func 0x80ca224 thumb_func 0x80ca250 thumb_func 0x80ca278 thumb_func 0x80ca2d8 thumb_func 0x80ca30c -thumb_func 0x80ca384 -thumb_func 0x80ca3b0 -thumb_func 0x80ca3d4 +thumb_func 0x80ca384 PokecenterHealEffect_3 +thumb_func 0x80ca3b0 SetUpDoShowPartyMenu +thumb_func 0x80ca3d4 DoShowPartyMenu thumb_func 0x80ca444 thumb_func 0x80ca480 -thumb_func 0x80ca4bc +thumb_func 0x80ca4bc PrintStorageActionText thumb_func 0x80ca600 thumb_func 0x80ca638 thumb_func 0x80ca64c -thumb_func 0x80ca680 +thumb_func 0x80ca680 AddWallpapersMenu thumb_func 0x80ca714 thumb_func 0x80ca720 thumb_func 0x80ca778 thumb_func 0x80ca820 -thumb_func 0x80ca838 +thumb_func 0x80ca838 CreateMovingMonIcon thumb_func 0x80ca89c thumb_func 0x80ca9b4 thumb_func 0x80caa64 @@ -6793,10 +6793,10 @@ thumb_func 0x80cab24 DestroyAllIconsInRow thumb_func 0x80cab6c thumb_func 0x80cad40 thumb_func 0x80cadf8 -thumb_func 0x80caf64 +thumb_func 0x80caf64 SetBoxSpeciesAndPersonalities thumb_func 0x80cafec DestroyBoxMonIconAtPosition thumb_func 0x80cb020 SetBoxMonIconObjMode -thumb_func 0x80cb05c +thumb_func 0x80cb05c CreatePartyMonsSprites thumb_func 0x80cb1c4 thumb_func 0x80cb230 thumb_func 0x80cb244 @@ -6820,17 +6820,17 @@ thumb_func 0x80cb974 thumb_func 0x80cb998 thumb_func 0x80cba54 thumb_func 0x80cbaa4 -thumb_func 0x80cbb88 +thumb_func 0x80cbb88 DestroyBoxMonIcon thumb_func 0x80cbba0 thumb_func 0x80cbbd0 thumb_func 0x80cbbe4 thumb_func 0x80cbcd8 SetUpScrollToBox -thumb_func 0x80cbdc0 +thumb_func 0x80cbdc0 ScrollToBox thumb_func 0x80cbeb8 -thumb_func 0x80cbef4 -thumb_func 0x80cbf24 -thumb_func 0x80cc014 -thumb_func 0x80cc274 +thumb_func 0x80cbef4 SetWallpaperForCurrentBox +thumb_func 0x80cbf24 DoWallpaperGfxChange +thumb_func 0x80cc014 LoadWallpaperGfx +thumb_func 0x80cc274 WaitForWallpaperGfxLoad thumb_func 0x80cc2b0 thumb_func 0x80cc354 thumb_func 0x80cc3c4 @@ -6862,54 +6862,54 @@ thumb_func 0x80cd494 thumb_func 0x80cd4a8 thumb_func 0x80cd4b4 InitMonPlaceChange thumb_func 0x80cd4e0 -thumb_func 0x80cd528 +thumb_func 0x80cd528 DoMonPlaceChange thumb_func 0x80cd538 -thumb_func 0x80cd548 -thumb_func 0x80cd5d8 -thumb_func 0x80cd654 +thumb_func 0x80cd548 MonPlaceChange_Move +thumb_func 0x80cd5d8 MonPlaceChange_Place +thumb_func 0x80cd654 MonPlaceChange_Shift thumb_func 0x80cd730 thumb_func 0x80cd740 thumb_func 0x80cd750 thumb_func 0x80cd784 -thumb_func 0x80cd7b4 -thumb_func 0x80cd828 +thumb_func 0x80cd7b4 MoveMon +thumb_func 0x80cd828 PlaceMon thumb_func 0x80cd888 -thumb_func 0x80cd894 -thumb_func 0x80cd908 -thumb_func 0x80cd964 -thumb_func 0x80cd98c -thumb_func 0x80cda18 -thumb_func 0x80cdaa8 +thumb_func 0x80cd894 SetMovedMonData +thumb_func 0x80cd908 SetPlacedMonData +thumb_func 0x80cd964 PurgeMonOrBoxMon +thumb_func 0x80cd98c SetShiftedMonData +thumb_func 0x80cda18 TryStorePartyMonInBox +thumb_func 0x80cdaa8 WallyHandleStatusIconUpdate thumb_func 0x80cdacc thumb_func 0x80cdb24 -thumb_func 0x80cdb54 +thumb_func 0x80cdb54 ReleaseMon thumb_func 0x80cdba0 thumb_func 0x80cdbcc -thumb_func 0x80cdc1c -thumb_func 0x80cdd98 -thumb_func 0x80cddfc +thumb_func 0x80cdc1c InitCanRelaseMonVars +thumb_func 0x80cdd98 AtLeastThreeUsableMons +thumb_func 0x80cddfc RunCanReleaseMon thumb_func 0x80cdfdc thumb_func 0x80ce00c thumb_func 0x80ce064 thumb_func 0x80ce160 -thumb_func 0x80ce188 -thumb_func 0x80ce224 -thumb_func 0x80ce2ac -thumb_func 0x80ce2e8 +thumb_func 0x80ce188 CompactPartySlots +thumb_func 0x80ce224 SetMonMarkings +thumb_func 0x80ce2ac CanMovePartyMon +thumb_func 0x80ce2e8 CanShiftMon thumb_func 0x80ce34c thumb_func 0x80ce358 IsCursorOnBox thumb_func 0x80ce374 IsCursorOnCloseBox thumb_func 0x80ce3a0 IsCursorInBox thumb_func 0x80ce3bc thumb_func 0x80ce458 -thumb_func 0x80ce47c -thumb_func 0x80ce948 -thumb_func 0x80ce984 -thumb_func 0x80cebf0 -thumb_func 0x80ced2c -thumb_func 0x80cee40 -thumb_func 0x80cf060 -thumb_func 0x80cf154 +thumb_func 0x80ce47c SetCursorMonData +thumb_func 0x80ce948 HandleInput_InBox +thumb_func 0x80ce984 InBoxInput_Normal +thumb_func 0x80cebf0 InBoxInput_GrabbingMultiple +thumb_func 0x80ced2c InBoxInput_MovingMultiple +thumb_func 0x80cee40 HandleInput_InParty +thumb_func 0x80cf060 HandleInput_OnBox +thumb_func 0x80cf154 HandleInput_OnButtons thumb_func 0x80cf268 thumb_func 0x80cf2b4 AddBoxMenu thumb_func 0x80cf2d8 @@ -6926,13 +6926,13 @@ thumb_func 0x80cf700 thumb_func 0x80cf724 thumb_func 0x80cf748 thumb_func 0x80cf76c InitMenu -thumb_func 0x80cf7b0 +thumb_func 0x80cf7b0 SetMenuText thumb_func 0x80cf814 thumb_func 0x80cf84c thumb_func 0x80cf948 thumb_func 0x80cf94c thumb_func 0x80cf9dc -thumb_func 0x80cfa04 +thumb_func 0x80cfa04 ItemStorage_StartScrollIndicatorAndProcessInput thumb_func 0x80cfa58 thumb_func 0x80cfa70 thumb_func 0x80cfa84 @@ -6962,16 +6962,16 @@ thumb_func 0x80d0460 thumb_func 0x80d0500 thumb_func 0x80d062c thumb_func 0x80d06f0 -thumb_func 0x80d0730 +thumb_func 0x80d0730 Item_FromMonToMoving thumb_func 0x80d07d8 -thumb_func 0x80d084c -thumb_func 0x80d0920 -thumb_func 0x80d09b4 +thumb_func 0x80d084c Item_SwitchMonsWithMoving +thumb_func 0x80d0920 Item_GiveMovingToMon +thumb_func 0x80d09b4 Item_TakeMons thumb_func 0x80d0a34 thumb_func 0x80d0a6c thumb_func 0x80d0ab8 -thumb_func 0x80d0b1c -thumb_func 0x80d0b58 +thumb_func 0x80d0b1c IsActiveItemMoving +thumb_func 0x80d0b58 GetMovingItemName thumb_func 0x80d0b74 thumb_func 0x80d0b88 thumb_func 0x80d0bc4 @@ -6982,8 +6982,8 @@ thumb_func 0x80d0dc4 thumb_func 0x80d0e74 thumb_func 0x80d0ea4 thumb_func 0x80d0fe0 -thumb_func 0x80d1034 -thumb_func 0x80d1044 +thumb_func 0x80d1034 GetItemIconPic +thumb_func 0x80d1044 GetItemIconPalette thumb_func 0x80d1054 thumb_func 0x80d10b8 thumb_func 0x80d10ec @@ -7000,31 +7000,31 @@ thumb_func 0x80d15a4 nullsub_61 thumb_func 0x80d15a8 nullsub_60 thumb_func 0x80d15ac thumb_func 0x80d15b8 SetCurrentBox -thumb_func 0x80d15d0 -thumb_func 0x80d1614 +thumb_func 0x80d15d0 GetBoxMonDataAt +thumb_func 0x80d1614 SetBoxMonDataAt thumb_func 0x80d1658 GetCurrentBoxMonData thumb_func 0x80d1678 SetCurrentBoxMonData -thumb_func 0x80d169c -thumb_func 0x80d16e4 -thumb_func 0x80d1730 -thumb_func 0x80d1770 -thumb_func 0x80d17b8 -thumb_func 0x80d17f8 -thumb_func 0x80d1838 -thumb_func 0x80d18b8 -thumb_func 0x80d18f4 -thumb_func 0x80d1934 +thumb_func 0x80d169c GetBoxMonNickAt +thumb_func 0x80d16e4 GetBoxMonLevelAt +thumb_func 0x80d1730 SetBoxMonNickAt +thumb_func 0x80d1770 GetAndCopyBoxMonDataAt +thumb_func 0x80d17b8 SetBoxMonAt +thumb_func 0x80d17f8 CopyBoxMonAt +thumb_func 0x80d1838 CreateBoxMonAt +thumb_func 0x80d18b8 ZeroBoxMonAt +thumb_func 0x80d18f4 BoxMonAtToMon +thumb_func 0x80d1934 GetBoxedMonPtr thumb_func 0x80d1970 GetBoxNamePtr thumb_func 0x80d1998 GetBoxWallpaper thumb_func 0x80d19c0 SetBoxWallpaper thumb_func 0x80d19ec -thumb_func 0x80d1ab8 -thumb_func 0x80d1b10 -thumb_func 0x80d1b70 -thumb_func 0x80d1bdc -thumb_func 0x80d1c48 +thumb_func 0x80d1ab8 CheckFreePokemonStorageSpace +thumb_func 0x80d1b10 CheckBoxMonSanityAt +thumb_func 0x80d1b70 CountStorageNonEggMons +thumb_func 0x80d1bdc CountAllStorageMons +thumb_func 0x80d1c48 AnyStorageMonWithMove thumb_func 0x80d1ccc ResetWaldaWallpaper -thumb_func 0x80d1d20 +thumb_func 0x80d1d20 SetWaldaWallpaperLockedOrUnlocked thumb_func 0x80d1d34 thumb_func 0x80d1d48 thumb_func 0x80d1d5c SetWaldaWallpaperPatternId @@ -7033,7 +7033,7 @@ thumb_func 0x80d1d90 SetWaldaWallpaperIconId thumb_func 0x80d1db0 thumb_func 0x80d1dc4 SetWaldaWallpaperColors thumb_func 0x80d1de8 -thumb_func 0x80d1dfc +thumb_func 0x80d1dfc SetWaldaPhrase thumb_func 0x80d1e18 IsWaldaPhraseEmpty thumb_func 0x80d1e3c thumb_func 0x80d1e90 @@ -7052,31 +7052,31 @@ thumb_func 0x80d238c thumb_func 0x80d2428 thumb_func 0x80d2460 thumb_func 0x80d24bc -thumb_func 0x80d2564 +thumb_func 0x80d2564 CreateMonIcon thumb_func 0x80d2618 thumb_func 0x80d26a8 GetIconSpecies -thumb_func 0x80d26e8 +thumb_func 0x80d26e8 GetUnownLetterByPersonality thumb_func 0x80d2724 thumb_func 0x80d277c GetMonIconPtr thumb_func 0x80d2798 -thumb_func 0x80d27a4 -thumb_func 0x80d27c8 -thumb_func 0x80d2808 -thumb_func 0x80d283c -thumb_func 0x80d2860 -thumb_func 0x80d2890 +thumb_func 0x80d27a4 LoadMonIconPalettes +thumb_func 0x80d27c8 SafeLoadMonIconPalette +thumb_func 0x80d2808 LoadMonIconPalette +thumb_func 0x80d283c FreeMonIconPalettes +thumb_func 0x80d2860 SafeFreeMonIconPalette +thumb_func 0x80d2890 FreeMonIconPalette thumb_func 0x80d28b4 thumb_func 0x80d28c0 GetMonIconTiles thumb_func 0x80d28ec thumb_func 0x80d2920 GetValidMonIconPalIndex thumb_func 0x80d2940 thumb_func 0x80d2950 GetValidMonIconPalettePtr -thumb_func 0x80d297c -thumb_func 0x80d2a54 +thumb_func 0x80d297c UpdateMonIconFrame +thumb_func 0x80d2a54 CreateMonIconSprite thumb_func 0x80d2b2c thumb_func 0x80d2b68 -thumb_func 0x80d2b88 -thumb_func 0x80d2be0 +thumb_func 0x80d2b88 ScriptMovement_StartObjectMovementScript +thumb_func 0x80d2be0 ScriptMovement_IsObjectMovementFinished thumb_func 0x80d2c2c thumb_func 0x80d2c4c thumb_func 0x80d2c94 @@ -7088,139 +7088,139 @@ thumb_func 0x80d2da8 thumb_func 0x80d2dcc thumb_func 0x80d2dfc thumb_func 0x80d2e24 -thumb_func 0x80d2e5c +thumb_func 0x80d2e5c npc_obj_offscreen_culling_and_flag_update thumb_func 0x80d2e6c thumb_func 0x80d2e7c -thumb_func 0x80d2ebc +thumb_func 0x80d2ebc UnfreezeObjects thumb_func 0x80d2f00 thumb_func 0x80d2f44 -thumb_func 0x80d2fb8 -thumb_func 0x80d32f0 +thumb_func 0x80d2fb8 SetUpFieldMove_Cut +thumb_func 0x80d32f0 FieldCallback_CutGrass thumb_func 0x80d330c -thumb_func 0x80d333c +thumb_func 0x80d333c FieldCallback_CutTree thumb_func 0x80d335c -thumb_func 0x80d338c -thumb_func 0x80d33a0 -thumb_func 0x80d34b0 -thumb_func 0x80d35a8 -thumb_func 0x80d35fc -thumb_func 0x80d3794 -thumb_func 0x80d3a00 -thumb_func 0x80d3a14 -thumb_func 0x80d3a70 -thumb_func 0x80d3adc -thumb_func 0x80d3b58 -thumb_func 0x80d3bf4 +thumb_func 0x80d338c StartCutGrassFieldEffect +thumb_func 0x80d33a0 FldEff_CutGrass +thumb_func 0x80d34b0 SetCutGrassMetatile +thumb_func 0x80d35a8 GetLongGrassCaseAt +thumb_func 0x80d35fc SetCutGrassMetatiles +thumb_func 0x80d3794 HandleLongGrassOnHyper +thumb_func 0x80d3a00 CutGrassSpriteCallback1 +thumb_func 0x80d3a14 CutGrassSpriteCallback2 +thumb_func 0x80d3a70 CutGrassSpriteCallbackEnd +thumb_func 0x80d3adc FixLongGrassMetatilesWindowTop +thumb_func 0x80d3b58 FixLongGrassMetatilesWindowBottom +thumb_func 0x80d3bf4 StartCutTreeFieldEffect thumb_func 0x80d3c0c ClearMailData thumb_func 0x80d3c3c ClearMailStruct -thumb_func 0x80d3c90 +thumb_func 0x80d3c90 MonHasMail thumb_func 0x80d3cc0 thumb_func 0x80d3e4c thumb_func 0x80d3e6c MailSpeciesToSpecies -thumb_func 0x80d3e90 +thumb_func 0x80d3e90 GiveMailToMon2 thumb_func 0x80d3f00 -thumb_func 0x80d3f04 +thumb_func 0x80d3f04 TakeMailFromMon thumb_func 0x80d3f64 ClearMailItemId -thumb_func 0x80d3f84 +thumb_func 0x80d3f84 TakeMailFromMon2 thumb_func 0x80d4040 ItemIsMail thumb_func 0x80d4058 -thumb_func 0x80d4068 -thumb_func 0x80d4100 -thumb_func 0x80d41f8 -thumb_func 0x80d4234 +thumb_func 0x80d4068 ShowMapNamePopup +thumb_func 0x80d4100 Task_MapNamePopUpWindow +thumb_func 0x80d41f8 HideMapNamePopUpWindow +thumb_func 0x80d4234 DrawOptionMenuTexts thumb_func 0x80d42fc -thumb_func 0x80d4464 -thumb_func 0x80d452c -thumb_func 0x80d4584 -thumb_func 0x80d45bc -thumb_func 0x80d4618 -thumb_func 0x80d4648 -thumb_func 0x80d4690 -thumb_func 0x80d46b8 +thumb_func 0x80d4464 LoadMapNamePopUpWindowBg +thumb_func 0x80d452c RemoveBagSprite +thumb_func 0x80d4584 AddBagVisualSprite +thumb_func 0x80d45bc SetBagVisualPocketId +thumb_func 0x80d4618 SpriteCB_BagVisualSwitchingPockets +thumb_func 0x80d4648 ShakeBagVisual +thumb_func 0x80d4690 SpriteCB_ShakeBagVisual +thumb_func 0x80d46b8 AddSwitchPocketRotatingBallSprite thumb_func 0x80d4710 UpdateSwitchPocketRotatingBallCoords -thumb_func 0x80d4734 +thumb_func 0x80d4734 SpriteCB_SwitchPocketRotatingBallInit thumb_func 0x80d4798 SpriteCB_SwitchPocketRotatingBallContinue -thumb_func 0x80d47bc +thumb_func 0x80d47bc AddBagItemIconSprite thumb_func 0x80d481c RemoveBagItemIconSprite thumb_func 0x80d4830 thumb_func 0x80d484c thumb_func 0x80d4870 thumb_func 0x80d489c -thumb_func 0x80d48f4 -thumb_func 0x80d4958 -thumb_func 0x80d4990 -thumb_func 0x80d49a0 -thumb_func 0x80d4a10 -thumb_func 0x80d4a30 -thumb_func 0x80d4aa4 -thumb_func 0x80d4b54 -thumb_func 0x80d4c40 -thumb_func 0x80d4d08 -thumb_func 0x80d4d8c -thumb_func 0x80d4ec8 +thumb_func 0x80d48f4 LoadBerryGfx +thumb_func 0x80d4958 CreateBerryTagSprite +thumb_func 0x80d4990 FreeBerryTagSpritePalette +thumb_func 0x80d49a0 LoadSpinningBerryPicGfx +thumb_func 0x80d4a10 CreateBerryFlavorCircleSprite +thumb_func 0x80d4a30 AnimTask_ShakeMon +thumb_func 0x80d4aa4 AnimTask_ShakeMonStep +thumb_func 0x80d4b54 AnimTask_ShakeMon2 +thumb_func 0x80d4c40 AnimTask_ShakeMon2Step +thumb_func 0x80d4d08 AnimTask_ShakeMonInPlace +thumb_func 0x80d4d8c AnimTask_ShakeMonInPlaceStep +thumb_func 0x80d4ec8 AnimTask_ShakeAndSinkMon thumb_func 0x80d4f10 -thumb_func 0x80d4f28 -thumb_func 0x80d4fbc +thumb_func 0x80d4f28 AnimTask_ShakeAndSinkMonStep +thumb_func 0x80d4fbc AnimTask_TranslateMonElliptical thumb_func 0x80d503c -thumb_func 0x80d50b4 -thumb_func 0x80d50e4 -thumb_func 0x80d5158 -thumb_func 0x80d517c -thumb_func 0x80d51c8 -thumb_func 0x80d51ec -thumb_func 0x80d52a8 -thumb_func 0x80d5318 +thumb_func 0x80d50b4 AnimTask_TranslateMonEllipticalRespectSide +thumb_func 0x80d50e4 DoHorizontalLunge +thumb_func 0x80d5158 ReverseHorizontalLungeDirection +thumb_func 0x80d517c DoVerticalDip +thumb_func 0x80d51c8 ReverseVerticalDipDirection +thumb_func 0x80d51ec SlideMonToOriginalPos +thumb_func 0x80d52a8 SlideMonToOriginalPosStep +thumb_func 0x80d5318 SlideMonToOffset thumb_func 0x80d53cc thumb_func 0x80d54a4 -thumb_func 0x80d54d4 -thumb_func 0x80d5568 -thumb_func 0x80d55cc +thumb_func 0x80d54d4 AnimTask_WindUpLunge +thumb_func 0x80d5568 AnimTask_WindUpLungePart1 +thumb_func 0x80d55cc AnimTask_WindUpLungePart2 thumb_func 0x80d5634 thumb_func 0x80d56f0 -thumb_func 0x80d573c -thumb_func 0x80d57c0 -thumb_func 0x80d58e8 -thumb_func 0x80d5940 +thumb_func 0x80d573c AnimTask_SwayMon +thumb_func 0x80d57c0 AnimTask_SwayMonStep +thumb_func 0x80d58e8 AnimTask_ScaleMonAndRestore +thumb_func 0x80d5940 AnimTask_ScaleMonAndRestoreStep thumb_func 0x80d59b8 thumb_func 0x80d5ab0 thumb_func 0x80d5b8c thumb_func 0x80d5c0c thumb_func 0x80d5cf0 thumb_func 0x80d5dd8 GetBagItemQuantity -thumb_func 0x80d5df0 +thumb_func 0x80d5df0 SetBagItemQuantity thumb_func 0x80d5e08 thumb_func 0x80d5e0c -thumb_func 0x80d5e10 -thumb_func 0x80d5e68 +thumb_func 0x80d5e10 ApplyNewEncryptionKeyToBagItems +thumb_func 0x80d5e68 ApplyNewEncryptionKeyToBagItems_ thumb_func 0x80d5e74 SetBagItemsPointers thumb_func 0x80d5ec8 -thumb_func 0x80d5f04 -thumb_func 0x80d5f3c -thumb_func 0x80d5fdc -thumb_func 0x80d6018 -thumb_func 0x80d6140 -thumb_func 0x80d62bc -thumb_func 0x80d6480 -thumb_func 0x80d6494 -thumb_func 0x80d64c4 +thumb_func 0x80d5f04 IsBagPocketNonEmpty +thumb_func 0x80d5f3c CheckBagHasItem +thumb_func 0x80d5fdc HasAtLeastOneBerry +thumb_func 0x80d6018 CheckBagHasSpace +thumb_func 0x80d6140 AddBagItem +thumb_func 0x80d62bc RemoveBagItem +thumb_func 0x80d6480 GetPocketByItemId +thumb_func 0x80d6494 ClearItemSlots +thumb_func 0x80d64c4 FindFreePCItemSlot thumb_func 0x80d64fc CountUsedPCItemSlots -thumb_func 0x80d6534 -thumb_func 0x80d6588 +thumb_func 0x80d6534 CheckPCHasItem +thumb_func 0x80d6588 AddPCItem thumb_func 0x80d6660 RemovePCItem thumb_func 0x80d669c CompactPCItems -thumb_func 0x80d66f4 +thumb_func 0x80d66f4 SwapRegisteredBike thumb_func 0x80d672c BagGetItemIdByPocketPosition -thumb_func 0x80d6748 -thumb_func 0x80d6770 -thumb_func 0x80d677c -thumb_func 0x80d67cc +thumb_func 0x80d6748 BagGetQuantityByPocketPosition +thumb_func 0x80d6770 SwapItemSlots +thumb_func 0x80d677c CompactItemsInBagPocket +thumb_func 0x80d67cc SortBerriesOrTMHMs thumb_func 0x80d6844 MoveItemSlotInList thumb_func 0x80d68ac ClearBag -thumb_func 0x80d68d4 -thumb_func 0x80d6924 -thumb_func 0x80d699c -thumb_func 0x80d6a1c -thumb_func 0x80d6b4c +thumb_func 0x80d68d4 CountTotalItemQuantityInBag +thumb_func 0x80d6924 CheckPyramidBagHasItem +thumb_func 0x80d699c CheckPyramidBagHasSpace +thumb_func 0x80d6a1c AddPyramidBagItem +thumb_func 0x80d6b4c RemovePyramidBagItem thumb_func 0x80d6c74 SanitizeItemId thumb_func 0x80d6c8c thumb_func 0x80d6cb0 @@ -7238,29 +7238,29 @@ thumb_func 0x80d6e44 thumb_func 0x80d6e6c thumb_func 0x80d6e94 nullsub_63 thumb_func 0x80d6e98 -thumb_func 0x80d6ea4 -thumb_func 0x80d6f50 -thumb_func 0x80d6fc8 -thumb_func 0x80d7010 +thumb_func 0x80d6ea4 SetupContestGpuRegs +thumb_func 0x80d6f50 LoadContestBgAfterMoveAnim +thumb_func 0x80d6fc8 InitContestInfoBgs +thumb_func 0x80d7010 InitContestWindows thumb_func 0x80d7058 -thumb_func 0x80d70a8 -thumb_func 0x80d71b4 -thumb_func 0x80d7288 -thumb_func 0x80d7350 +thumb_func 0x80d70a8 InitContestResources +thumb_func 0x80d71b4 AllocContestResources +thumb_func 0x80d7288 FreeContestResources +thumb_func 0x80d7350 CB2_StartContest thumb_func 0x80d74a8 thumb_func 0x80d74e0 thumb_func 0x80d75d8 thumb_func 0x80d75f4 thumb_func 0x80d7614 -thumb_func 0x80d7670 +thumb_func 0x80d7670 SetupContestGraphics thumb_func 0x80d78f4 thumb_func 0x80d7934 -thumb_func 0x80d7a68 -thumb_func 0x80d7aa8 +thumb_func 0x80d7a68 CB2_ContestMain +thumb_func 0x80d7aa8 vblank_cb_battle thumb_func 0x80d7b68 thumb_func 0x80d7c50 thumb_func 0x80d7cbc -thumb_func 0x80d7e40 +thumb_func 0x80d7e40 ReadMail thumb_func 0x80d8038 thumb_func 0x80d8064 thumb_func 0x80d8090 @@ -7269,7 +7269,7 @@ thumb_func 0x80d8158 thumb_func 0x80d8200 thumb_func 0x80d824c thumb_func 0x80d8284 -thumb_func 0x80d8334 +thumb_func 0x80d8334 NamingScreen_Init thumb_func 0x80d9900 thumb_func 0x80d9924 thumb_func 0x80d9954 @@ -7301,18 +7301,18 @@ thumb_func 0x80da330 thumb_func 0x80da460 thumb_func 0x80da58c thumb_func 0x80da624 -thumb_func 0x80da664 +thumb_func 0x80da664 Rain_Main thumb_func 0x80da68c thumb_func 0x80da6a4 thumb_func 0x80da6f8 thumb_func 0x80da710 thumb_func 0x80da744 thumb_func 0x80da800 -thumb_func 0x80da828 +thumb_func 0x80da828 AnimTask_Splash thumb_func 0x80da884 thumb_func 0x80da8d8 thumb_func 0x80daa0c IsSpeciesNotUnown -thumb_func 0x80daa20 +thumb_func 0x80daa20 SwapMoveDescAndContestTilemaps thumb_func 0x80daa50 thumb_func 0x80daad4 thumb_func 0x80dac44 @@ -7324,21 +7324,21 @@ thumb_func 0x80daeac thumb_func 0x80daefc thumb_func 0x80dafe8 thumb_func 0x80db000 -thumb_func 0x80db01c +thumb_func 0x80db01c GetChosenMove thumb_func 0x80db07c GetAllChosenMoves -thumb_func 0x80db0a8 +thumb_func 0x80db0a8 RankContestants thumb_func 0x80db17c -thumb_func 0x80db1cc +thumb_func 0x80db1cc ContestantCanUseTurn thumb_func 0x80db204 -thumb_func 0x80db40c +thumb_func 0x80db40c Contest_IsMonsTurnDisabled thumb_func 0x80db444 thumb_func 0x80db47c thumb_func 0x80db498 -thumb_func 0x80db4b0 +thumb_func 0x80db4b0 DetermineFinalStandings thumb_func 0x80db638 SaveLinkContestResults thumb_func 0x80db694 -thumb_func 0x80db6cc -thumb_func 0x80db6f4 +thumb_func 0x80db6cc ContestPrintLinkStandby +thumb_func 0x80db6f4 FillContestantWindowBgs thumb_func 0x80db72c thumb_func 0x80db760 thumb_func 0x80db78c @@ -7351,7 +7351,7 @@ thumb_func 0x80dbb6c thumb_func 0x80dbbb0 thumb_func 0x80dbbf4 thumb_func 0x80dbc54 -thumb_func 0x80dbcf8 +thumb_func 0x80dbcf8 CreateApplauseMeterSprite thumb_func 0x80dbd4c thumb_func 0x80dbd94 thumb_func 0x80dbdd8 @@ -7363,36 +7363,36 @@ thumb_func 0x80dbfc8 thumb_func 0x80dbfe0 thumb_func 0x80dc034 thumb_func 0x80dc118 -thumb_func 0x80dc150 +thumb_func 0x80dc150 IsMetatileDirectionallyImpassable thumb_func 0x80dc2dc thumb_func 0x80dc318 thumb_func 0x80dc334 thumb_func 0x80dc34c thumb_func 0x80dc3e8 thumb_func 0x80dc43c -thumb_func 0x80dc46c -thumb_func 0x80dc4ac -thumb_func 0x80dc5bc -thumb_func 0x80dc7b0 +thumb_func 0x80dc46c ContestDebugTogglePointTotal +thumb_func 0x80dc4ac ContestDebugDoPrint +thumb_func 0x80dc5bc SortContestants +thumb_func 0x80dc7b0 DrawContestantWindows thumb_func 0x80dc7e4 thumb_func 0x80dcb38 SetContestantEffectStringID thumb_func 0x80dcb54 SetContestantEffectStringID2 thumb_func 0x80dcb70 SetStartledString thumb_func 0x80dcbc0 thumb_func 0x80dccc4 MakeContestantNervous -thumb_func 0x80dccf4 +thumb_func 0x80dccf4 ApplyNextTurnOrder thumb_func 0x80dce40 thumb_func 0x80dce84 -thumb_func 0x80dd0a4 +thumb_func 0x80dd0a4 UpdateApplauseMeter thumb_func 0x80dd154 Contest_GetMoveExcitement -thumb_func 0x80dd184 -thumb_func 0x80dd1c4 -thumb_func 0x80dd270 -thumb_func 0x80dd2d0 -thumb_func 0x80dd34c -thumb_func 0x80dd3b0 -thumb_func 0x80dd440 -thumb_func 0x80dd484 +thumb_func 0x80dd184 StartApplauseOverflowAnimation +thumb_func 0x80dd1c4 Task_ApplauseOverflowAnimation +thumb_func 0x80dd270 StartMoveApplauseMeterOnscreen +thumb_func 0x80dd2d0 Task_MoveApplauseMeterOnscreen +thumb_func 0x80dd34c TryMoveApplauseMeterOffscreen +thumb_func 0x80dd3b0 Task_MoveApplauseMeterOffscreen +thumb_func 0x80dd440 ShowAndUpdateApplauseMeter +thumb_func 0x80dd484 Task_ShowAndUpdateApplauseMeter thumb_func 0x80dd50c HideApplauseMeterNoAnim thumb_func 0x80dd548 ShowApplauseMeterNoAnim thumb_func 0x80dd570 @@ -7400,7 +7400,7 @@ thumb_func 0x80dd594 thumb_func 0x80dd634 thumb_func 0x80dd6e4 thumb_func 0x80dd76c -thumb_func 0x80dd854 +thumb_func 0x80dd854 GetTurnOrderNumberGfx thumb_func 0x80dd890 thumb_func 0x80dd94c thumb_func 0x80dd988 @@ -7420,13 +7420,13 @@ thumb_func 0x80de114 thumb_func 0x80de140 thumb_func 0x80de184 thumb_func 0x80de1c0 -thumb_func 0x80de20c +thumb_func 0x80de20c SelectContestMoveBankTarget thumb_func 0x80de2d4 -thumb_func 0x80de338 -thumb_func 0x80de3c0 +thumb_func 0x80de338 Contest_StartTextPrinter +thumb_func 0x80de3c0 ContestBG_FillBoxWithIncrementingTile thumb_func 0x80de418 ContestBG_FillBoxWithTile -thumb_func 0x80de454 -thumb_func 0x80de468 +thumb_func 0x80de454 GetPlayerTextSpeed +thumb_func 0x80de468 Contest_SetBgCopyFlags thumb_func 0x80de47c ResetContestLinkResults thumb_func 0x80de4b0 thumb_func 0x80de6b0 @@ -7434,65 +7434,65 @@ thumb_func 0x80de748 ClearContestWinnerPicsInContestHall thumb_func 0x80de788 thumb_func 0x80de958 thumb_func 0x80dec00 -thumb_func 0x80dede0 +thumb_func 0x80dede0 ContestDebugToggleBitfields thumb_func 0x80dee2c thumb_func 0x80deff0 thumb_func 0x80df098 thumb_func 0x80df0a4 SetShopItemsForSale -thumb_func 0x80df0d4 +thumb_func 0x80df0d4 Task_ShopMenu thumb_func 0x80df11c thumb_func 0x80df158 thumb_func 0x80df194 -thumb_func 0x80df1b4 -thumb_func 0x80df1f0 -thumb_func 0x80df22c -thumb_func 0x80df244 -thumb_func 0x80df290 +thumb_func 0x80df1b4 Task_HandleShopMenuQuit +thumb_func 0x80df1f0 Task_GoToBuyOrSellMenu +thumb_func 0x80df22c MapPostLoadHook_ReturnToShopMenu +thumb_func 0x80df244 Task_ReturnToShopMenu +thumb_func 0x80df290 ShowShopMenuAfterExitingBuyOrSellMenu thumb_func 0x80df2b0 -thumb_func 0x80df2cc -thumb_func 0x80df2e0 -thumb_func 0x80df448 +thumb_func 0x80df2cc VBlankCB_BuyMenu +thumb_func 0x80df2e0 CB2_InitBuyMenu +thumb_func 0x80df448 BuyMenuFreeMemory thumb_func 0x80df478 -thumb_func 0x80df554 -thumb_func 0x80df594 +thumb_func 0x80df554 BuyMenuSetListEntry +thumb_func 0x80df594 BuyMenuPrintItemDescriptionAndShowItemIcon thumb_func 0x80df670 -thumb_func 0x80df70c -thumb_func 0x80df768 -thumb_func 0x80df794 -thumb_func 0x80df7c8 -thumb_func 0x80df860 -thumb_func 0x80df8b0 -thumb_func 0x80df968 -thumb_func 0x80df9ac +thumb_func 0x80df70c BuyMenuAddScrollIndicatorArrows +thumb_func 0x80df768 BuyMenuRemoveScrollIndicatorArrows +thumb_func 0x80df794 BuyMenuPrintCursor +thumb_func 0x80df7c8 BuyMenuAddItemIcon +thumb_func 0x80df860 BuyMenuRemoveItemIcon +thumb_func 0x80df8b0 BuyMenuInitBgs +thumb_func 0x80df968 BuyMenuDecompressBgGraphics +thumb_func 0x80df9ac BuyMenuInitWindows thumb_func 0x80df9e8 -thumb_func 0x80dfa2c -thumb_func 0x80dfa68 -thumb_func 0x80dfab4 -thumb_func 0x80dfac8 -thumb_func 0x80dfbb4 +thumb_func 0x80dfa2c BuyMenuDisplayMessage +thumb_func 0x80dfa68 BuyMenuDrawGraphics +thumb_func 0x80dfab4 BuyMenuDrawMapGraphics +thumb_func 0x80dfac8 BuyMenuDrawMapBg +thumb_func 0x80dfbb4 BuyMenuDrawMapMetatile thumb_func 0x80dfc78 BuyMenuDrawMapMetatileLayer -thumb_func 0x80dfca0 -thumb_func 0x80dfe34 +thumb_func 0x80dfca0 BuyMenuCollectEventObjectData +thumb_func 0x80dfe34 BuyMenuDrawEventObjects thumb_func 0x80dff58 BuyMenuCheckIfEventObjectOverlapsMenuBg thumb_func 0x80dff84 BuyMenuCopyMenuBgToBg1TilemapBuffer -thumb_func 0x80dffcc -thumb_func 0x80e000c -thumb_func 0x80e01f0 -thumb_func 0x80e02d4 -thumb_func 0x80e03f8 -thumb_func 0x80e0428 -thumb_func 0x80e04d4 -thumb_func 0x80e0558 -thumb_func 0x80e05c4 -thumb_func 0x80e05ec -thumb_func 0x80e0638 -thumb_func 0x80e06b4 -thumb_func 0x80e06fc -thumb_func 0x80e0730 -thumb_func 0x80e0750 -thumb_func 0x80e07d0 -thumb_func 0x80e07f4 -thumb_func 0x80e0814 +thumb_func 0x80dffcc BuyMenuCheckForOverlapWithMenuBg +thumb_func 0x80e000c Task_BuyMenu +thumb_func 0x80e01f0 Task_BuyHowManyDialogueInit +thumb_func 0x80e02d4 Task_BuyHowManyDialogueHandleInput +thumb_func 0x80e03f8 BuyMenuConfirmPurchase +thumb_func 0x80e0428 BuyMenuTryMakePurchase +thumb_func 0x80e04d4 BuyMenuSubtractMoney +thumb_func 0x80e0558 Task_ReturnToItemListAfterItemPurchase +thumb_func 0x80e05c4 Task_ReturnToItemListAfterDecorationPurchase +thumb_func 0x80e05ec BuyMenuReturnToItemList +thumb_func 0x80e0638 BuyMenuPrintItemQuantityAndPrice +thumb_func 0x80e06b4 ExitBuyMenu +thumb_func 0x80e06fc Task_ExitBuyMenu +thumb_func 0x80e0730 ClearItemPurchases +thumb_func 0x80e0750 RecordItemPurchase +thumb_func 0x80e07d0 CreatePokemartMenu +thumb_func 0x80e07f4 CreateDecorationShop1Menu +thumb_func 0x80e0814 CreateDecorationShop2Menu thumb_func 0x80e0834 thumb_func 0x80e0990 thumb_func 0x80e0a58 @@ -7502,69 +7502,69 @@ thumb_func 0x80e0ad0 thumb_func 0x80e0b04 thumb_func 0x80e0b30 SetEnigmaBerry thumb_func 0x80e0b5c GetEnigmaBerryChecksum -thumb_func 0x80e0b78 -thumb_func 0x80e0bc8 -thumb_func 0x80e0c0c -thumb_func 0x80e0c28 -thumb_func 0x80e0c84 -thumb_func 0x80e0cbc +thumb_func 0x80e0b78 IsEnigmaBerryValid +thumb_func 0x80e0bc8 GetBerryInfo +thumb_func 0x80e0c0c GetBerryTreeInfo +thumb_func 0x80e0c28 EventObjectInteractionWaterBerryTree +thumb_func 0x80e0c84 IsPlayerFacingEmptyBerryTreePatch +thumb_func 0x80e0cbc TryToWaterBerryTree thumb_func 0x80e0ce0 ClearBerryTrees -thumb_func 0x80e0d14 -thumb_func 0x80e0dbc -thumb_func 0x80e0e68 +thumb_func 0x80e0d14 BerryTreeGrow +thumb_func 0x80e0dbc BerryTreeTimeUpdate +thumb_func 0x80e0e68 PlantBerryTree thumb_func 0x80e0ed0 RemoveBerryTree -thumb_func 0x80e0ef8 +thumb_func 0x80e0ef8 GetBerryTypeByBerryTreeId thumb_func 0x80e0f14 GetStageByBerryTreeId thumb_func 0x80e0f34 ItemIdToBerryType thumb_func 0x80e0f5c BerryTypeToItemId -thumb_func 0x80e0f84 -thumb_func 0x80e0fa4 +thumb_func 0x80e0f84 GetBerryNameByBerryType +thumb_func 0x80e0fa4 ResetBerryTreeSparkleFlag thumb_func 0x80e0fbc BerryTreeGetNumStagesWatered -thumb_func 0x80e0ff8 -thumb_func 0x80e1010 -thumb_func 0x80e1064 +thumb_func 0x80e0ff8 GetNumStagesWateredByBerryTreeId +thumb_func 0x80e1010 CalcBerryYieldInternal +thumb_func 0x80e1064 CalcBerryYield thumb_func 0x80e1090 GetBerryCountByBerryTreeId -thumb_func 0x80e10a8 -thumb_func 0x80e10c0 +thumb_func 0x80e10a8 GetStageDurationByBerryType +thumb_func 0x80e10c0 EventObjectInteractionGetBerryTreeData thumb_func 0x80e1154 thumb_func 0x80e1164 -thumb_func 0x80e119c +thumb_func 0x80e119c EventObjectInteractionPickBerryTree thumb_func 0x80e11e8 -thumb_func 0x80e121c -thumb_func 0x80e122c -thumb_func 0x80e12c8 -thumb_func 0x80e1318 +thumb_func 0x80e121c PlayerHasBerries +thumb_func 0x80e122c ResetBerryTreeSparkleFlags +thumb_func 0x80e12c8 ScriptMenu_Multichoice +thumb_func 0x80e1318 ScriptMenu_MultichoiceWithDefault thumb_func 0x80e1378 thumb_func 0x80e13bc thumb_func 0x80e13fc thumb_func 0x80e14cc -thumb_func 0x80e1568 -thumb_func 0x80e1618 -thumb_func 0x80e1650 -thumb_func 0x80e166c +thumb_func 0x80e1568 Task_HandleMultichoiceInput +thumb_func 0x80e1618 ScriptMenu_YesNo +thumb_func 0x80e1650 IsScriptActive +thumb_func 0x80e166c Task_HandleYesNoInput thumb_func 0x80e16e0 -thumb_func 0x80e17ec +thumb_func 0x80e17ec Task_HandleMultichoiceGridInput thumb_func 0x80e1850 -thumb_func 0x80e1880 -thumb_func 0x80e1a0c +thumb_func 0x80e1880 ShowDomeResultsWindow +thumb_func 0x80e1a0c ScriptMenu_DisplayPCStartupPrompt thumb_func 0x80e1a40 thumb_func 0x80e1a70 thumb_func 0x80e1d6c -thumb_func 0x80e1d8c -thumb_func 0x80e1df4 -thumb_func 0x80e1eb8 -thumb_func 0x80e1ef0 -thumb_func 0x80e1f10 +thumb_func 0x80e1d8c Task_PokemonPicWindow +thumb_func 0x80e1df4 ScriptMenu_ShowPokemonPic +thumb_func 0x80e1eb8 ScriptMenu_GetPicboxWaitFunc +thumb_func 0x80e1ef0 IsPicboxClosed +thumb_func 0x80e1f10 CreateWindowFromRect thumb_func 0x80e1f6c thumb_func 0x80e1f88 thumb_func 0x80e2070 thumb_func 0x80e20a0 thumb_func 0x80e21f8 -thumb_func 0x80e2244 -thumb_func 0x80e22d0 +thumb_func 0x80e2244 DoNamingScreen +thumb_func 0x80e22d0 C2_NamingScreen thumb_func 0x80e2374 thumb_func 0x80e246c -thumb_func 0x80e24ac +thumb_func 0x80e24ac NamingScreen_InitBGs thumb_func 0x80e265c thumb_func 0x80e2678 thumb_func 0x80e270c @@ -7572,26 +7572,26 @@ thumb_func 0x80e2734 thumb_func 0x80e2758 thumb_func 0x80e2788 thumb_func 0x80e27b8 -thumb_func 0x80e28f0 -thumb_func 0x80e292c -thumb_func 0x80e293c -thumb_func 0x80e296c -thumb_func 0x80e29dc -thumb_func 0x80e2a10 -thumb_func 0x80e2a78 +thumb_func 0x80e28f0 MainState_WaitFadeIn +thumb_func 0x80e292c MainState_HandleInput +thumb_func 0x80e293c MainState_MoveToOKButton +thumb_func 0x80e296c MainState_6 +thumb_func 0x80e29dc MainState_BeginFadeInOut +thumb_func 0x80e2a10 MainState_WaitFadeOutAndExit +thumb_func 0x80e2a78 DisplaySentToPCMessage thumb_func 0x80e2b98 thumb_func 0x80e2bd4 thumb_func 0x80e2c14 -thumb_func 0x80e2c6c +thumb_func 0x80e2c6c StartPageSwapAnim thumb_func 0x80e2c8c -thumb_func 0x80e2cc4 +thumb_func 0x80e2cc4 IsPageSwapAnimNotInProgress thumb_func 0x80e2ce4 PageSwapAnimState_Init -thumb_func 0x80e2d0c -thumb_func 0x80e2da0 -thumb_func 0x80e2e34 +thumb_func 0x80e2d0c PageSwapAnimState_1 +thumb_func 0x80e2da0 PageSwapAnimState_2 +thumb_func 0x80e2e34 PageSwapAnimState_Done thumb_func 0x80e2e50 thumb_func 0x80e2e78 -thumb_func 0x80e2eec +thumb_func 0x80e2eec Task_80E39BC thumb_func 0x80e2fa4 thumb_func 0x80e3018 thumb_func 0x80e3040 @@ -7599,7 +7599,7 @@ thumb_func 0x80e3060 thumb_func 0x80e3144 thumb_func 0x80e3190 thumb_func 0x80e31ec -thumb_func 0x80e3208 +thumb_func 0x80e3208 CursorInit thumb_func 0x80e329c thumb_func 0x80e32e4 GetCursorPos thumb_func 0x80e3310 @@ -7608,7 +7608,7 @@ thumb_func 0x80e3378 thumb_func 0x80e33bc thumb_func 0x80e33e8 IsCursorAnimFinished thumb_func 0x80e3414 -thumb_func 0x80e344c +thumb_func 0x80e344c CreatePageSwitcherSprites thumb_func 0x80e3510 thumb_func 0x80e3544 thumb_func 0x80e356c @@ -7616,27 +7616,27 @@ thumb_func 0x80e35c0 thumb_func 0x80e35c4 thumb_func 0x80e3638 thumb_func 0x80e3678 -thumb_func 0x80e36d8 +thumb_func 0x80e36d8 CreateBackOkSprites thumb_func 0x80e3750 -thumb_func 0x80e3820 +thumb_func 0x80e3820 CreateInputTargetIcon thumb_func 0x80e383c nullsub_641 thumb_func 0x80e384c nullsub_65 -thumb_func 0x80e3850 -thumb_func 0x80e38ac -thumb_func 0x80e38ec -thumb_func 0x80e3948 -thumb_func 0x80e3988 -thumb_func 0x80e39e4 -thumb_func 0x80e3a30 -thumb_func 0x80e3a58 -thumb_func 0x80e3a7c +thumb_func 0x80e3850 NamingScreen_CreatePlayerIcon +thumb_func 0x80e38ac NamingScreen_CreatePCIcon +thumb_func 0x80e38ec NamingScreen_CreateMonIcon +thumb_func 0x80e3948 NamingScreen_CreateWandaDadIcon +thumb_func 0x80e3988 HandleKeyboardEvent +thumb_func 0x80e39e4 KeyboardKeyHandler_Character +thumb_func 0x80e3a30 KeyboardKeyHandler_Page +thumb_func 0x80e3a58 KeyboardKeyHandler_Backspace +thumb_func 0x80e3a7c KeyboardKeyHandler_OK thumb_func 0x80e3ab8 thumb_func 0x80e3ad0 -thumb_func 0x80e3ae4 -thumb_func 0x80e3b08 +thumb_func 0x80e3ae4 GetInputEvent +thumb_func 0x80e3b08 SetInputState thumb_func 0x80e3b34 thumb_func 0x80e3b64 -thumb_func 0x80e3b6c +thumb_func 0x80e3b6c InputState_Enabled thumb_func 0x80e3bd0 thumb_func 0x80e3bf4 thumb_func 0x80e3d50 @@ -7648,20 +7648,20 @@ thumb_func 0x80e3e68 nullsub_67 thumb_func 0x80e3e78 nullsub_68 thumb_func 0x80e3e7c thumb_func 0x80e3eec -thumb_func 0x80e3f20 -thumb_func 0x80e3f74 -thumb_func 0x80e3fb8 +thumb_func 0x80e3f20 GetTextCaretPosition +thumb_func 0x80e3f74 GetPreviousTextCaretPosition +thumb_func 0x80e3fb8 DeleteTextCharacter thumb_func 0x80e4018 thumb_func 0x80e40a8 thumb_func 0x80e4110 thumb_func 0x80e414c -thumb_func 0x80e4188 +thumb_func 0x80e4188 AddTextCharacter thumb_func 0x80e41b0 thumb_func 0x80e4208 thumb_func 0x80e4248 -thumb_func 0x80e4318 +thumb_func 0x80e4318 GetMultiplayerId_ thumb_func 0x80e437c -thumb_func 0x80e43ec +thumb_func 0x80e43ec choose_name_or_words_screen_load_bg_tile_patterns thumb_func 0x80e4450 thumb_func 0x80e4460 thumb_func 0x80e4490 @@ -7671,9 +7671,9 @@ thumb_func 0x80e45d0 thumb_func 0x80e4648 thumb_func 0x80e46e4 thumb_func 0x80e474c -thumb_func 0x80e4764 -thumb_func 0x80e4778 -thumb_func 0x80e4788 +thumb_func 0x80e4764 NamingScreen_TurnOffScreen +thumb_func 0x80e4778 NamingScreen_InitDisplayMode +thumb_func 0x80e4788 VBlankCB_NamingScreen thumb_func 0x80e4810 thumb_func 0x80e4830 thumb_func 0x80e4868 @@ -7687,104 +7687,104 @@ thumb_func 0x80e4948 AddMoney thumb_func 0x80e4980 RemoveMoney thumb_func 0x80e49a4 IsEnoughForCostInVar0x8005 thumb_func 0x80e49c8 SubtractMoneyFromVar0x8005 -thumb_func 0x80e49e8 -thumb_func 0x80e4a08 -thumb_func 0x80e4a74 -thumb_func 0x80e4ab0 -thumb_func 0x80e4ac8 -thumb_func 0x80e4b60 -thumb_func 0x80e4b88 -thumb_func 0x80e4bd0 -thumb_func 0x80e4bf0 +thumb_func 0x80e49e8 PrintMoneyAmountInMoneyBox +thumb_func 0x80e4a08 CreateBicycleAnimationTask +thumb_func 0x80e4a74 PrintMoneyAmountInMoneyBoxWithBorder +thumb_func 0x80e4ab0 ChangeAmountInMoneyBox +thumb_func 0x80e4ac8 DrawMoneyBox +thumb_func 0x80e4b60 HideMoneyBox +thumb_func 0x80e4b88 AddMoneyLabelObject +thumb_func 0x80e4bd0 RemoveMoneyLabelObject +thumb_func 0x80e4bf0 AreMovesContestCombo thumb_func 0x80e4c58 nullsub_21 -thumb_func 0x80e4c5c -thumb_func 0x80e4c8c +thumb_func 0x80e4c5c ContestEffect_UserMoreEasilyStartled +thumb_func 0x80e4c8c ContestEffect_GreatAppealButNoMoreMoves thumb_func 0x80e4cbc ContestEffect_RepetitionNotBoring -thumb_func 0x80e4d10 -thumb_func 0x80e4d3c -thumb_func 0x80e4d6c -thumb_func 0x80e4d98 -thumb_func 0x80e4dc8 -thumb_func 0x80e4e40 -thumb_func 0x80e4ebc -thumb_func 0x80e4ef4 -thumb_func 0x80e4fa8 -thumb_func 0x80e5068 -thumb_func 0x80e5114 -thumb_func 0x80e514c -thumb_func 0x80e518c -thumb_func 0x80e51ac +thumb_func 0x80e4d10 ContestEffect_AvoidStartleOnce +thumb_func 0x80e4d3c ContestEffect_AvoidStartle +thumb_func 0x80e4d6c ContestEffect_AvoidStartleSlightly +thumb_func 0x80e4d98 ContestEffect_UserLessEasilyStartled +thumb_func 0x80e4dc8 ContestEffect_StartleFrontMon +thumb_func 0x80e4e40 ContestEffect_StartlePrevMons +thumb_func 0x80e4ebc ContestEffect_StartlePrevMon2 +thumb_func 0x80e4ef4 ContestEffect_StartlePrevMons2 +thumb_func 0x80e4fa8 ContestEffect_ShiftJudgeAttention +thumb_func 0x80e5068 ContestEffect_StartleMonWithJudgesAttention +thumb_func 0x80e5114 ContestEffect_JamsOthersButMissOneTurn +thumb_func 0x80e514c ContestEffect_StartleMonsSameTypeAppeal +thumb_func 0x80e518c ContestEffect_StartleMonsCoolAppeal +thumb_func 0x80e51ac ContestEffect_StartleMonsBeautyAppeal thumb_func 0x80e51cc -thumb_func 0x80e51ec -thumb_func 0x80e520c -thumb_func 0x80e522c -thumb_func 0x80e52b0 -thumb_func 0x80e54b0 -thumb_func 0x80e5558 -thumb_func 0x80e55e0 -thumb_func 0x80e5638 -thumb_func 0x80e5690 -thumb_func 0x80e5740 -thumb_func 0x80e57c0 -thumb_func 0x80e5844 -thumb_func 0x80e58f8 -thumb_func 0x80e59e8 -thumb_func 0x80e5a94 -thumb_func 0x80e5b10 -thumb_func 0x80e5b74 -thumb_func 0x80e5bc4 -thumb_func 0x80e5cfc +thumb_func 0x80e51ec ContestEffect_StartleMonsSmartAppeal +thumb_func 0x80e520c ContestEffect_StartleMonsToughAppeal +thumb_func 0x80e522c ContestEffect_MakeFollowingMonNervous +thumb_func 0x80e52b0 ContestEffect_MakeFollowingMonsNervous +thumb_func 0x80e54b0 ContestEffect_WorsenConditionOfPrevMons +thumb_func 0x80e5558 ContestEffect_BadlyStartlesMonsInGoodCondition +thumb_func 0x80e55e0 ContestEffect_BetterIfFirst +thumb_func 0x80e5638 ContestEffect_BetterIfLast +thumb_func 0x80e5690 ContestEffect_AppealAsGoodAsPrevOnes +thumb_func 0x80e5740 ContestEffect_AppealAsGoodAsPrevOne +thumb_func 0x80e57c0 ContestEffect_BetterWhenLater +thumb_func 0x80e5844 ContestEffect_QualityDependsOnTiming +thumb_func 0x80e58f8 ContestEffect_BetterIfSameType +thumb_func 0x80e59e8 ContestEffect_BetterIfDiffType +thumb_func 0x80e5a94 ContestEffect_AffectedByPrevAppeal +thumb_func 0x80e5b10 ContestEffect_ImproveConditionPreventNervousness +thumb_func 0x80e5b74 ContestEffect_BetterWithGoodCondition +thumb_func 0x80e5bc4 ContestEffect_NextAppealEarlier +thumb_func 0x80e5cfc ContestEffect_NextAppealLater thumb_func 0x80e5e40 nullsub_20 -thumb_func 0x80e5e44 +thumb_func 0x80e5e44 ContestEffect_ScrambleNextTurnOrder thumb_func 0x80e5f54 ContestEffect_ExciteAudienceInAnyContest -thumb_func 0x80e5f98 -thumb_func 0x80e6044 -thumb_func 0x80e60c8 -thumb_func 0x80e6110 -thumb_func 0x80e61a4 -thumb_func 0x80e6208 +thumb_func 0x80e5f98 ContestEffect_BadlyStartleMonsWithGoodAppeals +thumb_func 0x80e6044 ContestEffect_BetterWhenAudienceExcited +thumb_func 0x80e60c8 ContestEffect_DontExciteAudience +thumb_func 0x80e6110 JamByMoveCategory +thumb_func 0x80e61a4 CanUnnerveContestant +thumb_func 0x80e6208 WasAtLeastOneOpponentJammed thumb_func 0x80e6318 JamContestant -thumb_func 0x80e634c -thumb_func 0x80e6390 -thumb_func 0x80e63c4 +thumb_func 0x80e634c RoundTowardsZero +thumb_func 0x80e6390 RoundUp +thumb_func 0x80e63c4 RecordMixingPlayerSpotTriggered thumb_func 0x80e63d4 SetSrcLookupPointers -thumb_func 0x80e647c +thumb_func 0x80e647c PrepareUnknownExchangePacket thumb_func 0x80e6530 -thumb_func 0x80e6604 -thumb_func 0x80e6738 -thumb_func 0x80e68cc -thumb_func 0x80e6900 -thumb_func 0x80e6934 -thumb_func 0x80e6afc -thumb_func 0x80e6d44 -thumb_func 0x80e6e08 +thumb_func 0x80e6604 PrepareExchangePacket +thumb_func 0x80e6738 ReceiveExchangePacket +thumb_func 0x80e68cc PrintTextOnRecordMixing +thumb_func 0x80e6900 Task_RecordMixing_SoundEffect +thumb_func 0x80e6934 Task_RecordMixing_Main +thumb_func 0x80e6afc Task_MixingRecordsRecv +thumb_func 0x80e6d44 Task_SendPacket +thumb_func 0x80e6e08 Task_CopyReceiveBuffer thumb_func 0x80e6f44 thumb_func 0x80e6f78 Task_ReceivePacket thumb_func 0x80e6fac Task_SendPacket_SwitchToReceive -thumb_func 0x80e6fd4 -thumb_func 0x80e6fe0 +thumb_func 0x80e6fd4 LoadPtrFromTaskData +thumb_func 0x80e6fe0 StorePtrInTaskData thumb_func 0x80e6fe8 -thumb_func 0x80e6ff8 -thumb_func 0x80e7008 +thumb_func 0x80e6ff8 GetPlayerRecvBuffer +thumb_func 0x80e7008 ShufflePlayerIndices thumb_func 0x80e709c thumb_func 0x80e711c -thumb_func 0x80e71e4 +thumb_func 0x80e71e4 ReceiveLilycoveLadyData thumb_func 0x80e726c thumb_func 0x80e7274 thumb_func 0x80e72fc thumb_func 0x80e7324 thumb_func 0x80e7330 -thumb_func 0x80e7750 -thumb_func 0x80e77e0 +thumb_func 0x80e7750 ReceiveGiftItem +thumb_func 0x80e77e0 Task_DoRecordMixing thumb_func 0x80e78f8 -thumb_func 0x80e7a48 +thumb_func 0x80e7a48 GetPlayerHallRecords thumb_func 0x80e7c04 -thumb_func 0x80e7c50 +thumb_func 0x80e7c50 ReceiveApprenticeData thumb_func 0x80e7d60 thumb_func 0x80e8068 thumb_func 0x80e80b4 thumb_func 0x80e810c -thumb_func 0x80e8194 +thumb_func 0x80e8194 ReceiveRankingHallRecords thumb_func 0x80e81e0 thumb_func 0x80e823c thumb_func 0x80e8290 @@ -7810,98 +7810,98 @@ thumb_func 0x80e9284 thumb_func 0x80e9410 thumb_func 0x80e94b8 thumb_func 0x80e9560 -thumb_func 0x80e96a8 +thumb_func 0x80e96a8 PutFirstMemBlockHeader thumb_func 0x80e96c8 thumb_func 0x80e96dc thumb_func 0x80e9734 -thumb_func 0x80e9750 -thumb_func 0x80e977c +thumb_func 0x80e9750 RemoveTrainerHillRecordsWindow +thumb_func 0x80e977c ClearSecretBase thumb_func 0x80e97b4 ClearSecretBases -thumb_func 0x80e97e4 -thumb_func 0x80e97f8 -thumb_func 0x80e9854 -thumb_func 0x80e9884 +thumb_func 0x80e97e4 SetCurSecretBaseId +thumb_func 0x80e97f8 TrySetCurSecretBaseIndex +thumb_func 0x80e9854 CheckPlayerHasSecretBase +thumb_func 0x80e9884 GetSecretBaseTypeInFrontOfPlayer_ thumb_func 0x80e9924 GetSecretBaseTypeInFrontOfPlayer -thumb_func 0x80e993c -thumb_func 0x80e99d8 +thumb_func 0x80e993c FindMetatileIdMapCoords +thumb_func 0x80e99d8 ToggleSecretBaseEntranceMetatile thumb_func 0x80e9a80 GetNameLength -thumb_func 0x80e9aa4 -thumb_func 0x80e9b6c -thumb_func 0x80e9c28 -thumb_func 0x80e9c5c -thumb_func 0x80e9cf4 -thumb_func 0x80e9d28 -thumb_func 0x80e9d54 -thumb_func 0x80e9d94 -thumb_func 0x80e9df8 +thumb_func 0x80e9aa4 SetPlayerSecretBase +thumb_func 0x80e9b6c SetOccupiedSecretBaseEntranceMetatiles +thumb_func 0x80e9c28 SetSecretBaseWarpDestination +thumb_func 0x80e9c5c Task_EnterSecretBase +thumb_func 0x80e9cf4 EnterSecretBase +thumb_func 0x80e9d28 SecretBaseMapPopupEnabled +thumb_func 0x80e9d54 EnterNewlyCreatedSecretBase_WaitFadeIn +thumb_func 0x80e9d94 EnterNewlyCreatedSecretBase_StartFadeIn +thumb_func 0x80e9df8 Task_EnterNewlyCreatedSecretBase thumb_func 0x80e9e84 -thumb_func 0x80e9ea0 +thumb_func 0x80e9ea0 CurMapIsSecretBase thumb_func 0x80e9ec4 -thumb_func 0x80e9fd4 -thumb_func 0x80ea218 -thumb_func 0x80ea274 -thumb_func 0x80ea2a8 -thumb_func 0x80ea308 -thumb_func 0x80ea320 -thumb_func 0x80ea344 +thumb_func 0x80e9fd4 InitSecretBaseDecorationSprites +thumb_func 0x80ea218 HideSecretBaseDecorationSprites +thumb_func 0x80ea274 SetSecretBaseOwnerGfxId +thumb_func 0x80ea2a8 SetCurSecretBaseIdFromPosition +thumb_func 0x80ea308 FldEffPoison_Start +thumb_func 0x80ea320 TrySetCurSecretBase +thumb_func 0x80ea344 Task_WarpOutOfSecretBase thumb_func 0x80ea3c8 -thumb_func 0x80ea3e4 +thumb_func 0x80ea3e4 IsCurSecretBaseOwnedByAnotherPlayer thumb_func 0x80ea420 thumb_func 0x80ea46c thumb_func 0x80ea48c -thumb_func 0x80ea4d8 -thumb_func 0x80ea50c -thumb_func 0x80ea574 -thumb_func 0x80ea6f0 -thumb_func 0x80ea720 -thumb_func 0x80ea730 -thumb_func 0x80ea7d0 +thumb_func 0x80ea4d8 IsSecretBaseRegistered +thumb_func 0x80ea50c GetAverageEVs +thumb_func 0x80ea574 SetPlayerSecretBaseParty +thumb_func 0x80ea6f0 ClearAndLeaveSecretBase +thumb_func 0x80ea720 MoveOutOfSecretBase +thumb_func 0x80ea730 ClosePlayerSecretBaseEntrance +thumb_func 0x80ea7d0 MoveOutOfSecretBaseFromOutside thumb_func 0x80ea808 GetNumRegisteredSecretBases -thumb_func 0x80ea83c -thumb_func 0x80ea88c +thumb_func 0x80ea83c GetCurSecretBaseRegistrationValidity +thumb_func 0x80ea88c ToggleCurSecretBaseRegistry thumb_func 0x80ea8d4 thumb_func 0x80ea8e8 -thumb_func 0x80ea8fc -thumb_func 0x80ea98c +thumb_func 0x80ea8fc Task_ShowSecretBaseRegistryMenu +thumb_func 0x80ea98c BuildRegistryMenuItems thumb_func 0x80eaa4c -thumb_func 0x80eaa60 -thumb_func 0x80eaaa4 -thumb_func 0x80eaaf0 +thumb_func 0x80eaa60 FinalizeRegistryMenu +thumb_func 0x80eaaa4 AddRegistryMenuScrollArrows +thumb_func 0x80eaaf0 HandleRegistryMenuInput thumb_func 0x80eab80 thumb_func 0x80eabf8 -thumb_func 0x80eac44 +thumb_func 0x80eac44 ShowRegistryMenuDeleteConfirmation thumb_func 0x80eacb4 -thumb_func 0x80eacd4 +thumb_func 0x80eacd4 DeleteRegistry_Yes_Callback thumb_func 0x80ead68 -thumb_func 0x80ead84 -thumb_func 0x80eadd4 -thumb_func 0x80eae18 -thumb_func 0x80eae54 -thumb_func 0x80eae98 -thumb_func 0x80eaf2c +thumb_func 0x80ead84 DeleteRegistry_No +thumb_func 0x80eadd4 ReturnToMainRegistryMenu +thumb_func 0x80eae18 EventObjectInteractionPlantBerryTree +thumb_func 0x80eae54 GetSecretBaseOwnerType +thumb_func 0x80eae98 GetSecretBaseTrainerLoseText +thumb_func 0x80eaf2c PrepSecretBaseBattleFlags thumb_func 0x80eaf54 -thumb_func 0x80eaf9c -thumb_func 0x80eb02c +thumb_func 0x80eaf9c GetSecretBaseOwnerInteractionState +thumb_func 0x80eb02c SecretBasePerStepCallback thumb_func 0x80eb470 thumb_func 0x80eb4cc SecretBasesHaveSameTrainerId thumb_func 0x80eb4fc SecretBasesHaveSameTrainerName thumb_func 0x80eb548 SecretBasesBelongToSamePlayer -thumb_func 0x80eb588 -thumb_func 0x80eb5d0 +thumb_func 0x80eb588 GetSecretBaseIndexFromId +thumb_func 0x80eb5d0 FindAvailableSecretBaseIndex thumb_func 0x80eb610 thumb_func 0x80eb65c -thumb_func 0x80eb6e8 +thumb_func 0x80eb6e8 SortSecretBasesByRegistryStatus thumb_func 0x80eb798 -thumb_func 0x80eb7cc -thumb_func 0x80eb84c +thumb_func 0x80eb7cc SecretBaseBelongsToPlayer +thumb_func 0x80eb84c DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords thumb_func 0x80eb904 thumb_func 0x80eb984 thumb_func 0x80eba80 thumb_func 0x80ebaa4 thumb_func 0x80ebae0 -thumb_func 0x80ebb64 -thumb_func 0x80ebd2c -thumb_func 0x80ebd4c +thumb_func 0x80ebb64 ReceiveSecretBasesData +thumb_func 0x80ebd2c ClearJapaneseSecretBases +thumb_func 0x80ebd4c EventObjectInteractionRemoveBerryTree thumb_func 0x80ebdb8 thumb_func 0x80ebe30 thumb_func 0x80ebe68 @@ -7909,82 +7909,82 @@ thumb_func 0x80ebea0 thumb_func 0x80ebf08 thumb_func 0x80ebf70 thumb_func 0x80ebfd8 -thumb_func 0x80ec038 +thumb_func 0x80ec038 SetSecretBaseSecretsTvFlags_Poster thumb_func 0x80ec10c -thumb_func 0x80ec580 -thumb_func 0x80ec6c8 -thumb_func 0x80eca1c -thumb_func 0x80eca80 -thumb_func 0x80ecadc -thumb_func 0x80ecb94 -thumb_func 0x80ecbe4 -thumb_func 0x80ecc6c -thumb_func 0x80eccd0 -thumb_func 0x80eccec +thumb_func 0x80ec580 SetSecretBaseSecretsTvFlags_LargeDecorationSpot +thumb_func 0x80ec6c8 SetSecretBaseSecretsTvFlags_SmallDecorationSpot +thumb_func 0x80eca1c SetSecretBaseSecretsTvFlags_SandOrnament +thumb_func 0x80eca80 ClearTVShowData +thumb_func 0x80ecadc special_0x44 +thumb_func 0x80ecb94 FindAnyTVShowOnTheAir +thumb_func 0x80ecbe4 UpdateTVScreensOnMap +thumb_func 0x80ecc6c SetTVMetatilesOnMap +thumb_func 0x80eccd0 TurnOffTVScreen +thumb_func 0x80eccec TurnOnTVScreen thumb_func 0x80ecd08 special_0x45 -thumb_func 0x80ecd2c +thumb_func 0x80ecd2c FindFirstActiveTVShowThatIsNotAMassOutbreak thumb_func 0x80ecd74 thumb_func 0x80ecdbc ResetGabbyAndTy -thumb_func 0x80ecebc -thumb_func 0x80ecfe8 +thumb_func 0x80ecebc GabbyAndTyBeforeInterview +thumb_func 0x80ecfe8 GabbyAndTyAfterInterview thumb_func 0x80ed088 TakeTVShowInSearchOfTrainersOffTheAir -thumb_func 0x80ed0a4 -thumb_func 0x80ed0d0 -thumb_func 0x80ed0e8 -thumb_func 0x80ed12c -thumb_func 0x80ed178 -thumb_func 0x80ed25c -thumb_func 0x80ed2c8 +thumb_func 0x80ed0a4 GabbyAndTyGetBattleNum +thumb_func 0x80ed0d0 IsTVShowInSearchOfTrainersAiring +thumb_func 0x80ed0e8 GabbyAndTyGetLastQuote +thumb_func 0x80ed12c GabbyAndTyGetLastBattleTrivia +thumb_func 0x80ed178 GabbyAndTySetScriptVarsToEventObjectLocalIds +thumb_func 0x80ed25c InterviewAfter +thumb_func 0x80ed2c8 PutPokemonTodayCaughtOnAir thumb_func 0x80ed438 -thumb_func 0x80ed490 -thumb_func 0x80ed57c -thumb_func 0x80ed5a4 -thumb_func 0x80ed5cc +thumb_func 0x80ed490 PutPokemonTodayFailedOnTheAir +thumb_func 0x80ed57c tv_store_id_3x +thumb_func 0x80ed5a4 tv_store_id_2x +thumb_func 0x80ed5cc InterviewAfter_ContestLiveUpdates thumb_func 0x80ed694 -thumb_func 0x80ed784 +thumb_func 0x80ed784 Put3CheersForPokeblocksOnTheAir thumb_func 0x80ed870 -thumb_func 0x80ed900 -thumb_func 0x80ed950 -thumb_func 0x80ed990 -thumb_func 0x80ed9d0 +thumb_func 0x80ed900 ContestLiveUpdates_BeforeInterview_1 +thumb_func 0x80ed950 ContestLiveUpdates_BeforeInterview_2 +thumb_func 0x80ed990 ContestLiveUpdates_BeforeInterview_3 +thumb_func 0x80ed9d0 ContestLiveUpdates_BeforeInterview_4 thumb_func 0x80eda10 -thumb_func 0x80edab0 -thumb_func 0x80edb90 +thumb_func 0x80edab0 InterviewAfter_BravoTrainerPokemonProfile +thumb_func 0x80edb90 BravoTrainerPokemonProfile_BeforeInterview1 thumb_func 0x80edbe4 -thumb_func 0x80edcac -thumb_func 0x80edd80 -thumb_func 0x80ede68 +thumb_func 0x80edcac InterviewAfter_BravoTrainerBattleTowerProfile +thumb_func 0x80edd80 SaveRecordedItemPurchasesForTVShow +thumb_func 0x80ede68 PutNameRaterShowOnTheAir thumb_func 0x80edf64 StartMassOutbreak -thumb_func 0x80ee010 -thumb_func 0x80ee07c -thumb_func 0x80ee0ec +thumb_func 0x80ee010 PutLilycoveContestLadyShowOnTheAir +thumb_func 0x80ee07c InterviewAfter_FanClubLetter +thumb_func 0x80ee0ec InterviewAfter_RecentHappenings thumb_func 0x80ee144 thumb_func 0x80ee234 nullsub_14 thumb_func 0x80ee238 thumb_func 0x80ee328 EndMassOutbreak -thumb_func 0x80ee3a8 +thumb_func 0x80ee3a8 UpdateTVShowsPerDay thumb_func 0x80ee3d4 -thumb_func 0x80ee444 +thumb_func 0x80ee444 UpdateMassOutbreakTimeLeft thumb_func 0x80ee470 -thumb_func 0x80ee4c8 +thumb_func 0x80ee4c8 PutFishingAdviceShowOnTheAir thumb_func 0x80ee55c thumb_func 0x80ee568 thumb_func 0x80ee5a0 thumb_func 0x80ee664 thumb_func 0x80ee780 thumb_func 0x80ee808 -thumb_func 0x80ee898 -thumb_func 0x80ee990 -thumb_func 0x80ee9a4 +thumb_func 0x80ee898 AlertTVOfNewCoinTotal +thumb_func 0x80ee990 AlertTVThatPlayerPlayedSlotMachine +thumb_func 0x80ee9a4 AlertTVThatPlayerPlayedRoulette thumb_func 0x80ee9b8 thumb_func 0x80eead4 -thumb_func 0x80eec24 +thumb_func 0x80eec24 TV_PutSecretBaseVisitOnTheAir thumb_func 0x80eeca4 thumb_func 0x80eedec thumb_func 0x80eee7c thumb_func 0x80eef6c thumb_func 0x80eeffc -thumb_func 0x80ef0bc +thumb_func 0x80ef0bc GetRibbonCount thumb_func 0x80ef1b4 TV_MonDataIdxToRibbon thumb_func 0x80ef244 thumb_func 0x80ef2d8 @@ -8005,57 +8005,57 @@ thumb_func 0x80ef934 thumb_func 0x80ef960 ClearPokemonNews thumb_func 0x80ef97c ClearPokemonNewsI thumb_func 0x80ef9bc -thumb_func 0x80efa24 -thumb_func 0x80efa70 -thumb_func 0x80efb3c -thumb_func 0x80efb98 +thumb_func 0x80efa24 FindAnyTVNewsOnTheAir +thumb_func 0x80efa70 DoPokeNews +thumb_func 0x80efb3c GetPriceReduction +thumb_func 0x80efb98 IsPriceDiscounted thumb_func 0x80efbe8 thumb_func 0x80efc24 -thumb_func 0x80efcc0 -thumb_func 0x80efd54 +thumb_func 0x80efcc0 CopyContestRankToStringVar +thumb_func 0x80efd54 CopyContestCategoryToStringVar thumb_func 0x80efe10 SetContestCategoryStringVarForInterview -thumb_func 0x80efe44 -thumb_func 0x80efe74 +thumb_func 0x80efe44 TV_PrintIntToStringVar +thumb_func 0x80efe74 CountDigits thumb_func 0x80eff10 -thumb_func 0x80eff70 +thumb_func 0x80eff70 HasMixableShowAlreadyBeenSpawnedWithPlayerID thumb_func 0x80f0004 TV_SortPurchasesByQuantity -thumb_func 0x80f0054 +thumb_func 0x80f0054 FindActiveBroadcastByShowType_SetScriptResult thumb_func 0x80f00bc -thumb_func 0x80f0150 -thumb_func 0x80f01c8 -thumb_func 0x80f0208 +thumb_func 0x80f0150 InterviewBefore_FanClubLetter +thumb_func 0x80f01c8 InterviewBefore_RecentHappenings +thumb_func 0x80f0208 InterviewBefore_PkmnFanClubOpinions thumb_func 0x80f02a0 -thumb_func 0x80f02ac -thumb_func 0x80f02b8 -thumb_func 0x80f02f8 -thumb_func 0x80f0304 -thumb_func 0x80f0310 -thumb_func 0x80f0350 +thumb_func 0x80f02ac InterviewBefore_NameRater +thumb_func 0x80f02b8 InterviewBefore_BravoTrainerPkmnProfile +thumb_func 0x80f02f8 InterviewBefore_ContestLiveUpdates +thumb_func 0x80f0304 InterviewBefore_3CheersForPokeblocks +thumb_func 0x80f0310 InterviewBefore_BravoTrainerBTProfile +thumb_func 0x80f0350 InterviewBefore_FanClubSpecial thumb_func 0x80f0390 thumb_func 0x80f03e4 thumb_func 0x80f03fc DeleteTVShowInArrayByIdx thumb_func 0x80f0428 -thumb_func 0x80f04d4 -thumb_func 0x80f0514 +thumb_func 0x80f04d4 TV_GetSomeOtherSpeciesAlreadySeenByPlayer_AndPrintName +thumb_func 0x80f0514 TV_GetSomeOtherSpeciesAlreadySeenByPlayer thumb_func 0x80f0578 thumb_func 0x80f05cc FindEmptyTVSlotWithinFirstFiveShowsOfArray thumb_func 0x80f05f8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray -thumb_func 0x80f0628 -thumb_func 0x80f0648 +thumb_func 0x80f0628 TV_BernoulliTrial +thumb_func 0x80f0648 TV_FanClubLetter_RandomWordToStringVar3 thumb_func 0x80f0694 TV_GetNicknameSumMod8 thumb_func 0x80f06cc -thumb_func 0x80f0820 -thumb_func 0x80f0864 -thumb_func 0x80f08a8 -thumb_func 0x80f0964 -thumb_func 0x80f0990 -thumb_func 0x80f0a14 -thumb_func 0x80f0a38 -thumb_func 0x80f0a68 +thumb_func 0x80f0820 TV_IsScriptShowKindAlreadyInQueue +thumb_func 0x80f0864 TV_PutNameRaterShowOnTheAirIfNicknameChanged +thumb_func 0x80f08a8 ChangePokemonNickname +thumb_func 0x80f0964 ChangePokemonNickname_CB +thumb_func 0x80f0990 ChangeBoxPokemonNickname +thumb_func 0x80f0a14 ChangeBoxPokemonNickname_CB +thumb_func 0x80f0a38 TV_CopyNicknameToStringVar1AndEnsureTerminated +thumb_func 0x80f0a68 TV_CheckMonOTIDEqualsPlayerID thumb_func 0x80f0aac GetTVChannelByShowType thumb_func 0x80f0aec GetPlayerIDAsU32 -thumb_func 0x80f0b0c -thumb_func 0x80f0b70 +thumb_func 0x80f0b0c CheckForBigMovieOrEmergencyNewsOnTV +thumb_func 0x80f0b70 GetMomOrDadStringForTVMessage thumb_func 0x80f0c84 thumb_func 0x80f0cb4 thumb_func 0x80f0e34 @@ -8070,7 +8070,7 @@ thumb_func 0x80f1600 thumb_func 0x80f1640 thumb_func 0x80f1694 thumb_func 0x80f16e0 -thumb_func 0x80f1758 +thumb_func 0x80f1758 ReceivePokeNewsData thumb_func 0x80f183c thumb_func 0x80f1934 thumb_func 0x80f1960 @@ -8079,42 +8079,42 @@ thumb_func 0x80f19c8 thumb_func 0x80f1a00 thumb_func 0x80f1a40 thumb_func 0x80f1ce4 -thumb_func 0x80f1d28 +thumb_func 0x80f1d28 DoTVShow thumb_func 0x80f1ed8 -thumb_func 0x80f2164 -thumb_func 0x80f23ec -thumb_func 0x80f2620 -thumb_func 0x80f28fc -thumb_func 0x80f2b50 -thumb_func 0x80f2cb8 +thumb_func 0x80f2164 DoTVShowBravoTrainerBattleTower +thumb_func 0x80f23ec DoTVShowTodaysSmartShopper +thumb_func 0x80f2620 DoTVShowTheNameRaterShow +thumb_func 0x80f28fc DoTVShowPokemonTodaySuccessfulCapture +thumb_func 0x80f2b50 DoTVShowPokemonTodayFailedCapture +thumb_func 0x80f2cb8 DoTVShowPokemonFanClubLetter thumb_func 0x80f2ee8 -thumb_func 0x80f3080 +thumb_func 0x80f3080 DoTVShowPokemonFanClubOpinions thumb_func 0x80f3174 nullsub_15 -thumb_func 0x80f3178 +thumb_func 0x80f3178 DoTVShowPokemonNewsMassOutbreak thumb_func 0x80f31e8 thumb_func 0x80f39cc thumb_func 0x80f3c00 thumb_func 0x80f3eac -thumb_func 0x80f40a4 -thumb_func 0x80f4180 +thumb_func 0x80f40a4 DoTVShowPokemonAngler +thumb_func 0x80f4180 DoTVShowTheWorldOfMasters thumb_func 0x80f4260 -thumb_func 0x80f4470 -thumb_func 0x80f45e0 -thumb_func 0x80f46e0 +thumb_func 0x80f4470 DoTVShowDewfordTrendWatcherNetwork +thumb_func 0x80f45e0 DoTVShowHoennTreasureInvestigators +thumb_func 0x80f46e0 DoTVShowFindThatGamer thumb_func 0x80f488c -thumb_func 0x80f4bbc -thumb_func 0x80f4e0c +thumb_func 0x80f4bbc DoTVShowSecretBaseVisit +thumb_func 0x80f4e0c DoTVShowPokemonLotteryWinnerFlashReport thumb_func 0x80f4ea0 thumb_func 0x80f50ac thumb_func 0x80f51e0 thumb_func 0x80f537c thumb_func 0x80f55b0 -thumb_func 0x80f5858 +thumb_func 0x80f5858 DoTVShowWhatsNo1InHoennToday thumb_func 0x80f59a4 TVShowGetFlagCount -thumb_func 0x80f59d0 +thumb_func 0x80f59d0 SecretBaseSecrets_GetStateForFlagNumber thumb_func 0x80f5a10 -thumb_func 0x80f5d54 -thumb_func 0x80f5ed0 +thumb_func 0x80f5d54 DoTVShowSafariFanClub +thumb_func 0x80f5ed0 DoTVShowPokemonContestLiveUpdates2 thumb_func 0x80f5f74 TVShowDone thumb_func 0x80f5fb0 thumb_func 0x80f5fbc @@ -8143,11 +8143,11 @@ thumb_func 0x80f70d8 thumb_func 0x80f7114 thumb_func 0x80f71dc thumb_func 0x80f7288 LoadAllContestMonIcons -thumb_func 0x80f72c0 +thumb_func 0x80f72c0 HealStatusConditions thumb_func 0x80f730c thumb_func 0x80f739c thumb_func 0x80f760c -thumb_func 0x80f76e8 +thumb_func 0x80f76e8 SpeciesToMailSpecies thumb_func 0x80f7708 thumb_func 0x80f7760 thumb_func 0x80f77ac @@ -8156,7 +8156,7 @@ thumb_func 0x80f7848 thumb_func 0x80f7880 thumb_func 0x80f78e8 thumb_func 0x80f79b8 -thumb_func 0x80f7a3c +thumb_func 0x80f7a3c RecordedBattle_SaveParties thumb_func 0x80f7ba0 thumb_func 0x80f7bf4 thumb_func 0x80f7c6c @@ -8186,7 +8186,7 @@ thumb_func 0x80f8bd4 thumb_func 0x80f8c14 thumb_func 0x80f8c54 thumb_func 0x80f8c64 -thumb_func 0x80f8c90 +thumb_func 0x80f8c90 WarpIntoSecretBase thumb_func 0x80f8cbc thumb_func 0x80f8cdc thumb_func 0x80f8d08 @@ -8199,7 +8199,7 @@ thumb_func 0x80f8e24 thumb_func 0x80f8e40 thumb_func 0x80f8f3c thumb_func 0x80f8f64 -thumb_func 0x80f8f98 +thumb_func 0x80f8f98 ReceiveOldManData thumb_func 0x80f901c thumb_func 0x80f9044 thumb_func 0x80f9068 SetContestTrainerGfxIds @@ -8210,17 +8210,17 @@ thumb_func 0x80f916c thumb_func 0x80f9178 thumb_func 0x80f91d0 CountPlayerContestPaintings thumb_func 0x80f9200 -thumb_func 0x80f935c -thumb_func 0x80f936c +thumb_func 0x80f935c ShowContestWinnerCleanup +thumb_func 0x80f936c ShowContestWinner thumb_func 0x80f938c thumb_func 0x80f9424 -thumb_func 0x80f950c +thumb_func 0x80f950c GiveMonArtistRibbon thumb_func 0x80f95b4 -thumb_func 0x80f95b8 +thumb_func 0x80f95b8 ShowContestEntryMonPic thumb_func 0x80f9748 thumb_func 0x80f9778 -thumb_func 0x80f9830 -thumb_func 0x80f9878 +thumb_func 0x80f9830 ScriptGetMultiplayerId +thumb_func 0x80f9878 ScriptRandom thumb_func 0x80f98cc thumb_func 0x80f98ec thumb_func 0x80f9918 @@ -8229,152 +8229,152 @@ thumb_func 0x80f999c thumb_func 0x80f99c4 thumb_func 0x80f99e4 thumb_func 0x80f99f0 -thumb_func 0x80f9a10 -thumb_func 0x80f9ad4 -thumb_func 0x80f9b58 -thumb_func 0x80f9b88 -thumb_func 0x80f9bb0 +thumb_func 0x80f9a10 HealPlayerParty +thumb_func 0x80f9ad4 ScriptGiveMon +thumb_func 0x80f9b58 ScriptGiveEgg +thumb_func 0x80f9b88 HasEnoughMonsForDoubleBattle +thumb_func 0x80f9bb0 CheckPartyMonHasHeldItem thumb_func 0x80f9c00 -thumb_func 0x80f9c30 -thumb_func 0x80f9c90 -thumb_func 0x80f9cc8 +thumb_func 0x80f9c30 CreateScriptedWildMon +thumb_func 0x80f9c90 ScriptSetMonMoveSlot +thumb_func 0x80f9cc8 ChooseHalfPartyForBattle thumb_func 0x80f9cf0 thumb_func 0x80f9d20 thumb_func 0x80f9d48 -thumb_func 0x80f9d78 +thumb_func 0x80f9d78 ReducePlayerPartyToSelectedMons thumb_func 0x80f9df8 -thumb_func 0x80f9e1c -thumb_func 0x80f9e50 -thumb_func 0x80f9e9c -thumb_func 0x80f9ee4 +thumb_func 0x80f9e1c AllMonsFainted +thumb_func 0x80f9e50 FaintFromFieldPoison +thumb_func 0x80f9e9c MonFaintedFromPoison +thumb_func 0x80f9ee4 Task_WhiteOut thumb_func 0x80f9fbc -thumb_func 0x80f9fd4 -thumb_func 0x80fa058 -thumb_func 0x80fa0fc -thumb_func 0x80fa12c +thumb_func 0x80f9fd4 DoPoisonFieldEffect +thumb_func 0x80fa058 GetMonSizeHash +thumb_func 0x80fa0fc TranslateBigMonSizeTableIndex +thumb_func 0x80fa12c GetMonSize thumb_func 0x80fa1a0 -thumb_func 0x80fa1f0 -thumb_func 0x80fa280 +thumb_func 0x80fa1f0 CompareMonSize +thumb_func 0x80fa280 GetMonSizeRecordInfo thumb_func 0x80fa2ec -thumb_func 0x80fa300 -thumb_func 0x80fa31c +thumb_func 0x80fa300 GetSeedotSizeRecordInfo +thumb_func 0x80fa31c CompareSeedotSize thumb_func 0x80fa344 -thumb_func 0x80fa358 -thumb_func 0x80fa374 -thumb_func 0x80fa3a0 +thumb_func 0x80fa358 GetLotadSizeRecordInfo +thumb_func 0x80fa374 CompareLotadSize +thumb_func 0x80fa3a0 GiveGiftRibbonToParty thumb_func 0x80fa43c thumb_func 0x80fa464 thumb_func 0x80fa48c -thumb_func 0x80fa4a0 +thumb_func 0x80fa4a0 FldEffPoison_IsActive thumb_func 0x80fa4b4 thumb_func 0x80fa500 thumb_func 0x80fa66c -thumb_func 0x80fa7cc -thumb_func 0x80fa7e8 -thumb_func 0x80fa874 +thumb_func 0x80fa7cc SetCurrentSecretBase +thumb_func 0x80fa7e8 AdjustSecretPowerSpritePixelOffsets +thumb_func 0x80fa874 SetUpFieldMove_SecretPower thumb_func 0x80fa94c thumb_func 0x80fa96c -thumb_func 0x80fa998 -thumb_func 0x80fa9ac +thumb_func 0x80fa998 StartSecretBaseCaveFieldEffect +thumb_func 0x80fa9ac FldEff_SecretPowerCave thumb_func 0x80fa9fc thumb_func 0x80faa18 -thumb_func 0x80faa48 +thumb_func 0x80faa48 CaveEntranceSpriteCallbackEnd thumb_func 0x80faa58 thumb_func 0x80faa78 -thumb_func 0x80faaa4 -thumb_func 0x80faab8 -thumb_func 0x80fab48 -thumb_func 0x80fab74 -thumb_func 0x80fabac +thumb_func 0x80faaa4 StartSecretBaseTreeFieldEffect +thumb_func 0x80faab8 FldEff_SecretPowerTree +thumb_func 0x80fab48 TreeEntranceSpriteCallback1 +thumb_func 0x80fab74 TreeEntranceSpriteCallback2 +thumb_func 0x80fabac TreeEntranceSpriteCallbackEnd thumb_func 0x80fabbc thumb_func 0x80fabdc -thumb_func 0x80fac08 +thumb_func 0x80fac08 StartSecretBaseShrubFieldEffect thumb_func 0x80fac1c -thumb_func 0x80fac6c +thumb_func 0x80fac6c ShrubEntranceSpriteCallback1 thumb_func 0x80fac88 -thumb_func 0x80facb8 -thumb_func 0x80facc8 -thumb_func 0x80fad10 -thumb_func 0x80fadec -thumb_func 0x80fae54 -thumb_func 0x80fae9c -thumb_func 0x80faf1c +thumb_func 0x80facb8 ShrubEntranceSpriteCallbackEnd +thumb_func 0x80facc8 FldEff_SecretBasePCTurnOn +thumb_func 0x80fad10 Task_SecretBasePCTurnOn +thumb_func 0x80fadec DoSecretBasePCTurnOffEffect +thumb_func 0x80fae54 PopSecretBaseBalloon +thumb_func 0x80fae9c Task_PopSecretBaseBalloon +thumb_func 0x80faf1c DoBalloonSoundEffect thumb_func 0x80faf6c thumb_func 0x80faf70 nullsub_69 -thumb_func 0x80faf74 -thumb_func 0x80fafc4 -thumb_func 0x80fb004 -thumb_func 0x80fb05c -thumb_func 0x80fb1e0 -thumb_func 0x80fb214 -thumb_func 0x80fb240 -thumb_func 0x80fb2ec -thumb_func 0x80fb414 -thumb_func 0x80fb494 +thumb_func 0x80faf74 DoSecretBaseBreakableDoorEffect +thumb_func 0x80fafc4 Task_ShatterSecretBaseBreakableDoor +thumb_func 0x80fb004 ShatterSecretBaseBreakableDoor +thumb_func 0x80fb05c Task_SecretBaseMusicNoteMatSound +thumb_func 0x80fb1e0 PlaySecretBaseMusicNoteMatSound +thumb_func 0x80fb214 SpriteCB_GlitterMatSparkle +thumb_func 0x80fb240 DoSecretBaseGlitterMatSparkle +thumb_func 0x80fb2ec FldEff_SandPillar +thumb_func 0x80fb414 SpriteCB_SandPillar_0 +thumb_func 0x80fb494 SpriteCB_SandPillar_1 thumb_func 0x80fb4d8 -thumb_func 0x80fb4e8 +thumb_func 0x80fb4e8 GetShieldToyTVDecorationInfo thumb_func 0x80fb654 -thumb_func 0x80fb6a8 +thumb_func 0x80fb6a8 Task_FieldPoisonEffect thumb_func 0x80fb718 thumb_func 0x80fb730 thumb_func 0x80fb744 -thumb_func 0x80fb760 -thumb_func 0x80fb7d4 -thumb_func 0x80fb844 -thumb_func 0x80fb868 -thumb_func 0x80fb87c -thumb_func 0x80fb8e4 +thumb_func 0x80fb760 Task_WateringBerryTreeAnim_1 +thumb_func 0x80fb7d4 Task_WateringBerryTreeAnim_2 +thumb_func 0x80fb844 AnimBonemerangProjectileEnd +thumb_func 0x80fb868 DoWateringBerryTreeAnim +thumb_func 0x80fb87c CreateRecordMixingSprite +thumb_func 0x80fb8e4 DestroyRecordMixingSprite thumb_func 0x80fb920 -thumb_func 0x80fb94c -thumb_func 0x80fb968 -thumb_func 0x80fba1c +thumb_func 0x80fb94c GetTruckBoxMovement +thumb_func 0x80fb968 Task_Truck1 +thumb_func 0x80fba1c Task_Truck2 thumb_func 0x80fbb30 -thumb_func 0x80fbbdc -thumb_func 0x80fbd50 -thumb_func 0x80fbdb0 +thumb_func 0x80fbbdc Task_HandleTruckSequence +thumb_func 0x80fbd50 ExecuteTruckSequence +thumb_func 0x80fbdb0 EndTruckSequence thumb_func 0x80fbe0c -thumb_func 0x80fbe58 +thumb_func 0x80fbe58 Task_HandlePorthole thumb_func 0x80fbf5c thumb_func 0x80fbfd8 thumb_func 0x80fc014 -thumb_func 0x80fc058 -thumb_func 0x80fc088 -thumb_func 0x80fc0c4 -thumb_func 0x80fc0e0 +thumb_func 0x80fc058 GetCurrentMapRotatingGatePuzzleType +thumb_func 0x80fc088 RotatingGate_ResetAllGateOrientations +thumb_func 0x80fc0c4 RotatingGate_GetGateOrientation +thumb_func 0x80fc0e0 RotatingGate_SetGateOrientation thumb_func 0x80fc100 RotatingGate_RotateInDirection -thumb_func 0x80fc13c +thumb_func 0x80fc13c RotatingGate_LoadPuzzleConfig thumb_func 0x80fc198 RotatingGate_CreateGatesWithinViewport -thumb_func 0x80fc26c -thumb_func 0x80fc354 +thumb_func 0x80fc26c RotatingGate_CreateGate +thumb_func 0x80fc354 SpriteCallback_RotatingGate thumb_func 0x80fc3d4 RotatingGate_HideGatesOutsideViewport thumb_func 0x80fc470 -thumb_func 0x80fc480 -thumb_func 0x80fc54c +thumb_func 0x80fc480 RotatingGate_DestroyGatesOutsideViewport +thumb_func 0x80fc54c RotatingGate_CanRotate thumb_func 0x80fc624 RotatingGate_HasArm thumb_func 0x80fc678 RotatingGate_TriggerRotationAnimation -thumb_func 0x80fc6ac +thumb_func 0x80fc6ac RotatingGate_GetRotationInfo thumb_func 0x80fc700 RotatingGate_InitPuzzle thumb_func 0x80fc718 RotatingGatePuzzleCameraUpdate thumb_func 0x80fc740 RotatingGate_InitPuzzleAndGraphics -thumb_func 0x80fc760 +thumb_func 0x80fc760 CheckForRotatingGatePuzzleCollision thumb_func 0x80fc844 CheckForRotatingGatePuzzleCollisionWithoutAnimation thumb_func 0x80fc910 thumb_func 0x80fc924 thumb_func 0x80fc934 -thumb_func 0x80fc944 -thumb_func 0x80fc984 -thumb_func 0x80fc9bc +thumb_func 0x80fc944 EnterSafariMode +thumb_func 0x80fc984 ExitSafariMode +thumb_func 0x80fc9bc SafariZoneTakeStep thumb_func 0x80fc9f0 -thumb_func 0x80fca00 -thumb_func 0x80fca98 -thumb_func 0x80fcab4 -thumb_func 0x80fcac8 -thumb_func 0x80fcb58 -thumb_func 0x80fcbf8 -thumb_func 0x80fcc28 -thumb_func 0x80fcc58 +thumb_func 0x80fca00 CB2_EndSafariBattle +thumb_func 0x80fca98 ClearPokeblockFeeder +thumb_func 0x80fcab4 ClearAllPokeblockFeeders +thumb_func 0x80fcac8 GetPokeblockFeederInFront +thumb_func 0x80fcb58 GetPokeblockFeederWithinRange +thumb_func 0x80fcbf8 SafariZoneGetPokeblockInFront +thumb_func 0x80fcc28 SafariZoneGetActivePokeblock +thumb_func 0x80fcc58 SafariZoneActivatePokeblockFeeder thumb_func 0x80fccf0 DecrementFeederStepCounters -thumb_func 0x80fcd24 +thumb_func 0x80fcd24 GetInFrontFeederPokeblockAndSteps thumb_func 0x80fcd64 thumb_func 0x80fcda0 thumb_func 0x80fcdcc @@ -8382,7 +8382,7 @@ thumb_func 0x80fcdf0 thumb_func 0x80fce30 thumb_func 0x80fce4c thumb_func 0x80fcee0 -thumb_func 0x80fcf2c +thumb_func 0x80fcf2c ContestLiveUpdates_BeforeInterview_5 thumb_func 0x80fd058 thumb_func 0x80fd0e8 thumb_func 0x80fd1ec @@ -8392,27 +8392,27 @@ thumb_func 0x80fd4dc thumb_func 0x80fd69c thumb_func 0x80fd794 thumb_func 0x80fd824 -thumb_func 0x80fd8b4 -thumb_func 0x80fd930 -thumb_func 0x80fd978 -thumb_func 0x80fd990 -thumb_func 0x80fd9b8 +thumb_func 0x80fd8b4 SetUpItemUseCallback +thumb_func 0x80fd930 SetUpItemUseOnFieldCallback +thumb_func 0x80fd978 MapPostLoadHook_UseItem +thumb_func 0x80fd990 Task_CallItemUseOnFieldCallback +thumb_func 0x80fd9b8 DisplayCannotUseItemMessage thumb_func 0x80fda1c DisplayDadsAdviceCannotUseItemMessage thumb_func 0x80fda34 DisplayCannotDismountBikeMessage -thumb_func 0x80fda4c -thumb_func 0x80fda70 +thumb_func 0x80fda4c CleanUpAfterFailingToUseRegisteredKeyItemOnField +thumb_func 0x80fda70 CheckIfItemIsTMHMOrEvolutionStone thumb_func 0x80fdaa8 thumb_func 0x80fdacc -thumb_func 0x80fdaec +thumb_func 0x80fdaec ItemUseOutOfBattle_Bike thumb_func 0x80fdbac -thumb_func 0x80fdbe8 -thumb_func 0x80fdc7c +thumb_func 0x80fdbe8 CanFish +thumb_func 0x80fdc7c ItemUseOutOfBattle_Rod thumb_func 0x80fdcbc -thumb_func 0x80fdce4 -thumb_func 0x80fdd0c +thumb_func 0x80fdce4 ItemUseOutOfBattle_Itemfinder +thumb_func 0x80fdd0c ItemUseOnFieldCB_Itemfinder thumb_func 0x80fdd58 thumb_func 0x80fde20 -thumb_func 0x80fde44 +thumb_func 0x80fde44 ItemfinderCheckForHiddenItems thumb_func 0x80fdf28 thumb_func 0x80fdf84 thumb_func 0x80fe01c @@ -8421,14 +8421,14 @@ thumb_func 0x80fe204 thumb_func 0x80fe278 thumb_func 0x80fe2e8 thumb_func 0x80fe330 -thumb_func 0x80fe3c0 +thumb_func 0x80fe3c0 ItemUseOutOfBattle_PokeblockCase thumb_func 0x80fe440 thumb_func 0x80fe454 -thumb_func 0x80fe488 -thumb_func 0x80fe4f8 +thumb_func 0x80fe488 ItemUseOutOfBattle_CoinCase +thumb_func 0x80fe4f8 ItemUseOutOfBattle_PowderJar thumb_func 0x80fe564 thumb_func 0x80fe5c8 -thumb_func 0x80fe5f8 +thumb_func 0x80fe5f8 ItemUseOutOfBattle_WailmerPail thumb_func 0x80fe65c thumb_func 0x80fe680 thumb_func 0x80fe6d0 @@ -8438,87 +8438,87 @@ thumb_func 0x80fe72c ItemUseOutOfBattle_SacredAsh thumb_func 0x80fe748 ItemUseOutOfBattle_PPRecovery thumb_func 0x80fe764 ItemUseOutOfBattle_PPUp thumb_func 0x80fe780 ItemUseOutOfBattle_RareCandy -thumb_func 0x80fe79c +thumb_func 0x80fe79c ItemUseOutOfBattle_TMHM thumb_func 0x80fe7e4 thumb_func 0x80fe810 thumb_func 0x80fe874 thumb_func 0x80fe88c thumb_func 0x80fe8a8 -thumb_func 0x80fe90c +thumb_func 0x80fe90c ItemUseOutOfBattle_Repel thumb_func 0x80fe974 thumb_func 0x80fe9b4 thumb_func 0x80fea20 -thumb_func 0x80fea84 +thumb_func 0x80fea84 ItemUseOutOfBattle_BlackWhiteFlute thumb_func 0x80feb0c -thumb_func 0x80feb28 -thumb_func 0x80feb64 -thumb_func 0x80feb84 -thumb_func 0x80febc8 -thumb_func 0x80febe4 +thumb_func 0x80feb28 re_escape_rope +thumb_func 0x80feb64 CanUseEscapeRopeOnCurrMap +thumb_func 0x80feb84 ItemUseOutOfBattle_EscapeRope +thumb_func 0x80febc8 ItemUseOutOfBattle_EvolutionStone +thumb_func 0x80febe4 ItemUseInBattle_PokeBall thumb_func 0x80fec58 -thumb_func 0x80fec90 -thumb_func 0x80fed08 +thumb_func 0x80fec90 OpponentHandleFaintAnimation +thumb_func 0x80fed08 ItemUseInBattle_StatIncrease thumb_func 0x80fed9c thumb_func 0x80fede0 ItemUseInBattle_Medicine thumb_func 0x80fedfc thumb_func 0x80fee18 ItemUseInBattle_PPRecovery thumb_func 0x80fee34 -thumb_func 0x80feea0 +thumb_func 0x80feea0 ItemUseOutOfBattle_EnigmaBerry thumb_func 0x80fefcc -thumb_func 0x80ff070 -thumb_func 0x80ff090 -thumb_func 0x80ff0e8 -thumb_func 0x80ff130 +thumb_func 0x80ff070 ItemUseOutOfBattle_CannotUse +thumb_func 0x80ff090 AnimMovePowderParticle +thumb_func 0x80ff0e8 AnimMovePowderParticleStep +thumb_func 0x80ff130 AnimPowerAbsorptionOrb thumb_func 0x80ff180 thumb_func 0x80ff1d8 -thumb_func 0x80ff234 -thumb_func 0x80ff2a8 -thumb_func 0x80ff328 +thumb_func 0x80ff234 AnimSolarbeamSmallOrbStep +thumb_func 0x80ff2a8 AnimTask_CreateSmallSolarbeamOrbs +thumb_func 0x80ff328 AnimAbsorptionOrb thumb_func 0x80ff378 -thumb_func 0x80ff394 -thumb_func 0x80ff44c -thumb_func 0x80ff498 -thumb_func 0x80ff508 -thumb_func 0x80ff540 -thumb_func 0x80ff578 -thumb_func 0x80ff5c4 -thumb_func 0x80ff66c -thumb_func 0x80ff6c8 -thumb_func 0x80ff71c -thumb_func 0x80ff794 -thumb_func 0x80ff7e8 -thumb_func 0x80ff84c -thumb_func 0x80ff894 -thumb_func 0x80ff8e0 -thumb_func 0x80ff944 -thumb_func 0x80ffa10 -thumb_func 0x80ffab8 -thumb_func 0x80ffb0c -thumb_func 0x80ffbc4 -thumb_func 0x80ffc00 -thumb_func 0x80ffc3c +thumb_func 0x80ff394 AnimHyperBeamOrb +thumb_func 0x80ff44c AnimHyperBeamOrbStep +thumb_func 0x80ff498 AnimLeechSeed +thumb_func 0x80ff508 AnimLeechSeedStep +thumb_func 0x80ff540 AnimLeechSeedSprouts +thumb_func 0x80ff578 AnimSporeParticle +thumb_func 0x80ff5c4 AnimSporeParticleStep +thumb_func 0x80ff66c AnimTask_SporeDoubleBattle +thumb_func 0x80ff6c8 AnimPetalDanceBigFlower +thumb_func 0x80ff71c AnimPetalDanceBigFlowerStep +thumb_func 0x80ff794 AnimPetalDanceSmallFlower +thumb_func 0x80ff7e8 AnimPetalDanceSmallFlowerStep +thumb_func 0x80ff84c AnimCuttingSlice +thumb_func 0x80ff894 AnimRazorLeafParticleStep1 +thumb_func 0x80ff8e0 AnimRazorLeafParticleStep2 +thumb_func 0x80ff944 AnimTranslateLinearSingleSineWave +thumb_func 0x80ffa10 AnimTranslateLinearSingleSineWaveStep +thumb_func 0x80ffab8 AnimMoveTwisterParticle +thumb_func 0x80ffb0c AnimMoveTwisterParticleStep +thumb_func 0x80ffbc4 AnimConstrictBinding +thumb_func 0x80ffc00 AnimConstrictBindingStep1 +thumb_func 0x80ffc3c AnimConstrictBindingStep2 thumb_func 0x80ffca8 thumb_func 0x80ffd8c thumb_func 0x80ffe1c -thumb_func 0x80ffee8 -thumb_func 0x80fffb8 -thumb_func 0x810003c -thumb_func 0x810012c -thumb_func 0x8100184 +thumb_func 0x80ffee8 AnimMimicOrb +thumb_func 0x80fffb8 AnimIngrainRoot +thumb_func 0x810003c AnimFrenzyPlantRoot +thumb_func 0x810012c AnimRootFlickerOut +thumb_func 0x8100184 AnimIngrainOrb thumb_func 0x8100208 thumb_func 0x8100230 thumb_func 0x81002d4 thumb_func 0x8100304 -thumb_func 0x8100368 +thumb_func 0x8100368 AnimPresent thumb_func 0x81003e0 -thumb_func 0x8100444 -thumb_func 0x81004c0 -thumb_func 0x8100504 -thumb_func 0x810057c -thumb_func 0x810060c -thumb_func 0x81006a8 -thumb_func 0x8100714 -thumb_func 0x81007cc +thumb_func 0x8100444 AnimKnockOffItem +thumb_func 0x81004c0 AnimPresentHealParticle +thumb_func 0x8100504 AnimItemSteal +thumb_func 0x810057c AnimItemStealStep +thumb_func 0x810060c AnimTrickBag +thumb_func 0x81006a8 AnimTrickBagStep1 +thumb_func 0x8100714 AnimTrickBagStep2 +thumb_func 0x81007cc AnimTrickBagStep3 thumb_func 0x8100810 thumb_func 0x8100978 thumb_func 0x8100d54 @@ -8535,8 +8535,8 @@ thumb_func 0x81012a0 thumb_func 0x81012e4 thumb_func 0x8101330 thumb_func 0x81013d8 -thumb_func 0x810151c -thumb_func 0x8101588 +thumb_func 0x810151c AnimSliceStep +thumb_func 0x8101588 unref_sub_8100D38 thumb_func 0x810166c thumb_func 0x81016d0 thumb_func 0x8101740 @@ -8585,8 +8585,8 @@ thumb_func 0x8102b24 thumb_func 0x8102b9c thumb_func 0x8102bcc thumb_func 0x8102c30 -thumb_func 0x8102c84 -thumb_func 0x8102cf8 +thumb_func 0x8102c84 unref_sub_8102434 +thumb_func 0x8102cf8 unref_sub_81024A8 thumb_func 0x8102d30 thumb_func 0x8102d78 thumb_func 0x8102d90 @@ -8628,12 +8628,12 @@ thumb_func 0x8103ddc thumb_func 0x8103e70 thumb_func 0x8103ea8 thumb_func 0x8103ed0 -thumb_func 0x8103ef0 -thumb_func 0x8103f2c -thumb_func 0x8104028 +thumb_func 0x8103ef0 AnimTask_Withdraw +thumb_func 0x8103f2c AnimTask_WithdrawStep +thumb_func 0x8104028 Anim_KinesisZapEnergy thumb_func 0x81040cc -thumb_func 0x81040f0 -thumb_func 0x8104118 +thumb_func 0x81040f0 Anim_SwordsDanceBladeStep +thumb_func 0x8104118 AnimSonicBoomProjectile thumb_func 0x810421c thumb_func 0x8104250 thumb_func 0x81042f4 @@ -8648,25 +8648,25 @@ thumb_func 0x81049a4 thumb_func 0x8104a14 thumb_func 0x8104a6c thumb_func 0x8104af0 -thumb_func 0x8104b54 -thumb_func 0x8104bb4 +thumb_func 0x8104b54 Anim_RazorWindTornado +thumb_func 0x8104bb4 Anim_ViceGripPincer thumb_func 0x8104c48 -thumb_func 0x8104c64 -thumb_func 0x8104d0c -thumb_func 0x8104d80 +thumb_func 0x8104c64 Anim_GuillotinePincer +thumb_func 0x8104d0c Anim_GuillotinePincerStep1 +thumb_func 0x8104d80 Anim_GuillotinePincerStep2 thumb_func 0x8104de4 -thumb_func 0x8104e00 -thumb_func 0x8104e64 -thumb_func 0x8104ec4 -thumb_func 0x8104f1c -thumb_func 0x8105050 -thumb_func 0x8105140 +thumb_func 0x8104e00 AnimTask_GrowAndGreyscale +thumb_func 0x8104e64 AnimTask_GrowAndGreyscaleStep +thumb_func 0x8104ec4 AnimTask_Minimize +thumb_func 0x8104f1c AnimTask_MinimizeStep1 +thumb_func 0x8105050 CreateMinimizeSprite +thumb_func 0x8105140 ClonedMinizeSprite_Step thumb_func 0x8105188 -thumb_func 0x81051e8 -thumb_func 0x8105304 +thumb_func 0x81051e8 AnimTask_SplashStep +thumb_func 0x8105304 AnimTask_GrowAndShrink thumb_func 0x8105340 -thumb_func 0x810536c -thumb_func 0x81053fc +thumb_func 0x810536c Anim_BreathPuff +thumb_func 0x81053fc Anim_AngerMark thumb_func 0x8105488 thumb_func 0x81054c8 thumb_func 0x81054f4 @@ -8711,14 +8711,14 @@ thumb_func 0x81069dc thumb_func 0x8106a14 thumb_func 0x8106a9c thumb_func 0x8106acc -thumb_func 0x8106b38 +thumb_func 0x8106b38 AnimTask_HeartsBackground thumb_func 0x8106bf8 thumb_func 0x8106d48 thumb_func 0x8106e3c -thumb_func 0x8106f8c -thumb_func 0x8106fec +thumb_func 0x8106f8c AnimOrbitFast +thumb_func 0x8106fec AnimOrbitFastStep thumb_func 0x81070c8 -thumb_func 0x810711c +thumb_func 0x810711c AnimOrbitScatterStep thumb_func 0x8107164 thumb_func 0x8107194 thumb_func 0x81071ec @@ -8739,9 +8739,9 @@ thumb_func 0x81077b0 thumb_func 0x8107868 thumb_func 0x810788c thumb_func 0x81078fc -thumb_func 0x8107994 -thumb_func 0x81079b8 -thumb_func 0x81079d8 +thumb_func 0x8107994 AnimTask_IsFuryCutterHitRight +thumb_func 0x81079b8 AnimTask_GetFuryCutterHitCount +thumb_func 0x81079d8 AnimTask_CreateRaindrops thumb_func 0x8107a6c thumb_func 0x8107a78 thumb_func 0x8107ab0 @@ -8762,7 +8762,7 @@ thumb_func 0x8108010 thumb_func 0x81080e4 thumb_func 0x8108120 thumb_func 0x810815c -thumb_func 0x81081a4 +thumb_func 0x81081a4 AnimTask_CreateSurfWave thumb_func 0x81083d4 thumb_func 0x8108514 thumb_func 0x81085a8 @@ -8797,14 +8797,14 @@ thumb_func 0x8109878 thumb_func 0x81098b4 thumb_func 0x8109928 thumb_func 0x81099bc -thumb_func 0x81099e8 +thumb_func 0x81099e8 AnimEmberFlare thumb_func 0x8109a50 -thumb_func 0x8109a6c -thumb_func 0x8109a94 -thumb_func 0x8109aec -thumb_func 0x8109b64 -thumb_func 0x8109b88 -thumb_func 0x8109bb4 +thumb_func 0x8109a6c AnimFireRing +thumb_func 0x8109a94 AnimFireRingStep1 +thumb_func 0x8109aec AnimFireRingStep2 +thumb_func 0x8109b64 AnimFireRingStep3 +thumb_func 0x8109b88 UpdateFireRingCircleOffset +thumb_func 0x8109bb4 AnimFireCross thumb_func 0x8109bf4 thumb_func 0x8109c34 thumb_func 0x8109c5c @@ -8822,7 +8822,7 @@ thumb_func 0x810a49c thumb_func 0x810a500 thumb_func 0x810a60c thumb_func 0x810a67c -thumb_func 0x810a8b0 +thumb_func 0x810a8b0 AnimTask_BlendBackground thumb_func 0x810a8e4 thumb_func 0x810a9f8 thumb_func 0x810aa48 @@ -8864,54 +8864,54 @@ thumb_func 0x810bed4 thumb_func 0x810bf14 thumb_func 0x810c098 thumb_func 0x810c0fc -thumb_func 0x810c13c -thumb_func 0x810c1c4 -thumb_func 0x810c238 -thumb_func 0x810c274 -thumb_func 0x810c3b0 -thumb_func 0x810c418 -thumb_func 0x810c49c -thumb_func 0x810c4e4 -thumb_func 0x810c628 -thumb_func 0x810c698 -thumb_func 0x810c720 -thumb_func 0x810c858 -thumb_func 0x810c8f0 -thumb_func 0x810c9b4 -thumb_func 0x810cb40 -thumb_func 0x810cb74 -thumb_func 0x810cc40 -thumb_func 0x810cdb0 -thumb_func 0x810cf24 +thumb_func 0x810c13c AnimIceBeamParticle +thumb_func 0x810c1c4 AnimIceEffectParticle +thumb_func 0x810c238 AnimFlickerIceEffectParticle +thumb_func 0x810c274 AnimSwirlingSnowball_Step1 +thumb_func 0x810c3b0 AnimSwirlingSnowball_Step2 +thumb_func 0x810c418 AnimSwirlingSnowball_Step3 +thumb_func 0x810c49c AnimSwirlingSnowball_End +thumb_func 0x810c4e4 AnimMoveParticleBeyondTarget +thumb_func 0x810c628 AnimWiggleParticleTowardsTarget +thumb_func 0x810c698 AnimWaveFromCenterOfTarget +thumb_func 0x810c720 InitSwirlingFogAnim +thumb_func 0x810c858 AnimSwirlingFogAnim +thumb_func 0x810c8f0 AnimTask_Haze1 +thumb_func 0x810c9b4 AnimTask_Haze2 +thumb_func 0x810cb40 AnimThrowMistBall +thumb_func 0x810cb74 AnimTask_LoadMistTiles +thumb_func 0x810cc40 AnimTask_OverlayFogTiles +thumb_func 0x810cdb0 InitPoisonGasCloudAnim +thumb_func 0x810cf24 MovePoisonGasCloud thumb_func 0x810d168 AnimTask_Hail1 -thumb_func 0x810d184 -thumb_func 0x810d234 -thumb_func 0x810d3a8 -thumb_func 0x810d48c -thumb_func 0x810d4d8 +thumb_func 0x810d184 AnimTask_Hail2 +thumb_func 0x810d234 GenerateHailParticle +thumb_func 0x810d3a8 AnimHailBegin +thumb_func 0x810d48c AnimHailContinue +thumb_func 0x810d4d8 InitIceBallAnim thumb_func 0x810d56c thumb_func 0x810d59c thumb_func 0x810d600 -thumb_func 0x810d64c -thumb_func 0x810d67c +thumb_func 0x810d64c AnimTask_GetRolloutCounter +thumb_func 0x810d67c unc_080B08A0 thumb_func 0x810d6b8 thumb_func 0x810d704 -thumb_func 0x810d730 +thumb_func 0x810d730 AnimBasicFistOrFoot thumb_func 0x810d780 thumb_func 0x810d908 thumb_func 0x810d95c thumb_func 0x810d9b4 thumb_func 0x810da04 thumb_func 0x810da90 -thumb_func 0x810dac8 -thumb_func 0x810db00 -thumb_func 0x810db34 -thumb_func 0x810db58 -thumb_func 0x810dbb0 +thumb_func 0x810dac8 AnimSpinningKickOrPunch +thumb_func 0x810db00 AnimSpinningKickOrPunchFinish +thumb_func 0x810db34 AnimStompFoot +thumb_func 0x810db58 AnimStompFootStep +thumb_func 0x810dbb0 AnimStompFootEnd thumb_func 0x810dbcc thumb_func 0x810dc5c thumb_func 0x810dccc -thumb_func 0x810dd44 +thumb_func 0x810dd44 DaycarePrintMonLvl thumb_func 0x810de2c thumb_func 0x810de58 thumb_func 0x810def8 @@ -8931,8 +8931,8 @@ thumb_func 0x810e504 thumb_func 0x810e520 thumb_func 0x810e574 thumb_func 0x810e5a0 -thumb_func 0x810e614 -thumb_func 0x810e67c +thumb_func 0x810e614 AnimBubbleEffect +thumb_func 0x810e67c AnimBubbleEffectStep thumb_func 0x810e6c0 thumb_func 0x810e6e8 thumb_func 0x810e728 @@ -8955,7 +8955,7 @@ thumb_func 0x810f484 thumb_func 0x810f4e4 thumb_func 0x810f578 thumb_func 0x810f5c0 -thumb_func 0x810f620 +thumb_func 0x810f620 LinkOpponentHandlePaletteFade thumb_func 0x810f664 thumb_func 0x810f748 thumb_func 0x810f7f8 @@ -8963,7 +8963,7 @@ thumb_func 0x810f854 thumb_func 0x810f868 thumb_func 0x810f8d4 thumb_func 0x810f990 -thumb_func 0x810f9d4 +thumb_func 0x810f9d4 unref_sub_810F184 thumb_func 0x810fa3c thumb_func 0x810fb90 thumb_func 0x810fc18 @@ -8993,26 +8993,26 @@ thumb_func 0x8110984 thumb_func 0x8110a90 thumb_func 0x8110bb8 thumb_func 0x8110c88 -thumb_func 0x8110d34 +thumb_func 0x8110d34 AnimTranslateWebThread thumb_func 0x8110dcc thumb_func 0x8110e04 thumb_func 0x8110e80 thumb_func 0x8110ecc thumb_func 0x8110ef4 thumb_func 0x8110f50 -thumb_func 0x8110f70 +thumb_func 0x8110f70 AnimTranslateStinger thumb_func 0x81110a0 -thumb_func 0x811111c +thumb_func 0x811111c AnimMissileArcStep thumb_func 0x81111e4 thumb_func 0x8111240 thumb_func 0x81112c0 thumb_func 0x8111304 thumb_func 0x8111388 thumb_func 0x81113d0 -thumb_func 0x811141c +thumb_func 0x811141c AnimTask_LoadSandstormBackground thumb_func 0x8111500 -thumb_func 0x811169c -thumb_func 0x8111780 +thumb_func 0x811169c AnimDirtParticleAcrossScreen +thumb_func 0x8111780 AnimRaiseSprite thumb_func 0x81117c4 thumb_func 0x81118f4 thumb_func 0x8111a64 @@ -9023,7 +9023,7 @@ thumb_func 0x8111c18 thumb_func 0x8111c68 thumb_func 0x8111c94 thumb_func 0x8111cec -thumb_func 0x8111d3c +thumb_func 0x8111d3c SafariHandleLoadMonSprite thumb_func 0x8111d7c thumb_func 0x8111de0 thumb_func 0x8111e5c @@ -9035,8 +9035,8 @@ thumb_func 0x8112064 thumb_func 0x81120dc thumb_func 0x8112164 thumb_func 0x81121bc -thumb_func 0x8112230 -thumb_func 0x81122d8 +thumb_func 0x8112230 InitAnimShadowBall +thumb_func 0x81122d8 AnimShadowBallStep thumb_func 0x81123ec thumb_func 0x8112404 thumb_func 0x81124a0 @@ -9096,18 +9096,18 @@ thumb_func 0x8114bc4 thumb_func 0x8114c10 thumb_func 0x8114cc0 thumb_func 0x8114d0c -thumb_func 0x8114d48 +thumb_func 0x8114d48 AnimTask_MetallicShine thumb_func 0x8114f98 -thumb_func 0x81150ec +thumb_func 0x81150ec AnimTask_SetGreyscaleOrOriginalPal thumb_func 0x81151b0 -thumb_func 0x81151e4 -thumb_func 0x811524c -thumb_func 0x81152b0 +thumb_func 0x81151e4 AnimBonemerangProjectile +thumb_func 0x811524c AnimBonemerangProjectileStep +thumb_func 0x81152b0 AnimFissureDirtPlumeParticleStep thumb_func 0x81152cc -thumb_func 0x8115340 +thumb_func 0x8115340 AnimDirtScatter thumb_func 0x81153d0 -thumb_func 0x8115460 -thumb_func 0x811549c +thumb_func 0x8115460 AnimMudSportDirtRising +thumb_func 0x811549c AnimMudSportDirtFalling thumb_func 0x811550c thumb_func 0x811554c thumb_func 0x8115704 @@ -9115,20 +9115,20 @@ thumb_func 0x8115764 thumb_func 0x81157a4 thumb_func 0x8115828 thumb_func 0x8115930 -thumb_func 0x81159f0 +thumb_func 0x81159f0 AnimFissureDirtPlumeParticle thumb_func 0x8115a78 -thumb_func 0x8115a94 +thumb_func 0x8115a94 AnimDigDirtMound thumb_func 0x8115b2c thumb_func 0x8115bfc thumb_func 0x8115cf4 thumb_func 0x8115dd8 -thumb_func 0x8115e50 +thumb_func 0x8115e50 AnimTask_IsPowerOver99 thumb_func 0x8115e78 thumb_func 0x8115f20 -thumb_func 0x8115f7c -thumb_func 0x8115fe8 -thumb_func 0x811604c -thumb_func 0x811608c +thumb_func 0x8115f7c AnimConfusionDuck +thumb_func 0x8115fe8 AnimConfusionDuckStep +thumb_func 0x811604c AnimSimplePaletteBlend +thumb_func 0x811608c UnpackSelectedBattleAnimPalettes thumb_func 0x81160d4 thumb_func 0x81160f4 thumb_func 0x8116148 @@ -9163,10 +9163,10 @@ thumb_func 0x8116df8 thumb_func 0x8116e34 thumb_func 0x8116e70 thumb_func 0x8116eb4 -thumb_func 0x8116fac -thumb_func 0x8117098 -thumb_func 0x81170c4 -thumb_func 0x8117108 +thumb_func 0x8116fac AnimTask_SetCamouflageBlend +thumb_func 0x8117098 AnimTask_BlendParticle +thumb_func 0x81170c4 StartBlendAnimSpriteColor +thumb_func 0x8117108 AnimTask_BlendSpriteColor_Step2 thumb_func 0x81171b0 thumb_func 0x81171f0 thumb_func 0x8117210 @@ -9186,89 +9186,89 @@ thumb_func 0x8117eb0 thumb_func 0x8117f28 thumb_func 0x8117fa4 thumb_func 0x8117fd0 -thumb_func 0x8117ffc +thumb_func 0x8117ffc AnimTask_GetTargetIsAttackerPartner thumb_func 0x8118034 thumb_func 0x81180a4 thumb_func 0x81182b0 -thumb_func 0x8118474 +thumb_func 0x8118474 AnimTask_GetBattleTerrain thumb_func 0x8118494 thumb_func 0x81184c0 thumb_func 0x81184f0 thumb_func 0x811858c thumb_func 0x8118628 -thumb_func 0x81186b0 +thumb_func 0x81186b0 AnimTask_IsContest thumb_func 0x81186e4 -thumb_func 0x8118714 +thumb_func 0x8118714 AnimTask_IsTargetSameSide thumb_func 0x8118760 thumb_func 0x8118780 thumb_func 0x81187b0 thumb_func 0x8118820 -thumb_func 0x811887c -thumb_func 0x8118990 -thumb_func 0x8118a24 +thumb_func 0x811887c SetAnimBgAttribute +thumb_func 0x8118990 GetAnimBgAttribute +thumb_func 0x8118a24 HandleIntroSlide thumb_func 0x8118adc -thumb_func 0x8118b3c -thumb_func 0x8118d88 -thumb_func 0x8119094 -thumb_func 0x8119310 -thumb_func 0x81195b8 +thumb_func 0x8118b3c BattleIntroSlide1 +thumb_func 0x8118d88 BattleIntroSlide2 +thumb_func 0x8119094 BattleIntroSlide3 +thumb_func 0x8119310 BattleIntroSlideLink +thumb_func 0x81195b8 BattleIntroSlidePartner thumb_func 0x811980c thumb_func 0x81198e4 unref_sub_8119094 -thumb_func 0x81199b4 -thumb_func 0x81199ec +thumb_func 0x81199b4 MovePlayerOnBike +thumb_func 0x81199ec MovePlayerOnMachBike thumb_func 0x8119a10 -thumb_func 0x8119a1c -thumb_func 0x8119a74 -thumb_func 0x8119a88 -thumb_func 0x8119ad0 +thumb_func 0x8119a1c GetMachBikeTransition +thumb_func 0x8119a74 MachBikeTransition_FaceDirection +thumb_func 0x8119a88 MachBikeTransition_TurnDirection +thumb_func 0x8119ad0 MachBikeTransition_TrySpeedUp thumb_func 0x8119b94 -thumb_func 0x8119c18 +thumb_func 0x8119c18 MovePlayerOnAcroBike thumb_func 0x8119c44 -thumb_func 0x8119c50 -thumb_func 0x8119c7c -thumb_func 0x8119d18 -thumb_func 0x8119d90 -thumb_func 0x8119e30 -thumb_func 0x8119ed8 -thumb_func 0x8119fb4 +thumb_func 0x8119c50 CheckMovementInputAcroBike +thumb_func 0x8119c7c AcroBikeHandleInputNormal +thumb_func 0x8119d18 AcroBikeHandleInputTurning +thumb_func 0x8119d90 AcroBikeHandleInputWheelieStanding +thumb_func 0x8119e30 AcroBikeHandleInputBunnyHop +thumb_func 0x8119ed8 AcroBikeHandleInputWheelieMoving +thumb_func 0x8119fb4 AcroBikeHandleInputSidewaysJump thumb_func 0x811a010 AcroBikeHandleInputTurnJump -thumb_func 0x811a034 -thumb_func 0x811a044 -thumb_func 0x811a080 -thumb_func 0x811a110 -thumb_func 0x811a14c -thumb_func 0x811a188 -thumb_func 0x811a1c4 -thumb_func 0x811a200 -thumb_func 0x811a274 +thumb_func 0x811a034 AcroBikeTransition_TurnJump +thumb_func 0x811a044 AcroBikeTransition_TurnDirection +thumb_func 0x811a080 AcroBikeTransition_Moving +thumb_func 0x811a110 AcroBikeTransition_NormalToWheelie +thumb_func 0x811a14c AcroBikeTransition_WheelieToNormal +thumb_func 0x811a188 AcroBikeTransition_WheelieIdle +thumb_func 0x811a1c4 AcroBikeTransition_WheelieHoppingStanding +thumb_func 0x811a200 AcroBikeTransition_WheelieHoppingMoving +thumb_func 0x811a274 AcroBikeTransition_SideJump thumb_func 0x811a2e4 -thumb_func 0x811a2f4 -thumb_func 0x811a384 -thumb_func 0x811a414 +thumb_func 0x811a2f4 AcroBikeTransition_WheelieMoving +thumb_func 0x811a384 AcroBikeTransition_WheelieRisingMoving +thumb_func 0x811a414 AcroBikeTransition_WheelieLoweringMoving thumb_func 0x811a48c Bike_TryAcroBikeHistoryUpdate -thumb_func 0x811a4b4 -thumb_func 0x811a51c -thumb_func 0x811a580 +thumb_func 0x811a4b4 AcroBike_TryHistoryUpdate +thumb_func 0x811a51c HasPlayerInputTakenLongerThanList +thumb_func 0x811a580 AcroBike_GetJumpDirection thumb_func 0x811a5d0 Bike_UpdateDirTimerHistory thumb_func 0x811a60c Bike_UpdateABStartSelectHistory thumb_func 0x811a648 Bike_DPadToDirection -thumb_func 0x811a688 -thumb_func 0x811a6f4 -thumb_func 0x811a740 -thumb_func 0x811a768 +thumb_func 0x811a688 get_some_collision +thumb_func 0x811a6f4 Bike_CheckCollisionTryAdvanceCollisionCount +thumb_func 0x811a740 RS_IsRunningDisallowed +thumb_func 0x811a768 IsRunningDisallowedByMetatile thumb_func 0x811a7a0 Bike_TryAdvanceCyclingRoadCollisions -thumb_func 0x811a7c4 +thumb_func 0x811a7c4 CanBikeFaceDirOnMetatile thumb_func 0x811a814 WillPlayerCollideWithCollision -thumb_func 0x811a848 -thumb_func 0x811a894 -thumb_func 0x811a8d0 +thumb_func 0x811a848 IsBikingDisallowedByPlayer +thumb_func 0x811a894 IsMonValidSpecies +thumb_func 0x811a8d0 GetOnOffBike thumb_func 0x811a920 BikeClearState -thumb_func 0x811a964 -thumb_func 0x811a978 -thumb_func 0x811a988 -thumb_func 0x811a9d8 -thumb_func 0x811aa2c -thumb_func 0x811aa5c +thumb_func 0x811a964 Bike_UpdateBikeCounterSpeed +thumb_func 0x811a978 Bike_SetBikeStill +thumb_func 0x811a988 GetPlayerSpeed +thumb_func 0x811a9d8 Bike_HandleBumpySlopeJump +thumb_func 0x811aa2c IsRunningDisallowed +thumb_func 0x811aa5c DoEasyChatScreen thumb_func 0x811aac8 thumb_func 0x811aae0 thumb_func 0x811aaf4 @@ -9276,7 +9276,7 @@ thumb_func 0x811ab10 thumb_func 0x811ab4c thumb_func 0x811ac78 thumb_func 0x811ad20 -thumb_func 0x811ad40 +thumb_func 0x811ad40 ShowEasyChatScreen thumb_func 0x811b034 thumb_func 0x811b0a8 thumb_func 0x811b0b8 @@ -9286,7 +9286,7 @@ thumb_func 0x811b11c DoQuizAnswerEasyChatScreen thumb_func 0x811b140 DoQuizQuestionEasyChatScreen thumb_func 0x811b164 DoQuizSetAnswerEasyChatScreen thumb_func 0x811b188 DoQuizSetQuestionEasyChatScreen -thumb_func 0x811b1ac +thumb_func 0x811b1ac EasyChat_AllocateResources thumb_func 0x811b2d0 thumb_func 0x811b2ec thumb_func 0x811b384 @@ -9321,7 +9321,7 @@ thumb_func 0x811bd38 thumb_func 0x811be04 thumb_func 0x811be94 thumb_func 0x811bf14 -thumb_func 0x811bf38 +thumb_func 0x811bf38 AnimTask_GrowAndShrinkStep thumb_func 0x811bf64 thumb_func 0x811c098 thumb_func 0x811c0b8 @@ -9335,16 +9335,16 @@ thumb_func 0x811c220 thumb_func 0x811c240 FooterHasFourOptions thumb_func 0x811c260 thumb_func 0x811c26c GetEasyChatScreenFrameId -thumb_func 0x811c28c -thumb_func 0x811c298 -thumb_func 0x811c2a4 -thumb_func 0x811c2b0 -thumb_func 0x811c2bc +thumb_func 0x811c28c GetTitleText +thumb_func 0x811c298 GetEasyChatWordBuffer +thumb_func 0x811c2a4 GetNumRows +thumb_func 0x811c2b0 GetNumColumns +thumb_func 0x811c2bc GetMainCursorColumn thumb_func 0x811c2c8 thumb_func 0x811c2d4 GetEasyChatInstructionsText thumb_func 0x811c30c GetEasyChatConfirmText thumb_func 0x811c344 -thumb_func 0x811c38c +thumb_func 0x811c38c GetEasyChatConfirmDeletionText thumb_func 0x811c3a0 thumb_func 0x811c3b4 thumb_func 0x811c3c0 @@ -9354,10 +9354,10 @@ thumb_func 0x811c3ec thumb_func 0x811c3f8 thumb_func 0x811c3fc thumb_func 0x811c430 -thumb_func 0x811c474 +thumb_func 0x811c474 FooterHasFourOptions_ thumb_func 0x811c480 -thumb_func 0x811c4c0 -thumb_func 0x811c4cc +thumb_func 0x811c4c0 GetDisplayedPersonType +thumb_func 0x811c4cc GetEachChatScreenTemplateId thumb_func 0x811c4f8 thumb_func 0x811c530 thumb_func 0x811c568 @@ -9390,7 +9390,7 @@ thumb_func 0x811d034 thumb_func 0x811d040 thumb_func 0x811d088 thumb_func 0x811d0e4 -thumb_func 0x811d1a4 +thumb_func 0x811d1a4 IsDma3ManagerBusyWithBgCopy_ thumb_func 0x811d250 thumb_func 0x811d310 thumb_func 0x811d3cc @@ -9429,7 +9429,7 @@ thumb_func 0x811e004 thumb_func 0x811e048 thumb_func 0x811e07c thumb_func 0x811e164 -thumb_func 0x811e1c8 +thumb_func 0x811e1c8 VBlankCB_MailRead thumb_func 0x811e1e0 thumb_func 0x811e2b8 thumb_func 0x811e2f0 @@ -9469,14 +9469,14 @@ thumb_func 0x811ee2c thumb_func 0x811ee6c thumb_func 0x811eee0 thumb_func 0x811ef44 -thumb_func 0x811ef74 +thumb_func 0x811ef74 GetCoolColorFromPersonality thumb_func 0x811f044 -thumb_func 0x811f088 +thumb_func 0x811f088 EasyChat_GetNumWordsInGroup thumb_func 0x811f0c0 -thumb_func 0x811f12c -thumb_func 0x811f180 +thumb_func 0x811f12c GetEasyChatWord +thumb_func 0x811f180 CopyEasyChatWord thumb_func 0x811f1cc ConvertEasyChatWordsToString -thumb_func 0x811f25c +thumb_func 0x811f25c GetEasyChatWordStringLength thumb_func 0x811f2a4 thumb_func 0x811f318 thumb_func 0x811f370 @@ -9495,9 +9495,9 @@ thumb_func 0x811f814 thumb_func 0x811f830 thumb_func 0x811f908 thumb_func 0x811f914 -thumb_func 0x811f93c +thumb_func 0x811f93c unref_sub_811F3E0 thumb_func 0x811f980 -thumb_func 0x811f990 +thumb_func 0x811f990 CopyEasyChatWordPadded thumb_func 0x811f9c8 thumb_func 0x811faa0 thumb_func 0x811fad0 @@ -9519,7 +9519,7 @@ thumb_func 0x8120018 thumb_func 0x81200c4 thumb_func 0x81201a0 thumb_func 0x812045c nullsub_71 -thumb_func 0x8120460 +thumb_func 0x8120460 OpponentHandleChosenMonReturnValue thumb_func 0x812049c thumb_func 0x81204b4 thumb_func 0x81204d4 @@ -9527,85 +9527,85 @@ thumb_func 0x81204f4 thumb_func 0x81205a4 thumb_func 0x81205c0 SetupBard thumb_func 0x8120618 SetupHipster -thumb_func 0x812063c +thumb_func 0x812063c SafariHandleDrawPartyStatusSummary thumb_func 0x8120648 SetupGiddy thumb_func 0x8120674 -thumb_func 0x8120680 +thumb_func 0x8120680 SetMauvilleOldMan thumb_func 0x81206e8 thumb_func 0x81206fc ScrSpecial_GetCurrentMauvilleMan -thumb_func 0x8120714 -thumb_func 0x8120730 +thumb_func 0x8120714 ScrSpecial_HasBardSongBeenChanged +thumb_func 0x8120730 ScrSpecial_SaveBardSongLyrics thumb_func 0x81207a0 -thumb_func 0x8120820 -thumb_func 0x8120838 -thumb_func 0x8120854 -thumb_func 0x812086c -thumb_func 0x81208a4 -thumb_func 0x81208dc -thumb_func 0x81209bc +thumb_func 0x8120820 ScrSpecial_PlayBardSong +thumb_func 0x8120838 ScrSpecial_GetHipsterSpokenFlag +thumb_func 0x8120854 ScrSpecial_SetHipsterSpokenFlag +thumb_func 0x812086c ScrSpecial_HipsterTeachWord +thumb_func 0x81208a4 ScrSpecial_GiddyShouldTellAnotherTale +thumb_func 0x81208dc ScrSpecial_GenerateGiddyLine +thumb_func 0x81209bc InitGiddyTaleList thumb_func 0x8120b08 -thumb_func 0x8120b20 +thumb_func 0x8120b20 ResetHipsterFlag thumb_func 0x8120b38 thumb_func 0x8120b44 -thumb_func 0x8120b50 -thumb_func 0x8120ba0 +thumb_func 0x8120b50 ResetMauvilleOldManFlag +thumb_func 0x8120ba0 StartBardSong thumb_func 0x8120bd0 thumb_func 0x8120bdc thumb_func 0x8120be8 thumb_func 0x8120c2c -thumb_func 0x8120e18 +thumb_func 0x8120e18 ScrSpecial_SetMauvilleOldManEventObjGfx thumb_func 0x8120e2c thumb_func 0x8120e90 thumb_func 0x8120f54 StorytellerSetup thumb_func 0x8120f9c Storyteller_ResetFlag -thumb_func 0x8120fc0 -thumb_func 0x8120fd4 -thumb_func 0x8121000 -thumb_func 0x812100c -thumb_func 0x8121018 +thumb_func 0x8120fc0 StorytellerGetGameStat +thumb_func 0x8120fd4 GetStoryByStat +thumb_func 0x8121000 GetStoryTitleByStat +thumb_func 0x812100c GetStoryTextByStat +thumb_func 0x8121018 GetStoryActionByStat thumb_func 0x8121024 GetFreeStorySlot thumb_func 0x8121054 StorytellerGetRecordedTrainerStat thumb_func 0x8121078 StorytellerSetRecordedTrainerStat -thumb_func 0x8121098 -thumb_func 0x81210c8 -thumb_func 0x81210f8 -thumb_func 0x8121128 -thumb_func 0x81211b0 -thumb_func 0x8121204 +thumb_func 0x8121098 HasTrainerStatIncreased +thumb_func 0x81210c8 GetStoryByStattellerPlayerName +thumb_func 0x81210f8 StorytellerSetPlayerName +thumb_func 0x8121128 StorytellerRecordNewStat +thumb_func 0x81211b0 ScrambleStatList +thumb_func 0x8121204 StorytellerInitializeRandomStat thumb_func 0x81212c4 -thumb_func 0x8121320 -thumb_func 0x81213ec -thumb_func 0x8121478 +thumb_func 0x8121320 Task_Dive +thumb_func 0x81213ec Task_StoryListMenu +thumb_func 0x8121478 ScrSpecial_StorytellerStoryListMenu thumb_func 0x812148c thumb_func 0x81214a0 -thumb_func 0x81214c8 -thumb_func 0x8121514 +thumb_func 0x81214c8 ScrSpecial_StorytellerUpdateStat +thumb_func 0x8121514 ScrSpecial_HasStorytellerAlreadyRecorded thumb_func 0x8121540 thumb_func 0x8121568 -thumb_func 0x8121688 -thumb_func 0x8121a60 +thumb_func 0x8121688 MailReadBuildGraphics +thumb_func 0x8121a60 CB2_InitMailRead thumb_func 0x8121a8c -thumb_func 0x8121b64 +thumb_func 0x8121b64 LoadSavedMapView thumb_func 0x8121c60 thumb_func 0x8121c74 thumb_func 0x8121c94 -thumb_func 0x8121ca0 -thumb_func 0x8121cc4 -thumb_func 0x8121d00 -thumb_func 0x8121d90 -thumb_func 0x8121e00 -thumb_func 0x8121e58 -thumb_func 0x8121e6c -thumb_func 0x8121f10 -thumb_func 0x8121f2c +thumb_func 0x8121ca0 CB2_WaitForPaletteExitOnKeyPress +thumb_func 0x8121cc4 CB2_ExitOnKeyPress +thumb_func 0x8121d00 CB2_ExitMailReadFreeVars +thumb_func 0x8121d90 ResetVramOamAndBgCntRegs +thumb_func 0x8121e00 ResetAllBgsCoordinates +thumb_func 0x8121e58 SetVBlankHBlankCallbacksToNull +thumb_func 0x8121e6c DisplayMessageAndContinueTask +thumb_func 0x8121f10 RunTextPrintersRetIsActive +thumb_func 0x8121f2c Task_ContinueTaskAfterMessagePrints thumb_func 0x8121f58 DoYesNoFuncWithChoice thumb_func 0x8121f84 -thumb_func 0x8121fe8 -thumb_func 0x8122040 -thumb_func 0x81220dc +thumb_func 0x8121fe8 Task_CallYesOrNoCallback +thumb_func 0x8122040 AdjustQuantityAccordingToDPadInput +thumb_func 0x81220dc GetLRKeysState thumb_func 0x8122118 thumb_func 0x8122154 -thumb_func 0x8122188 +thumb_func 0x8122188 itemid_80BF6D8_mail_related thumb_func 0x81221b8 thumb_func 0x81221dc thumb_func 0x81221f8 @@ -9617,73 +9617,73 @@ thumb_func 0x8122350 thumb_func 0x81223bc thumb_func 0x8122408 thumb_func 0x8122454 -thumb_func 0x81224e0 -thumb_func 0x812258c +thumb_func 0x81224e0 InitDewfordTrend +thumb_func 0x812258c UpdateDewfordTrendPerDay thumb_func 0x81226e4 thumb_func 0x8122810 -thumb_func 0x8122888 -thumb_func 0x81229a4 +thumb_func 0x8122888 ReceiveEasyChatPairsData +thumb_func 0x81229a4 BufferTrendyPhraseString thumb_func 0x81229d4 TrendyPhraseIsOld thumb_func 0x8122a3c GetDewfordHallPaintingNameIndex thumb_func 0x8122a64 thumb_func 0x8122b34 -thumb_func 0x8122bbc +thumb_func 0x8122bbc SB1ContainsWords thumb_func 0x8122bfc IsEasyChatPairEqual thumb_func 0x8122c28 GetEqualEasyChatPairIndex -thumb_func 0x8122c68 -thumb_func 0x8122ca0 -thumb_func 0x8122cc8 +thumb_func 0x8122c68 GetHealLocationIndexByMap +thumb_func 0x8122ca0 GetHealLocationByMap +thumb_func 0x8122cc8 GetHealLocation thumb_func 0x8122ce8 InitRegionMap thumb_func 0x8122d04 thumb_func 0x8122d94 thumb_func 0x8122dbc thumb_func 0x812303c -thumb_func 0x8123068 +thumb_func 0x8123068 FreeRegionMapIconResources thumb_func 0x81230b8 thumb_func 0x81230c4 -thumb_func 0x81230d0 -thumb_func 0x812319c +thumb_func 0x81230d0 ProcessRegionMapInput_Full +thumb_func 0x812319c MoveRegionMapCursor_Full thumb_func 0x8123260 ProcessRegionMapInput_Zoomed -thumb_func 0x8123340 +thumb_func 0x8123340 MoveRegionMapCursor_Zoomed thumb_func 0x8123424 thumb_func 0x8123520 thumb_func 0x81236d0 CalcZoomScrollParams thumb_func 0x8123798 RegionMap_SetBG2XAndBG2Y -thumb_func 0x81237c0 +thumb_func 0x81237c0 UpdateRegionMapVideoRegs thumb_func 0x8123830 PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs thumb_func 0x8123878 GetRegionMapSectionIdAt_Internal -thumb_func 0x81238b8 -thumb_func 0x8123c0c -thumb_func 0x8123d64 +thumb_func 0x81238b8 RegionMap_InitializeStateBasedOnPlayerLocation +thumb_func 0x8123c0c RegionMap_InitializeStateBasedOnSSTidalLocation +thumb_func 0x8123d64 get_flagnr_blue_points thumb_func 0x8123ea8 GetRegionMapSectionIdAt -thumb_func 0x8123ec0 -thumb_func 0x8123f10 +thumb_func 0x8123ec0 CorrectSpecialMapSecId_Internal +thumb_func 0x8123f10 RegionMap_GetTerraCaveMapSecId thumb_func 0x8123f3c -thumb_func 0x8123f80 -thumb_func 0x8123fa8 -thumb_func 0x8123fbc +thumb_func 0x8123f80 RegionMap_IsPlayerInCave +thumb_func 0x8123fa8 CorrectSpecialMapSecId +thumb_func 0x8123fbc RegionMap_GetPositionOfCursorWithinMapSection thumb_func 0x8124044 RegionMap_IsMapSecIdInNextRow thumb_func 0x8124094 SpriteCallback_CursorFull thumb_func 0x81240dc nullsub_70 -thumb_func 0x81240e0 -thumb_func 0x8124244 +thumb_func 0x81240e0 CreateRegionMapCursor +thumb_func 0x8124244 FreeRegionMapCursorSprite thumb_func 0x8124274 thumb_func 0x8124284 -thumb_func 0x8124294 +thumb_func 0x8124294 CreateRegionMapPlayerIcon thumb_func 0x81243bc HideRegionMapPlayerIcon -thumb_func 0x81243e8 -thumb_func 0x8124468 +thumb_func 0x81243e8 UnhideRegionMapPlayerIcon +thumb_func 0x8124468 RegionMapPlayerIconSpriteCallback_Zoomed thumb_func 0x81244f8 -thumb_func 0x8124504 +thumb_func 0x8124504 RegionMapPlayerIconSpriteCallback thumb_func 0x8124558 -thumb_func 0x8124578 +thumb_func 0x8124578 GetMapName thumb_func 0x81245e8 thumb_func 0x812461c thumb_func 0x812463c thumb_func 0x8124664 thumb_func 0x8124674 -thumb_func 0x812469c -thumb_func 0x81248cc +thumb_func 0x812469c MCB2_FlyMap +thumb_func 0x81248cc CheckLeadMonTough thumb_func 0x81248e0 thumb_func 0x81248f0 thumb_func 0x8124900 @@ -9735,68 +9735,68 @@ thumb_func 0x81268f0 thumb_func 0x8126924 thumb_func 0x8126950 InitDecorationContextItems thumb_func 0x81269bc -thumb_func 0x81269f8 +thumb_func 0x81269f8 RemoveDecorationWindow thumb_func 0x8126a28 -thumb_func 0x8126a84 +thumb_func 0x8126a84 InitDecorationActionsWindow thumb_func 0x8126aa0 DoSecretBaseDecorationMenu thumb_func 0x8126af4 DoPlayerRoomDecorationMenu -thumb_func 0x8126b48 -thumb_func 0x8126bd0 -thumb_func 0x8126c10 -thumb_func 0x8126c6c +thumb_func 0x8126b48 HandleDecorationActionsMenuInput +thumb_func 0x8126bd0 PrintCurMainMenuDescription +thumb_func 0x8126c10 DecorationMenuAction_Decorate +thumb_func 0x8126c6c DecorationMenuAction_PutAway thumb_func 0x8126cd8 -thumb_func 0x8126d34 +thumb_func 0x8126d34 DecorationMenuAction_Cancel thumb_func 0x8126d6c ReturnToDecorationActionsAfterInvalidSelection -thumb_func 0x8126d94 +thumb_func 0x8126d94 SecretBasePC_PrepMenuForSelectingStoredDecors thumb_func 0x8126dc4 -thumb_func 0x8126e1c +thumb_func 0x8126e1c task_map_chg_seq_0807EC34 thumb_func 0x8126e78 thumb_func 0x8126f20 -thumb_func 0x8127010 -thumb_func 0x8127040 -thumb_func 0x81270a0 -thumb_func 0x8127138 -thumb_func 0x8127154 -thumb_func 0x8127184 -thumb_func 0x81271c0 -thumb_func 0x8127208 -thumb_func 0x8127220 -thumb_func 0x812723c +thumb_func 0x8127010 ColorMenuItemString +thumb_func 0x8127040 HandleDecorationCategoriesMenuInput +thumb_func 0x81270a0 SelectDecorationCategory +thumb_func 0x8127138 ReturnToDecorationCategoriesAfterInvalidSelection +thumb_func 0x8127154 ExitDecorationCategoriesMenu +thumb_func 0x8127184 ReturnToActionsMenuFromCategories +thumb_func 0x81271c0 ShowDecorationCategoriesWindow +thumb_func 0x8127208 CopyDecorationCategoryName +thumb_func 0x8127220 ExitTraderDecorationMenu +thumb_func 0x812723c InitDecorationItemsMenuLimits thumb_func 0x8127280 thumb_func 0x81272b0 -thumb_func 0x81272e8 -thumb_func 0x8127404 -thumb_func 0x8127430 +thumb_func 0x81272e8 PrintDecorationItemMenuItems +thumb_func 0x8127404 CopyDecorationMenuItemName +thumb_func 0x8127430 DecorationItemsMenu_OnCursorMove thumb_func 0x8127450 -thumb_func 0x81274b0 +thumb_func 0x81274b0 AddDecorationItemsScrollIndicators thumb_func 0x8127504 thumb_func 0x8127530 -thumb_func 0x812754c -thumb_func 0x81275cc -thumb_func 0x81275f8 -thumb_func 0x81276c4 -thumb_func 0x81276f0 -thumb_func 0x8127758 +thumb_func 0x812754c InitDecorationItemsWindow +thumb_func 0x81275cc ShowDecorationItemsWindow +thumb_func 0x81275f8 HandleDecorationItemsMenuInput +thumb_func 0x81276c4 ShowDecorationCategorySummaryWindow +thumb_func 0x81276f0 PrintDecorationItemDescription +thumb_func 0x8127758 RemoveDecorationItemsOtherWindows thumb_func 0x812776c thumb_func 0x8127798 -thumb_func 0x81277c4 -thumb_func 0x8127964 -thumb_func 0x8127974 +thumb_func 0x81277c4 IdentifyOwnedDecorationsCurrentlyInUseInternal +thumb_func 0x8127964 IdentifyOwnedDecorationsCurrentlyInUse +thumb_func 0x8127974 IsSelectedDecorInThePC thumb_func 0x81279c4 thumb_func 0x81279e0 thumb_func 0x8127a0c -thumb_func 0x8127a3c +thumb_func 0x8127a3c SafariHandleSuccessBallThrowAnim thumb_func 0x8127a7c thumb_func 0x8127ab4 -thumb_func 0x8127b04 -thumb_func 0x8127b40 +thumb_func 0x8127b04 GetDecorationElevation +thumb_func 0x8127b40 ShowDecorationOnMap_ thumb_func 0x8127d08 thumb_func 0x8127dec thumb_func 0x8127f0c thumb_func 0x8127f3c thumb_func 0x8128034 -thumb_func 0x81280ec -thumb_func 0x812817c +thumb_func 0x81280ec ConfigureCameraObjectForPlacingDecoration +thumb_func 0x812817c SetUpPlacingDecorationPlayerAvatar thumb_func 0x8128240 thumb_func 0x8128394 thumb_func 0x81283ec @@ -9811,7 +9811,7 @@ thumb_func 0x8128a8c thumb_func 0x8128b60 thumb_func 0x8128b80 thumb_func 0x8128b9c -thumb_func 0x8128bcc +thumb_func 0x8128bcc c1_overworld_prev_quest thumb_func 0x8128c44 thumb_func 0x8128cb4 thumb_func 0x8128cf0 @@ -9830,17 +9830,17 @@ thumb_func 0x812923c SetDecorSelectionBoxOamAttributes thumb_func 0x81292b0 thumb_func 0x81292c8 thumb_func 0x8129314 -thumb_func 0x81293bc +thumb_func 0x81293bc AddDecorationIconObjectFromIconTable thumb_func 0x8129480 GetDecorationIconPicOrPalette thumb_func 0x81294a4 -thumb_func 0x81295b4 +thumb_func 0x81295b4 AddDecorationIconObject thumb_func 0x81296d4 thumb_func 0x81296f0 thumb_func 0x8129798 thumb_func 0x81297e4 thumb_func 0x81298dc thumb_func 0x812999c -thumb_func 0x81299cc +thumb_func 0x81299cc SetUpPuttingAwayDecorationPlayerAvatar thumb_func 0x8129aac thumb_func 0x8129b24 thumb_func 0x8129bbc @@ -9863,128 +9863,128 @@ thumb_func 0x812a268 thumb_func 0x812a2d0 thumb_func 0x812a340 thumb_func 0x812a378 -thumb_func 0x812a3a8 +thumb_func 0x812a3a8 CB2_PokeblockMenu thumb_func 0x812a3d4 thumb_func 0x812a3e0 thumb_func 0x812a468 thumb_func 0x812a488 -thumb_func 0x812a4ec -thumb_func 0x812a550 -thumb_func 0x812a598 +thumb_func 0x812a4ec Task_FadeToSlotMachine +thumb_func 0x812a550 PlaySlotMachine +thumb_func 0x812a598 CB2_SlotMachineSetup thumb_func 0x812a680 -thumb_func 0x812a698 -thumb_func 0x812a6e4 +thumb_func 0x812a698 mevent_srv_new_wcard +thumb_func 0x812a6e4 PlaySlotMachine_Internal thumb_func 0x812a720 thumb_func 0x812a75c nullsub_73 -thumb_func 0x812a760 -thumb_func 0x812a7ac +thumb_func 0x812a760 SlotMachineSetup_0_0 +thumb_func 0x812a7ac ContestEffect_StartleMonsCuteAppeal thumb_func 0x812a7cc SlotMachineSetup_1_0 thumb_func 0x812a820 SlotMachineSetup_2_0 -thumb_func 0x812a844 -thumb_func 0x812a8d4 -thumb_func 0x812a9bc -thumb_func 0x812a9dc -thumb_func 0x812aa58 +thumb_func 0x812a844 SlotMachineSetup_2_1 +thumb_func 0x812a8d4 SlotMachineSetup_0_1 +thumb_func 0x812a9bc SlotMachineSetup_3_0 +thumb_func 0x812a9dc SlotMachineSetup_4_0 +thumb_func 0x812aa58 SlotMachineSetup_5_0 thumb_func 0x812aa88 SlotMachineSetup_10_0 thumb_func 0x812aaa0 SlotMachineSetupGameplayTasks thumb_func 0x812aab8 -thumb_func 0x812aad8 -thumb_func 0x812ab14 +thumb_func 0x812aad8 RunSlotActions +thumb_func 0x812ab14 SlotAction_UnfadeScreen thumb_func 0x812ab48 SlotAction_WaitForUnfade -thumb_func 0x812ab70 +thumb_func 0x812ab70 SlotAction_SetSlotMachineVars thumb_func 0x812abb8 SlotAction3 thumb_func 0x812abd8 SlotAction4 -thumb_func 0x812ac08 +thumb_func 0x812ac08 SlotAction_AwaitPlayerInput thumb_func 0x812ad04 thumb_func 0x812ad44 thumb_func 0x812ad70 SlotAction_GivingInformation -thumb_func 0x812ad90 +thumb_func 0x812ad90 SlotAction9 thumb_func 0x812ae04 SlotAction10 thumb_func 0x812ae34 SlotAction_SetLuckySpins -thumb_func 0x812ae5c -thumb_func 0x812ae98 -thumb_func 0x812aed4 +thumb_func 0x812ae5c SlotAction_AwaitReelStop +thumb_func 0x812ae98 SlotAction_WaitForAllReelsToStop +thumb_func 0x812aed4 SlotAction_CheckMatches thumb_func 0x812b00c SlotAction_WaitForPayoutToBeAwarded -thumb_func 0x812b02c +thumb_func 0x812b02c SlotAction_EndOfRoll thumb_func 0x812b0a4 SlotAction_MatchedPower thumb_func 0x812b0e8 SlotAction18 thumb_func 0x812b118 SlotAction_Loop thumb_func 0x812b140 SlotAction_NoMatches -thumb_func 0x812b168 -thumb_func 0x812b1c0 +thumb_func 0x812b168 SlotAction_PrintQuitTheGame +thumb_func 0x812b1c0 SlotAction_SeeIfPlayerQuits thumb_func 0x812b224 thumb_func 0x812b264 -thumb_func 0x812b290 +thumb_func 0x812b290 SlotAction_PrintMessage_NoMoreCoins thumb_func 0x812b2d0 -thumb_func 0x812b2fc -thumb_func 0x812b33c +thumb_func 0x812b2fc SlotAction_EndGame +thumb_func 0x812b33c SlotAction_FreeDataStructures thumb_func 0x812b4fc DrawLuckyFlags thumb_func 0x812b56c SetLuckySpins -thumb_func 0x812b58c -thumb_func 0x812b5c0 -thumb_func 0x812b5fc -thumb_func 0x812b644 -thumb_func 0x812b6dc -thumb_func 0x812b710 -thumb_func 0x812b770 -thumb_func 0x812b79c +thumb_func 0x812b58c GetBiasTag +thumb_func 0x812b5c0 IsThisRoundLucky +thumb_func 0x812b5fc AttemptsAtLuckyFlags_Top3 +thumb_func 0x812b644 AttemptsAtLuckyFlags_NotTop3 +thumb_func 0x812b6dc GetReelTimeProbability +thumb_func 0x812b710 GetReeltimeDraw +thumb_func 0x812b770 SkipToReeltimeAction14 +thumb_func 0x812b79c SlowReelSpeed thumb_func 0x812b838 CheckMatch thumb_func 0x812b86c CheckMatch_CenterRow thumb_func 0x812b8e0 CheckMatch_TopAndBottom thumb_func 0x812b9b0 CheckMatch_Diagonals -thumb_func 0x812ba7c -thumb_func 0x812bacc +thumb_func 0x812ba7c GetMatchFromSymbolsInRow +thumb_func 0x812bacc AwardPayout thumb_func 0x812baec thumb_func 0x812bb0c -thumb_func 0x812bb44 -thumb_func 0x812bb78 -thumb_func 0x812bc30 -thumb_func 0x812bc54 -thumb_func 0x812bca8 -thumb_func 0x812bcf8 -thumb_func 0x812bd38 -thumb_func 0x812bd80 -thumb_func 0x812bde4 -thumb_func 0x812be1c -thumb_func 0x812be6c +thumb_func 0x812bb44 AwardPayoutAction0 +thumb_func 0x812bb78 AwardPayoutAction_GivePayoutToPlayer +thumb_func 0x812bc30 AwardPayoutAction_FreeTask +thumb_func 0x812bc54 GetNearbyTag_Quantized +thumb_func 0x812bca8 GetNearbyTag +thumb_func 0x812bcf8 GetNearbyReelTimeTag +thumb_func 0x812bd38 AdvanceSlotReel +thumb_func 0x812bd80 AdvanceSlotReelToNextTag +thumb_func 0x812bde4 AdvanceReeltimeReel +thumb_func 0x812be1c AdvanceReeltimeReelToNextTag +thumb_func 0x812be6c GameplayTask_StopSlotReel thumb_func 0x812beb4 ReelTasks_SetUnkTaskData thumb_func 0x812beec thumb_func 0x812bf14 IsSlotReelMoving thumb_func 0x812bf3c thumb_func 0x812bf74 thumb_func 0x812bf78 SlotReelAction_Spin -thumb_func 0x812bf98 -thumb_func 0x812c02c +thumb_func 0x812bf98 SlotReelAction_DecideWhereToStop +thumb_func 0x812c02c SlotReelAction_MoveToStop thumb_func 0x812c0f0 SlotReelAction_OscillatingStop -thumb_func 0x812c148 +thumb_func 0x812c148 DecideReelTurns_BiasTag_Reel1 thumb_func 0x812c180 -thumb_func 0x812c194 +thumb_func 0x812c194 AreTagsAtPosition_Reel1 thumb_func 0x812c1d4 AreCherriesOnScreen_Reel1 -thumb_func 0x812c228 -thumb_func 0x812c248 -thumb_func 0x812c2a0 -thumb_func 0x812c3b0 +thumb_func 0x812c228 IsBiasTowardsCherryOr7s +thumb_func 0x812c248 DecideReelTurns_BiasTag_Reel1_Bet1 +thumb_func 0x812c2a0 DecideReelTurns_BiasTag_Reel1_Bet2or3 +thumb_func 0x812c3b0 DecideReelTurns_BiasTag_Reel2 thumb_func 0x812c3c8 -thumb_func 0x812c3d8 -thumb_func 0x812c424 -thumb_func 0x812c4cc -thumb_func 0x812c510 -thumb_func 0x812c56c +thumb_func 0x812c3d8 DecideReelTurns_BiasTag_Reel2_Bet1or2 +thumb_func 0x812c424 DecideReelTurns_BiasTag_Reel2_Bet3 +thumb_func 0x812c4cc DecideReelTurns_BiasTag_Reel3 +thumb_func 0x812c510 DecideReelTurns_BiasTag_Reel3_Bet1or2 +thumb_func 0x812c56c DecideReelTurns_BiasTag_Reel3_Bet3 thumb_func 0x812c5ec DecideReelTurns_NoBiasTag_Reel1 thumb_func 0x812c618 IsBiasTag777_SwitchColor thumb_func 0x812c638 thumb_func 0x812c650 nullsub_741 -thumb_func 0x812c65c -thumb_func 0x812c6dc -thumb_func 0x812c75c +thumb_func 0x812c65c DecideReelTurns_NoBiasTag_Reel2_Bet1 +thumb_func 0x812c6dc DecideReelTurns_NoBiasTag_Reel2_Bet2 +thumb_func 0x812c75c DecideReelTurns_NoBiasTag_Reel2_Bet3 thumb_func 0x812c864 AreTagsMixed77 thumb_func 0x812c88c AreTagsMixed777 thumb_func 0x812c8bc TagsDontMatchOrHaveAny7s thumb_func 0x812c90c thumb_func 0x812c924 nullsub_75 -thumb_func 0x812c930 -thumb_func 0x812ca18 -thumb_func 0x812cb90 +thumb_func 0x812c930 DecideReelTurns_NoBiasTag_Reel3_Bet1 +thumb_func 0x812ca18 DecideReelTurns_NoBiasTag_Reel3_Bet2 +thumb_func 0x812cb90 DecideReelTurns_NoBiasTag_Reel3_Bet3 thumb_func 0x812cd50 thumb_func 0x812cd84 thumb_func 0x812cda8 @@ -10004,7 +10004,7 @@ thumb_func 0x812d034 thumb_func 0x812d0c0 thumb_func 0x812d0f0 thumb_func 0x812d138 -thumb_func 0x812d198 +thumb_func 0x812d198 GameplayTask_PikaPower thumb_func 0x812d1b8 DisplayPikaPower thumb_func 0x812d1ec thumb_func 0x812d21c @@ -10015,40 +10015,40 @@ thumb_func 0x812d29c thumb_func 0x812d31c thumb_func 0x812d3a4 ClearTaskDataFields_2orHigher thumb_func 0x812d3c4 -thumb_func 0x812d4bc +thumb_func 0x812d4bc BeginReeltime thumb_func 0x812d4dc thumb_func 0x812d4fc -thumb_func 0x812d52c -thumb_func 0x812d5a4 +thumb_func 0x812d52c ReeltimeAction0 +thumb_func 0x812d5a4 ReeltimeAction1 thumb_func 0x812d61c ReeltimeAction2 -thumb_func 0x812d64c -thumb_func 0x812d6fc +thumb_func 0x812d64c ReeltimeAction3 +thumb_func 0x812d6fc ReeltimeAction4 thumb_func 0x812d750 ReeltimeAction5 -thumb_func 0x812d784 -thumb_func 0x812d7f4 -thumb_func 0x812d880 +thumb_func 0x812d784 ReeltimeAction6 +thumb_func 0x812d7f4 ReelTimeAction_LandOnOutcome +thumb_func 0x812d880 ReeltimeAction8 thumb_func 0x812d930 ReeltimeAction9 -thumb_func 0x812d960 -thumb_func 0x812d9b4 -thumb_func 0x812da30 -thumb_func 0x812da7c -thumb_func 0x812daa0 -thumb_func 0x812db14 -thumb_func 0x812db9c -thumb_func 0x812dbcc +thumb_func 0x812d960 ReeltimeAction10 +thumb_func 0x812d9b4 ReeltimeAction11 +thumb_func 0x812da30 ReeltimeAction12 +thumb_func 0x812da7c ReeltimeAction13 +thumb_func 0x812daa0 ReeltimeAction14 +thumb_func 0x812db14 ReeltimeAction15 +thumb_func 0x812db9c ReeltimeAction16 +thumb_func 0x812dbcc ReeltimeAction17 thumb_func 0x812dc18 thumb_func 0x812dc60 -thumb_func 0x812dc90 +thumb_func 0x812dc90 OpenInfoBox thumb_func 0x812dcc4 thumb_func 0x812dce4 -thumb_func 0x812dd14 +thumb_func 0x812dd14 InfoBox_FadeIn thumb_func 0x812dd38 InfoBox_WaitForFade -thumb_func 0x812dd58 -thumb_func 0x812dd88 -thumb_func 0x812ddd4 -thumb_func 0x812de24 +thumb_func 0x812dd58 InfoBox_8104B80 +thumb_func 0x812dd88 InfoBox_AddText +thumb_func 0x812ddd4 InfoBox_AwaitPlayerInput +thumb_func 0x812de24 InfoBox_812DE14 thumb_func 0x812de40 InfoBox_812DE30 -thumb_func 0x812de58 +thumb_func 0x812de58 InfoBox_8104BFC thumb_func 0x812de8c thumb_func 0x812dea4 thumb_func 0x812def4 @@ -10075,15 +10075,15 @@ thumb_func 0x812e7dc thumb_func 0x812e83c thumb_func 0x812e8d4 thumb_func 0x812e908 -thumb_func 0x812e944 +thumb_func 0x812e944 CreateReelTimeSprites1 thumb_func 0x812e9f8 thumb_func 0x812ea54 thumb_func 0x812ea8c -thumb_func 0x812eac0 +thumb_func 0x812eac0 CreateReelTimeSprite2 thumb_func 0x812eb58 thumb_func 0x812ebbc thumb_func 0x812ebdc -thumb_func 0x812ec30 +thumb_func 0x812ec30 VBlankCB_ContestPainting thumb_func 0x812ec74 thumb_func 0x812ec80 thumb_func 0x812eca4 @@ -10119,26 +10119,26 @@ thumb_func 0x812f7a4 thumb_func 0x812f7d0 thumb_func 0x812f7f4 thumb_func 0x812f8b0 -thumb_func 0x812f918 +thumb_func 0x812f918 Anim_SwordsDanceBlade thumb_func 0x812f968 thumb_func 0x812f978 -thumb_func 0x812f9a4 +thumb_func 0x812f9a4 LoadSlotMachineWheelOverlay thumb_func 0x812fa9c thumb_func 0x812fb18 thumb_func 0x812fb4c SlotMachineSetup_9_0 -thumb_func 0x812fbfc +thumb_func 0x812fbfc SlotMachineSetup_8_0 thumb_func 0x812fde0 -thumb_func 0x812fe24 -thumb_func 0x812fe30 -thumb_func 0x812fe44 -thumb_func 0x812fe90 -thumb_func 0x8130000 -thumb_func 0x81300d0 +thumb_func 0x812fe24 CB2_ContestPainting +thumb_func 0x812fe30 CB2_HoldContestPainting +thumb_func 0x812fe44 CB2_QuitContestPainting +thumb_func 0x812fe90 ShowContestPainting +thumb_func 0x8130000 HoldContestPainting +thumb_func 0x81300d0 InitContestPaintingWindow thumb_func 0x8130144 -thumb_func 0x8130244 +thumb_func 0x8130244 InitContestPaintingBg thumb_func 0x8130290 InitContestPaintingVars -thumb_func 0x81302d8 -thumb_func 0x8130328 +thumb_func 0x81302d8 UpdateContestPaintingMosaicEffect +thumb_func 0x8130328 SlotMachineSetup_6_0 thumb_func 0x8130340 thumb_func 0x81303d8 thumb_func 0x8130488 @@ -10148,103 +10148,103 @@ thumb_func 0x8130790 thumb_func 0x81307b8 thumb_func 0x81308dc thumb_func 0x8130920 -thumb_func 0x81309a4 +thumb_func 0x81309a4 BattleAI_SetupAIData thumb_func 0x8130bec -thumb_func 0x8130c10 -thumb_func 0x8130d28 -thumb_func 0x8130f7c -thumb_func 0x81310a8 +thumb_func 0x8130c10 ChooseMoveOrAction_Singles +thumb_func 0x8130d28 ChooseMoveOrAction_Doubles +thumb_func 0x8130f7c BattleAI_DoAIProcessing +thumb_func 0x81310a8 RecordLastUsedMoveByTarget thumb_func 0x8131124 ClearBattlerMoveHistory -thumb_func 0x813114c +thumb_func 0x813114c RecordAbilityBattle thumb_func 0x8131164 ClearBattlerAbilityHistory -thumb_func 0x813117c +thumb_func 0x813117c RecordItemEffectBattle thumb_func 0x8131194 ClearBattlerItemEffectHistory -thumb_func 0x81311ac -thumb_func 0x81311ec -thumb_func 0x813122c -thumb_func 0x813126c +thumb_func 0x81311ac BattleAICmd_if_random_less_than +thumb_func 0x81311ec BattleAICmd_if_random_greater_than +thumb_func 0x813122c BattleAICmd_if_random_equal +thumb_func 0x813126c BattleAICmd_if_random_not_equal thumb_func 0x81312ac BattleAICmd_score -thumb_func 0x81312f0 +thumb_func 0x81312f0 BattleAICmd_if_hp_less_than thumb_func 0x8131358 -thumb_func 0x81313c0 -thumb_func 0x8131428 -thumb_func 0x8131490 -thumb_func 0x8131504 -thumb_func 0x8131578 -thumb_func 0x81315ec -thumb_func 0x8131660 -thumb_func 0x81316d0 -thumb_func 0x8131740 -thumb_func 0x81317bc -thumb_func 0x8131838 -thumb_func 0x8131874 -thumb_func 0x81318b0 -thumb_func 0x81318ec -thumb_func 0x8131928 -thumb_func 0x813197c -thumb_func 0x81319d0 -thumb_func 0x8131a24 -thumb_func 0x8131a78 -thumb_func 0x8131abc -thumb_func 0x8131b00 -thumb_func 0x8131b68 +thumb_func 0x81313c0 BattleAICmd_if_hp_equal +thumb_func 0x8131428 BattleAICmd_if_hp_not_equal +thumb_func 0x8131490 BattleAICmd_if_status +thumb_func 0x8131504 BattleAICmd_if_not_status +thumb_func 0x8131578 BattleAICmd_if_status2 +thumb_func 0x81315ec BattleAICmd_if_not_status2 +thumb_func 0x8131660 DisplayBerryPowderVendorMenu +thumb_func 0x81316d0 BattleAICmd_if_not_status3 +thumb_func 0x8131740 BattleAICmd_if_side_affecting +thumb_func 0x81317bc BattleAICmd_if_not_side_affecting +thumb_func 0x8131838 BattleAICmd_if_less_than +thumb_func 0x8131874 BattleAICmd_if_more_than +thumb_func 0x81318b0 BattleAICmd_if_equal +thumb_func 0x81318ec BattleAICmd_if_not_equal +thumb_func 0x8131928 BattleAICmd_if_less_than_ptr +thumb_func 0x813197c BattleAICmd_if_more_than_ptr +thumb_func 0x81319d0 BattleAICmd_if_equal_ptr +thumb_func 0x8131a24 BattleAICmd_if_not_equal_ptr +thumb_func 0x8131a78 BattleAICmd_if_move +thumb_func 0x8131abc BattleAICmd_if_not_move +thumb_func 0x8131b00 BattleAICmd_if_in_bytes +thumb_func 0x8131b68 BattleAICmd_if_not_in_bytes thumb_func 0x8131bd4 -thumb_func 0x8131c40 -thumb_func 0x8131cb0 -thumb_func 0x8131d20 +thumb_func 0x8131c40 BattleAICmd_if_not_in_hwords +thumb_func 0x8131cb0 BattleAICmd_if_user_has_attacking_move +thumb_func 0x8131d20 BattleAICmd_if_user_has_no_attacking_moves thumb_func 0x8131d90 BattleAICmd_get_turn_count -thumb_func 0x8131db4 -thumb_func 0x8131ea4 -thumb_func 0x8131ee8 +thumb_func 0x8131db4 BattleAICmd_get_type +thumb_func 0x8131ea4 BattleAI_GetWantedBattler +thumb_func 0x8131ee8 BattleAICmd_is_of_type thumb_func 0x8131f50 BattleAICmd_get_considered_move_power -thumb_func 0x8131f7c -thumb_func 0x8132180 -thumb_func 0x81321d8 -thumb_func 0x8132214 -thumb_func 0x8132250 -thumb_func 0x813229c +thumb_func 0x8131f7c BattleAICmd_get_how_powerful_move_is +thumb_func 0x8132180 BattleAICmd_get_last_used_battler_move +thumb_func 0x81321d8 BattleAICmd_if_equal_ +thumb_func 0x8132214 BattleAICmd_if_not_equal_ +thumb_func 0x8132250 BattleAICmd_if_user_goes +thumb_func 0x813229c BattleAICmd_if_user_doesnt_go thumb_func 0x81322e8 nullsub_23 thumb_func 0x81322ec nullsub_241 -thumb_func 0x81322f0 +thumb_func 0x81322f0 BattleAICmd_count_usable_party_mons thumb_func 0x81323ec BattleAICmd_get_considered_move thumb_func 0x8132408 BattleAICmd_get_considered_move_effect -thumb_func 0x8132434 -thumb_func 0x8132550 -thumb_func 0x8132648 -thumb_func 0x8132734 +thumb_func 0x8132434 BattleAICmd_get_ability +thumb_func 0x8132550 BattleAICmd_check_ability +thumb_func 0x8132648 BattleAICmd_get_highest_type_effectiveness +thumb_func 0x8132734 BattleAICmd_if_type_effectiveness thumb_func 0x8132804 nullsub_25 thumb_func 0x8132808 nullsub_24 -thumb_func 0x813280c -thumb_func 0x81328ec +thumb_func 0x813280c BattleAICmd_if_status_in_party +thumb_func 0x81328ec BattleAICmd_if_status_not_in_party thumb_func 0x81329c8 BattleAICmd_get_weather -thumb_func 0x8132a34 -thumb_func 0x8132a80 -thumb_func 0x8132acc -thumb_func 0x8132b34 -thumb_func 0x8132b9c -thumb_func 0x8132c04 -thumb_func 0x8132c6c -thumb_func 0x8132d68 -thumb_func 0x8132e4c -thumb_func 0x8132f7c -thumb_func 0x8133054 -thumb_func 0x813314c -thumb_func 0x8133230 -thumb_func 0x81332b8 -thumb_func 0x8133348 -thumb_func 0x813335c -thumb_func 0x81333bc -thumb_func 0x81333d0 -thumb_func 0x8133448 -thumb_func 0x81334c8 -thumb_func 0x8133520 -thumb_func 0x813356c +thumb_func 0x8132a34 BattleAICmd_if_effect +thumb_func 0x8132a80 BattleAICmd_if_not_effect +thumb_func 0x8132acc BattleAICmd_if_stat_level_less_than +thumb_func 0x8132b34 BattleAICmd_if_stat_level_more_than +thumb_func 0x8132b9c BattleAICmd_if_stat_level_equal +thumb_func 0x8132c04 BattleAICmd_if_stat_level_not_equal +thumb_func 0x8132c6c BattleAICmd_if_can_faint +thumb_func 0x8132d68 BattleAICmd_if_cant_faint +thumb_func 0x8132e4c BattleAICmd_if_has_move +thumb_func 0x8132f7c BattleAICmd_if_doesnt_have_move +thumb_func 0x8133054 BattleAICmd_if_has_move_with_effect +thumb_func 0x813314c BattleAICmd_if_doesnt_have_move_with_effect +thumb_func 0x8133230 BattleAICmd_if_any_move_disabled_or_encored +thumb_func 0x81332b8 BattleAICmd_if_curr_move_disabled_or_encored +thumb_func 0x8133348 BattleAICmd_flee +thumb_func 0x813335c BattleAICmd_if_random_safari_flee +thumb_func 0x81333bc BattleAICmd_watch +thumb_func 0x81333d0 BattleAICmd_get_hold_effect +thumb_func 0x8133448 BattleAICmd_if_holds_item +thumb_func 0x81334c8 BattleAICmd_get_gender +thumb_func 0x8133520 BattleAICmd_is_first_turn_for +thumb_func 0x813356c BattleAICmd_get_stockpile_count thumb_func 0x81335b8 BattleAICmd_is_double_battle -thumb_func 0x81335e0 +thumb_func 0x81335e0 BattleAICmd_get_used_held_item thumb_func 0x813362c BattleAICmd_get_move_type_from_result thumb_func 0x8133658 BattleAICmd_get_move_power_from_result thumb_func 0x8133684 BattleAICmd_get_move_effect_from_result -thumb_func 0x81336b0 +thumb_func 0x81336b0 BattleAICmd_get_protect_count thumb_func 0x81336fc nullsub_79 thumb_func 0x8133700 nullsub_801 thumb_func 0x8133704 nullsub_81 @@ -10254,288 +10254,288 @@ thumb_func 0x8133710 nullsub_841 thumb_func 0x8133714 BattleAICmd_call thumb_func 0x8133744 thumb_func 0x8133764 BattleAICmd_end -thumb_func 0x8133788 -thumb_func 0x8133860 -thumb_func 0x81338b0 -thumb_func 0x8133900 -thumb_func 0x8133950 +thumb_func 0x8133788 BattleAICmd_if_level_cond +thumb_func 0x8133860 BattleAICmd_if_target_taunted +thumb_func 0x81338b0 BattleAICmd_if_target_not_taunted +thumb_func 0x8133900 BattleAICmd_if_target_is_ally +thumb_func 0x8133950 BattleAICmd_if_flash_fired thumb_func 0x81339a0 thumb_func 0x81339c4 AIStackPushVar_cursor thumb_func 0x81339ec -thumb_func 0x8133a2c +thumb_func 0x8133a2c TraderSetup thumb_func 0x8133a94 -thumb_func 0x8133aac +thumb_func 0x8133aac AnimMudSportDirt thumb_func 0x8133b9c -thumb_func 0x8133c00 -thumb_func 0x8133c80 -thumb_func 0x8133c9c +thumb_func 0x8133c00 OpponentHandleTrainerSlide +thumb_func 0x8133c80 ScrSpecial_GetTraderTradedFlag +thumb_func 0x8133c9c ScrSpecial_DoesPlayerHaveNoDecorations thumb_func 0x8133cd4 thumb_func 0x8133d40 -thumb_func 0x8133d54 -thumb_func 0x8133dd8 -thumb_func 0x8133df4 -thumb_func 0x8133e78 +thumb_func 0x8133d54 ResetTrainerHillResults +thumb_func 0x8133dd8 ExitTraderMenu +thumb_func 0x8133df4 ScrSpecial_TraderDoDecorationTrade +thumb_func 0x8133e78 ScrSpecial_TraderMenuGetDecoration thumb_func 0x8133e94 GetStarterPokemon -thumb_func 0x8133eb0 -thumb_func 0x8133ec4 -thumb_func 0x8134198 -thumb_func 0x81341b4 -thumb_func 0x8134214 +thumb_func 0x8133eb0 WallClockVblankCallback +thumb_func 0x8133ec4 CB2_ChooseStarter +thumb_func 0x8134198 MainCallback2_StarterChoose +thumb_func 0x81341b4 Task_StarterChoose1 +thumb_func 0x8134214 Task_StarterChoose2 thumb_func 0x81342f8 Task_StarterChoose3 -thumb_func 0x8134348 -thumb_func 0x81343b8 +thumb_func 0x8134348 Task_StarterChoose4 +thumb_func 0x81343b8 Task_StarterChoose5 thumb_func 0x8134464 thumb_func 0x8134480 thumb_func 0x813464c thumb_func 0x8134688 Task_MoveStarterChooseCursor thumb_func 0x81346b0 -thumb_func 0x81346d8 +thumb_func 0x81346d8 CreatePokemonFrontSprite thumb_func 0x8134724 thumb_func 0x8134784 thumb_func 0x81347bc StarterPokemonSpriteCallback thumb_func 0x81347fc -thumb_func 0x8134810 -thumb_func 0x81349d4 -thumb_func 0x8134a3c -thumb_func 0x8134b8c -thumb_func 0x8134ce8 +thumb_func 0x8134810 LoadWallClockGraphics +thumb_func 0x81349d4 WallClockInit +thumb_func 0x8134a3c CB2_StartWallClock +thumb_func 0x8134b8c CB2_ViewWallClock +thumb_func 0x8134ce8 TrySetupDiveDownScript thumb_func 0x8134d04 -thumb_func 0x8134d34 -thumb_func 0x8134e10 -thumb_func 0x8134e84 -thumb_func 0x8134ef8 -thumb_func 0x8134f3c +thumb_func 0x8134d34 Task_SetClock2 +thumb_func 0x8134e10 Task_SetClock3 +thumb_func 0x8134e84 Task_SetClock4 +thumb_func 0x8134ef8 Task_SetClock5 +thumb_func 0x8134f3c Task_SetClock6 thumb_func 0x8134f64 thumb_func 0x8134f94 Task_ViewClock2 -thumb_func 0x8134fcc -thumb_func 0x8135004 +thumb_func 0x8134fcc Task_ViewClock3 +thumb_func 0x8135004 Task_ViewClock4 thumb_func 0x8135028 CalcMinHandDelta thumb_func 0x8135050 CalcNewMinHandAngle -thumb_func 0x81350a0 -thumb_func 0x813513c -thumb_func 0x8135184 -thumb_func 0x8135200 -thumb_func 0x8135298 -thumb_func 0x8135330 -thumb_func 0x81353d4 -thumb_func 0x8135478 -thumb_func 0x81354cc -thumb_func 0x81354f0 +thumb_func 0x81350a0 AdvanceClock +thumb_func 0x813513c UpdateClockPeriod +thumb_func 0x8135184 InitClockWithRtc +thumb_func 0x8135200 SpriteCB_MinuteHand +thumb_func 0x8135298 SpriteCB_HourHand +thumb_func 0x8135330 SpriteCB_AMIndicator +thumb_func 0x81353d4 SpriteCB_PMIndicator +thumb_func 0x8135478 CheckObjectGraphicsInFrontOfPlayer +thumb_func 0x81354cc oei_task_add +thumb_func 0x81354f0 task08_080C9820 thumb_func 0x8135580 thumb_func 0x81355cc thumb_func 0x8135670 -thumb_func 0x81356a8 +thumb_func 0x81356a8 SetUpFieldMove_RockSmash thumb_func 0x8135718 -thumb_func 0x8135738 +thumb_func 0x8135738 FldEff_UseRockSmash thumb_func 0x8135768 -thumb_func 0x8135780 -thumb_func 0x81357b4 -thumb_func 0x81357d4 +thumb_func 0x8135780 SetUpFieldMove_Dig +thumb_func 0x81357b4 hm2_dig +thumb_func 0x81357d4 FldEff_UseDig thumb_func 0x8135810 thumb_func 0x8135850 -thumb_func 0x8135944 -thumb_func 0x8135958 -thumb_func 0x813596c -thumb_func 0x8135988 -thumb_func 0x813599c -thumb_func 0x81359c8 +thumb_func 0x8135944 SummaryScreen_MainCB2 +thumb_func 0x8135958 OpenPokeblockCaseOnFeeder +thumb_func 0x813596c Mailbox_DoRedrawMailboxMenuAfterReturn +thumb_func 0x8135988 VBlankCB_PokeblockMenu +thumb_func 0x813599c CB2_InitPokeblockMenu +thumb_func 0x81359c8 InitPokeblockMenu thumb_func 0x8135c2c -thumb_func 0x8135c88 +thumb_func 0x8135c88 LoadPokeblockMenuGfx thumb_func 0x8135d74 thumb_func 0x8135dcc thumb_func 0x8135df8 thumb_func 0x8135e60 thumb_func 0x8135f30 -thumb_func 0x8135fb4 +thumb_func 0x8135fb4 MovePokeblockMenuCursor thumb_func 0x8136010 -thumb_func 0x8136150 +thumb_func 0x8136150 HandlePokeblockMenuCursor thumb_func 0x8136180 CompactPokeblockSlots -thumb_func 0x81361f0 -thumb_func 0x813628c -thumb_func 0x813629c +thumb_func 0x81361f0 SwapSortPokeblocksInternalData +thumb_func 0x813628c ResetPokeblockScrollPositions +thumb_func 0x813629c SetMenuItemsCountAndMaxShowed thumb_func 0x8136320 thumb_func 0x8136384 thumb_func 0x81363fc thumb_func 0x8136458 -thumb_func 0x8136484 +thumb_func 0x8136484 CreatePokeblockCaseSprite thumb_func 0x81364b0 thumb_func 0x813652c -thumb_func 0x8136564 -thumb_func 0x8136608 -thumb_func 0x813675c -thumb_func 0x8136894 +thumb_func 0x8136564 Task_FreeDataAndExitPokeblockCase +thumb_func 0x8136608 Task_HandlePokeblockMenuInput +thumb_func 0x813675c Task_HandlePokeblocksSwapInput +thumb_func 0x8136894 HandlePokeblocksSwap thumb_func 0x8136978 -thumb_func 0x8136a50 -thumb_func 0x8136ac0 +thumb_func 0x8136a50 Task_HandlePokeblockOptionsInput +thumb_func 0x8136ac0 PokeblockAction_UseOnField thumb_func 0x8136ae4 -thumb_func 0x8136b10 -thumb_func 0x8136b24 -thumb_func 0x8136bb8 -thumb_func 0x8136be8 -thumb_func 0x8136c30 +thumb_func 0x8136b10 ReturnToPokeblockCaseOnField +thumb_func 0x8136b24 PokeblockAction_Toss +thumb_func 0x8136bb8 CreateTossPokeblockYesNoMenu +thumb_func 0x8136be8 TossPokeblockChoice_Yes +thumb_func 0x8136c30 HandleErasePokeblock thumb_func 0x8136cc4 -thumb_func 0x8136cfc -thumb_func 0x8136d9c -thumb_func 0x8136e00 -thumb_func 0x8136e58 +thumb_func 0x8136cfc MachBikeTransition_TrySlowDown +thumb_func 0x8136d9c PokeblockAction_UseOnPokeblockFeeder +thumb_func 0x8136e00 PokeblockAction_GiveToContestLady +thumb_func 0x8136e58 PokeblockAction_Cancel thumb_func 0x8136e90 ClearPokeblock thumb_func 0x8136ef8 ClearPokeblocks thumb_func 0x8136f14 GetHighestPokeblocksFlavorLevel thumb_func 0x8136f4c GetPokeblocksFeel -thumb_func 0x8136f64 -thumb_func 0x8136f9c -thumb_func 0x8136fd8 +thumb_func 0x8136f64 GetFirstFreePokeblockSlot +thumb_func 0x8136f9c AddPokeblock +thumb_func 0x8136fd8 TryClearPokeblock thumb_func 0x813700c GetPokeblockData thumb_func 0x8137054 PokeblockGetGain -thumb_func 0x81370b4 -thumb_func 0x81370d8 +thumb_func 0x81370b4 PokeblockCopyName +thumb_func 0x81370d8 CopyMonFavoritePokeblockName thumb_func 0x8137124 GetPokeblocksFlavor -thumb_func 0x813716c -thumb_func 0x81371e8 +thumb_func 0x813716c SetUpFieldMove_Flash +thumb_func 0x81371e8 hm2_flash thumb_func 0x8137224 thumb_func 0x8137244 thumb_func 0x813725c -thumb_func 0x8137270 +thumb_func 0x8137270 c2_change_map thumb_func 0x8137374 thumb_func 0x81373d0 -thumb_func 0x8137418 +thumb_func 0x8137418 GetMapPairFadeFromType thumb_func 0x8137460 thumb_func 0x8137474 thumb_func 0x8137490 thumb_func 0x8137534 thumb_func 0x813757c thumb_func 0x81375e4 -thumb_func 0x8137618 +thumb_func 0x8137618 PartyMenuVBlankCallback thumb_func 0x813762c thumb_func 0x8137648 thumb_func 0x81376e8 thumb_func 0x813774c -thumb_func 0x81377a4 -thumb_func 0x81378ec -thumb_func 0x8137900 -thumb_func 0x813792c -thumb_func 0x8137954 +thumb_func 0x81377a4 GameClear +thumb_func 0x81378ec sp0C8_whiteout_maybe +thumb_func 0x8137900 GetMirageRnd +thumb_func 0x813792c SetMirageRnd +thumb_func 0x8137954 InitMirageRnd thumb_func 0x8137974 UpdateMirageRnd -thumb_func 0x81379ac +thumb_func 0x81379ac IsMirageIslandPresent thumb_func 0x81379f8 thumb_func 0x8137a48 thumb_func 0x8137a68 -thumb_func 0x8137a7c -thumb_func 0x8137a90 -thumb_func 0x8137abc -thumb_func 0x8137b08 -thumb_func 0x8137c80 +thumb_func 0x8137a7c InitBirchState +thumb_func 0x8137a90 UpdateBirchState +thumb_func 0x8137abc ScriptGetPokedexInfo +thumb_func 0x8137b08 GetPokedexRatingText +thumb_func 0x8137c80 ShowPokedexRatingMessage thumb_func 0x8137c98 -thumb_func 0x8137cac -thumb_func 0x8137ccc +thumb_func 0x8137cac ReturnFromHallOfFamePC +thumb_func 0x8137ccc ReshowPCMenuAfterHallOfFamePC thumb_func 0x8137d04 thumb_func 0x8137d24 -thumb_func 0x8137d38 -thumb_func 0x8137d5c +thumb_func 0x8137d38 Special_ViewWallClock +thumb_func 0x8137d5c ResetCyclingRoadChallengeData thumb_func 0x8137d7c Special_BeginCyclingRoadChallenge -thumb_func 0x8137da4 -thumb_func 0x8137dcc +thumb_func 0x8137da4 GetPlayerAvatarBike +thumb_func 0x8137dcc DetermineCyclingRoadResults thumb_func 0x8137edc FinishCyclingRoadChallenge -thumb_func 0x8137f0c -thumb_func 0x8137f6c -thumb_func 0x8137fb4 -thumb_func 0x8138000 -thumb_func 0x8138020 -thumb_func 0x8138030 -thumb_func 0x813806c +thumb_func 0x8137f0c RecordCyclingRoadResults +thumb_func 0x8137f6c GetRecordedCyclingRoadResults +thumb_func 0x8137fb4 UpdateCyclingRoadState +thumb_func 0x8138000 SetSSTidalFlag +thumb_func 0x8138020 ResetSSTidalFlag +thumb_func 0x8138030 CountSSTidalStep +thumb_func 0x813806c GetSSTidalLocation thumb_func 0x8138148 -thumb_func 0x8138190 -thumb_func 0x81381d8 -thumb_func 0x8138220 -thumb_func 0x8138268 -thumb_func 0x81382b0 -thumb_func 0x8138310 -thumb_func 0x813849c -thumb_func 0x8138560 -thumb_func 0x81385b0 -thumb_func 0x81387c0 -thumb_func 0x8138954 -thumb_func 0x8138980 -thumb_func 0x81389e8 -thumb_func 0x8138b14 -thumb_func 0x8138b30 -thumb_func 0x8138b40 -thumb_func 0x8138b60 +thumb_func 0x8138190 ShouldDoWinonaCall +thumb_func 0x81381d8 ShouldDoScottCall +thumb_func 0x8138220 ShouldDoRoxanneCall +thumb_func 0x8138268 c2_mystery_gift +thumb_func 0x81382b0 GetLinkPartnerNames +thumb_func 0x8138310 SpawnLinkPartnerEventObject +thumb_func 0x813849c LoadLinkPartnerEventObjectSpritePalette +thumb_func 0x8138560 MauvilleGymSpecial1 +thumb_func 0x81385b0 MauvilleGymSpecial2 +thumb_func 0x81387c0 MauvilleGymSpecial3 +thumb_func 0x8138954 PetalburgGymSpecial1 +thumb_func 0x8138980 Task_PetalburgGym +thumb_func 0x81389e8 PetalburgGymFunc +thumb_func 0x8138b14 PetalburgGymSpecial2 +thumb_func 0x8138b30 ShowFieldMessageStringVar4 +thumb_func 0x8138b40 StorePlayerCoordsInVars +thumb_func 0x8138b60 GetPlayerTrainerIdOnesDigit thumb_func 0x8138b80 thumb_func 0x8138bb8 thumb_func 0x8138bf0 -thumb_func 0x8138bfc -thumb_func 0x8138c38 -thumb_func 0x8138c4c -thumb_func 0x8138c74 -thumb_func 0x8138cf4 -thumb_func 0x8138d04 +thumb_func 0x8138bfc CableCarWarp +thumb_func 0x8138c38 SetFlagInVar +thumb_func 0x8138c4c GetWeekCount +thumb_func 0x8138c74 GetLeadMonFriendshipScore +thumb_func 0x8138cf4 CB2_FieldShowRegionMap +thumb_func 0x8138d04 FieldShowRegionMap thumb_func 0x8138d14 thumb_func 0x8138d58 -thumb_func 0x8138d80 -thumb_func 0x8138df8 +thumb_func 0x8138d80 PCTurnOnEffect_0 +thumb_func 0x8138df8 PCTurnOnEffect_1 thumb_func 0x8138e90 -thumb_func 0x8138e9c +thumb_func 0x8138e9c PCTurnOffEffect thumb_func 0x8138f30 thumb_func 0x8138f74 -thumb_func 0x8138f9c -thumb_func 0x813901c +thumb_func 0x8138f9c LotteryCornerComputerEffect +thumb_func 0x813901c EndLotteryCornerComputerEffect thumb_func 0x8139044 thumb_func 0x813905c -thumb_func 0x8139074 -thumb_func 0x81390a0 -thumb_func 0x81390cc -thumb_func 0x81390f8 +thumb_func 0x8139074 CheckLeadMonCool +thumb_func 0x81390a0 CheckLeadMonBeauty +thumb_func 0x81390cc CheckLeadMonCute +thumb_func 0x81390f8 CheckLeadMonSmart thumb_func 0x8139124 -thumb_func 0x8139150 -thumb_func 0x81391c8 -thumb_func 0x813921c -thumb_func 0x8139240 -thumb_func 0x8139270 -thumb_func 0x8139298 +thumb_func 0x8139150 IsGrassTypeInParty +thumb_func 0x81391c8 SpawnCameraObject +thumb_func 0x813921c RemoveCameraObject +thumb_func 0x8139240 GetPokeblockNameByMonNature +thumb_func 0x8139270 GetSecretBaseNearbyMapName +thumb_func 0x8139298 GetBestBattleTowerStreak thumb_func 0x81392a8 -thumb_func 0x81392b8 -thumb_func 0x813931c -thumb_func 0x8139344 +thumb_func 0x81392b8 GetSlotMachineId +thumb_func 0x813931c FoundAbandonedShipRoom1Key +thumb_func 0x8139344 FoundAbandonedShipRoom2Key thumb_func 0x8139368 -thumb_func 0x8139390 -thumb_func 0x81393b8 -thumb_func 0x81393e0 -thumb_func 0x8139438 -thumb_func 0x813946c +thumb_func 0x8139390 FoundAbandonedShipRoom6Key +thumb_func 0x81393b8 LeadMonHasEffortRibbon +thumb_func 0x81393e0 GiveLeadMonEffortRibbon +thumb_func 0x8139438 Special_AreLeadMonEVsMaxedOut +thumb_func 0x813946c TryUpdateRusturfTunnelState thumb_func 0x81394cc -thumb_func 0x81394dc -thumb_func 0x8139548 -thumb_func 0x81395a0 +thumb_func 0x81394dc PutZigzagoonInPlayerParty +thumb_func 0x8139548 IsStarterInParty +thumb_func 0x81395a0 ScriptCheckFreePokemonStorageSpace thumb_func 0x81395b0 thumb_func 0x81395d0 thumb_func 0x813962c thumb_func 0x8139690 thumb_func 0x81396a4 thumb_func 0x81396b8 -thumb_func 0x81396d8 -thumb_func 0x81396f8 -thumb_func 0x8139750 +thumb_func 0x81396d8 SetRoute123Weather +thumb_func 0x81396f8 GetLeadMonIndex +thumb_func 0x8139750 ScriptGetPartyMonSpecies thumb_func 0x8139778 nullsub_85 -thumb_func 0x813977c -thumb_func 0x81397c4 +thumb_func 0x813977c GetDaysUntilPacifidlogTMAvailable +thumb_func 0x81397c4 SetPacifidlogTMReceivedDay thumb_func 0x81397e0 -thumb_func 0x8139824 +thumb_func 0x8139824 BufferLottoTicketNumber thumb_func 0x81398cc thumb_func 0x8139938 thumb_func 0x8139980 -thumb_func 0x81399c0 +thumb_func 0x81399c0 InMultiBattleRoom thumb_func 0x81399f4 -thumb_func 0x8139a08 +thumb_func 0x8139a08 SetDepartmentStoreFloorVar thumb_func 0x8139a68 -thumb_func 0x8139aec +thumb_func 0x8139aec ShakeScreenInElevator thumb_func 0x8139b68 thumb_func 0x8139bd4 thumb_func 0x8139c4c thumb_func 0x8139c68 -thumb_func 0x8139cbc +thumb_func 0x8139cbc MoveElevatorWindowLights thumb_func 0x8139dd4 -thumb_func 0x8139ebc +thumb_func 0x8139ebc warp0_in_pokecenter thumb_func 0x8139f0c thumb_func 0x8139f30 thumb_func 0x8139f5c @@ -10554,7 +10554,7 @@ thumb_func 0x813a740 thumb_func 0x813a770 nullsub_84 thumb_func 0x813a774 thumb_func 0x813a7c0 -thumb_func 0x813a7fc +thumb_func 0x813a7fc UpdateFrontierGambler thumb_func 0x813a828 thumb_func 0x813a85c thumb_func 0x813a880 @@ -10569,30 +10569,30 @@ thumb_func 0x813aa90 thumb_func 0x813aaac thumb_func 0x813ac20 thumb_func 0x813ac90 -thumb_func 0x813acc8 +thumb_func 0x813acc8 IsArrowWarpMetatileBehavior thumb_func 0x813ad2c thumb_func 0x813ad6c thumb_func 0x813adf0 thumb_func 0x813ae0c thumb_func 0x813aeec thumb_func 0x813af80 -thumb_func 0x813b000 -thumb_func 0x813b014 -thumb_func 0x813b0ec -thumb_func 0x813b198 -thumb_func 0x813b1bc +thumb_func 0x813b000 DoDeoxysRockInteraction +thumb_func 0x813b014 Task_DeoxysRockInteraction +thumb_func 0x813b0ec ChangeDeoxysRockLevel +thumb_func 0x813b198 WaitForDeoxysRockMovement +thumb_func 0x813b1bc IncrementBirthIslandRockStepCount thumb_func 0x813b208 thumb_func 0x813b23c thumb_func 0x813b248 thumb_func 0x813b254 thumb_func 0x813b298 -thumb_func 0x813b31c -thumb_func 0x813b3ac -thumb_func 0x813b3e8 -thumb_func 0x813b4bc +thumb_func 0x813b31c CreateUnusualWeatherEvent +thumb_func 0x813b3ac GetUnusualWeatherMapNameAndType +thumb_func 0x813b3e8 UnusualWeatherHasExpired +thumb_func 0x813b4bc Unused_SetWeatherSunny thumb_func 0x813b4c8 thumb_func 0x813b518 -thumb_func 0x813b54c +thumb_func 0x813b54c StartWallClock thumb_func 0x813b56c thumb_func 0x813b5a0 thumb_func 0x813b5b4 @@ -10611,76 +10611,76 @@ thumb_func 0x813bb14 thumb_func 0x813bbac thumb_func 0x813bc38 thumb_func 0x813bce0 GetNumMovedLilycoveFanClubMembers -thumb_func 0x813bd20 +thumb_func 0x813bd20 UpdateMovedLilycoveFanClubMembers thumb_func 0x813bd98 ShouldMoveLilycoveFanClubMember thumb_func 0x813bdbc -thumb_func 0x813bdec +thumb_func 0x813bdec BufferStreakTrainerText thumb_func 0x813be68 thumb_func 0x813bf34 thumb_func 0x813bf68 thumb_func 0x813bf84 thumb_func 0x813bfa0 -thumb_func 0x813bfb8 -thumb_func 0x813bfe8 -thumb_func 0x813c01c -thumb_func 0x813c02c +thumb_func 0x813bfb8 ClearLinkBattleRecord +thumb_func 0x813bfe8 ClearLinkBattleRecords +thumb_func 0x813c01c GetLinkBattleRecordTotalBattles +thumb_func 0x813c02c FindLinkBattleRecord thumb_func 0x813c060 thumb_func 0x813c0dc UpdateLinkBattleRecord -thumb_func 0x813c140 -thumb_func 0x813c17c +thumb_func 0x813c140 UpdateLinkBattleGameStats +thumb_func 0x813c17c UpdateLinkBattleRecords thumb_func 0x813c204 thumb_func 0x813c220 thumb_func 0x813c248 -thumb_func 0x813c270 -thumb_func 0x813c2ac -thumb_func 0x813c300 -thumb_func 0x813c384 +thumb_func 0x813c270 UpdateTrainerCardWinsLosses +thumb_func 0x813c2ac UpdatePlayerLinkBattleRecords +thumb_func 0x813c300 PrintLinkBattleWinsLossesDraws +thumb_func 0x813c384 CrackedFloorPerStepCallback thumb_func 0x813c4b0 -thumb_func 0x813c57c +thumb_func 0x813c57c RemoveRecordsWindow thumb_func 0x813c598 -thumb_func 0x813c5c8 +thumb_func 0x813c5c8 Task_CloseTrainerHillRecordsOnButton thumb_func 0x813c608 -thumb_func 0x813c640 +thumb_func 0x813c640 party_menu_link_mon_pokeball_object thumb_func 0x813c684 -thumb_func 0x813c6b0 -thumb_func 0x813c7e8 -thumb_func 0x813c804 -thumb_func 0x813c85c -thumb_func 0x813c86c -thumb_func 0x813c8b4 +thumb_func 0x813c6b0 ClearVramOamPlttRegs +thumb_func 0x813c7e8 ClearTasksAndGraphicalStructs +thumb_func 0x813c804 ResetBgCoordinates +thumb_func 0x813c85c SetDispcntReg +thumb_func 0x813c86c LoadTrainerHillRecordsWindowGfx +thumb_func 0x813c8b4 VblankCB_TrainerHillRecords thumb_func 0x813c8c8 -thumb_func 0x813c8e0 -thumb_func 0x813c8f8 -thumb_func 0x813ca30 -thumb_func 0x813ca44 -thumb_func 0x813cb1c -thumb_func 0x813cce0 -thumb_func 0x813cd40 -thumb_func 0x813ce10 -thumb_func 0x813ce24 +thumb_func 0x813c8e0 ShowTrainerHillRecords +thumb_func 0x813c8f8 CB2_ShowTrainerHillRecords +thumb_func 0x813ca30 ResetDrawAreaGlowState +thumb_func 0x813ca44 DrawAreaGlow +thumb_func 0x813cb1c FindMapsWithMon +thumb_func 0x813cce0 SetAreaHasMon +thumb_func 0x813cd40 SetSpecialMapHasMon +thumb_func 0x813ce10 GetRegionMapSectionId +thumb_func 0x813ce24 MapHasMon thumb_func 0x813ceb0 MonListHasMon thumb_func 0x813cee8 -thumb_func 0x813d2cc -thumb_func 0x813d360 -thumb_func 0x813d4dc -thumb_func 0x813d530 -thumb_func 0x813d6a4 +thumb_func 0x813d2cc StartAreaGlow +thumb_func 0x813d360 DoAreaGlow +thumb_func 0x813d4dc ShowPokedexAreaScreen +thumb_func 0x813d530 Task_PokedexAreaScreen_0 +thumb_func 0x813d6a4 Task_PokedexAreaScreen_1 thumb_func 0x813d7b8 -thumb_func 0x813d7d4 -thumb_func 0x813d928 -thumb_func 0x813d9ac -thumb_func 0x813d9ec +thumb_func 0x813d7d4 CreateAreaMarkerSprites +thumb_func 0x813d928 DestroyAreaMarkerSprites +thumb_func 0x813d9ac LoadAreaUnknownGraphics +thumb_func 0x813d9ec CreateAreaUnknownSprites thumb_func 0x813dab4 -thumb_func 0x813dac4 -thumb_func 0x813db44 -thumb_func 0x813db90 -thumb_func 0x813de80 -thumb_func 0x813e074 -thumb_func 0x813e2d8 +thumb_func 0x813dac4 Task_BeginEvolutionScene +thumb_func 0x813db44 BeginEvolutionScene +thumb_func 0x813db90 EvolutionScene +thumb_func 0x813de80 CB2_EvolutionSceneLoadGraphics +thumb_func 0x813e074 CB2_TradeEvolutionSceneLoadGraphics +thumb_func 0x813e2d8 TradeEvolutionScene thumb_func 0x813e4a8 thumb_func 0x813e4c4 thumb_func 0x813e4e0 -thumb_func 0x813e638 +thumb_func 0x813e638 Task_EvolutionScene thumb_func 0x813f280 thumb_func 0x813fda0 nullsub_87 thumb_func 0x813fda4 @@ -10689,12 +10689,12 @@ thumb_func 0x813feb4 thumb_func 0x813ff6c thumb_func 0x813ffb0 thumb_func 0x8140088 InitMovingBgValues -thumb_func 0x81400c8 +thumb_func 0x81400c8 InitMovingBackgroundTask thumb_func 0x81401c8 thumb_func 0x81401fc -thumb_func 0x814023c -thumb_func 0x81402a8 -thumb_func 0x81402d0 +thumb_func 0x814023c OpenPokeblockCaseInBattle +thumb_func 0x81402a8 EvoScene_DoMonAnimation +thumb_func 0x81402d0 EvoScene_IsMonAnimFinished thumb_func 0x8140300 thumb_func 0x814032c thumb_func 0x8140450 @@ -10728,7 +10728,7 @@ thumb_func 0x8141a4c thumb_func 0x8141ae0 thumb_func 0x8141b88 thumb_func 0x8141c20 -thumb_func 0x8141dd4 +thumb_func 0x8141dd4 dp01t_12_3_battle_menu thumb_func 0x8141eac thumb_func 0x8141f44 thumb_func 0x8141fc0 @@ -10748,11 +10748,11 @@ thumb_func 0x8142a44 thumb_func 0x8142a68 thumb_func 0x8142ab8 thumb_func 0x8142b50 -thumb_func 0x8142c94 +thumb_func 0x8142c94 PlayRoulette thumb_func 0x8142cd8 thumb_func 0x8142d2c thumb_func 0x8142d9c -thumb_func 0x8142f08 +thumb_func 0x8142f08 unref_sub_8142E3C thumb_func 0x8142f3c thumb_func 0x8143048 thumb_func 0x8143104 @@ -10780,7 +10780,7 @@ thumb_func 0x8144070 thumb_func 0x814411c thumb_func 0x81441f4 thumb_func 0x8144234 -thumb_func 0x8144274 +thumb_func 0x8144274 prev_quest_read_x24_hm_usage thumb_func 0x8144330 thumb_func 0x81444dc thumb_func 0x81445e0 @@ -10815,41 +10815,41 @@ thumb_func 0x8145a38 thumb_func 0x8145bf0 thumb_func 0x8145c20 thumb_func 0x8145c6c -thumb_func 0x8145cd4 +thumb_func 0x8145cd4 HideCoinsWindow thumb_func 0x8145cf0 GetCoins thumb_func 0x8145d18 SetCoins thumb_func 0x8145d40 GiveCoins thumb_func 0x8145d8c TakeCoins -thumb_func 0x8145db4 -thumb_func 0x8145e08 -thumb_func 0x8145e84 -thumb_func 0x8145ecc +thumb_func 0x8145db4 GetLandmarkName +thumb_func 0x8145e08 GetLandmarks +thumb_func 0x8145e84 SetUpFieldMove_Strength +thumb_func 0x8145ecc FldEff_UseStrength thumb_func 0x8145eec -thumb_func 0x8145f34 -thumb_func 0x8145f44 -thumb_func 0x8145f9c +thumb_func 0x8145f34 CoordEventWeather_Clouds +thumb_func 0x8145f44 CB2_TestBattleTransition +thumb_func 0x8145f9c TestBattleTransition thumb_func 0x8145fb4 BattleTransition_StartOnField -thumb_func 0x8145fd0 -thumb_func 0x8145fe0 -thumb_func 0x814602c +thumb_func 0x8145fd0 BattleTransition_Start +thumb_func 0x8145fe0 IsBattleTransitionDone +thumb_func 0x814602c LaunchBattleTransitionTask thumb_func 0x8146068 -thumb_func 0x81460a0 -thumb_func 0x81460f0 -thumb_func 0x8146124 -thumb_func 0x814614c -thumb_func 0x814617c +thumb_func 0x81460a0 Transition_Phase1 +thumb_func 0x81460f0 Transition_WaitForPhase1 +thumb_func 0x8146124 Transition_Phase2 +thumb_func 0x814614c Transition_WaitForPhase2 +thumb_func 0x814617c Phase1Task_TransitionAll thumb_func 0x81461cc -thumb_func 0x8146204 -thumb_func 0x8146238 -thumb_func 0x8146298 +thumb_func 0x8146204 Phase2_Blur_Func1 +thumb_func 0x8146238 Phase2_Blur_Func2 +thumb_func 0x8146298 Phase2_Blur_Func3 thumb_func 0x81462c4 -thumb_func 0x81462fc -thumb_func 0x8146368 +thumb_func 0x81462fc Phase2_Swirl_Func1 +thumb_func 0x8146368 Phase2_Swirl_Func2 thumb_func 0x81463e0 VBlankCB_Phase2_Swirl thumb_func 0x8146418 thumb_func 0x8146444 -thumb_func 0x814647c -thumb_func 0x81464e0 +thumb_func 0x814647c Phase2_Shuffle_Func1 +thumb_func 0x81464e0 Phase2_Shuffle_Func2 thumb_func 0x8146570 VBlankCB_Phase2_Shuffle thumb_func 0x81465a8 thumb_func 0x81465d4 @@ -10860,55 +10860,55 @@ thumb_func 0x81466b4 thumb_func 0x81466ec thumb_func 0x8146724 thumb_func 0x814675c -thumb_func 0x81467cc -thumb_func 0x8146820 -thumb_func 0x8146874 -thumb_func 0x81468c0 +thumb_func 0x81467cc Phase2_Aqua_Func1 +thumb_func 0x8146820 Phase2_Magma_Func1 +thumb_func 0x8146874 Phase2_Regi_Func1 +thumb_func 0x81468c0 Phase2_BigPokeball_Func1 thumb_func 0x8146914 Phase2_BigPokeball_Func2 -thumb_func 0x81469a4 -thumb_func 0x81469ec -thumb_func 0x8146a34 -thumb_func 0x8146a8c -thumb_func 0x8146ae4 -thumb_func 0x8146b3c -thumb_func 0x8146b88 +thumb_func 0x81469a4 Phase2_Aqua_Func2 +thumb_func 0x81469ec Phase2_Magma_Func2 +thumb_func 0x8146a34 Phase2_Regice_Func2 +thumb_func 0x8146a8c Phase2_Registeel_Func2 +thumb_func 0x8146ae4 Phase2_Regirock_Func2 +thumb_func 0x8146b3c Phase2_Kyogre_Func3 +thumb_func 0x8146b88 Phase2_Kyogre_Func4 thumb_func 0x8146be4 thumb_func 0x8146c3c -thumb_func 0x8146c68 +thumb_func 0x8146c68 Phase2_WeatherDuo_Func7 thumb_func 0x8146cb8 Phase2_BigPokeball_Func3 thumb_func 0x8146d4c Phase2_BigPokeball_Func4 thumb_func 0x8146de0 Phase2_BigPokeball_Func5 thumb_func 0x8146e50 Phase2_FramesCountdown thumb_func 0x8146e6c thumb_func 0x8146e98 Phase2_WaitPaletteFade -thumb_func 0x8146eb8 +thumb_func 0x8146eb8 Phase2_BigPokeball_Func6 thumb_func 0x8146f80 Transition_BigPokeball_Vblank thumb_func 0x8146ffc VBlankCB0_Phase2_BigPokeball thumb_func 0x8147028 VBlankCB1_Phase2_BigPokeball thumb_func 0x8147054 -thumb_func 0x814708c -thumb_func 0x81470d8 -thumb_func 0x8147164 -thumb_func 0x8147190 -thumb_func 0x81471fc +thumb_func 0x814708c Phase2_PokeballsTrail_Func1 +thumb_func 0x81470d8 Phase2_PokeballsTrail_Func2 +thumb_func 0x8147164 Phase2_PokeballsTrail_Func3 +thumb_func 0x8147190 FldEff_Pokeball +thumb_func 0x81471fc berry_fix_gpu_set thumb_func 0x81472c4 -thumb_func 0x81472fc +thumb_func 0x81472fc Phase2_Clockwise_BlackFade_Func1 thumb_func 0x8147364 Phase2_Clockwise_BlackFade_Func2 -thumb_func 0x81473f4 +thumb_func 0x81473f4 Phase2_Clockwise_BlackFade_Func3 thumb_func 0x81474e8 Phase2_Clockwise_BlackFade_Func4 -thumb_func 0x8147570 +thumb_func 0x8147570 Phase2_Clockwise_BlackFade_Func5 thumb_func 0x8147670 Phase2_Clockwise_BlackFade_Func6 -thumb_func 0x8147708 +thumb_func 0x8147708 Phase2_Clockwise_BlackFade_Func7 thumb_func 0x8147748 VBlankCB_Phase2_Clockwise_BlackFade thumb_func 0x81477d8 -thumb_func 0x8147810 -thumb_func 0x8147868 +thumb_func 0x8147810 Phase2_Ripple_Func1 +thumb_func 0x8147868 Phase2_Ripple_Func2 thumb_func 0x8147948 VBlankCB_Phase2_Ripple thumb_func 0x8147980 thumb_func 0x81479ac -thumb_func 0x81479e4 -thumb_func 0x8147a3c -thumb_func 0x8147ad8 +thumb_func 0x81479e4 Phase2_Wave_Func1 +thumb_func 0x8147a3c Phase2_Wave_Func2 +thumb_func 0x8147ad8 Phase2_Wave_Func3 thumb_func 0x8147b18 VBlankCB_Phase2_Wave thumb_func 0x8147ba4 Phase2Task_Sidney thumb_func 0x8147bc4 Phase2Task_Phoebe @@ -10916,20 +10916,20 @@ thumb_func 0x8147be4 Phase2Task_Glacia thumb_func 0x8147c04 Phase2Task_Drake thumb_func 0x8147c24 Phase2Task_Champion thumb_func 0x8147c44 -thumb_func 0x8147c7c -thumb_func 0x8147ce4 -thumb_func 0x8147da4 -thumb_func 0x8147e90 +thumb_func 0x8147c7c Phase2_Mugshot_Func1 +thumb_func 0x8147ce4 Phase2_Mugshot_Func2 +thumb_func 0x8147da4 Phase2_Mugshot_Func3 +thumb_func 0x8147e90 Phase2_Mugshot_Func4 thumb_func 0x8147f0c Phase2_Mugshot_Func5 -thumb_func 0x8147f48 +thumb_func 0x8147f48 Phase2_Mugshot_Func6 thumb_func 0x8148000 Phase2_Mugshot_Func7 -thumb_func 0x81480c8 -thumb_func 0x8148100 -thumb_func 0x814814c +thumb_func 0x81480c8 Phase2_Mugshot_Func8 +thumb_func 0x8148100 Phase2_Mugshot_Func9 +thumb_func 0x814814c Phase2_RectangularSpiral_Func3 thumb_func 0x814818c VBlankCB0_Phase2_Mugshots thumb_func 0x8148220 VBlankCB1_Phase2_Mugshots -thumb_func 0x81482a0 -thumb_func 0x81482d8 +thumb_func 0x81482a0 HBlankCB_Phase2_Mugshots +thumb_func 0x81482d8 Mugshots_CreateOpponentPlayerSprites thumb_func 0x8148440 thumb_func 0x8148468 thumb_func 0x814846c @@ -10940,68 +10940,68 @@ thumb_func 0x8148544 thumb_func 0x814855c thumb_func 0x8148578 thumb_func 0x8148590 -thumb_func 0x81485c8 -thumb_func 0x8148650 -thumb_func 0x814871c +thumb_func 0x81485c8 Phase2_Slice_Func1 +thumb_func 0x8148650 Phase2_Slice_Func2 +thumb_func 0x814871c Phase2_Slice_Func3 thumb_func 0x814875c VBlankCB_Phase2_Slice thumb_func 0x81487e8 HBlankCB_Phase2_Slice thumb_func 0x8148820 -thumb_func 0x8148858 -thumb_func 0x8148924 +thumb_func 0x8148858 Phase2_ShredSplit_Func1 +thumb_func 0x8148924 Phase2_ShredSplit_Func2 thumb_func 0x8148b94 Phase2_ShredSplit_Func3 -thumb_func 0x8148bd4 +thumb_func 0x8148bd4 Phase2_ShredSplit_Func4 thumb_func 0x8148c14 thumb_func 0x8148c4c -thumb_func 0x8148c84 -thumb_func 0x8148ce8 +thumb_func 0x8148c84 Phase2_Blackhole_Func1 +thumb_func 0x8148ce8 Phase2_Blackhole1_Func3 thumb_func 0x8148da8 Phase2_Blackhole1_Func2 -thumb_func 0x8148e2c +thumb_func 0x8148e2c Phase2_Blackhole2_Func2 thumb_func 0x8148f14 -thumb_func 0x8148f4c +thumb_func 0x8148f4c Phase2_RectangularSpiral_Func1 thumb_func 0x814900c Phase2_RectangularSpiral_Func2 thumb_func 0x81490c8 thumb_func 0x8149108 thumb_func 0x8149200 -thumb_func 0x8149238 +thumb_func 0x8149238 Phase2_Groudon_Func3 thumb_func 0x8149288 thumb_func 0x81492e4 thumb_func 0x814933c -thumb_func 0x8149374 -thumb_func 0x8149418 -thumb_func 0x8149448 -thumb_func 0x8149498 +thumb_func 0x8149374 Phase2_Rayquaza_Func3 +thumb_func 0x8149418 Phase2_Rayquaza_Func4 +thumb_func 0x8149448 Phase2_Rayquaza_Func5 +thumb_func 0x8149498 Phase2_Rayquaza_Func6 thumb_func 0x81494d0 Phase2_Rayquaza_Func7 thumb_func 0x81494fc -thumb_func 0x814952c -thumb_func 0x81495c8 +thumb_func 0x814952c Phase2_Rayquaza_Func9 +thumb_func 0x81495c8 VBlankCB_Phase2_Rayquaza thumb_func 0x8149638 -thumb_func 0x8149670 -thumb_func 0x81496e8 -thumb_func 0x814975c -thumb_func 0x8149798 -thumb_func 0x8149800 +thumb_func 0x8149670 Phase2_WhiteFade_Func1 +thumb_func 0x81496e8 Phase2_WhiteFade_Func2 +thumb_func 0x814975c Phase2_WhiteFade_Func3 +thumb_func 0x8149798 Phase2_WhiteFade_Func4 +thumb_func 0x8149800 Phase2_WhiteFade_Func5 thumb_func 0x8149834 VBlankCB0_Phase2_WhiteFade thumb_func 0x81498c4 VBlankCB1_Phase2_WhiteFade thumb_func 0x8149900 HBlankCB_Phase2_WhiteFade thumb_func 0x8149924 thumb_func 0x8149a1c -thumb_func 0x8149a54 -thumb_func 0x8149aa8 -thumb_func 0x8149b00 +thumb_func 0x8149a54 Phase2_GridSquares_Func1 +thumb_func 0x8149aa8 ItemId_GetImportance +thumb_func 0x8149b00 Phase2_GridSquares_Func3 thumb_func 0x8149b2c -thumb_func 0x8149b64 +thumb_func 0x8149b64 Phase2_Shards_Func1 thumb_func 0x8149bc8 Phase2_Shards_Func2 -thumb_func 0x8149c44 -thumb_func 0x8149d20 +thumb_func 0x8149c44 Phase2_Shards_Func3 +thumb_func 0x8149d20 Phase2_Shards_Func4 thumb_func 0x8149d8c Phase2_Shards_Func5 thumb_func 0x8149da8 VBlankCB_Phase2_Shards thumb_func 0x8149e38 -thumb_func 0x8149e9c -thumb_func 0x8149ebc +thumb_func 0x8149e9c IsPhase1Done +thumb_func 0x8149ebc Phase2Task_Magma thumb_func 0x8149ef4 -thumb_func 0x8149f50 +thumb_func 0x8149f50 Phase1_TransitionAll_Func2 thumb_func 0x8149fc8 -thumb_func 0x8149fec +thumb_func 0x8149fec VBlankCB_BattleTransition thumb_func 0x814a000 thumb_func 0x814a018 thumb_func 0x814a044 @@ -11009,36 +11009,36 @@ thumb_func 0x814a058 thumb_func 0x814a0d4 thumb_func 0x814a26c thumb_func 0x814a2e8 -thumb_func 0x814a3e4 -thumb_func 0x814a434 +thumb_func 0x814a3e4 Phase2_29_Func1 +thumb_func 0x814a434 Phase2_29_Func2 thumb_func 0x814a47c thumb_func 0x814a4b4 -thumb_func 0x814a4ec -thumb_func 0x814a594 -thumb_func 0x814a5c0 -thumb_func 0x814a610 +thumb_func 0x814a4ec Phase2_30_Func1 +thumb_func 0x814a594 Phase2_30_Func2 +thumb_func 0x814a5c0 Phase2_30_Func3 +thumb_func 0x814a610 Phase2_30_Func4 thumb_func 0x814a744 VBlankCB_Phase2_30 thumb_func 0x814a78c HBlankCB_Phase2_30 -thumb_func 0x814a7b0 +thumb_func 0x814a7b0 Phase2Task_37 thumb_func 0x814a7e8 thumb_func 0x814a820 -thumb_func 0x814a858 -thumb_func 0x814a8e8 -thumb_func 0x814a958 -thumb_func 0x814aa20 -thumb_func 0x814aac4 -thumb_func 0x814ab44 -thumb_func 0x814ab78 -thumb_func 0x814ac60 +thumb_func 0x814a858 Phase2_31_Func1 +thumb_func 0x814a8e8 Phase2_31_Func2 +thumb_func 0x814a958 Phase2_31_Func3 +thumb_func 0x814aa20 Phase2_33_Func1 +thumb_func 0x814aac4 Phase2_33_Func2 +thumb_func 0x814ab44 Phase2_33_Func3 +thumb_func 0x814ab78 Phase2_33_Func4 +thumb_func 0x814ac60 ItemId_GetFieldFunc thumb_func 0x814aca4 -thumb_func 0x814acf8 -thumb_func 0x814ae08 -thumb_func 0x814ae74 -thumb_func 0x814ae98 -thumb_func 0x814af00 +thumb_func 0x814acf8 Phase2_32_Func1 +thumb_func 0x814ae08 Phase2_32_Func2 +thumb_func 0x814ae74 Phase2_32_Func3 +thumb_func 0x814ae98 Phase2_32_Func4 +thumb_func 0x814af00 Phase2_32_Func5 thumb_func 0x814af6c nullsub_88 thumb_func 0x814af70 -thumb_func 0x814af8c +thumb_func 0x814af8c LinkPartnerBufferRunCommand thumb_func 0x814afdc thumb_func 0x814b014 thumb_func 0x814b07c @@ -11054,98 +11054,98 @@ thumb_func 0x814b5a0 thumb_func 0x814b614 thumb_func 0x814b668 thumb_func 0x814b75c -thumb_func 0x814b800 +thumb_func 0x814b800 LinkPartnerBufferExecCompleted thumb_func 0x814b878 thumb_func 0x814b8a8 thumb_func 0x814b8d8 -thumb_func 0x814b94c +thumb_func 0x814b94c CopyLinkPartnerMonData thumb_func 0x814c0f8 thumb_func 0x814c104 -thumb_func 0x814c15c +thumb_func 0x814c15c SetLinkPartnerMonData thumb_func 0x814cb58 -thumb_func 0x814cbcc +thumb_func 0x814cbcc LinkPartnerHandleLoadMonSprite thumb_func 0x814cce8 thumb_func 0x814cd58 -thumb_func 0x814ced4 +thumb_func 0x814ced4 LinkPartnerHandleReturnMonToBall thumb_func 0x814cf64 -thumb_func 0x814cff0 -thumb_func 0x814d1a4 -thumb_func 0x814d1b0 +thumb_func 0x814cff0 LinkPartnerHandleDrawTrainerPic +thumb_func 0x814d1a4 LinkPartnerHandleTrainerSlide +thumb_func 0x814d1b0 LinkPartnerHandleTrainerSlideBack thumb_func 0x814d25c -thumb_func 0x814d348 -thumb_func 0x814d354 -thumb_func 0x814d360 -thumb_func 0x814d36c +thumb_func 0x814d348 LinkPartnerHandlePaletteFade +thumb_func 0x814d354 LinkPartnerHandleSuccessBallThrowAnim +thumb_func 0x814d360 LinkPartnerHandleBallThrowAnim +thumb_func 0x814d36c LinkPartnerHandlePause thumb_func 0x814d378 thumb_func 0x814d4cc -thumb_func 0x814d650 -thumb_func 0x814d6a8 -thumb_func 0x814d6b4 +thumb_func 0x814d650 LinkPartnerHandlePrintString +thumb_func 0x814d6a8 LinkPartnerHandlePrintSelectionString +thumb_func 0x814d6b4 LinkPartnerHandleChooseAction thumb_func 0x814d6c0 thumb_func 0x814d6cc -thumb_func 0x814d6d8 -thumb_func 0x814d6e4 -thumb_func 0x814d6f0 -thumb_func 0x814d6fc -thumb_func 0x814d7ec +thumb_func 0x814d6d8 LinkPartnerHandleChooseItem +thumb_func 0x814d6e4 LinkPartnerHandleChoosePokemon +thumb_func 0x814d6f0 LinkPartnerHandleCmd23 +thumb_func 0x814d6fc LinkPartnerHandleHealthBarUpdate +thumb_func 0x814d7ec LinkPartnerHandleExpUpdate thumb_func 0x814d7f8 thumb_func 0x814d870 -thumb_func 0x814d8d8 -thumb_func 0x814d8e4 -thumb_func 0x814d8f0 -thumb_func 0x814d8fc -thumb_func 0x814d908 -thumb_func 0x814d914 -thumb_func 0x814d920 -thumb_func 0x814d92c -thumb_func 0x814d938 +thumb_func 0x814d8d8 LinkPartnerHandleStatusXor +thumb_func 0x814d8e4 LinkPartnerHandleDataTransfer +thumb_func 0x814d8f0 LinkPartnerHandleDMA3Transfer +thumb_func 0x814d8fc LinkPartnerHandlePlayBGM +thumb_func 0x814d908 LinkPartnerHandleCmd32 +thumb_func 0x814d914 LinkPartnerHandleTwoReturnValues +thumb_func 0x814d920 LinkPartnerHandleChosenMonReturnValue +thumb_func 0x814d92c LinkPartnerHandleOneReturnValue +thumb_func 0x814d938 LinkPartnerHandleOneReturnValue_Duplicate thumb_func 0x814d944 LinkPartnerHandleCmd37 thumb_func 0x814d960 LinkPartnerHandleCmd38 thumb_func 0x814d998 LinkPartnerHandleCmd39 thumb_func 0x814d9b0 LinkPartnerHandleCmd40 thumb_func 0x814d9d8 -thumb_func 0x814da48 +thumb_func 0x814da48 LinkPartnerHandleCmd42 thumb_func 0x814da54 -thumb_func 0x814da98 -thumb_func 0x814daf4 -thumb_func 0x814db34 -thumb_func 0x814db68 +thumb_func 0x814da98 LinkPartnerHandlePlayFanfareOrBGM +thumb_func 0x814daf4 LinkPartnerHandleFaintingCry +thumb_func 0x814db34 LinkPartnerHandleIntroSlide +thumb_func 0x814db68 LinkPartnerHandleIntroTrainerBallThrow thumb_func 0x814dd8c -thumb_func 0x814de98 +thumb_func 0x814de98 LinkPartnerHandleDrawPartyStatusSummary thumb_func 0x814df5c thumb_func 0x814dfa4 LinkPartnerHandleHidePartyStatusSummary -thumb_func 0x814dff4 -thumb_func 0x814e000 -thumb_func 0x814e060 -thumb_func 0x814e0d4 -thumb_func 0x814e0f4 -thumb_func 0x814e100 +thumb_func 0x814dff4 LinkPartnerHandleEndBounceEffect +thumb_func 0x814e000 LinkPartnerHandleSpriteInvisibility +thumb_func 0x814e060 LinkPartnerHandleBattleAnimation +thumb_func 0x814e0d4 LinkPartnerHandleLinkStandbyMsg +thumb_func 0x814e0f4 LinkPartnerHandleResetActionMoveSelection +thumb_func 0x814e100 LinkPartnerHandleCmd55 thumb_func 0x814e180 nullsub_89 -thumb_func 0x814e184 -thumb_func 0x814e7a0 -thumb_func 0x814e7b0 -thumb_func 0x814f664 -thumb_func 0x814f910 -thumb_func 0x814f968 +thumb_func 0x814e184 PrintOnTrainerHillRecordsWindow +thumb_func 0x814e7a0 BattleStringExpandPlaceholdersToDisplayedString +thumb_func 0x814e7b0 BattleStringExpandPlaceholders +thumb_func 0x814f664 ExpandBattleTextBuffPlaceholders +thumb_func 0x814f910 ChooseMoveUsedParticle +thumb_func 0x814f968 ChooseTypeOfMoveUsedString thumb_func 0x814fa04 thumb_func 0x814fb80 thumb_func 0x814fbfc GetCurrentPpToMaxPpState -thumb_func 0x814fc4c +thumb_func 0x814fc4c CableCarTask1 thumb_func 0x814fc78 -thumb_func 0x814fca4 +thumb_func 0x814fca4 CableCarMainCallback_Setup thumb_func 0x8150218 -thumb_func 0x8150234 +thumb_func 0x8150234 CleanupCableCar thumb_func 0x81503c0 thumb_func 0x815052c thumb_func 0x8150640 -thumb_func 0x81507dc +thumb_func 0x81507dc CableCarVblankCallback thumb_func 0x8150840 nullsub_901 thumb_func 0x8150844 thumb_func 0x8150924 thumb_func 0x8150a44 thumb_func 0x8150ad0 thumb_func 0x8150b48 -thumb_func 0x8150d04 +thumb_func 0x8150d04 LoadCableCarSprites thumb_func 0x8151064 thumb_func 0x8151138 thumb_func 0x8151194 @@ -11169,13 +11169,13 @@ thumb_func 0x8151928 thumb_func 0x81519b8 task_tutorial_controls_fadein thumb_func 0x8151a24 thumb_func 0x8151a78 -thumb_func 0x8151b18 +thumb_func 0x8151b18 InitPulseBlend thumb_func 0x8151b44 InitPulseBlendPaletteSettings -thumb_func 0x8151bb0 +thumb_func 0x8151bb0 ClearPulseBlendPalettesSettings thumb_func 0x8151c2c UnloadUsedPulseBlendPalettes thumb_func 0x8151c84 MarkUsedPulseBlendPalettes -thumb_func 0x8151d04 -thumb_func 0x8151e2c +thumb_func 0x8151d04 UnmarkUsedPulseBlendPalettes +thumb_func 0x8151e2c UpdatePulseBlend thumb_func 0x8151fe4 thumb_func 0x8152034 thumb_func 0x8152084 @@ -11188,116 +11188,116 @@ thumb_func 0x8152414 thumb_func 0x8152450 thumb_func 0x81524a0 thumb_func 0x81525ac -thumb_func 0x815262c -thumb_func 0x815265c -thumb_func 0x8152678 +thumb_func 0x815262c ClearSaveData +thumb_func 0x815265c Save_ResetSaveCounters +thumb_func 0x8152678 SetDamagedSectorBits thumb_func 0x81526dc -thumb_func 0x815277c -thumb_func 0x815286c -thumb_func 0x81528e4 -thumb_func 0x8152910 +thumb_func 0x815277c HandleWriteSector +thumb_func 0x815286c HandleWriteSectorNBytes +thumb_func 0x81528e4 TryWriteSector +thumb_func 0x8152910 RestoreSaveBackupVarsAndIncrement thumb_func 0x815296c RestoreSaveBackupVars thumb_func 0x81529b0 thumb_func 0x8152a10 -thumb_func 0x8152a5c +thumb_func 0x8152a5c ClearSaveData_2 thumb_func 0x8152bfc thumb_func 0x8152c94 thumb_func 0x8152d20 thumb_func 0x8152d60 -thumb_func 0x8152e18 +thumb_func 0x8152e18 GetSaveValidStatus thumb_func 0x815302c -thumb_func 0x815309c +thumb_func 0x815309c DoReadFlashWholeSection thumb_func 0x81530b4 CalculateChecksum thumb_func 0x81530e0 UpdateSaveAddresses -thumb_func 0x8153154 -thumb_func 0x8153274 +thumb_func 0x8153154 HandleSavingData +thumb_func 0x8153274 TrySavingData thumb_func 0x81532bc thumb_func 0x81532e8 thumb_func 0x815331c thumb_func 0x8153344 thumb_func 0x815336c -thumb_func 0x81533b0 -thumb_func 0x815340c +thumb_func 0x81533b0 CheckSaveFile +thumb_func 0x815340c Save_LoadGameData thumb_func 0x8153498 -thumb_func 0x8153518 -thumb_func 0x8153570 +thumb_func 0x8153518 TryReadSpecialSaveSection +thumb_func 0x8153570 TryWriteSpecialSaveSection thumb_func 0x81535c4 thumb_func 0x8153708 CheckCompatibility -thumb_func 0x8153740 -thumb_func 0x815375c -thumb_func 0x815378c +thumb_func 0x8153740 SetIncompatible +thumb_func 0x815375c InitMysteryEventScript +thumb_func 0x815378c RunMysteryEventScriptCommand thumb_func 0x81537ac thumb_func 0x81537c0 thumb_func 0x81537dc RunMysteryEventScript -thumb_func 0x8153800 +thumb_func 0x8153800 SetMysteryEventScriptStatus thumb_func 0x815380c CalcRecordMixingGiftChecksum -thumb_func 0x8153834 +thumb_func 0x8153834 IsRecordMixingGiftValid thumb_func 0x8153880 thumb_func 0x81538ac SetRecordMixingGift -thumb_func 0x8153910 +thumb_func 0x8153910 GetRecordMixingGift thumb_func 0x8153960 -thumb_func 0x815396c +thumb_func 0x815396c MEScrCmd_checkcompat thumb_func 0x81539bc nullsub_91 -thumb_func 0x81539c0 -thumb_func 0x81539d0 -thumb_func 0x8153a08 -thumb_func 0x8153a24 -thumb_func 0x8153aec -thumb_func 0x8153b20 +thumb_func 0x81539c0 MEScrCmd_setstatus +thumb_func 0x81539d0 MEScrCmd_setmsg +thumb_func 0x8153a08 MEScrCmd_runscript +thumb_func 0x8153a24 MEScrCmd_setenigmaberry +thumb_func 0x8153aec MEScrCmd_giveribbon +thumb_func 0x8153b20 MEScrCmd_initramscript thumb_func 0x8153b88 -thumb_func 0x8153bac -thumb_func 0x8153bd8 -thumb_func 0x8153c04 -thumb_func 0x8153d10 +thumb_func 0x8153bac MEScrCmd_addrareword +thumb_func 0x8153bd8 MEScrCmd_setrecordmixinggift +thumb_func 0x8153c04 MEScrCmd_givepokemon +thumb_func 0x8153d10 MEScrCmd_addtrainer thumb_func 0x8153d58 -thumb_func 0x8153d7c +thumb_func 0x8153d7c MEScrCmd_checksum thumb_func 0x8153dc4 -thumb_func 0x8153e10 -thumb_func 0x8153ed4 -thumb_func 0x8153ee8 -thumb_func 0x8153f58 -thumb_func 0x8153fb4 -thumb_func 0x8153fe4 -thumb_func 0x8154164 +thumb_func 0x8153e10 SetUpReflection +thumb_func 0x8153ed4 GetReflectionVerticalOffset +thumb_func 0x8153ee8 LoadObjectReflectionPalette +thumb_func 0x8153f58 LoadObjectRegularReflectionPalette +thumb_func 0x8153fb4 LoadObjectHighBridgeReflectionPalette +thumb_func 0x8153fe4 UpdateObjectReflectionSprite +thumb_func 0x8154164 CreateWarpArrowSprite thumb_func 0x81541b4 SetSpriteInvisible -thumb_func 0x81541d4 -thumb_func 0x815427c -thumb_func 0x8154320 -thumb_func 0x81543e8 -thumb_func 0x815448c -thumb_func 0x8154594 -thumb_func 0x8154604 -thumb_func 0x8154694 -thumb_func 0x815473c -thumb_func 0x8154838 -thumb_func 0x81548a8 -thumb_func 0x815494c -thumb_func 0x8154a40 -thumb_func 0x8154ab4 -thumb_func 0x8154b28 +thumb_func 0x81541d4 ShowWarpArrowSprite +thumb_func 0x815427c FldEff_Shadow +thumb_func 0x8154320 UpdateShadowFieldEffect +thumb_func 0x81543e8 FldEff_TallGrass +thumb_func 0x815448c UpdateTallGrassFieldEffect +thumb_func 0x8154594 FldEff_JumpTallGrass +thumb_func 0x8154604 FindTallGrassFieldEffectSpriteId +thumb_func 0x8154694 FldEff_LongGrass +thumb_func 0x815473c UpdateLongGrassFieldEffect +thumb_func 0x8154838 FldEff_JumpLongGrass +thumb_func 0x81548a8 FldEff_ShortGrass +thumb_func 0x815494c UpdateShortGrassFieldEffect +thumb_func 0x8154a40 FldEff_SandFootprints +thumb_func 0x8154ab4 FldEff_DeepSandFootprints +thumb_func 0x8154b28 FldEff_BikeTireTracks thumb_func 0x8154b9c -thumb_func 0x8154bb8 -thumb_func 0x8154bdc -thumb_func 0x8154c28 -thumb_func 0x8154ccc -thumb_func 0x8154d58 -thumb_func 0x8154dc8 -thumb_func 0x8154e38 -thumb_func 0x8154ef0 -thumb_func 0x8154f90 -thumb_func 0x8154ff0 -thumb_func 0x8155094 -thumb_func 0x815512c -thumb_func 0x8155198 -thumb_func 0x8155204 -thumb_func 0x8155270 -thumb_func 0x81552dc -thumb_func 0x8155310 -thumb_func 0x815539c +thumb_func 0x8154bb8 FadeFootprintsTireTracks_Step0 +thumb_func 0x8154bdc FadeFootprintsTireTracks_Step1 +thumb_func 0x8154c28 FldEff_Splash +thumb_func 0x8154ccc UpdateSplashFieldEffect +thumb_func 0x8154d58 FldEff_JumpSmallSplash +thumb_func 0x8154dc8 FldEff_JumpBigSplash +thumb_func 0x8154e38 FldEff_FeetInFlowingWater +thumb_func 0x8154ef0 UpdateFeetInFlowingWaterFieldEffect +thumb_func 0x8154f90 FldEff_Ripple +thumb_func 0x8154ff0 FldEff_HotSpringsWater +thumb_func 0x8155094 UpdateHotSpringsWaterFieldEffect +thumb_func 0x815512c FldEff_Unknown19 +thumb_func 0x8155198 FldEff_Unknown20 +thumb_func 0x8155204 FldEff_Unknown21 +thumb_func 0x8155270 FldEff_Unknown22 +thumb_func 0x81552dc StartAshFieldEffect +thumb_func 0x8155310 FldEff_Ash +thumb_func 0x815539c CallBattlePikeFunction thumb_func 0x81553b8 UpdateAshFieldEffect_Step0 -thumb_func 0x81553e8 -thumb_func 0x8155448 -thumb_func 0x8155470 +thumb_func 0x81553e8 UpdateAshFieldEffect_Step1 +thumb_func 0x8155448 UpdateAshFieldEffect_Step2 +thumb_func 0x8155470 FldEff_SurfBlob thumb_func 0x81554e8 thumb_func 0x8155514 thumb_func 0x8155540 @@ -11305,57 +11305,57 @@ thumb_func 0x8155574 thumb_func 0x815557c thumb_func 0x8155588 thumb_func 0x8155594 UpdateSurfBlobFieldEffect -thumb_func 0x81555ec +thumb_func 0x81555ec SynchroniseSurfAnim thumb_func 0x8155624 -thumb_func 0x81556b8 +thumb_func 0x81556b8 CreateBobbingEffect thumb_func 0x815573c thumb_func 0x815578c -thumb_func 0x81557cc -thumb_func 0x815583c -thumb_func 0x81558f8 -thumb_func 0x81559c4 -thumb_func 0x8155a28 -thumb_func 0x8155a68 -thumb_func 0x8155adc -thumb_func 0x8155aec -thumb_func 0x8155afc -thumb_func 0x8155b0c -thumb_func 0x8155bc4 +thumb_func 0x81557cc FldEff_Dust +thumb_func 0x815583c FldEff_SandPile +thumb_func 0x81558f8 UpdateSandPileFieldEffect +thumb_func 0x81559c4 FldEff_Bubbles +thumb_func 0x8155a28 UpdateBubblesFieldEffect +thumb_func 0x8155a68 FldEff_BerryTreeGrowthSparkle +thumb_func 0x8155adc ShowTreeDisguiseFieldEffect +thumb_func 0x8155aec ShowMountainDisguiseFieldEffect +thumb_func 0x8155afc ShowSandDisguiseFieldEffect +thumb_func 0x8155b0c ShowDisguiseFieldEffect +thumb_func 0x8155bc4 UpdateDisguiseFieldEffect thumb_func 0x8155cb4 thumb_func 0x8155cdc -thumb_func 0x8155d18 -thumb_func 0x8155d8c +thumb_func 0x8155d18 FldEff_Sparkle +thumb_func 0x8155d8c UpdateSparkleFieldEffect thumb_func 0x8155ddc thumb_func 0x8155de4 thumb_func 0x8155ebc thumb_func 0x81560d0 -thumb_func 0x815610c +thumb_func 0x815610c WaitFieldEffectSpriteAnim thumb_func 0x8156138 -thumb_func 0x8156200 -thumb_func 0x8156260 -thumb_func 0x81562ec +thumb_func 0x8156200 ContestAI_ResetAI +thumb_func 0x8156260 ContestAI_GetActionToUse +thumb_func 0x81562ec ContestAI_DoAIProcessing thumb_func 0x81563e8 -thumb_func 0x8156418 +thumb_func 0x8156418 ContestAICmd_score thumb_func 0x815646c ContestAICmd_get_turn -thumb_func 0x815648c -thumb_func 0x81564d0 -thumb_func 0x8156514 -thumb_func 0x8156558 +thumb_func 0x815648c ContestAICmd_if_turn_less_than +thumb_func 0x81564d0 ContestAICmd_if_turn_more_than +thumb_func 0x8156514 ContestAICmd_if_turn_eq +thumb_func 0x8156558 ContestAICmd_if_turn_not_eq thumb_func 0x815659c ContestAICmd_get_excitement -thumb_func 0x81565c0 -thumb_func 0x8156604 -thumb_func 0x8156648 -thumb_func 0x815668c +thumb_func 0x81565c0 ContestAICmd_if_excitement_less_than +thumb_func 0x8156604 ContestAICmd_if_excitement_more_than +thumb_func 0x8156648 ContestAICmd_if_excitement_eq +thumb_func 0x815668c ContestAICmd_if_excitement_not_eq thumb_func 0x81566d0 ContestAICmd_get_user_order -thumb_func 0x81566f8 -thumb_func 0x815673c -thumb_func 0x8156780 -thumb_func 0x81567c4 -thumb_func 0x8156808 -thumb_func 0x8156848 -thumb_func 0x815688c -thumb_func 0x81568d0 -thumb_func 0x8156914 +thumb_func 0x81566f8 ContestAICmd_if_user_order_less_than +thumb_func 0x815673c ContestAICmd_if_user_order_more_than +thumb_func 0x8156780 ContestAICmd_if_user_order_eq +thumb_func 0x81567c4 ContestAICmd_if_user_order_not_eq +thumb_func 0x8156808 ContestAICmd_get_user_condition +thumb_func 0x8156848 ContestAICmd_if_user_condition_less_than +thumb_func 0x815688c ContestAICmd_if_user_condition_more_than +thumb_func 0x81568d0 ContestAICmd_if_user_condition_eq +thumb_func 0x8156914 ContestAICmd_if_user_condition_not_eq thumb_func 0x8156958 ContestAICmd_unk_15 thumb_func 0x8156984 thumb_func 0x81569d4 @@ -11367,112 +11367,112 @@ thumb_func 0x8156b40 thumb_func 0x8156b90 thumb_func 0x8156be0 thumb_func 0x8156c30 ContestAICmd_get_contest_type -thumb_func 0x8156c54 -thumb_func 0x8156c98 -thumb_func 0x8156cdc -thumb_func 0x8156d20 -thumb_func 0x8156d68 -thumb_func 0x8156db0 -thumb_func 0x8156df8 +thumb_func 0x8156c54 ContestAICmd_if_contest_type_eq +thumb_func 0x8156c98 ContestAICmd_if_contest_type_not_eq +thumb_func 0x8156cdc ContestAICmd_get_move_excitement +thumb_func 0x8156d20 ContestAICmd_if_move_excitement_less_than +thumb_func 0x8156d68 ContestAICmd_if_move_excitement_greater_than +thumb_func 0x8156db0 ContestAICmd_if_move_excitement_eq +thumb_func 0x8156df8 ContestAICmd_if_move_excitement_not_eq thumb_func 0x8156e40 ContestAICmd_get_move_effect -thumb_func 0x8156e80 -thumb_func 0x8156ec4 +thumb_func 0x8156e80 PrintPlayerBerryPowderAmount +thumb_func 0x8156ec4 ContestAICmd_if_move_effect_not_eq thumb_func 0x8156f08 ContestAICmd_get_move_effect_type -thumb_func 0x8156f54 -thumb_func 0x8156f98 -thumb_func 0x8156fdc -thumb_func 0x8157068 -thumb_func 0x81570b0 -thumb_func 0x815713c -thumb_func 0x8157184 +thumb_func 0x8156f54 ContestAICmd_if_move_effect_type_eq +thumb_func 0x8156f98 ContestAICmd_if_move_effect_type_not_eq +thumb_func 0x8156fdc ContestAICmd_check_most_appealing_move +thumb_func 0x8157068 ContestAICmd_if_most_appealing_move +thumb_func 0x81570b0 ContestAICmd_unk_2F +thumb_func 0x815713c ContestAICmd_unk_30 +thumb_func 0x8157184 ContestAICmd_unk_31 thumb_func 0x81571e0 thumb_func 0x8157224 thumb_func 0x8157268 thumb_func 0x81572ac -thumb_func 0x81572f0 +thumb_func 0x81572f0 ContestAICmd_unk_36 thumb_func 0x815734c thumb_func 0x8157390 thumb_func 0x81573d4 thumb_func 0x8157418 -thumb_func 0x815745c -thumb_func 0x81574b4 -thumb_func 0x81574f8 -thumb_func 0x815753c -thumb_func 0x8157580 -thumb_func 0x81575c4 +thumb_func 0x815745c ContestAICmd_get_move_used_count +thumb_func 0x81574b4 ContestAICmd_if_most_used_count_less_than +thumb_func 0x81574f8 ContestAICmd_if_most_used_count_more_than +thumb_func 0x815753c ContestAICmd_if_most_used_count_eq +thumb_func 0x8157580 ContestAICmd_if_most_used_count_not_eq +thumb_func 0x81575c4 ContestAICmd_check_combo_starter thumb_func 0x815763c thumb_func 0x8157684 -thumb_func 0x81576cc +thumb_func 0x81576cc ContestAICmd_check_combo_finisher thumb_func 0x8157744 thumb_func 0x815778c -thumb_func 0x81577d4 -thumb_func 0x8157834 -thumb_func 0x815787c -thumb_func 0x81578c4 -thumb_func 0x8157908 -thumb_func 0x815794c -thumb_func 0x8157990 -thumb_func 0x81579d4 -thumb_func 0x8157a18 +thumb_func 0x81577d4 ContestAICmd_check_would_finish_combo +thumb_func 0x8157834 ContestAICmd_if_would_finish_combo +thumb_func 0x815787c ContestAICmd_if_would_not_finish_combo +thumb_func 0x81578c4 ContestAICmd_get_condition +thumb_func 0x8157908 ContestAICmd_if_condition_less_than +thumb_func 0x815794c ContestAICmd_if_condition_more_than +thumb_func 0x8157990 ContestAICmd_if_condition_eq +thumb_func 0x81579d4 ContestAICmd_if_condition_not_eq +thumb_func 0x8157a18 ContestAICmd_get_used_combo_starter thumb_func 0x8157a74 thumb_func 0x8157ab8 thumb_func 0x8157afc thumb_func 0x8157b40 -thumb_func 0x8157b84 -thumb_func 0x8157bd0 -thumb_func 0x8157c18 +thumb_func 0x8157b84 ContestAICmd_check_can_participate +thumb_func 0x8157bd0 ContestAICmd_if_can_participate +thumb_func 0x8157c18 ContestAICmd_if_cannot_participate thumb_func 0x8157c60 ContestAICmd_get_val_812A188 -thumb_func 0x8157c9c -thumb_func 0x8157ce4 +thumb_func 0x8157c9c ContestAICmd_unk_57 +thumb_func 0x8157ce4 ContestAICmd_contest_58 thumb_func 0x8157d2c ContestAICmd_unk_59 -thumb_func 0x8157d78 +thumb_func 0x8157d78 ContestAICmd_unk_5A thumb_func 0x8157dc0 -thumb_func 0x8157e08 -thumb_func 0x8157e50 +thumb_func 0x8157e08 ContestAICmd_unk_5C +thumb_func 0x8157e50 ContestAICmd_unk_5D thumb_func 0x8157e98 ContestAICmd_unk_5E -thumb_func 0x8157edc -thumb_func 0x8157f24 -thumb_func 0x8157f6c -thumb_func 0x8157fb4 +thumb_func 0x8157edc ContestAICmd_unk_5F +thumb_func 0x8157f24 ContestAICmd_unk_60 +thumb_func 0x8157f6c ContestAICmd_unk_61 +thumb_func 0x8157fb4 ContestAICmd_unk_62 thumb_func 0x8157ffc ContestAICmd_unk_63 -thumb_func 0x8158044 -thumb_func 0x8158088 -thumb_func 0x81580cc -thumb_func 0x8158110 +thumb_func 0x8158044 ContestAICmd_unk_64 +thumb_func 0x8158088 ContestAICmd_unk_65 +thumb_func 0x81580cc ContestAICmd_unk_66 +thumb_func 0x8158110 ContestAICmd_unk_67 thumb_func 0x8158154 ContestAICmd_unk_68 -thumb_func 0x8158190 -thumb_func 0x81581d4 -thumb_func 0x8158218 -thumb_func 0x815825c +thumb_func 0x8158190 ContestAICmd_unk_69 +thumb_func 0x81581d4 ContestAICmd_unk_6A +thumb_func 0x8158218 ContestAICmd_unk_6B +thumb_func 0x815825c ContestAICmd_unk_6C thumb_func 0x81582a0 ContestAICmd_unk_6D -thumb_func 0x81582f4 -thumb_func 0x8158338 +thumb_func 0x81582f4 ContestAICmd_unk_6E +thumb_func 0x8158338 ContestAICmd_unk_6F thumb_func 0x815837c ContestAICmd_unk_70 thumb_func 0x81583a8 ContestAICmd_unk_71 thumb_func 0x81583d8 ContestAICmd_unk_72 thumb_func 0x8158410 thumb_func 0x8158444 -thumb_func 0x8158478 -thumb_func 0x81584c8 -thumb_func 0x8158518 -thumb_func 0x8158568 -thumb_func 0x81585b8 -thumb_func 0x815860c -thumb_func 0x8158660 -thumb_func 0x81586b4 -thumb_func 0x8158708 -thumb_func 0x8158758 +thumb_func 0x8158478 ContestAICmd_unk_75 +thumb_func 0x81584c8 ContestAICmd_unk_76 +thumb_func 0x8158518 ContestAICmd_unk_77 +thumb_func 0x8158568 ContestAICmd_unk_78 +thumb_func 0x81585b8 ContestAICmd_unk_79 +thumb_func 0x815860c ContestAICmd_unk_7A +thumb_func 0x8158660 ContestAICmd_unk_7B +thumb_func 0x81586b4 ContestAICmd_unk_7C +thumb_func 0x8158708 ContestAICmd_if_random +thumb_func 0x8158758 ContestAICmd_unk_7E thumb_func 0x81587a8 thumb_func 0x81587c8 ContestAICmd_call thumb_func 0x81587f8 ContestAICmd_end thumb_func 0x815881c AIStackPushVar -thumb_func 0x8158844 -thumb_func 0x8158884 -thumb_func 0x81588e0 -thumb_func 0x8158928 -thumb_func 0x8158970 -thumb_func 0x81589dc -thumb_func 0x8158a24 +thumb_func 0x8158844 AIStackPop +thumb_func 0x8158884 ContestAICmd_check_user_has_exciting_move +thumb_func 0x81588e0 ContestAICmd_if_user_has_exciting_move +thumb_func 0x8158928 ContestAICmd_if_user_doesnt_have_exciting_move +thumb_func 0x8158970 ContestAICmd_unk_85 +thumb_func 0x81589dc ContestAICmd_unk_86 +thumb_func 0x8158a24 ContestAICmd_if_effect_in_user_moveset thumb_func 0x8158a6c thumb_func 0x8158ad4 thumb_func 0x8158b40 @@ -11492,82 +11492,82 @@ thumb_func 0x815922c thumb_func 0x8159244 thumb_func 0x81592a4 nullsub_90 thumb_func 0x81592a8 -thumb_func 0x81592c4 -thumb_func 0x8159314 +thumb_func 0x81592c4 SafariBufferRunCommand +thumb_func 0x8159314 HandleInputChooseAction thumb_func 0x8159498 thumb_func 0x81594d0 thumb_func 0x81594e8 CompleteOnHealthboxSpriteCallbackDummy thumb_func 0x8159520 thumb_func 0x8159560 CompleteOnSpecialAnimDone -thumb_func 0x815959c +thumb_func 0x815959c SafariOpenPokeblockCase thumb_func 0x81595d4 thumb_func 0x8159610 -thumb_func 0x8159640 +thumb_func 0x8159640 SafariBufferExecCompleted thumb_func 0x81596b8 -thumb_func 0x81596e8 -thumb_func 0x81596f4 -thumb_func 0x8159700 -thumb_func 0x815970c +thumb_func 0x81596e8 SafariHandleGetMonData +thumb_func 0x81596f4 SafariHandleGetRawMonData +thumb_func 0x8159700 SafariHandleSetMonData +thumb_func 0x815970c SafariHandleSetRawMonData thumb_func 0x8159718 -thumb_func 0x8159724 -thumb_func 0x8159730 -thumb_func 0x815973c -thumb_func 0x815981c -thumb_func 0x8159828 -thumb_func 0x8159834 -thumb_func 0x8159840 +thumb_func 0x8159724 SafariHandleSwitchInAnim +thumb_func 0x8159730 SafariHandleReturnMonToBall +thumb_func 0x815973c SafariHandleDrawTrainerPic +thumb_func 0x815981c SafariHandleTrainerSlide +thumb_func 0x8159828 SafariHandleTrainerSlideBack +thumb_func 0x8159834 SafariHandleFaintAnimation +thumb_func 0x8159840 SafariHandlePaletteFade thumb_func 0x815984c thumb_func 0x81598a0 -thumb_func 0x8159900 -thumb_func 0x815990c +thumb_func 0x8159900 SafariHandlePause +thumb_func 0x815990c SafariHandleMoveAnimation thumb_func 0x8159918 -thumb_func 0x815996c +thumb_func 0x815996c SafariHandlePrintSelectionString thumb_func 0x8159990 -thumb_func 0x81599d0 -thumb_func 0x8159a38 -thumb_func 0x8159a44 -thumb_func 0x8159a50 -thumb_func 0x8159a90 -thumb_func 0x8159a9c -thumb_func 0x8159aa8 -thumb_func 0x8159ab4 -thumb_func 0x8159ac0 +thumb_func 0x81599d0 SafariHandleChooseAction +thumb_func 0x8159a38 SafariHandleUnknownYesNoBox +thumb_func 0x8159a44 SafariHandleChooseMove +thumb_func 0x8159a50 SafariHandleChooseItem +thumb_func 0x8159a90 SafariHandleChoosePokemon +thumb_func 0x8159a9c SafariHandleCmd23 +thumb_func 0x8159aa8 SafariHandleHealthBarUpdate +thumb_func 0x8159ab4 SafariHandleExpUpdate +thumb_func 0x8159ac0 SafariHandleStatusIconUpdate thumb_func 0x8159afc -thumb_func 0x8159b08 -thumb_func 0x8159b14 -thumb_func 0x8159b20 -thumb_func 0x8159b2c -thumb_func 0x8159b38 -thumb_func 0x8159b44 -thumb_func 0x8159b50 -thumb_func 0x8159b5c -thumb_func 0x8159b68 -thumb_func 0x8159b74 -thumb_func 0x8159b80 -thumb_func 0x8159b8c -thumb_func 0x8159b98 -thumb_func 0x8159ba4 -thumb_func 0x8159bb0 -thumb_func 0x8159bbc +thumb_func 0x8159b08 SafariHandleStatusXor +thumb_func 0x8159b14 SafariHandleDataTransfer +thumb_func 0x8159b20 SafariHandleDMA3Transfer +thumb_func 0x8159b2c SafariHandlePlayBGM +thumb_func 0x8159b38 SafariHandleCmd32 +thumb_func 0x8159b44 SafariHandleTwoReturnValues +thumb_func 0x8159b50 SafariHandleChosenMonReturnValue +thumb_func 0x8159b5c SafariHandleOneReturnValue +thumb_func 0x8159b68 SafariHandleOneReturnValue_Duplicate +thumb_func 0x8159b74 SafariHandleCmd37 +thumb_func 0x8159b80 SafariHandleCmd38 +thumb_func 0x8159b8c SafariHandleCmd39 +thumb_func 0x8159b98 SafariHandleCmd40 +thumb_func 0x8159ba4 SafariHandleHitAnimation +thumb_func 0x8159bb0 SafariHandleCmd42 +thumb_func 0x8159bbc SafariHandlePlaySE thumb_func 0x8159c00 -thumb_func 0x8159c5c -thumb_func 0x8159c98 -thumb_func 0x8159ccc +thumb_func 0x8159c5c SafariHandleFaintingCry +thumb_func 0x8159c98 SafariHandleIntroSlide +thumb_func 0x8159ccc SafariHandleIntroTrainerBallThrow thumb_func 0x8159d28 -thumb_func 0x8159d34 -thumb_func 0x8159d40 -thumb_func 0x8159d4c -thumb_func 0x8159d58 -thumb_func 0x8159db4 -thumb_func 0x8159dc0 +thumb_func 0x8159d34 SafariHandleHidePartyStatusSummary +thumb_func 0x8159d40 SafariHandleEndBounceEffect +thumb_func 0x8159d4c SafariHandleSpriteInvisibility +thumb_func 0x8159d58 SafariHandleBattleAnimation +thumb_func 0x8159db4 SafariHandleLinkStandbyMsg +thumb_func 0x8159dc0 SafariHandleResetActionMoveSelection thumb_func 0x8159dcc thumb_func 0x8159e28 nullsub_93 -thumb_func 0x8159e2c -thumb_func 0x8159e4c -thumb_func 0x8159e68 +thumb_func 0x8159e2c SetUpFieldMove_SweetScent +thumb_func 0x8159e4c FieldCallback_SweetScent +thumb_func 0x8159e68 FldEff_SweetScent thumb_func 0x8159e98 -thumb_func 0x8159f28 -thumb_func 0x8159fcc +thumb_func 0x8159f28 TrySweetScentEncounter +thumb_func 0x8159fcc FailSweetScentEncounter thumb_func 0x815a010 thumb_func 0x815a050 thumb_func 0x815a09c @@ -11590,15 +11590,15 @@ thumb_func 0x815a6a8 thumb_func 0x815a6ec thumb_func 0x815a728 thumb_func 0x815a7e8 -thumb_func 0x815a804 -thumb_func 0x815a840 +thumb_func 0x815a804 AnimTask_IsTargetPlayerSide +thumb_func 0x815a840 AnimTask_IsHealingMove thumb_func 0x815a870 thumb_func 0x815a8dc thumb_func 0x815a9a8 thumb_func 0x815a9e0 thumb_func 0x815aa98 thumb_func 0x815ab0c -thumb_func 0x815ab28 +thumb_func 0x815ab28 StartSweetScentFieldEffect thumb_func 0x815abc8 thumb_func 0x815ac0c thumb_func 0x815ac88 @@ -11612,10 +11612,10 @@ thumb_func 0x815b274 thumb_func 0x815b2d0 thumb_func 0x815b3d8 thumb_func 0x815b410 -thumb_func 0x815b4ac +thumb_func 0x815b4ac AnimMiniTwinklingStar thumb_func 0x815b50c thumb_func 0x815b598 -thumb_func 0x815b5f0 +thumb_func 0x815b5f0 AnimTask_StrongFrustrationGrowAndShrink thumb_func 0x815b648 thumb_func 0x815b6b4 thumb_func 0x815b70c @@ -11628,106 +11628,106 @@ thumb_func 0x815bf30 thumb_func 0x815bf8c thumb_func 0x815bfe0 thumb_func 0x815c2e4 -thumb_func 0x815c33c -thumb_func 0x815c3b4 -thumb_func 0x815c484 -thumb_func 0x815c5ec -thumb_func 0x815c63c -thumb_func 0x815c6ac -thumb_func 0x815c700 -thumb_func 0x815c898 -thumb_func 0x815c95c -thumb_func 0x815cac4 -thumb_func 0x815cb70 -thumb_func 0x815cbd0 -thumb_func 0x815cc48 -thumb_func 0x815ccf0 -thumb_func 0x815cd38 -thumb_func 0x815ce14 -thumb_func 0x815d09c -thumb_func 0x815d0f8 -thumb_func 0x815d17c -thumb_func 0x815d2d4 -thumb_func 0x815d588 -thumb_func 0x815d5d0 -thumb_func 0x815d668 +thumb_func 0x815c33c AnimWeakFrustrationAngerMark +thumb_func 0x815c3b4 AnimTask_RockMonBackAndForth +thumb_func 0x815c484 AnimTask_RockMonBackAndForthStep +thumb_func 0x815c5ec AnimSweetScentPetal +thumb_func 0x815c63c AnimSweetScentPetalStep +thumb_func 0x815c6ac AnimTask_FlailMovement +thumb_func 0x815c700 AnimTask_FlailMovementStep +thumb_func 0x815c898 AnimPainSplitProjectile +thumb_func 0x815c95c AnimTask_PainSplitMovement +thumb_func 0x815cac4 AnimFlatterConfetti +thumb_func 0x815cb70 AnimFlatterConfettiStep +thumb_func 0x815cbd0 AnimFlatterSpotlight +thumb_func 0x815cc48 AnimFlatterSpotlightStep +thumb_func 0x815ccf0 AnimReversalOrb +thumb_func 0x815cd38 AnimReversalOrbStep +thumb_func 0x815ce14 AnimTask_RolePlaySilhouette +thumb_func 0x815d09c AnimTask_RolePlaySilhouetteStep1 +thumb_func 0x815d0f8 AnimTask_RolePlaySilhouetteStep2 +thumb_func 0x815d17c AnimTask_AcidArmor +thumb_func 0x815d2d4 AnimTask_AcidArmorStep +thumb_func 0x815d588 AnimTask_DeepInhale +thumb_func 0x815d5d0 AnimTask_DeepInhaleStep +thumb_func 0x815d668 InitYawnCloudPosition thumb_func 0x815d6d0 UpdateYawnCloudPosition -thumb_func 0x815d6f0 -thumb_func 0x815d740 -thumb_func 0x815d7ac +thumb_func 0x815d6f0 AnimYawnCloud +thumb_func 0x815d740 AnimYawnCloudStep +thumb_func 0x815d7ac AnimSmokeBallEscapeCloud thumb_func 0x815d814 thumb_func 0x815d95c thumb_func 0x815dacc -thumb_func 0x815dbe0 -thumb_func 0x815dc84 -thumb_func 0x815dd1c +thumb_func 0x815dbe0 AnimTask_SquishAndSweatDroplets +thumb_func 0x815dc84 AnimTask_SquishAndSweatDropletsStep +thumb_func 0x815dd1c CreateSweatDroplets thumb_func 0x815ddf8 -thumb_func 0x815de48 -thumb_func 0x815dea0 +thumb_func 0x815de48 AnimTask_FacadeColorBlend +thumb_func 0x815dea0 AnimTask_FacadeColorBlendStep thumb_func 0x815df08 -thumb_func 0x815df54 -thumb_func 0x815e014 -thumb_func 0x815e04c -thumb_func 0x815e144 -thumb_func 0x815e284 -thumb_func 0x815e33c -thumb_func 0x815e37c -thumb_func 0x815e3b4 -thumb_func 0x815e504 -thumb_func 0x815e610 +thumb_func 0x815df54 AnimRoarNoiseLine +thumb_func 0x815e014 AnimRoarNoiseLineStep +thumb_func 0x815e04c AnimTask_GlareEyeDots +thumb_func 0x815e144 AnimTask_GlareEyeDotsStep +thumb_func 0x815e284 GetGlareEyeDotCoords +thumb_func 0x815e33c AnimGlareEyeDot +thumb_func 0x815e37c AnimAssistPawprint +thumb_func 0x815e3b4 AnimTask_BarrageBall +thumb_func 0x815e504 AnimTask_BarrageBallStep +thumb_func 0x815e610 AnimSmellingSaltsHand thumb_func 0x815e6bc -thumb_func 0x815e778 -thumb_func 0x815e7d0 -thumb_func 0x815e88c -thumb_func 0x815e8f4 -thumb_func 0x815e94c -thumb_func 0x815e998 -thumb_func 0x815eb80 -thumb_func 0x815ec1c -thumb_func 0x815edbc -thumb_func 0x815ee40 -thumb_func 0x815f044 -thumb_func 0x815f0c4 -thumb_func 0x815f144 -thumb_func 0x815f268 -thumb_func 0x815f3c4 -thumb_func 0x815f428 -thumb_func 0x815f558 -thumb_func 0x815f6d4 -thumb_func 0x815f6fc -thumb_func 0x815f7d8 -thumb_func 0x815f82c +thumb_func 0x815e778 AnimTask_SmellingSaltsSquish +thumb_func 0x815e7d0 AnimTask_SmellingSaltsSquishStep +thumb_func 0x815e88c AnimSmellingSaltExclamation +thumb_func 0x815e8f4 AnimSmellingSaltExclamationStep +thumb_func 0x815e94c AnimHelpingHandClap +thumb_func 0x815e998 AnimHelpingHandClapStep +thumb_func 0x815eb80 AnimTask_HelpingHandAttackerMovement +thumb_func 0x815ec1c AnimTask_HelpingHandAttackerMovementStep +thumb_func 0x815edbc AnimForesightMagnifyingGlass +thumb_func 0x815ee40 AnimForesightMagnifyingGlassStep +thumb_func 0x815f044 AnimMeteorMashStarStep +thumb_func 0x815f0c4 AnimMeteorMashStar +thumb_func 0x815f144 AnimTask_MonToSubstitute +thumb_func 0x815f268 AnimTask_MonToSubstituteDoll +thumb_func 0x815f3c4 AnimBlockX +thumb_func 0x815f428 AnimBlockXStep +thumb_func 0x815f558 AnimTask_OdorSleuthMovement +thumb_func 0x815f6d4 AnimTask_OdorSleuthMovementWaitFinish +thumb_func 0x815f6fc MoveOdorSleuthClone +thumb_func 0x815f7d8 AnimTask_GetReturnPowerLevel +thumb_func 0x815f82c AnimTask_SnatchOpposingMonMove thumb_func 0x815fdb8 -thumb_func 0x815fefc -thumb_func 0x816009c -thumb_func 0x8160114 -thumb_func 0x8160218 -thumb_func 0x8160270 -thumb_func 0x81602e0 -thumb_func 0x816032c -thumb_func 0x8160428 +thumb_func 0x815fefc AnimTask_SnatchPartnerMove +thumb_func 0x816009c AnimTask_TeeterDanceMovement +thumb_func 0x8160114 AnimTask_TeeterDanceMovementStep +thumb_func 0x8160218 AnimKnockOffStrikeStep +thumb_func 0x8160270 AnimKnockOffStrike +thumb_func 0x81602e0 AnimRecycle +thumb_func 0x816032c AnimRecycleStep +thumb_func 0x8160428 AnimTask_GetWeather thumb_func 0x816047c -thumb_func 0x81604c4 -thumb_func 0x816055c -thumb_func 0x8160570 +thumb_func 0x81604c4 AnimTask_SlackOffSquishStep +thumb_func 0x816055c VBlankCB_MoveRelearner +thumb_func 0x8160570 TeachMoveRelearnerMove thumb_func 0x816059c -thumb_func 0x81605d8 -thumb_func 0x8160678 -thumb_func 0x8160724 +thumb_func 0x81605d8 CB2_InitLearnMove +thumb_func 0x8160678 CB2_InitLearnMoveReturnFromSelectMove +thumb_func 0x8160724 InitMoveRelearnerBackgroundLayers thumb_func 0x8160764 -thumb_func 0x8160784 +thumb_func 0x8160784 FormatAndPrintText thumb_func 0x81607a0 -thumb_func 0x8160dc8 -thumb_func 0x8160e08 +thumb_func 0x8160dc8 FreeMoveRelearnerResources +thumb_func 0x8160e08 HideHeartSpritesAndShowTeachMoveText thumb_func 0x8160e70 thumb_func 0x8160f74 GetCurrentSelectedMove thumb_func 0x8160f94 -thumb_func 0x8160fd0 -thumb_func 0x81610c4 -thumb_func 0x816114c +thumb_func 0x8160fd0 CreateUISprites +thumb_func 0x81610c4 AddScrollArrows +thumb_func 0x816114c RemoveScrollArrows thumb_func 0x8161198 -thumb_func 0x8161280 -thumb_func 0x816140c +thumb_func 0x8161280 MoveRelearnerShowHideHearts +thumb_func 0x816140c SetUpFieldMove_SoftBoiled thumb_func 0x8161464 thumb_func 0x81614ac thumb_func 0x8161570 @@ -11735,66 +11735,66 @@ thumb_func 0x81615c4 thumb_func 0x8161628 thumb_func 0x8161688 thumb_func 0x81616bc -thumb_func 0x81616f8 +thumb_func 0x81616f8 SetDecorationInventoriesPointers thumb_func 0x8161784 ClearDecorationInventory thumb_func 0x81617b8 ClearDecorationInventories -thumb_func 0x81617d4 +thumb_func 0x81617d4 GetFirstEmptyDecorSlot thumb_func 0x816181c thumb_func 0x8161868 thumb_func 0x81618b4 -thumb_func 0x81618ec +thumb_func 0x81618ec DecorationRemove thumb_func 0x816194c CondenseDecorationsInCategory thumb_func 0x81619e4 GetNumOwnedDecorationsInCategory thumb_func 0x8161a24 GetNumOwnedDecorations -thumb_func 0x8161a48 +thumb_func 0x8161a48 ClearRoamerData thumb_func 0x8161a74 ClearRoamerLocationData -thumb_func 0x8161aa8 +thumb_func 0x8161aa8 CreateInitialRoamerMon thumb_func 0x8161bd0 InitRoamer thumb_func 0x8161bec UpdateLocationHistoryForRoamer -thumb_func 0x8161c14 -thumb_func 0x8161c68 -thumb_func 0x8161cfc -thumb_func 0x8161d3c -thumb_func 0x8161df0 -thumb_func 0x8161e2c -thumb_func 0x8161e60 -thumb_func 0x8161e78 +thumb_func 0x8161c14 RoamerMoveToOtherLocationSet +thumb_func 0x8161c68 RoamerMove +thumb_func 0x8161cfc IsRoamerAt +thumb_func 0x8161d3c CreateRoamerMonInstance +thumb_func 0x8161df0 TryStartRoamerEncounter +thumb_func 0x8161e2c UpdateRoamerHPStatus +thumb_func 0x8161e60 SetRoamerInactive +thumb_func 0x8161e78 GetRoamerLocation thumb_func 0x8161e88 thumb_func 0x8161e9c nullsub_941 thumb_func 0x8161ea8 thumb_func 0x8161f68 thumb_func 0x8162008 thumb_func 0x81620d4 -thumb_func 0x8162140 -thumb_func 0x8162304 +thumb_func 0x8162140 ChooseSpecialBattleTowerTrainer +thumb_func 0x8162304 ChooseNextBattleTowerTrainer thumb_func 0x816245c thumb_func 0x81624c8 thumb_func 0x8162528 -thumb_func 0x81626a0 -thumb_func 0x81626b0 -thumb_func 0x81627a4 -thumb_func 0x81629a4 -thumb_func 0x8162adc +thumb_func 0x81626a0 SetEReaderTrainerGfxId +thumb_func 0x81626b0 IsFrontierTrainerFemale +thumb_func 0x81627a4 PutNewBattleTowerRecord +thumb_func 0x81629a4 GetFrontierTrainerFrontSpriteId +thumb_func 0x8162adc GetFrontierOpponentClass thumb_func 0x8162c38 thumb_func 0x8162d24 thumb_func 0x8162e90 -thumb_func 0x8162f68 -thumb_func 0x8162f8c -thumb_func 0x8162fc0 -thumb_func 0x8162fe4 -thumb_func 0x8163364 -thumb_func 0x8163444 -thumb_func 0x81634b0 -thumb_func 0x81634f4 -thumb_func 0x81636bc -thumb_func 0x81637cc +thumb_func 0x8162f68 FillFrontierTrainerParty +thumb_func 0x8162f8c FillFrontierTrainersParties +thumb_func 0x8162fc0 FillTentTrainerParty +thumb_func 0x8162fe4 FillTrainerParty +thumb_func 0x8163364 Unused_CreateApprenticeMons +thumb_func 0x8163444 RandomizeFacilityTrainerMonSet +thumb_func 0x81634b0 FillFactoryTrainerParty +thumb_func 0x81634f4 FillFactoryFrontierTrainerParty +thumb_func 0x81636bc FillFactoryTentTrainerParty +thumb_func 0x81637cc FrontierSpeechToString thumb_func 0x816383c -thumb_func 0x81638d4 -thumb_func 0x81639b4 -thumb_func 0x81639ec -thumb_func 0x8163db8 +thumb_func 0x81638d4 HandleSpecialTrainerBattleEnd +thumb_func 0x81639b4 Task_StartBattleAfterTransition +thumb_func 0x81639ec DoSpecialTrainerBattle +thumb_func 0x8163db8 SaveCurrentWinStreak thumb_func 0x8163e0c -thumb_func 0x8163f68 +thumb_func 0x8163f68 SaveBattleTowerProgress thumb_func 0x8164000 nullsub_95 thumb_func 0x8164004 nullsub_94 thumb_func 0x8164008 @@ -11809,39 +11809,39 @@ thumb_func 0x8164ce4 thumb_func 0x8164da4 ValidateBattleTowerRecordChecksums thumb_func 0x8164e3c CalcEmeraldBattleTowerChecksum thumb_func 0x8164e60 CalcRubyBattleTowerChecksum -thumb_func 0x8164e84 +thumb_func 0x8164e84 ClearBattleTowerRecord thumb_func 0x8164e98 GetCurrentBattleTowerWinStreak thumb_func 0x8164ec8 -thumb_func 0x8164fd8 +thumb_func 0x8164fd8 FillEReaderTrainerWithPlayerData thumb_func 0x81650c0 thumb_func 0x81650e0 thumb_func 0x8165100 GetEreaderTrainerName -thumb_func 0x8165130 +thumb_func 0x8165130 ValidateEReaderTrainer thumb_func 0x81651a4 SetEReaderTrainerChecksum -thumb_func 0x81651c8 -thumb_func 0x81651dc -thumb_func 0x81651f8 +thumb_func 0x81651c8 ClearEReaderTrainer +thumb_func 0x81651dc CopyEReaderTrainerGreeting +thumb_func 0x81651f8 CopyEReaderTrainerFarewellMessage thumb_func 0x8165248 -thumb_func 0x8165280 +thumb_func 0x8165280 FillPartnerParty thumb_func 0x81656c8 thumb_func 0x8165820 thumb_func 0x8165924 CalcApprenticeChecksum -thumb_func 0x8165944 +thumb_func 0x8165944 ClearApprentice thumb_func 0x816595c ValidateApprenticesChecksums -thumb_func 0x81659c4 -thumb_func 0x8165a4c +thumb_func 0x81659c4 GetBattleTowerTrainerLanguage +thumb_func 0x8165a4c SetFacilityPtrsGetLevel thumb_func 0x8165a9c GetFrontierEnemyMonLevel -thumb_func 0x8165ac0 +thumb_func 0x8165ac0 GetHighestLevelInPlayerParty thumb_func 0x8165b14 thumb_func 0x8165b4c -thumb_func 0x8165b84 +thumb_func 0x8165b84 SetTentPtrsGetLevel thumb_func 0x8165c24 -thumb_func 0x8165cb0 -thumb_func 0x8165ec4 -thumb_func 0x8165f30 +thumb_func 0x8165cb0 FillTentTrainerParty_ +thumb_func 0x8165ec4 FacilityClassToGraphicsId +thumb_func 0x8165f30 ValidateBattleTowerRecord thumb_func 0x8165f94 -thumb_func 0x8166010 -thumb_func 0x8166058 +thumb_func 0x8166010 ChooseMonToGivePokeblock +thumb_func 0x8166058 CB2_ReturnAndChooseMonToGivePokeblock thumb_func 0x81660cc thumb_func 0x81660dc thumb_func 0x8166110 @@ -11862,13 +11862,13 @@ thumb_func 0x8166c30 thumb_func 0x8166ce8 thumb_func 0x8166d5c thumb_func 0x8166d98 -thumb_func 0x8166db4 -thumb_func 0x8166dd8 -thumb_func 0x8166e28 +thumb_func 0x8166db4 Pokeblock_MenuWindowTextPrint +thumb_func 0x8166dd8 Pokeblock_BufferEnhancedStatText +thumb_func 0x8166e28 Pokeblock_GetMonContestStats thumb_func 0x8166e58 thumb_func 0x8166f08 thumb_func 0x8166f88 -thumb_func 0x816706c +thumb_func 0x816706c IsSheenMaxed thumb_func 0x81670a8 thumb_func 0x81670e8 thumb_func 0x8167128 @@ -11896,143 +11896,143 @@ thumb_func 0x816817c thumb_func 0x81681bc nullsub_97 thumb_func 0x81681c0 SetControllerToWally thumb_func 0x81681fc -thumb_func 0x816824c +thumb_func 0x816824c WallyHandleActions thumb_func 0x8168374 thumb_func 0x81683ac -thumb_func 0x81683c4 -thumb_func 0x81683dc -thumb_func 0x8168418 +thumb_func 0x81683c4 CompleteOnFinishedAnimation +thumb_func 0x81683dc OpenBagAfterPaletteFade +thumb_func 0x8168418 CompleteOnChosenItem thumb_func 0x8168454 thumb_func 0x8168620 -thumb_func 0x816873c -thumb_func 0x81687ac +thumb_func 0x816873c CompleteOnHealthbarDone +thumb_func 0x81687ac DoHitAnimBlinkSpriteEffect thumb_func 0x8168828 thumb_func 0x8168898 thumb_func 0x81688d0 -thumb_func 0x8168900 +thumb_func 0x8168900 WallyBufferExecCompleted thumb_func 0x8168978 -thumb_func 0x81689a8 -thumb_func 0x8168a1c +thumb_func 0x81689a8 WallyHandleGetMonData +thumb_func 0x8168a1c CopyWallyMonData thumb_func 0x81691c8 -thumb_func 0x81691d4 -thumb_func 0x816922c -thumb_func 0x8169c28 -thumb_func 0x8169c34 -thumb_func 0x8169c40 -thumb_func 0x8169c4c -thumb_func 0x8169cd0 -thumb_func 0x8169d9c -thumb_func 0x8169e68 -thumb_func 0x8169e74 -thumb_func 0x8169e80 -thumb_func 0x8169e8c -thumb_func 0x8169ee0 -thumb_func 0x8169f40 -thumb_func 0x8169f4c -thumb_func 0x816a074 -thumb_func 0x816a1c0 -thumb_func 0x816a214 -thumb_func 0x816a238 -thumb_func 0x816a278 -thumb_func 0x816a2e0 -thumb_func 0x816a2ec -thumb_func 0x816a384 -thumb_func 0x816a3c4 -thumb_func 0x816a3d0 -thumb_func 0x816a3dc -thumb_func 0x816a4dc +thumb_func 0x81691d4 WallyHandleSetMonData +thumb_func 0x816922c SetWallyMonData +thumb_func 0x8169c28 WallyHandleSetRawMonData +thumb_func 0x8169c34 WallyHandleLoadMonSprite +thumb_func 0x8169c40 WallyHandleSwitchInAnim +thumb_func 0x8169c4c WallyHandleReturnMonToBall +thumb_func 0x8169cd0 WallyHandleDrawTrainerPic +thumb_func 0x8169d9c WallyHandleTrainerSlide +thumb_func 0x8169e68 WallyHandleTrainerSlideBack +thumb_func 0x8169e74 WallyHandleFaintAnimation +thumb_func 0x8169e80 WallyHandlePaletteFade +thumb_func 0x8169e8c WallyHandleSuccessBallThrowAnim +thumb_func 0x8169ee0 WallyHandleBallThrowAnim +thumb_func 0x8169f40 WallyHandlePause +thumb_func 0x8169f4c WallyHandleMoveAnimation +thumb_func 0x816a074 WallyDoMoveAnimation +thumb_func 0x816a1c0 WallyHandlePrintString +thumb_func 0x816a214 WallyHandlePrintSelectionString +thumb_func 0x816a238 HandleChooseActionAfterDma3 +thumb_func 0x816a278 WallyHandleChooseAction +thumb_func 0x816a2e0 WallyHandleUnknownYesNoBox +thumb_func 0x816a2ec WallyHandleChooseMove +thumb_func 0x816a384 WallyHandleChooseItem +thumb_func 0x816a3c4 WallyHandleChoosePokemon +thumb_func 0x816a3d0 WallyHandleCmd23 +thumb_func 0x816a3dc WallyHandleHealthBarUpdate +thumb_func 0x816a4dc WallyHandleExpUpdate thumb_func 0x816a4e8 -thumb_func 0x816a4f4 -thumb_func 0x816a500 -thumb_func 0x816a50c -thumb_func 0x816a518 -thumb_func 0x816a524 -thumb_func 0x816a530 +thumb_func 0x816a4f4 WallyHandleStatusAnimation +thumb_func 0x816a500 WallyHandleStatusXor +thumb_func 0x816a50c WallyHandleDataTransfer +thumb_func 0x816a518 WallyHandleDMA3Transfer +thumb_func 0x816a524 WallyHandlePlayBGM +thumb_func 0x816a530 WallyHandleCmd32 thumb_func 0x816a53c thumb_func 0x816a548 thumb_func 0x816a554 thumb_func 0x816a560 -thumb_func 0x816a56c +thumb_func 0x816a56c WallyHandleCmd37 thumb_func 0x816a578 thumb_func 0x816a584 thumb_func 0x816a590 -thumb_func 0x816a59c -thumb_func 0x816a60c -thumb_func 0x816a618 +thumb_func 0x816a59c WallyHandleHitAnimation +thumb_func 0x816a60c WallyHandleCmd42 +thumb_func 0x816a618 WallyHandlePlaySE thumb_func 0x816a648 thumb_func 0x816a6a4 thumb_func 0x816a6e0 -thumb_func 0x816a714 +thumb_func 0x816a714 WallyHandleIntroTrainerBallThrow thumb_func 0x816a888 thumb_func 0x816aa0c -thumb_func 0x816aa80 -thumb_func 0x816ab04 -thumb_func 0x816ab10 -thumb_func 0x816ab1c -thumb_func 0x816ab28 -thumb_func 0x816ab84 -thumb_func 0x816ab90 -thumb_func 0x816ab9c +thumb_func 0x816aa80 WallyHandleDrawPartyStatusSummary +thumb_func 0x816ab04 WallyHandleHidePartyStatusSummary +thumb_func 0x816ab10 WallyHandleEndBounceEffect +thumb_func 0x816ab1c WallyHandleSpriteInvisibility +thumb_func 0x816ab28 WallyHandleBattleAnimation +thumb_func 0x816ab84 WallyHandleLinkStandbyMsg +thumb_func 0x816ab90 WallyHandleResetActionMoveSelection +thumb_func 0x816ab9c WallyHandleCmd55 thumb_func 0x816abf8 nullsub_98 -thumb_func 0x816abfc -thumb_func 0x816ac60 -thumb_func 0x816aca0 +thumb_func 0x816abfc NewGameInitPCItems +thumb_func 0x816ac60 BedroomPC +thumb_func 0x816aca0 PlayerPC thumb_func 0x816ace0 -thumb_func 0x816adb0 -thumb_func 0x816ae78 +thumb_func 0x816adb0 PlayerPCProcessMenuInput +thumb_func 0x816ae78 ReshowPlayerPC thumb_func 0x816ae94 PlayerPC_ItemStorage -thumb_func 0x816aec0 -thumb_func 0x816af50 -thumb_func 0x816af60 +thumb_func 0x816aec0 PlayerPC_Mailbox +thumb_func 0x816af50 PlayerPC_Decoration +thumb_func 0x816af60 PlayerPC_TurnOff thumb_func 0x816afa8 -thumb_func 0x816b040 -thumb_func 0x816b06c -thumb_func 0x816b0ec -thumb_func 0x816b114 +thumb_func 0x816b040 ItemStorageMenuPrint +thumb_func 0x816b06c ItemStorageMenuProcessInput +thumb_func 0x816b0ec ItemStorage_Deposit +thumb_func 0x816b114 Task_ItemStorage_Deposit thumb_func 0x816b140 thumb_func 0x816b160 thumb_func 0x816b18c -thumb_func 0x816b1bc -thumb_func 0x816b208 -thumb_func 0x816b254 -thumb_func 0x816b2c8 -thumb_func 0x816b2e4 +thumb_func 0x816b1bc ItemStorage_Withdraw +thumb_func 0x816b208 ItemStorage_Toss +thumb_func 0x816b254 ItemStorage_WithdrawToss_Helper +thumb_func 0x816b2c8 ItemStorage_Exit +thumb_func 0x816b2e4 ItemStorage_SetItemAndMailCount thumb_func 0x816b300 thumb_func 0x816b334 GetMailboxMailCount thumb_func 0x816b370 Mailbox_UpdateMailList thumb_func 0x816b41c -thumb_func 0x816b488 +thumb_func 0x816b488 Mailbox_ProcessInput thumb_func 0x816b544 -thumb_func 0x816b5a4 +thumb_func 0x816b5a4 Mailbox_ReturnToPlayerPC thumb_func 0x816b5e8 -thumb_func 0x816b66c -thumb_func 0x816b6b8 -thumb_func 0x816b6e4 +thumb_func 0x816b66c Mailbox_MailOptionsProcessInput +thumb_func 0x816b6b8 Mailbox_DoMailRead +thumb_func 0x816b6e4 Mailbox_FadeAndReadMail thumb_func 0x816b740 -thumb_func 0x816b760 +thumb_func 0x816b760 pal_fill_for_maplights_or_black thumb_func 0x816b7a4 thumb_func 0x816b7d4 -thumb_func 0x816b7f0 -thumb_func 0x816b818 -thumb_func 0x816b858 -thumb_func 0x816b8ec -thumb_func 0x816b8fc +thumb_func 0x816b7f0 Mailbox_DrawYesNoBeforeMove +thumb_func 0x816b818 Mailbox_MoveToBagYesNoPrompt +thumb_func 0x816b858 Mailbox_DoMailMoveToBag +thumb_func 0x816b8ec Mailbox_CancelMoveToBag +thumb_func 0x816b8fc Mailbox_Give thumb_func 0x816b938 thumb_func 0x816b968 -thumb_func 0x816b988 +thumb_func 0x816b988 Mailbox_UpdateMailListAfterDeposit thumb_func 0x816b9f8 -thumb_func 0x816ba14 +thumb_func 0x816ba14 Mailbox_Cancel thumb_func 0x816ba54 -thumb_func 0x816ba98 +thumb_func 0x816ba98 AnimTask_LoadPokeblockGfx thumb_func 0x816babc thumb_func 0x816bb04 -thumb_func 0x816bb44 -thumb_func 0x816bc08 -thumb_func 0x816bc1c -thumb_func 0x816bc84 +thumb_func 0x816bb44 ItemStorage_RefreshListMenu +thumb_func 0x816bc08 CopyItemName_PlayerPC +thumb_func 0x816bc1c ItemStorage_MoveCursor +thumb_func 0x816bc84 fish4_goto_x5_or_x6 thumb_func 0x816bd24 -thumb_func 0x816bd94 -thumb_func 0x816bdd0 +thumb_func 0x816bd94 ItemStorage_StartScrollIndicator +thumb_func 0x816bdd0 ItemStorage_RemoveScrollIndicator thumb_func 0x816bdec thumb_func 0x816be14 thumb_func 0x816be94 @@ -12040,77 +12040,77 @@ thumb_func 0x816befc thumb_func 0x816bf44 thumb_func 0x816bf74 thumb_func 0x816bf8c -thumb_func 0x816c070 -thumb_func 0x816c108 -thumb_func 0x816c154 +thumb_func 0x816c070 ItemStorage_GetItemPcResponse +thumb_func 0x816c108 ItemStorage_PrintItemPcResponse +thumb_func 0x816c154 ItemStorage_ProcessInput thumb_func 0x816c1ec -thumb_func 0x816c268 +thumb_func 0x816c268 ItemStorage_ItemSwapChoosePrompt thumb_func 0x816c314 -thumb_func 0x816c3b8 +thumb_func 0x816c3b8 ItemStorage_DoItemSwap thumb_func 0x816c4a8 thumb_func 0x816c4d4 -thumb_func 0x816c534 +thumb_func 0x816c534 ItemStorage_DoItemAction thumb_func 0x816c630 -thumb_func 0x816c70c -thumb_func 0x816c7c8 -thumb_func 0x816c8a4 -thumb_func 0x816c8d8 -thumb_func 0x816c914 -thumb_func 0x816c984 +thumb_func 0x816c70c ItemStorage_DoItemWithdraw +thumb_func 0x816c7c8 ItemStorage_DoItemToss +thumb_func 0x816c8a4 ItemStorage_ResumeInputFromYesToss +thumb_func 0x816c8d8 ItemStorage_ResumeInputFromNoToss +thumb_func 0x816c914 ItemStorage_HandleRemoveItem +thumb_func 0x816c984 ItemStorage_WaitPressHandleResumeProcessInput thumb_func 0x816c9d0 -thumb_func 0x816c9f8 -thumb_func 0x816ca10 -thumb_func 0x816ca64 -thumb_func 0x816ca80 +thumb_func 0x816c9f8 VBlankCB_Intro +thumb_func 0x816ca10 MainCB2_Intro +thumb_func 0x816ca64 MainCB2_EndIntro +thumb_func 0x816ca80 LoadCopyrightGraphics thumb_func 0x816cac8 -thumb_func 0x816cad8 -thumb_func 0x816cc90 +thumb_func 0x816cad8 task00_08081A90 +thumb_func 0x816cc90 CB2_InitCopyrightScreenAfterBootup thumb_func 0x816ccf0 -thumb_func 0x816ccfc -thumb_func 0x816cf10 -thumb_func 0x816cf74 -thumb_func 0x816d084 +thumb_func 0x816ccfc Task_IntroLoadPart1Graphics +thumb_func 0x816cf10 Task_IntroFadeIn +thumb_func 0x816cf74 Task_IntroWaterDrops +thumb_func 0x816d084 Task_IntroWaterDrops_3 thumb_func 0x816d11c -thumb_func 0x816d138 +thumb_func 0x816d138 Task_IntroScrollDownAndShowFlygon thumb_func 0x816d23c -thumb_func 0x816d270 -thumb_func 0x816d2c8 -thumb_func 0x816d434 +thumb_func 0x816d270 Task_IntroLoadPart2Graphics +thumb_func 0x816d2c8 Task_IntroStartBikeRide +thumb_func 0x816d434 Task_IntroHandleBikeAndFlygonMovement thumb_func 0x816d5cc thumb_func 0x816d600 thumb_func 0x816d7a4 thumb_func 0x816d8cc -thumb_func 0x816d990 -thumb_func 0x816da48 +thumb_func 0x816d990 Task_IntroLoadPart3Graphics +thumb_func 0x816da48 Task_IntroSpinAndZoomPokeball thumb_func 0x816dae0 Task_IntroWaitToSetupPart3LegendsFight -thumb_func 0x816db0c -thumb_func 0x816dbbc -thumb_func 0x816dc60 +thumb_func 0x816db0c Task_IntroLoadGroudonScene +thumb_func 0x816dbbc Task_IntroLoadPart3Graphics1 +thumb_func 0x816dc60 Task_IntroLoadPart3Graphics2 thumb_func 0x816dcb4 -thumb_func 0x816dcd0 -thumb_func 0x816dd10 -thumb_func 0x816df74 -thumb_func 0x816dfdc -thumb_func 0x816e084 -thumb_func 0x816e13c -thumb_func 0x816e4b8 -thumb_func 0x816e530 -thumb_func 0x816e598 -thumb_func 0x816e66c -thumb_func 0x816e738 -thumb_func 0x816e77c -thumb_func 0x816e7c0 -thumb_func 0x816e89c -thumb_func 0x816e928 -thumb_func 0x816ea50 -thumb_func 0x816eb04 -thumb_func 0x816eb98 -thumb_func 0x816ec74 -thumb_func 0x816ec8c -thumb_func 0x816eea4 -thumb_func 0x816ef0c +thumb_func 0x816dcd0 Task_IntroLoadPart3Graphics4 +thumb_func 0x816dd10 Task_IntroGroudonScene +thumb_func 0x816df74 CreateGroudonRockSprites +thumb_func 0x816dfdc SpriteCB_IntroGroudonRocks +thumb_func 0x816e084 Task_IntroLoadKyogreScene +thumb_func 0x816e13c Task_IntroKyogreScene +thumb_func 0x816e4b8 CreateKyogreBubbleSprites_0 +thumb_func 0x816e530 CreateKyogreBubbleSprites_1 +thumb_func 0x816e598 SpriteCB_IntroKyogreBubbles +thumb_func 0x816e66c Task_IntroLoadClouds1 +thumb_func 0x816e738 Task_IntroLoadClouds2 +thumb_func 0x816e77c Task_IntroLoadClouds3 +thumb_func 0x816e7c0 Task_IntroCloudScene +thumb_func 0x816e89c Task_IntroLoadRayquazaLightningScene +thumb_func 0x816e928 Task_IntroRayquazaLightningScene +thumb_func 0x816ea50 SpriteCB_IntroRayquazaLightning +thumb_func 0x816eb04 Task_IntroLoadRayquazaGlowScene +thumb_func 0x816eb98 Task_IntroRayquazaGlowScene_0 +thumb_func 0x816ec74 Task_EndIntroMovie +thumb_func 0x816ec8c Task_IntroRayquazaGlowScene_1 +thumb_func 0x816eea4 intro_reset_and_hide_bgs +thumb_func 0x816ef0c Task_IntroWaterDrops_1 thumb_func 0x816efc4 -thumb_func 0x816f08c +thumb_func 0x816f08c PanFadeAndZoomScreen thumb_func 0x816f0fc thumb_func 0x816f188 thumb_func 0x816f238 @@ -12119,22 +12119,22 @@ thumb_func 0x816f398 thumb_func 0x816f444 thumb_func 0x816f4b4 thumb_func 0x816f534 -thumb_func 0x816f5b4 -thumb_func 0x816f7b8 -thumb_func 0x816f894 +thumb_func 0x816f5b4 CreateWaterDrop +thumb_func 0x816f7b8 SpriteCB_IntroGraphicsBicycle +thumb_func 0x816f894 SpriteCB_IntroGraphicsFlygon thumb_func 0x816f91c thumb_func 0x816fb3c -thumb_func 0x816fbb0 +thumb_func 0x816fbb0 CreatePart1Animations thumb_func 0x816fcd4 -thumb_func 0x816fe38 +thumb_func 0x816fe38 SpriteCB_IntroRayquazaHyperbeam thumb_func 0x816fef0 -thumb_func 0x816ff84 -thumb_func 0x816ffbc -thumb_func 0x8170058 -thumb_func 0x817006c +thumb_func 0x816ff84 FieldInitRegionMap +thumb_func 0x816ffbc MCB2_InitRegionMapRegisters +thumb_func 0x8170058 VBCB_FieldUpdateRegionMap +thumb_func 0x817006c MCB2_FieldUpdateRegionMap thumb_func 0x8170088 -thumb_func 0x8170214 -thumb_func 0x817025c +thumb_func 0x8170214 StartMirageTowerShake +thumb_func 0x817025c unref_sub_8170478 thumb_func 0x8170444 thumb_func 0x8170618 thumb_func 0x8170704 @@ -12146,8 +12146,8 @@ thumb_func 0x81708e8 thumb_func 0x8170994 thumb_func 0x8170ae0 thumb_func 0x8170b08 -thumb_func 0x8170b30 -thumb_func 0x8170b68 +thumb_func 0x8170b30 AnimTask_IsBallBlockedByTrainer +thumb_func 0x8170b68 ItemIdToBallId thumb_func 0x8170be8 thumb_func 0x8170cd4 thumb_func 0x8170d10 @@ -12173,88 +12173,88 @@ thumb_func 0x8171990 thumb_func 0x8171a90 thumb_func 0x8171acc thumb_func 0x8171b44 -thumb_func 0x8171b7c +thumb_func 0x8171b7c AnimateBallOpenParticles thumb_func 0x8171c04 -thumb_func 0x8171c34 -thumb_func 0x8171d4c -thumb_func 0x8171d6c +thumb_func 0x8171c34 PokeBallOpenParticleAnimation +thumb_func 0x8171d4c PokeBallOpenParticleAnimation_Step1 +thumb_func 0x8171d6c PokeBallOpenParticleAnimation_Step2 thumb_func 0x8171da8 -thumb_func 0x8171eac -thumb_func 0x8171fb0 -thumb_func 0x81720b0 -thumb_func 0x81721b8 -thumb_func 0x81722ec -thumb_func 0x8172344 -thumb_func 0x8172440 -thumb_func 0x81724a0 -thumb_func 0x81725cc -thumb_func 0x81726c4 -thumb_func 0x8172728 -thumb_func 0x81727cc +thumb_func 0x8171eac DiveBallOpenParticleAnimation +thumb_func 0x8171fb0 SafariBallOpenParticleAnimation +thumb_func 0x81720b0 UltraBallOpenParticleAnimation +thumb_func 0x81721b8 GreatBallOpenParticleAnimation +thumb_func 0x81722ec FanOutBallOpenParticles_Step1 +thumb_func 0x8172344 RepeatBallOpenParticleAnimation +thumb_func 0x8172440 RepeatBallOpenParticleAnimation_Step1 +thumb_func 0x81724a0 MasterBallOpenParticleAnimation +thumb_func 0x81725cc PremierBallOpenParticleAnimation +thumb_func 0x81726c4 PremierBallOpenParticleAnimation_Step1 +thumb_func 0x8172728 DestroyBallOpenAnimationParticle +thumb_func 0x81727cc LaunchBallFadeMonTask thumb_func 0x8172894 thumb_func 0x8172924 thumb_func 0x8172974 thumb_func 0x81729d4 thumb_func 0x8172b7c -thumb_func 0x8172c80 -thumb_func 0x8172cb4 +thumb_func 0x8172c80 AnimTask_IsAttackerBehindSubstitute +thumb_func 0x8172cb4 AnimTask_TargetToEffectBattler thumb_func 0x8172cd4 thumb_func 0x8172dd0 thumb_func 0x8172f94 thumb_func 0x8172fe0 thumb_func 0x8173034 thumb_func 0x8173094 -thumb_func 0x81730c8 +thumb_func 0x81730c8 AnimTask_FreePokeblockGfx thumb_func 0x81730f0 thumb_func 0x8173180 thumb_func 0x81731b8 thumb_func 0x81731e4 thumb_func 0x8173240 -thumb_func 0x8173298 -thumb_func 0x8173300 -thumb_func 0x8173330 -thumb_func 0x8173344 -thumb_func 0x8173360 -thumb_func 0x8173478 -thumb_func 0x81734bc -thumb_func 0x8173500 -thumb_func 0x81736a0 -thumb_func 0x81737a8 -thumb_func 0x8173840 +thumb_func 0x8173298 AnimTask_GetTrappedMoveAnimId +thumb_func 0x8173300 AnimTask_GetBattlersFromArg +thumb_func 0x8173330 VBlankCB_HallOfFame +thumb_func 0x8173344 CB2_HallOfFame +thumb_func 0x8173360 InitHallOfFameScreen +thumb_func 0x8173478 CB2_DoHallOfFameScreen +thumb_func 0x81734bc CB2_DoHallOfFameScreenDontSaveData +thumb_func 0x8173500 Task_Hof_InitMonData +thumb_func 0x81736a0 Task_Hof_InitTeamSaveData +thumb_func 0x81737a8 Task_Hof_TrySaveData +thumb_func 0x8173840 Task_Hof_WaitForFrames thumb_func 0x8173870 -thumb_func 0x817388c -thumb_func 0x81739a4 -thumb_func 0x8173a18 -thumb_func 0x8173b08 +thumb_func 0x817388c Task_Hof_DisplayMon +thumb_func 0x81739a4 Task_Hof_PrintMonInfoAfterAnimating +thumb_func 0x8173a18 Task_Hof_TryDisplayAnotherMon +thumb_func 0x8173b08 Task_Hof_PaletteFadeAndPrintWelcomeText thumb_func 0x8173ba4 thumb_func 0x8173c88 thumb_func 0x8173cc8 -thumb_func 0x8173d68 -thumb_func 0x8173e0c -thumb_func 0x8173e44 -thumb_func 0x8173e94 -thumb_func 0x8173f68 -thumb_func 0x8173f78 -thumb_func 0x8174108 -thumb_func 0x81741d0 -thumb_func 0x81743e0 -thumb_func 0x817450c -thumb_func 0x817467c -thumb_func 0x81746d4 -thumb_func 0x8174784 +thumb_func 0x8173d68 Task_Hof_WaitAndPrintPlayerInfo +thumb_func 0x8173e0c Task_Hof_ExitOnKeyPressed +thumb_func 0x8173e44 Task_Hof_HandlePaletteOnExit +thumb_func 0x8173e94 Task_Hof_HandleExit +thumb_func 0x8173f68 SetCallback2AfterHallOfFameDisplay +thumb_func 0x8173f78 CB2_DoHallOfFamePC +thumb_func 0x8174108 Task_HofPC_CopySaveData +thumb_func 0x81741d0 Task_HofPC_DrawSpritesPrintText +thumb_func 0x81743e0 Task_HofPC_PrintMonInfo +thumb_func 0x817450c Task_HofPC_HandleInput +thumb_func 0x817467c Task_HofPC_HandlePaletteOnExit +thumb_func 0x81746d4 Task_HofPC_HandleExit +thumb_func 0x8174784 Task_HofPC_PrintDataIsCorrupted thumb_func 0x81747ec Task_HofPC_ExitOnButtonPress thumb_func 0x817481c thumb_func 0x817487c -thumb_func 0x8174b74 -thumb_func 0x8174dc8 +thumb_func 0x8174b74 NewGameBirchSpeech_CreateDialogueWindowBorder +thumb_func 0x8174dc8 ClearVramOamPltt_LoadHofPal thumb_func 0x8174e74 thumb_func 0x8174eb0 thumb_func 0x8174f28 -thumb_func 0x8175024 +thumb_func 0x8175024 SpriteCB_GetOnScreenAndAnimate thumb_func 0x81750a8 thumb_func 0x8175100 thumb_func 0x8175184 -thumb_func 0x81751c4 +thumb_func 0x81751c4 Task_RayDescendsEnd thumb_func 0x81751f8 thumb_func 0x8175268 thumb_func 0x81753cc @@ -12266,7 +12266,7 @@ thumb_func 0x817553c thumb_func 0x817564c thumb_func 0x817567c thumb_func 0x8175710 -thumb_func 0x8175750 +thumb_func 0x8175750 c2_080C9BFC thumb_func 0x81757ac thumb_func 0x81757ec thumb_func 0x81759a4 @@ -12277,7 +12277,7 @@ thumb_func 0x8175ae4 thumb_func 0x8175b40 thumb_func 0x8175bd4 thumb_func 0x8175bf0 -thumb_func 0x8175cac +thumb_func 0x8175cac EvolutionRenameMon thumb_func 0x8175f1c thumb_func 0x8176024 thumb_func 0x817615c @@ -12295,126 +12295,126 @@ thumb_func 0x8176edc thumb_func 0x81770b0 thumb_func 0x8177144 thumb_func 0x8177214 -thumb_func 0x81773e4 -thumb_func 0x8177410 -thumb_func 0x8177458 -thumb_func 0x817746c -thumb_func 0x8177618 -thumb_func 0x81776a0 -thumb_func 0x81776c8 -thumb_func 0x81776f0 -thumb_func 0x8177700 -thumb_func 0x8177714 -thumb_func 0x8177894 +thumb_func 0x81773e4 ResetLotteryCorner +thumb_func 0x8177410 SetRandomLotteryNumber +thumb_func 0x8177458 RetrieveLotteryNumber +thumb_func 0x817746c PickLotteryCornerTicket +thumb_func 0x8177618 GetMatchingDigits +thumb_func 0x81776a0 SetLotteryNumber +thumb_func 0x81776c8 GetLotteryNumber +thumb_func 0x81776f0 SetLotteryNumber16_Unused +thumb_func 0x8177700 VblankCB +thumb_func 0x8177714 CB2_ShowDiploma +thumb_func 0x8177894 LinkPartnerHandleUnknownYesNoBox thumb_func 0x81778ac -thumb_func 0x81778dc -thumb_func 0x8177924 +thumb_func 0x81778dc Task_DiplomaWaitForKeyPress +thumb_func 0x8177924 Task_DiplomaFadeOut thumb_func 0x8177960 -thumb_func 0x8177a2c -thumb_func 0x8177a84 -thumb_func 0x8177ab4 -thumb_func 0x8177afc +thumb_func 0x8177a2c InitDiplomaBg +thumb_func 0x8177a84 InitDiplomaWindow +thumb_func 0x8177ab4 PrintDiplomaText +thumb_func 0x8177afc DoBerryTagScreen thumb_func 0x8177b3c thumb_func 0x8177b58 -thumb_func 0x8177b6c -thumb_func 0x8177b98 +thumb_func 0x8177b6c CB2_InitBerryTagScreen +thumb_func 0x8177b98 InitBerryTagScreen thumb_func 0x8177cfc -thumb_func 0x8177d70 +thumb_func 0x8177d70 LoadBerryTagGfx thumb_func 0x8177ef0 -thumb_func 0x8177f34 +thumb_func 0x8177f34 PrintTextInBerryTagScreen thumb_func 0x8177f78 -thumb_func 0x8177fcc -thumb_func 0x8177fe8 +thumb_func 0x8177fcc PrintAllBerryData +thumb_func 0x8177fe8 PrintBerryNumberAndName thumb_func 0x817804c -thumb_func 0x8178108 -thumb_func 0x8178188 -thumb_func 0x81781bc -thumb_func 0x81781f0 -thumb_func 0x8178224 -thumb_func 0x8178254 -thumb_func 0x81782bc -thumb_func 0x817844c -thumb_func 0x8178488 -thumb_func 0x81784c8 -thumb_func 0x817850c -thumb_func 0x8178564 -thumb_func 0x81785e0 -thumb_func 0x8178664 +thumb_func 0x8178108 PrintBerryFirmness +thumb_func 0x8178188 PrintBerryDescription1 +thumb_func 0x81781bc PrintBerryDescription2 +thumb_func 0x81781f0 CreateBerrySprite +thumb_func 0x8178224 DestroyBerrySprite +thumb_func 0x8178254 CreateFlavorCircleSprites +thumb_func 0x81782bc SetFlavorCirclesVisiblity +thumb_func 0x817844c DestroyFlavorCircleSprites +thumb_func 0x8178488 PrepareToCloseBerryTagScreen +thumb_func 0x81784c8 Task_CloseBerryTagScreen +thumb_func 0x817850c Task_HandleInput +thumb_func 0x8178564 TryChangeDisplayedBerry +thumb_func 0x81785e0 HandleBagCursorPositionChange +thumb_func 0x8178664 Task_DisplayAnotherBerry thumb_func 0x81787fc thumb_func 0x8178810 CheckLanguageMatch -thumb_func 0x817882c -thumb_func 0x81788f8 -thumb_func 0x8178930 -thumb_func 0x8178d7c -thumb_func 0x8178dfc -thumb_func 0x8178e48 +thumb_func 0x817882c CB2_InitMysteryEventMenu +thumb_func 0x81788f8 GetEventLoadMessage +thumb_func 0x8178930 CB2_MysteryEventMenu +thumb_func 0x8178d7c PrintMysteryMenuText +thumb_func 0x8178dfc SaveFailedScreenTextPrint +thumb_func 0x8178e48 DoSaveFailedScreen thumb_func 0x8178e80 -thumb_func 0x8178e94 -thumb_func 0x8179140 -thumb_func 0x8179248 -thumb_func 0x8179298 -thumb_func 0x81792e0 -thumb_func 0x817930c -thumb_func 0x81793cc -thumb_func 0x817940c +thumb_func 0x8178e94 CB2_SaveFailedScreen +thumb_func 0x8179140 CB2_WipeSave +thumb_func 0x8179248 CB2_GameplayCannotBeContinued +thumb_func 0x8179298 CB2_FadeAndReturnToTitleScreen +thumb_func 0x81792e0 CB2_ReturnToTitleScreen +thumb_func 0x817930c VBlankCB_UpdateClockGraphics +thumb_func 0x81793cc VerifySectorWipe +thumb_func 0x817940c WipeSector thumb_func 0x8179464 WipeSectors -thumb_func 0x81794a0 -thumb_func 0x81794f4 -thumb_func 0x8179564 +thumb_func 0x81794a0 ShouldDoBrailleDigEffect +thumb_func 0x81794f4 DoBrailleDigEffect +thumb_func 0x8179564 CheckRelicanthWailord thumb_func 0x81795b4 nullsub_17 -thumb_func 0x81795b8 -thumb_func 0x81795f4 -thumb_func 0x8179630 -thumb_func 0x8179694 +thumb_func 0x81795b8 DoSealedChamberShakingEffect1 +thumb_func 0x81795f4 DoSealedChamberShakingEffect2 +thumb_func 0x8179630 SealedChamberShakingEffect +thumb_func 0x8179694 ShouldDoBrailleRegirockEffect thumb_func 0x81796ec thumb_func 0x8179708 -thumb_func 0x8179718 -thumb_func 0x8179788 +thumb_func 0x8179718 DoBrailleRegirockEffect +thumb_func 0x8179788 ShouldDoBrailleRegisteelEffect thumb_func 0x81797d0 thumb_func 0x81797ec -thumb_func 0x81797fc +thumb_func 0x81797fc DoBrailleRegisteelEffect thumb_func 0x817986c nullsub_99 -thumb_func 0x8179870 -thumb_func 0x81798bc -thumb_func 0x8179a20 -thumb_func 0x8179a3c -thumb_func 0x8179a50 -thumb_func 0x8179c28 -thumb_func 0x8179c54 -thumb_func 0x8179cac -thumb_func 0x8179e64 -thumb_func 0x8179ea4 -thumb_func 0x8179ee8 -thumb_func 0x817a020 -thumb_func 0x817a04c -thumb_func 0x817a07c -thumb_func 0x817a178 -thumb_func 0x817a1d8 -thumb_func 0x817a210 +thumb_func 0x8179870 FldEff_UsePuzzleEffect +thumb_func 0x81798bc ShouldDoBrailleRegicePuzzle +thumb_func 0x8179a20 CB2_PokeblockFeed +thumb_func 0x8179a3c VBlankCB_PokeblockFeed +thumb_func 0x8179a50 TransitionToPokeblockFeedScene +thumb_func 0x8179c28 CB2_PreparePokeblockFeedScene +thumb_func 0x8179c54 HandleInitBackgrounds +thumb_func 0x8179cac LoadMonAndSceneGfx +thumb_func 0x8179e64 HandleInitWindows +thumb_func 0x8179ea4 SetPokeblockSpritePal +thumb_func 0x8179ee8 Task_HandlePokeblockFeed +thumb_func 0x817a020 LaunchPokeblockFeedTask +thumb_func 0x817a04c Task_WaitForAtePokeblockText +thumb_func 0x817a07c Task_HandleMonAtePokeblock +thumb_func 0x817a178 Task_ReturnAfterPaletteFade +thumb_func 0x817a1d8 Task_PaletteFadeToReturn +thumb_func 0x817a210 CreateMonSprite thumb_func 0x817a2ec PrepareMonToMoveToPokeblock thumb_func 0x817a320 -thumb_func 0x817a35c -thumb_func 0x817a3b0 -thumb_func 0x817a424 -thumb_func 0x817a458 +thumb_func 0x817a35c CreatePokeblockCaseSpriteForFeeding +thumb_func 0x817a3b0 DoPokeblockCaseThrowEffect +thumb_func 0x817a424 CreatePokeblockSprite +thumb_func 0x817a458 SpriteCB_ThrownPokeblock thumb_func 0x817a484 thumb_func 0x817a4ec thumb_func 0x817a7d4 thumb_func 0x817a89c -thumb_func 0x817a8f4 +thumb_func 0x817a8f4 FreeMonSpriteOamMatrix thumb_func 0x817a90c thumb_func 0x817aa20 -thumb_func 0x817ab80 +thumb_func 0x817ab80 CB2_InitClearSaveDataScreen thumb_func 0x817ab9c -thumb_func 0x817ac00 -thumb_func 0x817ac80 +thumb_func 0x817ac00 Task_ClearSaveDataScreenYesNoChoice +thumb_func 0x817ac80 Task_ClearSaveData thumb_func 0x817aca4 -thumb_func 0x817acb4 -thumb_func 0x817acc0 -thumb_func 0x817ae94 -thumb_func 0x817aeec -thumb_func 0x817af24 -thumb_func 0x817b010 +thumb_func 0x817acb4 VBlankCB +thumb_func 0x817acc0 SetupClearSaveDataScreen +thumb_func 0x817ae94 CB2_FadeAndDoReset +thumb_func 0x817aeec InitClearSaveDataScreenWindows +thumb_func 0x817af24 load_intro_part2_graphics +thumb_func 0x817b010 LinkPartnerHandleChooseMove thumb_func 0x817b088 thumb_func 0x817b268 thumb_func 0x817b29c @@ -12434,77 +12434,77 @@ thumb_func 0x817b7a8 thumb_func 0x817b808 thumb_func 0x817b884 thumb_func 0x817b900 nullsub_100 -thumb_func 0x817b904 -thumb_func 0x817b93c -thumb_func 0x817b9f8 -thumb_func 0x817ba54 -thumb_func 0x817bac8 -thumb_func 0x817bb30 -thumb_func 0x817bb78 -thumb_func 0x817bbe0 -thumb_func 0x817bcb0 -thumb_func 0x817bd38 -thumb_func 0x817bd54 -thumb_func 0x817bd84 -thumb_func 0x817bdd4 -thumb_func 0x817be44 +thumb_func 0x817b904 SetEvoSparklesMatrices +thumb_func 0x817b93c SpriteCB_PreEvoSparkleSet1 +thumb_func 0x817b9f8 CreatePreEvoSparkleSet1 +thumb_func 0x817ba54 SpriteCB_PreEvoSparkleSet2 +thumb_func 0x817bac8 CreatePreEvoSparkleSet2 +thumb_func 0x817bb30 SpriteCB_PostEvoSparkleSet1 +thumb_func 0x817bb78 CreatePostEvoSparkleSet1 +thumb_func 0x817bbe0 SpriteCB_PostEvoSparkleSet2 +thumb_func 0x817bcb0 CreatePostEvoSparkleSet2 +thumb_func 0x817bd38 LoadEvoSparkleSpriteAndPal +thumb_func 0x817bd54 LaunchTask_PreEvoSparklesSet1 +thumb_func 0x817bd84 EvoTask_BeginPreSet1_FadeAndPlaySE +thumb_func 0x817bdd4 EvoTask_CreatePreEvoSparkleSet1 +thumb_func 0x817be44 EvoTask_WaitForPre1SparklesToGoUp thumb_func 0x817be74 -thumb_func 0x817be8c -thumb_func 0x817bec0 +thumb_func 0x817be8c EvoTask_BeginPreSparklesSet2 +thumb_func 0x817bec0 EvoTask_CreatePreEvoSparklesSet2 thumb_func 0x817bf18 thumb_func 0x817bf28 -thumb_func 0x817bf40 -thumb_func 0x817bf74 -thumb_func 0x817bff4 +thumb_func 0x817bf40 EvoTask_BeginPostSparklesSet1 +thumb_func 0x817bf74 EvoTask_CreatePostEvoSparklesSet1 +thumb_func 0x817bff4 EvoTask_DestroyPostSet1Task thumb_func 0x817c004 -thumb_func 0x817c034 -thumb_func 0x817c094 -thumb_func 0x817c120 +thumb_func 0x817c034 EvoTask_BeginPostSparklesSet2_AndFlash +thumb_func 0x817c094 EvoTask_CreatePostEvoSparklesSet2_AndFlash +thumb_func 0x817c120 EvoTask_DestroyPostSet2AndFlashTask thumb_func 0x817c140 -thumb_func 0x817c170 -thumb_func 0x817c1d0 +thumb_func 0x817c170 EvoTask_BeginPostSparklesSet2_AndFlash_Trade +thumb_func 0x817c1d0 EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade thumb_func 0x817c25c nullsub_103 thumb_func 0x817c260 thumb_func 0x817c3ac thumb_func 0x817c3d0 thumb_func 0x817c420 -thumb_func 0x817c53c -thumb_func 0x817c5ec +thumb_func 0x817c53c PreEvoInvisible_PostEvoVisible_KillTask +thumb_func 0x817c5ec PreEvoVisible_PostEvoInvisible_KillTask thumb_func 0x817c69c thumb_func 0x817c6b0 thumb_func 0x817c704 -thumb_func 0x817c768 -thumb_func 0x817c7a8 -thumb_func 0x817c7c8 -thumb_func 0x817c7f8 -thumb_func 0x817c808 +thumb_func 0x817c768 SetUpFieldMove_Teleport +thumb_func 0x817c7a8 FieldCallback_Teleport +thumb_func 0x817c7c8 FldEff_UseTeleport +thumb_func 0x817c7f8 StartTeleportFieldEffect +thumb_func 0x817c808 BattleTv_SetDataBasedOnString thumb_func 0x817df64 -thumb_func 0x817dfa8 -thumb_func 0x817e1d8 -thumb_func 0x817e2a0 +thumb_func 0x817dfa8 BattleTv_SetDataBasedOnMove +thumb_func 0x817e1d8 BattleTv_SetDataBasedOnAnimation +thumb_func 0x817e2a0 TryPutLinkBattleTvShowOnAir thumb_func 0x817e530 AddMovePoints thumb_func 0x817e92c AddPointsOnFainting -thumb_func 0x817ed78 -thumb_func 0x817f0c8 +thumb_func 0x817ed78 TrySetBattleSeminarShow +thumb_func 0x817f0c8 ShouldCalculateDamage thumb_func 0x817f154 BattleTv_ClearExplosionFaintCause -thumb_func 0x817f1e8 +thumb_func 0x817f1e8 GetBattlerMoveSlotId thumb_func 0x817f240 AddPointsBasedOnWeather thumb_func 0x817f298 nullsub_27 thumb_func 0x817f29c -thumb_func 0x817f320 -thumb_func 0x817f344 -thumb_func 0x817f3f0 +thumb_func 0x817f320 GetSpeciesBackAnimSet +thumb_func 0x817f344 Task_HandleMonAnimation +thumb_func 0x817f3f0 LaunchAnimationTaskForFrontSprite thumb_func 0x817f424 StartMonSummaryAnimation -thumb_func 0x817f440 +thumb_func 0x817f440 LaunchAnimationTaskForBackSprite thumb_func 0x817f4b8 -thumb_func 0x817f4c4 -thumb_func 0x817f51c +thumb_func 0x817f4c4 SetAffineData +thumb_func 0x817f51c HandleStartAffineAnim thumb_func 0x817f580 HandleSetAffineData thumb_func 0x817f5b8 thumb_func 0x817f5d0 thumb_func 0x817f604 thumb_func 0x817f628 -thumb_func 0x817f6b4 +thumb_func 0x817f6b4 pokemonanimfunc_01 thumb_func 0x817f744 thumb_func 0x817f7a8 thumb_func 0x817f808 @@ -12512,33 +12512,33 @@ thumb_func 0x817f824 thumb_func 0x817f884 thumb_func 0x817f8a0 thumb_func 0x817f918 pokemonanimfunc_1E -thumb_func 0x817f934 -thumb_func 0x817fa10 +thumb_func 0x817f934 pokemonanimfunc_06 +thumb_func 0x817fa10 pokemonanimfunc_09 thumb_func 0x817facc -thumb_func 0x817fb70 +thumb_func 0x817fb70 pokemonanimfunc_0A thumb_func 0x817fb88 thumb_func 0x817fbd0 pokemonanimfunc_0F thumb_func 0x817fbf0 thumb_func 0x817fc34 pokemonanimfunc_10 -thumb_func 0x817fc50 +thumb_func 0x817fc50 pokemonanimfunc_11 thumb_func 0x817fcdc thumb_func 0x817fdac pokemonanimfunc_12 thumb_func 0x817fde8 thumb_func 0x817fe64 pokemonanimfunc_1F thumb_func 0x817fe9c thumb_func 0x817ff3c pokemonanimfunc_14 -thumb_func 0x817ff7c -thumb_func 0x817ffe0 -thumb_func 0x81800bc +thumb_func 0x817ff7c pokemonanimfunc_15 +thumb_func 0x817ffe0 pokemonanimfunc_16 +thumb_func 0x81800bc pokemonanimfunc_17 thumb_func 0x81801c8 thumb_func 0x818024c pokemonanimfunc_19 -thumb_func 0x8180268 -thumb_func 0x8180320 +thumb_func 0x8180268 pokemonanimfunc_1A +thumb_func 0x8180320 pokemonanimfunc_1B thumb_func 0x81803a4 thumb_func 0x8180440 pokemonanimfunc_1C thumb_func 0x818045c thumb_func 0x8180500 pokemonanimfunc_18 -thumb_func 0x818051c +thumb_func 0x818051c pokemonanimfunc_1D thumb_func 0x81805c0 thumb_func 0x81806b8 pokemonanimfunc_00 thumb_func 0x81806d4 @@ -12546,11 +12546,11 @@ thumb_func 0x8180784 pokemonanimfunc_13 thumb_func 0x81807ac thumb_func 0x81808fc pokemonanimfunc_05 thumb_func 0x8180938 -thumb_func 0x81809a4 -thumb_func 0x8180a08 +thumb_func 0x81809a4 pokemonanimfunc_21 +thumb_func 0x8180a08 pokemonanimfunc_22 thumb_func 0x8180a70 -thumb_func 0x8180adc -thumb_func 0x8180b48 +thumb_func 0x8180adc pokemonanimfunc_24 +thumb_func 0x8180b48 pokemonanimfunc_25 thumb_func 0x8180b60 thumb_func 0x8180b94 thumb_func 0x8180bf0 @@ -12561,11 +12561,11 @@ thumb_func 0x8180d24 thumb_func 0x8180d7c thumb_func 0x8180dd8 thumb_func 0x8180e54 pokemonanimfunc_27 -thumb_func 0x8180eb8 +thumb_func 0x8180eb8 pokemonanimfunc_28 thumb_func 0x8180ed0 thumb_func 0x8180f14 thumb_func 0x8180f70 -thumb_func 0x8180fa4 +thumb_func 0x8180fa4 pokemonanimfunc_29 thumb_func 0x8180fbc thumb_func 0x8180ff0 thumb_func 0x8181050 @@ -12573,40 +12573,40 @@ thumb_func 0x818108c pokemonanimfunc_2A thumb_func 0x81810c0 thumb_func 0x8181200 pokemonanimfunc_2B thumb_func 0x818121c -thumb_func 0x81812c4 +thumb_func 0x81812c4 pokemonanimfunc_2C thumb_func 0x8181380 thumb_func 0x818144c pokemonanimfunc_2D thumb_func 0x8181480 thumb_func 0x818154c pokemonanimfunc_2E -thumb_func 0x8181580 +thumb_func 0x8181580 pokemonanimfunc_2F thumb_func 0x81815b4 thumb_func 0x818161c thumb_func 0x8181640 thumb_func 0x81816bc thumb_func 0x818180c pokemonanimfunc_30 -thumb_func 0x8181840 +thumb_func 0x8181840 pokemonanimfunc_31 thumb_func 0x8181924 pokemonanimfunc_32 thumb_func 0x8181968 thumb_func 0x81819f8 thumb_func 0x8181ad8 thumb_func 0x8181b94 thumb_func 0x8181c5c pokemonanimfunc_33 -thumb_func 0x8181c90 +thumb_func 0x8181c90 pokemonanimfunc_34 thumb_func 0x8181d3c pokemonanimfunc_35 thumb_func 0x8181da4 pokemonanimfunc_36 thumb_func 0x8181dc0 thumb_func 0x8181dfc thumb_func 0x8181e6c -thumb_func 0x8181ec8 +thumb_func 0x8181ec8 pokemonanimfunc_37 thumb_func 0x8181f8c pokemonanimfunc_38 thumb_func 0x8181fa8 thumb_func 0x8182018 thumb_func 0x8182078 thumb_func 0x81820f4 -thumb_func 0x818215c -thumb_func 0x818221c -thumb_func 0x818234c -thumb_func 0x81823f4 +thumb_func 0x818215c pokemonanimfunc_39 +thumb_func 0x818221c pokemonanimfunc_3A +thumb_func 0x818234c pokemonanimfunc_3B +thumb_func 0x81823f4 pokemonanimfunc_3C thumb_func 0x8182488 pokemonanimfunc_3D thumb_func 0x81824a4 thumb_func 0x81824f4 @@ -12615,17 +12615,17 @@ thumb_func 0x8182610 thumb_func 0x81826a8 pokemonanimfunc_3E thumb_func 0x81826dc thumb_func 0x8182774 pokemonanimfunc_3F -thumb_func 0x81827a8 -thumb_func 0x8182858 -thumb_func 0x8182918 -thumb_func 0x81829d0 -thumb_func 0x8182ac4 +thumb_func 0x81827a8 pokemonanimfunc_40 +thumb_func 0x8182858 pokemonanimfunc_41 +thumb_func 0x8182918 pokemonanimfunc_42 +thumb_func 0x81829d0 pokemonanimfunc_43 +thumb_func 0x8182ac4 pokemonanimfunc_44 thumb_func 0x8182bd0 pokemonanimfunc_45 thumb_func 0x8182bec pokemonanimfunc_46 thumb_func 0x8182c08 pokemonanimfunc_47 thumb_func 0x8182c24 pokemonanimfunc_48 thumb_func 0x8182c60 -thumb_func 0x8182c70 +thumb_func 0x8182c70 pokemonanimfunc_4A thumb_func 0x8182c80 pokemonanimfunc_4B thumb_func 0x8182cac pokemonanimfunc_4C thumb_func 0x8182ccc pokemonanimfunc_4D @@ -12647,7 +12647,7 @@ thumb_func 0x8182fb4 pokemonanimfunc_0E thumb_func 0x8182fec thumb_func 0x8183040 pokemonanimfunc_57 thumb_func 0x8183060 pokemonanimfunc_58 -thumb_func 0x8183080 +thumb_func 0x8183080 pokemonanimfunc_66 thumb_func 0x8183174 thumb_func 0x8183294 pokemonanimfunc_5A thumb_func 0x81832c4 @@ -12657,7 +12657,7 @@ thumb_func 0x81834c4 pokemonanimfunc_5C thumb_func 0x81834e4 pokemonanimfunc_5D thumb_func 0x8183504 pokemonanimfunc_5E thumb_func 0x8183520 -thumb_func 0x8183584 +thumb_func 0x8183584 pokemonanimfunc_60 thumb_func 0x81835e8 pokemonanimfunc_61 thumb_func 0x8183608 pokemonanimfunc_62 thumb_func 0x8183628 pokemonanimfunc_63 @@ -12665,7 +12665,7 @@ thumb_func 0x8183648 pokemonanimfunc_64 thumb_func 0x8183688 thumb_func 0x81837e8 pokemonanimfunc_65 thumb_func 0x8183818 -thumb_func 0x818390c +thumb_func 0x818390c pokemonanimfunc_67 thumb_func 0x81839f8 thumb_func 0x8183ab8 pokemonanimfunc_68 thumb_func 0x8183ad8 pokemonanimfunc_69 @@ -12697,9 +12697,9 @@ thumb_func 0x81840c0 pokemonanimfunc_7F thumb_func 0x81840e8 pokemonanimfunc_80 thumb_func 0x8184110 pokemonanimfunc_81 thumb_func 0x818413c -thumb_func 0x8184188 -thumb_func 0x818420c -thumb_func 0x8184290 +thumb_func 0x8184188 pokemonanimfunc_82 +thumb_func 0x818420c pokemonanimfunc_83 +thumb_func 0x8184290 pokemonanimfunc_84 thumb_func 0x8184314 thumb_func 0x81843fc pokemonanimfunc_85 thumb_func 0x8184428 pokemonanimfunc_86 @@ -12713,11 +12713,11 @@ thumb_func 0x8184598 pokemonanimfunc_88 thumb_func 0x81845c4 pokemonanimfunc_89 thumb_func 0x81845f0 pokemonanimfunc_8A thumb_func 0x818461c -thumb_func 0x8184644 +thumb_func 0x8184644 BackAnimBlendYellow thumb_func 0x81846e0 pokemonanimfunc_8B thumb_func 0x8184718 pokemonanimfunc_8C thumb_func 0x8184750 pokemonanimfunc_8D -thumb_func 0x818478c +thumb_func 0x818478c BackAnimBlend thumb_func 0x81847e0 thumb_func 0x8184880 pokemonanimfunc_8E thumb_func 0x81848e8 pokemonanimfunc_8F @@ -12733,33 +12733,33 @@ thumb_func 0x8184c50 thumb_func 0x8184d04 thumb_func 0x8184e1c RecordedBattle_SetBattlerAction thumb_func 0x8184e68 RecordedBattle_ClearBattlerAction -thumb_func 0x8184eb4 +thumb_func 0x8184eb4 RecordedBattle_GetBattlerAction thumb_func 0x8184f30 thumb_func 0x8184f3c thumb_func 0x8185008 thumb_func 0x81850d8 -thumb_func 0x81850f0 -thumb_func 0x8185110 -thumb_func 0x8185150 -thumb_func 0x8185198 -thumb_func 0x8185810 -thumb_func 0x8185844 -thumb_func 0x818586c -thumb_func 0x81858d8 +thumb_func 0x81850f0 CanCopyRecordedBattleSaveData +thumb_func 0x8185110 IsRecordedBattleSaveValid +thumb_func 0x8185150 RecordedBattleToSave +thumb_func 0x8185198 MoveRecordedBattleToSaveData +thumb_func 0x8185810 TryCopyRecordedBattleSaveData +thumb_func 0x8185844 CopyRecordedBattleFromSave +thumb_func 0x818586c CB2_RecordedBattleEnd +thumb_func 0x81858d8 Task_StartAfterCountdown thumb_func 0x818591c -thumb_func 0x8185b7c -thumb_func 0x8185be4 +thumb_func 0x8185b7c PlayRecordedBattle +thumb_func 0x8185be4 CB2_RecordedBattle thumb_func 0x8185bf8 thumb_func 0x8185c04 thumb_func 0x8185c10 thumb_func 0x8185c54 -thumb_func 0x8185c98 +thumb_func 0x8185c98 GetActiveBattlerLinkPlayerGender thumb_func 0x8185cdc thumb_func 0x8185ce8 thumb_func 0x8185d04 thumb_func 0x8185d10 thumb_func 0x8185d1c -thumb_func 0x8185d28 +thumb_func 0x8185d28 RecordedBattle_CopyBattlerMoves thumb_func 0x8185d94 thumb_func 0x8186190 thumb_func 0x818619c @@ -12790,71 +12790,71 @@ thumb_func 0x8186cc0 thumb_func 0x8186db0 thumb_func 0x8186e78 thumb_func 0x8186ea8 -thumb_func 0x8186ed8 -thumb_func 0x8186f50 +thumb_func 0x8186ed8 RecordedOpponentBufferExecCompleted +thumb_func 0x8186f50 RecordedOpponentHandleGetMonData thumb_func 0x8186fc4 thumb_func 0x8187770 thumb_func 0x818777c -thumb_func 0x81877d4 +thumb_func 0x81877d4 SetRecordedOpponentMonData thumb_func 0x81880f4 -thumb_func 0x8188168 +thumb_func 0x8188168 RecordedOpponentHandleLoadMonSprite thumb_func 0x81882b8 thumb_func 0x8188304 thumb_func 0x8188494 thumb_func 0x818852c -thumb_func 0x81885b8 -thumb_func 0x818876c -thumb_func 0x8188778 -thumb_func 0x8188824 -thumb_func 0x81888d0 -thumb_func 0x81888dc -thumb_func 0x81888e8 -thumb_func 0x81888f4 -thumb_func 0x8188900 +thumb_func 0x81885b8 RecordedOpponentHandleDrawTrainerPic +thumb_func 0x818876c RecordedOpponentHandleTrainerSlide +thumb_func 0x8188778 RecordedOpponentHandleTrainerSlideBack +thumb_func 0x8188824 RecordedOpponentHandleFaintAnimation +thumb_func 0x81888d0 RecordedOpponentHandlePaletteFade +thumb_func 0x81888dc RecordedOpponentHandleSuccessBallThrowAnim +thumb_func 0x81888e8 RecordedOpponentHandleBallThrowAnim +thumb_func 0x81888f4 RecordedOpponentHandlePause +thumb_func 0x8188900 RecordedOpponentHandleMoveAnimation thumb_func 0x8188a38 -thumb_func 0x8188bbc -thumb_func 0x8188c10 -thumb_func 0x8188c1c -thumb_func 0x8188c40 -thumb_func 0x8188c4c -thumb_func 0x8188ca8 -thumb_func 0x8188cb4 -thumb_func 0x8188cf0 -thumb_func 0x8188cfc +thumb_func 0x8188bbc RecordedOpponentHandlePrintString +thumb_func 0x8188c10 RecordedOpponentHandlePrintSelectionString +thumb_func 0x8188c1c RecordedOpponentHandleChooseAction +thumb_func 0x8188c40 RecordedOpponentHandleUnknownYesNoBox +thumb_func 0x8188c4c RecordedOpponentHandleChooseMove +thumb_func 0x8188ca8 RecordedOpponentHandleChooseItem +thumb_func 0x8188cb4 RecordedOpponentHandleChoosePokemon +thumb_func 0x8188cf0 RecordedOpponentHandleCmd23 +thumb_func 0x8188cfc RecordedOpponentHandleHealthBarUpdate thumb_func 0x8188dec -thumb_func 0x8188df8 -thumb_func 0x8188e70 -thumb_func 0x8188ed8 -thumb_func 0x8188ee4 +thumb_func 0x8188df8 RecordedOpponentHandleStatusIconUpdate +thumb_func 0x8188e70 RecordedOpponentHandleStatusAnimation +thumb_func 0x8188ed8 RecordedOpponentHandleStatusXor +thumb_func 0x8188ee4 RecordedOpponentHandleDataTransfer thumb_func 0x8188ef0 -thumb_func 0x8188efc -thumb_func 0x8188f08 -thumb_func 0x8188f14 -thumb_func 0x8188f20 -thumb_func 0x8188f2c -thumb_func 0x8188f38 +thumb_func 0x8188efc RecordedOpponentHandlePlayBGM +thumb_func 0x8188f08 RecordedOpponentHandleCmd32 +thumb_func 0x8188f14 RecordedOpponentHandleTwoReturnValues +thumb_func 0x8188f20 RecordedOpponentHandleChosenMonReturnValue +thumb_func 0x8188f2c RecordedOpponentHandleOneReturnValue +thumb_func 0x8188f38 RecordedOpponentHandleOneReturnValue_Duplicate thumb_func 0x8188f44 RecordedOpponentHandleCmd37 thumb_func 0x8188f60 RecordedOpponentHandleCmd38 thumb_func 0x8188f98 RecordedOpponentHandleCmd39 thumb_func 0x8188fb0 RecordedOpponentHandleCmd40 -thumb_func 0x8188fd8 -thumb_func 0x8189048 -thumb_func 0x8189054 -thumb_func 0x8189098 -thumb_func 0x81890f4 +thumb_func 0x8188fd8 RecordedOpponentHandleHitAnimation +thumb_func 0x8189048 RecordedOpponentHandleCmd42 +thumb_func 0x8189054 RecordedOpponentHandlePlaySE +thumb_func 0x8189098 RecordedOpponentHandlePlayFanfareOrBGM +thumb_func 0x81890f4 RecordedOpponentHandleFaintingCry thumb_func 0x8189130 -thumb_func 0x8189164 +thumb_func 0x8189164 RecordedOpponentHandleIntroTrainerBallThrow thumb_func 0x8189274 thumb_func 0x8189358 thumb_func 0x8189374 thumb_func 0x8189488 thumb_func 0x81894d0 RecordedOpponentHandleHidePartyStatusSummary -thumb_func 0x8189520 +thumb_func 0x8189520 RecordedOpponentHandleEndBounceEffect thumb_func 0x818952c -thumb_func 0x818958c -thumb_func 0x81895f4 -thumb_func 0x8189600 -thumb_func 0x818960c +thumb_func 0x818958c RecordedOpponentHandleBattleAnimation +thumb_func 0x81895f4 RecordedOpponentHandleLinkStandbyMsg +thumb_func 0x8189600 RecordedOpponentHandleResetActionMoveSelection +thumb_func 0x818960c RecordedOpponentHandleCmd55 thumb_func 0x8189670 nullsub_105 thumb_func 0x8189674 nullsub_104 thumb_func 0x8189678 @@ -12874,47 +12874,47 @@ thumb_func 0x8189fe0 thumb_func 0x818a054 thumb_func 0x818a0a8 thumb_func 0x818a19c -thumb_func 0x818a240 +thumb_func 0x818a240 RecordedPlayerBufferExecCompleted thumb_func 0x818a2b8 CompleteOnFinishedStatusAnimation thumb_func 0x818a2e8 CompleteOnFinishedBattleAnimation -thumb_func 0x818a318 +thumb_func 0x818a318 RecordedPlayerHandleGetMonData thumb_func 0x818a38c thumb_func 0x818ab38 thumb_func 0x818ab44 -thumb_func 0x818ab9c +thumb_func 0x818ab9c SetRecordedPlayerMonData thumb_func 0x818b598 -thumb_func 0x818b60c -thumb_func 0x818b728 +thumb_func 0x818b60c RecordedPlayerHandleLoadMonSprite +thumb_func 0x818b728 RecordedPlayerHandleSwitchInAnim thumb_func 0x818b798 thumb_func 0x818b914 -thumb_func 0x818b9a4 -thumb_func 0x818ba30 -thumb_func 0x818bcd8 +thumb_func 0x818b9a4 DoSwitchOutAnimation +thumb_func 0x818ba30 RecordedPlayerHandleDrawTrainerPic +thumb_func 0x818bcd8 RecordedPlayerHandleTrainerSlide thumb_func 0x818bce4 -thumb_func 0x818bd90 +thumb_func 0x818bd90 RecordedPlayerHandleFaintAnimation thumb_func 0x818be7c thumb_func 0x818be88 thumb_func 0x818be94 thumb_func 0x818bea0 -thumb_func 0x818beac -thumb_func 0x818bfe4 +thumb_func 0x818beac RecordedPlayerHandleMoveAnimation +thumb_func 0x818bfe4 RecordedPlayerDoMoveAnimation thumb_func 0x818c168 -thumb_func 0x818c1bc -thumb_func 0x818c1c8 -thumb_func 0x818c204 +thumb_func 0x818c1bc RecordedPlayerHandlePrintSelectionString +thumb_func 0x818c1c8 ChooseActionInBattlePalace +thumb_func 0x818c204 RecordedPlayerHandleChooseAction thumb_func 0x818c258 -thumb_func 0x818c264 -thumb_func 0x818c2c0 -thumb_func 0x818c2cc -thumb_func 0x818c308 -thumb_func 0x818c314 -thumb_func 0x818c414 -thumb_func 0x818c420 -thumb_func 0x818c498 -thumb_func 0x818c500 -thumb_func 0x818c50c -thumb_func 0x818c518 -thumb_func 0x818c524 +thumb_func 0x818c264 RecordedPlayerHandleChooseMove +thumb_func 0x818c2c0 RecordedPlayerHandleChooseItem +thumb_func 0x818c2cc RecordedPlayerHandleChoosePokemon +thumb_func 0x818c308 RecordedPlayerHandleCmd23 +thumb_func 0x818c314 RecordedPlayerHandleHealthBarUpdate +thumb_func 0x818c414 RecordedPlayerHandleExpUpdate +thumb_func 0x818c420 RecordedPlayerHandleStatusIconUpdate +thumb_func 0x818c498 RecordedPlayerHandleStatusAnimation +thumb_func 0x818c500 RecordedPlayerHandleStatusXor +thumb_func 0x818c50c RecordedPlayerHandleDataTransfer +thumb_func 0x818c518 RecordedPlayerHandleDMA3Transfer +thumb_func 0x818c524 RecordedPlayerHandlePlayBGM thumb_func 0x818c530 thumb_func 0x818c53c thumb_func 0x818c548 @@ -12925,51 +12925,51 @@ thumb_func 0x818c588 RecordedPlayerHandleCmd38 thumb_func 0x818c5c0 RecordedPlayerHandleCmd39 thumb_func 0x818c5d8 RecordedPlayerHandleCmd40 thumb_func 0x818c600 -thumb_func 0x818c670 +thumb_func 0x818c670 RecordedPlayerHandleCmd42 thumb_func 0x818c67c -thumb_func 0x818c6c0 -thumb_func 0x818c71c +thumb_func 0x818c6c0 RecordedPlayerHandlePlayFanfareOrBGM +thumb_func 0x818c71c RecordedPlayerHandleFaintingCry thumb_func 0x818c75c -thumb_func 0x818c790 +thumb_func 0x818c790 RecordedPlayerHandleIntroTrainerBallThrow thumb_func 0x818c950 -thumb_func 0x818ca5c +thumb_func 0x818ca5c RecordedPlayerHandleDrawPartyStatusSummary thumb_func 0x818cb20 thumb_func 0x818cb68 RecordedPlayerHandleHidePartyStatusSummary -thumb_func 0x818cbb8 -thumb_func 0x818cbc4 -thumb_func 0x818cc24 -thumb_func 0x818cc8c -thumb_func 0x818cc98 -thumb_func 0x818cca4 +thumb_func 0x818cbb8 RecordedPlayerHandleEndBounceEffect +thumb_func 0x818cbc4 RecordedPlayerHandleSpriteInvisibility +thumb_func 0x818cc24 RecordedPlayerHandleBattleAnimation +thumb_func 0x818cc8c RecordedPlayerHandleLinkStandbyMsg +thumb_func 0x818cc98 RecordedPlayerHandleResetActionMoveSelection +thumb_func 0x818cca4 RecordedPlayerHandleCmd55 thumb_func 0x818ccf0 nullsub_107 thumb_func 0x818ccf4 nullsub_108 thumb_func 0x818ccf8 ResetAllPicSprites -thumb_func 0x818cd20 +thumb_func 0x818cd20 DecompressPic thumb_func 0x818cdc8 DecompressPic_HandleDeoxys -thumb_func 0x818cdf0 -thumb_func 0x818ceac -thumb_func 0x818ceec -thumb_func 0x818cf18 +thumb_func 0x818cdf0 LoadPicPaletteByTagOrSlot +thumb_func 0x818ceac LoadPicPaletteBySlot +thumb_func 0x818ceec AssignSpriteAnimsTable +thumb_func 0x818cf18 CreatePicSprite thumb_func 0x818d0b0 CreatePicSprite_HandleDeoxys -thumb_func 0x818d110 -thumb_func 0x818d2dc +thumb_func 0x818d110 CreatePicSprite2 +thumb_func 0x818d2dc FreeAndDestroyPicSpriteInternal thumb_func 0x818d388 thumb_func 0x818d3f8 thumb_func 0x818d4a4 CreateMonPicSprite thumb_func 0x818d504 CreateMonPicSprite_HandleDeoxys -thumb_func 0x818d54c +thumb_func 0x818d54c FreeAndDestroyMonPicSprite thumb_func 0x818d560 thumb_func 0x818d590 thumb_func 0x818d5d8 CreateTrainerPicSprite -thumb_func 0x818d61c +thumb_func 0x818d61c FreeAndDestroyTrainerPicSprite thumb_func 0x818d630 thumb_func 0x818d664 -thumb_func 0x818d6a8 +thumb_func 0x818d6a8 PlayerGenderToFrontTrainerPicId_Debug thumb_func 0x818d6d8 thumb_func 0x818d6ec -thumb_func 0x818d75c +thumb_func 0x818d75c SetLilycoveLady thumb_func 0x818d7a4 -thumb_func 0x818d7d8 +thumb_func 0x818d7d8 SetLilycoveLadyRandomly thumb_func 0x818d818 thumb_func 0x818d830 thumb_func 0x818d84c @@ -12982,7 +12982,7 @@ thumb_func 0x818d98c thumb_func 0x818d9c8 thumb_func 0x818d9e4 thumb_func 0x818da10 -thumb_func 0x818da30 +thumb_func 0x818da30 SetRainStrengthFromSoundEffect thumb_func 0x818da60 thumb_func 0x818da84 thumb_func 0x818da90 @@ -12991,7 +12991,7 @@ thumb_func 0x818db68 thumb_func 0x818db94 thumb_func 0x818dbac thumb_func 0x818dbe8 -thumb_func 0x818dc00 +thumb_func 0x818dc00 CB2_ReturnToField thumb_func 0x818dc0c thumb_func 0x818dc74 SetLilycoveQuizLady thumb_func 0x818dd10 @@ -13017,13 +13017,13 @@ thumb_func 0x818e0ec thumb_func 0x818e100 thumb_func 0x818e16c thumb_func 0x818e194 -thumb_func 0x818e1c0 +thumb_func 0x818e1c0 MainCB2 thumb_func 0x818e1cc thumb_func 0x818e260 thumb_func 0x818e294 SetLilycoveContestLady thumb_func 0x818e2d0 thumb_func 0x818e30c -thumb_func 0x818e360 +thumb_func 0x818e360 GivePokeblockToContestLady thumb_func 0x818e3f0 thumb_func 0x818e43c thumb_func 0x818e478 @@ -13040,72 +13040,72 @@ thumb_func 0x818e5ec thumb_func 0x818e608 thumb_func 0x818e61c nullsub_109 thumb_func 0x818e628 -thumb_func 0x818e6e0 -thumb_func 0x818e984 -thumb_func 0x818ec88 -thumb_func 0x818f37c +thumb_func 0x818e6e0 GetDomeData +thumb_func 0x818e984 SetDomeData +thumb_func 0x818ec88 InitDomeTrainers +thumb_func 0x818f37c CalcDomeMonStats thumb_func 0x818f560 SwapDomeTrainers -thumb_func 0x818f60c -thumb_func 0x818f63c -thumb_func 0x818f67c -thumb_func 0x818f6d0 -thumb_func 0x818f838 -thumb_func 0x818f8d4 +thumb_func 0x818f60c BufferDomeRoundText +thumb_func 0x818f63c BufferDomeOpponentName +thumb_func 0x818f67c InitDomeOpponentParty +thumb_func 0x818f6d0 CreateDomeOpponentMon +thumb_func 0x818f838 CreateDomeOpponentMons +thumb_func 0x818f8d4 GetDomeTrainerMonCountInBits thumb_func 0x818f918 thumb_func 0x818fa14 thumb_func 0x818fb10 -thumb_func 0x818fc1c +thumb_func 0x818fc1c GetTypeEffectivenessPoints thumb_func 0x818fdc4 -thumb_func 0x818fdfc -thumb_func 0x818fef4 +thumb_func 0x818fdfc TournamentIdOfOpponent +thumb_func 0x818fef4 SetDomeOpponentId thumb_func 0x818ff08 TrainerIdOfPlayerOpponent -thumb_func 0x818ff40 +thumb_func 0x818ff40 SetDomeOpponentGraphicsId thumb_func 0x818ff54 -thumb_func 0x818ff98 -thumb_func 0x8190014 -thumb_func 0x819005c -thumb_func 0x81903ec -thumb_func 0x8190454 -thumb_func 0x81904bc -thumb_func 0x8190528 -thumb_func 0x8190594 -thumb_func 0x81905ac -thumb_func 0x8190628 -thumb_func 0x81906a4 -thumb_func 0x8190720 +thumb_func 0x818ff98 UpdateDomeStreaks +thumb_func 0x8190014 ShowDomeOpponentInfo +thumb_func 0x819005c Task_ShowOpponentInfo +thumb_func 0x81903ec SpriteCb_TrainerIconCardScrollUp +thumb_func 0x8190454 SpriteCb_TrainerIconCardScrollDown +thumb_func 0x81904bc SpriteCb_TrainerIconCardScrollLeft +thumb_func 0x8190528 SpriteCb_TrainerIconCardScrollRight +thumb_func 0x8190594 SpriteCb_MonIcon +thumb_func 0x81905ac SpriteCb_MonIconCardScrollUp +thumb_func 0x8190628 SpriteCb_MonIconCardScrollDown +thumb_func 0x81906a4 SpriteCb_MonIconCardScrollLeft +thumb_func 0x8190720 SpriteCb_MonIconCardScrollRight thumb_func 0x819079c thumb_func 0x81908c8 thumb_func 0x8190930 thumb_func 0x8191e78 -thumb_func 0x819213c +thumb_func 0x819213c DisplayTrainerInfoOnCard thumb_func 0x8192b3c -thumb_func 0x8192d7c -thumb_func 0x8193484 -thumb_func 0x81934c0 +thumb_func 0x8192d7c DisplayMatchInfoOnCard +thumb_func 0x8193484 ShowDomeTourneyTree +thumb_func 0x81934c0 ShowPreviousDomeResultsTourneyTree thumb_func 0x819353c -thumb_func 0x81937bc -thumb_func 0x8193920 -thumb_func 0x819395c -thumb_func 0x8193ab0 -thumb_func 0x8193e00 +thumb_func 0x81937bc UpdateTourneyTreeCursor +thumb_func 0x8193920 ShowNonInteractiveDomeTourneyTree +thumb_func 0x819395c ResolveDomeRoundWinners +thumb_func 0x8193ab0 GetWinningMove +thumb_func 0x8193e00 Task_ShowTourneyTree thumb_func 0x8194490 thumb_func 0x81944f4 -thumb_func 0x8194754 -thumb_func 0x8194770 +thumb_func 0x8194754 CB2_BattleDome +thumb_func 0x8194770 VblankCb0_BattleDome thumb_func 0x81947ec HblankCb_BattleDome -thumb_func 0x81948e4 -thumb_func 0x8194948 -thumb_func 0x8194968 -thumb_func 0x8194a44 +thumb_func 0x81948e4 VblankCb1_BattleDome +thumb_func 0x8194948 InitDomeFacilityTrainersAndMons +thumb_func 0x8194968 RestoreDomePlayerParty +thumb_func 0x8194a44 RestoreDomePlayerPartyHeldItems thumb_func 0x8194ab4 -thumb_func 0x8194ac0 +thumb_func 0x8194ac0 GetPlayerSeededBeforeOpponent thumb_func 0x8194af8 BufferLastDomeWinnerName thumb_func 0x8194b58 thumb_func 0x8194f58 thumb_func 0x8194fa0 thumb_func 0x8194fe8 -thumb_func 0x8195038 -thumb_func 0x8195498 +thumb_func 0x8195038 DecideRoundWinners +thumb_func 0x8195498 CopyDomeTrainerName thumb_func 0x8195510 thumb_func 0x8195524 thumb_func 0x8195538 CopyDomeBrainTrainerName @@ -13121,84 +13121,84 @@ thumb_func 0x819587c thumb_func 0x81958e4 thumb_func 0x8195928 thumb_func 0x81959b8 -thumb_func 0x8195a10 +thumb_func 0x8195a10 InitMatchCallCounters thumb_func 0x8195a34 GetCurrentTotalMinutes -thumb_func 0x8195a58 -thumb_func 0x8195a8c -thumb_func 0x8195ad8 -thumb_func 0x8195b40 -thumb_func 0x8195b68 -thumb_func 0x8195bcc -thumb_func 0x8195bf8 -thumb_func 0x8195c34 -thumb_func 0x8195c80 +thumb_func 0x8195a58 UpdateMatchCallMinutesCounter +thumb_func 0x8195a8c CheckMatchCallChance +thumb_func 0x8195ad8 MapAllowsMatchCall +thumb_func 0x8195b40 UpdateMatchCallStepCounter +thumb_func 0x8195b68 SelectMatchCallTrainer +thumb_func 0x8195bcc GetNumRegisteredNPCs +thumb_func 0x8195bf8 GetActiveMatchCallTrainerId +thumb_func 0x8195c34 TryStartMatchCall +thumb_func 0x8195c80 StartMatchCallFromScript thumb_func 0x8195c94 -thumb_func 0x8195ca8 -thumb_func 0x8195ce0 -thumb_func 0x8195d2c -thumb_func 0x8195df0 -thumb_func 0x8195e74 +thumb_func 0x8195ca8 StartMatchCall +thumb_func 0x8195ce0 ExecuteMatchCall +thumb_func 0x8195d2c LoadMatchCallWindowGfx +thumb_func 0x8195df0 MoveMatchCallWindowToVram +thumb_func 0x8195e74 PrintMatchCallIntroEllipsis thumb_func 0x8195eb0 thumb_func 0x8195ed8 thumb_func 0x8195f30 thumb_func 0x8195f90 thumb_func 0x8195ff0 -thumb_func 0x819605c -thumb_func 0x81961d8 -thumb_func 0x8196248 +thumb_func 0x819605c DrawMatchCallTextBoxBorder +thumb_func 0x81961d8 InitMatchCallTextPrinter +thumb_func 0x8196248 ExecuteMatchCallTextPrinter thumb_func 0x8196294 thumb_func 0x8196310 TrainerIsEligibleForRematch -thumb_func 0x819632c -thumb_func 0x8196348 +thumb_func 0x819632c GetRematchTrainerLocation +thumb_func 0x8196348 GetNumRematchTrainersFought thumb_func 0x8196374 -thumb_func 0x81963ac -thumb_func 0x8196444 +thumb_func 0x81963ac SelectMatchCallMessage +thumb_func 0x8196444 GetTrainerMatchCallId thumb_func 0x8196464 GetSameRouteMatchCallText thumb_func 0x8196490 GetDifferentRouteMatchCallText -thumb_func 0x81964bc -thumb_func 0x8196510 -thumb_func 0x81965e0 +thumb_func 0x81964bc GetBattleMatchCallText +thumb_func 0x8196510 GetGeneralMatchCallText +thumb_func 0x81965e0 BuildMatchCallString thumb_func 0x81965fc PopulateMatchCallStringVars -thumb_func 0x819662c -thumb_func 0x8196644 -thumb_func 0x8196698 -thumb_func 0x81966b4 -thumb_func 0x819674c -thumb_func 0x8196794 -thumb_func 0x819686c -thumb_func 0x81968e8 -thumb_func 0x8196908 -thumb_func 0x8196940 +thumb_func 0x819662c PopulateMatchCallStringVar +thumb_func 0x8196644 PopulateTrainerName +thumb_func 0x8196698 PopulateMapName +thumb_func 0x81966b4 GetLandEncounterSlot +thumb_func 0x819674c GetWaterEncounterSlot +thumb_func 0x8196794 PopulateSpeciesFromTrainerLocation +thumb_func 0x819686c atk50_openpartyscreen +thumb_func 0x81968e8 PopulateBattleFrontierFacilityName +thumb_func 0x8196908 PopulateBattleFrontierStreak +thumb_func 0x8196940 GetNumOwnedBadges thumb_func 0x8196968 -thumb_func 0x81969f8 -thumb_func 0x8196b84 +thumb_func 0x81969f8 GetFrontierStreakInfo +thumb_func 0x8196b84 GetPokedexRatingLevel thumb_func 0x8196c74 thumb_func 0x8196d78 thumb_func 0x8196db8 -thumb_func 0x8196dc4 +thumb_func 0x8196dc4 InitStandardTextBoxWindows thumb_func 0x8196de8 thumb_func 0x8196df4 -thumb_func 0x8196e18 -thumb_func 0x8196e2c -thumb_func 0x8196eb8 -thumb_func 0x8196f04 +thumb_func 0x8196e18 RunTextPrintersAndIsPrinter0Active +thumb_func 0x8196e2c AddTextPrinterParameterized2 +thumb_func 0x8196eb8 AddTextPrinterForMessage +thumb_func 0x8196f04 AddTextPrinterForMessage_2 thumb_func 0x8196f50 AddTextPrinterWithCustomSpeedForMessage thumb_func 0x8196f98 thumb_func 0x8196fb8 thumb_func 0x8196ff0 thumb_func 0x8197028 thumb_func 0x8197060 -thumb_func 0x8197098 +thumb_func 0x8197098 WindowFunc_DrawStandardFrame thumb_func 0x81971e8 -thumb_func 0x81975a0 -thumb_func 0x81975e8 -thumb_func 0x8197638 +thumb_func 0x81975a0 WindowFunc_ClearStdWindowAndFrame +thumb_func 0x81975e8 WindowFunc_ClearDialogWindowAndFrame +thumb_func 0x8197638 SetStandardWindowBorderStyle thumb_func 0x8197650 thumb_func 0x8197680 -thumb_func 0x8197694 +thumb_func 0x8197694 Menu_LoadStdPalAt thumb_func 0x81976ac thumb_func 0x81976b4 -thumb_func 0x81976d0 +thumb_func 0x81976d0 DisplayItemMessageOnField thumb_func 0x8197714 thumb_func 0x819773c thumb_func 0x8197768 @@ -13208,21 +13208,21 @@ thumb_func 0x819780c thumb_func 0x8197818 thumb_func 0x8197834 thumb_func 0x819783c -thumb_func 0x8197844 +thumb_func 0x8197844 AddMapNamePopUpWindow thumb_func 0x819787c thumb_func 0x8197888 -thumb_func 0x81978a4 +thumb_func 0x81978a4 AddTextPrinterWithCallbackForMessage thumb_func 0x81978f0 -thumb_func 0x8197924 -thumb_func 0x819796c +thumb_func 0x8197924 DrawDialogFrameWithCustomTileAndPalette +thumb_func 0x819796c DrawDialogFrameWithCustomTile thumb_func 0x81979bc thumb_func 0x8197ebc -thumb_func 0x8197ef4 -thumb_func 0x8197f44 +thumb_func 0x8197ef4 WindowFunc_ClearDialogWindowAndFrameNullPalette +thumb_func 0x8197f44 DrawStdFrameWithCustomTileAndPalette thumb_func 0x8197f8c -thumb_func 0x8197fdc +thumb_func 0x8197fdc WindowFunc_DrawStdFrameWithCustomTileAndPalette thumb_func 0x8198134 -thumb_func 0x819816c +thumb_func 0x819816c WindowFunc_ClearStdWindowAndFrameToTransparent thumb_func 0x81981b4 thumb_func 0x8198244 thumb_func 0x81982e8 @@ -13233,17 +13233,17 @@ thumb_func 0x819844c thumb_func 0x81984b0 thumb_func 0x81984f0 thumb_func 0x819854c -thumb_func 0x81985e8 -thumb_func 0x819862c -thumb_func 0x8198670 -thumb_func 0x819867c -thumb_func 0x81986e8 -thumb_func 0x8198768 -thumb_func 0x81987d4 -thumb_func 0x8198850 +thumb_func 0x81985e8 Menu_MoveCursor +thumb_func 0x819862c Menu_MoveCursorNoWrapAround +thumb_func 0x8198670 Menu_GetCursorPos +thumb_func 0x819867c Menu_ProcessInput +thumb_func 0x81986e8 Menu_ProcessInputNoWrap +thumb_func 0x8198768 ProcessMenuInput_other +thumb_func 0x81987d4 Menu_ProcessInputNoWrapAround_other +thumb_func 0x8198850 PrintTextArray thumb_func 0x81988cc thumb_func 0x8198964 -thumb_func 0x81989b4 +thumb_func 0x81989b4 AddItemMenuActionTextPrinters thumb_func 0x8198ac8 thumb_func 0x8198b34 SetWindowTemplateFields thumb_func 0x8198b60 CreateWindowTemplate @@ -13251,7 +13251,7 @@ thumb_func 0x8198bb4 thumb_func 0x8198c08 thumb_func 0x8198d44 thumb_func 0x8198d68 Menu_ProcessInputNoWrapClearOnChoose -thumb_func 0x8198d88 +thumb_func 0x8198d88 MovementType_WalkSequenceUpLeftDownRight_callback thumb_func 0x8198da4 thumb_func 0x8198e64 thumb_func 0x8198ecc @@ -13262,157 +13262,157 @@ thumb_func 0x8199170 thumb_func 0x8199250 thumb_func 0x8199314 thumb_func 0x81993a0 -thumb_func 0x8199450 +thumb_func 0x8199450 Menu_ProcessInputGridLayout thumb_func 0x81994f4 thumb_func 0x81995a0 thumb_func 0x8199640 -thumb_func 0x8199654 -thumb_func 0x8199668 +thumb_func 0x8199654 schedule_bg_copy_tilemap_to_vram +thumb_func 0x8199668 do_scheduled_bg_tilemap_copies_to_vram thumb_func 0x81996b8 reset_temp_tile_data_buffers -thumb_func 0x81996dc -thumb_func 0x8199728 -thumb_func 0x81997a0 -thumb_func 0x819981c -thumb_func 0x8199858 -thumb_func 0x8199888 +thumb_func 0x81996dc free_temp_tile_data_buffers_if_possible +thumb_func 0x8199728 decompress_and_copy_tile_data_to_vram +thumb_func 0x81997a0 DecompressAndLoadBgGfxUsingHeap +thumb_func 0x819981c task_free_buf_after_copying_tile_data_to_vram +thumb_func 0x8199858 malloc_and_decompress +thumb_func 0x8199888 copy_decompressed_tile_data_to_vram thumb_func 0x81998c8 thumb_func 0x8199954 thumb_func 0x81999d4 thumb_func 0x8199a30 thumb_func 0x8199a88 -thumb_func 0x8199afc -thumb_func 0x8199b84 -thumb_func 0x8199c0c -thumb_func 0x8199cbc +thumb_func 0x8199afc AddTextPrinterParameterized3 +thumb_func 0x8199b84 AddTextPrinterParameterized4 +thumb_func 0x8199c0c AddTextPrinterParameterized5 +thumb_func 0x8199cbc PrintPlayerNameOnWindow thumb_func 0x8199d18 thumb_func 0x8199ef4 thumb_func 0x8199f14 thumb_func 0x8199f54 -thumb_func 0x8199f90 +thumb_func 0x8199f90 blit_move_info_icon thumb_func 0x8199fdc thumb_func 0x819a0ec -thumb_func 0x819a168 +thumb_func 0x819a168 Select_CB2 thumb_func 0x819a184 -thumb_func 0x819a198 -thumb_func 0x819a1b4 -thumb_func 0x819a64c -thumb_func 0x819a6b8 -thumb_func 0x819a7e0 -thumb_func 0x819a848 -thumb_func 0x819a8b0 -thumb_func 0x819a918 -thumb_func 0x819a980 -thumb_func 0x819aa4c -thumb_func 0x819aaa8 -thumb_func 0x819ac08 -thumb_func 0x819accc -thumb_func 0x819adc4 -thumb_func 0x819b018 -thumb_func 0x819b124 -thumb_func 0x819b2dc -thumb_func 0x819b404 -thumb_func 0x819b4e4 -thumb_func 0x819b574 +thumb_func 0x819a198 DoBattleFactorySelectScreen +thumb_func 0x819a1b4 CB2_InitSelectScreen +thumb_func 0x819a64c Select_InitMonsData +thumb_func 0x819a6b8 Select_InitAllSprites +thumb_func 0x819a7e0 Select_DestroyAllSprites +thumb_func 0x819a848 Select_UpdateBallCursorPosition +thumb_func 0x819a8b0 Select_UpdateMenuCursorPosition +thumb_func 0x819a918 Select_UpdateYesNoCursorPosition +thumb_func 0x819a980 Select_HandleMonSelectionChange +thumb_func 0x819aa4c Select_SetBallSpritePaletteNum +thumb_func 0x819aaa8 Task_FromSelectScreenToSummaryScreen +thumb_func 0x819ac08 Task_CloseSelectionScreen +thumb_func 0x819accc Task_HandleSelectionScreenYesNo +thumb_func 0x819adc4 Task_HandleSelectionScreenMenu +thumb_func 0x819b018 Task_HandleSelectionScreenChooseMons +thumb_func 0x819b124 CreateFrontierFactorySelectableMons +thumb_func 0x819b2dc CreateTentFactorySelectableMons +thumb_func 0x819b404 Select_CopyMonsToPlayerParty +thumb_func 0x819b4e4 Select_ShowMenuOptions +thumb_func 0x819b574 Select_ShowYesNoOptions thumb_func 0x819b5f8 thumb_func 0x819b654 -thumb_func 0x819b688 -thumb_func 0x819b708 -thumb_func 0x819b76c -thumb_func 0x819b7a0 -thumb_func 0x819b84c -thumb_func 0x819b8a8 +thumb_func 0x819b688 Select_PrintMonSpecies +thumb_func 0x819b708 Select_PrintSelectMonString +thumb_func 0x819b76c Select_PrintCantSelectSameMon +thumb_func 0x819b7a0 Select_PrintMenuOptions +thumb_func 0x819b84c Select_PrintYesNoOptions +thumb_func 0x819b8a8 Select_RunMenuOptionFunc thumb_func 0x819b8c0 -thumb_func 0x819b8d4 +thumb_func 0x819b8d4 Select_OptionRentDeselect thumb_func 0x819b940 thumb_func 0x819b970 -thumb_func 0x819b974 -thumb_func 0x819b99c -thumb_func 0x819ba58 +thumb_func 0x819b974 Select_OptionOthers +thumb_func 0x819b99c Select_PrintMonCategory +thumb_func 0x819ba58 Summary_ShowMonSprite thumb_func 0x819bb08 -thumb_func 0x819bb1c -thumb_func 0x819bc14 +thumb_func 0x819bb1c Select_ShowSummaryMonSprite +thumb_func 0x819bc14 Select_ShowChosenMonsSprites thumb_func 0x819bd28 thumb_func 0x819bde8 thumb_func 0x819beb8 thumb_func 0x819bfbc thumb_func 0x819c19c thumb_func 0x819c250 -thumb_func 0x819c2b8 -thumb_func 0x819c31c -thumb_func 0x819c384 -thumb_func 0x819c4c8 -thumb_func 0x819c4e4 -thumb_func 0x819c4f8 -thumb_func 0x819c5f4 -thumb_func 0x819c6f0 -thumb_func 0x819c804 +thumb_func 0x819c2b8 Select_SetWinRegs +thumb_func 0x819c31c Select_AreSpeciesValid +thumb_func 0x819c384 Task_SelectFadeSpeciesName +thumb_func 0x819c4c8 Swap_CB2 +thumb_func 0x819c4e4 FldEff_UseCutOnTree +thumb_func 0x819c4f8 CopySwappedMonData +thumb_func 0x819c5f4 Task_FromSwapScreenToSummaryScreen +thumb_func 0x819c6f0 Task_CloseSwapScreen +thumb_func 0x819c804 Task_HandleSwapScreenYesNo thumb_func 0x819c8c4 thumb_func 0x819c90c thumb_func 0x819c95c thumb_func 0x819c9bc -thumb_func 0x819ca1c -thumb_func 0x819cb28 -thumb_func 0x819cc3c -thumb_func 0x819cd4c +thumb_func 0x819ca1c Task_HandleSwapScreenMenu +thumb_func 0x819cb28 Task_HandleSwapScreenChooseMons +thumb_func 0x819cc3c Task_SwapFadeSpeciesName +thumb_func 0x819cd4c Task_SwapFadeSpeciesName2 thumb_func 0x819ce14 thumb_func 0x819d00c thumb_func 0x819d270 thumb_func 0x819d458 thumb_func 0x819d6d4 -thumb_func 0x819d8c0 +thumb_func 0x819d8c0 Swap_InitStruct thumb_func 0x819d8e8 -thumb_func 0x819d904 -thumb_func 0x819ddc8 -thumb_func 0x819e240 -thumb_func 0x819e310 -thumb_func 0x819e39c -thumb_func 0x819e3f0 -thumb_func 0x819e460 -thumb_func 0x819e4c8 +thumb_func 0x819d904 CB2_InitSwapScreen +thumb_func 0x819ddc8 Swap_InitAllSprites +thumb_func 0x819e240 Swap_DestroyAllSprites +thumb_func 0x819e310 Swap_HandleActionCursorChange +thumb_func 0x819e39c Swap_UpdateBallCursorPosition +thumb_func 0x819e3f0 Swap_UpdateActionCursorPosition +thumb_func 0x819e460 Swap_UpdateYesNoCursorPosition +thumb_func 0x819e4c8 Swap_UpdateMenuCursorPosition thumb_func 0x819e540 thumb_func 0x819e5f4 -thumb_func 0x819e64c -thumb_func 0x819e6e8 +thumb_func 0x819e64c Swap_ShowMenuOptions +thumb_func 0x819e6e8 Swap_ShowYesNoOptions thumb_func 0x819e76c thumb_func 0x819e7c8 thumb_func 0x819e7fc thumb_func 0x819e844 -thumb_func 0x819e864 -thumb_func 0x819e898 -thumb_func 0x819e93c -thumb_func 0x819e970 -thumb_func 0x819e9e4 +thumb_func 0x819e864 Swap_PrintPkmnSwap +thumb_func 0x819e898 Swap_PrintMonSpecies +thumb_func 0x819e93c Swap_PrintOnInfoWindow +thumb_func 0x819e970 Swap_PrintMenuOptions +thumb_func 0x819e9e4 Swap_PrintYesNoOptions thumb_func 0x819ea40 thumb_func 0x819eab0 thumb_func 0x819eb18 thumb_func 0x819eb80 -thumb_func 0x819ebf0 +thumb_func 0x819ebf0 Swap_PrintMonSpecies2 thumb_func 0x819ed38 -thumb_func 0x819ee50 -thumb_func 0x819ef34 -thumb_func 0x819ef8c +thumb_func 0x819ee50 Swap_PrintMonCategory +thumb_func 0x819ef34 Swap_InitActions +thumb_func 0x819ef8c Swap_RunMenuOptionFunc thumb_func 0x819efb8 thumb_func 0x819f000 thumb_func 0x819f020 -thumb_func 0x819f070 +thumb_func 0x819f070 Swap_RunActionFunc thumb_func 0x819f098 Swap_ActionCancel thumb_func 0x819f0c8 Swap_ActionPkmnForSwap -thumb_func 0x819f0f8 +thumb_func 0x819f0f8 Swap_ActionMon thumb_func 0x819f1a0 -thumb_func 0x819f1f0 +thumb_func 0x819f1f0 Swap_ShowSummaryMonSprite thumb_func 0x819f2e4 thumb_func 0x819f330 -thumb_func 0x819f374 -thumb_func 0x819f488 +thumb_func 0x819f374 Task_SwapCantHaveSameMons +thumb_func 0x819f488 Swap_AlreadyHasSameSpecies thumb_func 0x819f4ec thumb_func 0x819f540 thumb_func 0x819f588 thumb_func 0x819f6a0 -thumb_func 0x819f7cc -thumb_func 0x819f888 +thumb_func 0x819f7cc Swap_ShowMonSprite +thumb_func 0x819f888 CopyFriendsApprenticeChallengeText thumb_func 0x819f928 thumb_func 0x819f934 ResetApprenticeStruct -thumb_func 0x819f978 +thumb_func 0x819f978 ResetAllApprenticeData thumb_func 0x819fa88 IsPlayersApprenticeActive thumb_func 0x819faa0 thumb_func 0x819fb18 SetPlayersApprenticeLvlMode @@ -13425,13 +13425,13 @@ thumb_func 0x81a00c4 GetLatestLearnedMoves thumb_func 0x81a0160 thumb_func 0x81a026c thumb_func 0x81a03c4 -thumb_func 0x81a05d4 -thumb_func 0x81a064c -thumb_func 0x81a06b0 -thumb_func 0x81a06cc +thumb_func 0x81a05d4 Task_ChooseAnswer +thumb_func 0x81a064c CreateAndShowWindow +thumb_func 0x81a06b0 RemoveAndHideWindow +thumb_func 0x81a06cc CreateChooseAnswerTask thumb_func 0x81a0724 thumb_func 0x81a0738 nullsub_111 -thumb_func 0x81a0744 +thumb_func 0x81a0744 Script_ResetPlayerApprentice thumb_func 0x81a0804 thumb_func 0x81a082c thumb_func 0x81a0840 @@ -13440,27 +13440,27 @@ thumb_func 0x81a0858 thumb_func 0x81a087c thumb_func 0x81a0898 thumb_func 0x81a08e8 -thumb_func 0x81a08fc -thumb_func 0x81a0938 -thumb_func 0x81a0b64 +thumb_func 0x81a08fc Task_WaitForPrintingMessage +thumb_func 0x81a0938 PrintMessage +thumb_func 0x81a0b64 Script_PrintMessage thumb_func 0x81a0b88 thumb_func 0x81a0c08 thumb_func 0x81a0c48 thumb_func 0x81a0c9c thumb_func 0x81a0ebc -thumb_func 0x81a0ed4 +thumb_func 0x81a0ed4 AtkCanceller_UnableToUseMove thumb_func 0x81a1104 thumb_func 0x81a1124 thumb_func 0x81a1130 thumb_func 0x81a127c thumb_func 0x81a1344 thumb_func 0x81a1418 -thumb_func 0x81a14b0 +thumb_func 0x81a14b0 Script_SetPlayerApprenticeTrainerGfxId thumb_func 0x81a1544 thumb_func 0x81a1550 thumb_func 0x81a155c -thumb_func 0x81a1584 -thumb_func 0x81a15d4 +thumb_func 0x81a1584 Task_ExecuteFuncAfterButtonPress +thumb_func 0x81a15d4 ExecuteFuncAfterButtonPress thumb_func 0x81a1604 thumb_func 0x81a1628 thumb_func 0x81a163c nullsub_110 @@ -13468,12 +13468,12 @@ thumb_func 0x81a1648 thumb_func 0x81a16d8 thumb_func 0x81a1810 thumb_func 0x81a197c -thumb_func 0x81a19c4 +thumb_func 0x81a19c4 DoSoftReset_ thumb_func 0x81a19d0 thumb_func 0x81a19e0 -thumb_func 0x81a1a40 +thumb_func 0x81a1a40 ShowFacilityResultsWindow thumb_func 0x81a1acc -thumb_func 0x81a1af4 +thumb_func 0x81a1af4 PrintLinkBattleRecord thumb_func 0x81a1b8c thumb_func 0x81a1bc4 TowerGetWinStreak thumb_func 0x81a1bf4 @@ -13501,7 +13501,7 @@ thumb_func 0x81a2924 thumb_func 0x81a2974 thumb_func 0x81a29a4 thumb_func 0x81a29d4 -thumb_func 0x81a2a78 +thumb_func 0x81a2a78 ScriptCmd_end thumb_func 0x81a2b9c thumb_func 0x81a2c38 thumb_func 0x81a2c70 @@ -13511,12 +13511,12 @@ thumb_func 0x81a2de4 thumb_func 0x81a2f90 thumb_func 0x81a337c thumb_func 0x81a33a0 -thumb_func 0x81a3460 +thumb_func 0x81a3460 CopyFrontierTrainerText thumb_func 0x81a36a0 -thumb_func 0x81a375c +thumb_func 0x81a375c GetCurrentFacilityWinStreak thumb_func 0x81a3864 thumb_func 0x81a3898 -thumb_func 0x81a38c8 +thumb_func 0x81a38c8 GetPlayerSymbolCountForFacility thumb_func 0x81a38fc thumb_func 0x81a3ac8 thumb_func 0x81a3af0 @@ -13531,239 +13531,239 @@ thumb_func 0x81a409c thumb_func 0x81a40c8 thumb_func 0x81a4108 thumb_func 0x81a4208 -thumb_func 0x81a4220 +thumb_func 0x81a4220 Print1PRecord thumb_func 0x81a42f4 thumb_func 0x81a43f8 -thumb_func 0x81a44cc +thumb_func 0x81a44cc Fill2PRecords thumb_func 0x81a45b0 -thumb_func 0x81a469c -thumb_func 0x81a46e4 -thumb_func 0x81a4710 +thumb_func 0x81a469c ShowRankingHallRecordsWindow +thumb_func 0x81a46e4 ScrollRankingHallRecordsWindow +thumb_func 0x81a4710 ClearRankingHallRecords thumb_func 0x81a482c thumb_func 0x81a48ac thumb_func 0x81a48f8 -thumb_func 0x81a4944 -thumb_func 0x81a49a8 -thumb_func 0x81a49c8 -thumb_func 0x81a49f4 -thumb_func 0x81a4be0 -thumb_func 0x81a4c20 -thumb_func 0x81a4c50 -thumb_func 0x81a4ca0 -thumb_func 0x81a4ce0 -thumb_func 0x81a4d2c -thumb_func 0x81a4d98 +thumb_func 0x81a4944 CopyFrontierBrainTrainerName +thumb_func 0x81a49a8 IsFrontierBrainFemale +thumb_func 0x81a49c8 SetFrontierBrainEventObjGfx_2 +thumb_func 0x81a49f4 CreateFrontierBrainPokemon +thumb_func 0x81a4be0 GetFrontierBrainMonSpecies +thumb_func 0x81a4c20 SetFrontierBrainEventObjGfx +thumb_func 0x81a4c50 GetFrontierBrainMonMove +thumb_func 0x81a4ca0 GetFrontierBrainMonNature +thumb_func 0x81a4ce0 GetFrontierBrainMonEvs +thumb_func 0x81a4d2c GetFronterBrainSymbol +thumb_func 0x81a4d98 CopyFrontierBrainText thumb_func 0x81a4e28 thumb_func 0x81a4e3c nullsub_113 -thumb_func 0x81a4e48 -thumb_func 0x81a5148 -thumb_func 0x81a5288 +thumb_func 0x81a4e48 BattleArena_ShowJudgmentWindow +thumb_func 0x81a5148 ShowJudgmentSprite +thumb_func 0x81a5288 SpriteCb_JudgmentIcon thumb_func 0x81a52a4 BattleArena_InitPoints thumb_func 0x81a52d8 BattleArena_AddMindPoints -thumb_func 0x81a5308 -thumb_func 0x81a53d4 +thumb_func 0x81a5308 BattleArena_AddSkillPoints +thumb_func 0x81a53d4 BattleArena_DeductMindPoints thumb_func 0x81a545c -thumb_func 0x81a54a4 -thumb_func 0x81a5554 -thumb_func 0x81a55ec +thumb_func 0x81a54a4 InitArenaChallenge +thumb_func 0x81a5554 GetArenaData +thumb_func 0x81a55ec SetArenaData thumb_func 0x81a56b4 -thumb_func 0x81a56f8 -thumb_func 0x81a5778 -thumb_func 0x81a57d0 -thumb_func 0x81a57e8 +thumb_func 0x81a56f8 SetArenaRewardItem +thumb_func 0x81a5778 GiveArenaRewardItem +thumb_func 0x81a57d0 BufferArenaOpponentName +thumb_func 0x81a57e8 DrawArenaRefereeTextBox thumb_func 0x81a5ad8 thumb_func 0x81a5c0c thumb_func 0x81a5c20 nullsub_1141 -thumb_func 0x81a5c2c -thumb_func 0x81a5d40 -thumb_func 0x81a5dec +thumb_func 0x81a5c2c InitFactoryChallenge +thumb_func 0x81a5d40 GetBattleFactoryData +thumb_func 0x81a5dec SetBattleFactoryData thumb_func 0x81a5ed4 thumb_func 0x81a5f18 nullsub_115 thumb_func 0x81a5f1c nullsub_114 -thumb_func 0x81a5f20 +thumb_func 0x81a5f20 SelectInitialRentalMons thumb_func 0x81a5f30 thumb_func 0x81a5f3c -thumb_func 0x81a5f48 -thumb_func 0x81a6150 -thumb_func 0x81a6164 -thumb_func 0x81a625c -thumb_func 0x81a6584 -thumb_func 0x81a67a0 +thumb_func 0x81a5f48 GenerateOpponentMons +thumb_func 0x81a6150 VBlankCB_EvolutionScene +thumb_func 0x81a6164 SetRentalsToOpponentParty +thumb_func 0x81a625c SetPlayerAndOpponentParties +thumb_func 0x81a6584 GenerateInitialRentalMons +thumb_func 0x81a67a0 GetOpponentMostCommonMonType thumb_func 0x81a6884 GetOpponentBattleStyle -thumb_func 0x81a693c +thumb_func 0x81a693c GetMoveBattleStyle thumb_func 0x81a698c InBattleFactory -thumb_func 0x81a69b4 +thumb_func 0x81a69b4 RestorePlayerPartyHeldItems thumb_func 0x81a6a40 GetFactoryMonFixedIV -thumb_func 0x81a6a68 -thumb_func 0x81a6c88 +thumb_func 0x81a6a68 FillFactoryBrainParty +thumb_func 0x81a6c88 GetMonSetId thumb_func 0x81a6d08 GetNumPastRentalsRank -thumb_func 0x81a6d4c -thumb_func 0x81a6dbc +thumb_func 0x81a6d4c GetAiScriptsInBattleFactory +thumb_func 0x81a6dbc SetMonMoveAvoidReturn thumb_func 0x81a6dd4 thumb_func 0x81a6de8 nullsub_117 -thumb_func 0x81a6df4 +thumb_func 0x81a6df4 SetRoomType thumb_func 0x81a6e08 -thumb_func 0x81a6ec0 -thumb_func 0x81a6fc8 -thumb_func 0x81a7138 +thumb_func 0x81a6ec0 GetBattlePikeData +thumb_func 0x81a6fc8 SetBattlePikeData +thumb_func 0x81a7138 GetInFinalRoom thumb_func 0x81a716c thumb_func 0x81a7180 thumb_func 0x81a718c thumb_func 0x81a7198 thumb_func 0x81a71e0 nullsub_118 thumb_func 0x81a71e4 nullsub_119 -thumb_func 0x81a71e8 +thumb_func 0x81a71e8 GetRoomInflictedStatus thumb_func 0x81a724c -thumb_func 0x81a7260 -thumb_func 0x81a7288 -thumb_func 0x81a7300 -thumb_func 0x81a7314 -thumb_func 0x81a73a8 -thumb_func 0x81a73fc -thumb_func 0x81a74a8 -thumb_func 0x81a76f4 -thumb_func 0x81a776c -thumb_func 0x81a78d8 +thumb_func 0x81a7260 HealOneOrTwoMons +thumb_func 0x81a7288 BufferNPCMessage +thumb_func 0x81a7300 StatusInflictionScreenFade +thumb_func 0x81a7314 HealMon +thumb_func 0x81a73a8 DoesAbilityPreventStatus +thumb_func 0x81a73fc DoesTypePreventStatus +thumb_func 0x81a74a8 TryInflictRandomStatus +thumb_func 0x81a76f4 AtLeastOneHealthyMon +thumb_func 0x81a776c GetNextRoomType +thumb_func 0x81a78d8 GetNPCRoomGraphicsId thumb_func 0x81a7904 -thumb_func 0x81a7910 -thumb_func 0x81a7a80 +thumb_func 0x81a7910 TryGenerateBattlePikeWildMon +thumb_func 0x81a7a80 GetBattlePikeWildMonHeaderId thumb_func 0x81a7ad4 -thumb_func 0x81a7b0c -thumb_func 0x81a7b68 +thumb_func 0x81a7b0c StatusInflictionFadeOut +thumb_func 0x81a7b68 StatusInflictionFadeIn thumb_func 0x81a7be0 -thumb_func 0x81a7c44 -thumb_func 0x81a7c64 -thumb_func 0x81a7cb8 +thumb_func 0x81a7c44 IsStatusInflictionScreenFadeTaskFinished +thumb_func 0x81a7c64 Task_DoStatusInflictionScreenFade +thumb_func 0x81a7cb8 TryHealMons thumb_func 0x81a7e10 GetInBattlePike thumb_func 0x81a7e28 InBattlePike -thumb_func 0x81a7e5c +thumb_func 0x81a7e5c SetHintedRoom thumb_func 0x81a7fdc GetHintedRoomIndex thumb_func 0x81a7ffc GetRoomTypeHint -thumb_func 0x81a8024 -thumb_func 0x81a80f4 +thumb_func 0x81a8024 PrepareOneTrainer +thumb_func 0x81a80f4 PrepareTwoTrainers thumb_func 0x81a8234 ClearPikeTrainerIds -thumb_func 0x81a826c -thumb_func 0x81a82d4 -thumb_func 0x81a8310 +thumb_func 0x81a826c BufferRecordMixingTrainerMessage +thumb_func 0x81a82d4 AtLeastTwoAliveMons +thumb_func 0x81a8310 GetPikeQueenFightType thumb_func 0x81a83bc GetCurrentRoomPikeQueenFightType thumb_func 0x81a83d8 HealSomeMonsBeforePikeQueen thumb_func 0x81a841c SetHealingRoomsDisabled -thumb_func 0x81a8440 -thumb_func 0x81a8514 -thumb_func 0x81a8568 +thumb_func 0x81a8440 CanAnyPartyMonsBeHealed +thumb_func 0x81a8514 BackupMonHeldItems +thumb_func 0x81a8568 RestoreMonHeldItems thumb_func 0x81a85b0 InitPikeChallenge -thumb_func 0x81a8630 +thumb_func 0x81a8630 CanEncounterWildMon thumb_func 0x81a868c SpeciesToPikeMonId -thumb_func 0x81a86b4 -thumb_func 0x81a86dc -thumb_func 0x81a8720 -thumb_func 0x81a8878 +thumb_func 0x81a86b4 InitMossdeepGymTiles +thumb_func 0x81a86dc FinishMossdeepGymTiles +thumb_func 0x81a8720 MossdeepGym_MoveEvents +thumb_func 0x81a8878 MossdeepGym_TurnEvents thumb_func 0x81a8ae0 AddEventObject thumb_func 0x81a8b14 thumb_func 0x81a8bfc thumb_func 0x81a8c10 nullsub_1201 -thumb_func 0x81a8c1c -thumb_func 0x81a8cb8 -thumb_func 0x81a8dc8 +thumb_func 0x81a8c1c InitPyramidChallenge +thumb_func 0x81a8cb8 GetBattlePyramidData +thumb_func 0x81a8dc8 SetBattlePyramidData thumb_func 0x81a8eb4 -thumb_func 0x81a8efc -thumb_func 0x81a8f7c -thumb_func 0x81a8fd4 +thumb_func 0x81a8efc SetBattlePyramidRewardItem +thumb_func 0x81a8f7c GiveBattlePyramidRewardItem +thumb_func 0x81a8fd4 SeedPyramidFloor thumb_func 0x81a9010 -thumb_func 0x81a9140 +thumb_func 0x81a9140 HidePyramidItem thumb_func 0x81a918c -thumb_func 0x81a919c +thumb_func 0x81a919c ShowPostBattleHintText thumb_func 0x81a9390 UpdatePyramidWinStreak thumb_func 0x81a93e4 GetInBattlePyramid -thumb_func 0x81a93fc -thumb_func 0x81a94d4 -thumb_func 0x81a9540 -thumb_func 0x81a9554 -thumb_func 0x81a95a0 -thumb_func 0x81a95ac -thumb_func 0x81a9710 +thumb_func 0x81a93fc UpdatePyramidLightRadius +thumb_func 0x81a94d4 ClearPyramidPartyHeldItems +thumb_func 0x81a9540 SetPyramidFloorPalette +thumb_func 0x81a9554 Task_SetPyramidFloorPalette +thumb_func 0x81a95a0 FldEff_UseSecretPowerShrub +thumb_func 0x81a95ac RestorePyramidPlayerParty +thumb_func 0x81a9710 GetPostBattleDirectionHintTextIndex thumb_func 0x81a9820 thumb_func 0x81a983c GetBattlePyramidTrainerFlag -thumb_func 0x81a987c +thumb_func 0x81a987c MarkApproachingPyramidTrainersAsBattled thumb_func 0x81a98bc MarkPyramidTrainerAsBattled -thumb_func 0x81a997c +thumb_func 0x81a997c GenerateBattlePyramidWildMon thumb_func 0x81a9ba0 GetPyramidRunMultiplier -thumb_func 0x81a9bb8 +thumb_func 0x81a9bb8 InBattlePyramid thumb_func 0x81a9be4 InBattlePyramid_ thumb_func 0x81a9c08 -thumb_func 0x81a9c40 -thumb_func 0x81a9c54 -thumb_func 0x81a9c74 -thumb_func 0x81a9c94 -thumb_func 0x81a9cb4 +thumb_func 0x81a9c40 SoftResetInBattlePyramid +thumb_func 0x81a9c54 CopyPyramidTrainerSpeechBefore +thumb_func 0x81a9c74 CopyPyramidTrainerWinSpeech +thumb_func 0x81a9c94 CopyPyramidTrainerLoseSpeech +thumb_func 0x81a9cb4 GetBattlePyramindTrainerEncounterMusicId thumb_func 0x81a9cf8 -thumb_func 0x81a9d08 -thumb_func 0x81a9df0 -thumb_func 0x81a9f50 -thumb_func 0x81aa070 +thumb_func 0x81a9d08 GetUniqueTrainerId +thumb_func 0x81a9df0 GenerateBattlePyramidFloorLayout +thumb_func 0x81a9f50 LoadBattlePyramidEventObjectTemplates +thumb_func 0x81aa070 LoadBattlePyramidFloorEventObjectScripts thumb_func 0x81aa0b4 GetPyramidEntranceAndExitSquareIds -thumb_func 0x81aa110 -thumb_func 0x81aa250 -thumb_func 0x81aa3c0 -thumb_func 0x81aa4d8 -thumb_func 0x81aa588 +thumb_func 0x81aa110 SetPyramidObjectPositionsUniformly +thumb_func 0x81aa250 SetPyramidObjectPositionsInAndNearSquare +thumb_func 0x81aa3c0 SetPyramidObjectPositionsNearSquare +thumb_func 0x81aa4d8 TrySetPyramidEventObjectPositionInSquare +thumb_func 0x81aa588 TrySetPyramidEventObjectPositionAtCoords thumb_func 0x81aa6e4 GetPyramidFloorLayoutOffsets -thumb_func 0x81aa75c -thumb_func 0x81aa7b8 -thumb_func 0x81aa7f4 -thumb_func 0x81aa858 -thumb_func 0x81aa8e8 -thumb_func 0x81aa914 +thumb_func 0x81aa75c GetPyramidFloorTemplateId +thumb_func 0x81aa7b8 GetNumBattlePyramidEventObjects +thumb_func 0x81aa7f4 InitPyramidBagItems +thumb_func 0x81aa858 GetBattlePyramidPickupItemId +thumb_func 0x81aa8e8 ResetBagScrollPositions +thumb_func 0x81aa914 CB2_BagMenuFromStartMenu thumb_func 0x81aa928 -thumb_func 0x81aa954 +thumb_func 0x81aa954 CB2_ChooseBerry thumb_func 0x81aa968 -thumb_func 0x81aa978 +thumb_func 0x81aa978 CB2_GoToSellMenu thumb_func 0x81aa98c thumb_func 0x81aa9a0 thumb_func 0x81aa9c8 thumb_func 0x81aa9e8 -thumb_func 0x81aaa08 +thumb_func 0x81aaa08 GoToBagMenu thumb_func 0x81aaad4 -thumb_func 0x81aaaf0 -thumb_func 0x81aab04 -thumb_func 0x81aab30 -thumb_func 0x81aadc0 -thumb_func 0x81aae2c -thumb_func 0x81aaf60 -thumb_func 0x81aaf88 -thumb_func 0x81aafb0 +thumb_func 0x81aaaf0 c2_bag_3 +thumb_func 0x81aab04 CB2_Bag +thumb_func 0x81aab30 SetupBagMenu +thumb_func 0x81aadc0 BagMenu_InitBGs +thumb_func 0x81aae2c LoadBagMenu_Graphics +thumb_func 0x81aaf60 AccessHallOfFamePC +thumb_func 0x81aaf88 AllocateBagItemListBuffers +thumb_func 0x81aafb0 LoadBagItemListBuffers thumb_func 0x81ab10c -thumb_func 0x81ab1c0 -thumb_func 0x81ab290 -thumb_func 0x81ab414 +thumb_func 0x81ab1c0 BagMenu_MoveCursorCallback +thumb_func 0x81ab290 PrintItemQuantityPlusGFX +thumb_func 0x81ab414 BagMenu_PrintDescription thumb_func 0x81ab4a0 -thumb_func 0x81ab4e8 -thumb_func 0x81ab508 -thumb_func 0x81ab568 +thumb_func 0x81ab4e8 BagMenu_PrintCursor_ +thumb_func 0x81ab508 BagMenu_PrintCursor +thumb_func 0x81ab568 bag_menu_add_pocket_scroll_arrow_indicators_maybe thumb_func 0x81ab5d0 -thumb_func 0x81ab600 +thumb_func 0x81ab600 bag_menu_add_list_scroll_arrow_indicators_maybe thumb_func 0x81ab648 thumb_func 0x81ab674 thumb_func 0x81ab6a4 -thumb_func 0x81ab6dc +thumb_func 0x81ab6dc TaskCloseBagMenu_2 thumb_func 0x81ab754 thumb_func 0x81ab818 -thumb_func 0x81ab834 +thumb_func 0x81ab834 SetInitialScrollAndCursorPositions thumb_func 0x81ab870 SetPocketListPositions thumb_func 0x81ab88c thumb_func 0x81ab8d8 GetItemListPosition -thumb_func 0x81ab8f8 -thumb_func 0x81ab968 -thumb_func 0x81ab9e8 +thumb_func 0x81ab8f8 DisplayItemMessage +thumb_func 0x81ab968 BagMenu_InitListsMenu +thumb_func 0x81ab9e8 GetItemName thumb_func 0x81aba50 thumb_func 0x81abab4 -thumb_func 0x81abc58 -thumb_func 0x81abc9c +thumb_func 0x81abc58 set_callback3_to_bag +thumb_func 0x81abc9c GetSwitchBagPocketDirection thumb_func 0x81abcfc ChangeBagPocketId -thumb_func 0x81abd34 +thumb_func 0x81abd34 Fill1PRecords thumb_func 0x81abec0 thumb_func 0x81ac000 -thumb_func 0x81ac030 +thumb_func 0x81ac030 BagMenu_DrawPocketIndicatorSquare thumb_func 0x81ac084 thumb_func 0x81ac0ac thumb_func 0x81ac184 @@ -13772,173 +13772,173 @@ thumb_func 0x81ac354 thumb_func 0x81ac408 thumb_func 0x81ac8bc thumb_func 0x81ac938 -thumb_func 0x81ac9a8 -thumb_func 0x81ac9fc -thumb_func 0x81aca70 +thumb_func 0x81ac9a8 unknown_item_menu_type +thumb_func 0x81ac9fc Task_HandleInBattleItemMenuInput +thumb_func 0x81aca70 Task_HandleOutOfBattleItemMenuInput thumb_func 0x81acbf4 -thumb_func 0x81acc30 -thumb_func 0x81acc74 -thumb_func 0x81accec +thumb_func 0x81acc30 BagMenu_RemoveSomeWindow +thumb_func 0x81acc74 ItemMenu_UseOutOfBattle +thumb_func 0x81accec ItemMenu_Toss thumb_func 0x81acd80 -thumb_func 0x81ace08 -thumb_func 0x81ace3c -thumb_func 0x81acec4 -thumb_func 0x81acf48 -thumb_func 0x81acfe4 -thumb_func 0x81ad070 -thumb_func 0x81ad0e8 -thumb_func 0x81ad104 +thumb_func 0x81ace08 BagMenu_CancelToss +thumb_func 0x81ace3c Task_ChooseHowManyToToss +thumb_func 0x81acec4 BagMenu_ConfirmToss +thumb_func 0x81acf48 Task_ActuallyToss +thumb_func 0x81acfe4 ItemMenu_Register +thumb_func 0x81ad070 ItemMenu_Give +thumb_func 0x81ad0e8 BagMenu_PrintThereIsNoPokemon +thumb_func 0x81ad104 BagMenu_PrintItemCantBeHeld thumb_func 0x81ad148 -thumb_func 0x81ad170 -thumb_func 0x81ad190 -thumb_func 0x81ad1d4 -thumb_func 0x81ad204 -thumb_func 0x81ad214 -thumb_func 0x81ad2ac -thumb_func 0x81ad318 -thumb_func 0x81ad3d4 +thumb_func 0x81ad170 ItemMenu_CheckTag +thumb_func 0x81ad190 ItemMenu_Cancel +thumb_func 0x81ad1d4 AnimRazorLeafParticle +thumb_func 0x81ad204 bag_menu_mail_related +thumb_func 0x81ad214 item_menu_type_2 +thumb_func 0x81ad2ac item_menu_type_b +thumb_func 0x81ad318 UseRegisteredKeyItemOnField +thumb_func 0x81ad3d4 DisplaySellItemAskString thumb_func 0x81ad478 thumb_func 0x81ad4dc -thumb_func 0x81ad4f4 +thumb_func 0x81ad4f4 BagMenu_CancelSell thumb_func 0x81ad528 thumb_func 0x81ad57c thumb_func 0x81ad5a8 -thumb_func 0x81ad660 +thumb_func 0x81ad660 BagMenu_ConfirmSell thumb_func 0x81ad6dc thumb_func 0x81ad7d4 -thumb_func 0x81ad800 +thumb_func 0x81ad800 DisplayDepositItemAskString thumb_func 0x81ad890 thumb_func 0x81ad928 thumb_func 0x81ada18 -thumb_func 0x81ada60 -thumb_func 0x81ada7c -thumb_func 0x81adb0c -thumb_func 0x81adb7c -thumb_func 0x81adba4 +thumb_func 0x81ada60 IsWallysBag +thumb_func 0x81ada7c PrepareBagForWallyTutorial +thumb_func 0x81adb0c RestoreBagAfterWallyTutorial +thumb_func 0x81adb7c DoWallyTutorialBagMenu +thumb_func 0x81adba4 Task_WallyTutorialBagMenu thumb_func 0x81adc44 thumb_func 0x81adc78 -thumb_func 0x81adc98 +thumb_func 0x81adc98 unknown_ItemMenu_Give2 thumb_func 0x81adcc8 -thumb_func 0x81adce8 +thumb_func 0x81adce8 unknown_ItemMenu_Confirm2 thumb_func 0x81add0c -thumb_func 0x81add2c -thumb_func 0x81add94 +thumb_func 0x81add2c SetupBagMenu_Textboxes +thumb_func 0x81add94 BagMenu_Print thumb_func 0x81addfc -thumb_func 0x81ade14 +thumb_func 0x81ade14 BagMenu_AddWindow thumb_func 0x81ade5c -thumb_func 0x81ade9c +thumb_func 0x81ade9c AddItemMessageWindow thumb_func 0x81aded0 -thumb_func 0x81adf10 -thumb_func 0x81adf40 -thumb_func 0x81adf7c -thumb_func 0x81adf8c -thumb_func 0x81adfd4 +thumb_func 0x81adf10 BagMenu_YesNo +thumb_func 0x81adf40 bag_menu_AddMoney_window +thumb_func 0x81adf7c bag_menu_remove_money_window +thumb_func 0x81adf8c BagMenu_PrepareTMHMMoveWindow +thumb_func 0x81adfd4 PrintTMHMMoveData thumb_func 0x81ae130 nullsub_121 -thumb_func 0x81ae134 -thumb_func 0x81ae25c -thumb_func 0x81ae288 -thumb_func 0x81ae2dc -thumb_func 0x81ae3a0 -thumb_func 0x81ae3e4 +thumb_func 0x81ae134 DoMysteryGiftListMenu +thumb_func 0x81ae25c ListMenuInit +thumb_func 0x81ae288 ListMenuInitInRect +thumb_func 0x81ae2dc ListMenu_ProcessInput +thumb_func 0x81ae3a0 DestroyListMenuTask +thumb_func 0x81ae3e4 RedrawListMenu thumb_func 0x81ae428 ChangeListMenuPals -thumb_func 0x81ae46c +thumb_func 0x81ae46c ChangeListMenuCoords thumb_func 0x81ae4a8 ListMenuTestInput thumb_func 0x81ae510 ListMenuGetCurrentItemArrayId thumb_func 0x81ae538 ListMenuGetScrollAndRow -thumb_func 0x81ae564 -thumb_func 0x81ae5ac -thumb_func 0x81ae68c -thumb_func 0x81ae740 -thumb_func 0x81ae7f8 -thumb_func 0x81ae8f0 -thumb_func 0x81ae950 +thumb_func 0x81ae564 ListMenuGetYCoordForPrintingArrowCursor +thumb_func 0x81ae5ac ListMenuInitInternal +thumb_func 0x81ae68c ListMenuPrint +thumb_func 0x81ae740 ListMenuPrintEntries +thumb_func 0x81ae7f8 ListMenuDrawCursor +thumb_func 0x81ae8f0 ListMenuAddCursorObject +thumb_func 0x81ae950 ListMenuErasePrintedCursor thumb_func 0x81ae9d8 ListMenuUpdateSelectedRowIndexAndScrollOffset -thumb_func 0x81aeac8 -thumb_func 0x81aec00 -thumb_func 0x81aecd8 +thumb_func 0x81aeac8 ListMenuScroll +thumb_func 0x81aec00 ListMenuChangeSelection +thumb_func 0x81aecd8 ListMenuCallSelectionChangedCallback thumb_func 0x81aed00 ListMenuOverrideSetColors -thumb_func 0x81aed50 -thumb_func 0x81aed64 -thumb_func 0x81aee34 -thumb_func 0x81aef3c -thumb_func 0x81aefc8 -thumb_func 0x81af058 -thumb_func 0x81af178 -thumb_func 0x81af1dc -thumb_func 0x81af274 -thumb_func 0x81af2f8 +thumb_func 0x81aed50 ListMenuDefaultCursorMoveFunc +thumb_func 0x81aed64 ListMenuGetUnkIndicatorsStructFields +thumb_func 0x81aee34 ListMenuSetUnkIndicatorsStructField +thumb_func 0x81aef3c SpriteCallback_ScrollIndicatorArrow +thumb_func 0x81aefc8 AddScrollIndicatorArrowObject +thumb_func 0x81af058 AddScrollIndicatorArrowPair +thumb_func 0x81af178 AddScrollIndicatorArrowPairParameterized +thumb_func 0x81af1dc Task_ScrollIndicatorArrowPair +thumb_func 0x81af274 Task_ScrollIndicatorArrowPairOnMainMenu +thumb_func 0x81af2f8 RemoveScrollIndicatorArrowPair thumb_func 0x81af358 ListMenuAddCursorObjectInternal thumb_func 0x81af374 ListMenuUpdateCursorObject thumb_func 0x81af39c ListMenuRemoveCursorObject thumb_func 0x81af3bc nullsub_28 thumb_func 0x81af3c0 ListMenuGetRedOutlineCursorSpriteCount thumb_func 0x81af3fc ListMenuSetUpRedOutlineCursorSpriteOamTable -thumb_func 0x81af500 +thumb_func 0x81af500 ListMenuAddRedOutlineCursorObject thumb_func 0x81af66c ListMenuUpdateRedOutlineCursorObject -thumb_func 0x81af6b0 +thumb_func 0x81af6b0 ListMenuRemoveRedOutlineCursorObject thumb_func 0x81af708 SpriteCallback_RedArrowCursor thumb_func 0x81af734 nullsub_120 -thumb_func 0x81af738 +thumb_func 0x81af738 ListMenuAddRedArrowCursorObject thumb_func 0x81af840 ListMenuUpdateRedArrowCursorObject -thumb_func 0x81af878 +thumb_func 0x81af878 ListMenuRemoveRedArrowCursorObject thumb_func 0x81af8c8 DynamicPlaceholderTextUtil_Reset thumb_func 0x81af8e4 DynamicPlaceholderTextUtil_SetPlaceholderPtr -thumb_func 0x81af900 +thumb_func 0x81af900 DynamicPlaceholderTextUtil_ExpandPlaceholders thumb_func 0x81af94c -thumb_func 0x81af95c -thumb_func 0x81af9a4 -thumb_func 0x81af9b4 +thumb_func 0x81af95c IsCurMapInLocationList +thumb_func 0x81af9a4 IsCurMapPokeCenter +thumb_func 0x81af9b4 IsCurMapReloadLocation thumb_func 0x81af9c4 -thumb_func 0x81af9d4 -thumb_func 0x81afa04 +thumb_func 0x81af9d4 TrySetPokeCenterWarpStatus +thumb_func 0x81afa04 TrySetReloadWarpStatus thumb_func 0x81afa34 -thumb_func 0x81afa64 +thumb_func 0x81afa64 TrySetMapSaveWarpStatus thumb_func 0x81afa78 thumb_func 0x81afaa8 -thumb_func 0x81afabc -thumb_func 0x81afafc -thumb_func 0x81afb1c -thumb_func 0x81afb48 -thumb_func 0x81afc0c +thumb_func 0x81afabc AllocItemIconTemporaryBuffers +thumb_func 0x81afafc FreeItemIconTemporaryBuffers +thumb_func 0x81afb1c CopyItemIconPicTo4x4Buffer +thumb_func 0x81afb48 AddItemIconSprite +thumb_func 0x81afc0c AddCustomItemIconSprite thumb_func 0x81afcd4 GetItemIconPicOrPalette -thumb_func 0x81afd10 -thumb_func 0x81afe88 +thumb_func 0x81afd10 InitPartyMenu +thumb_func 0x81afe88 PartyMenuCallback thumb_func 0x81afea4 -thumb_func 0x81afeb8 -thumb_func 0x81afee4 -thumb_func 0x81b0194 -thumb_func 0x81b01d0 +thumb_func 0x81afeb8 PartyMenuInitCallback +thumb_func 0x81afee4 PartyMenuSetup +thumb_func 0x81b0194 PartyMenuExit +thumb_func 0x81b01d0 PartyMenuExitTask thumb_func 0x81b0204 reset_brm -thumb_func 0x81b0228 -thumb_func 0x81b02a0 -thumb_func 0x81b0398 -thumb_func 0x81b03cc -thumb_func 0x81b0418 -thumb_func 0x81b04b8 -thumb_func 0x81b0620 -thumb_func 0x81b06e8 -thumb_func 0x81b0774 -thumb_func 0x81b07e0 -thumb_func 0x81b0838 +thumb_func 0x81b0228 AllocPartyMenuBg +thumb_func 0x81b02a0 AllocPartyMiscGfx +thumb_func 0x81b0398 PartyPaletteBufferCopy +thumb_func 0x81b03cc FreePartyPointers +thumb_func 0x81b0418 PartyMenuInitHelperStructs +thumb_func 0x81b04b8 RenderPartyMenuBox +thumb_func 0x81b0620 DisplayPartyPokemonData +thumb_func 0x81b06e8 DisplayPartyPokemonSelectData +thumb_func 0x81b0774 DisplayPartyPokemonSelectForBattle +thumb_func 0x81b07e0 DisplayPartyPokemonSelectForContest +thumb_func 0x81b0838 DisplayPartyPokemonSelectForRelearner thumb_func 0x81b0870 -thumb_func 0x81b089c +thumb_func 0x81b089c DisplayPartyPokemonSelectHeldItemRelated thumb_func 0x81b08d4 -thumb_func 0x81b096c +thumb_func 0x81b096c DisplayPartyPokemonSelectToTeachMove thumb_func 0x81b09c4 thumb_func 0x81b0a70 -thumb_func 0x81b0aa4 -thumb_func 0x81b0ab8 -thumb_func 0x81b0bc4 +thumb_func 0x81b0aa4 GetPartyMiscGraphicsTile +thumb_func 0x81b0ab8 party_menu_add_per_mon_objects_internal +thumb_func 0x81b0bc4 party_menu_add_per_mon_objects thumb_func 0x81b0bf8 thumb_func 0x81b0c9c -thumb_func 0x81b0dc8 -thumb_func 0x81b0e5c +thumb_func 0x81b0dc8 GetPartyBoxPalBitfield +thumb_func 0x81b0e5c PartyBoxPal_ParnterOrDisqualifiedInArena thumb_func 0x81b0edc -thumb_func 0x81b0f20 +thumb_func 0x81b0f20 IsMultiBattle thumb_func 0x81b0f58 thumb_func 0x81b0f90 -thumb_func 0x81b0fc8 -thumb_func 0x81b1024 +thumb_func 0x81b0fc8 c3_0811FAB4 +thumb_func 0x81b1024 GetCursorSelectionMonId thumb_func 0x81b1030 thumb_func 0x81b1040 thumb_func 0x81b10bc @@ -13948,15 +13948,15 @@ thumb_func 0x81b12a0 thumb_func 0x81b1330 thumb_func 0x81b13a4 thumb_func 0x81b13d8 -thumb_func 0x81b1430 -thumb_func 0x81b14c8 -thumb_func 0x81b1524 -thumb_func 0x81b162c +thumb_func 0x81b1430 PartyMenuButtonHandler +thumb_func 0x81b14c8 UpdateCurrentPartySelection +thumb_func 0x81b1524 SetNewPartySelectTarget1 +thumb_func 0x81b162c SetNewPartySelectTarget2 thumb_func 0x81b17d0 -thumb_func 0x81b1814 +thumb_func 0x81b1814 GetMonNickname thumb_func 0x81b182c thumb_func 0x81b185c -thumb_func 0x81b18a4 +thumb_func 0x81b18a4 LoadListMenuArrowsGfx thumb_func 0x81b18b8 thumb_func 0x81b18ec thumb_func 0x81b1954 @@ -13964,13 +13964,13 @@ thumb_func 0x81b19a0 thumb_func 0x81b19ec thumb_func 0x81b1a38 thumb_func 0x81b1a88 -thumb_func 0x81b1ad0 -thumb_func 0x81b1b18 +thumb_func 0x81b1ad0 InitEventObjectPalettes +thumb_func 0x81b1b18 pokemon_item_not_removed thumb_func 0x81b1b30 thumb_func 0x81b1be8 thumb_func 0x81b1c78 thumb_func 0x81b1ce4 pokemon_ailments_get_primary -thumb_func 0x81b1d2c +thumb_func 0x81b1d2c GetMonAilment thumb_func 0x81b1d6c thumb_func 0x81b1e04 thumb_func 0x81b1e34 @@ -13979,32 +13979,32 @@ thumb_func 0x81b1e7c thumb_func 0x81b1ee0 thumb_func 0x81b1f18 thumb_func 0x81b1f4c -thumb_func 0x81b1fa8 +thumb_func 0x81b1fa8 CanMonLearnTMTutor thumb_func 0x81b2030 -thumb_func 0x81b2040 +thumb_func 0x81b2040 CanLearnTutorMove thumb_func 0x81b206c thumb_func 0x81b20f8 -thumb_func 0x81b2200 -thumb_func 0x81b2214 -thumb_func 0x81b22f4 -thumb_func 0x81b2358 +thumb_func 0x81b2200 GetPartyMenuPaletteFromBuffer +thumb_func 0x81b2214 BlitBitmapToPartyWindow +thumb_func 0x81b22f4 BlitBitmapToPartyWindow_Default1 +thumb_func 0x81b2358 BlitBitmapToPartyWindow_Default2 thumb_func 0x81b23bc DrawEmptySlot -thumb_func 0x81b23e4 -thumb_func 0x81b26d8 -thumb_func 0x81b270c -thumb_func 0x81b2764 -thumb_func 0x81b27dc -thumb_func 0x81b2828 -thumb_func 0x81b2890 -thumb_func 0x81b2970 -thumb_func 0x81b29d8 -thumb_func 0x81b2a08 -thumb_func 0x81b2a70 -thumb_func 0x81b2abc -thumb_func 0x81b2af8 +thumb_func 0x81b23e4 UpdateSelectedPartyBox +thumb_func 0x81b26d8 DisplayPartyPokemonBarDetail +thumb_func 0x81b270c DisplayPartyPokemonNickname +thumb_func 0x81b2764 DisplayPartyPokemonLevelCheck +thumb_func 0x81b27dc DisplayPartyPokemonLevel +thumb_func 0x81b2828 DisplayPartyPokemonGenderNidoranCheck +thumb_func 0x81b2890 DisplayPartyPokemonGender +thumb_func 0x81b2970 DisplayPartyPokemonHPCheck +thumb_func 0x81b29d8 DisplayPartyPokemonHP +thumb_func 0x81b2a08 DisplayPartyPokemonMaxHPCheck +thumb_func 0x81b2a70 DisplayPartyPokemonMaxHP +thumb_func 0x81b2abc DisplayPartyPokemonHPBarCheck +thumb_func 0x81b2af8 DisplayPartyPokemonHPBar thumb_func 0x81b2c3c thumb_func 0x81b2cb0 -thumb_func 0x81b2cd8 +thumb_func 0x81b2cd8 display_pokemon_menu_message thumb_func 0x81b2dd0 thumb_func 0x81b2e34 thumb_func 0x81b2f90 @@ -14012,15 +14012,15 @@ thumb_func 0x81b2fdc thumb_func 0x81b3004 thumb_func 0x81b3034 thumb_func 0x81b3054 -thumb_func 0x81b30b4 +thumb_func 0x81b30b4 CreateActionList thumb_func 0x81b31dc thumb_func 0x81b32a8 thumb_func 0x81b339c -thumb_func 0x81b33d0 +thumb_func 0x81b33d0 HandleMenuInput thumb_func 0x81b349c thumb_func 0x81b34c8 thumb_func 0x81b3534 -thumb_func 0x81b357c +thumb_func 0x81b357c CursorCb_Switch thumb_func 0x81b35d8 thumb_func 0x81b3778 thumb_func 0x81b37e0 @@ -14030,13 +14030,13 @@ thumb_func 0x81b3960 thumb_func 0x81b39e8 thumb_func 0x81b3b00 thumb_func 0x81b3bb0 oamt_swap_pos -thumb_func 0x81b3c7c +thumb_func 0x81b3c7c swap_pokemon_and_oams thumb_func 0x81b3d1c -thumb_func 0x81b3d74 -thumb_func 0x81b3dd4 +thumb_func 0x81b3d74 CursorCb_Cancel1 +thumb_func 0x81b3dd4 CursorCb_Item thumb_func 0x81b3e38 thumb_func 0x81b3e64 -thumb_func 0x81b3e90 +thumb_func 0x81b3e90 c2_8123744 thumb_func 0x81b3f70 thumb_func 0x81b3ff0 thumb_func 0x81b4048 @@ -14046,100 +14046,100 @@ thumb_func 0x81b41cc thumb_func 0x81b4218 thumb_func 0x81b42c4 thumb_func 0x81b433c -thumb_func 0x81b43c4 -thumb_func 0x81b4480 +thumb_func 0x81b43c4 CursorCb_TakeItem +thumb_func 0x81b4480 CursorCb_Toss thumb_func 0x81b4548 -thumb_func 0x81b457c +thumb_func 0x81b457c BagMenu_TossItems thumb_func 0x81b4628 -thumb_func 0x81b46a8 -thumb_func 0x81b470c +thumb_func 0x81b46a8 CursorCb_Mail +thumb_func 0x81b470c CursorCb_Read thumb_func 0x81b4738 thumb_func 0x81b4780 -thumb_func 0x81b47c0 +thumb_func 0x81b47c0 CursorCb_TakeMail thumb_func 0x81b480c thumb_func 0x81b4840 thumb_func 0x81b4900 thumb_func 0x81b4934 -thumb_func 0x81b4a18 -thumb_func 0x81b4acc -thumb_func 0x81b4b2c +thumb_func 0x81b4a18 CursorCb_Cancel2 +thumb_func 0x81b4acc CursorCb_SendMon +thumb_func 0x81b4b2c CursorCb_Enter thumb_func 0x81b4c28 -thumb_func 0x81b4c48 -thumb_func 0x81b4d4c -thumb_func 0x81b4d68 -thumb_func 0x81b4e74 -thumb_func 0x81b4f84 -thumb_func 0x81b509c +thumb_func 0x81b4c48 CursorCb_NoEntry +thumb_func 0x81b4d4c CursorCb_Store +thumb_func 0x81b4d68 CursorCb_Register +thumb_func 0x81b4e74 CursorCb_Trade1 +thumb_func 0x81b4f84 CursorCb_Trade2 +thumb_func 0x81b509c GetFlavorRelationByPersonality thumb_func 0x81b50d0 -thumb_func 0x81b5110 +thumb_func 0x81b5110 CursorCb_FieldMove thumb_func 0x81b5314 thumb_func 0x81b5344 thumb_func 0x81b5378 -thumb_func 0x81b53d8 -thumb_func 0x81b53f0 -thumb_func 0x81b542c +thumb_func 0x81b53d8 FieldCallback_PrepareFadeInFromMenu +thumb_func 0x81b53f0 task_launch_hm_phase_2 +thumb_func 0x81b542c brm_get_selected_species thumb_func 0x81b5454 task_brm_cancel_1_on_keypad_a_or_b thumb_func 0x81b547c thumb_func 0x81b54a4 -thumb_func 0x81b54c0 +thumb_func 0x81b54c0 SetUpFieldMove_Surf thumb_func 0x81b5504 -thumb_func 0x81b5524 +thumb_func 0x81b5524 SetUpFieldMove_Fly thumb_func 0x81b5548 -thumb_func 0x81b5574 -thumb_func 0x81b5590 +thumb_func 0x81b5574 hm2_waterfall +thumb_func 0x81b5590 SetUpFieldMove_Waterfall thumb_func 0x81b55f8 -thumb_func 0x81b5614 -thumb_func 0x81b5654 -thumb_func 0x81b56cc +thumb_func 0x81b5614 SetUpFieldMove_Dive +thumb_func 0x81b5654 party_menu_icon_anim +thumb_func 0x81b56cc party_menu_link_mon_icon_anim thumb_func 0x81b572c thumb_func 0x81b57d8 -thumb_func 0x81b580c -thumb_func 0x81b587c -thumb_func 0x81b58a8 -thumb_func 0x81b58b4 -thumb_func 0x81b58e8 +thumb_func 0x81b580c AnimateSelectedPartyIcon +thumb_func 0x81b587c UpdatePartyMonIconFrameAndBounce +thumb_func 0x81b58a8 UpdatePartyMonIconFrame +thumb_func 0x81b58b4 party_menu_held_item_object +thumb_func 0x81b58e8 party_menu_link_mon_held_item_object thumb_func 0x81b5934 thumb_func 0x81b5950 thumb_func 0x81b59d0 thumb_func 0x81b59ec thumb_func 0x81b5a90 -thumb_func 0x81b5b14 -thumb_func 0x81b5b6c +thumb_func 0x81b5b14 SpriteCB_HeldItem +thumb_func 0x81b5b6c party_menu_pokeball_object thumb_func 0x81b5b94 thumb_func 0x81b5bd4 thumb_func 0x81b5c14 thumb_func 0x81b5c38 thumb_func 0x81b5c5c -thumb_func 0x81b5ce0 -thumb_func 0x81b5d04 -thumb_func 0x81b5d38 -thumb_func 0x81b5d84 -thumb_func 0x81b5d9c -thumb_func 0x81b5e00 +thumb_func 0x81b5ce0 LoadPartyMenuPokeballGfx +thumb_func 0x81b5d04 party_menu_status_condition_object +thumb_func 0x81b5d38 party_menu_link_mon_status_condition_object +thumb_func 0x81b5d84 party_menu_get_status_condition_and_update_object +thumb_func 0x81b5d9c party_menu_update_status_condition_object +thumb_func 0x81b5e00 LoadPartyMenuAilmentGfx thumb_func 0x81b5e1c -thumb_func 0x81b5ef4 +thumb_func 0x81b5ef4 c2_815ABFC thumb_func 0x81b5f20 -thumb_func 0x81b5f70 -thumb_func 0x81b5fb0 -thumb_func 0x81b6170 +thumb_func 0x81b5f70 IsHPRecoveryItem +thumb_func 0x81b5fb0 GetMedicineItemEffectMessage +thumb_func 0x81b6170 UsingHPEVItemOnShedinja thumb_func 0x81b61a4 IsItemFlute -thumb_func 0x81b61c0 -thumb_func 0x81b6228 +thumb_func 0x81b61c0 ExecuteTableBasedItemEffect__ +thumb_func 0x81b6228 ItemUseCB_Medicine thumb_func 0x81b63cc thumb_func 0x81b6434 thumb_func 0x81b6468 -thumb_func 0x81b65bc -thumb_func 0x81b663c +thumb_func 0x81b65bc ItemEffectToMonEv +thumb_func 0x81b663c ItemEffectToStatString thumb_func 0x81b66b0 -thumb_func 0x81b677c -thumb_func 0x81b67c4 -thumb_func 0x81b6848 +thumb_func 0x81b677c ether_effect_related_3 +thumb_func 0x81b67c4 dp05_ether +thumb_func 0x81b6848 ether_effect_related_2 thumb_func 0x81b687c thumb_func 0x81b68b4 -thumb_func 0x81b6978 -thumb_func 0x81b69b4 -thumb_func 0x81b69cc -thumb_func 0x81b69fc +thumb_func 0x81b6978 dp05_pp_up +thumb_func 0x81b69b4 ItemIdToBattleMoveId +thumb_func 0x81b69cc IsMoveHm +thumb_func 0x81b69fc MonKnowsMove thumb_func 0x81b6a2c thumb_func 0x81b6a50 thumb_func 0x81b6a7c @@ -14158,7 +14158,7 @@ thumb_func 0x81b6ee0 thumb_func 0x81b6f44 thumb_func 0x81b6f78 thumb_func 0x81b7090 -thumb_func 0x81b70b0 +thumb_func 0x81b70b0 dp05_rare_candy thumb_func 0x81b71f8 thumb_func 0x81b7280 thumb_func 0x81b72e0 @@ -14172,12 +14172,12 @@ thumb_func 0x81b75b8 thumb_func 0x81b7644 thumb_func 0x81b768c thumb_func 0x81b76cc -thumb_func 0x81b77f0 +thumb_func 0x81b77f0 task_sacred_ash_party_loop thumb_func 0x81b78b4 thumb_func 0x81b7918 -thumb_func 0x81b7990 +thumb_func 0x81b7990 GetItemEffectType thumb_func 0x81b7af0 -thumb_func 0x81b7bd4 +thumb_func 0x81b7bd4 CB2_PartyMenuFromStartMenu thumb_func 0x81b7c00 thumb_func 0x81b7c4c thumb_func 0x81b7ce4 @@ -14193,10 +14193,10 @@ thumb_func 0x81b8090 thumb_func 0x81b80bc thumb_func 0x81b80e8 thumb_func 0x81b8114 -thumb_func 0x81b81b8 +thumb_func 0x81b81b8 InitChooseHalfPartyForBattle thumb_func 0x81b81f8 thumb_func 0x81b820c -thumb_func 0x81b824c +thumb_func 0x81b824c GetBattleEntryEligibility thumb_func 0x81b82fc thumb_func 0x81b8410 thumb_func 0x81b843c @@ -14209,7 +14209,7 @@ thumb_func 0x81b85a4 thumb_func 0x81b85cc thumb_func 0x81b85f8 thumb_func 0x81b8624 -thumb_func 0x81b864c +thumb_func 0x81b864c OpenPartyMenuInBattle thumb_func 0x81b8690 thumb_func 0x81b86cc thumb_func 0x81b871c @@ -14221,7 +14221,7 @@ thumb_func 0x81b8b20 thumb_func 0x81b8bd8 thumb_func 0x81b8c0c thumb_func 0x81b8c50 -thumb_func 0x81b8c8c +thumb_func 0x81b8c8c pokemon_order_func thumb_func 0x81b8cd0 thumb_func 0x81b8d20 thumb_func 0x81b8d70 @@ -14235,8 +14235,8 @@ thumb_func 0x81b8f34 thumb_func 0x81b8fc8 thumb_func 0x81b8ff4 thumb_func 0x81b9030 -thumb_func 0x81b9068 -thumb_func 0x81b9080 +thumb_func 0x81b9068 hm_add_c3_without_phase_2 +thumb_func 0x81b9080 TossPokeblockChoice_No thumb_func 0x81b90a4 thumb_func 0x81b90c4 thumb_func 0x81b9110 @@ -14248,7 +14248,7 @@ thumb_func 0x81b9228 thumb_func 0x81b9280 thumb_func 0x81b92c0 thumb_func 0x81b92e0 -thumb_func 0x81b932c +thumb_func 0x81b932c ForcedMovement_Slip thumb_func 0x81b9370 thumb_func 0x81b93b8 thumb_func 0x81b9410 @@ -14280,21 +14280,21 @@ thumb_func 0x81b99c8 thumb_func 0x81b9a1c thumb_func 0x81b9a38 thumb_func 0x81b9a54 -thumb_func 0x81b9a98 +thumb_func 0x81b9a98 GetTrainerEncounterMusicId thumb_func 0x81b9ac0 thumb_func 0x81b9b18 thumb_func 0x81b9b28 thumb_func 0x81b9b34 InSlateportBattleTent thumb_func 0x81b9b60 thumb_func 0x81b9ce0 -thumb_func 0x81b9ef0 -thumb_func 0x81ba308 +thumb_func 0x81b9ef0 Font6Func +thumb_func 0x81ba308 DecompressGlyphFont6 thumb_func 0x81ba36c MultiBootInit -thumb_func 0x81ba3a8 +thumb_func 0x81ba3a8 MultiBootMain thumb_func 0x81ba798 MultiBootSend thumb_func 0x81ba7e4 MultiBootStartProbe -thumb_func 0x81ba808 -thumb_func 0x81ba8cc +thumb_func 0x81ba808 MultiBootStartMaster +thumb_func 0x81ba8cc MultiBootCheckComplete thumb_func 0x81ba8e0 MultiBootHandShake thumb_func 0x81ba9cc MultiBootWaitCycles thumb_func 0x81ba9e4 MultiBootWaitSendDone @@ -14310,7 +14310,7 @@ thumb_func 0x81bacc8 thumb_func 0x81bae70 thumb_func 0x81baeb0 thumb_func 0x81baf20 -thumb_func 0x81baf38 +thumb_func 0x81baf38 Task_GiveExpToMon thumb_func 0x81bb0b0 thumb_func 0x81bb180 thumb_func 0x81bb2c4 @@ -14318,137 +14318,137 @@ thumb_func 0x81bb324 thumb_func 0x81bb3dc thumb_func 0x81bb428 thumb_func 0x81bb4c4 -thumb_func 0x81bb534 +thumb_func 0x81bb534 CompleteOnInactiveTextPrinter thumb_func 0x81bb54c thumb_func 0x81bb5c8 thumb_func 0x81bb63c thumb_func 0x81bb690 thumb_func 0x81bb784 -thumb_func 0x81bb828 +thumb_func 0x81bb828 PlayerPartnerBufferExecCompleted thumb_func 0x81bb8a0 thumb_func 0x81bb8d0 -thumb_func 0x81bb900 -thumb_func 0x81bb974 +thumb_func 0x81bb900 PlayerPartnerHandleGetMonData +thumb_func 0x81bb974 CopyPlayerPartnerMonData thumb_func 0x81bc120 thumb_func 0x81bc12c -thumb_func 0x81bc184 +thumb_func 0x81bc184 SetPlayerPartnerMonData thumb_func 0x81bcb80 -thumb_func 0x81bcbf4 -thumb_func 0x81bcd10 +thumb_func 0x81bcbf4 PlayerPartnerHandleLoadMonSprite +thumb_func 0x81bcd10 PlayerPartnerHandleSwitchInAnim thumb_func 0x81bcd80 thumb_func 0x81bcefc thumb_func 0x81bcf8c -thumb_func 0x81bd018 -thumb_func 0x81bd258 +thumb_func 0x81bd018 PlayerPartnerHandleDrawTrainerPic +thumb_func 0x81bd258 PlayerPartnerHandleTrainerSlide thumb_func 0x81bd264 -thumb_func 0x81bd310 -thumb_func 0x81bd3fc -thumb_func 0x81bd408 -thumb_func 0x81bd414 -thumb_func 0x81bd420 -thumb_func 0x81bd42c -thumb_func 0x81bd564 -thumb_func 0x81bd6e8 +thumb_func 0x81bd310 PlayerPartnerHandleFaintAnimation +thumb_func 0x81bd3fc PlayerPartnerHandlePaletteFade +thumb_func 0x81bd408 PlayerPartnerHandleSuccessBallThrowAnim +thumb_func 0x81bd414 PlayerPartnerHandleBallThrowAnim +thumb_func 0x81bd420 PlayerPartnerHandlePause +thumb_func 0x81bd42c PlayerPartnerHandleMoveAnimation +thumb_func 0x81bd564 PlayerPartnerDoMoveAnimation +thumb_func 0x81bd6e8 PlayerPartnerHandlePrintString thumb_func 0x81bd73c -thumb_func 0x81bd748 -thumb_func 0x81bd758 -thumb_func 0x81bd764 +thumb_func 0x81bd748 PlayerPartnerHandleChooseAction +thumb_func 0x81bd758 PlayerPartnerHandleUnknownYesNoBox +thumb_func 0x81bd764 PlayerPartnerHandleChooseMove thumb_func 0x81bd80c -thumb_func 0x81bd818 +thumb_func 0x81bd818 PlayerPartnerHandleChoosePokemon thumb_func 0x81bd8a0 thumb_func 0x81bd8ac -thumb_func 0x81bd99c -thumb_func 0x81bda38 -thumb_func 0x81bdab0 +thumb_func 0x81bd99c PlayerPartnerHandleExpUpdate +thumb_func 0x81bda38 PlayerPartnerHandleStatusIconUpdate +thumb_func 0x81bdab0 PlayerPartnerHandleStatusAnimation thumb_func 0x81bdb18 thumb_func 0x81bdb24 thumb_func 0x81bdb30 thumb_func 0x81bdb3c thumb_func 0x81bdb48 -thumb_func 0x81bdb54 -thumb_func 0x81bdb60 -thumb_func 0x81bdb6c -thumb_func 0x81bdb78 +thumb_func 0x81bdb54 PlayerPartnerHandleTwoReturnValues +thumb_func 0x81bdb60 PlayerPartnerHandleChosenMonReturnValue +thumb_func 0x81bdb6c PlayerPartnerHandleOneReturnValue +thumb_func 0x81bdb78 PlayerPartnerHandleOneReturnValue_Duplicate thumb_func 0x81bdb84 PlayerPartnerHandleCmd37 thumb_func 0x81bdba0 PlayerPartnerHandleCmd38 thumb_func 0x81bdbd8 PlayerPartnerHandleCmd39 thumb_func 0x81bdbf0 PlayerPartnerHandleCmd40 -thumb_func 0x81bdc18 -thumb_func 0x81bdc88 -thumb_func 0x81bdc94 -thumb_func 0x81bdcd8 -thumb_func 0x81bdd34 +thumb_func 0x81bdc18 PlayerPartnerHandleHitAnimation +thumb_func 0x81bdc88 PlayerPartnerHandleCmd42 +thumb_func 0x81bdc94 PlayerPartnerHandlePlaySE +thumb_func 0x81bdcd8 PlayerPartnerHandlePlayFanfareOrBGM +thumb_func 0x81bdd34 PlayerPartnerHandleFaintingCry thumb_func 0x81bdd74 -thumb_func 0x81bdda8 +thumb_func 0x81bdda8 PlayerPartnerHandleIntroTrainerBallThrow thumb_func 0x81bdf64 -thumb_func 0x81be070 +thumb_func 0x81be070 PlayerPartnerHandleDrawPartyStatusSummary thumb_func 0x81be134 thumb_func 0x81be17c PlayerPartnerHandleHidePartyStatusSummary -thumb_func 0x81be1cc +thumb_func 0x81be1cc PlayerPartnerHandleEndBounceEffect thumb_func 0x81be1d8 -thumb_func 0x81be238 -thumb_func 0x81be2a0 -thumb_func 0x81be2ac -thumb_func 0x81be2b8 +thumb_func 0x81be238 PlayerPartnerHandleBattleAnimation +thumb_func 0x81be2a0 PlayerPartnerHandleLinkStandbyMsg +thumb_func 0x81be2ac PlayerPartnerHandleResetActionMoveSelection +thumb_func 0x81be2b8 FullSaveGame thumb_func 0x81be304 nullsub_127 -thumb_func 0x81be308 -thumb_func 0x81be334 +thumb_func 0x81be308 IsMirageTowerVisible +thumb_func 0x81be334 UpdateMirageTowerPulseBlend thumb_func 0x81be348 -thumb_func 0x81be354 -thumb_func 0x81be3c8 -thumb_func 0x81be438 -thumb_func 0x81be490 -thumb_func 0x81be4a4 -thumb_func 0x81be538 -thumb_func 0x81be59c -thumb_func 0x81be604 -thumb_func 0x81be630 +thumb_func 0x81be354 TryStartMirageTowerPulseBlendEffect +thumb_func 0x81be3c8 ClearMirageTowerPulseBlendEffect +thumb_func 0x81be438 SetMirageTowerVisibility +thumb_func 0x81be490 StartPlayerDescendMirageTower +thumb_func 0x81be4a4 PlayerDescendMirageTower +thumb_func 0x81be538 StartScreenShake +thumb_func 0x81be59c DoScreenShake +thumb_func 0x81be604 IncrementCeilingCrumbleFinishedCount +thumb_func 0x81be630 DoMirageTowerCeilingCrumble thumb_func 0x81be65c WaitCeilingCrumble -thumb_func 0x81be69c -thumb_func 0x81be6bc -thumb_func 0x81be774 -thumb_func 0x81be7c0 +thumb_func 0x81be69c FinishCeilingCrumbleTask +thumb_func 0x81be6bc CreateCeilingCrumbleSprites +thumb_func 0x81be774 MoveCeilingCrumbleSprite +thumb_func 0x81be7c0 SetInvisibleMirageTowerMetatiles thumb_func 0x81be7f0 thumb_func 0x81be804 thumb_func 0x81be818 -thumb_func 0x81be82c -thumb_func 0x81be850 -thumb_func 0x81be890 -thumb_func 0x81be9ec -thumb_func 0x81becc4 +thumb_func 0x81be82c SetBgShakeOffsets +thumb_func 0x81be850 UpdateBgShake +thumb_func 0x81be890 InitMirageTowerShake +thumb_func 0x81be9ec DoMirageTowerDisintegration +thumb_func 0x81becc4 DoFossilFallAndSink thumb_func 0x81beee4 thumb_func 0x81bef54 thumb_func 0x81bf020 thumb_func 0x81bf0b0 thumb_func 0x81bf0bc -thumb_func 0x81bf280 +thumb_func 0x81bf280 ShowPokemonSummaryScreen thumb_func 0x81bf3cc ShowSelectMovePokemonSummaryScreen -thumb_func 0x81bf414 -thumb_func 0x81bf430 -thumb_func 0x81bf444 -thumb_func 0x81bf470 -thumb_func 0x81bf784 -thumb_func 0x81bf810 -thumb_func 0x81bf9f8 -thumb_func 0x81bfa50 +thumb_func 0x81bf414 CallBattlePyramidFunction +thumb_func 0x81bf430 SummaryScreen_VBlank +thumb_func 0x81bf444 SummaryScreen_LoadingCB2 +thumb_func 0x81bf470 SummaryScreen_LoadGraphics +thumb_func 0x81bf784 InitBGs +thumb_func 0x81bf810 SummaryScreen_DecompressGraphics +thumb_func 0x81bf9f8 CopyMonToSummaryStruct +thumb_func 0x81bfa50 ExtractMonDataToSummaryStruct thumb_func 0x81bfc7c thumb_func 0x81bfd68 -thumb_func 0x81bfd80 -thumb_func 0x81bfdb8 -thumb_func 0x81bfe44 -thumb_func 0x81bff38 +thumb_func 0x81bfd80 BeginCloseSummaryScreen +thumb_func 0x81bfdb8 CloseSummaryScreen +thumb_func 0x81bfe44 HandleInput +thumb_func 0x81bff38 ChangeSummaryPokemon thumb_func 0x81c0038 thumb_func 0x81c022c thumb_func 0x81c02e8 thumb_func 0x81c0384 -thumb_func 0x81c03c0 -thumb_func 0x81c04c0 -thumb_func 0x81c059c -thumb_func 0x81c05f8 -thumb_func 0x81c0678 +thumb_func 0x81c03c0 ChangePage +thumb_func 0x81c04c0 PssScrollRight +thumb_func 0x81c059c PssScrollRightEnd +thumb_func 0x81c05f8 PssScrollLeft +thumb_func 0x81c0678 PssScrollLeftEnd thumb_func 0x81c0758 CheckExperienceProgressBar thumb_func 0x81c077c -thumb_func 0x81c0878 +thumb_func 0x81c0878 HandleInput_MoveSelect thumb_func 0x81c0974 thumb_func 0x81c09a4 thumb_func 0x81c0b28 @@ -14458,12 +14458,12 @@ thumb_func 0x81c0ce4 thumb_func 0x81c0df0 thumb_func 0x81c0f20 thumb_func 0x81c1050 -thumb_func 0x81c1080 -thumb_func 0x81c11dc -thumb_func 0x81c1228 -thumb_func 0x81c1274 +thumb_func 0x81c1080 HandleReplaceMoveInput +thumb_func 0x81c11dc CanReplaceMove +thumb_func 0x81c1228 ShowHMMovesCantBeForgottenWindow +thumb_func 0x81c1274 HandleHMMovesCantBeForgottenInput thumb_func 0x81c14c8 -thumb_func 0x81c14d4 +thumb_func 0x81c14d4 DrawPagination thumb_func 0x81c15e4 thumb_func 0x81c16d8 thumb_func 0x81c1754 @@ -14472,88 +14472,88 @@ thumb_func 0x81c18b4 thumb_func 0x81c19a8 thumb_func 0x81c1a24 thumb_func 0x81c1ac8 -thumb_func 0x81c1b5c +thumb_func 0x81c1b5c DrawPokerusCuredSymbol thumb_func 0x81c1bc0 -thumb_func 0x81c1c00 -thumb_func 0x81c1d40 -thumb_func 0x81c1e58 -thumb_func 0x81c1e88 -thumb_func 0x81c1ed8 +thumb_func 0x81c1c00 DrawExperienceProgressBar +thumb_func 0x81c1d40 DrawContestMoveHearts +thumb_func 0x81c1e58 LimitEggSummaryPageDisplay +thumb_func 0x81c1e88 ResetWindows +thumb_func 0x81c1ed8 SummaryScreen_PrintTextOnWindow thumb_func 0x81c1f1c thumb_func 0x81c1f5c thumb_func 0x81c20d8 -thumb_func 0x81c2120 +thumb_func 0x81c2120 GetBgType thumb_func 0x81c219c thumb_func 0x81c21cc thumb_func 0x81c23d4 thumb_func 0x81c251c -thumb_func 0x81c2620 -thumb_func 0x81c265c -thumb_func 0x81c2690 +thumb_func 0x81c2620 AddWindowFromTemplateList +thumb_func 0x81c265c SummaryScreen_RemoveWindowByIndex +thumb_func 0x81c2690 PrintPageSpecificText thumb_func 0x81c26c4 -thumb_func 0x81c26d8 -thumb_func 0x81c26f4 -thumb_func 0x81c2734 +thumb_func 0x81c26d8 CreateTextPrinterTask +thumb_func 0x81c26f4 PrintInfoPageText +thumb_func 0x81c2734 Task_PrintInfoPage thumb_func 0x81c27b8 thumb_func 0x81c2828 thumb_func 0x81c288c thumb_func 0x81c28e0 thumb_func 0x81c2934 -thumb_func 0x81c2a4c +thumb_func 0x81c2a4c PrintMonTrainerMemo thumb_func 0x81c2a78 -thumb_func 0x81c2ac4 -thumb_func 0x81c2af4 -thumb_func 0x81c2bb4 -thumb_func 0x81c2bd8 -thumb_func 0x81c2bfc +thumb_func 0x81c2ac4 GetMetLevelString +thumb_func 0x81c2af4 DoesMonOTMatchOwner +thumb_func 0x81c2bb4 DidMonComeFromGBAGames +thumb_func 0x81c2bd8 DidMonComeFromRSE +thumb_func 0x81c2bfc IsInGamePartnerMon thumb_func 0x81c2c54 thumb_func 0x81c2c84 -thumb_func 0x81c2cb4 -thumb_func 0x81c2d28 -thumb_func 0x81c2dbc -thumb_func 0x81c2de0 +thumb_func 0x81c2cb4 PrintEggState +thumb_func 0x81c2d28 PrintEggMemo +thumb_func 0x81c2dbc PrintSkillsPageText +thumb_func 0x81c2de0 Task_PrintSkillsPage thumb_func 0x81c2e70 thumb_func 0x81c2f08 -thumb_func 0x81c2f74 +thumb_func 0x81c2f74 BufferLeftColumnStats thumb_func 0x81c303c -thumb_func 0x81c3068 +thumb_func 0x81c3068 BufferRightColumnStats thumb_func 0x81c30f0 thumb_func 0x81c311c -thumb_func 0x81c31d8 -thumb_func 0x81c3244 -thumb_func 0x81c335c -thumb_func 0x81c3498 -thumb_func 0x81c3544 -thumb_func 0x81c3590 -thumb_func 0x81c3668 -thumb_func 0x81c36d4 +thumb_func 0x81c31d8 PrintBattleMoves +thumb_func 0x81c3244 Task_PrintBattleMoves +thumb_func 0x81c335c CB2_HandleStartMultiPartnerBattle +thumb_func 0x81c3498 PrintMovePowerAndAccuracy +thumb_func 0x81c3544 PrintContestMoves +thumb_func 0x81c3590 Task_PrintContestMoves +thumb_func 0x81c3668 PrintContestMoveDescription +thumb_func 0x81c36d4 PrintMoveDetails thumb_func 0x81c377c thumb_func 0x81c3888 thumb_func 0x81c38c4 -thumb_func 0x81c3978 +thumb_func 0x81c3978 PrintHMMovesCantBeForgotten thumb_func 0x81c39b4 ResetSpriteIds -thumb_func 0x81c39e4 +thumb_func 0x81c39e4 DestroySpriteInArray thumb_func 0x81c3a28 SetSpriteInvisibility thumb_func 0x81c3a70 HidePageSpecificSprites -thumb_func 0x81c3aa4 -thumb_func 0x81c3aec -thumb_func 0x81c3b3c -thumb_func 0x81c3bc4 -thumb_func 0x81c3c44 -thumb_func 0x81c3ca8 -thumb_func 0x81c3d14 +thumb_func 0x81c3aa4 SetTypeIcons +thumb_func 0x81c3aec CreateMoveTypeIcons +thumb_func 0x81c3b3c SetMoveTypeSpritePosAndType +thumb_func 0x81c3bc4 SetMonTypeIcons +thumb_func 0x81c3c44 SetMoveTypeIcons +thumb_func 0x81c3ca8 SetContestMoveTypeIcons +thumb_func 0x81c3d14 SetNewMoveTypeIcon thumb_func 0x81c3d8c -thumb_func 0x81c3e18 -thumb_func 0x81c3f80 +thumb_func 0x81c3e18 CreatePokemonSprite +thumb_func 0x81c3f80 PlayMonCry thumb_func 0x81c3fbc -thumb_func 0x81c404c +thumb_func 0x81c404c SpriteCB_Pokemon thumb_func 0x81c4094 -thumb_func 0x81c40a0 -thumb_func 0x81c40bc -thumb_func 0x81c40f8 -thumb_func 0x81c418c -thumb_func 0x81c41e8 -thumb_func 0x81c4210 +thumb_func 0x81c40a0 SummaryScreen_DestroyUnknownTask +thumb_func 0x81c40bc SummaryScreen_DoesSpriteHaveCallback +thumb_func 0x81c40f8 StopPokemonAnimations +thumb_func 0x81c418c CreateMonMarkingsSprite +thumb_func 0x81c41e8 RemoveAndCreateMonMarkingsSprite +thumb_func 0x81c4210 CreateCaughtBallSprite thumb_func 0x81c4290 thumb_func 0x81c4300 thumb_func 0x81c43ec @@ -14564,8 +14564,8 @@ thumb_func 0x81c4578 thumb_func 0x81c4698 thumb_func 0x81c46bc thumb_func 0x81c46d8 -thumb_func 0x81c46f4 -thumb_func 0x81c4704 +thumb_func 0x81c46f4 InitBattlePyramidBagCursorPosition +thumb_func 0x81c4704 CB2_PyramidBagMenuFromStartMenu thumb_func 0x81c4718 thumb_func 0x81c472c thumb_func 0x81c474c @@ -14577,16 +14577,16 @@ thumb_func 0x81c4854 thumb_func 0x81c4880 thumb_func 0x81c49e4 thumb_func 0x81c4a40 -thumb_func 0x81c4b1c -thumb_func 0x81c4c14 -thumb_func 0x81c4c68 -thumb_func 0x81c4d20 -thumb_func 0x81c4dd4 -thumb_func 0x81c4e70 +thumb_func 0x81c4b1c SetBagItemsListTemplate +thumb_func 0x81c4c14 PyramidBag_CopyItemName +thumb_func 0x81c4c68 PyramidBagMoveCursorFunc +thumb_func 0x81c4d20 PrintItemQuantity +thumb_func 0x81c4dd4 PrintItemDescription +thumb_func 0x81c4e70 AddScrollArrow thumb_func 0x81c4ec8 thumb_func 0x81c4ef4 thumb_func 0x81c4f34 SwapItems -thumb_func 0x81c4fa4 +thumb_func 0x81c4fa4 MovePyramidBagItemSlotInList thumb_func 0x81c5068 CompactItems thumb_func 0x81c5120 thumb_func 0x81c51b8 @@ -14595,38 +14595,38 @@ thumb_func 0x81c5294 thumb_func 0x81c52b4 thumb_func 0x81c5310 thumb_func 0x81c5348 -thumb_func 0x81c53c4 +thumb_func 0x81c53c4 Task_HandlePyramidBagInput thumb_func 0x81c551c thumb_func 0x81c56a8 thumb_func 0x81c5724 -thumb_func 0x81c5794 -thumb_func 0x81c5810 -thumb_func 0x81c5998 +thumb_func 0x81c5794 HandleFewMenuActionsInput +thumb_func 0x81c5810 HandleMenuActionInput +thumb_func 0x81c5998 IsValidMenuAction thumb_func 0x81c59d4 -thumb_func 0x81c5a0c -thumb_func 0x81c5a84 +thumb_func 0x81c5a0c BagAction_UseOnField +thumb_func 0x81c5a84 BagAction_Cancel thumb_func 0x81c5ac8 -thumb_func 0x81c5af0 +thumb_func 0x81c5af0 BagAction_Toss thumb_func 0x81c5b7c -thumb_func 0x81c5bfc +thumb_func 0x81c5bfc DontTossItem thumb_func 0x81c5c30 thumb_func 0x81c5c7c thumb_func 0x81c5cc4 -thumb_func 0x81c5d5c +thumb_func 0x81c5d5c TossItem thumb_func 0x81c5ddc -thumb_func 0x81c5e58 +thumb_func 0x81c5e58 BagAction_Give thumb_func 0x81c5ebc thumb_func 0x81c5efc thumb_func 0x81c5f24 thumb_func 0x81c5f5c -thumb_func 0x81c5fac +thumb_func 0x81c5fac BagAction_UseInBattle thumb_func 0x81c5fdc -thumb_func 0x81c60c8 -thumb_func 0x81c617c +thumb_func 0x81c60c8 Task_ItemSwapHandleInput +thumb_func 0x81c617c PerformItemSwap thumb_func 0x81c622c thumb_func 0x81c62ac thumb_func 0x81c63f0 -thumb_func 0x81c6454 +thumb_func 0x81c6454 PrintOnWindow_Font1 thumb_func 0x81c64ac thumb_func 0x81c64c8 thumb_func 0x81c64e4 @@ -14639,137 +14639,137 @@ thumb_func 0x81c6658 thumb_func 0x81c66b4 thumb_func 0x81c66e0 thumb_func 0x81c6728 -thumb_func 0x81c6750 +thumb_func 0x81c6750 ShowItemImage thumb_func 0x81c67b8 thumb_func 0x81c67cc thumb_func 0x81c67e8 thumb_func 0x81c680c -thumb_func 0x81c6838 -thumb_func 0x81c6898 -thumb_func 0x81c68e4 +thumb_func 0x81c6838 CreateLoopedTask +thumb_func 0x81c6898 IsLoopedTaskActive +thumb_func 0x81c68e4 FuncIsActiveLoopedTask thumb_func 0x81c6930 -thumb_func 0x81c69a4 +thumb_func 0x81c69a4 Task_RunLoopedTask_LinkMode thumb_func 0x81c6a10 thumb_func 0x81c6a64 thumb_func 0x81c6a7c -thumb_func 0x81c6af4 +thumb_func 0x81c6af4 FreePokenavResources thumb_func 0x81c6b20 InitPokenavResources -thumb_func 0x81c6b48 +thumb_func 0x81c6b48 AnyMonHasRibbon thumb_func 0x81c6bc0 -thumb_func 0x81c6bd8 +thumb_func 0x81c6bd8 VBlankCB_Pokenav thumb_func 0x81c6bec -thumb_func 0x81c6d2c +thumb_func 0x81c6d2c SetActivePokenavMenu thumb_func 0x81c6d48 thumb_func 0x81c6d94 thumb_func 0x81c6da0 thumb_func 0x81c6dac nullsub_128 -thumb_func 0x81c6db4 +thumb_func 0x81c6db4 SetVBlankCallback_ thumb_func 0x81c6dc0 -thumb_func 0x81c6dcc -thumb_func 0x81c6ddc -thumb_func 0x81c6dfc -thumb_func 0x81c6e10 -thumb_func 0x81c6e3c -thumb_func 0x81c6e48 +thumb_func 0x81c6dcc SetPokenavVBlankCallback +thumb_func 0x81c6ddc AllocSubstruct +thumb_func 0x81c6dfc GetSubstructPtr +thumb_func 0x81c6e10 FreePokenavSubstruct +thumb_func 0x81c6e3c GetPokenavMode +thumb_func 0x81c6e48 SetPokenavMode thumb_func 0x81c6e54 thumb_func 0x81c6e6c -thumb_func 0x81c6e78 -thumb_func 0x81c6e84 -thumb_func 0x81c6ebc -thumb_func 0x81c6ed0 -thumb_func 0x81c6ef8 -thumb_func 0x81c6f24 +thumb_func 0x81c6e78 CanViewRibbonsMenu +thumb_func 0x81c6e84 InitPokenavMainMenu +thumb_func 0x81c6ebc PokenavMainMenuLoopedTaskIsActive +thumb_func 0x81c6ed0 CB2_TradeEvolutionSceneUpdate +thumb_func 0x81c6ef8 WaitForPokenavShutdownFade +thumb_func 0x81c6f24 LoopedTask_InitPokenavMenu thumb_func 0x81c6ff4 thumb_func 0x81c7010 thumb_func 0x81c702c thumb_func 0x81c703c nullsub_129 thumb_func 0x81c7040 thumb_func 0x81c7060 -thumb_func 0x81c7080 -thumb_func 0x81c7094 -thumb_func 0x81c70dc -thumb_func 0x81c7104 -thumb_func 0x81c711c +thumb_func 0x81c7080 MainMenuLoopedTaskIsBusy +thumb_func 0x81c7094 LoopedTask_ScrollMenuHeaderDown +thumb_func 0x81c70dc LoopedTask_ScrollMenuHeaderUp +thumb_func 0x81c7104 ClearBottomWindow +thumb_func 0x81c711c Pokenav_AllocAndLoadPalettes thumb_func 0x81c7150 thumb_func 0x81c717c thumb_func 0x81c7280 thumb_func 0x81c72f4 thumb_func 0x81c7300 -thumb_func 0x81c7314 +thumb_func 0x81c7314 InitBgTemplates thumb_func 0x81c7334 thumb_func 0x81c7364 thumb_func 0x81c73a8 thumb_func 0x81c73b8 -thumb_func 0x81c73e8 -thumb_func 0x81c7454 -thumb_func 0x81c7474 -thumb_func 0x81c748c +thumb_func 0x81c73e8 InitPokenavMainMenuResources +thumb_func 0x81c7454 CleanupPokenavMainMenuResources +thumb_func 0x81c7474 SpriteCB_SpinningPokenav +thumb_func 0x81c748c PauseSpinningPokenavSprite thumb_func 0x81c74a4 ResumeSpinningPokenavSprite -thumb_func 0x81c74e8 -thumb_func 0x81c75bc +thumb_func 0x81c74e8 InitHoennMapHeaderSprites +thumb_func 0x81c75bc LoadLeftHeaderGfxForIndex thumb_func 0x81c75d4 thumb_func 0x81c7618 -thumb_func 0x81c76cc +thumb_func 0x81c76cc LoadLeftHeaderGfxForSubMenu thumb_func 0x81c7748 thumb_func 0x81c776c thumb_func 0x81c7784 thumb_func 0x81c77b8 -thumb_func 0x81c77e4 -thumb_func 0x81c7830 -thumb_func 0x81c787c -thumb_func 0x81c78b8 -thumb_func 0x81c78f4 +thumb_func 0x81c77e4 ShowLeftHeaderSprites +thumb_func 0x81c7830 ShowLeftHeaderSubmenuSprites +thumb_func 0x81c787c HideLeftHeaderSprites +thumb_func 0x81c78b8 HideLeftHeaderSubmenuSprites +thumb_func 0x81c78f4 MoveLeftHeader thumb_func 0x81c7924 SpriteCB_MoveLeftHeader thumb_func 0x81c797c thumb_func 0x81c79cc thumb_func 0x81c79dc -thumb_func 0x81c79fc +thumb_func 0x81c79fc LoopedTask_sub_81C8254 thumb_func 0x81c7a8c thumb_func 0x81c7b04 thumb_func 0x81c7b24 thumb_func 0x81c7b54 thumb_func 0x81c7b88 -thumb_func 0x81c7b98 -thumb_func 0x81c7c4c -thumb_func 0x81c7c68 -thumb_func 0x81c7c90 +thumb_func 0x81c7b98 LoopedTask_sub_81C83F0 +thumb_func 0x81c7c4c ShouldShowUpArrow +thumb_func 0x81c7c68 ShouldShowDownArrow +thumb_func 0x81c7c90 MatchCall_MoveWindow thumb_func 0x81c7d10 -thumb_func 0x81c7d48 -thumb_func 0x81c7dd8 -thumb_func 0x81c7dec +thumb_func 0x81c7d48 LoopedTask_sub_81C85A0 +thumb_func 0x81c7dd8 MatchCall_GetMessage_Type2 +thumb_func 0x81c7dec GetMatchCallWindowStruct thumb_func 0x81c7e00 MatchCall_MoveCursorUp thumb_func 0x81c7e34 MatchCall_MoveCursorDown thumb_func 0x81c7e74 MatchCall_PageUp thumb_func 0x81c7eb4 MatchCall_PageDown -thumb_func 0x81c7f04 -thumb_func 0x81c7f18 +thumb_func 0x81c7f04 GetSelectedMatchCall +thumb_func 0x81c7f18 GetMatchCallListTopIndex thumb_func 0x81c7f24 thumb_func 0x81c7f54 thumb_func 0x81c7f98 thumb_func 0x81c7fc8 thumb_func 0x81c7fe0 -thumb_func 0x81c8018 -thumb_func 0x81c8100 -thumb_func 0x81c81d0 +thumb_func 0x81c8018 LoopedTask_sub_81C8870 +thumb_func 0x81c8100 LoopedTask_sub_81C8958 +thumb_func 0x81c81d0 LoopedTask_sub_81C8A28 thumb_func 0x81c8318 thumb_func 0x81c840c thumb_func 0x81c845c thumb_func 0x81c8484 thumb_func 0x81c84f4 thumb_func 0x81c8510 -thumb_func 0x81c8564 +thumb_func 0x81c8564 PrintMatchCallFieldNames thumb_func 0x81c85fc thumb_func 0x81c867c thumb_func 0x81c86a4 thumb_func 0x81c8794 -thumb_func 0x81c87bc -thumb_func 0x81c8834 -thumb_func 0x81c8854 -thumb_func 0x81c88a8 -thumb_func 0x81c88fc +thumb_func 0x81c87bc ToggleMatchCallArrows +thumb_func 0x81c8834 c3_0802FDF4 +thumb_func 0x81c8854 SpriteCB_MatchCallDownArrow +thumb_func 0x81c88a8 SpriteCB_MatchCallUpArrow +thumb_func 0x81c88fc ToggleMatchCallVerticalArrows thumb_func 0x81c8914 thumb_func 0x81c8960 -thumb_func 0x81c8a14 +thumb_func 0x81c8a14 GetPokenavMainMenuType thumb_func 0x81c8a44 thumb_func 0x81c8a78 thumb_func 0x81c8ab0 @@ -14815,7 +14815,7 @@ thumb_func 0x81c9674 thumb_func 0x81c96a4 thumb_func 0x81c96d4 thumb_func 0x81c9770 -thumb_func 0x81c9798 +thumb_func 0x81c9798 PrintLeftColumnStats thumb_func 0x81c97d8 thumb_func 0x81c9840 thumb_func 0x81c9874 @@ -14841,7 +14841,7 @@ thumb_func 0x81c9f80 thumb_func 0x81c9fa0 thumb_func 0x81c9fb4 thumb_func 0x81c9fc4 -thumb_func 0x81c9ffc +thumb_func 0x81c9ffc Overworld_ResetStateAfterFly thumb_func 0x81ca010 thumb_func 0x81ca048 thumb_func 0x81ca05c @@ -14866,21 +14866,21 @@ thumb_func 0x81ca5b4 thumb_func 0x81ca5d4 thumb_func 0x81ca5e4 thumb_func 0x81ca5f4 -thumb_func 0x81ca604 -thumb_func 0x81ca618 +thumb_func 0x81ca604 unref_sub_81CAE58 +thumb_func 0x81ca618 unref_sub_81CAE6C thumb_func 0x81ca640 thumb_func 0x81ca650 thumb_func 0x81ca668 thumb_func 0x81ca6b0 thumb_func 0x81ca71c -thumb_func 0x81ca77c +thumb_func 0x81ca77c GroundEffect_DeepSandTracks thumb_func 0x81ca7c0 thumb_func 0x81ca7d0 -thumb_func 0x81ca7f4 +thumb_func 0x81ca7f4 DoHitAnimHealthboxEffect thumb_func 0x81ca86c thumb_func 0x81ca888 thumb_func 0x81ca8cc -thumb_func 0x81ca910 +thumb_func 0x81ca910 unref_sub_81CB16C thumb_func 0x81ca974 thumb_func 0x81caa04 thumb_func 0x81caa40 @@ -14892,7 +14892,7 @@ thumb_func 0x81caac8 thumb_func 0x81cacb4 thumb_func 0x81cad20 thumb_func 0x81cad8c -thumb_func 0x81cadf8 +thumb_func 0x81cadf8 DestroyFog1Sprites thumb_func 0x81cae64 thumb_func 0x81caea8 thumb_func 0x81caed0 @@ -14926,7 +14926,7 @@ thumb_func 0x81cb760 thumb_func 0x81cb780 thumb_func 0x81cb7a4 thumb_func 0x81cb7e8 -thumb_func 0x81cb81c +thumb_func 0x81cb81c OpponentHandlePaletteFade thumb_func 0x81cb82c thumb_func 0x81cb854 thumb_func 0x81cb86c @@ -14956,9 +14956,9 @@ thumb_func 0x81cbd30 thumb_func 0x81cbd38 thumb_func 0x81cbd48 thumb_func 0x81cbd80 -thumb_func 0x81cbdb0 +thumb_func 0x81cbdb0 PlayerHandleOneReturnValue thumb_func 0x81cbdc0 nullsub_130 -thumb_func 0x81cbdc4 +thumb_func 0x81cbdc4 Cb_PlaceMon thumb_func 0x81cbdf8 thumb_func 0x81cbe10 thumb_func 0x81cbe24 @@ -14967,7 +14967,7 @@ thumb_func 0x81cbf9c thumb_func 0x81cbfcc thumb_func 0x81cc02c thumb_func 0x81cc0b0 -thumb_func 0x81cc114 +thumb_func 0x81cc114 InitMoveRelearnerWindows thumb_func 0x81cc140 thumb_func 0x81cc170 thumb_func 0x81cc250 @@ -15030,7 +15030,7 @@ thumb_func 0x81cdd44 thumb_func 0x81cde1c thumb_func 0x81cde60 thumb_func 0x81cde98 -thumb_func 0x81cdeb4 +thumb_func 0x81cdeb4 GiveMailToMon thumb_func 0x81ce068 thumb_func 0x81ce098 thumb_func 0x81ce0c4 @@ -15078,7 +15078,7 @@ thumb_func 0x81ced14 thumb_func 0x81ced7c thumb_func 0x81cede4 thumb_func 0x81cee4c -thumb_func 0x81cee8c +thumb_func 0x81cee8c CB2_MoveRelearnerMain thumb_func 0x81ceebc thumb_func 0x81ceee8 thumb_func 0x81cef4c @@ -15132,9 +15132,9 @@ thumb_func 0x81cfd14 thumb_func 0x81cfd38 thumb_func 0x81cfd74 thumb_func 0x81cfd84 -thumb_func 0x81cfd94 -thumb_func 0x81cfe10 -thumb_func 0x81cfe88 +thumb_func 0x81cfd94 GetCurrMonInfo1 +thumb_func 0x81cfe10 GetCurrMonInfo2 +thumb_func 0x81cfe88 GetCurrMonRibbonCount thumb_func 0x81cfec4 thumb_func 0x81cffc4 thumb_func 0x81cffdc @@ -15158,7 +15158,7 @@ thumb_func 0x81d05ac thumb_func 0x81d067c thumb_func 0x81d06a0 thumb_func 0x81d076c -thumb_func 0x81d07b8 +thumb_func 0x81d07b8 DisplayItemMessageInBattlePyramid thumb_func 0x81d081c thumb_func 0x81d0864 thumb_func 0x81d0894 @@ -15177,24 +15177,24 @@ thumb_func 0x81d0b64 thumb_func 0x81d0c1c thumb_func 0x81d0c40 thumb_func 0x81d0c54 -thumb_func 0x81d0c90 -thumb_func 0x81d0cd8 -thumb_func 0x81d0ce8 -thumb_func 0x81d0d10 +thumb_func 0x81d0c90 MatchCallGetFunctionIndex +thumb_func 0x81d0cd8 GetTrainerIdxByRematchIdx +thumb_func 0x81d0ce8 GetRematchIdxByTrainerIdx +thumb_func 0x81d0d10 MatchCallFlagGetByIndex thumb_func 0x81d0d44 thumb_func 0x81d0d68 thumb_func 0x81d0d8c -thumb_func 0x81d0db0 -thumb_func 0x81d0de8 -thumb_func 0x81d0df8 +thumb_func 0x81d0db0 MatchCallGetFlag_Type4 +thumb_func 0x81d0de8 MatchCallGetFlag_Type3 +thumb_func 0x81d0df8 MatchCallMapSecGetByIndex thumb_func 0x81d0e30 thumb_func 0x81d0e34 thumb_func 0x81d0e38 thumb_func 0x81d0e6c thumb_func 0x81d0e70 -thumb_func 0x81d0e74 +thumb_func 0x81d0e74 MatchCall_IsRematchable thumb_func 0x81d0ea8 nullsub_137 -thumb_func 0x81d0eac +thumb_func 0x81d0eac MatchCall_IsRematchable_Type1 thumb_func 0x81d0edc MatchCall_IsRematchable_Type2 thumb_func 0x81d0efc thumb_func 0x81d0f00 nullsub_138 @@ -15204,18 +15204,18 @@ thumb_func 0x81d0f60 nullsub_139 thumb_func 0x81d0f64 nullsub_1401 thumb_func 0x81d0f68 nullsub_141 thumb_func 0x81d0f6c nullsub_140 -thumb_func 0x81d0f70 +thumb_func 0x81d0f70 MatchCall_GetRematchTableIdx thumb_func 0x81d0fa4 thumb_func 0x81d0fa8 thumb_func 0x81d0fac thumb_func 0x81d0fb0 thumb_func 0x81d0fb4 -thumb_func 0x81d0fb8 -thumb_func 0x81d0fec -thumb_func 0x81d0ff8 +thumb_func 0x81d0fb8 MatchCall_GetMessage +thumb_func 0x81d0fec MatchCall_GetMessage_Type0 +thumb_func 0x81d0ff8 MatchCall_GetMessage_Type1 thumb_func 0x81d1018 -thumb_func 0x81d1024 -thumb_func 0x81d1030 +thumb_func 0x81d1024 MatchCall_GetMessage_Type4 +thumb_func 0x81d1030 MatchCall_GetMessage_Type3 thumb_func 0x81d103c thumb_func 0x81d109c thumb_func 0x81d1178 @@ -15224,13 +15224,13 @@ thumb_func 0x81d11bc MatchCall_GetNameAndDesc_Type1 thumb_func 0x81d11dc MatchCall_GetNameAndDesc_Type2 thumb_func 0x81d11f4 thumb_func 0x81d1200 -thumb_func 0x81d120c +thumb_func 0x81d120c MatchCall_GetNameAndDescByRematchIdx thumb_func 0x81d123c thumb_func 0x81d12cc thumb_func 0x81d12f4 -thumb_func 0x81d131c +thumb_func 0x81d131c SetMatchCallRegisteredFlag thumb_func 0x81d1340 -thumb_func 0x81d1380 +thumb_func 0x81d1380 UpdateWorldOfMastersAndPutItOnTheAir thumb_func 0x81d13b4 thumb_func 0x81d13e4 thumb_func 0x81d13f4 @@ -15247,16 +15247,16 @@ thumb_func 0x81d1824 thumb_func 0x81d1878 thumb_func 0x81d18c0 thumb_func 0x81d1aec -thumb_func 0x81d1c48 +thumb_func 0x81d1c48 MatchCallGetMapSec_Type2 thumb_func 0x81d1d70 thumb_func 0x81d1e40 thumb_func 0x81d1ee0 -thumb_func 0x81d1fd8 +thumb_func 0x81d1fd8 LoadMoveRelearnerMovesList thumb_func 0x81d200c -thumb_func 0x81d2208 -thumb_func 0x81d2250 -thumb_func 0x81d2264 -thumb_func 0x81d227c +thumb_func 0x81d2208 MoveRelearnerPrintText +thumb_func 0x81d2250 MoveRelearnerRunTextPrinters +thumb_func 0x81d2264 MoveRelearnerCreateYesNoMenu +thumb_func 0x81d227c GetBoxOrPartyMonData thumb_func 0x81d22e4 thumb_func 0x81d24ac thumb_func 0x81d2504 @@ -15280,20 +15280,20 @@ thumb_func 0x81d2b50 thumb_func 0x81d2b7c thumb_func 0x81d2b94 thumb_func 0x81d2c18 -thumb_func 0x81d2c70 -thumb_func 0x81d2db4 -thumb_func 0x81d2eb8 +thumb_func 0x81d2c70 DrawLevelUpWindowPg1 +thumb_func 0x81d2db4 DrawLevelUpWindowPg2 +thumb_func 0x81d2eb8 GetMonLevelUpWindowStats thumb_func 0x81d2f00 -thumb_func 0x81d2f28 +thumb_func 0x81d2f28 Struct_Unk81D38FC_ValidateChecksum thumb_func 0x81d2f4c -thumb_func 0x81d2f9c +thumb_func 0x81d2f9c TrainerHill_VerifyChecksum thumb_func 0x81d2fc8 thumb_func 0x81d3130 -thumb_func 0x81d3158 -thumb_func 0x81d318c -thumb_func 0x81d31b4 -thumb_func 0x81d31d4 -thumb_func 0x81d3268 +thumb_func 0x81d3158 TryReadTrainerHill_r +thumb_func 0x81d318c TryReadTrainerHill +thumb_func 0x81d31b4 ReadTrainerHillAndValidate +thumb_func 0x81d31d4 unref_sub_81D3B54 +thumb_func 0x81d3268 unref_sub_81D3BE8 thumb_func 0x81d32fc thumb_func 0x81d333c thumb_func 0x81d33b4 @@ -15309,13 +15309,13 @@ thumb_func 0x81d37f0 thumb_func 0x81d3820 thumb_func 0x81d3874 thumb_func 0x81d38b8 -thumb_func 0x81d38d8 -thumb_func 0x81d38fc -thumb_func 0x81d3eb4 +thumb_func 0x81d38d8 GetMewEventObjectId +thumb_func 0x81d38fc GetMewMoveDirection +thumb_func 0x81d3eb4 CanMewWalkToCoords thumb_func 0x81d3f10 -thumb_func 0x81d4018 -thumb_func 0x81d4068 -thumb_func 0x81d4094 +thumb_func 0x81d4018 UpdateFarawayIslandStepCounter +thumb_func 0x81d4068 EventObjectIsFarawayIslandMew +thumb_func 0x81d4094 IsMewPlayingHideAndSeek thumb_func 0x81d40d8 thumb_func 0x81d4110 thumb_func 0x81d426c @@ -15337,22 +15337,22 @@ thumb_func 0x81d46e4 thumb_func 0x81d4704 thumb_func 0x81d4b14 thumb_func 0x81d4b3c -thumb_func 0x81d4b80 -thumb_func 0x81d4b90 -thumb_func 0x81d4bb4 -thumb_func 0x81d4be4 +thumb_func 0x81d4b80 GetFloorId +thumb_func 0x81d4b90 GetTrainerHillOpponentClass +thumb_func 0x81d4bb4 ScrCmd_showmonpic +thumb_func 0x81d4be4 GetTrainerHillTrainerFrontSpriteId thumb_func 0x81d4c30 thumb_func 0x81d4cf0 -thumb_func 0x81d4d0c +thumb_func 0x81d4d0c SetUpDataStruct thumb_func 0x81d4d64 -thumb_func 0x81d4d80 -thumb_func 0x81d4e70 +thumb_func 0x81d4d80 CopyTrainerHillTrainerText +thumb_func 0x81d4e70 TrainerHillStartChallenge thumb_func 0x81d4f2c thumb_func 0x81d4f78 thumb_func 0x81d5024 -thumb_func 0x81d50a8 -thumb_func 0x81d50ec -thumb_func 0x81d5108 +thumb_func 0x81d50a8 TrainerHillResumeTimer +thumb_func 0x81d50ec TrainerHillSetPlayerLost +thumb_func 0x81d5108 TrainerHillGetChallengeStatus thumb_func 0x81d5164 thumb_func 0x81d51f4 thumb_func 0x81d5238 @@ -15368,18 +15368,18 @@ thumb_func 0x81d5840 thumb_func 0x81d58b0 thumb_func 0x81d590c thumb_func 0x81d5a10 InTrainerHill -thumb_func 0x81d5a38 +thumb_func 0x81d5a38 GetCurrentTrainerHillMapId thumb_func 0x81d5a9c thumb_func 0x81d5abc thumb_func 0x81d5ad0 thumb_func 0x81d5b1c -thumb_func 0x81d5b38 -thumb_func 0x81d5b84 +thumb_func 0x81d5b38 GetHillTrainerFlag +thumb_func 0x81d5b84 SetHillTrainerFlag thumb_func 0x81d5c48 thumb_func 0x81d5c50 thumb_func 0x81d5c68 -thumb_func 0x81d5d20 -thumb_func 0x81d5d38 +thumb_func 0x81d5d20 FillHillTrainerParty +thumb_func 0x81d5d38 FillHillTrainersParties thumb_func 0x81d5d60 thumb_func 0x81d5d64 thumb_func 0x81d5dcc @@ -15392,68 +15392,68 @@ thumb_func 0x81d5eb8 thumb_func 0x81d5ed4 thumb_func 0x81d5f08 thumb_func 0x81d5f40 -thumb_func 0x81d5f98 -thumb_func 0x81d605c -thumb_func 0x81d60b0 +thumb_func 0x81d5f98 AllocOamMatrix +thumb_func 0x81d605c DoRayquazaScene +thumb_func 0x81d60b0 CB2_InitRayquazaScene thumb_func 0x81d610c -thumb_func 0x81d6128 -thumb_func 0x81d613c -thumb_func 0x81d617c +thumb_func 0x81d6128 VBlankCB_RayquazaScene +thumb_func 0x81d613c Task_EndAfterFadeScreen +thumb_func 0x81d617c Task_SetNextAnim thumb_func 0x81d6204 thumb_func 0x81d6240 -thumb_func 0x81d6258 +thumb_func 0x81d6258 Task_HandleDuoFightPre thumb_func 0x81d62c0 thumb_func 0x81d635c thumb_func 0x81d64b8 thumb_func 0x81d665c -thumb_func 0x81d690c +thumb_func 0x81d690c VBlankCB_DuoFight thumb_func 0x81d691c thumb_func 0x81d69a8 -thumb_func 0x81d6a70 +thumb_func 0x81d6a70 Task_DuoFightAnim thumb_func 0x81d6b64 -thumb_func 0x81d6ca8 +thumb_func 0x81d6ca8 Task_HandleDuoFight thumb_func 0x81d6d74 thumb_func 0x81d6dbc thumb_func 0x81d6e04 thumb_func 0x81d6e48 thumb_func 0x81d6e68 -thumb_func 0x81d6ef0 -thumb_func 0x81d6f3c +thumb_func 0x81d6ef0 DuoFightEnd +thumb_func 0x81d6f3c Task_DuoFightEnd thumb_func 0x81d6fa0 thumb_func 0x81d703c thumb_func 0x81d719c thumb_func 0x81d71f8 thumb_func 0x81d739c thumb_func 0x81d7650 -thumb_func 0x81d774c +thumb_func 0x81d774c MoveSelectionDisplayPpString thumb_func 0x81d77d8 -thumb_func 0x81d7888 -thumb_func 0x81d78fc -thumb_func 0x81d7aa0 +thumb_func 0x81d7888 Task_RayTakesFlightAnim +thumb_func 0x81d78fc Task_HandleRayTakesFlight +thumb_func 0x81d7aa0 Task_RayTakesFlightEnd thumb_func 0x81d7ae0 thumb_func 0x81d7b9c thumb_func 0x81d7bec thumb_func 0x81d7c94 thumb_func 0x81d7d88 -thumb_func 0x81d7e28 -thumb_func 0x81d7eb8 +thumb_func 0x81d7e28 Task_RayDescendsAnim +thumb_func 0x81d7eb8 Task_HandleRayDescends thumb_func 0x81d7fc0 thumb_func 0x81d8008 thumb_func 0x81d8088 thumb_func 0x81d8164 thumb_func 0x81d820c -thumb_func 0x81d82bc -thumb_func 0x81d831c +thumb_func 0x81d82bc Task_RayChargesAnim +thumb_func 0x81d831c Task_HandleRayCharges thumb_func 0x81d8414 thumb_func 0x81d8468 thumb_func 0x81d84f0 -thumb_func 0x81d8528 +thumb_func 0x81d8528 Task_RayChargesEnd thumb_func 0x81d8574 thumb_func 0x81d8600 -thumb_func 0x81d86f0 -thumb_func 0x81d87bc +thumb_func 0x81d86f0 Task_RayChasesAwayAnim +thumb_func 0x81d87bc Task_HandleRayChasesAway thumb_func 0x81d88ec -thumb_func 0x81d8970 +thumb_func 0x81d8970 Task_RayChasesAwayEnd thumb_func 0x81d89e4 thumb_func 0x81d8bb0 thumb_func 0x81d8c74 @@ -15465,11 +15465,11 @@ thumb_func 0x81d8f58 thumb_func 0x81d911c thumb_func 0x81d91a4 thumb_func 0x81d91f0 -thumb_func 0x81d92f8 -thumb_func 0x81d9320 -thumb_func 0x81d9358 -thumb_func 0x81d93d4 -thumb_func 0x81d9400 +thumb_func 0x81d92f8 TryBufferWaldaPhrase +thumb_func 0x81d9320 DoWaldaNamingScreen +thumb_func 0x81d9358 CB2_HandleGivenWaldaPhrase +thumb_func 0x81d93d4 GetWaldaPhraseInputCase +thumb_func 0x81d9400 TryGetWallpaperWithWaldaPhrase thumb_func 0x81d947c thumb_func 0x81d9574 thumb_func 0x81d95c0 @@ -15489,10 +15489,10 @@ thumb_func 0x81d9ad4 thumb_func 0x81d9b78 thumb_func 0x81d9c48 thumb_func 0x81d9d18 -thumb_func 0x81d9dcc -thumb_func 0x81d9e24 -thumb_func 0x81d9f1c -thumb_func 0x81d9f50 +thumb_func 0x81d9dcc UpdateGymLeaderRematch +thumb_func 0x81d9e24 UpdateGymLeaderRematchFromArray +thumb_func 0x81d9f1c GetRematchIndex +thumb_func 0x81d9f50 StopCry thumb_func 0x81d9f9c thumb_func 0x81da098 thumb_func 0x81da10c